fix(skills): preserve namespaced local installs

Author: OpenClaude Worker 3

src/cli/handlers/skills.test.ts

@@ -39,6 +39,22 @@ Use this skill for install tests.
 Document token scopes without storing secret values.
 `
 
+const NAMESPACED_SKILL = `---
+name: git:commit
+title: Git Commit
+description: Nested git commit skill used by install tests.
+version: 0.1.0
+category: test
+author: OpenClaude Tests
+license: MIT
+trust: local
+---
+
+# Git Commit
+
+Use this skill for commit workflows.
+`
+
 const PATH_TRAVERSAL_SKILL = `---
 name: ../escape
 title: Unsafe Skill
@@ -298,6 +314,30 @@ test.serial('installs a local skill directory into project skills by default', a
   })
 })
 
+test.serial('preserves namespaced names when installing local skill directories', async () => {
+  await withTempDir(async tempDir => {
+    const cwd = join(tempDir, 'project')
+    const source = join(tempDir, 'source', 'git', 'commit')
+    mkdirSync(source, { recursive: true })
+    mkdirSync(cwd, { recursive: true })
+    writeFileSync(join(source, 'SKILL.md'), NAMESPACED_SKILL, 'utf8')
+
+    await skillsInstallHandler(source, { projectDir: cwd })
+
+    const nestedPath = join(
+      cwd,
+      '.openclaude',
+      'skills',
+      'git',
+      'commit',
+      'SKILL.md',
+    )
+    const flatPath = join(cwd, '.openclaude', 'skills', 'commit', 'SKILL.md')
+    assert.equal(existsSync(flatPath), false)
+    assert.equal(readFileSync(nestedPath, 'utf8'), NAMESPACED_SKILL)
+  })
+})
+
 test.serial('refuses to overwrite installed skills without --force', async () => {
   await withTempDir(async tempDir => {
     const cwd = join(tempDir, 'project')

src/cli/handlers/skillsInstall.ts

@@ -272,6 +272,25 @@ function resolveContainedPath(root: string, child: string): string {
   return resolvedChild
 }
 
+function skillNameToInstallPath(skillName: string): string {
+  return join(...skillName.split(':'))
+}
+
+function resolveSkillInstallPath(root: string, skillName: string): string {
+  return resolveContainedPath(root, skillNameToInstallPath(skillName))
+}
+
+async function getSkillNameFromDirectory(sourcePath: string): Promise<string> {
+  const fallbackName = basename(sourcePath)
+  try {
+    const markdown = await readFile(join(sourcePath, 'SKILL.md'), 'utf8')
+    return getSkillNameFromMarkdown(markdown, fallbackName)
+  } catch {
+    // Validation reports missing or malformed SKILL.md after the directory is staged.
+    return fallbackName
+  }
+}
+
 async function prepareSkillFromMarkdown({
   markdown,
   fallbackName,
@@ -287,7 +306,7 @@ async function prepareSkillFromMarkdown({
       : getSkillNameFromMarkdown(markdown, fallbackName),
   )
   const tempRoot = await mkdtemp(join(tmpdir(), 'openclaude-skill-install-'))
-  const tempDir = resolveContainedPath(tempRoot, skillName)
+  const tempDir = resolveSkillInstallPath(tempRoot, skillName)
   await mkdir(tempDir, { recursive: true })
   await writeFile(join(tempDir, 'SKILL.md'), markdown, 'utf8')
   if (registryEntry) {
@@ -316,9 +335,11 @@ async function prepareInstallCandidate(
     const sourcePath = resolve(spec)
     const sourceStats = await stat(sourcePath)
     if (sourceStats.isDirectory()) {
-      const skillName = normalizeInstallSkillName(basename(sourcePath))
+      const skillName = normalizeInstallSkillName(
+        await getSkillNameFromDirectory(sourcePath),
+      )
       const tempRoot = await mkdtemp(join(tmpdir(), 'openclaude-skill-install-'))
-      const tempDir = resolveContainedPath(tempRoot, skillName)
+      const tempDir = resolveSkillInstallPath(tempRoot, skillName)
       await cp(sourcePath, tempDir, {
         recursive: true,
         errorOnExist: true,
@@ -410,7 +431,7 @@ export async function skillsInstallHandler(
     }
 
     const root = installRoot(options)
-    const targetDir = resolveContainedPath(root, candidate.skillName)
+    const targetDir = resolveSkillInstallPath(root, candidate.skillName)
     if ((await pathExists(targetDir)) && !options.force) {
       console.error(
         `Skill "${candidate.skillName}" already exists at ${getDisplayPath(targetDir)}. Use --force to overwrite.`,

src/skills/loadSkillsDir.test.ts

@@ -1,5 +1,4 @@
 import assert from 'node:assert/strict'
-import { spawnSync } from 'node:child_process'
 import { mkdtempSync, rmSync, mkdirSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
@@ -162,9 +161,11 @@ test('prefers .openclaude project skills over legacy .claude skills with the sam
 })
 
 test('project skills are ordered before user skills with the same name', async () => {
+  await acquireSharedMutationLock('loadSkillsDir.test.ts')
   const configDir = mkdtempSync(join(tmpdir(), 'openclaude-skills-'))
   const cwd = join(configDir, 'workspace')
-  const scriptPath = join(configDir, 'check-skill-order.mjs')
+  const originalConfigDir = process.env.CLAUDE_CONFIG_DIR
+  const originalSources = enableUserAndProjectSettingSources()
 
   try {
     mkdirSync(cwd, { recursive: true })
@@ -174,44 +175,33 @@ test('project skills are ordered before user skills with the same name', async (
       description: 'project skill',
     })
 
-    writeFileSync(
-      scriptPath,
-      `
-        import { clearSkillCaches, getSkillDirCommands } from ${JSON.stringify(join(process.cwd(), 'src/skills/loadSkillsDir.ts'))}
-
-        clearSkillCaches()
-        const skills = await getSkillDirCommands(${JSON.stringify(cwd)})
-        const sharedSkills = skills
-          .filter(skill => skill.type === 'prompt' && skill.name === 'shared')
-          .map(skill => ({
-            description: skill.description,
-            source: skill.source,
-          }))
-        console.log(JSON.stringify(sharedSkills))
-      `,
-      'utf8',
-    )
-
-    const result = spawnSync(process.execPath, [scriptPath], {
-      cwd: process.cwd(),
-      env: {
-        ...process.env,
-        CLAUDE_CONFIG_DIR: configDir,
-      },
-      encoding: 'utf8',
-    })
+    process.env.CLAUDE_CONFIG_DIR = configDir
+    clearSkillCaches()
 
-    assert.equal(result.status, 0, result.stderr)
-    const sharedSkills = JSON.parse(result.stdout) as Array<{
-      description: string
-      source: string
-    }>
+    const skills = await getSkillDirCommands(cwd)
+    const sharedSkills = skills
+      .filter(skill => skill.type === 'prompt' && skill.name === 'shared')
+      .map(skill => ({
+        description: skill.description,
+        source: skill.source,
+      }))
 
     assert.equal(sharedSkills.length, 2)
     assert.equal(sharedSkills[0]?.description, 'project skill')
     assert.equal(sharedSkills[0]?.source, 'projectSettings')
   } finally {
-    rmSync(configDir, { recursive: true, force: true })
+    try {
+      if (originalConfigDir === undefined) {
+        delete process.env.CLAUDE_CONFIG_DIR
+      } else {
+        process.env.CLAUDE_CONFIG_DIR = originalConfigDir
+      }
+      clearSkillCaches()
+      setAllowedSettingSources(originalSources)
+      rmSync(configDir, { recursive: true, force: true })
+    } finally {
+      releaseSharedMutationLock()
+    }
   }
 })