agentplane 0.3.9 → 0.3.11

package/dist/commands/finish.spec.js

@@ -1,4 +1,5 @@
 import { usageError } from "../cli/spec/errors.js";
+import { verifyFindingOptions, validateVerifyFindingSource } from "./task/verify-command-shared.js";
 import { toStringList } from "../cli/spec/parse-utils.js";
 import { findRepoWideAllowPrefixes, repoWideAllowPrefixMessage, } from "../shared/allow-prefix-policy.js";
 export const finishSpec = {
@@ -157,6 +158,13 @@ export const finishSpec = {
             default: false,
             description: "With --close-commit: unstage any currently staged paths before staging the task README.",
         },
+        {
+            kind: "string",
+            name: "base",
+            valueHint: "<branch>",
+            description: "Optional explicit base branch override for branch_pr finish validation and close-commit reconciliation.",
+        },
+        ...verifyFindingOptions,
         { kind: "boolean", name: "quiet", default: false, description: "Suppress output." },
     ],
     examples: [
@@ -168,6 +176,10 @@ export const finishSpec = {
             cmd: 'agentplane finish 202602030608-F1Q8AB --author INTEGRATOR --body "Verified: all checks passed" --commit-from-comment --commit-allow packages/agentplane/src',
             why: "Finish and create a commit from the comment (single-task only).",
         },
+        {
+            cmd: 'agentplane finish 202602030608-F1Q8AB --author INTEGRATOR --body "Verified: all checks passed" --commit abcdef123456 --observation "Recurring manual recovery remained easy to miss." --impact "incidents.md stayed stale until a second command." --resolution "Capture the closeout finding during finish itself."',
+            why: "Finish a task while appending a structured finding that can promote into incidents.md.",
+        },
     ],
     validateRaw: (raw) => {
         const ids = raw.args["task-id"];
@@ -270,9 +282,29 @@ export const finishSpec = {
                 message: "--close-unstage-others requires --close-commit",
             });
         }
+        if (typeof raw.opts.base === "string" && raw.opts.base.trim().length === 0) {
+            throw usageError({
+                spec: finishSpec,
+                command: "finish",
+                message: "Invalid value for --base: empty.",
+            });
+        }
         const hasMeta = typeof raw.opts.result === "string" ||
             typeof raw.opts.risk === "string" ||
             raw.opts.breaking === true;
+        const hasFindingInput = [
+            raw.opts.observation,
+            raw.opts.impact,
+            raw.opts.resolution,
+            raw.opts["incident-scope"],
+            raw.opts["incident-advice"],
+            raw.opts["incident-rule"],
+        ].some((value) => typeof value === "string" && value.trim().length > 0)
+            ? true
+            : (Array.isArray(raw.opts["incident-tag"]) && raw.opts["incident-tag"].length > 0) ||
+                (Array.isArray(raw.opts["incident-match"]) && raw.opts["incident-match"].length > 0) ||
+                raw.opts["local-only"] === true ||
+                raw.opts["repo-fixable"] === true;
         if (hasMeta && taskIds.length !== 1) {
             throw usageError({
                 spec: finishSpec,
@@ -280,6 +312,14 @@ export const finishSpec = {
                 message: "--result/--risk/--breaking requires exactly one task id",
             });
         }
+        if (hasFindingInput && taskIds.length !== 1) {
+            throw usageError({
+                spec: finishSpec,
+                command: "finish",
+                message: "--observation/--impact/--resolution and incident finding options require exactly one task id",
+            });
+        }
+        validateVerifyFindingSource(raw, finishSpec, { command: "finish" });
     },
     parse: (raw) => ({
         taskIds: Array.isArray(raw.args["task-id"])
@@ -308,6 +348,17 @@ export const finishSpec = {
         closeCommit: raw.opts["close-commit"] === true,
         noCloseCommit: raw.opts["no-close-commit"] === true,
         closeUnstageOthers: raw.opts["close-unstage-others"] === true,
+        baseBranchOverride: typeof raw.opts.base === "string" ? raw.opts.base : undefined,
+        observation: typeof raw.opts.observation === "string" ? raw.opts.observation : undefined,
+        impact: typeof raw.opts.impact === "string" ? raw.opts.impact : undefined,
+        resolution: typeof raw.opts.resolution === "string" ? raw.opts.resolution : undefined,
+        localOnly: raw.opts["local-only"] === true,
+        repoFixable: raw.opts["repo-fixable"] === true,
+        incidentScope: typeof raw.opts["incident-scope"] === "string" ? raw.opts["incident-scope"] : undefined,
+        incidentTags: toStringList(raw.opts["incident-tag"]),
+        incidentMatch: toStringList(raw.opts["incident-match"]),
+        incidentAdvice: typeof raw.opts["incident-advice"] === "string" ? raw.opts["incident-advice"] : undefined,
+        incidentRule: typeof raw.opts["incident-rule"] === "string" ? raw.opts["incident-rule"] : undefined,
         quiet: raw.opts.quiet === true,
     }),
 };

package/dist/commands/guard/impl/close-message.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"close-message.d.ts","sourceRoot":"","sources":["../../../../src/commands/guard/impl/close-message.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAsHlE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,wBAAsB,uBAAuB,CAAC,IAAI,EAAE;IAClD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,QAAQ,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAsD9B;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,MAAM,CAET"}
+{"version":3,"file":"close-message.d.ts","sourceRoot":"","sources":["../../../../src/commands/guard/impl/close-message.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAyIlE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,wBAAsB,uBAAuB,CAAC,IAAI,EAAE;IAClD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,QAAQ,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAsD9B;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,MAAM,CAET"}

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.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":"AAUA,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,CA4OlB"}

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

@@ -6,6 +6,7 @@ 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 { loadCommandContext } from "../../shared/task-backend.js";
 import { loadTaskFromContext } from "../../shared/task-backend.js";
 import { execFileAsync, gitEnv } from "../../shared/git.js";
@@ -325,11 +326,24 @@ export async function cmdCommit(opts) {
                 }
                 return 0;
             }
+            if (opts.closeStageTaskArtifacts === true) {
+                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 refreshed 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 +364,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 +375,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 +452,13 @@ 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,
+        });
         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.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":"AAoBA,eAAO,MAAM,UAAU,mDAAoD,CAAC;AA8K5E,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,CAiJlB"}

package/dist/commands/hooks/index.js

@@ -1,5 +1,7 @@
+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";
@@ -9,10 +11,20 @@ import { CliError } from "../../shared/errors.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";
 const HOOK_MARKER = "agentplane-hook";
 const SHIM_MARKER = "agentplane-hook-shim";
 export const HOOK_NAMES = ["commit-msg", "pre-commit", "pre-push"];
+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"]);
@@ -116,6 +128,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 +254,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 +326,49 @@ 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",
+            });
+            if (typeof result.stdout === "string" && result.stdout.length > 0) {
+                process.stdout.write(result.stdout);
+            }
+            if (typeof result.stderr === "string" && result.stderr.length > 0) {
+                process.stderr.write(result.stderr);
+            }
+            if (result.error)
+                throw result.error;
+            return result.status ?? (result.signal ? 1 : 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/advise.command.d.ts

@@ -0,0 +1,15 @@
+import type { CommandCtx, CommandSpec } from "../../cli/spec/spec.js";
+import { type CommandContext } from "../shared/task-backend.js";
+type IncidentsAdviseParsed = {
+    taskId: string | null;
+    scope: string | null;
+    title: string | null;
+    description: string | null;
+    tags: string[];
+    limit: number;
+    json: boolean;
+};
+export declare const incidentsAdviseSpec: CommandSpec<IncidentsAdviseParsed>;
+export declare function makeRunIncidentsAdviseHandler(getCtx: (cmd: string) => Promise<CommandContext>): (ctx: CommandCtx, p: IncidentsAdviseParsed) => Promise<number>;
+export {};
+//# sourceMappingURL=advise.command.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"advise.command.d.ts","sourceRoot":"","sources":["../../../src/commands/incidents/advise.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAQtE,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAGpF,KAAK,qBAAqB,GAAG;IAC3B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAIF,eAAO,MAAM,mBAAmB,EAAE,WAAW,CAAC,qBAAqB,CA6ElE,CAAC;AAEF,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,IAC9E,KAAK,UAAU,EAAE,GAAG,qBAAqB,KAAG,OAAO,CAAC,MAAM,CAAC,CA2D1E"}

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

@@ -0,0 +1,139 @@
+import { createCliEmitter } from "../../cli/output.js";
+import { usageError } from "../../cli/spec/errors.js";
+import { buildIncidentAdviceQueryFromTask, renderIncidentAdvice, resolveIncidentAdviceMatches, } from "../../runtime/incidents/index.js";
+import { loadCommandContext } from "../shared/task-backend.js";
+import { adviseTaskIncidents, loadIncidentRegistry } from "./shared.js";
+const output = createCliEmitter();
+export const incidentsAdviseSpec = {
+    id: ["incidents", "advise"],
+    group: "Policy",
+    summary: "Resolve relevant incident advice for a task or an ad hoc scope/tag query.",
+    args: [{ name: "task-id", required: false, valueHint: "<task-id>" }],
+    options: [
+        {
+            kind: "string",
+            name: "scope",
+            valueHint: "<text>",
+            description: "Ad hoc scope text when querying without a task id.",
+        },
+        {
+            kind: "string",
+            name: "title",
+            valueHint: "<text>",
+            description: "Optional title text for ad hoc advice lookup.",
+        },
+        {
+            kind: "string",
+            name: "description",
+            valueHint: "<text>",
+            description: "Optional description text for ad hoc advice lookup.",
+        },
+        {
+            kind: "string",
+            name: "tag",
+            valueHint: "<tag>",
+            repeatable: true,
+            description: "Matching tag for ad hoc advice lookup; repeat as needed.",
+        },
+        {
+            kind: "string",
+            name: "limit",
+            valueHint: "<n>",
+            default: "5",
+            coerce: (raw) => Number.parseInt(raw, 10),
+            description: "Maximum number of advice entries to show.",
+        },
+        {
+            kind: "boolean",
+            name: "json",
+            default: false,
+            description: "Emit machine-readable advice matches.",
+        },
+    ],
+    validateRaw: (raw) => {
+        const taskId = typeof raw.args["task-id"] === "string" ? raw.args["task-id"].trim() : "";
+        const scope = typeof raw.opts.scope === "string" ? raw.opts.scope.trim() : "";
+        const title = typeof raw.opts.title === "string" ? raw.opts.title.trim() : "";
+        const description = typeof raw.opts.description === "string" ? raw.opts.description.trim() : "";
+        const tags = Array.isArray(raw.opts.tag) ? raw.opts.tag : [];
+        if (!taskId && !scope && !title && !description && tags.length === 0) {
+            throw usageError({
+                spec: incidentsAdviseSpec,
+                message: "Provide either <task-id> or at least one of --scope/--title/--description/--tag.",
+            });
+        }
+    },
+    parse: (raw) => ({
+        taskId: typeof raw.args["task-id"] === "string" && String(raw.args["task-id"]).trim()
+            ? String(raw.args["task-id"]).trim()
+            : null,
+        scope: typeof raw.opts.scope === "string" ? String(raw.opts.scope).trim() : null,
+        title: typeof raw.opts.title === "string" ? String(raw.opts.title).trim() : null,
+        description: typeof raw.opts.description === "string" ? String(raw.opts.description).trim() : null,
+        tags: Array.isArray(raw.opts.tag)
+            ? raw.opts.tag.map((value) => String(value).trim()).filter(Boolean)
+            : [],
+        limit: typeof raw.opts.limit === "number" && Number.isInteger(raw.opts.limit) && raw.opts.limit > 0
+            ? Number(raw.opts.limit)
+            : 5,
+        json: raw.opts.json === true,
+    }),
+};
+export function makeRunIncidentsAdviseHandler(getCtx) {
+    return async (ctx, p) => {
+        const commandContext = (await getCtx("incidents advise")) ??
+            (await loadCommandContext({ cwd: ctx.cwd, rootOverride: ctx.rootOverride ?? null }));
+        if (p.taskId) {
+            const result = await adviseTaskIncidents({
+                ctx: commandContext,
+                taskId: p.taskId,
+                limit: p.limit,
+            });
+            if (p.json) {
+                output.json({
+                    task_id: p.taskId,
+                    matches: result.matches.map((match) => ({
+                        score: match.score,
+                        matched_tags: match.matchedTags,
+                        matched_terms: match.matchedTerms,
+                        scope_matched: match.scopeMatched,
+                        entry: match.entry,
+                    })),
+                });
+                return 0;
+            }
+            output.line(`Incident advice for ${p.taskId}:`);
+            output.line(renderIncidentAdvice(result.matches));
+            return 0;
+        }
+        const registry = await loadIncidentRegistry(commandContext);
+        const query = buildIncidentAdviceQueryFromTask({
+            taskId: "adhoc",
+            title: p.title ?? p.scope ?? "",
+            description: p.description ?? "",
+            scope: p.scope,
+            tags: p.tags,
+        });
+        const matches = resolveIncidentAdviceMatches({
+            query,
+            registry: registry.registry,
+            limit: p.limit,
+        });
+        if (p.json) {
+            output.json({
+                query,
+                matches: matches.map((match) => ({
+                    score: match.score,
+                    matched_tags: match.matchedTags,
+                    matched_terms: match.matchedTerms,
+                    scope_matched: match.scopeMatched,
+                    entry: match.entry,
+                })),
+            });
+            return 0;
+        }
+        output.line("Incident advice:");
+        output.line(renderIncidentAdvice(matches));
+        return 0;
+    };
+}

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

@@ -0,0 +1,11 @@
+import type { CommandCtx, CommandSpec } from "../../cli/spec/spec.js";
+import { type CommandContext } from "../shared/task-backend.js";
+type IncidentsCollectParsed = {
+    taskId: string;
+    check: boolean;
+    json: boolean;
+};
+export declare const incidentsCollectSpec: CommandSpec<IncidentsCollectParsed>;
+export declare function makeRunIncidentsCollectHandler(getCtx: (cmd: string) => Promise<CommandContext>): (ctx: CommandCtx, p: IncidentsCollectParsed) => Promise<number>;
+export {};
+//# sourceMappingURL=collect.command.d.ts.map

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

@@ -0,0 +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,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

@@ -0,0 +1,72 @@
+import { createCliEmitter } from "../../cli/output.js";
+import { loadCommandContext } from "../shared/task-backend.js";
+import { collectTaskIncidents, renderIncidentCollectionPlanOutcome } from "./shared.js";
+const output = createCliEmitter();
+export const incidentsCollectSpec = {
+    id: ["incidents", "collect"],
+    group: "Policy",
+    summary: "Promote reusable resolved external findings from a task into the incident registry.",
+    args: [{ name: "task-id", required: true, valueHint: "<task-id>" }],
+    options: [
+        {
+            kind: "boolean",
+            name: "check",
+            default: false,
+            description: "Validate incident promotion inputs without writing `.agentplane/policy/incidents.md`.",
+        },
+        {
+            kind: "boolean",
+            name: "json",
+            default: false,
+            description: "Emit machine-readable collection details.",
+        },
+    ],
+    examples: [
+        {
+            cmd: "agentplane incidents collect 202604031416-HEJWTM",
+            why: "Promote resolved external incident advice from task Findings into the shared registry.",
+        },
+        {
+            cmd: "agentplane incidents collect 202604031416-HEJWTM --check --json",
+            why: "Validate that reusable resolved external findings are complete before finish.",
+        },
+    ],
+    parse: (raw) => ({
+        taskId: String(raw.args["task-id"] ?? ""),
+        check: raw.opts.check === true,
+        json: raw.opts.json === true,
+    }),
+};
+export function makeRunIncidentsCollectHandler(getCtx) {
+    return async (ctx, p) => {
+        const commandContext = (await getCtx("incidents collect")) ??
+            (await loadCommandContext({ cwd: ctx.cwd, rootOverride: ctx.rootOverride ?? null }));
+        const result = await collectTaskIncidents({
+            ctx: commandContext,
+            taskId: p.taskId,
+            write: !p.check,
+        });
+        if (p.json) {
+            output.json({
+                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} 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.d.ts

@@ -0,0 +1,5 @@
+import type { CommandHandler, CommandSpec } from "../../cli/spec/spec.js";
+import { type GroupCommandParsed } from "../../cli/group-command.js";
+export declare const incidentsSpec: CommandSpec<GroupCommandParsed>;
+export declare const runIncidents: CommandHandler<GroupCommandParsed>;
+//# sourceMappingURL=incidents.command.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"incidents.command.d.ts","sourceRoot":"","sources":["../../../src/commands/incidents/incidents.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,aAAa,EAAE,WAAW,CAAC,kBAAkB,CAWzD,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,cAAc,CAAC,kBAAkB,CAO3D,CAAC"}