@yivan-lab/pretty-please 1.0.0 → 1.2.0

package/dist/src/shell-hook.d.ts

@@ -1,35 +1,110 @@
+type ShellType = 'zsh' | 'bash' | 'powershell' | 'unknown';
+/**
+ * Shell 历史记录项
+ */
+export interface ShellHistoryItem {
+    cmd: string;
+    exit: number;
+    time: string;
+}
+/**
+ * Hook 状态
+ */
+export interface HookStatus {
+    enabled: boolean;
+    installed: boolean;
+    shellType: ShellType;
+    configPath: string | null;
+    historyFile: string;
+}
 /**
  * 检测当前 shell 类型
  */
-export function detectShell(): "unknown" | "zsh" | "bash" | "powershell";
+export declare function detectShell(): ShellType;
 /**
  * 获取 shell 配置文件路径
  */
-export function getShellConfigPath(shellType: any): string | null;
+export declare function getShellConfigPath(shellType: ShellType): string | null;
 /**
  * 安装 shell hook
  */
-export function installShellHook(): Promise<boolean>;
+export declare function installShellHook(): Promise<boolean>;
 /**
  * 卸载 shell hook
  */
-export function uninstallShellHook(): boolean;
+export declare function uninstallShellHook(): boolean;
 /**
  * 读取 shell 历史记录
  */
-export function getShellHistory(): any[];
+export declare function getShellHistory(): ShellHistoryItem[];
 /**
  * 格式化 shell 历史供 AI 使用
  * 对于 pls 命令，会从 pls history 中查找对应的详细信息
  */
-export function formatShellHistoryForAI(): string;
+export declare function formatShellHistoryForAI(): string;
 /**
  * 获取 hook 状态
  */
-export function getHookStatus(): {
-    enabled: any;
+export declare function getHookStatus(): HookStatus;
+/**
+ * 显示 shell 历史
+ */
+export declare function displayShellHistory(): void;
+/**
+ * 清空 shell 历史
+ */
+export declare function clearShellHistory(): void;
+/**
+ * 检测远程服务器的 shell 类型
+ */
+export declare function detectRemoteShell(sshExecFn: (cmd: string) => Promise<{
+    stdout: string;
+    exitCode: number;
+}>): Promise<ShellType>;
+/**
+ * 获取远程 shell 配置文件路径
+ */
+export declare function getRemoteShellConfigPath(shellType: ShellType): string;
+/**
+ * 生成远程 hook 脚本
+ */
+export declare function generateRemoteHookScript(shellType: ShellType): string | null;
+/**
+ * 检查远程 hook 是否已安装
+ */
+export declare function checkRemoteHookInstalled(sshExecFn: (cmd: string) => Promise<{
+    stdout: string;
+    exitCode: number;
+}>, configPath: string): Promise<boolean>;
+/**
+ * 在远程服务器安装 shell hook
+ */
+export declare function installRemoteShellHook(sshExecFn: (cmd: string) => Promise<{
+    stdout: string;
+    exitCode: number;
+}>, shellType: ShellType): Promise<{
+    success: boolean;
+    message: string;
+}>;
+/**
+ * 从远程服务器卸载 shell hook
+ */
+export declare function uninstallRemoteShellHook(sshExecFn: (cmd: string) => Promise<{
+    stdout: string;
+    exitCode: number;
+}>, shellType: ShellType): Promise<{
+    success: boolean;
+    message: string;
+}>;
+/**
+ * 获取远程 hook 状态
+ */
+export declare function getRemoteHookStatus(sshExecFn: (cmd: string) => Promise<{
+    stdout: string;
+    exitCode: number;
+}>): Promise<{
     installed: boolean;
-    shellType: string;
-    configPath: string | null;
-    historyFile: string;
-};
+    shellType: ShellType;
+    configPath: string;
+}>;
+export {};

package/dist/src/shell-hook.js

@@ -4,6 +4,18 @@ 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 标记，用于识别我们添加的内容
@@ -157,20 +169,21 @@ function generateHookScript(shellType) {
 export async function installShellHook() {
     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;
     }
     // 检查是否已安装
     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;
         }
@@ -189,9 +202,9 @@ export async function installShellHook() {
     fs.appendFileSync(configPath, hookScript);
     // 更新配置
     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;
 }
 /**
@@ -200,8 +213,9 @@ export async function installShellHook() {
 export function uninstallShellHook() {
     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;
     }
@@ -210,7 +224,7 @@ export function uninstallShellHook() {
     const startIndex = content.indexOf(HOOK_START_MARKER);
     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;
     }
@@ -224,8 +238,8 @@ export function uninstallShellHook() {
     if (fs.existsSync(SHELL_HISTORY_FILE)) {
         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;
 }
 /**
@@ -242,15 +256,20 @@ export function getShellHistory() {
     }
     try {
         const content = fs.readFileSync(SHELL_HISTORY_FILE, 'utf-8');
-        const lines = content.trim().split('\n').filter(line => line.trim());
-        return lines.map(line => {
+        const lines = content
+            .trim()
+            .split('\n')
+            .filter((line) => line.trim());
+        return lines
+            .map((line) => {
             try {
                 return JSON.parse(line);
             }
             catch {
                 return null;
             }
-        }).filter(Boolean);
+        })
+            .filter((item) => item !== null);
     }
     catch {
         return [];
@@ -258,8 +277,6 @@ export function getShellHistory() {
 }
 /**
  * 从 pls history 中查找匹配的记录
- * @param {string} prompt - pls 命令后面的 prompt 部分
- * @returns {object|null} 匹配的 pls history 记录
  */
 function findPlsHistoryMatch(prompt) {
     const plsHistory = getHistory();
@@ -312,7 +329,13 @@ export function formatShellHistoryForAI() {
                 }
                 else if (plsRecord.executed) {
                     const execStatus = plsRecord.exitCode === 0 ? '✓' : `✗ 退出码:${plsRecord.exitCode}`;
-                    return `${index + 1}. [pls] "${prompt}" → 实际执行: ${plsRecord.command} ${execStatus}`;
+                    // 检查用户是否修改了命令
+                    if (plsRecord.userModified && plsRecord.aiGeneratedCommand) {
+                        return `${index + 1}. [pls] "${prompt}" → AI 生成: ${plsRecord.aiGeneratedCommand} / 用户修改为: ${plsRecord.command} ${execStatus}`;
+                    }
+                    else {
+                        return `${index + 1}. [pls] "${prompt}" → 实际执行: ${plsRecord.command} ${execStatus}`;
+                    }
                 }
                 else {
                     return `${index + 1}. [pls] "${prompt}" → 生成命令: ${plsRecord.command} (用户取消执行)`;
@@ -343,6 +366,281 @@ export function getHookStatus() {
         installed,
         shellType,
         configPath,
-        historyFile: SHELL_HISTORY_FILE
+        historyFile: SHELL_HISTORY_FILE,
     };
 }
+/**
+ * 显示 shell 历史
+ */
+export function displayShellHistory() {
+    const config = getConfig();
+    const history = getShellHistory();
+    const colors = getColors();
+    if (!config.shellHook) {
+        console.log('');
+        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;
+    }
+    if (history.length === 0) {
+        console.log('');
+        console.log(chalk.gray('暂无 Shell 历史记录'));
+        console.log('');
+        return;
+    }
+    console.log('');
+    console.log(chalk.bold(`终端历史（最近 ${history.length} 条）:`));
+    console.log(chalk.gray('━'.repeat(50)));
+    history.forEach((item, index) => {
+        const num = index + 1;
+        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 ');
+        if (isPls) {
+            // pls 命令：尝试从 history 查找详细信息
+            const args = item.cmd.replace(/^(pls|please)\s+/, '');
+            const plsRecord = findPlsHistoryMatch(args);
+            if (plsRecord && plsRecord.executed) {
+                // 检查用户是否修改了命令
+                if (plsRecord.userModified && plsRecord.aiGeneratedCommand) {
+                    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.hex(colors.warning)('(已修改)')}`);
+                }
+                else {
+                    console.log(`  ${chalk.hex(colors.primary)(num.toString().padStart(2, ' '))}. ${chalk.hex(colors.secondary)('[pls]')} "${args}" → ${plsRecord.command} ${status}`);
+                }
+            }
+            else {
+                console.log(`  ${chalk.hex(colors.primary)(num.toString().padStart(2, ' '))}. ${chalk.hex(colors.secondary)('[pls]')} ${args} ${status}`);
+            }
+        }
+        else {
+            console.log(`  ${chalk.hex(colors.primary)(num.toString().padStart(2, ' '))}. ${item.cmd} ${status}`);
+        }
+    });
+    console.log(chalk.gray('━'.repeat(50)));
+    console.log(chalk.gray(`配置: 保留最近 ${config.shellHistoryLimit} 条`));
+    console.log(chalk.gray(`文件: ${SHELL_HISTORY_FILE}`));
+    console.log('');
+}
+/**
+ * 清空 shell 历史
+ */
+export function clearShellHistory() {
+    if (fs.existsSync(SHELL_HISTORY_FILE)) {
+        fs.unlinkSync(SHELL_HISTORY_FILE);
+    }
+    const colors = getColors();
+    console.log('');
+    console.log(chalk.hex(colors.success)('✓ Shell 历史已清空'));
+    console.log('');
+}
+// ================== 远程 Shell Hook ==================
+/**
+ * 生成远程 zsh hook 脚本
+ */
+function generateRemoteZshHook() {
+    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() {
+    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) {
+    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) {
+    switch (shellType) {
+        case 'zsh':
+            return '~/.zshrc';
+        case 'bash':
+            return '~/.bashrc';
+        default:
+            return '~/.bashrc';
+    }
+}
+/**
+ * 生成远程 hook 脚本
+ */
+export function generateRemoteHookScript(shellType) {
+    switch (shellType) {
+        case 'zsh':
+            return generateRemoteZshHook();
+        case 'bash':
+            return generateRemoteBashHook();
+        default:
+            return null;
+    }
+}
+/**
+ * 检查远程 hook 是否已安装
+ */
+export async function checkRemoteHookInstalled(sshExecFn, configPath) {
+    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, shellType) {
+    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, shellType) {
+    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) {
+    // 检测 shell 类型
+    const shellType = await detectRemoteShell(sshExecFn);
+    const configPath = getRemoteShellConfigPath(shellType);
+    // 检查是否已安装
+    const installed = await checkRemoteHookInstalled(sshExecFn, configPath);
+    return { installed, shellType, configPath };
+}

package/dist/src/sysinfo.d.ts

@@ -1,15 +1,19 @@
 /**
- * 收集系统信息
+ * 系统信息
  */
-export function collectSystemInfo(): {
+export interface SystemInfo {
     os: NodeJS.Platform;
-    arch: NodeJS.Architecture;
+    arch: string;
     shell: string;
     packageManager: string;
     cwd: string;
     user: string;
-};
+}
+/**
+ * 收集系统信息
+ */
+export declare function collectSystemInfo(): SystemInfo;
 /**
  * 将系统信息格式化为字符串（供 AI 使用）
  */
-export function formatSystemInfo(): string;
+export declare function formatSystemInfo(): string;

package/dist/src/sysinfo.js

@@ -11,7 +11,7 @@ function detectPackageManager() {
         { name: 'yum', command: 'yum' },
         { name: 'pacman', command: 'pacman' },
         { name: 'zypper', command: 'zypper' },
-        { name: 'apk', command: 'apk' }
+        { name: 'apk', command: 'apk' },
     ];
     for (const mgr of managers) {
         try {
@@ -40,7 +40,7 @@ export function collectSystemInfo() {
         shell: getCurrentShell(),
         packageManager: detectPackageManager(),
         cwd: process.cwd(),
-        user: os.userInfo().username
+        user: os.userInfo().username,
     };
 }
 /**

package/dist/src/ui/theme.d.ts

@@ -1,26 +1,29 @@
-export declare const theme: {
-    readonly primary: "#00D9FF";
-    readonly secondary: "#A78BFA";
-    readonly accent: "#F472B6";
-    readonly success: "#10B981";
-    readonly error: "#EF4444";
-    readonly warning: "#F59E0B";
-    readonly info: "#3B82F6";
-    readonly text: {
-        readonly primary: "#E5E7EB";
-        readonly secondary: "#9CA3AF";
-        readonly muted: "#6B7280";
-        readonly dim: "#4B5563";
+export type ThemeName = 'dark' | 'light';
+export interface Theme {
+    primary: string;
+    secondary: string;
+    accent: string;
+    success: string;
+    error: string;
+    warning: string;
+    info: string;
+    text: {
+        primary: string;
+        secondary: string;
+        muted: string;
+        dim: string;
     };
-    readonly border: "#374151";
-    readonly divider: "#1F2937";
-    readonly code: {
-        readonly background: "#1F2937";
-        readonly text: "#E5E7EB";
-        readonly keyword: "#C678DD";
-        readonly string: "#98C379";
-        readonly function: "#61AFEF";
-        readonly comment: "#5C6370";
+    border: string;
+    divider: string;
+    code: {
+        background: string;
+        text: string;
+        keyword: string;
+        string: string;
+        function: string;
+        comment: string;
     };
-};
-export type Theme = typeof theme;
+}
+export declare const themes: Record<ThemeName, Theme>;
+export declare function getCurrentTheme(): Theme;
+export declare const theme: Theme;