@yivan-lab/pretty-please 1.1.0 → 1.3.0

package/src/shell-hook.ts

@@ -4,9 +4,21 @@ import os from 'os'
 import chalk from 'chalk'
 import { CONFIG_DIR, getConfig, setConfigValue } from './config.js'
 import { getHistory } from './history.js'
+import { getCurrentTheme } from './ui/theme.js'
+
+// 获取主题颜色
+function getColors() {
+  const theme = getCurrentTheme()
+  return {
+    primary: theme.primary,
+    success: theme.success,
+    error: theme.error,
+    warning: theme.warning,
+    secondary: theme.secondary,
+  }
+}
 
 const SHELL_HISTORY_FILE = path.join(CONFIG_DIR, 'shell_history.jsonl')
-const MAX_SHELL_HISTORY = 20
 
 // Hook 标记，用于识别我们添加的内容
 const HOOK_START_MARKER = '# >>> pretty-please shell hook >>>'
@@ -73,6 +85,9 @@ export function getShellConfigPath(shellType: ShellType): string | null {
  * 生成 zsh hook 脚本
  */
 function generateZshHook(): string {
+  const config = getConfig()
+  const limit = config.shellHistoryLimit || 10  // 从配置读取
+
   return `
 ${HOOK_START_MARKER}
 # 记录命令到 pretty-please 历史
@@ -89,8 +104,8 @@ __pls_precmd() {
     # 转义命令中的特殊字符
     local escaped_cmd=$(echo "$__PLS_LAST_CMD" | sed 's/\\\\/\\\\\\\\/g; s/"/\\\\"/g')
     echo "{\\"cmd\\":\\"$escaped_cmd\\",\\"exit\\":$exit_code,\\"time\\":\\"$timestamp\\"}" >> "${CONFIG_DIR}/shell_history.jsonl"
-    # 保持文件不超过 ${MAX_SHELL_HISTORY} 行
-    tail -n ${MAX_SHELL_HISTORY} "${CONFIG_DIR}/shell_history.jsonl" > "${CONFIG_DIR}/shell_history.jsonl.tmp" && mv "${CONFIG_DIR}/shell_history.jsonl.tmp" "${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"
     unset __PLS_LAST_CMD
   fi
 }
@@ -106,6 +121,9 @@ ${HOOK_END_MARKER}
  * 生成 bash hook 脚本
  */
 function generateBashHook(): string {
+  const config = getConfig()
+  const limit = config.shellHistoryLimit || 10  // 从配置读取
+
   return `
 ${HOOK_START_MARKER}
 # 记录命令到 pretty-please 历史
@@ -117,7 +135,7 @@ __pls_prompt_command() {
     local timestamp=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
     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 ${MAX_SHELL_HISTORY} "${CONFIG_DIR}/shell_history.jsonl" > "${CONFIG_DIR}/shell_history.jsonl.tmp" && mv "${CONFIG_DIR}/shell_history.jsonl.tmp" "${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"
   fi
 }
 
@@ -132,6 +150,9 @@ ${HOOK_END_MARKER}
  * 生成 PowerShell hook 脚本
  */
 function generatePowerShellHook(): string {
+  const config = getConfig()
+  const limit = config.shellHistoryLimit || 10  // 从配置读取
+
   return `
 ${HOOK_START_MARKER}
 # 记录命令到 pretty-please 历史
@@ -147,8 +168,8 @@ function __Pls_RecordCommand {
         $escapedCmd = $lastCmd -replace '\\\\', '\\\\\\\\' -replace '"', '\\\\"'
         $json = "{\`"cmd\`":\`"$escapedCmd\`",\`"exit\`":$exitCode,\`"time\`":\`"$timestamp\`"}"
         Add-Content -Path "${CONFIG_DIR}/shell_history.jsonl" -Value $json
-        # 保持文件不超过 ${MAX_SHELL_HISTORY} 行
-        $content = Get-Content "${CONFIG_DIR}/shell_history.jsonl" -Tail ${MAX_SHELL_HISTORY}
+        # 保持文件不超过 ${limit} 行（从配置读取）
+        $content = Get-Content "${CONFIG_DIR}/shell_history.jsonl" -Tail ${limit}
         $content | Set-Content "${CONFIG_DIR}/shell_history.jsonl"
     }
 }
@@ -186,15 +207,16 @@ function generateHookScript(shellType: ShellType): string | null {
 export async function installShellHook(): Promise<boolean> {
   const shellType = detectShell()
   const configPath = getShellConfigPath(shellType)
+  const colors = getColors()
 
   if (!configPath) {
-    console.log(chalk.red(`❌ 不支持的 shell 类型: ${shellType}`))
+    console.log(chalk.hex(colors.error)(`❌ 不支持的 shell 类型: ${shellType}`))
     return false
   }
 
   const hookScript = generateHookScript(shellType)
   if (!hookScript) {
-    console.log(chalk.red(`❌ 无法为 ${shellType} 生成 hook 脚本`))
+    console.log(chalk.hex(colors.error)(`❌ 无法为 ${shellType} 生成 hook 脚本`))
     return false
   }
 
@@ -202,7 +224,7 @@ export async function installShellHook(): Promise<boolean> {
   if (fs.existsSync(configPath)) {
     const content = fs.readFileSync(configPath, 'utf-8')
     if (content.includes(HOOK_START_MARKER)) {
-      console.log(chalk.yellow('⚠️  Shell hook 已安装，跳过'))
+      console.log(chalk.hex(colors.warning)('⚠️  Shell hook 已安装，跳过'))
       setConfigValue('shellHook', true)
       return true
     }
@@ -226,9 +248,9 @@ export async function installShellHook(): Promise<boolean> {
   // 更新配置
   setConfigValue('shellHook', true)
 
-  console.log(chalk.green(`✅ Shell hook 已安装到: ${configPath}`))
-  console.log(chalk.yellow('⚠️  请重启终端或执行以下命令使其生效:'))
-  console.log(chalk.cyan(`   source ${configPath}`))
+  console.log(chalk.hex(colors.success)(`✅ Shell hook 已安装到: ${configPath}`))
+  console.log(chalk.hex(colors.warning)('⚠️  请重启终端或执行以下命令使其生效:'))
+  console.log(chalk.hex(colors.primary)(`   source ${configPath}`))
 
   return true
 }
@@ -239,9 +261,10 @@ export async function installShellHook(): Promise<boolean> {
 export function uninstallShellHook(): boolean {
   const shellType = detectShell()
   const configPath = getShellConfigPath(shellType)
+  const colors = getColors()
 
   if (!configPath || !fs.existsSync(configPath)) {
-    console.log(chalk.yellow('⚠️  未找到 shell 配置文件'))
+    console.log(chalk.hex(colors.warning)('⚠️  未找到 shell 配置文件'))
     setConfigValue('shellHook', false)
     return true
   }
@@ -253,7 +276,7 @@ export function uninstallShellHook(): boolean {
   const endIndex = content.indexOf(HOOK_END_MARKER)
 
   if (startIndex === -1 || endIndex === -1) {
-    console.log(chalk.yellow('⚠️  未找到已安装的 hook'))
+    console.log(chalk.hex(colors.warning)('⚠️  未找到已安装的 hook'))
     setConfigValue('shellHook', false)
     return true
   }
@@ -271,8 +294,8 @@ export function uninstallShellHook(): boolean {
     fs.unlinkSync(SHELL_HISTORY_FILE)
   }
 
-  console.log(chalk.green('✅ Shell hook 已卸载'))
-  console.log(chalk.yellow('⚠️  请重启终端使其生效'))
+  console.log(chalk.hex(colors.success)('✅ Shell hook 已卸载'))
+  console.log(chalk.hex(colors.warning)('⚠️  请重启终端使其生效'))
 
   return true
 }
@@ -299,7 +322,7 @@ export function getShellHistory(): ShellHistoryItem[] {
       .split('\n')
       .filter((line) => line.trim())
 
-    return lines
+    const allHistory = lines
       .map((line) => {
         try {
           return JSON.parse(line) as ShellHistoryItem
@@ -308,6 +331,10 @@ export function getShellHistory(): ShellHistoryItem[] {
         }
       })
       .filter((item): item is ShellHistoryItem => item !== null)
+
+    // 应用 shellHistoryLimit 限制：只返回最近的 N 条
+    const limit = config.shellHistoryLimit || 15
+    return allHistory.slice(-limit)
   } catch {
     return []
   }
@@ -430,11 +457,12 @@ export function getHookStatus(): HookStatus {
 export function displayShellHistory(): void {
   const config = getConfig()
   const history = getShellHistory()
+  const colors = getColors()
 
   if (!config.shellHook) {
     console.log('')
-    console.log(chalk.yellow('⚠️  Shell Hook 未启用'))
-    console.log(chalk.gray('运行 ') + chalk.cyan('pls hook install') + chalk.gray(' 启用 Shell Hook'))
+    console.log(chalk.hex(colors.warning)('⚠️  Shell Hook 未启用'))
+    console.log(chalk.gray('运行 ') + chalk.hex(colors.primary)('pls hook install') + chalk.gray(' 启用 Shell Hook'))
     console.log('')
     return
   }
@@ -452,7 +480,7 @@ export function displayShellHistory(): void {
 
   history.forEach((item, index) => {
     const num = index + 1
-    const status = item.exit === 0 ? chalk.green('✓') : chalk.red(`✗ (${item.exit})`)
+    const status = item.exit === 0 ? chalk.hex(colors.success)('✓') : chalk.hex(colors.error)(`✗ (${item.exit})`)
 
     // 检查是否是 pls 命令
     const isPls = item.cmd.startsWith('pls ') || item.cmd.startsWith('please ')
@@ -465,21 +493,21 @@ export function displayShellHistory(): void {
       if (plsRecord && plsRecord.executed) {
         // 检查用户是否修改了命令
         if (plsRecord.userModified && plsRecord.aiGeneratedCommand) {
-          console.log(`  ${chalk.cyan(num.toString().padStart(2, ' '))}. ${chalk.magenta('[pls]')} "${args}"`)
+          console.log(`  ${chalk.hex(colors.primary)(num.toString().padStart(2, ' '))}. ${chalk.hex(colors.secondary)('[pls]')} "${args}"`)
           console.log(`     ${chalk.dim('AI 生成:')} ${chalk.gray(plsRecord.aiGeneratedCommand)}`)
           console.log(
-            `     ${chalk.dim('用户修改为:')} ${plsRecord.command} ${status} ${chalk.yellow('(已修改)')}`
+            `     ${chalk.dim('用户修改为:')} ${plsRecord.command} ${status} ${chalk.hex(colors.warning)('(已修改)')}`
           )
         } else {
           console.log(
-            `  ${chalk.cyan(num.toString().padStart(2, ' '))}. ${chalk.magenta('[pls]')} "${args}" → ${plsRecord.command} ${status}`
+            `  ${chalk.hex(colors.primary)(num.toString().padStart(2, ' '))}. ${chalk.hex(colors.secondary)('[pls]')} "${args}" → ${plsRecord.command} ${status}`
           )
         }
       } else {
-        console.log(`  ${chalk.cyan(num.toString().padStart(2, ' '))}. ${chalk.magenta('[pls]')} ${args} ${status}`)
+        console.log(`  ${chalk.hex(colors.primary)(num.toString().padStart(2, ' '))}. ${chalk.hex(colors.secondary)('[pls]')} ${args} ${status}`)
       }
     } else {
-      console.log(`  ${chalk.cyan(num.toString().padStart(2, ' '))}. ${item.cmd} ${status}`)
+      console.log(`  ${chalk.hex(colors.primary)(num.toString().padStart(2, ' '))}. ${item.cmd} ${status}`)
     }
   })
 
@@ -489,6 +517,49 @@ export function displayShellHistory(): void {
   console.log('')
 }
 
+/**
+ * 当 shellHistoryLimit 变化时，自动重装 Hook
+ * 返回是否成功重装
+ */
+export async function reinstallHookForLimitChange(oldLimit: number, newLimit: number): Promise<boolean> {
+  const config = getConfig()
+
+  // 只有在 hook 已启用时才重装
+  if (!config.shellHook) {
+    return false
+  }
+
+  // 值没有变化，不需要重装
+  if (oldLimit === newLimit) {
+    return false
+  }
+
+  const colors = getColors()
+
+  console.log('')
+  console.log(chalk.hex(colors.primary)(`检测到 shellHistoryLimit 变化 (${oldLimit} → ${newLimit})`))
+  console.log(chalk.hex(colors.primary)('正在更新 Shell Hook...'))
+
+  uninstallShellHook()
+  await installShellHook()
+
+  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'
+  }
+
+  console.log(chalk.gray(`  source ${configFile}`))
+  console.log('')
+
+  return true
+}
+
 /**
  * 清空 shell 历史
  */
@@ -496,7 +567,249 @@ export function clearShellHistory(): void {
   if (fs.existsSync(SHELL_HISTORY_FILE)) {
     fs.unlinkSync(SHELL_HISTORY_FILE)
   }
+  const colors = getColors()
   console.log('')
-  console.log(chalk.green('✓ Shell 历史已清空'))
+  console.log(chalk.hex(colors.success)('✓ Shell 历史已清空'))
   console.log('')
 }
+
+// ================== 远程 Shell Hook ==================
+
+/**
+ * 生成远程 zsh hook 脚本
+ */
+function generateRemoteZshHook(): string {
+  const config = getConfig()
+  const limit = config.shellHistoryLimit || 10  // 从配置读取
+
+  return `
+${HOOK_START_MARKER}
+# 记录命令到 pretty-please 历史
+__pls_preexec() {
+  __PLS_LAST_CMD="$1"
+  __PLS_CMD_START=$(date +%s)
+}
+
+__pls_precmd() {
+  local exit_code=$?
+  if [[ -n "$__PLS_LAST_CMD" ]]; then
+    local end_time=$(date +%s)
+    local timestamp=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
+    # 确保目录存在
+    mkdir -p ~/.please
+    # 转义命令中的特殊字符
+    local escaped_cmd=$(echo "$__PLS_LAST_CMD" | sed 's/\\\\/\\\\\\\\/g; s/"/\\\\"/g')
+    echo "{\\"cmd\\":\\"$escaped_cmd\\",\\"exit\\":$exit_code,\\"time\\":\\"$timestamp\\"}" >> ~/.please/shell_history.jsonl
+    # 保持文件不超过 ${limit} 行（从配置读取）
+    tail -n ${limit} ~/.please/shell_history.jsonl > ~/.please/shell_history.jsonl.tmp && mv ~/.please/shell_history.jsonl.tmp ~/.please/shell_history.jsonl
+    unset __PLS_LAST_CMD
+  fi
+}
+
+autoload -Uz add-zsh-hook
+add-zsh-hook preexec __pls_preexec
+add-zsh-hook precmd __pls_precmd
+${HOOK_END_MARKER}
+`
+}
+
+/**
+ * 生成远程 bash hook 脚本
+ */
+function generateRemoteBashHook(): string {
+  const config = getConfig()
+  const limit = config.shellHistoryLimit || 10  // 从配置读取
+
+  return `
+${HOOK_START_MARKER}
+# 记录命令到 pretty-please 历史
+__pls_prompt_command() {
+  local exit_code=$?
+  local last_cmd=$(history 1 | sed 's/^ *[0-9]* *//')
+  if [[ -n "$last_cmd" && "$last_cmd" != "$__PLS_LAST_CMD" ]]; then
+    __PLS_LAST_CMD="$last_cmd"
+    local timestamp=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
+    # 确保目录存在
+    mkdir -p ~/.please
+    local escaped_cmd=$(echo "$last_cmd" | sed 's/\\\\/\\\\\\\\/g; s/"/\\\\"/g')
+    echo "{\\"cmd\\":\\"$escaped_cmd\\",\\"exit\\":$exit_code,\\"time\\":\\"$timestamp\\"}" >> ~/.please/shell_history.jsonl
+    tail -n ${limit} ~/.please/shell_history.jsonl > ~/.please/shell_history.jsonl.tmp && mv ~/.please/shell_history.jsonl.tmp ~/.please/shell_history.jsonl
+  fi
+}
+
+if [[ ! "$PROMPT_COMMAND" =~ __pls_prompt_command ]]; then
+  PROMPT_COMMAND="__pls_prompt_command;\${PROMPT_COMMAND}"
+fi
+${HOOK_END_MARKER}
+`
+}
+
+/**
+ * 检测远程服务器的 shell 类型
+ */
+export async function detectRemoteShell(sshExecFn: (cmd: string) => Promise<{ stdout: string; exitCode: number }>): Promise<ShellType> {
+  try {
+    const result = await sshExecFn('basename "$SHELL"')
+    if (result.exitCode === 0) {
+      const shell = result.stdout.trim()
+      if (shell === 'zsh') return 'zsh'
+      if (shell === 'bash') return 'bash'
+    }
+  } catch {
+    // 忽略错误
+  }
+  return 'bash' // 默认 bash
+}
+
+/**
+ * 获取远程 shell 配置文件路径
+ */
+export function getRemoteShellConfigPath(shellType: ShellType): string {
+  switch (shellType) {
+    case 'zsh':
+      return '~/.zshrc'
+    case 'bash':
+      return '~/.bashrc'
+    default:
+      return '~/.bashrc'
+  }
+}
+
+/**
+ * 生成远程 hook 脚本
+ */
+export function generateRemoteHookScript(shellType: ShellType): string | null {
+  switch (shellType) {
+    case 'zsh':
+      return generateRemoteZshHook()
+    case 'bash':
+      return generateRemoteBashHook()
+    default:
+      return null
+  }
+}
+
+/**
+ * 检查远程 hook 是否已安装
+ */
+export async function checkRemoteHookInstalled(
+  sshExecFn: (cmd: string) => Promise<{ stdout: string; exitCode: number }>,
+  configPath: string
+): Promise<boolean> {
+  try {
+    const result = await sshExecFn(`grep -q "${HOOK_START_MARKER}" ${configPath} 2>/dev/null && echo "installed" || echo "not_installed"`)
+    return result.stdout.trim() === 'installed'
+  } catch {
+    return false
+  }
+}
+
+/**
+ * 在远程服务器安装 shell hook
+ */
+export async function installRemoteShellHook(
+  sshExecFn: (cmd: string) => Promise<{ stdout: string; exitCode: number }>,
+  shellType: ShellType
+): Promise<{ success: boolean; message: string }> {
+  const colors = getColors()
+  const configPath = getRemoteShellConfigPath(shellType)
+  const hookScript = generateRemoteHookScript(shellType)
+
+  if (!hookScript) {
+    return { success: false, message: chalk.hex(colors.error)(`不支持的 shell 类型: ${shellType}`) }
+  }
+
+  // 检查是否已安装
+  const installed = await checkRemoteHookInstalled(sshExecFn, configPath)
+  if (installed) {
+    return { success: true, message: chalk.hex(colors.warning)('Shell hook 已安装，跳过') }
+  }
+
+  // 备份原配置文件
+  try {
+    await sshExecFn(`cp ${configPath} ${configPath}.pls-backup 2>/dev/null || true`)
+  } catch {
+    // 忽略备份错误
+  }
+
+  // 安装 hook
+  // 使用 cat 和 heredoc 来追加内容
+  const escapedScript = hookScript.replace(/'/g, "'\"'\"'")
+  const installCmd = `echo '${escapedScript}' >> ${configPath}`
+
+  try {
+    const result = await sshExecFn(installCmd)
+    if (result.exitCode !== 0) {
+      return { success: false, message: chalk.hex(colors.error)(`安装失败: ${result.stdout}`) }
+    }
+
+    // 确保 ~/.please 目录存在
+    await sshExecFn('mkdir -p ~/.please')
+
+    return {
+      success: true,
+      message: chalk.hex(colors.success)(`Shell hook 已安装到 ${configPath}`),
+    }
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error)
+    return { success: false, message: chalk.hex(colors.error)(`安装失败: ${message}`) }
+  }
+}
+
+/**
+ * 从远程服务器卸载 shell hook
+ */
+export async function uninstallRemoteShellHook(
+  sshExecFn: (cmd: string) => Promise<{ stdout: string; exitCode: number }>,
+  shellType: ShellType
+): Promise<{ success: boolean; message: string }> {
+  const colors = getColors()
+  const configPath = getRemoteShellConfigPath(shellType)
+
+  // 检查是否已安装
+  const installed = await checkRemoteHookInstalled(sshExecFn, configPath)
+  if (!installed) {
+    return { success: true, message: chalk.hex(colors.warning)('Shell hook 未安装，跳过') }
+  }
+
+  // 使用 sed 删除 hook 代码块
+  // 注意：需要处理特殊字符
+  const startMarkerEscaped = HOOK_START_MARKER.replace(/[[\]]/g, '\\$&')
+  const endMarkerEscaped = HOOK_END_MARKER.replace(/[[\]]/g, '\\$&')
+
+  // 在 macOS 和 Linux 上 sed -i 行为不同，使用 sed + 临时文件
+  const uninstallCmd = `
+sed '/${startMarkerEscaped}/,/${endMarkerEscaped}/d' ${configPath} > ${configPath}.tmp && mv ${configPath}.tmp ${configPath}
+`
+
+  try {
+    const result = await sshExecFn(uninstallCmd)
+    if (result.exitCode !== 0) {
+      return { success: false, message: chalk.hex(colors.error)(`卸载失败: ${result.stdout}`) }
+    }
+
+    return {
+      success: true,
+      message: chalk.hex(colors.success)('Shell hook 已卸载'),
+    }
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error)
+    return { success: false, message: chalk.hex(colors.error)(`卸载失败: ${message}`) }
+  }
+}
+
+/**
+ * 获取远程 hook 状态
+ */
+export async function getRemoteHookStatus(
+  sshExecFn: (cmd: string) => Promise<{ stdout: string; exitCode: number }>
+): Promise<{ installed: boolean; shellType: ShellType; configPath: string }> {
+  // 检测 shell 类型
+  const shellType = await detectRemoteShell(sshExecFn)
+  const configPath = getRemoteShellConfigPath(shellType)
+
+  // 检查是否已安装
+  const installed = await checkRemoteHookInstalled(sshExecFn, configPath)
+
+  return { installed, shellType, configPath }
+}