@yivan-lab/pretty-please 1.0.0 → 1.1.0

package/src/components/ConfirmationPrompt.tsx

@@ -6,16 +6,18 @@ interface ConfirmationPromptProps {
   prompt: string
   onConfirm: () => void
   onCancel: () => void
+  onEdit?: () => void  // 新增：编辑回调
 }
 
 /**
  * ConfirmationPrompt 组件 - 单键确认提示
- * 回车 = 确认，Esc = 取消，Ctrl+C = 退出
+ * 回车 = 确认，E = 编辑，Esc = 取消，Ctrl+C = 退出
  */
 export const ConfirmationPrompt: React.FC<ConfirmationPromptProps> = ({
   prompt,
   onConfirm,
   onCancel,
+  onEdit,
 }) => {
   useInput((input, key) => {
     if (key.return) {
@@ -24,6 +26,9 @@ export const ConfirmationPrompt: React.FC<ConfirmationPromptProps> = ({
     } else if (key.escape) {
       // Esc 键
       onCancel()
+    } else if ((input === 'e' || input === 'E') && onEdit) {
+      // E 键进入编辑模式
+      onEdit()
     } else if (key.ctrl && input === 'c') {
       // Ctrl+C
       process.exit(0)
@@ -35,7 +40,9 @@ export const ConfirmationPrompt: React.FC<ConfirmationPromptProps> = ({
       <Text bold color={theme.warning}>
         {prompt}
       </Text>
-      <Text color={theme.text.secondary}> [回车执行 / Esc 取消] </Text>
+      <Text color={theme.text.secondary}>
+        {onEdit ? ' [回车执行 / E 编辑 / Esc 取消] ' : ' [回车执行 / Esc 取消] '}
+      </Text>
     </Text>
   )
 }

package/src/components/MultiStepCommandGenerator.tsx

@@ -1,5 +1,6 @@
 import React, { useState, useEffect } from 'react'
-import { Box, Text } from 'ink'
+import { Box, Text, useInput } from 'ink'
+import TextInput from 'ink-text-input'
 import Spinner from 'ink-spinner'
 import { generateMultiStepCommand, type CommandStep, type ExecutedStep } from '../multi-step.js'
 import { detectBuiltin, formatBuiltins } from '../builtin-detector.js'
@@ -7,12 +8,15 @@ import { CommandBox } from './CommandBox.js'
 import { ConfirmationPrompt } from './ConfirmationPrompt.js'
 import { Duration } from './Duration.js'
 import { theme } from '../ui/theme.js'
+import { getConfig } from '../config.js'
 
 interface MultiStepCommandGeneratorProps {
   prompt: string
   debug?: boolean
   onStepComplete: (step: {
     command: string
+    aiGeneratedCommand?: string  // 新增：AI 生成的原始命令
+    userModified?: boolean        // 新增：用户是否修改
     confirmed: boolean
     cancelled?: boolean
     hasBuiltin?: boolean
@@ -29,6 +33,7 @@ interface MultiStepCommandGeneratorProps {
 type State =
   | { type: 'thinking' }
   | { type: 'showing_command'; stepData: CommandStep }
+  | { type: 'editing'; stepData: CommandStep }  // 新增：编辑状态
   | { type: 'cancelled'; command: string }
   | { type: 'error'; error: string }
 
@@ -46,6 +51,17 @@ export const MultiStepCommandGenerator: React.FC<MultiStepCommandGeneratorProps>
   const [state, setState] = useState<State>({ type: 'thinking' })
   const [thinkDuration, setThinkDuration] = useState(0)
   const [debugInfo, setDebugInfo] = useState<any>(null)
+  const [editedCommand, setEditedCommand] = useState('')  // 新增：编辑后的命令
+
+  // 监听编辑模式下的 Esc 键
+  useInput(
+    (input, key) => {
+      if (state.type === 'editing' && key.escape) {
+        handleEditCancel()
+      }
+    },
+    { isActive: state.type === 'editing' }
+  )
 
   // 初始化：调用 Mastra 生成命令
   useEffect(() => {
@@ -61,15 +77,29 @@ export const MultiStepCommandGenerator: React.FC<MultiStepCommandGeneratorProps>
           setDebugInfo(result.debugInfo)
         }
 
-        setState({
-          type: 'showing_command',
-          stepData: result.stepData,
-        })
+        // 如果 AI 返回空命令且决定不继续，说明 AI 放弃了
+        // 直接结束，不显示命令框
+        if (!result.stepData.command.trim() && result.stepData.continue === false) {
+          setTimeout(() => {
+            onStepComplete({
+              command: '',
+              confirmed: false,
+              reasoning: result.stepData.reasoning,
+              needsContinue: false,
+            })
+          }, 100)
+          return
+        }
 
-        // 检测 builtin
+        // 检测 builtin（优先检测）
         const { hasBuiltin, builtins } = detectBuiltin(result.stepData.command)
 
         if (hasBuiltin) {
+          // 有 builtin，不管什么模式都不编辑，直接提示
+          setState({
+            type: 'showing_command',
+            stepData: result.stepData,
+          })
           setTimeout(() => {
             onStepComplete({
               command: result.stepData.command,
@@ -80,6 +110,26 @@ export const MultiStepCommandGenerator: React.FC<MultiStepCommandGeneratorProps>
               needsContinue: result.stepData.continue,
             })
           }, 100)
+          return
+        }
+
+        // 根据 editMode 决定进入哪个状态
+        const config = getConfig()
+        const autoEdit = config.editMode === 'auto'
+
+        if (autoEdit) {
+          // auto 模式：直接进入编辑状态
+          setEditedCommand(result.stepData.command)
+          setState({
+            type: 'editing',
+            stepData: result.stepData,
+          })
+        } else {
+          // manual 模式：显示命令，等待用户操作
+          setState({
+            type: 'showing_command',
+            stepData: result.stepData,
+          })
         }
       })
       .catch((error: any) => {
@@ -99,6 +149,33 @@ export const MultiStepCommandGenerator: React.FC<MultiStepCommandGeneratorProps>
     if (state.type === 'showing_command') {
       onStepComplete({
         command: state.stepData.command,
+        aiGeneratedCommand: state.stepData.command,  // 原始命令
+        userModified: false,
+        confirmed: true,
+        reasoning: state.stepData.reasoning,
+        needsContinue: state.stepData.continue,
+        nextStepHint: state.stepData.nextStepHint,
+        debugInfo: debugInfo,
+      })
+    }
+  }
+
+  // 处理编辑
+  const handleEdit = () => {
+    if (state.type === 'showing_command') {
+      setEditedCommand(state.stepData.command)  // 初始化为 AI 生成的命令
+      setState({ type: 'editing', stepData: state.stepData })
+    }
+  }
+
+  // 编辑完成确认
+  const handleEditConfirm = () => {
+    if (state.type === 'editing') {
+      const modified = editedCommand !== state.stepData.command
+      onStepComplete({
+        command: editedCommand,  // 使用编辑后的命令
+        aiGeneratedCommand: state.stepData.command,  // 保存 AI 原始命令
+        userModified: modified,
         confirmed: true,
         reasoning: state.stepData.reasoning,
         needsContinue: state.stepData.continue,
@@ -108,6 +185,28 @@ export const MultiStepCommandGenerator: React.FC<MultiStepCommandGeneratorProps>
     }
   }
 
+  // 取消编辑
+  const handleEditCancel = () => {
+    if (state.type === 'editing') {
+      const config = getConfig()
+
+      if (config.editMode === 'auto') {
+        // auto 模式：Esc 直接取消整个操作
+        setState({ type: 'cancelled', command: state.stepData.command })
+        setTimeout(() => {
+          onStepComplete({
+            command: state.stepData.command,
+            confirmed: false,
+            cancelled: true,
+          })
+        }, 100)
+      } else {
+        // manual 模式：Esc 返回到 showing_command 状态
+        setState({ type: 'showing_command', stepData: state.stepData })
+      }
+    }
+  }
+
   // 处理取消
   const handleCancel = () => {
     if (state.type === 'showing_command') {
@@ -206,8 +305,46 @@ export const MultiStepCommandGenerator: React.FC<MultiStepCommandGeneratorProps>
 
           {/* 确认提示 */}
           {!detectBuiltin(state.stepData.command).hasBuiltin && (
-            <ConfirmationPrompt prompt="执行？" onConfirm={handleConfirm} onCancel={handleCancel} />
+            <ConfirmationPrompt
+              prompt="执行？"
+              onConfirm={handleConfirm}
+              onCancel={handleCancel}
+              onEdit={handleEdit}  // 新增：编辑回调
+            />
+          )}
+        </>
+      )}
+
+      {/* 编辑模式 */}
+      {state.type === 'editing' && (
+        <>
+          {/* 步骤信息（仅多步骤时显示） */}
+          {state.stepData.continue === true && (
+            <Box flexDirection="column" marginTop={1}>
+              <Text color={theme.text.secondary}>步骤 {currentStepNumber}/?</Text>
+              {state.stepData.reasoning && (
+                <Text color={theme.text.muted}>原因: {state.stepData.reasoning}</Text>
+              )}
+            </Box>
           )}
+
+          {/* 命令框（AI 建议） */}
+          <CommandBox command={state.stepData.command} />
+
+          {/* 编辑框 */}
+          <Box flexDirection="row">
+            <Text color={theme.primary}>{'> '}</Text>
+            <TextInput
+              value={editedCommand}
+              onChange={setEditedCommand}
+              onSubmit={handleEditConfirm}
+            />
+          </Box>
+          <Box marginTop={1}>
+            <Text color={theme.text.secondary}>
+              {getConfig().editMode === 'auto' ? '[回车执行 / Esc 取消]' : '[回车执行 / Esc 返回]'}
+            </Text>
+          </Box>
         </>
       )}
 

package/src/config.ts

@@ -0,0 +1,309 @@
+import fs from 'fs'
+import path from 'path'
+import os from 'os'
+import readline from 'readline'
+import chalk from 'chalk'
+
+// 配置文件路径
+export const CONFIG_DIR = path.join(os.homedir(), '.please')
+const CONFIG_FILE = path.join(CONFIG_DIR, 'config.json')
+
+// 支持的 Provider 列表
+const VALID_PROVIDERS = [
+  'openai',
+  'anthropic',
+  'deepseek',
+  'google',
+  'groq',
+  'mistral',
+  'cohere',
+  'fireworks',
+  'together',
+] as const
+
+type Provider = (typeof VALID_PROVIDERS)[number]
+
+// 编辑模式
+const VALID_EDIT_MODES = ['manual', 'auto'] as const
+type EditMode = (typeof VALID_EDIT_MODES)[number]
+
+/**
+ * 配置接口
+ */
+export interface Config {
+  apiKey: string
+  baseUrl: string
+  model: string
+  provider: Provider
+  shellHook: boolean
+  chatHistoryLimit: number
+  commandHistoryLimit: number
+  shellHistoryLimit: number
+  editMode: EditMode
+}
+
+/**
+ * 默认配置
+ */
+const DEFAULT_CONFIG: Config = {
+  apiKey: '',
+  baseUrl: 'https://api.openai.com/v1',
+  model: 'gpt-4-turbo',
+  provider: 'openai',
+  shellHook: false,
+  chatHistoryLimit: 10,
+  commandHistoryLimit: 10,
+  shellHistoryLimit: 15,
+  editMode: 'manual',
+}
+
+/**
+ * 确保配置目录存在
+ */
+function ensureConfigDir(): void {
+  if (!fs.existsSync(CONFIG_DIR)) {
+    fs.mkdirSync(CONFIG_DIR, { recursive: true })
+  }
+}
+
+/**
+ * 读取配置
+ */
+export function getConfig(): Config {
+  ensureConfigDir()
+
+  if (!fs.existsSync(CONFIG_FILE)) {
+    return { ...DEFAULT_CONFIG }
+  }
+
+  try {
+    const content = fs.readFileSync(CONFIG_FILE, 'utf-8')
+    return { ...DEFAULT_CONFIG, ...JSON.parse(content) }
+  } catch {
+    return { ...DEFAULT_CONFIG }
+  }
+}
+
+/**
+ * 保存配置
+ */
+export function saveConfig(config: Config): void {
+  ensureConfigDir()
+  fs.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2))
+}
+
+/**
+ * 设置单个配置项
+ */
+export function setConfigValue(key: string, value: string | boolean | number): Config {
+  const config = getConfig()
+
+  if (!(key in DEFAULT_CONFIG)) {
+    throw new Error(`未知的配置项: ${key}`)
+  }
+
+  // 处理特殊类型
+  if (key === 'shellHook') {
+    config.shellHook = value === 'true' || value === true
+  } else if (key === 'chatHistoryLimit' || key === 'commandHistoryLimit' || key === 'shellHistoryLimit') {
+    const num = typeof value === 'number' ? value : parseInt(String(value), 10)
+    if (isNaN(num) || num < 1) {
+      throw new Error(`${key} 必须是大于 0 的整数`)
+    }
+    config[key] = num
+  } else if (key === 'provider') {
+    const strValue = String(value)
+    if (!VALID_PROVIDERS.includes(strValue as Provider)) {
+      throw new Error(`provider 必须是以下之一: ${VALID_PROVIDERS.join(', ')}`)
+    }
+    config.provider = strValue as Provider
+  } else if (key === 'editMode') {
+    const strValue = String(value)
+    if (!VALID_EDIT_MODES.includes(strValue as EditMode)) {
+      throw new Error(`editMode 必须是以下之一: ${VALID_EDIT_MODES.join(', ')}`)
+    }
+    config.editMode = strValue as EditMode
+  } else if (key === 'apiKey' || key === 'baseUrl' || key === 'model') {
+    config[key] = String(value)
+  }
+
+  saveConfig(config)
+  return config
+}
+
+/**
+ * 检查配置是否有效
+ */
+export function isConfigValid(): boolean {
+  const config = getConfig()
+  return config.apiKey.length > 0
+}
+
+/**
+ * 隐藏 API Key 中间部分
+ */
+export function maskApiKey(apiKey: string): string {
+  if (!apiKey || apiKey.length < 10) return apiKey || '(未设置)'
+  return apiKey.slice(0, 6) + '****' + apiKey.slice(-4)
+}
+
+/**
+ * 显示当前配置
+ */
+export function displayConfig(): void {
+  const config = getConfig()
+  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.gray('━'.repeat(50)))
+  console.log(chalk.gray(`配置文件: ${CONFIG_FILE}\n`))
+}
+
+/**
+ * 创建 readline 接口
+ */
+function createReadlineInterface(): readline.Interface {
+  return readline.createInterface({
+    input: process.stdin,
+    output: process.stdout,
+  })
+}
+
+/**
+ * 异步提问
+ */
+function question(rl: readline.Interface, prompt: string): Promise<string> {
+  return new Promise((resolve) => {
+    rl.question(prompt, (answer) => {
+      resolve(answer)
+    })
+  })
+}
+
+/**
+ * 交互式配置向导
+ */
+export async function runConfigWizard(): Promise<void> {
+  const rl = createReadlineInterface()
+  const config = getConfig()
+
+  console.log(chalk.bold.hex('#00D9FF')('\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 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()
+        rl.close()
+        return
+      }
+      config.provider = provider.trim() as Provider
+    }
+
+    // 2. Base URL
+    const baseUrlPrompt = `${chalk.cyan('API Base URL')}\n${chalk.gray('默认:')} ${chalk.yellow(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 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 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 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 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()
+        rl.close()
+        return
+      }
+      config.editMode = editMode.trim() as EditMode
+    }
+
+    // 7. Chat History Limit
+    const chatHistoryPrompt = `${chalk.cyan('Chat 历史保留轮数')}\n${chalk.gray('默认:')} ${chalk.yellow(config.chatHistoryLimit)} ${chalk.gray('→')} `
+    const chatHistoryLimit = await question(rl, chatHistoryPrompt)
+    if (chatHistoryLimit.trim()) {
+      const num = parseInt(chatHistoryLimit.trim(), 10)
+      if (!isNaN(num) && num > 0) {
+        config.chatHistoryLimit = num
+      }
+    }
+
+    // 8. Command History Limit
+    const commandHistoryPrompt = `${chalk.cyan('命令历史保留条数')}\n${chalk.gray('默认:')} ${chalk.yellow(config.commandHistoryLimit)} ${chalk.gray('→')} `
+    const commandHistoryLimit = await question(rl, commandHistoryPrompt)
+    if (commandHistoryLimit.trim()) {
+      const num = parseInt(commandHistoryLimit.trim(), 10)
+      if (!isNaN(num) && num > 0) {
+        config.commandHistoryLimit = num
+      }
+    }
+
+    // 9. Shell History Limit
+    const shellHistoryPrompt = `${chalk.cyan('Shell 历史保留条数')}\n${chalk.gray('默认:')} ${chalk.yellow(config.shellHistoryLimit)} ${chalk.gray('→')} `
+    const shellHistoryLimit = await question(rl, shellHistoryPrompt)
+    if (shellHistoryLimit.trim()) {
+      const num = parseInt(shellHistoryLimit.trim(), 10)
+      if (!isNaN(num) && num > 0) {
+        config.shellHistoryLimit = num
+      }
+    }
+
+    saveConfig(config)
+
+    console.log('\n' + chalk.gray('━'.repeat(50)))
+    console.log(chalk.hex('#10B981')('✅ 配置已保存'))
+    console.log(chalk.gray(`   ${CONFIG_FILE}`))
+    console.log()
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error)
+    console.log(chalk.hex('#EF4444')(`\n✗ 配置失败: ${message}`))
+    console.log()
+  } finally {
+    rl.close()
+  }
+}