@yivan-lab/pretty-please 1.1.0 → 1.2.0

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/chat-history.ts

@@ -3,6 +3,15 @@ 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')
@@ -104,6 +113,7 @@ export function getChatRoundCount(): number {
 export function displayChatHistory(): void {
   const history = getChatHistory()
   const config = getConfig()
+  const colors = getColors()
 
   if (history.length === 0) {
     console.log('\n' + chalk.gray('暂无对话历史'))
@@ -120,7 +130,7 @@ export function displayChatHistory(): void {
 
   userMessages.forEach((msg, index) => {
     const num = index + 1
-    console.log(`  ${chalk.cyan(num.toString().padStart(2, ' '))}. ${msg.content}`)
+    console.log(`  ${chalk.hex(colors.primary)(num.toString().padStart(2, ' '))}. ${msg.content}`)
   })
 
   console.log(chalk.gray('━'.repeat(50)))

package/src/components/Chat.tsx

@@ -4,7 +4,7 @@ import Spinner from 'ink-spinner'
 import { MarkdownDisplay } from './MarkdownDisplay.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)

package/src/components/CodeColorizer.tsx

@@ -2,23 +2,27 @@ import React from 'react'
 import { Text, Box } from 'ink'
 import { common, createLowlight } from 'lowlight'
 import type { Root, Element, Text as HastText, ElementContent, RootContent } from 'hast'
-import { theme } from '../ui/theme.js'
+import { getCurrentTheme, type Theme } from '../ui/theme.js'
 
 // 创建 lowlight 实例
 const lowlight = createLowlight(common)
 
-// 语法高亮颜色映射
-const syntaxColors: Record<string, string> = {
-  'hljs-keyword': theme.code.keyword,
-  'hljs-string': theme.code.string,
-  'hljs-function': theme.code.function,
-  'hljs-comment': theme.code.comment,
-  'hljs-number': theme.primary,
-  'hljs-built_in': theme.secondary,
-  'hljs-title': theme.accent,
-  'hljs-variable': theme.text.primary,
-  'hljs-type': theme.info,
-  'hljs-operator': theme.text.secondary,
+/**
+ * 获取语法高亮颜色映射
+ */
+function getSyntaxColors(theme: Theme): Record<string, string> {
+  return {
+    'hljs-keyword': theme.code.keyword,
+    'hljs-string': theme.code.string,
+    'hljs-function': theme.code.function,
+    'hljs-comment': theme.code.comment,
+    'hljs-number': theme.primary,
+    'hljs-built_in': theme.secondary,
+    'hljs-title': theme.accent,
+    'hljs-variable': theme.text.primary,
+    'hljs-type': theme.info,
+    'hljs-operator': theme.text.secondary,
+  }
 }
 
 /**
@@ -26,7 +30,9 @@ const syntaxColors: Record<string, string> = {
  */
 function renderHastNode(
   node: Root | Element | HastText | RootContent,
-  inheritedColor: string | undefined
+  inheritedColor: string | undefined,
+  syntaxColors: Record<string, string>,
+  theme: Theme
 ): React.ReactNode {
   if (node.type === 'text') {
     const color = inheritedColor || theme.code.text
@@ -51,7 +57,7 @@ function renderHastNode(
     // 递归渲染子节点
     const children = node.children?.map((child: ElementContent, index: number) => (
       <React.Fragment key={index}>
-        {renderHastNode(child, colorToPassDown)}
+        {renderHastNode(child, colorToPassDown, syntaxColors, theme)}
       </React.Fragment>
     ))
 
@@ -65,7 +71,7 @@ function renderHastNode(
 
     return node.children?.map((child: RootContent, index: number) => (
       <React.Fragment key={index}>
-        {renderHastNode(child, inheritedColor)}
+        {renderHastNode(child, inheritedColor, syntaxColors, theme)}
       </React.Fragment>
     ))
   }
@@ -76,13 +82,13 @@ function renderHastNode(
 /**
  * 高亮并渲染一行代码
  */
-function highlightLine(line: string, language: string | null): React.ReactNode {
+function highlightLine(line: string, language: string | null, syntaxColors: Record<string, string>, theme: Theme): React.ReactNode {
   try {
     const highlighted = !language || !lowlight.registered(language)
       ? lowlight.highlightAuto(line)
       : lowlight.highlight(language, line)
 
-    const rendered = renderHastNode(highlighted, undefined)
+    const rendered = renderHastNode(highlighted, undefined, syntaxColors, theme)
     return rendered !== null ? rendered : line
   } catch {
     return line
@@ -99,12 +105,14 @@ interface ColorizeCodeProps {
  * 代码高亮组件
  */
 function ColorizeCodeInternal({ code, language = null, showLineNumbers = false }: ColorizeCodeProps) {
+  const theme = getCurrentTheme()
+  const syntaxColors = getSyntaxColors(theme)
   const codeToHighlight = code.replace(/\n$/, '')
   const lines = codeToHighlight.split('\n')
   const padWidth = String(lines.length).length
 
   const renderedLines = lines.map((line, index) => {
-    const contentToRender = highlightLine(line, language)
+    const contentToRender = highlightLine(line, language, syntaxColors, theme)
 
     return (
       <Box key={index} minHeight={1}>

package/src/components/CommandBox.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { Box, Text } from 'ink'
-import { theme } from '../ui/theme.js'
+import { getCurrentTheme } from '../ui/theme.js'
 import { getDisplayWidth } from '../utils/console.js'
 
 interface CommandBoxProps {
@@ -12,6 +12,7 @@ interface CommandBoxProps {
  * CommandBox 组件 - 显示带边框和标题的命令框
  */
 export const CommandBox: React.FC<CommandBoxProps> = ({ command, title = '生成命令' }) => {
+  const theme = getCurrentTheme()
   const lines = command.split('\n')
   const titleWidth = getDisplayWidth(title)
   const maxContentWidth = Math.max(...lines.map(l => getDisplayWidth(l)))

package/src/components/ConfirmationPrompt.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { Text, useInput } from 'ink'
-import { theme } from '../ui/theme.js'
+import { getCurrentTheme } from '../ui/theme.js'
 
 interface ConfirmationPromptProps {
   prompt: string
@@ -19,6 +19,7 @@ export const ConfirmationPrompt: React.FC<ConfirmationPromptProps> = ({
   onCancel,
   onEdit,
 }) => {
+  const theme = getCurrentTheme()
   useInput((input, key) => {
     if (key.return) {
       // 回车键

package/src/components/Duration.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { Text } from 'ink'
-import { theme } from '../ui/theme.js'
+import { getCurrentTheme } from '../ui/theme.js'
 
 interface DurationProps {
   ms: number
@@ -20,5 +20,6 @@ function formatDuration(ms: number): string {
  * Duration 组件 - 显示耗时
  */
 export const Duration: React.FC<DurationProps> = ({ ms }) => {
+  const theme = getCurrentTheme()
   return <Text color={theme.text.secondary}>({formatDuration(ms)})</Text>
 }

package/src/components/InlineRenderer.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { Text } from 'ink'
-import { theme } from '../ui/theme.js'
+import { getCurrentTheme } from '../ui/theme.js'
 
 interface RenderInlineProps {
   text: string
@@ -12,6 +12,7 @@ interface RenderInlineProps {
  * 处理 **粗体**、*斜体*、`代码`、~~删除线~~、<u>下划线</u>、链接
  */
 function RenderInlineInternal({ text, defaultColor }: RenderInlineProps) {
+  const theme = getCurrentTheme()
   const baseColor = defaultColor || theme.text.primary
 
   // 快速路径：纯文本无 markdown

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