agentplane 0.2.12 → 0.2.13

package/dist/commands/recipes/install.spec.js

@@ -0,0 +1,140 @@
+import { usageError } from "../../cli/spec/errors.js";
+export const recipesInstallSpec = {
+    id: ["recipes", "install"],
+    group: "Recipes",
+    summary: "Install a recipe from remote index, local archive, or URL.",
+    synopsis: [
+        "agentplane recipes install <id|path|url> [--index <path|url>] [--refresh] [--yes] [--on-conflict <fail|rename|overwrite>]",
+        "agentplane recipes install --name <id> [--index <path|url>] [--refresh] [--yes] [--on-conflict <fail|rename|overwrite>]",
+        "agentplane recipes install --path <path> [--yes] [--on-conflict <fail|rename|overwrite>]",
+        "agentplane recipes install --url <url> [--yes] [--on-conflict <fail|rename|overwrite>]",
+    ],
+    args: [
+        {
+            name: "source",
+            required: false,
+            valueHint: "<id|path|url>",
+            description: "Auto mode: URL if http(s); else PATH if file exists; else NAME (remote index id).",
+        },
+    ],
+    options: [
+        {
+            kind: "string",
+            name: "name",
+            valueHint: "<id>",
+            description: "Install from remote index by recipe id.",
+        },
+        {
+            kind: "string",
+            name: "path",
+            valueHint: "<path>",
+            description: "Install from local recipe archive path.",
+        },
+        {
+            kind: "string",
+            name: "url",
+            valueHint: "<url>",
+            description: "Install from recipe archive URL.",
+        },
+        {
+            kind: "string",
+            name: "index",
+            valueHint: "<path|url>",
+            description: "Override recipes index location (used when installing by name / auto-name).",
+        },
+        {
+            kind: "boolean",
+            name: "refresh",
+            default: false,
+            description: "Refresh remote index cache before installing.",
+        },
+        {
+            kind: "boolean",
+            name: "yes",
+            default: false,
+            description: "Auto-approve network prompts when allowed by config.",
+        },
+        {
+            kind: "string",
+            name: "on-conflict",
+            valueHint: "<fail|rename|overwrite>",
+            choices: ["fail", "rename", "overwrite"],
+            default: "fail",
+            description: "How to handle conflicts when applying recipe agents.",
+        },
+    ],
+    validateRaw: (raw) => {
+        const explicit = [raw.opts.name, raw.opts.path, raw.opts.url].filter(Boolean).length;
+        const hasPositional = Boolean(raw.args.source);
+        if (explicit + (hasPositional ? 1 : 0) !== 1) {
+            throw usageError({
+                spec: recipesInstallSpec,
+                message: "Exactly one source is required: <source> OR --name OR --path OR --url",
+                command: "recipes install",
+            });
+        }
+    },
+    parse: (raw) => {
+        const onConflict = (raw.opts["on-conflict"] ?? "fail");
+        const refresh = raw.opts.refresh === true;
+        const yes = raw.opts.yes === true;
+        const index = typeof raw.opts.index === "string" ? raw.opts.index : undefined;
+        if (raw.opts.name) {
+            return {
+                source: { type: "name", value: raw.opts.name },
+                index,
+                refresh,
+                yes,
+                onConflict,
+            };
+        }
+        if (raw.opts.path) {
+            return {
+                source: { type: "path", value: raw.opts.path },
+                index,
+                refresh,
+                yes,
+                onConflict,
+            };
+        }
+        if (raw.opts.url) {
+            return {
+                source: { type: "url", value: raw.opts.url },
+                index,
+                refresh,
+                yes,
+                onConflict,
+            };
+        }
+        const source = raw.args.source;
+        if (typeof source !== "string") {
+            throw usageError({
+                spec: recipesInstallSpec,
+                command: "recipes install",
+                message: "Missing source argument",
+            });
+        }
+        return {
+            source: { type: "auto", value: source },
+            index,
+            refresh,
+            yes,
+            onConflict,
+        };
+    },
+    examples: [
+        { cmd: "agentplane recipes install viewer", why: "Auto: install by id from remote index." },
+        {
+            cmd: "agentplane recipes install --name viewer --refresh",
+            why: "Install by id, forcing index refresh.",
+        },
+        {
+            cmd: "agentplane recipes install viewer --on-conflict overwrite",
+            why: "Apply recipe agents, overwriting conflicts.",
+        },
+    ],
+    notes: [
+        "Auto mode resolution matches v0.1.9: URL if http(s); else PATH if file exists; else NAME (remote index).",
+        "Network operations may require approval; use --yes to auto-approve when allowed by config.",
+    ],
+};

package/dist/commands/shared/git-context.d.ts

@@ -15,6 +15,9 @@ export declare class GitContext {
         body?: string;
         env?: NodeJS.ProcessEnv;
     }): Promise<void>;
+    commitAmendNoEdit(opts?: {
+        env?: NodeJS.ProcessEnv;
+    }): Promise<void>;
     headHashSubject(): Promise<{
         hash: string;
         subject: string;

package/dist/commands/shared/git-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git-context.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/git-context.ts"],"names":[],"mappings":"AAyEA,qBAAa,UAAU;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAEzB,OAAO,CAAC,IAAI,CAGL;gBAEK,IAAI,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE;YAIvB,gBAAgB;IAmBxB,kBAAkB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAKvC,iBAAiB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAKtC,0BAA0B,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAKrD,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAWvB,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAWrC,MAAM,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAcxF,eAAe,IAAI,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CAWpE"}
+{"version":3,"file":"git-context.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/git-context.ts"],"names":[],"mappings":"AAyEA,qBAAa,UAAU;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAEzB,OAAO,CAAC,IAAI,CAGL;gBAEK,IAAI,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE;YAIvB,gBAAgB;IAmBxB,kBAAkB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAKvC,iBAAiB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAKtC,0BAA0B,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAKrD,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAWvB,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAWrC,MAAM,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAcxF,iBAAiB,CAAC,IAAI,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAWpE,eAAe,IAAI,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CAWpE"}

package/dist/commands/shared/git-context.js

@@ -126,6 +126,16 @@ export class GitContext {
         this.memo.status = undefined;
         this.memo.headCommit = undefined;
     }
+    async commitAmendNoEdit(opts) {
+        await execFileAsync("git", ["commit", "--amend", "--no-edit"], {
+            cwd: this.gitRoot,
+            env: opts?.env ?? gitEnv(),
+            // Amend triggers hooks too; keep buffer aligned with regular commit.
+            maxBuffer: 50 * 1024 * 1024,
+        });
+        this.memo.status = undefined;
+        this.memo.headCommit = undefined;
+    }
     async headHashSubject() {
         const { stdout } = await execFileAsync("git", ["log", "-1", "--pretty=%H%x00%s"], {
             cwd: this.gitRoot,

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

@@ -1 +1 @@
-{"version":3,"file":"finish.d.ts","sourceRoot":"","sources":["../../../src/commands/task/finish.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AAiCnC,wBAAsB,SAAS,CAAC,IAAI,EAAE;IACpC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,iBAAiB,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,eAAe,EAAE,OAAO,CAAC;IACzB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,YAAY,EAAE,OAAO,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,wBAAwB,EAAE,OAAO,CAAC;IAClC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAmOlB"}
+{"version":3,"file":"finish.d.ts","sourceRoot":"","sources":["../../../src/commands/task/finish.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AAiCnC,wBAAsB,SAAS,CAAC,IAAI,EAAE;IACpC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,iBAAiB,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,eAAe,EAAE,OAAO,CAAC;IACzB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,YAAY,EAAE,OAAO,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,wBAAwB,EAAE,OAAO,CAAC;IAClC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAyQlB"}

package/dist/commands/task/finish.js

@@ -4,7 +4,7 @@ import { formatCommentBodyForCommit } from "../../shared/comment-format.js";
 import { CliError } from "../../shared/errors.js";
 import { readFile, rm } from "node:fs/promises";
 import path from "node:path";
-import { commitFromComment } from "../guard/index.js";
+import { buildGitCommitEnv, commitFromComment } from "../guard/index.js";
 import { loadCommandContext, loadTaskFromContext, } from "../shared/task-backend.js";
 import { backendIsLocalFileBackend, getTaskStore } from "../shared/task-store.js";
 import { readDirectWorkLock } from "../../shared/direct-work-lock.js";
@@ -160,7 +160,7 @@ export async function cmdFinish(opts) {
                     message: invalidValueMessage("--commit-emoji", opts.commitEmoji, "✅ (finish commits must use a checkmark)"),
                 });
             }
-            await commitFromComment({
+            const committed = await commitFromComment({
                 ctx,
                 cwd: opts.cwd,
                 rootOverride: opts.rootOverride,
@@ -179,6 +179,38 @@ export async function cmdFinish(opts) {
                 quiet: opts.quiet,
                 config: ctx.config,
             });
+            // commitFromComment creates the git commit and returns the actual head hash/subject.
+            // Refresh task commit metadata to this hash and amend the same commit in local mode so
+            // "task done" metadata does not require a manual follow-up close commit.
+            const taskAfterCommit = useStore
+                ? await store.get(primaryTaskId)
+                : await loadTaskFromContext({ ctx, taskId: primaryTaskId });
+            const updatedAfterCommit = {
+                ...taskAfterCommit,
+                commit: { hash: committed.hash, message: committed.message },
+                doc_version: 2,
+                doc_updated_at: nowIso(),
+                doc_updated_by: opts.author,
+            };
+            await (useStore
+                ? store.update(primaryTaskId, () => updatedAfterCommit)
+                : ctx.taskBackend.writeTask(updatedAfterCommit));
+            if (useStore) {
+                const workflowReadmeRelPath = path.join(ctx.config.paths.workflow_dir, primaryTaskId, "README.md");
+                await ctx.git.stage([workflowReadmeRelPath]);
+                const env = buildGitCommitEnv({
+                    taskId: primaryTaskId,
+                    agentId: executorAgent ?? undefined,
+                    statusTo: "DONE",
+                    allowTasks: true,
+                    allowBase: false,
+                    allowPolicy: false,
+                    allowConfig: false,
+                    allowHooks: false,
+                    allowCI: false,
+                });
+                await ctx.git.commitAmendNoEdit({ env });
+            }
         }
         if (opts.statusCommit) {
             if (typeof opts.statusCommitEmoji === "string" && opts.statusCommitEmoji.trim() !== "✅") {

package/dist/commands/upgrade.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../../src/commands/upgrade.ts"],"names":[],"mappings":"AAmCA,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC;IACvB,MAAM,EAAE,OAAO,CAAC;IAChB,YAAY,EAAE,OAAO,CAAC;IACtB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,EAAE,OAAO,CAAC;CACd,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,oBAAoB,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5D,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AA4EF,wBAAgB,kCAAkC,CAAC,MAAM,EAAE,MAAM,GAAG;IAClE,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;CACnB,CAWA;AAED,wBAAgB,iCAAiC,CAAC,IAAI,EAAE;IACtD,OAAO,EAAE,aAAa,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;CACtB,GACG;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GAC1D;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAqB1C;AAUD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE;IAC1C,OAAO,EAAE,aAAa,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,MAAM,CAgBT;AAqQD,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,YAAY,CAAC;CACrB,GAAG,OAAO,CAAC,MAAM,CAAC,CAqmBlB"}
+{"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../../src/commands/upgrade.ts"],"names":[],"mappings":"AAmCA,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC;IACvB,MAAM,EAAE,OAAO,CAAC;IAChB,YAAY,EAAE,OAAO,CAAC;IACtB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,EAAE,OAAO,CAAC;CACd,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,oBAAoB,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5D,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAgGF,wBAAgB,kCAAkC,CAAC,MAAM,EAAE,MAAM,GAAG;IAClE,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;CACnB,CAWA;AAED,wBAAgB,iCAAiC,CAAC,IAAI,EAAE;IACtD,OAAO,EAAE,aAAa,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;CACtB,GACG;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GAC1D;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAqB1C;AAUD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE;IAC1C,OAAO,EAAE,aAAa,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,MAAM,CAgBT;AAqQD,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,YAAY,CAAC;CACrB,GAAG,OAAO,CAAC,MAAM,CAAC,CA2mBlB"}

package/dist/commands/upgrade.js

@@ -15,6 +15,21 @@ const DEFAULT_UPGRADE_ASSET = "agentplane-upgrade.tar.gz";
 const DEFAULT_UPGRADE_CHECKSUM_ASSET = "agentplane-upgrade.tar.gz.sha256";
 const UPGRADE_DOWNLOAD_TIMEOUT_MS = 60_000;
 const UPGRADE_RELEASE_METADATA_TIMEOUT_MS = 15_000;
+async function safeRemovePath(targetPath) {
+    try {
+        await rm(targetPath, { recursive: true, force: true });
+    }
+    catch {
+        // best-effort cleanup
+    }
+}
+async function cleanupAutoUpgradeArtifacts(opts) {
+    for (const backupPath of opts.createdBackups) {
+        await safeRemovePath(backupPath);
+    }
+    // Keep durable state files at .upgrade root; remove transient per-run agent artifacts.
+    await safeRemovePath(path.join(opts.upgradeStateDir, "agent"));
+}
 const ASSETS_DIR_URL = new URL("../../assets/", import.meta.url);
 async function loadFrameworkManifestFromPath(manifestPath) {
     const text = await readFile(manifestPath, "utf8");
@@ -415,6 +430,7 @@ export async function cmdUpgradeParsed(opts) {
     const useRemote = flags.remote === true || hasRemoteHints;
     let tempRoot = null;
     let extractRoot = null;
+    const createdBackups = [];
     try {
         tempRoot = await mkdtemp(path.join(os.tmpdir(), "agentplane-upgrade-"));
         let bundlePath = "";
@@ -684,7 +700,9 @@ export async function cmdUpgradeParsed(opts) {
                 });
             const baselineConflict = baselineText === null
                 ? false
-                : Boolean(changedCurrentVsBaseline) && Boolean(changedIncomingVsBaseline);
+                : currentDiffersFromIncoming &&
+                    Boolean(changedCurrentVsBaseline) &&
+                    Boolean(changedIncomingVsBaseline);
             const noBaselineConflict = baselineText === null ? currentDiffersFromIncoming : false;
             const mergeNotAppliedConflict = mergeApplied ? false : currentDiffersFromIncoming;
             const needsSemanticReview = baselineConflict || noBaselineConflict || mergeNotAppliedConflict;
@@ -694,6 +712,7 @@ export async function cmdUpgradeParsed(opts) {
                 hasBaseline,
                 changedCurrentVsBaseline,
                 changedIncomingVsBaseline,
+                currentDiffersFromIncoming,
                 needsSemanticReview,
                 mergeApplied,
                 mergePath,
@@ -824,7 +843,8 @@ export async function cmdUpgradeParsed(opts) {
         for (const rel of [...additions, ...updates]) {
             const destPath = path.join(resolved.gitRoot, rel);
             if (flags.backup && (await fileExists(destPath))) {
-                await backupPath(destPath);
+                const backup = await backupPath(destPath);
+                createdBackups.push(backup);
             }
             await mkdir(path.dirname(destPath), { recursive: true });
             const data = fileContents.get(rel);
@@ -884,6 +904,7 @@ export async function cmdUpgradeParsed(opts) {
             },
             files: reviewRecords,
         }, null, 2) + "\n", "utf8");
+        await cleanupAutoUpgradeArtifacts({ upgradeStateDir, createdBackups });
         process.stdout.write(`Upgrade applied: ${additions.length} add, ${updates.length} update, ${skipped.length} unchanged\n`);
         return 0;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentplane",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "description": "Agent Plane CLI for task workflows, recipes, and project automation.",
   "keywords": [
     "agentplane",