@yivan-lab/pretty-please 1.0.0 → 1.1.0

package/dist/src/builtin-detector.js

@@ -7,26 +7,50 @@
 // Shell 内置命令列表
 const SHELL_BUILTINS = [
     // 目录相关
-    'cd', 'pushd', 'popd', 'dirs',
+    'cd',
+    'pushd',
+    'popd',
+    'dirs',
     // 历史相关
     'history',
     // 别名和函数
-    'alias', 'unalias',
+    'alias',
+    'unalias',
     // 环境变量
-    'export', 'set', 'unset', 'declare', 'local', 'readonly',
+    'export',
+    'set',
+    'unset',
+    'declare',
+    'local',
+    'readonly',
     // 脚本执行
-    'source', '.',
+    'source',
+    '.',
     // 任务控制
-    'jobs', 'fg', 'bg', 'disown',
+    'jobs',
+    'fg',
+    'bg',
+    'disown',
     // 其他
-    'ulimit', 'umask', 'builtin', 'command', 'type',
-    'enable', 'hash', 'help', 'let', 'read', 'wait',
-    'eval', 'exec', 'trap', 'times', 'shopt'
+    'ulimit',
+    'umask',
+    'builtin',
+    'command',
+    'type',
+    'enable',
+    'hash',
+    'help',
+    'let',
+    'read',
+    'wait',
+    'eval',
+    'exec',
+    'trap',
+    'times',
+    'shopt',
 ];
 /**
  * 提取命令中的所有命令名
- * @param {string} command - 完整命令字符串
- * @returns {string[]} 命令名数组
  */
 function extractCommandNames(command) {
     // 按分隔符拆分（&&, ||, ;, |, &, 换行）
@@ -39,7 +63,7 @@ function extractCommandNames(command) {
             continue;
         // 提取第一个单词（命令名）
         // 处理 sudo、env 等前缀
-        let words = trimmed.split(/\s+/);
+        const words = trimmed.split(/\s+/);
         // 跳过 sudo、env 等
         let i = 0;
         while (i < words.length && ['sudo', 'env', 'nohup', 'nice'].includes(words[i])) {
@@ -53,8 +77,6 @@ function extractCommandNames(command) {
 }
 /**
  * 检测命令中是否包含 builtin
- * @param {string} command - 要检测的命令
- * @returns {{ hasBuiltin: boolean, builtins: string[] }} 检测结果
  */
 export function detectBuiltin(command) {
     const commandNames = extractCommandNames(command);
@@ -66,13 +88,11 @@ export function detectBuiltin(command) {
     }
     return {
         hasBuiltin: foundBuiltins.length > 0,
-        builtins: [...new Set(foundBuiltins)] // 去重
+        builtins: [...new Set(foundBuiltins)], // 去重
     };
 }
 /**
  * 格式化 builtin 列表为易读的字符串
- * @param {string[]} builtins - builtin 命令数组
- * @returns {string} 格式化后的字符串
  */
 export function formatBuiltins(builtins) {
     if (builtins.length === 0)

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

@@ -1,26 +1,31 @@
 /**
- * 读取对话历史
- * @returns {Array<{role: string, content: string}>} messages 数组
+ * 聊天消息
  */
-export function getChatHistory(): Array<{
-    role: string;
+export interface ChatMessage {
+    role: 'user' | 'assistant';
     content: string;
-}>;
+}
+/**
+ * 读取对话历史
+ */
+export declare function getChatHistory(): ChatMessage[];
 /**
  * 添加一轮对话（用户问题 + AI 回答）
- * @param {string} userMessage - 用户消息
- * @param {string} assistantMessage - AI 回复
  */
-export function addChatMessage(userMessage: string, assistantMessage: string): void;
+export declare function addChatMessage(userMessage: string, assistantMessage: string): void;
 /**
  * 清空对话历史
  */
-export function clearChatHistory(): void;
+export declare function clearChatHistory(): void;
 /**
  * 获取对话历史文件路径
  */
-export function getChatHistoryFilePath(): string;
+export declare function getChatHistoryFilePath(): string;
 /**
  * 获取当前对话轮数
  */
-export function getChatRoundCount(): number;
+export declare function getChatRoundCount(): number;
+/**
+ * 显示对话历史（只显示用户的 prompt）
+ */
+export declare function displayChatHistory(): void;

package/dist/src/chat-history.js

@@ -1,6 +1,7 @@
 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');
@@ -14,7 +15,6 @@ function ensureConfigDir() {
 }
 /**
  * 读取对话历史
- * @returns {Array<{role: string, content: string}>} messages 数组
  */
 export function getChatHistory() {
     ensureConfigDir();
@@ -31,7 +31,6 @@ export function getChatHistory() {
 }
 /**
  * 保存对话历史
- * @param {Array<{role: string, content: string}>} history
  */
 function saveChatHistory(history) {
     ensureConfigDir();
@@ -39,8 +38,6 @@ function saveChatHistory(history) {
 }
 /**
  * 添加一轮对话（用户问题 + AI 回答）
- * @param {string} userMessage - 用户消息
- * @param {string} assistantMessage - AI 回复
  */
 export function addChatMessage(userMessage, assistantMessage) {
     const config = getConfig();
@@ -79,3 +76,28 @@ export function getChatRoundCount() {
     const history = getChatHistory();
     return Math.floor(history.length / 2);
 }
+/**
+ * 显示对话历史（只显示用户的 prompt）
+ */
+export function displayChatHistory() {
+    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/dist/src/components/Chat.js

@@ -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';
 /**
@@ -23,12 +23,12 @@ export function Chat({ prompt, debug, showRoundCount, onComplete }) {
             setContent((prev) => prev + chunk);
         };
         // 调用 AI
-        chatWithAI(prompt, { debug: debug || false, onChunk })
+        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);
             }
             setTimeout(onComplete, 100);

package/dist/src/components/CommandBox.js

@@ -1,22 +1,7 @@
 import React from 'react';
 import { Box, Text } from 'ink';
 import { theme } from '../ui/theme.js';
-/**
- * 计算字符串的显示宽度（中文占2个宽度）
- */
-function getDisplayWidth(str) {
-    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;
-}
+import { getDisplayWidth } from '../utils/console.js';
 /**
  * CommandBox 组件 - 显示带边框和标题的命令框
  */

package/dist/src/components/ConfirmationPrompt.d.ts

@@ -3,10 +3,11 @@ interface ConfirmationPromptProps {
     prompt: string;
     onConfirm: () => void;
     onCancel: () => void;
+    onEdit?: () => void;
 }
 /**
  * ConfirmationPrompt 组件 - 单键确认提示
- * 回车 = 确认，Esc = 取消，Ctrl+C = 退出
+ * 回车 = 确认，E = 编辑，Esc = 取消，Ctrl+C = 退出
  */
 export declare const ConfirmationPrompt: React.FC<ConfirmationPromptProps>;
 export {};

package/dist/src/components/ConfirmationPrompt.js

@@ -3,9 +3,9 @@ import { Text, useInput } from 'ink';
 import { theme } from '../ui/theme.js';
 /**
  * ConfirmationPrompt 组件 - 单键确认提示
- * 回车 = 确认，Esc = 取消，Ctrl+C = 退出
+ * 回车 = 确认，E = 编辑，Esc = 取消，Ctrl+C = 退出
  */
-export const ConfirmationPrompt = ({ prompt, onConfirm, onCancel, }) => {
+export const ConfirmationPrompt = ({ prompt, onConfirm, onCancel, onEdit, }) => {
     useInput((input, key) => {
         if (key.return) {
             // 回车键
@@ -15,6 +15,10 @@ export const ConfirmationPrompt = ({ prompt, onConfirm, onCancel, }) => {
             // Esc 键
             onCancel();
         }
+        else if ((input === 'e' || input === 'E') && onEdit) {
+            // E 键进入编辑模式
+            onEdit();
+        }
         else if (key.ctrl && input === 'c') {
             // Ctrl+C
             process.exit(0);
@@ -22,5 +26,5 @@ export const ConfirmationPrompt = ({ prompt, onConfirm, onCancel, }) => {
     });
     return (React.createElement(Text, null,
         React.createElement(Text, { bold: true, color: theme.warning }, prompt),
-        React.createElement(Text, { color: theme.text.secondary }, " [\u56DE\u8F66\u6267\u884C / Esc \u53D6\u6D88] ")));
+        React.createElement(Text, { color: theme.text.secondary }, onEdit ? ' [回车执行 / E 编辑 / Esc 取消] ' : ' [回车执行 / Esc 取消] ')));
 };

package/dist/src/components/MultiStepCommandGenerator.d.ts

@@ -5,6 +5,8 @@ interface MultiStepCommandGeneratorProps {
     debug?: boolean;
     onStepComplete: (step: {
         command: string;
+        aiGeneratedCommand?: string;
+        userModified?: boolean;
         confirmed: boolean;
         cancelled?: boolean;
         hasBuiltin?: boolean;

package/dist/src/components/MultiStepCommandGenerator.js

@@ -1,5 +1,6 @@
 import React, { useState, useEffect } from 'react';
-import { Box, Text } from 'ink';
+import { Box, Text, useInput } from 'ink';
+import TextInput from 'ink-text-input';
 import Spinner from 'ink-spinner';
 import { generateMultiStepCommand } from '../multi-step.js';
 import { detectBuiltin, formatBuiltins } from '../builtin-detector.js';
@@ -7,6 +8,7 @@ import { CommandBox } from './CommandBox.js';
 import { ConfirmationPrompt } from './ConfirmationPrompt.js';
 import { Duration } from './Duration.js';
 import { theme } from '../ui/theme.js';
+import { getConfig } from '../config.js';
 /**
  * MultiStepCommandGenerator 组件 - 多步骤命令生成
  * 每次只生成一个命令，支持 continue 机制
@@ -15,6 +17,13 @@ export const MultiStepCommandGenerator = ({ prompt, debug, previousSteps = [], c
     const [state, setState] = useState({ type: 'thinking' });
     const [thinkDuration, setThinkDuration] = useState(0);
     const [debugInfo, setDebugInfo] = useState(null);
+    const [editedCommand, setEditedCommand] = useState(''); // 新增：编辑后的命令
+    // 监听编辑模式下的 Esc 键
+    useInput((input, key) => {
+        if (state.type === 'editing' && key.escape) {
+            handleEditCancel();
+        }
+    }, { isActive: state.type === 'editing' });
     // 初始化：调用 Mastra 生成命令
     useEffect(() => {
         const thinkStart = Date.now();
@@ -26,13 +35,27 @@ export const MultiStepCommandGenerator = ({ prompt, debug, previousSteps = [], c
             if (debug && result.debugInfo) {
                 setDebugInfo(result.debugInfo);
             }
-            setState({
-                type: 'showing_command',
-                stepData: result.stepData,
-            });
-            // 检测 builtin
+            // 如果 AI 返回空命令且决定不继续，说明 AI 放弃了
+            // 直接结束，不显示命令框
+            if (!result.stepData.command.trim() && result.stepData.continue === false) {
+                setTimeout(() => {
+                    onStepComplete({
+                        command: '',
+                        confirmed: false,
+                        reasoning: result.stepData.reasoning,
+                        needsContinue: false,
+                    });
+                }, 100);
+                return;
+            }
+            // 检测 builtin（优先检测）
             const { hasBuiltin, builtins } = detectBuiltin(result.stepData.command);
             if (hasBuiltin) {
+                // 有 builtin，不管什么模式都不编辑，直接提示
+                setState({
+                    type: 'showing_command',
+                    stepData: result.stepData,
+                });
                 setTimeout(() => {
                     onStepComplete({
                         command: result.stepData.command,
@@ -43,6 +66,25 @@ export const MultiStepCommandGenerator = ({ prompt, debug, previousSteps = [], c
                         needsContinue: result.stepData.continue,
                     });
                 }, 100);
+                return;
+            }
+            // 根据 editMode 决定进入哪个状态
+            const config = getConfig();
+            const autoEdit = config.editMode === 'auto';
+            if (autoEdit) {
+                // auto 模式：直接进入编辑状态
+                setEditedCommand(result.stepData.command);
+                setState({
+                    type: 'editing',
+                    stepData: result.stepData,
+                });
+            }
+            else {
+                // manual 模式：显示命令，等待用户操作
+                setState({
+                    type: 'showing_command',
+                    stepData: result.stepData,
+                });
             }
         })
             .catch((error) => {
@@ -61,6 +103,8 @@ export const MultiStepCommandGenerator = ({ prompt, debug, previousSteps = [], c
         if (state.type === 'showing_command') {
             onStepComplete({
                 command: state.stepData.command,
+                aiGeneratedCommand: state.stepData.command, // 原始命令
+                userModified: false,
                 confirmed: true,
                 reasoning: state.stepData.reasoning,
                 needsContinue: state.stepData.continue,
@@ -69,6 +113,50 @@ export const MultiStepCommandGenerator = ({ prompt, debug, previousSteps = [], c
             });
         }
     };
+    // 处理编辑
+    const handleEdit = () => {
+        if (state.type === 'showing_command') {
+            setEditedCommand(state.stepData.command); // 初始化为 AI 生成的命令
+            setState({ type: 'editing', stepData: state.stepData });
+        }
+    };
+    // 编辑完成确认
+    const handleEditConfirm = () => {
+        if (state.type === 'editing') {
+            const modified = editedCommand !== state.stepData.command;
+            onStepComplete({
+                command: editedCommand, // 使用编辑后的命令
+                aiGeneratedCommand: state.stepData.command, // 保存 AI 原始命令
+                userModified: modified,
+                confirmed: true,
+                reasoning: state.stepData.reasoning,
+                needsContinue: state.stepData.continue,
+                nextStepHint: state.stepData.nextStepHint,
+                debugInfo: debugInfo,
+            });
+        }
+    };
+    // 取消编辑
+    const handleEditCancel = () => {
+        if (state.type === 'editing') {
+            const config = getConfig();
+            if (config.editMode === 'auto') {
+                // auto 模式：Esc 直接取消整个操作
+                setState({ type: 'cancelled', command: state.stepData.command });
+                setTimeout(() => {
+                    onStepComplete({
+                        command: state.stepData.command,
+                        confirmed: false,
+                        cancelled: true,
+                    });
+                }, 100);
+            }
+            else {
+                // manual 模式：Esc 返回到 showing_command 状态
+                setState({ type: 'showing_command', stepData: state.stepData });
+            }
+        }
+    };
     // 处理取消
     const handleCancel = () => {
         if (state.type === 'showing_command') {
@@ -132,7 +220,22 @@ export const MultiStepCommandGenerator = ({ prompt, debug, previousSteps = [], c
                 }
                 return null;
             })(),
-            !detectBuiltin(state.stepData.command).hasBuiltin && (React.createElement(ConfirmationPrompt, { prompt: "\u6267\u884C\uFF1F", onConfirm: handleConfirm, onCancel: handleCancel })))),
+            !detectBuiltin(state.stepData.command).hasBuiltin && (React.createElement(ConfirmationPrompt, { prompt: "\u6267\u884C\uFF1F", onConfirm: handleConfirm, onCancel: handleCancel, onEdit: handleEdit })))),
+        state.type === 'editing' && (React.createElement(React.Fragment, null,
+            state.stepData.continue === true && (React.createElement(Box, { flexDirection: "column", marginTop: 1 },
+                React.createElement(Text, { color: theme.text.secondary },
+                    "\u6B65\u9AA4 ",
+                    currentStepNumber,
+                    "/?"),
+                state.stepData.reasoning && (React.createElement(Text, { color: theme.text.muted },
+                    "\u539F\u56E0: ",
+                    state.stepData.reasoning)))),
+            React.createElement(CommandBox, { command: state.stepData.command }),
+            React.createElement(Box, { flexDirection: "row" },
+                React.createElement(Text, { color: theme.primary }, '> '),
+                React.createElement(TextInput, { value: editedCommand, onChange: setEditedCommand, onSubmit: handleEditConfirm })),
+            React.createElement(Box, { marginTop: 1 },
+                React.createElement(Text, { color: theme.text.secondary }, getConfig().editMode === 'auto' ? '[回车执行 / Esc 取消]' : '[回车执行 / Esc 返回]')))),
         state.type === 'cancelled' && (React.createElement(Box, { marginTop: 1 },
             React.createElement(Text, { color: theme.text.secondary }, "\u5DF2\u53D6\u6D88\u6267\u884C"))),
         state.type === 'error' && (React.createElement(Box, { marginTop: 1 },

package/dist/src/config.d.ts

@@ -1,29 +1,48 @@
+export declare const CONFIG_DIR: string;
+declare const VALID_PROVIDERS: readonly ["openai", "anthropic", "deepseek", "google", "groq", "mistral", "cohere", "fireworks", "together"];
+type Provider = (typeof VALID_PROVIDERS)[number];
+declare const VALID_EDIT_MODES: readonly ["manual", "auto"];
+type EditMode = (typeof VALID_EDIT_MODES)[number];
+/**
+ * 配置接口
+ */
+export interface Config {
+    apiKey: string;
+    baseUrl: string;
+    model: string;
+    provider: Provider;
+    shellHook: boolean;
+    chatHistoryLimit: number;
+    commandHistoryLimit: number;
+    shellHistoryLimit: number;
+    editMode: EditMode;
+}
 /**
  * 读取配置
  */
-export function getConfig(): any;
+export declare function getConfig(): Config;
 /**
  * 保存配置
  */
-export function saveConfig(config: any): void;
+export declare function saveConfig(config: Config): void;
 /**
  * 设置单个配置项
  */
-export function setConfigValue(key: any, value: any): any;
+export declare function setConfigValue(key: string, value: string | boolean | number): Config;
 /**
  * 检查配置是否有效
  */
-export function isConfigValid(): any;
+export declare function isConfigValid(): boolean;
 /**
  * 隐藏 API Key 中间部分
  */
-export function maskApiKey(apiKey: any): any;
+export declare function maskApiKey(apiKey: string): string;
 /**
  * 显示当前配置
  */
-export function displayConfig(): void;
+export declare function displayConfig(): void;
 /**
  * 交互式配置向导
  */
-export function runConfigWizard(): Promise<void>;
-export const CONFIG_DIR: string;
+export declare function runConfigWizard(): Promise<void>;
+export {};