diff --git a/src/shared/opencode-command-dirs.test.ts b/src/shared/opencode-command-dirs.test.ts
index 02ffb871f..4b2ac48f0 100644
--- a/src/shared/opencode-command-dirs.test.ts
+++ b/src/shared/opencode-command-dirs.test.ts
@@ -26,8 +26,10 @@ describe("opencode-command-dirs", () => {
           const dirs = getOpenCodeSkillDirs({ binary: "opencode" })
 
           expect(dirs).toContain("/home/user/.config/opencode/profiles/opus/skills")
+          expect(dirs).toContain("/home/user/.config/opencode/profiles/opus/skill")
           expect(dirs).toContain("/home/user/.config/opencode/skills")
-          expect(dirs).toHaveLength(2)
+          expect(dirs).toContain("/home/user/.config/opencode/skill")
+          expect(dirs).toHaveLength(4)
         })
       })
     })
@@ -41,7 +43,8 @@ describe("opencode-command-dirs", () => {
           const dirs = getOpenCodeSkillDirs({ binary: "opencode" })
 
           expect(dirs).toContain("/home/user/.config/opencode/skills")
-          expect(dirs).toHaveLength(1)
+          expect(dirs).toContain("/home/user/.config/opencode/skill")
+          expect(dirs).toHaveLength(2)
         })
       })
     })
@@ -56,9 +59,11 @@ describe("opencode-command-dirs", () => {
           const { getOpenCodeCommandDirs } = await import("./opencode-command-dirs")
           const dirs = getOpenCodeCommandDirs({ binary: "opencode" })
 
+          expect(dirs).toContain("/home/user/.config/opencode/profiles/opus/commands")
           expect(dirs).toContain("/home/user/.config/opencode/profiles/opus/command")
+          expect(dirs).toContain("/home/user/.config/opencode/commands")
           expect(dirs).toContain("/home/user/.config/opencode/command")
-          expect(dirs).toHaveLength(2)
+          expect(dirs).toHaveLength(4)
         })
       })
     })
diff --git a/src/shared/opencode-command-dirs.ts b/src/shared/opencode-command-dirs.ts
index 456085730..4431370ad 100644
--- a/src/shared/opencode-command-dirs.ts
+++ b/src/shared/opencode-command-dirs.ts
@@ -17,8 +17,9 @@ export function getOpenCodeCommandDirs(options: OpenCodeConfigDirOptions): strin
 
   return Array.from(
     new Set([
+      join(configDir, "commands"),
       join(configDir, "command"),
-      ...(parentConfigDir ? [join(parentConfigDir, "command")] : []),
+      ...(parentConfigDir ? [join(parentConfigDir, "commands"), join(parentConfigDir, "command")] : []),
     ])
   )
 }
@@ -30,7 +31,8 @@ export function getOpenCodeSkillDirs(options: OpenCodeConfigDirOptions): string[
   return Array.from(
     new Set([
       join(configDir, "skills"),
-      ...(parentConfigDir ? [join(parentConfigDir, "skills")] : []),
+      join(configDir, "skill"),
+      ...(parentConfigDir ? [join(parentConfigDir, "skills"), join(parentConfigDir, "skill")] : []),
     ])
   )
 }