@yivan-lab/pretty-please 1.0.0 → 1.2.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,7 +1,16 @@
 import fs from 'fs';
 import path from 'path';
 import os from 'os';
+import chalk from 'chalk';
 import { getConfig } from './config.js';
+import { getCurrentTheme } from './ui/theme.js';
+// 获取主题颜色
+function getColors() {
+    const theme = getCurrentTheme();
+    return {
+        primary: theme.primary,
+    };
+}
 const CONFIG_DIR = path.join(os.homedir(), '.please');
 const CHAT_HISTORY_FILE = path.join(CONFIG_DIR, 'chat_history.json');
 /**
@@ -14,7 +23,6 @@ function ensureConfigDir() {
 }
 /**
  * 读取对话历史
- * @returns {Array<{role: string, content: string}>} messages 数组
  */
 export function getChatHistory() {
     ensureConfigDir();
@@ -31,7 +39,6 @@ export function getChatHistory() {
 }
 /**
  * 保存对话历史
- * @param {Array<{role: string, content: string}>} history
  */
 function saveChatHistory(history) {
     ensureConfigDir();
@@ -39,8 +46,6 @@ function saveChatHistory(history) {
 }
 /**
  * 添加一轮对话（用户问题 + AI 回答）
- * @param {string} userMessage - 用户消息
- * @param {string} assistantMessage - AI 回复
  */
 export function addChatMessage(userMessage, assistantMessage) {
     const config = getConfig();
@@ -79,3 +84,29 @@ export function getChatRoundCount() {
     const history = getChatHistory();
     return Math.floor(history.length / 2);
 }
+/**
+ * 显示对话历史（只显示用户的 prompt）
+ */
+export function displayChatHistory() {
+    const history = getChatHistory();
+    const config = getConfig();
+    const colors = getColors();
+    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.hex(colors.primary)(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,14 +2,15 @@ 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';
+import { getCurrentTheme } from '../ui/theme.js';
 /**
  * Chat 组件 - AI 对话模式
  * 使用正常渲染，完成后保持最后一帧在终端
  */
 export function Chat({ prompt, debug, showRoundCount, onComplete }) {
+    const theme = getCurrentTheme();
     const [status, setStatus] = useState('thinking');
     const [content, setContent] = useState('');
     const [duration, setDuration] = useState(0);
@@ -23,12 +24,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/CodeColorizer.js

@@ -1,26 +1,30 @@
 import React from 'react';
 import { Text, Box } from 'ink';
 import { common, createLowlight } from 'lowlight';
-import { theme } from '../ui/theme.js';
+import { getCurrentTheme } from '../ui/theme.js';
 // 创建 lowlight 实例
 const lowlight = createLowlight(common);
-// 语法高亮颜色映射
-const syntaxColors = {
-    'hljs-keyword': theme.code.keyword,
-    'hljs-string': theme.code.string,
-    'hljs-function': theme.code.function,
-    'hljs-comment': theme.code.comment,
-    'hljs-number': theme.primary,
-    'hljs-built_in': theme.secondary,
-    'hljs-title': theme.accent,
-    'hljs-variable': theme.text.primary,
-    'hljs-type': theme.info,
-    'hljs-operator': theme.text.secondary,
-};
+/**
+ * 获取语法高亮颜色映射
+ */
+function getSyntaxColors(theme) {
+    return {
+        'hljs-keyword': theme.code.keyword,
+        'hljs-string': theme.code.string,
+        'hljs-function': theme.code.function,
+        'hljs-comment': theme.code.comment,
+        'hljs-number': theme.primary,
+        'hljs-built_in': theme.secondary,
+        'hljs-title': theme.accent,
+        'hljs-variable': theme.text.primary,
+        'hljs-type': theme.info,
+        'hljs-operator': theme.text.secondary,
+    };
+}
 /**
  * 渲染 HAST 语法树节点
  */
-function renderHastNode(node, inheritedColor) {
+function renderHastNode(node, inheritedColor, syntaxColors, theme) {
     if (node.type === 'text') {
         const color = inheritedColor || theme.code.text;
         return React.createElement(Text, { color: color }, node.value);
@@ -38,26 +42,26 @@ function renderHastNode(node, inheritedColor) {
         }
         const colorToPassDown = elementColor || inheritedColor;
         // 递归渲染子节点
-        const children = node.children?.map((child, index) => (React.createElement(React.Fragment, { key: index }, renderHastNode(child, colorToPassDown))));
+        const children = node.children?.map((child, index) => (React.createElement(React.Fragment, { key: index }, renderHastNode(child, colorToPassDown, syntaxColors, theme))));
         return React.createElement(React.Fragment, null, children);
     }
     if (node.type === 'root') {
         if (!node.children || node.children.length === 0) {
             return null;
         }
-        return node.children?.map((child, index) => (React.createElement(React.Fragment, { key: index }, renderHastNode(child, inheritedColor))));
+        return node.children?.map((child, index) => (React.createElement(React.Fragment, { key: index }, renderHastNode(child, inheritedColor, syntaxColors, theme))));
     }
     return null;
 }
 /**
  * 高亮并渲染一行代码
  */
-function highlightLine(line, language) {
+function highlightLine(line, language, syntaxColors, theme) {
     try {
         const highlighted = !language || !lowlight.registered(language)
             ? lowlight.highlightAuto(line)
             : lowlight.highlight(language, line);
-        const rendered = renderHastNode(highlighted, undefined);
+        const rendered = renderHastNode(highlighted, undefined, syntaxColors, theme);
         return rendered !== null ? rendered : line;
     }
     catch {
@@ -68,11 +72,13 @@ function highlightLine(line, language) {
  * 代码高亮组件
  */
 function ColorizeCodeInternal({ code, language = null, showLineNumbers = false }) {
+    const theme = getCurrentTheme();
+    const syntaxColors = getSyntaxColors(theme);
     const codeToHighlight = code.replace(/\n$/, '');
     const lines = codeToHighlight.split('\n');
     const padWidth = String(lines.length).length;
     const renderedLines = lines.map((line, index) => {
-        const contentToRender = highlightLine(line, language);
+        const contentToRender = highlightLine(line, language, syntaxColors, theme);
         return (React.createElement(Box, { key: index, minHeight: 1 },
             showLineNumbers && (React.createElement(Text, { color: theme.text.dim }, `${String(index + 1).padStart(padWidth, ' ')} `)),
             React.createElement(Text, { color: theme.code.text }, contentToRender)));

package/dist/src/components/CommandBox.js

@@ -1,26 +1,12 @@
 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 { getCurrentTheme } from '../ui/theme.js';
+import { getDisplayWidth } from '../utils/console.js';
 /**
  * CommandBox 组件 - 显示带边框和标题的命令框
  */
 export const CommandBox = ({ command, title = '生成命令' }) => {
+    const theme = getCurrentTheme();
     const lines = command.split('\n');
     const titleWidth = getDisplayWidth(title);
     const maxContentWidth = Math.max(...lines.map(l => getDisplayWidth(l)));

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

@@ -1,11 +1,12 @@
 import React from 'react';
 import { Text, useInput } from 'ink';
-import { theme } from '../ui/theme.js';
+import { getCurrentTheme } 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, }) => {
+    const theme = getCurrentTheme();
     useInput((input, key) => {
         if (key.return) {
             // 回车键
@@ -15,6 +16,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 +27,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/Duration.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Text } from 'ink';
-import { theme } from '../ui/theme.js';
+import { getCurrentTheme } from '../ui/theme.js';
 /**
  * 格式化耗时
  */
@@ -14,6 +14,7 @@ function formatDuration(ms) {
  * Duration 组件 - 显示耗时
  */
 export const Duration = ({ ms }) => {
+    const theme = getCurrentTheme();
     return React.createElement(Text, { color: theme.text.secondary },
         "(",
         formatDuration(ms),

package/dist/src/components/InlineRenderer.js

@@ -1,11 +1,12 @@
 import React from 'react';
 import { Text } from 'ink';
-import { theme } from '../ui/theme.js';
+import { getCurrentTheme } from '../ui/theme.js';
 /**
  * 行内 Markdown 渲染器
  * 处理 **粗体**、*斜体*、`代码`、~~删除线~~、<u>下划线</u>、链接
  */
 function RenderInlineInternal({ text, defaultColor }) {
+    const theme = getCurrentTheme();
     const baseColor = defaultColor || theme.text.primary;
     // 快速路径：纯文本无 markdown
     if (!/[*_~`<[https?:]/.test(text)) {

package/dist/src/components/MarkdownDisplay.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Text, Box } from 'ink';
-import { theme } from '../ui/theme.js';
+import { getCurrentTheme } from '../ui/theme.js';
 import { ColorizeCode } from './CodeColorizer.js';
 import { TableRenderer } from './TableRenderer.js';
 import { RenderInline } from './InlineRenderer.js';
@@ -12,6 +12,7 @@ import { RenderInline } from './InlineRenderer.js';
 function MarkdownDisplayInternal({ text, terminalWidth = 80 }) {
     if (!text)
         return React.createElement(React.Fragment, null);
+    const theme = getCurrentTheme();
     const lines = text.split(/\r?\n/);
     // 正则表达式
     const headerRegex = /^ *(#{1,4}) +(.*)/;

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

@@ -1,10 +1,12 @@
 import React from 'react';
-import { type ExecutedStep } from '../multi-step.js';
+import { type ExecutedStep, type RemoteContext } from '../multi-step.js';
 interface MultiStepCommandGeneratorProps {
     prompt: string;
     debug?: boolean;
     onStepComplete: (step: {
         command: string;
+        aiGeneratedCommand?: string;
+        userModified?: boolean;
         confirmed: boolean;
         cancelled?: boolean;
         hasBuiltin?: boolean;
@@ -16,6 +18,8 @@ interface MultiStepCommandGeneratorProps {
     }) => void;
     previousSteps?: ExecutedStep[];
     currentStepNumber?: number;
+    remoteContext?: RemoteContext;
+    isRemote?: boolean;
 }
 /**
  * MultiStepCommandGenerator 组件 - 多步骤命令生成