@yivan-lab/pretty-please 1.2.0 → 1.3.0

package/src/components/Chat.tsx

@@ -3,8 +3,13 @@ import { Box, Text } from 'ink'
 import Spinner from 'ink-spinner'
 import { MarkdownDisplay } from './MarkdownDisplay.js'
 import { chatWithMastra } from '../mastra-chat.js'
-import { getChatRoundCount } from '../chat-history.js'
+import { getChatRoundCount, getChatHistory } from '../chat-history.js'
 import { getCurrentTheme } from '../ui/theme.js'
+import { formatSystemInfo } from '../sysinfo.js'
+import { formatHistoryForAI } from '../history.js'
+import { formatShellHistoryForAI, getShellHistory } from '../shell-hook.js'
+import { getConfig } from '../config.js'
+import { CHAT_SYSTEM_PROMPT, buildChatUserContext } from '../prompts.js'
 
 interface ChatProps {
   prompt: string
@@ -19,7 +24,7 @@ interface DebugInfo {
   sysinfo: string
   model: string
   systemPrompt: string
-  userPrompt: string
+  userContext: string
   chatHistory: any[]
 }
 
@@ -32,9 +37,36 @@ export function Chat({ prompt, debug, showRoundCount, onComplete }: ChatProps) {
   const [status, setStatus] = useState<Status>('thinking')
   const [content, setContent] = useState('')
   const [duration, setDuration] = useState(0)
-  const [debugInfo, setDebugInfo] = useState<DebugInfo | null>(null)
   const [roundCount] = useState(getChatRoundCount())
 
+  // Debug 信息：直接在 useState 初始化时计算（同步）
+  const [debugInfo] = useState<DebugInfo | null>(() => {
+    if (!debug) return null
+
+    const config = getConfig()
+    const sysinfo = formatSystemInfo()
+    const plsHistory = formatHistoryForAI()
+    const shellHistory = formatShellHistoryForAI()
+    const shellHookEnabled = config.shellHook && getShellHistory().length > 0
+    const chatHistory = getChatHistory()
+
+    const userContext = buildChatUserContext(
+      prompt,
+      sysinfo,
+      plsHistory,
+      shellHistory,
+      shellHookEnabled
+    )
+
+    return {
+      sysinfo,
+      model: config.model,
+      systemPrompt: CHAT_SYSTEM_PROMPT,
+      userContext,
+      chatHistory,
+    }
+  })
+
   useEffect(() => {
     const startTime = Date.now()
 
@@ -45,17 +77,13 @@ export function Chat({ prompt, debug, showRoundCount, onComplete }: ChatProps) {
     }
 
     // 调用 AI
-    chatWithMastra(prompt, { debug: debug || false, onChunk })
+    chatWithMastra(prompt, { debug: false, onChunk })  // 不需要 AI 返回 debug
       .then((result) => {
         const endTime = Date.now()
         setDuration(endTime - startTime)
         setStatus('done')
 
-        if (debug && typeof result === 'object' && 'debug' in result && result.debug) {
-          setDebugInfo(result.debug)
-        }
-
-        setTimeout(onComplete, 100)
+        setTimeout(onComplete, debug ? 500 : 100)
       })
       .catch((error: any) => {
         setStatus('error')
@@ -66,6 +94,38 @@ export function Chat({ prompt, debug, showRoundCount, onComplete }: ChatProps) {
 
   return (
     <Box flexDirection="column">
+      {/* 调试信息 - 放在最前面 */}
+      {debugInfo && (
+        <Box flexDirection="column" marginBottom={1}>
+          <Text color={theme.accent} bold>━━━ 调试信息 ━━━</Text>
+          <Text color={theme.text.secondary}>模型: {debugInfo.model}</Text>
+          <Text color={theme.text.secondary}>对话历史轮数: {Math.floor(debugInfo.chatHistory.length / 2)}</Text>
+
+          {/* 历史对话（只显示用户问题） */}
+          {debugInfo.chatHistory.length > 0 && (
+            <Box flexDirection="column" marginTop={1}>
+              <Text color={theme.text.secondary}>历史对话（用户问题）:</Text>
+              {debugInfo.chatHistory
+                .filter((msg) => msg.role === 'user')
+                .slice(-5)  // 最多显示最近 5 条
+                .map((msg, idx) => (
+                  <Text key={idx} color={theme.text.muted}>
+                    {idx + 1}. {msg.content.substring(0, 50)}{msg.content.length > 50 ? '...' : ''}
+                  </Text>
+                ))}
+            </Box>
+          )}
+
+          {/* User Context */}
+          <Box flexDirection="column" marginTop={1}>
+            <Text color={theme.text.secondary}>User Context (最新消息):</Text>
+            <Text color={theme.text.muted}>{debugInfo.userContext.substring(0, 500)}...</Text>
+          </Box>
+
+          <Text color={theme.accent}>━━━━━━━━━━━━━━━━</Text>
+        </Box>
+      )}
+
       {/* 显示对话轮数 */}
       {showRoundCount && roundCount > 0 && (
         <Box marginBottom={1}>
@@ -102,22 +162,6 @@ export function Chat({ prompt, debug, showRoundCount, onComplete }: ChatProps) {
           <Text color={theme.text.secondary}>({(duration / 1000).toFixed(2)}s)</Text>
         </Box>
       )}
-
-      {/* 调试信息 */}
-      {debugInfo && (
-        <Box flexDirection="column" marginY={1}>
-          <Text color={theme.accent}>━━━ 调试信息 ━━━</Text>
-          <Text color={theme.text.secondary}>系统信息: {debugInfo.sysinfo}</Text>
-          <Text color={theme.text.secondary}>模型: {debugInfo.model}</Text>
-          <Text color={theme.text.secondary}>
-            对话历史轮数: {Math.floor(debugInfo.chatHistory.length / 2)}
-          </Text>
-          <Text color={theme.text.secondary}>System Prompt:</Text>
-          <Text dimColor>{debugInfo.systemPrompt}</Text>
-          <Text color={theme.text.secondary}>User Prompt: {debugInfo.userPrompt}</Text>
-          <Text color={theme.accent}>━━━━━━━━━━━━━━━━</Text>
-        </Box>
-      )}
     </Box>
   )
 }

package/src/components/CommandBox.tsx

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

package/src/config.ts

@@ -3,7 +3,7 @@ import path from 'path'
 import os from 'os'
 import readline from 'readline'
 import chalk from 'chalk'
-import { getCurrentTheme } from './ui/theme.js'
+import { getCurrentTheme, isValidTheme, getAllThemeMetadata, type ThemeName } from './ui/theme.js'
 
 // 获取主题颜色
 function getColors() {
@@ -39,10 +39,6 @@ type Provider = (typeof VALID_PROVIDERS)[number]
 const VALID_EDIT_MODES = ['manual', 'auto'] as const
 type EditMode = (typeof VALID_EDIT_MODES)[number]
 
-// 主题
-const VALID_THEMES = ['dark', 'light'] as const
-export type ThemeName = (typeof VALID_THEMES)[number]
-
 /**
  * 别名配置接口
  */
@@ -102,9 +98,9 @@ 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: {},
@@ -193,8 +189,10 @@ export function setConfigValue(key: string, value: string | boolean | number): C
     config.editMode = strValue as EditMode
   } else if (key === 'theme') {
     const strValue = String(value)
-    if (!VALID_THEMES.includes(strValue as ThemeName)) {
-      throw new Error(`theme 必须是以下之一: ${VALID_THEMES.join(', ')}`)
+    if (!isValidTheme(strValue)) {
+      const allThemes = getAllThemeMetadata()
+      const themeNames = allThemes.map((m) => m.name).join(', ')
+      throw new Error(`theme 必须是以下之一: ${themeNames}`)
     }
     config.theme = strValue as ThemeName
   } else if (key === 'apiKey' || key === 'baseUrl' || key === 'model' || key === 'defaultRemote') {
@@ -248,11 +246,12 @@ export function displayConfig(): void {
   console.log(`  ${chalk.hex(colors.primary)('chatHistoryLimit')}:    ${config.chatHistoryLimit} 轮`)
   console.log(`  ${chalk.hex(colors.primary)('commandHistoryLimit')}: ${config.commandHistoryLimit} 条`)
   console.log(`  ${chalk.hex(colors.primary)('shellHistoryLimit')}:   ${config.shellHistoryLimit} 条`)
-  console.log(
-    `  ${chalk.hex(colors.primary)('theme')}:               ${
-      config.theme === 'dark' ? chalk.hex(colors.primary)('dark (深色)') : chalk.hex(colors.primary)('light (浅色)')
-    }`
-  )
+
+  // 动态显示主题信息
+  const themeMetadata = getAllThemeMetadata().find((m) => m.name === config.theme)
+  const themeLabel = themeMetadata ? `${themeMetadata.name} (${themeMetadata.displayName})` : config.theme
+  console.log(`  ${chalk.hex(colors.primary)('theme')}:               ${chalk.hex(colors.primary)(themeLabel)}`)
+
   console.log(chalk.gray('━'.repeat(50)))
   console.log(chalk.gray(`配置文件: ${CONFIG_FILE}\n`))
 }
@@ -369,6 +368,7 @@ export async function runConfigWizard(): Promise<void> {
     }
 
     // 9. Shell History Limit
+    const oldShellHistoryLimit = config.shellHistoryLimit  // 保存旧值
     const shellHistoryPrompt = `${chalk.hex(colors.primary)('Shell 历史保留条数')}\n${chalk.gray('默认:')} ${chalk.hex(colors.secondary)(config.shellHistoryLimit)} ${chalk.gray('→')} `
     const shellHistoryLimit = await question(rl, shellHistoryPrompt)
     if (shellHistoryLimit.trim()) {
@@ -384,6 +384,12 @@ export async function runConfigWizard(): Promise<void> {
     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(getColors().error)(`\n✗ 配置失败: ${message}`))

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,
       },
     }
   }

package/src/multi-step.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod'
 import { createShellAgent } from './mastra-agent.js'
-import { buildCommandSystemPrompt } from './prompts.js'
+import { SHELL_COMMAND_SYSTEM_PROMPT, buildUserContextPrompt } from './prompts.js'
 import { formatSystemInfo } from './sysinfo.js'
 import { formatHistoryForAI } from './history.js'
 import { formatShellHistoryForAI, getShellHistory } from './shell-hook.js'
@@ -39,33 +39,17 @@ export interface RemoteContext {
 }
 
 /**
- * 生成系统上下文信息（供 Mastra 使用）
+ * 获取静态 System Prompt（供 Mastra 使用）
  */
 export function getFullSystemPrompt() {
-  const config = getConfig()
-  const sysinfo = formatSystemInfo()
-  const plsHistory = formatHistoryForAI()
-  const shellHistory = formatShellHistoryForAI()
-  const shellHookEnabled = config.shellHook && getShellHistory().length > 0
-
-  return buildCommandSystemPrompt(sysinfo, plsHistory, shellHistory, shellHookEnabled)
+  return SHELL_COMMAND_SYSTEM_PROMPT
 }
 
 /**
- * 生成远程系统上下文信息
+ * 获取静态 System Prompt（远程执行也使用相同的 System Prompt）
  */
 export function getRemoteFullSystemPrompt(remoteContext: RemoteContext) {
-  // 格式化远程系统信息
-  const sysinfo = formatRemoteSysInfoForAI(remoteContext.name, remoteContext.sysInfo)
-
-  // 格式化远程 pls 命令历史
-  const plsHistory = formatRemoteHistoryForAI(remoteContext.name)
-
-  // 格式化远程 shell 历史
-  const shellHistory = formatRemoteShellHistoryForAI(remoteContext.shellHistory)
-  const shellHookEnabled = remoteContext.shellHistory.length > 0
-
-  return buildCommandSystemPrompt(sysinfo, plsHistory, shellHistory, shellHookEnabled)
+  return SHELL_COMMAND_SYSTEM_PROMPT
 }
 
 /**
@@ -78,26 +62,35 @@ export async function generateMultiStepCommand(
 ): Promise<{ stepData: CommandStep; debugInfo?: any }> {
   const agent = createShellAgent()
 
-  // 根据是否有远程上下文选择不同的系统提示词
-  const fullSystemPrompt = options.remoteContext
-    ? getRemoteFullSystemPrompt(options.remoteContext)
-    : getFullSystemPrompt()
+  // 准备动态数据
+  let sysinfoStr = ''
+  let historyStr = ''
+
+  if (options.remoteContext) {
+    // 远程执行：格式化远程系统信息和历史
+    sysinfoStr = formatRemoteSysInfoForAI(options.remoteContext.name, options.remoteContext.sysInfo)
+    const plsHistory = formatRemoteHistoryForAI(options.remoteContext.name)
+    const shellHistory = formatRemoteShellHistoryForAI(options.remoteContext.shellHistory)
+    historyStr = options.remoteContext.shellHistory.length > 0 ? shellHistory : plsHistory
+  } else {
+    // 本地执行：格式化本地系统信息和历史
+    sysinfoStr = formatSystemInfo()
+    const config = getConfig()
+    const plsHistory = formatHistoryForAI()
+    const shellHistory = formatShellHistoryForAI()
+    historyStr = (config.shellHook && getShellHistory().length > 0) ? shellHistory : plsHistory
+  }
 
-  // 构建消息数组（string[] 格式）
-  const messages: string[] = [userPrompt]
+  // 构建包含所有动态数据的 User Prompt（XML 格式）
+  const userContextPrompt = buildUserContextPrompt(
+    userPrompt,
+    sysinfoStr,
+    historyStr,
+    previousSteps
+  )
 
-  // 添加之前步骤的执行结果
-  previousSteps.forEach((step) => {
-    messages.push(
-      JSON.stringify({
-        command: step.command,
-        continue: step.continue,
-        reasoning: step.reasoning,
-        nextStepHint: step.nextStepHint,
-      })
-    )
-    messages.push(`命令已执行\n退出码: ${step.exitCode}\n输出:\n${step.output.slice(0, 500)}`)
-  })
+  // 只发送一条 User Message
+  const messages = [userContextPrompt]
 
   // 调用 Mastra Agent 生成结构化输出
   const response = await agent.generate(messages, {
@@ -114,14 +107,16 @@ export async function generateMultiStepCommand(
     return {
       stepData,
       debugInfo: {
-        fullPrompt: fullSystemPrompt,
-        userPrompt,
+        systemPrompt: SHELL_COMMAND_SYSTEM_PROMPT,
+        userPrompt: userContextPrompt,
         previousStepsCount: previousSteps.length,
         response: stepData,
-        remoteContext: options.remoteContext ? {
-          name: options.remoteContext.name,
-          sysInfo: options.remoteContext.sysInfo,
-        } : undefined,
+        remoteContext: options.remoteContext
+          ? {
+              name: options.remoteContext.name,
+              sysInfo: options.remoteContext.sysInfo,
+            }
+          : undefined,
       },
     }
   }