@yivan-lab/pretty-please 1.1.0 → 1.3.0

package/src/components/MarkdownDisplay.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { Text, Box } from 'ink'
-import { theme } from '../ui/theme.js'
+import { getCurrentTheme } from '../ui/theme.js'
 import { ColorizeCode } from './CodeColorizer.js'
 import { TableRenderer } from './TableRenderer.js'
 import { RenderInline } from './InlineRenderer.js'
@@ -18,6 +18,7 @@ interface MarkdownDisplayProps {
 function MarkdownDisplayInternal({ text, terminalWidth = 80 }: MarkdownDisplayProps) {
   if (!text) return <></>
 
+  const theme = getCurrentTheme()
   const lines = text.split(/\r?\n/)
 
   // 正则表达式

package/src/components/MultiStepCommandGenerator.tsx

@@ -2,12 +2,12 @@ import React, { useState, useEffect } from 'react'
 import { Box, Text, useInput } from 'ink'
 import TextInput from 'ink-text-input'
 import Spinner from 'ink-spinner'
-import { generateMultiStepCommand, type CommandStep, type ExecutedStep } from '../multi-step.js'
+import { generateMultiStepCommand, type CommandStep, type ExecutedStep, type RemoteContext } 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'
 
 interface MultiStepCommandGeneratorProps {
@@ -28,6 +28,8 @@ interface MultiStepCommandGeneratorProps {
   }) => void
   previousSteps?: ExecutedStep[]
   currentStepNumber?: number
+  remoteContext?: RemoteContext  // 远程执行上下文
+  isRemote?: boolean             // 是否为远程执行（远程执行时不检测 builtin）
 }
 
 type State =
@@ -46,8 +48,11 @@ export const MultiStepCommandGenerator: React.FC<MultiStepCommandGeneratorProps>
   debug,
   previousSteps = [],
   currentStepNumber = 1,
+  remoteContext,
+  isRemote = false,
   onStepComplete,
 }) => {
+  const theme = getCurrentTheme()
   const [state, setState] = useState<State>({ type: 'thinking' })
   const [thinkDuration, setThinkDuration] = useState(0)
   const [debugInfo, setDebugInfo] = useState<any>(null)
@@ -67,7 +72,7 @@ export const MultiStepCommandGenerator: React.FC<MultiStepCommandGeneratorProps>
   useEffect(() => {
     const thinkStart = Date.now()
 
-    generateMultiStepCommand(prompt, previousSteps, { debug })
+    generateMultiStepCommand(prompt, previousSteps, { debug, remoteContext })
       .then((result) => {
         const thinkEnd = Date.now()
         setThinkDuration(thinkEnd - thinkStart)
@@ -91,11 +96,11 @@ export const MultiStepCommandGenerator: React.FC<MultiStepCommandGeneratorProps>
           return
         }
 
-        // 检测 builtin（优先检测）
+        // 检测 builtin（优先检测，但远程执行时跳过）
         const { hasBuiltin, builtins } = detectBuiltin(result.stepData.command)
 
-        if (hasBuiltin) {
-          // 有 builtin，不管什么模式都不编辑，直接提示
+        if (hasBuiltin && !isRemote) {
+          // 有 builtin 且是本地执行，不管什么模式都不编辑，直接提示
           setState({
             type: 'showing_command',
             stepData: result.stepData,
@@ -142,7 +147,7 @@ export const MultiStepCommandGenerator: React.FC<MultiStepCommandGeneratorProps>
           })
         }, 100)
       })
-  }, [prompt, previousSteps, debug])
+  }, [prompt, previousSteps, debug, remoteContext])
 
   // 处理确认
   const handleConfirm = () => {
@@ -228,7 +233,10 @@ export const MultiStepCommandGenerator: React.FC<MultiStepCommandGeneratorProps>
         <Box>
           <Text color={theme.info}>
             <Spinner type="dots" />{' '}
-            {currentStepNumber === 1 ? '正在思考...' : `正在规划步骤 ${currentStepNumber}...`}
+            {remoteContext
+              ? (currentStepNumber === 1 ? `正在为 ${remoteContext.name} 思考...` : `正在规划步骤 ${currentStepNumber} (${remoteContext.name})...`)
+              : (currentStepNumber === 1 ? '正在思考...' : `正在规划步骤 ${currentStepNumber}...`)
+            }
           </Text>
         </Box>
       )}
@@ -262,6 +270,12 @@ export const MultiStepCommandGenerator: React.FC<MultiStepCommandGeneratorProps>
                 </Box>
               )}
 
+              {debugInfo.remoteContext && (
+                <Box marginTop={1}>
+                  <Text color={theme.text.secondary}>远程服务器: {debugInfo.remoteContext.name} ({debugInfo.remoteContext.sysInfo.os})</Text>
+                </Box>
+              )}
+
               <Box marginTop={1}>
                 <Text color={theme.text.secondary}>AI 返回的 JSON:</Text>
               </Box>
@@ -287,8 +301,8 @@ export const MultiStepCommandGenerator: React.FC<MultiStepCommandGeneratorProps>
           {/* 命令框 */}
           <CommandBox command={state.stepData.command} />
 
-          {/* Builtin 警告 */}
-          {(() => {
+          {/* Builtin 警告（仅本地执行时显示） */}
+          {!isRemote && (() => {
             const { hasBuiltin, builtins } = detectBuiltin(state.stepData.command)
             if (hasBuiltin) {
               return (
@@ -304,7 +318,7 @@ export const MultiStepCommandGenerator: React.FC<MultiStepCommandGeneratorProps>
           })()}
 
           {/* 确认提示 */}
-          {!detectBuiltin(state.stepData.command).hasBuiltin && (
+          {(isRemote || !detectBuiltin(state.stepData.command).hasBuiltin) && (
             <ConfirmationPrompt
               prompt="执行？"
               onConfirm={handleConfirm}

package/src/components/TableRenderer.tsx

@@ -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'
 
 interface TableRendererProps {
@@ -56,6 +56,7 @@ function calculateColumnWidths(
  * 表格渲染组件
  */
 function TableRendererInternal({ headers, rows, terminalWidth }: TableRendererProps) {
+  const theme = getCurrentTheme()
   const columnWidths = calculateColumnWidths(headers, rows, terminalWidth)
   const baseColor = theme.text.primary
 

package/src/config.ts

@@ -3,6 +3,18 @@ import path from 'path'
 import os from 'os'
 import readline from 'readline'
 import chalk from 'chalk'
+import { getCurrentTheme, isValidTheme, getAllThemeMetadata, type ThemeName } 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')
@@ -27,6 +39,37 @@ type Provider = (typeof VALID_PROVIDERS)[number]
 const VALID_EDIT_MODES = ['manual', 'auto'] as const
 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           // SSH 私钥路径
+  password?: boolean     // 是否使用密码认证（密码不存储，每次交互输入）
+  workDir?: string       // 默认工作目录
+}
+
+/**
+ * 远程服务器系统信息缓存
+ */
+export interface RemoteSysInfo {
+  os: string             // 操作系统 (linux, darwin, etc.)
+  osVersion: string      // 系统版本
+  shell: string          // 默认 shell (bash, zsh, etc.)
+  hostname: string       // 主机名
+  cachedAt: string       // 缓存时间
+}
+
 /**
  * 配置接口
  */
@@ -40,6 +83,10 @@ export interface Config {
   commandHistoryLimit: number
   shellHistoryLimit: number
   editMode: EditMode
+  theme: ThemeName
+  aliases: Record<string, AliasConfig>
+  remotes: Record<string, RemoteConfig>  // 远程服务器配置
+  defaultRemote?: string                  // 默认远程服务器名称
 }
 
 /**
@@ -51,10 +98,14 @@ const DEFAULT_CONFIG: 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: '',
 }
 
 /**
@@ -68,20 +119,33 @@ function ensureConfigDir(): void {
 
 /**
  * 读取配置
+ * 优化：添加缓存，避免重复读取文件
  */
+let cachedConfig: Config | null = null
+
 export function getConfig(): Config {
+  // 如果已有缓存，直接返回
+  if (cachedConfig !== null) {
+    return cachedConfig
+  }
+
   ensureConfigDir()
 
+  let config: Config
+
   if (!fs.existsSync(CONFIG_FILE)) {
-    return { ...DEFAULT_CONFIG }
+    config = { ...DEFAULT_CONFIG }
+  } else {
+    try {
+      const content = fs.readFileSync(CONFIG_FILE, 'utf-8')
+      config = { ...DEFAULT_CONFIG, ...JSON.parse(content) }
+    } catch {
+      config = { ...DEFAULT_CONFIG }
+    }
   }
 
-  try {
-    const content = fs.readFileSync(CONFIG_FILE, 'utf-8')
-    return { ...DEFAULT_CONFIG, ...JSON.parse(content) }
-  } catch {
-    return { ...DEFAULT_CONFIG }
-  }
+  cachedConfig = config
+  return config
 }
 
 /**
@@ -123,11 +187,23 @@ export function setConfigValue(key: string, value: string | boolean | number): C
       throw new Error(`editMode 必须是以下之一: ${VALID_EDIT_MODES.join(', ')}`)
     }
     config.editMode = strValue as EditMode
-  } 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 as ThemeName
+  } else if (key === 'apiKey' || key === 'baseUrl' || key === 'model' || key === 'defaultRemote') {
     config[key] = String(value)
   }
 
   saveConfig(config)
+
+  // 清除缓存，下次读取时会重新加载
+  cachedConfig = null
+
   return config
 }
 
@@ -152,23 +228,30 @@ export function maskApiKey(apiKey: string): string {
  */
 export function displayConfig(): void {
   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.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.cyan('shellHook')}:           ${config.shellHook ? chalk.green('已启用') : chalk.gray('未启用')}`
+    `  ${chalk.hex(colors.primary)('shellHook')}:           ${config.shellHook ? chalk.hex(colors.success)('已启用') : chalk.gray('未启用')}`
   )
   console.log(
-    `  ${chalk.cyan('editMode')}:            ${
-      config.editMode === 'auto' ? chalk.hex('#00D9FF')('auto (自动编辑)') : chalk.gray('manual (按E编辑)')
+    `  ${chalk.hex(colors.primary)('editMode')}:            ${
+      config.editMode === 'auto' ? chalk.hex(colors.primary)('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)('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`))
 }
@@ -200,19 +283,20 @@ function question(rl: readline.Interface, prompt: string): Promise<string> {
 export async function runConfigWizard(): Promise<void> {
   const rl = createReadlineInterface()
   const config = getConfig()
+  const colors = getColors()
 
-  console.log(chalk.bold.hex('#00D9FF')('\n🔧 Pretty Please 配置向导'))
+  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() as Provider)) {
-        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
@@ -221,7 +305,7 @@ export async function runConfigWizard(): Promise<void> {
     }
 
     // 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()
@@ -229,21 +313,21 @@ export async function runConfigWizard(): Promise<void> {
 
     // 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'
@@ -251,11 +335,11 @@ export async function runConfigWizard(): Promise<void> {
 
     // 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() as EditMode)) {
-        console.log(chalk.hex('#EF4444')(`\n✗ 无效的 editMode，必须是: manual 或 auto`))
+        console.log(chalk.hex(colors.error)(`\n✗ 无效的 editMode，必须是: manual 或 auto`))
         console.log()
         rl.close()
         return
@@ -264,7 +348,7 @@ export async function runConfigWizard(): Promise<void> {
     }
 
     // 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)
@@ -274,7 +358,7 @@ export async function runConfigWizard(): Promise<void> {
     }
 
     // 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)
@@ -284,7 +368,8 @@ export async function runConfigWizard(): Promise<void> {
     }
 
     // 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)
@@ -296,12 +381,18 @@ export async function runConfigWizard(): Promise<void> {
     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 {
     rl.close()

package/src/mastra-agent.ts

@@ -1,13 +1,11 @@
 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()
@@ -15,16 +13,9 @@ export function createShellAgent() {
   // 组合 provider/model 格式（Mastra 要求）
   const modelId = `${config.provider}/${config.model}` as `${string}/${string}`
 
-  // 构建系统提示词
-  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/src/mastra-chat.ts

@@ -1,13 +1,13 @@
 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()
@@ -15,16 +15,9 @@ export function createChatAgent() {
   // 组合 provider/model 格式（Mastra 要求）
   const modelId = `${config.provider}/${config.model}` as `${string}/${string}`
 
-  // 构建系统提示词
-  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,
@@ -33,20 +26,19 @@ export function createChatAgent() {
   })
 }
 
-/**
- * 获取完整的系统提示词（用于调试）
- */
-export function getChatSystemPrompt(): string {
-  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: string,
@@ -61,30 +53,44 @@ export async function chatWithMastra(
     model: string
     systemPrompt: string
     chatHistory: Array<{ role: string; content: string }>
-    userPrompt: string
+    userContext: string
   }
 }> {
   const config = getConfig()
   const agent = createChatAgent()
 
-  // 获取对话历史
+  // 1. 获取历史对话（纯粹的问答）
   const chatHistory = getChatHistory()
 
-  // 构建消息数组（将历史和新消息合并）
+  // 2. 构建消息数组
   const messages: string[] = []
 
-  // 添加历史对话
+  // 加载历史对话
   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) {
@@ -103,19 +109,19 @@ export async function chatWithMastra(
     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,
       },
     }
   }