opc-agent 4.1.1 → 4.1.2

package/dist/core/runtime.js

@@ -74,25 +74,39 @@ class AgentRuntime {
     evolveScheduler = null;
     async loadConfig(filePath) {
         const fs = require('fs');
+        const path = require('path');
+        // 如果指定文件不存在，尝试 fallback
         if (!fs.existsSync(filePath)) {
-            // Auto-create a minimal oad.yaml with auto-detect provider
-            const yaml = require('js-yaml');
-            const defaultOAD = {
-                apiVersion: 'opc/v1',
-                kind: 'Agent',
-                metadata: { name: 'my-agent', version: '1.0.0', description: 'OPC Agent' },
-                spec: {
-                    model: 'auto',
-                    provider: { default: 'auto' },
-                    systemPrompt: 'You are a helpful AI assistant.',
-                    channels: [{ type: 'web', config: { port: 3000 } }],
-                },
-            };
-            fs.writeFileSync(filePath, yaml.dump(defaultOAD, { lineWidth: 120 }));
-            this.logger.info('Created default oad.yaml (no config file found)');
+            // 如果发现旧的 agent.yaml，提示迁移
+            if (filePath === 'oad.yaml' && fs.existsSync('agent.yaml')) {
+                this.logger.warn('⚠️  发现 agent.yaml 但未找到 oad.yaml。建议运行 `opc migrate` 统一为 oad.yaml。');
+                this.logger.info('暂时使用 agent.yaml 加载配置...');
+                filePath = 'agent.yaml';
+            }
+            else {
+                // Auto-create a minimal oad.yaml with auto-detect provider
+                const yaml = require('js-yaml');
+                const defaultOAD = {
+                    apiVersion: 'opc/v1',
+                    kind: 'Agent',
+                    metadata: { name: 'my-agent', version: '1.0.0', description: 'OPC Agent' },
+                    spec: {
+                        model: 'auto',
+                        provider: { default: 'auto' },
+                        systemPrompt: 'You are a helpful AI assistant.',
+                        channels: [{ type: 'web', config: { port: 3000 } }],
+                    },
+                };
+                fs.writeFileSync(filePath, yaml.dump(defaultOAD, { lineWidth: 120 }));
+                this.logger.info('Created default oad.yaml (no config file found)');
+            }
         }
         this.config = (0, config_1.loadOAD)(filePath);
         this.logger.info('Config loaded', { name: this.config.metadata.name });
+        // 如果同时存在 agent.yaml 和 oad.yaml，提示用户清理
+        if (fs.existsSync('agent.yaml') && fs.existsSync('oad.yaml')) {
+            this.logger.warn('⚠️  同时存在 agent.yaml 和 oad.yaml。建议删除 agent.yaml，统一使用 oad.yaml。');
+        }
         return this.config;
     }
     setHistoryLimit(limit) {
@@ -128,6 +142,14 @@ class AgentRuntime {
         const cfg = config ?? this.config;
         if (!cfg)
             throw new Error('No config loaded. Call loadConfig() first.');
+        // 检查 API key 是否为占位符，启动时警告
+        const apiKey = process.env.OPC_LLM_API_KEY;
+        const cfgProvider = cfg.spec.provider?.default;
+        if (cfgProvider !== 'ollama' && cfgProvider !== 'auto') {
+            if (!apiKey || apiKey === 'your-api-key-here') {
+                this.logger.warn('⚠️  API Key 未配置或仍是占位符。请编辑 .env 文件设置 OPC_LLM_API_KEY。');
+            }
+        }
         let memory;
         const memCfg = cfg.spec.memory;
         if (memCfg && typeof memCfg.longTerm === 'object' && memCfg.longTerm.provider === 'deepbrain') {

package/dist/doctor.d.ts

@@ -2,6 +2,7 @@ export interface CheckResult {
     ok: boolean;
     detail: string;
     fix?: string;
+    optional?: boolean;
 }
 export interface DoctorCheck {
     name: string;

package/dist/doctor.js

@@ -38,6 +38,41 @@ exports.runDoctor = runDoctor;
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const net = __importStar(require("net"));
+const yaml = __importStar(require("js-yaml"));
+/** 读取 .env 文件并解析为 key-value */
+function loadEnvFile() {
+    const envPath = '.env';
+    if (!(0, fs_1.existsSync)(envPath))
+        return {};
+    const result = {};
+    try {
+        const content = (0, fs_1.readFileSync)(envPath, 'utf-8');
+        for (const line of content.split('\n')) {
+            const trimmed = line.trim();
+            if (!trimmed || trimmed.startsWith('#'))
+                continue;
+            const eqIdx = trimmed.indexOf('=');
+            if (eqIdx === -1)
+                continue;
+            result[trimmed.slice(0, eqIdx).trim()] = trimmed.slice(eqIdx + 1).trim();
+        }
+    }
+    catch { /* ignore */ }
+    return result;
+}
+/** 从 oad.yaml 读取 provider 配置 */
+function loadOadProvider() {
+    for (const f of ['oad.yaml', 'agent.yaml']) {
+        if ((0, fs_1.existsSync)(f)) {
+            try {
+                const cfg = yaml.load((0, fs_1.readFileSync)(f, 'utf-8'));
+                return cfg?.spec?.provider?.default;
+            }
+            catch { /* ignore */ }
+        }
+    }
+    return undefined;
+}
 function getDoctorChecks() {
     return [
         {
@@ -64,6 +99,7 @@ function getDoctorChecks() {
             },
         },
         {
+            // Ollama 是可选的（只有选了 ollama provider 才需要）
             name: 'Ollama running',
             check: async () => {
                 try {
@@ -75,15 +111,22 @@ function getDoctorChecks() {
                     return { ok: true, detail: `${data.models?.length || 0} models available` };
                 }
                 catch {
-                    return { ok: false, detail: 'Not running', fix: 'Install Ollama: https://ollama.ai' };
+                    return { ok: false, detail: 'Not running', fix: 'Install Ollama: https://ollama.ai (optional, only needed for local models)', optional: true };
                 }
             },
         },
         {
-            name: 'agent.yaml exists',
+            // 检查 oad.yaml 而不是 agent.yaml
+            name: 'oad.yaml exists',
             check: () => {
-                const found = (0, fs_1.existsSync)('./agent.yaml');
-                return { ok: found, detail: found ? 'Found' : 'Not found', fix: found ? undefined : 'Run `opc init` to create a project' };
+                const found = (0, fs_1.existsSync)('./oad.yaml');
+                if (found)
+                    return { ok: true, detail: 'Found' };
+                // 检查是否有旧的 agent.yaml 需要迁移
+                if ((0, fs_1.existsSync)('./agent.yaml')) {
+                    return { ok: false, detail: 'Not found (found agent.yaml)', fix: 'Run `opc migrate` to migrate agent.yaml → oad.yaml' };
+                }
+                return { ok: false, detail: 'Not found', fix: 'Run `opc init` to create a project' };
             },
         },
         {
@@ -94,6 +137,7 @@ function getDoctorChecks() {
             },
         },
         {
+            // TypeScript 是可选的
             name: 'TypeScript installed',
             check: () => {
                 try {
@@ -101,7 +145,7 @@ function getDoctorChecks() {
                     return { ok: true, detail: 'Available' };
                 }
                 catch {
-                    return { ok: false, detail: 'Not found', fix: 'npm install -D typescript' };
+                    return { ok: false, detail: 'Not found', fix: 'npm install -D typescript (optional)', optional: true };
                 }
             },
         },
@@ -112,6 +156,7 @@ function getDoctorChecks() {
             },
         },
         {
+            // DeepBrain 是可选的
             name: 'DeepBrain package',
             check: () => {
                 try {
@@ -119,7 +164,7 @@ function getDoctorChecks() {
                     return { ok: true, detail: 'Installed' };
                 }
                 catch {
-                    return { ok: false, detail: 'Not installed', fix: 'npm install deepbrain' };
+                    return { ok: false, detail: 'Not installed', fix: 'npm install deepbrain (optional, for long-term memory)', optional: true };
                 }
             },
         },
@@ -140,6 +185,53 @@ function getDoctorChecks() {
                 });
             },
         },
+        {
+            // 检查 API key 是否配置（不是占位符）
+            name: 'API key configured',
+            check: () => {
+                const env = loadEnvFile();
+                const apiKey = env['OPC_LLM_API_KEY'] || '';
+                const oadProvider = loadOadProvider();
+                // Ollama 不需要 API key
+                if (oadProvider === 'ollama') {
+                    return { ok: true, detail: 'Not required (Ollama provider)' };
+                }
+                if (!apiKey || apiKey === 'your-api-key-here') {
+                    return { ok: false, detail: 'Not configured or still placeholder', fix: 'Edit .env and set OPC_LLM_API_KEY to your actual API key' };
+                }
+                return { ok: true, detail: 'Configured' };
+            },
+        },
+        {
+            // 检查 .env 和 oad.yaml 的 provider 是否匹配
+            name: 'Provider consistency',
+            check: () => {
+                const env = loadEnvFile();
+                const baseUrl = env['OPC_LLM_BASE_URL'] || '';
+                const oadProvider = loadOadProvider();
+                if (!oadProvider || !baseUrl) {
+                    return { ok: true, detail: 'N/A (no config to compare)' };
+                }
+                // 检测 .env 的 base URL 暗示的 provider
+                let envProvider = 'unknown';
+                if (baseUrl.includes('openai.com'))
+                    envProvider = 'openai';
+                else if (baseUrl.includes('deepseek.com'))
+                    envProvider = 'deepseek';
+                else if (baseUrl.includes('localhost:11434'))
+                    envProvider = 'ollama';
+                else if (baseUrl.includes('anthropic.com'))
+                    envProvider = 'anthropic';
+                else if (baseUrl.includes('dashscope.aliyuncs.com'))
+                    envProvider = 'qwen';
+                if (envProvider === 'unknown')
+                    return { ok: true, detail: `Custom base URL (${oadProvider})` };
+                if (envProvider !== oadProvider && oadProvider !== 'auto') {
+                    return { ok: false, detail: `Mismatch: .env → ${envProvider}, oad.yaml → ${oadProvider}`, fix: 'Update .env or oad.yaml to use the same provider' };
+                }
+                return { ok: true, detail: `Matched: ${oadProvider}` };
+            },
+        },
     ];
 }
 async function runDoctor() {
@@ -147,6 +239,7 @@ async function runDoctor() {
     const color = {
         green: (s) => `\x1b[32m${s}\x1b[0m`,
         red: (s) => `\x1b[31m${s}\x1b[0m`,
+        yellow: (s) => `\x1b[33m${s}\x1b[0m`,
         dim: (s) => `\x1b[2m${s}\x1b[0m`,
         bold: (s) => `\x1b[1m${s}\x1b[0m`,
     };
@@ -156,17 +249,19 @@ async function runDoctor() {
     for (const check of checks) {
         try {
             const result = await check.check();
-            const icon = result.ok ? color.green('✅') : color.red('❌');
-            const name = check.name.padEnd(22);
+            // optional 项失败显示 ⚠️ 而不是 ❌
+            const icon = result.ok ? color.green('✅') : (result.optional ? color.yellow('⚠️') : color.red('❌'));
+            const name = check.name.padEnd(24);
             console.log(`  ${icon} ${name} ${result.detail}`);
             if (!result.ok && result.fix) {
                 console.log(`     → ${result.fix}`);
             }
-            if (result.ok)
+            // optional 项即使失败也算 passed
+            if (result.ok || result.optional)
                 passed++;
         }
         catch (err) {
-            const name = check.name.padEnd(22);
+            const name = check.name.padEnd(24);
             console.log(`  ${color.red('❌')} ${name} Error: ${err instanceof Error ? err.message : String(err)}`);
         }
     }

package/dist/memory/deepbrain.d.ts

@@ -1,7 +1,7 @@
 import type { Message, MemoryStore } from '../core/types';
 /**
  * DeepBrain-backed memory store for long-term semantic memory.
- * Falls back to InMemoryStore if deepbrain package is not installed.
+ * Falls back to local JSON file storage (.opc/memory.json) if deepbrain package is not installed.
  */
 export interface DeepBrainClient {
     store(collection: string, id: string, content: string, metadata?: Record<string, unknown>): Promise<void>;

package/dist/memory/deepbrain.js

@@ -34,14 +34,105 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeepBrainMemoryStore = void 0;
-const index_1 = require("./index");
+const fs_1 = require("fs");
+const path_1 = require("path");
+/**
+ * 本地 JSON 文件持久化存储，作为 DeepBrain 不可用时的 fallback。
+ * 数据保存在 .opc/memory.json，进程重启后记忆不会丢失。
+ */
+class FileBackedStore {
+    store = new Map();
+    conversations = new Map();
+    filePath;
+    dirty = false;
+    saveTimer = null;
+    constructor(baseDir = '.') {
+        const opcDir = (0, path_1.join)((0, path_1.resolve)(baseDir), '.opc');
+        if (!(0, fs_1.existsSync)(opcDir))
+            (0, fs_1.mkdirSync)(opcDir, { recursive: true });
+        this.filePath = (0, path_1.join)(opcDir, 'memory.json');
+        this.loadFromFile();
+    }
+    loadFromFile() {
+        if (!(0, fs_1.existsSync)(this.filePath))
+            return;
+        try {
+            const data = JSON.parse((0, fs_1.readFileSync)(this.filePath, 'utf-8'));
+            if (data.store) {
+                for (const [k, v] of Object.entries(data.store)) {
+                    this.store.set(k, v);
+                }
+            }
+            if (data.conversations) {
+                for (const [k, v] of Object.entries(data.conversations)) {
+                    this.conversations.set(k, v);
+                }
+            }
+        }
+        catch { /* 文件损坏则忽略，从空开始 */ }
+    }
+    scheduleSave() {
+        this.dirty = true;
+        if (this.saveTimer)
+            return; // 已经有定时器在等了
+        // 延迟 1 秒批量写入，避免高频写磁盘
+        this.saveTimer = setTimeout(() => {
+            this.saveTimer = null;
+            if (this.dirty)
+                this.saveToFile();
+        }, 1000);
+    }
+    saveToFile() {
+        try {
+            const data = {
+                store: Object.fromEntries(this.store),
+                conversations: Object.fromEntries(this.conversations),
+                updatedAt: new Date().toISOString(),
+            };
+            (0, fs_1.writeFileSync)(this.filePath, JSON.stringify(data, null, 2));
+            this.dirty = false;
+        }
+        catch { /* 写入失败不影响运行 */ }
+    }
+    async get(key) {
+        return this.store.get(key);
+    }
+    async set(key, value) {
+        this.store.set(key, value);
+        this.scheduleSave();
+    }
+    async getConversation(sessionId) {
+        return this.conversations.get(sessionId) ?? [];
+    }
+    async addMessage(sessionId, message) {
+        if (!this.conversations.has(sessionId)) {
+            this.conversations.set(sessionId, []);
+        }
+        const conv = this.conversations.get(sessionId);
+        conv.push(message);
+        // 每个 session 最多保留 200 条消息，避免文件无限增长
+        if (conv.length > 200)
+            conv.splice(0, conv.length - 200);
+        this.scheduleSave();
+    }
+    async clear(sessionId) {
+        if (sessionId) {
+            this.conversations.delete(sessionId);
+        }
+        else {
+            this.store.clear();
+            this.conversations.clear();
+        }
+        this.scheduleSave();
+    }
+}
 class DeepBrainMemoryStore {
     fallback;
     client = null;
     collection;
     ready;
     constructor(options = {}) {
-        this.fallback = new index_1.InMemoryStore();
+        this.fallback = new FileBackedStore();
         this.collection = options.collection ?? 'agent-memory';
         this.ready = this.initClient(options.config);
     }
@@ -51,13 +142,13 @@ class DeepBrainMemoryStore {
             const deepbrain = await Promise.resolve().then(() => __importStar(require(/* webpackIgnore: true */ 'deepbrain')));
             this.client = deepbrain.createClient?.(config) ?? deepbrain.default?.createClient?.(config);
             if (!this.client) {
-                console.warn('[DeepBrainMemory] Could not create client, using in-memory fallback');
+                console.warn('[DeepBrainMemory] Could not create client, using file-backed fallback (.opc/memory.json)');
                 return false;
             }
             return true;
         }
         catch {
-            console.warn('[DeepBrainMemory] deepbrain package not found, using in-memory fallback');
+            console.warn('[DeepBrainMemory] deepbrain package not found, using file-backed fallback (.opc/memory.json)');
             return false;
         }
     }

package/dist/scheduler/cron-engine.js

@@ -4,48 +4,15 @@
  * Manages scheduled tasks with cron expressions, persists to ~/.opc/schedules.json,
  * and auto-recovers on startup.
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CronEngine = void 0;
 exports.frequencyToCron = frequencyToCron;
 const fs_1 = require("fs");
 const path_1 = require("path");
-const os = __importStar(require("os"));
 const scheduler_1 = require("../core/scheduler");
-function getSchedulesPath() {
-    const dir = (0, path_1.join)(os.homedir(), '.opc');
+function getSchedulesPath(projectDir) {
+    // 使用项目本地路径而不是全局 ~/.opc/，避免新 agent 加载其他项目的任务
+    const dir = projectDir ? (0, path_1.join)(projectDir, '.opc') : (0, path_1.join)(process.cwd(), '.opc');
     if (!(0, fs_1.existsSync)(dir))
         (0, fs_1.mkdirSync)(dir, { recursive: true });
     return (0, path_1.join)(dir, 'schedules.json');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opc-agent",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "description": "Open Agent Framework — Build, test, and run AI Agents for business workstations",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/channels/web.ts

@@ -211,7 +211,7 @@ async function send(){
       for(const line of lines){
         if(!line.startsWith('data: '))continue;
         const dd=line.slice(6);if(dd==='[DONE]')continue;
-        try{const j=JSON.parse(dd);if(j.content)full+=j.content;if(j.error)full='Error: '+j.error;}catch{}
+        try{const j=JSON.parse(dd);if(j.content)full+=j.content;if(j.error){if(j.error.includes('401')||j.error.toLowerCase().includes('api key')||j.error.toLowerCase().includes('unauthorized')){full='⚠️ 请先配置 API Key。编辑项目根目录的 .env 文件，设置 OPC_LLM_API_KEY。';}else{full='Error: '+j.error;}}}catch{}
       }
       d.innerHTML=renderMd(full)+'<span class="cursor"></span>';
       msgs.scrollTop=msgs.scrollHeight;
@@ -220,7 +220,13 @@ async function send(){
     const rx=document.createElement('div');rx.className='reactions';
     rx.innerHTML='<button data-r="👍" onclick="react(this)">👍</button><button data-r="👎" onclick="react(this)">👎</button>';
     wrap.appendChild(rx);
-  }catch(e){d.className='msg error';d.textContent='Error: '+e.message;}
+  }catch(e){
+    d.className='msg error';
+    const errMsg=e.message||'';
+    if(errMsg.includes('401')||errMsg.includes('HTTP 401')){
+      d.innerHTML='⚠️ <b>请先配置 API Key</b><br>编辑项目根目录的 <code>.env</code> 文件，设置 <code>OPC_LLM_API_KEY</code> 为你的实际 API Key。';
+    }else{d.textContent='Error: '+errMsg;}
+  }
   sending=false;btn.disabled=false;input.focus();
 }