agentplane 0.3.9 → 0.3.11

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,
@@ -128,10 +153,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,6 +179,19 @@ 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,
@@ -152,6 +199,7 @@ async function closeHostedTask(opts) {
         taskId: target.taskId,
         baseBranchOverride: target.mergedPr.baseRefName ?? meta.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,35 @@ type HostedMergeSyncResult = {
     tasks: TaskData[];
     synced: number;
 };
+export type LocalBranchPrSyncCandidate = {
+    taskId: string;
+    branch: string;
+    base: string;
+    commitHash: string;
+    verificationSource: "task" | "pr";
+};
+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 +58,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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"}

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

@@ -1,11 +1,13 @@
 import { readFile } from "node:fs/promises";
 import path from "node:path";
-import { normalizeTaskDocVersion } from "@agentplaneorg/core";
+import { normalizeTaskDocVersion, resolveBaseBranch } from "@agentplaneorg/core";
 import { CliError } from "../../shared/errors.js";
 import { writeJsonStableIfChanged } from "../../shared/write-if-changed.js";
 import { execFileAsync } from "../shared/git.js";
+import { withGhTransportRetry } from "../shared/gh-transport.js";
 import { parseTaskIdFromBranch } from "../shared/git-worktree.js";
 import { parsePrMeta } from "../shared/pr-meta.js";
+import { ghEnv } from "../pr/internal/gh-api.js";
 import { appendTaskEvent } from "./shared.js";
 function normalizeMergedPr(value) {
     if (!value || typeof value !== "object" || Array.isArray(value))
@@ -78,6 +80,19 @@ function pickHostedMergedPr(records) {
         return right.localeCompare(left);
     })[0] ?? null);
 }
+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 function resolveHostedMergeTargetFromEvent(opts) {
     if (!opts.event || typeof opts.event !== "object" || Array.isArray(opts.event))
         return null;
@@ -94,23 +109,27 @@ export function resolveHostedMergeTargetFromEvent(opts) {
         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,
+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}`,
     });
-    const parsed = JSON.parse(stdout);
-    return Array.isArray(parsed) ? pickHostedMergedPr(parsed) : null;
 }
 function buildSyncedPrMeta(opts) {
     const at = opts.mergedPr.mergedAt ?? new Date().toISOString();
@@ -160,6 +179,119 @@ function buildSyncedTask(opts) {
         doc_updated_by: "INTEGRATOR",
     };
 }
+function needsHostedMergeSyncFromLocalMeta(opts) {
+    const currentStatus = String(opts.task.status || "TODO").toUpperCase();
+    const expectedCommit = opts.meta.mergeCommit;
+    if (currentStatus !== "DONE")
+        return true;
+    if ((opts.task.commit?.hash ?? "") !== expectedCommit)
+        return true;
+    return false;
+}
+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.";
+    const statusEvent = {
+        type: "status",
+        at,
+        author: "INTEGRATOR",
+        from: currentStatus,
+        to: "DONE",
+        note,
+    };
+    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, statusEvent),
+        doc_version: normalizeTaskDocVersion(opts.task.doc_version),
+        doc_updated_at: at,
+        doc_updated_by: "INTEGRATOR",
+    };
+}
+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 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.`;
+    const statusEvent = {
+        type: "status",
+        at,
+        author: "INTEGRATOR",
+        from: currentStatus,
+        to: "DONE",
+        note,
+    };
+    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, 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 {
@@ -238,6 +370,97 @@ export async function syncHostedMergedTask(opts) {
         synced: 1,
     };
 }
+export async function findLocallyShippedBranchPrTasks(opts) {
+    if (opts.ctx.backendId !== "local" || 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 verificationSource = hasTaskVerificationForLocalSync({
+            task,
+            meta: prMetaRecord?.meta ?? null,
+        });
+        if (!verificationSource)
+            continue;
+        const commitHash = task.commit?.hash?.trim() ?? "";
+        if (!commitHash)
+            continue;
+        const base = await resolveSyncBaseBranch({
+            ctx: opts.ctx,
+            meta: prMetaRecord?.meta ?? null,
+        });
+        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;
+        }
+        matches.push({
+            taskId: task.id,
+            branch: prMetaRecord?.meta.branch?.trim() ?? "",
+            base,
+            commitHash,
+            verificationSource,
+        });
+    }
+    return matches;
+}
+export async function findDoneBranchPrTasksWithOpenPrArtifacts(opts) {
+    if (opts.ctx.backendId !== "local" || 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 commitHash = task.commit?.hash?.trim() ?? meta.head_sha?.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;
+}
+export async function syncLocallyShippedBranchPrTasks(opts) {
+    const matches = await findLocallyShippedBranchPrTasks(opts);
+    if (matches.length === 0)
+        return { tasks: opts.tasks, synced: 0 };
+    const byTaskId = new Map(matches.map((entry) => [entry.taskId, entry]));
+    return {
+        tasks: opts.tasks.map((task) => {
+            const candidate = byTaskId.get(task.id);
+            return candidate ? buildLocallySyncedTask({ task, candidate }) : task;
+        }),
+        synced: matches.length,
+    };
+}
 export async function syncHostedMergedTasks(opts) {
     if (opts.ctx.backendId !== "local" || opts.ctx.config.workflow_mode !== "branch_pr") {
         return { tasks: opts.tasks, synced: 0 };
@@ -255,6 +478,15 @@ export async function syncHostedMergedTasks(opts) {
             nextTasks.push(task);
             continue;
         }
+        const localMergedMeta = resolveLocalMergedPrMeta(prMetaRecord.meta);
+        if (localMergedMeta) {
+            nextTasks.push(needsHostedMergeSyncFromLocalMeta({ task, meta: localMergedMeta })
+                ? buildLocallyMergedSyncedTask({ task, meta: localMergedMeta })
+                : task);
+            if (needsHostedMergeSyncFromLocalMeta({ task, meta: localMergedMeta }))
+                synced += 1;
+            continue;
+        }
         const mergedPr = await resolveHostedMergedPr({
             cwd: opts.ctx.resolvedProject.gitRoot,
             branch,

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

@@ -18,6 +18,7 @@ export { cmdTaskDerive } from "./derive.js";
 export { cmdTaskCloseDuplicate } from "./close-duplicate.js";
 export { cmdTaskStartReady } from "./start-ready.js";
 export { cmdTaskCloseNoop } from "./close-noop.js";
+export { makeRunTaskHostedClosePrHandler, taskHostedClosePrSpec, } from "./hosted-close-pr.command.js";
 export { cmdTaskExport } from "./export.js";
 export { cmdTaskLint } from "./lint.js";
 export { cmdTaskPlanSet, cmdTaskPlanApprove, cmdTaskPlanReject } from "./plan.js";

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/task/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,OAAO,EAAE,sBAAsB,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAExC,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAElF,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE1E,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAEzD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/task/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,OAAO,EAAE,sBAAsB,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EACL,+BAA+B,EAC/B,qBAAqB,GACtB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAExC,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAElF,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE1E,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAEzD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC"}

package/dist/commands/task/index.js

@@ -17,6 +17,7 @@ export { cmdTaskDerive } from "./derive.js";
 export { cmdTaskCloseDuplicate } from "./close-duplicate.js";
 export { cmdTaskStartReady } from "./start-ready.js";
 export { cmdTaskCloseNoop } from "./close-noop.js";
+export { makeRunTaskHostedClosePrHandler, taskHostedClosePrSpec, } from "./hosted-close-pr.command.js";
 export { cmdTaskExport } from "./export.js";
 export { cmdTaskLint } from "./lint.js";
 export { cmdTaskPlanSet, cmdTaskPlanApprove, cmdTaskPlanReject } from "./plan.js";

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

@@ -7,6 +7,7 @@ export type TaskNewParsed = {
     tags: string[];
     dependsOn: string[];
     verify: string[];
+    allowDuplicate: boolean;
 };
 export declare function runTaskNewParsed(opts: {
     ctx?: CommandContext;

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":"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"}
+{"version":3,"file":"new.d.ts","sourceRoot":"","sources":["../../../src/commands/task/new.ts"],"names":[],"mappings":"AAaA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAepF,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;IACjB,cAAc,EAAE,OAAO,CAAC;CACzB,CAAC;AAiIF,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,CAuJlB"}