@yivan-lab/pretty-please 1.1.0 → 1.3.0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@yivan-lab/pretty-please",
-    "version": "1.1.0",
+    "version": "1.3.0",
     "description": "AI 驱动的命令行工具，将自然语言转换为可执行的 Shell 命令",
     "type": "module",
     "bin": {
@@ -31,12 +31,12 @@
     "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"
     },

package/dist/src/alias.d.ts

@@ -0,0 +1,41 @@
+import { type AliasConfig } from './config.js';
+/**
+ * 别名解析结果
+ */
+export interface AliasResolveResult {
+    resolved: boolean;
+    prompt: string;
+    aliasName?: string;
+    originalInput?: string;
+}
+/**
+ * 获取所有别名
+ */
+export declare function getAliases(): Record<string, AliasConfig>;
+/**
+ * 添加别名
+ * @param name 别名名称
+ * @param prompt 对应的 prompt
+ * @param description 可选描述
+ * @param reservedCommands 保留的子命令列表（动态传入）
+ */
+export declare function addAlias(name: string, prompt: string, description?: string, reservedCommands?: string[]): void;
+/**
+ * 删除别名
+ */
+export declare function removeAlias(name: string): boolean;
+/**
+ * 解析别名
+ * 支持 `pls disk` 和 `pls @disk` 两种格式
+ * @param input 用户输入（可能是别名或普通 prompt）
+ * @returns 解析结果
+ */
+export declare function resolveAlias(input: string): AliasResolveResult;
+/**
+ * 显示所有别名
+ */
+export declare function displayAliases(): void;
+/**
+ * 获取别名的参数信息（用于帮助显示）
+ */
+export declare function getAliasParams(aliasName: string): string[];

package/dist/src/alias.js

@@ -0,0 +1,240 @@
+import chalk from 'chalk';
+import { getConfig, saveConfig } 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 function getAliases() {
+    const config = getConfig();
+    return config.aliases || {};
+}
+/**
+ * 添加别名
+ * @param name 别名名称
+ * @param prompt 对应的 prompt
+ * @param description 可选描述
+ * @param reservedCommands 保留的子命令列表（动态传入）
+ */
+export function addAlias(name, prompt, description, reservedCommands = []) {
+    // 验证别名名称
+    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) {
+    // 移除可能的 @ 前缀
+    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) {
+    const regex = /\{\{([^}:]+)(?::[^}]*)?\}\}/g;
+    const params = [];
+    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, args) {
+    // 解析用户参数
+    const userParams = {};
+    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) {
+    const regex = /\{\{([^}:]+)\}\}/g;
+    const unresolved = [];
+    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) {
+    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;
+    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() {
+    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) {
+    const aliases = getAliases();
+    const alias = aliases[aliasName];
+    if (!alias)
+        return [];
+    return parseTemplateParams(alias.prompt);
+}

package/dist/src/chat-history.js

@@ -3,6 +3,14 @@ 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');
 /**
@@ -82,6 +90,7 @@ export function getChatRoundCount() {
 export function displayChatHistory() {
     const history = getChatHistory();
     const config = getConfig();
+    const colors = getColors();
     if (history.length === 0) {
         console.log('\n' + chalk.gray('暂无对话历史'));
         console.log('');
@@ -94,7 +103,7 @@ export function displayChatHistory() {
     console.log(chalk.gray('━'.repeat(50)));
     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)));
     console.log(chalk.gray(`配置: 保留最近 ${config.chatHistoryLimit} 轮对话`));

package/dist/src/components/Chat.js

@@ -3,18 +3,42 @@ 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 { theme } from '../ui/theme.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';
 /**
  * Chat 组件 - AI 对话模式
  * 使用正常渲染，完成后保持最后一帧在终端
  */
 export function Chat({ prompt, debug, showRoundCount, onComplete }) {
+    const theme = getCurrentTheme();
     const [status, setStatus] = useState('thinking');
     const [content, setContent] = useState('');
     const [duration, setDuration] = useState(0);
-    const [debugInfo, setDebugInfo] = useState(null);
     const [roundCount] = useState(getChatRoundCount());
+    // Debug 信息：直接在 useState 初始化时计算（同步）
+    const [debugInfo] = useState(() => {
+        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();
         // 流式输出回调
@@ -23,15 +47,12 @@ export function Chat({ prompt, debug, showRoundCount, onComplete }) {
             setContent((prev) => prev + chunk);
         };
         // 调用 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) => {
             setStatus('error');
@@ -40,6 +61,30 @@ export function Chat({ prompt, debug, showRoundCount, onComplete }) {
         });
     }, [prompt, debug, onComplete]);
     return (React.createElement(Box, { flexDirection: "column" },
+        debugInfo && (React.createElement(Box, { flexDirection: "column", marginBottom: 1 },
+            React.createElement(Text, { color: theme.accent, bold: true }, "\u2501\u2501\u2501 \u8C03\u8BD5\u4FE1\u606F \u2501\u2501\u2501"),
+            React.createElement(Text, { color: theme.text.secondary },
+                "\u6A21\u578B: ",
+                debugInfo.model),
+            React.createElement(Text, { color: theme.text.secondary },
+                "\u5BF9\u8BDD\u5386\u53F2\u8F6E\u6570: ",
+                Math.floor(debugInfo.chatHistory.length / 2)),
+            debugInfo.chatHistory.length > 0 && (React.createElement(Box, { flexDirection: "column", marginTop: 1 },
+                React.createElement(Text, { color: theme.text.secondary }, "\u5386\u53F2\u5BF9\u8BDD\uFF08\u7528\u6237\u95EE\u9898\uFF09:"),
+                debugInfo.chatHistory
+                    .filter((msg) => msg.role === 'user')
+                    .slice(-5) // 最多显示最近 5 条
+                    .map((msg, idx) => (React.createElement(Text, { key: idx, color: theme.text.muted },
+                    idx + 1,
+                    ". ",
+                    msg.content.substring(0, 50),
+                    msg.content.length > 50 ? '...' : ''))))),
+            React.createElement(Box, { flexDirection: "column", marginTop: 1 },
+                React.createElement(Text, { color: theme.text.secondary }, "User Context (\u6700\u65B0\u6D88\u606F):"),
+                React.createElement(Text, { color: theme.text.muted },
+                    debugInfo.userContext.substring(0, 500),
+                    "...")),
+            React.createElement(Text, { color: theme.accent }, "\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501"))),
         showRoundCount && roundCount > 0 && (React.createElement(Box, { marginBottom: 1 },
             React.createElement(Text, { color: theme.text.secondary },
                 "(\u5BF9\u8BDD\u8F6E\u6570: ",
@@ -59,22 +104,5 @@ export function Chat({ prompt, debug, showRoundCount, onComplete }) {
             React.createElement(Text, { color: theme.text.secondary },
                 "(",
                 (duration / 1000).toFixed(2),
-                "s)"))),
-        debugInfo && (React.createElement(Box, { flexDirection: "column", marginY: 1 },
-            React.createElement(Text, { color: theme.accent }, "\u2501\u2501\u2501 \u8C03\u8BD5\u4FE1\u606F \u2501\u2501\u2501"),
-            React.createElement(Text, { color: theme.text.secondary },
-                "\u7CFB\u7EDF\u4FE1\u606F: ",
-                debugInfo.sysinfo),
-            React.createElement(Text, { color: theme.text.secondary },
-                "\u6A21\u578B: ",
-                debugInfo.model),
-            React.createElement(Text, { color: theme.text.secondary },
-                "\u5BF9\u8BDD\u5386\u53F2\u8F6E\u6570: ",
-                Math.floor(debugInfo.chatHistory.length / 2)),
-            React.createElement(Text, { color: theme.text.secondary }, "System Prompt:"),
-            React.createElement(Text, { dimColor: true }, debugInfo.systemPrompt),
-            React.createElement(Text, { color: theme.text.secondary },
-                "User Prompt: ",
-                debugInfo.userPrompt),
-            React.createElement(Text, { color: theme.accent }, "\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501")))));
+                "s)")))));
 }

package/dist/src/components/CodeColorizer.js

@@ -1,26 +1,30 @@
 import React from 'react';
 import { Text, Box } from 'ink';
 import { common, createLowlight } from 'lowlight';
-import { theme } from '../ui/theme.js';
+import { getCurrentTheme } from '../ui/theme.js';
 // 创建 lowlight 实例
 const lowlight = createLowlight(common);
-// 语法高亮颜色映射
-const syntaxColors = {
-    '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) {
+    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,
+    };
+}
 /**
  * 渲染 HAST 语法树节点
  */
-function renderHastNode(node, inheritedColor) {
+function renderHastNode(node, inheritedColor, syntaxColors, theme) {
     if (node.type === 'text') {
         const color = inheritedColor || theme.code.text;
         return React.createElement(Text, { color: color }, node.value);
@@ -38,26 +42,26 @@ function renderHastNode(node, inheritedColor) {
         }
         const colorToPassDown = elementColor || inheritedColor;
         // 递归渲染子节点
-        const children = node.children?.map((child, index) => (React.createElement(React.Fragment, { key: index }, renderHastNode(child, colorToPassDown))));
+        const children = node.children?.map((child, index) => (React.createElement(React.Fragment, { key: index }, renderHastNode(child, colorToPassDown, syntaxColors, theme))));
         return React.createElement(React.Fragment, null, children);
     }
     if (node.type === 'root') {
         if (!node.children || node.children.length === 0) {
             return null;
         }
-        return node.children?.map((child, index) => (React.createElement(React.Fragment, { key: index }, renderHastNode(child, inheritedColor))));
+        return node.children?.map((child, index) => (React.createElement(React.Fragment, { key: index }, renderHastNode(child, inheritedColor, syntaxColors, theme))));
     }
     return null;
 }
 /**
  * 高亮并渲染一行代码
  */
-function highlightLine(line, language) {
+function highlightLine(line, language, syntaxColors, theme) {
     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 {
@@ -68,11 +72,13 @@ function highlightLine(line, language) {
  * 代码高亮组件
  */
 function ColorizeCodeInternal({ code, language = null, showLineNumbers = false }) {
+    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 (React.createElement(Box, { key: index, minHeight: 1 },
             showLineNumbers && (React.createElement(Text, { color: theme.text.dim }, `${String(index + 1).padStart(padWidth, ' ')} `)),
             React.createElement(Text, { color: theme.code.text }, contentToRender)));

package/dist/src/components/CommandBox.js

@@ -1,25 +1,36 @@
 import React from 'react';
 import { Box, Text } from 'ink';
-import { theme } from '../ui/theme.js';
-import { getDisplayWidth } from '../utils/console.js';
+import { getCurrentTheme } from '../ui/theme.js';
+import { getDisplayWidth, wrapText } from '../utils/console.js';
 /**
  * CommandBox 组件 - 显示带边框和标题的命令框
  */
 export const CommandBox = ({ command, title = '生成命令' }) => {
-    const lines = command.split('\n');
+    const theme = getCurrentTheme();
+    // 获取终端宽度，限制最大宽度
+    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 = [];
+    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) + '┘';
     return (React.createElement(Box, { flexDirection: "column", marginY: 1 },
         React.createElement(Text, { color: theme.warning }, topBorder),
-        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 (React.createElement(Text, { key: index },
                 React.createElement(Text, { color: theme.warning }, "\u2502 "),
                 React.createElement(Text, { color: theme.primary }, line),

package/dist/src/components/ConfirmationPrompt.js

@@ -1,11 +1,12 @@
 import React from 'react';
 import { Text, useInput } from 'ink';
-import { theme } from '../ui/theme.js';
+import { getCurrentTheme } from '../ui/theme.js';
 /**
  * ConfirmationPrompt 组件 - 单键确认提示
  * 回车 = 确认，E = 编辑，Esc = 取消，Ctrl+C = 退出
  */
 export const ConfirmationPrompt = ({ prompt, onConfirm, onCancel, onEdit, }) => {
+    const theme = getCurrentTheme();
     useInput((input, key) => {
         if (key.return) {
             // 回车键

package/dist/src/components/Duration.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Text } from 'ink';
-import { theme } from '../ui/theme.js';
+import { getCurrentTheme } from '../ui/theme.js';
 /**
  * 格式化耗时
  */
@@ -14,6 +14,7 @@ function formatDuration(ms) {
  * Duration 组件 - 显示耗时
  */
 export const Duration = ({ ms }) => {
+    const theme = getCurrentTheme();
     return React.createElement(Text, { color: theme.text.secondary },
         "(",
         formatDuration(ms),

package/dist/src/components/InlineRenderer.js

@@ -1,11 +1,12 @@
 import React from 'react';
 import { Text } from 'ink';
-import { theme } from '../ui/theme.js';
+import { getCurrentTheme } from '../ui/theme.js';
 /**
  * 行内 Markdown 渲染器
  * 处理 **粗体**、*斜体*、`代码`、~~删除线~~、<u>下划线</u>、链接
  */
 function RenderInlineInternal({ text, defaultColor }) {
+    const theme = getCurrentTheme();
     const baseColor = defaultColor || theme.text.primary;
     // 快速路径：纯文本无 markdown
     if (!/[*_~`<[https?:]/.test(text)) {

package/dist/src/components/MarkdownDisplay.js

@@ -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';
@@ -12,6 +12,7 @@ import { RenderInline } from './InlineRenderer.js';
 function MarkdownDisplayInternal({ text, terminalWidth = 80 }) {
     if (!text)
         return React.createElement(React.Fragment, null);
+    const theme = getCurrentTheme();
     const lines = text.split(/\r?\n/);
     // 正则表达式
     const headerRegex = /^ *(#{1,4}) +(.*)/;

package/dist/src/components/MultiStepCommandGenerator.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { type ExecutedStep } from '../multi-step.js';
+import { type ExecutedStep, type RemoteContext } from '../multi-step.js';
 interface MultiStepCommandGeneratorProps {
     prompt: string;
     debug?: boolean;
@@ -18,6 +18,8 @@ interface MultiStepCommandGeneratorProps {
     }) => void;
     previousSteps?: ExecutedStep[];
     currentStepNumber?: number;
+    remoteContext?: RemoteContext;
+    isRemote?: boolean;
 }
 /**
  * MultiStepCommandGenerator 组件 - 多步骤命令生成