@yivan-lab/pretty-please 1.3.1 → 1.5.0

package/dist/src/__tests__/system-history.test.js

@@ -0,0 +1,457 @@
+/**
+ * 系统 Shell 历史读取模块测试
+ * 测试各种 Shell 历史格式解析和系统历史读取功能
+ */
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import { zshExtendedHistory, zshSimpleHistory, bashHistory, powerShellHistory, } from '../../tests/fixtures/shell-history';
+// Mock fs 模块
+vi.mock('fs', () => ({
+    default: {
+        existsSync: vi.fn(),
+        readFileSync: vi.fn(),
+    },
+}));
+// Mock config 模块
+vi.mock('../config.js', () => ({
+    getConfig: vi.fn(() => ({
+        shellHistoryLimit: 10,
+    })),
+}));
+// Mock platform 模块
+vi.mock('../utils/platform.js', () => ({
+    detectShell: vi.fn(),
+    getShellCapabilities: vi.fn(),
+}));
+import fs from 'fs';
+import { getConfig } from '../config.js';
+import { detectShell, getShellCapabilities } from '../utils/platform.js';
+// 获取 mock 函数引用
+const mockFs = vi.mocked(fs);
+const mockDetectShell = vi.mocked(detectShell);
+const mockGetShellCapabilities = vi.mocked(getShellCapabilities);
+const mockGetConfig = vi.mocked(getConfig);
+beforeEach(() => {
+    vi.clearAllMocks();
+    // 默认配置
+    mockGetConfig.mockReturnValue({
+        shellHistoryLimit: 10,
+    });
+});
+afterEach(() => {
+    vi.restoreAllMocks();
+});
+// ============================================================================
+// Zsh 历史解析测试
+// ============================================================================
+describe('Zsh 历史解析', () => {
+    beforeEach(() => {
+        mockDetectShell.mockReturnValue('zsh');
+        mockGetShellCapabilities.mockReturnValue({
+            supportsHistory: true,
+            historyPath: '/home/user/.zsh_history',
+            supportsHook: true,
+            hookType: 'zsh',
+        });
+        mockFs.existsSync.mockReturnValue(true);
+    });
+    it('应该解析扩展格式（: timestamp:duration;command）', async () => {
+        mockFs.readFileSync.mockReturnValue(': 1700000000:0;ls -la');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history).toHaveLength(1);
+        expect(history[0].cmd).toBe('ls -la');
+        expect(history[0].exit).toBe(0);
+        // 时间戳 1700000000 = 2023-11-14T22:13:20.000Z
+        expect(history[0].time).toContain('2023-11-14');
+    });
+    it('应该解析简单格式（纯命令）', async () => {
+        mockFs.readFileSync.mockReturnValue('git status');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history).toHaveLength(1);
+        expect(history[0].cmd).toBe('git status');
+        expect(history[0].exit).toBe(0);
+    });
+    it('应该处理多行扩展格式历史', async () => {
+        mockFs.readFileSync.mockReturnValue(zshExtendedHistory);
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history).toHaveLength(5);
+        expect(history[0].cmd).toBe('ls -la');
+        expect(history[1].cmd).toBe('git status');
+        expect(history[4].cmd).toBe('cd ~/projects');
+    });
+    it('应该处理多行简单格式历史', async () => {
+        mockFs.readFileSync.mockReturnValue(zshSimpleHistory);
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history).toHaveLength(5);
+        expect(history[0].cmd).toBe('ls -la');
+        expect(history[4].cmd).toBe('cd ~/projects');
+    });
+    it('退出码应该默认为 0（系统历史无退出码）', async () => {
+        mockFs.readFileSync.mockReturnValue(': 1700000000:0;failed-command');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history[0].exit).toBe(0);
+    });
+    it('空行应该被过滤', async () => {
+        mockFs.readFileSync.mockReturnValue('ls -la\n\n\ngit status\n\n');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history).toHaveLength(2);
+    });
+    it('应该正确转换时间戳为 ISO 8601 格式', async () => {
+        // 时间戳 1700000000 对应 2023-11-14T22:13:20.000Z
+        mockFs.readFileSync.mockReturnValue(': 1700000000:0;test');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history[0].time).toMatch(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/);
+    });
+    it('duration 字段应该被忽略', async () => {
+        // duration 值不同，但结果应该一样
+        mockFs.readFileSync.mockReturnValue(': 1700000000:999;test');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history[0].cmd).toBe('test');
+    });
+    it('应该保留命令中的特殊字符', async () => {
+        mockFs.readFileSync.mockReturnValue(': 1700000000:0;echo "hello $USER" && ls');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history[0].cmd).toBe('echo "hello $USER" && ls');
+    });
+    it('简单格式的时间应该使用当前时间', async () => {
+        const beforeTime = new Date().toISOString();
+        mockFs.readFileSync.mockReturnValue('simple-command');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        const afterTime = new Date().toISOString();
+        // 时间应该在测试执行期间
+        expect(history[0].time >= beforeTime).toBe(true);
+        expect(history[0].time <= afterTime).toBe(true);
+    });
+});
+// ============================================================================
+// Bash 历史解析测试
+// ============================================================================
+describe('Bash 历史解析', () => {
+    beforeEach(() => {
+        mockDetectShell.mockReturnValue('bash');
+        mockGetShellCapabilities.mockReturnValue({
+            supportsHistory: true,
+            historyPath: '/home/user/.bash_history',
+            supportsHook: true,
+            hookType: 'bash',
+        });
+        mockFs.existsSync.mockReturnValue(true);
+    });
+    it('应该解析纯文本命令', async () => {
+        mockFs.readFileSync.mockReturnValue('ls -la');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history).toHaveLength(1);
+        expect(history[0].cmd).toBe('ls -la');
+    });
+    it('应该处理多行历史', async () => {
+        mockFs.readFileSync.mockReturnValue(bashHistory);
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history).toHaveLength(5);
+        expect(history[0].cmd).toBe('ls -la');
+        expect(history[2].cmd).toBe('npm install');
+    });
+    it('退出码应该默认为 0', async () => {
+        mockFs.readFileSync.mockReturnValue('any-command');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history[0].exit).toBe(0);
+    });
+    it('时间应该使用当前时间', async () => {
+        const beforeTime = new Date().toISOString();
+        mockFs.readFileSync.mockReturnValue('test-command');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history[0].time >= beforeTime).toBe(true);
+    });
+    it('空行应该被过滤', async () => {
+        mockFs.readFileSync.mockReturnValue('cmd1\n\ncmd2\n\n\ncmd3');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history).toHaveLength(3);
+    });
+    it('应该去除首尾空格', async () => {
+        mockFs.readFileSync.mockReturnValue('  ls -la  ');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history[0].cmd).toBe('ls -la');
+    });
+    it('应该保留命令中的特殊字符', async () => {
+        mockFs.readFileSync.mockReturnValue('grep "pattern" file | awk \'{print $1}\'');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history[0].cmd).toBe('grep "pattern" file | awk \'{print $1}\'');
+    });
+});
+// ============================================================================
+// Fish 历史解析测试
+// ============================================================================
+describe('Fish 历史解析', () => {
+    beforeEach(() => {
+        mockDetectShell.mockReturnValue('fish');
+        mockGetShellCapabilities.mockReturnValue({
+            supportsHistory: true,
+            historyPath: '/home/user/.local/share/fish/fish_history',
+            supportsHook: false,
+            hookType: null,
+        });
+        mockFs.existsSync.mockReturnValue(true);
+    });
+    it('应该解析 YAML-like 格式（- cmd: ...）', async () => {
+        mockFs.readFileSync.mockReturnValue('- cmd: ls -la');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history).toHaveLength(1);
+        expect(history[0].cmd).toBe('ls -la');
+    });
+    it('非 cmd 行应该被过滤', async () => {
+        mockFs.readFileSync.mockReturnValue('- cmd: ls -la\n  when: 1700000000\n- cmd: git status');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        // 只有 cmd 行被解析
+        expect(history).toHaveLength(2);
+        expect(history[0].cmd).toBe('ls -la');
+        expect(history[1].cmd).toBe('git status');
+    });
+    it('退出码应该默认为 0', async () => {
+        mockFs.readFileSync.mockReturnValue('- cmd: failed-cmd');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history[0].exit).toBe(0);
+    });
+    it('时间应该使用当前时间', async () => {
+        const beforeTime = new Date().toISOString();
+        mockFs.readFileSync.mockReturnValue('- cmd: test');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history[0].time >= beforeTime).toBe(true);
+    });
+    it('格式错误的行应该被过滤', async () => {
+        mockFs.readFileSync.mockReturnValue('- cmd: valid\ninvalid line\n- cmd: also-valid');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history).toHaveLength(2);
+    });
+    it('应该保留命令中的特殊字符', async () => {
+        mockFs.readFileSync.mockReturnValue('- cmd: echo "hello $USER"');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history[0].cmd).toBe('echo "hello $USER"');
+    });
+});
+// ============================================================================
+// PowerShell 历史解析测试
+// ============================================================================
+describe('PowerShell 历史解析', () => {
+    beforeEach(() => {
+        mockDetectShell.mockReturnValue('powershell7');
+        mockGetShellCapabilities.mockReturnValue({
+            supportsHistory: true,
+            historyPath: 'C:\\Users\\test\\AppData\\Roaming\\Microsoft\\Windows\\PowerShell\\PSReadLine\\ConsoleHost_history.txt',
+            supportsHook: true,
+            hookType: 'powershell',
+        });
+        mockFs.existsSync.mockReturnValue(true);
+    });
+    it('应该解析纯文本命令', async () => {
+        mockFs.readFileSync.mockReturnValue('Get-ChildItem');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history).toHaveLength(1);
+        expect(history[0].cmd).toBe('Get-ChildItem');
+    });
+    it('应该处理多行历史', async () => {
+        mockFs.readFileSync.mockReturnValue(powerShellHistory);
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history).toHaveLength(5);
+        expect(history[0].cmd).toBe('Get-ChildItem');
+        expect(history[1].cmd).toBe('Get-Process');
+    });
+    it('退出码应该默认为 0', async () => {
+        mockFs.readFileSync.mockReturnValue('Get-Process');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history[0].exit).toBe(0);
+    });
+    it('时间应该使用当前时间', async () => {
+        const beforeTime = new Date().toISOString();
+        mockFs.readFileSync.mockReturnValue('Write-Host "test"');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history[0].time >= beforeTime).toBe(true);
+    });
+    it('空行应该被过滤', async () => {
+        mockFs.readFileSync.mockReturnValue('cmd1\n\ncmd2');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history).toHaveLength(2);
+    });
+    it('PowerShell 5 也应该正常工作', async () => {
+        mockDetectShell.mockReturnValue('powershell5');
+        mockFs.readFileSync.mockReturnValue('Get-Service');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history).toHaveLength(1);
+        expect(history[0].cmd).toBe('Get-Service');
+    });
+});
+// ============================================================================
+// 系统历史读取测试
+// ============================================================================
+describe('getSystemShellHistory', () => {
+    it('应该根据 Shell 类型选择正确的解析器', async () => {
+        // Zsh
+        mockDetectShell.mockReturnValue('zsh');
+        mockGetShellCapabilities.mockReturnValue({
+            supportsHistory: true,
+            historyPath: '/home/user/.zsh_history',
+        });
+        mockFs.existsSync.mockReturnValue(true);
+        mockFs.readFileSync.mockReturnValue(': 1700000000:0;zsh-cmd');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        let history = getSystemShellHistory();
+        expect(history[0].cmd).toBe('zsh-cmd');
+        // Bash
+        mockDetectShell.mockReturnValue('bash');
+        mockGetShellCapabilities.mockReturnValue({
+            supportsHistory: true,
+            historyPath: '/home/user/.bash_history',
+        });
+        mockFs.readFileSync.mockReturnValue('bash-cmd');
+        history = getSystemShellHistory();
+        expect(history[0].cmd).toBe('bash-cmd');
+    });
+    it('文件不存在时应该返回空数组', async () => {
+        mockDetectShell.mockReturnValue('zsh');
+        mockGetShellCapabilities.mockReturnValue({
+            supportsHistory: true,
+            historyPath: '/nonexistent/.zsh_history',
+        });
+        mockFs.existsSync.mockReturnValue(false);
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history).toEqual([]);
+    });
+    it('Shell 不支持历史时应该返回空数组', async () => {
+        mockDetectShell.mockReturnValue('cmd');
+        mockGetShellCapabilities.mockReturnValue({
+            supportsHistory: false,
+            historyPath: null,
+        });
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history).toEqual([]);
+    });
+    it('应该只返回最后 N 条（shellHistoryLimit）', async () => {
+        mockGetConfig.mockReturnValue({ shellHistoryLimit: 3 });
+        mockDetectShell.mockReturnValue('bash');
+        mockGetShellCapabilities.mockReturnValue({
+            supportsHistory: true,
+            historyPath: '/home/user/.bash_history',
+        });
+        mockFs.existsSync.mockReturnValue(true);
+        mockFs.readFileSync.mockReturnValue('cmd1\ncmd2\ncmd3\ncmd4\ncmd5');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history).toHaveLength(3);
+        expect(history[0].cmd).toBe('cmd3');
+        expect(history[2].cmd).toBe('cmd5');
+    });
+    it('读取失败时应该返回空数组', async () => {
+        mockDetectShell.mockReturnValue('zsh');
+        mockGetShellCapabilities.mockReturnValue({
+            supportsHistory: true,
+            historyPath: '/home/user/.zsh_history',
+        });
+        mockFs.existsSync.mockReturnValue(true);
+        mockFs.readFileSync.mockImplementation(() => {
+            throw new Error('EACCES: permission denied');
+        });
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history).toEqual([]);
+    });
+    it('unknown Shell 应该返回空数组', async () => {
+        mockDetectShell.mockReturnValue('unknown');
+        mockGetShellCapabilities.mockReturnValue({
+            supportsHistory: false,
+            historyPath: null,
+        });
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history).toEqual([]);
+    });
+    it('空文件应该返回空数组', async () => {
+        mockDetectShell.mockReturnValue('bash');
+        mockGetShellCapabilities.mockReturnValue({
+            supportsHistory: true,
+            historyPath: '/home/user/.bash_history',
+        });
+        mockFs.existsSync.mockReturnValue(true);
+        mockFs.readFileSync.mockReturnValue('');
+        const { getSystemShellHistory } = await import('../system-history.js');
+        const history = getSystemShellHistory();
+        expect(history).toEqual([]);
+    });
+});
+// ============================================================================
+// getLastCommandFromSystem 测试
+// ============================================================================
+describe('getLastCommandFromSystem', () => {
+    beforeEach(() => {
+        mockDetectShell.mockReturnValue('bash');
+        mockGetShellCapabilities.mockReturnValue({
+            supportsHistory: true,
+            historyPath: '/home/user/.bash_history',
+        });
+        mockFs.existsSync.mockReturnValue(true);
+    });
+    it('应该返回最近一条非 pls 命令', async () => {
+        mockFs.readFileSync.mockReturnValue('git status\npls install git\nls -la');
+        const { getLastCommandFromSystem } = await import('../system-history.js');
+        const lastCmd = getLastCommandFromSystem();
+        expect(lastCmd).not.toBeNull();
+        expect(lastCmd.cmd).toBe('ls -la');
+    });
+    it('应该排除 pls 命令', async () => {
+        mockFs.readFileSync.mockReturnValue('git status\npls fix\npls install');
+        const { getLastCommandFromSystem } = await import('../system-history.js');
+        const lastCmd = getLastCommandFromSystem();
+        expect(lastCmd.cmd).toBe('git status');
+    });
+    it('应该排除 please 命令', async () => {
+        mockFs.readFileSync.mockReturnValue('npm install\nplease help\nplease run');
+        const { getLastCommandFromSystem } = await import('../system-history.js');
+        const lastCmd = getLastCommandFromSystem();
+        expect(lastCmd.cmd).toBe('npm install');
+    });
+    it('所有命令都是 pls/please 时应该返回 null', async () => {
+        mockFs.readFileSync.mockReturnValue('pls help\npls config\nplease install');
+        const { getLastCommandFromSystem } = await import('../system-history.js');
+        const lastCmd = getLastCommandFromSystem();
+        expect(lastCmd).toBeNull();
+    });
+    it('历史为空时应该返回 null', async () => {
+        mockFs.readFileSync.mockReturnValue('');
+        const { getLastCommandFromSystem } = await import('../system-history.js');
+        const lastCmd = getLastCommandFromSystem();
+        expect(lastCmd).toBeNull();
+    });
+    it('文件不存在时应该返回 null', async () => {
+        mockFs.existsSync.mockReturnValue(false);
+        const { getLastCommandFromSystem } = await import('../system-history.js');
+        const lastCmd = getLastCommandFromSystem();
+        expect(lastCmd).toBeNull();
+    });
+});

package/dist/src/components/Chat.js

@@ -3,13 +3,8 @@ import { Box, Text } from 'ink';
 import Spinner from 'ink-spinner';
 import { MarkdownDisplay } from './MarkdownDisplay.js';
 import { chatWithMastra } from '../mastra-chat.js';
-import { getChatRoundCount, getChatHistory } from '../chat-history.js';
+import { getChatRoundCount } 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 对话模式
  * 使用正常渲染，完成后保持最后一帧在终端
@@ -20,25 +15,7 @@ export function Chat({ prompt, debug, showRoundCount, onComplete }) {
     const [content, setContent] = useState('');
     const [duration, setDuration] = useState(0);
     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,
-        };
-    });
+    const [debugInfo, setDebugInfo] = useState(null);
     useEffect(() => {
         const startTime = Date.now();
         // 流式输出回调
@@ -46,12 +23,16 @@ export function Chat({ prompt, debug, showRoundCount, onComplete }) {
             setStatus('streaming');
             setContent((prev) => prev + chunk);
         };
-        // 调用 AI
-        chatWithMastra(prompt, { debug: false, onChunk }) // 不需要 AI 返回 debug
+        // 调用 AI（如果需要 debug 信息，则开启）
+        chatWithMastra(prompt, { debug, onChunk })
             .then((result) => {
             const endTime = Date.now();
             setDuration(endTime - startTime);
             setStatus('done');
+            // 如果有 debug 信息，保存它
+            if (result.debug) {
+                setDebugInfo(result.debug);
+            }
             setTimeout(onComplete, debug ? 500 : 100);
         })
             .catch((error) => {
@@ -61,7 +42,7 @@ export function Chat({ prompt, debug, showRoundCount, onComplete }) {
         });
     }, [prompt, debug, onComplete]);
     return (React.createElement(Box, { flexDirection: "column" },
-        debugInfo && (React.createElement(Box, { flexDirection: "column", marginBottom: 1 },
+        debug && 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: ",

package/dist/src/config.d.ts

@@ -44,11 +44,13 @@ export interface Config {
     chatHistoryLimit: number;
     commandHistoryLimit: number;
     shellHistoryLimit: number;
+    userPreferencesTopK: number;
     editMode: EditMode;
     theme: ThemeName;
     aliases: Record<string, AliasConfig>;
     remotes: Record<string, RemoteConfig>;
     defaultRemote?: string;
+    systemCacheExpireDays?: number;
 }
 export declare function getConfig(): Config;
 /**

package/dist/src/config.js

@@ -11,7 +11,8 @@ function getColors() {
         primary: theme.primary,
         secondary: theme.secondary,
         success: theme.success,
-        error: theme.error
+        error: theme.error,
+        warning: theme.warning,
     };
 }
 // 配置文件路径
@@ -43,11 +44,13 @@ const DEFAULT_CONFIG = {
     chatHistoryLimit: 5,
     commandHistoryLimit: 5,
     shellHistoryLimit: 10,
+    userPreferencesTopK: 20, // 默认显示 Top 20
     editMode: 'manual',
     theme: 'dark',
     aliases: {},
     remotes: {},
     defaultRemote: '',
+    systemCacheExpireDays: 7,
 };
 /**
  * 确保配置目录存在
@@ -103,7 +106,7 @@ export function setConfigValue(key, value) {
     if (key === 'shellHook') {
         config.shellHook = value === 'true' || value === true;
     }
-    else if (key === 'chatHistoryLimit' || key === 'commandHistoryLimit' || key === 'shellHistoryLimit') {
+    else if (key === 'chatHistoryLimit' || key === 'commandHistoryLimit' || key === 'shellHistoryLimit' || key === 'userPreferencesTopK' || key === 'systemCacheExpireDays') {
         const num = typeof value === 'number' ? value : parseInt(String(value), 10);
         if (isNaN(num) || num < 1) {
             throw new Error(`${key} 必须是大于 0 的整数`);
@@ -173,6 +176,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)('userPreferencesTopK')}: ${config.userPreferencesTopK} 个`);
+    if (config.systemCacheExpireDays !== undefined) {
+        console.log(`  ${chalk.hex(colors.primary)('systemCacheExpireDays')}: ${config.systemCacheExpireDays} 天`);
+    }
     // 动态显示主题信息
     const themeMetadata = getAllThemeMetadata().find((m) => m.name === config.theme);
     const themeLabel = themeMetadata ? `${themeMetadata.name} (${themeMetadata.displayName})` : config.theme;
@@ -269,6 +276,9 @@ export async function runConfigWizard() {
             if (!isNaN(num) && num > 0) {
                 config.chatHistoryLimit = num;
             }
+            else {
+                console.log(chalk.hex(colors.warning)('  ⚠️  输入无效，保持原值'));
+            }
         }
         // 8. Command History Limit
         const commandHistoryPrompt = `${chalk.hex(colors.primary)('命令历史保留条数')}\n${chalk.gray('默认:')} ${chalk.hex(colors.secondary)(config.commandHistoryLimit)} ${chalk.gray('→')} `;
@@ -278,6 +288,9 @@ export async function runConfigWizard() {
             if (!isNaN(num) && num > 0) {
                 config.commandHistoryLimit = num;
             }
+            else {
+                console.log(chalk.hex(colors.warning)('  ⚠️  输入无效，保持原值'));
+            }
         }
         // 9. Shell History Limit
         const oldShellHistoryLimit = config.shellHistoryLimit; // 保存旧值
@@ -288,6 +301,21 @@ export async function runConfigWizard() {
             if (!isNaN(num) && num > 0) {
                 config.shellHistoryLimit = num;
             }
+            else {
+                console.log(chalk.hex(colors.warning)('  ⚠️  输入无效，保持原值'));
+            }
+        }
+        // 10. User Preferences Top K
+        const userPrefsPrompt = `${chalk.hex(colors.primary)('用户偏好显示命令数')}\n${chalk.gray('默认:')} ${chalk.hex(colors.secondary)(config.userPreferencesTopK)} ${chalk.gray('→')} `;
+        const userPrefsTopK = await question(rl, userPrefsPrompt);
+        if (userPrefsTopK.trim()) {
+            const num = parseInt(userPrefsTopK.trim(), 10);
+            if (!isNaN(num) && num > 0) {
+                config.userPreferencesTopK = num;
+            }
+            else {
+                console.log(chalk.hex(colors.warning)('  ⚠️  输入无效，保持原值'));
+            }
         }
         saveConfig(config);
         console.log('\n' + chalk.gray('━'.repeat(50)));

package/dist/src/mastra-chat.js

@@ -1,9 +1,8 @@
 import { Agent } from '@mastra/core';
 import { getConfig } from './config.js';
 import { CHAT_SYSTEM_PROMPT, buildChatUserContext } from './prompts.js';
-import { formatSystemInfo } from './sysinfo.js';
+import { formatSystemInfo, getSystemInfo } from './sysinfo.js';
 import { formatHistoryForAI } from './history.js';
-import { formatShellHistoryForAI, getShellHistory } from './shell-hook.js';
 import { getChatHistory, addChatMessage } from './chat-history.js';
 /**
  * 创建 Mastra Chat Agent（使用静态系统提示词）
@@ -48,11 +47,16 @@ export async function chatWithMastra(prompt, options = {}) {
         messages.push(msg.content);
     }
     // 3. 构建最新消息（动态上下文 + 用户问题）
-    const sysinfo = formatSystemInfo();
+    const sysinfo = formatSystemInfo(await getSystemInfo());
     const plsHistory = formatHistoryForAI();
-    const shellHistory = formatShellHistoryForAI();
-    const shellHookEnabled = config.shellHook && getShellHistory().length > 0;
-    const latestUserContext = buildChatUserContext(prompt, sysinfo, plsHistory, shellHistory, shellHookEnabled);
+    // 使用统一的历史获取接口（自动降级到系统历史）
+    const { formatShellHistoryForAIWithFallback } = await import('./shell-hook.js');
+    const shellHistory = formatShellHistoryForAIWithFallback();
+    const shellHookEnabled = !!shellHistory; // 如果有 shell 历史就视为启用
+    // 获取用户偏好
+    const { formatUserPreferences } = await import('./user-preferences.js');
+    const userPreferencesStr = formatUserPreferences();
+    const latestUserContext = buildChatUserContext(prompt, sysinfo, plsHistory, shellHistory, shellHookEnabled, userPreferencesStr);
     messages.push(latestUserContext);
     // 4. 发送给 AI（流式或非流式）
     let fullContent = '';