@yivan-lab/pretty-please 1.1.0 → 1.3.0

package/dist/src/components/MultiStepCommandGenerator.js

@@ -7,13 +7,14 @@ 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);
@@ -27,7 +28,7 @@ export const MultiStepCommandGenerator = ({ prompt, debug, previousSteps = [], c
     // 初始化：调用 Mastra 生成命令
     useEffect(() => {
         const thinkStart = Date.now();
-        generateMultiStepCommand(prompt, previousSteps, { debug })
+        generateMultiStepCommand(prompt, previousSteps, { debug, remoteContext })
             .then((result) => {
             const thinkEnd = Date.now();
             setThinkDuration(thinkEnd - thinkStart);
@@ -48,10 +49,10 @@ export const MultiStepCommandGenerator = ({ prompt, debug, previousSteps = [], c
                 }, 100);
                 return;
             }
-            // 检测 builtin（优先检测）
+            // 检测 builtin（优先检测，但远程执行时跳过）
             const { hasBuiltin, builtins } = detectBuiltin(result.stepData.command);
-            if (hasBuiltin) {
-                // 有 builtin，不管什么模式都不编辑，直接提示
+            if (hasBuiltin && !isRemote) {
+                // 有 builtin 且是本地执行，不管什么模式都不编辑，直接提示
                 setState({
                     type: 'showing_command',
                     stepData: result.stepData,
@@ -97,7 +98,7 @@ export const MultiStepCommandGenerator = ({ prompt, debug, previousSteps = [], c
                 });
             }, 100);
         });
-    }, [prompt, previousSteps, debug]);
+    }, [prompt, previousSteps, debug, remoteContext]);
     // 处理确认
     const handleConfirm = () => {
         if (state.type === 'showing_command') {
@@ -175,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 }))),
@@ -192,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)),
@@ -208,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 },
@@ -220,7 +230,7 @@ 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, onEdit: handleEdit })))),
+            (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 },

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,8 +1,37 @@
+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];
+/**
+ * 别名配置接口
+ */
+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;
+}
 /**
  * 配置接口
  */
@@ -16,10 +45,11 @@ export interface Config {
     commandHistoryLimit: number;
     shellHistoryLimit: number;
     editMode: EditMode;
+    theme: ThemeName;
+    aliases: Record<string, AliasConfig>;
+    remotes: Record<string, RemoteConfig>;
+    defaultRemote?: string;
 }
-/**
- * 读取配置
- */
 export declare function getConfig(): Config;
 /**
  * 保存配置

package/dist/src/config.js

@@ -3,6 +3,17 @@ import path from 'path';
 import os from 'os';
 import readline from 'readline';
 import chalk from 'chalk';
+import { getCurrentTheme, isValidTheme, getAllThemeMetadata } 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');
@@ -29,10 +40,14 @@ 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: {},
+    remotes: {},
+    defaultRemote: '',
 };
 /**
  * 确保配置目录存在
@@ -44,19 +59,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 };
-    }
-    try {
-        const content = fs.readFileSync(CONFIG_FILE, 'utf-8');
-        return { ...DEFAULT_CONFIG, ...JSON.parse(content) };
+        config = { ...DEFAULT_CONFIG };
     }
-    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;
 }
 /**
  * 保存配置
@@ -98,10 +124,21 @@ export function setConfigValue(key, value) {
         }
         config.editMode = strValue;
     }
-    else if (key === 'apiKey' || key === 'baseUrl' || key === 'model') {
+    else if (key === 'theme') {
+        const strValue = String(value);
+        if (!isValidTheme(strValue)) {
+            const allThemes = getAllThemeMetadata();
+            const themeNames = allThemes.map((m) => m.name).join(', ');
+            throw new Error(`theme 必须是以下之一: ${themeNames}`);
+        }
+        config.theme = strValue;
+    }
+    else if (key === 'apiKey' || key === 'baseUrl' || key === 'model' || key === 'defaultRemote') {
         config[key] = String(value);
     }
     saveConfig(config);
+    // 清除缓存，下次读取时会重新加载
+    cachedConfig = null;
     return config;
 }
 /**
@@ -124,17 +161,22 @@ export function maskApiKey(apiKey) {
  */
 export function displayConfig() {
     const config = getConfig();
+    const colors = getColors();
     console.log(chalk.bold('\n当前配置:'));
     console.log(chalk.gray('━'.repeat(50)));
-    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('editMode')}:            ${config.editMode === 'auto' ? chalk.hex('#00D9FF')('auto (自动编辑)') : chalk.gray('manual (按E编辑)')}`);
-    console.log(`  ${chalk.cyan('chatHistoryLimit')}:    ${config.chatHistoryLimit} 轮`);
-    console.log(`  ${chalk.cyan('commandHistoryLimit')}: ${config.commandHistoryLimit} 条`);
-    console.log(`  ${chalk.cyan('shellHistoryLimit')}:   ${config.shellHistoryLimit} 条`);
+    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} 条`);
+    // 动态显示主题信息
+    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`));
 }
@@ -163,17 +205,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 providerHint = chalk.gray(`(可选: ${VALID_PROVIDERS.join(', ')})`);
-        const providerPrompt = `${chalk.cyan('Provider')} ${providerHint}\n${chalk.gray('默认:')} ${chalk.yellow(config.provider)} ${chalk.gray('→')} `;
+        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 (!VALID_PROVIDERS.includes(provider.trim())) {
-                console.log(chalk.hex('#EF4444')(`\n✗ 无效的 provider，必须是以下之一: ${VALID_PROVIDERS.join(', ')}`));
+                console.log(chalk.hex(colors.error)(`\n✗ 无效的 provider，必须是以下之一: ${VALID_PROVIDERS.join(', ')}`));
                 console.log();
                 rl.close();
                 return;
@@ -181,37 +224,37 @@ 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. Edit Mode
         const editModeHint = chalk.gray('(manual=按E编辑, auto=自动编辑)');
-        const editModePrompt = `${chalk.cyan('编辑模式')} ${editModeHint}\n${chalk.gray('默认:')} ${chalk.yellow(config.editMode)} ${chalk.gray('→')} `;
+        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('#EF4444')(`\n✗ 无效的 editMode，必须是: manual 或 auto`));
+                console.log(chalk.hex(colors.error)(`\n✗ 无效的 editMode，必须是: manual 或 auto`));
                 console.log();
                 rl.close();
                 return;
@@ -219,7 +262,7 @@ export async function runConfigWizard() {
             config.editMode = editMode.trim();
         }
         // 7. Chat History Limit
-        const chatHistoryPrompt = `${chalk.cyan('Chat 历史保留轮数')}\n${chalk.gray('默认:')} ${chalk.yellow(config.chatHistoryLimit)} ${chalk.gray('→')} `;
+        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);
@@ -228,7 +271,7 @@ export async function runConfigWizard() {
             }
         }
         // 8. Command History Limit
-        const commandHistoryPrompt = `${chalk.cyan('命令历史保留条数')}\n${chalk.gray('默认:')} ${chalk.yellow(config.commandHistoryLimit)} ${chalk.gray('→')} `;
+        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);
@@ -237,7 +280,8 @@ export async function runConfigWizard() {
             }
         }
         // 9. Shell History Limit
-        const shellHistoryPrompt = `${chalk.cyan('Shell 历史保留条数')}\n${chalk.gray('默认:')} ${chalk.yellow(config.shellHistoryLimit)} ${chalk.gray('→')} `;
+        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()) {
             const num = parseInt(shellHistoryLimit.trim(), 10);
@@ -247,13 +291,18 @@ export async function runConfigWizard() {
         }
         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();
+        // 如果修改了 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);
-        console.log(chalk.hex('#EF4444')(`\n✗ 配置失败: ${message}`));
+        console.log(chalk.hex(getColors().error)(`\n✗ 配置失败: ${message}`));
         console.log();
     }
     finally {

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>>;

package/dist/src/mastra-agent.js

@@ -1,26 +1,18 @@
 import { Agent } from '@mastra/core';
 import { getConfig } from './config.js';
-import { buildCommandSystemPrompt } from './prompts.js';
-import { formatSystemInfo } from './sysinfo.js';
-import { formatHistoryForAI } from './history.js';
-import { formatShellHistoryForAI, getShellHistory } from './shell-hook.js';
+import { SHELL_COMMAND_SYSTEM_PROMPT } from './prompts.js';
 /**
  * 创建 Mastra Shell Agent
  * 根据用户配置的 API Key、Base URL、Provider 和 Model
+ * 使用静态的 System Prompt（不包含动态数据）
  */
 export function createShellAgent() {
     const config = getConfig();
     // 组合 provider/model 格式（Mastra 要求）
     const modelId = `${config.provider}/${config.model}`;
-    // 构建系统提示词
-    const sysinfo = formatSystemInfo();
-    const plsHistory = formatHistoryForAI();
-    const shellHistory = formatShellHistoryForAI();
-    const shellHookEnabled = config.shellHook && getShellHistory().length > 0;
-    const systemPrompt = buildCommandSystemPrompt(sysinfo, plsHistory, shellHistory, shellHookEnabled);
     return new Agent({
         name: 'shell-commander',
-        instructions: systemPrompt,
+        instructions: SHELL_COMMAND_SYSTEM_PROMPT,
         model: {
             url: config.baseUrl,
             id: modelId,

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

@@ -1,14 +1,21 @@
 import { Agent } from '@mastra/core';
 /**
- * 创建 Mastra Chat Agent
+ * 创建 Mastra Chat Agent（使用静态系统提示词）
  */
 export declare function createChatAgent(): Agent<"chat-assistant", Record<string, import("@mastra/core").ToolAction<any, any, any, any, import("@mastra/core").ToolExecutionContext<any, any, any>>>, Record<string, import("@mastra/core").Metric>>;
-/**
- * 获取完整的系统提示词（用于调试）
- */
-export declare function getChatSystemPrompt(): string;
 /**
  * 使用 Mastra 进行 AI 对话（支持流式输出）
+ *
+ * 消息结构：
+ * [
+ *   "历史问题1",                          // user (纯粹的问题)
+ *   "历史回答1",                          // assistant
+ *   "历史问题2",                          // user
+ *   "历史回答2",                          // assistant
+ *   "<system_info>...\n                  // user (最新消息，包含完整上下文)
+ *    <command_history>...\n
+ *    <user_question>最新问题</user_question>"
+ * ]
  */
 export declare function chatWithMastra(prompt: string, options?: {
     debug?: boolean;
@@ -23,6 +30,6 @@ export declare function chatWithMastra(prompt: string, options?: {
             role: string;
             content: string;
         }>;
-        userPrompt: string;
+        userContext: string;
     };
 }>;

package/dist/src/mastra-chat.js

@@ -1,26 +1,20 @@
 import { Agent } from '@mastra/core';
 import { getConfig } from './config.js';
-import { buildChatSystemPrompt } from './prompts.js';
+import { CHAT_SYSTEM_PROMPT, buildChatUserContext } from './prompts.js';
 import { formatSystemInfo } 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
+ * 创建 Mastra Chat Agent（使用静态系统提示词）
  */
 export function createChatAgent() {
     const config = getConfig();
     // 组合 provider/model 格式（Mastra 要求）
     const modelId = `${config.provider}/${config.model}`;
-    // 构建系统提示词
-    const sysinfo = formatSystemInfo();
-    const plsHistory = formatHistoryForAI();
-    const shellHistory = formatShellHistoryForAI();
-    const shellHookEnabled = config.shellHook && getShellHistory().length > 0;
-    const systemPrompt = buildChatSystemPrompt(sysinfo, plsHistory, shellHistory, shellHookEnabled);
     return new Agent({
         name: 'chat-assistant',
-        instructions: systemPrompt,
+        instructions: CHAT_SYSTEM_PROMPT, // 只包含静态规则
         model: {
             url: config.baseUrl,
             id: modelId,
@@ -28,36 +22,42 @@ export function createChatAgent() {
         },
     });
 }
-/**
- * 获取完整的系统提示词（用于调试）
- */
-export function getChatSystemPrompt() {
-    const config = getConfig();
-    const sysinfo = formatSystemInfo();
-    const plsHistory = formatHistoryForAI();
-    const shellHistory = formatShellHistoryForAI();
-    const shellHookEnabled = config.shellHook && getShellHistory().length > 0;
-    return buildChatSystemPrompt(sysinfo, plsHistory, shellHistory, shellHookEnabled);
-}
 /**
  * 使用 Mastra 进行 AI 对话（支持流式输出）
+ *
+ * 消息结构：
+ * [
+ *   "历史问题1",                          // user (纯粹的问题)
+ *   "历史回答1",                          // assistant
+ *   "历史问题2",                          // user
+ *   "历史回答2",                          // assistant
+ *   "<system_info>...\n                  // user (最新消息，包含完整上下文)
+ *    <command_history>...\n
+ *    <user_question>最新问题</user_question>"
+ * ]
  */
 export async function chatWithMastra(prompt, options = {}) {
     const config = getConfig();
     const agent = createChatAgent();
-    // 获取对话历史
+    // 1. 获取历史对话（纯粹的问答）
     const chatHistory = getChatHistory();
-    // 构建消息数组（将历史和新消息合并）
+    // 2. 构建消息数组
     const messages = [];
-    // 添加历史对话
+    // 加载历史对话
     for (const msg of chatHistory) {
         messages.push(msg.content);
     }
-    // 添加当前用户消息
-    messages.push(prompt);
+    // 3. 构建最新消息（动态上下文 + 用户问题）
+    const sysinfo = formatSystemInfo();
+    const plsHistory = formatHistoryForAI();
+    const shellHistory = formatShellHistoryForAI();
+    const shellHookEnabled = config.shellHook && getShellHistory().length > 0;
+    const latestUserContext = buildChatUserContext(prompt, sysinfo, plsHistory, shellHistory, shellHookEnabled);
+    messages.push(latestUserContext);
+    // 4. 发送给 AI（流式或非流式）
     let fullContent = '';
-    // 流式输出模式
     if (options.onChunk) {
+        // 流式输出模式
         const stream = await agent.stream(messages);
         for await (const chunk of stream.textStream) {
             if (chunk) {
@@ -74,18 +74,18 @@ export async function chatWithMastra(prompt, options = {}) {
     if (!fullContent) {
         throw new Error('AI 返回了空的响应');
     }
-    // 保存对话历史
+    // 5. 保存对话历史（只保存纯粹的问题和回答，不保存 XML）
     addChatMessage(prompt, fullContent);
-    // 返回结果
+    // 6. 返回结果
     if (options.debug) {
         return {
             reply: fullContent,
             debug: {
-                sysinfo: formatSystemInfo(),
+                sysinfo,
                 model: config.model,
-                systemPrompt: getChatSystemPrompt(),
+                systemPrompt: CHAT_SYSTEM_PROMPT,
                 chatHistory,
-                userPrompt: prompt,
+                userContext: latestUserContext,
             },
         };
     }

package/dist/src/multi-step.d.ts

@@ -1,17 +1,20 @@
 import { z } from 'zod';
+import { type RemoteSysInfo } from './config.js';
+import { type RemoteShellHistoryItem } from './remote-history.js';
 /**
  * 多步骤命令的 Zod Schema
+ * 注意：optional 字段使用 .default() 是为了绕过 Mastra 0.24.8 对 optional 字段的验证 bug
  */
 export declare const CommandStepSchema: z.ZodObject<{
     command: z.ZodString;
-    continue: z.ZodOptional<z.ZodBoolean>;
-    reasoning: z.ZodOptional<z.ZodString>;
-    nextStepHint: z.ZodOptional<z.ZodString>;
+    continue: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    reasoning: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    nextStepHint: z.ZodDefault<z.ZodOptional<z.ZodString>>;
 }, "strip", z.ZodTypeAny, {
     command: string;
-    reasoning?: string | undefined;
-    continue?: boolean | undefined;
-    nextStepHint?: string | undefined;
+    reasoning: string;
+    continue: boolean;
+    nextStepHint: string;
 }, {
     command: string;
     reasoning?: string | undefined;
@@ -27,14 +30,27 @@ export interface ExecutedStep extends CommandStep {
     output: string;
 }
 /**
- * 生成系统上下文信息（供 Mastra 使用）
+ * 远程执行上下文
+ */
+export interface RemoteContext {
+    name: string;
+    sysInfo: RemoteSysInfo;
+    shellHistory: RemoteShellHistoryItem[];
+}
+/**
+ * 获取静态 System Prompt（供 Mastra 使用）
  */
 export declare function getFullSystemPrompt(): string;
+/**
+ * 获取静态 System Prompt（远程执行也使用相同的 System Prompt）
+ */
+export declare function getRemoteFullSystemPrompt(remoteContext: RemoteContext): string;
 /**
  * 使用 Mastra 生成多步骤命令
  */
 export declare function generateMultiStepCommand(userPrompt: string, previousSteps?: ExecutedStep[], options?: {
     debug?: boolean;
+    remoteContext?: RemoteContext;
 }): Promise<{
     stepData: CommandStep;
     debugInfo?: any;