agentplane 0.3.15 → 0.3.17

package/dist/commands/task/hosted-close-pr.precheck.js

@@ -0,0 +1,288 @@
+import { readFile } from "node:fs/promises";
+import { resolveBaseBranch } from "@agentplaneorg/core";
+import { exitCodeForError } from "../../cli/exit-codes.js";
+import { fileExists } from "../../cli/fs-utils.js";
+import { CliError } from "../../shared/errors.js";
+import { resolveDefaultGithubRepo, runGhApiJson } from "../pr/internal/gh-api.js";
+import { resolvePrPaths } from "../pr/internal/pr-paths.js";
+import { execFileAsync, gitEnv } from "../shared/git.js";
+import { parseTaskIdFromCloseBranch } from "../shared/git-worktree.js";
+import { parsePrMeta } from "../shared/pr-meta.js";
+import { loadTaskFromContext, resolveTaskBranchFromContext, } from "../shared/task-backend.js";
+async function resolveGithubRepo(opts) {
+    const repo = opts.repoOverride?.trim() ?? "";
+    if (repo)
+        return repo;
+    return await resolveDefaultGithubRepo(opts.gitRoot);
+}
+function selectMergedPullRecord(opts) {
+    const merged = opts.pulls.filter((record) => {
+        if (typeof record.merged_at !== "string" || record.merged_at.trim().length === 0)
+            return false;
+        const headRef = record.head?.ref?.trim() ?? "";
+        if (opts.sourceBranch && headRef && headRef !== opts.sourceBranch)
+            return false;
+        const baseRef = record.base?.ref?.trim() ?? "";
+        if (opts.baseBranch && baseRef && baseRef !== opts.baseBranch)
+            return false;
+        return true;
+    });
+    if (merged.length === 0)
+        return null;
+    if (typeof opts.prNumber === "number" && opts.prNumber > 0) {
+        const exact = merged.find((record) => Number(record.number ?? 0) === opts.prNumber);
+        if (exact)
+            return exact;
+    }
+    return ([...merged].toSorted((left, right) => {
+        const leftAt = Date.parse(left.merged_at ?? "");
+        const rightAt = Date.parse(right.merged_at ?? "");
+        return Number.isNaN(rightAt) || Number.isNaN(leftAt) ? 0 : rightAt - leftAt;
+    })[0] ?? null);
+}
+async function resolveHostedCloseMergeRecord(opts) {
+    const owner = opts.repo.split("/")[0]?.trim() ?? "";
+    if (!owner)
+        return null;
+    const query = new URLSearchParams({
+        state: "closed",
+        head: `${owner}:${opts.sourceBranch}`,
+    });
+    if (opts.baseBranch)
+        query.set("base", opts.baseBranch);
+    const records = await runGhApiJson(opts.gitRoot, [
+        `repos/${opts.repo}/pulls?${query.toString()}`,
+    ]);
+    return selectMergedPullRecord({
+        pulls: Array.isArray(records) ? records : [],
+        sourceBranch: opts.sourceBranch,
+        baseBranch: opts.baseBranch,
+        prNumber: opts.prNumber,
+    });
+}
+async function resolveHostedCloseMergeRecordByCommit(opts) {
+    const records = await runGhApiJson(opts.gitRoot, [
+        `repos/${opts.repo}/commits/${opts.mergeCommit}/pulls`,
+    ]);
+    return selectMergedPullRecord({
+        pulls: Array.isArray(records) ? records : [],
+        sourceBranch: opts.sourceBranch,
+        baseBranch: opts.baseBranch,
+        prNumber: opts.prNumber,
+    });
+}
+async function readHostedCloseState(opts) {
+    const task = (await opts.ctx.taskBackend.getTask(opts.taskId)) ??
+        (await loadTaskFromContext({
+            ctx: opts.ctx,
+            taskId: opts.taskId,
+            preferBranchSnapshot: false,
+        }));
+    const taskBranch = await resolveTaskBranchFromContext({ ctx: opts.ctx, taskId: opts.taskId });
+    const { metaPath, config } = await resolvePrPaths({
+        ctx: opts.ctx,
+        cwd: opts.cwd,
+        rootOverride: opts.rootOverride,
+        taskId: opts.taskId,
+    });
+    if (config.workflow_mode !== "branch_pr") {
+        throw new CliError({
+            exitCode: exitCodeForError("E_USAGE"),
+            code: "E_USAGE",
+            message: `Invalid workflow_mode: ${config.workflow_mode} (expected branch_pr)`,
+        });
+    }
+    if (!(await fileExists(metaPath))) {
+        return { meta: null, task, taskBranch };
+    }
+    const meta = parsePrMeta(await readFile(metaPath, "utf8"), opts.taskId);
+    return { meta, task, taskBranch };
+}
+async function listRemoteTaskCloseBranches(opts) {
+    const { stdout } = await execFileAsync("git", ["ls-remote", "--heads", "origin", `task-close/${opts.taskId}/*`], {
+        cwd: opts.gitRoot,
+        env: gitEnv(),
+        maxBuffer: 10 * 1024 * 1024,
+    });
+    return stdout
+        .split("\n")
+        .map((line) => line.trim())
+        .filter((line) => line.length > 0)
+        .map((line) => line.split(/\s+/, 2)[1] ?? "")
+        .map((ref) => ref.replace(/^refs\/heads\//, ""))
+        .filter((ref) => ref.length > 0);
+}
+export function shortHostedCloseSha(value) {
+    return value.trim().slice(0, 12);
+}
+function stripBranchRef(branch) {
+    return branch.startsWith("refs/heads/") ? branch.slice("refs/heads/".length) : branch;
+}
+async function resolveHostedCloseBranch(opts) {
+    const remoteBranches = await listRemoteTaskCloseBranches({
+        gitRoot: opts.gitRoot,
+        taskId: opts.taskId,
+    });
+    const explicitBranch = stripBranchRef(opts.explicitBranch?.trim() ?? "");
+    if (explicitBranch) {
+        const parsedTaskId = parseTaskIdFromCloseBranch(explicitBranch);
+        if (parsedTaskId && parsedTaskId !== opts.taskId) {
+            throw new CliError({
+                exitCode: exitCodeForError("E_VALIDATION"),
+                code: "E_VALIDATION",
+                message: `Branch ${explicitBranch} does not belong to task ${opts.taskId}.`,
+            });
+        }
+        if (!remoteBranches.includes(explicitBranch)) {
+            throw new CliError({
+                exitCode: exitCodeForError("E_VALIDATION"),
+                code: "E_VALIDATION",
+                message: `Remote hosted closure branch not found: ${explicitBranch}.`,
+            });
+        }
+        return explicitBranch;
+    }
+    if (opts.mergeCommit) {
+        const expected = `task-close/${opts.taskId}/${shortHostedCloseSha(opts.mergeCommit)}`;
+        if (remoteBranches.includes(expected))
+            return expected;
+        if (remoteBranches.length === 1)
+            return remoteBranches[0] ?? expected;
+        if (remoteBranches.length > 1) {
+            throw new CliError({
+                exitCode: exitCodeForError("E_VALIDATION"),
+                code: "E_VALIDATION",
+                message: `Multiple remote hosted closure branches match ${opts.taskId}: ${remoteBranches.join(", ")} (use --branch).`,
+            });
+        }
+        throw new CliError({
+            exitCode: exitCodeForError("E_VALIDATION"),
+            code: "E_VALIDATION",
+            message: `Remote hosted closure branch not found for ${opts.taskId}: ${expected}.`,
+        });
+    }
+    if (remoteBranches.length === 1)
+        return remoteBranches[0] ?? "";
+    if (remoteBranches.length > 1) {
+        throw new CliError({
+            exitCode: exitCodeForError("E_VALIDATION"),
+            code: "E_VALIDATION",
+            message: `Multiple remote hosted closure branches match ${opts.taskId}: ${remoteBranches.join(", ")} (use --branch).`,
+        });
+    }
+    throw new CliError({
+        exitCode: exitCodeForError("E_VALIDATION"),
+        code: "E_VALIDATION",
+        message: `Could not resolve remote hosted closure branch for ${opts.taskId}.`,
+    });
+}
+export async function precheckHostedClosePr(opts) {
+    const { meta, task, taskBranch } = await readHostedCloseState({
+        ctx: opts.ctx,
+        cwd: opts.cwd,
+        rootOverride: opts.rootOverride,
+        taskId: opts.taskId,
+    });
+    const gitRoot = opts.ctx.resolvedProject.gitRoot;
+    const repo = await resolveGithubRepo({ gitRoot, repoOverride: opts.repo ?? null });
+    const defaultBaseBranch = await resolveBaseBranch({
+        cwd: opts.cwd,
+        rootOverride: opts.rootOverride ?? null,
+        cliBaseOpt: null,
+        mode: opts.ctx.config.workflow_mode,
+    });
+    let sourceBranch = meta?.branch?.trim() ?? taskBranch?.trim() ?? "";
+    let baseBranch = meta?.base?.trim() ?? defaultBaseBranch?.trim() ?? "";
+    const localMergeCommit = meta?.merge_commit?.trim() ?? task.commit?.hash?.trim() ?? "";
+    const canonicalCloseAlreadyPresent = meta?.status === "MERGED" &&
+        sourceBranch.length > 0 &&
+        localMergeCommit.length > 0 &&
+        String(task.status || "TODO").toUpperCase() === "DONE" &&
+        (task.commit?.hash?.trim() ?? "") === localMergeCommit;
+    if (canonicalCloseAlreadyPresent) {
+        return {
+            kind: "skip",
+            outcome: {
+                kind: "canonical-already-present",
+                taskId: opts.taskId,
+                baseBranch,
+                mergeCommit: localMergeCommit,
+            },
+        };
+    }
+    const prNumber = typeof meta?.pr_number === "number" ? meta.pr_number : null;
+    let mergedRecord = sourceBranch.length > 0 && (meta?.status !== "MERGED" || !localMergeCommit)
+        ? await resolveHostedCloseMergeRecord({
+            gitRoot,
+            repo,
+            sourceBranch,
+            baseBranch: baseBranch || null,
+            prNumber,
+        })
+        : null;
+    if (!mergedRecord && localMergeCommit) {
+        mergedRecord = await resolveHostedCloseMergeRecordByCommit({
+            gitRoot,
+            repo,
+            mergeCommit: localMergeCommit,
+            sourceBranch: sourceBranch || null,
+            baseBranch: baseBranch || null,
+            prNumber,
+        });
+    }
+    if (!sourceBranch) {
+        sourceBranch = mergedRecord?.head?.ref?.trim() ?? "";
+    }
+    if (!baseBranch) {
+        baseBranch = mergedRecord?.base?.ref?.trim() ?? defaultBaseBranch?.trim() ?? "";
+    }
+    const mergeCommit = meta?.merge_commit?.trim() ??
+        task.commit?.hash?.trim() ??
+        mergedRecord?.merge_commit_sha?.trim() ??
+        "";
+    if (!sourceBranch) {
+        throw new CliError({
+            exitCode: exitCodeForError("E_VALIDATION"),
+            code: "E_VALIDATION",
+            message: `Missing hosted close source branch for ${opts.taskId}.`,
+        });
+    }
+    if (!mergeCommit) {
+        throw new CliError({
+            exitCode: exitCodeForError("E_VALIDATION"),
+            code: "E_VALIDATION",
+            message: `Missing hosted close merge commit for ${opts.taskId}.`,
+        });
+    }
+    if (meta?.status !== "MERGED" && !mergedRecord?.merged_at) {
+        throw new CliError({
+            exitCode: exitCodeForError("E_USAGE"),
+            code: "E_USAGE",
+            message: `Task ${opts.taskId} is not in MERGED hosted-close state.`,
+        });
+    }
+    const closeBranch = await resolveHostedCloseBranch({
+        gitRoot,
+        taskId: opts.taskId,
+        explicitBranch: opts.branch ?? null,
+        mergeCommit,
+    });
+    return {
+        kind: "ready",
+        plan: {
+            taskId: opts.taskId,
+            gitRoot,
+            workflowDir: opts.ctx.config.paths.workflow_dir,
+            repo,
+            sourceBranch,
+            baseBranch,
+            mergeCommit,
+            closeBranch,
+            sourcePrNumber: typeof meta?.pr_number === "number"
+                ? meta.pr_number
+                : typeof mergedRecord?.number === "number"
+                    ? mergedRecord.number
+                    : null,
+        },
+    };
+}

package/dist/commands/task/hosted-close-pr.report.d.ts

@@ -0,0 +1,4 @@
+import type { HostedClosePrExecutionResult, HostedClosePrOutcome } from "./hosted-close-pr.types.js";
+export declare function reportHostedClosePrOutcome(outcome: HostedClosePrOutcome): void;
+export declare function reportHostedClosePrExecutionResult(result: HostedClosePrExecutionResult): void;
+//# sourceMappingURL=hosted-close-pr.report.d.ts.map

package/dist/commands/task/hosted-close-pr.report.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hosted-close-pr.report.d.ts","sourceRoot":"","sources":["../../../src/commands/task/hosted-close-pr.report.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,4BAA4B,EAE5B,oBAAoB,EACrB,MAAM,4BAA4B,CAAC;AAoBpC,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,oBAAoB,GAAG,IAAI,CAE9E;AAED,wBAAgB,kCAAkC,CAAC,MAAM,EAAE,4BAA4B,GAAG,IAAI,CAyC7F"}

package/dist/commands/task/hosted-close-pr.report.js

@@ -0,0 +1,42 @@
+import { createCliEmitter } from "../../cli/output.js";
+import { shortHostedCloseSha } from "./hosted-close-pr.precheck.js";
+function normalizeGithubPrLink(prNumber, prUrl, verb) {
+    return prUrl?.trim()
+        ? `${verb} GitHub PR #${prNumber}: ${prUrl.trim()}`
+        : `${verb} GitHub PR #${prNumber}`;
+}
+function reportNotice(output, notice) {
+    if (notice.level === "warn") {
+        output.warn(notice.message);
+        return;
+    }
+    output.info(notice.message);
+}
+export function reportHostedClosePrOutcome(outcome) {
+    reportHostedClosePrExecutionResult({ notices: [], outcome });
+}
+export function reportHostedClosePrExecutionResult(result) {
+    const output = createCliEmitter();
+    for (const notice of result.notices) {
+        reportNotice(output, notice);
+    }
+    switch (result.outcome.kind) {
+        case "canonical-already-present": {
+            output.info(`hosted-close-pr skipped: ${result.outcome.taskId} is already closed on ${result.outcome.baseBranch || "the base branch"} for merge ${shortHostedCloseSha(result.outcome.mergeCommit)}`);
+            return;
+        }
+        case "base-already-recorded": {
+            output.info(`hosted close already recorded on ${result.outcome.baseBranch}; no follow-up PR needed`);
+            output.success("task hosted-close-pr", result.outcome.taskId, `hosted close already recorded on ${result.outcome.baseBranch}; skipped follow-up PR`);
+            return;
+        }
+        case "existing-pr": {
+            output.success("task hosted-close-pr", result.outcome.taskId, normalizeGithubPrLink(result.outcome.prNumber, result.outcome.prUrl, "linked to"));
+            return;
+        }
+        case "created-pr": {
+            output.success("task hosted-close-pr", result.outcome.taskId, normalizeGithubPrLink(result.outcome.prNumber, result.outcome.prUrl, "created"));
+            return;
+        }
+    }
+}

package/dist/commands/task/hosted-close-pr.types.d.ts

@@ -0,0 +1,75 @@
+import type { CommandContext } from "../shared/task-backend.js";
+export type TaskHostedClosePrParsed = {
+    taskIds: string[];
+    branch: string | null;
+    repo: string | null;
+};
+export type GithubPullRequestRecord = {
+    number?: number;
+    html_url?: string | null;
+    state?: string | null;
+    merged_at?: string | null;
+    merge_commit_sha?: string | null;
+    head?: {
+        ref?: string | null;
+    } | null;
+    base?: {
+        ref?: string | null;
+    } | null;
+};
+export type HostedClosePrPrecheckOptions = {
+    ctx: CommandContext;
+    cwd: string;
+    rootOverride?: string;
+    taskId: string;
+    branch?: string | null;
+    repo?: string | null;
+};
+export type HostedClosePrPlan = {
+    taskId: string;
+    gitRoot: string;
+    workflowDir: string;
+    repo: string;
+    sourceBranch: string;
+    baseBranch: string;
+    mergeCommit: string;
+    closeBranch: string;
+    sourcePrNumber: number | null;
+};
+export type HostedClosePrOutcome = {
+    kind: "canonical-already-present";
+    taskId: string;
+    baseBranch: string;
+    mergeCommit: string;
+} | {
+    kind: "base-already-recorded";
+    taskId: string;
+    baseBranch: string;
+} | {
+    kind: "existing-pr";
+    taskId: string;
+    prNumber: number;
+    prUrl: string | null;
+} | {
+    kind: "created-pr";
+    taskId: string;
+    closeBranch: string;
+    prNumber: number;
+    prUrl: string | null;
+};
+export type HostedClosePrPrecheckResult = {
+    kind: "skip";
+    outcome: HostedClosePrOutcome;
+} | {
+    kind: "ready";
+    plan: HostedClosePrPlan;
+};
+export type HostedClosePrNotice = {
+    level: "info" | "warn";
+    message: string;
+};
+export type HostedClosePrExecutionResult = {
+    notices: HostedClosePrNotice[];
+    outcome: HostedClosePrOutcome;
+};
+//# sourceMappingURL=hosted-close-pr.types.d.ts.map

package/dist/commands/task/hosted-close-pr.types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hosted-close-pr.types.d.ts","sourceRoot":"","sources":["../../../src/commands/task/hosted-close-pr.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEhE,MAAM,MAAM,uBAAuB,GAAG;IACpC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,IAAI,CAAC,EAAE;QACL,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KACrB,GAAG,IAAI,CAAC;IACT,IAAI,CAAC,EAAE;QACL,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KACrB,GAAG,IAAI,CAAC;CACV,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,GAAG,EAAE,cAAc,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAC5B;IACE,IAAI,EAAE,2BAA2B,CAAC;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB,GACD;IACE,IAAI,EAAE,uBAAuB,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,GACD;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB,GACD;IACE,IAAI,EAAE,YAAY,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB,CAAC;AAEN,MAAM,MAAM,2BAA2B,GACnC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAA;CAAE,GAC/C;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,iBAAiB,CAAA;CAAE,CAAC;AAE/C,MAAM,MAAM,mBAAmB,GAAG;IAChC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,OAAO,EAAE,mBAAmB,EAAE,CAAC;IAC/B,OAAO,EAAE,oBAAoB,CAAC;CAC/B,CAAC"}

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