@orderful/droid 0.27.5 → 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/`).

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @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

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,9 +642,101 @@ function createConfigSkillNameMigration(version2) {
     }
   };
 }
+function createOpenCodeSkillsPathMigration(version2) {
+  return {
+    version: version2,
+    description: "Move OpenCode skills from skills/ to skill/ directory",
+    up: () => {
+      const config = loadConfig();
+      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}`
+          );
+        }
+        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}`
+            );
+          }
+        }
+      }
+      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}`
+        );
+      }
+    }
+  };
+}
+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}`
+            );
+          }
+        }
+      }
+    }
+  };
+}
 var PACKAGE_MIGRATIONS = [
   createPlatformSyncMigration("0.25.0"),
-  createConfigSkillNameMigration("0.27.2")
+  createConfigSkillNameMigration("0.27.2"),
+  createOpenCodeSkillsPathMigration("0.28.0"),
+  createClaudeCodeCommandCleanupMigration("0.28.0")
 ];
 var TOOL_MIGRATIONS = {
   brain: [createConfigDirMigration("droid-brain", "0.2.3")],
@@ -1200,7 +1292,6 @@ function detectGitUsername() {
     return "";
   }
 }
-var OPENCODE_SKILLS_PLUGIN = "opencode-skills";
 function configurePlatformPermissions(platform) {
   const added = [];
   if (platform === "claude-code" /* ClaudeCode */) {
@@ -1242,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 };
 }
@@ -1371,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."));
 }

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/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,9 +615,101 @@ function createConfigSkillNameMigration(version) {
     }
   };
 }
+function createOpenCodeSkillsPathMigration(version) {
+  return {
+    version,
+    description: "Move OpenCode skills from skills/ to skill/ directory",
+    up: () => {
+      const config = loadConfig();
+      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}`
+          );
+        }
+        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}`
+            );
+          }
+        }
+      }
+      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}`
+        );
+      }
+    }
+  };
+}
+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}`
+            );
+          }
+        }
+      }
+    }
+  };
+}
 var PACKAGE_MIGRATIONS = [
   createPlatformSyncMigration("0.25.0"),
-  createConfigSkillNameMigration("0.27.2")
+  createConfigSkillNameMigration("0.27.2"),
+  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;AAmOjB;;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.5",
+  "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/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';
@@ -211,6 +211,144 @@ function createConfigSkillNameMigration(version: string): Migration {
   };
 }
 
+/**
+ * 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 createOpenCodeSkillsPathMigration(version: string): Migration {
+  return {
+    version,
+    description: 'Move OpenCode skills from skills/ to skill/ directory',
+    up: () => {
+      const config = loadConfig();
+
+      // Only run for OpenCode platform
+      if (config.platform !== Platform.OpenCode) {
+        return;
+      }
+
+      const oldSkillsPath = join(getSkillsPath(Platform.OpenCode), '..', 'skills');
+      const newSkillsPath = getSkillsPath(Platform.OpenCode);
+
+      // Check if old directory exists
+      if (!existsSync(oldSkillsPath)) {
+        return;
+      }
+
+      // 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;
+      }
+
+      // 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}`,
+            );
+          }
+        }
+      }
+
+      // 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}`,
+        );
+      }
+    },
+  };
+}
+
+/**
+ * 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();
+
+      // Only run for Claude Code platform
+      if (config.platform !== Platform.ClaudeCode) {
+        return;
+      }
+
+      const commandsPath = getCommandsPath(Platform.ClaudeCode);
+      if (!existsSync(commandsPath)) {
+        return;
+      }
+
+      // 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);
+          }
+        }
+      }
+
+      // 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}`,
+            );
+          }
+        }
+      }
+    },
+  };
+}
+
 /**
  * Registry of package-level migrations
  * These run when the @orderful/droid npm package updates
@@ -220,6 +358,8 @@ function createConfigSkillNameMigration(version: string): Migration {
 const PACKAGE_MIGRATIONS: Migration[] = [
   createPlatformSyncMigration('0.25.0'),
   createConfigSkillNameMigration('0.27.2'),
+  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"));
   });
 });