agentplane 0.3.14 → 0.3.16

package/dist/commands/task/hosted-close.command.js

@@ -243,18 +243,33 @@ async function closeHostedTask(opts) {
     const gitRoot = opts.ctx.resolvedProject.gitRoot;
     const taskDirRelative = path.join(opts.ctx.config.paths.workflow_dir, target.taskId);
     const taskReadmePath = path.join(gitRoot, taskDirRelative, "README.md");
+    const existingMetaPath = path.join(gitRoot, taskDirRelative, "pr", "meta.json");
+    let existingMeta = null;
+    if (await fileExists(existingMetaPath)) {
+        existingMeta = parsePrMeta(await readFile(existingMetaPath, "utf8"), target.taskId);
+    }
+    const existingMergeCommit = existingMeta?.merge_commit?.trim() ?? "";
+    const existingMetaAlreadyMerged = existingMeta?.status === "MERGED" &&
+        existingMergeCommit.length > 0 &&
+        existingMergeCommit === target.mergedPr.mergeCommit.oid;
     let task;
     try {
         task = await loadTaskFromContext({
             ctx: opts.ctx,
             taskId: target.taskId,
-            preferBranchSnapshot: true,
-            branchSnapshotBranch: target.branch,
+            preferBranchSnapshot: !existingMetaAlreadyMerged,
+            branchSnapshotBranch: existingMetaAlreadyMerged ? null : target.branch,
         });
     }
     catch (err) {
         if (!isMissingTaskReadmeError(err, taskReadmePath))
             throw err;
+        if (existingMetaAlreadyMerged) {
+            return {
+                outcome: "noop",
+                detail: `${target.taskId} is already closed for merge ${target.mergedPr.mergeCommit.oid.slice(0, 12)}`,
+            };
+        }
         const recovered = await buildHostedTaskFromTrackedPrArtifacts({
             gitRoot,
             taskDirRelative,
@@ -286,6 +301,12 @@ async function closeHostedTask(opts) {
                 `${task.commit?.hash} != ${target.mergedPr.mergeCommit.oid}`,
         });
     }
+    if (alreadyClosed && existingMetaAlreadyMerged) {
+        return {
+            outcome: "noop",
+            detail: `${target.taskId} is already closed for merge ${target.mergedPr.mergeCommit.oid.slice(0, 12)}`,
+        };
+    }
     const nextMeta = buildIntegratedPrMeta({
         meta,
         branch: target.branch,

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

@@ -0,0 +1,35 @@
+import { type TaskPrMeta } from "@agentplaneorg/core";
+import type { TaskData } from "../../../backends/task-backend.js";
+import type { HostedMergedPr, LocalBranchPrSyncCandidate, LocalMergedPrMeta } from "./model.js";
+export declare function buildSyncedPrMeta(opts: {
+    meta: TaskPrMeta;
+    mergedPr: HostedMergedPr;
+    branch: string;
+}): TaskPrMeta;
+export declare function buildSyncedTask(opts: {
+    task: TaskData;
+    mergedPr: HostedMergedPr;
+}): TaskData;
+export declare function needsHostedMergeSyncFromLocalMeta(opts: {
+    task: TaskData;
+    meta: LocalMergedPrMeta;
+}): boolean;
+export declare function buildLocallyMergedSyncedTask(opts: {
+    task: TaskData;
+    meta: LocalMergedPrMeta;
+}): TaskData;
+export declare function buildLocallySyncedTask(opts: {
+    task: TaskData;
+    candidate: LocalBranchPrSyncCandidate;
+}): TaskData;
+export declare function buildLocallySyncedPrMeta(opts: {
+    meta: TaskPrMeta;
+    candidate: LocalBranchPrSyncCandidate;
+}): TaskPrMeta;
+export declare function needsHostedMergeSync(opts: {
+    task: TaskData;
+    meta: TaskPrMeta;
+    mergedPr: HostedMergedPr;
+    branch: string;
+}): boolean;
+//# sourceMappingURL=builders.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"builders.d.ts","sourceRoot":"","sources":["../../../../src/commands/task/hosted-merge-sync/builders.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,KAAK,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAE/E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAElE,OAAO,KAAK,EAAE,cAAc,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAEhG,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IACtC,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,cAAc,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,UAAU,CAab;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,EAAE,cAAc,CAAA;CAAE,GAAG,QAAQ,CAkC5F;AAED,wBAAgB,iCAAiC,CAAC,IAAI,EAAE;IACtD,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,iBAAiB,CAAC;CACzB,GAAG,OAAO,CAKV;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE;IACjD,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,iBAAiB,CAAC;CACzB,GAAG,QAAQ,CA4BX;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE;IAC3C,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,0BAA0B,CAAC;CACvC,GAAG,QAAQ,CA8BX;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE;IAC7C,IAAI,EAAE,UAAU,CAAC;IACjB,SAAS,EAAE,0BAA0B,CAAC;CACvC,GAAG,UAAU,CAYb;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE;IACzC,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,cAAc,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAaV"}

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

@@ -0,0 +1,148 @@
+import { normalizeTaskDocVersion } from "@agentplaneorg/core";
+import { appendTaskEvent } from "../shared.js";
+export 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,
+    };
+}
+export 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 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, {
+            type: "status",
+            at,
+            author: "INTEGRATOR",
+            from: currentStatus,
+            to: "DONE",
+            note,
+        }),
+        doc_version: normalizeTaskDocVersion(opts.task.doc_version),
+        doc_updated_at: at,
+        doc_updated_by: "INTEGRATOR",
+    };
+}
+export function needsHostedMergeSyncFromLocalMeta(opts) {
+    const currentStatus = String(opts.task.status || "TODO").toUpperCase();
+    if (currentStatus !== "DONE")
+        return true;
+    if ((opts.task.commit?.hash ?? "") !== opts.meta.mergeCommit)
+        return true;
+    return false;
+}
+export function buildLocallyMergedSyncedTask(opts) {
+    const at = opts.meta.mergedAt ?? new Date().toISOString();
+    const currentStatus = String(opts.task.status || "TODO").toUpperCase();
+    const note = "Local PR metadata already marks the task branch as MERGED; " +
+        "task projection reconciled without an additional GitHub lookup.";
+    return {
+        ...opts.task,
+        status: "DONE",
+        result_summary: opts.task.result_summary ?? "Merged and reconciled from local PR metadata.",
+        commit: opts.task.commit?.hash?.trim()
+            ? opts.task.commit
+            : {
+                hash: opts.meta.mergeCommit,
+                message: "Merged branch_pr task reconciled from local PR metadata",
+            },
+        events: appendTaskEvent(opts.task, {
+            type: "status",
+            at,
+            author: "INTEGRATOR",
+            from: currentStatus,
+            to: "DONE",
+            note,
+        }),
+        doc_version: normalizeTaskDocVersion(opts.task.doc_version),
+        doc_updated_at: at,
+        doc_updated_by: "INTEGRATOR",
+    };
+}
+export function buildLocallySyncedTask(opts) {
+    const at = new Date().toISOString();
+    const currentStatus = String(opts.task.status || "TODO").toUpperCase();
+    const note = `Local branch_pr reconciliation detected task commit ${opts.candidate.commitHash.slice(0, 12)} ` +
+        `on base ${opts.candidate.base}; canonical task state normalized after shipment.`;
+    return {
+        ...opts.task,
+        status: "DONE",
+        result_summary: opts.task.result_summary ??
+            `Shipped on ${opts.candidate.base} and reconciled from local branch_pr state.`,
+        commit: opts.task.commit?.hash?.trim()
+            ? opts.task.commit
+            : {
+                hash: opts.candidate.commitHash,
+                message: `Shipped on ${opts.candidate.base} before canonical task closure`,
+            },
+        events: appendTaskEvent(opts.task, {
+            type: "status",
+            at,
+            author: "INTEGRATOR",
+            from: currentStatus,
+            to: "DONE",
+            note,
+        }),
+        doc_version: normalizeTaskDocVersion(opts.task.doc_version),
+        doc_updated_at: at,
+        doc_updated_by: "INTEGRATOR",
+    };
+}
+export function buildLocallySyncedPrMeta(opts) {
+    const at = new Date().toISOString();
+    return {
+        ...opts.meta,
+        branch: opts.candidate.branch,
+        base: opts.candidate.base,
+        status: "MERGED",
+        merged_at: opts.meta.merged_at ?? at,
+        merge_commit: opts.meta.merge_commit ?? opts.candidate.commitHash,
+        head_sha: opts.meta.head_sha ?? opts.candidate.commitHash,
+        updated_at: at,
+    };
+}
+export 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;
+}

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

@@ -0,0 +1,10 @@
+import type { HostedMergedPr, HostedMergeTarget } from "./model.js";
+export declare function resolveHostedMergeTargetFromEvent(opts: {
+    event: unknown;
+    branchPrefix: string;
+}): HostedMergeTarget | null;
+export declare function resolveHostedMergedPr(opts: {
+    cwd: string;
+    branch: string;
+}): Promise<HostedMergedPr | null>;
+//# sourceMappingURL=github.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"github.d.ts","sourceRoot":"","sources":["../../../../src/commands/task/hosted-merge-sync/github.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AA6EpE,wBAAgB,iCAAiC,CAAC,IAAI,EAAE;IACtD,KAAK,EAAE,OAAO,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,iBAAiB,GAAG,IAAI,CAY3B;AAED,wBAAsB,qBAAqB,CAAC,IAAI,EAAE;IAChD,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CA4BjC"}

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

@@ -0,0 +1,113 @@
+import { execFileAsync } from "../../shared/git.js";
+import { withGhTransportRetry } from "../../shared/gh-transport.js";
+import { parseTaskIdFromBranch } from "../../shared/git-worktree.js";
+import { ghEnv } from "../../pr/internal/gh-api.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,
+    };
+}
+export async function resolveHostedMergedPr(opts) {
+    return await withGhTransportRetry(async () => {
+        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: ghEnv(),
+            maxBuffer: 10 * 1024 * 1024,
+        });
+        const parsed = JSON.parse(stdout);
+        return Array.isArray(parsed) ? pickHostedMergedPr(parsed) : null;
+    }, {
+        label: `looking up merged PR metadata for ${opts.branch}`,
+    });
+}

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

@@ -0,0 +1,12 @@
+import type { TaskData } from "../../../backends/task-backend.js";
+import type { CommandContext } from "../../shared/task-backend.js";
+import type { LocalBranchPrSyncCandidate, LocalDoneBranchPrDrift } from "./model.js";
+export declare function findLocallyShippedBranchPrTasks(opts: {
+    ctx: CommandContext;
+    tasks: TaskData[];
+}): Promise<LocalBranchPrSyncCandidate[]>;
+export declare function findDoneBranchPrTasksWithOpenPrArtifacts(opts: {
+    ctx: CommandContext;
+    tasks: TaskData[];
+}): Promise<LocalDoneBranchPrDrift[]>;
+//# sourceMappingURL=local-branch.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"local-branch.d.ts","sourceRoot":"","sources":["../../../../src/commands/task/hosted-merge-sync/local-branch.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAGlE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAGnE,OAAO,KAAK,EAAE,0BAA0B,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AA+DrF,wBAAsB,+BAA+B,CAAC,IAAI,EAAE;IAC1D,GAAG,EAAE,cAAc,CAAC;IACpB,KAAK,EAAE,QAAQ,EAAE,CAAC;CACnB,GAAG,OAAO,CAAC,0BAA0B,EAAE,CAAC,CAiDxC;AAED,wBAAsB,wCAAwC,CAAC,IAAI,EAAE;IACnE,GAAG,EAAE,cAAc,CAAC;IACpB,KAAK,EAAE,QAAQ,EAAE,CAAC;CACnB,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC,CAqCpC"}

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

@@ -0,0 +1,143 @@
+import { resolveBaseBranch } from "@agentplaneorg/core";
+import { execFileAsync } from "../../shared/git.js";
+import { parseTaskIdFromBranch } from "../../shared/git-worktree.js";
+import { backendUsesLocalTaskStore } from "../../shared/task-backend.js";
+import { readPrMetaIfPresent } from "./pr-meta.js";
+function hasTaskVerificationForLocalSync(opts) {
+    if (opts.task.verification?.state === "ok")
+        return "task";
+    if (opts.meta?.verify?.status === "pass")
+        return "pr";
+    return null;
+}
+async function gitRefExists(opts) {
+    try {
+        await execFileAsync("git", ["rev-parse", "--verify", "--quiet", opts.ref], {
+            cwd: opts.cwd,
+            env: process.env,
+        });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+async function gitIsAncestor(opts) {
+    try {
+        await execFileAsync("git", ["merge-base", "--is-ancestor", opts.ancestor, opts.descendant], {
+            cwd: opts.cwd,
+            env: process.env,
+        });
+        return true;
+    }
+    catch (err) {
+        const code = err?.code;
+        if (code === 1)
+            return false;
+        throw err;
+    }
+}
+async function resolveSyncBaseBranch(opts) {
+    const fromMeta = opts.meta?.base?.trim() ?? "";
+    if (fromMeta.length > 0)
+        return fromMeta;
+    return await resolveBaseBranch({
+        cwd: opts.ctx.resolvedProject.gitRoot,
+        rootOverride: opts.ctx.resolvedProject.gitRoot,
+        cliBaseOpt: null,
+        mode: opts.ctx.config.workflow_mode,
+    });
+}
+function isStackedBranchAliasDoneTask(opts) {
+    const branchTaskId = parseTaskIdFromBranch("task", opts.branch);
+    if (!branchTaskId || branchTaskId === opts.task.id)
+        return false;
+    const summary = opts.task.result_summary?.trim().toLowerCase() ?? "";
+    if (!summary.includes("stacked branch_pr merge rooted at"))
+        return false;
+    return summary.includes(branchTaskId.toLowerCase());
+}
+export async function findLocallyShippedBranchPrTasks(opts) {
+    if (!backendUsesLocalTaskStore(opts.ctx) || opts.ctx.config.workflow_mode !== "branch_pr") {
+        return [];
+    }
+    const matches = [];
+    for (const task of opts.tasks) {
+        const currentStatus = String(task.status || "TODO").toUpperCase();
+        const prMetaRecord = await readPrMetaIfPresent({ ctx: opts.ctx, taskId: task.id });
+        const meta = prMetaRecord?.meta ?? null;
+        const branch = meta?.branch?.trim() ?? "";
+        if (!branch)
+            continue;
+        const verificationSource = hasTaskVerificationForLocalSync({ task, meta });
+        const commitHash = task.commit?.hash?.trim() ?? meta?.merge_commit?.trim() ?? meta?.head_sha?.trim() ?? "";
+        if (!commitHash)
+            continue;
+        const base = await resolveSyncBaseBranch({ ctx: opts.ctx, meta });
+        if (!base)
+            continue;
+        if (!(await gitRefExists({ cwd: opts.ctx.resolvedProject.gitRoot, ref: base })))
+            continue;
+        if (!(await gitIsAncestor({
+            cwd: opts.ctx.resolvedProject.gitRoot,
+            ancestor: commitHash,
+            descendant: base,
+        }))) {
+            continue;
+        }
+        const metaNeedsSync = Boolean(meta && meta.status !== "MERGED");
+        const taskNeedsSync = currentStatus !== "DONE" && verificationSource !== null;
+        if (!taskNeedsSync && !metaNeedsSync)
+            continue;
+        if (!taskNeedsSync && currentStatus !== "DONE")
+            continue;
+        matches.push({
+            taskId: task.id,
+            branch,
+            base,
+            commitHash,
+            verificationSource,
+            metaPath: prMetaRecord?.metaPath ?? null,
+            meta,
+            taskStatus: currentStatus,
+        });
+    }
+    return matches;
+}
+export async function findDoneBranchPrTasksWithOpenPrArtifacts(opts) {
+    if (!backendUsesLocalTaskStore(opts.ctx) || opts.ctx.config.workflow_mode !== "branch_pr") {
+        return [];
+    }
+    const matches = [];
+    for (const task of opts.tasks) {
+        const currentStatus = String(task.status || "TODO").toUpperCase();
+        if (currentStatus !== "DONE")
+            continue;
+        const prMetaRecord = await readPrMetaIfPresent({ ctx: opts.ctx, taskId: task.id });
+        const meta = prMetaRecord?.meta ?? null;
+        if (!meta || meta.status === "MERGED")
+            continue;
+        const branch = meta.branch?.trim() ?? "";
+        if (!branch)
+            continue;
+        const branchStillExists = (await gitRefExists({ cwd: opts.ctx.resolvedProject.gitRoot, ref: branch })) ||
+            (await gitRefExists({ cwd: opts.ctx.resolvedProject.gitRoot, ref: `origin/${branch}` }));
+        if (!branchStillExists)
+            continue;
+        if (isStackedBranchAliasDoneTask({ task, branch }))
+            continue;
+        const commitHash = task.commit?.hash?.trim() ?? "";
+        if (!commitHash)
+            continue;
+        const base = await resolveSyncBaseBranch({ ctx: opts.ctx, meta });
+        if (!base)
+            continue;
+        matches.push({
+            taskId: task.id,
+            branch,
+            base,
+            commitHash,
+        });
+    }
+    return matches;
+}

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

@@ -0,0 +1,47 @@
+import type { TaskPrMeta } from "@agentplaneorg/core";
+import type { TaskData } from "../../../backends/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;
+};
+export type HostedMergeSyncResult = {
+    tasks: TaskData[];
+    synced: number;
+};
+export type LocalBranchPrSyncCandidate = {
+    taskId: string;
+    branch: string;
+    base: string;
+    commitHash: string;
+    verificationSource: "task" | "pr" | null;
+    metaPath: string | null;
+    meta: TaskPrMeta | null;
+    taskStatus: string;
+};
+export type LocalDoneBranchPrDrift = {
+    taskId: string;
+    branch: string;
+    base: string;
+    commitHash: string;
+};
+export type LocalMergedPrMeta = {
+    branch: string;
+    base?: string | null;
+    mergedAt?: string | null;
+    mergeCommit: string;
+    headSha?: string | null;
+};
+//# sourceMappingURL=model.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../../src/commands/task/hosted-merge-sync/model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAElE,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,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,kBAAkB,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAAC;IACzC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB,CAAC"}

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

@@ -0,0 +1,12 @@
+import type { TaskPrMeta } from "@agentplaneorg/core";
+import type { CommandContext } from "../../shared/task-backend.js";
+import type { LocalMergedPrMeta } from "./model.js";
+export declare function resolveLocalMergedPrMeta(meta: TaskPrMeta | null): LocalMergedPrMeta | null;
+export declare function readPrMetaIfPresent(opts: {
+    ctx: CommandContext;
+    taskId: string;
+}): Promise<{
+    meta: TaskPrMeta;
+    metaPath: string;
+} | null>;
+//# sourceMappingURL=pr-meta.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"pr-meta.d.ts","sourceRoot":"","sources":["../../../../src/commands/task/hosted-merge-sync/pr-meta.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAEpD,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,GAAG,iBAAiB,GAAG,IAAI,CAW1F;AAED,wBAAsB,mBAAmB,CAAC,IAAI,EAAE;IAC9C,GAAG,EAAE,cAAc,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CAczD"}

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

@@ -0,0 +1,26 @@
+import { readFile } from "node:fs/promises";
+import path from "node:path";
+import { parsePrMeta } from "../../shared/pr-meta.js";
+export function resolveLocalMergedPrMeta(meta) {
+    const branch = meta?.branch?.trim() ?? "";
+    const mergeCommit = meta?.merge_commit?.trim() ?? "";
+    if (meta?.status !== "MERGED" || !branch || !mergeCommit)
+        return null;
+    return {
+        branch,
+        base: meta.base ?? null,
+        mergedAt: meta.merged_at ?? null,
+        mergeCommit,
+        headSha: meta.head_sha ?? null,
+    };
+}
+export 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;
+    }
+}