@yivan-lab/pretty-please 1.1.0 → 1.2.0

package/src/shell-hook.ts

@@ -4,6 +4,19 @@ 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
@@ -186,15 +199,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 +216,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 +240,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 +253,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 +268,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 +286,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
 }
@@ -430,11 +445,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 +468,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 +481,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}`)
     }
   })
 
@@ -496,7 +512,243 @@ 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 {
+  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
+    # 保持文件不超过 50 行
+    tail -n 50 ~/.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 {
+  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 50 ~/.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 }
+}

package/src/ui/theme.ts

@@ -1,29 +1,53 @@
-// 主题配置 - 优雅的配色方案
-export const theme = {
-  // 主色调
-  primary: '#00D9FF',      // 青色 - 主要交互元素
-  secondary: '#A78BFA',    // 紫色 - 次要元素
-  accent: '#F472B6',       // 粉色 - 强调元素
+import fs from 'fs'
+import path from 'path'
+import os from 'os'
 
-  // 状态色
-  success: '#10B981',      // 绿色 - 成功
-  error: '#EF4444',        // 红色 - 错误
-  warning: '#F59E0B',      // 橙色 - 警告
-  info: '#3B82F6',         // 蓝色 - 信息
+// 主题类型定义
+export type ThemeName = 'dark' | 'light'
 
-  // 文本色
+export interface Theme {
+  primary: string
+  secondary: string
+  accent: string
+  success: string
+  error: string
+  warning: string
+  info: string
   text: {
-    primary: '#E5E7EB',    // 主文本
-    secondary: '#9CA3AF',  // 次要文本
-    muted: '#6B7280',      // 弱化文本
-    dim: '#4B5563',        // 暗淡文本
-  },
-
-  // 边框和分隔
-  border: '#374151',       // 边框色
-  divider: '#1F2937',      // 分隔线
+    primary: string
+    secondary: string
+    muted: string
+    dim: string
+  }
+  border: string
+  divider: string
+  code: {
+    background: string
+    text: string
+    keyword: string
+    string: string
+    function: string
+    comment: string
+  }
+}
 
-  // 代码相关
+// 深色主题（原默认主题）
+const darkTheme: Theme = {
+  primary: '#00D9FF',
+  secondary: '#A78BFA',
+  accent: '#F472B6',
+  success: '#10B981',
+  error: '#EF4444',
+  warning: '#F59E0B',
+  info: '#3B82F6',
+  text: {
+    primary: '#E5E7EB',
+    secondary: '#9CA3AF',
+    muted: '#6B7280',
+    dim: '#4B5563',
+  },
+  border: '#374151',
+  divider: '#1F2937',
   code: {
     background: '#1F2937',
     text: '#E5E7EB',
@@ -31,7 +55,60 @@ export const theme = {
     string: '#98C379',
     function: '#61AFEF',
     comment: '#5C6370',
+  },
+}
+
+// 浅色主题（白色/浅色终端背景）
+// 所有颜色都要在白色背景上清晰可见
+const lightTheme: Theme = {
+  primary: '#0369A1',      // 深天蓝，在白底上醒目
+  secondary: '#6D28D9',    // 深紫色
+  accent: '#BE185D',       // 深粉色
+  success: '#047857',      // 深绿色
+  error: '#B91C1C',        // 深红色
+  warning: '#B45309',      // 深橙色
+  info: '#1D4ED8',         // 深蓝色
+  text: {
+    primary: '#111827',    // 近黑色，主要文字
+    secondary: '#374151',  // 深灰色
+    muted: '#4B5563',      // 中灰色
+    dim: '#6B7280',        // 浅灰色
+  },
+  border: '#6B7280',       // 边框要明显
+  divider: '#9CA3AF',
+  code: {
+    background: '#F3F4F6',
+    text: '#111827',
+    keyword: '#6D28D9',
+    string: '#047857',
+    function: '#0369A1',
+    comment: '#4B5563',
+  },
+}
+
+// 所有主题
+export const themes: Record<ThemeName, Theme> = {
+  dark: darkTheme,
+  light: lightTheme,
+}
+
+// 获取当前主题
+export function getCurrentTheme(): Theme {
+  // 直接读取配置文件，避免循环依赖
+  try {
+    const configPath = path.join(os.homedir(), '.please', 'config.json')
+    if (fs.existsSync(configPath)) {
+      const content = fs.readFileSync(configPath, 'utf-8')
+      const config = JSON.parse(content)
+      if (config.theme && themes[config.theme as ThemeName]) {
+        return themes[config.theme as ThemeName]
+      }
+    }
+  } catch {
+    // 忽略错误，返回默认主题
   }
-} as const
+  return themes.dark
+}
 
-export type Theme = typeof theme
+// 向后兼容：导出默认主题
+export const theme = darkTheme