@@ -1,6 +1,7 @@
11 import { existsSync, readFileSync, readdirSync } from "node:fs";
22 import { homedir } from "node:os";
33 import { basename, join } from "node:path";
4+import { warnConventionConflicts } from "./config-conflicts.ts";
45 import { parseFrontmatter } from "./frontmatter.ts";
56
67 // ─── Types ────────────────────────────────────────────────────────────────────
@@ -57,14 +58,36 @@ function loadFromDir(
5758 // ─── Load all custom commands (global + local, local wins) ───────────────────
5859
5960 export function loadCustomCommands(cwd: string): Map<string, CustomCommand> {
60- const globalDir = join(homedir(), ".agents", "commands");
61- const localDir = join(cwd, ".agents", "commands");
62-
63- const global = loadFromDir(globalDir, "global");
64- const local = loadFromDir(localDir, "local");
65-
66- // Merge: local overrides global
67- return new Map([...global, ...local]);
61+ const globalAgentsDir = join(homedir(), ".agents", "commands");
62+ const globalClaudeDir = join(homedir(), ".claude", "commands");
63+ const localAgentsDir = join(cwd, ".agents", "commands");
64+ const localClaudeDir = join(cwd, ".claude", "commands");
65+
66+ const globalAgents = loadFromDir(globalAgentsDir, "global");
67+ const globalClaude = loadFromDir(globalClaudeDir, "global");
68+ const localAgents = loadFromDir(localAgentsDir, "local");
69+ const localClaude = loadFromDir(localClaudeDir, "local");
70+
71+ warnConventionConflicts(
72+ "commands",
73+ "global",
74+ globalAgents.keys(),
75+ globalClaude.keys(),
76+ );
77+ warnConventionConflicts(
78+ "commands",
79+ "local",
80+ localAgents.keys(),
81+ localClaude.keys(),
82+ );
83+
84+ // Merge precedence: local overrides global; at the same scope, .agents overrides .claude.
85+ return new Map([
86+ ...globalClaude,
87+ ...globalAgents,
88+ ...localClaude,
89+ ...localAgents,
90+ ]);
6891 }
6992
7093 // ─── Template expansion ───────────────────────────────────────────────────────