@yivan-lab/pretty-please 1.0.0 → 1.1.0

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

@@ -1,35 +1,57 @@
+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;
-    installed: boolean;
-    shellType: string;
-    configPath: string | null;
-    historyFile: string;
-};
+export declare function getHookStatus(): HookStatus;
+/**
+ * 显示 shell 历史
+ */
+export declare function displayShellHistory(): void;
+/**
+ * 清空 shell 历史
+ */
+export declare function clearShellHistory(): void;
+export {};

package/dist/src/shell-hook.js

@@ -242,15 +242,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 +263,6 @@ export function getShellHistory() {
 }
 /**
  * 从 pls history 中查找匹配的记录
- * @param {string} prompt - pls 命令后面的 prompt 部分
- * @returns {object|null} 匹配的 pls history 记录
  */
 function findPlsHistoryMatch(prompt) {
     const plsHistory = getHistory();
@@ -312,7 +315,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 +352,72 @@ export function getHookStatus() {
         installed,
         shellType,
         configPath,
-        historyFile: SHELL_HISTORY_FILE
+        historyFile: SHELL_HISTORY_FILE,
     };
 }
+/**
+ * 显示 shell 历史
+ */
+export function displayShellHistory() {
+    const config = getConfig();
+    const history = getShellHistory();
+    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('');
+        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.green('✓') : chalk.red(`✗ (${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.cyan(num.toString().padStart(2, ' '))}. ${chalk.magenta('[pls]')} "${args}"`);
+                    console.log(`     ${chalk.dim('AI 生成:')} ${chalk.gray(plsRecord.aiGeneratedCommand)}`);
+                    console.log(`     ${chalk.dim('用户修改为:')} ${plsRecord.command} ${status} ${chalk.yellow('(已修改)')}`);
+                }
+                else {
+                    console.log(`  ${chalk.cyan(num.toString().padStart(2, ' '))}. ${chalk.magenta('[pls]')} "${args}" → ${plsRecord.command} ${status}`);
+                }
+            }
+            else {
+                console.log(`  ${chalk.cyan(num.toString().padStart(2, ' '))}. ${chalk.magenta('[pls]')} ${args} ${status}`);
+            }
+        }
+        else {
+            console.log(`  ${chalk.cyan(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);
+    }
+    console.log('');
+    console.log(chalk.green('✓ Shell 历史已清空'));
+    console.log('');
+}

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/utils/console.d.ts

@@ -1,44 +1,44 @@
 /**
  * 计算字符串的显示宽度（中文占2个宽度）
  */
-export function getDisplayWidth(str: any): number;
+export declare function getDisplayWidth(str: string): number;
 /**
  * 绘制命令框（原生版本）
  */
-export function drawCommandBox(command: any, title?: string): void;
+export declare function drawCommandBox(command: string, title?: string): void;
 /**
  * 格式化耗时
  */
-export function formatDuration(ms: any): string;
+export declare function formatDuration(ms: number): string;
 /**
  * 输出分隔线
  */
-export function printSeparator(text?: string, length?: number): void;
+export declare function printSeparator(text?: string, length?: number): void;
 /**
  * 输出成功消息
  */
-export function success(message: any): void;
+export declare function success(message: string): void;
 /**
  * 输出错误消息
  */
-export function error(message: any): void;
+export declare function error(message: string): void;
 /**
  * 输出警告消息
  */
-export function warning(message: any): void;
+export declare function warning(message: string): void;
 /**
  * 输出信息消息
  */
-export function info(message: any): void;
+export declare function info(message: string): void;
 /**
  * 输出灰色文本
  */
-export function muted(message: any): void;
+export declare function muted(message: string): void;
 /**
  * 输出标题
  */
-export function title(message: any): void;
+export declare function title(message: string): void;
 /**
  * 输出主色文本
  */
-export function primary(message: any): void;
+export declare function primary(message: string): void;

package/dist/src/utils/console.js

@@ -35,7 +35,7 @@ export function getDisplayWidth(str) {
 export function drawCommandBox(command, title = '生成命令') {
     const lines = command.split('\n');
     const titleWidth = getDisplayWidth(title);
-    const maxContentWidth = Math.max(...lines.map(l => getDisplayWidth(l)));
+    const maxContentWidth = Math.max(...lines.map((l) => getDisplayWidth(l)));
     const boxWidth = Math.max(maxContentWidth + 4, titleWidth + 6, 20);
     const topPadding = boxWidth - titleWidth - 5;
     const topBorder = '┌─ ' + title + ' ' + '─'.repeat(topPadding) + '┐';
@@ -44,10 +44,7 @@ export function drawCommandBox(command, title = '生成命令') {
     for (const line of lines) {
         const lineWidth = getDisplayWidth(line);
         const padding = ' '.repeat(boxWidth - lineWidth - 4);
-        console.log(chalk.hex(colors.warning)('│ ') +
-            chalk.hex(colors.primary)(line) +
-            padding +
-            chalk.hex(colors.warning)(' │'));
+        console.log(chalk.hex(colors.warning)('│ ') + chalk.hex(colors.primary)(line) + padding + chalk.hex(colors.warning)(' │'));
     }
     console.log(chalk.hex(colors.warning)(bottomBorder));
 }
@@ -65,7 +62,8 @@ export function formatDuration(ms) {
  */
 export function printSeparator(text = '输出', length = 38) {
     const textPart = text ? ` ${text} ` : '';
-    const lineLength = Math.max(0, length - textPart.length);
+    const textWidth = getDisplayWidth(textPart); // 使用显示宽度而不是字符数
+    const lineLength = Math.max(0, length - textWidth);
     const leftDashes = '─'.repeat(Math.floor(lineLength / 2));
     const rightDashes = '─'.repeat(Math.ceil(lineLength / 2));
     console.log(chalk.gray(`${leftDashes}${textPart}${rightDashes}`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yivan-lab/pretty-please",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "AI 驱动的命令行工具，将自然语言转换为可执行的 Shell 命令",
   "type": "module",
   "bin": {
@@ -9,8 +9,10 @@
   },
   "scripts": {
     "dev": "tsx bin/pls.tsx",
-    "build": "tsc",
+    "build": "tsc && node scripts/postbuild.js",
     "start": "node dist/bin/pls.js",
+    "link:dev": "mkdir -p ~/.local/bin && ln -sf \"$(pwd)/bin/pls.tsx\" ~/.local/bin/pls-dev && echo '✅ pls-dev 已链接到 ~/.local/bin/pls-dev'",
+    "unlink:dev": "rm -f ~/.local/bin/pls-dev && echo '✅ pls-dev 已移除'",
     "prepublishOnly": "pnpm build"
   },
   "keywords": [
@@ -40,11 +42,12 @@
   },
   "files": [
     "bin",
-    "dist",
+    "dist/bin",
+    "dist/src",
+    "dist/package.json",
     "src",
     "README.md",
     "LICENSE",
-    "package.json",
     "tsconfig.json"
   ],
   "dependencies": {
@@ -60,8 +63,6 @@
     "ink-text-input": "^6.0.0",
     "lowlight": "^3.3.0",
     "marked": "^17.0.1",
-    "openai": "^6.10.0",
-    "ora": "^9.0.0",
     "react": "^19.2.3",
     "shiki": "^3.20.0",
     "string-width": "^8.1.0",
@@ -72,6 +73,7 @@
     "@types/hast": "^3.0.4",
     "@types/node": "^25.0.2",
     "@types/react": "^19.2.7",
+    "react-devtools-core": "^7.0.1",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3"
   }

package/src/builtin-detector.ts

@@ -0,0 +1,126 @@
+/**
+ * Shell builtin 命令检测器
+ *
+ * 用于检测命令中是否包含 shell 内置命令（builtin）
+ * 这些命令在子进程中执行可能无效或行为异常
+ */
+
+// Shell 内置命令列表
+const SHELL_BUILTINS: readonly string[] = [
+  // 目录相关
+  'cd',
+  'pushd',
+  'popd',
+  'dirs',
+
+  // 历史相关
+  'history',
+
+  // 别名和函数
+  'alias',
+  'unalias',
+
+  // 环境变量
+  'export',
+  'set',
+  'unset',
+  'declare',
+  'local',
+  'readonly',
+
+  // 脚本执行
+  'source',
+  '.',
+
+  // 任务控制
+  'jobs',
+  'fg',
+  'bg',
+  'disown',
+
+  // 其他
+  'ulimit',
+  'umask',
+  'builtin',
+  'command',
+  'type',
+  'enable',
+  'hash',
+  'help',
+  'let',
+  'read',
+  'wait',
+  'eval',
+  'exec',
+  'trap',
+  'times',
+  'shopt',
+]
+
+/**
+ * Builtin 检测结果
+ */
+export interface BuiltinResult {
+  hasBuiltin: boolean
+  builtins: string[]
+}
+
+/**
+ * 提取命令中的所有命令名
+ */
+function extractCommandNames(command: string): string[] {
+  // 按分隔符拆分（&&, ||, ;, |, &, 换行）
+  // 注意：| 是管道，两边都在子进程中执行，所以也算
+  const parts = command.split(/[;&|]+|\n+/)
+
+  const commandNames: string[] = []
+
+  for (const part of parts) {
+    const trimmed = part.trim()
+    if (!trimmed) continue
+
+    // 提取第一个单词（命令名）
+    // 处理 sudo、env 等前缀
+    const words = trimmed.split(/\s+/)
+
+    // 跳过 sudo、env 等
+    let i = 0
+    while (i < words.length && ['sudo', 'env', 'nohup', 'nice'].includes(words[i])) {
+      i++
+    }
+
+    if (i < words.length) {
+      commandNames.push(words[i])
+    }
+  }
+
+  return commandNames
+}
+
+/**
+ * 检测命令中是否包含 builtin
+ */
+export function detectBuiltin(command: string): BuiltinResult {
+  const commandNames = extractCommandNames(command)
+  const foundBuiltins: string[] = []
+
+  for (const name of commandNames) {
+    if (SHELL_BUILTINS.includes(name)) {
+      foundBuiltins.push(name)
+    }
+  }
+
+  return {
+    hasBuiltin: foundBuiltins.length > 0,
+    builtins: [...new Set(foundBuiltins)], // 去重
+  }
+}
+
+/**
+ * 格式化 builtin 列表为易读的字符串
+ */
+export function formatBuiltins(builtins: string[]): string {
+  if (builtins.length === 0) return ''
+  if (builtins.length === 1) return builtins[0]
+  return builtins.join(', ')
+}

package/src/chat-history.ts

@@ -0,0 +1,130 @@
+import fs from 'fs'
+import path from 'path'
+import os from 'os'
+import chalk from 'chalk'
+import { getConfig } from './config.js'
+
+const CONFIG_DIR = path.join(os.homedir(), '.please')
+const CHAT_HISTORY_FILE = path.join(CONFIG_DIR, 'chat_history.json')
+
+/**
+ * 聊天消息
+ */
+export interface ChatMessage {
+  role: 'user' | 'assistant'
+  content: string
+}
+
+/**
+ * 确保配置目录存在
+ */
+function ensureConfigDir(): void {
+  if (!fs.existsSync(CONFIG_DIR)) {
+    fs.mkdirSync(CONFIG_DIR, { recursive: true })
+  }
+}
+
+/**
+ * 读取对话历史
+ */
+export function getChatHistory(): ChatMessage[] {
+  ensureConfigDir()
+
+  if (!fs.existsSync(CHAT_HISTORY_FILE)) {
+    return []
+  }
+
+  try {
+    const content = fs.readFileSync(CHAT_HISTORY_FILE, 'utf-8')
+    return JSON.parse(content) as ChatMessage[]
+  } catch {
+    return []
+  }
+}
+
+/**
+ * 保存对话历史
+ */
+function saveChatHistory(history: ChatMessage[]): void {
+  ensureConfigDir()
+  fs.writeFileSync(CHAT_HISTORY_FILE, JSON.stringify(history, null, 2))
+}
+
+/**
+ * 添加一轮对话（用户问题 + AI 回答）
+ */
+export function addChatMessage(userMessage: string, assistantMessage: string): void {
+  const config = getConfig()
+  const history = getChatHistory()
+
+  // 添加新的对话
+  history.push({ role: 'user', content: userMessage })
+  history.push({ role: 'assistant', content: assistantMessage })
+
+  // 计算当前轮数（每 2 条消息 = 1 轮）
+  const currentRounds = Math.floor(history.length / 2)
+  const maxRounds = config.chatHistoryLimit || 10
+
+  // 如果超出限制，移除最早的对话
+  if (currentRounds > maxRounds) {
+    // 需要移除的轮数
+    const removeRounds = currentRounds - maxRounds
+    // 移除最早的 N 轮（N*2 条消息）
+    history.splice(0, removeRounds * 2)
+  }
+
+  saveChatHistory(history)
+}
+
+/**
+ * 清空对话历史
+ */
+export function clearChatHistory(): void {
+  saveChatHistory([])
+}
+
+/**
+ * 获取对话历史文件路径
+ */
+export function getChatHistoryFilePath(): string {
+  return CHAT_HISTORY_FILE
+}
+
+/**
+ * 获取当前对话轮数
+ */
+export function getChatRoundCount(): number {
+  const history = getChatHistory()
+  return Math.floor(history.length / 2)
+}
+
+/**
+ * 显示对话历史（只显示用户的 prompt）
+ */
+export function displayChatHistory(): void {
+  const history = getChatHistory()
+  const config = getConfig()
+
+  if (history.length === 0) {
+    console.log('\n' + chalk.gray('暂无对话历史'))
+    console.log('')
+    return
+  }
+
+  // 只提取用户消息
+  const userMessages = history.filter((msg) => msg.role === 'user')
+
+  console.log('')
+  console.log(chalk.bold(`对话历史（最近 ${userMessages.length} 轮）:`))
+  console.log(chalk.gray('━'.repeat(50)))
+
+  userMessages.forEach((msg, index) => {
+    const num = index + 1
+    console.log(`  ${chalk.cyan(num.toString().padStart(2, ' '))}. ${msg.content}`)
+  })
+
+  console.log(chalk.gray('━'.repeat(50)))
+  console.log(chalk.gray(`配置: 保留最近 ${config.chatHistoryLimit} 轮对话`))
+  console.log(chalk.gray(`文件: ${CHAT_HISTORY_FILE}`))
+  console.log('')
+}

package/src/components/Chat.tsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react'
 import { Box, Text } from 'ink'
 import Spinner from 'ink-spinner'
 import { MarkdownDisplay } from './MarkdownDisplay.js'
-import { chatWithAI } from '../ai.js'
+import { chatWithMastra } from '../mastra-chat.js'
 import { getChatRoundCount } from '../chat-history.js'
 import { theme } from '../ui/theme.js'
 
@@ -44,13 +44,13 @@ export function Chat({ prompt, debug, showRoundCount, onComplete }: ChatProps) {
     }
 
     // 调用 AI
-    chatWithAI(prompt, { debug: debug || false, onChunk })
-      .then((result: any) => {
+    chatWithMastra(prompt, { debug: debug || false, onChunk })
+      .then((result) => {
         const endTime = Date.now()
         setDuration(endTime - startTime)
         setStatus('done')
 
-        if (debug && typeof result === 'object' && 'debug' in result) {
+        if (debug && typeof result === 'object' && 'debug' in result && result.debug) {
           setDebugInfo(result.debug)
         }
 

package/src/components/CommandBox.tsx

@@ -1,28 +1,13 @@
 import React from 'react'
 import { Box, Text } from 'ink'
 import { theme } from '../ui/theme.js'
+import { getDisplayWidth } from '../utils/console.js'
 
 interface CommandBoxProps {
   command: string
   title?: string
 }
 
-/**
- * 计算字符串的显示宽度（中文占2个宽度）
- */
-function getDisplayWidth(str: string): number {
-  let width = 0
-  for (const char of str) {
-    // 中文、日文、韩文等宽字符占 2 个宽度
-    if (char.match(/[\u4e00-\u9fff\u3400-\u4dbf\uff00-\uffef\u3000-\u303f]/)) {
-      width += 2
-    } else {
-      width += 1
-    }
-  }
-  return width
-}
-
 /**
  * CommandBox 组件 - 显示带边框和标题的命令框
  */