opencode-thrum-pro 0.1.17 → 0.1.19

package/dist/installer.js

@@ -50,6 +50,68 @@ function copyDirRecursive(src, dest) {
         }
     }
 }
+// Older pro releases (0.1.x) installed flat (skills/<name>) with the marker in
+// skills/thrum, the same layout open-core still uses. OpenCode resolves
+// duplicate skill names to the flat copy, so stale flat pro skills would shadow
+// the nested ones. Remove them only when the install is positively identified
+// as pro; anything else (open-core, unknown version, unreadable) is left alone.
+function isLegacyProInstall(markerDir) {
+    const read = (name) => {
+        try {
+            return fs.readFileSync(path.join(markerDir, name), "utf8").trim();
+        }
+        catch {
+            return undefined;
+        }
+    };
+    const flavor = read(FLAVOR_FILE);
+    if (flavor !== undefined)
+        return flavor === "pro";
+    const version = read(VERSION_FILE);
+    return version !== undefined && /^0\.1\.\d+([-+].*)?$/.test(version);
+}
+async function cleanLegacyFlatInstall(skillsDir, log) {
+    const markerDir = path.join(skillsDir, DEFAULT_SKILLS_SUBDIR);
+    if (!fs.existsSync(path.join(markerDir, VERSION_FILE)))
+        return;
+    if (!isLegacyProInstall(markerDir)) {
+        await log(`Legacy flat install found at ${markerDir}; not removed (not identified as an old pro install). If it is one, delete it and its sibling skill dirs manually.`);
+        return;
+    }
+    const assetsSkillsDir = path.join(ASSETS_DIR, "skills");
+    let removed = 0;
+    if (fs.existsSync(assetsSkillsDir)) {
+        for (const entry of fs.readdirSync(assetsSkillsDir, { withFileTypes: true })) {
+            if (!entry.isDirectory())
+                continue;
+            const flat = path.join(skillsDir, entry.name);
+            if (!fs.existsSync(flat))
+                continue;
+            try {
+                fs.rmSync(flat, { recursive: true });
+                removed++;
+            }
+            catch {
+                // best-effort; a locked dir must not block the install
+            }
+        }
+    }
+    for (const marker of [VERSION_FILE, FLAVOR_FILE]) {
+        try {
+            fs.rmSync(path.join(markerDir, marker), { force: true });
+        }
+        catch {
+            // best-effort
+        }
+    }
+    try {
+        fs.rmdirSync(markerDir); // only succeeds when empty
+    }
+    catch {
+        // not empty or already gone
+    }
+    await log(`Removed ${removed} legacy flat pro skill dirs under ${skillsDir}`);
+}
 export async function installAssets(ctx, opts = {}) {
     const configDir = getConfigDir();
     const skillsDir = path.join(configDir, "skills");
@@ -73,12 +135,7 @@ export async function installAssets(ctx, opts = {}) {
         body: { service: "opencode-thrum", level: "info", message: msg },
     });
     if (subdir !== DEFAULT_SKILLS_SUBDIR) {
-        // Pro build: a pre-existing skills/thrum copy cannot be attributed to pro
-        // vs open-core (same marker file, no flavor field), so never delete it.
-        const legacy = path.join(skillsDir, DEFAULT_SKILLS_SUBDIR, VERSION_FILE);
-        if (fs.existsSync(legacy)) {
-            await log(`Legacy flat install found at ${path.join(skillsDir, DEFAULT_SKILLS_SUBDIR)}; not removed (cannot tell pro from open-core). If it is an old pro install, delete it and its sibling skill dirs manually.`);
-        }
+        await cleanLegacyFlatInstall(skillsDir, log);
     }
     // Copy each skill subdirectory
     const assetsSkillsDir = path.join(ASSETS_DIR, "skills");

package/dist/installer.test.js

@@ -51,3 +51,52 @@ test("invalid subdir falls back to default", () => {
     }
     assert.equal(sanitizeSkillsSubdir("thrum-pro"), "thrum-pro");
 });
+function seedLegacy(cfg, marker) {
+    const skills = path.join(cfg, "skills");
+    const thrumDir = path.join(skills, "thrum");
+    fs.mkdirSync(thrumDir, { recursive: true });
+    if (marker.version !== undefined)
+        fs.writeFileSync(path.join(thrumDir, ".thrum-plugin-version"), marker.version);
+    if (marker.flavor !== undefined)
+        fs.writeFileSync(path.join(thrumDir, ".thrum-plugin-flavor"), marker.flavor);
+    for (const n of ["configure-roles", "adversarial-critique", "user-own-skill"]) {
+        fs.mkdirSync(path.join(skills, n), { recursive: true });
+        fs.writeFileSync(path.join(skills, n, "SKILL.md"), "stale");
+    }
+    return skills;
+}
+test("pro: legacy flavor=pro removes matching flat dirs, keeps others", withConfig(async (cfg) => {
+    const skills = seedLegacy(cfg, { version: "0.1.16", flavor: "pro" });
+    await installAssets(ctx, { skillsSubdir: "thrum-pro" });
+    assert.ok(!fs.existsSync(path.join(skills, "configure-roles")));
+    assert.ok(!fs.existsSync(path.join(skills, "adversarial-critique")));
+    assert.ok(fs.existsSync(path.join(skills, "user-own-skill", "SKILL.md")));
+    assert.ok(!fs.existsSync(path.join(skills, "thrum", ".thrum-plugin-version")));
+    assert.ok(!fs.existsSync(path.join(skills, "thrum", ".thrum-plugin-flavor")));
+    assert.ok(fs.existsSync(path.join(skills, "thrum-pro", "configure-roles")));
+}));
+test("pro: legacy 0.1.16 without flavor is removed", withConfig(async (cfg) => {
+    const skills = seedLegacy(cfg, { version: "0.1.16" });
+    await installAssets(ctx, { skillsSubdir: "thrum-pro" });
+    assert.ok(!fs.existsSync(path.join(skills, "configure-roles")));
+    assert.ok(fs.existsSync(path.join(skills, "user-own-skill")));
+    assert.ok(!fs.existsSync(path.join(skills, "thrum", ".thrum-plugin-version")));
+}));
+test("pro: legacy 0.3.105 without flavor removes nothing", withConfig(async (cfg) => {
+    const skills = seedLegacy(cfg, { version: "0.3.105" });
+    await installAssets(ctx, { skillsSubdir: "thrum-pro" });
+    assert.ok(fs.existsSync(path.join(skills, "configure-roles", "SKILL.md")));
+    assert.ok(fs.existsSync(path.join(skills, "thrum", ".thrum-plugin-version")));
+}));
+test("pro: legacy flavor=open-core removes nothing", withConfig(async (cfg) => {
+    const skills = seedLegacy(cfg, { version: "0.1.16", flavor: "open-core" });
+    await installAssets(ctx, { skillsSubdir: "thrum-pro" });
+    assert.ok(fs.existsSync(path.join(skills, "configure-roles", "SKILL.md")));
+    assert.ok(fs.existsSync(path.join(skills, "thrum", ".thrum-plugin-flavor")));
+}));
+test("open-core build: existing flat install is not cleaned", withConfig(async (cfg) => {
+    const skills = seedLegacy(cfg, { version: "0.1.16", flavor: "pro" });
+    await installAssets(ctx, { skillsSubdir: "thrum" });
+    assert.ok(fs.existsSync(path.join(skills, "user-own-skill", "SKILL.md")));
+    assert.equal(fs.readFileSync(path.join(skills, "thrum", ".thrum-plugin-flavor"), "utf8"), "open-core");
+}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-thrum-pro",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "description": "Thrum multi-agent coordination plugin for Open Code",
   "type": "module",
   "main": "./dist/index.js",