agentplane 0.3.5 → 0.3.6

package/dist/commands/shared/reconcile-check.js

@@ -1,4 +1,5 @@
 import { exitCodeForError } from "../../cli/exit-codes.js";
+import { withDiagnosticContext } from "../../shared/diagnostics.js";
 import { CliError } from "../../shared/errors.js";
 import { listTasksMemo } from "./task-backend.js";
 function compactError(err) {
@@ -8,11 +9,85 @@ function compactError(err) {
     }
     return String(err);
 }
+function parseTaskScanWarning(raw) {
+    const trimmed = raw.trim();
+    const match = /^skip:([^:]+):\s*(.+)$/.exec(trimmed);
+    if (!match) {
+        return { raw: trimmed, taskId: null, kind: null };
+    }
+    return {
+        raw: trimmed,
+        taskId: match[1]?.trim() || null,
+        kind: match[2]?.trim() || null,
+    };
+}
+function describePrimaryWarning(warning) {
+    const subject = warning.taskId ? `task README for ${warning.taskId}` : "a task README";
+    switch (warning.kind) {
+        case "invalid_readme_frontmatter": {
+            return {
+                summary: `${subject} has invalid frontmatter and could not be parsed`,
+                likelyCause: `${subject} has invalid frontmatter, so reconcile skipped it before the mutating command could run`,
+                hint: "Fix the malformed task README frontmatter, then rerun the mutating command.",
+            };
+        }
+        case "empty_or_invalid_frontmatter": {
+            return {
+                summary: `${subject} has empty or invalid frontmatter and could not be parsed`,
+                likelyCause: `${subject} is missing required frontmatter fields, so reconcile skipped it before the mutating command could run`,
+                hint: "Restore valid task README frontmatter, then rerun the mutating command.",
+            };
+        }
+        case "unreadable_readme":
+        case "missing_or_unreadable_readme": {
+            return {
+                summary: `${subject} could not be read during task scan`,
+                likelyCause: `${subject} is missing or unreadable, so reconcile skipped it before the mutating command could run`,
+                hint: "Restore or fix the task README file, then rerun the mutating command.",
+            };
+        }
+        default: {
+            return null;
+        }
+    }
+}
 function summarizeWarnings(warnings) {
+    const primary = describePrimaryWarning(parseTaskScanWarning(warnings[0] ?? ""));
+    if (primary) {
+        const extra = warnings.length - 1;
+        if (extra <= 0)
+            return primary.summary;
+        return `${primary.summary}; +${extra} more task scan warning${extra === 1 ? "" : "s"}`;
+    }
     const preview = warnings.slice(0, 3).join("; ");
     const suffix = warnings.length > 3 ? `; +${warnings.length - 3} more` : "";
     return `skipped ${warnings.length} task files during scan (${preview}${suffix})`;
 }
+function buildWarningDiagnostic(warnings) {
+    const primary = describePrimaryWarning(parseTaskScanWarning(warnings[0] ?? ""));
+    if (primary) {
+        return {
+            state: "mutation preflight cannot reconcile task artifacts",
+            likelyCause: primary.likelyCause,
+            hint: primary.hint,
+            nextAction: {
+                command: "agentplane task list --strict-read",
+                reason: "surface the malformed or unreadable task README before retrying mutating commands",
+                reasonCode: "reconcile_task_scan_incomplete",
+            },
+        };
+    }
+    return {
+        state: "mutation preflight found skipped task artifacts",
+        likelyCause: "task scan skipped one or more task artifacts due to parse/read warnings, so the mutating command stopped before touching git state",
+        hint: "Reconcile check failed due to task scan drift or parse/read errors.",
+        nextAction: {
+            command: "agentplane task list --strict-read",
+            reason: "surface task scan/read failures before retrying mutating commands",
+            reasonCode: "reconcile_task_scan_incomplete",
+        },
+    };
+}
 export async function ensureReconciledBeforeMutation(opts) {
     try {
         await opts.ctx.git.statusChangedPaths();
@@ -51,10 +126,10 @@ export async function ensureReconciledBeforeMutation(opts) {
         exitCode: exitCodeForError("E_VALIDATION"),
         code: "E_VALIDATION",
         message: `reconcile check failed: ${summarizeWarnings(warnings)}`,
-        context: {
+        context: withDiagnosticContext({
             command: opts.command,
             reason_code: "reconcile_task_scan_incomplete",
             warning_count: warnings.length,
-        },
+        }, buildWarningDiagnostic(warnings)),
     });
 }

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

@@ -1,5 +1,29 @@
-import { type TaskData } from "../../backends/task-backend.js";
+import { type TaskData, type TaskEvent } from "../../backends/task-backend.js";
 import { type CommandContext } from "./task-backend.js";
+type TaskComment = NonNullable<TaskData["comments"]>[number];
+export type TaskStoreTaskPatch = Partial<Omit<TaskData, "doc" | "comments" | "events" | "doc_version" | "doc_updated_at" | "doc_updated_by">>;
+export type TaskStoreDocPatch = {
+    kind: "replace-doc";
+    doc: string;
+    expectedCurrentDoc?: string | null;
+} | {
+    kind: "set-section";
+    section: string;
+    text: string;
+    requiredSections: string[];
+    expectedCurrentText?: string | null;
+};
+export type TaskStorePatch = {
+    task?: TaskStoreTaskPatch;
+    appendComments?: TaskComment[];
+    appendEvents?: TaskEvent[];
+    doc?: TaskStoreDocPatch;
+    docMeta?: {
+        touch?: boolean;
+        updatedBy?: string;
+        version?: 2 | 3;
+    };
+};
 export declare class TaskStore {
     private ctx;
     private cache;
@@ -10,7 +34,14 @@ export declare class TaskStore {
         changed: boolean;
         task: TaskData;
     }>;
+    patch(taskId: string, builder: (current: TaskData) => Promise<TaskStorePatch | null | undefined> | TaskStorePatch | null | undefined): Promise<{
+        changed: boolean;
+        task: TaskData;
+    }>;
+    private runWithRetry;
+    private writeNextTask;
 }
 export declare function getTaskStore(ctx: CommandContext): TaskStore;
 export declare function backendIsLocalFileBackend(ctx: CommandContext): boolean;
+export {};
 //# sourceMappingURL=task-store.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"task-store.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/task-store.ts"],"names":[],"mappings":"AAYA,OAAO,EAAgB,KAAK,QAAQ,EAAoB,MAAM,gCAAgC,CAAC;AAI/F,OAAO,EAA8C,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AA8DpG,qBAAa,SAAS;IACpB,OAAO,CAAC,GAAG,CAAiB;IAC5B,OAAO,CAAC,KAAK,CAA0C;gBAE3C,GAAG,EAAE,cAAc;IAIzB,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;YAK9B,SAAS;IAsBjB,MAAM,CACV,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,GAC3D,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,QAAQ,CAAA;KAAE,CAAC;CA6EjD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,cAAc,GAAG,SAAS,CAI3D;AAED,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAEtE"}
+{"version":3,"file":"task-store.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/task-store.ts"],"names":[],"mappings":"AAcA,OAAO,EAEL,KAAK,QAAQ,EACb,KAAK,SAAS,EAEf,MAAM,gCAAgC,CAAC;AAIxC,OAAO,EAA8C,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AASpG,KAAK,WAAW,GAAG,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AAE7D,MAAM,MAAM,kBAAkB,GAAG,OAAO,CACtC,IAAI,CACF,QAAQ,EACR,KAAK,GAAG,UAAU,GAAG,QAAQ,GAAG,aAAa,GAAG,gBAAgB,GAAG,gBAAgB,CACpF,CACF,CAAC;AAEF,MAAM,MAAM,iBAAiB,GACzB;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACpC,GACD;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC,CAAC;AAEN,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,CAAC,EAAE,kBAAkB,CAAC;IAC1B,cAAc,CAAC,EAAE,WAAW,EAAE,CAAC;IAC/B,YAAY,CAAC,EAAE,SAAS,EAAE,CAAC;IAC3B,GAAG,CAAC,EAAE,iBAAiB,CAAC;IACxB,OAAO,CAAC,EAAE;QACR,KAAK,CAAC,EAAE,OAAO,CAAC;QAChB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;KACjB,CAAC;CACH,CAAC;AA2KF,qBAAa,SAAS;IACpB,OAAO,CAAC,GAAG,CAAiB;IAC5B,OAAO,CAAC,KAAK,CAA0C;gBAE3C,GAAG,EAAE,cAAc;IAIzB,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;YAK9B,SAAS;IAsBjB,MAAM,CACV,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,GAC3D,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,QAAQ,CAAA;KAAE,CAAC;IAM1C,KAAK,CACT,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,CACP,OAAO,EAAE,QAAQ,KACd,OAAO,CAAC,cAAc,GAAG,IAAI,GAAG,SAAS,CAAC,GAAG,cAAc,GAAG,IAAI,GAAG,SAAS,GAClF,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,QAAQ,CAAA;KAAE,CAAC;YAqClC,YAAY;YAyBZ,aAAa;CAyD5B;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,cAAc,GAAG,SAAS,CAI3D;AAED,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAEtE"}

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

@@ -1,7 +1,7 @@
 import { readFile, stat } from "node:fs/promises";
 import path from "node:path";
-import { docChanged, extractTaskDoc, mergeTaskDoc, parseTaskReadme, renderTaskReadme, } from "@agentplaneorg/core";
-import { LocalBackend, taskRecordToData } from "../../backends/task-backend.js";
+import { ensureDocSections, docChanged, extractTaskDoc, mergeTaskDoc, parseTaskReadme, renderTaskReadme, setMarkdownSection, } from "@agentplaneorg/core";
+import { LocalBackend, taskRecordToData, } from "../../backends/task-backend.js";
 import { exitCodeForError } from "../../cli/exit-codes.js";
 import { CliError } from "../../shared/errors.js";
 import { writeTextIfChanged } from "../../shared/write-if-changed.js";
@@ -12,6 +12,94 @@ function taskReadmePath(ctx, taskId) {
 function normalizeTaskDocVersion(value, fallback = 2) {
     return value === 3 ? 3 : value === 2 ? 2 : fallback;
 }
+function normalizeDocComparison(text) {
+    return String(text ?? "")
+        .replaceAll("\r\n", "\n")
+        .trim();
+}
+function extractDocSectionText(doc, sectionName) {
+    const lines = doc.replaceAll("\r\n", "\n").split("\n");
+    let capturing = false;
+    const out = [];
+    for (const line of lines) {
+        const match = /^##\s+(.*)$/.exec(line.trim());
+        if (match) {
+            if (capturing)
+                break;
+            capturing = (match[1] ?? "").trim() === sectionName;
+            continue;
+        }
+        if (capturing)
+            out.push(line);
+    }
+    if (!capturing)
+        return null;
+    return out.join("\n").trimEnd();
+}
+function normalizeComments(task) {
+    return Array.isArray(task.comments)
+        ? task.comments.filter((item) => !!item && typeof item.author === "string" && typeof item.body === "string")
+        : [];
+}
+function normalizeEvents(task) {
+    return Array.isArray(task.events)
+        ? task.events.filter((item) => !!item &&
+            typeof item.type === "string" &&
+            typeof item.at === "string" &&
+            typeof item.author === "string")
+        : [];
+}
+function isConcurrentReadmeChangeError(err) {
+    return (err instanceof CliError &&
+        err.code === "E_IO" &&
+        err.message.startsWith("Task README changed concurrently:"));
+}
+function throwTaskSectionConflict(opts) {
+    throw new CliError({
+        exitCode: exitCodeForError("E_VALIDATION"),
+        code: "E_VALIDATION",
+        message: `Task README section changed concurrently: ${opts.taskId} ## ${opts.section} ` +
+            "(re-read the task and re-apply your change)",
+        context: {
+            task_id: opts.taskId,
+            section: opts.section,
+            reason_code: "task_readme_section_conflict",
+        },
+    });
+}
+function throwTaskDocConflict(opts) {
+    throw new CliError({
+        exitCode: exitCodeForError("E_VALIDATION"),
+        code: "E_VALIDATION",
+        message: `Task README changed concurrently: ${opts.taskId} ` +
+            "(re-read the task and re-apply your change)",
+        context: {
+            task_id: opts.taskId,
+            reason_code: "task_readme_conflict",
+        },
+    });
+}
+function applyTaskDocPatch(opts) {
+    if (opts.patch.kind === "replace-doc") {
+        if (opts.patch.expectedCurrentDoc !== undefined) {
+            const currentDoc = normalizeDocComparison(opts.currentDocRaw);
+            const expectedDoc = normalizeDocComparison(opts.patch.expectedCurrentDoc);
+            if (currentDoc !== expectedDoc) {
+                throwTaskDocConflict({ taskId: opts.taskId });
+            }
+        }
+        return opts.patch.doc;
+    }
+    const baseDoc = ensureDocSections(opts.currentDocRaw, opts.patch.requiredSections);
+    if (opts.patch.expectedCurrentText !== undefined) {
+        const currentSection = normalizeDocComparison(extractDocSectionText(baseDoc, opts.patch.section));
+        const expectedSection = normalizeDocComparison(opts.patch.expectedCurrentText);
+        if (currentSection !== expectedSection) {
+            throwTaskSectionConflict({ taskId: opts.taskId, section: opts.patch.section });
+        }
+    }
+    return ensureDocSections(setMarkdownSection(baseDoc, opts.patch.section, opts.patch.text), opts.patch.requiredSections);
+}
 async function readTaskReadmeCached(opts) {
     const readmePath = taskReadmePath(opts.ctx, opts.taskId);
     let text;
@@ -82,64 +170,100 @@ export class TaskStore {
         return await load;
     }
     async update(taskId, updater) {
-        // One retry on concurrent modification: re-read latest and re-apply updater.
-        for (let attempt = 0; attempt < 2; attempt++) {
-            const entry = await this.getCached(taskId);
+        return await this.runWithRetry(taskId, async (entry) => {
+            return await updater({ ...entry.task });
+        });
+    }
+    async patch(taskId, builder) {
+        return await this.runWithRetry(taskId, async (entry) => {
+            const patch = await builder({ ...entry.task });
+            if (!patch)
+                return { ...entry.task };
             const current = entry.task;
-            const next = await updater({ ...current });
-            // Start from existing frontmatter to preserve any unknown keys.
-            const frontmatter = { ...entry.parsed.frontmatter, ...taskDataToFrontmatter(next) };
-            let body = entry.parsed.body ?? "";
-            const existingDoc = extractTaskDoc(body);
-            const now = new Date().toISOString();
-            const currentDocVersion = normalizeTaskDocVersion(entry.parsed.frontmatter.doc_version);
-            const requestedDocVersion = normalizeTaskDocVersion(next.doc_version, currentDocVersion);
-            if (next.doc !== undefined) {
-                const nextDoc = String(next.doc ?? "");
-                body = mergeTaskDoc(body, nextDoc);
-                if (docChanged(existingDoc, nextDoc) || !frontmatter.doc_updated_at) {
-                    frontmatter.doc_version = requestedDocVersion;
-                    frontmatter.doc_updated_at = now;
-                    frontmatter.doc_updated_by = resolveDocUpdatedBy(next);
-                }
+            const next = patch.task ? { ...current, ...patch.task } : { ...current };
+            if (patch.appendComments && patch.appendComments.length > 0) {
+                next.comments = [...normalizeComments(current), ...patch.appendComments];
             }
-            frontmatter.doc_version = normalizeTaskDocVersion(frontmatter.doc_version, requestedDocVersion);
-            if (typeof frontmatter.doc_updated_at !== "string" ||
-                frontmatter.doc_updated_at.trim() === "") {
-                frontmatter.doc_updated_at = now;
+            if (patch.appendEvents && patch.appendEvents.length > 0) {
+                next.events = [...normalizeEvents(current), ...patch.appendEvents];
             }
-            if (typeof frontmatter.doc_updated_by !== "string" ||
-                frontmatter.doc_updated_by.trim() === "") {
-                frontmatter.doc_updated_by = resolveDocUpdatedBy(next);
+            if (patch.doc) {
+                next.doc = applyTaskDocPatch({
+                    taskId: current.id,
+                    currentDocRaw: String(current.doc ?? ""),
+                    patch: patch.doc,
+                });
             }
-            const rendered = renderTaskReadme(frontmatter, body);
+            const touchDoc = patch.doc !== undefined || patch.docMeta?.touch === true;
+            if (touchDoc) {
+                const currentDocVersion = normalizeTaskDocVersion(entry.parsed.frontmatter.doc_version);
+                next.doc_version = normalizeTaskDocVersion(patch.docMeta?.version ?? current.doc_version, currentDocVersion);
+                next.doc_updated_at = new Date().toISOString();
+                next.doc_updated_by = patch.docMeta?.updatedBy ?? resolveDocUpdatedBy(next);
+            }
+            return next;
+        });
+    }
+    async runWithRetry(taskId, computeNext) {
+        for (let attempt = 0; attempt < 2; attempt++) {
+            const entry = await this.getCached(taskId);
+            const next = await computeNext(entry);
             try {
-                await ensureUnchangedOnDisk({
-                    readmePath: entry.readmePath,
-                    expectedMtimeMs: entry.mtimeMs,
-                });
+                return await this.writeNextTask(taskId, entry, next);
             }
             catch (err) {
-                if (attempt === 0 && err instanceof CliError) {
+                if (attempt === 0 && isConcurrentReadmeChangeError(err)) {
                     // Refresh cache and retry once.
                     this.cache.delete(taskId);
                     continue;
                 }
                 throw err;
             }
-            const nextText = rendered.endsWith("\n") ? rendered : `${rendered}\n`;
-            const changed = await writeTextIfChanged(entry.readmePath, nextText);
-            // Refresh cache with latest content on disk.
-            this.cache.set(taskId, (async () => {
-                return await readTaskReadmeCached({ ctx: this.ctx, taskId });
-            })());
-            const updated = await this.get(taskId);
-            return { changed, task: updated };
         }
         // Unreachable, but keeps TS happy.
         const task = await this.get(taskId);
         return { changed: false, task };
     }
+    async writeNextTask(taskId, entry, next) {
+        // Start from existing frontmatter to preserve any unknown keys.
+        const frontmatter = { ...entry.parsed.frontmatter, ...taskDataToFrontmatter(next) };
+        let body = entry.parsed.body ?? "";
+        const existingDoc = extractTaskDoc(body);
+        const now = new Date().toISOString();
+        const currentDocVersion = normalizeTaskDocVersion(entry.parsed.frontmatter.doc_version);
+        const requestedDocVersion = normalizeTaskDocVersion(next.doc_version, currentDocVersion);
+        if (next.doc !== undefined) {
+            const nextDoc = String(next.doc ?? "");
+            body = mergeTaskDoc(body, nextDoc);
+            if (docChanged(existingDoc, nextDoc) || !frontmatter.doc_updated_at) {
+                frontmatter.doc_version = requestedDocVersion;
+                frontmatter.doc_updated_at = now;
+                frontmatter.doc_updated_by = resolveDocUpdatedBy(next);
+            }
+        }
+        frontmatter.doc_version = normalizeTaskDocVersion(frontmatter.doc_version, requestedDocVersion);
+        if (typeof frontmatter.doc_updated_at !== "string" ||
+            frontmatter.doc_updated_at.trim() === "") {
+            frontmatter.doc_updated_at = now;
+        }
+        if (typeof frontmatter.doc_updated_by !== "string" ||
+            frontmatter.doc_updated_by.trim() === "") {
+            frontmatter.doc_updated_by = resolveDocUpdatedBy(next);
+        }
+        const rendered = renderTaskReadme(frontmatter, body);
+        await ensureUnchangedOnDisk({
+            readmePath: entry.readmePath,
+            expectedMtimeMs: entry.mtimeMs,
+        });
+        const nextText = rendered.endsWith("\n") ? rendered : `${rendered}\n`;
+        const changed = await writeTextIfChanged(entry.readmePath, nextText);
+        // Refresh cache with latest content on disk.
+        this.cache.set(taskId, (async () => {
+            return await readTaskReadmeCached({ ctx: this.ctx, taskId });
+        })());
+        const updated = await this.get(taskId);
+        return { changed, task: updated };
+    }
 }
 export function getTaskStore(ctx) {
     const memo = ctx.memo;

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

@@ -1 +1 @@
-{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../../src/commands/task/block.ts"],"names":[],"mappings":"AAQA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AAiBnC,wBAAsB,QAAQ,CAAC,IAAI,EAAE;IACnC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,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,mBAAmB,EAAE,OAAO,CAAC;IAC7B,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CA+HlB"}
+{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../../src/commands/task/block.ts"],"names":[],"mappings":"AAOA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AAiBnC,wBAAsB,QAAQ,CAAC,IAAI,EAAE;IACnC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,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,mBAAmB,EAAE,OAAO,CAAC;IAC7B,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CA2IlB"}

package/dist/commands/task/block.js

@@ -1,5 +1,5 @@
 import { mapBackendError } from "../../cli/error-map.js";
-import { invalidValueMessage, successMessage } from "../../cli/output.js";
+import { successMessage } from "../../cli/output.js";
 import { formatCommentBodyForCommit } from "../../shared/comment-format.js";
 import { CliError } from "../../shared/errors.js";
 import { commitFromComment } from "../guard/index.js";
@@ -7,7 +7,7 @@ import { ensureActionApproved } from "../shared/approval-requirements.js";
 import { loadCommandContext, loadTaskFromContext, } from "../shared/task-backend.js";
 import { backendIsLocalFileBackend, getTaskStore } from "../shared/task-store.js";
 import { readDirectWorkLock } from "../../shared/direct-work-lock.js";
-import { appendTaskEvent, defaultCommitEmojiForAgentId, ensureCommentCommitAllowed, ensureStatusTransitionAllowed, normalizeTaskDocVersion, nowIso, requireStructuredComment, resolvePrimaryTag, toStringArray, } from "./shared.js";
+import { appendTaskEvent, defaultCommitEmojiForStatus, ensureCommentCommitAllowed, ensureStatusTransitionAllowed, normalizeTaskDocVersion, nowIso, requireStructuredComment, resolvePrimaryTag, toStringArray, } from "./shared.js";
 export async function cmdBlock(opts) {
     try {
         const ctx = opts.ctx ??
@@ -51,25 +51,50 @@ export async function cmdBlock(opts) {
             : [];
         const commentsValue = [...existingComments, { author: opts.author, body: commentBody }];
         const at = nowIso();
-        const nextTask = {
-            ...task,
-            status: "BLOCKED",
-            comments: commentsValue,
-            events: appendTaskEvent(task, {
-                type: "status",
-                at,
-                author: opts.author,
-                from: currentStatus,
-                to: "BLOCKED",
-                note: commentBody,
-            }),
-            doc_version: normalizeTaskDocVersion(task.doc_version),
-            doc_updated_at: at,
-            doc_updated_by: opts.author,
-        };
         await (useStore
-            ? store.update(opts.taskId, () => nextTask)
-            : ctx.taskBackend.writeTask(nextTask));
+            ? store.patch(opts.taskId, (current) => {
+                const currentStatus = String(current.status || "TODO").toUpperCase();
+                ensureStatusTransitionAllowed({
+                    currentStatus,
+                    nextStatus: "BLOCKED",
+                    force: opts.force,
+                });
+                return {
+                    task: { status: "BLOCKED" },
+                    appendComments: [{ author: opts.author, body: commentBody }],
+                    appendEvents: [
+                        {
+                            type: "status",
+                            at,
+                            author: opts.author,
+                            from: currentStatus,
+                            to: "BLOCKED",
+                            note: commentBody,
+                        },
+                    ],
+                    docMeta: {
+                        touch: true,
+                        updatedBy: opts.author,
+                        version: normalizeTaskDocVersion(current.doc_version),
+                    },
+                };
+            })
+            : ctx.taskBackend.writeTask({
+                ...task,
+                status: "BLOCKED",
+                comments: commentsValue,
+                events: appendTaskEvent(task, {
+                    type: "status",
+                    at,
+                    author: opts.author,
+                    from: currentStatus,
+                    to: "BLOCKED",
+                    note: commentBody,
+                }),
+                doc_version: normalizeTaskDocVersion(task.doc_version),
+                doc_updated_at: at,
+                doc_updated_by: opts.author,
+            }));
         let commitInfo = null;
         if (opts.commitFromComment) {
             const mode = ctx.config.workflow_mode;
@@ -80,14 +105,6 @@ export async function cmdBlock(opts) {
                 if (lockAgent)
                     executorAgent = lockAgent;
             }
-            const expectedEmoji = await defaultCommitEmojiForAgentId(ctx, executorAgent);
-            if (typeof opts.commitEmoji === "string" && opts.commitEmoji.trim() !== expectedEmoji) {
-                throw new CliError({
-                    exitCode: 2,
-                    code: "E_USAGE",
-                    message: invalidValueMessage("--commit-emoji", opts.commitEmoji, `${expectedEmoji} (executor agent=${executorAgent})`),
-                });
-            }
             commitInfo = await commitFromComment({
                 ctx,
                 cwd: opts.cwd,
@@ -100,7 +117,7 @@ export async function cmdBlock(opts) {
                 statusTo: "BLOCKED",
                 commentBody: opts.body,
                 formattedComment,
-                emoji: opts.commitEmoji ?? expectedEmoji,
+                emoji: opts.commitEmoji ?? defaultCommitEmojiForStatus("BLOCKED"),
                 allow: opts.commitAllow,
                 autoAllow: opts.commitAutoAllow || opts.commitAllow.length === 0,
                 allowTasks: opts.commitAllowTasks,

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":"AAIA,OAAO,EAAuB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AASrF,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,CAuFlB"}
+{"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;AAIrF,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,CA2DlB"}

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

@@ -3,7 +3,7 @@ import { CliError } from "../../shared/errors.js";
 import { ensureActionApproved } from "../shared/approval-requirements.js";
 import { loadTaskFromContext } from "../shared/task-backend.js";
 import { backendIsLocalFileBackend, getTaskStore } from "../shared/task-store.js";
-import { appendTaskEvent, normalizeTaskDocVersion, nowIso, requireStructuredComment, } from "./shared.js";
+import { recordVerifiedNoopClosure } from "./close-shared.js";
 export async function cmdTaskCloseDuplicate(opts) {
     try {
         const sourceId = opts.taskId.trim();
@@ -36,47 +36,22 @@ export async function cmdTaskCloseDuplicate(opts) {
         const task = useStore
             ? await store.get(sourceId)
             : await loadTaskFromContext({ ctx: opts.ctx, taskId: sourceId });
-        if (!opts.force && String(task.status || "TODO").toUpperCase() === "DONE") {
-            throw new CliError({
-                exitCode: 2,
-                code: "E_USAGE",
-                message: `Task is already DONE: ${sourceId} (use --force to override)`,
-            });
-        }
         const reason = opts.note?.trim();
         const canonicalTitle = canonical.title?.trim() ? ` (${canonical.title.trim()})` : "";
         const baseBody = `Verified: ${sourceId} is a bookkeeping duplicate of ${duplicateOf}${canonicalTitle}; ` +
             "no code/config changes are expected in this task and closure is recorded as no-op.";
         const body = reason ? `${baseBody}\n\nReason: ${reason}` : baseBody;
-        const verifiedCfg = opts.ctx.config.tasks.comments.verified;
-        requireStructuredComment(body, verifiedCfg.prefix, verifiedCfg.min_chars);
-        const at = nowIso();
-        const next = {
-            ...task,
-            status: "DONE",
-            comments: [
-                ...(Array.isArray(task.comments) ? task.comments : []),
-                { author: opts.author, body },
-            ],
-            events: appendTaskEvent(task, {
-                type: "status",
-                at,
-                author: opts.author,
-                from: String(task.status || "TODO").toUpperCase(),
-                to: "DONE",
-                note: body,
-            }),
-            result_summary: `Closed as duplicate of ${duplicateOf}.`,
-            risk_level: "low",
-            breaking: false,
-            doc_version: normalizeTaskDocVersion(task.doc_version),
-            doc_updated_at: at,
-            doc_updated_by: opts.author,
-        };
-        await (useStore ? store.update(sourceId, () => next) : opts.ctx.taskBackend.writeTask(next));
-        if (!opts.quiet) {
-            process.stdout.write(`task.done: ${sourceId} (duplicate of ${duplicateOf})\n`);
-        }
+        await recordVerifiedNoopClosure({
+            ctx: opts.ctx,
+            task,
+            taskId: sourceId,
+            author: opts.author,
+            body,
+            resultSummary: `Closed as duplicate of ${duplicateOf}.`,
+            quiet: opts.quiet,
+            successMessage: `task.done: ${sourceId} (duplicate of ${duplicateOf})`,
+            force: opts.force,
+        });
         return 0;
     }
     catch (err) {

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

@@ -1 +1 @@
-{"version":3,"file":"close-noop.d.ts","sourceRoot":"","sources":["../../../src/commands/task/close-noop.ts"],"names":[],"mappings":"AAIA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAQpF,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,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,CAsElB"}
+{"version":3,"file":"close-noop.d.ts","sourceRoot":"","sources":["../../../src/commands/task/close-noop.ts"],"names":[],"mappings":"AAIA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAGpF,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,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"}

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

@@ -3,7 +3,7 @@ import { CliError } from "../../shared/errors.js";
 import { ensureActionApproved } from "../shared/approval-requirements.js";
 import { backendIsLocalFileBackend, getTaskStore } from "../shared/task-store.js";
 import { loadCommandContext } from "../shared/task-backend.js";
-import { appendTaskEvent, normalizeTaskDocVersion, nowIso, requireStructuredComment, } from "./shared.js";
+import { recordVerifiedNoopClosure } from "./close-shared.js";
 export async function cmdTaskCloseNoop(opts) {
     try {
         const ctx = opts.ctx ??
@@ -38,35 +38,17 @@ export async function cmdTaskCloseNoop(opts) {
         const normalizedNote = opts.note?.trim();
         const baseBody = "Verified: no implementation changes were required; closure is recorded as no-op bookkeeping.";
         const body = normalizedNote ? `${baseBody}\n\nNote: ${normalizedNote}` : baseBody;
-        const verifiedCfg = ctx.config.tasks.comments.verified;
-        requireStructuredComment(body, verifiedCfg.prefix, verifiedCfg.min_chars);
-        const at = nowIso();
-        const next = {
-            ...task,
-            status: "DONE",
-            comments: [
-                ...(Array.isArray(task.comments) ? task.comments : []),
-                { author: opts.author, body },
-            ],
-            events: appendTaskEvent(task, {
-                type: "status",
-                at,
-                author: opts.author,
-                from: String(task.status || "TODO").toUpperCase(),
-                to: "DONE",
-                note: body,
-            }),
-            result_summary: "No-op closure recorded.",
-            risk_level: "low",
-            breaking: false,
-            doc_version: normalizeTaskDocVersion(task.doc_version),
-            doc_updated_at: at,
-            doc_updated_by: opts.author,
-        };
-        await (useStore ? store.update(opts.taskId, () => next) : ctx.taskBackend.writeTask(next));
-        if (!opts.quiet) {
-            process.stdout.write(`task.done: ${opts.taskId} (no-op)\n`);
-        }
+        await recordVerifiedNoopClosure({
+            ctx,
+            task,
+            taskId: opts.taskId,
+            author: opts.author,
+            body,
+            resultSummary: "No-op closure recorded.",
+            quiet: opts.quiet,
+            successMessage: `task.done: ${opts.taskId} (no-op)`,
+            force: opts.force,
+        });
         return 0;
     }
     catch (err) {