Check if this issue is valid — if so, understand the root cause and fix it. At src/features/claude-code-command-loader/loader.ts, line 139:

<comment>Reverse the directory array before mapping so that child project commands correctly overwrite generic ancestor commands.</comment>

<file context>
@@ -121,16 +126,21 @@ export async function loadProjectCommands(directory?: string): Promise<Record<st
-  return commandsToRecord(commands)
+  const opencodeProjectDirs = findProjectOpencodeCommandDirs(directory ?? process.cwd())
+  const allCommands = await Promise.all(
+    opencodeProjectDirs.map((commandsDir) =>
+      loadCommandsFromDir(commandsDir, "opencode-project"),
+    ),
</file context>

Check if this issue is valid — if so, understand the root cause and fix it. At src/features/claude-code-command-loader/loader.ts, line 131:

<comment>Reverse the directory array before mapping so that specific profile commands properly overwrite general global commands.</comment>

<file context>
@@ -121,16 +126,21 @@ export async function loadProjectCommands(directory?: string): Promise<Record<st
-  return commandsToRecord(commands)
+  const opencodeCommandDirs = getOpenCodeCommandDirs({ binary: "opencode" })
+  const allCommands = await Promise.all(
+    opencodeCommandDirs.map((commandsDir) => loadCommandsFromDir(commandsDir, "opencode")),
+  )
+  return commandsToRecord(allCommands.flat())
</file context>

Check if this issue is valid — if so, understand the root cause and fix it. At src/features/opencode-skill-loader/loader.ts, line 24:

<comment>Refactor `loadProjectSkills` to call `discoverProjectClaudeSkills` to avoid duplicating the discovery and loading logic.</comment>

<file context>
@@ -16,9 +21,11 @@ export async function loadUserSkills(): Promise<Record<string, CommandDefinition
-  const projectSkillsDir = join(directory ?? process.cwd(), ".claude", "skills")
-  const skills = await loadSkillsFromDir({ skillsDir: projectSkillsDir, scope: "project" })
-  return skillsToCommandDefinitionRecord(skills)
+  const projectSkillDirs = findProjectClaudeSkillDirs(directory ?? process.cwd())
+  const allSkills = await Promise.all(
+    projectSkillDirs.map((skillsDir) => loadSkillsFromDir({ skillsDir, scope: "project" })),
</file context>

Check if this issue is valid — if so, understand the root cause and fix it. At src/shared/project-discovery-dirs.ts, line 15:

<comment>`existsSync` returns true for files as well as directories, which means this function could incorrectly return a file path if a file happens to be named (for example) `.opencode/skills`. Replace it with a directory-specific check.</comment>

<file context>
@@ -0,0 +1,52 @@
+  while (true) {
+    for (const targetPath of targetPaths) {
+      const candidateDirectory = join(currentDirectory, ...targetPath)
+      if (!existsSync(candidateDirectory) || seen.has(candidateDirectory)) {
+        continue
+      }
</file context>

Check if this issue is valid — if so, understand the root cause and fix it. At src/features/claude-code-command-loader/loader.ts, line 125:

<comment>The deduplication logic reverses upstream OpenCode's configuration merging precedence by keeping the first encountered command instead of the last.</comment>

<file context>
@@ -104,9 +104,25 @@ $ARGUMENTS
 function commandsToRecord(commands: LoadedCommand[]): Record<string, CommandDefinition> {
   const result: Record<string, CommandDefinition> = {}
-  for (const cmd of commands) {
+  for (const cmd of deduplicateLoadedCommandsByName(commands)) {
     const { name: _name, argumentHint: _argumentHint, ...openCodeCompatible } = cmd.definition
     result[cmd.name] = openCodeCompatible as CommandDefinition
</file context>