agentplane 0.3.10 → 0.3.11

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":"AAaA,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,CA4IlB"}
+{"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"}

package/dist/commands/task/new.js

@@ -8,6 +8,22 @@ import { makeReadOnlyUsecaseContext } from "../../usecases/context/resolve-conte
 import { loadCommandContext } from "../shared/task-backend.js";
 import { ensureTaskDependsOnGraphIsAcyclic, nowIso, requiresVerifyStepsByPrimary, resolvePrimaryTag, warnIfUnknownOwner, } from "./shared.js";
 import { buildDefaultVerifyStepsSection, defaultTaskDocV3, TASK_DOC_VERSION_V3, } from "./doc-template.js";
+const TASK_NEW_DUPLICATE_THRESHOLD = 0.75;
+const TASK_NEW_DUPLICATE_STOPWORDS = new Set([
+    "a",
+    "an",
+    "and",
+    "for",
+    "from",
+    "in",
+    "is",
+    "of",
+    "on",
+    "the",
+    "to",
+    "when",
+    "with",
+]);
 function dedupeTrimmed(values) {
     const seen = new Set();
     const out = [];
@@ -55,11 +71,65 @@ function sanitizeTaskNewParsed(p) {
     const verify = dedupeTrimmed(p.verify);
     return { ...p, title, description, owner, tags, dependsOn, verify };
 }
+function normalizeDuplicateTitleTokens(value) {
+    return value
+        .trim()
+        .toLowerCase()
+        .replaceAll(/[^a-z0-9]+/g, " ")
+        .split(/\s+/)
+        .map((token) => token.trim())
+        .filter((token) => token.length > 0 &&
+        (token.length > 2 || /\d/.test(token)) &&
+        !TASK_NEW_DUPLICATE_STOPWORDS.has(token));
+}
+function duplicateSimilarity(left, right) {
+    const leftTokens = normalizeDuplicateTitleTokens(left);
+    const rightTokens = normalizeDuplicateTitleTokens(right);
+    if (leftTokens.length === 0 || rightTokens.length === 0) {
+        return left.trim().toLowerCase() === right.trim().toLowerCase() ? 1 : 0;
+    }
+    const leftSet = new Set(leftTokens);
+    const rightSet = new Set(rightTokens);
+    const intersection = [...leftSet].filter((token) => rightSet.has(token)).length;
+    const union = new Set([...leftSet, ...rightSet]).size;
+    return union === 0 ? 0 : intersection / union;
+}
+function listOpenTaskDuplicates(tasks, title) {
+    return tasks
+        .filter((task) => String(task.status ?? "").toUpperCase() !== "DONE")
+        .map((task) => ({
+        task,
+        score: duplicateSimilarity(task.title ?? "", title),
+    }))
+        .filter(({ score }) => score >= TASK_NEW_DUPLICATE_THRESHOLD)
+        .toSorted((left, right) => right.score - left.score || left.task.id.localeCompare(right.task.id));
+}
+function formatDuplicateTaskMessage(duplicates, allowDuplicate) {
+    const summary = duplicates
+        .slice(0, 3)
+        .map(({ task, score }) => `${task.id} (${Math.round(score * 100)}% title overlap, status=${String(task.status || "TODO").toUpperCase()}): ${task.title}`)
+        .join("; ");
+    const tail = allowDuplicate
+        ? "creating a duplicate because --allow-duplicate was passed"
+        : "rerun with --allow-duplicate only when intentional or close the extra task with `agentplane task close-duplicate`";
+    return `potential duplicate open task detected: ${summary}; ${tail}.`;
+}
 export async function runTaskNewParsed(opts) {
     const p = sanitizeTaskNewParsed(opts.parsed);
     try {
         const ctx = opts.ctx ??
             (await loadCommandContext({ cwd: opts.cwd, rootOverride: opts.rootOverride ?? null }));
+        const duplicateTasks = listOpenTaskDuplicates(await ctx.taskBackend.listTasks(), p.title);
+        if (duplicateTasks.length > 0 && !p.allowDuplicate) {
+            throw new CliError({
+                exitCode: 3,
+                code: "E_VALIDATION",
+                message: formatDuplicateTaskMessage(duplicateTasks, false),
+            });
+        }
+        if (duplicateTasks.length > 0 && p.allowDuplicate) {
+            process.stderr.write(`${warnMessage(formatDuplicateTaskMessage(duplicateTasks, true))}\n`);
+        }
         const suffixLength = ctx.config.tasks.id_suffix_length_default;
         if (!ctx.taskBackend.generateTaskId) {
             throw new CliError({
@@ -96,7 +166,7 @@ export async function runTaskNewParsed(opts) {
                 primary: primary.primary,
                 verifyCommands: p.verify,
             }));
-            process.stderr.write(`${warnMessage("task requires Verify Steps by primary tag; seeded a default ## Verify Steps section in README (review and refine before approval/start)")}\n`);
+            process.stderr.write(`${warnMessage("task requires Verify Steps by primary tag; seeded a concrete ## Verify Steps section in README (refine it only if the task needs stricter acceptance coverage)")}\n`);
         }
         const hasSpike = p.tags.some((tag) => tag.trim().toLowerCase() === spikeTag);
         const hasImplementationTags = requiresVerifyStepsByPrimary(p.tags, ctx.config);

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

@@ -1 +1 @@
-{"version":3,"file":"new.spec.d.ts","sourceRoot":"","sources":["../../../src/commands/task/new.spec.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAG9C,eAAO,MAAM,WAAW,EAAE,WAAW,CAAC,aAAa,CA+ElD,CAAC"}
+{"version":3,"file":"new.spec.d.ts","sourceRoot":"","sources":["../../../src/commands/task/new.spec.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAG9C,eAAO,MAAM,WAAW,EAAE,WAAW,CAAC,aAAa,CAuFlD,CAAC"}

package/dist/commands/task/new.spec.js

@@ -57,6 +57,12 @@ export const taskNewSpec = {
             repeatable: true,
             description: "Repeatable. Verification commands/checks to run for this task.",
         },
+        {
+            kind: "boolean",
+            name: "allow-duplicate",
+            default: false,
+            description: "Allow creating a task even when an open task with a highly similar title already exists.",
+        },
     ],
     examples: [
         {
@@ -76,5 +82,6 @@ export const taskNewSpec = {
         tags: (raw.opts.tag ?? []),
         dependsOn: (raw.opts["depends-on"] ?? []),
         verify: (raw.opts.verify ?? []),
+        allowDuplicate: raw.opts["allow-duplicate"] === true,
     }),
 };

package/dist/commands/task/normalize.command.d.ts

@@ -5,6 +5,8 @@ export type TaskNormalizeParsed = {
     force: boolean;
     yes: boolean;
     syncHostedMerges: boolean;
+    syncBranchPrState: boolean;
+    taskIds: string[];
 };
 export declare const taskNormalizeSpec: CommandSpec<TaskNormalizeParsed>;
 export declare function makeRunTaskNormalizeHandler(getCtx: (cmd: string) => Promise<CommandContext>): (ctx: CommandCtx, p: TaskNormalizeParsed) => Promise<number>;

package/dist/commands/task/normalize.command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize.command.d.ts","sourceRoot":"","sources":["../../../src/commands/task/normalize.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAIhE,MAAM,MAAM,mBAAmB,GAAG;IAChC,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,OAAO,CAAC;IACb,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,WAAW,CAAC,mBAAmB,CA6C9D,CAAC;AAEF,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,IAC5E,KAAK,UAAU,EAAE,GAAG,mBAAmB,KAAG,OAAO,CAAC,MAAM,CAAC,CAWxE"}
+{"version":3,"file":"normalize.command.d.ts","sourceRoot":"","sources":["../../../src/commands/task/normalize.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAEtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAIhE,MAAM,MAAM,mBAAmB,GAAG;IAChC,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,OAAO,CAAC;IACb,gBAAgB,EAAE,OAAO,CAAC;IAC1B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,WAAW,CAAC,mBAAmB,CA2F9D,CAAC;AAEF,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,IAC5E,KAAK,UAAU,EAAE,GAAG,mBAAmB,KAAG,OAAO,CAAC,MAAM,CAAC,CAaxE"}

package/dist/commands/task/normalize.command.js

@@ -1,3 +1,4 @@
+import { usageError } from "../../cli/spec/errors.js";
 import { cmdTaskNormalize } from "./normalize.js";
 export const taskNormalizeSpec = {
     id: ["task", "normalize"],
@@ -28,6 +29,19 @@ export const taskNormalizeSpec = {
             default: false,
             description: "Query GitHub for merged hosted PRs referenced by local PR artifacts and reconcile stale branch_pr task state before normalization.",
         },
+        {
+            kind: "boolean",
+            name: "sync-branch-pr-state",
+            default: false,
+            description: "Reconcile stale local branch_pr task state when verified task commits already landed on the base branch.",
+        },
+        {
+            kind: "string",
+            name: "task-id",
+            valueHint: "<task-id>",
+            repeatable: true,
+            description: "Repeatable. Limit reconcile modes to explicit task ids instead of scanning every task.",
+        },
     ],
     examples: [
         { cmd: "agentplane task normalize", why: "Normalize tasks and print a short summary." },
@@ -36,12 +50,41 @@ export const taskNormalizeSpec = {
             cmd: "agentplane task normalize --sync-hosted-merges",
             why: "Reconcile stale branch_pr task state from hosted PR merges, then normalize the local projection.",
         },
+        {
+            cmd: "agentplane task normalize --sync-branch-pr-state",
+            why: "Reconcile locally shipped branch_pr task state when task commits already reached the base branch.",
+        },
+        {
+            cmd: "agentplane task normalize --sync-hosted-merges --task-id 202604071853-XGX2YJ",
+            why: "Reconcile only known stale tasks instead of scanning unrelated historical PR metadata.",
+        },
     ],
+    validateRaw: (raw) => {
+        const taskIds = raw.opts["task-id"] ?? [];
+        if (taskIds.length > 0 &&
+            raw.opts["sync-hosted-merges"] !== true &&
+            raw.opts["sync-branch-pr-state"] !== true) {
+            throw usageError({
+                spec: taskNormalizeSpec,
+                message: "--task-id requires --sync-hosted-merges and/or --sync-branch-pr-state.",
+            });
+        }
+        for (const taskId of taskIds) {
+            if (typeof taskId !== "string" || taskId.trim().length === 0) {
+                throw usageError({
+                    spec: taskNormalizeSpec,
+                    message: "Invalid value for --task-id: empty.",
+                });
+            }
+        }
+    },
     parse: (raw) => ({
         quiet: raw.opts.quiet === true,
         force: raw.opts.force === true,
         yes: raw.opts.yes === true,
         syncHostedMerges: raw.opts["sync-hosted-merges"] === true,
+        syncBranchPrState: raw.opts["sync-branch-pr-state"] === true,
+        taskIds: (raw.opts["task-id"] ?? []).map((taskId) => taskId.trim()),
     }),
 };
 export function makeRunTaskNormalizeHandler(getCtx) {
@@ -54,6 +97,8 @@ export function makeRunTaskNormalizeHandler(getCtx) {
             force: p.force,
             yes: p.yes,
             syncHostedMerges: p.syncHostedMerges,
+            syncBranchPrState: p.syncBranchPrState,
+            taskIds: p.taskIds,
         });
     };
 }

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

@@ -7,5 +7,7 @@ export declare function cmdTaskNormalize(opts: {
     force: boolean;
     yes?: boolean;
     syncHostedMerges?: boolean;
+    syncBranchPrState?: boolean;
+    taskIds?: string[];
 }): Promise<number>;
 //# sourceMappingURL=normalize.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../../../src/commands/task/normalize.ts"],"names":[],"mappings":"AAGA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAIpF,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,GAAG,OAAO,CAAC,MAAM,CAAC,CAqDlB"}
+{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../../../src/commands/task/normalize.ts"],"names":[],"mappings":"AAKA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAgDpF,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,GAAG,OAAO,CAAC,MAAM,CAAC,CAqGlB"}