agentplane 0.3.6 → 0.3.8

package/dist/commands/task/next.js

@@ -1,41 +1,23 @@
 import { mapBackendError } from "../../cli/error-map.js";
-import { loadCommandContext } from "../shared/task-backend.js";
-import { buildDependencyState, dedupeStrings, formatTaskLine, handleTaskListWarnings, toStringArray, } from "./shared.js";
+import { listTaskSummariesMemo, loadCommandContext, } from "../shared/task-backend.js";
+import { formatTaskLine, handleTaskListWarnings, queryTaskProjection, } from "./shared.js";
 export async function cmdTaskNext(opts) {
     try {
         const ctx = opts.ctx ??
             (await loadCommandContext({ cwd: opts.cwd, rootOverride: opts.rootOverride ?? null }));
-        const tasks = await ctx.taskBackend.listTasks();
+        const tasks = await listTaskSummariesMemo(ctx);
         handleTaskListWarnings({ backend: ctx.taskBackend, strictRead: opts.filters.strictRead });
-        const depState = buildDependencyState(tasks);
-        const statuses = opts.filters.status.length > 0
-            ? new Set(opts.filters.status.map((s) => s.trim().toUpperCase()))
-            : new Set(["TODO"]);
-        let filtered = tasks.filter((task) => statuses.has(String(task.status || "TODO").toUpperCase()));
-        if (opts.filters.owner.length > 0) {
-            const wanted = new Set(opts.filters.owner.map((o) => o.trim().toUpperCase()));
-            filtered = filtered.filter((task) => wanted.has(String(task.owner || "").toUpperCase()));
-        }
-        if (opts.filters.tag.length > 0) {
-            const wanted = new Set(opts.filters.tag.map((t) => t.trim()).filter(Boolean));
-            filtered = filtered.filter((task) => {
-                const tags = dedupeStrings(toStringArray(task.tags));
-                return tags.some((tag) => wanted.has(tag));
-            });
-        }
-        const sorted = filtered.toSorted((a, b) => a.id.localeCompare(b.id));
-        const ready = sorted.filter((task) => {
-            const dep = depState.get(task.id);
-            return !dep || (dep.missing.length === 0 && dep.incomplete.length === 0);
+        const { depState, filtered, items } = queryTaskProjection({
+            tasks,
+            filters: opts.filters,
+            defaultStatuses: ["TODO"],
+            readyOnly: true,
         });
-        const limited = opts.filters.limit !== undefined && opts.filters.limit >= 0
-            ? ready.slice(0, opts.filters.limit)
-            : ready;
-        for (const task of limited) {
+        for (const task of items) {
             process.stdout.write(`${formatTaskLine(task, depState.get(task.id))}\n`);
         }
         if (!opts.filters.quiet) {
-            process.stdout.write(`Ready: ${limited.length} / ${filtered.length}\n`);
+            process.stdout.write(`Ready: ${items.length} / ${filtered.length}\n`);
         }
         return 0;
     }

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

@@ -4,6 +4,7 @@ export type TaskNormalizeParsed = {
     quiet: boolean;
     force: boolean;
     yes: boolean;
+    syncHostedMerges: boolean;
 };
 export declare const taskNormalizeSpec: CommandSpec<TaskNormalizeParsed>;
 export declare function makeRunTaskNormalizeHandler(getCtx: (cmd: string) => Promise<CommandContext>): (ctx: CommandCtx, p: TaskNormalizeParsed) => Promise<number>;

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

@@ -1 +1 @@
-{"version":3,"file":"normalize.command.d.ts","sourceRoot":"","sources":["../../../src/commands/task/normalize.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAIhE,MAAM,MAAM,mBAAmB,GAAG;IAChC,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,OAAO,CAAC;CACd,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,WAAW,CAAC,mBAAmB,CAiC9D,CAAC;AAEF,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,IAC5E,KAAK,UAAU,EAAE,GAAG,mBAAmB,KAAG,OAAO,CAAC,MAAM,CAAC,CAUxE"}
+{"version":3,"file":"normalize.command.d.ts","sourceRoot":"","sources":["../../../src/commands/task/normalize.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAIhE,MAAM,MAAM,mBAAmB,GAAG;IAChC,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,OAAO,CAAC;IACb,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,WAAW,CAAC,mBAAmB,CA6C9D,CAAC;AAEF,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,IAC5E,KAAK,UAAU,EAAE,GAAG,mBAAmB,KAAG,OAAO,CAAC,MAAM,CAAC,CAWxE"}

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

@@ -22,15 +22,26 @@ export const taskNormalizeSpec = {
             default: false,
             description: "Auto-approve force-action approval checks when required.",
         },
+        {
+            kind: "boolean",
+            name: "sync-hosted-merges",
+            default: false,
+            description: "Query GitHub for merged hosted PRs referenced by local PR artifacts and reconcile stale branch_pr task state before normalization.",
+        },
     ],
     examples: [
         { cmd: "agentplane task normalize", why: "Normalize tasks and print a short summary." },
         { cmd: "agentplane task normalize --quiet", why: "Normalize tasks without printing output." },
+        {
+            cmd: "agentplane task normalize --sync-hosted-merges",
+            why: "Reconcile stale branch_pr task state from hosted PR merges, then normalize the local projection.",
+        },
     ],
     parse: (raw) => ({
         quiet: raw.opts.quiet === true,
         force: raw.opts.force === true,
         yes: raw.opts.yes === true,
+        syncHostedMerges: raw.opts["sync-hosted-merges"] === true,
     }),
 };
 export function makeRunTaskNormalizeHandler(getCtx) {
@@ -42,6 +53,7 @@ export function makeRunTaskNormalizeHandler(getCtx) {
             quiet: p.quiet,
             force: p.force,
             yes: p.yes,
+            syncHostedMerges: p.syncHostedMerges,
         });
     };
 }

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

@@ -6,5 +6,6 @@ export declare function cmdTaskNormalize(opts: {
     quiet: boolean;
     force: boolean;
     yes?: boolean;
+    syncHostedMerges?: boolean;
 }): Promise<number>;
 //# sourceMappingURL=normalize.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../../../src/commands/task/normalize.ts"],"names":[],"mappings":"AAGA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEpF,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,GAAG,OAAO,CAAC,MAAM,CAAC,CAsClB"}
+{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../../../src/commands/task/normalize.ts"],"names":[],"mappings":"AAGA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAIpF,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,GAAG,OAAO,CAAC,MAAM,CAAC,CAqDlB"}

package/dist/commands/task/normalize.js

@@ -2,6 +2,8 @@ import { mapBackendError } from "../../cli/error-map.js";
 import { successMessage } from "../../cli/output.js";
 import { ensureActionApproved } from "../shared/approval-requirements.js";
 import { loadCommandContext } from "../shared/task-backend.js";
+import { applyTaskCollectionMutation } from "../shared/task-mutation.js";
+import { syncHostedMergedTasks } from "./hosted-merge-sync.js";
 export async function cmdTaskNormalize(opts) {
     try {
         const ctx = opts.ctx ??
@@ -14,22 +16,32 @@ export async function cmdTaskNormalize(opts) {
                 reason: "task normalize --force",
             });
         }
-        if (ctx.taskBackend.normalizeTasks) {
+        if (ctx.taskBackend.normalizeTasks && opts.syncHostedMerges !== true) {
             const result = await ctx.taskBackend.normalizeTasks();
             if (!opts.quiet) {
                 process.stdout.write(`${successMessage("normalized tasks", undefined, `scanned=${result.scanned} changed=${result.changed}`)}\n`);
             }
             return 0;
         }
-        const tasks = await ctx.taskBackend.listTasks();
-        await (ctx.taskBackend.writeTasks
-            ? ctx.taskBackend.writeTasks(tasks)
-            : (async () => {
-                for (const task of tasks)
-                    await ctx.taskBackend.writeTask(task);
-            })());
+        let syncedHostedMerges = 0;
+        const { result, tasksToWrite } = await applyTaskCollectionMutation({
+            ctx,
+            build: async (tasks) => {
+                let nextTasks = tasks;
+                if (opts.syncHostedMerges === true) {
+                    const synced = await syncHostedMergedTasks({ ctx, tasks });
+                    nextTasks = synced.tasks;
+                    syncedHostedMerges = synced.synced;
+                }
+                return {
+                    result: null,
+                    tasksToWrite: nextTasks,
+                };
+            },
+        });
+        void result;
         if (!opts.quiet) {
-            process.stdout.write(`${successMessage("normalized tasks", undefined, `count=${tasks.length}`)}\n`);
+            process.stdout.write(`${successMessage("normalized tasks", undefined, `count=${tasksToWrite.length}${opts.syncHostedMerges === true ? ` synced_hosted_merges=${syncedHostedMerges}` : ""}`)}\n`);
         }
         return 0;
     }

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

@@ -1,8 +1,7 @@
 import type { CommandHandler, CommandSpec } from "../../cli/spec/spec.js";
-type TaskPlanGroupParsed = {
-    cmd: string[];
-};
+import { type GroupCommandParsed } from "../../cli/group-command.js";
+type TaskPlanGroupParsed = GroupCommandParsed;
 export declare const taskPlanSpec: CommandSpec<TaskPlanGroupParsed>;
-export declare const runTaskPlan: CommandHandler<TaskPlanGroupParsed>;
+export declare const runTaskPlan: CommandHandler<GroupCommandParsed>;
 export {};
 //# sourceMappingURL=plan.command.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"plan.command.d.ts","sourceRoot":"","sources":["../../../src/commands/task/plan.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAc,cAAc,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAItF,KAAK,mBAAmB,GAAG;IAAE,GAAG,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAI7C,eAAO,MAAM,YAAY,EAAE,WAAW,CAAC,mBAAmB,CAqBzD,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,cAAc,CAAC,mBAAmB,CAW3D,CAAC"}
+{"version":3,"file":"plan.command.d.ts","sourceRoot":"","sources":["../../../src/commands/task/plan.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAc,cAAc,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACtF,OAAO,EAIL,KAAK,kBAAkB,EACxB,MAAM,4BAA4B,CAAC;AACpC,KAAK,mBAAmB,GAAG,kBAAkB,CAAC;AAE9C,eAAO,MAAM,YAAY,EAAE,WAAW,CAAC,mBAAmB,CAqBzD,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,cAAc,CAAC,kBAAkB,CAO1D,CAAC"}

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

@@ -1,6 +1,4 @@
-import { usageError } from "../../cli/spec/errors.js";
-import { suggestOne } from "../../cli/spec/suggest.js";
-const TASK_PLAN_SUBCOMMANDS = ["set", "approve", "reject"];
+import { loadDirectSubcommandNames, parseGroupCommand, throwGroupCommandUsage, } from "../../cli/group-command.js";
 export const taskPlanSpec = {
     id: ["task", "plan"],
     group: "Task",
@@ -21,17 +19,13 @@ export const taskPlanSpec = {
             why: "Reject the current task plan with a note.",
         },
     ],
-    parse: (raw) => ({ cmd: (raw.args.cmd ?? []) }),
+    parse: (raw) => parseGroupCommand(raw),
 };
-export const runTaskPlan = (_ctx, p) => {
-    const input = p.cmd.join(" ");
-    const suggestion = suggestOne(input, [...TASK_PLAN_SUBCOMMANDS]);
-    const suffix = suggestion ? ` Did you mean: ${suggestion}?` : "";
-    const message = p.cmd.length === 0 ? "Missing subcommand." : `Unknown subcommand: ${p.cmd[0]}.`;
-    throw usageError({
+export const runTaskPlan = async (_ctx, p) => {
+    throwGroupCommandUsage({
         spec: taskPlanSpec,
+        cmd: p.cmd,
+        subcommands: await loadDirectSubcommandNames(["task", "plan"]),
         command: "task plan",
-        message: `${message}${suffix}`,
-        context: { command: "task plan" },
     });
 };

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

@@ -1 +1 @@
-{"version":3,"file":"plan.d.ts","sourceRoot":"","sources":["../../../src/commands/task/plan.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AAkJnC,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,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,MAAM,CAAC,CA8HlB;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE;IAC7C,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,OAAO,CAAC,MAAM,CAAC,CA2DlB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,OAAO,CAAC,MAAM,CAAC,CAkElB"}
+{"version":3,"file":"plan.d.ts","sourceRoot":"","sources":["../../../src/commands/task/plan.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AA8InC,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,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,MAAM,CAAC,CAuHlB;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE;IAC7C,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,OAAO,CAAC,MAAM,CAAC,CAgElB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,OAAO,CAAC,MAAM,CAAC,CAuElB"}

package/dist/commands/task/plan.js

@@ -5,17 +5,13 @@ import { mapBackendError, mapCoreError } from "../../cli/error-map.js";
 import { backendNotSupportedMessage } from "../../cli/output.js";
 import { CliError } from "../../shared/errors.js";
 import { loadCommandContext, loadTaskFromContext, } from "../shared/task-backend.js";
-import { backendIsLocalFileBackend, getTaskStore } from "../shared/task-store.js";
+import { applyTaskMutation, withTaskMutationStorage } from "../shared/task-mutation.js";
+import { setTaskFieldsIntent, setTaskSectionIntent, touchTaskDocMetaIntent, } from "../shared/task-store.js";
 import { decodeEscapedTaskTextNewlines, ensureAgentFilledRequiredDocSections, extractDocSection, extractTaskObservationSection, isVerifyStepsFilled, nowIso, normalizeTaskDocVersion, taskObservationSectionName, requiresVerifyStepsByPrimary, toStringArray, } from "./shared.js";
-async function loadPlanTask(opts) {
+async function loadPlanBackend(opts) {
     const ctx = opts.ctx ??
         (await loadCommandContext({ cwd: opts.cwd, rootOverride: opts.rootOverride ?? null }));
     const backend = ctx.taskBackend;
-    const useStore = backendIsLocalFileBackend(ctx);
-    const store = useStore ? getTaskStore(ctx) : null;
-    const task = useStore
-        ? await store.get(opts.taskId)
-        : await loadTaskFromContext({ ctx, taskId: opts.taskId });
     if (!backend.getTaskDoc || !backend.writeTask) {
         throw new CliError({
             exitCode: 2,
@@ -23,7 +19,7 @@ async function loadPlanTask(opts) {
             message: backendNotSupportedMessage("task docs"),
         });
     }
-    return { ctx, backend: backend, task, useStore, store };
+    return { ctx, backend: backend };
 }
 function normalizeForComparison(text) {
     return text.replaceAll("\r\n", "\n").trim();
@@ -92,11 +88,10 @@ function assertPlanCanBeApproved(opts) {
 }
 export async function cmdTaskPlanSet(opts) {
     try {
-        const { ctx, backend, task, useStore, store } = await loadPlanTask({
+        const { ctx, backend } = await loadPlanBackend({
             ctx: opts.ctx,
             cwd: opts.cwd,
             rootOverride: opts.rootOverride,
-            taskId: opts.taskId,
         });
         const config = ctx.config;
         const resolved = ctx.resolvedProject;
@@ -133,12 +128,15 @@ export async function cmdTaskPlanSet(opts) {
                 throw mapCoreError(err, { command: "task plan set", filePath: opts.file ?? "" });
             }
         }
-        const readmePath = path.join(resolved.gitRoot, config.paths.workflow_dir, task.id, "README.md");
-        if (useStore) {
-            let expectedCurrentPlan;
-            await store.patch(opts.taskId, (current) => {
+        const readmePath = path.join(resolved.gitRoot, config.paths.workflow_dir, opts.taskId, "README.md");
+        await applyTaskMutation({
+            ctx,
+            taskId: opts.taskId,
+            build: async (current) => {
+                const currentDocRaw = (typeof current.doc === "string" ? current.doc : "") ||
+                    (await backend.getTaskDoc(current.id));
                 const { currentPlan, nextPlan, planChanged, docChanged } = buildPlanDocUpdate({
-                    currentDocRaw: String(current.doc ?? ""),
+                    currentDocRaw,
                     text,
                     requiredSections: config.tasks.doc.required_sections,
                 });
@@ -146,67 +144,52 @@ export async function cmdTaskPlanSet(opts) {
                     return null;
                 if (!docChanged) {
                     return {
+                        intents: [
+                            ...(planChanged
+                                ? [
+                                    setTaskFieldsIntent({
+                                        plan_approval: {
+                                            state: "pending",
+                                            updated_at: null,
+                                            updated_by: null,
+                                            note: null,
+                                        },
+                                    }),
+                                ]
+                                : []),
+                            ...(updatedBy ? [touchTaskDocMetaIntent({ updatedBy })] : []),
+                        ],
+                    };
+                }
+                return {
+                    intents: [
+                        setTaskSectionIntent({
+                            section: "Plan",
+                            text: nextPlan,
+                            requiredSections: config.tasks.doc.required_sections,
+                            expectedCurrentText: currentPlan,
+                        }),
                         ...(planChanged
-                            ? {
-                                task: {
+                            ? [
+                                setTaskFieldsIntent({
                                     plan_approval: {
                                         state: "pending",
                                         updated_at: null,
                                         updated_by: null,
                                         note: null,
                                     },
-                                },
-                            }
-                            : {}),
-                        ...(updatedBy ? { docMeta: { touch: true, updatedBy } } : {}),
-                    };
-                }
-                expectedCurrentPlan ??= currentPlan;
-                return {
-                    doc: {
-                        kind: "set-section",
-                        section: "Plan",
-                        text: nextPlan,
-                        requiredSections: config.tasks.doc.required_sections,
-                        expectedCurrentText: expectedCurrentPlan,
+                                }),
+                            ]
+                            : []),
+                        ...(updatedBy ? [touchTaskDocMetaIntent({ updatedBy })] : []),
+                    ],
+                    writeOptions: {
+                        expectedCurrentText: currentPlan,
+                        expectedSection: "Plan",
                     },
-                    ...(planChanged
-                        ? {
-                            task: {
-                                plan_approval: {
-                                    state: "pending",
-                                    updated_at: null,
-                                    updated_by: null,
-                                    note: null,
-                                },
-                            },
-                        }
-                        : {}),
-                    ...(updatedBy ? { docMeta: { updatedBy } } : {}),
                 };
-            });
-        }
-        else {
-            const existingDoc = (typeof task.doc === "string" ? task.doc : "") || (await backend.getTaskDoc(task.id));
-            const { planChanged, docChanged, nextDoc } = buildPlanDocUpdate({
-                currentDocRaw: existingDoc,
-                text,
-                requiredSections: config.tasks.doc.required_sections,
-            });
-            if (!planChanged && !docChanged && !updatedBy) {
-                process.stdout.write(`${readmePath}\n`);
-                return 0;
-            }
-            const nextTask = {
-                ...task,
-                doc: nextDoc,
-                ...(planChanged
-                    ? { plan_approval: { state: "pending", updated_at: null, updated_by: null, note: null } }
-                    : {}),
-                ...(updatedBy ? { doc_updated_by: updatedBy } : {}),
-            };
-            await backend.writeTask(nextTask);
-        }
+            },
+        });
         process.stdout.write(`${readmePath}\n`);
         return 0;
     }
@@ -218,11 +201,10 @@ export async function cmdTaskPlanSet(opts) {
 }
 export async function cmdTaskPlanApprove(opts) {
     try {
-        const { ctx, backend, task, useStore, store } = await loadPlanTask({
+        const { ctx, backend } = await loadPlanBackend({
             ctx: opts.ctx,
             cwd: opts.cwd,
             rootOverride: opts.rootOverride,
-            taskId: opts.taskId,
         });
         const config = ctx.config;
         const by = String(opts.by ?? "").trim();
@@ -234,36 +216,42 @@ export async function cmdTaskPlanApprove(opts) {
             });
         }
         const note = typeof opts.note === "string" ? opts.note.trim() : "";
-        const existingDoc = useStore
-            ? String(task.doc ?? "")
-            : (typeof task.doc === "string" ? task.doc : "") || (await backend.getTaskDoc(task.id));
-        const baseDoc = ensureDocSections(existingDoc ?? "", config.tasks.doc.required_sections);
-        assertPlanCanBeApproved({ task, config, doc: baseDoc });
         const approvedAt = nowIso();
-        await (useStore
-            ? store.patch(opts.taskId, (current) => {
-                const currentDoc = ensureDocSections(String(current.doc ?? ""), config.tasks.doc.required_sections);
-                assertPlanCanBeApproved({ task: current, config, doc: currentDoc });
-                return {
-                    task: {
-                        plan_approval: {
-                            state: "approved",
-                            updated_at: approvedAt,
-                            updated_by: by,
-                            note: note || null,
+        await withTaskMutationStorage({
+            ctx,
+            local: async (store) => {
+                await store.get(opts.taskId);
+                await store.patch(opts.taskId, (current) => {
+                    const currentDoc = ensureDocSections(String(current.doc ?? ""), config.tasks.doc.required_sections);
+                    assertPlanCanBeApproved({ task: current, config, doc: currentDoc });
+                    return {
+                        task: {
+                            plan_approval: {
+                                state: "approved",
+                                updated_at: approvedAt,
+                                updated_by: by,
+                                note: note || null,
+                            },
                         },
+                    };
+                });
+            },
+            remote: async () => {
+                const task = await loadTaskFromContext({ ctx, taskId: opts.taskId });
+                const existingDoc = (typeof task.doc === "string" ? task.doc : "") || (await backend.getTaskDoc(task.id));
+                const baseDoc = ensureDocSections(existingDoc ?? "", config.tasks.doc.required_sections);
+                assertPlanCanBeApproved({ task, config, doc: baseDoc });
+                await backend.writeTask({
+                    ...task,
+                    plan_approval: {
+                        state: "approved",
+                        updated_at: approvedAt,
+                        updated_by: by,
+                        note: note || null,
                     },
-                };
-            })
-            : backend.writeTask({
-                ...task,
-                plan_approval: {
-                    state: "approved",
-                    updated_at: approvedAt,
-                    updated_by: by,
-                    note: note || null,
-                },
-            }));
+                });
+            },
+        });
         return 0;
     }
     catch (err) {
@@ -274,11 +262,10 @@ export async function cmdTaskPlanApprove(opts) {
 }
 export async function cmdTaskPlanReject(opts) {
     try {
-        const { ctx, backend, task, useStore, store } = await loadPlanTask({
+        const { ctx, backend } = await loadPlanBackend({
             ctx: opts.ctx,
             cwd: opts.cwd,
             rootOverride: opts.rootOverride,
-            taskId: opts.taskId,
         });
         const config = ctx.config;
         const by = String(opts.by ?? "").trim();
@@ -297,36 +284,42 @@ export async function cmdTaskPlanReject(opts) {
                 message: "Invalid value for --note: empty.",
             });
         }
-        const existingDoc = useStore
-            ? String(task.doc ?? "")
-            : (typeof task.doc === "string" ? task.doc : "") || (await backend.getTaskDoc(task.id));
-        const baseDoc = ensureDocSections(existingDoc ?? "", config.tasks.doc.required_sections);
-        assertPlanSectionPresent(task.id, baseDoc, "reject");
         const rejectedAt = nowIso();
-        await (useStore
-            ? store.patch(opts.taskId, (current) => {
-                const currentDoc = ensureDocSections(String(current.doc ?? ""), config.tasks.doc.required_sections);
-                assertPlanSectionPresent(current.id, currentDoc, "reject");
-                return {
-                    task: {
-                        plan_approval: {
-                            state: "rejected",
-                            updated_at: rejectedAt,
-                            updated_by: by,
-                            note: note || null,
+        await withTaskMutationStorage({
+            ctx,
+            local: async (store) => {
+                await store.get(opts.taskId);
+                await store.patch(opts.taskId, (current) => {
+                    const currentDoc = ensureDocSections(String(current.doc ?? ""), config.tasks.doc.required_sections);
+                    assertPlanSectionPresent(current.id, currentDoc, "reject");
+                    return {
+                        task: {
+                            plan_approval: {
+                                state: "rejected",
+                                updated_at: rejectedAt,
+                                updated_by: by,
+                                note: note || null,
+                            },
                         },
+                    };
+                });
+            },
+            remote: async () => {
+                const task = await loadTaskFromContext({ ctx, taskId: opts.taskId });
+                const existingDoc = (typeof task.doc === "string" ? task.doc : "") || (await backend.getTaskDoc(task.id));
+                const baseDoc = ensureDocSections(existingDoc ?? "", config.tasks.doc.required_sections);
+                assertPlanSectionPresent(task.id, baseDoc, "reject");
+                await backend.writeTask({
+                    ...task,
+                    plan_approval: {
+                        state: "rejected",
+                        updated_at: rejectedAt,
+                        updated_by: by,
+                        note: note || null,
                     },
-                };
-            })
-            : backend.writeTask({
-                ...task,
-                plan_approval: {
-                    state: "rejected",
-                    updated_at: rejectedAt,
-                    updated_by: by,
-                    note: note || null,
-                },
-            }));
+                });
+            },
+        });
         return 0;
     }
     catch (err) {

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

@@ -0,0 +1,11 @@
+import type { CommandCtx, CommandSpec } from "../../cli/spec/spec.js";
+export type TaskReclaimParsed = {
+    taskId: string;
+    author: string;
+    reason: string;
+    force: boolean;
+    json: boolean;
+};
+export declare const taskReclaimSpec: CommandSpec<TaskReclaimParsed>;
+export declare const runTaskReclaim: (ctx: CommandCtx, parsed: TaskReclaimParsed) => Promise<number>;
+//# sourceMappingURL=reclaim.command.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"reclaim.command.d.ts","sourceRoot":"","sources":["../../../src/commands/task/reclaim.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAQtE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,WAAW,CAAC,iBAAiB,CAiD1D,CAAC;AAIF,eAAO,MAAM,cAAc,GAAU,KAAK,UAAU,EAAE,QAAQ,iBAAiB,oBA+C9E,CAAC"}