@yivan-lab/pretty-please 1.2.0 → 1.3.0

package/dist/bin/pls.js

@@ -2,7 +2,9 @@
 import { Command } from 'commander';
 import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
+import path from 'path';
 import { exec } from 'child_process';
+import fs from 'fs';
 import os from 'os';
 import chalk from 'chalk';
 // React 和 Ink 懒加载（只在需要 UI 时加载）
@@ -72,10 +74,16 @@ function executeCommand(command) {
         let stderr = '';
         let hasOutput = false;
         console.log(''); // 空行
-        // 计算命令框宽度，让分隔线长度一致
+        // 计算命令框宽度，让分隔线长度一致（限制终端宽度）
+        const termWidth = process.stdout.columns || 80;
+        const maxContentWidth = termWidth - 6;
         const lines = command.split('\n');
-        const maxContentWidth = Math.max(...lines.map(l => console2.getDisplayWidth(l)));
-        const boxWidth = Math.max(maxContentWidth + 4, console2.getDisplayWidth('生成命令') + 6, 20);
+        const wrappedLines = [];
+        for (const line of lines) {
+            wrappedLines.push(...console2.wrapText(line, maxContentWidth));
+        }
+        const actualMaxWidth = Math.max(...wrappedLines.map((l) => console2.getDisplayWidth(l)), console2.getDisplayWidth('生成命令'));
+        const boxWidth = Math.min(actualMaxWidth + 4, termWidth - 2);
         console2.printSeparator('输出', boxWidth);
         // 使用 bash 并启用 pipefail，确保管道中任何命令失败都能正确返回非零退出码
         const child = exec(`set -o pipefail; ${command}`, { shell: '/bin/bash' });
@@ -141,11 +149,18 @@ configCmd
 configCmd
     .command('set <key> <value>')
     .description('设置配置项 (apiKey, baseUrl, provider, model, shellHook, chatHistoryLimit)')
-    .action((key, value) => {
+    .action(async (key, value) => {
     try {
+        const oldConfig = getConfig();
+        const oldShellHistoryLimit = oldConfig.shellHistoryLimit;
         setConfigValue(key, value);
         console.log('');
         console2.success(`已设置 ${key}`);
+        // 如果修改了 shellHistoryLimit，自动重装 hook
+        if (key === 'shellHistoryLimit') {
+            const { reinstallHookForLimitChange } = await import('../src/shell-hook.js');
+            await reinstallHookForLimitChange(oldShellHistoryLimit, Number(value));
+        }
         console.log('');
     }
     catch (error) {
@@ -165,41 +180,84 @@ const themeCmd = program.command('theme').description('管理主题');
 themeCmd
     .command('list')
     .description('查看所有可用主题')
-    .action(async () => {
-    const { themes } = await import('../src/ui/theme.js');
+    .option('--custom', '只显示自定义主题')
+    .option('--builtin', '只显示内置主题')
+    .action(async (options) => {
+    const { getAllThemeMetadata, isBuiltinTheme } = await import('../src/ui/theme.js');
     const config = getConfig();
     const currentTheme = config.theme || 'dark';
     console.log('');
     console2.title('🎨 可用主题:');
     console2.muted('━'.repeat(50));
-    Object.keys(themes).forEach((themeName) => {
-        const isCurrent = themeName === currentTheme;
-        const prefix = isCurrent ? '●' : '○';
-        const label = themeName === 'dark' ? 'dark (深色)' : 'light (浅色)';
-        const color = themeName === 'dark' ? '#00D9FF' : '#0284C7';
-        if (isCurrent) {
-            console.log(`  ${chalk.hex(color)(prefix)} ${chalk.hex(color).bold(label)} ${chalk.gray('(当前)')}`);
+    // 动态获取所有主题元数据
+    const allThemes = getAllThemeMetadata();
+    // 根据选项过滤主题
+    const builtinThemes = allThemes.filter((meta) => isBuiltinTheme(meta.name));
+    const customThemes = allThemes.filter((meta) => !isBuiltinTheme(meta.name));
+    // 显示内置主题
+    if (!options.custom) {
+        if (builtinThemes.length > 0) {
+            console.log('');
+            console2.info('内置主题:');
+            builtinThemes.forEach((meta) => {
+                const isCurrent = meta.name === currentTheme;
+                const prefix = isCurrent ? '●' : '○';
+                const label = `${meta.name} (${meta.displayName})`;
+                if (isCurrent) {
+                    console.log(`  ${chalk.hex(meta.previewColor)(prefix)} ${chalk.hex(meta.previewColor).bold(label)} ${chalk.gray('(当前)')}`);
+                }
+                else {
+                    console.log(`  ${chalk.gray(prefix)} ${label}`);
+                }
+            });
         }
-        else {
-            console.log(`  ${chalk.gray(prefix)} ${label}`);
+    }
+    // 显示自定义主题
+    if (!options.builtin) {
+        if (customThemes.length > 0) {
+            console.log('');
+            console2.info('自定义主题:');
+            customThemes.forEach((meta) => {
+                const isCurrent = meta.name === currentTheme;
+                const prefix = isCurrent ? '●' : '○';
+                const label = `${meta.name} (${meta.displayName})`;
+                const emoji = ' ✨';
+                if (isCurrent) {
+                    console.log(`  ${chalk.hex(meta.previewColor)(prefix)} ${chalk.hex(meta.previewColor).bold(label)}${emoji} ${chalk.gray('(当前)')}`);
+                }
+                else {
+                    console.log(`  ${chalk.gray(prefix)} ${label}${emoji}`);
+                }
+            });
         }
-    });
+        else if (options.custom) {
+            console.log('');
+            console2.muted('  还没有自定义主题');
+            console2.muted('  使用 pls theme create <name> 创建');
+        }
+    }
+    console.log('');
     console2.muted('━'.repeat(50));
     console.log('');
 });
 themeCmd
-    .argument('[name]', '主题名称 (dark, light)')
+    .argument('[name]', '主题名称')
     .description('切换主题')
-    .action((name) => {
+    .action(async (name) => {
+    const { getThemeMetadata, getAllThemeMetadata, isValidTheme } = await import('../src/ui/theme.js');
     if (!name) {
         // 显示当前主题
         const config = getConfig();
         const currentTheme = config.theme || 'dark';
-        const label = currentTheme === 'dark' ? 'dark (深色)' : 'light (浅色)';
-        const color = currentTheme === 'dark' ? '#00D9FF' : '#0284C7';
-        console.log('');
-        console.log(`当前主题: ${chalk.hex(color).bold(label)}`);
-        console.log('');
+        const meta = getThemeMetadata(currentTheme);
+        if (meta) {
+            console.log('');
+            console.log(`当前主题: ${chalk.hex(meta.previewColor).bold(`${meta.name} (${meta.displayName})`)}`);
+            if (meta.description) {
+                console2.muted(`  ${meta.description}`);
+            }
+            console.log('');
+        }
         console2.muted('使用 pls theme list 查看所有主题');
         console2.muted('使用 pls theme <name> 切换主题');
         console.log('');
@@ -207,11 +265,80 @@ themeCmd
     }
     // 切换主题
     try {
+        // 验证主题是否存在
+        if (!isValidTheme(name)) {
+            const allThemes = getAllThemeMetadata();
+            const themeNames = allThemes.map((m) => m.name).join(', ');
+            throw new Error(`未知主题 "${name}"，可用主题: ${themeNames}`);
+        }
         setConfigValue('theme', name);
-        const label = name === 'dark' ? 'dark (深色)' : 'light (浅色)';
-        const color = name === 'dark' ? '#00D9FF' : '#0284C7';
+        const meta = getThemeMetadata(name);
+        if (meta) {
+            console.log('');
+            console2.success(`已切换到 ${chalk.hex(meta.previewColor).bold(`${meta.name} (${meta.displayName})`)} 主题`);
+            if (meta.description) {
+                console2.muted(`  ${meta.description}`);
+            }
+            console.log('');
+        }
+    }
+    catch (error) {
+        console.log('');
+        console2.error(error.message);
+        console.log('');
+        process.exit(1);
+    }
+});
+// theme create - 创建主题模板
+themeCmd
+    .command('create <name>')
+    .description('创建自定义主题模板')
+    .option('-d, --display-name <name>', '显示名称')
+    .option('-c, --category <type>', '主题类别 (dark 或 light)', 'dark')
+    .action(async (name, options) => {
+    const { createThemeTemplate } = await import('../src/ui/theme.js');
+    try {
+        // 验证主题名称格式
+        if (!/^[a-z0-9-]+$/.test(name)) {
+            throw new Error('主题名称只能包含小写字母、数字和连字符');
+        }
+        // 验证类别
+        const category = options.category;
+        if (category !== 'dark' && category !== 'light') {
+            throw new Error('主题类别必须是 dark 或 light');
+        }
+        // 创建主题目录
+        const themesDir = path.join(os.homedir(), '.please', 'themes');
+        if (!fs.existsSync(themesDir)) {
+            fs.mkdirSync(themesDir, { recursive: true });
+        }
+        // 检查主题文件是否已存在
+        const themePath = path.join(themesDir, `${name}.json`);
+        if (fs.existsSync(themePath)) {
+            throw new Error(`主题 "${name}" 已存在`);
+        }
+        // 创建主题模板
+        const displayName = options.displayName || name;
+        const template = createThemeTemplate(name, displayName, category);
+        // 保存到文件
+        fs.writeFileSync(themePath, JSON.stringify(template, null, 2), 'utf-8');
+        // 显示成功信息
+        console.log('');
+        console2.success(`已创建主题模板: ${themePath}`);
+        console.log('');
+        console2.info('📝 下一步:');
+        console.log(`  1. 编辑主题文件修改颜色配置`);
+        console2.muted(`     vim ${themePath}`);
+        console.log('');
+        console.log(`  2. 验证主题格式`);
+        console2.muted(`     pls theme validate ${themePath}`);
+        console.log('');
+        console.log(`  3. 应用主题查看效果`);
+        console2.muted(`     pls theme ${name}`);
         console.log('');
-        console2.success(`已切换到 ${chalk.hex(color).bold(label)} 主题`);
+        console2.info('💡 提示:');
+        console2.muted('  - 使用在线工具选择颜色: https://colorhunt.co');
+        console2.muted('  - 参考内置主题: pls theme list');
         console.log('');
     }
     catch (error) {
@@ -221,6 +348,67 @@ themeCmd
         process.exit(1);
     }
 });
+// theme validate - 验证主题文件
+themeCmd
+    .command('validate <file>')
+    .description('验证主题文件格式')
+    .action(async (file) => {
+    const { validateThemeWithDetails } = await import('../src/ui/theme.js');
+    try {
+        // 读取主题文件
+        const themePath = path.isAbsolute(file) ? file : path.join(process.cwd(), file);
+        if (!fs.existsSync(themePath)) {
+            throw new Error(`文件不存在: ${themePath}`);
+        }
+        const content = fs.readFileSync(themePath, 'utf-8');
+        const theme = JSON.parse(content);
+        // 验证主题
+        const result = validateThemeWithDetails(theme);
+        console.log('');
+        if (result.valid) {
+            console2.success('✓ 主题验证通过');
+            console.log('');
+            if (theme.metadata) {
+                console2.info('主题信息:');
+                console.log(`  名称: ${theme.metadata.name} (${theme.metadata.displayName})`);
+                console.log(`  类别: ${theme.metadata.category}`);
+                if (theme.metadata.description) {
+                    console.log(`  描述: ${theme.metadata.description}`);
+                }
+                if (theme.metadata.author) {
+                    console.log(`  作者: ${theme.metadata.author}`);
+                }
+            }
+            console.log('');
+        }
+        else {
+            console2.error('✗ 主题验证失败');
+            console.log('');
+            console2.info('错误列表:');
+            result.errors.forEach((err, idx) => {
+                console.log(`  ${idx + 1}. ${err}`);
+            });
+            console.log('');
+            console2.info('修复建议:');
+            console2.muted(`  1. 编辑主题文件: vim ${themePath}`);
+            console2.muted('  2. 参考内置主题格式');
+            console2.muted('  3. 确保所有颜色使用 #RRGGBB 格式');
+            console.log('');
+            process.exit(1);
+        }
+    }
+    catch (error) {
+        console.log('');
+        if (error.message.includes('Unexpected token')) {
+            console2.error('JSON 格式错误，请检查文件语法');
+        }
+        else {
+            console2.error(error.message);
+        }
+        console.log('');
+        process.exit(1);
+    }
+});
 // history 子命令
 const historyCmd = program.command('history').description('查看或管理命令历史');
 historyCmd
@@ -787,22 +975,16 @@ remoteCmd
 remoteCmd.action(() => {
     displayRemotes();
 });
-// chat 子命令
-const chatCmd = program.command('chat').description('AI 对话模式，问答、讲解命令');
-chatCmd
-    .command('clear')
-    .description('清空对话历史')
-    .action(() => {
-    clearChatHistory();
-    console.log('');
-    console2.success('对话历史已清空');
-    console.log('');
-});
-// 默认 chat 命令（进行对话）
-chatCmd
-    .argument('[prompt...]', '你的问题')
+// chat 命令（AI 对话）
+program
+    .command('chat')
+    .description('AI 对话模式，问答、讲解命令')
+    .argument('[prompt...]', '你的问题（不提供则显示状态）')
     .option('-d, --debug', '显示调试信息')
     .action((promptArgs, options) => {
+    // Workaround: Commander.js 14.x 的子命令 option 解析有 bug
+    // 直接从 process.argv 检查 --debug
+    const debug = process.argv.includes('--debug') || process.argv.includes('-d');
     const prompt = promptArgs.join(' ');
     if (!prompt.trim()) {
         // 没有输入，显示对话状态
@@ -816,8 +998,8 @@ chatCmd
         console2.muted('━'.repeat(40));
         console.log('');
         console2.muted('用法:');
-        console2.info('  pls chat <问题>    与 AI 对话');
-        console2.info('  pls chat clear     清空对话历史');
+        console2.info('  pls chat <问题>          与 AI 对话');
+        console2.info('  pls history chat clear   清空对话历史');
         console.log('');
         return;
     }
@@ -837,7 +1019,7 @@ chatCmd
         const { Chat } = await import('../src/components/Chat.js');
         render(React.createElement(Chat, {
             prompt,
-            debug: options.debug,
+            debug: debug, // 使用 debug 变量
             showRoundCount: true,
             onComplete: () => process.exit(0),
         }));
@@ -1084,9 +1266,6 @@ program
             await new Promise((resolve) => setTimeout(resolve, 10));
             // 处理步骤结果
             if (!stepResult || stepResult.cancelled) {
-                console.log('');
-                console2.muted('已取消执行');
-                console.log('');
                 process.exit(0);
             }
             if (stepResult.hasBuiltin) {
@@ -1264,10 +1443,16 @@ async function executeRemoteCommand(remoteName, command) {
     const workDir = getRemoteWorkDir(remoteName);
     const actualCommand = workDir ? `cd ${workDir} && ${command}` : command;
     console.log(''); // 空行
-    // 计算命令框宽度，让分隔线长度一致
+    // 计算命令框宽度，让分隔线长度一致（限制终端宽度）
+    const termWidth = process.stdout.columns || 80;
+    const maxContentWidth = termWidth - 6;
     const lines = command.split('\n');
-    const maxContentWidth = Math.max(...lines.map(l => console2.getDisplayWidth(l)));
-    const boxWidth = Math.max(maxContentWidth + 4, console2.getDisplayWidth('生成命令') + 6, 20);
+    const wrappedLines = [];
+    for (const line of lines) {
+        wrappedLines.push(...console2.wrapText(line, maxContentWidth));
+    }
+    const actualMaxWidth = Math.max(...wrappedLines.map((l) => console2.getDisplayWidth(l)), console2.getDisplayWidth('生成命令'));
+    const boxWidth = Math.min(actualMaxWidth + 4, termWidth - 2);
     console2.printSeparator(`远程输出 (${remoteName})`, boxWidth);
     try {
         const result = await sshExec(remoteName, actualCommand, {

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@yivan-lab/pretty-please",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "description": "AI 驱动的命令行工具，将自然语言转换为可执行的 Shell 命令",
     "type": "module",
     "bin": {

package/dist/src/components/Chat.js

@@ -3,8 +3,13 @@ import { Box, Text } from 'ink';
 import Spinner from 'ink-spinner';
 import { MarkdownDisplay } from './MarkdownDisplay.js';
 import { chatWithMastra } from '../mastra-chat.js';
-import { getChatRoundCount } from '../chat-history.js';
+import { getChatRoundCount, getChatHistory } from '../chat-history.js';
 import { getCurrentTheme } from '../ui/theme.js';
+import { formatSystemInfo } from '../sysinfo.js';
+import { formatHistoryForAI } from '../history.js';
+import { formatShellHistoryForAI, getShellHistory } from '../shell-hook.js';
+import { getConfig } from '../config.js';
+import { CHAT_SYSTEM_PROMPT, buildChatUserContext } from '../prompts.js';
 /**
  * Chat 组件 - AI 对话模式
  * 使用正常渲染，完成后保持最后一帧在终端
@@ -14,8 +19,26 @@ export function Chat({ prompt, debug, showRoundCount, onComplete }) {
     const [status, setStatus] = useState('thinking');
     const [content, setContent] = useState('');
     const [duration, setDuration] = useState(0);
-    const [debugInfo, setDebugInfo] = useState(null);
     const [roundCount] = useState(getChatRoundCount());
+    // Debug 信息：直接在 useState 初始化时计算（同步）
+    const [debugInfo] = useState(() => {
+        if (!debug)
+            return null;
+        const config = getConfig();
+        const sysinfo = formatSystemInfo();
+        const plsHistory = formatHistoryForAI();
+        const shellHistory = formatShellHistoryForAI();
+        const shellHookEnabled = config.shellHook && getShellHistory().length > 0;
+        const chatHistory = getChatHistory();
+        const userContext = buildChatUserContext(prompt, sysinfo, plsHistory, shellHistory, shellHookEnabled);
+        return {
+            sysinfo,
+            model: config.model,
+            systemPrompt: CHAT_SYSTEM_PROMPT,
+            userContext,
+            chatHistory,
+        };
+    });
     useEffect(() => {
         const startTime = Date.now();
         // 流式输出回调
@@ -24,15 +47,12 @@ export function Chat({ prompt, debug, showRoundCount, onComplete }) {
             setContent((prev) => prev + chunk);
         };
         // 调用 AI
-        chatWithMastra(prompt, { debug: debug || false, onChunk })
+        chatWithMastra(prompt, { debug: false, onChunk }) // 不需要 AI 返回 debug
             .then((result) => {
             const endTime = Date.now();
             setDuration(endTime - startTime);
             setStatus('done');
-            if (debug && typeof result === 'object' && 'debug' in result && result.debug) {
-                setDebugInfo(result.debug);
-            }
-            setTimeout(onComplete, 100);
+            setTimeout(onComplete, debug ? 500 : 100);
         })
             .catch((error) => {
             setStatus('error');
@@ -41,6 +61,30 @@ export function Chat({ prompt, debug, showRoundCount, onComplete }) {
         });
     }, [prompt, debug, onComplete]);
     return (React.createElement(Box, { flexDirection: "column" },
+        debugInfo && (React.createElement(Box, { flexDirection: "column", marginBottom: 1 },
+            React.createElement(Text, { color: theme.accent, bold: true }, "\u2501\u2501\u2501 \u8C03\u8BD5\u4FE1\u606F \u2501\u2501\u2501"),
+            React.createElement(Text, { color: theme.text.secondary },
+                "\u6A21\u578B: ",
+                debugInfo.model),
+            React.createElement(Text, { color: theme.text.secondary },
+                "\u5BF9\u8BDD\u5386\u53F2\u8F6E\u6570: ",
+                Math.floor(debugInfo.chatHistory.length / 2)),
+            debugInfo.chatHistory.length > 0 && (React.createElement(Box, { flexDirection: "column", marginTop: 1 },
+                React.createElement(Text, { color: theme.text.secondary }, "\u5386\u53F2\u5BF9\u8BDD\uFF08\u7528\u6237\u95EE\u9898\uFF09:"),
+                debugInfo.chatHistory
+                    .filter((msg) => msg.role === 'user')
+                    .slice(-5) // 最多显示最近 5 条
+                    .map((msg, idx) => (React.createElement(Text, { key: idx, color: theme.text.muted },
+                    idx + 1,
+                    ". ",
+                    msg.content.substring(0, 50),
+                    msg.content.length > 50 ? '...' : ''))))),
+            React.createElement(Box, { flexDirection: "column", marginTop: 1 },
+                React.createElement(Text, { color: theme.text.secondary }, "User Context (\u6700\u65B0\u6D88\u606F):"),
+                React.createElement(Text, { color: theme.text.muted },
+                    debugInfo.userContext.substring(0, 500),
+                    "...")),
+            React.createElement(Text, { color: theme.accent }, "\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501"))),
         showRoundCount && roundCount > 0 && (React.createElement(Box, { marginBottom: 1 },
             React.createElement(Text, { color: theme.text.secondary },
                 "(\u5BF9\u8BDD\u8F6E\u6570: ",
@@ -60,22 +104,5 @@ export function Chat({ prompt, debug, showRoundCount, onComplete }) {
             React.createElement(Text, { color: theme.text.secondary },
                 "(",
                 (duration / 1000).toFixed(2),
-                "s)"))),
-        debugInfo && (React.createElement(Box, { flexDirection: "column", marginY: 1 },
-            React.createElement(Text, { color: theme.accent }, "\u2501\u2501\u2501 \u8C03\u8BD5\u4FE1\u606F \u2501\u2501\u2501"),
-            React.createElement(Text, { color: theme.text.secondary },
-                "\u7CFB\u7EDF\u4FE1\u606F: ",
-                debugInfo.sysinfo),
-            React.createElement(Text, { color: theme.text.secondary },
-                "\u6A21\u578B: ",
-                debugInfo.model),
-            React.createElement(Text, { color: theme.text.secondary },
-                "\u5BF9\u8BDD\u5386\u53F2\u8F6E\u6570: ",
-                Math.floor(debugInfo.chatHistory.length / 2)),
-            React.createElement(Text, { color: theme.text.secondary }, "System Prompt:"),
-            React.createElement(Text, { dimColor: true }, debugInfo.systemPrompt),
-            React.createElement(Text, { color: theme.text.secondary },
-                "User Prompt: ",
-                debugInfo.userPrompt),
-            React.createElement(Text, { color: theme.accent }, "\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501")))));
+                "s)")))));
 }

package/dist/src/components/CommandBox.js

@@ -1,26 +1,36 @@
 import React from 'react';
 import { Box, Text } from 'ink';
 import { getCurrentTheme } from '../ui/theme.js';
-import { getDisplayWidth } from '../utils/console.js';
+import { getDisplayWidth, wrapText } from '../utils/console.js';
 /**
  * CommandBox 组件 - 显示带边框和标题的命令框
  */
 export const CommandBox = ({ command, title = '生成命令' }) => {
     const theme = getCurrentTheme();
-    const lines = command.split('\n');
+    // 获取终端宽度，限制最大宽度
+    const termWidth = process.stdout.columns || 80;
     const titleWidth = getDisplayWidth(title);
-    const maxContentWidth = Math.max(...lines.map(l => getDisplayWidth(l)));
-    const boxWidth = Math.max(maxContentWidth + 4, titleWidth + 6, 20);
+    // 计算最大内容宽度（终端宽度 - 边框和内边距）
+    const maxContentWidth = termWidth - 6; // 减去 '│ ' 和 ' │' 以及一些余量
+    // 处理命令换行
+    const originalLines = command.split('\n');
+    const wrappedLines = [];
+    for (const line of originalLines) {
+        wrappedLines.push(...wrapText(line, maxContentWidth));
+    }
+    // 计算实际使用的宽度
+    const actualMaxWidth = Math.max(...wrappedLines.map((l) => getDisplayWidth(l)), titleWidth);
+    const boxWidth = Math.min(actualMaxWidth + 4, termWidth - 2);
     // 顶部边框：┌─ 生成命令 ─────┐
     const topPadding = boxWidth - titleWidth - 5;
-    const topBorder = '┌─ ' + title + ' ' + '─'.repeat(topPadding) + '┐';
+    const topBorder = '┌─ ' + title + ' ' + '─'.repeat(Math.max(0, topPadding)) + '┐';
     // 底部边框
     const bottomBorder = '└' + '─'.repeat(boxWidth - 2) + '┘';
     return (React.createElement(Box, { flexDirection: "column", marginY: 1 },
         React.createElement(Text, { color: theme.warning }, topBorder),
-        lines.map((line, index) => {
+        wrappedLines.map((line, index) => {
             const lineWidth = getDisplayWidth(line);
-            const padding = ' '.repeat(boxWidth - lineWidth - 4);
+            const padding = ' '.repeat(Math.max(0, boxWidth - lineWidth - 4));
             return (React.createElement(Text, { key: index },
                 React.createElement(Text, { color: theme.warning }, "\u2502 "),
                 React.createElement(Text, { color: theme.primary }, line),

package/dist/src/config.d.ts

@@ -1,10 +1,9 @@
+import { type ThemeName } from './ui/theme.js';
 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];
-declare const VALID_THEMES: readonly ["dark", "light"];
-export type ThemeName = (typeof VALID_THEMES)[number];
 /**
  * 别名配置接口
  */

package/dist/src/config.js

@@ -3,7 +3,7 @@ import path from 'path';
 import os from 'os';
 import readline from 'readline';
 import chalk from 'chalk';
-import { getCurrentTheme } from './ui/theme.js';
+import { getCurrentTheme, isValidTheme, getAllThemeMetadata } from './ui/theme.js';
 // 获取主题颜色
 function getColors() {
     const theme = getCurrentTheme();
@@ -31,8 +31,6 @@ const VALID_PROVIDERS = [
 ];
 // 编辑模式
 const VALID_EDIT_MODES = ['manual', 'auto'];
-// 主题
-const VALID_THEMES = ['dark', 'light'];
 /**
  * 默认配置
  */
@@ -42,9 +40,9 @@ const DEFAULT_CONFIG = {
     model: 'gpt-4-turbo',
     provider: 'openai',
     shellHook: false,
-    chatHistoryLimit: 10,
-    commandHistoryLimit: 10,
-    shellHistoryLimit: 15,
+    chatHistoryLimit: 5,
+    commandHistoryLimit: 5,
+    shellHistoryLimit: 10,
     editMode: 'manual',
     theme: 'dark',
     aliases: {},
@@ -128,8 +126,10 @@ export function setConfigValue(key, value) {
     }
     else if (key === 'theme') {
         const strValue = String(value);
-        if (!VALID_THEMES.includes(strValue)) {
-            throw new Error(`theme 必须是以下之一: ${VALID_THEMES.join(', ')}`);
+        if (!isValidTheme(strValue)) {
+            const allThemes = getAllThemeMetadata();
+            const themeNames = allThemes.map((m) => m.name).join(', ');
+            throw new Error(`theme 必须是以下之一: ${themeNames}`);
         }
         config.theme = strValue;
     }
@@ -173,7 +173,10 @@ export function displayConfig() {
     console.log(`  ${chalk.hex(colors.primary)('chatHistoryLimit')}:    ${config.chatHistoryLimit} 轮`);
     console.log(`  ${chalk.hex(colors.primary)('commandHistoryLimit')}: ${config.commandHistoryLimit} 条`);
     console.log(`  ${chalk.hex(colors.primary)('shellHistoryLimit')}:   ${config.shellHistoryLimit} 条`);
-    console.log(`  ${chalk.hex(colors.primary)('theme')}:               ${config.theme === 'dark' ? chalk.hex(colors.primary)('dark (深色)') : chalk.hex(colors.primary)('light (浅色)')}`);
+    // 动态显示主题信息
+    const themeMetadata = getAllThemeMetadata().find((m) => m.name === config.theme);
+    const themeLabel = themeMetadata ? `${themeMetadata.name} (${themeMetadata.displayName})` : config.theme;
+    console.log(`  ${chalk.hex(colors.primary)('theme')}:               ${chalk.hex(colors.primary)(themeLabel)}`);
     console.log(chalk.gray('━'.repeat(50)));
     console.log(chalk.gray(`配置文件: ${CONFIG_FILE}\n`));
 }
@@ -277,6 +280,7 @@ export async function runConfigWizard() {
             }
         }
         // 9. Shell History Limit
+        const oldShellHistoryLimit = config.shellHistoryLimit; // 保存旧值
         const shellHistoryPrompt = `${chalk.hex(colors.primary)('Shell 历史保留条数')}\n${chalk.gray('默认:')} ${chalk.hex(colors.secondary)(config.shellHistoryLimit)} ${chalk.gray('→')} `;
         const shellHistoryLimit = await question(rl, shellHistoryPrompt);
         if (shellHistoryLimit.trim()) {
@@ -290,6 +294,11 @@ export async function runConfigWizard() {
         console.log(chalk.hex(getColors().success)('✅ 配置已保存'));
         console.log(chalk.gray(`   ${CONFIG_FILE}`));
         console.log();
+        // 如果修改了 shellHistoryLimit，自动重装 hook
+        if (oldShellHistoryLimit !== config.shellHistoryLimit) {
+            const { reinstallHookForLimitChange } = await import('./shell-hook.js');
+            await reinstallHookForLimitChange(oldShellHistoryLimit, config.shellHistoryLimit);
+        }
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);

package/dist/src/mastra-agent.d.ts

@@ -2,5 +2,6 @@ import { Agent } from '@mastra/core';
 /**
  * 创建 Mastra Shell Agent
  * 根据用户配置的 API Key、Base URL、Provider 和 Model
+ * 使用静态的 System Prompt（不包含动态数据）
  */
 export declare function createShellAgent(): Agent<"shell-commander", Record<string, import("@mastra/core").ToolAction<any, any, any, any, import("@mastra/core").ToolExecutionContext<any, any, any>>>, Record<string, import("@mastra/core").Metric>>;