yuangs 1.3.34 → 1.3.38

package/README.md

@@ -51,15 +51,61 @@ yuangs ai
 - 直接输入问题进行对话
 - 输入 `/clear` 清空对话历史
 - 输入 `/history` 查看对话历史
-### 命令生成模式（v1.3.32）
+### 命令生成模式
 
-使用 `-e` 参数让 AI 为你生成 Linux 命令：
+使用 `-e` 参数让 AI 为你生成 Linux 命令。现在支持生成后自动复制到剪贴板，并预填到输入行供你确认执行：
 
 ```bash
 yuangs ai -e "查看当前目录下大于100M的文件"
-# 输出: > find . -type f -size +100M
+# 1. 自动生成: > find . -type f -size +100M
+# 2. 自动复制到剪贴板
+# 3. 预填到下方，按回车即可执行
 ```
 
+### 管道模式 (Pipe Mode)
+
+支持将前一个命令的输出通过管道传给 AI 进行分析：
+
+```bash
+cat error.log | yuangs ai "解释这个报错"
+ls -la | yuangs ai "帮我总结这些文件"
+```
+
+### 流式输出与 Markdown 渲染
+
+所有 AI 回复默认开启流式输出（打字机效果），并在回答结束后自动进行 Markdown 渲染（包含代码高亮、表格格式化等）。
+
+## 快捷指令 (Macros)
+
+可以将常用的复杂命令保存为快捷指令：
+
+```bash
+# 创建快捷指令 (支持多行命令)
+yuangs save deploy
+# > 请输入要保存的命令:
+# > npm run build && git add . && git commit -m "deploy" && git push
+
+# 执行快捷指令
+yuangs run deploy
+
+# 查看所有指令
+yuangs macros
+```
+
+## 配置管理
+
+使用 `config` 命令快速修改 AI 配置：
+
+```bash
+yuangs config defaultModel Assistant
+yuangs config accountType pro
+```
+
+配置项说明：
+- `defaultModel`: 默认使用的 AI 模型 (默认为 `Assistant`)
+- `aiProxyUrl`: 自定义 AI 接口地址
+- `accountType`: 账户类型 (free/pro)
+
 ## 应用列表
 
 以下是 CLI 中可以通过相应命令直接打开的应用程序链接：
@@ -126,9 +172,12 @@ yuangs mail        # 打开邮箱
 
 ## 近期主要更新日志
 
-### v1.3.32 (2026-01-16)
-- **新增** AI 命令生成模式：使用 `yuangs ai -e <描述>` 快速生成 Linux 命令。
-- **优化** AI 接口升级：全面迁移至 OpenAI 兼容接口，提升稳定性。
+### v1.3.38 (2026-01-16)
+- **新增** 快捷指令系统 (`save`/`run`/`macros`)，支持保存复杂命令。
+- **新增** 管道模式：支持 `cat file | yuangs ai` 分析内容。
+- **新增** AI 流式输出 + Markdown 终端渲染，体验对齐 ChatGPT 网页版。
+- **新增** `config` 命令，方便管理 AI 配置。
+- **优化** 命令生成模式 (`-e`) 增加剪贴板自动复制和预填执行功能。
 
 ### v1.3.22 (2025-11-30)
 - **新增** AI 命令支持 `-p` `-f` `-l` 简写，快速选择gemini默认模型

package/cli.js

@@ -2,11 +2,43 @@
 
 const yuangs = require('./index.js');
 const chalk = require('chalk');
-const { version } = require('./package.json'); // 引入版本号
+const { version } = require('./package.json');
+const fs = require('fs');
+const path = require('path');
+const ora = require('ora').default;
+const { marked } = require('marked');
+const TerminalRenderer = require('marked-terminal').default;
+const { exec } = require('child_process');
+
+marked.setOptions({
+    renderer: new TerminalRenderer({
+        code: chalk.yellow,
+        heading: chalk.magenta.bold,
+        firstHeading: chalk.magenta.underline.bold,
+        listitem: chalk.cyan,
+        table: chalk.white,
+        strong: chalk.bold.red,
+        em: chalk.italic
+    })
+});
 
 const args = process.argv.slice(2);
 const command = args[0];
 
+async function readStdin() {
+    if (process.stdin.isTTY) return '';
+    return new Promise((resolve) => {
+        let data = '';
+        process.stdin.setEncoding('utf8');
+        process.stdin.on('data', (chunk) => {
+            data += chunk;
+        });
+        process.stdin.on('end', () => {
+            resolve(data);
+        });
+    });
+}
+
 function printHelp() {
     console.log(chalk.bold.cyan('\n🎨 苑广山的个人应用启动器\n'));
     console.log(chalk.yellow(`当前版本: ${version}`)); // 显示版本号
@@ -35,6 +67,11 @@ function printHelp() {
     console.log(`    ${chalk.gray('--model, -m <模型名称>')}  指定 AI 模型 (可选)`);
     console.log(`    ${chalk.gray('-p -f -l')}  指定 pro,flash,lite 模型 (可选)`);
     console.log(`    ${chalk.gray('-e <描述>')}         生成 Linux 命令`);
+    console.log(`  ${chalk.green('config')} <key> <value>  设置配置项`);
+    console.log(`  ${chalk.green('history')}           查看命令历史`);
+    console.log(`  ${chalk.green('save')} <名称>         创建快捷指令`);
+    console.log(`  ${chalk.green('run')} <名称>          执行快捷指令`);
+    console.log(`  ${chalk.green('macros')}            查看所有快捷指令`);
     console.log(`  ${chalk.green('help')}              显示帮助信息\n`);
     console.log(chalk.bold('AI 交互模式命令:'));
     console.log(`    ${chalk.gray('/clear')}           清空对话历史`);
@@ -51,50 +88,83 @@ function printSuccess(app, url) {
 }
 
 async function askOnce(question, model) {
-    const startTime = Date.now(); // Record start time
+    const startTime = Date.now();
     let i = 0;
     const spinner = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
     const interval = setInterval(() => {
-        const elapsedTime = Math.floor((Date.now() - startTime) / 1000); // Calculate elapsed time in seconds
+        const elapsedTime = Math.floor((Date.now() - startTime) / 1000);
         process.stdout.write(chalk.cyan(`\r${spinner[i++ % spinner.length]} 正在请求 AI，请稍候... (${elapsedTime}s}`));
     }, 100);
 
     try {
-        // For single requests (non-interactive mode), we may want to include history
-        // For now, use history for all requests, but we could make this configurable
         const answer = await yuangs.getAIAnswer(question, model, true);
         clearInterval(interval);
 
-        // Clear the spinner line if possible
         if (process.stdout.clearLine) {
             process.stdout.clearLine(0);
             process.stdout.cursorTo(0);
         } else {
-            process.stdout.write('\r'); // Fallback to just carriage return
+            process.stdout.write('\r');
         }
 
-        const totalElapsedTime = (Date.now() - startTime) / 1000; // Calculate total elapsed time
+        const totalElapsedTime = (Date.now() - startTime) / 1000;
         if (answer && answer.explanation) {
-            console.log(chalk.bold.green('🤖 AI 回答:\n'));
-            console.log(answer.explanation);
+            console.log(marked(answer.explanation));
         } else {
             console.log(chalk.yellow('AI 未返回有效内容。'));
         }
-        console.log(chalk.gray(`\n请求耗时: ${totalElapsedTime.toFixed(2)}s\n`)); // Display total elapsed time
+        console.log(chalk.gray(`\n请求耗时: ${totalElapsedTime.toFixed(2)}s\n`));
     } catch (error) {
         clearInterval(interval);
 
-        // Clear the spinner line if possible
         if (process.stdout.clearLine) {
             process.stdout.clearLine(0);
             process.stdout.cursorTo(0);
         } else {
-            process.stdout.write('\r'); // Fallback to just carriage return
+            process.stdout.write('\r');
         }
 
-        const totalElapsedTime = (Date.now() - startTime) / 1000; // Calculate total elapsed time on error
+        const totalElapsedTime = (Date.now() - startTime) / 1000;
         console.error(chalk.red('处理 AI 请求时出错:'), error.message || error);
-        console.log(chalk.gray(`\n请求耗时: ${totalElapsedTime.toFixed(2)}s\n`)); // Display total elapsed time on error
+        console.log(chalk.gray(`\n请求耗时: ${totalElapsedTime.toFixed(2)}s\n`));
+    }
+}
+
+async function askOnceStream(question, model) {
+    const startTime = Date.now();
+    let messages = [...yuangs.getConversationHistory()];
+    messages.push({ role: 'user', content: question });
+
+    const spinner = ora(chalk.cyan('AI 正在思考...')).start();
+    let fullResponse = '';
+    let firstChunk = true;
+
+    const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
+
+    try {
+        await yuangs.callAI_Stream(messages, model, (chunk) => {
+            if (spinner.isSpinning) {
+                spinner.stop();
+            }
+            fullResponse += chunk;
+            process.stdout.write(chunk);
+        });
+
+        yuangs.addToConversationHistory('user', question);
+        yuangs.addToConversationHistory('assistant', fullResponse);
+
+        // 打印优美的分割线和 Markdown 渲染结果
+        console.log('');
+        console.log(chalk.gray('─'.repeat(Math.min(80, process.stdout.columns || 80))));
+        console.log(marked(fullResponse));
+
+        const totalElapsedTime = (Date.now() - startTime) / 1000;
+        console.log(chalk.gray(`\n\n请求耗时: ${totalElapsedTime.toFixed(2)}s\n`));
+    } catch (error) {
+        if (spinner.isSpinning) {
+            spinner.fail(chalk.red('AI 响应出错'));
+        }
+        console.error(error.message);
     }
 }
 
@@ -105,6 +175,12 @@ async function handleAICommand() {
     let questionParts = commandArgs;
     let isExecMode = false;
 
+    const stdinContent = await readStdin();
+
+    if (stdinContent) {
+        questionParts.unshift(stdinContent);
+    }
+
     // Check for -e flag
     const execIndex = commandArgs.indexOf('-e');
     if (execIndex !== -1) {
@@ -218,11 +294,13 @@ async function handleAICommand() {
 
                 const { spawn } = require('child_process');
                 console.log(chalk.gray('正在执行...'));
-                // Use shell: true to support pipes, redirects, etc.
                 const child = spawn(finalCommand, [], { shell: true, stdio: 'inherit' });
 
                 child.on('close', (code) => {
-                    if (code !== 0) {
+                    if (code === 0) {
+                        yuangs.saveSuccessfulCommand(question, finalCommand);
+                        console.log(chalk.green('\n✓ 执行成功并已存入历史库'));
+                    } else {
                         console.log(chalk.red(`\n命令执行失败 (退出码: ${code})`));
                     }
                     process.exit(code);
@@ -288,11 +366,10 @@ async function handleAICommand() {
                 }
 
                 if (!trimmed) {
-                    return askLoop(); // 空输入则重新询问
+                    return askLoop();
                 }
 
-                // 等待回答完成后，再开启下一轮询问
-                await askOnce(trimmed, model);
+                await askOnceStream(trimmed, model);
                 askLoop();
             });
         };
@@ -303,7 +380,7 @@ async function handleAICommand() {
     }
 
     // 有问题时，直接请求一次
-    await askOnce(question, model);
+    await askOnceStream(question, model);
 }
 
 // Check if the command matches one of the configured apps
@@ -333,13 +410,143 @@ switch (command) {
     case 'ai':
         handleAICommand();
         break;
+    case 'config':
+        const key = args[1];
+        const value = args[2];
+        if (!key || !value) {
+            console.log(chalk.cyan('\n⚙️  配置帮助: yuangs config <key> <value>'));
+            console.log(chalk.gray('当前配置:'), yuangs.getUserConfig());
+            console.log(chalk.gray('\n可用配置:'));
+            console.log(chalk.gray('  defaultModel  默认AI模型 (如: Assistant, gemini-pro-latest)'));
+            console.log(chalk.gray('  aiProxyUrl    AI代理地址'));
+            console.log(chalk.gray('  accountType   账户类型 (如: free, pro)\n'));
+            break;
+        }
+        const config = yuangs.getUserConfig();
+        config[key] = value;
+        fs.writeFileSync(path.join(require('os').homedir(), '.yuangs.json'), JSON.stringify(config, null, 2));
+        console.log(chalk.green(`✓ 已更新 ${key}`));
+        break;
+    case 'history':
+        const history = yuangs.getCommandHistory();
+        if (history.length === 0) {
+            console.log(chalk.gray('暂无命令历史\n'));
+        } else {
+            console.log(chalk.bold.cyan('\n📋 命令历史\n'));
+            console.log(chalk.gray('─────────────────────────────────────────────────'));
+            history.forEach((item, index) => {
+                console.log(chalk.white(`${index + 1}. ${item.command}`));
+                console.log(chalk.gray(`   问题: ${item.question}`));
+                console.log(chalk.gray(`   时间: ${item.time}\n`));
+            });
+            console.log(chalk.gray('─────────────────────────────────────────────────\n'));
+        }
+        break;
+    case 'save':
+        const macroName = args[1];
+        if (!macroName) {
+            console.log(chalk.red('\n错误: 请指定快捷指令名称'));
+            console.log(chalk.gray('用法: yuangs save <名称>\n'));
+            break;
+        }
+
+        const readline = require('readline');
+        const saveRl = readline.createInterface({
+            input: process.stdin,
+            output: process.stdout
+        });
+
+        console.log(chalk.cyan(`\n正在创建快捷指令 "${macroName}"...`));
+        console.log(chalk.gray('请输入要保存的命令（多行命令用 && 或 ; 分隔，输入空行结束）:\n'));
+
+        let commandLines = [];
+        const askCommand = () => {
+            saveRl.question(chalk.green('> '), (line) => {
+                if (line.trim() === '') {
+                    if (commandLines.length === 0) {
+                        console.log(chalk.yellow('\n未输入命令，已取消'));
+                        saveRl.close();
+                        return;
+                    }
+
+                    saveRl.question(chalk.cyan('请输入描述（可选）: '), (desc) => {
+                        const commands = commandLines.map(cmd => cmd.trim()).join(' && ');
+                        yuangs.saveMacro(macroName, commands, desc.trim());
+                        console.log(chalk.green(`\n✓ 快捷指令 "${macroName}" 已保存\n`));
+                        saveRl.close();
+                    });
+                    return;
+                }
+                commandLines.push(line);
+                askCommand();
+            });
+        };
+        askCommand();
+        break;
+    case 'run':
+        const runMacroName = args[1];
+        if (!runMacroName) {
+            console.log(chalk.red('\n错误: 请指定快捷指令名称'));
+            console.log(chalk.gray('用法: yuangs run <名称>\n'));
+            break;
+        }
+
+        const macros = yuangs.getMacros();
+        if (!macros[runMacroName]) {
+            console.log(chalk.red(`\n错误: 快捷指令 "${runMacroName}" 不存在`));
+            console.log(chalk.gray('使用 "yuangs macros" 查看所有快捷指令\n'));
+            break;
+        }
+
+        const macro = macros[runMacroName];
+        console.log(chalk.cyan(`\n执行快捷指令: ${runMacroName}`));
+        if (macro.description) {
+            console.log(chalk.gray(`描述: ${macro.description}`));
+        }
+        console.log(chalk.gray(`命令: ${macro.commands}\n`));
+
+        const { spawn } = require('child_process');
+        const child = spawn(macro.commands, [], { shell: true, stdio: 'inherit' });
+
+        child.on('close', (code) => {
+            if (code !== 0) {
+                console.error(chalk.red(`\n快捷指令执行失败 (退出码: ${code})`));
+                process.exit(code);
+            }
+        });
+        break;
+    case 'macros':
+        const allMacros = yuangs.getMacros();
+        const macroNames = Object.keys(allMacros);
+
+        if (macroNames.length === 0) {
+            console.log(chalk.gray('暂无快捷指令\n'));
+            console.log(chalk.gray('使用 "yuangs save <名称>" 创建快捷指令\n'));
+            break;
+        }
+
+        console.log(chalk.bold.cyan('\n🚀 快捷指令列表\n'));
+        console.log(chalk.gray('─────────────────────────────────────────────────'));
+        macroNames.forEach(name => {
+            const m = allMacros[name];
+            console.log(chalk.white(`  ${name}`));
+            if (m.description) {
+                console.log(chalk.gray(`    描述: ${m.description}`));
+            }
+            console.log(chalk.gray(`    命令: ${m.commands}`));
+            console.log('');
+        });
+        console.log(chalk.gray('─────────────────────────────────────────────────\n'));
+        console.log(chalk.gray('使用:'));
+        console.log(chalk.gray('  yuangs run <名称>  执行快捷指令'));
+        console.log(chalk.gray('  yuangs save <名称>  创建新快捷指令\n'));
+        break;
     case 'help':
     case '--help':
     case '-h':
         printHelp();
         break;
     default:
-        // If it's an app command but not one of the named ones, handle it with the dynamic function
         if (isAppCommand) {
             printSuccess(command, yuangs.urls[command]);
             yuangs.openApp(command);

package/index.js

@@ -2,11 +2,72 @@ const { exec } = require('child_process');
 const axios = require('axios');
 const fs = require('fs');
 const path = require('path');
+const os = require('os');
 
 // Store conversation history
 // 存储结构标准为: [{ role: 'user', content: '...' }, { role: 'assistant', content: '...' }]
 let conversationHistory = [];
 
+const HISTORY_FILE = path.join(os.homedir(), '.yuangs_cmd_history.json');
+const CONFIG_FILE = path.join(os.homedir(), '.yuangs.json');
+const MACROS_FILE = path.join(os.homedir(), '.yuangs_macros.json');
+
+function getUserConfig() {
+    if (fs.existsSync(CONFIG_FILE)) {
+        try {
+            return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
+        } catch (e) {}
+    }
+    return {};
+}
+
+function getCommandHistory() {
+    if (fs.existsSync(HISTORY_FILE)) {
+        try {
+            return JSON.parse(fs.readFileSync(HISTORY_FILE, 'utf8'));
+        } catch (e) {}
+    }
+    return [];
+}
+
+function saveSuccessfulCommand(question, command) {
+    if (!command) return;
+    let history = getCommandHistory();
+    const newEntry = { question, command, time: new Date().toLocaleString() };
+    history = [newEntry, ...history.filter(item => item.command !== command)].slice(0, 5);
+    fs.writeFileSync(HISTORY_FILE, JSON.stringify(history, null, 2));
+}
+
+function getMacros() {
+    if (fs.existsSync(MACROS_FILE)) {
+        try {
+            return JSON.parse(fs.readFileSync(MACROS_FILE, 'utf8'));
+        } catch (e) {}
+    }
+    return {};
+}
+
+function saveMacro(name, commands, description = '') {
+    const macros = getMacros();
+    macros[name] = {
+        commands,
+        description,
+        createdAt: new Date().toISOString()
+    };
+    fs.writeFileSync(MACROS_FILE, JSON.stringify(macros, null, 2));
+    return true;
+}
+
+function deleteMacro(name) {
+    const macros = getMacros();
+    if (macros[name]) {
+        delete macros[name];
+        fs.writeFileSync(MACROS_FILE, JSON.stringify(macros, null, 2));
+        return true;
+    }
+    return false;
+}
+
 // Default apps (fallback if no config file exists)
 const DEFAULT_APPS = {
     shici: 'https://wealth.want.biz/shici/index.html',
@@ -103,21 +164,90 @@ function getConversationHistory() {
 /**
  * 通用 AI 调用函数 (OpenAI 兼容接口)
  */
+async function callAI_Stream(messages, model, onChunk) {
+    const config = getUserConfig();
+    const url = config.aiProxyUrl || 'https://aiproxy.want.biz/v1/chat/completions';
+
+    const response = await axios({
+        method: 'post',
+        url: url,
+        data: {
+            model: model || config.defaultModel || 'Assistant',
+            messages: messages,
+            stream: true
+        },
+        responseType: 'stream',
+        headers: {
+            'Content-Type': 'application/json',
+            'X-Client-ID': 'npm_yuangs',
+            'Origin': 'https://cli.want.biz',
+            'Referer': 'https://cli.want.biz/',
+            'account': config.accountType || 'free',
+            'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 18_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.5 Mobile/15E148 Safari/604.1',
+            'Accept': 'application/json'
+        }
+    });
+
+    return new Promise((resolve, reject) => {
+        let buffer = '';
+        response.data.on('data', chunk => {
+            buffer += chunk.toString();
+            let lines = buffer.split('\n');
+            // 数组的最后一个元素可能是不完整的行，留到下一次处理
+            buffer = lines.pop(); 
+
+            for (const line of lines) {
+                const trimmedLine = line.trim();
+                if (trimmedLine.startsWith('data: ')) {
+                    const data = trimmedLine.slice(6);
+                    if (data === '[DONE]') {
+                        resolve();
+                        return;
+                    }
+                    try {
+                        const parsed = JSON.parse(data);
+                        const content = parsed.choices[0]?.delta?.content || '';
+                        if (content) onChunk(content);
+                    } catch (e) {
+                        // 如果这一行真的有问题，忽略它
+                    }
+                }
+            }
+        });
+        response.data.on('error', reject);
+        response.data.on('end', () => {
+             // 处理缓冲区中剩余的内容（如果有）
+            if (buffer.trim().startsWith('data: ')) {
+                 try {
+                    const data = buffer.trim().slice(6);
+                    if (data !== '[DONE]') {
+                        const parsed = JSON.parse(data);
+                        const content = parsed.choices[0]?.delta?.content || '';
+                        if (content) onChunk(content);
+                    }
+                } catch (e) {}
+            }
+            resolve();
+        });
+    });
+}
+
 async function callAI_OpenAI(messages, model) {
-    const url = 'https://aiproxy.want.biz/v1/chat/completions';
+    const config = getUserConfig();
+    const url = config.aiProxyUrl || 'https://aiproxy.want.biz/v1/chat/completions';
 
     const headers = {
         'Content-Type': 'application/json',
-        'X-Client-ID': 'npm_yuangs', // 客户端 标识
-        'Origin': 'https://cli.want.biz', // 配合后端白名单
+        'X-Client-ID': 'npm_yuangs',
+        'Origin': 'https://cli.want.biz',
         'Referer': 'https://cli.want.biz/',
-        "account": "free",
+        'account': config.accountType || 'free',
         'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 18_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.5 Mobile/15E148 Safari/604.1',
         'Accept': 'application/json'
     };
 
     const data = {
-        model: model || "gemini-flash-lite-latest",
+        model: model || config.defaultModel || 'Assistant',
         messages: messages,
         stream: false
     };
@@ -162,8 +292,7 @@ async function getAIAnswer(question, model, includeHistory = true) {
 }
 
 async function generateCommand(instruction, model) {
-    // 构造 System Prompt (通过 system role 或者直接在 user message 中强调)
-    // Gemini 有时对 system role 支持不同，但在 OpenAI 兼容接口下通常支持 system
+    const config = getUserConfig();
     const messages = [
         {
             role: 'system',
@@ -177,20 +306,17 @@ async function generateCommand(instruction, model) {
     ];
 
     try {
-        const response = await callAI_OpenAI(messages, model);
+        const response = await callAI_OpenAI(messages, model || config.defaultModel);
         const aiContent = response.data?.choices?.[0]?.message?.content;
 
         if (aiContent) {
-            // Clean up the output just in case the AI adds markdown or whitespace
             let command = aiContent.trim();
-            // Remove wrapping backticks if present
             if (command.startsWith('`') && command.endsWith('`')) {
                 command = command.slice(1, -1);
             }
             if (command.startsWith('```') && command.endsWith('```')) {
                 command = command.split('\n').filter(line => !line.startsWith('```')).join('\n').trim();
             }
-            // If it starts with a shell prefix like "$ " or "> ", remove it
             if (command.startsWith('$ ')) command = command.slice(2);
             if (command.startsWith('> ')) command = command.slice(2);
 
@@ -198,15 +324,12 @@ async function generateCommand(instruction, model) {
         }
         return null;
     } catch (error) {
-        // 命令生成失败不打印过多错误，返回 null 即可
-        // console.error('AI 生成命令失败:', error.message); 
         return null;
     }
 }
 
 module.exports = {
     urls: APPS,
-    // Dynamic function to open any app by key
     openApp: (appKey) => {
         const url = APPS[appKey];
         if (url) {
@@ -216,7 +339,6 @@ module.exports = {
         console.error(`App '${appKey}' not found`);
         return false;
     },
-    // Specific functions for default apps (for backward compatibility)
     openShici: () => openUrl(APPS.shici || DEFAULT_APPS.shici),
     openDict: () => openUrl(APPS.dict || DEFAULT_APPS.dict),
     openPong: () => openUrl(APPS.pong || DEFAULT_APPS.pong),
@@ -228,5 +350,12 @@ module.exports = {
     addToConversationHistory,
     clearConversationHistory,
     getConversationHistory,
-    generateCommand
+    generateCommand,
+    getUserConfig,
+    getCommandHistory,
+    saveSuccessfulCommand,
+    callAI_Stream,
+    getMacros,
+    saveMacro,
+    deleteMacro
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuangs",
-  "version": "1.3.34",
+  "version": "1.3.38",
   "description": "苑广山的个人应用集合 CLI（彩色版）",
   "main": "index.js",
   "bin": {
@@ -28,7 +28,10 @@
   "dependencies": {
     "axios": "^1.13.2",
     "chalk": "^4.1.2",
-    "js-yaml": "^4.1.0"
+    "js-yaml": "^4.1.0",
+    "marked": "^15.0.12",
+    "marked-terminal": "^7.3.0",
+    "ora": "^9.0.0"
   },
   "devDependencies": {
     "jest": "^29.7.0"

package/test/macros.test.js

@@ -0,0 +1,91 @@
+const fs = require('fs');
+const yuangs = require('../index.js');
+const path = require('path');
+const os = require('os');
+
+jest.mock('fs');
+
+describe('Module: Macros', () => {
+    const mockMacrosFile = path.join(os.homedir(), '.yuangs_macros.json');
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        // Setup default mock implementation
+        fs.existsSync.mockReturnValue(false);
+        fs.readFileSync.mockReturnValue('{}');
+        fs.writeFileSync.mockReturnValue(undefined);
+        // We need to unmock path and os if they were mocked, but we only mocked fs
+    });
+
+    test('should get empty macros when file does not exist', () => {
+        fs.existsSync.mockReturnValue(false);
+        const macros = yuangs.getMacros();
+        expect(macros).toEqual({});
+        expect(fs.existsSync).toHaveBeenCalledWith(mockMacrosFile);
+    });
+
+    test('should save a new macro', () => {
+        fs.existsSync.mockReturnValue(false); // File doesn't exist yet
+        
+        const result = yuangs.saveMacro('test', 'echo hello', 'description');
+        
+        expect(result).toBe(true);
+        expect(fs.writeFileSync).toHaveBeenCalled();
+        
+        const [filePath, content] = fs.writeFileSync.mock.calls[0];
+        expect(filePath).toBe(mockMacrosFile);
+        
+        const data = JSON.parse(content);
+        expect(data).toHaveProperty('test');
+        expect(data.test.commands).toBe('echo hello');
+        expect(data.test.description).toBe('description');
+        expect(data.test).toHaveProperty('createdAt');
+    });
+
+    test('should retrieve existing macros', () => {
+        const mockData = {
+            "demo": {
+                "commands": "ls -la",
+                "description": "list files"
+            }
+        };
+        fs.existsSync.mockReturnValue(true);
+        fs.readFileSync.mockReturnValue(JSON.stringify(mockData));
+
+        const macros = yuangs.getMacros();
+        expect(macros).toEqual(mockData);
+    });
+
+    test('should delete a macro', () => {
+        const mockData = {
+            "todelete": { "commands": "rm -rf /" },
+            "keep": { "commands": "echo safe" }
+        };
+        fs.existsSync.mockReturnValue(true);
+        fs.readFileSync.mockReturnValue(JSON.stringify(mockData));
+
+        const result = yuangs.deleteMacro('todelete');
+        
+        expect(result).toBe(true);
+        expect(fs.writeFileSync).toHaveBeenCalled();
+        
+        const [filePath, content] = fs.writeFileSync.mock.calls[0];
+        const savedData = JSON.parse(content);
+        expect(savedData).not.toHaveProperty('todelete');
+        expect(savedData).toHaveProperty('keep');
+    });
+
+    test('should return false when deleting non-existent macro', () => {
+        fs.existsSync.mockReturnValue(false); // Or true with empty object
+        
+        const result = yuangs.deleteMacro('nonexistent');
+        expect(result).toBe(false);
+        // Should not write to disk if nothing changed (optional optimization, but current implementation reads first)
+        // Actually current implementation:
+        // const macros = getMacros();
+        // if (macros[name]) { ... }
+        // getMacros returns {} if file not exists. macros['nonexistent'] is undefined.
+        // So it returns false and does NOT call writeFileSync.
+        expect(fs.writeFileSync).not.toHaveBeenCalled();
+    });
+});

package/yuangs.config.example.json

@@ -4,5 +4,8 @@
   "pong": "https://wealth.want.biz/pages/pong.html",
   "github": "https://github.com",
   "calendar": "https://calendar.google.com",
-  "mail": "https://mail.google.com"
+  "mail": "https://mail.google.com",
+  "aiProxyUrl": "https://aiproxy.want.biz/v1/chat/completions",
+  "defaultModel": "Assistant",
+  "accountType": "free"
 }

package/yuangs.config.example.yaml

@@ -8,6 +8,11 @@ github: "https://github.com"
 calendar: "https://calendar.google.com"
 mail: "https://mail.google.com"
 
+# AI Configuration
+aiProxyUrl: "https://aiproxy.want.biz/v1/chat/completions"
+defaultModel: "Assistant"
+accountType: "free"
+
 # You can also use the apps property if you prefer to group them
 # apps:
 #   shici: "https://wealth.want.biz/shici/index.html"
@@ -15,4 +20,4 @@ mail: "https://mail.google.com"
 #   pong: "https://wealth.want.biz/pages/pong.html"
 #   github: "https://github.com"
 #   calendar: "https://calendar.google.com"
-#   mail: "https://mail.google.com"
+#   mail: "https://mail.google.com"

package/yuangs.config.json

@@ -0,0 +1,9 @@
+{
+  "shici": "https://wealth.want.biz/shici/index.html",
+  "dict": "https://wealth.want.biz/pages/dict.html",
+  "pong": "https://wealth.want.biz/pages/pong.html",
+  "mail": "https://mail.google.com",
+  "github": "https://github.com",
+  "calendar": "https://calendar.google.com",
+  "homepage": "https://i.want.biz"
+}

package/.github/workflows/publish.yml

@@ -1,54 +0,0 @@
-name: Auto Bump & Publish
-
-on:
-  push:
-    branches:
-      - main # 如果你的默认分支不是 main，记得改成对应名字
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-
-    # 权限：允许 Action 修改仓库代码 + 生成 provenance
-    permissions:
-      contents: write
-      id-token: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          fetch-depth: 0 # 完整历史，方便推 tag
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "18"
-          registry-url: "https://registry.npmjs.org/"
-
-      - name: Configure Git
-        run: |
-          git config user.name "GitHub Action"
-          git config user.email "action@github.com"
-
-      # 自动 bump patch 版本：1.1.5 -> 1.1.6
-      # [skip ci] 防止这个 commit 再次触发 workflow 形成死循环
-      - name: Bump version
-        run: |
-          npm version patch -m "苑广山注：自动升版本号%s[skip ci]"
-
-      # 推送 commit + tag 回 GitHub
-      - name: Push changes
-        run: |
-          git push --follow-tags
-
-      # 安装依赖
-      - name: Install dependencies
-        run: npm ci
-
-      # 发布到 npm
-      - name: Publish to npm
-        run: npm publish --provenance
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}