diff --git a/src/index.ts b/src/index.ts
index 0e2ad51..f02721c 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -50,7 +50,7 @@ import {
   setMainSession,
   getMainSessionID,
 } from "./features/claude-code-session-state";
-import { builtinTools, createCallOmoAgent, createBackgroundTools, createLookAt, interactive_bash, getTmuxPath } from "./tools";
+import { builtinTools, createCallOmoAgent, createBackgroundTools, createLookAt, createSkillTool, interactive_bash, getTmuxPath } from "./tools";
 import { BackgroundManager } from "./features/background-agent";
 import { createBuiltinMcps } from "./mcp";
 import { OhMyOpenCodeConfigSchema, type OhMyOpenCodeConfig, type HookName } from "./config";
@@ -322,6 +322,9 @@ const OhMyOpenCodePlugin: Plugin = async (ctx) => {
 
   const callOmoAgent = createCallOmoAgent(ctx, backgroundManager);
   const lookAt = createLookAt(ctx);
+  const skillTool = createSkillTool({
+    opencodeOnly: pluginConfig.claude_code?.skills === false,
+  });
 
   const googleAuthHooks = pluginConfig.google_auth !== false
     ? await createGoogleAntigravityAuthPlugin(ctx)
@@ -337,6 +340,7 @@ const OhMyOpenCodePlugin: Plugin = async (ctx) => {
       ...backgroundTools,
       call_omo_agent: callOmoAgent,
       look_at: lookAt,
+      skill: skillTool,
       ...(tmuxAvailable ? { interactive_bash } : {}),
     },
 
diff --git a/src/tools/index.ts b/src/tools/index.ts
index 283447b..9484473 100644
--- a/src/tools/index.ts
+++ b/src/tools/index.ts
@@ -29,6 +29,7 @@ import {
 } from "./session-manager"
 
 export { interactive_bash, startBackgroundCheck as startTmuxCheck } from "./interactive-bash"
+export { createSkillTool } from "./skill"
 export { getTmuxPath } from "./interactive-bash/utils"
 
 import {