Merge pull request #2894 from codivedev/fix/issue-2881

fix: detect and warn about opencode-skills conflict

src/plugin-handlers/command-config-handler.ts

@@ -17,6 +17,11 @@ import {
   loadOpencodeProjectSkills,
   skillsToCommandDefinitionRecord,
 } from "../features/opencode-skill-loader";
+import {
+  detectExternalSkillPlugin,
+  getSkillPluginConflictWarning,
+  log,
+} from "../shared";
 import type { PluginComponents } from "./plugin-components-loader";
 
 export async function applyCommandConfig(params: {
@@ -31,6 +36,12 @@ export async function applyCommandConfig(params: {
   const includeClaudeCommands = params.pluginConfig.claude_code?.commands ?? true;
   const includeClaudeSkills = params.pluginConfig.claude_code?.skills ?? true;
 
+  // Detect conflicting skill plugins
+  const externalSkillPlugin = detectExternalSkillPlugin(params.ctx.directory);
+  if (includeClaudeSkills && externalSkillPlugin.detected) {
+    log(getSkillPluginConflictWarning(externalSkillPlugin.pluginName!));
+  }
+
   const [
     configSourceSkills,
     userCommands,