agentplane 0.3.7 → 0.3.9

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

@@ -1,9 +1,10 @@
 import { readFile, stat } from "node:fs/promises";
 import path from "node:path";
-import { docChanged, extractTaskDoc, mergeTaskDoc, parseTaskReadme, renderTaskReadme, renderTaskDocFromSections, taskDocToSectionMap, } from "@agentplaneorg/core";
+import { applyTaskDocMutations, docChanged, extractTaskDoc, mergeTaskDoc, normalizeTaskDocVersion, parseTaskReadme, renderTaskReadme, 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 { assertExpectedTaskDoc, assertExpectedTaskSection, } from "../../shared/task-doc-conflicts.js";
 import { writeTextIfChanged } from "../../shared/write-if-changed.js";
 import { resolveDocUpdatedBy, taskDataToFrontmatter } from "./task-backend.js";
 export function setTaskFieldsIntent(task) {
@@ -33,20 +34,12 @@ export function touchTaskDocMetaIntent(opts = {}) {
 function taskReadmePath(ctx, taskId) {
     return path.join(ctx.resolvedProject.gitRoot, ctx.config.paths.workflow_dir, taskId, "README.md");
 }
-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 normalizeComments(task) {
     return Array.isArray(task.comments)
         ? task.comments.filter((item) => !!item && typeof item.author === "string" && typeof item.body === "string")
@@ -65,31 +58,6 @@ function isConcurrentReadmeChangeError(err) {
         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 throwTaskRevisionConflict(opts) {
     throw new CliError({
         exitCode: exitCodeForError("E_VALIDATION"),
@@ -104,31 +72,18 @@ function throwTaskRevisionConflict(opts) {
         },
     });
 }
-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 renderTaskDocFromSections(taskDocToSectionMap(opts.patch.doc));
-    }
-    const sections = taskDocToSectionMap(opts.currentDocRaw);
-    for (const requiredSection of opts.patch.requiredSections) {
-        if (!(requiredSection in sections))
-            sections[requiredSection] = "";
-    }
-    if (opts.patch.expectedCurrentText !== undefined) {
-        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 });
-        }
-    }
-    sections[opts.patch.section] = opts.patch.text.replaceAll("\r\n", "\n").trimEnd();
-    return renderTaskDocFromSections(sections);
+function applyDocMutationsToState(docState, mutations, opts) {
+    const applied = applyTaskDocMutations(docState, mutations, {
+        now: opts.docUpdatedAt,
+    });
+    return {
+        ...docState,
+        doc: applied.doc,
+        sections: applied.sections,
+        doc_version: applied.doc_version,
+        doc_updated_at: applied.doc_updated_at,
+        doc_updated_by: applied.doc_updated_by,
+    };
 }
 function normalizeTaskStoreIntents(intents) {
     if (!intents)
@@ -241,23 +196,37 @@ export async function mutateTaskStore(store, 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;
+export function applyTaskStoreIntentsToTask(task, intents, opts = {}) {
+    const normalizedIntents = normalizeTaskStoreIntents(intents);
+    if (normalizedIntents.length === 0)
+        return { ...task };
+    const current = task;
     const next = { ...current };
+    let docState = {
+        comments: next.comments ?? null,
+        doc: String(next.doc ?? ""),
+        doc_updated_by: next.doc_updated_by,
+        doc_version: normalizeTaskDocVersion(opts.currentDocVersion ?? task.doc_version),
+        owner: next.owner,
+        sections: next.sections ?? null,
+    };
     let touchDoc = false;
-    let docMetaUpdatedBy;
-    let docMetaVersion;
-    for (const intent of intents) {
+    for (const intent of normalizedIntents) {
         switch (intent.kind) {
             case "set-task-fields": {
                 Object.assign(next, intent.task);
+                docState = {
+                    ...docState,
+                    doc_updated_by: next.doc_updated_by,
+                    doc_version: normalizeTaskDocVersion(next.doc_version ?? docState.doc_version),
+                    owner: next.owner,
+                };
                 break;
             }
             case "append-comments": {
                 if (intent.comments.length > 0) {
                     next.comments = [...normalizeComments(next), ...intent.comments];
+                    docState = { ...docState, comments: next.comments };
                 }
                 break;
             }
@@ -268,55 +237,66 @@ function applyTaskStoreIntents(entry, intents) {
                 break;
             }
             case "replace-doc": {
-                next.doc = applyTaskDocPatch({
-                    taskId: current.id,
-                    currentDocRaw: String(next.doc ?? ""),
-                    patch: {
-                        kind: "replace-doc",
-                        doc: intent.doc,
-                        expectedCurrentDoc: intent.expectedCurrentDoc,
-                    },
+                if (intent.expectedCurrentDoc !== undefined) {
+                    assertExpectedTaskDoc({
+                        taskId: current.id,
+                        currentDoc: docState.doc,
+                        expectedDoc: intent.expectedCurrentDoc,
+                    });
+                }
+                docState = applyDocMutationsToState(docState, [{ kind: "replace-doc", doc: intent.doc }], {
+                    docUpdatedAt: opts.docUpdatedAt,
                 });
-                next.sections = taskDocToSectionMap(String(next.doc ?? ""));
                 touchDoc = true;
                 break;
             }
             case "set-section": {
-                next.doc = applyTaskDocPatch({
-                    taskId: current.id,
-                    currentDocRaw: String(next.doc ?? ""),
-                    patch: {
+                if (intent.expectedCurrentText !== undefined) {
+                    assertExpectedTaskSection({
+                        taskId: current.id,
+                        currentDoc: docState.doc,
+                        section: intent.section,
+                        expectedText: intent.expectedCurrentText,
+                    });
+                }
+                docState = applyDocMutationsToState(docState, [
+                    {
                         kind: "set-section",
                         section: intent.section,
                         text: intent.text,
                         requiredSections: intent.requiredSections,
-                        expectedCurrentText: intent.expectedCurrentText,
                     },
-                });
-                next.sections = taskDocToSectionMap(String(next.doc ?? ""));
+                ], { docUpdatedAt: opts.docUpdatedAt });
                 touchDoc = true;
                 break;
             }
             case "touch-doc-meta": {
+                docState = applyDocMutationsToState(docState, [
+                    {
+                        kind: "touch-doc-meta",
+                        updatedBy: intent.updatedBy,
+                        version: intent.version,
+                    },
+                ], { docUpdatedAt: opts.docUpdatedAt });
                 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);
+        next.doc = docState.doc;
+        next.sections = docState.sections ?? taskDocToSectionMap(docState.doc);
+        next.doc_version = docState.doc_version;
+        next.doc_updated_at = docState.doc_updated_at;
+        next.doc_updated_by = docState.doc_updated_by;
     }
     return next;
 }
+function applyTaskStoreIntents(entry, intents) {
+    return applyTaskStoreIntentsToTask(entry.task, intents, {
+        currentDocVersion: normalizeTaskDocVersion(entry.parsed.frontmatter.doc_version),
+    });
+}
 async function readTaskReadmeCached(opts) {
     const readmePath = taskReadmePath(opts.ctx, opts.taskId);
     let text;

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

@@ -1 +1 @@
-{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../../src/commands/task/add.ts"],"names":[],"mappings":"AAGA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAIpF,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B,GAAG,OAAO,CAAC,MAAM,CAAC,CAyDlB"}
+{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../../src/commands/task/add.ts"],"names":[],"mappings":"AAGA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAKpF,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B,GAAG,OAAO,CAAC,MAAM,CAAC,CA2DlB"}

package/dist/commands/task/add.js

@@ -1,6 +1,7 @@
 import { mapBackendError } from "../../cli/error-map.js";
 import { CliError } from "../../shared/errors.js";
 import { loadCommandContext } from "../shared/task-backend.js";
+import { applyTaskCollectionMutation } from "../shared/task-mutation.js";
 import { dedupeStrings, normalizeTaskStatus, nowIso } from "./shared.js";
 import { defaultTaskDocV3, TASK_DOC_VERSION_V3 } from "./doc-template.js";
 export async function cmdTaskAdd(opts) {
@@ -8,49 +9,50 @@ export async function cmdTaskAdd(opts) {
         const ctx = opts.ctx ??
             (await loadCommandContext({ cwd: opts.cwd, rootOverride: opts.rootOverride ?? null }));
         const status = normalizeTaskStatus(opts.status);
-        const existing = await ctx.taskBackend.listTasks();
-        const existingIds = new Set(existing.map((task) => task.id));
-        for (const taskId of opts.taskIds) {
-            if (existingIds.has(taskId)) {
-                throw new CliError({
-                    exitCode: 2,
-                    code: "E_USAGE",
-                    message: `Task already exists: ${taskId}`,
-                });
-            }
-        }
         const tags = dedupeStrings(opts.tags);
         const dependsOn = dedupeStrings(opts.dependsOn);
         const verify = dedupeStrings(opts.verify);
         const docUpdatedBy = (opts.commentAuthor ?? "").trim() || opts.owner;
-        const tasks = opts.taskIds.map((taskId) => ({
-            id: taskId,
-            title: opts.title,
-            description: opts.description,
-            status,
-            priority: opts.priority,
-            owner: opts.owner,
-            tags,
-            depends_on: dependsOn,
-            verify,
-            comments: opts.commentAuthor && opts.commentBody
-                ? [{ author: opts.commentAuthor, body: opts.commentBody }]
-                : [],
-            doc_version: TASK_DOC_VERSION_V3,
-            doc_updated_at: nowIso(),
-            doc_updated_by: docUpdatedBy,
-            id_source: "explicit",
-            doc: defaultTaskDocV3({ title: opts.title, description: opts.description }),
-        }));
-        if (ctx.taskBackend.writeTasks) {
-            await ctx.taskBackend.writeTasks(tasks);
-        }
-        else {
-            for (const task of tasks) {
-                await ctx.taskBackend.writeTask(task);
-            }
-        }
-        for (const task of tasks) {
+        const { tasksToWrite } = await applyTaskCollectionMutation({
+            ctx,
+            build: (existing) => {
+                const existingIds = new Set(existing.map((task) => task.id));
+                for (const taskId of opts.taskIds) {
+                    if (existingIds.has(taskId)) {
+                        throw new CliError({
+                            exitCode: 2,
+                            code: "E_USAGE",
+                            message: `Task already exists: ${taskId}`,
+                        });
+                    }
+                }
+                const tasksToWrite = opts.taskIds.map((taskId) => ({
+                    id: taskId,
+                    title: opts.title,
+                    description: opts.description,
+                    status,
+                    priority: opts.priority,
+                    owner: opts.owner,
+                    origin: { system: "manual" },
+                    tags,
+                    depends_on: dependsOn,
+                    verify,
+                    comments: opts.commentAuthor && opts.commentBody
+                        ? [{ author: opts.commentAuthor, body: opts.commentBody }]
+                        : [],
+                    doc_version: TASK_DOC_VERSION_V3,
+                    doc_updated_at: nowIso(),
+                    doc_updated_by: docUpdatedBy,
+                    id_source: "explicit",
+                    doc: defaultTaskDocV3({ title: opts.title, description: opts.description }),
+                }));
+                return {
+                    result: null,
+                    tasksToWrite,
+                };
+            },
+        });
+        for (const task of tasksToWrite) {
             process.stdout.write(`${task.id}\n`);
         }
         return 0;

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;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"}
+{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../../src/commands/task/block.ts"],"names":[],"mappings":"AAKA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAWpF,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+ElB"}

package/dist/commands/task/block.js

@@ -1,13 +1,9 @@
 import { mapBackendError } from "../../cli/error-map.js";
-import { successMessage, warnMessage } from "../../cli/output.js";
-import { formatCommentBodyForCommit } from "../../shared/comment-format.js";
+import { successMessage } from "../../cli/output.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 { appendTaskCommentIntent, appendTaskEventIntent, backendIsLocalFileBackend, getTaskStore, mutateTaskStore, setTaskFieldsIntent, touchTaskDocMetaIntent, } from "../shared/task-store.js";
-import { readDirectWorkLock } from "../../shared/direct-work-lock.js";
-import { appendTaskEvent, defaultCommitEmojiForStatus, ensureCommentCommitAllowed, resolveCommentCommitWarning, ensureStatusTransitionAllowed, normalizeTaskDocVersion, nowIso, requireStructuredComment, resolvePrimaryTag, toStringArray, } from "./shared.js";
+import { loadCommandContext } from "../shared/task-backend.js";
+import { applyTaskStatusTransitionCommand, defaultCommitEmojiForStatus, nowIso, prepareTaskTransitionComment, requireStructuredComment, runTaskTransitionCommentCommit, } from "./shared.js";
 export async function cmdBlock(opts) {
     try {
         const ctx = opts.ctx ??
@@ -22,129 +18,54 @@ export async function cmdBlock(opts) {
         }
         const { prefix, min_chars: minChars } = ctx.config.tasks.comments.blocked;
         requireStructuredComment(opts.body, prefix, minChars);
-        const useStore = backendIsLocalFileBackend(ctx);
-        const store = useStore ? getTaskStore(ctx) : null;
-        const task = useStore
-            ? await store.get(opts.taskId)
-            : await loadTaskFromContext({ ctx, taskId: opts.taskId });
-        const currentStatus = String(task.status || "TODO").toUpperCase();
-        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;
-        const commentBody = formattedComment ?? opts.body;
-        const existingComments = Array.isArray(task.comments)
-            ? task.comments.filter((item) => !!item && typeof item.author === "string" && typeof item.body === "string")
-            : [];
-        const commentsValue = [...existingComments, { author: opts.author, body: commentBody }];
+        const preparedComment = prepareTaskTransitionComment({
+            body: opts.body,
+            enabled: opts.commitFromComment,
+            config: ctx.config,
+        });
+        const commentBody = preparedComment.commentBody ?? opts.body;
         const at = nowIso();
-        let currentStatusForCommit = currentStatus;
-        let primaryTagForCommit = resolvePrimaryTag(toStringArray(task.tags), ctx).primary;
-        let deferredWarnings = [];
-        await (useStore
-            ? 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,
-                });
-                const commitWarning = resolveCommentCommitWarning({
+        const transition = await applyTaskStatusTransitionCommand({
+            ctx,
+            taskId: opts.taskId,
+            quiet: opts.quiet,
+            build: () => ({
+                at,
+                toStatus: "BLOCKED",
+                eventAuthor: opts.author,
+                updatedBy: opts.author,
+                note: commentBody,
+                comment: { author: opts.author, body: commentBody },
+                force: opts.force,
+                dependencyPolicy: { kind: "none" },
+                commentCommitPolicy: {
                     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,
-                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,
-            }));
-        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;
-            let executorAgent = opts.author;
-            if (mode === "direct") {
-                const lock = await readDirectWorkLock(ctx.resolvedProject.agentplaneDir);
-                const lockAgent = lock?.task_id === opts.taskId ? (lock.agent?.trim() ?? "") : "";
-                if (lockAgent)
-                    executorAgent = lockAgent;
-            }
-            commitInfo = await commitFromComment({
+            commitInfo = await runTaskTransitionCommentCommit({
                 ctx,
                 cwd: opts.cwd,
                 rootOverride: opts.rootOverride,
                 taskId: opts.taskId,
-                primaryTag: primaryTagForCommit,
-                executorAgent,
+                primaryTag: transition.primaryTag,
                 author: opts.author,
-                statusFrom: currentStatusForCommit,
+                statusFrom: transition.execution.currentStatus,
                 statusTo: "BLOCKED",
                 commentBody: opts.body,
-                formattedComment,
+                formattedComment: preparedComment.formattedComment,
                 emoji: opts.commitEmoji ?? defaultCommitEmojiForStatus("BLOCKED"),
                 allow: opts.commitAllow,
                 autoAllow: opts.commitAutoAllow || opts.commitAllow.length === 0,
                 allowTasks: opts.commitAllowTasks,
                 requireClean: opts.commitRequireClean,
                 quiet: opts.quiet,
-                config: ctx.config,
+                resolveExecutorAgent: true,
             });
         }
         if (!opts.quiet) {

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;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"}
+{"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"}

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

@@ -2,7 +2,6 @@ import { mapBackendError } from "../../cli/error-map.js";
 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 { recordVerifiedNoopClosure } from "./close-shared.js";
 export async function cmdTaskCloseDuplicate(opts) {
     try {
@@ -31,11 +30,6 @@ export async function cmdTaskCloseDuplicate(opts) {
             });
         }
         const canonical = await loadTaskFromContext({ ctx: opts.ctx, taskId: duplicateOf });
-        const useStore = backendIsLocalFileBackend(opts.ctx);
-        const store = useStore ? getTaskStore(opts.ctx) : null;
-        const task = useStore
-            ? await store.get(sourceId)
-            : await loadTaskFromContext({ 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}; ` +
@@ -43,7 +37,6 @@ export async function cmdTaskCloseDuplicate(opts) {
         const body = reason ? `${baseBody}\n\nReason: ${reason}` : baseBody;
         await recordVerifiedNoopClosure({
             ctx: opts.ctx,
-            task,
             taskId: sourceId,
             author: opts.author,
             body,

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;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"}
+{"version":3,"file":"close-noop.d.ts","sourceRoot":"","sources":["../../../src/commands/task/close-noop.ts"],"names":[],"mappings":"AAGA,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,CAgClB"}

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

@@ -1,7 +1,6 @@
 import { mapBackendError } from "../../cli/error-map.js";
 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 { recordVerifiedNoopClosure } from "./close-shared.js";
 export async function cmdTaskCloseNoop(opts) {
@@ -16,31 +15,11 @@ export async function cmdTaskCloseNoop(opts) {
                 reason: "task close-noop --force",
             });
         }
-        const useStore = backendIsLocalFileBackend(ctx);
-        const store = useStore ? getTaskStore(ctx) : null;
-        const task = useStore
-            ? await store.get(opts.taskId)
-            : await ctx.taskBackend.getTask(opts.taskId);
-        if (!task) {
-            throw new CliError({
-                exitCode: 4,
-                code: "E_IO",
-                message: `Task not found: ${opts.taskId}`,
-            });
-        }
-        if (!opts.force && String(task.status || "TODO").toUpperCase() === "DONE") {
-            throw new CliError({
-                exitCode: 2,
-                code: "E_USAGE",
-                message: `Task is already DONE: ${opts.taskId} (use --force to override)`,
-            });
-        }
         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;
         await recordVerifiedNoopClosure({
             ctx,
-            task,
             taskId: opts.taskId,
             author: opts.author,
             body,

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

@@ -1,8 +1,6 @@
-import { type TaskData } from "../../backends/task-backend.js";
 import { type CommandContext } from "../shared/task-backend.js";
 export declare function recordVerifiedNoopClosure(opts: {
     ctx: CommandContext;
-    task: TaskData;
     taskId: string;
     author: string;
     body: string;

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;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"}
+{"version":3,"file":"close-shared.d.ts","sourceRoot":"","sources":["../../../src/commands/task/close-shared.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAIhE,wBAAsB,yBAAyB,CAAC,IAAI,EAAE;IACpD,GAAG,EAAE,cAAc,CAAC;IACpB,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,CAyChB"}