harveyz-skill 0.8.1 → 0.9.0

package/CHANGELOG.md

@@ -7,6 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.9.0] - 2026-05-28
+
+### Added
+- `hskill uninstall <tool>` 命令：清理 binary、Python 模块、tool.json、venv 及 zshrc snippet
+- `hskill uninstall <tool> --yes`：跳过所有确认（含用户配置文件）
+- `hskill uninstall <skill> --scope <s> --target <t>`：卸载已安装的 skill 目录
+- `tool.json` 新增 `uninstallPaths[]` 和 `configPaths[]` 字段，tool 可声明 tool-specific 清理路径
+- fzf 交互界面在选完 item 后新增 Action 选择步骤（安装 / 卸载），支持在同一界面卸载 tool / skill / hook
+- p-launch：迁移至 Python + Textual，新增三栏 TUI 界面
+- p-launch：push/pull 时检测 diverged 分支（本地和远端均有新提交），跳过操作并提示
+- p-launch：首次运行自动创建隔离 venv 并安装 textual，无需手动配置依赖
+
+### Changed
+- p-launch `tool.json` 新增 `uninstallPaths`（`p-launch-venv`）和 `configPaths`（`~/.config/p-launch`）
+
 ## [0.8.1] - 2026-05-24
 
 ### Fixed

package/bin/cli.js

@@ -13,7 +13,7 @@ import {
   TOOL_BUNDLE_CHOICES,
 } from '../lib/bundles.js'
 import { buildTargetChoices, resolveTargets, TARGETS } from '../lib/targets.js'
-import { installSkills, installTools, installHooks, uninstallHook } from '../lib/installer.js'
+import { installSkills, installTools, installHooks, installHooksForTarget, uninstallHook, uninstallTool, uninstallSkill } from '../lib/installer.js'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 const require = createRequire(import.meta.url)
@@ -46,6 +46,9 @@ function printHelp() {
     hskill hooks install [--project <path>]           target project dir (for project scope)
     hskill hooks install [--force]                    overwrite existing
     hskill hooks uninstall <name> [--scope <s>]       remove hook
+    hskill uninstall <tool>            uninstall a shell tool and clean up all files
+    hskill uninstall <tool> --yes      skip all confirmations (incl. config files)
+    hskill uninstall <skill> --scope <s> --target <t>  uninstall a skill
     hskill update                  update hskill to the latest version
     hskill version                 show version
     hskill --help                  show this help
@@ -109,6 +112,16 @@ if (args[0] === '--help' || args[0] === '-h') {
           args: ['<name>'],
           flags: [{ name: '--json', description: 'Machine-readable output' }],
         },
+        {
+          name: 'uninstall',
+          description: 'Uninstall a shell tool or skill',
+          args: ['<name>'],
+          flags: [
+            { name: '--yes',    description: 'Skip all confirmations including config file removal' },
+            { name: '--scope',  arg: '<scope>',  description: 'Skill scope: user or project', enum: ['user','project'] },
+            { name: '--target', arg: '<target>', description: 'Skill target: claude, cursor, codex, etc.' },
+          ],
+        },
         {
           name: 'update',
           description: 'Update hskill to the latest version via npm',
@@ -388,6 +401,54 @@ if (subcommand === 'info') {
   process.exit(0)
 }
 
+// ── Uninstall ─────────────────────────────────────────────────────────────────
+if (subcommand === 'uninstall') {
+  const nameToRemove = args[1]
+  if (!nameToRemove || nameToRemove.startsWith('--')) {
+    console.error(chalk.red('  ✗ Usage: hskill uninstall <tool-or-skill-name> [--yes] [--scope user|project] [--target claude|...]'))
+    process.exit(1)
+  }
+
+  const yesFlag    = args.includes('--yes')
+  const scopeIdx2  = args.indexOf('--scope')
+  const targetIdx2 = args.indexOf('--target')
+  const scopeArg2  = scopeIdx2  !== -1 ? args[scopeIdx2  + 1] : 'user'
+  const targetArg2 = targetIdx2 !== -1 ? args[targetIdx2 + 1] : undefined
+
+  const toolItems2  = getAllToolItems()
+  const skillItems2 = getAllSkillItems()
+  const isTool  = toolItems2.some(t => t.toolName  === nameToRemove)
+  const isSkill = skillItems2.some(s => s.skillName === nameToRemove)
+
+  if (!isTool && !isSkill) {
+    console.error(chalk.red(`  ✗ Unknown tool or skill: "${nameToRemove}"`))
+    process.exit(1)
+  }
+
+  if (isTool) {
+    const { removed, failed } = await uninstallTool(nameToRemove, { yes: yesFlag })
+    if (removed.length > 0) console.error(chalk.green.bold(`✔ ${nameToRemove} uninstalled`))
+    process.exit(failed.length ? 1 : 0)
+  }
+
+  // Skill uninstall
+  const scope = scopeArg2
+  const selectedTargets = targetArg2
+    ? [targetArg2]
+    : ['claude', 'cursor', 'codex', 'openclaw', 'hermes']
+  const targets = resolveTargets(selectedTargets, scope)
+
+  let anyRemoved = false
+  let anyFailed  = false
+  for (const { dir } of targets) {
+    const { removed, failed } = await uninstallSkill(nameToRemove, dir)
+    if (removed.length) anyRemoved = true
+    if (failed.length)  anyFailed  = true
+  }
+  if (anyRemoved) console.error(chalk.green.bold(`✔ ${nameToRemove} uninstalled`))
+  process.exit(anyFailed ? 1 : 0)
+}
+
 // ── Hooks ─────────────────────────────────────────────────────────────────────
 if (subcommand === 'hooks') {
   const hooksSubcmd    = args[1]
@@ -396,10 +457,12 @@ if (subcommand === 'hooks') {
   const hookNameIdx    = hookArgs.indexOf('--name')
   const hookScopeIdx   = hookArgs.indexOf('--scope')
   const hookProjectIdx = hookArgs.indexOf('--project')
+  const hookTargetIdx  = hookArgs.indexOf('--target')
   const hookForce      = hookArgs.includes('--force')
   const hookNameArg    = hookNameIdx    !== -1 ? hookArgs[hookNameIdx    + 1] : undefined
   const hookScopeArg   = hookScopeIdx   !== -1 ? hookArgs[hookScopeIdx   + 1] : 'user'
   const hookProjectArg = hookProjectIdx !== -1 ? hookArgs[hookProjectIdx + 1] : process.cwd()
+  const hookTargetArg  = hookTargetIdx  !== -1 ? hookArgs[hookTargetIdx  + 1] : 'claude'
 
   // Validate scope for install/uninstall commands
   if (!['user', 'project'].includes(hookScopeArg) && ['install', 'uninstall'].includes(hooksSubcmd)) {
@@ -414,7 +477,16 @@ if (subcommand === 'hooks') {
       const out = hookItems.map(h => {
         const inst = checkHookInstalled(h.name)
         const ver = resolveHookDisplayVersion(inst, h.version)
-        return { name: h.name, version: ver, description: h.description, event: h.event, user: inst.user, project: inst.project }
+        return {
+          name: h.name,
+          version: ver,
+          description: h.description,
+          event: h.event,
+          user: inst.user,
+          project: inst.project,
+          claude: inst.claude,
+          codex: inst.codex,
+        }
       })
       console.log(JSON.stringify({ hooks: out }, null, 2))
       process.exit(0)
@@ -427,15 +499,22 @@ if (subcommand === 'hooks') {
     const nameWidth = Math.max(...hookItems.map(h => h.name.length), 4)
     const verWidth = 7
     console.log('')
-    console.log('  ' + chalk.bold('NAME'.padEnd(nameWidth)) + '  ' + chalk.bold('VER'.padEnd(verWidth)) + '  U  P  ' + chalk.bold('DESCRIPTION'))
-    console.log('  ' + '─'.repeat(nameWidth) + '  ' + '─'.repeat(verWidth) + '  ─  ─  ' + '─'.repeat(20))
+    console.log('  ' + chalk.bold('NAME'.padEnd(nameWidth)) + '  ' + chalk.bold('VER'.padEnd(verWidth)) + '  U  P  CX  ' + chalk.bold('DESCRIPTION'))
+    console.log('  ' + '─'.repeat(nameWidth) + '  ' + '─'.repeat(verWidth) + '  ─  ─  ──  ' + '─'.repeat(20))
     for (const h of hookItems) {
       const inst = checkHookInstalled(h.name)
       const ver = resolveHookDisplayVersion(inst, h.version)
-      console.log('  ' + h.name.padEnd(nameWidth) + '  ' + chalk.dim(ver.padEnd(verWidth)) + '  ' + hookIcon(inst.user.status) + '  ' + hookIcon(inst.project.status) + '  ' + h.description)
+      console.log(
+        '  ' + h.name.padEnd(nameWidth) +
+        '  ' + chalk.dim(ver.padEnd(verWidth)) +
+        '  ' + hookIcon(inst.user.status) +
+        '  ' + hookIcon(inst.project.status) +
+        '  ' + hookIcon(inst.codex.user.status) +
+        '   ' + h.description
+      )
     }
     console.log('')
-    console.log(chalk.dim(`  U=user  P=project  ${chalk.green('✓')}=installed  ${chalk.yellow('~')}=partial  ${chalk.dim('—')}=none`))
+    console.log(chalk.dim(`  U=claude-user  P=claude-project  CX=codex-user  ${chalk.green('✓')}=installed  ${chalk.yellow('~')}=partial  ${chalk.dim('—')}=none`))
     console.log('')
     process.exit(0)
   }
@@ -467,7 +546,7 @@ if (subcommand === 'hooks') {
       toInstall = selected
     }
 
-    const { installed, skipped, failed } = await installHooks(toInstall, hookScopeArg, hookProjectArg, hookForce)
+    const { installed, skipped, failed } = await installHooksForTarget(toInstall, hookTargetArg, hookScopeArg, hookProjectArg, hookForce)
 
     if (hookJsonFlag) {
       console.log(JSON.stringify({ installed, skipped, failed }, null, 2))
@@ -534,6 +613,7 @@ function fzfSelect() {
   requireFzf()
   const skillItems  = getAllSkillItems()
   const toolItems   = getAllToolItems()
+  const hookItems   = getAllHookItems()
   const previewPath = path.join(__dirname, 'preview.mjs')
 
   // 构建 fzf 输入：每行 "NAME\tVERSION\tBUNDLE\tKIND\tSRCPATH"
@@ -543,6 +623,7 @@ function fzfSelect() {
       return `${s.skillName}\t${s.version ?? '—'}\t${bundle}\tskill\t${s.srcPath}`
     }),
     ...toolItems.map(t => `${t.toolName}\t${t.version ?? '—'}\tshell-tool\ttool\t${t.srcPath}`),
+    ...hookItems.map(h => `${h.name}\t${h.version ?? '—'}\thook\thook\t${h.srcPath}`),
   ]
 
   const nameWidth    = Math.max(...lines.map(l => l.split('\t')[0].length))
@@ -565,6 +646,12 @@ function fzfSelect() {
       pIcon = colorIcon(scopeSummary(installed.project))
     } else if (kind === 'tool') {
       uIcon = colorIcon(checkToolInstalled(name, srcPath).status)
+    } else if (kind === 'hook') {
+      const inst = checkHookInstalled(name)
+      uIcon = colorIcon(inst.user.status === 'installed' ? 'up-to-date'
+             : inst.user.status === 'partial'            ? 'update' : '')
+      pIcon = colorIcon(inst.project.status === 'installed' ? 'up-to-date'
+             : inst.project.status === 'partial'             ? 'update' : '')
     }
     return `${name.padEnd(nameWidth)}  ${ver.padEnd(versionWidth)}  U:${uIcon}  P:${pIcon}  ${bundle}`
   })
@@ -598,12 +685,13 @@ function fzfSelect() {
     const parts = line.split('\t')
     const [, name, ver, bundle, kind, srcPath] = parts
     if (kind === 'skill') return { kind: 'skill', skillName: name, srcPath, version: ver }
+    if (kind === 'hook') return { kind: 'hook', name, srcPath, version: ver }
     return { kind: 'tool', toolName: name, srcPath, version: ver }
   })
 }
 
 // ── Print install summary (shared between interactive loop and non-interactive) ──
-function printSummary(skillSummary, toolSummary) {
+function printSummary(skillSummary, toolSummary, hookSummary = null) {
   if (skillSummary !== null) {
     const anyInstalled = Object.values(skillSummary).some(r => r.installed.length > 0)
     if (!anyInstalled) {
@@ -650,6 +738,26 @@ function printSummary(skillSummary, toolSummary) {
       }
     }
   }
+  if (hookSummary !== null) {
+    const anyInstalled = Object.values(hookSummary).some(r => r.installed.length > 0)
+    if (!anyInstalled) {
+      console.log(chalk.dim('  · No hooks installed'))
+    } else {
+      console.log(chalk.green.bold('✔ Hooks installed:'))
+      for (const [target, { installed }] of Object.entries(hookSummary)) {
+        if (installed.length > 0)
+          console.log(`  ${chalk.bold(target)} ← ${installed.join(', ')}`)
+      }
+    }
+    for (const { skipped } of Object.values(hookSummary)) {
+      for (const s of skipped) {
+        const detail = s.reason === 'outdated'
+          ? `outdated ${s.installed} → ${s.available}, use --force`
+          : s.reason
+        console.log(chalk.dim(`  · ${s.name} skipped (${detail})`))
+      }
+    }
+  }
 }
 
 try {
@@ -671,7 +779,14 @@ try {
     }
 
     while (true) {
-      const selected = fzfSelect()
+      // ── Test shortcut: HSKILL_TEST_ACTION bypasses fzf entirely ───────────
+      let selected
+      if (process.env.HSKILL_TEST_ACTION && process.env.HSKILL_TEST_TOOL) {
+        const testTool = getAllToolItems().find(t => t.toolName === process.env.HSKILL_TEST_TOOL)
+        selected = testTool ? [{ kind: 'tool', ...testTool }] : []
+      } else {
+        selected = fzfSelect()
+      }
 
       if (!selected.length) {
         console.log(chalk.dim('  · Nothing selected, exiting'))
@@ -679,76 +794,222 @@ try {
       }
 
       const toolItems = selected.filter(s => s.kind === 'tool')
+      const hookItems = selected.filter(s => s.kind === 'hook')
       const seen = new Set()
       const skillItems = selected.filter(s => s.kind === 'skill').filter(s => {
         if (seen.has(s.skillName)) return false
         seen.add(s.skillName); return true
       })
 
-      if (!skillItems.length && !toolItems.length) continue
+      if (!skillItems.length && !toolItems.length && !hookItems.length) continue
 
-      let skillSummary = null
-      if (skillItems.length > 0) {
-        // Scope selection
-        const scopeResult = spawnSync('fzf', [
+      // ── Action selection (install / uninstall) ─────────────────────────────
+      let action = 'install'
+      if (process.env.HSKILL_TEST_ACTION) {
+        action = process.env.HSKILL_TEST_ACTION
+      } else {
+        const actionResult = spawnSync('fzf', [
           '--prompt=  › ',
-          '--header=  Scope  ·  enter 确认  ·  esc 取消',
+          '--header=  Action  ·  enter 确认  ·  esc 取消',
           '--layout=reverse',
           '--border=rounded',
           '--color=header:italic:dim,prompt:cyan,pointer:cyan,hl:cyan,hl+:cyan:bold',
         ], {
-          input: `user     — ~/.claude/skills/  (所有项目共享)\nproject  — .claude/skills/    (仅当前项目)`,
+          input: `install    安装 / 重新安装\nuninstall  卸载并清理文件`,
           encoding: 'utf8',
           stdio: ['pipe', 'pipe', 'inherit'],
         })
-        if (!scopeResult.stdout.trim()) {
+        if (!actionResult.stdout.trim()) {
           console.log(chalk.dim('  · Cancelled'))
           break
         }
-        const scope = scopeResult.stdout.trim().startsWith('project') ? 'project' : 'user'
+        action = actionResult.stdout.trim().startsWith('uninstall') ? 'uninstall' : 'install'
+      }
 
-        // Target selection
-        const targetChoices = buildTargetChoices(scope)
-        const targetInput = targetChoices.map(c => c.name).join('\n') + '\nall      — all tools'
-        const targetResult = spawnSync('fzf', [
-          '--multi',
-          '--prompt=  › ',
-          '--header=  Install to  ·  tab 多选  ·  enter 确认  ·  esc 取消',
-          '--layout=reverse',
-          '--border=rounded',
-          '--color=header:italic:dim,prompt:cyan,pointer:cyan,hl:cyan,hl+:cyan:bold',
-        ], {
-          input: targetInput,
-          encoding: 'utf8',
-          stdio: ['pipe', 'pipe', 'inherit'],
-        })
-        if (!targetResult.stdout.trim()) {
-          console.log(chalk.dim('  · Cancelled'))
-          break
+      if (action === 'install') {
+        let skillSummary = null
+        if (skillItems.length > 0) {
+          // Scope selection
+          const scopeResult = spawnSync('fzf', [
+            '--prompt=  › ',
+            '--header=  Scope  ·  enter 确认  ·  esc 取消',
+            '--layout=reverse',
+            '--border=rounded',
+            '--color=header:italic:dim,prompt:cyan,pointer:cyan,hl:cyan,hl+:cyan:bold',
+          ], {
+            input: `user     — ~/.claude/skills/  (所有项目共享)\nproject  — .claude/skills/    (仅当前项目)`,
+            encoding: 'utf8',
+            stdio: ['pipe', 'pipe', 'inherit'],
+          })
+          if (!scopeResult.stdout.trim()) {
+            console.log(chalk.dim('  · Cancelled'))
+            break
+          }
+          const scope = scopeResult.stdout.trim().startsWith('project') ? 'project' : 'user'
+
+          // Target selection
+          const targetChoices = buildTargetChoices(scope)
+          const targetInput = targetChoices.map(c => c.name).join('\n') + '\nall      — all tools'
+          const targetResult = spawnSync('fzf', [
+            '--multi',
+            '--prompt=  › ',
+            '--header=  Install to  ·  tab 多选  ·  enter 确认  ·  esc 取消',
+            '--layout=reverse',
+            '--border=rounded',
+            '--color=header:italic:dim,prompt:cyan,pointer:cyan,hl:cyan,hl+:cyan:bold',
+          ], {
+            input: targetInput,
+            encoding: 'utf8',
+            stdio: ['pipe', 'pipe', 'inherit'],
+          })
+          if (!targetResult.stdout.trim()) {
+            console.log(chalk.dim('  · Cancelled'))
+            break
+          }
+          const selectedTargets = targetResult.stdout.trim().split('\n')
+            .map(l => l.trim().split(/\s+/)[0])
+
+          if (selectedTargets.length > 0) {
+            const targets = resolveTargets(selectedTargets, scope)
+            console.log('')
+            skillSummary = await installSkills(skillItems, targets, forceFlag)
+            console.log('')
+          }
         }
-        const selectedTargets = targetResult.stdout.trim().split('\n')
-          .map(l => l.trim().split(/\s+/)[0])
 
-        if (selectedTargets.length > 0) {
-          const targets = resolveTargets(selectedTargets, scope)
+        let toolSummary = null
+        if (toolItems.length > 0) {
           console.log('')
-          skillSummary = await installSkills(skillItems, targets, forceFlag)
+          toolSummary = await installTools(
+            toolItems.map(t => ({ toolName: t.toolName, srcPath: t.srcPath })),
+            TARGETS.shell,
+            forceFlag,
+          )
           console.log('')
         }
-      }
 
-      let toolSummary = null
-      if (toolItems.length > 0) {
+        // ── Hook install ────────────────────────────────────────────────────────
+        let hookSummary = null
+        if (hookItems.length > 0) {
+          // Scope selection
+          const hookScopeResult = spawnSync('fzf', [
+            '--prompt=  › ',
+            '--header=  Hook scope  ·  enter 确认  ·  esc 取消',
+            '--layout=reverse',
+            '--border=rounded',
+            '--color=header:italic:dim,prompt:cyan,pointer:cyan,hl:cyan,hl+:cyan:bold',
+          ], {
+            input: `user     — ~/.{claude,codex}/hooks/  (所有项目共享)\nproject  — .{claude,codex}/hooks/    (仅当前项目)`,
+            encoding: 'utf8',
+            stdio: ['pipe', 'pipe', 'inherit'],
+          })
+          if (!hookScopeResult.stdout.trim()) {
+            console.log(chalk.dim('  · Cancelled'))
+            break
+          }
+          const hookScope = hookScopeResult.stdout.trim().startsWith('project') ? 'project' : 'user'
+
+          // Target selection (claude / codex / all)
+          const hookTargetResult = spawnSync('fzf', [
+            '--multi',
+            '--prompt=  › ',
+            '--header=  Install hook to  ·  tab 多选  ·  enter 确认  ·  esc 取消',
+            '--layout=reverse',
+            '--border=rounded',
+            '--color=header:italic:dim,prompt:cyan,pointer:cyan,hl:cyan,hl+:cyan:bold',
+          ], {
+            input: `claude   — ~/.claude/hooks/\ncodex    — ~/.codex/hooks/\nall      — claude + codex`,
+            encoding: 'utf8',
+            stdio: ['pipe', 'pipe', 'inherit'],
+          })
+          if (!hookTargetResult.stdout.trim()) {
+            console.log(chalk.dim('  · Cancelled'))
+            break
+          }
+
+          const selectedHookTargets = hookTargetResult.stdout.trim().split('\n')
+            .map(l => l.trim().split(/\s+/)[0])
+          const resolvedHookTargets = selectedHookTargets.includes('all')
+            ? ['claude', 'codex']
+            : selectedHookTargets.filter(t => ['claude', 'codex'].includes(t))
+
+          hookSummary = {}
+          console.log('')
+          for (const target of resolvedHookTargets) {
+            const result = await installHooksForTarget(hookItems, target, hookScope, process.cwd(), forceFlag)
+            hookSummary[target] = result
+          }
+          console.log('')
+        }
+
+        printSummary(skillSummary, toolSummary, hookSummary)
+      } else {
+        // ── Uninstall ───────────────────────────────────────────────────────
+        const yesFlag2 = !!process.env.HSKILL_TEST_YES
         console.log('')
-        toolSummary = await installTools(
-          toolItems.map(t => ({ toolName: t.toolName, srcPath: t.srcPath })),
-          TARGETS.shell,
-          forceFlag,
-        )
+
+        // Re-filter after possible HSKILL_TEST_TOOL injection
+        const uToolItems  = selected.filter(s => s.kind === 'tool')
+        const uSkillItems = selected.filter(s => s.kind === 'skill')
+        const uHookItems  = selected.filter(s => s.kind === 'hook')
+
+        for (const item of uToolItems) {
+          const { removed, failed } = await uninstallTool(item.toolName, { yes: yesFlag2 })
+          if (removed.length) console.error(chalk.green.bold(`✔ ${item.toolName} uninstalled`))
+          if (failed.length)  console.error(chalk.red(`  ✗ ${item.toolName}: some files could not be removed`))
+        }
+
+        for (const item of uSkillItems) {
+          const scopeRes = spawnSync('fzf', [
+            '--prompt=  › ',
+            '--header=  Uninstall from scope  ·  enter 确认  ·  esc 取消',
+            '--layout=reverse', '--border=rounded',
+            '--color=header:italic:dim,prompt:cyan,pointer:cyan,hl:cyan,hl+:cyan:bold',
+          ], {
+            input: `user     — ~/.claude/skills/\nproject  — .claude/skills/`,
+            encoding: 'utf8', stdio: ['pipe', 'pipe', 'inherit'],
+          })
+          if (!scopeRes.stdout.trim()) { console.log(chalk.dim('  · Cancelled')); break }
+          const scope2 = scopeRes.stdout.trim().startsWith('project') ? 'project' : 'user'
+
+          const targetChoices2 = buildTargetChoices(scope2)
+          const targetRes = spawnSync('fzf', [
+            '--multi', '--prompt=  › ',
+            '--header=  Uninstall from  ·  tab 多选  ·  enter 确认',
+            '--layout=reverse', '--border=rounded',
+            '--color=header:italic:dim,prompt:cyan,pointer:cyan,hl:cyan,hl+:cyan:bold',
+          ], {
+            input: targetChoices2.map(c => c.name).join('\n') + '\nall      — all tools',
+            encoding: 'utf8', stdio: ['pipe', 'pipe', 'inherit'],
+          })
+          if (!targetRes.stdout.trim()) { console.log(chalk.dim('  · Cancelled')); break }
+          const selTargets2 = targetRes.stdout.trim().split('\n').map(l => l.trim().split(/\s+/)[0])
+          const targets2 = resolveTargets(selTargets2, scope2)
+          for (const { dir } of targets2) {
+            await uninstallSkill(item.skillName, dir)
+          }
+        }
+
+        for (const item of uHookItems) {
+          const hookScopeRes = spawnSync('fzf', [
+            '--prompt=  › ',
+            '--header=  Hook scope  ·  enter 确认',
+            '--layout=reverse', '--border=rounded',
+            '--color=header:italic:dim,prompt:cyan,pointer:cyan,hl:cyan,hl+:cyan:bold',
+          ], {
+            input: `user     — ~/.claude/hooks/\nproject  — .claude/hooks/`,
+            encoding: 'utf8', stdio: ['pipe', 'pipe', 'inherit'],
+          })
+          if (!hookScopeRes.stdout.trim()) { console.log(chalk.dim('  · Cancelled')); break }
+          const hookScope2 = hookScopeRes.stdout.trim().startsWith('project') ? 'project' : 'user'
+          await uninstallHook(item.name, hookScope2, process.cwd())
+        }
+
         console.log('')
       }
 
-      printSummary(skillSummary, toolSummary)
+      // In test mode with HSKILL_TEST_ACTION, run once and exit
+      if (process.env.HSKILL_TEST_ACTION) break
 
       // Loop back to skill selector automatically
     }

package/lib/bundles.js

@@ -193,9 +193,9 @@ export function checkHookInstalled(hookName) {
   const home = os.homedir()
   const cwd  = process.cwd()
 
-  function checkScope(hooksDir, settingsPath) {
-    const scriptPath   = path.join(hooksDir, `${hookName}.sh`)
-    const scriptExists = fs.existsSync(scriptPath)
+  function checkClaudeScope(hooksDir, settingsPath) {
+    const scriptPath       = path.join(hooksDir, `${hookName}.sh`)
+    const scriptExists     = fs.existsSync(scriptPath)
     const installedVersion = scriptExists ? readHookVersion(scriptPath) : '—'
     let registered = false
     try {
@@ -208,23 +208,55 @@ export function checkHookInstalled(hookName) {
         )
       )
     } catch { /* settings.json 不存在或解析失败 */ }
+    const status = scriptExists && registered ? 'installed'
+                 : scriptExists || registered ? 'partial'
+                 : 'none'
+    return { status, version: installedVersion }
+  }
 
+  function checkCodexScope(hooksDir, hooksJsonPath) {
+    const scriptPath       = path.join(hooksDir, `${hookName}.sh`)
+    const scriptExists     = fs.existsSync(scriptPath)
+    const installedVersion = scriptExists ? readHookVersion(scriptPath) : '—'
+    let registered = false
+    try {
+      const data = JSON.parse(fs.readFileSync(hooksJsonPath, 'utf-8'))
+      registered = Object.values(data.hooks ?? {}).some(entries =>
+        Array.isArray(entries) && entries.some(e =>
+          Array.isArray(e.hooks) && e.hooks.some(h =>
+            typeof h.command === 'string' && h.command.includes(`${hookName}.sh`)
+          )
+        )
+      )
+    } catch { /* hooks.json 不存在或解析失败 */ }
     const status = scriptExists && registered ? 'installed'
                  : scriptExists || registered ? 'partial'
                  : 'none'
     return { status, version: installedVersion }
   }
 
-  const userHooksDir    = path.join(home, '.claude', 'hooks')
-  const userSettings    = path.join(home, '.claude', 'settings.json')
-  const projectHooksDir = path.join(cwd,  '.claude', 'hooks')
-  const projectSettings = path.join(cwd,  '.claude', 'settings.json')
+  const userClaudeHooks    = path.join(home, '.claude', 'hooks')
+  const userClaudeSettings = path.join(home, '.claude', 'settings.json')
+  const projClaudeHooks    = path.join(cwd,  '.claude', 'hooks')
+  const projClaudeSettings = path.join(cwd,  '.claude', 'settings.json')
+
+  const userCodexHooks     = path.join(home, '.codex', 'hooks')
+  const userCodexHooksJson = path.join(home, '.codex', 'hooks.json')
+  const projCodexHooks     = path.join(cwd,  '.codex', 'hooks')
+  const projCodexHooksJson = path.join(cwd,  '.codex', 'hooks.json')
+
+  const claudeUser    = checkClaudeScope(userClaudeHooks, userClaudeSettings)
+  const claudeProject = cwd === home ? { status: 'none', version: '—' } : checkClaudeScope(projClaudeHooks, projClaudeSettings)
+  const codexUser     = checkCodexScope(userCodexHooks, userCodexHooksJson)
+  const codexProject  = cwd === home ? { status: 'none', version: '—' } : checkCodexScope(projCodexHooks, projCodexHooksJson)
 
   return {
-    user:    checkScope(userHooksDir, userSettings),
-    project: cwd === home
-      ? { status: 'none', version: '—' }
-      : checkScope(projectHooksDir, projectSettings),
+    // Legacy flat fields (backward compat — used by hooks list text output)
+    user:    claudeUser,
+    project: claudeProject,
+    // Per-target
+    claude: { user: claudeUser, project: claudeProject },
+    codex:  { user: codexUser,  project: codexProject  },
   }
 }