agentplane 0.3.7 → 0.3.8

package/dist/commands/task/hosted-merge-sync.d.ts

@@ -0,0 +1,40 @@
+import type { TaskData } from "../../backends/task-backend.js";
+import type { CommandContext } from "../shared/task-backend.js";
+export type HostedMergedPr = {
+    number: number;
+    title?: string | null;
+    url?: string | null;
+    mergedAt?: string | null;
+    baseRefName?: string | null;
+    headRefName?: string | null;
+    headRefOid?: string | null;
+    mergeCommit?: {
+        oid?: string | null;
+    } | null;
+};
+export type HostedMergeTarget = {
+    taskId: string;
+    branch: string;
+    mergedPr: HostedMergedPr;
+};
+type HostedMergeSyncResult = {
+    tasks: TaskData[];
+    synced: number;
+};
+export declare function resolveHostedMergeTargetFromEvent(opts: {
+    event: unknown;
+    branchPrefix: string;
+}): HostedMergeTarget | null;
+export declare function syncHostedMergedTask(opts: {
+    ctx: CommandContext;
+    tasks: TaskData[];
+    target: HostedMergeTarget;
+    missingTask?: "noop" | "error";
+    missingPrMeta?: "noop" | "error";
+}): Promise<HostedMergeSyncResult>;
+export declare function syncHostedMergedTasks(opts: {
+    ctx: CommandContext;
+    tasks: TaskData[];
+}): Promise<HostedMergeSyncResult>;
+export {};
+//# sourceMappingURL=hosted-merge-sync.d.ts.map

package/dist/commands/task/hosted-merge-sync.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hosted-merge-sync.d.ts","sourceRoot":"","sources":["../../../src/commands/task/hosted-merge-sync.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAM/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAGhE,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,WAAW,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;CAC9C,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,cAAc,CAAC;CAC1B,CAAC;AAEF,KAAK,qBAAqB,GAAG;IAC3B,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA6EF,wBAAgB,iCAAiC,CAAC,IAAI,EAAE;IACtD,KAAK,EAAE,OAAO,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,iBAAiB,GAAG,IAAI,CAY3B;AA2HD,wBAAsB,oBAAoB,CAAC,IAAI,EAAE;IAC/C,GAAG,EAAE,cAAc,CAAC;IACpB,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC/B,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CAClC,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAuDjC;AAED,wBAAsB,qBAAqB,CAAC,IAAI,EAAE;IAChD,GAAG,EAAE,cAAc,CAAC;IACpB,KAAK,EAAE,QAAQ,EAAE,CAAC;CACnB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CA0CjC"}

package/dist/commands/task/hosted-merge-sync.js

@@ -0,0 +1,277 @@
+import { readFile } from "node:fs/promises";
+import path from "node:path";
+import { normalizeTaskDocVersion } from "@agentplaneorg/core";
+import { CliError } from "../../shared/errors.js";
+import { writeJsonStableIfChanged } from "../../shared/write-if-changed.js";
+import { execFileAsync } from "../shared/git.js";
+import { parseTaskIdFromBranch } from "../shared/git-worktree.js";
+import { parsePrMeta } from "../shared/pr-meta.js";
+import { appendTaskEvent } from "./shared.js";
+function normalizeMergedPr(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        return null;
+    const record = value;
+    const number = typeof record.number === "number" ? record.number : null;
+    if (!number || number <= 0)
+        return null;
+    const mergeCommit = record.mergeCommit &&
+        typeof record.mergeCommit === "object" &&
+        !Array.isArray(record.mergeCommit)
+        ? {
+            oid: typeof record.mergeCommit.oid === "string"
+                ? String(record.mergeCommit.oid)
+                : null,
+        }
+        : null;
+    return {
+        number,
+        title: typeof record.title === "string" ? record.title : null,
+        url: typeof record.url === "string" ? record.url : null,
+        mergedAt: typeof record.mergedAt === "string" ? record.mergedAt : null,
+        baseRefName: typeof record.baseRefName === "string" ? record.baseRefName : null,
+        headRefName: typeof record.headRefName === "string" ? record.headRefName : null,
+        headRefOid: typeof record.headRefOid === "string" ? record.headRefOid : null,
+        mergeCommit,
+    };
+}
+function normalizePullRequestLike(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        return null;
+    const record = value;
+    if (record.merged !== true)
+        return null;
+    const number = typeof record.number === "number" ? record.number : null;
+    const mergeCommitSha = typeof record.merge_commit_sha === "string" && record.merge_commit_sha.trim().length > 0
+        ? record.merge_commit_sha.trim()
+        : null;
+    const head = record.head && typeof record.head === "object" && !Array.isArray(record.head)
+        ? record.head
+        : null;
+    const base = record.base && typeof record.base === "object" && !Array.isArray(record.base)
+        ? record.base
+        : null;
+    const headRefName = typeof head?.ref === "string" ? head.ref : null;
+    const headRefOid = typeof head?.sha === "string" ? head.sha : null;
+    const baseRefName = typeof base?.ref === "string" ? base.ref : null;
+    if (!number || number <= 0 || !mergeCommitSha || !headRefName)
+        return null;
+    return {
+        number,
+        title: typeof record.title === "string" ? record.title : null,
+        url: typeof record.html_url === "string" ? record.html_url : null,
+        mergedAt: typeof record.merged_at === "string" ? record.merged_at : null,
+        baseRefName,
+        headRefName,
+        headRefOid,
+        mergeCommit: { oid: mergeCommitSha },
+    };
+}
+function pickHostedMergedPr(records) {
+    const merged = records
+        .map((record) => normalizeMergedPr(record))
+        .filter((record) => !!record && !!record.mergeCommit?.oid);
+    if (merged.length === 0)
+        return null;
+    return (merged.toSorted((a, b) => {
+        const left = a.mergedAt ?? "";
+        const right = b.mergedAt ?? "";
+        return right.localeCompare(left);
+    })[0] ?? null);
+}
+export function resolveHostedMergeTargetFromEvent(opts) {
+    if (!opts.event || typeof opts.event !== "object" || Array.isArray(opts.event))
+        return null;
+    const pullRequest = opts.event.pull_request;
+    const mergedPr = normalizePullRequestLike(pullRequest);
+    if (!mergedPr?.headRefName || !mergedPr.mergeCommit?.oid)
+        return null;
+    const taskId = parseTaskIdFromBranch(opts.branchPrefix, mergedPr.headRefName);
+    if (!taskId)
+        return null;
+    return {
+        taskId,
+        branch: mergedPr.headRefName,
+        mergedPr,
+    };
+}
+async function resolveHostedMergedPr(opts) {
+    const { stdout } = await execFileAsync("gh", [
+        "pr",
+        "list",
+        "--state",
+        "merged",
+        "--head",
+        opts.branch,
+        "--json",
+        "number,title,url,mergedAt,baseRefName,headRefName,headRefOid,mergeCommit",
+    ], {
+        cwd: opts.cwd,
+        env: process.env,
+        maxBuffer: 10 * 1024 * 1024,
+    });
+    const parsed = JSON.parse(stdout);
+    return Array.isArray(parsed) ? pickHostedMergedPr(parsed) : null;
+}
+function buildSyncedPrMeta(opts) {
+    const at = opts.mergedPr.mergedAt ?? new Date().toISOString();
+    return {
+        ...opts.meta,
+        branch: opts.branch,
+        status: "MERGED",
+        base: opts.mergedPr.baseRefName ?? opts.meta.base,
+        merge_strategy: opts.meta.merge_strategy,
+        merged_at: opts.meta.merged_at ?? at,
+        merge_commit: opts.mergedPr.mergeCommit?.oid ?? opts.meta.merge_commit,
+        head_sha: opts.mergedPr.headRefOid ?? opts.meta.head_sha,
+        updated_at: at,
+    };
+}
+function buildSyncedTask(opts) {
+    const at = opts.mergedPr.mergedAt ?? new Date().toISOString();
+    const currentStatus = String(opts.task.status || "TODO").toUpperCase();
+    const note = `Hosted PR #${opts.mergedPr.number} merged on GitHub main; ` +
+        "task projection reconciled from hosted PR artifacts.";
+    const statusEvent = {
+        type: "status",
+        at,
+        author: "INTEGRATOR",
+        from: currentStatus,
+        to: "DONE",
+        note,
+    };
+    const mergeHash = opts.mergedPr.mergeCommit?.oid ?? "";
+    const mergeMessage = opts.mergedPr.title?.trim();
+    return {
+        ...opts.task,
+        status: "DONE",
+        result_summary: opts.task.result_summary ?? `Merged via PR #${opts.mergedPr.number}.`,
+        commit: opts.task.commit?.hash?.trim()
+            ? opts.task.commit
+            : mergeHash
+                ? {
+                    hash: mergeHash,
+                    message: (mergeMessage && mergeMessage.length > 0 ? mergeMessage : null) ??
+                        `Hosted PR #${opts.mergedPr.number} merged on GitHub main`,
+                }
+                : null,
+        events: appendTaskEvent(opts.task, statusEvent),
+        doc_version: normalizeTaskDocVersion(opts.task.doc_version),
+        doc_updated_at: at,
+        doc_updated_by: "INTEGRATOR",
+    };
+}
+async function readPrMetaIfPresent(opts) {
+    const metaPath = path.join(opts.ctx.resolvedProject.gitRoot, opts.ctx.config.paths.workflow_dir, opts.taskId, "pr", "meta.json");
+    try {
+        const raw = await readFile(metaPath, "utf8");
+        return { meta: parsePrMeta(raw, opts.taskId), metaPath };
+    }
+    catch {
+        return null;
+    }
+}
+function needsHostedMergeSync(opts) {
+    const currentStatus = String(opts.task.status || "TODO").toUpperCase();
+    const expectedCommit = opts.mergedPr.mergeCommit?.oid ?? "";
+    const expectedBase = opts.mergedPr.baseRefName ?? opts.meta.base ?? "";
+    const expectedHeadSha = opts.mergedPr.headRefOid ?? opts.meta.head_sha ?? "";
+    if (currentStatus !== "DONE")
+        return true;
+    if ((opts.task.commit?.hash ?? "") !== expectedCommit)
+        return true;
+    if (opts.meta.status !== "MERGED")
+        return true;
+    if ((opts.meta.merge_commit ?? "") !== expectedCommit)
+        return true;
+    if ((opts.meta.branch ?? "") !== opts.branch)
+        return true;
+    if ((opts.meta.base ?? "") !== expectedBase)
+        return true;
+    if (opts.meta.head_sha?.trim() !== expectedHeadSha)
+        return true;
+    return false;
+}
+export async function syncHostedMergedTask(opts) {
+    if (opts.ctx.backendId !== "local" || opts.ctx.config.workflow_mode !== "branch_pr") {
+        return { tasks: opts.tasks, synced: 0 };
+    }
+    const task = opts.tasks.find((entry) => entry.id === opts.target.taskId);
+    if (!task) {
+        if (opts.missingTask === "error") {
+            throw new CliError({
+                exitCode: 3,
+                code: "E_VALIDATION",
+                message: `Hosted task closure could not find task artifact: ${opts.target.taskId}`,
+            });
+        }
+        return { tasks: opts.tasks, synced: 0 };
+    }
+    const prMetaRecord = await readPrMetaIfPresent({ ctx: opts.ctx, taskId: opts.target.taskId });
+    if (!prMetaRecord) {
+        if (opts.missingPrMeta === "error") {
+            throw new CliError({
+                exitCode: 3,
+                code: "E_VALIDATION",
+                message: `Hosted task closure could not find pr/meta.json for ${opts.target.taskId}`,
+            });
+        }
+        return { tasks: opts.tasks, synced: 0 };
+    }
+    if (!needsHostedMergeSync({
+        task,
+        meta: prMetaRecord.meta,
+        mergedPr: opts.target.mergedPr,
+        branch: opts.target.branch,
+    })) {
+        return { tasks: opts.tasks, synced: 0 };
+    }
+    const nextMeta = buildSyncedPrMeta({
+        meta: prMetaRecord.meta,
+        mergedPr: opts.target.mergedPr,
+        branch: opts.target.branch,
+    });
+    await writeJsonStableIfChanged(prMetaRecord.metaPath, nextMeta);
+    return {
+        tasks: opts.tasks.map((entry) => entry.id === opts.target.taskId
+            ? buildSyncedTask({ task: entry, mergedPr: opts.target.mergedPr })
+            : entry),
+        synced: 1,
+    };
+}
+export async function syncHostedMergedTasks(opts) {
+    if (opts.ctx.backendId !== "local" || opts.ctx.config.workflow_mode !== "branch_pr") {
+        return { tasks: opts.tasks, synced: 0 };
+    }
+    const nextTasks = [];
+    let synced = 0;
+    for (const task of opts.tasks) {
+        const prMetaRecord = await readPrMetaIfPresent({ ctx: opts.ctx, taskId: task.id });
+        if (!prMetaRecord) {
+            nextTasks.push(task);
+            continue;
+        }
+        const branch = prMetaRecord.meta.branch?.trim() ?? "";
+        if (!branch) {
+            nextTasks.push(task);
+            continue;
+        }
+        const mergedPr = await resolveHostedMergedPr({
+            cwd: opts.ctx.resolvedProject.gitRoot,
+            branch,
+        });
+        if (!mergedPr?.mergeCommit?.oid) {
+            nextTasks.push(task);
+            continue;
+        }
+        const syncedTask = await syncHostedMergedTask({
+            ctx: opts.ctx,
+            tasks: [task],
+            target: { taskId: task.id, branch, mergedPr },
+            missingTask: "noop",
+            missingPrMeta: "noop",
+        });
+        nextTasks.push(syncedTask.tasks[0] ?? task);
+        synced += syncedTask.synced;
+    }
+    return { tasks: nextTasks, synced };
+}

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

@@ -1 +1 @@
-{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/commands/task/list.ts"],"names":[],"mappings":"AACA,OAAO,EAAqC,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEnG,OAAO,EAML,KAAK,eAAe,EACrB,MAAM,aAAa,CAAC;AAErB,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,eAAe,CAAC;CAC1B,GAAG,OAAO,CAAC,MAAM,CAAC,CA6ClB;AAED,wBAAsB,WAAW,CAAC,IAAI,EAAE;IACtC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,eAAe,CAAC;CAC1B,GAAG,OAAO,CAAC,MAAM,CAAC,CAElB"}
+{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/commands/task/list.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAIL,KAAK,eAAe,EACrB,MAAM,aAAa,CAAC;AAErB,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,eAAe,CAAC;CAC1B,GAAG,OAAO,CAAC,MAAM,CAAC,CA4BlB;AAED,wBAAsB,WAAW,CAAC,IAAI,EAAE;IACtC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,eAAe,CAAC;CAC1B,GAAG,OAAO,CAAC,MAAM,CAAC,CAElB"}

package/dist/commands/task/list.js

@@ -1,40 +1,23 @@
 import { mapBackendError } from "../../cli/error-map.js";
-import { listTasksMemo, 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 cmdTaskListWithFilters(opts) {
     try {
         const ctx = opts.ctx ??
             (await loadCommandContext({ cwd: opts.cwd, rootOverride: opts.rootOverride ?? null }));
-        const tasks = await listTasksMemo(ctx);
+        const tasks = await listTaskSummariesMemo(ctx);
         handleTaskListWarnings({ backend: ctx.taskBackend, strictRead: opts.filters.strictRead });
-        const depState = buildDependencyState(tasks);
-        let filtered = tasks;
-        if (opts.filters.status.length > 0) {
-            const wanted = new Set(opts.filters.status.map((s) => s.trim().toUpperCase()));
-            filtered = filtered.filter((task) => wanted.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));
-        for (const task of sorted) {
+        const { depState, items } = queryTaskProjection({ tasks, filters: opts.filters });
+        for (const task of items) {
             process.stdout.write(`${formatTaskLine(task, depState.get(task.id))}\n`);
         }
         if (!opts.filters.quiet) {
             const counts = {};
-            for (const task of sorted) {
+            for (const task of items) {
                 const status = String(task.status || "TODO").toUpperCase();
                 counts[status] = (counts[status] ?? 0) + 1;
             }
-            const total = sorted.length;
+            const total = items.length;
             const summary = Object.keys(counts)
                 .toSorted()
                 .map((key) => `${key}=${counts[key]}`)

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

@@ -1 +1 @@
-{"version":3,"file":"new.d.ts","sourceRoot":"","sources":["../../../src/commands/task/new.ts"],"names":[],"mappings":"AAMA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAcpF,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,KAAK,GAAG,QAAQ,GAAG,KAAK,GAAG,MAAM,CAAC;IAC5C,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAmDF,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,aAAa,CAAC;CACvB,GAAG,OAAO,CAAC,MAAM,CAAC,CAmFlB"}
+{"version":3,"file":"new.d.ts","sourceRoot":"","sources":["../../../src/commands/task/new.ts"],"names":[],"mappings":"AAOA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAcpF,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,KAAK,GAAG,QAAQ,GAAG,KAAK,GAAG,MAAM,CAAC;IAC5C,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAmDF,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,aAAa,CAAC;CACvB,GAAG,OAAO,CAAC,MAAM,CAAC,CAsGlB"}

package/dist/commands/task/new.js

@@ -1,7 +1,8 @@
-import { setMarkdownSection, taskDocToSectionMap } from "@agentplaneorg/core";
+import { setMarkdownSection } from "@agentplaneorg/core";
 import { mapBackendError } from "../../cli/error-map.js";
 import { backendNotSupportedMessage, warnMessage } from "../../cli/output.js";
 import { CliError } from "../../shared/errors.js";
+import { buildTaskDocState } from "../../shared/task-doc-state.js";
 import { loadCommandContext } from "../shared/task-backend.js";
 import { ensureTaskDependsOnGraphIsAcyclic, nowIso, requiresVerifyStepsByPrimary, resolvePrimaryTag, warnIfUnknownOwner, } from "./shared.js";
 import { buildDefaultVerifyStepsSection, defaultTaskDocV3, TASK_DOC_VERSION_V3, } from "./doc-template.js";
@@ -66,6 +67,13 @@ export async function runTaskNewParsed(opts) {
             });
         }
         const taskId = await ctx.taskBackend.generateTaskId({ length: suffixLength, attempts: 1000 });
+        const docState = buildTaskDocState({
+            doc: defaultTaskDocV3({ title: p.title, description: p.description }),
+            owner: p.owner,
+            updatedBy: p.owner,
+            version: TASK_DOC_VERSION_V3,
+            updatedAt: nowIso(),
+        });
         const task = {
             id: taskId,
             title: p.title,
@@ -74,15 +82,16 @@ export async function runTaskNewParsed(opts) {
             priority: p.priority,
             owner: p.owner,
             revision: 1,
+            origin: { system: "manual" },
             tags: p.tags,
             depends_on: p.dependsOn,
             verify: p.verify,
             comments: [],
-            doc_version: TASK_DOC_VERSION_V3,
-            doc_updated_at: nowIso(),
-            doc_updated_by: p.owner,
+            doc_version: docState.doc_version,
+            doc_updated_at: docState.doc_updated_at,
+            doc_updated_by: docState.doc_updated_by,
             id_source: "generated",
-            doc: defaultTaskDocV3({ title: p.title, description: p.description }),
+            doc: docState.doc,
         };
         const spikeTag = (ctx.config.tasks.verify.spike_tag ?? "spike").trim().toLowerCase();
         const primary = resolvePrimaryTag(p.tags, ctx);
@@ -108,7 +117,18 @@ export async function runTaskNewParsed(opts) {
         if (hasSpike && hasImplementationTags) {
             process.stderr.write(`${warnMessage("spike is combined with a primary tag that requires verify steps; consider splitting spike vs implementation tasks")}\n`);
         }
-        task.sections = taskDocToSectionMap(task.doc ?? "");
+        const normalizedDoc = buildTaskDocState({
+            doc: task.doc ?? "",
+            owner: p.owner,
+            updatedBy: task.doc_updated_by,
+            version: TASK_DOC_VERSION_V3,
+            updatedAt: task.doc_updated_at,
+        });
+        task.doc = normalizedDoc.doc;
+        task.sections = normalizedDoc.sections;
+        task.doc_version = normalizedDoc.doc_version;
+        task.doc_updated_at = normalizedDoc.doc_updated_at;
+        task.doc_updated_by = normalizedDoc.doc_updated_by;
         await ctx.taskBackend.writeTask(task);
         process.stdout.write(`${taskId}\n`);
         return 0;

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

@@ -1 +1 @@
-{"version":3,"file":"next.d.ts","sourceRoot":"","sources":["../../../src/commands/task/next.ts"],"names":[],"mappings":"AACA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEpF,OAAO,EAML,KAAK,eAAe,EACrB,MAAM,aAAa,CAAC;AAErB,wBAAsB,WAAW,CAAC,IAAI,EAAE;IACtC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,eAAe,CAAC;CAC1B,GAAG,OAAO,CAAC,MAAM,CAAC,CA6ClB"}
+{"version":3,"file":"next.d.ts","sourceRoot":"","sources":["../../../src/commands/task/next.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAIL,KAAK,eAAe,EACrB,MAAM,aAAa,CAAC;AAErB,wBAAsB,WAAW,CAAC,IAAI,EAAE;IACtC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,eAAe,CAAC;CAC1B,GAAG,OAAO,CAAC,MAAM,CAAC,CAuBlB"}

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"}