agentplane 0.3.6 → 0.3.7

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

@@ -1,41 +1,52 @@
 import { readFile, stat } from "node:fs/promises";
 import path from "node:path";
-import { ensureDocSections, docChanged, extractTaskDoc, mergeTaskDoc, parseTaskReadme, renderTaskReadme, setMarkdownSection, } from "@agentplaneorg/core";
+import { docChanged, extractTaskDoc, mergeTaskDoc, parseTaskReadme, renderTaskReadme, renderTaskDocFromSections, taskDocToSectionMap, } 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";
 import { resolveDocUpdatedBy, taskDataToFrontmatter } from "./task-backend.js";
+export function setTaskFieldsIntent(task) {
+    return { kind: "set-task-fields", task };
+}
+export function appendTaskCommentsIntent(comments) {
+    return { kind: "append-comments", comments };
+}
+export function appendTaskCommentIntent(comment) {
+    return appendTaskCommentsIntent([comment]);
+}
+export function appendTaskEventsIntent(events) {
+    return { kind: "append-events", events };
+}
+export function appendTaskEventIntent(event) {
+    return appendTaskEventsIntent([event]);
+}
+export function replaceTaskDocIntent(opts) {
+    return { kind: "replace-doc", ...opts };
+}
+export function setTaskSectionIntent(opts) {
+    return { kind: "set-section", ...opts };
+}
+export function touchTaskDocMetaIntent(opts = {}) {
+    return { kind: "touch-doc-meta", ...opts };
+}
 function taskReadmePath(ctx, taskId) {
     return path.join(ctx.resolvedProject.gitRoot, ctx.config.paths.workflow_dir, taskId, "README.md");
 }
-function normalizeTaskDocVersion(value, fallback = 2) {
+function normalizeTaskDocVersion(value, fallback = 3) {
     return value === 3 ? 3 : value === 2 ? 2 : fallback;
 }
+function normalizeTaskRevision(value, fallback = 1) {
+    return Number.isInteger(value) && Number(value) > 0 ? Number(value) : fallback;
+}
+function readStoredTaskRevision(value) {
+    return Number.isInteger(value) && Number(value) > 0 ? Number(value) : null;
+}
 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")
@@ -79,6 +90,20 @@ function throwTaskDocConflict(opts) {
         },
     });
 }
+function throwTaskRevisionConflict(opts) {
+    throw new CliError({
+        exitCode: exitCodeForError("E_VALIDATION"),
+        code: "E_VALIDATION",
+        message: `Task revision changed concurrently: ${opts.taskId} ` +
+            `(expected revision ${opts.expectedRevision}, current revision ${opts.currentRevision})`,
+        context: {
+            task_id: opts.taskId,
+            expected_revision: opts.expectedRevision,
+            current_revision: opts.currentRevision,
+            reason_code: "task_revision_conflict",
+        },
+    });
+}
 function applyTaskDocPatch(opts) {
     if (opts.patch.kind === "replace-doc") {
         if (opts.patch.expectedCurrentDoc !== undefined) {
@@ -88,17 +113,209 @@ function applyTaskDocPatch(opts) {
                 throwTaskDocConflict({ taskId: opts.taskId });
             }
         }
-        return opts.patch.doc;
+        return renderTaskDocFromSections(taskDocToSectionMap(opts.patch.doc));
+    }
+    const sections = taskDocToSectionMap(opts.currentDocRaw);
+    for (const requiredSection of opts.patch.requiredSections) {
+        if (!(requiredSection in sections))
+            sections[requiredSection] = "";
     }
-    const baseDoc = ensureDocSections(opts.currentDocRaw, opts.patch.requiredSections);
     if (opts.patch.expectedCurrentText !== undefined) {
-        const currentSection = normalizeDocComparison(extractDocSectionText(baseDoc, opts.patch.section));
+        const currentSection = normalizeDocComparison(sections[opts.patch.section] ?? null);
         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);
+    sections[opts.patch.section] = opts.patch.text.replaceAll("\r\n", "\n").trimEnd();
+    return renderTaskDocFromSections(sections);
+}
+function normalizeTaskStoreIntents(intents) {
+    if (!intents)
+        return [];
+    if (Array.isArray(intents)) {
+        return intents.filter((intent) => intent != null);
+    }
+    return [intents];
+}
+function patchToIntents(patch) {
+    if (!patch)
+        return [];
+    const intents = [];
+    if (patch.task) {
+        intents.push(setTaskFieldsIntent(patch.task));
+    }
+    if (patch.appendComments && patch.appendComments.length > 0) {
+        intents.push(appendTaskCommentsIntent(patch.appendComments));
+    }
+    if (patch.appendEvents && patch.appendEvents.length > 0) {
+        intents.push(appendTaskEventsIntent(patch.appendEvents));
+    }
+    if (patch.doc) {
+        intents.push(patch.doc.kind === "replace-doc"
+            ? replaceTaskDocIntent({
+                doc: patch.doc.doc,
+                expectedCurrentDoc: patch.doc.expectedCurrentDoc,
+            })
+            : setTaskSectionIntent({
+                section: patch.doc.section,
+                text: patch.doc.text,
+                requiredSections: patch.doc.requiredSections,
+                expectedCurrentText: patch.doc.expectedCurrentText,
+            }));
+    }
+    if (patch.docMeta && (patch.doc !== undefined || patch.docMeta.touch === true)) {
+        intents.push(touchTaskDocMetaIntent({
+            updatedBy: patch.docMeta.updatedBy,
+            version: patch.docMeta.version,
+        }));
+    }
+    return intents;
+}
+export function taskStorePatchFromIntents(intents) {
+    const normalized = normalizeTaskStoreIntents(intents);
+    if (normalized.length === 0)
+        return null;
+    const patch = {};
+    for (const intent of normalized) {
+        switch (intent.kind) {
+            case "set-task-fields": {
+                patch.task = patch.task ? { ...patch.task, ...intent.task } : { ...intent.task };
+                break;
+            }
+            case "append-comments": {
+                if (intent.comments.length > 0) {
+                    patch.appendComments = [...(patch.appendComments ?? []), ...intent.comments];
+                }
+                break;
+            }
+            case "append-events": {
+                if (intent.events.length > 0) {
+                    patch.appendEvents = [...(patch.appendEvents ?? []), ...intent.events];
+                }
+                break;
+            }
+            case "replace-doc": {
+                const docPatch = {
+                    kind: "replace-doc",
+                    doc: intent.doc,
+                };
+                if (intent.expectedCurrentDoc === undefined) {
+                    patch.doc = docPatch;
+                    break;
+                }
+                docPatch.expectedCurrentDoc = intent.expectedCurrentDoc;
+                patch.doc = docPatch;
+                break;
+            }
+            case "set-section": {
+                const sectionPatch = {
+                    kind: "set-section",
+                    section: intent.section,
+                    text: intent.text,
+                    requiredSections: [...intent.requiredSections],
+                };
+                if (intent.expectedCurrentText === undefined) {
+                    patch.doc = sectionPatch;
+                    break;
+                }
+                sectionPatch.expectedCurrentText = intent.expectedCurrentText;
+                patch.doc = sectionPatch;
+                break;
+            }
+            case "touch-doc-meta": {
+                patch.docMeta = {
+                    touch: true,
+                    updatedBy: intent.updatedBy ?? patch.docMeta?.updatedBy,
+                    version: intent.version ?? patch.docMeta?.version,
+                };
+                break;
+            }
+        }
+    }
+    return patch;
+}
+export async function mutateTaskStore(store, taskId, builder, opts = {}) {
+    if (typeof store.mutate === "function") {
+        return await store.mutate(taskId, builder, opts);
+    }
+    return await store.patch(taskId, async (current) => taskStorePatchFromIntents(await builder(current)), opts);
+}
+function applyTaskStoreIntents(entry, intents) {
+    if (intents.length === 0)
+        return { ...entry.task };
+    const current = entry.task;
+    const next = { ...current };
+    let touchDoc = false;
+    let docMetaUpdatedBy;
+    let docMetaVersion;
+    for (const intent of intents) {
+        switch (intent.kind) {
+            case "set-task-fields": {
+                Object.assign(next, intent.task);
+                break;
+            }
+            case "append-comments": {
+                if (intent.comments.length > 0) {
+                    next.comments = [...normalizeComments(next), ...intent.comments];
+                }
+                break;
+            }
+            case "append-events": {
+                if (intent.events.length > 0) {
+                    next.events = [...normalizeEvents(next), ...intent.events];
+                }
+                break;
+            }
+            case "replace-doc": {
+                next.doc = applyTaskDocPatch({
+                    taskId: current.id,
+                    currentDocRaw: String(next.doc ?? ""),
+                    patch: {
+                        kind: "replace-doc",
+                        doc: intent.doc,
+                        expectedCurrentDoc: intent.expectedCurrentDoc,
+                    },
+                });
+                next.sections = taskDocToSectionMap(String(next.doc ?? ""));
+                touchDoc = true;
+                break;
+            }
+            case "set-section": {
+                next.doc = applyTaskDocPatch({
+                    taskId: current.id,
+                    currentDocRaw: String(next.doc ?? ""),
+                    patch: {
+                        kind: "set-section",
+                        section: intent.section,
+                        text: intent.text,
+                        requiredSections: intent.requiredSections,
+                        expectedCurrentText: intent.expectedCurrentText,
+                    },
+                });
+                next.sections = taskDocToSectionMap(String(next.doc ?? ""));
+                touchDoc = true;
+                break;
+            }
+            case "touch-doc-meta": {
+                touchDoc = true;
+                if (intent.updatedBy !== undefined) {
+                    docMetaUpdatedBy = intent.updatedBy;
+                }
+                if (intent.version !== undefined) {
+                    docMetaVersion = intent.version;
+                }
+                break;
+            }
+        }
+    }
+    if (touchDoc) {
+        const currentDocVersion = normalizeTaskDocVersion(entry.parsed.frontmatter.doc_version);
+        next.doc_version = normalizeTaskDocVersion(docMetaVersion ?? next.doc_version, currentDocVersion);
+        next.doc_updated_at = new Date().toISOString();
+        next.doc_updated_by = docMetaUpdatedBy ?? resolveDocUpdatedBy(next);
+    }
+    return next;
 }
 async function readTaskReadmeCached(opts) {
     const readmePath = taskReadmePath(opts.ctx, opts.taskId);
@@ -126,7 +343,7 @@ async function readTaskReadmeCached(opts) {
         body: parsed.body,
         readmePath,
     });
-    return { task, readmePath, mtimeMs: st.mtimeMs, parsed };
+    return { task, readmePath, mtimeMs: st.mtimeMs, parsed, rawText: text };
 }
 async function ensureUnchangedOnDisk(opts) {
     const st = await stat(opts.readmePath);
@@ -138,6 +355,18 @@ async function ensureUnchangedOnDisk(opts) {
         });
     }
 }
+async function didReadmeChangeOnDisk(opts) {
+    try {
+        const st = await stat(opts.readmePath);
+        return st.mtimeMs !== opts.expectedMtimeMs;
+    }
+    catch (err) {
+        const code = err?.code;
+        if (code === "ENOENT")
+            return true;
+        throw err;
+    }
+}
 export class TaskStore {
     ctx;
     cache = new Map();
@@ -169,45 +398,47 @@ export class TaskStore {
         this.cache.set(key, load);
         return await load;
     }
-    async update(taskId, updater) {
-        return await this.runWithRetry(taskId, async (entry) => {
+    async update(taskId, updater, opts = {}) {
+        return await this.runWithRetry(taskId, opts, 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 = patch.task ? { ...current, ...patch.task } : { ...current };
-            if (patch.appendComments && patch.appendComments.length > 0) {
-                next.comments = [...normalizeComments(current), ...patch.appendComments];
-            }
-            if (patch.appendEvents && patch.appendEvents.length > 0) {
-                next.events = [...normalizeEvents(current), ...patch.appendEvents];
-            }
-            if (patch.doc) {
-                next.doc = applyTaskDocPatch({
-                    taskId: current.id,
-                    currentDocRaw: String(current.doc ?? ""),
-                    patch: patch.doc,
-                });
-            }
-            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 patch(taskId, builder, opts = {}) {
+        return await this.mutate(taskId, async (current) => patchToIntents(await builder(current)), opts);
+    }
+    async mutate(taskId, builder, opts = {}) {
+        return await this.runWithRetry(taskId, opts, async (entry) => {
+            const intents = normalizeTaskStoreIntents(await builder({ ...entry.task }));
+            return applyTaskStoreIntents(entry, intents);
         });
     }
-    async runWithRetry(taskId, computeNext) {
+    async runWithRetry(taskId, opts, computeNext) {
         for (let attempt = 0; attempt < 2; attempt++) {
             const entry = await this.getCached(taskId);
-            const next = await computeNext(entry);
+            if (opts.expectedRevision !== undefined) {
+                const expectedRevision = normalizeTaskRevision(opts.expectedRevision);
+                const currentRevision = normalizeTaskRevision(entry.task.revision);
+                if (currentRevision !== expectedRevision) {
+                    throwTaskRevisionConflict({ taskId, expectedRevision, currentRevision });
+                }
+            }
+            let next;
+            try {
+                next = await computeNext(entry);
+            }
+            catch (err) {
+                if (attempt === 0 &&
+                    err instanceof CliError &&
+                    err.code === "E_VALIDATION" &&
+                    (await didReadmeChangeOnDisk({
+                        readmePath: entry.readmePath,
+                        expectedMtimeMs: entry.mtimeMs,
+                    }))) {
+                    this.cache.delete(taskId);
+                    continue;
+                }
+                throw err;
+            }
             try {
                 return await this.writeNextTask(taskId, entry, next);
             }
@@ -250,12 +481,19 @@ export class TaskStore {
             frontmatter.doc_updated_by.trim() === "") {
             frontmatter.doc_updated_by = resolveDocUpdatedBy(next);
         }
-        const rendered = renderTaskReadme(frontmatter, body);
+        const storedRevision = readStoredTaskRevision(entry.parsed.frontmatter.revision);
+        frontmatter.revision = storedRevision ?? 1;
+        let nextText = renderTaskReadme(frontmatter, body);
+        nextText = nextText.endsWith("\n") ? nextText : `${nextText}\n`;
+        if (storedRevision !== null && nextText !== entry.rawText) {
+            frontmatter.revision = storedRevision + 1;
+            nextText = renderTaskReadme(frontmatter, body);
+            nextText = nextText.endsWith("\n") ? nextText : `${nextText}\n`;
+        }
         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 () => {

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":"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"}
+{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../../src/commands/task/block.ts"],"names":[],"mappings":"AAOA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AA0BnC,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,CAgKlB"}

package/dist/commands/task/block.js

@@ -1,13 +1,13 @@
 import { mapBackendError } from "../../cli/error-map.js";
-import { successMessage } from "../../cli/output.js";
+import { successMessage, warnMessage } from "../../cli/output.js";
 import { formatCommentBodyForCommit } from "../../shared/comment-format.js";
 import { CliError } from "../../shared/errors.js";
 import { commitFromComment } from "../guard/index.js";
 import { ensureActionApproved } from "../shared/approval-requirements.js";
 import { loadCommandContext, loadTaskFromContext, } from "../shared/task-backend.js";
-import { backendIsLocalFileBackend, getTaskStore } from "../shared/task-store.js";
+import { appendTaskCommentIntent, appendTaskEventIntent, backendIsLocalFileBackend, getTaskStore, mutateTaskStore, setTaskFieldsIntent, touchTaskDocMetaIntent, } from "../shared/task-store.js";
 import { readDirectWorkLock } from "../../shared/direct-work-lock.js";
-import { appendTaskEvent, defaultCommitEmojiForStatus, ensureCommentCommitAllowed, ensureStatusTransitionAllowed, normalizeTaskDocVersion, nowIso, requireStructuredComment, resolvePrimaryTag, toStringArray, } from "./shared.js";
+import { appendTaskEvent, defaultCommitEmojiForStatus, ensureCommentCommitAllowed, resolveCommentCommitWarning, ensureStatusTransitionAllowed, normalizeTaskDocVersion, nowIso, requireStructuredComment, resolvePrimaryTag, toStringArray, } from "./shared.js";
 export async function cmdBlock(opts) {
     try {
         const ctx = opts.ctx ??
@@ -28,20 +28,22 @@ export async function cmdBlock(opts) {
             ? await store.get(opts.taskId)
             : await loadTaskFromContext({ ctx, taskId: opts.taskId });
         const currentStatus = String(task.status || "TODO").toUpperCase();
-        ensureStatusTransitionAllowed({
-            currentStatus,
-            nextStatus: "BLOCKED",
-            force: opts.force,
-        });
-        ensureCommentCommitAllowed({
-            enabled: opts.commitFromComment,
-            config: ctx.config,
-            action: "block",
-            confirmed: opts.confirmStatusCommit,
-            quiet: opts.quiet,
-            statusFrom: currentStatus,
-            statusTo: "BLOCKED",
-        });
+        if (!useStore) {
+            ensureStatusTransitionAllowed({
+                currentStatus,
+                nextStatus: "BLOCKED",
+                force: opts.force,
+            });
+            ensureCommentCommitAllowed({
+                enabled: opts.commitFromComment,
+                config: ctx.config,
+                action: "block",
+                confirmed: opts.confirmStatusCommit,
+                quiet: opts.quiet,
+                statusFrom: currentStatus,
+                statusTo: "BLOCKED",
+            });
+        }
         const formattedComment = opts.commitFromComment
             ? formatCommentBodyForCommit(opts.body, ctx.config)
             : null;
@@ -51,33 +53,47 @@ export async function cmdBlock(opts) {
             : [];
         const commentsValue = [...existingComments, { author: opts.author, body: commentBody }];
         const at = nowIso();
+        let currentStatusForCommit = currentStatus;
+        let primaryTagForCommit = resolvePrimaryTag(toStringArray(task.tags), ctx).primary;
+        let deferredWarnings = [];
         await (useStore
-            ? store.patch(opts.taskId, (current) => {
+            ? mutateTaskStore(store, opts.taskId, (current) => {
+                deferredWarnings = [];
                 const currentStatus = String(current.status || "TODO").toUpperCase();
+                currentStatusForCommit = currentStatus;
+                primaryTagForCommit = resolvePrimaryTag(toStringArray(current.tags), ctx).primary;
                 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,
+                const commitWarning = resolveCommentCommitWarning({
+                    enabled: opts.commitFromComment,
+                    config: ctx.config,
+                    action: "block",
+                    confirmed: opts.confirmStatusCommit,
+                    quiet: opts.quiet,
+                    statusFrom: currentStatus,
+                    statusTo: "BLOCKED",
+                });
+                if (commitWarning)
+                    deferredWarnings.push(commitWarning);
+                return [
+                    setTaskFieldsIntent({ status: "BLOCKED" }),
+                    appendTaskCommentIntent({ author: opts.author, body: commentBody }),
+                    appendTaskEventIntent({
+                        type: "status",
+                        at,
+                        author: opts.author,
+                        from: currentStatus,
+                        to: "BLOCKED",
+                        note: commentBody,
+                    }),
+                    touchTaskDocMetaIntent({
                         updatedBy: opts.author,
                         version: normalizeTaskDocVersion(current.doc_version),
-                    },
-                };
+                    }),
+                ];
             })
             : ctx.taskBackend.writeTask({
                 ...task,
@@ -95,6 +111,11 @@ export async function cmdBlock(opts) {
                 doc_updated_at: at,
                 doc_updated_by: opts.author,
             }));
+        if (!opts.quiet) {
+            for (const warning of new Set(deferredWarnings)) {
+                process.stderr.write(`${warnMessage(warning)}\n`);
+            }
+        }
         let commitInfo = null;
         if (opts.commitFromComment) {
             const mode = ctx.config.workflow_mode;
@@ -110,10 +131,10 @@ export async function cmdBlock(opts) {
                 cwd: opts.cwd,
                 rootOverride: opts.rootOverride,
                 taskId: opts.taskId,
-                primaryTag: resolvePrimaryTag(toStringArray(task.tags), ctx).primary,
+                primaryTag: primaryTagForCommit,
                 executorAgent,
                 author: opts.author,
-                statusFrom: currentStatus,
+                statusFrom: currentStatusForCommit,
                 statusTo: "BLOCKED",
                 commentBody: opts.body,
                 formattedComment,

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

@@ -1 +1 @@
-{"version":3,"file":"close-shared.d.ts","sourceRoot":"","sources":["../../../src/commands/task/close-shared.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAShE,wBAAsB,yBAAyB,CAAC,IAAI,EAAE;IACpD,GAAG,EAAE,cAAc,CAAC;IACpB,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2EhB"}
+{"version":3,"file":"close-shared.d.ts","sourceRoot":"","sources":["../../../src/commands/task/close-shared.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAgBhE,wBAAsB,yBAAyB,CAAC,IAAI,EAAE;IACpD,GAAG,EAAE,cAAc,CAAC;IACpB,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,IAAI,CAAC,CAwEhB"}

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

@@ -1,5 +1,5 @@
 import { CliError } from "../../shared/errors.js";
-import { backendIsLocalFileBackend, getTaskStore } from "../shared/task-store.js";
+import { appendTaskCommentIntent, appendTaskEventIntent, backendIsLocalFileBackend, getTaskStore, setTaskFieldsIntent, touchTaskDocMetaIntent, } from "../shared/task-store.js";
 import { appendTaskEvent, normalizeTaskDocVersion, nowIso, requireStructuredComment, } from "./shared.js";
 export async function recordVerifiedNoopClosure(opts) {
     if (!opts.force && String(opts.task.status || "TODO").toUpperCase() === "DONE") {
@@ -15,7 +15,7 @@ export async function recordVerifiedNoopClosure(opts) {
     const useStore = backendIsLocalFileBackend(opts.ctx);
     const store = useStore ? getTaskStore(opts.ctx) : null;
     await (useStore
-        ? store.patch(opts.taskId, (current) => {
+        ? store.mutate(opts.taskId, (current) => {
             if (!opts.force && String(current.status || "TODO").toUpperCase() === "DONE") {
                 throw new CliError({
                     exitCode: 2,
@@ -23,30 +23,27 @@ export async function recordVerifiedNoopClosure(opts) {
                     message: `Task is already DONE: ${opts.taskId} (use --force to override)`,
                 });
             }
-            return {
-                task: {
+            return [
+                setTaskFieldsIntent({
                     status: "DONE",
                     result_summary: opts.resultSummary,
                     risk_level: "low",
                     breaking: false,
-                },
-                appendComments: [{ author: opts.author, body: opts.body }],
-                appendEvents: [
-                    {
-                        type: "status",
-                        at,
-                        author: opts.author,
-                        from: String(current.status || "TODO").toUpperCase(),
-                        to: "DONE",
-                        note: opts.body,
-                    },
-                ],
-                docMeta: {
-                    touch: true,
+                }),
+                appendTaskCommentIntent({ author: opts.author, body: opts.body }),
+                appendTaskEventIntent({
+                    type: "status",
+                    at,
+                    author: opts.author,
+                    from: String(current.status || "TODO").toUpperCase(),
+                    to: "DONE",
+                    note: opts.body,
+                }),
+                touchTaskDocMetaIntent({
                     updatedBy: opts.author,
                     version: normalizeTaskDocVersion(current.doc_version),
-                },
-            };
+                }),
+            ];
         })
         : opts.ctx.taskBackend.writeTask({
             ...opts.task,

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

@@ -1 +1 @@
-{"version":3,"file":"comment.d.ts","sourceRoot":"","sources":["../../../src/commands/task/comment.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AAInC,wBAAsB,cAAc,CAAC,IAAI,EAAE;IACzC,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;CACd,GAAG,OAAO,CAAC,MAAM,CAAC,CAsDlB"}
+{"version":3,"file":"comment.d.ts","sourceRoot":"","sources":["../../../src/commands/task/comment.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AAUnC,wBAAsB,cAAc,CAAC,IAAI,EAAE;IACzC,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;CACd,GAAG,OAAO,CAAC,MAAM,CAAC,CAiDlB"}