@yivan-lab/pretty-please 1.0.0 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yivan-lab/pretty-please",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "AI 驱动的命令行工具，将自然语言转换为可执行的 Shell 命令",
   "type": "module",
   "bin": {
@@ -9,8 +9,10 @@
   },
   "scripts": {
     "dev": "tsx bin/pls.tsx",
-    "build": "tsc",
+    "build": "tsc && node scripts/postbuild.js",
     "start": "node dist/bin/pls.js",
+    "link:dev": "mkdir -p ~/.local/bin && ln -sf \"$(pwd)/bin/pls.tsx\" ~/.local/bin/pls-dev && echo '✅ pls-dev 已链接到 ~/.local/bin/pls-dev'",
+    "unlink:dev": "rm -f ~/.local/bin/pls-dev && echo '✅ pls-dev 已移除'",
     "prepublishOnly": "pnpm build"
   },
   "keywords": [
@@ -29,22 +31,23 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/yivan-lab/pretty-please.git"
+    "url": "https://github.com/IvanLark/pretty-please.git"
   },
   "bugs": {
-    "url": "https://github.com/yivan-lab/pretty-please/issues"
+    "url": "https://github.com/IvanLark/pretty-please/issues"
   },
-  "homepage": "https://github.com/yivan-lab/pretty-please#readme",
+  "homepage": "https://github.com/IvanLark/pretty-please#readme",
   "publishConfig": {
     "access": "public"
   },
   "files": [
     "bin",
-    "dist",
+    "dist/bin",
+    "dist/src",
+    "dist/package.json",
     "src",
     "README.md",
     "LICENSE",
-    "package.json",
     "tsconfig.json"
   ],
   "dependencies": {
@@ -60,8 +63,6 @@
     "ink-text-input": "^6.0.0",
     "lowlight": "^3.3.0",
     "marked": "^17.0.1",
-    "openai": "^6.10.0",
-    "ora": "^9.0.0",
     "react": "^19.2.3",
     "shiki": "^3.20.0",
     "string-width": "^8.1.0",
@@ -72,6 +73,7 @@
     "@types/hast": "^3.0.4",
     "@types/node": "^25.0.2",
     "@types/react": "^19.2.7",
+    "react-devtools-core": "^7.0.1",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3"
   }

package/src/alias.ts

@@ -0,0 +1,301 @@
+import chalk from 'chalk'
+import { getConfig, saveConfig, type AliasConfig } from './config.js'
+import { getCurrentTheme } from './ui/theme.js'
+
+// 获取主题颜色
+function getColors() {
+  const theme = getCurrentTheme()
+  return {
+    primary: theme.primary,
+    secondary: theme.secondary,
+    success: theme.success,
+    error: theme.error,
+    warning: theme.warning,
+    muted: theme.text.muted,
+  }
+}
+
+/**
+ * 别名解析结果
+ */
+export interface AliasResolveResult {
+  resolved: boolean
+  prompt: string
+  aliasName?: string
+  originalInput?: string
+}
+
+/**
+ * 获取所有别名
+ */
+export function getAliases(): Record<string, AliasConfig> {
+  const config = getConfig()
+  return config.aliases || {}
+}
+
+/**
+ * 添加别名
+ * @param name 别名名称
+ * @param prompt 对应的 prompt
+ * @param description 可选描述
+ * @param reservedCommands 保留的子命令列表（动态传入）
+ */
+export function addAlias(
+  name: string,
+  prompt: string,
+  description?: string,
+  reservedCommands: string[] = []
+): void {
+  // 验证别名名称
+  if (!name || !name.trim()) {
+    throw new Error('别名名称不能为空')
+  }
+
+  // 移除可能的 @ 前缀
+  const aliasName = name.startsWith('@') ? name.slice(1) : name
+
+  // 验证别名名称格式（只允许字母、数字、下划线、连字符）
+  if (!/^[a-zA-Z0-9_-]+$/.test(aliasName)) {
+    throw new Error('别名名称只能包含字母、数字、下划线和连字符')
+  }
+
+  // 检查是否与保留命令冲突
+  if (reservedCommands.includes(aliasName)) {
+    throw new Error(`"${aliasName}" 是保留的子命令，不能用作别名`)
+  }
+
+  // 验证 prompt
+  if (!prompt || !prompt.trim()) {
+    throw new Error('prompt 不能为空')
+  }
+
+  const config = getConfig()
+  if (!config.aliases) {
+    config.aliases = {}
+  }
+
+  config.aliases[aliasName] = {
+    prompt: prompt.trim(),
+    description: description?.trim(),
+  }
+
+  saveConfig(config)
+}
+
+/**
+ * 删除别名
+ */
+export function removeAlias(name: string): boolean {
+  // 移除可能的 @ 前缀
+  const aliasName = name.startsWith('@') ? name.slice(1) : name
+
+  const config = getConfig()
+  if (!config.aliases || !config.aliases[aliasName]) {
+    return false
+  }
+
+  delete config.aliases[aliasName]
+  saveConfig(config)
+  return true
+}
+
+/**
+ * 解析参数模板
+ * 支持格式：{{param}} 或 {{param:default}}
+ */
+function parseTemplateParams(prompt: string): string[] {
+  const regex = /\{\{([^}:]+)(?::[^}]*)?\}\}/g
+  const params: string[] = []
+  let match
+
+  while ((match = regex.exec(prompt)) !== null) {
+    if (!params.includes(match[1])) {
+      params.push(match[1])
+    }
+  }
+
+  return params
+}
+
+/**
+ * 替换模板参数
+ * @param prompt 原始 prompt（可能包含模板参数）
+ * @param args 用户提供的参数（key=value 或 --key=value 格式）
+ */
+function replaceTemplateParams(prompt: string, args: string[]): string {
+  // 解析用户参数
+  const userParams: Record<string, string> = {}
+
+  for (const arg of args) {
+    // 支持 --key=value 或 key=value 格式
+    const cleanArg = arg.startsWith('--') ? arg.slice(2) : arg
+    const eqIndex = cleanArg.indexOf('=')
+    if (eqIndex > 0) {
+      const key = cleanArg.slice(0, eqIndex)
+      const value = cleanArg.slice(eqIndex + 1)
+      userParams[key] = value
+    }
+  }
+
+  // 替换模板参数
+  let result = prompt
+
+  // 匹配 {{param}} 或 {{param:default}}
+  result = result.replace(/\{\{([^}:]+)(?::([^}]*))?\}\}/g, (match, param, defaultValue) => {
+    if (userParams[param] !== undefined) {
+      return userParams[param]
+    }
+    if (defaultValue !== undefined) {
+      return defaultValue
+    }
+    // 没有提供值也没有默认值，保留原样（后面会报错或让用户补充）
+    return match
+  })
+
+  return result
+}
+
+/**
+ * 检查是否还有未替换的模板参数
+ */
+function hasUnresolvedParams(prompt: string): string[] {
+  const regex = /\{\{([^}:]+)\}\}/g
+  const unresolved: string[] = []
+  let match
+
+  while ((match = regex.exec(prompt)) !== null) {
+    unresolved.push(match[1])
+  }
+
+  return unresolved
+}
+
+/**
+ * 解析别名
+ * 支持 `pls disk` 和 `pls @disk` 两种格式
+ * @param input 用户输入（可能是别名或普通 prompt）
+ * @returns 解析结果
+ */
+export function resolveAlias(input: string): AliasResolveResult {
+  const parts = input.trim().split(/\s+/)
+  if (parts.length === 0) {
+    return { resolved: false, prompt: input }
+  }
+
+  let aliasName = parts[0]
+  const restArgs = parts.slice(1)
+
+  // 支持 @ 前缀
+  if (aliasName.startsWith('@')) {
+    aliasName = aliasName.slice(1)
+  }
+
+  const aliases = getAliases()
+  const aliasConfig = aliases[aliasName]
+
+  if (!aliasConfig) {
+    return { resolved: false, prompt: input }
+  }
+
+  // 检查是否有模板参数
+  const templateParams = parseTemplateParams(aliasConfig.prompt)
+
+  let resolvedPrompt: string
+
+  if (templateParams.length > 0) {
+    // 有模板参数，进行替换
+    resolvedPrompt = replaceTemplateParams(aliasConfig.prompt, restArgs)
+
+    // 检查是否还有未替换的必填参数
+    const unresolved = hasUnresolvedParams(resolvedPrompt)
+    if (unresolved.length > 0) {
+      throw new Error(`别名 "${aliasName}" 缺少必填参数: ${unresolved.join(', ')}`)
+    }
+
+    // 过滤掉已用于参数替换的 args，剩余的追加到 prompt
+    const usedArgs = restArgs.filter((arg) => {
+      const cleanArg = arg.startsWith('--') ? arg.slice(2) : arg
+      return cleanArg.includes('=')
+    })
+    const extraArgs = restArgs.filter((arg) => !usedArgs.includes(arg))
+
+    if (extraArgs.length > 0) {
+      resolvedPrompt = `${resolvedPrompt} ${extraArgs.join(' ')}`
+    }
+  } else {
+    // 没有模板参数，直接追加额外内容
+    if (restArgs.length > 0) {
+      resolvedPrompt = `${aliasConfig.prompt} ${restArgs.join(' ')}`
+    } else {
+      resolvedPrompt = aliasConfig.prompt
+    }
+  }
+
+  return {
+    resolved: true,
+    prompt: resolvedPrompt,
+    aliasName,
+    originalInput: input,
+  }
+}
+
+/**
+ * 显示所有别名
+ */
+export function displayAliases(): void {
+  const aliases = getAliases()
+  const colors = getColors()
+  const aliasNames = Object.keys(aliases)
+
+  console.log('')
+
+  if (aliasNames.length === 0) {
+    console.log(chalk.gray('  暂无别名'))
+    console.log('')
+    console.log(chalk.gray('  使用 pls alias add <name> "<prompt>" 添加别名'))
+    console.log('')
+    return
+  }
+
+  console.log(chalk.bold('命令别名:'))
+  console.log(chalk.gray('━'.repeat(50)))
+
+  for (const name of aliasNames) {
+    const alias = aliases[name]
+    const params = parseTemplateParams(alias.prompt)
+
+    // 别名名称
+    let line = `  ${chalk.hex(colors.primary)(name)}`
+
+    // 如果有参数，显示参数
+    if (params.length > 0) {
+      line += chalk.gray(` <${params.join('> <')}>`)
+    }
+
+    console.log(line)
+
+    // prompt 内容
+    console.log(`    ${chalk.gray('→')} ${alias.prompt}`)
+
+    // 描述
+    if (alias.description) {
+      console.log(`    ${chalk.gray(alias.description)}`)
+    }
+
+    console.log('')
+  }
+
+  console.log(chalk.gray('━'.repeat(50)))
+  console.log(chalk.gray('使用: pls <alias> 或 pls @<alias>'))
+  console.log('')
+}
+
+/**
+ * 获取别名的参数信息（用于帮助显示）
+ */
+export function getAliasParams(aliasName: string): string[] {
+  const aliases = getAliases()
+  const alias = aliases[aliasName]
+  if (!alias) return []
+  return parseTemplateParams(alias.prompt)
+}

package/src/builtin-detector.ts

@@ -0,0 +1,126 @@
+/**
+ * Shell builtin 命令检测器
+ *
+ * 用于检测命令中是否包含 shell 内置命令（builtin）
+ * 这些命令在子进程中执行可能无效或行为异常
+ */
+
+// Shell 内置命令列表
+const SHELL_BUILTINS: readonly string[] = [
+  // 目录相关
+  'cd',
+  'pushd',
+  'popd',
+  'dirs',
+
+  // 历史相关
+  'history',
+
+  // 别名和函数
+  'alias',
+  'unalias',
+
+  // 环境变量
+  'export',
+  'set',
+  'unset',
+  'declare',
+  'local',
+  'readonly',
+
+  // 脚本执行
+  'source',
+  '.',
+
+  // 任务控制
+  'jobs',
+  'fg',
+  'bg',
+  'disown',
+
+  // 其他
+  'ulimit',
+  'umask',
+  'builtin',
+  'command',
+  'type',
+  'enable',
+  'hash',
+  'help',
+  'let',
+  'read',
+  'wait',
+  'eval',
+  'exec',
+  'trap',
+  'times',
+  'shopt',
+]
+
+/**
+ * Builtin 检测结果
+ */
+export interface BuiltinResult {
+  hasBuiltin: boolean
+  builtins: string[]
+}
+
+/**
+ * 提取命令中的所有命令名
+ */
+function extractCommandNames(command: string): string[] {
+  // 按分隔符拆分（&&, ||, ;, |, &, 换行）
+  // 注意：| 是管道，两边都在子进程中执行，所以也算
+  const parts = command.split(/[;&|]+|\n+/)
+
+  const commandNames: string[] = []
+
+  for (const part of parts) {
+    const trimmed = part.trim()
+    if (!trimmed) continue
+
+    // 提取第一个单词（命令名）
+    // 处理 sudo、env 等前缀
+    const words = trimmed.split(/\s+/)
+
+    // 跳过 sudo、env 等
+    let i = 0
+    while (i < words.length && ['sudo', 'env', 'nohup', 'nice'].includes(words[i])) {
+      i++
+    }
+
+    if (i < words.length) {
+      commandNames.push(words[i])
+    }
+  }
+
+  return commandNames
+}
+
+/**
+ * 检测命令中是否包含 builtin
+ */
+export function detectBuiltin(command: string): BuiltinResult {
+  const commandNames = extractCommandNames(command)
+  const foundBuiltins: string[] = []
+
+  for (const name of commandNames) {
+    if (SHELL_BUILTINS.includes(name)) {
+      foundBuiltins.push(name)
+    }
+  }
+
+  return {
+    hasBuiltin: foundBuiltins.length > 0,
+    builtins: [...new Set(foundBuiltins)], // 去重
+  }
+}
+
+/**
+ * 格式化 builtin 列表为易读的字符串
+ */
+export function formatBuiltins(builtins: string[]): string {
+  if (builtins.length === 0) return ''
+  if (builtins.length === 1) return builtins[0]
+  return builtins.join(', ')
+}

package/src/chat-history.ts

@@ -0,0 +1,140 @@
+import fs from 'fs'
+import path from 'path'
+import os from 'os'
+import chalk from 'chalk'
+import { getConfig } from './config.js'
+import { getCurrentTheme } from './ui/theme.js'
+
+// 获取主题颜色
+function getColors() {
+  const theme = getCurrentTheme()
+  return {
+    primary: theme.primary,
+  }
+}
+
+const CONFIG_DIR = path.join(os.homedir(), '.please')
+const CHAT_HISTORY_FILE = path.join(CONFIG_DIR, 'chat_history.json')
+
+/**
+ * 聊天消息
+ */
+export interface ChatMessage {
+  role: 'user' | 'assistant'
+  content: string
+}
+
+/**
+ * 确保配置目录存在
+ */
+function ensureConfigDir(): void {
+  if (!fs.existsSync(CONFIG_DIR)) {
+    fs.mkdirSync(CONFIG_DIR, { recursive: true })
+  }
+}
+
+/**
+ * 读取对话历史
+ */
+export function getChatHistory(): ChatMessage[] {
+  ensureConfigDir()
+
+  if (!fs.existsSync(CHAT_HISTORY_FILE)) {
+    return []
+  }
+
+  try {
+    const content = fs.readFileSync(CHAT_HISTORY_FILE, 'utf-8')
+    return JSON.parse(content) as ChatMessage[]
+  } catch {
+    return []
+  }
+}
+
+/**
+ * 保存对话历史
+ */
+function saveChatHistory(history: ChatMessage[]): void {
+  ensureConfigDir()
+  fs.writeFileSync(CHAT_HISTORY_FILE, JSON.stringify(history, null, 2))
+}
+
+/**
+ * 添加一轮对话（用户问题 + AI 回答）
+ */
+export function addChatMessage(userMessage: string, assistantMessage: string): void {
+  const config = getConfig()
+  const history = getChatHistory()
+
+  // 添加新的对话
+  history.push({ role: 'user', content: userMessage })
+  history.push({ role: 'assistant', content: assistantMessage })
+
+  // 计算当前轮数（每 2 条消息 = 1 轮）
+  const currentRounds = Math.floor(history.length / 2)
+  const maxRounds = config.chatHistoryLimit || 10
+
+  // 如果超出限制，移除最早的对话
+  if (currentRounds > maxRounds) {
+    // 需要移除的轮数
+    const removeRounds = currentRounds - maxRounds
+    // 移除最早的 N 轮（N*2 条消息）
+    history.splice(0, removeRounds * 2)
+  }
+
+  saveChatHistory(history)
+}
+
+/**
+ * 清空对话历史
+ */
+export function clearChatHistory(): void {
+  saveChatHistory([])
+}
+
+/**
+ * 获取对话历史文件路径
+ */
+export function getChatHistoryFilePath(): string {
+  return CHAT_HISTORY_FILE
+}
+
+/**
+ * 获取当前对话轮数
+ */
+export function getChatRoundCount(): number {
+  const history = getChatHistory()
+  return Math.floor(history.length / 2)
+}
+
+/**
+ * 显示对话历史（只显示用户的 prompt）
+ */
+export function displayChatHistory(): void {
+  const history = getChatHistory()
+  const config = getConfig()
+  const colors = getColors()
+
+  if (history.length === 0) {
+    console.log('\n' + chalk.gray('暂无对话历史'))
+    console.log('')
+    return
+  }
+
+  // 只提取用户消息
+  const userMessages = history.filter((msg) => msg.role === 'user')
+
+  console.log('')
+  console.log(chalk.bold(`对话历史（最近 ${userMessages.length} 轮）:`))
+  console.log(chalk.gray('━'.repeat(50)))
+
+  userMessages.forEach((msg, index) => {
+    const num = index + 1
+    console.log(`  ${chalk.hex(colors.primary)(num.toString().padStart(2, ' '))}. ${msg.content}`)
+  })
+
+  console.log(chalk.gray('━'.repeat(50)))
+  console.log(chalk.gray(`配置: 保留最近 ${config.chatHistoryLimit} 轮对话`))
+  console.log(chalk.gray(`文件: ${CHAT_HISTORY_FILE}`))
+  console.log('')
+}

package/src/components/Chat.tsx

@@ -2,9 +2,9 @@ import React, { useState, useEffect } from 'react'
 import { Box, Text } from 'ink'
 import Spinner from 'ink-spinner'
 import { MarkdownDisplay } from './MarkdownDisplay.js'
-import { chatWithAI } from '../ai.js'
+import { chatWithMastra } from '../mastra-chat.js'
 import { getChatRoundCount } from '../chat-history.js'
-import { theme } from '../ui/theme.js'
+import { getCurrentTheme } from '../ui/theme.js'
 
 interface ChatProps {
   prompt: string
@@ -28,6 +28,7 @@ interface DebugInfo {
  * 使用正常渲染，完成后保持最后一帧在终端
  */
 export function Chat({ prompt, debug, showRoundCount, onComplete }: ChatProps) {
+  const theme = getCurrentTheme()
   const [status, setStatus] = useState<Status>('thinking')
   const [content, setContent] = useState('')
   const [duration, setDuration] = useState(0)
@@ -44,13 +45,13 @@ export function Chat({ prompt, debug, showRoundCount, onComplete }: ChatProps) {
     }
 
     // 调用 AI
-    chatWithAI(prompt, { debug: debug || false, onChunk })
-      .then((result: any) => {
+    chatWithMastra(prompt, { debug: debug || false, onChunk })
+      .then((result) => {
         const endTime = Date.now()
         setDuration(endTime - startTime)
         setStatus('done')
 
-        if (debug && typeof result === 'object' && 'debug' in result) {
+        if (debug && typeof result === 'object' && 'debug' in result && result.debug) {
           setDebugInfo(result.debug)
         }