@yivan-lab/pretty-please 1.0.0 → 1.2.0

package/dist/src/components/MultiStepCommandGenerator.js

@@ -1,24 +1,34 @@
 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';
 import { CommandBox } from './CommandBox.js';
 import { ConfirmationPrompt } from './ConfirmationPrompt.js';
 import { Duration } from './Duration.js';
-import { theme } from '../ui/theme.js';
+import { getCurrentTheme } from '../ui/theme.js';
+import { getConfig } from '../config.js';
 /**
  * MultiStepCommandGenerator 组件 - 多步骤命令生成
  * 每次只生成一个命令，支持 continue 机制
  */
-export const MultiStepCommandGenerator = ({ prompt, debug, previousSteps = [], currentStepNumber = 1, onStepComplete, }) => {
+export const MultiStepCommandGenerator = ({ prompt, debug, previousSteps = [], currentStepNumber = 1, remoteContext, isRemote = false, onStepComplete, }) => {
+    const theme = getCurrentTheme();
     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();
-        generateMultiStepCommand(prompt, previousSteps, { debug })
+        generateMultiStepCommand(prompt, previousSteps, { debug, remoteContext })
             .then((result) => {
             const thinkEnd = Date.now();
             setThinkDuration(thinkEnd - thinkStart);
@@ -26,13 +36,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) {
+            if (hasBuiltin && !isRemote) {
+                // 有 builtin 且是本地执行，不管什么模式都不编辑，直接提示
+                setState({
+                    type: 'showing_command',
+                    stepData: result.stepData,
+                });
                 setTimeout(() => {
                     onStepComplete({
                         command: result.stepData.command,
@@ -43,6 +67,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) => {
@@ -55,12 +98,37 @@ export const MultiStepCommandGenerator = ({ prompt, debug, previousSteps = [], c
                 });
             }, 100);
         });
-    }, [prompt, previousSteps, debug]);
+    }, [prompt, previousSteps, debug, remoteContext]);
     // 处理确认
     const handleConfirm = () => {
         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,
+                nextStepHint: state.stepData.nextStepHint,
+                debugInfo: debugInfo,
+            });
+        }
+    };
+    // 处理编辑
+    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,
@@ -69,6 +137,27 @@ export const MultiStepCommandGenerator = ({ prompt, debug, previousSteps = [], c
             });
         }
     };
+    // 取消编辑
+    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') {
@@ -87,7 +176,9 @@ export const MultiStepCommandGenerator = ({ prompt, debug, previousSteps = [], c
             React.createElement(Text, { color: theme.info },
                 React.createElement(Spinner, { type: "dots" }),
                 ' ',
-                currentStepNumber === 1 ? '正在思考...' : `正在规划步骤 ${currentStepNumber}...`))),
+                remoteContext
+                    ? (currentStepNumber === 1 ? `正在为 ${remoteContext.name} 思考...` : `正在规划步骤 ${currentStepNumber} (${remoteContext.name})...`)
+                    : (currentStepNumber === 1 ? '正在思考...' : `正在规划步骤 ${currentStepNumber}...`)))),
         state.type !== 'thinking' && thinkDuration > 0 && (React.createElement(Box, null,
             React.createElement(Text, { color: theme.success }, "\u2713 \u601D\u8003\u5B8C\u6210 "),
             React.createElement(Duration, { ms: thinkDuration }))),
@@ -104,6 +195,13 @@ export const MultiStepCommandGenerator = ({ prompt, debug, previousSteps = [], c
                     React.createElement(Text, { color: theme.text.secondary },
                         "\u5DF2\u6267\u884C\u6B65\u9AA4\u6570: ",
                         debugInfo.previousStepsCount))),
+                debugInfo.remoteContext && (React.createElement(Box, { marginTop: 1 },
+                    React.createElement(Text, { color: theme.text.secondary },
+                        "\u8FDC\u7A0B\u670D\u52A1\u5668: ",
+                        debugInfo.remoteContext.name,
+                        " (",
+                        debugInfo.remoteContext.sysInfo.os,
+                        ")"))),
                 React.createElement(Box, { marginTop: 1 },
                     React.createElement(Text, { color: theme.text.secondary }, "AI \u8FD4\u56DE\u7684 JSON:")),
                 React.createElement(Text, { color: theme.text.dim }, JSON.stringify(debugInfo.response, null, 2)),
@@ -120,7 +218,7 @@ export const MultiStepCommandGenerator = ({ prompt, debug, previousSteps = [], c
                     "\u4E0B\u4E00\u6B65: ",
                     state.stepData.nextStepHint)))),
             React.createElement(CommandBox, { command: state.stepData.command }),
-            (() => {
+            !isRemote && (() => {
                 const { hasBuiltin, builtins } = detectBuiltin(state.stepData.command);
                 if (hasBuiltin) {
                     return (React.createElement(Box, { flexDirection: "column", marginY: 1 },
@@ -132,7 +230,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 })))),
+            (isRemote || !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/components/TableRenderer.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Box, Text } from 'ink';
 import stringWidth from 'string-width';
-import { theme } from '../ui/theme.js';
+import { getCurrentTheme } from '../ui/theme.js';
 import { RenderInline } from './InlineRenderer.js';
 /**
  * 计算纯文本长度（去除 markdown 标记）
@@ -40,6 +40,7 @@ function calculateColumnWidths(headers, rows, terminalWidth) {
  * 表格渲染组件
  */
 function TableRendererInternal({ headers, rows, terminalWidth }) {
+    const theme = getCurrentTheme();
     const columnWidths = calculateColumnWidths(headers, rows, terminalWidth);
     const baseColor = theme.text.primary;
     return (React.createElement(Box, { flexDirection: "column", marginY: 1 },

package/dist/src/config.d.ts

@@ -1,29 +1,79 @@
+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];
 /**
- * 读取配置
+ * 别名配置接口
  */
-export function getConfig(): any;
+export interface AliasConfig {
+    prompt: string;
+    description?: string;
+}
+/**
+ * 远程服务器配置接口
+ */
+export interface RemoteConfig {
+    host: string;
+    user: string;
+    port: number;
+    key?: string;
+    password?: boolean;
+    workDir?: string;
+}
+/**
+ * 远程服务器系统信息缓存
+ */
+export interface RemoteSysInfo {
+    os: string;
+    osVersion: string;
+    shell: string;
+    hostname: string;
+    cachedAt: string;
+}
+/**
+ * 配置接口
+ */
+export interface Config {
+    apiKey: string;
+    baseUrl: string;
+    model: string;
+    provider: Provider;
+    shellHook: boolean;
+    chatHistoryLimit: number;
+    commandHistoryLimit: number;
+    shellHistoryLimit: number;
+    editMode: EditMode;
+    theme: ThemeName;
+    aliases: Record<string, AliasConfig>;
+    remotes: Record<string, RemoteConfig>;
+    defaultRemote?: string;
+}
+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 {};

package/dist/src/config.js

@@ -3,18 +3,54 @@ import path from 'path';
 import os from 'os';
 import readline from 'readline';
 import chalk from 'chalk';
-const CONFIG_DIR = path.join(os.homedir(), '.please');
+import { getCurrentTheme } from './ui/theme.js';
+// 获取主题颜色
+function getColors() {
+    const theme = getCurrentTheme();
+    return {
+        primary: theme.primary,
+        secondary: theme.secondary,
+        success: theme.success,
+        error: theme.error
+    };
+}
+// 配置文件路径
+export const CONFIG_DIR = path.join(os.homedir(), '.please');
 const CONFIG_FILE = path.join(CONFIG_DIR, 'config.json');
+// 支持的 Provider 列表
+const VALID_PROVIDERS = [
+    'openai',
+    'anthropic',
+    'deepseek',
+    'google',
+    'groq',
+    'mistral',
+    'cohere',
+    'fireworks',
+    'together',
+];
+// 编辑模式
+const VALID_EDIT_MODES = ['manual', 'auto'];
+// 主题
+const VALID_THEMES = ['dark', 'light'];
+/**
+ * 默认配置
+ */
 const DEFAULT_CONFIG = {
     apiKey: '',
     baseUrl: 'https://api.openai.com/v1',
     model: 'gpt-4-turbo',
-    provider: 'openai', // Mastra provider: openai, anthropic, deepseek, google, groq, mistral, cohere 等
-    shellHook: false, // 是否启用 shell hook 记录终端命令
-    chatHistoryLimit: 10 // chat 对话历史保留轮数
+    provider: 'openai',
+    shellHook: false,
+    chatHistoryLimit: 10,
+    commandHistoryLimit: 10,
+    shellHistoryLimit: 15,
+    editMode: 'manual',
+    theme: 'dark',
+    aliases: {},
+    remotes: {},
+    defaultRemote: '',
 };
-// 导出配置目录路径
-export { CONFIG_DIR };
 /**
  * 确保配置目录存在
  */
@@ -25,19 +61,30 @@ function ensureConfigDir() {
 }
 /**
  * 读取配置
+ * 优化：添加缓存，避免重复读取文件
  */
+let cachedConfig = null;
 export function getConfig() {
+    // 如果已有缓存，直接返回
+    if (cachedConfig !== null) {
+        return cachedConfig;
+    }
     ensureConfigDir();
+    let config;
     if (!fs.existsSync(CONFIG_FILE)) {
-        return { ...DEFAULT_CONFIG };
+        config = { ...DEFAULT_CONFIG };
     }
-    try {
-        const content = fs.readFileSync(CONFIG_FILE, 'utf-8');
-        return { ...DEFAULT_CONFIG, ...JSON.parse(content) };
-    }
-    catch {
-        return { ...DEFAULT_CONFIG };
+    else {
+        try {
+            const content = fs.readFileSync(CONFIG_FILE, 'utf-8');
+            config = { ...DEFAULT_CONFIG, ...JSON.parse(content) };
+        }
+        catch {
+            config = { ...DEFAULT_CONFIG };
+        }
     }
+    cachedConfig = config;
+    return config;
 }
 /**
  * 保存配置
@@ -56,27 +103,42 @@ export function setConfigValue(key, value) {
     }
     // 处理特殊类型
     if (key === 'shellHook') {
-        config[key] = value === 'true' || value === true;
+        config.shellHook = value === 'true' || value === true;
     }
-    else if (key === 'chatHistoryLimit') {
-        const num = parseInt(value, 10);
+    else if (key === 'chatHistoryLimit' || key === 'commandHistoryLimit' || key === 'shellHistoryLimit') {
+        const num = typeof value === 'number' ? value : parseInt(String(value), 10);
         if (isNaN(num) || num < 1) {
-            throw new Error('chatHistoryLimit 必须是大于 0 的整数');
+            throw new Error(`${key} 必须是大于 0 的整数`);
         }
         config[key] = num;
     }
     else if (key === 'provider') {
-        // 验证 provider 值
-        const validProviders = ['openai', 'anthropic', 'deepseek', 'google', 'groq', 'mistral', 'cohere', 'fireworks', 'together'];
-        if (!validProviders.includes(value)) {
-            throw new Error(`provider 必须是以下之一: ${validProviders.join(', ')}`);
+        const strValue = String(value);
+        if (!VALID_PROVIDERS.includes(strValue)) {
+            throw new Error(`provider 必须是以下之一: ${VALID_PROVIDERS.join(', ')}`);
         }
-        config[key] = value;
+        config.provider = strValue;
     }
-    else {
-        config[key] = value;
+    else if (key === 'editMode') {
+        const strValue = String(value);
+        if (!VALID_EDIT_MODES.includes(strValue)) {
+            throw new Error(`editMode 必须是以下之一: ${VALID_EDIT_MODES.join(', ')}`);
+        }
+        config.editMode = strValue;
+    }
+    else if (key === 'theme') {
+        const strValue = String(value);
+        if (!VALID_THEMES.includes(strValue)) {
+            throw new Error(`theme 必须是以下之一: ${VALID_THEMES.join(', ')}`);
+        }
+        config.theme = strValue;
+    }
+    else if (key === 'apiKey' || key === 'baseUrl' || key === 'model' || key === 'defaultRemote') {
+        config[key] = String(value);
     }
     saveConfig(config);
+    // 清除缓存，下次读取时会重新加载
+    cachedConfig = null;
     return config;
 }
 /**
@@ -84,7 +146,7 @@ export function setConfigValue(key, value) {
  */
 export function isConfigValid() {
     const config = getConfig();
-    return config.apiKey && config.apiKey.length > 0;
+    return config.apiKey.length > 0;
 }
 /**
  * 隐藏 API Key 中间部分
@@ -99,15 +161,20 @@ export function maskApiKey(apiKey) {
  */
 export function displayConfig() {
     const config = getConfig();
+    const colors = getColors();
     console.log(chalk.bold('\n当前配置:'));
-    console.log(chalk.gray('━'.repeat(40)));
-    console.log(`  ${chalk.cyan('apiKey')}:           ${maskApiKey(config.apiKey)}`);
-    console.log(`  ${chalk.cyan('baseUrl')}:          ${config.baseUrl}`);
-    console.log(`  ${chalk.cyan('provider')}:         ${config.provider}`);
-    console.log(`  ${chalk.cyan('model')}:            ${config.model}`);
-    console.log(`  ${chalk.cyan('shellHook')}:        ${config.shellHook ? chalk.green('已启用') : chalk.gray('未启用')}`);
-    console.log(`  ${chalk.cyan('chatHistoryLimit')}: ${config.chatHistoryLimit} 轮`);
-    console.log(chalk.gray('━'.repeat(40)));
+    console.log(chalk.gray('━'.repeat(50)));
+    console.log(`  ${chalk.hex(colors.primary)('apiKey')}:              ${maskApiKey(config.apiKey)}`);
+    console.log(`  ${chalk.hex(colors.primary)('baseUrl')}:             ${config.baseUrl}`);
+    console.log(`  ${chalk.hex(colors.primary)('provider')}:            ${config.provider}`);
+    console.log(`  ${chalk.hex(colors.primary)('model')}:               ${config.model}`);
+    console.log(`  ${chalk.hex(colors.primary)('shellHook')}:           ${config.shellHook ? chalk.hex(colors.success)('已启用') : chalk.gray('未启用')}`);
+    console.log(`  ${chalk.hex(colors.primary)('editMode')}:            ${config.editMode === 'auto' ? chalk.hex(colors.primary)('auto (自动编辑)') : chalk.gray('manual (按E编辑)')}`);
+    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 (浅色)')}`);
+    console.log(chalk.gray('━'.repeat(50)));
     console.log(chalk.gray(`配置文件: ${CONFIG_FILE}\n`));
 }
 /**
@@ -116,7 +183,7 @@ export function displayConfig() {
 function createReadlineInterface() {
     return readline.createInterface({
         input: process.stdin,
-        output: process.stdout
+        output: process.stdout,
     });
 }
 /**
@@ -135,18 +202,18 @@ function question(rl, prompt) {
 export async function runConfigWizard() {
     const rl = createReadlineInterface();
     const config = getConfig();
-    console.log(chalk.bold.hex('#00D9FF')('\n🔧 Pretty Please 配置向导'));
+    const colors = getColors();
+    console.log(chalk.bold.hex(colors.primary)('\n🔧 Pretty Please 配置向导'));
     console.log(chalk.gray('━'.repeat(50)));
     console.log(chalk.gray('直接回车使用默认值，输入值后回车确认\n'));
     try {
         // 1. Provider
-        const validProviders = ['openai', 'anthropic', 'deepseek', 'google', 'groq', 'mistral', 'cohere', 'fireworks', 'together'];
-        const providerHint = chalk.gray(`(可选: ${validProviders.join(', ')})`);
-        const providerPrompt = `${chalk.cyan('Provider')} ${providerHint}\n${chalk.gray('默认:')} ${chalk.yellow(config.provider)} ${chalk.gray('→')} `;
+        const providerHint = chalk.gray(`(可选: ${VALID_PROVIDERS.join(', ')})`);
+        const providerPrompt = `${chalk.hex(colors.primary)('Provider')} ${providerHint}\n${chalk.gray('默认:')} ${chalk.hex(colors.secondary)(config.provider)} ${chalk.gray('→')} `;
         const provider = await question(rl, providerPrompt);
         if (provider.trim()) {
-            if (!validProviders.includes(provider.trim())) {
-                console.log(chalk.hex('#EF4444')(`\n✗ 无效的 provider，必须是以下之一: ${validProviders.join(', ')}`));
+            if (!VALID_PROVIDERS.includes(provider.trim())) {
+                console.log(chalk.hex(colors.error)(`\n✗ 无效的 provider，必须是以下之一: ${VALID_PROVIDERS.join(', ')}`));
                 console.log();
                 rl.close();
                 return;
@@ -154,32 +221,45 @@ export async function runConfigWizard() {
             config.provider = provider.trim();
         }
         // 2. Base URL
-        const baseUrlPrompt = `${chalk.cyan('API Base URL')}\n${chalk.gray('默认:')} ${chalk.yellow(config.baseUrl)} ${chalk.gray('→')} `;
+        const baseUrlPrompt = `${chalk.hex(colors.primary)('API Base URL')}\n${chalk.gray('默认:')} ${chalk.hex(colors.secondary)(config.baseUrl)} ${chalk.gray('→')} `;
         const baseUrl = await question(rl, baseUrlPrompt);
         if (baseUrl.trim()) {
             config.baseUrl = baseUrl.trim();
         }
         // 3. API Key
         const currentKeyDisplay = config.apiKey ? maskApiKey(config.apiKey) : '(未设置)';
-        const apiKeyPrompt = `${chalk.cyan('API Key')} ${chalk.gray(`(当前: ${currentKeyDisplay})`)}\n${chalk.gray('→')} `;
+        const apiKeyPrompt = `${chalk.hex(colors.primary)('API Key')} ${chalk.gray(`(当前: ${currentKeyDisplay})`)}\n${chalk.gray('→')} `;
         const apiKey = await question(rl, apiKeyPrompt);
         if (apiKey.trim()) {
             config.apiKey = apiKey.trim();
         }
         // 4. Model
-        const modelPrompt = `${chalk.cyan('Model')}\n${chalk.gray('默认:')} ${chalk.yellow(config.model)} ${chalk.gray('→')} `;
+        const modelPrompt = `${chalk.hex(colors.primary)('Model')}\n${chalk.gray('默认:')} ${chalk.hex(colors.secondary)(config.model)} ${chalk.gray('→')} `;
         const model = await question(rl, modelPrompt);
         if (model.trim()) {
             config.model = model.trim();
         }
         // 5. Shell Hook
-        const shellHookPrompt = `${chalk.cyan('启用 Shell Hook')} ${chalk.gray('(记录终端命令历史)')}\n${chalk.gray('默认:')} ${chalk.yellow(config.shellHook ? 'true' : 'false')} ${chalk.gray('→')} `;
+        const shellHookPrompt = `${chalk.hex(colors.primary)('启用 Shell Hook')} ${chalk.gray('(记录终端命令历史)')}\n${chalk.gray('默认:')} ${chalk.hex(colors.secondary)(config.shellHook ? 'true' : 'false')} ${chalk.gray('→')} `;
         const shellHook = await question(rl, shellHookPrompt);
         if (shellHook.trim()) {
             config.shellHook = shellHook.trim() === 'true';
         }
-        // 6. Chat History Limit
-        const chatHistoryPrompt = `${chalk.cyan('Chat 历史保留轮数')}\n${chalk.gray('默认:')} ${chalk.yellow(config.chatHistoryLimit)} ${chalk.gray('→')} `;
+        // 6. Edit Mode
+        const editModeHint = chalk.gray('(manual=按E编辑, auto=自动编辑)');
+        const editModePrompt = `${chalk.hex(colors.primary)('编辑模式')} ${editModeHint}\n${chalk.gray('默认:')} ${chalk.hex(colors.secondary)(config.editMode)} ${chalk.gray('→')} `;
+        const editMode = await question(rl, editModePrompt);
+        if (editMode.trim()) {
+            if (!VALID_EDIT_MODES.includes(editMode.trim())) {
+                console.log(chalk.hex(colors.error)(`\n✗ 无效的 editMode，必须是: manual 或 auto`));
+                console.log();
+                rl.close();
+                return;
+            }
+            config.editMode = editMode.trim();
+        }
+        // 7. Chat History Limit
+        const chatHistoryPrompt = `${chalk.hex(colors.primary)('Chat 历史保留轮数')}\n${chalk.gray('默认:')} ${chalk.hex(colors.secondary)(config.chatHistoryLimit)} ${chalk.gray('→')} `;
         const chatHistoryLimit = await question(rl, chatHistoryPrompt);
         if (chatHistoryLimit.trim()) {
             const num = parseInt(chatHistoryLimit.trim(), 10);
@@ -187,14 +267,33 @@ export async function runConfigWizard() {
                 config.chatHistoryLimit = num;
             }
         }
+        // 8. Command History Limit
+        const commandHistoryPrompt = `${chalk.hex(colors.primary)('命令历史保留条数')}\n${chalk.gray('默认:')} ${chalk.hex(colors.secondary)(config.commandHistoryLimit)} ${chalk.gray('→')} `;
+        const commandHistoryLimit = await question(rl, commandHistoryPrompt);
+        if (commandHistoryLimit.trim()) {
+            const num = parseInt(commandHistoryLimit.trim(), 10);
+            if (!isNaN(num) && num > 0) {
+                config.commandHistoryLimit = num;
+            }
+        }
+        // 9. Shell History Limit
+        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()) {
+            const num = parseInt(shellHistoryLimit.trim(), 10);
+            if (!isNaN(num) && num > 0) {
+                config.shellHistoryLimit = num;
+            }
+        }
         saveConfig(config);
         console.log('\n' + chalk.gray('━'.repeat(50)));
-        console.log(chalk.hex('#10B981')('✅ 配置已保存'));
+        console.log(chalk.hex(getColors().success)('✅ 配置已保存'));
         console.log(chalk.gray(`   ${CONFIG_FILE}`));
         console.log();
     }
     catch (error) {
-        console.log(chalk.hex('#EF4444')(`\n✗ 配置失败: ${error.message}`));
+        const message = error instanceof Error ? error.message : String(error);
+        console.log(chalk.hex(getColors().error)(`\n✗ 配置失败: ${message}`));
         console.log();
     }
     finally {