yuangs 1.3.30 → 1.3.32

package/cli.js

@@ -34,11 +34,13 @@ function printHelp() {
     console.log(`  ${chalk.green('ai')} "<问题>"      向 AI 提问（不写问题进入交互模式）`);
     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('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('AI 生成命令: yuangs ai -e "查看当前目录"'));
     console.log(chalk.gray('普通示例: yuangs shici\n'));
     console.log(chalk.gray('配置文件: 您可以通过创建 yuangs.config.json 或 ~/.yuangs.json 来自定义应用列表\n'));
 }
@@ -99,23 +101,34 @@ async function askOnce(question, model) {
 async function handleAICommand() {
     const commandArgs = args.slice(1);
 
-    let model = null; // Default model will be handled in index.js
+    let model = null;
     let questionParts = commandArgs;
+    let isExecMode = false;
+
+    // Check for -e flag
+    const execIndex = commandArgs.indexOf('-e');
+    if (execIndex !== -1) {
+        isExecMode = true;
+        // removing -e from args
+        const before = commandArgs.slice(0, execIndex);
+        const after = commandArgs.slice(execIndex + 1);
+        questionParts = [...before, ...after];
+    }
 
     // Check for shorthand model flags first
-    const proIndex = commandArgs.indexOf('-p');
-    const flashIndex = commandArgs.indexOf('-f');
-    const liteIndex = commandArgs.indexOf('-l');
+    const proIndex = questionParts.indexOf('-p');
+    const flashIndex = questionParts.indexOf('-f');
+    const liteIndex = questionParts.indexOf('-l');
 
     if (proIndex !== -1) {
         model = 'gemini-pro-latest';
-        questionParts = commandArgs.filter((_, index) => index !== proIndex);
+        questionParts = questionParts.filter((_, index) => index !== proIndex);
     } else if (flashIndex !== -1) {
         model = 'gemini-flash-latest';
-        questionParts = commandArgs.filter((_, index) => index !== flashIndex);
+        questionParts = questionParts.filter((_, index) => index !== flashIndex);
     } else if (liteIndex !== -1) {
         model = 'gemini-flash-lite-latest';
-        questionParts = commandArgs.filter((_, index) => index !== liteIndex);
+        questionParts = questionParts.filter((_, index) => index !== liteIndex);
     }
 
     // If shorthand flags are not used, check for --model or -m
@@ -133,6 +146,39 @@ async function handleAICommand() {
 
     const question = questionParts.join(' ').trim();
 
+    // Special handling for execution mode
+    if (isExecMode) {
+        if (!question) {
+            console.log(chalk.red('错误: 使用 -e 参数时必需提供描述。'));
+            return;
+        }
+
+        const startTime = Date.now();
+        let i = 0;
+        const spinner = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+        const interval = setInterval(() => {
+            process.stdout.write(chalk.cyan(`\r${spinner[i++ % spinner.length]} 正在生成命令...`));
+        }, 100);
+
+        const command = await yuangs.generateCommand(question, model);
+        clearInterval(interval);
+
+        if (process.stdout.clearLine) {
+            process.stdout.clearLine(0);
+            process.stdout.cursorTo(0);
+        } else {
+            process.stdout.write('\r');
+        }
+
+        if (command) {
+            console.log(chalk.gray('生成命令:'));
+            console.log(chalk.bold.green(`> ${command}`));
+        } else {
+            console.log(chalk.yellow('未能生成有效的命令。'));
+        }
+        return;
+    }
+
     // 如果用户直接输入 `yuangs ai`，进入交互式模式
     if (!question) {
         console.log(chalk.bold.cyan('\n🤖 进入 AI 交互模式 (输入 exit 退出)\n'));

package/index.js

@@ -101,58 +101,53 @@ function getConversationHistory() {
 }
 
 /**
- * 获取 AI 回复 (OpenAI 兼容接口版)
+ * 通用 AI 调用函数 (OpenAI 兼容接口)
  */
-async function getAIAnswer(question, model, includeHistory = true) {
-    // 1. 修改接口地址为 OpenAI 标准兼容路径
+async function callAI_OpenAI(messages, model) {
     const url = 'https://aiproxy.want.biz/v1/chat/completions';
 
-    // 2. 准备 Headers (包含客户端标识)
     const headers = {
         'Content-Type': 'application/json',
         'X-Client-ID': 'npm_yuangs', // 客户端 标识
         'Origin': 'https://cli.want.biz', // 配合后端白名单
         'Referer': 'https://cli.want.biz/',
-          "account" : "free",
+        "account": "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'
     };
 
-    // 3. 构建 messages 数组 (上下文 + 当前问题)
-    let messages = [];
-    if (includeHistory) {
-        // history 已经是 [{role, content}, ...] 格式，直接展开
-        messages = [...conversationHistory];
-    }
-    
-    // 添加当前用户提问
-    messages.push({ role: 'user', content: question });
-
-    // 4. 构建 OpenAI 标准请求体
     const data = {
         model: model || "gemini-flash-lite-latest",
         messages: messages,
         stream: false
     };
 
+    return await axios.post(url, data, { headers });
+}
+
+/**
+ * 获取 AI 回复
+ */
+async function getAIAnswer(question, model, includeHistory = true) {
+    // 构建 messages 数组 (上下文 + 当前问题)
+    let messages = [];
+    if (includeHistory) {
+        messages = [...conversationHistory];
+    }
+    messages.push({ role: 'user', content: question });
+
     try {
-        // 发送请求
-        const response = await axios.post(url, data, { headers });
-        
-        // 5. 解析 OpenAI 格式响应 (choices[0].message.content)
+        const response = await callAI_OpenAI(messages, model);
         const aiContent = response.data?.choices?.[0]?.message?.content;
 
         if (!aiContent) {
             throw new Error('Invalid response structure from AI API');
         }
 
-        // 6. 更新历史记录
-        // 只有请求成功才记录
+        // 只有请求成功才记录历史
         addToConversationHistory('user', question);
         addToConversationHistory('assistant', aiContent);
 
-        // 返回结果
-        // 为了兼容旧代码可能使用的 .explanation 属性，这里做一层包装
         return {
             explanation: aiContent, // 兼容字段
             content: aiContent,     // 标准字段建议
@@ -166,6 +161,49 @@ async function getAIAnswer(question, model, includeHistory = true) {
     }
 }
 
+async function generateCommand(instruction, model) {
+    // 构造 System Prompt (通过 system role 或者直接在 user message 中强调)
+    // Gemini 有时对 system role 支持不同，但在 OpenAI 兼容接口下通常支持 system
+    const messages = [
+        {
+            role: 'system',
+            content: `You are a Linux command generator. Convert the user's natural language request into a single, executable Linux command. 
+            IMPORTANT: Output ONLY the command. Do not check for safety. Do not output markdown code blocks (no backticks). Do not explain.`
+        },
+        {
+            role: 'user',
+            content: `Request: ${instruction}`
+        }
+    ];
+
+    try {
+        const response = await callAI_OpenAI(messages, model);
+        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);
+
+            return command;
+        }
+        return null;
+    } catch (error) {
+        // 命令生成失败不打印过多错误，返回 null 即可
+        // console.error('AI 生成命令失败:', error.message); 
+        return null;
+    }
+}
+
 module.exports = {
     urls: APPS,
     // Dynamic function to open any app by key
@@ -189,5 +227,6 @@ module.exports = {
     getAIAnswer,
     addToConversationHistory,
     clearConversationHistory,
-    getConversationHistory
-};
+    getConversationHistory,
+    generateCommand
+};

package/package.json

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

package/yuangs.config.json

@@ -1,9 +0,0 @@
-{
-  "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"
-}