agentplane 0.3.10 → 0.3.12

package/dist/commands/task/findings.js

@@ -0,0 +1,188 @@
+import { ensureDocSections, normalizeTaskDoc, setMarkdownSection, } from "@agentplaneorg/core";
+import { mapBackendError } from "../../cli/error-map.js";
+import { infoMessage } from "../../cli/output.js";
+import { CliError } from "../../shared/errors.js";
+import { loadCommandContext } from "../shared/task-backend.js";
+import { applyTaskMutation } from "../shared/task-mutation.js";
+import { setTaskSectionIntent, touchTaskDocMetaIntent, } from "../shared/task-store.js";
+import { resolveWritableDocSections } from "./shared.js";
+import { extractDocSection, extractTaskObservationSection, normalizeTaskDocVersion, taskObservationSectionName, } from "./shared/docs.js";
+function ensureNonEmptyFlag(name, value) {
+    const trimmed = value.trim();
+    if (!trimmed) {
+        throw new CliError({
+            exitCode: 2,
+            code: "E_USAGE",
+            message: `Invalid value for --${name}: empty.`,
+        });
+    }
+    return trimmed;
+}
+function dedupeTrimmed(values) {
+    const seen = new Set();
+    const out = [];
+    for (const raw of values) {
+        const trimmed = raw.trim();
+        if (!trimmed)
+            continue;
+        const key = trimmed.toLowerCase();
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        out.push(trimmed);
+    }
+    return out;
+}
+export function renderStructuredFindingBlock(opts) {
+    const fixability = opts.fixability ?? (opts.external ? "external" : null);
+    const lines = [
+        `- Observation: ${ensureNonEmptyFlag("observation", opts.observation)}`,
+        `  Impact: ${ensureNonEmptyFlag("impact", opts.impact)}`,
+        `  Resolution: ${ensureNonEmptyFlag("resolution", opts.resolution)}`,
+    ];
+    if (opts.promote)
+        lines.push("  Promotion: incident-candidate");
+    if (fixability === "external")
+        lines.push("  Fixability: external");
+    if (fixability === "repo-fixable")
+        lines.push("  Fixability: repo-fixable");
+    if (opts.incidentScope?.trim())
+        lines.push(`  IncidentScope: ${opts.incidentScope.trim()}`);
+    const tags = dedupeTrimmed(opts.incidentTags);
+    if (tags.length > 0)
+        lines.push(`  IncidentTags: ${tags.join(", ")}`);
+    const match = dedupeTrimmed(opts.incidentMatch);
+    if (match.length > 0)
+        lines.push(`  IncidentMatch: ${match.join(", ")}`);
+    if (opts.incidentAdvice?.trim())
+        lines.push(`  IncidentAdvice: ${opts.incidentAdvice.trim()}`);
+    if (opts.incidentRule?.trim())
+        lines.push(`  IncidentRule: ${opts.incidentRule.trim()}`);
+    return lines.join("\n");
+}
+function appendFindingBlock(existingSection, block) {
+    const current = (existingSection ?? "").trim();
+    if (!current)
+        return block;
+    return `${current}\n\n${block}`;
+}
+export function buildStructuredFindingMutationPlan(opts) {
+    const currentDocRaw = typeof opts.current.doc === "string" ? opts.current.doc : "";
+    const docVersion = normalizeTaskDocVersion(opts.current.doc_version);
+    const targetSection = taskObservationSectionName(docVersion);
+    const sectionOrder = resolveWritableDocSections({
+        allowedSections: opts.config.tasks.doc.sections,
+        requiredSections: opts.config.tasks.doc.required_sections,
+        targetSection,
+    });
+    const existingSection = extractTaskObservationSection(currentDocRaw, docVersion);
+    const block = renderStructuredFindingBlock({
+        observation: opts.observation,
+        impact: opts.impact,
+        resolution: opts.resolution,
+        promote: opts.promote,
+        external: opts.external,
+        fixability: opts.fixability ?? null,
+        incidentScope: opts.incidentScope,
+        incidentTags: opts.incidentTags,
+        incidentMatch: opts.incidentMatch,
+        incidentAdvice: opts.incidentAdvice,
+        incidentRule: opts.incidentRule,
+    });
+    const nextSectionText = appendFindingBlock(existingSection, block);
+    const nextDoc = ensureDocSections(setMarkdownSection(currentDocRaw, targetSection, nextSectionText), sectionOrder);
+    if (normalizeTaskDoc(currentDocRaw) === normalizeTaskDoc(nextDoc) && !opts.updatedBy) {
+        return null;
+    }
+    const expectedCurrentText = extractDocSection(currentDocRaw, targetSection);
+    const intents = [
+        setTaskSectionIntent({
+            section: targetSection,
+            text: nextSectionText,
+            requiredSections: sectionOrder,
+            expectedCurrentText,
+        }),
+        ...(opts.updatedBy ? [touchTaskDocMetaIntent({ updatedBy: opts.updatedBy })] : []),
+    ];
+    return { targetSection, expectedCurrentText, intents };
+}
+export function renderFindingsAddRegistryNote(opts) {
+    if (opts.promote && opts.external) {
+        if (opts.branchPr) {
+            return (`incident candidate recorded for ${opts.taskId}; ` +
+                "incidents.md updates later during finish, `verify --collect-incidents`, or `agentplane incidents collect <task-id>`; task-local until base-branch promotion in the current task worktree");
+        }
+        return (`incident candidate recorded for ${opts.taskId}; ` +
+            "incidents.md updates later during finish, `verify --collect-incidents`, or `agentplane incidents collect <task-id>`; task-local in the current checkout until promotion");
+    }
+    return `task-local finding recorded for ${opts.taskId}; incidents.md unchanged in the current checkout`;
+}
+export async function cmdTaskFindingsAdd(opts) {
+    let updatedBy;
+    if (opts.updatedBy !== undefined) {
+        updatedBy = ensureNonEmptyFlag("updated-by", opts.updatedBy);
+    }
+    try {
+        const ctx = opts.ctx ??
+            (await loadCommandContext({ cwd: opts.cwd, rootOverride: opts.rootOverride ?? null }));
+        const backend = ctx.taskBackend;
+        const config = ctx.config;
+        const resolved = ctx.resolvedProject;
+        if (!backend.getTaskDoc || !backend.writeTask) {
+            throw new CliError({
+                exitCode: 2,
+                code: "E_USAGE",
+                message: "Configured task backend does not support task docs.",
+            });
+        }
+        let targetSection = "Findings";
+        await applyTaskMutation({
+            ctx,
+            taskId: opts.taskId,
+            build: (current) => {
+                const plan = buildStructuredFindingMutationPlan({
+                    current,
+                    config,
+                    observation: opts.observation,
+                    impact: opts.impact,
+                    resolution: opts.resolution,
+                    promote: opts.promote,
+                    external: opts.external,
+                    fixability: opts.fixability ?? null,
+                    incidentScope: opts.incidentScope,
+                    incidentTags: opts.incidentTags,
+                    incidentMatch: opts.incidentMatch,
+                    incidentAdvice: opts.incidentAdvice,
+                    incidentRule: opts.incidentRule,
+                    updatedBy,
+                });
+                if (!plan) {
+                    return null;
+                }
+                targetSection = plan.targetSection;
+                return {
+                    intents: plan.intents,
+                    writeOptions: {
+                        expectedCurrentText: plan.expectedCurrentText,
+                        expectedSection: targetSection,
+                    },
+                };
+            },
+        });
+        const tasksDir = `${resolved.gitRoot}/${config.paths.workflow_dir}`;
+        process.stdout.write(`${tasksDir}/${opts.taskId}/README.md\n`);
+        process.stderr.write(`${infoMessage(`task findings add outcome=entry-appended section=${targetSection}`)}\n`);
+        process.stderr.write(`${infoMessage(renderFindingsAddRegistryNote({
+            promote: opts.promote,
+            external: opts.external,
+            taskId: opts.taskId,
+            branchPr: config.workflow_mode === "branch_pr",
+        }))}\n`);
+        return 0;
+    }
+    catch (err) {
+        if (err instanceof CliError)
+            throw err;
+        throw mapBackendError(err, { command: "task findings add", root: opts.rootOverride ?? null });
+    }
+}

package/dist/commands/task/finish-shared.d.ts

@@ -56,5 +56,7 @@ export declare function createTaskCloseCommit(opts: {
     baseBranchOverride?: string;
     quiet: boolean;
     closeUnstageOthers?: boolean;
+    allowPolicy?: boolean;
+    closeRefreshTaskArtifacts?: boolean;
 }): Promise<void>;
 //# sourceMappingURL=finish-shared.d.ts.map

package/dist/commands/task/finish-shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"finish-shared.d.ts","sourceRoot":"","sources":["../../../src/commands/task/finish-shared.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAG/D,OAAO,EAAuB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AACrF,OAAO,EAA6B,YAAY,EAAmB,MAAM,yBAAyB,CAAC;AAWnG,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,QAAQ,CAAC;CAChB,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,QAAQ,GAAG,kBAAkB,GAAG,IAAI,CAK5E;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE;IACxC,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;IACpB,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,IAAI,CAyCP;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,GAAG,EAAE,cAAc,CAAC;IACpB,KAAK,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,GAAG,IAAI,CAAC;IAC9C,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;IACf,2BAA2B,EAAE,OAAO,CAAC;CACtC,GAAG,OAAO,CAAC;IACV,MAAM,EAAE,gBAAgB,CAAC;IACzB,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B,CAAC,CAuDD;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE;IAC7C,GAAG,EAAE,cAAc,CAAC;IACpB,WAAW,EAAE,gBAAgB,EAAE,CAAC;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC;IACnC,QAAQ,EAAE,OAAO,CAAC;IAClB,cAAc,EAAE,kBAAkB,GAAG,IAAI,CAAC;CAC3C,GAAG,OAAO,CAAC,IAAI,CAAC,CAuDhB;AAED,wBAAsB,qBAAqB,CAAC,IAAI,EAAE;IAChD,GAAG,EAAE,cAAc,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,KAAK,EAAE,OAAO,CAAC;IACf,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,GAAG,OAAO,CAAC,IAAI,CAAC,CAuBhB"}
+{"version":3,"file":"finish-shared.d.ts","sourceRoot":"","sources":["../../../src/commands/task/finish-shared.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAG/D,OAAO,EAAuB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AACrF,OAAO,EAA6B,YAAY,EAAmB,MAAM,yBAAyB,CAAC;AAWnG,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,QAAQ,CAAC;CAChB,CAAC;AA0CF,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,QAAQ,GAAG,kBAAkB,GAAG,IAAI,CAK5E;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE;IACxC,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;IACpB,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,IAAI,CAyCP;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,GAAG,EAAE,cAAc,CAAC;IACpB,KAAK,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,GAAG,IAAI,CAAC;IAC9C,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;IACf,2BAA2B,EAAE,OAAO,CAAC;CACtC,GAAG,OAAO,CAAC;IACV,MAAM,EAAE,gBAAgB,CAAC;IACzB,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B,CAAC,CAuDD;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE;IAC7C,GAAG,EAAE,cAAc,CAAC;IACpB,WAAW,EAAE,gBAAgB,EAAE,CAAC;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC;IACnC,QAAQ,EAAE,OAAO,CAAC;IAClB,cAAc,EAAE,kBAAkB,GAAG,IAAI,CAAC;CAC3C,GAAG,OAAO,CAAC,IAAI,CAAC,CAuEhB;AAED,wBAAsB,qBAAqB,CAAC,IAAI,EAAE;IAChD,GAAG,EAAE,cAAc,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,KAAK,EAAE,OAAO,CAAC;IACf,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,yBAAyB,CAAC,EAAE,OAAO,CAAC;CACrC,GAAG,OAAO,CAAC,IAAI,CAAC,CAwBhB"}

package/dist/commands/task/finish-shared.js

@@ -4,6 +4,46 @@ import { cmdCommit } from "../guard/index.js";
 import { loadTaskFromContext } from "../shared/task-backend.js";
 import { backendIsLocalFileBackend, getTaskStore, mutateTaskStore } from "../shared/task-store.js";
 import { ensureAgentFilledRequiredDocSections, executeTaskStatusTransitionRequest, ensureVerificationSatisfiedIfRequired, nowIso, resolvePrimaryTag, toStringArray, } from "./shared.js";
+function normalizeCommentBody(value) {
+    return typeof value === "string" ? value.trim() : "";
+}
+function commitInfoMatches(current, requested) {
+    if (!requested)
+        return true;
+    const existing = existingCommitInfo(current);
+    if (!existing)
+        return false;
+    return existing.hash === requested.hash && existing.message === requested.message;
+}
+function isIdempotentDoneRetry(opts) {
+    if (String(opts.task.status ?? "TODO").toUpperCase() !== "DONE")
+        return false;
+    const lastComment = opts.task.comments?.at(-1) ?? null;
+    const lastEvent = opts.task.events?.at(-1) ?? null;
+    if (lastComment?.author !== opts.author)
+        return false;
+    if (normalizeCommentBody(lastComment.body) !== normalizeCommentBody(opts.body))
+        return false;
+    if (lastEvent?.type !== "status" || lastEvent.author !== opts.author)
+        return false;
+    if (String(lastEvent.from ?? "").toUpperCase() !== "DOING")
+        return false;
+    if (String(lastEvent.to ?? "").toUpperCase() !== "DONE")
+        return false;
+    if (normalizeCommentBody(lastEvent.note) !== normalizeCommentBody(opts.body))
+        return false;
+    if (!commitInfoMatches(opts.task, opts.taskCommitInfo))
+        return false;
+    if (opts.taskId === opts.metaTaskId) {
+        if ((opts.task.result_summary ?? "") !== opts.resultSummary)
+            return false;
+        if ((opts.task.risk_level ?? undefined) !== opts.riskLevel)
+            return false;
+        if (Boolean(opts.task.breaking) !== opts.breaking)
+            return false;
+    }
+    return true;
+}
 export function existingCommitInfo(task) {
     const hash = typeof task.commit?.hash === "string" ? task.commit.hash.trim() : "";
     if (!hash)
@@ -120,6 +160,20 @@ export async function writeFinishedTasks(opts) {
                 resultSummary: opts.resultSummary,
                 force: opts.force,
             });
+            if (opts.force &&
+                isIdempotentDoneRetry({
+                    task: currentTask,
+                    author: opts.author,
+                    body: opts.body,
+                    resultSummary: opts.resultSummary,
+                    metaTaskId: opts.metaTaskId,
+                    taskId,
+                    riskLevel: opts.riskLevel,
+                    breaking: opts.breaking,
+                    taskCommitInfo: opts.taskCommitInfo,
+                })) {
+                return { intents: [], nextTask: currentTask };
+            }
             return await executeTaskStatusTransitionRequest({
                 task: currentTask,
                 backend: opts.ctx.taskBackend,
@@ -171,7 +225,7 @@ export async function createTaskCloseCommit(opts) {
         autoAllow: false,
         allowTasks: true,
         allowBase: opts.ctx.config.workflow_mode === "branch_pr",
-        allowPolicy: false,
+        allowPolicy: opts.allowPolicy === true,
         allowConfig: false,
         allowHooks: false,
         allowCI: false,
@@ -180,5 +234,6 @@ export async function createTaskCloseCommit(opts) {
         closeUnstageOthers: opts.closeUnstageOthers === true,
         closeCheckOnly: false,
         closeStageTaskArtifacts: opts.ctx.config.workflow_mode === "branch_pr",
+        closeRefreshTaskArtifacts: opts.closeRefreshTaskArtifacts,
     });
 }

package/dist/commands/task/finish.d.ts

@@ -28,6 +28,16 @@ export declare function cmdFinish(opts: {
     noCloseCommit?: boolean;
     closeUnstageOthers?: boolean;
     baseBranchOverride?: string;
+    observation?: string;
+    impact?: string;
+    resolution?: string;
+    localOnly?: boolean;
+    repoFixable?: boolean;
+    incidentScope?: string;
+    incidentTags?: string[];
+    incidentMatch?: string[];
+    incidentAdvice?: string;
+    incidentRule?: string;
     quiet: boolean;
 }): Promise<number>;
 //# sourceMappingURL=finish.d.ts.map

package/dist/commands/task/finish.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"finish.d.ts","sourceRoot":"","sources":["../../../src/commands/task/finish.ts"],"names":[],"mappings":"AAQA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAsCpF,wBAAsB,SAAS,CAAC,IAAI,EAAE;IACpC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,iBAAiB,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,eAAe,EAAE,OAAO,CAAC;IACzB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,YAAY,EAAE,OAAO,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,wBAAwB,EAAE,OAAO,CAAC;IAClC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAuUlB"}
+{"version":3,"file":"finish.d.ts","sourceRoot":"","sources":["../../../src/commands/task/finish.ts"],"names":[],"mappings":"AAYA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAsHpF,wBAAsB,SAAS,CAAC,IAAI,EAAE;IACpC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,iBAAiB,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,eAAe,EAAE,OAAO,CAAC;IACzB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,YAAY,EAAE,OAAO,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,wBAAwB,EAAE,OAAO,CAAC;IAClC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CA0YlB"}

package/dist/commands/task/finish.js

@@ -1,14 +1,19 @@
+import { resolveBaseBranch } from "@agentplaneorg/core";
 import { mapBackendError } from "../../cli/error-map.js";
+import { exitCodeForError } from "../../cli/exit-codes.js";
 import { infoMessage, invalidValueMessage, successMessage } from "../../cli/output.js";
 import { CliError } from "../../shared/errors.js";
 import { readFile, rm } from "node:fs/promises";
 import path from "node:path";
 import { ensureActionApproved } from "../shared/approval-requirements.js";
 import { ensureReconciledBeforeMutation } from "../shared/reconcile-check.js";
+import { gitCurrentBranch } from "../shared/git-ops.js";
 import { loadCommandContext } from "../shared/task-backend.js";
 import { backendIsLocalFileBackend, getTaskStore } from "../shared/task-store.js";
-import { collectTaskIncidents } from "../incidents/shared.js";
+import { applyTaskMutation } from "../shared/task-mutation.js";
+import { collectTaskIncidents, renderIncidentCollectionPlanOutcome } from "../incidents/shared.js";
 import { createTaskCloseCommit, existingCommitInfo, loadTaskForFinish, writeFinishedTasks, } from "./finish-shared.js";
+import { buildStructuredFindingMutationPlan } from "./findings.js";
 import { defaultCommitEmojiForStatus, enforceStatusCommitPolicy, prepareTaskTransitionComment, readCommitInfo, requireStructuredComment, runTaskTransitionCommentCommit, } from "./shared.js";
 async function clearDirectWorkLockIfMatches(opts) {
     const lockPath = path.join(opts.agentplaneDir, "cache", "direct-work.json");
@@ -26,11 +31,68 @@ async function clearDirectWorkLockIfMatches(opts) {
         // best-effort
     }
 }
+async function ensureFinishRunsOnBaseBranch(opts) {
+    if (opts.ctx.config.workflow_mode !== "branch_pr")
+        return;
+    const baseBranch = await resolveBaseBranch({
+        cwd: opts.cwd,
+        rootOverride: opts.rootOverride ?? null,
+        cliBaseOpt: opts.baseBranchOverride ?? null,
+        mode: opts.ctx.config.workflow_mode,
+    });
+    if (!baseBranch) {
+        throw new CliError({
+            exitCode: exitCodeForError("E_USAGE"),
+            code: "E_USAGE",
+            message: "Base branch could not be resolved (use `agentplane branch base set` or --base).",
+        });
+    }
+    const currentBranch = await gitCurrentBranch(opts.ctx.resolvedProject.gitRoot);
+    if (currentBranch === baseBranch)
+        return;
+    throw new CliError({
+        exitCode: exitCodeForError("E_GIT"),
+        code: "E_GIT",
+        message: `finish must run on base branch ${baseBranch} in branch_pr mode ` +
+            `(current: ${currentBranch}); integrate first or reconcile from the base checkout.`,
+    });
+}
+async function appendFinishStructuredFinding(opts) {
+    await applyTaskMutation({
+        ctx: opts.ctx,
+        taskId: opts.taskId,
+        build: (current) => {
+            const plan = buildStructuredFindingMutationPlan({
+                current,
+                config: opts.ctx.config,
+                observation: opts.finding.observation,
+                impact: opts.finding.impact,
+                resolution: opts.finding.resolution,
+                promote: !opts.finding.localOnly,
+                external: !opts.finding.localOnly,
+                fixability: opts.finding.repoFixable ? "repo-fixable" : null,
+                incidentScope: opts.finding.incidentScope,
+                incidentTags: opts.finding.incidentTags,
+                incidentMatch: opts.finding.incidentMatch,
+                incidentAdvice: opts.finding.incidentAdvice,
+                incidentRule: opts.finding.incidentRule,
+                updatedBy: opts.author,
+            });
+            return plan ? { intents: plan.intents } : null;
+        },
+    });
+}
 export async function cmdFinish(opts) {
     try {
         const ctx = opts.ctx ??
             (await loadCommandContext({ cwd: opts.cwd, rootOverride: opts.rootOverride ?? null }));
         await ensureReconciledBeforeMutation({ ctx, command: "finish" });
+        await ensureFinishRunsOnBaseBranch({
+            ctx,
+            cwd: opts.cwd,
+            rootOverride: opts.rootOverride,
+            baseBranchOverride: opts.baseBranchOverride,
+        });
         if (opts.force) {
             await ensureActionApproved({
                 action: "force_action",
@@ -140,6 +202,49 @@ export async function cmdFinish(opts) {
         const resultSummary = typeof opts.result === "string" ? opts.result.trim() : "";
         const riskLevel = opts.risk;
         const breaking = opts.breaking === true;
+        const finishFinding = typeof opts.observation === "string" &&
+            typeof opts.impact === "string" &&
+            typeof opts.resolution === "string"
+            ? {
+                observation: opts.observation,
+                impact: opts.impact,
+                resolution: opts.resolution,
+                localOnly: opts.localOnly === true,
+                repoFixable: opts.repoFixable === true,
+                incidentScope: opts.incidentScope,
+                incidentTags: opts.incidentTags ?? [],
+                incidentMatch: opts.incidentMatch ?? [],
+                incidentAdvice: opts.incidentAdvice,
+                incidentRule: opts.incidentRule,
+            }
+            : null;
+        if (finishFinding && opts.taskIds.length !== 1) {
+            throw new CliError({
+                exitCode: 2,
+                code: "E_USAGE",
+                message: "--observation/--impact/--resolution and incident finding options require exactly one task id",
+            });
+        }
+        if (finishFinding && primaryTaskId) {
+            await loadTaskForFinish({
+                ctx,
+                store,
+                useStore,
+                taskId: primaryTaskId,
+                taskCount: opts.taskIds.length,
+                metaTaskId,
+                resultProvided,
+                resultSummary,
+                force: opts.force,
+                capturePrimaryLifecycleMeta: false,
+            });
+            await appendFinishStructuredFinding({
+                ctx,
+                taskId: primaryTaskId,
+                author: opts.author,
+                finding: finishFinding,
+            });
+        }
         let primaryStatusFrom = null;
         let primaryTag = null;
         const loadedTasks = [];
@@ -273,7 +378,8 @@ export async function cmdFinish(opts) {
             breaking,
             taskCommitInfo,
         });
-        let promotedIncidents = 0;
+        const incidentPlans = [];
+        const incidentRegistryPaths = [];
         for (const taskId of opts.taskIds) {
             const loadedTask = loadedTasks.find((candidate) => candidate.taskId === taskId) ?? null;
             const collected = await collectTaskIncidents({
@@ -282,8 +388,10 @@ export async function cmdFinish(opts) {
                 task: loadedTask?.task ?? null,
                 write: true,
             });
-            promotedIncidents += collected.plan.promotable.length;
+            incidentPlans.push(collected.plan);
+            incidentRegistryPaths.push(collected.registryPaths);
         }
+        const promotedIncidents = incidentPlans.reduce((sum, plan) => sum + plan.promotable.length, 0);
         // tasks.json is export-only; generated via `agentplane task export`.
         if (shouldCloseCommit && primaryTaskId) {
             if (!opts.quiet) {
@@ -297,6 +405,7 @@ export async function cmdFinish(opts) {
                 baseBranchOverride: opts.baseBranchOverride,
                 quiet: opts.quiet,
                 closeUnstageOthers: opts.closeCommit === true && opts.closeUnstageOthers === true,
+                allowPolicy: promotedIncidents > 0,
             });
         }
         if (ctx.config.workflow_mode === "direct") {
@@ -306,9 +415,19 @@ export async function cmdFinish(opts) {
             });
         }
         if (!opts.quiet) {
-            if (promotedIncidents > 0) {
-                process.stdout.write(`${infoMessage(`incident registry updated (${promotedIncidents} promoted)`)}\n`);
-            }
+            const incidentPlan = incidentPlans[0] ?? {
+                candidates: [],
+                skipped: [],
+                promotable: [],
+                duplicates: [],
+            };
+            process.stdout.write(`${infoMessage(renderIncidentCollectionPlanOutcome(incidentPlan, {
+                wrote: promotedIncidents > 0,
+                context: "finish",
+                promotedIds: incidentPlan.promotable.map((item) => item.entry.id),
+                registryPaths: incidentRegistryPaths[0] ?? [],
+                taskId: opts.taskIds[0] ?? null,
+            }))}\n`);
             process.stdout.write(`${successMessage("finished")}\n`);
         }
         return 0;

package/dist/commands/task/hosted-close-pr.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 TaskHostedClosePrParsed = {
+    taskIds: string[];
+    branch: string | null;
+    repo: string | null;
+};
+export declare const taskHostedClosePrSpec: CommandSpec<TaskHostedClosePrParsed>;
+export declare function makeRunTaskHostedClosePrHandler(getCtx: (cmd: string) => Promise<CommandContext>): (ctx: CommandCtx, p: TaskHostedClosePrParsed) => Promise<number>;
+export {};
+//# sourceMappingURL=hosted-close-pr.command.d.ts.map

package/dist/commands/task/hosted-close-pr.command.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hosted-close-pr.command.d.ts","sourceRoot":"","sources":["../../../src/commands/task/hosted-close-pr.command.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAStE,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AAQnC,KAAK,uBAAuB,GAAG;IAC7B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB,CAAC;AAgBF,eAAO,MAAM,qBAAqB,EAAE,WAAW,CAAC,uBAAuB,CAoEtE,CAAC;AA4aF,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,IAChF,KAAK,UAAU,EAAE,GAAG,uBAAuB,KAAG,OAAO,CAAC,MAAM,CAAC,CAsB5E"}