diff --git a/src/features/opencode-skill-loader/skill-discovery.ts b/src/features/opencode-skill-loader/skill-discovery.ts
index fb991e44..2ee2cbca 100644
--- a/src/features/opencode-skill-loader/skill-discovery.ts
+++ b/src/features/opencode-skill-loader/skill-discovery.ts
@@ -3,19 +3,20 @@ import { discoverSkills } from "./loader"
 import type { LoadedSkill } from "./types"
 import type { SkillResolutionOptions } from "./skill-resolution-options"
 
-const cachedSkillsByProvider = new Map<string, LoadedSkill[]>()
+const skillCache = new Map<string, LoadedSkill[]>()
 
 export function clearSkillCache(): void {
-	cachedSkillsByProvider.clear()
+	skillCache.clear()
 }
 
 export async function getAllSkills(options?: SkillResolutionOptions): Promise<LoadedSkill[]> {
-	const cacheKey = options?.browserProvider ?? "playwright"
+	const directory = options?.directory ?? process.cwd()
+	const cacheKey = `${options?.browserProvider ?? "playwright"}:${directory}`
 	const hasDisabledSkills = options?.disabledSkills && options.disabledSkills.size > 0
 
 	// Skip cache if disabledSkills is provided (varies between calls)
 	if (!hasDisabledSkills) {
-		const cached = cachedSkillsByProvider.get(cacheKey)
+		const cached = skillCache.get(cacheKey)
 		if (cached) return cached
 	}
 
@@ -69,7 +70,7 @@ export async function getAllSkills(options?: SkillResolutionOptions): Promise<Lo
 	if (hasDisabledSkills) {
 		allSkills = allSkills.filter((skill) => !options!.disabledSkills!.has(skill.name))
 	} else {
-		cachedSkillsByProvider.set(cacheKey, allSkills)
+		skillCache.set(cacheKey, allSkills)
 	}
 
 	return allSkills
diff --git a/src/tools/delegate-task/skill-resolver.ts b/src/tools/delegate-task/skill-resolver.ts
index bfd58e17..217079a8 100644
--- a/src/tools/delegate-task/skill-resolver.ts
+++ b/src/tools/delegate-task/skill-resolver.ts
@@ -1,10 +1,9 @@
 import type { GitMasterConfig, BrowserAutomationProvider } from "../../config/schema"
-import { resolveMultipleSkillsAsync } from "../../features/opencode-skill-loader/skill-content"
-import { discoverSkills } from "../../features/opencode-skill-loader"
+import { resolveMultipleSkillsAsync, getAllSkills } from "../../features/opencode-skill-loader/skill-content"
 
 export async function resolveSkillContent(
   skills: string[],
-  options: { gitMasterConfig?: GitMasterConfig; browserProvider?: BrowserAutomationProvider, disabledSkills?: Set<string>, directory?: string }
+  options: { gitMasterConfig?: GitMasterConfig; browserProvider?: BrowserAutomationProvider; disabledSkills?: Set<string>; directory?: string }
 ): Promise<{ content: string | undefined; error: string | null }> {
   if (skills.length === 0) {
     return { content: undefined, error: null }
@@ -12,7 +11,7 @@ export async function resolveSkillContent(
 
   const { resolved, notFound } = await resolveMultipleSkillsAsync(skills, options)
   if (notFound.length > 0) {
-    const allSkills = await discoverSkills({ includeClaudeCodePaths: true, directory: options?.directory })
+    const allSkills = await getAllSkills(options)
     const available = allSkills.map(s => s.name).join(", ")
     return { content: undefined, error: `Skills not found: ${notFound.join(", ")}. Available: ${available}` }
   }
diff --git a/src/tools/skill/tools.ts b/src/tools/skill/tools.ts
index 04477690..60f6ad51 100644
--- a/src/tools/skill/tools.ts
+++ b/src/tools/skill/tools.ts
@@ -189,7 +189,7 @@ export function createSkillTool(options: SkillLoadOptions = {}): ToolDefinition
   const getSkills = async (): Promise<LoadedSkill[]> => {
     if (options.skills) return options.skills
     if (cachedSkills) return cachedSkills
-    cachedSkills = await getAllSkills({disabledSkills: options?.disabledSkills})
+    cachedSkills = await getAllSkills({disabledSkills: options?.disabledSkills, directory: options?.directory})
     return cachedSkills
   }
 
diff --git a/src/tools/skill/types.ts b/src/tools/skill/types.ts
index 4fd48d6c..b914957d 100644
--- a/src/tools/skill/types.ts
+++ b/src/tools/skill/types.ts
@@ -33,4 +33,6 @@ export interface SkillLoadOptions {
   /** Git master configuration for watermark/co-author settings */
   gitMasterConfig?: GitMasterConfig
   disabledSkills?: Set<string>
+  /** Project directory for skill discovery. Falls back to process.cwd() if not provided. */
+  directory?: string
 }