@yivan-lab/pretty-please 1.3.1 → 1.5.0

package/dist/src/sysinfo.js

@@ -1,10 +1,66 @@
 import os from 'os';
-import { execSync } from 'child_process';
+import fs from 'fs';
+import path from 'path';
+import chalk from 'chalk';
+import { detectProjectContext, formatProjectContext } from './project-context.js';
+import { getConfig, CONFIG_DIR } from './config.js';
+import { getCurrentTheme } from './ui/theme.js';
+import { detectShell, getShellCapabilities, commandExists, batchCommandExists, isWindows, } from './utils/platform.js';
 /**
- * 检测包管理器
+ * 要检测的命令列表（45 个）
+ */
+const COMMANDS_TO_CHECK = {
+    // 现代 CLI 工具（ls/find/grep/cat 等的替代品）
+    modern: [
+        'eza', 'lsd', 'exa', // ls 替代
+        'fd', 'fdfind', // find 替代
+        'rg', 'ag', 'ack', // grep 替代
+        'bat', 'batcat', // cat 替代
+        'fzf', 'skim', // 模糊搜索
+        'jq', 'yq', 'fx', // JSON/YAML 处理
+        'delta', 'diff-so-fancy', // diff 替代
+        'zoxide', 'z', 'autojump', // cd 替代
+        'tldr', 'tealdeer', // man 替代
+        'dust', 'duf', 'ncdu', // du 替代
+        'procs', 'bottom', 'htop', // ps/top 替代
+        'sd', // sed 替代
+        'hyperfine', // benchmark
+    ],
+    // 包管理器
+    node: ['pnpm', 'yarn', 'bun', 'npm'],
+    python: ['uv', 'rye', 'poetry', 'pipenv', 'pip'],
+    rust: ['cargo'],
+    go: ['go'],
+    ruby: ['gem', 'bundle'],
+    php: ['composer'],
+    // 容器/云工具
+    container: ['docker', 'podman', 'nerdctl'],
+    k8s: ['kubectl', 'k9s', 'helm'],
+    // 版本控制
+    vcs: ['git', 'gh', 'glab', 'hg'],
+    // 构建工具
+    build: ['make', 'cmake', 'ninja', 'just', 'task'],
+    // 其他常用工具
+    misc: ['curl', 'wget', 'aria2c', 'rsync', 'ssh', 'tmux', 'screen'],
+};
+// 缓存文件路径
+const CACHE_FILE = path.join(CONFIG_DIR, 'system_cache.json');
+/**
+ * 检测系统包管理器
  */
 function detectPackageManager() {
-    const managers = [
+    // Windows 包管理器
+    if (isWindows()) {
+        const windowsManagers = ['winget', 'scoop', 'choco'];
+        for (const mgr of windowsManagers) {
+            if (commandExists(mgr)) {
+                return mgr;
+            }
+        }
+        return 'unknown';
+    }
+    // Unix 包管理器
+    const unixManagers = [
         { name: 'brew', command: 'brew' },
         { name: 'apt', command: 'apt-get' },
         { name: 'dnf', command: 'dnf' },
@@ -13,40 +69,208 @@ function detectPackageManager() {
         { name: 'zypper', command: 'zypper' },
         { name: 'apk', command: 'apk' },
     ];
-    for (const mgr of managers) {
-        try {
-            execSync(`which ${mgr.command}`, { stdio: 'ignore' });
+    for (const mgr of unixManagers) {
+        if (commandExists(mgr.command)) {
             return mgr.name;
         }
-        catch {
-            // 继续检测下一个
-        }
     }
     return 'unknown';
 }
 /**
- * 获取当前 Shell
+ * 检测可用命令（跨平台版本）
+ * 使用 platform 模块的 batchCommandExists 函数
  */
-function getCurrentShell() {
-    return process.env.SHELL || 'unknown';
+function detectAvailableCommands() {
+    const allCommands = Object.values(COMMANDS_TO_CHECK).flat();
+    return batchCommandExists(allCommands);
 }
 /**
- * 收集系统信息
+ * 检测所有静态信息（纯同步，不需要 async）
  */
-export function collectSystemInfo() {
+function detectStaticInfo() {
+    // 使用 platform 模块检测 Shell
+    const shell = detectShell();
+    const capabilities = getShellCapabilities(shell);
     return {
         os: os.platform(),
         arch: os.arch(),
-        shell: getCurrentShell(),
-        packageManager: detectPackageManager(),
-        cwd: process.cwd(),
+        shell: capabilities.displayName,
         user: os.userInfo().username,
+        systemPackageManager: detectPackageManager(),
+        availableCommands: detectAvailableCommands(),
+    };
+}
+/**
+ * 获取静态系统信息（带缓存）
+ */
+export function getStaticSystemInfo() {
+    const config = getConfig();
+    // 确保配置目录存在
+    if (!fs.existsSync(CONFIG_DIR)) {
+        fs.mkdirSync(CONFIG_DIR, { recursive: true });
+    }
+    if (fs.existsSync(CACHE_FILE)) {
+        try {
+            const cache = JSON.parse(fs.readFileSync(CACHE_FILE, 'utf-8'));
+            // 缓存未过期
+            const expireDays = config.systemCacheExpireDays || 7;
+            const age = Date.now() - new Date(cache.cachedAt).getTime();
+            if (age < expireDays * 24 * 60 * 60 * 1000) {
+                return cache.static;
+            }
+        }
+        catch {
+            // 缓存文件损坏，重新检测
+        }
+    }
+    // 首次或过期，重新检测
+    const info = detectStaticInfo();
+    // 保存缓存
+    const cache = {
+        version: 1,
+        cachedAt: new Date().toISOString(),
+        expiresInDays: config.systemCacheExpireDays || 7,
+        static: info,
+    };
+    fs.writeFileSync(CACHE_FILE, JSON.stringify(cache, null, 2));
+    return info;
+}
+/**
+ * 获取动态系统信息（每次实时）
+ */
+export async function getDynamicSystemInfo() {
+    return {
+        cwd: process.cwd(),
+        project: await detectProjectContext(process.cwd()),
+    };
+}
+/**
+ * 获取完整系统信息（主接口）
+ */
+export async function getSystemInfo() {
+    return {
+        ...getStaticSystemInfo(),
+        ...(await getDynamicSystemInfo()),
     };
 }
 /**
- * 将系统信息格式化为字符串（供 AI 使用）
+ * 辅助函数：分类命令
  */
-export function formatSystemInfo() {
-    const info = collectSystemInfo();
-    return `OS: ${info.os}, Arch: ${info.arch}, Shell: ${info.shell}, PkgMgr: ${info.packageManager}, CWD: ${info.cwd}`;
+function categorizeCommands(commands) {
+    const modern = ['eza', 'lsd', 'exa', 'fd', 'fdfind', 'rg', 'ag', 'ack', 'bat', 'batcat', 'fzf', 'jq', 'yq', 'delta'];
+    const packageManagers = ['pnpm', 'yarn', 'bun', 'npm', 'uv', 'poetry', 'cargo', 'go'];
+    const containers = ['docker', 'podman', 'kubectl', 'k9s', 'helm'];
+    return {
+        modern: commands.filter(cmd => modern.includes(cmd)),
+        packageManagers: commands.filter(cmd => packageManagers.includes(cmd)),
+        containers: commands.filter(cmd => containers.includes(cmd)),
+        others: commands.filter(cmd => !modern.includes(cmd) &&
+            !packageManagers.includes(cmd) &&
+            !containers.includes(cmd)),
+    };
+}
+/**
+ * 格式化系统信息为字符串（供 AI 使用）
+ */
+export function formatSystemInfo(info) {
+    const parts = [];
+    // 基础信息
+    parts.push(`OS: ${info.os}, Arch: ${info.arch}, Shell: ${info.shell}, User: ${info.user}`);
+    parts.push(`Package Manager: ${info.systemPackageManager}, CWD: ${info.cwd}`);
+    // 可用工具（分类展示）
+    if (info.availableCommands.length > 0) {
+        const categorized = categorizeCommands(info.availableCommands);
+        const lines = [];
+        if (categorized.modern.length > 0) {
+            lines.push(`现代工具: ${categorized.modern.join(', ')}`);
+        }
+        if (categorized.packageManagers.length > 0) {
+            lines.push(`包管理器: ${categorized.packageManagers.join(', ')}`);
+        }
+        if (categorized.containers.length > 0) {
+            lines.push(`容器工具: ${categorized.containers.join(', ')}`);
+        }
+        if (categorized.others.length > 0) {
+            lines.push(`其他: ${categorized.others.join(', ')}`);
+        }
+        if (lines.length > 0) {
+            parts.push(`【用户终端可用工具】（非完整列表）`);
+            parts.push(...lines);
+            //parts.push(`注: 为确保兼容性和输出捕获，建议优先使用标准命令（ls/find/grep/cat/ps）`)
+        }
+    }
+    // 项目上下文
+    if (info.project && info.project.types.length > 0) {
+        parts.push(formatProjectContext(info.project));
+    }
+    return parts.join('\n');
+}
+/**
+ * 显示系统信息（CLI 美化版）
+ */
+export function displaySystemInfo(info) {
+    const theme = getCurrentTheme();
+    console.log(chalk.bold('\n系统信息:'));
+    console.log(chalk.hex(theme.text.muted)('━'.repeat(50)));
+    // 基础信息
+    console.log(`  ${chalk.hex(theme.primary)('操作系统')}:          ${info.os}`);
+    console.log(`  ${chalk.hex(theme.primary)('架构')}:              ${info.arch}`);
+    console.log(`  ${chalk.hex(theme.primary)('Shell')}:             ${info.shell}`);
+    console.log(`  ${chalk.hex(theme.primary)('用户')}:              ${info.user}`);
+    console.log(`  ${chalk.hex(theme.primary)('系统包管理器')}:      ${info.systemPackageManager}`);
+    console.log(`  ${chalk.hex(theme.primary)('当前目录')}:          ${chalk.hex(theme.text.secondary)(info.cwd)}`);
+    // 可用工具
+    if (info.availableCommands.length > 0) {
+        console.log(`  ${chalk.hex(theme.primary)('可用命令数')}:        ${chalk.hex(theme.success)(info.availableCommands.length)}`);
+        const categorized = categorizeCommands(info.availableCommands);
+        if (categorized.modern.length > 0) {
+            console.log(`    ${chalk.hex(theme.text.secondary)('现代工具')}: ${categorized.modern.join(', ')}`);
+        }
+        if (categorized.packageManagers.length > 0) {
+            console.log(`    ${chalk.hex(theme.text.secondary)('包管理器')}: ${categorized.packageManagers.join(', ')}`);
+        }
+        if (categorized.containers.length > 0) {
+            console.log(`    ${chalk.hex(theme.text.secondary)('容器工具')}: ${categorized.containers.join(', ')}`);
+        }
+        if (categorized.others.length > 0) {
+            console.log(`    ${chalk.hex(theme.text.secondary)('其他工具')}: ${categorized.others.join(', ')}`);
+        }
+    }
+    // 项目信息
+    if (info.project && info.project.types.length > 0) {
+        console.log(chalk.hex(theme.text.muted)('  ──────────────────────────────────────────────────'));
+        console.log(`  ${chalk.hex(theme.primary)('项目类型')}:          ${info.project.types.join(', ')}`);
+        if (info.project.packageManager) {
+            console.log(`  ${chalk.hex(theme.primary)('包管理器')}:          ${info.project.packageManager}`);
+        }
+        if (info.project.git) {
+            const statusColor = info.project.git.status === 'clean' ? theme.success : theme.warning;
+            const statusText = info.project.git.status === 'clean' ? '干净' : info.project.git.status === 'dirty' ? '有改动' : '未知';
+            console.log(`  ${chalk.hex(theme.primary)('Git 分支')}:          ${info.project.git.branch} (${chalk.hex(statusColor)(statusText)})`);
+        }
+        if (info.project.scripts && info.project.scripts.length > 0) {
+            console.log(`  ${chalk.hex(theme.primary)('可用脚本')}:          ${info.project.scripts.join(', ')}`);
+        }
+    }
+    console.log(chalk.hex(theme.text.muted)('━'.repeat(50)));
+    console.log(chalk.hex(theme.text.muted)(`缓存文件: ${CACHE_FILE}\n`));
+}
+/**
+ * 强制刷新缓存
+ */
+export function refreshSystemCache() {
+    const config = getConfig();
+    const info = detectStaticInfo();
+    const cache = {
+        version: 1,
+        cachedAt: new Date().toISOString(),
+        expiresInDays: config.systemCacheExpireDays || 7,
+        static: info,
+    };
+    // 确保配置目录存在
+    if (!fs.existsSync(CONFIG_DIR)) {
+        fs.mkdirSync(CONFIG_DIR, { recursive: true });
+    }
+    fs.writeFileSync(CACHE_FILE, JSON.stringify(cache, null, 2));
+    console.log('✓ 系统信息缓存已刷新');
 }

package/dist/src/system-history.d.ts

@@ -0,0 +1,18 @@
+import type { ShellHistoryItem } from './shell-hook.js';
+/**
+ * 直接读取系统 shell 历史文件（类似 thefuck）
+ * 用于没有安装 shell hook 的情况
+ *
+ * 限制：系统历史文件不记录退出码，所以 exit 字段都是 0
+ *
+ * 支持的 Shell：
+ * - Unix: zsh, bash, fish
+ * - Windows: PowerShell 5.x, PowerShell 7+ (通过 PSReadLine)
+ * - 不支持: CMD (无持久化历史)
+ */
+export declare function getSystemShellHistory(): ShellHistoryItem[];
+/**
+ * 从系统历史中获取最近一条命令
+ * 排除 pls 命令本身
+ */
+export declare function getLastCommandFromSystem(): ShellHistoryItem | null;

package/dist/src/system-history.js

@@ -0,0 +1,151 @@
+import fs from 'fs';
+import { getConfig } from './config.js';
+import { detectShell, getShellCapabilities } from './utils/platform.js';
+/**
+ * 直接读取系统 shell 历史文件（类似 thefuck）
+ * 用于没有安装 shell hook 的情况
+ *
+ * 限制：系统历史文件不记录退出码，所以 exit 字段都是 0
+ *
+ * 支持的 Shell：
+ * - Unix: zsh, bash, fish
+ * - Windows: PowerShell 5.x, PowerShell 7+ (通过 PSReadLine)
+ * - 不支持: CMD (无持久化历史)
+ */
+export function getSystemShellHistory() {
+    const shell = detectShell();
+    const capabilities = getShellCapabilities(shell);
+    // 检查是否支持历史读取
+    if (!capabilities.supportsHistory || !capabilities.historyPath) {
+        return [];
+    }
+    const historyFile = capabilities.historyPath;
+    let parser;
+    switch (shell) {
+        case 'zsh':
+            parser = parseZshHistoryLine;
+            break;
+        case 'bash':
+            parser = parseBashHistoryLine;
+            break;
+        case 'fish':
+            parser = parseFishHistoryLine;
+            break;
+        case 'powershell5':
+        case 'powershell7':
+            parser = parsePowerShellHistoryLine;
+            break;
+        default:
+            return [];
+    }
+    if (!fs.existsSync(historyFile)) {
+        return [];
+    }
+    try {
+        const content = fs.readFileSync(historyFile, 'utf-8');
+        const lines = content.trim().split('\n');
+        const limit = getConfig().shellHistoryLimit || 10;
+        // 只取最后 N 条
+        const recentLines = lines.slice(-limit);
+        return recentLines
+            .map(line => parser(line))
+            .filter((item) => item !== null);
+    }
+    catch {
+        return [];
+    }
+}
+/**
+ * 解析 zsh 历史行
+ * 格式: ": 1234567890:0;ls -la"
+ * 或者: "ls -la" (简单格式)
+ */
+function parseZshHistoryLine(line) {
+    // 扩展格式: ": timestamp:duration;command"
+    const extendedMatch = line.match(/^:\s*(\d+):\d+;(.+)$/);
+    if (extendedMatch) {
+        const timestamp = parseInt(extendedMatch[1]);
+        const cmd = extendedMatch[2].trim();
+        return {
+            cmd,
+            exit: 0, // 系统历史文件不记录退出码
+            time: new Date(timestamp * 1000).toISOString(),
+        };
+    }
+    // 简单格式
+    const cmd = line.trim();
+    if (cmd) {
+        return {
+            cmd,
+            exit: 0,
+            time: new Date().toISOString(),
+        };
+    }
+    return null;
+}
+/**
+ * 解析 bash 历史行
+ * 格式: "ls -la"
+ * bash 历史文件默认不记录时间戳
+ */
+function parseBashHistoryLine(line) {
+    const cmd = line.trim();
+    if (cmd) {
+        return {
+            cmd,
+            exit: 0, // 系统历史文件不记录退出码
+            time: new Date().toISOString(),
+        };
+    }
+    return null;
+}
+/**
+ * 解析 Fish 历史行
+ * Fish 历史文件使用 YAML-like 格式:
+ * - cmd: ls -la
+ *   when: 1234567890
+ */
+function parseFishHistoryLine(line) {
+    // Fish 历史格式比较特殊，这里简化处理
+    // 实际格式是多行的，这里只处理 cmd 行
+    const cmdMatch = line.match(/^- cmd:\s*(.+)$/);
+    if (cmdMatch) {
+        return {
+            cmd: cmdMatch[1].trim(),
+            exit: 0,
+            time: new Date().toISOString(),
+        };
+    }
+    return null;
+}
+/**
+ * 解析 PowerShell 历史行
+ * PSReadLine 历史文件格式: 每行一条命令，纯文本
+ * 路径: %APPDATA%\Microsoft\Windows\PowerShell\PSReadLine\ConsoleHost_history.txt
+ */
+function parsePowerShellHistoryLine(line) {
+    const cmd = line.trim();
+    if (cmd) {
+        return {
+            cmd,
+            exit: 0, // 系统历史文件不记录退出码
+            time: new Date().toISOString(),
+        };
+    }
+    return null;
+}
+/**
+ * 从系统历史中获取最近一条命令
+ * 排除 pls 命令本身
+ */
+export function getLastCommandFromSystem() {
+    const history = getSystemShellHistory();
+    // 从后往前找第一条非 pls 命令
+    for (let i = history.length - 1; i >= 0; i--) {
+        const item = history[i];
+        if (!item.cmd.startsWith('pls') && !item.cmd.startsWith('please')) {
+            return item;
+        }
+    }
+    return null;
+}

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

@@ -0,0 +1,5 @@
+/**
+ * 主题系统测试
+ * 测试主题读取、验证、自定义主题加载等功能
+ */
+export {};