@yivan-lab/pretty-please 1.4.0 → 1.5.1

package/src/shell-hook.ts

@@ -5,6 +5,10 @@ import chalk from 'chalk'
 import { CONFIG_DIR, getConfig, setConfigValue } from './config.js'
 import { getHistory } from './history.js'
 import { getCurrentTheme } from './ui/theme.js'
+import {
+  detectShell as platformDetectShell,
+  type ShellType as PlatformShellType,
+} from './utils/platform.js'
 
 // 获取主题颜色
 function getColors() {
@@ -24,9 +28,29 @@ const SHELL_HISTORY_FILE = path.join(CONFIG_DIR, 'shell_history.jsonl')
 const HOOK_START_MARKER = '# >>> pretty-please shell hook >>>'
 const HOOK_END_MARKER = '# <<< pretty-please shell hook <<<'
 
-// Shell 类型
+// Shell 类型（保持向后兼容，但内部使用更细分的类型）
 type ShellType = 'zsh' | 'bash' | 'powershell' | 'unknown'
 
+/**
+ * 将 platform 模块的 ShellType 转换为本地 ShellType
+ */
+function toLocalShellType(platformShell: PlatformShellType): ShellType {
+  switch (platformShell) {
+    case 'zsh':
+      return 'zsh'
+    case 'bash':
+      return 'bash'
+    case 'powershell5':
+    case 'powershell7':
+      return 'powershell'
+    case 'cmd':
+    case 'fish':
+    case 'unknown':
+    default:
+      return 'unknown'
+  }
+}
+
 /**
  * Shell 历史记录项
  */
@@ -49,14 +73,17 @@ export interface HookStatus {
 
 /**
  * 检测当前 shell 类型
+ * 使用 platform 模块进行跨平台检测
  */
 export function detectShell(): ShellType {
-  const shell = process.env.SHELL || ''
-  if (shell.includes('zsh')) return 'zsh'
-  if (shell.includes('bash')) return 'bash'
-  // Windows PowerShell
-  if (process.platform === 'win32') return 'powershell'
-  return 'unknown'
+  const platformShell = platformDetectShell()
+
+  // CMD 不支持 Hook，提示用户
+  if (platformShell === 'cmd') {
+    return 'unknown'
+  }
+
+  return toLocalShellType(platformShell)
 }
 
 /**
@@ -81,6 +108,36 @@ export function getShellConfigPath(shellType: ShellType): string | null {
   }
 }
 
+/**
+ * 生成命令统计的公共 shell 函数
+ * 用于 zsh 和 bash，避免代码重复
+ */
+function generateStatFunction(): string {
+  return `
+# 统计命令频率（公共函数）
+__pls_record_stat() {
+  local cmd_name="$1"
+  local stats_file="${CONFIG_DIR}/command_stats.txt"
+
+  # 确保文件存在
+  touch "$stats_file"
+
+  # 更新统计（纯 shell 实现，不依赖 jq）
+  if grep -q "^$cmd_name=" "$stats_file" 2>/dev/null; then
+    # 命令已存在，次数 +1
+    local count=$(grep "^$cmd_name=" "$stats_file" | cut -d= -f2)
+    count=$((count + 1))
+    # macOS 和 Linux 的 sed -i 不同，使用临时文件
+    sed "s/^$cmd_name=.*/$cmd_name=$count/" "$stats_file" > "$stats_file.tmp" 2>/dev/null
+    mv "$stats_file.tmp" "$stats_file" 2>/dev/null
+  else
+    # 新命令，追加
+    echo "$cmd_name=1" >> "$stats_file"
+  fi
+}
+`
+}
+
 /**
  * 生成 zsh hook 脚本
  */
@@ -91,6 +148,7 @@ function generateZshHook(): string {
   return `
 ${HOOK_START_MARKER}
 # 记录命令到 pretty-please 历史
+${generateStatFunction()}
 __pls_preexec() {
   __PLS_LAST_CMD="$1"
   __PLS_CMD_START=$(date +%s)
@@ -106,6 +164,11 @@ __pls_precmd() {
     echo "{\\"cmd\\":\\"$escaped_cmd\\",\\"exit\\":$exit_code,\\"time\\":\\"$timestamp\\"}" >> "${CONFIG_DIR}/shell_history.jsonl"
     # 保持文件不超过 ${limit} 行（从配置读取）
     tail -n ${limit} "${CONFIG_DIR}/shell_history.jsonl" > "${CONFIG_DIR}/shell_history.jsonl.tmp" && mv "${CONFIG_DIR}/shell_history.jsonl.tmp" "${CONFIG_DIR}/shell_history.jsonl"
+
+    # 统计命令频率
+    local cmd_name=$(echo "$__PLS_LAST_CMD" | awk '{print $1}')
+    __pls_record_stat "$cmd_name"
+
     unset __PLS_LAST_CMD
   fi
 }
@@ -127,6 +190,7 @@ function generateBashHook(): string {
   return `
 ${HOOK_START_MARKER}
 # 记录命令到 pretty-please 历史
+${generateStatFunction()}
 __pls_prompt_command() {
   local exit_code=$?
   local last_cmd=$(history 1 | sed 's/^ *[0-9]* *//')
@@ -136,6 +200,10 @@ __pls_prompt_command() {
     local escaped_cmd=$(echo "$last_cmd" | sed 's/\\\\/\\\\\\\\/g; s/"/\\\\"/g')
     echo "{\\"cmd\\":\\"$escaped_cmd\\",\\"exit\\":$exit_code,\\"time\\":\\"$timestamp\\"}" >> "${CONFIG_DIR}/shell_history.jsonl"
     tail -n ${limit} "${CONFIG_DIR}/shell_history.jsonl" > "${CONFIG_DIR}/shell_history.jsonl.tmp" && mv "${CONFIG_DIR}/shell_history.jsonl.tmp" "${CONFIG_DIR}/shell_history.jsonl"
+
+    # 统计命令频率
+    local cmd_name=$(echo "$last_cmd" | awk '{print $1}')
+    __pls_record_stat "$cmd_name"
   fi
 }
 
@@ -148,16 +216,27 @@ ${HOOK_END_MARKER}
 
 /**
  * 生成 PowerShell hook 脚本
+ * 使用 PowerShell 原生路径处理，避免跨平台路径问题
  */
 function generatePowerShellHook(): string {
   const config = getConfig()
   const limit = config.shellHistoryLimit || 10  // 从配置读取
 
+  // 使用 PowerShell 原生路径变量，而不是嵌入 Node.js 路径
   return `
 ${HOOK_START_MARKER}
 # 记录命令到 pretty-please 历史
+# 使用 PowerShell 原生路径
+$Global:__PlsDir = Join-Path $env:USERPROFILE ".please"
+$Global:__PlsHistoryFile = Join-Path $Global:__PlsDir "shell_history.jsonl"
+$Global:__PlsStatsFile = Join-Path $Global:__PlsDir "command_stats.txt"
 $Global:__PlsLastCmd = ""
 
+# 确保目录存在
+if (-not (Test-Path $Global:__PlsDir)) {
+    New-Item -Path $Global:__PlsDir -ItemType Directory -Force | Out-Null
+}
+
 function __Pls_RecordCommand {
     $lastCmd = (Get-History -Count 1).CommandLine
     if ($lastCmd -and $lastCmd -ne $Global:__PlsLastCmd) {
@@ -167,10 +246,38 @@ function __Pls_RecordCommand {
         $timestamp = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
         $escapedCmd = $lastCmd -replace '\\\\', '\\\\\\\\' -replace '"', '\\\\"'
         $json = "{\`"cmd\`":\`"$escapedCmd\`",\`"exit\`":$exitCode,\`"time\`":\`"$timestamp\`"}"
-        Add-Content -Path "${CONFIG_DIR}/shell_history.jsonl" -Value $json
+        Add-Content -Path $Global:__PlsHistoryFile -Value $json
         # 保持文件不超过 ${limit} 行（从配置读取）
-        $content = Get-Content "${CONFIG_DIR}/shell_history.jsonl" -Tail ${limit}
-        $content | Set-Content "${CONFIG_DIR}/shell_history.jsonl"
+        $content = Get-Content $Global:__PlsHistoryFile -Tail ${limit} -ErrorAction SilentlyContinue
+        if ($content) {
+            $content | Set-Content $Global:__PlsHistoryFile
+        }
+
+        # 统计命令频率
+        $cmdName = $lastCmd -split ' ' | Select-Object -First 1
+
+        # 确保统计文件存在
+        if (-not (Test-Path $Global:__PlsStatsFile)) {
+            New-Item -Path $Global:__PlsStatsFile -ItemType File -Force | Out-Null
+        }
+
+        # 更新统计
+        $stats = Get-Content $Global:__PlsStatsFile -ErrorAction SilentlyContinue
+        $found = $false
+        $newStats = @()
+        foreach ($line in $stats) {
+            if ($line -match "^$cmdName=(\\d+)$") {
+                $count = [int]$matches[1] + 1
+                $newStats += "$cmdName=$count"
+                $found = $true
+            } else {
+                $newStats += $line
+            }
+        }
+        if (-not $found) {
+            $newStats += "$cmdName=1"
+        }
+        $newStats | Set-Content $Global:__PlsStatsFile
     }
 }
 
@@ -211,6 +318,20 @@ export async function installShellHook(): Promise<boolean> {
 
   if (!configPath) {
     console.log(chalk.hex(colors.error)(`❌ 不支持的 shell 类型: ${shellType}`))
+
+    // CMD 特殊提示
+    if (shellType === 'unknown') {
+      const platformShell = platformDetectShell()
+      if (platformShell === 'cmd') {
+        console.log('')
+        console.log(chalk.hex(colors.warning)('⚠️  CMD 不支持 Shell Hook 功能'))
+        console.log(chalk.hex(colors.secondary)('建议使用 PowerShell 获得完整体验：'))
+        console.log(chalk.hex(colors.secondary)('  1. 按 Win 键搜索 "PowerShell"'))
+        console.log(chalk.hex(colors.secondary)('  2. 在 PowerShell 中运行 pls hook install'))
+        console.log('')
+      }
+    }
+
     return false
   }
 
@@ -518,10 +639,17 @@ export function displayShellHistory(): void {
 }
 
 /**
- * 当 shellHistoryLimit 变化时，自动重装 Hook
- * 返回是否成功重装
+ * 重新安装 Shell Hook（通用函数）
+ * 用于版本升级、配置变更等场景
+ *
+ * @param options.silent 是否静默模式（不输出日志）
+ * @param options.reason 重装原因（用于日志显示）
+ * @returns 是否成功重装
  */
-export async function reinstallHookForLimitChange(oldLimit: number, newLimit: number): Promise<boolean> {
+export async function reinstallShellHook(options?: {
+  silent?: boolean
+  reason?: string
+}): Promise<boolean> {
   const config = getConfig()
 
   // 只有在 hook 已启用时才重装
@@ -529,37 +657,55 @@ export async function reinstallHookForLimitChange(oldLimit: number, newLimit: nu
     return false
   }
 
-  // 值没有变化，不需要重装
-  if (oldLimit === newLimit) {
-    return false
-  }
-
   const colors = getColors()
+  const { silent = false, reason } = options || {}
 
-  console.log('')
-  console.log(chalk.hex(colors.primary)(`检测到 shellHistoryLimit 变化 (${oldLimit} → ${newLimit})`))
-  console.log(chalk.hex(colors.primary)('正在更新 Shell Hook...'))
+  if (!silent) {
+    console.log('')
+    if (reason) {
+      console.log(chalk.hex(colors.primary)(reason))
+    }
+    console.log(chalk.hex(colors.primary)('正在更新 Shell Hook...'))
+  }
 
+  // 卸载旧版本，安装新版本
   uninstallShellHook()
   await installShellHook()
 
-  console.log('')
-  console.log(chalk.hex(colors.warning)('⚠️  请重启终端或运行以下命令使新配置生效:'))
+  if (!silent) {
+    console.log('')
+    console.log(chalk.hex(colors.warning)('⚠️  请重启终端或运行以下命令使新配置生效:'))
+
+    const shellType = detectShell()
+    let configFile = '~/.zshrc'
+    if (shellType === 'bash') {
+      configFile = process.platform === 'darwin' ? '~/.bash_profile' : '~/.bashrc'
+    } else if (shellType === 'powershell') {
+      configFile = '~/Documents/PowerShell/Microsoft.PowerShell_profile.ps1'
+    }
 
-  const shellType = detectShell()
-  let configFile = '~/.zshrc'
-  if (shellType === 'bash') {
-    configFile = process.platform === 'darwin' ? '~/.bash_profile' : '~/.bashrc'
-  } else if (shellType === 'powershell') {
-    configFile = '~/Documents/PowerShell/Microsoft.PowerShell_profile.ps1'
+    console.log(chalk.gray(`  source ${configFile}`))
+    console.log('')
   }
 
-  console.log(chalk.gray(`  source ${configFile}`))
-  console.log('')
-
   return true
 }
 
+/**
+ * 当 shellHistoryLimit 变化时，自动重装 Hook
+ * 返回是否成功重装
+ */
+export async function reinstallHookForLimitChange(oldLimit: number, newLimit: number): Promise<boolean> {
+  // 值没有变化，不需要重装
+  if (oldLimit === newLimit) {
+    return false
+  }
+
+  return reinstallShellHook({
+    reason: `检测到 shellHistoryLimit 变化 (${oldLimit} → ${newLimit})`,
+  })
+}
+
 /**
  * 清空 shell 历史
  */
@@ -641,7 +787,7 @@ export function formatShellHistoryForAIWithFallback(): string {
   }
 
   // 格式化系统历史（简单格式，无详细信息）
-  const lines = history.map((item, index) => {
+  const lines = history.map((item: ShellHistoryItem, index: number) => {
     const status = item.exit === 0 ? '✓' : `✗ 退出码:${item.exit}`
     return `${index + 1}. ${item.cmd} ${status}`
   })