@orderful/droid 0.27.4 → 0.28.0

package/AGENTS.md

@@ -2,6 +2,20 @@
 
 Project instructions for AI coding assistants.
 
+## ⚠️ CRITICAL: Git Workflow
+
+**NEVER PUSH DIRECTLY TO MAIN!**
+
+All changes MUST go through Pull Requests:
+
+1. Create a feature branch: `git checkout -b fix/description` or `feat/description`
+2. Make your changes and commit
+3. Push the branch: `git push origin <branch-name>`
+4. Create a PR using `gh pr create` or the GitHub UI
+5. Wait for CI checks and review before merging
+
+**No exceptions.** Even "small fixes" require PRs.
+
 ## Overview
 
 Droid is a TUI dashboard for managing AI tools. Each tool bundles related skills, commands, and agents. Installs to Claude Code (`~/.claude/`) and OpenCode (`~/.config/opencode/`).
@@ -71,6 +85,7 @@ Don't consolidate them. Using Ink for simple prompts would be overkill.
 ## Code Style
 
 - TypeScript strict mode
+- **Use single quotes** for strings (enforced by ESLint)
 - Prefer `const` over `let`
 - Use Canadian/British spelling (behaviour, colour, favourite)
 - Use "allow list/deny list" not "whitelist/blacklist"

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @orderful/droid
 
+## 0.28.0
+
+### Minor Changes
+
+- [#160](https://github.com/Orderful/droid/pull/160) [`235c520`](https://github.com/Orderful/droid/commit/235c520de056f286fd2af04d6ec2606c51c7bbb2) Thanks [@frytyler](https://github.com/frytyler)! - Support OpenCode's native skills implementation
+
+  OpenCode now has native skills support and no longer requires the deprecated opencode-skills plugin. This update removes the plugin requirement and updates paths to match OpenCode's native directory structure.
+
+  **Breaking changes for OpenCode users:**
+  - Skills directory changed from `~/.config/opencode/skills/` to `~/.config/opencode/skill/` (singular)
+  - Automatic migration moves existing skills to the new location
+
+  **Changes:**
+  - Remove opencode-skills plugin requirement from setup
+  - Update OpenCode skills path to use singular `skill/` directory
+  - Add migration to move existing skills from old to new directory
+  - Update setup messaging to reflect native skills support
+  - Fix test expectations for new OpenCode paths
+
+### Patch Changes
+
+- [#159](https://github.com/Orderful/droid/pull/159) [`4275602`](https://github.com/Orderful/droid/commit/4275602e1c05f6205e6442a2a6c121a508116bd8) Thanks [@frytyler](https://github.com/frytyler)! - Add migration to remove non-alias commands from Claude Code
+
+  Claude Code v2.1.3+ can invoke skills directly via /{skillName}, making non-alias commands redundant. This migration removes old non-alias commands from ~/.claude/commands/ while preserving aliases (e.g., /scratchpad for /brain).
+  - New package migration (v0.27.3): `createClaudeCodeCommandCleanupMigration`
+  - Only affects Claude Code platform
+  - Keeps alias commands, removes primary commands that are now redundant
+
+## 0.27.5
+
+### Patch Changes
+
+- [`dd0e5f1`](https://github.com/Orderful/droid/commit/dd0e5f114f11ab2ff34c6e329265ea84117792e9) Thanks [@frytyler](https://github.com/frytyler)! - Fix TUI displaying commands as `/[object Object]` instead of actual command names. Commands are now displayed correctly (e.g., `/brain, /scratchpad`) after handling both string and object formats in TOOL.yaml.
+
 ## 0.27.4
 
 ### Patch Changes

package/dist/bin/droid.js

@@ -208,7 +208,7 @@ var PLATFORM_PATHS = {
     config: join2(homedir2(), ".claude", "CLAUDE.md")
   },
   ["opencode" /* OpenCode */]: {
-    skills: join2(homedir2(), ".config", "opencode", "skills"),
+    skills: join2(homedir2(), ".config", "opencode", "skill"),
     commands: join2(homedir2(), ".config", "opencode", "command"),
     agents: join2(homedir2(), ".config", "opencode", "agent"),
     config: join2(homedir2(), ".config", "opencode", "AGENTS.md")
@@ -642,52 +642,92 @@ function createConfigSkillNameMigration(version2) {
     }
   };
 }
-function createFilesystemSyncMigration(version2) {
+function createOpenCodeSkillsPathMigration(version2) {
   return {
     version: version2,
-    description: "Sync config with actually installed skills on filesystem",
+    description: "Move OpenCode skills from skills/ to skill/ directory",
     up: () => {
       const config = loadConfig();
-      const originalPlatform = config.platform;
-      let configChanged = false;
-      for (const platformKey of ["claude-code" /* ClaudeCode */, "opencode" /* OpenCode */]) {
-        if (!config.platforms[platformKey]) continue;
-        const skillsPath = getSkillsPath(platformKey);
-        if (!existsSync4(skillsPath)) continue;
-        config.platform = platformKey;
-        const trackedTools = getPlatformTools(config);
-        let platformChanged = false;
-        const bundledTools = getBundledTools();
-        const allToolNames = new Set(
-          bundledTools.flatMap(
-            (tool) => tool.includes.skills.map((s) => s.name)
-          )
-        );
-        const installedDirs = readdirSync3(skillsPath, { withFileTypes: true }).filter((dirent) => dirent.isDirectory()).map((dirent) => dirent.name);
-        for (const dirName of installedDirs) {
-          if (!allToolNames.has(dirName)) continue;
-          if (trackedTools[dirName]) continue;
-          let version3 = "0.0.0";
-          const matchingTool = bundledTools.find(
-            (tool) => tool.includes.skills.some((s) => s.name === dirName && s.required)
+      if (config.platform !== "opencode" /* OpenCode */) {
+        return;
+      }
+      const oldSkillsPath = join6(getSkillsPath("opencode" /* OpenCode */), "..", "skills");
+      const newSkillsPath = getSkillsPath("opencode" /* OpenCode */);
+      if (!existsSync4(oldSkillsPath)) {
+        return;
+      }
+      if (!existsSync4(newSkillsPath)) {
+        try {
+          renameSync(oldSkillsPath, newSkillsPath);
+        } catch (error) {
+          console.warn(
+            `Warning: Could not rename skills directory ${oldSkillsPath}: ${error}`
           );
-          if (matchingTool) {
-            version3 = matchingTool.version;
+        }
+        return;
+      }
+      const skillDirs = readdirSync3(oldSkillsPath, { withFileTypes: true }).filter((dirent) => dirent.isDirectory()).map((dirent) => dirent.name);
+      for (const skillName of skillDirs) {
+        const oldSkillDir = join6(oldSkillsPath, skillName);
+        const newSkillDir = join6(newSkillsPath, skillName);
+        if (!existsSync4(newSkillDir)) {
+          try {
+            renameSync(oldSkillDir, newSkillDir);
+          } catch (error) {
+            console.warn(
+              `Warning: Could not move skill ${skillName}: ${error}`
+            );
           }
-          trackedTools[dirName] = {
-            version: version3,
-            installed_at: (/* @__PURE__ */ new Date()).toISOString()
-          };
-          platformChanged = true;
-          configChanged = true;
         }
-        if (platformChanged) {
-          setPlatformTools(config, trackedTools);
+      }
+      try {
+        const remaining = readdirSync3(oldSkillsPath);
+        if (remaining.length === 0) {
+          rmSync(oldSkillsPath, { recursive: true });
         }
+      } catch (error) {
+        console.warn(
+          `Warning: Could not remove old skills directory ${oldSkillsPath}: ${error}`
+        );
       }
-      config.platform = originalPlatform;
-      if (configChanged) {
-        saveConfig(config);
+    }
+  };
+}
+function createClaudeCodeCommandCleanupMigration(version2) {
+  return {
+    version: version2,
+    description: "Remove non-alias commands from Claude Code",
+    up: () => {
+      const config = loadConfig();
+      if (config.platform !== "claude-code" /* ClaudeCode */) {
+        return;
+      }
+      const commandsPath = getCommandsPath("claude-code" /* ClaudeCode */);
+      if (!existsSync4(commandsPath)) {
+        return;
+      }
+      const bundledTools = getBundledTools();
+      const aliasCommands = /* @__PURE__ */ new Set();
+      for (const tool of bundledTools) {
+        for (const cmd of tool.includes.commands) {
+          if (typeof cmd === "object" && cmd.is_alias) {
+            aliasCommands.add(cmd.name);
+          }
+        }
+      }
+      const commandFiles = readdirSync3(commandsPath, { withFileTypes: true }).filter((dirent) => dirent.isFile() && dirent.name.endsWith(".md")).map((dirent) => dirent.name);
+      for (const file of commandFiles) {
+        const commandName = file.replace(".md", "");
+        if (!aliasCommands.has(commandName)) {
+          const commandFilePath = join6(commandsPath, file);
+          try {
+            rmSync(commandFilePath);
+          } catch (error) {
+            console.warn(
+              `Warning: Could not remove command ${commandFilePath}: ${error}`
+            );
+          }
+        }
       }
     }
   };
@@ -695,7 +735,8 @@ function createFilesystemSyncMigration(version2) {
 var PACKAGE_MIGRATIONS = [
   createPlatformSyncMigration("0.25.0"),
   createConfigSkillNameMigration("0.27.2"),
-  createFilesystemSyncMigration("0.27.4")
+  createOpenCodeSkillsPathMigration("0.28.0"),
+  createClaudeCodeCommandCleanupMigration("0.28.0")
 ];
 var TOOL_MIGRATIONS = {
   brain: [createConfigDirMigration("droid-brain", "0.2.3")],
@@ -1251,7 +1292,6 @@ function detectGitUsername() {
     return "";
   }
 }
-var OPENCODE_SKILLS_PLUGIN = "opencode-skills";
 function configurePlatformPermissions(platform) {
   const added = [];
   if (platform === "claude-code" /* ClaudeCode */) {
@@ -1293,35 +1333,10 @@ function configurePlatformPermissions(platform) {
   }
   if (platform === "opencode" /* OpenCode */) {
     const globalConfigDir = join8(homedir3(), ".config", "opencode");
-    const globalConfigPath = join8(globalConfigDir, "opencode.json");
     if (!existsSync6(globalConfigDir)) {
       mkdirSync5(globalConfigDir, { recursive: true });
     }
-    let config = {};
-    if (existsSync6(globalConfigPath)) {
-      try {
-        config = JSON.parse(readFileSync6(globalConfigPath, "utf-8"));
-      } catch {
-        console.warn(chalk2.yellow("\u26A0 OpenCode config appears corrupted, resetting"));
-        config = {};
-      }
-    }
-    if (!Array.isArray(config.plugin)) {
-      config.plugin = [];
-    }
-    if (!config.plugin.includes(OPENCODE_SKILLS_PLUGIN)) {
-      config.plugin.push(OPENCODE_SKILLS_PLUGIN);
-      added.push(OPENCODE_SKILLS_PLUGIN);
-    }
-    if (added.length > 0) {
-      try {
-        writeFileSync4(globalConfigPath, JSON.stringify(config, null, 2) + "\n", "utf-8");
-      } catch (e) {
-        const message = e instanceof Error ? e.message : "Unknown error";
-        return { added: [], alreadyPresent: false, error: `Failed to update OpenCode config: ${message}` };
-      }
-    }
-    return { added, alreadyPresent: added.length === 0 };
+    return { added: [], alreadyPresent: true };
   }
   return { added: [], alreadyPresent: true };
 }
@@ -1422,13 +1437,7 @@ async function setupCommand() {
       console.log(chalk2.gray("  Droid permissions already configured in Claude Code"));
     }
   } else if (answers.platform === "opencode" /* OpenCode */) {
-    if (added.length > 0) {
-      console.log(chalk2.green("\u2713 Added opencode-skills plugin to OpenCode config"));
-      console.log(chalk2.gray("  This enables Claude Code-style skills in OpenCode"));
-      console.log(chalk2.gray("  Restart OpenCode to activate the plugin"));
-    } else if (alreadyPresent) {
-      console.log(chalk2.gray("  opencode-skills plugin already configured in OpenCode"));
-    }
+    console.log(chalk2.gray("  OpenCode has native skills support - no configuration needed"));
   }
   console.log(chalk2.gray("\nRun `droid skills` to browse and install skills."));
 }
@@ -1974,7 +1983,13 @@ function ToolDetails({
   const isSystemTool = tool.system === true;
   const actions = installed ? [
     { id: "explore", label: "Explore", variant: "default" },
-    ...updateStatus.hasUpdate ? [{ id: "update", label: `Update (${updateStatus.bundledVersion})`, variant: "primary" }] : [],
+    ...updateStatus.hasUpdate ? [
+      {
+        id: "update",
+        label: `Update (${updateStatus.bundledVersion})`,
+        variant: "primary"
+      }
+    ] : [],
     { id: "configure", label: "Configure", variant: "default" },
     // System tools can't be uninstalled
     ...!isSystemTool ? [{ id: "uninstall", label: "Uninstall", variant: "danger" }] : []
@@ -1990,7 +2005,8 @@ function ToolDetails({
       tool.status && ` \xB7 ${tool.status}`,
       installed && /* @__PURE__ */ jsx4(Text4, { color: colors.success, children: " \xB7 installed" }),
       updateStatus.hasUpdate && /* @__PURE__ */ jsxs4(Text4, { color: colors.primary, children: [
-        " \xB7 update (",
+        " ",
+        "\xB7 update (",
         installedVersion,
         " \u2192 ",
         updateStatus.bundledVersion,
@@ -2008,7 +2024,7 @@ function ToolDetails({
         ] }),
         tool.includes.commands.length > 0 && /* @__PURE__ */ jsxs4(Text4, { children: [
           /* @__PURE__ */ jsx4(Text4, { color: colors.command, children: "Commands: " }),
-          /* @__PURE__ */ jsx4(Text4, { color: colors.textMuted, children: tool.includes.commands.map((c) => `/${c}`).join(", ") })
+          /* @__PURE__ */ jsx4(Text4, { color: colors.textMuted, children: tool.includes.commands.map((c) => typeof c === "string" ? `/${c}` : `/${c.name}`).join(", ") })
         ] }),
         tool.includes.agents.length > 0 && /* @__PURE__ */ jsxs4(Text4, { children: [
           /* @__PURE__ */ jsx4(Text4, { color: colors.agent, children: "Agents: " }),

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;AAoDhG;;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,CAmG7H;AAyBD,wBAAsB,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CA8GlD"}
+{"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"}

package/dist/commands/tui/components/ToolDetails.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ToolDetails.d.ts","sourceRoot":"","sources":["../../../../src/commands/tui/components/ToolDetails.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIvD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,YAAY,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,wBAAgB,WAAW,CAAC,EAC1B,IAAI,EACJ,SAAS,EACT,cAAc,GACf,EAAE,gBAAgB,2CAoGlB"}
+{"version":3,"file":"ToolDetails.d.ts","sourceRoot":"","sources":["../../../../src/commands/tui/components/ToolDetails.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIvD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,YAAY,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,wBAAgB,WAAW,CAAC,EAC1B,IAAI,EACJ,SAAS,EACT,cAAc,GACf,EAAE,gBAAgB,2CA2HlB"}

package/dist/index.js

@@ -216,7 +216,7 @@ var PLATFORM_PATHS = {
     config: join2(homedir2(), ".claude", "CLAUDE.md")
   },
   ["opencode" /* OpenCode */]: {
-    skills: join2(homedir2(), ".config", "opencode", "skills"),
+    skills: join2(homedir2(), ".config", "opencode", "skill"),
     commands: join2(homedir2(), ".config", "opencode", "command"),
     agents: join2(homedir2(), ".config", "opencode", "agent"),
     config: join2(homedir2(), ".config", "opencode", "AGENTS.md")
@@ -615,52 +615,92 @@ function createConfigSkillNameMigration(version) {
     }
   };
 }
-function createFilesystemSyncMigration(version) {
+function createOpenCodeSkillsPathMigration(version) {
   return {
     version,
-    description: "Sync config with actually installed skills on filesystem",
+    description: "Move OpenCode skills from skills/ to skill/ directory",
     up: () => {
       const config = loadConfig();
-      const originalPlatform = config.platform;
-      let configChanged = false;
-      for (const platformKey of ["claude-code" /* ClaudeCode */, "opencode" /* OpenCode */]) {
-        if (!config.platforms[platformKey]) continue;
-        const skillsPath = getSkillsPath(platformKey);
-        if (!existsSync4(skillsPath)) continue;
-        config.platform = platformKey;
-        const trackedTools = getPlatformTools(config);
-        let platformChanged = false;
-        const bundledTools = getBundledTools();
-        const allToolNames = new Set(
-          bundledTools.flatMap(
-            (tool) => tool.includes.skills.map((s) => s.name)
-          )
-        );
-        const installedDirs = readdirSync3(skillsPath, { withFileTypes: true }).filter((dirent) => dirent.isDirectory()).map((dirent) => dirent.name);
-        for (const dirName of installedDirs) {
-          if (!allToolNames.has(dirName)) continue;
-          if (trackedTools[dirName]) continue;
-          let version2 = "0.0.0";
-          const matchingTool = bundledTools.find(
-            (tool) => tool.includes.skills.some((s) => s.name === dirName && s.required)
+      if (config.platform !== "opencode" /* OpenCode */) {
+        return;
+      }
+      const oldSkillsPath = join6(getSkillsPath("opencode" /* OpenCode */), "..", "skills");
+      const newSkillsPath = getSkillsPath("opencode" /* OpenCode */);
+      if (!existsSync4(oldSkillsPath)) {
+        return;
+      }
+      if (!existsSync4(newSkillsPath)) {
+        try {
+          renameSync(oldSkillsPath, newSkillsPath);
+        } catch (error) {
+          console.warn(
+            `Warning: Could not rename skills directory ${oldSkillsPath}: ${error}`
           );
-          if (matchingTool) {
-            version2 = matchingTool.version;
+        }
+        return;
+      }
+      const skillDirs = readdirSync3(oldSkillsPath, { withFileTypes: true }).filter((dirent) => dirent.isDirectory()).map((dirent) => dirent.name);
+      for (const skillName of skillDirs) {
+        const oldSkillDir = join6(oldSkillsPath, skillName);
+        const newSkillDir = join6(newSkillsPath, skillName);
+        if (!existsSync4(newSkillDir)) {
+          try {
+            renameSync(oldSkillDir, newSkillDir);
+          } catch (error) {
+            console.warn(
+              `Warning: Could not move skill ${skillName}: ${error}`
+            );
           }
-          trackedTools[dirName] = {
-            version: version2,
-            installed_at: (/* @__PURE__ */ new Date()).toISOString()
-          };
-          platformChanged = true;
-          configChanged = true;
         }
-        if (platformChanged) {
-          setPlatformTools(config, trackedTools);
+      }
+      try {
+        const remaining = readdirSync3(oldSkillsPath);
+        if (remaining.length === 0) {
+          rmSync(oldSkillsPath, { recursive: true });
         }
+      } catch (error) {
+        console.warn(
+          `Warning: Could not remove old skills directory ${oldSkillsPath}: ${error}`
+        );
       }
-      config.platform = originalPlatform;
-      if (configChanged) {
-        saveConfig(config);
+    }
+  };
+}
+function createClaudeCodeCommandCleanupMigration(version) {
+  return {
+    version,
+    description: "Remove non-alias commands from Claude Code",
+    up: () => {
+      const config = loadConfig();
+      if (config.platform !== "claude-code" /* ClaudeCode */) {
+        return;
+      }
+      const commandsPath = getCommandsPath("claude-code" /* ClaudeCode */);
+      if (!existsSync4(commandsPath)) {
+        return;
+      }
+      const bundledTools = getBundledTools();
+      const aliasCommands = /* @__PURE__ */ new Set();
+      for (const tool of bundledTools) {
+        for (const cmd of tool.includes.commands) {
+          if (typeof cmd === "object" && cmd.is_alias) {
+            aliasCommands.add(cmd.name);
+          }
+        }
+      }
+      const commandFiles = readdirSync3(commandsPath, { withFileTypes: true }).filter((dirent) => dirent.isFile() && dirent.name.endsWith(".md")).map((dirent) => dirent.name);
+      for (const file of commandFiles) {
+        const commandName = file.replace(".md", "");
+        if (!aliasCommands.has(commandName)) {
+          const commandFilePath = join6(commandsPath, file);
+          try {
+            rmSync(commandFilePath);
+          } catch (error) {
+            console.warn(
+              `Warning: Could not remove command ${commandFilePath}: ${error}`
+            );
+          }
+        }
       }
     }
   };
@@ -668,7 +708,8 @@ function createFilesystemSyncMigration(version) {
 var PACKAGE_MIGRATIONS = [
   createPlatformSyncMigration("0.25.0"),
   createConfigSkillNameMigration("0.27.2"),
-  createFilesystemSyncMigration("0.27.4")
+  createOpenCodeSkillsPathMigration("0.28.0"),
+  createClaudeCodeCommandCleanupMigration("0.28.0")
 ];
 var TOOL_MIGRATIONS = {
   brain: [createConfigDirMigration("droid-brain", "0.2.3")],

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;AA8SjB;;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":"AAUA,OAAO,EACL,KAAK,SAAS,EAIf,MAAM,SAAS,CAAC;AA+WjB;;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/package.json

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

package/src/commands/setup.ts

@@ -51,13 +51,6 @@ function detectGitUsername(): string {
   }
 }
 
-/**
- * The opencode-skills plugin name for OpenCode
- * This plugin enables Claude Code-style skills in OpenCode
- * @see https://github.com/malhashemi/opencode-skills
- */
-const OPENCODE_SKILLS_PLUGIN = 'opencode-skills';
-
 /**
  * Configure platform permissions for droid
  */
@@ -114,49 +107,14 @@ export function configurePlatformPermissions(platform: Platform): { added: strin
   }
 
   if (platform === Platform.OpenCode) {
-    // OpenCode uses opencode.json for config
-    // Check global config location: ~/.config/opencode/opencode.json
+    // OpenCode now has native skills support - no configuration needed
+    // Ensure config directory exists for when skills are installed
     const globalConfigDir = join(homedir(), '.config', 'opencode');
-    const globalConfigPath = join(globalConfigDir, 'opencode.json');
-
-    // Ensure config directory exists
     if (!existsSync(globalConfigDir)) {
       mkdirSync(globalConfigDir, { recursive: true });
     }
 
-    // Load or create config
-    let config: { plugin?: string[] } = {};
-    if (existsSync(globalConfigPath)) {
-      try {
-        config = JSON.parse(readFileSync(globalConfigPath, 'utf-8'));
-      } catch {
-        console.warn(chalk.yellow('⚠ OpenCode config appears corrupted, resetting'));
-        config = {};
-      }
-    }
-
-    // Ensure plugin array exists
-    if (!Array.isArray(config.plugin)) {
-      config.plugin = [];
-    }
-
-    // Add opencode-skills plugin if not present
-    if (!config.plugin.includes(OPENCODE_SKILLS_PLUGIN)) {
-      config.plugin.push(OPENCODE_SKILLS_PLUGIN);
-      added.push(OPENCODE_SKILLS_PLUGIN);
-    }
-
-    // Save if we added anything
-    if (added.length > 0) {
-      try {
-        writeFileSync(globalConfigPath, JSON.stringify(config, null, 2) + '\n', 'utf-8');
-      } catch (e) {
-        const message = e instanceof Error ? e.message : 'Unknown error';
-        return { added: [], alreadyPresent: false, error: `Failed to update OpenCode config: ${message}` };
-      }
-    }
-
-    return { added, alreadyPresent: added.length === 0 };
+    return { added: [], alreadyPresent: true };
   }
 
   return { added: [], alreadyPresent: true };
@@ -285,13 +243,7 @@ export async function setupCommand(): Promise<void> {
       console.log(chalk.gray('  Droid permissions already configured in Claude Code'));
     }
   } else if (answers.platform === Platform.OpenCode) {
-    if (added.length > 0) {
-      console.log(chalk.green('✓ Added opencode-skills plugin to OpenCode config'));
-      console.log(chalk.gray('  This enables Claude Code-style skills in OpenCode'));
-      console.log(chalk.gray('  Restart OpenCode to activate the plugin'));
-    } else if (alreadyPresent) {
-      console.log(chalk.gray('  opencode-skills plugin already configured in OpenCode'));
-    }
+    console.log(chalk.gray('  OpenCode has native skills support - no configuration needed'));
   }
 
   console.log(chalk.gray('\nRun `droid skills` to browse and install skills.'));

package/src/commands/tui/components/ToolDetails.tsx

@@ -1,5 +1,9 @@
 import { Box, Text } from 'ink';
-import { isToolInstalled, getInstalledToolVersion, getToolUpdateStatus } from '../../../lib/tools';
+import {
+  isToolInstalled,
+  getInstalledToolVersion,
+  getToolUpdateStatus,
+} from '../../../lib/tools';
 import type { ToolManifest } from '../../../lib/types';
 import { colors } from '../constants';
 import { ComponentBadges } from './Badge';
@@ -26,17 +30,26 @@ export function ToolDetails({
   const installed = isToolInstalled(tool.name);
   const installedVersion = getInstalledToolVersion(tool.name);
   const updateStatus = getToolUpdateStatus(tool.name);
-  const isSystemTool = (tool as ToolManifest & { system?: boolean }).system === true;
+  const isSystemTool =
+    (tool as ToolManifest & { system?: boolean }).system === true;
 
   const actions = installed
     ? [
         { id: 'explore', label: 'Explore', variant: 'default' },
         ...(updateStatus.hasUpdate
-          ? [{ id: 'update', label: `Update (${updateStatus.bundledVersion})`, variant: 'primary' }]
+          ? [
+              {
+                id: 'update',
+                label: `Update (${updateStatus.bundledVersion})`,
+                variant: 'primary',
+              },
+            ]
           : []),
         { id: 'configure', label: 'Configure', variant: 'default' },
         // System tools can't be uninstalled
-        ...(!isSystemTool ? [{ id: 'uninstall', label: 'Uninstall', variant: 'danger' }] : []),
+        ...(!isSystemTool
+          ? [{ id: 'uninstall', label: 'Uninstall', variant: 'danger' }]
+          : []),
       ]
     : [
         { id: 'explore', label: 'Explore', variant: 'default' },
@@ -46,7 +59,9 @@ export function ToolDetails({
 
   return (
     <Box flexDirection="column" paddingLeft={2} flexGrow={1}>
-      <Text color={colors.text} bold>{tool.name}</Text>
+      <Text color={colors.text} bold>
+        {tool.name}
+      </Text>
 
       <Box marginTop={1}>
         <Text color={colors.textDim}>
@@ -54,7 +69,10 @@ export function ToolDetails({
           {tool.status && ` · ${tool.status}`}
           {installed && <Text color={colors.success}> · installed</Text>}
           {updateStatus.hasUpdate && (
-            <Text color={colors.primary}> · update ({installedVersion} → {updateStatus.bundledVersion})</Text>
+            <Text color={colors.primary}>
+              {' '}
+              · update ({installedVersion} → {updateStatus.bundledVersion})
+            </Text>
           )}
         </Text>
       </Box>
@@ -74,19 +92,27 @@ export function ToolDetails({
           {tool.includes.skills.length > 0 && (
             <Text>
               <Text color={colors.skill}>Skills: </Text>
-              <Text color={colors.textMuted}>{tool.includes.skills.map(s => s.name).join(', ')}</Text>
+              <Text color={colors.textMuted}>
+                {tool.includes.skills.map((s) => s.name).join(', ')}
+              </Text>
             </Text>
           )}
           {tool.includes.commands.length > 0 && (
             <Text>
               <Text color={colors.command}>Commands: </Text>
-              <Text color={colors.textMuted}>{tool.includes.commands.map(c => `/${c}`).join(', ')}</Text>
+              <Text color={colors.textMuted}>
+                {tool.includes.commands
+                  .map((c) => (typeof c === 'string' ? `/${c}` : `/${c.name}`))
+                  .join(', ')}
+              </Text>
             </Text>
           )}
           {tool.includes.agents.length > 0 && (
             <Text>
               <Text color={colors.agent}>Agents: </Text>
-              <Text color={colors.textMuted}>{tool.includes.agents.join(', ')}</Text>
+              <Text color={colors.textMuted}>
+                {tool.includes.agents.join(', ')}
+              </Text>
             </Text>
           )}
         </Box>
@@ -107,7 +133,8 @@ export function ToolDetails({
               color={selectedAction === index ? '#ffffff' : colors.textMuted}
               bold={selectedAction === index}
             >
-              {' '}{action.label}{' '}
+              {' '}
+              {action.label}{' '}
             </Text>
           ))}
         </Box>

package/src/lib/migrations.ts

@@ -15,7 +15,7 @@ import {
   setPlatformTools,
 } from './types';
 import { compareSemver } from './version';
-import { getSkillsPath } from './platforms';
+import { getSkillsPath, getCommandsPath } from './platforms';
 import { getBundledTools } from './tools';
 
 const MIGRATIONS_LOG_FILE = '.migrations.log';
@@ -212,74 +212,138 @@ function createConfigSkillNameMigration(version: string): Migration {
 }
 
 /**
- * Sync config with filesystem - add any installed skills that aren't tracked
- * This is a one-time cleanup migration to fix config inconsistencies from v0.27.x
+ * Migration: Move OpenCode skills to native skill directory
+ *
+ * OpenCode now has native skills support and looks for skills in ~/.config/opencode/skill/
+ * (singular) instead of the old ~/.config/opencode/skills/ (plural). This migration
+ * moves existing skills to the correct location.
  */
-function createFilesystemSyncMigration(version: string): Migration {
+function createOpenCodeSkillsPathMigration(version: string): Migration {
   return {
     version,
-    description: 'Sync config with actually installed skills on filesystem',
+    description: 'Move OpenCode skills from skills/ to skill/ directory',
     up: () => {
       const config = loadConfig();
-      const originalPlatform = config.platform;
-      let configChanged = false;
 
-      // Check both platforms
-      for (const platformKey of [Platform.ClaudeCode, Platform.OpenCode]) {
-        if (!config.platforms[platformKey]) continue;
+      // Only run for OpenCode platform
+      if (config.platform !== Platform.OpenCode) {
+        return;
+      }
 
-        const skillsPath = getSkillsPath(platformKey);
-        if (!existsSync(skillsPath)) continue;
+      const oldSkillsPath = join(getSkillsPath(Platform.OpenCode), '..', 'skills');
+      const newSkillsPath = getSkillsPath(Platform.OpenCode);
 
-        config.platform = platformKey;
-        const trackedTools = getPlatformTools(config);
-        let platformChanged = false;
+      // Check if old directory exists
+      if (!existsSync(oldSkillsPath)) {
+        return;
+      }
 
-        // Get all tool names from manifests
-        const bundledTools = getBundledTools();
-        const allToolNames = new Set(
-          bundledTools.flatMap((tool) =>
-            tool.includes.skills.map((s) => s.name),
-          ),
-        );
+      // If new directory doesn't exist, just rename the old one
+      if (!existsSync(newSkillsPath)) {
+        try {
+          renameSync(oldSkillsPath, newSkillsPath);
+        } catch (error) {
+          console.warn(
+            `Warning: Could not rename skills directory ${oldSkillsPath}: ${error}`,
+          );
+        }
+        return;
+      }
 
-        // Scan filesystem for installed skills
-        const installedDirs = readdirSync(skillsPath, { withFileTypes: true })
-          .filter((dirent) => dirent.isDirectory())
-          .map((dirent) => dirent.name);
+      // Both exist - move skills from old to new
+      const skillDirs = readdirSync(oldSkillsPath, { withFileTypes: true })
+        .filter((dirent) => dirent.isDirectory())
+        .map((dirent) => dirent.name);
+
+      for (const skillName of skillDirs) {
+        const oldSkillDir = join(oldSkillsPath, skillName);
+        const newSkillDir = join(newSkillsPath, skillName);
+
+        // Only move if destination doesn't exist
+        if (!existsSync(newSkillDir)) {
+          try {
+            renameSync(oldSkillDir, newSkillDir);
+          } catch (error) {
+            console.warn(
+              `Warning: Could not move skill ${skillName}: ${error}`,
+            );
+          }
+        }
+      }
 
-        for (const dirName of installedDirs) {
-          // Skip if not a known tool skill
-          if (!allToolNames.has(dirName)) continue;
+      // Remove old directory if empty
+      try {
+        const remaining = readdirSync(oldSkillsPath);
+        if (remaining.length === 0) {
+          rmSync(oldSkillsPath, { recursive: true });
+        }
+      } catch (error) {
+        // Non-fatal: Log warning but continue
+        console.warn(
+          `Warning: Could not remove old skills directory ${oldSkillsPath}: ${error}`,
+        );
+      }
+    },
+  };
+}
 
-          // Skip if already tracked
-          if (trackedTools[dirName]) continue;
+/**
+ * Migration: Remove non-alias commands from Claude Code
+ *
+ * Claude Code v2.1.3+ can invoke skills directly via /{skillName}, so non-alias
+ * commands are redundant. This migration removes them from ~/.claude/commands/
+ * while keeping aliases (e.g., /scratchpad for /brain).
+ */
+function createClaudeCodeCommandCleanupMigration(version: string): Migration {
+  return {
+    version,
+    description: 'Remove non-alias commands from Claude Code',
+    up: () => {
+      const config = loadConfig();
 
-          // Try to get version from bundled tool
-          let version = '0.0.0';
-          const matchingTool = bundledTools.find((tool) =>
-            tool.includes.skills.some((s) => s.name === dirName && s.required),
-          );
-          if (matchingTool) {
-            version = matchingTool.version;
-          }
+      // Only run for Claude Code platform
+      if (config.platform !== Platform.ClaudeCode) {
+        return;
+      }
 
-          trackedTools[dirName] = {
-            version,
-            installed_at: new Date().toISOString(),
-          };
-          platformChanged = true;
-          configChanged = true;
-        }
+      const commandsPath = getCommandsPath(Platform.ClaudeCode);
+      if (!existsSync(commandsPath)) {
+        return;
+      }
 
-        if (platformChanged) {
-          setPlatformTools(config, trackedTools);
+      // Get all bundled tools to check which commands are aliases
+      const bundledTools = getBundledTools();
+      const aliasCommands = new Set<string>();
+
+      // Collect all alias command names across all tools
+      for (const tool of bundledTools) {
+        for (const cmd of tool.includes.commands) {
+          if (typeof cmd === 'object' && cmd.is_alias) {
+            aliasCommands.add(cmd.name);
+          }
         }
       }
 
-      config.platform = originalPlatform;
-      if (configChanged) {
-        saveConfig(config);
+      // Check each command file and remove non-aliases
+      const commandFiles = readdirSync(commandsPath, { withFileTypes: true })
+        .filter((dirent) => dirent.isFile() && dirent.name.endsWith('.md'))
+        .map((dirent) => dirent.name);
+
+      for (const file of commandFiles) {
+        const commandName = file.replace('.md', '');
+
+        // Keep aliases, remove everything else
+        if (!aliasCommands.has(commandName)) {
+          const commandFilePath = join(commandsPath, file);
+          try {
+            rmSync(commandFilePath);
+          } catch (error) {
+            // Non-fatal: Log warning but continue
+            console.warn(
+              `Warning: Could not remove command ${commandFilePath}: ${error}`,
+            );
+          }
+        }
       }
     },
   };
@@ -294,7 +358,8 @@ function createFilesystemSyncMigration(version: string): Migration {
 const PACKAGE_MIGRATIONS: Migration[] = [
   createPlatformSyncMigration('0.25.0'),
   createConfigSkillNameMigration('0.27.2'),
-  createFilesystemSyncMigration('0.27.4'),
+  createOpenCodeSkillsPathMigration('0.28.0'),
+  createClaudeCodeCommandCleanupMigration('0.28.0'),
 ];
 
 /**

package/src/lib/platforms.ts

@@ -14,7 +14,7 @@ export const PLATFORM_PATHS = {
     config: join(homedir(), '.claude', 'CLAUDE.md'),
   },
   [Platform.OpenCode]: {
-    skills: join(homedir(), '.config', 'opencode', 'skills'),
+    skills: join(homedir(), '.config', 'opencode', 'skill'),
     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

@@ -44,7 +44,7 @@ describe("getSkillsInstallPath", () => {
 
   it("should return OpenCode path", () => {
     const path = getSkillsInstallPath(Platform.OpenCode);
-    expect(path).toBe(join(homedir(), ".config", "opencode", "skills"));
+    expect(path).toBe(join(homedir(), ".config", "opencode", "skill"));
   });
 });