agentplane 0.3.10 → 0.3.12

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

@@ -12,6 +12,7 @@ import { loadTaskFromContext } from "../shared/task-backend.js";
 import { createTaskCloseCommit, writeFinishedTasks } from "./finish-shared.js";
 import { resolveHostedMergeTargetFromEvent } from "./hosted-merge-sync.js";
 import { readCommitInfo } from "./shared.js";
+import { collectTaskIncidents, renderIncidentCollectionPlanOutcome } from "../incidents/shared.js";
 export const taskHostedCloseSpec = {
     id: ["task", "hosted-close"],
     group: "Task",
@@ -50,6 +51,30 @@ export const taskHostedCloseSpec = {
         quiet: raw.opts.quiet === true,
     }),
 };
+function isMissingCommitObjectError(err) {
+    const stderr = err.stderr;
+    const text = err instanceof Error
+        ? [err.message, typeof stderr === "string" ? stderr : ""]
+            .filter((part) => part.trim().length > 0)
+            .join("\n")
+        : String(err);
+    return (/bad object/i.test(text) || /unknown revision/i.test(text) || /ambiguous argument/i.test(text));
+}
+async function resolveHostedTaskCommitInfo(opts) {
+    const mergeHash = opts.mergedPr.mergeCommit?.oid ?? "";
+    try {
+        return await readCommitInfo(opts.gitRoot, mergeHash);
+    }
+    catch (err) {
+        if (!isMissingCommitObjectError(err))
+            throw err;
+        return {
+            hash: mergeHash,
+            message: opts.mergedPr.title?.trim() ??
+                `Hosted PR #${opts.mergedPr.number} merged on GitHub ${opts.mergedPr.baseRefName ?? "main"}`,
+        };
+    }
+}
 async function hasTaskArtifactChanges(opts) {
     const { stdout } = await execFileAsync("git", ["status", "--short", "--", opts.taskDirRelative], {
         cwd: opts.gitRoot,
@@ -57,6 +82,154 @@ async function hasTaskArtifactChanges(opts) {
     });
     return stdout.trim().length > 0;
 }
+function buildFallbackPrMeta(opts) {
+    const at = opts.mergedPr.mergedAt ?? new Date().toISOString();
+    const headShaRaw = opts.mergedPr.headRefOid?.trim();
+    const headSha = headShaRaw && headShaRaw.length > 0 ? headShaRaw : undefined;
+    const prUrlRaw = opts.mergedPr.url?.trim();
+    const prUrl = prUrlRaw && prUrlRaw.length > 0 ? prUrlRaw : undefined;
+    return {
+        schema_version: 1,
+        task_id: opts.taskId,
+        branch: opts.branch,
+        ...(opts.mergedPr.baseRefName ? { base: opts.mergedPr.baseRefName } : {}),
+        pr_number: opts.mergedPr.number,
+        ...(prUrl ? { pr_url: prUrl } : {}),
+        created_at: at,
+        updated_at: at,
+        status: "OPEN",
+        ...(headSha ? { head_sha: headSha } : {}),
+        last_verified_sha: null,
+        last_verified_at: null,
+        verify: { status: "skipped" },
+    };
+}
+function escapeRegExp(value) {
+    return value.replaceAll(/[.*+?^${}()|[\]\\]/g, String.raw `\$&`);
+}
+function extractMarkdownSection(markdown, heading) {
+    const pattern = new RegExp(String.raw `^## ${escapeRegExp(heading)}\n\n([\s\S]*?)(?=\n## [^\n]+\n|$)`, "m");
+    const match = pattern.exec(markdown);
+    return match?.[1]?.trim() ?? "";
+}
+function fallbackTaskTitleFromPrTitle(taskId, prTitle) {
+    const trimmed = prTitle?.trim() ?? "";
+    if (!trimmed)
+        return `Hosted close recovery for ${taskId}`;
+    const suffix = taskId.split("-").at(-1)?.trim();
+    if (suffix) {
+        const stripped = trimmed.replace(new RegExp(String.raw `\s*\(${escapeRegExp(suffix)}\)\s*$`), "");
+        if (stripped.trim().length > 0)
+            return stripped.trim();
+    }
+    return trimmed;
+}
+function isMissingTaskReadmeError(err, readmePath) {
+    if (!(err instanceof CliError))
+        return false;
+    return err.code === "E_IO" && err.message.includes(readmePath);
+}
+async function buildHostedTaskFromTrackedPrArtifacts(opts) {
+    const bodyPath = path.join(opts.gitRoot, opts.taskDirRelative, "pr", "github-body.md");
+    let bodyText = "";
+    try {
+        bodyText = await readFile(bodyPath, "utf8");
+    }
+    catch (err) {
+        const code = err?.code;
+        if (code === "ENOENT")
+            return null;
+        throw err;
+    }
+    const summary = extractMarkdownSection(bodyText, "Summary");
+    const scope = extractMarkdownSection(bodyText, "Scope");
+    const verification = extractMarkdownSection(bodyText, "Verification");
+    const handoff = extractMarkdownSection(bodyText, "Handoff Notes");
+    const summaryLines = summary
+        .split("\n")
+        .map((line) => line.trim())
+        .filter((line) => line.length > 0);
+    const title = summaryLines[0] || fallbackTaskTitleFromPrTitle(opts.taskId, opts.mergedPr.title);
+    const description = summaryLines.slice(1).join("\n").trim() ||
+        `Recovered hosted-close state from tracked PR artifacts for merged PR #${opts.mergedPr.number}.`;
+    const scopeText = scope || `- In scope: record canonical task closure for merged PR #${opts.mergedPr.number}.`;
+    const verificationText = verification || "- State: pending\n- Note: Recovered during hosted-close.";
+    const handoffText = handoff || "- No handoff notes recorded.";
+    const planText = `Recovered hosted-close state from tracked PR artifacts for merged PR #${opts.mergedPr.number}.`;
+    const rollbackText = [
+        "- Revert the hosted closure commit if the merged PR metadata was recorded incorrectly.",
+        "- Re-run the required checks after rollback.",
+    ].join("\n");
+    const doc = [
+        "## Summary",
+        "",
+        title,
+        "",
+        description,
+        "",
+        "## Scope",
+        "",
+        scopeText,
+        "",
+        "## Plan",
+        "",
+        planText,
+        "",
+        "## Verification",
+        "",
+        verificationText,
+        "",
+        "## Rollback Plan",
+        "",
+        rollbackText,
+        "",
+        "## Handoff Notes",
+        "",
+        handoffText,
+        "",
+        "## Findings",
+        "",
+    ].join("\n");
+    return {
+        id: opts.taskId,
+        title,
+        description,
+        status: "DOING",
+        priority: "med",
+        owner: "INTEGRATOR",
+        revision: 1,
+        origin: { system: "manual" },
+        depends_on: [],
+        tags: [],
+        verify: [],
+        plan_approval: { state: "pending", updated_at: null, updated_by: null, note: null },
+        verification: { state: "pending", updated_at: null, updated_by: null, note: null },
+        commit: null,
+        doc,
+        doc_version: 3,
+        doc_updated_at: opts.mergedPr.mergedAt ?? new Date().toISOString(),
+        doc_updated_by: "INTEGRATOR",
+        id_source: "generated",
+    };
+}
+async function readHostedPrMetaOrFallback(opts) {
+    const metaPath = path.join(opts.gitRoot, opts.taskDirRelative, "pr", "meta.json");
+    if (!(await fileExists(metaPath))) {
+        return {
+            metaPath,
+            meta: buildFallbackPrMeta({
+                taskId: opts.target.taskId,
+                branch: opts.target.branch,
+                mergedPr: opts.target.mergedPr,
+            }),
+        };
+    }
+    const rawMeta = await readFile(metaPath, "utf8");
+    return {
+        metaPath,
+        meta: parsePrMeta(rawMeta, opts.target.taskId),
+    };
+}
 async function closeHostedTask(opts) {
     const rawEvent = await readFile(opts.eventJson, "utf8");
     const parsedEvent = JSON.parse(rawEvent);
@@ -69,24 +242,43 @@ async function closeHostedTask(opts) {
     }
     const gitRoot = opts.ctx.resolvedProject.gitRoot;
     const taskDirRelative = path.join(opts.ctx.config.paths.workflow_dir, target.taskId);
-    const task = await loadTaskFromContext({ ctx: opts.ctx, taskId: target.taskId });
-    const metaPath = path.join(gitRoot, taskDirRelative, "pr", "meta.json");
-    if (!(await fileExists(metaPath))) {
-        throw new CliError({
-            exitCode: 3,
-            code: "E_VALIDATION",
-            message: `Hosted task closure could not find pr/meta.json for ${target.taskId}`,
+    const taskReadmePath = path.join(gitRoot, taskDirRelative, "README.md");
+    let task;
+    try {
+        task = await loadTaskFromContext({
+            ctx: opts.ctx,
+            taskId: target.taskId,
+            preferBranchSnapshot: true,
+            branchSnapshotBranch: target.branch,
         });
     }
-    const rawMeta = await readFile(metaPath, "utf8");
-    const meta = parsePrMeta(rawMeta, target.taskId);
-    const alreadyClosed = String(task.status || "TODO").toUpperCase() === "DONE" &&
-        (task.commit?.hash ?? "") === target.mergedPr.mergeCommit.oid &&
-        meta.status === "MERGED" &&
-        (meta.merge_commit ?? "") === target.mergedPr.mergeCommit.oid;
-    if (String(task.status || "TODO").toUpperCase() === "DONE" &&
-        (task.commit?.hash ?? "") !== "" &&
-        (task.commit?.hash ?? "") !== target.mergedPr.mergeCommit.oid) {
+    catch (err) {
+        if (!isMissingTaskReadmeError(err, taskReadmePath))
+            throw err;
+        const recovered = await buildHostedTaskFromTrackedPrArtifacts({
+            gitRoot,
+            taskDirRelative,
+            taskId: target.taskId,
+            mergedPr: target.mergedPr,
+        });
+        if (!recovered)
+            throw err;
+        task = recovered;
+    }
+    if (!(await fileExists(taskReadmePath))) {
+        await opts.ctx.taskBackend.writeTask(task);
+    }
+    const { metaPath, meta } = await readHostedPrMetaOrFallback({
+        gitRoot,
+        taskDirRelative,
+        target,
+    });
+    const taskStatus = String(task.status || "TODO").toUpperCase();
+    const taskCommitHash = task.commit?.hash ?? "";
+    const alreadyClosed = taskStatus === "DONE" && taskCommitHash === target.mergedPr.mergeCommit.oid;
+    if (taskStatus === "DONE" &&
+        taskCommitHash !== "" &&
+        taskCommitHash !== target.mergedPr.mergeCommit.oid) {
         throw new CliError({
             exitCode: 3,
             code: "E_VALIDATION",
@@ -119,7 +311,7 @@ async function closeHostedTask(opts) {
             cwd: opts.cwd,
             rootOverride: opts.rootOverride,
             taskId: target.taskId,
-            baseBranchOverride: target.mergedPr.baseRefName ?? meta.base ?? "main",
+            baseBranchOverride: nextMeta.base ?? "main",
             quiet: opts.quiet,
         });
         return {
@@ -128,10 +320,19 @@ async function closeHostedTask(opts) {
             mergeHash: target.mergedPr.mergeCommit.oid,
         };
     }
-    const taskCommitInfo = await readCommitInfo(gitRoot, target.mergedPr.mergeCommit.oid);
+    const taskCommitInfo = await resolveHostedTaskCommitInfo({
+        gitRoot,
+        mergedPr: target.mergedPr,
+    });
     const prLabel = `PR #${target.mergedPr.number}`;
     const finishBody = `Verified: ${prLabel} merged on GitHub ${target.mergedPr.baseRefName ?? "main"}; ` +
         "hosted closure automation recorded canonical task artifacts.";
+    await collectTaskIncidents({
+        ctx: opts.ctx,
+        taskId: target.taskId,
+        task,
+        write: false,
+    });
     await writeFinishedTasks({
         ctx: opts.ctx,
         loadedTasks: [{ taskId: target.taskId, task }],
@@ -145,13 +346,27 @@ async function closeHostedTask(opts) {
         breaking: false,
         taskCommitInfo,
     });
+    const collectedIncidents = await collectTaskIncidents({
+        ctx: opts.ctx,
+        taskId: target.taskId,
+        write: true,
+    });
+    if (!opts.quiet) {
+        process.stdout.write(`${infoMessage(renderIncidentCollectionPlanOutcome(collectedIncidents.plan, {
+            wrote: collectedIncidents.wrote,
+            context: "finish",
+            promotedIds: collectedIncidents.plan.promotable.map((item) => item.entry.id),
+            registryPaths: collectedIncidents.registryPaths,
+        }))}\n`);
+    }
     await createTaskCloseCommit({
         ctx: opts.ctx,
         cwd: opts.cwd,
         rootOverride: opts.rootOverride,
         taskId: target.taskId,
-        baseBranchOverride: target.mergedPr.baseRefName ?? meta.base ?? "main",
+        baseBranchOverride: nextMeta.base ?? "main",
         quiet: opts.quiet,
+        allowPolicy: collectedIncidents.wrote,
     });
     return {
         outcome: "closed",

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

@@ -1,3 +1,4 @@
+import { type TaskPrMeta } from "@agentplaneorg/core";
 import type { TaskData } from "../../backends/task-backend.js";
 import type { CommandContext } from "../shared/task-backend.js";
 export type HostedMergedPr = {
@@ -21,10 +22,38 @@ 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;
+};
+export declare function resolveLocalMergedPrMeta(meta: TaskPrMeta | null): LocalMergedPrMeta | null;
 export declare function resolveHostedMergeTargetFromEvent(opts: {
     event: unknown;
     branchPrefix: string;
 }): HostedMergeTarget | null;
+export declare function resolveHostedMergedPr(opts: {
+    cwd: string;
+    branch: string;
+}): Promise<HostedMergedPr | null>;
 export declare function syncHostedMergedTask(opts: {
     ctx: CommandContext;
     tasks: TaskData[];
@@ -32,6 +61,18 @@ export declare function syncHostedMergedTask(opts: {
     missingTask?: "noop" | "error";
     missingPrMeta?: "noop" | "error";
 }): Promise<HostedMergeSyncResult>;
+export declare function findLocallyShippedBranchPrTasks(opts: {
+    ctx: CommandContext;
+    tasks: TaskData[];
+}): Promise<LocalBranchPrSyncCandidate[]>;
+export declare function findDoneBranchPrTasksWithOpenPrArtifacts(opts: {
+    ctx: CommandContext;
+    tasks: TaskData[];
+}): Promise<LocalDoneBranchPrDrift[]>;
+export declare function syncLocallyShippedBranchPrTasks(opts: {
+    ctx: CommandContext;
+    tasks: TaskData[];
+}): Promise<HostedMergeSyncResult>;
 export declare function syncHostedMergedTasks(opts: {
     ctx: CommandContext;
     tasks: TaskData[];

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

@@ -1 +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"}
+{"version":3,"file":"hosted-merge-sync.d.ts","sourceRoot":"","sources":["../../../src/commands/task/hosted-merge-sync.ts"],"names":[],"mappings":"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"}