agentplane 0.3.10 → 0.3.12

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

@@ -1 +1 @@
-{"version":3,"file":"task-backend.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/task-backend.ts"],"names":[],"mappings":"AACA,OAAO,EAOL,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACrB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAE9E,OAAO,EACL,eAAe,EAEf,KAAK,WAAW,EAEhB,KAAK,QAAQ,EACb,KAAK,WAAW,EACjB,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,MAAM,MAAM,WAAW,GAAG;IACxB,cAAc,CAAC,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IACxC,YAAY,CAAC,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACjC,UAAU,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAC,uBAAuB,CAAC,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,eAAe,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IACzE,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC9D,WAAW,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACpE,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,GAAG,EAAE,UAAU,CAAC;IAEhB,IAAI,EAAE,WAAW,CAAC;CACnB,CAAC;AASF,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAW3E;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA2C7E;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE;IAC7C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,MAAM,CAAC,EAAE,gBAAgB,CAAC;CAC3B,GAAG,OAAO,CAAC,cAAc,CAAC,CAiB1B;AAED,wBAAsB,mBAAmB,CAAC,IAAI,EAAE;IAC9C,GAAG,EAAE,cAAc,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAkBpB;AAED,wBAAsB,0BAA0B,CAAC,IAAI,EAAE;IACrD,GAAG,EAAE,cAAc,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAiC3B;AAoBD,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAC1C,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC;IACV,OAAO,EAAE,cAAc,CAAC,aAAa,CAAC,CAAC;IACvC,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,QAAQ,EAAE,cAAc,CAAC,iBAAiB,CAAC,CAAC;IAC5C,MAAM,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;IACjC,IAAI,EAAE,QAAQ,CAAC;CAChB,CAAC,CAaD;AAED,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,YAAY,CAAC,EACtD,KAAK,EAAE,SAAS,QAAQ,EAAE,GACzB,OAAO,CAAC,IAAI,CAAC,CASf;AAED,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAgBvF;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,CAQ3F;AAED,wBAAsB,4BAA4B,CAAC,IAAI,EAAE;IACvD,GAAG,EAAE,cAAc,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,IAAI,CAAC,CAchB"}
+{"version":3,"file":"task-backend.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/task-backend.ts"],"names":[],"mappings":"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"}

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

@@ -1,10 +1,11 @@
+import { readFile } from "node:fs/promises";
 import path from "node:path";
 import { resolveTaskDocUpdatedBy, parseTaskReadme, taskDocToSectionMap, validateTaskReadmeFrontmatter, withTaskReadmeFrontmatterDefaults, } from "@agentplaneorg/core";
 import { CliError } from "../../shared/errors.js";
 import { loadTaskBackend, taskRecordToData, toTaskSummary, } from "../../backends/task-backend.js";
 import { gitShowFile, toGitPath } from "./git-diff.js";
 import { GitContext } from "./git-context.js";
-import { gitListTaskBranches, parseTaskIdFromBranch } from "./git-worktree.js";
+import { findWorktreeForBranch, gitListTaskBranches, parseTaskIdFromBranch, } from "./git-worktree.js";
 function normalizeDocUpdatedBy(value) {
     const trimmed = value?.trim() ?? "";
     if (!trimmed)
@@ -79,39 +80,97 @@ export async function loadCommandContext(opts) {
     };
 }
 export async function loadTaskFromContext(opts) {
-    const task = await opts.ctx.taskBackend.getTask(opts.taskId);
-    if (task)
-        return task;
     const tasksDir = path.join(opts.ctx.resolvedProject.gitRoot, opts.ctx.config.paths.workflow_dir);
     const readmePath = path.join(tasksDir, opts.taskId, "README.md");
-    const branchFallback = await loadTaskFromBranchSnapshot({
+    const branchFallback = () => loadTaskFromBranchSnapshot({
         ctx: opts.ctx,
         taskId: opts.taskId,
         readmePath,
+        branch: opts.branchSnapshotBranch ?? null,
     });
-    if (branchFallback)
-        return branchFallback;
+    if (opts.preferBranchSnapshot) {
+        const preferredBranchTask = await branchFallback();
+        if (preferredBranchTask)
+            return preferredBranchTask;
+    }
+    const task = await opts.ctx.taskBackend.getTask(opts.taskId);
+    if (task)
+        return task;
+    const fallbackTask = await branchFallback();
+    if (fallbackTask)
+        return fallbackTask;
     throw new CliError({
         exitCode: 4,
         code: "E_IO",
         message: `ENOENT: no such file or directory, open '${readmePath}'`,
     });
 }
+export async function resolveTaskBranchFromContext(opts) {
+    if (opts.ctx.backendId !== "local") {
+        return null;
+    }
+    const prefix = opts.ctx.config.branch.task_prefix;
+    const branches = await gitListTaskBranches(opts.ctx.resolvedProject.gitRoot, prefix);
+    const matches = branches.filter((branch) => parseTaskIdFromBranch(prefix, branch) === opts.taskId);
+    if (matches.length === 1)
+        return matches[0] ?? null;
+    if (matches.length > 1) {
+        throw new CliError({
+            exitCode: 3,
+            code: "E_VALIDATION",
+            message: `Multiple task branches match ${opts.taskId}: ${matches.join(", ")}`,
+        });
+    }
+    return null;
+}
 export async function loadTaskFromBranchSnapshot(opts) {
     if (opts.ctx.backendId !== "local") {
         return null;
     }
-    const branch = await resolveSingleTaskBranch(opts.ctx, opts.taskId);
+    const branch = typeof opts.branch === "string" && opts.branch.trim().length > 0
+        ? opts.branch.trim()
+        : await resolveTaskBranchFromContext({ ctx: opts.ctx, taskId: opts.taskId });
     if (!branch)
         return null;
+    const liveWorktreePath = await findWorktreeForBranch(opts.ctx.resolvedProject.gitRoot, branch);
+    if (liveWorktreePath) {
+        const liveReadmePath = path.join(liveWorktreePath, path.relative(opts.ctx.resolvedProject.gitRoot, opts.readmePath));
+        try {
+            const liveText = await readFile(liveReadmePath, "utf8");
+            const parsed = parseTaskReadme(liveText);
+            const frontmatter = validateTaskReadmeFrontmatter(withTaskReadmeFrontmatterDefaults({
+                ...parsed.frontmatter,
+                id: typeof parsed.frontmatter.id === "string" && parsed.frontmatter.id.trim().length > 0
+                    ? parsed.frontmatter.id
+                    : opts.taskId,
+            }));
+            return taskRecordToData({
+                id: opts.taskId,
+                frontmatter: frontmatter,
+                body: parsed.body,
+                readmePath: opts.readmePath,
+            });
+        }
+        catch {
+            // Fall back to the committed branch snapshot when the live worktree lacks the README.
+        }
+    }
     const relReadmePath = toGitPath(path.relative(opts.ctx.resolvedProject.gitRoot, opts.readmePath));
+    const refsToTry = [branch, branch.startsWith("origin/") ? null : `origin/${branch}`].filter((ref) => Boolean(ref && ref.trim().length > 0));
     let text = "";
-    try {
-        text = await gitShowFile(opts.ctx.resolvedProject.gitRoot, branch, relReadmePath);
+    let loaded = false;
+    for (const ref of refsToTry) {
+        try {
+            text = await gitShowFile(opts.ctx.resolvedProject.gitRoot, ref, relReadmePath);
+            loaded = true;
+            break;
+        }
+        catch {
+            // Try the next candidate ref.
+        }
     }
-    catch {
+    if (!loaded)
         return null;
-    }
     const parsed = parseTaskReadme(text);
     const frontmatter = validateTaskReadmeFrontmatter(withTaskReadmeFrontmatterDefaults({
         ...parsed.frontmatter,
@@ -126,21 +185,6 @@ export async function loadTaskFromBranchSnapshot(opts) {
         readmePath: opts.readmePath,
     });
 }
-async function resolveSingleTaskBranch(ctx, taskId) {
-    const prefix = ctx.config.branch.task_prefix;
-    const branches = await gitListTaskBranches(ctx.resolvedProject.gitRoot, prefix);
-    const matches = branches.filter((branch) => parseTaskIdFromBranch(prefix, branch) === taskId);
-    if (matches.length === 1)
-        return matches[0] ?? null;
-    if (matches.length > 1) {
-        throw new CliError({
-            exitCode: 3,
-            code: "E_VALIDATION",
-            message: `Multiple task branches match ${taskId}: ${matches.join(", ")}`,
-        });
-    }
-    return null;
-}
 export async function loadBackendTask(opts) {
     const ctx = opts.ctx ??
         (await loadCommandContext({ cwd: opts.cwd, rootOverride: opts.rootOverride ?? null }));

package/dist/commands/shared/task-local-freshness.d.ts

@@ -1,12 +1,14 @@
 export declare function isTaskLocalAdvancePath(opts: {
     workflowDir: string;
     taskId: string;
+    tasksPath?: string;
     relPath: string;
 }): boolean;
 export declare function isTaskLocalOnlyAdvance(opts: {
     gitRoot: string;
     workflowDir: string;
     taskId: string;
+    tasksPath?: string;
     fromRef: string | null;
     toRef: string;
 }): Promise<boolean>;

package/dist/commands/shared/task-local-freshness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task-local-freshness.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/task-local-freshness.ts"],"names":[],"mappings":"AAQA,wBAAgB,sBAAsB,CAAC,IAAI,EAAE;IAC3C,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAEV;AAED,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;CACf,GAAG,OAAO,CAAC,OAAO,CAAC,CAenB"}
+{"version":3,"file":"task-local-freshness.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/task-local-freshness.ts"],"names":[],"mappings":"AAQA,wBAAgB,sBAAsB,CAAC,IAAI,EAAE;IAC3C,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAOV;AAED,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;CACf,GAAG,OAAO,CAAC,OAAO,CAAC,CAgBnB"}

package/dist/commands/shared/task-local-freshness.js

@@ -4,7 +4,12 @@ function taskRootPrefix(workflowDir, taskId) {
     return `${toGitPath(path.join(workflowDir, taskId))}/`;
 }
 export function isTaskLocalAdvancePath(opts) {
-    return opts.relPath.startsWith(taskRootPrefix(opts.workflowDir, opts.taskId));
+    const normalizedRelPath = toGitPath(opts.relPath);
+    if (normalizedRelPath.startsWith(taskRootPrefix(opts.workflowDir, opts.taskId))) {
+        return true;
+    }
+    const normalizedTasksPath = opts.tasksPath ? toGitPath(opts.tasksPath) : null;
+    return normalizedTasksPath !== null && normalizedRelPath === normalizedTasksPath;
 }
 export async function isTaskLocalOnlyAdvance(opts) {
     if (!opts.fromRef || opts.fromRef === opts.toRef) {
@@ -15,6 +20,7 @@ export async function isTaskLocalOnlyAdvance(opts) {
         changedPaths.every((relPath) => isTaskLocalAdvancePath({
             workflowDir: opts.workflowDir,
             taskId: opts.taskId,
+            tasksPath: opts.tasksPath,
             relPath,
         })));
 }

package/dist/commands/task/close-duplicate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"close-duplicate.d.ts","sourceRoot":"","sources":["../../../src/commands/task/close-duplicate.ts"],"names":[],"mappings":"AAGA,OAAO,EAAuB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAGrF,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,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,OAAO,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAoDlB"}
+{"version":3,"file":"close-duplicate.d.ts","sourceRoot":"","sources":["../../../src/commands/task/close-duplicate.ts"],"names":[],"mappings":"AAUA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AAgDnC,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,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,OAAO,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAqDlB"}

package/dist/commands/task/close-duplicate.js

@@ -1,8 +1,40 @@
+import { mkdir, readFile } from "node:fs/promises";
+import path from "node:path";
+import { renderTaskReadme } from "@agentplaneorg/core";
 import { mapBackendError } from "../../cli/error-map.js";
+import { fileExists } from "../../cli/fs-utils.js";
 import { CliError } from "../../shared/errors.js";
+import { writeTextIfChanged } from "../../shared/write-if-changed.js";
 import { ensureActionApproved } from "../shared/approval-requirements.js";
-import { loadTaskFromContext } from "../shared/task-backend.js";
+import { loadTaskFromContext, taskDataToFrontmatter, } from "../shared/task-backend.js";
+import { listWorktrees, parseTaskIdFromBranch } from "../shared/git-worktree.js";
 import { recordVerifiedNoopClosure } from "./close-shared.js";
+async function ensureLocalTaskReadmeHydrated(opts) {
+    const workflowDir = opts.ctx.config.paths.workflow_dir;
+    const targetReadmePath = path.join(opts.ctx.resolvedProject.gitRoot, workflowDir, opts.taskId, "README.md");
+    if (await fileExists(targetReadmePath))
+        return;
+    const worktrees = await listWorktrees(opts.ctx.resolvedProject.gitRoot).catch(() => []);
+    const matchingTaskWorktrees = worktrees.filter((entry) => typeof entry.branch === "string" &&
+        parseTaskIdFromBranch(opts.ctx.config.branch.task_prefix, entry.branch) === opts.taskId);
+    if (matchingTaskWorktrees.length === 1) {
+        const sourceReadmePath = path.join(matchingTaskWorktrees[0].path, workflowDir, opts.taskId, "README.md");
+        if (await fileExists(sourceReadmePath)) {
+            const text = await readFile(sourceReadmePath, "utf8");
+            await mkdir(path.dirname(targetReadmePath), { recursive: true });
+            await writeTextIfChanged(targetReadmePath, text);
+            return;
+        }
+    }
+    const task = await loadTaskFromContext({
+        ctx: opts.ctx,
+        taskId: opts.taskId,
+        preferBranchSnapshot: true,
+    });
+    const rendered = renderTaskReadme(taskDataToFrontmatter(task), task.doc ?? "");
+    await mkdir(path.dirname(targetReadmePath), { recursive: true });
+    await writeTextIfChanged(targetReadmePath, rendered);
+}
 export async function cmdTaskCloseDuplicate(opts) {
     try {
         const sourceId = opts.taskId.trim();
@@ -30,6 +62,7 @@ export async function cmdTaskCloseDuplicate(opts) {
             });
         }
         const canonical = await loadTaskFromContext({ ctx: opts.ctx, taskId: duplicateOf });
+        await ensureLocalTaskReadmeHydrated({ ctx: opts.ctx, taskId: sourceId });
         const reason = opts.note?.trim();
         const canonicalTitle = canonical.title?.trim() ? ` (${canonical.title.trim()})` : "";
         const baseBody = `Verified: ${sourceId} is a bookkeeping duplicate of ${duplicateOf}${canonicalTitle}; ` +

package/dist/commands/task/derive.js

@@ -61,7 +61,7 @@ export async function cmdTaskDerive(opts) {
                 primary: primary.primary,
                 verifyCommands: opts.verify,
             }));
-            process.stderr.write(`${warnMessage("task requires Verify Steps by primary tag; seeded a default ## Verify Steps section in README (review and refine before approval/start)")}\n`);
+            process.stderr.write(`${warnMessage("task requires Verify Steps by primary tag; seeded a concrete ## Verify Steps section in README (refine it only if the task needs stricter acceptance coverage)")}\n`);
         }
         const hasSpike = opts.tags.some((tag) => tag.trim().toLowerCase() === spikeTag);
         if (hasSpike && requiresVerifySteps) {

package/dist/commands/task/doc-template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"doc-template.d.ts","sourceRoot":"","sources":["../../../src/commands/task/doc-template.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,mBAAmB,IAAI,CAAC;AA2DrC,wBAAgB,gBAAgB,CAAC,IAAI,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAkCrF;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE;IACnD,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B,GAAG,MAAM,CA2BT"}
+{"version":3,"file":"doc-template.d.ts","sourceRoot":"","sources":["../../../src/commands/task/doc-template.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,mBAAmB,IAAI,CAAC;AAyDrC,wBAAgB,gBAAgB,CAAC,IAAI,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAsCrF;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE;IACnD,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B,GAAG,MAAM,CAyBT"}

package/dist/commands/task/doc-template.js

@@ -31,13 +31,11 @@ function buildDefaultPlan(opts) {
         "3. Finalize task findings and finish with traceable commit metadata.",
     ].join("\n");
 }
-function buildDefaultVerifyStepsTemplate() {
+function buildDefaultVerifyStepsTemplate(opts) {
     return [
-        "<!-- TODO: REPLACE WITH TASK-SPECIFIC ACCEPTANCE STEPS -->",
-        "",
-        "1. <Action>. Expected: <observable result>.",
-        "2. <Action>. Expected: <observable result>.",
-        "3. <Action>. Expected: <observable result>.",
+        `1. Review the requested outcome for "${opts.title}". Expected: the visible result matches ## Summary and stays inside approved scope.`,
+        "2. Run the most relevant validation step for this task. Expected: it succeeds without unexpected regressions in touched behavior.",
+        "3. Compare the final result against ## Scope and record any residual follow-up in ## Findings. Expected: open edges are explicit rather than implicit.",
     ].join("\n");
 }
 function buildDefaultVerificationTemplate() {
@@ -69,7 +67,7 @@ export function defaultTaskDocV3(opts) {
     body = setMarkdownSection(body, "Summary", buildDefaultSummary({ title: opts.title, description: opts.description }));
     body = setMarkdownSection(body, "Scope", buildDefaultScope({ title: opts.title, description: opts.description }));
     body = setMarkdownSection(body, "Plan", buildDefaultPlan({ title: opts.title }));
-    body = setMarkdownSection(body, "Verify Steps", buildDefaultVerifyStepsTemplate());
+    body = setMarkdownSection(body, "Verify Steps", buildDefaultVerifyStepsTemplate({ title: opts.title }));
     body = setMarkdownSection(body, "Verification", buildDefaultVerificationTemplate());
     body = setMarkdownSection(body, "Rollback Plan", buildDefaultRollbackPlan());
     body = setMarkdownSection(body, "Findings", "");
@@ -85,10 +83,8 @@ export function buildDefaultVerifyStepsSection(opts) {
     ];
     if (commandSteps.length === 0) {
         return [
-            "<!-- TODO: REPLACE WITH TASK-SPECIFIC ACCEPTANCE STEPS -->",
-            "",
-            "1. Review the changed artifact or behavior. Expected: the requested outcome is visible and matches the approved scope.",
-            "2. Run the most relevant validation step for this task. Expected: it succeeds without unexpected regressions in touched scope.",
+            `1. Review the changed artifact or behavior for the \`${opts.primary}\` task. Expected: the requested outcome is visible and matches the approved scope.`,
+            `2. Run the most relevant validation step for the \`${opts.primary}\` task. Expected: it succeeds without unexpected regressions in touched scope.`,
             "3. Compare the final result against the task summary and scope. Expected: any remaining follow-up is explicit in ## Findings.",
         ].join("\n");
     }

package/dist/commands/task/findings-add.command.d.ts

@@ -0,0 +1,20 @@
+import type { CommandCtx, CommandSpec } from "../../cli/spec/spec.js";
+import type { CommandContext } from "../shared/task-backend.js";
+export type TaskFindingsAddParsed = {
+    taskId: string;
+    observation: string;
+    impact: string;
+    resolution: string;
+    promote: boolean;
+    external: boolean;
+    fixability: "external" | "repo-fixable" | null;
+    incidentScope?: string;
+    incidentTags: string[];
+    incidentMatch: string[];
+    incidentAdvice?: string;
+    incidentRule?: string;
+    updatedBy?: string;
+};
+export declare const taskFindingsAddSpec: CommandSpec<TaskFindingsAddParsed>;
+export declare function makeRunTaskFindingsAddHandler(getCtx: (cmd: string) => Promise<CommandContext>): (ctx: CommandCtx, p: TaskFindingsAddParsed) => Promise<number>;
+//# sourceMappingURL=findings-add.command.d.ts.map

package/dist/commands/task/findings-add.command.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"findings-add.command.d.ts","sourceRoot":"","sources":["../../../src/commands/task/findings-add.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAEtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAIhE,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,UAAU,GAAG,cAAc,GAAG,IAAI,CAAC;IAC/C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,WAAW,CAAC,qBAAqB,CAqJlE,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,CAoB1E"}

package/dist/commands/task/findings-add.command.js

@@ -0,0 +1,165 @@
+import { usageError } from "../../cli/spec/errors.js";
+import { cmdTaskFindingsAdd } from "./findings.js";
+export const taskFindingsAddSpec = {
+    id: ["task", "findings", "add"],
+    group: "Task",
+    summary: "Append a structured Findings/Notes block; incident promotion is default unless --local-only.",
+    synopsis: [
+        "agentplane task findings add <task-id> --observation <text> --impact <text> --resolution <text> [--local-only] [--repo-fixable] [--incident-scope <text>] [--incident-tag <tag>] [--incident-match <term>] [--incident-advice <text>] [--incident-rule <text>] [--updated-by <id>]",
+    ],
+    args: [{ name: "task-id", required: true, valueHint: "<task-id>" }],
+    options: [
+        {
+            kind: "string",
+            name: "observation",
+            valueHint: "<text>",
+            description: "Required. Observation field.",
+        },
+        { kind: "string", name: "impact", valueHint: "<text>", description: "Required. Impact field." },
+        {
+            kind: "string",
+            name: "resolution",
+            valueHint: "<text>",
+            description: "Required. Resolution field.",
+        },
+        {
+            kind: "boolean",
+            name: "promote",
+            description: "Compatibility flag. Promotion is the default unless `--local-only` is set.",
+        },
+        {
+            kind: "boolean",
+            name: "external",
+            description: "Compatibility flag. External incident metadata is the default unless `--local-only` is set.",
+        },
+        {
+            kind: "boolean",
+            name: "repo-fixable",
+            description: "Mark the structured finding as repo-fixable so it can promote into incidents.md.",
+        },
+        {
+            kind: "boolean",
+            name: "local-only",
+            default: false,
+            description: "Keep the entry task-local only; omit `Promotion: incident-candidate` and any explicit fixability marker.",
+        },
+        {
+            kind: "string",
+            name: "incident-scope",
+            valueHint: "<text>",
+            description: "Optional. IncidentScope override.",
+        },
+        {
+            kind: "string",
+            name: "incident-tag",
+            valueHint: "<tag>",
+            repeatable: true,
+            description: "Repeatable. IncidentTags entry.",
+        },
+        {
+            kind: "string",
+            name: "incident-match",
+            valueHint: "<term>",
+            repeatable: true,
+            description: "Repeatable. IncidentMatch entry.",
+        },
+        {
+            kind: "string",
+            name: "incident-advice",
+            valueHint: "<text>",
+            description: "Optional. IncidentAdvice field.",
+        },
+        {
+            kind: "string",
+            name: "incident-rule",
+            valueHint: "<text>",
+            description: "Optional. IncidentRule field.",
+        },
+        {
+            kind: "string",
+            name: "updated-by",
+            valueHint: "<id>",
+            description: "Optional. Override doc_updated_by metadata (must be non-empty).",
+        },
+    ],
+    examples: [
+        {
+            cmd: 'agentplane task findings add 202602030608-F1Q8AB --observation "GitHub API EOF retries were manual." --impact "Operators repeated the reconcile loop." --resolution "Switch the retry path to REST polling." --incident-scope "GitHub PR reconciliation" --incident-tag workflow --incident-tag github',
+            why: "Append a promotable external incident candidate without hand-editing the README or remembering hidden flags.",
+        },
+        {
+            cmd: 'agentplane task findings add 202602030608-F1Q8AB --observation "One manual follow-up remains." --impact "Task notes should stay local." --resolution "Track it in Findings only." --local-only',
+            why: "Keep an observation task-local when it should not feed incidents collection.",
+        },
+    ],
+    validateRaw: (raw) => {
+        for (const key of ["observation", "impact", "resolution"]) {
+            const value = raw.opts[key];
+            if (typeof value !== "string" || value.trim() === "") {
+                throw usageError({
+                    spec: taskFindingsAddSpec,
+                    message: `Missing required option: --${key}.`,
+                });
+            }
+        }
+        const updatedBy = raw.opts["updated-by"];
+        if (typeof updatedBy === "string" && updatedBy.trim() === "") {
+            throw usageError({ spec: taskFindingsAddSpec, message: "--updated-by must be non-empty." });
+        }
+        if (raw.opts["local-only"] === true &&
+            (raw.opts.promote === true || raw.opts.external === true || raw.opts["repo-fixable"] === true)) {
+            throw usageError({
+                spec: taskFindingsAddSpec,
+                message: "--local-only cannot be combined with --promote, --external, or --repo-fixable.",
+            });
+        }
+        if (raw.opts.external === true && raw.opts["repo-fixable"] === true) {
+            throw usageError({
+                spec: taskFindingsAddSpec,
+                message: "--external and --repo-fixable are mutually exclusive.",
+            });
+        }
+    },
+    parse: (raw) => {
+        const localOnly = raw.opts["local-only"] === true;
+        const repoFixable = raw.opts["repo-fixable"] === true;
+        const fixability = localOnly ? null : repoFixable ? "repo-fixable" : "external";
+        return {
+            taskId: String(raw.args["task-id"]),
+            observation: String(raw.opts.observation),
+            impact: String(raw.opts.impact),
+            resolution: String(raw.opts.resolution),
+            promote: !localOnly,
+            external: !localOnly,
+            fixability,
+            incidentScope: typeof raw.opts["incident-scope"] === "string" ? raw.opts["incident-scope"] : undefined,
+            incidentTags: raw.opts["incident-tag"] ?? [],
+            incidentMatch: 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,
+            updatedBy: typeof raw.opts["updated-by"] === "string" ? raw.opts["updated-by"] : undefined,
+        };
+    },
+};
+export function makeRunTaskFindingsAddHandler(getCtx) {
+    return async (ctx, p) => {
+        return await cmdTaskFindingsAdd({
+            ctx: await getCtx("task findings add"),
+            cwd: ctx.cwd,
+            rootOverride: ctx.rootOverride,
+            taskId: p.taskId,
+            observation: p.observation,
+            impact: p.impact,
+            resolution: p.resolution,
+            promote: p.promote,
+            external: p.external,
+            fixability: p.fixability === "repo-fixable" ? "repo-fixable" : null,
+            incidentScope: p.incidentScope,
+            incidentTags: p.incidentTags,
+            incidentMatch: p.incidentMatch,
+            incidentAdvice: p.incidentAdvice,
+            incidentRule: p.incidentRule,
+            updatedBy: p.updatedBy,
+        });
+    };
+}

package/dist/commands/task/findings.command.d.ts

@@ -0,0 +1,7 @@
+import type { CommandCtx, CommandSpec } from "../../cli/spec/spec.js";
+export type TaskFindingsParsed = {
+    subcommand?: string;
+};
+export declare const taskFindingsSpec: CommandSpec<TaskFindingsParsed>;
+export declare function runTaskFindings(_ctx: CommandCtx, p: TaskFindingsParsed): Promise<number>;
+//# sourceMappingURL=findings.command.d.ts.map

package/dist/commands/task/findings.command.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"findings.command.d.ts","sourceRoot":"","sources":["../../../src/commands/task/findings.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAGtE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,WAAW,CAAC,kBAAkB,CAY5D,CAAC;AAEF,wBAAsB,eAAe,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,CAM9F"}

package/dist/commands/task/findings.command.js

@@ -0,0 +1,20 @@
+import { loadDirectSubcommandNames, throwGroupCommandUsage } from "../../cli/group-command.js";
+export const taskFindingsSpec = {
+    id: ["task", "findings"],
+    group: "Task",
+    summary: "Structured Findings/Notes commands (incident promotion is default unless --local-only).",
+    synopsis: [
+        "agentplane task findings add <task-id> --observation <text> --impact <text> --resolution <text> [--local-only] [--incident-scope <text>] [--incident-tag <tag>] [--incident-match <term>] [--incident-advice <text>] [--incident-rule <text>] [--updated-by <id>]",
+    ],
+    args: [{ name: "subcommand", required: false, valueHint: "<add>" }],
+    parse: (raw) => ({
+        subcommand: typeof raw.args.subcommand === "string" ? raw.args.subcommand : undefined,
+    }),
+};
+export async function runTaskFindings(_ctx, p) {
+    throwGroupCommandUsage({
+        spec: taskFindingsSpec,
+        cmd: p.subcommand ? [p.subcommand] : [],
+        subcommands: await loadDirectSubcommandNames(["task", "findings"]),
+    });
+}

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

@@ -0,0 +1,63 @@
+import { type AgentplaneConfig } from "@agentplaneorg/core";
+import type { TaskData } from "../../backends/task-backend.js";
+import { type CommandContext } from "../shared/task-backend.js";
+import { type TaskStoreIntent } from "../shared/task-store.js";
+export declare function renderStructuredFindingBlock(opts: {
+    observation: string;
+    impact: string;
+    resolution: string;
+    promote: boolean;
+    external: boolean;
+    fixability?: "repo-fixable" | null;
+    incidentScope?: string;
+    incidentTags: readonly string[];
+    incidentMatch: readonly string[];
+    incidentAdvice?: string;
+    incidentRule?: string;
+}): string;
+export type StructuredFindingMutationPlan = {
+    targetSection: string;
+    expectedCurrentText: string | null;
+    intents: readonly TaskStoreIntent[];
+};
+export declare function buildStructuredFindingMutationPlan(opts: {
+    current: TaskData;
+    config: AgentplaneConfig;
+    observation: string;
+    impact: string;
+    resolution: string;
+    promote: boolean;
+    external: boolean;
+    fixability?: "repo-fixable" | null;
+    incidentScope?: string;
+    incidentTags: readonly string[];
+    incidentMatch: readonly string[];
+    incidentAdvice?: string;
+    incidentRule?: string;
+    updatedBy?: string;
+}): StructuredFindingMutationPlan | null;
+export declare function renderFindingsAddRegistryNote(opts: {
+    promote: boolean;
+    external: boolean;
+    taskId: string;
+    branchPr?: boolean;
+}): string;
+export declare function cmdTaskFindingsAdd(opts: {
+    ctx?: CommandContext;
+    cwd: string;
+    rootOverride?: string;
+    taskId: string;
+    observation: string;
+    impact: string;
+    resolution: string;
+    promote: boolean;
+    external: boolean;
+    fixability?: "repo-fixable" | null;
+    incidentScope?: string;
+    incidentTags: string[];
+    incidentMatch: string[];
+    incidentAdvice?: string;
+    incidentRule?: string;
+    updatedBy?: string;
+}): Promise<number>;
+//# sourceMappingURL=findings.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"findings.d.ts","sourceRoot":"","sources":["../../../src/commands/task/findings.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,gBAAgB,EACtB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAI/D,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEpF,OAAO,EAGL,KAAK,eAAe,EACrB,MAAM,yBAAyB,CAAC;AAoCjC,wBAAgB,4BAA4B,CAAC,IAAI,EAAE;IACjD,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;IACnC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;IAChC,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,MAAM,CAkBT;AAQD,MAAM,MAAM,6BAA6B,GAAG;IAC1C,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,OAAO,EAAE,SAAS,eAAe,EAAE,CAAC;CACrC,CAAC;AAEF,wBAAgB,kCAAkC,CAAC,IAAI,EAAE;IACvD,OAAO,EAAE,QAAQ,CAAC;IAClB,MAAM,EAAE,gBAAgB,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;IACnC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;IAChC,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,6BAA6B,GAAG,IAAI,CA0CvC;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE;IAClD,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,GAAG,MAAM,CAcT;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE;IAC7C,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;IACnC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,MAAM,CAAC,CA4ElB"}