opc-agent 4.1.3 → 4.1.4

package/dist/cli.js

@@ -37,10 +37,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const os = __importStar(require("os"));
 const yaml = __importStar(require("js-yaml"));
 const readline = __importStar(require("readline"));
 const runtime_1 = require("./core/runtime");
+const model_recommender_1 = require("./core/model-recommender");
 const customer_service_1 = require("./templates/customer-service");
 const sales_assistant_1 = require("./templates/sales-assistant");
 const knowledge_base_1 = require("./templates/knowledge-base");
@@ -366,32 +366,9 @@ export class EchoSkill extends BaseSkill {
         template = await select('Select a template:', Object.entries(TEMPLATES).map(([value, { label }]) => ({ value, label })));
     }
     // ── 硬件检测 + 智能模型推荐 ──
-    const totalRAM = Math.round(os.totalmem() / (1024 ** 3)); // GB
-    const freeMem = Math.round(os.freemem() / (1024 ** 3));
-    const cpuCount = os.cpus().length;
-    const MODEL_RECOMMENDATIONS = [
-        // Tier 1: 超轻量 (≤4GB RAM)
-        { name: 'qwen2.5:0.5b', size: '0.4GB', minRAM: 2, desc: '超轻量，适合低配机器', priority: 1 },
-        { name: 'qwen2.5:1.5b', size: '1.0GB', minRAM: 4, desc: '轻量但更智能', priority: 2 },
-        // Tier 2: 轻量 (4-8GB RAM)
-        { name: 'qwen2.5:3b', size: '2.0GB', minRAM: 6, desc: '性价比最优', priority: 3 },
-        { name: 'llama3.2:3b', size: '2.0GB', minRAM: 6, desc: 'Meta 最新轻量模型', priority: 3 },
-        { name: 'phi3:mini', size: '2.3GB', minRAM: 6, desc: '微软高效小模型', priority: 3 },
-        // Tier 3: 标准 (8-16GB RAM)
-        { name: 'qwen2.5:7b', size: '4.7GB', minRAM: 8, desc: '推荐：中文最强 7B', priority: 4 },
-        { name: 'llama3.1:8b', size: '4.7GB', minRAM: 8, desc: 'Meta 通用 8B', priority: 4 },
-        { name: 'mistral:7b', size: '4.1GB', minRAM: 8, desc: 'Mistral 经典 7B', priority: 4 },
-        { name: 'gemma2:9b', size: '5.4GB', minRAM: 10, desc: 'Google 高效 9B', priority: 4 },
-        // Tier 4: 高配 (16-32GB RAM)
-        { name: 'qwen2.5:14b', size: '9.0GB', minRAM: 16, desc: '中文强力 14B', priority: 5 },
-        { name: 'deepseek-coder-v2:16b', size: '9.0GB', minRAM: 16, desc: '编程专用', priority: 5 },
-        // Tier 5: 旗舰 (32GB+ RAM)
-        { name: 'qwen2.5:32b', size: '20GB', minRAM: 32, desc: '接近 GPT-4 水平', priority: 6 },
-        { name: 'llama3.1:70b', size: '40GB', minRAM: 64, desc: '开源最强', priority: 7 },
-    ];
-    // 根据可用内存筛选合适的模型
-    const suitableModels = MODEL_RECOMMENDATIONS.filter(m => m.minRAM <= freeMem + 2); // +2GB 容差
-    const bestRec = suitableModels.length > 0 ? suitableModels[suitableModels.length - 1] : MODEL_RECOMMENDATIONS[0];
+    // ── 硬件检测 + 远程模型推荐 ──
+    const sys = (0, model_recommender_1.detectSystem)();
+    const allModels = await (0, model_recommender_1.fetchModelList)();
     // ── LLM Provider 选择（Ollama-first）──
     let llmProvider = 'ollama';
     let llmModel = 'qwen2.5';
@@ -409,20 +386,23 @@ export class EchoSkill extends BaseSkill {
         modelNames = (ollamaData.models || []).map((m) => m.name || m.model);
         ollamaRunning = true;
         if (opts.yes && modelNames.length > 0) {
-            // --yes 模式：优先用推荐模型（如果已安装），否则用第一个已有模型
-            const bestInstalled = suitableModels.reverse().find(m => modelNames.includes(m.name));
+            const rec = (0, model_recommender_1.recommendModels)(allModels, sys, modelNames);
+            // --yes: prefer best installed recommended model
+            const bestInstalled = rec.installed.length > 0 ? rec.installed[rec.installed.length - 1] : null;
             llmModel = bestInstalled ? bestInstalled.name : modelNames[0];
         }
     }
     catch {
         ollamaRunning = false;
     }
+    // Compute recommendation (used by both interactive branches)
+    const rec = (0, model_recommender_1.recommendModels)(allModels, sys, modelNames);
     if (!opts.yes) {
         if (ollamaRunning) {
             console.log(`\n  ${icon.info} ${color.dim('正在检测 Ollama...')}`);
             console.log(`  ${icon.success} Ollama 已运行，发现 ${modelNames.length} 个模型`);
-            console.log(`  ${icon.info} 系统: ${totalRAM}GB RAM (${freeMem}GB 可用), ${cpuCount} CPU cores`);
-            console.log(`  ${icon.info} 推荐模型: ${color.cyan(bestRec.name)} (${bestRec.size}) - ${bestRec.desc}`);
+            console.log(`  ${icon.info} 系统: ${sys.totalRAM}GB RAM (${sys.freeRAM}GB 可用), ${sys.cpuCount} CPU cores`);
+            console.log(`  ${icon.info} 推荐模型: ${color.cyan(rec.best.name)} (${rec.best.size}) - ${rec.best.desc}`);
             // 选择 provider
             llmProvider = await select('选择 LLM 引擎:', [
                 { value: 'ollama', label: '🟢 Ollama (免费本地，推荐) - 已检测到运行中' },
@@ -433,16 +413,14 @@ export class EchoSkill extends BaseSkill {
             ]);
             if (llmProvider === 'ollama') {
                 // 已有模型 + 推荐未下载的模型
-                const existingSet = new Set(modelNames);
-                const recommendedNotInstalled = suitableModels.filter(m => !existingSet.has(m.name)).slice(-3); // 推荐最多3个未下载的
                 const modelOptions = [
-                    ...modelNames.map((m) => {
-                        const rec = MODEL_RECOMMENDATIONS.find(r => r.name === m);
-                        const recLabel = rec ? ` (${rec.size}, ${rec.desc})` : '';
-                        const isBest = m === bestRec.name ? ' ⭐推荐' : '';
-                        return { value: m, label: `${m}${recLabel}${isBest} [已安装]` };
+                    ...rec.installed.map((m) => {
+                        const isBest = m.name === rec.best.name ? ' ⭐推荐' : '';
+                        return { value: m.name, label: `${m.name} (${m.size}, ${m.desc})${isBest} [已安装]` };
                     }),
-                    ...recommendedNotInstalled.map(m => ({
+                    // Also show installed models not in recommendation list
+                    ...modelNames.filter(n => !rec.installed.find(m => m.name === n)).map(n => ({ value: n, label: `${n} [已安装]` })),
+                    ...rec.toDownload.map((m) => ({
                         value: `pull:${m.name}`,
                         label: `${m.name} (${m.size}, ${m.desc}) [需下载]`,
                     })),
@@ -463,11 +441,11 @@ export class EchoSkill extends BaseSkill {
                 else {
                     // 没有本地模型，推荐下载
                     console.log(`  ${color.yellow('⚠️')}  没有发现已下载的模型`);
-                    console.log(`  ${icon.info} 根据你的硬件 (${freeMem}GB 可用)，推荐下载:`);
-                    for (const m of suitableModels.slice(-3)) {
+                    console.log(`  ${icon.info} 根据你的硬件 (${sys.freeRAM}GB 可用)，推荐下载:`);
+                    for (const m of rec.suitable.slice(-3)) {
                         console.log(`     ${color.cyan(`ollama pull ${m.name}`)}  (${m.size}, ${m.desc})`);
                     }
-                    llmModel = bestRec.name;
+                    llmModel = rec.best.name;
                 }
             }
         }
@@ -485,12 +463,12 @@ export class EchoSkill extends BaseSkill {
             if (llmProvider === 'ollama') {
                 console.log(`\n  ${icon.info} Ollama 安装指南:`);
                 console.log(`     1. 访问 ${color.cyan('https://ollama.ai')} 下载并安装`);
-                console.log(`  ${icon.info} 根据你的硬件 (${totalRAM}GB RAM, ${freeMem}GB 可用)，推荐:`);
-                for (const m of suitableModels.slice(-3)) {
+                console.log(`  ${icon.info} 根据你的硬件 (${sys.totalRAM}GB RAM, ${sys.freeRAM}GB 可用)，推荐:`);
+                for (const m of rec.suitable.slice(-3)) {
                     console.log(`     ${color.cyan(`ollama pull ${m.name}`)}  (${m.size}, ${m.desc})`);
                 }
                 console.log(`     3. 然后 ${color.cyan('opc run')} 即可开始对话\n`);
-                llmModel = bestRec.name;
+                llmModel = rec.best.name;
             }
         }
         // 商业模型需要 API key
@@ -2436,6 +2414,64 @@ program
   await voice.start();
 `));
 });
+// ── Models command ──────────────────────────────────────────────
+program
+    .command('models')
+    .description('Show recommended Ollama models for your system')
+    .option('--refresh', 'Force refresh model list from remote')
+    .option('--json', 'Output as JSON')
+    .action(async (opts) => {
+    if (opts.refresh) {
+        (0, model_recommender_1.clearModelCache)();
+        console.log(`${icon.success} 模型推荐缓存已清除`);
+    }
+    const sys = (0, model_recommender_1.detectSystem)();
+    const models = await (0, model_recommender_1.fetchModelList)();
+    const cache = (0, model_recommender_1.cacheInfo)();
+    // Detect Ollama
+    let installedModels = [];
+    try {
+        const ctrl = new AbortController();
+        const t = setTimeout(() => ctrl.abort(), 3000);
+        const res = await fetch('http://localhost:11434/api/tags', { signal: ctrl.signal });
+        clearTimeout(t);
+        const data = await res.json();
+        installedModels = (data.models || []).map((m) => m.name || m.model);
+    }
+    catch { /* Ollama not running */ }
+    const rec = (0, model_recommender_1.recommendModels)(models, sys, installedModels);
+    if (opts.json) {
+        console.log(JSON.stringify({ system: sys, cache, recommendation: rec }, null, 2));
+        return;
+    }
+    console.log(`\n${icon.rocket} ${color.bold('OPC 模型推荐')}\n`);
+    console.log(`  系统: ${sys.totalRAM}GB RAM (${sys.freeRAM}GB 可用), ${sys.cpuCount} cores, ${sys.platform}/${sys.arch}`);
+    if (cache.exists) {
+        console.log(`  推荐列表: v${cache.version} (${cache.age})`);
+    }
+    else {
+        console.log(`  推荐列表: 内置 (运行 ${color.cyan('opc models --refresh')} 获取最新)`);
+    }
+    console.log(`  Ollama: ${installedModels.length > 0 ? color.green(`运行中, ${installedModels.length} 个模型`) : color.yellow('未运行')}`);
+    console.log(`\n  ${color.bold('⭐ 推荐:')} ${color.cyan(rec.best.name)} (${rec.best.size}) - ${rec.best.desc}\n`);
+    // Table
+    console.log(`  ${'模型'.padEnd(28)} ${'大小'.padEnd(8)} ${'最低RAM'.padEnd(8)} ${'状态'.padEnd(10)} 说明`);
+    console.log(`  ${'─'.repeat(28)} ${'─'.repeat(8)} ${'─'.repeat(8)} ${'─'.repeat(10)} ${'─'.repeat(20)}`);
+    for (const m of rec.suitable) {
+        const installed = installedModels.includes(m.name);
+        const isBest = m.name === rec.best.name;
+        const status = installed ? color.green('已安装') : color.dim('未安装');
+        const star = isBest ? ' ⭐' : (m.recommended ? ' 💎' : '');
+        console.log(`  ${(m.name + star).padEnd(28)} ${m.size.padEnd(8)} ${(m.minRAM + 'GB').padEnd(8)} ${status.padEnd(10)} ${m.desc}`);
+    }
+    if (rec.toDownload.length > 0) {
+        console.log(`\n  ${color.bold('推荐下载:')}`);
+        for (const m of rec.toDownload) {
+            console.log(`  ${color.cyan(`ollama pull ${m.name}`)}  (${m.size}, ${m.desc})`);
+        }
+    }
+    console.log();
+});
 program.parse();
 // ── Keys command ──────────────────────────────────────────────
 const keys_1 = require("./security/keys");