@orderful/droid 0.29.1 → 0.30.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @orderful/droid
 
+## 0.30.0
+
+### Minor Changes
+
+- [#178](https://github.com/Orderful/droid/pull/178) [`77bc5f2`](https://github.com/Orderful/droid/commit/77bc5f24f4340a123cfe9648da134d68895ffefd) Thanks [@frytyler](https://github.com/frytyler)! - Unify skills installation to ~/.claude/skills/ for all platforms. This is the Agent Skills standard location supported by Claude Code, OpenCode, and Cursor. Existing OpenCode skills are automatically migrated to the unified location.
+
+## 0.29.2
+
+### Patch Changes
+
+- [#176](https://github.com/Orderful/droid/pull/176) [`8451100`](https://github.com/Orderful/droid/commit/845110083082198213b68f34579beebd845b608f) Thanks [@frytyler](https://github.com/frytyler)! - Add migration to remove stale opencode-skills plugin from opencode.json. This plugin was required before OpenCode got native skills support, but now causes errors because it looks for `skills/` (plural) while native OpenCode looks for `skill/` (singular).
+
 ## 0.29.1
 
 ### Patch Changes

package/dist/bin/droid.js

@@ -7,9 +7,9 @@ import { program } from "commander";
 import inquirer from "inquirer";
 import chalk2 from "chalk";
 import { execSync as execSync2 } from "child_process";
-import { existsSync as existsSync6, readFileSync as readFileSync6, writeFileSync as writeFileSync4, mkdirSync as mkdirSync5 } from "fs";
+import { existsSync as existsSync6, readFileSync as readFileSync7, writeFileSync as writeFileSync5, mkdirSync as mkdirSync5 } from "fs";
 import { join as join8 } from "path";
-import { homedir as homedir3 } from "os";
+import { homedir as homedir4 } from "os";
 
 // src/lib/config.ts
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
@@ -182,9 +182,9 @@ function setAutoUpdateConfig(updates) {
 import {
   existsSync as existsSync5,
   readdirSync as readdirSync4,
-  readFileSync as readFileSync5,
+  readFileSync as readFileSync6,
   mkdirSync as mkdirSync4,
-  writeFileSync as writeFileSync3,
+  writeFileSync as writeFileSync4,
   rmSync as rmSync2
 } from "fs";
 import { join as join7, dirname as dirname5, basename } from "path";
@@ -200,15 +200,16 @@ import YAML3 from "yaml";
 // src/lib/platforms.ts
 import { join as join2 } from "path";
 import { homedir as homedir2 } from "os";
+var UNIFIED_SKILLS_PATH = join2(homedir2(), ".claude", "skills");
 var PLATFORM_PATHS = {
   ["claude-code" /* ClaudeCode */]: {
-    skills: join2(homedir2(), ".claude", "skills"),
+    skills: UNIFIED_SKILLS_PATH,
     commands: join2(homedir2(), ".claude", "commands"),
     agents: join2(homedir2(), ".claude", "agents"),
     config: join2(homedir2(), ".claude", "CLAUDE.md")
   },
   ["opencode" /* OpenCode */]: {
-    skills: join2(homedir2(), ".config", "opencode", "skill"),
+    skills: UNIFIED_SKILLS_PATH,
     commands: join2(homedir2(), ".config", "opencode", "command"),
     agents: join2(homedir2(), ".config", "opencode", "agent"),
     config: join2(homedir2(), ".config", "opencode", "AGENTS.md")
@@ -525,9 +526,12 @@ import {
   mkdirSync as mkdirSync3,
   renameSync,
   rmSync,
-  readdirSync as readdirSync3
+  readdirSync as readdirSync3,
+  readFileSync as readFileSync5,
+  writeFileSync as writeFileSync3
 } from "fs";
 import { join as join6, dirname as dirname4 } from "path";
+import { homedir as homedir3 } from "os";
 var MIGRATIONS_LOG_FILE = ".migrations.log";
 function getMigrationsLogPath() {
   return join6(getConfigDir(), MIGRATIONS_LOG_FILE);
@@ -728,13 +732,108 @@ function createClaudeCodeCommandCleanupMigration(version2) {
     }
   };
 }
+function createOpenCodePluginCleanupMigration(version2) {
+  return {
+    version: version2,
+    description: "Remove opencode-skills plugin from opencode.json",
+    up: () => {
+      const opencodeConfigPath = join6(
+        homedir3(),
+        ".config",
+        "opencode",
+        "opencode.json"
+      );
+      if (!existsSync4(opencodeConfigPath)) {
+        return;
+      }
+      let config;
+      try {
+        config = JSON.parse(readFileSync5(opencodeConfigPath, "utf-8"));
+      } catch {
+        return;
+      }
+      if (!Array.isArray(config.plugin)) {
+        return;
+      }
+      const pluginIndex = config.plugin.indexOf("opencode-skills");
+      if (pluginIndex === -1) {
+        return;
+      }
+      config.plugin.splice(pluginIndex, 1);
+      if (config.plugin.length === 0) {
+        delete config.plugin;
+      }
+      try {
+        writeFileSync3(
+          opencodeConfigPath,
+          JSON.stringify(config, null, 2) + "\n",
+          "utf-8"
+        );
+      } catch (error) {
+        console.warn(`Warning: Could not update opencode.json: ${error}`);
+      }
+    }
+  };
+}
+function createUnifiedSkillsPathMigration(version2) {
+  return {
+    version: version2,
+    description: "Copy OpenCode skills to unified ~/.claude/skills/ location",
+    up: () => {
+      const oldOpenCodeSkillsPath = join6(
+        homedir3(),
+        ".config",
+        "opencode",
+        "skill"
+      );
+      const unifiedSkillsPath = join6(homedir3(), ".claude", "skills");
+      if (!existsSync4(oldOpenCodeSkillsPath)) {
+        return;
+      }
+      if (!existsSync4(unifiedSkillsPath)) {
+        mkdirSync3(unifiedSkillsPath, { recursive: true });
+      }
+      const skillDirs = readdirSync3(oldOpenCodeSkillsPath, { withFileTypes: true }).filter((dirent) => dirent.isDirectory()).map((dirent) => dirent.name);
+      for (const skillName of skillDirs) {
+        const sourcePath = join6(oldOpenCodeSkillsPath, skillName);
+        const destPath = join6(unifiedSkillsPath, skillName);
+        if (existsSync4(destPath)) {
+          continue;
+        }
+        try {
+          copyDirRecursive(sourcePath, destPath);
+        } catch (error) {
+          console.warn(
+            `Warning: Could not copy skill ${skillName} to unified location: ${error}`
+          );
+        }
+      }
+    }
+  };
+}
+function copyDirRecursive(src, dest) {
+  mkdirSync3(dest, { recursive: true });
+  const entries = readdirSync3(src, { withFileTypes: true });
+  for (const entry of entries) {
+    const srcPath = join6(src, entry.name);
+    const destPath = join6(dest, entry.name);
+    if (entry.isDirectory()) {
+      copyDirRecursive(srcPath, destPath);
+    } else {
+      const content = readFileSync5(srcPath);
+      writeFileSync3(destPath, content);
+    }
+  }
+}
 var PACKAGE_MIGRATIONS = [
   createPlatformSyncMigration("0.25.0"),
   createConfigSkillNameMigration("0.27.2"),
   createOpenCodeSkillsPathMigration("0.28.0"),
   createClaudeCodeCommandCleanupMigration("0.28.0"),
   // Retry: 0.28.0 migration had platform check that prevented running after platform switch
-  createClaudeCodeCommandCleanupMigration("0.28.1")
+  createClaudeCodeCommandCleanupMigration("0.28.1"),
+  createOpenCodePluginCleanupMigration("0.29.2"),
+  createUnifiedSkillsPathMigration("0.30.0")
 ];
 var TOOL_MIGRATIONS = {
   brain: [createConfigDirMigration("droid-brain", "0.2.3")],
@@ -873,7 +972,7 @@ function updatePlatformConfigSkills(platform, installedSkills) {
   const configPath = getPlatformConfigPath(platform);
   let content = "";
   if (existsSync5(configPath)) {
-    content = readFileSync5(configPath, "utf-8");
+    content = readFileSync6(configPath, "utf-8");
   }
   const skillLines = installedSkills.map((name) => {
     const relativePath = `skills/${name}/SKILL.md`;
@@ -895,7 +994,7 @@ ${DROID_SKILLS_END}` : "";
   if (!existsSync5(configDir)) {
     mkdirSync4(configDir, { recursive: true });
   }
-  writeFileSync3(configPath, content, "utf-8");
+  writeFileSync4(configPath, content, "utf-8");
 }
 function parseSkillFrontmatter(content) {
   const trimmed = content.trimStart();
@@ -918,7 +1017,7 @@ function loadSkillManifest(skillDir) {
   if (!existsSync5(skillMdPath)) {
     return null;
   }
-  const content = readFileSync5(skillMdPath, "utf-8");
+  const content = readFileSync6(skillMdPath, "utf-8");
   const frontmatter = parseSkillFrontmatter(content);
   if (!frontmatter || !frontmatter.name) {
     return null;
@@ -1161,8 +1260,8 @@ function installSkill(skillName) {
       mkdirSync4(targetSkillDir, { recursive: true });
     }
     const skillMdTarget = join7(targetSkillDir, "SKILL.md");
-    const content = readFileSync5(skillMdSource, "utf-8");
-    writeFileSync3(skillMdTarget, content);
+    const content = readFileSync6(skillMdSource, "utf-8");
+    writeFileSync4(skillMdTarget, content);
   }
   const referencesSource = join7(skillDir, "references");
   if (existsSync5(referencesSource)) {
@@ -1176,8 +1275,8 @@ function installSkill(skillName) {
     for (const file of referenceFiles) {
       const sourcePath = join7(referencesSource, file);
       const targetPath = join7(targetReferencesDir, file);
-      const content = readFileSync5(sourcePath, "utf-8");
-      writeFileSync3(targetPath, content);
+      const content = readFileSync6(sourcePath, "utf-8");
+      writeFileSync4(targetPath, content);
     }
   }
   const scriptsSource = join7(skillDir, "scripts");
@@ -1192,8 +1291,8 @@ function installSkill(skillName) {
     for (const file of scriptFiles) {
       const sourcePath = join7(scriptsSource, file);
       const targetPath = join7(targetScriptsDir, file);
-      const content = readFileSync5(sourcePath, "utf-8");
-      writeFileSync3(targetPath, content);
+      const content = readFileSync6(sourcePath, "utf-8");
+      writeFileSync4(targetPath, content);
     }
   }
   if (existsSync5(commandsSource)) {
@@ -1213,8 +1312,8 @@ function installSkill(skillName) {
       if (shouldInstall) {
         const sourcePath = join7(commandsSource, file);
         const targetPath = join7(commandsPath, file);
-        const content = readFileSync5(sourcePath, "utf-8");
-        writeFileSync3(targetPath, content);
+        const content = readFileSync6(sourcePath, "utf-8");
+        writeFileSync4(targetPath, content);
       }
     }
   }
@@ -1334,15 +1433,15 @@ function detectGitUsername() {
 function configurePlatformPermissions(platform) {
   const added = [];
   if (platform === "claude-code" /* ClaudeCode */) {
-    const settingsPath = join8(homedir3(), ".claude", "settings.json");
-    const claudeDir = join8(homedir3(), ".claude");
+    const settingsPath = join8(homedir4(), ".claude", "settings.json");
+    const claudeDir = join8(homedir4(), ".claude");
     if (!existsSync6(claudeDir)) {
       mkdirSync5(claudeDir, { recursive: true });
     }
     let settings = {};
     if (existsSync6(settingsPath)) {
       try {
-        settings = JSON.parse(readFileSync6(settingsPath, "utf-8"));
+        settings = JSON.parse(readFileSync7(settingsPath, "utf-8"));
       } catch {
         console.warn(chalk2.yellow("\u26A0 Claude Code settings.json appears corrupted, resetting permissions"));
         settings = {};
@@ -1362,7 +1461,7 @@ function configurePlatformPermissions(platform) {
     }
     if (added.length > 0) {
       try {
-        writeFileSync4(settingsPath, JSON.stringify(settings, null, 2) + "\n", "utf-8");
+        writeFileSync5(settingsPath, JSON.stringify(settings, null, 2) + "\n", "utf-8");
       } catch (e) {
         const message = e instanceof Error ? e.message : "Unknown error";
         return { added: [], alreadyPresent: false, error: `Failed to update Claude Code settings: ${message}` };
@@ -1371,7 +1470,7 @@ function configurePlatformPermissions(platform) {
     return { added, alreadyPresent: added.length === 0 };
   }
   if (platform === "opencode" /* OpenCode */) {
-    const globalConfigDir = join8(homedir3(), ".config", "opencode");
+    const globalConfigDir = join8(homedir4(), ".config", "opencode");
     if (!existsSync6(globalConfigDir)) {
       mkdirSync5(globalConfigDir, { recursive: true });
     }
@@ -1476,7 +1575,7 @@ async function setupCommand() {
       console.log(chalk2.gray("  Droid permissions already configured in Claude Code"));
     }
   } else if (answers.platform === "opencode" /* OpenCode */) {
-    console.log(chalk2.gray("  OpenCode has native skills support - no configuration needed"));
+    console.log(chalk2.gray("  Skills installed to ~/.claude/skills/ (works with Claude Code, OpenCode, and Cursor)"));
   }
   console.log(chalk2.gray("\nRun `droid skills` to browse and install skills."));
 }
@@ -2728,7 +2827,7 @@ function ReadmeViewer({ title, content, onClose }) {
 // src/commands/tui/views/ToolExplorer.tsx
 import { Box as Box10, Text as Text11, useInput as useInput5 } from "ink";
 import { useState as useState5, useMemo as useMemo3 } from "react";
-import { existsSync as existsSync7, readFileSync as readFileSync7 } from "fs";
+import { existsSync as existsSync7, readFileSync as readFileSync8 } from "fs";
 import { join as join9 } from "path";
 import { jsx as jsx11, jsxs as jsxs10 } from "react/jsx-runtime";
 function ToolExplorer({ tool, onViewSource, onClose }) {
@@ -2773,12 +2872,12 @@ function ToolExplorer({ tool, onViewSource, onClose }) {
     if (key.return && items.length > 0) {
       const item = items[selectedIndex];
       if (existsSync7(item.path)) {
-        const content = readFileSync7(item.path, "utf-8");
+        const content = readFileSync8(item.path, "utf-8");
         onViewSource(`${tool.name} / ${item.name}`, content);
       } else {
         const yamlPath = item.path.replace(".md", ".yaml");
         if (existsSync7(yamlPath)) {
-          const content = readFileSync7(yamlPath, "utf-8");
+          const content = readFileSync8(yamlPath, "utf-8");
           onViewSource(`${tool.name} / ${item.name}`, content);
         }
       }

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

@@ -1 +1 @@
-{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/commands/setup.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,QAAQ,EAA0D,MAAM,cAAc,CAAC;AA6ChG;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,QAAQ,GAAG;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,cAAc,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAgE7H;AAyBD,wBAAsB,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAwGlD"}
+{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/commands/setup.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,QAAQ,EAA0D,MAAM,cAAc,CAAC;AA6ChG;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,QAAQ,GAAG;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,cAAc,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAiE7H;AAyBD,wBAAsB,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAwGlD"}

package/dist/index.js

@@ -190,9 +190,9 @@ function setAutoUpdateConfig(updates) {
 import {
   existsSync as existsSync5,
   readdirSync as readdirSync4,
-  readFileSync as readFileSync5,
+  readFileSync as readFileSync6,
   mkdirSync as mkdirSync4,
-  writeFileSync as writeFileSync3,
+  writeFileSync as writeFileSync4,
   rmSync as rmSync2
 } from "fs";
 import { join as join7, dirname as dirname5, basename } from "path";
@@ -208,15 +208,16 @@ import YAML3 from "yaml";
 // src/lib/platforms.ts
 import { join as join2 } from "path";
 import { homedir as homedir2 } from "os";
+var UNIFIED_SKILLS_PATH = join2(homedir2(), ".claude", "skills");
 var PLATFORM_PATHS = {
   ["claude-code" /* ClaudeCode */]: {
-    skills: join2(homedir2(), ".claude", "skills"),
+    skills: UNIFIED_SKILLS_PATH,
     commands: join2(homedir2(), ".claude", "commands"),
     agents: join2(homedir2(), ".claude", "agents"),
     config: join2(homedir2(), ".claude", "CLAUDE.md")
   },
   ["opencode" /* OpenCode */]: {
-    skills: join2(homedir2(), ".config", "opencode", "skill"),
+    skills: UNIFIED_SKILLS_PATH,
     commands: join2(homedir2(), ".config", "opencode", "command"),
     agents: join2(homedir2(), ".config", "opencode", "agent"),
     config: join2(homedir2(), ".config", "opencode", "AGENTS.md")
@@ -498,9 +499,12 @@ import {
   mkdirSync as mkdirSync3,
   renameSync,
   rmSync,
-  readdirSync as readdirSync3
+  readdirSync as readdirSync3,
+  readFileSync as readFileSync5,
+  writeFileSync as writeFileSync3
 } from "fs";
 import { join as join6, dirname as dirname4 } from "path";
+import { homedir as homedir3 } from "os";
 var MIGRATIONS_LOG_FILE = ".migrations.log";
 function getMigrationsLogPath() {
   return join6(getConfigDir(), MIGRATIONS_LOG_FILE);
@@ -701,13 +705,108 @@ function createClaudeCodeCommandCleanupMigration(version) {
     }
   };
 }
+function createOpenCodePluginCleanupMigration(version) {
+  return {
+    version,
+    description: "Remove opencode-skills plugin from opencode.json",
+    up: () => {
+      const opencodeConfigPath = join6(
+        homedir3(),
+        ".config",
+        "opencode",
+        "opencode.json"
+      );
+      if (!existsSync4(opencodeConfigPath)) {
+        return;
+      }
+      let config;
+      try {
+        config = JSON.parse(readFileSync5(opencodeConfigPath, "utf-8"));
+      } catch {
+        return;
+      }
+      if (!Array.isArray(config.plugin)) {
+        return;
+      }
+      const pluginIndex = config.plugin.indexOf("opencode-skills");
+      if (pluginIndex === -1) {
+        return;
+      }
+      config.plugin.splice(pluginIndex, 1);
+      if (config.plugin.length === 0) {
+        delete config.plugin;
+      }
+      try {
+        writeFileSync3(
+          opencodeConfigPath,
+          JSON.stringify(config, null, 2) + "\n",
+          "utf-8"
+        );
+      } catch (error) {
+        console.warn(`Warning: Could not update opencode.json: ${error}`);
+      }
+    }
+  };
+}
+function createUnifiedSkillsPathMigration(version) {
+  return {
+    version,
+    description: "Copy OpenCode skills to unified ~/.claude/skills/ location",
+    up: () => {
+      const oldOpenCodeSkillsPath = join6(
+        homedir3(),
+        ".config",
+        "opencode",
+        "skill"
+      );
+      const unifiedSkillsPath = join6(homedir3(), ".claude", "skills");
+      if (!existsSync4(oldOpenCodeSkillsPath)) {
+        return;
+      }
+      if (!existsSync4(unifiedSkillsPath)) {
+        mkdirSync3(unifiedSkillsPath, { recursive: true });
+      }
+      const skillDirs = readdirSync3(oldOpenCodeSkillsPath, { withFileTypes: true }).filter((dirent) => dirent.isDirectory()).map((dirent) => dirent.name);
+      for (const skillName of skillDirs) {
+        const sourcePath = join6(oldOpenCodeSkillsPath, skillName);
+        const destPath = join6(unifiedSkillsPath, skillName);
+        if (existsSync4(destPath)) {
+          continue;
+        }
+        try {
+          copyDirRecursive(sourcePath, destPath);
+        } catch (error) {
+          console.warn(
+            `Warning: Could not copy skill ${skillName} to unified location: ${error}`
+          );
+        }
+      }
+    }
+  };
+}
+function copyDirRecursive(src, dest) {
+  mkdirSync3(dest, { recursive: true });
+  const entries = readdirSync3(src, { withFileTypes: true });
+  for (const entry of entries) {
+    const srcPath = join6(src, entry.name);
+    const destPath = join6(dest, entry.name);
+    if (entry.isDirectory()) {
+      copyDirRecursive(srcPath, destPath);
+    } else {
+      const content = readFileSync5(srcPath);
+      writeFileSync3(destPath, content);
+    }
+  }
+}
 var PACKAGE_MIGRATIONS = [
   createPlatformSyncMigration("0.25.0"),
   createConfigSkillNameMigration("0.27.2"),
   createOpenCodeSkillsPathMigration("0.28.0"),
   createClaudeCodeCommandCleanupMigration("0.28.0"),
   // Retry: 0.28.0 migration had platform check that prevented running after platform switch
-  createClaudeCodeCommandCleanupMigration("0.28.1")
+  createClaudeCodeCommandCleanupMigration("0.28.1"),
+  createOpenCodePluginCleanupMigration("0.29.2"),
+  createUnifiedSkillsPathMigration("0.30.0")
 ];
 var TOOL_MIGRATIONS = {
   brain: [createConfigDirMigration("droid-brain", "0.2.3")],
@@ -805,7 +904,7 @@ function updatePlatformConfigSkills(platform, installedSkills) {
   const configPath = getPlatformConfigPath(platform);
   let content = "";
   if (existsSync5(configPath)) {
-    content = readFileSync5(configPath, "utf-8");
+    content = readFileSync6(configPath, "utf-8");
   }
   const skillLines = installedSkills.map((name) => {
     const relativePath = `skills/${name}/SKILL.md`;
@@ -827,7 +926,7 @@ ${DROID_SKILLS_END}` : "";
   if (!existsSync5(configDir)) {
     mkdirSync4(configDir, { recursive: true });
   }
-  writeFileSync3(configPath, content, "utf-8");
+  writeFileSync4(configPath, content, "utf-8");
 }
 function parseSkillFrontmatter(content) {
   const trimmed = content.trimStart();
@@ -850,7 +949,7 @@ function loadSkillManifest(skillDir) {
   if (!existsSync5(skillMdPath)) {
     return null;
   }
-  const content = readFileSync5(skillMdPath, "utf-8");
+  const content = readFileSync6(skillMdPath, "utf-8");
   const frontmatter = parseSkillFrontmatter(content);
   if (!frontmatter || !frontmatter.name) {
     return null;
@@ -1109,8 +1208,8 @@ function installSkill(skillName) {
       mkdirSync4(targetSkillDir, { recursive: true });
     }
     const skillMdTarget = join7(targetSkillDir, "SKILL.md");
-    const content = readFileSync5(skillMdSource, "utf-8");
-    writeFileSync3(skillMdTarget, content);
+    const content = readFileSync6(skillMdSource, "utf-8");
+    writeFileSync4(skillMdTarget, content);
   }
   const referencesSource = join7(skillDir, "references");
   if (existsSync5(referencesSource)) {
@@ -1124,8 +1223,8 @@ function installSkill(skillName) {
     for (const file of referenceFiles) {
       const sourcePath = join7(referencesSource, file);
       const targetPath = join7(targetReferencesDir, file);
-      const content = readFileSync5(sourcePath, "utf-8");
-      writeFileSync3(targetPath, content);
+      const content = readFileSync6(sourcePath, "utf-8");
+      writeFileSync4(targetPath, content);
     }
   }
   const scriptsSource = join7(skillDir, "scripts");
@@ -1140,8 +1239,8 @@ function installSkill(skillName) {
     for (const file of scriptFiles) {
       const sourcePath = join7(scriptsSource, file);
       const targetPath = join7(targetScriptsDir, file);
-      const content = readFileSync5(sourcePath, "utf-8");
-      writeFileSync3(targetPath, content);
+      const content = readFileSync6(sourcePath, "utf-8");
+      writeFileSync4(targetPath, content);
     }
   }
   if (existsSync5(commandsSource)) {
@@ -1161,8 +1260,8 @@ function installSkill(skillName) {
       if (shouldInstall) {
         const sourcePath = join7(commandsSource, file);
         const targetPath = join7(commandsPath, file);
-        const content = readFileSync5(sourcePath, "utf-8");
-        writeFileSync3(targetPath, content);
+        const content = readFileSync6(sourcePath, "utf-8");
+        writeFileSync4(targetPath, content);
       }
     }
   }
@@ -1305,8 +1404,8 @@ function installCommand(commandName, skillName) {
   const actualSourcePath = join7(commandsDir, sourceFile);
   const targetPath = join7(commandsPath, sourceFile);
   try {
-    const content = readFileSync5(actualSourcePath, "utf-8");
-    writeFileSync3(targetPath, content);
+    const content = readFileSync6(actualSourcePath, "utf-8");
+    writeFileSync4(targetPath, content);
     return { success: true, message: `Installed /${commandName}` };
   } catch (error) {
     return { success: false, message: `Failed to install command: ${error}` };

package/dist/lib/migrations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../../src/lib/migrations.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,KAAK,SAAS,EAIf,MAAM,SAAS,CAAC;AA4WjB;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,CAE/D;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAc/D;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GACd,IAAI,CAmBN;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,GAChB;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CA2CtC;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,GACvB;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAStC;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,cAAc,EAAE,MAAM,GAAG;IAC5D,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAyDA"}
+{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../../src/lib/migrations.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,KAAK,SAAS,EAIf,MAAM,SAAS,CAAC;AA8fjB;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,CAE/D;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAc/D;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GACd,IAAI,CAmBN;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,GAChB;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CA2CtC;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,GACvB;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAStC;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,cAAc,EAAE,MAAM,GAAG;IAC5D,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAyDA"}

package/dist/lib/platforms.d.ts

@@ -2,6 +2,9 @@ import { Platform } from './types';
 /**
  * Platform-specific paths configuration
  * Single source of truth for all platform-specific directories
+ *
+ * Note: Skills are unified to ~/.claude/skills/ (all platforms read this location).
+ * Commands and agents remain platform-specific as there's no cross-platform compatibility.
  */
 export declare const PLATFORM_PATHS: {
     readonly "claude-code": {

package/dist/lib/platforms.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"platforms.d.ts","sourceRoot":"","sources":["../../src/lib/platforms.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC;;;GAGG;AACH,eAAO,MAAM,cAAc;;;;;;;;;;;;;CAajB,CAAC;AAEX,MAAM,MAAM,aAAa,GAAG,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;AAE5D;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,GAAG,aAAa,CAElE;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAExD;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAE1D;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAExD;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAExD"}
+{"version":3,"file":"platforms.d.ts","sourceRoot":"","sources":["../../src/lib/platforms.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAQnC;;;;;;GAMG;AACH,eAAO,MAAM,cAAc;;;;;;;;;;;;;CAajB,CAAC;AAEX,MAAM,MAAM,aAAa,GAAG,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;AAE5D;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,GAAG,aAAa,CAElE;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAExD;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAE1D;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAExD;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAExD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orderful/droid",
-  "version": "0.29.1",
+  "version": "0.30.0",
   "description": "AI workflow toolkit for sharing skills, commands, and agents across the team",
   "type": "module",
   "bin": {

package/src/commands/setup.test.ts

@@ -1,16 +1,12 @@
-import { describe, it, expect, beforeEach, afterEach, mock, spyOn } from 'bun:test';
+import { describe, it, expect, beforeEach, afterEach } from 'bun:test';
 import { existsSync, mkdirSync, rmSync, readFileSync, writeFileSync } from 'fs';
 import { join } from 'path';
 import { tmpdir } from 'os';
-import { Platform } from '../lib/types';
 
 // We need to mock homedir() before importing the module
 // Create a test directory that will act as our fake home
 let testHomeDir: string;
 
-// Mock the os module's homedir function
-const originalHomedir = await import('os').then(m => m.homedir);
-
 describe('configurePlatformPermissions', () => {
   beforeEach(() => {
     testHomeDir = join(tmpdir(), `droid-setup-test-${Date.now()}`);
@@ -23,66 +19,80 @@ describe('configurePlatformPermissions', () => {
     }
   });
 
-  describe('OpenCode plugin configuration', () => {
-    it('should add opencode-skills plugin to empty config', () => {
+  describe('OpenCode plugin cleanup migration', () => {
+    it('should remove opencode-skills plugin from config', () => {
       const configDir = join(testHomeDir, '.config', 'opencode');
       const configPath = join(configDir, 'opencode.json');
 
       mkdirSync(configDir, { recursive: true });
 
-      const config: { plugin?: string[] } = {};
-      if (!Array.isArray(config.plugin)) {
-        config.plugin = [];
-      }
-      config.plugin.push('opencode-skills');
+      // Config with the stale plugin
+      const existingConfig = {
+        plugin: ['opencode-skills', 'some-other-plugin'],
+        theme: 'dark',
+      };
+      writeFileSync(configPath, JSON.stringify(existingConfig, null, 2), 'utf-8');
 
+      // Simulate migration logic
+      const config = JSON.parse(readFileSync(configPath, 'utf-8'));
+      const pluginIndex = config.plugin.indexOf('opencode-skills');
+      if (pluginIndex !== -1) {
+        config.plugin.splice(pluginIndex, 1);
+      }
       writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n', 'utf-8');
 
       const read = JSON.parse(readFileSync(configPath, 'utf-8'));
-      expect(read.plugin).toContain('opencode-skills');
+      expect(read.plugin).not.toContain('opencode-skills');
+      expect(read.plugin).toContain('some-other-plugin');
+      expect(read.theme).toBe('dark');
     });
 
-    it('should add opencode-skills plugin to config with existing plugins', () => {
+    it('should remove empty plugin array after cleanup', () => {
       const configDir = join(testHomeDir, '.config', 'opencode');
       const configPath = join(configDir, 'opencode.json');
 
       mkdirSync(configDir, { recursive: true });
 
+      // Config with only the stale plugin
       const existingConfig = {
-        plugin: ['some-other-plugin'],
+        plugin: ['opencode-skills'],
         theme: 'dark',
       };
       writeFileSync(configPath, JSON.stringify(existingConfig, null, 2), 'utf-8');
 
-      // Read and modify (simulating what the function does)
+      // Simulate migration logic
       const config = JSON.parse(readFileSync(configPath, 'utf-8'));
-      if (!config.plugin.includes('opencode-skills')) {
-        config.plugin.push('opencode-skills');
+      const pluginIndex = config.plugin.indexOf('opencode-skills');
+      if (pluginIndex !== -1) {
+        config.plugin.splice(pluginIndex, 1);
+      }
+      if (config.plugin.length === 0) {
+        delete config.plugin;
       }
       writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n', 'utf-8');
 
       const read = JSON.parse(readFileSync(configPath, 'utf-8'));
-      expect(read.plugin).toContain('opencode-skills');
-      expect(read.plugin).toContain('some-other-plugin');
+      expect(read.plugin).toBeUndefined();
       expect(read.theme).toBe('dark');
     });
 
-    it('should not duplicate opencode-skills if already present', () => {
+    it('should do nothing if plugin not present', () => {
       const configDir = join(testHomeDir, '.config', 'opencode');
       const configPath = join(configDir, 'opencode.json');
 
       mkdirSync(configDir, { recursive: true });
 
       const existingConfig = {
-        plugin: ['opencode-skills'],
+        plugin: ['some-other-plugin'],
+        theme: 'dark',
       };
       writeFileSync(configPath, JSON.stringify(existingConfig, null, 2), 'utf-8');
 
+      // Simulate migration logic
       const config = JSON.parse(readFileSync(configPath, 'utf-8'));
-      const alreadyPresent = config.plugin.includes('opencode-skills');
-
-      expect(alreadyPresent).toBe(true);
-      expect(config.plugin.length).toBe(1);
+      const pluginIndex = config.plugin.indexOf('opencode-skills');
+      expect(pluginIndex).toBe(-1);
+      expect(config.plugin).toHaveLength(1);
     });
 
     it('should handle config without plugin key', () => {
@@ -97,31 +107,32 @@ describe('configurePlatformPermissions', () => {
       };
       writeFileSync(configPath, JSON.stringify(existingConfig, null, 2), 'utf-8');
 
+      // Simulate migration logic - should not throw
       const config = JSON.parse(readFileSync(configPath, 'utf-8'));
-      if (!Array.isArray(config.plugin)) {
-        config.plugin = [];
+      if (Array.isArray(config.plugin)) {
+        const pluginIndex = config.plugin.indexOf('opencode-skills');
+        if (pluginIndex !== -1) {
+          config.plugin.splice(pluginIndex, 1);
+        }
       }
-      config.plugin.push('opencode-skills');
-      writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n', 'utf-8');
 
-      const read = JSON.parse(readFileSync(configPath, 'utf-8'));
-      expect(read.plugin).toContain('opencode-skills');
-      expect(read.theme).toBe('dark');
-      expect(read.model).toBe('claude-sonnet');
+      expect(config.theme).toBe('dark');
+      expect(config.model).toBe('claude-sonnet');
     });
 
-    it('should create config directory if it does not exist', () => {
-      const nestedDir = join(testHomeDir, '.config', 'opencode');
-      expect(existsSync(nestedDir)).toBe(false);
-
-      mkdirSync(nestedDir, { recursive: true });
-      expect(existsSync(nestedDir)).toBe(true);
+    it('should handle missing config file gracefully', () => {
+      const configDir = join(testHomeDir, '.config', 'opencode');
+      const configPath = join(configDir, 'opencode.json');
 
-      const configPath = join(nestedDir, 'opencode.json');
-      const config = { plugin: ['opencode-skills'] };
-      writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n', 'utf-8');
+      // Don't create the file - simulate missing config
+      expect(existsSync(configPath)).toBe(false);
 
-      expect(existsSync(configPath)).toBe(true);
+      // Migration should not throw
+      if (existsSync(configPath)) {
+        // Would process file here
+      }
+      // No error thrown = success
+      expect(true).toBe(true);
     });
 
     it('should handle corrupted JSON gracefully', () => {
@@ -131,20 +142,17 @@ describe('configurePlatformPermissions', () => {
       mkdirSync(configDir, { recursive: true });
       writeFileSync(configPath, '{ invalid json }}}', 'utf-8');
 
-      let config: { plugin?: string[] } = {};
+      // Simulate migration logic - should not throw
+      let processed = false;
       try {
-        config = JSON.parse(readFileSync(configPath, 'utf-8'));
+        JSON.parse(readFileSync(configPath, 'utf-8'));
+        processed = true;
       } catch {
-        // Invalid JSON, start fresh
-        config = {};
-      }
-
-      if (!Array.isArray(config.plugin)) {
-        config.plugin = [];
+        // Invalid JSON - migration skips this file
+        processed = false;
       }
-      config.plugin.push('opencode-skills');
 
-      expect(config.plugin).toContain('opencode-skills');
+      expect(processed).toBe(false);
     });
   });
 

package/src/commands/setup.ts

@@ -107,8 +107,9 @@ export function configurePlatformPermissions(platform: Platform): { added: strin
   }
 
   if (platform === Platform.OpenCode) {
-    // OpenCode now has native skills support - no configuration needed
-    // Ensure config directory exists for when skills are installed
+    // Skills are installed to ~/.claude/skills/ (unified location)
+    // OpenCode reads from this location via Agent Skills standard compatibility
+    // Ensure config directory exists for commands and agents
     const globalConfigDir = join(homedir(), '.config', 'opencode');
     if (!existsSync(globalConfigDir)) {
       mkdirSync(globalConfigDir, { recursive: true });
@@ -243,7 +244,7 @@ export async function setupCommand(): Promise<void> {
       console.log(chalk.gray('  Droid permissions already configured in Claude Code'));
     }
   } else if (answers.platform === Platform.OpenCode) {
-    console.log(chalk.gray('  OpenCode has native skills support - no configuration needed'));
+    console.log(chalk.gray('  Skills installed to ~/.claude/skills/ (works with Claude Code, OpenCode, and Cursor)'));
   }
 
   console.log(chalk.gray('\nRun `droid skills` to browse and install skills.'));

package/src/lib/migrations.ts

@@ -5,8 +5,11 @@ import {
   renameSync,
   rmSync,
   readdirSync,
+  readFileSync,
+  writeFileSync,
 } from 'fs';
 import { join, dirname } from 'path';
+import { homedir } from 'os';
 import { loadConfig, saveConfig, getConfigDir } from './config';
 import {
   type Migration,
@@ -344,6 +347,150 @@ function createClaudeCodeCommandCleanupMigration(version: string): Migration {
   };
 }
 
+/**
+ * Migration: Remove opencode-skills plugin from opencode.json
+ *
+ * The opencode-skills plugin was required before OpenCode got native skills support.
+ * Now it causes errors because it looks for `skills/` (plural) while native OpenCode
+ * looks for `skill/` (singular). This migration removes the stale plugin entry.
+ */
+function createOpenCodePluginCleanupMigration(version: string): Migration {
+  return {
+    version,
+    description: 'Remove opencode-skills plugin from opencode.json',
+    up: () => {
+      const opencodeConfigPath = join(
+        homedir(),
+        '.config',
+        'opencode',
+        'opencode.json',
+      );
+
+      if (!existsSync(opencodeConfigPath)) {
+        return;
+      }
+
+      let config: { plugin?: string[]; [key: string]: unknown };
+      try {
+        config = JSON.parse(readFileSync(opencodeConfigPath, 'utf-8'));
+      } catch {
+        // Invalid JSON or read error - skip
+        return;
+      }
+
+      if (!Array.isArray(config.plugin)) {
+        return;
+      }
+
+      const pluginIndex = config.plugin.indexOf('opencode-skills');
+      if (pluginIndex === -1) {
+        return;
+      }
+
+      // Remove the plugin
+      config.plugin.splice(pluginIndex, 1);
+
+      // Clean up empty plugin array
+      if (config.plugin.length === 0) {
+        delete config.plugin;
+      }
+
+      try {
+        writeFileSync(
+          opencodeConfigPath,
+          JSON.stringify(config, null, 2) + '\n',
+          'utf-8',
+        );
+      } catch (error) {
+        // Non-fatal: Log warning but continue
+        console.warn(`Warning: Could not update opencode.json: ${error}`);
+      }
+    },
+  };
+}
+
+/**
+ * Migration: Copy OpenCode skills to unified ~/.claude/skills/ location
+ *
+ * All platforms now read skills from ~/.claude/skills/ (Agent Skills standard).
+ * This migration copies existing OpenCode skills to the unified location.
+ *
+ * Strategy:
+ * - Additive only: copies skills, never deletes from source
+ * - Skip if exists: if skill already in ~/.claude/skills/, don't overwrite
+ */
+function createUnifiedSkillsPathMigration(version: string): Migration {
+  return {
+    version,
+    description: 'Copy OpenCode skills to unified ~/.claude/skills/ location',
+    up: () => {
+      const oldOpenCodeSkillsPath = join(
+        homedir(),
+        '.config',
+        'opencode',
+        'skill',
+      );
+      const unifiedSkillsPath = join(homedir(), '.claude', 'skills');
+
+      // Skip if old OpenCode skills directory doesn't exist
+      if (!existsSync(oldOpenCodeSkillsPath)) {
+        return;
+      }
+
+      // Ensure unified skills directory exists
+      if (!existsSync(unifiedSkillsPath)) {
+        mkdirSync(unifiedSkillsPath, { recursive: true });
+      }
+
+      // Get all skill directories from old location
+      const skillDirs = readdirSync(oldOpenCodeSkillsPath, { withFileTypes: true })
+        .filter((dirent) => dirent.isDirectory())
+        .map((dirent) => dirent.name);
+
+      for (const skillName of skillDirs) {
+        const sourcePath = join(oldOpenCodeSkillsPath, skillName);
+        const destPath = join(unifiedSkillsPath, skillName);
+
+        // Skip if already exists in unified location (Claude version wins)
+        if (existsSync(destPath)) {
+          continue;
+        }
+
+        // Copy skill directory recursively
+        try {
+          copyDirRecursive(sourcePath, destPath);
+        } catch (error) {
+          // Non-fatal: Log warning but continue with other skills
+          console.warn(
+            `Warning: Could not copy skill ${skillName} to unified location: ${error}`,
+          );
+        }
+      }
+    },
+  };
+}
+
+/**
+ * Recursively copy a directory
+ */
+function copyDirRecursive(src: string, dest: string): void {
+  mkdirSync(dest, { recursive: true });
+
+  const entries = readdirSync(src, { withFileTypes: true });
+
+  for (const entry of entries) {
+    const srcPath = join(src, entry.name);
+    const destPath = join(dest, entry.name);
+
+    if (entry.isDirectory()) {
+      copyDirRecursive(srcPath, destPath);
+    } else {
+      const content = readFileSync(srcPath);
+      writeFileSync(destPath, content);
+    }
+  }
+}
+
 /**
  * Registry of package-level migrations
  * These run when the @orderful/droid npm package updates
@@ -357,6 +504,8 @@ const PACKAGE_MIGRATIONS: Migration[] = [
   createClaudeCodeCommandCleanupMigration('0.28.0'),
   // Retry: 0.28.0 migration had platform check that prevented running after platform switch
   createClaudeCodeCommandCleanupMigration('0.28.1'),
+  createOpenCodePluginCleanupMigration('0.29.2'),
+  createUnifiedSkillsPathMigration('0.30.0'),
 ];
 
 /**

package/src/lib/platforms.ts

@@ -2,19 +2,28 @@ import { join } from 'path';
 import { homedir } from 'os';
 import { Platform } from './types';
 
+/**
+ * Unified skills path - all platforms read from ~/.claude/skills/
+ * This is the Agent Skills standard location supported by Claude Code, OpenCode, and Cursor.
+ */
+const UNIFIED_SKILLS_PATH = join(homedir(), '.claude', 'skills');
+
 /**
  * Platform-specific paths configuration
  * Single source of truth for all platform-specific directories
+ *
+ * Note: Skills are unified to ~/.claude/skills/ (all platforms read this location).
+ * Commands and agents remain platform-specific as there's no cross-platform compatibility.
  */
 export const PLATFORM_PATHS = {
   [Platform.ClaudeCode]: {
-    skills: join(homedir(), '.claude', 'skills'),
+    skills: UNIFIED_SKILLS_PATH,
     commands: join(homedir(), '.claude', 'commands'),
     agents: join(homedir(), '.claude', 'agents'),
     config: join(homedir(), '.claude', 'CLAUDE.md'),
   },
   [Platform.OpenCode]: {
-    skills: join(homedir(), '.config', 'opencode', 'skill'),
+    skills: UNIFIED_SKILLS_PATH,
     commands: join(homedir(), '.config', 'opencode', 'command'),
     agents: join(homedir(), '.config', 'opencode', 'agent'),
     config: join(homedir(), '.config', 'opencode', 'AGENTS.md'),

package/src/lib/skills.test.ts

@@ -42,9 +42,10 @@ describe("getSkillsInstallPath", () => {
     expect(path).toBe(join(homedir(), ".claude", "skills"));
   });
 
-  it("should return OpenCode path", () => {
+  it("should return unified skills path for OpenCode", () => {
+    // OpenCode now uses the unified ~/.claude/skills/ path (Agent Skills standard)
     const path = getSkillsInstallPath(Platform.OpenCode);
-    expect(path).toBe(join(homedir(), ".config", "opencode", "skill"));
+    expect(path).toBe(join(homedir(), ".claude", "skills"));
   });
 });