agentplane 0.3.10 → 0.3.11

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

package/dist/commands/incidents/shared.js

@@ -5,6 +5,8 @@ import { writeTextIfChanged } from "../../shared/write-if-changed.js";
 import { appendIncidentRegistryEntries, buildIncidentAdviceQueryFromTask, createIncidentRegistrySkeleton, parseIncidentRegistry, planIncidentCollection, resolveIncidentAdviceMatches, } from "../../runtime/incidents/index.js";
 import { extractDocSection, extractTaskObservationSection, normalizeTaskDocVersion, } from "../task/shared.js";
 export const INCIDENTS_POLICY_PATH = ".agentplane/policy/incidents.md";
+export const INCIDENTS_POLICY_ASSET_PATH = "packages/agentplane/assets/policy/incidents.md";
+const INCIDENTS_POLICY_LINE_BUDGET = 100;
 async function readTextIfExists(filePath) {
     try {
         return await readFile(filePath, "utf8");
@@ -19,6 +21,41 @@ async function readTextIfExists(filePath) {
 export function incidentRegistryPath(ctx) {
     return path.join(ctx.resolvedProject.gitRoot, INCIDENTS_POLICY_PATH);
 }
+export function incidentRegistryAssetPath(ctx) {
+    return path.join(ctx.resolvedProject.gitRoot, INCIDENTS_POLICY_ASSET_PATH);
+}
+function normalizeIncidentRegistryDocument(text) {
+    const normalized = text.replaceAll("\r\n", "\n").trimEnd();
+    return normalized.length > 0 ? `${normalized}\n` : createIncidentRegistrySkeleton();
+}
+async function writeIncidentRegistryMirrors(ctx, content) {
+    const registryPath = incidentRegistryPath(ctx);
+    const assetPath = incidentRegistryAssetPath(ctx);
+    const assetExists = (await readTextIfExists(assetPath)) !== null;
+    const normalizedContent = normalizeIncidentRegistryDocument(content);
+    let wroteRegistry = await writeTextIfChanged(registryPath, normalizedContent);
+    let wroteAsset = false;
+    if (assetExists) {
+        const canonicalText = (await readTextIfExists(registryPath)) ?? normalizedContent;
+        wroteAsset = await writeTextIfChanged(assetPath, canonicalText);
+        const registryText = await readTextIfExists(registryPath);
+        if (registryText !== canonicalText) {
+            wroteRegistry = (await writeTextIfChanged(registryPath, canonicalText)) || wroteRegistry;
+        }
+    }
+    return wroteRegistry || wroteAsset;
+}
+async function resolveIncidentRegistryMirrorPaths(ctx) {
+    const paths = [INCIDENTS_POLICY_PATH];
+    const assetPath = incidentRegistryAssetPath(ctx);
+    if ((await readTextIfExists(assetPath)) !== null) {
+        paths.push(INCIDENTS_POLICY_ASSET_PATH);
+    }
+    return paths;
+}
+function countTextLines(text) {
+    return text.replaceAll("\r\n", "\n").split("\n").length;
+}
 export async function loadIncidentRegistry(ctx) {
     const registryPath = incidentRegistryPath(ctx);
     const registryText = (await readTextIfExists(registryPath)) ?? createIncidentRegistrySkeleton();
@@ -60,19 +97,48 @@ export function formatIncidentCollectionIssues(taskId, plan) {
         return `line ${issue.candidate.line}: ${scope} -> missing ${issue.missingFields.join(", ")}`;
     });
     return [
-        `${taskId}: incident-candidate entries require explicit external incident metadata before promotion.`,
+        `${taskId}: reusable external findings need explicit external marking and enough recovery detail before promotion.`,
         "Required fields:",
         ...issueLines.map((line) => `- ${line}`),
     ].join("\n");
 }
 export async function collectTaskIncidents(opts) {
+    const inspected = await inspectTaskIncidents(opts);
+    const { loaded, registryPath, registryPaths, registryText, registry, plan } = inspected;
+    if (plan.issues.length > 0) {
+        throw new CliError({
+            exitCode: 3,
+            code: "E_VALIDATION",
+            message: formatIncidentCollectionIssues(opts.taskId, plan),
+        });
+    }
+    const nextText = appendIncidentRegistryEntries(registryText, plan.promotable.map((item) => item.entry));
+    if (plan.promotable.length > 0) {
+        const nextLineCount = countTextLines(nextText);
+        if (nextLineCount > INCIDENTS_POLICY_LINE_BUDGET) {
+            throw new CliError({
+                exitCode: 3,
+                code: "E_VALIDATION",
+                message: `Incident registry write would exceed policy budget: ${nextLineCount} lines ` +
+                    `(limit ${INCIDENTS_POLICY_LINE_BUDGET}). Compact or promote fewer entries before writing.`,
+            });
+        }
+    }
+    const wrote = opts.write && plan.promotable.length > 0
+        ? await writeIncidentRegistryMirrors(opts.ctx, nextText)
+        : false;
+    return { loaded, registryPath, registryPaths, registryText, registry, plan, wrote };
+}
+export async function inspectTaskIncidents(opts) {
     const loaded = await loadTaskIncidents(opts.ctx, opts.taskId, opts.task ?? null);
     const { registryPath, registryText, registry } = await loadIncidentRegistry(opts.ctx);
+    const registryPaths = await resolveIncidentRegistryMirrorPaths(opts.ctx);
     const plan = planIncidentCollection({
         task: {
             id: loaded.task.id,
             title: loaded.task.title,
             description: loaded.task.description,
+            scope: loaded.scope,
             tags: loaded.task.tags ?? [],
             commitHash: loaded.task.commit?.hash ?? null,
         },
@@ -80,18 +146,106 @@ export async function collectTaskIncidents(opts) {
         registry,
         now: opts.now,
     });
-    if (plan.issues.length > 0) {
-        throw new CliError({
-            exitCode: 3,
-            code: "E_VALIDATION",
-            message: formatIncidentCollectionIssues(opts.taskId, plan),
-        });
+    return { loaded, registryPath, registryPaths, registryText, registry, plan };
+}
+export function renderIncidentCollectionOutcome(promotedCount) {
+    return promotedCount > 0
+        ? `incident registry updated (${promotedCount} promoted)`
+        : "incident registry unchanged (no promotable external findings)";
+}
+function summarizeDetailList(values, maxItems = 3) {
+    const filtered = values.map((value) => value.trim()).filter((value) => value.length > 0);
+    if (filtered.length === 0)
+        return null;
+    if (filtered.length <= maxItems)
+        return filtered.join(", ");
+    return `${filtered.slice(0, maxItems).join(", ")}, +${filtered.length - maxItems} more`;
+}
+export function renderIncidentCollectionPlanOutcome(plan, opts) {
+    const candidates = Array.isArray(plan.candidates) ? plan.candidates.length : 0;
+    const skipped = Array.isArray(plan.skipped) ? plan.skipped.length : 0;
+    const promoted = Array.isArray(plan.promotable) ? plan.promotable.length : 0;
+    const duplicates = Array.isArray(plan.duplicates) ? plan.duplicates.length : 0;
+    const issues = Array.isArray(plan.issues) ? plan.issues.length : 0;
+    const findingsTextPresent = plan.findingsTextPresent === true;
+    const structuredFindingCount = typeof plan.structuredFindingCount === "number" ? plan.structuredFindingCount : 0;
+    const wrote = opts?.wrote === true;
+    const context = opts?.context ?? "generic";
+    const taskId = typeof opts?.taskId === "string" && opts.taskId.trim().length > 0 ? opts.taskId.trim() : null;
+    const findingsNextStep = taskId
+        ? ` next: agentplane task findings add ${taskId} --observation "<observation>" --impact "<impact>" --resolution "<resolution>"`
+        : "";
+    if (promoted > 0 && wrote) {
+        const suffix = [];
+        if (duplicates > 0)
+            suffix.push(`${duplicates} duplicate${duplicates === 1 ? "" : "s"}`);
+        if (skipped > 0)
+            suffix.push(`${skipped} skipped structured finding${skipped === 1 ? "" : "s"}`);
+        const base = suffix.length > 0
+            ? `incident registry updated (${promoted} promoted; ${suffix.join("; ")})`
+            : renderIncidentCollectionOutcome(promoted);
+        const details = [];
+        const promotedIds = Array.isArray(opts?.promotedIds)
+            ? opts.promotedIds.filter((id) => typeof id === "string" && id.trim().length > 0)
+            : [];
+        const registryPaths = Array.isArray(opts?.registryPaths)
+            ? opts.registryPaths.filter((filePath) => typeof filePath === "string" && filePath.trim().length > 0)
+            : [];
+        const idsSummary = summarizeDetailList(promotedIds);
+        const pathsSummary = summarizeDetailList(registryPaths);
+        if (idsSummary)
+            details.push(`ids=${idsSummary}`);
+        if (pathsSummary)
+            details.push(`files=${pathsSummary}`);
+        return details.length > 0 ? `${base} ${details.join(" ")}` : base;
     }
-    const nextText = appendIncidentRegistryEntries(registryText, plan.promotable.map((item) => item.entry));
-    const wrote = opts.write && plan.promotable.length > 0
-        ? await writeTextIfChanged(registryPath, nextText)
-        : false;
-    return { loaded, registryPath, registryText, registry, plan, wrote };
+    if (promoted > 0 && !wrote) {
+        if (context === "collect") {
+            return `incident registry unchanged (${promoted} promotable external finding${promoted === 1 ? "" : "s"} validated; rerun without --check to update incidents.md)`;
+        }
+        if (context === "verify") {
+            return `incident registry unchanged (${promoted} promotable external finding${promoted === 1 ? "" : "s"} stayed task-local in the current task worktree; run verify --collect-incidents, agentplane incidents collect <task-id>, or finish on the base branch to update incidents.md)`;
+        }
+        return `incident registry unchanged (${promoted} promotable external finding${promoted === 1 ? "" : "s"} pending promotion)`;
+    }
+    if (issues > 0) {
+        const issueEntries = Array.isArray(plan.issues)
+            ? plan.issues
+            : [];
+        const firstIssue = issueEntries[0];
+        const rawMissingFields = firstIssue?.missingFields;
+        const missingFields = Array.isArray(rawMissingFields)
+            ? rawMissingFields.filter((field) => typeof field === "string" && field.trim().length > 0)
+            : [];
+        const detail = missingFields.length > 0
+            ? ` missing required fields: ${missingFields.join(", ")}`
+            : " missing required promotion fields";
+        const suffix = issues > 1 ? `; +${issues - 1} more candidate${issues - 1 === 1 ? "" : "s"}` : "";
+        return `incident registry unchanged (${issues} structured finding candidate${issues === 1 ? "" : "s"} still invalid;${detail}${suffix})`;
+    }
+    if (skipped > 0) {
+        return `incident registry unchanged (${skipped} structured finding${skipped === 1 ? "" : "s"} stayed task-local in the current checkout: mark reusable external findings with Promotion: incident-candidate plus Fixability: external, or use task findings add without --local-only)`;
+    }
+    if (candidates === 0 && structuredFindingCount === 0 && findingsTextPresent) {
+        return "incident registry unchanged (plain Findings text stays task-local in the current checkout and does not update incidents.md: add a structured Observation/Impact/Resolution block for reusable external incidents, or use task findings add without --local-only)";
+    }
+    if (candidates === 0) {
+        if (context === "verify") {
+            return ("incident registry unchanged (plain verify note stayed task-local and did not update " +
+                "incidents.md: add --observation, --impact, and --resolution for a reusable incident, " +
+                `then rerun with --collect-incidents or collect later on the base branch.${findingsNextStep})`);
+        }
+        if (context === "finish") {
+            return ("incident registry unchanged (plain finish body/result stayed task-local and did not " +
+                "update incidents.md: add --observation, --impact, and --resolution for a reusable " +
+                `incident before closeout.${findingsNextStep})`);
+        }
+        return "incident registry unchanged (no structured incident findings)";
+    }
+    if (duplicates > 0 && duplicates === candidates) {
+        return `incident registry unchanged (${duplicates} duplicate incident${duplicates === 1 ? "" : "s"} already recorded)`;
+    }
+    return "incident registry unchanged (no promotable external findings)";
 }
 export async function adviseTaskIncidents(opts) {
     const loaded = await loadTaskIncidents(opts.ctx, opts.taskId, opts.task ?? null);

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

@@ -1 +1 @@
-{"version":3,"file":"check.d.ts","sourceRoot":"","sources":["../../../src/commands/pr/check.ts"],"names":[],"mappings":"AAYA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AA8DnC,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAiMlB"}
+{"version":3,"file":"check.d.ts","sourceRoot":"","sources":["../../../src/commands/pr/check.ts"],"names":[],"mappings":"AAeA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AAgLnC,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CA2NlB"}