agentplane 0.1.8 → 0.2.0

package/dist/commands/block.command.js

@@ -0,0 +1,143 @@
+import { usageError } from "../cli/spec/errors.js";
+import { cmdBlock } from "./task/block.js";
+function toStringList(v) {
+    if (typeof v === "string")
+        return [v];
+    if (Array.isArray(v))
+        return v.filter((x) => typeof x === "string");
+    return [];
+}
+export const blockSpec = {
+    id: ["block"],
+    group: "Lifecycle",
+    summary: "Transition a task to BLOCKED and record a structured Blocked comment.",
+    args: [
+        {
+            name: "task-id",
+            required: true,
+            valueHint: "<task-id>",
+            description: "Existing task id.",
+        },
+    ],
+    options: [
+        {
+            kind: "string",
+            name: "author",
+            valueHint: "<id>",
+            required: true,
+            description: "Comment author id (e.g. CODER).",
+        },
+        {
+            kind: "string",
+            name: "body",
+            valueHint: "<text>",
+            required: true,
+            description: "Structured comment body (must match the configured Blocked: prefix).",
+        },
+        {
+            kind: "boolean",
+            name: "commit-from-comment",
+            default: false,
+            description: "Create a status commit using the comment body.",
+        },
+        {
+            kind: "string",
+            name: "commit-emoji",
+            valueHint: "<emoji>",
+            description: "Override the status commit emoji (used with --commit-from-comment).",
+        },
+        {
+            kind: "string",
+            name: "commit-allow",
+            valueHint: "<path-prefix>",
+            repeatable: true,
+            description: "Repeatable. Allowlist path prefixes to stage for the status commit (used with --commit-from-comment).",
+        },
+        {
+            kind: "boolean",
+            name: "commit-auto-allow",
+            default: false,
+            description: "Auto-allow inferred allowlist paths if none are provided (used with --commit-from-comment).",
+        },
+        {
+            kind: "boolean",
+            name: "commit-allow-tasks",
+            default: true,
+            hidden: true,
+            description: "Deprecated. Tasks are always allowed for status commits.",
+            deprecated: "no-op",
+        },
+        {
+            kind: "boolean",
+            name: "commit-require-clean",
+            default: false,
+            description: "Require a clean working tree for the status commit (used with --commit-from-comment).",
+        },
+        {
+            kind: "boolean",
+            name: "confirm-status-commit",
+            default: false,
+            description: "Confirm status commit creation when status_commit_policy=confirm (used with --commit-from-comment).",
+        },
+        {
+            kind: "boolean",
+            name: "force",
+            default: false,
+            description: "Override status transition restrictions.",
+        },
+        { kind: "boolean", name: "quiet", default: false, description: "Suppress output." },
+    ],
+    examples: [
+        {
+            cmd: 'agentplane block 202602030608-F1Q8AB --author CODER --body "Blocked: waiting for review"',
+            why: "Block work on a task.",
+        },
+        {
+            cmd: 'agentplane block 202602030608-F1Q8AB --author CODER --body "Blocked: waiting for review" --commit-from-comment --commit-allow packages/agentplane/src',
+            why: "Block work and create a status commit from the comment.",
+        },
+    ],
+    validateRaw: (raw) => {
+        const author = typeof raw.opts.author === "string" ? raw.opts.author.trim() : "";
+        const body = typeof raw.opts.body === "string" ? raw.opts.body.trim() : "";
+        if (!author)
+            throw usageError({ spec: blockSpec, message: "Invalid value for --author: empty." });
+        if (!body)
+            throw usageError({ spec: blockSpec, message: "Invalid value for --body: empty." });
+    },
+    parse: (raw) => ({
+        taskId: typeof raw.args["task-id"] === "string" ? raw.args["task-id"] : "",
+        author: raw.opts.author,
+        body: raw.opts.body,
+        commitFromComment: raw.opts["commit-from-comment"] === true,
+        commitEmoji: raw.opts["commit-emoji"],
+        commitAllow: toStringList(raw.opts["commit-allow"]),
+        commitAutoAllow: raw.opts["commit-auto-allow"] === true,
+        commitAllowTasks: raw.opts["commit-allow-tasks"] !== false,
+        commitRequireClean: raw.opts["commit-require-clean"] === true,
+        confirmStatusCommit: raw.opts["confirm-status-commit"] === true,
+        force: raw.opts.force === true,
+        quiet: raw.opts.quiet === true,
+    }),
+};
+export function makeRunBlockHandler(getCtx) {
+    return async (ctx, p) => {
+        return await cmdBlock({
+            ctx: await getCtx("block"),
+            cwd: ctx.cwd,
+            rootOverride: ctx.rootOverride,
+            taskId: p.taskId,
+            author: p.author,
+            body: p.body,
+            commitFromComment: p.commitFromComment,
+            commitEmoji: p.commitEmoji,
+            commitAllow: p.commitAllow,
+            commitAutoAllow: p.commitAutoAllow,
+            commitAllowTasks: p.commitAllowTasks,
+            commitRequireClean: p.commitRequireClean,
+            confirmStatusCommit: p.confirmStatusCommit,
+            force: p.force,
+            quiet: p.quiet,
+        });
+    };
+}

package/dist/commands/branch/base.command.d.ts

@@ -0,0 +1,20 @@
+import type { CommandHandler, CommandSpec } from "../../cli/spec/spec.js";
+type BranchBaseGroupParsed = {
+    cmd: string[];
+};
+export declare const branchBaseSpec: CommandSpec<BranchBaseGroupParsed>;
+export declare const branchBaseGetSpec: CommandSpec<Record<string, never>>;
+export declare const branchBaseClearSpec: CommandSpec<Record<string, never>>;
+export declare const branchBaseExplainSpec: CommandSpec<Record<string, never>>;
+export type BranchBaseSetParsed = {
+    value: string | null;
+    useCurrent: boolean;
+};
+export declare const branchBaseSetSpec: CommandSpec<BranchBaseSetParsed>;
+export declare const runBranchBase: CommandHandler<BranchBaseGroupParsed>;
+export declare const runBranchBaseGet: CommandHandler<Record<string, never>>;
+export declare const runBranchBaseClear: CommandHandler<Record<string, never>>;
+export declare const runBranchBaseExplain: CommandHandler<Record<string, never>>;
+export declare const runBranchBaseSet: CommandHandler<BranchBaseSetParsed>;
+export {};
+//# sourceMappingURL=base.command.d.ts.map

package/dist/commands/branch/base.command.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"base.command.d.ts","sourceRoot":"","sources":["../../../src/commands/branch/base.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAW1E,KAAK,qBAAqB,GAAG;IAAE,GAAG,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAE/C,eAAO,MAAM,cAAc,EAAE,WAAW,CAAC,qBAAqB,CAa7D,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAKhE,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAKlE,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAKpE,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAE,CAAC;AAEhF,eAAO,MAAM,iBAAiB,EAAE,WAAW,CAAC,mBAAmB,CA4C9D,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,cAAc,CAAC,qBAAqB,CAc/D,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAElE,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAEpE,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAEtE,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,cAAc,CAAC,mBAAmB,CAOhE,CAAC"}

package/dist/commands/branch/base.command.js

@@ -0,0 +1,110 @@
+import { usageError } from "../../cli/spec/errors.js";
+import { suggestOne } from "../../cli/spec/suggest.js";
+import { cmdBranchBaseClear, cmdBranchBaseExplain, cmdBranchBaseGet, cmdBranchBaseSet, } from "./index.js";
+export const branchBaseSpec = {
+    id: ["branch", "base"],
+    group: "Branch",
+    summary: "Manage the pinned base branch used in branch_pr workflow.",
+    synopsis: ["agentplane branch base <get|set|clear|explain> [args] [options]"],
+    args: [{ name: "cmd", required: false, variadic: true, valueHint: "<cmd>" }],
+    examples: [
+        { cmd: "agentplane branch base get", why: "Print the pinned base branch." },
+        { cmd: "agentplane branch base set --current", why: "Pin the current branch as base." },
+        { cmd: "agentplane branch base clear", why: "Clear the pinned base branch." },
+        { cmd: "agentplane branch base explain", why: "Show current/pinned/effective base details." },
+    ],
+    parse: (raw) => ({ cmd: (raw.args.cmd ?? []) }),
+};
+export const branchBaseGetSpec = {
+    id: ["branch", "base", "get"],
+    group: "Branch",
+    summary: "Print the pinned base branch.",
+    parse: () => ({}),
+};
+export const branchBaseClearSpec = {
+    id: ["branch", "base", "clear"],
+    group: "Branch",
+    summary: "Clear the pinned base branch.",
+    parse: () => ({}),
+};
+export const branchBaseExplainSpec = {
+    id: ["branch", "base", "explain"],
+    group: "Branch",
+    summary: "Explain current, pinned, and effective base branch resolution.",
+    parse: () => ({}),
+};
+export const branchBaseSetSpec = {
+    id: ["branch", "base", "set"],
+    group: "Branch",
+    summary: "Pin a base branch by name, or pin the current branch.",
+    args: [
+        {
+            name: "name",
+            required: false,
+            valueHint: "<name>",
+            description: "Branch name to pin as base (conflicts with --current).",
+        },
+    ],
+    options: [
+        {
+            kind: "boolean",
+            name: "current",
+            description: "Pin the current branch as base (conflicts with <name>).",
+            default: false,
+        },
+    ],
+    examples: [
+        { cmd: "agentplane branch base set main", why: "Pin main as the base branch." },
+        { cmd: "agentplane branch base set --current", why: "Pin the current branch as base." },
+    ],
+    validateRaw: (raw) => {
+        const name = raw.args.name ? String(raw.args.name).trim() : "";
+        const useCurrent = raw.opts.current === true;
+        if (useCurrent && name) {
+            throw usageError({
+                spec: branchBaseSetSpec,
+                message: "Invalid usage: <name> conflicts with --current.",
+            });
+        }
+        if (!useCurrent && !name) {
+            throw usageError({
+                spec: branchBaseSetSpec,
+                message: "Missing required argument: <name> (or pass --current).",
+            });
+        }
+    },
+    parse: (raw) => ({
+        value: raw.args.name ? String(raw.args.name).trim() : null,
+        useCurrent: raw.opts.current === true,
+    }),
+};
+export const runBranchBase = (_ctx, p) => {
+    const input = p.cmd.join(" ");
+    const candidates = ["get", "set", "clear", "explain"];
+    const suggestion = suggestOne(input, candidates);
+    const suffix = suggestion ? ` Did you mean: ${suggestion}?` : "";
+    const msg = p.cmd.length === 0 ? "Missing subcommand." : `Unknown subcommand: ${p.cmd[0]}.`;
+    return Promise.reject(usageError({
+        spec: branchBaseSpec,
+        command: "branch base",
+        message: `${msg}${suffix}`,
+        context: { command: "branch base" },
+    }));
+};
+export const runBranchBaseGet = async (ctx) => {
+    return await cmdBranchBaseGet({ cwd: ctx.cwd, rootOverride: ctx.rootOverride });
+};
+export const runBranchBaseClear = async (ctx) => {
+    return await cmdBranchBaseClear({ cwd: ctx.cwd, rootOverride: ctx.rootOverride });
+};
+export const runBranchBaseExplain = async (ctx) => {
+    return await cmdBranchBaseExplain({ cwd: ctx.cwd, rootOverride: ctx.rootOverride });
+};
+export const runBranchBaseSet = async (ctx, p) => {
+    return await cmdBranchBaseSet({
+        cwd: ctx.cwd,
+        rootOverride: ctx.rootOverride,
+        value: p.value ?? undefined,
+        useCurrent: p.useCurrent,
+    });
+};

package/dist/commands/branch/base.d.ts

@@ -0,0 +1,19 @@
+export declare function cmdBranchBaseGet(opts: {
+    cwd: string;
+    rootOverride?: string;
+}): Promise<number>;
+export declare function cmdBranchBaseSet(opts: {
+    cwd: string;
+    rootOverride?: string;
+    value?: string;
+    useCurrent?: boolean;
+}): Promise<number>;
+export declare function cmdBranchBaseClear(opts: {
+    cwd: string;
+    rootOverride?: string;
+}): Promise<number>;
+export declare function cmdBranchBaseExplain(opts: {
+    cwd: string;
+    rootOverride?: string;
+}): Promise<number>;
+//# sourceMappingURL=base.d.ts.map

package/dist/commands/branch/base.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../src/commands/branch/base.ts"],"names":[],"mappings":"AAaA,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAAC,MAAM,CAAC,CAmBlB;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,GAAG,OAAO,CAAC,MAAM,CAAC,CA4BlB;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE;IAC7C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAAC,MAAM,CAAC,CAWlB;AAED,wBAAsB,oBAAoB,CAAC,IAAI,EAAE;IAC/C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAAC,MAAM,CAAC,CA6ClB"}

package/dist/commands/branch/base.js

@@ -0,0 +1,114 @@
+import { clearPinnedBaseBranch, getPinnedBaseBranch, loadConfig, resolveBaseBranch, resolveProject, setPinnedBaseBranch, } from "@agentplaneorg/core";
+import { mapCoreError } from "../../cli/error-map.js";
+import { CliError } from "../../shared/errors.js";
+import { gitBranchExists, gitCurrentBranch } from "../shared/git-ops.js";
+export async function cmdBranchBaseGet(opts) {
+    try {
+        const pinned = await getPinnedBaseBranch({
+            cwd: opts.cwd,
+            rootOverride: opts.rootOverride ?? null,
+        });
+        if (!pinned) {
+            throw new CliError({
+                exitCode: 2,
+                code: "E_USAGE",
+                message: "Base branch is not pinned (use `agentplane branch base set`).",
+            });
+        }
+        process.stdout.write(`${pinned}\n`);
+        return 0;
+    }
+    catch (err) {
+        if (err instanceof CliError)
+            throw err;
+        throw mapCoreError(err, { command: "branch base get", root: opts.rootOverride ?? null });
+    }
+}
+export async function cmdBranchBaseSet(opts) {
+    const trimmed = (opts.value ?? "").trim();
+    if (trimmed.length === 0 && !opts.useCurrent) {
+        throw new CliError({
+            exitCode: 2,
+            code: "E_USAGE",
+            message: "Missing base branch value (pass <name> or --current).",
+        });
+    }
+    try {
+        let nextValue = trimmed;
+        if (opts.useCurrent) {
+            const resolved = await resolveProject({
+                cwd: opts.cwd,
+                rootOverride: opts.rootOverride ?? null,
+            });
+            nextValue = await gitCurrentBranch(resolved.gitRoot);
+        }
+        const value = await setPinnedBaseBranch({
+            cwd: opts.cwd,
+            rootOverride: opts.rootOverride ?? null,
+            value: nextValue,
+        });
+        process.stdout.write(`${value}\n`);
+        return 0;
+    }
+    catch (err) {
+        throw mapCoreError(err, { command: "branch base set", root: opts.rootOverride ?? null });
+    }
+}
+export async function cmdBranchBaseClear(opts) {
+    try {
+        const cleared = await clearPinnedBaseBranch({
+            cwd: opts.cwd,
+            rootOverride: opts.rootOverride ?? null,
+        });
+        process.stdout.write(`${cleared ? "cleared" : "no-op"}\n`);
+        return 0;
+    }
+    catch (err) {
+        throw mapCoreError(err, { command: "branch base clear", root: opts.rootOverride ?? null });
+    }
+}
+export async function cmdBranchBaseExplain(opts) {
+    try {
+        const resolved = await resolveProject({
+            cwd: opts.cwd,
+            rootOverride: opts.rootOverride ?? null,
+        });
+        const loaded = await loadConfig(resolved.agentplaneDir);
+        let current = null;
+        try {
+            current = await gitCurrentBranch(resolved.gitRoot);
+        }
+        catch {
+            current = null;
+        }
+        const pinned = await getPinnedBaseBranch({
+            cwd: opts.cwd,
+            rootOverride: opts.rootOverride ?? null,
+        });
+        const effective = await resolveBaseBranch({
+            cwd: opts.cwd,
+            rootOverride: opts.rootOverride ?? null,
+            cliBaseOpt: null,
+            mode: loaded.config.workflow_mode,
+        });
+        const warnings = [];
+        if (pinned && !(await gitBranchExists(resolved.gitRoot, pinned))) {
+            warnings.push(`Pinned base branch not found: ${pinned}`);
+        }
+        if (effective && !(await gitBranchExists(resolved.gitRoot, effective))) {
+            warnings.push(`Effective base branch not found: ${effective}`);
+        }
+        process.stdout.write(`current_branch=${current ?? "-"}\n`);
+        process.stdout.write(`pinned_base=${pinned ?? "-"}\n`);
+        process.stdout.write(`effective_base=${effective ?? "-"}\n`);
+        if (warnings.length > 0) {
+            for (const warning of warnings) {
+                process.stdout.write(`warning=${warning}\n`);
+            }
+        }
+        return 0;
+    }
+    catch (err) {
+        throw mapCoreError(err, { command: "branch base explain", root: opts.rootOverride ?? null });
+    }
+}

package/dist/commands/branch/cleanup-merged.d.ts

@@ -0,0 +1,11 @@
+import { type CommandContext } from "../shared/task-backend.js";
+export declare function cmdCleanupMerged(opts: {
+    ctx?: CommandContext;
+    cwd: string;
+    rootOverride?: string;
+    base?: string;
+    yes: boolean;
+    archive: boolean;
+    quiet: boolean;
+}): Promise<number>;
+//# sourceMappingURL=cleanup-merged.d.ts.map

package/dist/commands/branch/cleanup-merged.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cleanup-merged.d.ts","sourceRoot":"","sources":["../../../src/commands/branch/cleanup-merged.ts"],"names":[],"mappings":"AAiBA,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,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,OAAO,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CA0IlB"}

package/dist/commands/branch/cleanup-merged.js

@@ -0,0 +1,141 @@
+import path from "node:path";
+import { resolveBaseBranch } from "@agentplaneorg/core";
+import { mapBackendError } from "../../cli/error-map.js";
+import { successMessage, unknownEntityMessage, workflowModeMessage } from "../../cli/output.js";
+import { CliError } from "../../shared/errors.js";
+import { ensureGitClean } from "../guard/index.js";
+import { execFileAsync, gitEnv } from "../shared/git.js";
+import { gitDiffNames } from "../shared/git-diff.js";
+import { gitBranchExists, gitCurrentBranch } from "../shared/git-ops.js";
+import { findWorktreeForBranch, gitListTaskBranches, parseTaskIdFromBranch, } from "../shared/git-worktree.js";
+import { isPathWithin, resolvePathFallback } from "../shared/path.js";
+import { loadCommandContext } from "../shared/task-backend.js";
+import { archivePrArtifacts } from "./internal/archive-pr.js";
+export async function cmdCleanupMerged(opts) {
+    try {
+        const ctx = opts.ctx ??
+            (await loadCommandContext({ cwd: opts.cwd, rootOverride: opts.rootOverride ?? null }));
+        const resolved = ctx.resolvedProject;
+        const config = ctx.config;
+        if (config.workflow_mode !== "branch_pr") {
+            throw new CliError({
+                exitCode: 2,
+                code: "E_USAGE",
+                message: workflowModeMessage(config.workflow_mode, "branch_pr"),
+            });
+        }
+        await ensureGitClean({ cwd: opts.cwd, rootOverride: opts.rootOverride });
+        const baseBranch = await resolveBaseBranch({
+            cwd: opts.cwd,
+            rootOverride: opts.rootOverride ?? null,
+            cliBaseOpt: opts.base ?? null,
+            mode: config.workflow_mode,
+        });
+        if (!baseBranch) {
+            throw new CliError({
+                exitCode: 2,
+                code: "E_USAGE",
+                message: "Base branch could not be resolved (use `agentplane branch base set` or --base).",
+            });
+        }
+        if (!(await gitBranchExists(resolved.gitRoot, baseBranch))) {
+            throw new CliError({
+                exitCode: 5,
+                code: "E_GIT",
+                message: unknownEntityMessage("base branch", baseBranch),
+            });
+        }
+        const currentBranch = await gitCurrentBranch(resolved.gitRoot);
+        if (currentBranch !== baseBranch) {
+            throw new CliError({
+                exitCode: 5,
+                code: "E_GIT",
+                message: `cleanup merged must run on base branch ${baseBranch} (current: ${currentBranch})`,
+            });
+        }
+        const repoRoot = await resolvePathFallback(resolved.gitRoot);
+        const tasks = await ctx.taskBackend.listTasks();
+        const tasksById = new Map(tasks.map((task) => [task.id, task]));
+        const prefix = config.branch.task_prefix;
+        const branches = await gitListTaskBranches(resolved.gitRoot, prefix);
+        const candidates = [];
+        for (const branch of branches) {
+            if (branch === baseBranch)
+                continue;
+            const taskId = parseTaskIdFromBranch(prefix, branch);
+            if (!taskId)
+                continue;
+            const task = tasksById.get(taskId);
+            if (!task)
+                continue;
+            const status = String(task.status || "").toUpperCase();
+            if (status !== "DONE")
+                continue;
+            const diff = await gitDiffNames(resolved.gitRoot, baseBranch, branch);
+            if (diff.length > 0)
+                continue;
+            const worktreePath = await findWorktreeForBranch(resolved.gitRoot, branch);
+            candidates.push({ taskId, branch, worktreePath });
+        }
+        const sortedCandidates = candidates.toSorted((a, b) => a.taskId.localeCompare(b.taskId));
+        if (!opts.quiet) {
+            const archiveLabel = opts.archive ? " archive=on" : "";
+            process.stdout.write(`cleanup merged (base=${baseBranch}${archiveLabel})\n`);
+            if (sortedCandidates.length === 0) {
+                process.stdout.write("no candidates\n");
+                return 0;
+            }
+            for (const item of sortedCandidates) {
+                process.stdout.write(`- ${item.taskId}: branch=${item.branch} worktree=${item.worktreePath ?? "-"}\n`);
+            }
+        }
+        if (!opts.yes) {
+            if (!opts.quiet) {
+                process.stdout.write("Re-run with --yes to delete these branches/worktrees.\n");
+            }
+            return 0;
+        }
+        for (const item of sortedCandidates) {
+            const worktreePath = item.worktreePath ? await resolvePathFallback(item.worktreePath) : null;
+            if (worktreePath) {
+                if (!isPathWithin(repoRoot, worktreePath)) {
+                    throw new CliError({
+                        exitCode: 5,
+                        code: "E_GIT",
+                        message: `Refusing to remove worktree outside repo: ${worktreePath}`,
+                    });
+                }
+                if (worktreePath === repoRoot) {
+                    throw new CliError({
+                        exitCode: 5,
+                        code: "E_GIT",
+                        message: "Refusing to remove the current worktree",
+                    });
+                }
+            }
+            if (opts.archive) {
+                const taskDir = path.join(resolved.gitRoot, config.paths.workflow_dir, item.taskId);
+                await archivePrArtifacts(taskDir);
+            }
+            if (worktreePath) {
+                await execFileAsync("git", ["worktree", "remove", "--force", worktreePath], {
+                    cwd: resolved.gitRoot,
+                    env: gitEnv(),
+                });
+            }
+            await execFileAsync("git", ["branch", "-D", item.branch], {
+                cwd: resolved.gitRoot,
+                env: gitEnv(),
+            });
+        }
+        if (!opts.quiet) {
+            process.stdout.write(`${successMessage("cleanup merged", undefined, `deleted=${candidates.length}`)}\n`);
+        }
+        return 0;
+    }
+    catch (err) {
+        if (err instanceof CliError)
+            throw err;
+        throw mapBackendError(err, { command: "cleanup merged", root: opts.rootOverride ?? null });
+    }
+}

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

@@ -1,60 +1,7 @@
-export { gitInitRepo, resolveInitBaseBranch, promptInitBaseBranch, ensureInitCommit, } from "../shared/git-ops.js";
-export declare const BRANCH_BASE_USAGE = "Usage: agentplane branch base get|set|clear|explain [<name>|--current]";
-export declare const BRANCH_BASE_USAGE_EXAMPLE = "agentplane branch base set --current";
-export declare const BRANCH_STATUS_USAGE = "Usage: agentplane branch status [--branch <name>] [--base <name>]";
-export declare const BRANCH_STATUS_USAGE_EXAMPLE = "agentplane branch status --base main";
-export declare const BRANCH_REMOVE_USAGE = "Usage: agentplane branch remove [--branch <name>] [--worktree <path>] [--force] [--quiet]";
-export declare const BRANCH_REMOVE_USAGE_EXAMPLE = "agentplane branch remove --branch task/20260203-F1Q8AB --worktree .agentplane/worktrees/task";
-export declare const WORK_START_USAGE = "Usage: agentplane work start <task-id> --agent <id> --slug <slug> [--worktree]";
-export declare const WORK_START_USAGE_EXAMPLE = "agentplane work start 202602030608-F1Q8AB --agent CODER --slug cli --worktree";
-export declare const CLEANUP_MERGED_USAGE = "Usage: agentplane cleanup merged [--base <name>] [--yes] [--archive] [--quiet]";
-export declare const CLEANUP_MERGED_USAGE_EXAMPLE = "agentplane cleanup merged --yes";
-export declare function cmdWorkStart(opts: {
-    cwd: string;
-    rootOverride?: string;
-    taskId: string;
-    agent: string;
-    slug: string;
-    worktree: boolean;
-}): Promise<number>;
-export declare function cmdCleanupMerged(opts: {
-    cwd: string;
-    rootOverride?: string;
-    base?: string;
-    yes: boolean;
-    archive: boolean;
-    quiet: boolean;
-}): Promise<number>;
-export declare function cmdBranchBaseGet(opts: {
-    cwd: string;
-    rootOverride?: string;
-}): Promise<number>;
-export declare function cmdBranchBaseSet(opts: {
-    cwd: string;
-    rootOverride?: string;
-    value?: string;
-    useCurrent?: boolean;
-}): Promise<number>;
-export declare function cmdBranchBaseClear(opts: {
-    cwd: string;
-    rootOverride?: string;
-}): Promise<number>;
-export declare function cmdBranchBaseExplain(opts: {
-    cwd: string;
-    rootOverride?: string;
-}): Promise<number>;
-export declare function cmdBranchStatus(opts: {
-    cwd: string;
-    rootOverride?: string;
-    branch?: string;
-    base?: string;
-}): Promise<number>;
-export declare function cmdBranchRemove(opts: {
-    cwd: string;
-    rootOverride?: string;
-    branch?: string;
-    worktree?: string;
-    force: boolean;
-    quiet: boolean;
-}): Promise<number>;
+export { ensureInitCommit, gitInitRepo, promptInitBaseBranch, resolveInitBaseBranch, } from "../shared/git-ops.js";
+export { cmdBranchBaseClear, cmdBranchBaseExplain, cmdBranchBaseGet, cmdBranchBaseSet, } from "./base.js";
+export { cmdBranchRemove } from "./remove.js";
+export { cmdBranchStatus } from "./status.js";
+export { cmdCleanupMerged } from "./cleanup-merged.js";
+export { cmdWorkStart } from "./work-start.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/branch/index.ts"],"names":[],"mappings":"AAoCA,OAAO,EACL,WAAW,EACX,qBAAqB,EACrB,oBAAoB,EACpB,gBAAgB,GACjB,MAAM,sBAAsB,CAAC;AAE9B,eAAO,MAAM,iBAAiB,2EAC4C,CAAC;AAC3E,eAAO,MAAM,yBAAyB,yCAAyC,CAAC;AAChF,eAAO,MAAM,mBAAmB,sEACqC,CAAC;AACtE,eAAO,MAAM,2BAA2B,yCAAyC,CAAC;AAClF,eAAO,MAAM,mBAAmB,8FAC6D,CAAC;AAC9F,eAAO,MAAM,2BAA2B,iGACwD,CAAC;AACjG,eAAO,MAAM,gBAAgB,mFACqD,CAAC;AACnF,eAAO,MAAM,wBAAwB,kFAC4C,CAAC;AAClF,eAAO,MAAM,oBAAoB,mFACiD,CAAC;AACnF,eAAO,MAAM,4BAA4B,oCAAoC,CAAC;AAoD9E,wBAAsB,YAAY,CAAC,IAAI,EAAE;IACvC,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;CACnB,GAAG,OAAO,CAAC,MAAM,CAAC,CA4GlB;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,OAAO,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CA8IlB;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAAC,MAAM,CAAC,CAQlB;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,GAAG,OAAO,CAAC,MAAM,CAAC,CA4BlB;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE;IAC7C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAAC,MAAM,CAAC,CAWlB;AAED,wBAAsB,oBAAoB,CAAC,IAAI,EAAE;IAC/C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAAC,MAAM,CAAC,CA6ClB;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAC1C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,OAAO,CAAC,MAAM,CAAC,CAmDlB;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAC1C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CA4DlB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/branch/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,WAAW,EACX,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC"}