yuangs 1.3.10 → 1.3.13

package/cli.js

@@ -20,6 +20,9 @@ function printHelp() {
     console.log(`  ${chalk.green('ai')} "<问题>"      向 AI 提问（不写问题进入交互模式）`);
     console.log(`    ${chalk.gray('--model, -m <模型名称>')}  指定 AI 模型 (可选)`);
     console.log(`  ${chalk.green('help')}              显示帮助信息\n`);
+    console.log(chalk.bold('AI 交互模式命令:'));
+    console.log(`    ${chalk.gray('/clear')}           清空对话历史`);
+    console.log(`    ${chalk.gray('/history')}         查看对话历史\n`);
     console.log(chalk.gray('AI 示例: yuangs ai "你好" --model gemini-pro-latest'));
     console.log(chalk.gray('普通示例: yuangs shici\n'));
 }
@@ -35,14 +38,23 @@ async function askOnce(question, model) {
     const spinner = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
     const interval = setInterval(() => {
         const elapsedTime = Math.floor((Date.now() - startTime) / 1000); // Calculate elapsed time in seconds
-        process.stdout.write(chalk.cyan(`\r${spinner[i++ % spinner.length]} 正在请求 AI，请稍候... (${elapsedTime}s)`));
+        process.stdout.write(chalk.cyan(`\r${spinner[i++ % spinner.length]} 正在请求 AI，请稍候... (${elapsedTime}s}`));
     }, 100);
 
     try {
-        const answer = await yuangs.getAIAnswer(question, model);
+        // 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);
-        process.stdout.clearLine(0);
-        process.stdout.cursorTo(0);
+
+        // 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
+        }
+
         const totalElapsedTime = (Date.now() - startTime) / 1000; // Calculate total elapsed time
         if (answer && answer.explanation) {
             console.log(chalk.bold.green('🤖 AI 回答:\n'));
@@ -53,8 +65,15 @@ async function askOnce(question, model) {
         console.log(chalk.gray(`\n请求耗时: ${totalElapsedTime.toFixed(2)}s\n`)); // Display total elapsed time
     } catch (error) {
         clearInterval(interval);
-        process.stdout.clearLine(0);
-        process.stdout.cursorTo(0);
+
+        // 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
+        }
+
         const totalElapsedTime = (Date.now() - startTime) / 1000; // Calculate total elapsed time on error
         console.error(chalk.red('处理 AI 请求时出错:'), error.message || error);
         console.log(chalk.gray(`\n请求耗时: ${totalElapsedTime.toFixed(2)}s\n`)); // Display total elapsed time on error
@@ -64,18 +83,36 @@ async function askOnce(question, model) {
 async function handleAICommand() {
     const commandArgs = args.slice(1);
 
-    // 支持 --model 和 -m 两种写法
-    const longIndex = commandArgs.indexOf('--model');
-    const shortIndex = commandArgs.indexOf('-m');
-    const modelIndex = longIndex !== -1 ? longIndex : shortIndex;
-
     let model = null; // Default model will be handled in index.js
     let questionParts = commandArgs;
 
-    if (modelIndex !== -1 && commandArgs.length > modelIndex + 1) {
-        model = commandArgs[modelIndex + 1];
-        // Filter out --model/-m and its value
-        questionParts = commandArgs.filter((_, index) => index !== modelIndex && index !== modelIndex + 1);
+    // Check for shorthand model flags first
+    const proIndex = commandArgs.indexOf('-p');
+    const flashIndex = commandArgs.indexOf('-f');
+    const liteIndex = commandArgs.indexOf('-l');
+
+    if (proIndex !== -1) {
+        model = 'gemini-pro';
+        questionParts = commandArgs.filter((_, index) => index !== proIndex);
+    } else if (flashIndex !== -1) {
+        model = 'gemini-flash-latest';
+        questionParts = commandArgs.filter((_, index) => index !== flashIndex);
+    } else if (liteIndex !== -1) {
+        model = 'gemini-flash-lite-latest';
+        questionParts = commandArgs.filter((_, index) => index !== liteIndex);
+    }
+
+    // If shorthand flags are not used, check for --model or -m
+    if (!model) {
+        const longIndex = questionParts.indexOf('--model');
+        const shortIndex = questionParts.indexOf('-m');
+        const modelIndex = longIndex !== -1 ? longIndex : shortIndex;
+
+        if (modelIndex !== -1 && questionParts.length > modelIndex + 1) {
+            model = questionParts[modelIndex + 1];
+            // Filter out --model/-m and its value
+            questionParts = questionParts.filter((_, index) => index !== modelIndex && index !== modelIndex + 1);
+        }
     }
 
     const question = questionParts.join(' ').trim();
@@ -84,6 +121,9 @@ async function handleAICommand() {
     if (!question) {
         console.log(chalk.bold.cyan('\n🤖 进入 AI 交互模式 (输入 exit 退出)\n'));
         console.log(chalk.gray('直接输入你的问题，每回车一次提一个问题。\n'));
+        console.log(chalk.gray('支持的命令:'));
+        console.log(chalk.gray('  /clear - 清空对话历史'));
+        console.log(chalk.gray('  /history - 查看对话历史\n'));
 
         const readline = require('readline');
         const rl = readline.createInterface({
@@ -103,10 +143,32 @@ async function handleAICommand() {
                     process.exit(0);
                 }
 
+                // Handle special commands
+                if (trimmed === '/clear') {
+                    yuangs.clearConversationHistory();
+                    console.log(chalk.yellow('✓ 对话历史已清空\n'));
+                    return askLoop();
+                }
+
+                if (trimmed === '/history') {
+                    const history = yuangs.getConversationHistory();
+                    if (history.length === 0) {
+                        console.log(chalk.gray('暂无对话历史\n'));
+                    } else {
+                        console.log(chalk.bold('📋 对话历史:\n'));
+                        history.forEach((msg, index) => {
+                            const prefix = msg.role === 'user' ? chalk.green('你: ') : chalk.blue('AI: ');
+                            console.log(prefix + msg.content);
+                        });
+                        console.log('');
+                    }
+                    return askLoop();
+                }
+
                 if (!trimmed) {
                     return askLoop(); // 空输入则重新询问
                 }
-                
+
                 // 等待回答完成后，再开启下一轮询问
                 await askOnce(trimmed, model);
                 askLoop();

package/index.js

@@ -1,6 +1,9 @@
 const { exec } = require('child_process');
 const axios = require('axios');
 
+// Store conversation history
+let conversationHistory = [];
+
 const APPS = {
     shici: 'https://wealth.want.biz/shici/index.html',
     dict: 'https://wealth.want.biz/pages/dict.html',
@@ -17,9 +20,39 @@ function openUrl(url) {
     exec(command);
 }
 
-async function getAIAnswer(question, model) {
+// Function to add a message to the conversation history
+function addToConversationHistory(role, content) {
+    conversationHistory.push({ role, content });
+
+    // Keep only the last 20 messages to prevent history from growing too large
+    if (conversationHistory.length > 20) {
+        conversationHistory = conversationHistory.slice(-20);
+    }
+}
+
+// Function to clear conversation history
+function clearConversationHistory() {
+    conversationHistory = [];
+}
+
+// Function to get conversation history
+function getConversationHistory() {
+    return conversationHistory;
+}
+
+async function getAIAnswer(question, model, includeHistory = true) {
     const url = 'https://aiproxy.want.biz/ai/explain';
-    const prompt = question;
+
+    // Prepare the prompt with conversation history if enabled
+    let prompt = question;
+    if (includeHistory && conversationHistory.length > 0) {
+        // Create a context with the current question added to history
+        const contextWithHistory = [...conversationHistory, { role: 'user', content: question }];
+        prompt = contextWithHistory.map(msg => `${msg.role}: ${msg.content}`).join('\n\n');
+    } else {
+        // If not including history, just use the question directly
+        prompt = question;
+    }
 
     const headers = {
         'Referer': 'https://wealth.want.biz/',
@@ -35,7 +68,17 @@ async function getAIAnswer(question, model) {
 
     try {
         const response = await axios.post(url, data, { headers });
-        return response.data;
+        const answer = response.data;
+
+        // Add the user's question to the conversation history
+        addToConversationHistory('user', question);
+
+        // Add the AI response to the conversation history
+        if (answer && answer.explanation) {
+            addToConversationHistory('assistant', answer.explanation);
+        }
+
+        return answer;
     } catch (error) {
         console.error('AI 请求失败:', error.response?.data?.message || error.message || '未知错误');
         return null;
@@ -51,5 +94,8 @@ module.exports = {
         console.log('--- YGS Apps ---');
         Object.entries(APPS).forEach(([key, url]) => console.log(`${key}: ${url}`));
     },
-    getAIAnswer
+    getAIAnswer,
+    addToConversationHistory,
+    clearConversationHistory,
+    getConversationHistory
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuangs",
-  "version": "1.3.10",
+  "version": "1.3.13",
   "description": "苑广山的个人应用集合 CLI（彩色版）",
   "main": "index.js",
   "bin": {