agentplane 0.2.0 → 0.2.1

package/dist/commands/upgrade.d.ts

@@ -9,6 +9,12 @@ export type UpgradeFlags = {
     backup: boolean;
     yes: boolean;
 };
+export declare function normalizeFrameworkSourceForUpgrade(source: string): {
+    source: string;
+    owner: string;
+    repo: string;
+    migrated: boolean;
+};
 export declare function cmdUpgradeParsed(opts: {
     cwd: string;
     rootOverride?: string;

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

@@ -1 +1 @@
-{"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../../src/commands/upgrade.ts"],"names":[],"mappings":"AAkBA,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,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,EAAE,OAAO,CAAC;CACd,CAAC;AAgDF,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,CA6LlB"}
+{"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../../src/commands/upgrade.ts"],"names":[],"mappings":"AAuBA,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,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,EAAE,OAAO,CAAC;CACd,CAAC;AAmBF,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;AAkOD,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,CAuQlB"}

package/dist/commands/upgrade.js

@@ -6,7 +6,7 @@ import { backupPath, fileExists, getPathKind } from "../cli/fs-utils.js";
 import { downloadToFile, fetchJson } from "../cli/http.js";
 import { parseSha256Text, sha256File } from "../cli/checksum.js";
 import { extractArchive } from "../cli/archive.js";
-import { invalidFieldMessage, invalidValueMessage, requiredFieldMessage } from "../cli/output.js";
+import { invalidFieldMessage, invalidValueMessage, requiredFieldMessage, warnMessage, } from "../cli/output.js";
 import { exitCodeForError } from "../cli/exit-codes.js";
 import { CliError } from "../shared/errors.js";
 import { ensureNetworkApproved } from "./shared/network-approval.js";
@@ -30,6 +30,18 @@ function parseGitHubRepo(source) {
         throw new Error(invalidValueMessage("GitHub repo URL", trimmed, "owner/repo"));
     }
 }
+export function normalizeFrameworkSourceForUpgrade(source) {
+    const { owner, repo } = parseGitHubRepo(source);
+    if (owner === "basilisk-labs" && repo === "agent-plane") {
+        return {
+            source: `https://github.com/${owner}/agentplane`,
+            owner,
+            repo: "agentplane",
+            migrated: true,
+        };
+    }
+    return { source: `https://github.com/${owner}/${repo}`, owner, repo, migrated: false };
+}
 async function resolveUpgradeRoot(extractedDir) {
     const entries = await readdir(extractedDir, { withFileTypes: true });
     const dirs = entries.filter((entry) => entry.isDirectory()).map((entry) => entry.name);
@@ -58,6 +70,193 @@ function isAllowedUpgradePath(relPath) {
         return true;
     return relPath.startsWith(".agentplane/");
 }
+const LOCAL_OVERRIDES_START = "<!-- AGENTPLANE:LOCAL-START -->";
+const LOCAL_OVERRIDES_END = "<!-- AGENTPLANE:LOCAL-END -->";
+function extractLocalOverridesBlock(text) {
+    const start = text.indexOf(LOCAL_OVERRIDES_START);
+    const end = text.indexOf(LOCAL_OVERRIDES_END);
+    if (start === -1 || end === -1 || end < start)
+        return null;
+    return text.slice(start + LOCAL_OVERRIDES_START.length, end).trim();
+}
+function withLocalOverridesBlock(base, localOverrides) {
+    const start = base.indexOf(LOCAL_OVERRIDES_START);
+    const end = base.indexOf(LOCAL_OVERRIDES_END);
+    if (start === -1 || end === -1 || end < start) {
+        const suffix = "\n\n## Local Overrides (preserved across upgrades)\n\n" +
+            `${LOCAL_OVERRIDES_START}\n` +
+            (localOverrides.trim() ? `${localOverrides.trim()}\n` : "") +
+            `${LOCAL_OVERRIDES_END}\n`;
+        return `${base.trimEnd()}${suffix}`;
+    }
+    const before = base.slice(0, start + LOCAL_OVERRIDES_START.length);
+    const after = base.slice(end);
+    return `${before}\n${localOverrides.trim() ? `${localOverrides.trim()}\n` : ""}${after}`;
+}
+function parseH2Sections(text) {
+    const lines = text.replaceAll("\r\n", "\n").split("\n");
+    const sections = new Map();
+    let current = null;
+    let buf = [];
+    const flush = () => {
+        if (!current)
+            return;
+        if (!sections.has(current)) {
+            sections.set(current, buf.join("\n").trimEnd());
+        }
+    };
+    for (const line of lines) {
+        const m = /^##\s+(.+?)\s*$/.exec(line);
+        if (m) {
+            flush();
+            current = (m[1] ?? "").trim();
+            buf = [];
+            continue;
+        }
+        if (current)
+            buf.push(line);
+    }
+    flush();
+    return sections;
+}
+function mergeAgentsPolicyMarkdown(incoming, current) {
+    const local = extractLocalOverridesBlock(current);
+    if (local !== null) {
+        return withLocalOverridesBlock(incoming, local);
+    }
+    // Fallback: if the user edited AGENTS.md without the local markers, preserve their changes by
+    // appending differing/extra sections into a dedicated local overrides block.
+    const incomingSections = parseH2Sections(incoming);
+    const currentSections = parseH2Sections(current);
+    const overrides = [];
+    for (const [title, body] of currentSections.entries()) {
+        const incomingBody = incomingSections.get(title);
+        if (incomingBody === undefined) {
+            overrides.push(`### Added section: ${title}\n\n${body.trim()}\n`);
+            continue;
+        }
+        if (incomingBody.trim() !== body.trim()) {
+            overrides.push(`### Local edits for: ${title}\n\n${body.trim()}\n`);
+        }
+    }
+    if (overrides.length === 0)
+        return incoming;
+    return withLocalOverridesBlock(incoming, overrides.join("\n"));
+}
+function isJsonRecord(value) {
+    return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function mergeAgentJson(incomingText, currentText) {
+    let incoming;
+    let current;
+    try {
+        incoming = JSON.parse(incomingText);
+        current = JSON.parse(currentText);
+    }
+    catch {
+        return null;
+    }
+    if (!isJsonRecord(incoming) || !isJsonRecord(current))
+        return null;
+    const out = { ...incoming };
+    for (const [k, curVal] of Object.entries(current)) {
+        const incVal = incoming[k];
+        if (incVal === undefined) {
+            out[k] = curVal;
+            continue;
+        }
+        if (Array.isArray(incVal) && Array.isArray(curVal)) {
+            const merged = [...incVal];
+            for (const item of curVal) {
+                if (!merged.some((x) => JSON.stringify(x) === JSON.stringify(item)))
+                    merged.push(item);
+            }
+            out[k] = merged;
+            continue;
+        }
+        if (isJsonRecord(incVal) && isJsonRecord(curVal)) {
+            out[k] = { ...incVal, ...curVal };
+            continue;
+        }
+        if (curVal !== incVal && curVal !== null && curVal !== "") {
+            out[k] = curVal;
+            continue;
+        }
+        out[k] = incVal;
+    }
+    return JSON.stringify(out, null, 2) + "\n";
+}
+function mergeAgentJson3Way(opts) {
+    let incoming;
+    let current;
+    let base;
+    try {
+        incoming = JSON.parse(opts.incomingText);
+        current = JSON.parse(opts.currentText);
+        base = JSON.parse(opts.baseText);
+    }
+    catch {
+        return null;
+    }
+    if (!isJsonRecord(incoming) || !isJsonRecord(current) || !isJsonRecord(base))
+        return null;
+    const keys = new Set([...Object.keys(incoming), ...Object.keys(current), ...Object.keys(base)]);
+    const out = {};
+    for (const key of keys) {
+        const incVal = incoming[key];
+        const curVal = current[key];
+        const baseVal = base[key];
+        // Arrays: always take incoming as base; if user changed vs base, append user-only items.
+        if (Array.isArray(incVal) && Array.isArray(curVal) && Array.isArray(baseVal)) {
+            const merged = [...incVal];
+            const userChanged = JSON.stringify(curVal) !== JSON.stringify(baseVal);
+            if (userChanged) {
+                for (const item of curVal) {
+                    if (!merged.some((x) => JSON.stringify(x) === JSON.stringify(item)))
+                        merged.push(item);
+                }
+            }
+            out[key] = merged;
+            continue;
+        }
+        // Objects: shallow merge; for each subkey, prefer incoming unless user changed vs base.
+        if (isJsonRecord(incVal) && isJsonRecord(curVal) && isJsonRecord(baseVal)) {
+            const merged = { ...incVal };
+            const subKeys = new Set([
+                ...Object.keys(incVal),
+                ...Object.keys(curVal),
+                ...Object.keys(baseVal),
+            ]);
+            for (const sk of subKeys) {
+                const incSub = incVal[sk];
+                const curSub = curVal[sk];
+                const baseSub = baseVal[sk];
+                const userChanged = JSON.stringify(curSub) !== JSON.stringify(baseSub);
+                if (userChanged)
+                    merged[sk] = curSub;
+                else if (incSub !== undefined)
+                    merged[sk] = incSub;
+                else if (curSub !== undefined)
+                    merged[sk] = curSub;
+            }
+            out[key] = merged;
+            continue;
+        }
+        // Scalars: prefer incoming unless the user changed vs base.
+        if (JSON.stringify(curVal) !== JSON.stringify(baseVal)) {
+            if (curVal !== undefined)
+                out[key] = curVal;
+            else if (incVal !== undefined)
+                out[key] = incVal;
+            continue;
+        }
+        if (incVal !== undefined)
+            out[key] = incVal;
+        else if (curVal !== undefined)
+            out[key] = curVal;
+    }
+    return JSON.stringify(out, null, 2) + "\n";
+}
 export async function cmdUpgradeParsed(opts) {
     const flags = opts.flags;
     if ((flags.bundle && !flags.checksum) || (!flags.bundle && flags.checksum)) {
@@ -74,7 +273,13 @@ export async function cmdUpgradeParsed(opts) {
         rootOverride: opts.rootOverride ?? null,
     });
     const loaded = await loadConfig(resolved.agentplaneDir);
-    const source = flags.source ?? loaded.config.framework.source;
+    const sourceFromFlags = typeof flags.source === "string" && flags.source.trim().length > 0;
+    const originalSource = flags.source ?? loaded.config.framework.source;
+    const normalized = normalizeFrameworkSourceForUpgrade(originalSource);
+    const source = normalized.source;
+    if (normalized.migrated) {
+        process.stderr.write(`${warnMessage(`config.framework.source uses deprecated repo basilisk-labs/agent-plane; using ${source}`)}\n`);
+    }
     let networkApproved = false;
     const ensureApproved = async (reason) => {
         if (networkApproved)
@@ -106,7 +311,7 @@ export async function cmdUpgradeParsed(opts) {
             }
         }
         else {
-            const { owner, repo } = parseGitHubRepo(source);
+            const { owner, repo } = normalized;
             const releaseUrl = flags.tag
                 ? `https://api.github.com/repos/${owner}/${repo}/releases/tags/${flags.tag}`
                 : `https://api.github.com/repos/${owner}/${repo}/releases/latest`;
@@ -156,6 +361,15 @@ export async function cmdUpgradeParsed(opts) {
         const updates = [];
         const skipped = [];
         const fileContents = new Map();
+        const merged = [];
+        const baselineDir = path.join(resolved.agentplaneDir, "upgrade", "baseline");
+        const toBaselineKey = (rel) => {
+            if (rel === "AGENTS.md")
+                return "AGENTS.md";
+            if (rel.startsWith(".agentplane/"))
+                return rel.slice(".agentplane/".length);
+            return null;
+        };
         for (const filePath of files) {
             let rel = path.relative(bundleRoot, filePath).replaceAll("\\", "/");
             if (!rel || rel.startsWith("..") || path.isAbsolute(rel)) {
@@ -188,14 +402,49 @@ export async function cmdUpgradeParsed(opts) {
                     message: `Upgrade target is a directory: ${rel}`,
                 });
             }
-            const data = await readFile(filePath);
+            if (rel === ".agentplane/config.json") {
+                // Never overwrite local config during upgrade.
+                skipped.push(rel);
+                continue;
+            }
+            let data = await readFile(filePath);
+            if (kind !== null) {
+                const existing = await readFile(destPath, "utf8");
+                if (rel === "AGENTS.md") {
+                    const mergedText = mergeAgentsPolicyMarkdown(data.toString("utf8"), existing);
+                    data = Buffer.from(mergedText, "utf8");
+                    merged.push(rel);
+                }
+                else if (rel.startsWith(".agentplane/agents/") && rel.endsWith(".json")) {
+                    const baselineKey = toBaselineKey(rel);
+                    let mergedText = null;
+                    if (baselineKey) {
+                        try {
+                            const baselineText = await readFile(path.join(baselineDir, baselineKey), "utf8");
+                            mergedText = mergeAgentJson3Way({
+                                incomingText: data.toString("utf8"),
+                                currentText: existing,
+                                baseText: baselineText,
+                            });
+                        }
+                        catch {
+                            mergedText = null;
+                        }
+                    }
+                    mergedText ??= mergeAgentJson(data.toString("utf8"), existing);
+                    if (mergedText) {
+                        data = Buffer.from(mergedText, "utf8");
+                        merged.push(rel);
+                    }
+                }
+            }
             fileContents.set(rel, data);
             if (kind === null) {
                 additions.push(rel);
             }
             else {
-                const existing = await readFile(destPath);
-                if (Buffer.compare(existing, data) === 0) {
+                const existingBuf = await readFile(destPath);
+                if (Buffer.compare(existingBuf, data) === 0) {
                     skipped.push(rel);
                 }
                 else {
@@ -211,8 +460,13 @@ export async function cmdUpgradeParsed(opts) {
                 process.stdout.write(`UPDATE ${rel}\n`);
             for (const rel of skipped)
                 process.stdout.write(`SKIP ${rel}\n`);
+            for (const rel of merged)
+                process.stdout.write(`MERGE ${rel}\n`);
             return 0;
         }
+        if (skipped.includes(".agentplane/config.json")) {
+            process.stderr.write(`${warnMessage("upgrade bundle includes .agentplane/config.json; skipping to preserve local configuration")}\n`);
+        }
         for (const rel of [...additions, ...updates]) {
             const destPath = path.join(resolved.gitRoot, rel);
             if (flags.backup && (await fileExists(destPath))) {
@@ -222,8 +476,18 @@ export async function cmdUpgradeParsed(opts) {
             const data = fileContents.get(rel);
             if (data)
                 await writeFile(destPath, data);
+            // Record a baseline copy for future three-way merges.
+            const baselineKey = toBaselineKey(rel);
+            if (baselineKey && data) {
+                const baselinePath = path.join(baselineDir, baselineKey);
+                await mkdir(path.dirname(baselinePath), { recursive: true });
+                await writeFile(baselinePath, data);
+            }
         }
         const raw = { ...loaded.raw };
+        if (!sourceFromFlags && normalized.migrated) {
+            setByDottedKey(raw, "framework.source", source);
+        }
         setByDottedKey(raw, "framework.last_update", new Date().toISOString());
         await saveConfig(resolved.agentplaneDir, raw);
         process.stdout.write(`Upgrade applied: ${additions.length} add, ${updates.length} update, ${skipped.length} unchanged\n`);

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "agentplane",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Agent Plane CLI for task workflows, recipes, and project automation.",
   "keywords": [
     "agentplane",
-    "agent-plane",
+    "agentplane-framework",
     "cli",
     "tasks",
     "workflow",
@@ -54,7 +54,7 @@
     "prepublishOnly": "npm run prepack"
   },
   "dependencies": {
-    "@agentplaneorg/core": "0.2.0",
+    "@agentplaneorg/core": "0.2.1",
     "yauzl": "^2.10.0"
   },
   "devDependencies": {