agentplane 0.3.10 → 0.3.12

package/dist/commands/guard/impl/close-message.js

@@ -3,6 +3,15 @@ import { extractTaskSuffix } from "@agentplaneorg/core";
 import { exitCodeForError } from "../../../cli/exit-codes.js";
 import { CliError } from "../../../shared/errors.js";
 import { execFileAsync, gitEnv } from "../../shared/git.js";
+function isMissingCommitObjectError(err) {
+    const stderr = err.stderr;
+    const text = err instanceof Error
+        ? [err.message, typeof stderr === "string" ? stderr : ""]
+            .filter((part) => part.trim().length > 0)
+            .join("\n")
+        : String(err);
+    return (/bad object/i.test(text) || /unknown revision/i.test(text) || /ambiguous argument/i.test(text));
+}
 function uniqSorted(values) {
     return [...new Set(values)].toSorted((a, b) => a.localeCompare(b));
 }
@@ -29,12 +38,20 @@ function clampList(items, max) {
     return items.slice(0, Math.max(0, Math.floor(max)));
 }
 async function gitNumstatForCommit(gitRoot, commit) {
-    const { stdout } = await execFileAsync("git", ["show", "--numstat", "--format=", commit], {
-        cwd: gitRoot,
-        env: gitEnv(),
-        encoding: "buffer",
-        maxBuffer: 10 * 1024 * 1024,
-    });
+    let stdout;
+    try {
+        ({ stdout } = await execFileAsync("git", ["show", "--numstat", "--format=", commit], {
+            cwd: gitRoot,
+            env: gitEnv(),
+            encoding: "buffer",
+            maxBuffer: 10 * 1024 * 1024,
+        }));
+    }
+    catch (err) {
+        if (isMissingCommitObjectError(err))
+            return [];
+        throw err;
+    }
     const text = Buffer.isBuffer(stdout) ? stdout.toString("utf8") : String(stdout);
     const entries = [];
     for (const line of text.split("\n")) {

package/dist/commands/guard/impl/commands.d.ts

@@ -32,5 +32,6 @@ export declare function cmdCommit(opts: {
     closeUnstageOthers: boolean;
     closeCheckOnly: boolean;
     closeStageTaskArtifacts?: boolean;
+    closeRefreshTaskArtifacts?: boolean;
 }): Promise<number>;
 //# sourceMappingURL=commands.d.ts.map

package/dist/commands/guard/impl/commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../../src/commands/guard/impl/commands.ts"],"names":[],"mappings":"AASA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAQvF,OAAO,EAAoB,KAAK,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAsOxE,wBAAsB,aAAa,CAAC,IAAI,EAAE;IACxC,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAsBlB;AAED,wBAAsB,oBAAoB,CAAC,IAAI,EAAE;IAC/C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC;CAC1B,GAAG,OAAO,CAAC,MAAM,CAAC,CAyBlB;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,CAa9E;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE;IACpC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;IACf,kBAAkB,EAAE,OAAO,CAAC;IAC5B,cAAc,EAAE,OAAO,CAAC;IACxB,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC,GAAG,OAAO,CAAC,MAAM,CAAC,CAuNlB"}
+{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../../src/commands/guard/impl/commands.ts"],"names":[],"mappings":"AAaA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAQvF,OAAO,EAAoB,KAAK,kBAAkB,EAAE,MAAM,aAAa,CAAC;AA8SxE,wBAAsB,aAAa,CAAC,IAAI,EAAE;IACxC,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAsBlB;AAED,wBAAsB,oBAAoB,CAAC,IAAI,EAAE;IAC/C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC;CAC1B,GAAG,OAAO,CAAC,MAAM,CAAC,CAyBlB;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,CAa9E;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE;IACpC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;IACf,kBAAkB,EAAE,OAAO,CAAC;IAC5B,cAAc,EAAE,OAAO,CAAC;IACxB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,yBAAyB,CAAC,EAAE,OAAO,CAAC;CACrC,GAAG,OAAO,CAAC,MAAM,CAAC,CAsPlB"}

package/dist/commands/guard/impl/commands.js

@@ -1,11 +1,14 @@
 import { mkdir, rm, writeFile } from "node:fs/promises";
 import path from "node:path";
+import { extractTaskSuffix } from "@agentplaneorg/core";
 import { resolveTaskIndexPath } from "../../../backends/task-index.js";
 import { mapCoreError } from "../../../cli/error-map.js";
 import { infoMessage, successMessage } from "../../../cli/output.js";
 import { stripAnsi } from "../../../cli/shared/ansi.js";
 import { withDiagnosticContext } from "../../../shared/diagnostics.js";
 import { CliError } from "../../../shared/errors.js";
+import { refreshBranchPrArtifactsAfterTaskCommit } from "../../shared/post-commit-pr-artifacts.js";
+import { isTaskLocalAdvancePath } from "../../shared/task-local-freshness.js";
 import { loadCommandContext } from "../../shared/task-backend.js";
 import { loadTaskFromContext } from "../../shared/task-backend.js";
 import { execFileAsync, gitEnv } from "../../shared/git.js";
@@ -110,6 +113,64 @@ function detectCommitFailureSignal(output) {
     }
     return null;
 }
+function taskArtifactRefreshCommitMessage(taskId) {
+    return `📝 ${extractTaskSuffix(taskId)} task: refresh PR artifacts`;
+}
+async function commitRefreshedTaskArtifacts(opts) {
+    const changedPaths = await opts.ctx.git.statusChangedPaths();
+    const taskArtifactPaths = changedPaths.filter((relPath) => isTaskLocalAdvancePath({
+        workflowDir: opts.ctx.config.paths.workflow_dir,
+        taskId: opts.taskId,
+        tasksPath: opts.ctx.config.paths.tasks_path,
+        relPath,
+    }));
+    if (taskArtifactPaths.length === 0)
+        return false;
+    await stageAllowlist({
+        ctx: opts.ctx,
+        allow: [],
+        allowTasks: true,
+        allowPolicy: false,
+        allowConfig: false,
+        allowHooks: false,
+        allowCI: false,
+        tasksPath: opts.ctx.config.paths.tasks_path,
+        workflowDir: opts.ctx.config.paths.workflow_dir,
+        taskId: opts.taskId,
+        allowTaskOnly: true,
+        emptyAllowMessage: "PR artifact refresh produced no task-local files to stage for the follow-up commit.",
+        noMatchMessage: "PR artifact refresh produced changes outside the active task artifact scope; inspect the working tree before retrying the commit flow.",
+    });
+    const message = taskArtifactRefreshCommitMessage(opts.taskId);
+    await guardCommitCheck({
+        ctx: opts.ctx,
+        cwd: opts.cwd,
+        rootOverride: opts.rootOverride,
+        baseBranchOverride: null,
+        taskId: opts.taskId,
+        message,
+        allow: [],
+        allowBase: false,
+        allowTasks: true,
+        allowPolicy: false,
+        allowConfig: false,
+        allowHooks: false,
+        allowCI: false,
+        requireClean: true,
+        quiet: opts.quiet,
+    });
+    const env = buildGitCommitEnv({
+        taskId: opts.taskId,
+        allowTasks: true,
+        allowBase: false,
+        allowPolicy: false,
+        allowConfig: false,
+        allowHooks: false,
+        allowCI: false,
+    });
+    await opts.ctx.git.commit({ message, env });
+    return true;
+}
 function commitFailureDiagnostic(phase, output) {
     const signal = detectCommitFailureSignal(output);
     if (signal === "formatter") {
@@ -325,11 +386,26 @@ export async function cmdCommit(opts) {
                 }
                 return 0;
             }
+            if (opts.closeStageTaskArtifacts === true) {
+                if (opts.closeRefreshTaskArtifacts !== false) {
+                    await refreshBranchPrArtifactsAfterTaskCommit({
+                        ctx,
+                        cwd: opts.cwd,
+                        rootOverride: opts.rootOverride,
+                        taskId: opts.taskId,
+                        quiet: opts.quiet,
+                    });
+                }
+                // Artifact refresh writes tracked task files on disk; invalidate the memoized
+                // porcelain snapshot so staging/cleanliness checks see the current task artifact state.
+                ctx.git.invalidateStatus();
+            }
             await (opts.closeStageTaskArtifacts === true
                 ? stageAllowlist({
                     ctx,
                     allow: [],
                     allowTasks: true,
+                    allowPolicy: opts.allowPolicy,
                     tasksPath: ctx.config.paths.tasks_path,
                     workflowDir: ctx.config.paths.workflow_dir,
                     taskId: opts.taskId,
@@ -350,7 +426,7 @@ export async function cmdCommit(opts) {
                 allow: [],
                 allowBase: opts.allowBase,
                 allowTasks: true,
-                allowPolicy: false,
+                allowPolicy: opts.allowPolicy,
                 allowConfig: false,
                 allowHooks: false,
                 allowCI: false,
@@ -361,10 +437,11 @@ export async function cmdCommit(opts) {
                 taskId: opts.taskId,
                 allowTasks: true,
                 allowBase: opts.allowBase,
-                allowPolicy: false,
+                allowPolicy: opts.allowPolicy,
                 allowConfig: false,
                 allowHooks: false,
                 allowCI: false,
+                allowStaleDist: true,
             });
             await ctx.git.commit({ message: msg.subject, body: msg.body, env });
             if (!opts.quiet) {
@@ -437,6 +514,21 @@ export async function cmdCommit(opts) {
             allowCI: opts.allowCI,
         });
         await ctx.git.commit({ message: opts.message, env });
+        await refreshBranchPrArtifactsAfterTaskCommit({
+            ctx,
+            cwd: opts.cwd,
+            rootOverride: opts.rootOverride,
+            taskId: opts.taskId,
+            quiet: opts.quiet,
+        });
+        ctx.git.invalidateStatus();
+        await commitRefreshedTaskArtifacts({
+            ctx,
+            cwd: opts.cwd,
+            rootOverride: opts.rootOverride,
+            taskId: opts.taskId,
+            quiet: opts.quiet,
+        });
         if (!opts.quiet) {
             const { hash, subject } = await ctx.git.headHashSubject();
             process.stdout.write(`${successMessage("committed", `${hash?.slice(0, 12) ?? ""} ${subject ?? ""}`.trim(), autoStaged.length > 0 ? `staged=${autoStaged.join(", ")}` : undefined)}\n`);

package/dist/commands/guard/impl/env.d.ts

@@ -8,5 +8,6 @@ export declare function buildGitCommitEnv(opts: {
     allowConfig: boolean;
     allowHooks: boolean;
     allowCI: boolean;
+    allowStaleDist?: boolean;
 }): NodeJS.ProcessEnv;
 //# sourceMappingURL=env.d.ts.map

package/dist/commands/guard/impl/env.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../../../src/commands/guard/impl/env.ts"],"names":[],"mappings":"AAAA,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;CAClB,GAAG,MAAM,CAAC,UAAU,CAapB"}
+{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../../../src/commands/guard/impl/env.ts"],"names":[],"mappings":"AAAA,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,GAAG,MAAM,CAAC,UAAU,CAcpB"}

package/dist/commands/guard/impl/env.js

@@ -10,5 +10,6 @@ export function buildGitCommitEnv(opts) {
         AGENTPLANE_ALLOW_CONFIG: opts.allowConfig ? "1" : "0",
         AGENTPLANE_ALLOW_HOOKS: opts.allowHooks ? "1" : "0",
         AGENTPLANE_ALLOW_CI: opts.allowCI ? "1" : "0",
+        ...(opts.allowStaleDist ? { AGENTPLANE_DEV_ALLOW_STALE_DIST: "1" } : null),
     };
 }

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

@@ -1,4 +1,4 @@
-export declare const HOOK_NAMES: readonly ["commit-msg", "pre-commit", "pre-push"];
+export declare const HOOK_NAMES: readonly ["commit-msg", "pre-commit", "pre-push", "post-merge"];
 export declare function cmdHooksInstall(opts: {
     cwd: string;
     rootOverride?: string;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/hooks/index.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,UAAU,mDAAoD,CAAC;AAkH5E,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAC1C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAmClB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CA4BlB;AAED,wBAAsB,WAAW,CAAC,IAAI,EAAE;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,CAAC,OAAO,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC;IAClC,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAsGlB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/hooks/index.ts"],"names":[],"mappings":"AAsBA,eAAO,MAAM,UAAU,iEAAkE,CAAC;AA8K1F,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAC1C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAmClB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CA4BlB;AAED,wBAAsB,WAAW,CAAC,IAAI,EAAE;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,CAAC,OAAO,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC;IAClC,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAoLlB"}

package/dist/commands/hooks/index.js

@@ -1,18 +1,32 @@
+import { spawnSync } from "node:child_process";
 import { chmod, mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import path from "node:path";
+import { fileURLToPath } from "node:url";
 import { loadConfig, resolveBaseBranch, resolveProject } from "@agentplaneorg/core";
 import { evaluatePolicy } from "../../policy/evaluate.js";
 import { mapBackendError, mapCoreError } from "../../cli/error-map.js";
 import { fileExists } from "../../cli/fs-utils.js";
 import { infoMessage, successMessage } from "../../cli/output.js";
 import { CliError } from "../../shared/errors.js";
+import { cmdCleanupMerged } from "../branch/index.js";
 import { GitContext } from "../shared/git-context.js";
 import { throwIfPolicyDenied } from "../shared/policy-deny.js";
 import { gitCurrentBranch, gitRevParse } from "../shared/git-ops.js";
+import { parseTaskIdFromBranch, parseTaskIdFromCloseBranch } from "../shared/git-worktree.js";
 import { isPathWithin } from "../shared/path.js";
+import { loadCommandContext } from "../shared/task-backend.js";
 const HOOK_MARKER = "agentplane-hook";
 const SHIM_MARKER = "agentplane-hook-shim";
-export const HOOK_NAMES = ["commit-msg", "pre-commit", "pre-push"];
+export const HOOK_NAMES = ["commit-msg", "pre-commit", "pre-push", "post-merge"];
+async function inferTaskIdFromBranchContext(opts) {
+    try {
+        const branch = await gitCurrentBranch(opts.gitRoot);
+        return (parseTaskIdFromBranch(opts.taskPrefix, branch) ?? parseTaskIdFromCloseBranch(branch) ?? "");
+    }
+    catch {
+        return "";
+    }
+}
 async function resolveGitHooksDir(cwd) {
     const repoRoot = await gitRevParse(cwd, ["--show-toplevel"]);
     const commonDirRaw = await gitRevParse(cwd, ["--git-common-dir"]);
@@ -71,14 +85,14 @@ function shimScriptText() {
         "set -e",
         'SCRIPT_DIR="$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)"',
         'REPO_ROOT="$(dirname "$(dirname "$SCRIPT_DIR")")"',
-        'ENV_BIN="${AGENTPLANE_HOOK_RUNNER:-}"',
-        'if [ -n "$ENV_BIN" ] && command -v node >/dev/null 2>&1 && [ -f "$ENV_BIN" ]; then',
-        '  exec node "$ENV_BIN" "$@"',
-        "fi",
         'LOCAL_BIN="$REPO_ROOT/packages/agentplane/bin/agentplane.js"',
         'if command -v node >/dev/null 2>&1 && [ -f "$LOCAL_BIN" ]; then',
         '  exec node "$LOCAL_BIN" "$@"',
         "fi",
+        'ENV_BIN="${AGENTPLANE_HOOK_RUNNER:-}"',
+        'if [ -n "$ENV_BIN" ] && command -v node >/dev/null 2>&1 && [ -f "$ENV_BIN" ]; then',
+        '  exec node "$ENV_BIN" "$@"',
+        "fi",
         "if command -v agentplane >/dev/null 2>&1; then",
         '  exec agentplane "$@"',
         "fi",
@@ -116,6 +130,47 @@ function readCommitSubject(message) {
     }
     return "";
 }
+function resolveBundledPrePushHookScriptPath() {
+    return fileURLToPath(new URL("../../../../../scripts/run-pre-push-hook.mjs", import.meta.url));
+}
+async function readHookStdinUtf8(timeoutMs = 25) {
+    if (process.stdin.isTTY)
+        return "";
+    const chunks = [];
+    const consume = () => {
+        let chunk = process.stdin.read();
+        while (chunk !== null) {
+            chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(String(chunk)));
+            chunk = process.stdin.read();
+        }
+    };
+    consume();
+    if (chunks.length > 0 || process.stdin.readableEnded) {
+        return Buffer.concat(chunks).toString("utf8");
+    }
+    await new Promise((resolve) => {
+        const finish = () => {
+            clearTimeout(timer);
+            process.stdin.off("readable", onReadable);
+            process.stdin.off("end", onEnd);
+            resolve();
+        };
+        const onReadable = () => {
+            consume();
+            finish();
+        };
+        const onEnd = () => {
+            consume();
+            finish();
+        };
+        const timer = setTimeout(finish, timeoutMs);
+        process.stdin.on("readable", onReadable);
+        process.stdin.on("end", onEnd);
+        process.stdin.resume();
+    });
+    consume();
+    return Buffer.concat(chunks).toString("utf8");
+}
 export async function cmdHooksInstall(opts) {
     try {
         const resolved = await resolveProject({
@@ -201,7 +256,11 @@ export async function cmdHooksRun(opts) {
                 rootOverride: opts.rootOverride ?? null,
             });
             const loaded = await loadConfig(resolved.agentplaneDir);
-            const taskId = (process.env.AGENTPLANE_TASK_ID ?? "").trim();
+            const taskId = (process.env.AGENTPLANE_TASK_ID ?? "").trim() ||
+                (await inferTaskIdFromBranchContext({
+                    gitRoot: resolved.gitRoot,
+                    taskPrefix: loaded.config.branch.task_prefix,
+                }));
             const statusTo = (process.env.AGENTPLANE_STATUS_TO ?? "").trim().toUpperCase();
             const emoji = subject.split(/\s+/).find(Boolean) ?? "";
             if (taskId && statusTo === "DONE" && emoji !== "✅") {
@@ -269,9 +328,83 @@ export async function cmdHooksRun(opts) {
             throwIfPolicyDenied(res);
             return 0;
         }
+        if (opts.hook === "pre-push") {
+            const resolved = await resolveProject({
+                cwd: opts.cwd,
+                rootOverride: opts.rootOverride ?? null,
+            });
+            const scriptPath = resolveBundledPrePushHookScriptPath();
+            if (!(await fileExists(scriptPath))) {
+                throw new CliError({
+                    exitCode: 2,
+                    code: "E_USAGE",
+                    message: `Missing pre-push hook script: ${scriptPath}`,
+                });
+            }
+            const result = spawnSync("node", [scriptPath], {
+                cwd: resolved.gitRoot,
+                env: process.env,
+                encoding: "utf8",
+                input: await readHookStdinUtf8(),
+                stdio: ["pipe", "inherit", "inherit"],
+            });
+            if (result.error)
+                throw result.error;
+            return result.status ?? (result.signal ? 1 : 0);
+        }
+        if (opts.hook === "post-merge") {
+            try {
+                const ctx = await loadCommandContext({
+                    cwd: opts.cwd,
+                    rootOverride: opts.rootOverride ?? null,
+                });
+                if (ctx.config.workflow_mode !== "branch_pr")
+                    return 0;
+                const baseBranch = await resolveBaseBranch({
+                    cwd: opts.cwd,
+                    rootOverride: opts.rootOverride ?? null,
+                    cliBaseOpt: null,
+                    mode: ctx.config.workflow_mode,
+                });
+                if (!baseBranch)
+                    return 0;
+                const currentBranch = await gitCurrentBranch(ctx.resolvedProject.gitRoot);
+                if (currentBranch !== baseBranch)
+                    return 0;
+                return await cmdCleanupMerged({
+                    ctx,
+                    cwd: opts.cwd,
+                    rootOverride: opts.rootOverride,
+                    base: baseBranch,
+                    yes: true,
+                    archive: false,
+                    deleteRemoteBranches: false,
+                    fetch: false,
+                    quiet: true,
+                    skipUnsafeWorktrees: true,
+                });
+            }
+            catch (error) {
+                const message = error instanceof Error && error.message.trim().length > 0
+                    ? error.message.trim()
+                    : String(error);
+                process.stderr.write(`warning: post-merge cleanup skipped: ${message}\n`);
+                return 0;
+            }
+        }
         return 0;
     }
     catch (err) {
+        const status = err?.status;
+        const stdout = err?.stdout;
+        const stderr = err?.stderr;
+        if (typeof stdout === "string" && stdout.length > 0)
+            process.stdout.write(stdout);
+        if (typeof stderr === "string" && stderr.length > 0)
+            process.stderr.write(stderr);
+        if (typeof status === "number" && Number.isInteger(status) && status >= 0) {
+            return status;
+        }
         if (err instanceof CliError)
             throw err;
         throw mapBackendError(err, {

package/dist/commands/incidents/collect.command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collect.command.d.ts","sourceRoot":"","sources":["../../../src/commands/incidents/collect.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAEtE,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAGpF,KAAK,sBAAsB,GAAG;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAIF,eAAO,MAAM,oBAAoB,EAAE,WAAW,CAAC,sBAAsB,CAoCpE,CAAC;AAEF,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,IAC/E,KAAK,UAAU,EAAE,GAAG,sBAAsB,KAAG,OAAO,CAAC,MAAM,CAAC,CA+B3E"}
+{"version":3,"file":"collect.command.d.ts","sourceRoot":"","sources":["../../../src/commands/incidents/collect.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAEtE,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAGpF,KAAK,sBAAsB,GAAG;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAIF,eAAO,MAAM,oBAAoB,EAAE,WAAW,CAAC,sBAAsB,CAmCpE,CAAC;AAEF,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,IAC/E,KAAK,UAAU,EAAE,GAAG,sBAAsB,KAAG,OAAO,CAAC,MAAM,CAAC,CAsC3E"}

package/dist/commands/incidents/collect.command.js

@@ -1,11 +1,11 @@
 import { createCliEmitter } from "../../cli/output.js";
 import { loadCommandContext } from "../shared/task-backend.js";
-import { collectTaskIncidents } from "./shared.js";
+import { collectTaskIncidents, renderIncidentCollectionPlanOutcome } from "./shared.js";
 const output = createCliEmitter();
 export const incidentsCollectSpec = {
     id: ["incidents", "collect"],
     group: "Policy",
-    summary: "Promote structured external incident-candidates from a task into the incident registry.",
+    summary: "Promote reusable resolved external findings from a task into the incident registry.",
     args: [{ name: "task-id", required: true, valueHint: "<task-id>" }],
     options: [
         {
@@ -28,7 +28,7 @@ export const incidentsCollectSpec = {
         },
         {
             cmd: "agentplane incidents collect 202604031416-HEJWTM --check --json",
-            why: "Validate that incident-candidate blocks are complete before finish.",
+            why: "Validate that reusable resolved external findings are complete before finish.",
         },
     ],
     parse: (raw) => ({
@@ -51,17 +51,22 @@ export function makeRunIncidentsCollectHandler(getCtx) {
                 task_id: p.taskId,
                 checked_only: p.check,
                 candidates: result.plan.candidates.length,
+                skipped: result.plan.skipped,
                 promotable: result.plan.promotable.map((item) => item.entry),
                 duplicates: result.plan.duplicates.map((item) => item.entry.id),
                 wrote: result.wrote,
                 registry_path: result.registryPath,
+                registry_paths: result.registryPaths,
             });
             return 0;
         }
-        output.success(p.check ? "checked" : "collected", p.taskId, `candidates=${result.plan.candidates.length} promoted=${result.plan.promotable.length} duplicates=${result.plan.duplicates.length}`);
-        if (result.plan.promotable.length > 0 && !p.check) {
-            output.info(`Incident registry updated: ${result.registryPath}`);
-        }
+        output.success(p.check ? "checked" : "collected", p.taskId, `candidates=${result.plan.candidates.length} skipped=${result.plan.skipped.length} promoted=${result.plan.promotable.length} duplicates=${result.plan.duplicates.length}`);
+        output.info(renderIncidentCollectionPlanOutcome(result.plan, {
+            wrote: result.wrote,
+            context: "collect",
+            promotedIds: result.plan.promotable.map((item) => item.entry.id),
+            registryPaths: result.registryPaths,
+        }));
         return 0;
     };
 }

package/dist/commands/incidents/incidents.command.js

@@ -6,7 +6,7 @@ export const incidentsSpec = {
     synopsis: ["agentplane incidents <collect|advise> [args] [options]"],
     args: [{ name: "cmd", required: false, variadic: true, valueHint: "<command>" }],
     notes: [
-        "Use `incidents collect` to promote structured incident-candidate findings into `.agentplane/policy/incidents.md`.",
+        "Use `incidents collect` to promote resolved reusable external findings into `.agentplane/policy/incidents.md`.",
         "Use `incidents advise` to query registry advice by task id or lightweight scope/tags.",
     ],
     parse: (raw) => parseGroupCommand(raw),

package/dist/commands/incidents/shared.d.ts

@@ -2,6 +2,7 @@ import type { TaskData } from "../../backends/task-backend.js";
 import { type IncidentAdviceMatch, type IncidentAdviceQuery, type IncidentCollectionPlan, type IncidentRegistry } from "../../runtime/incidents/index.js";
 import type { CommandContext } from "../shared/task-backend.js";
 export declare const INCIDENTS_POLICY_PATH = ".agentplane/policy/incidents.md";
+export declare const INCIDENTS_POLICY_ASSET_PATH = "packages/agentplane/assets/policy/incidents.md";
 export type LoadedTaskIncidents = {
     task: TaskData;
     findings: string;
@@ -9,6 +10,7 @@ export type LoadedTaskIncidents = {
     query: IncidentAdviceQuery;
 };
 export declare function incidentRegistryPath(ctx: CommandContext): string;
+export declare function incidentRegistryAssetPath(ctx: CommandContext): string;
 export declare function loadIncidentRegistry(ctx: CommandContext): Promise<{
     registryPath: string;
     registryText: string;
@@ -25,11 +27,43 @@ export declare function collectTaskIncidents(opts: {
 }): Promise<{
     loaded: LoadedTaskIncidents;
     registryPath: string;
+    registryPaths: string[];
     registryText: string;
     registry: IncidentRegistry;
     plan: IncidentCollectionPlan;
     wrote: boolean;
 }>;
+export declare function inspectTaskIncidents(opts: {
+    ctx: CommandContext;
+    taskId: string;
+    task?: TaskData | null;
+    now?: Date;
+}): Promise<{
+    loaded: LoadedTaskIncidents;
+    registryPath: string;
+    registryPaths: string[];
+    registryText: string;
+    registry: IncidentRegistry;
+    plan: IncidentCollectionPlan;
+}>;
+export declare function renderIncidentCollectionOutcome(promotedCount: number): string;
+export declare function renderIncidentCollectionPlanOutcome(plan: {
+    candidates?: readonly unknown[];
+    skipped?: readonly unknown[];
+    promotable?: readonly unknown[];
+    duplicates?: readonly unknown[];
+    issues?: readonly {
+        missingFields?: readonly string[];
+    }[];
+    findingsTextPresent?: boolean;
+    structuredFindingCount?: number;
+}, opts?: {
+    wrote?: boolean;
+    context?: "collect" | "verify" | "finish" | "generic";
+    promotedIds?: readonly string[];
+    registryPaths?: readonly string[];
+    taskId?: string | null;
+}): string;
 export declare function adviseTaskIncidents(opts: {
     ctx: CommandContext;
     taskId: string;

package/dist/commands/incidents/shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../src/commands/incidents/shared.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAG/D,OAAO,EAOL,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EACxB,KAAK,sBAAsB,EAC3B,KAAK,gBAAgB,EACtB,MAAM,kCAAkC,CAAC;AAM1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEhE,eAAO,MAAM,qBAAqB,oCAAoC,CAAC;AAEvE,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,QAAQ,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,KAAK,EAAE,mBAAmB,CAAC;CAC5B,CAAC;AAYF,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,cAAc,GAAG,MAAM,CAEhE;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC;IACvE,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,gBAAgB,CAAC;CAC5B,CAAC,CAQD;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,QAAQ,GAAG,IAAI,GAC7B,OAAO,CAAC,mBAAmB,CAAC,CAyB9B;AAED,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,sBAAsB,GAC3B,MAAM,CAUR;AAED,wBAAsB,oBAAoB,CAAC,IAAI,EAAE;IAC/C,GAAG,EAAE,cAAc,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;IACvB,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,CAAC,EAAE,IAAI,CAAC;CACZ,GAAG,OAAO,CAAC;IACV,MAAM,EAAE,mBAAmB,CAAC;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,IAAI,EAAE,sBAAsB,CAAC;IAC7B,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC,CA+BD;AAED,wBAAsB,mBAAmB,CAAC,IAAI,EAAE;IAC9C,GAAG,EAAE,cAAc,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC;IACV,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,EAAE,mBAAmB,EAAE,CAAC;CAChC,CAAC,CAWD"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../src/commands/incidents/shared.ts"],"names":[],"mappings":"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"}