opc-agent 4.1.1 → 4.1.2

package/src/doctor.ts

@@ -1,156 +1,243 @@
-import { execSync } from 'child_process';
-import { existsSync } from 'fs';
-import * as net from 'net';
-
-export interface CheckResult {
-  ok: boolean;
-  detail: string;
-  fix?: string;
-}
-
-export interface DoctorCheck {
-  name: string;
-  check: () => CheckResult | Promise<CheckResult>;
-}
-
-export function getDoctorChecks(): DoctorCheck[] {
-  return [
-    {
-      name: 'Node.js version',
-      check: () => {
-        const v = process.versions.node.split('.').map(Number);
-        return {
-          ok: v[0] >= 18,
-          detail: `v${process.versions.node}`,
-          fix: v[0] < 18 ? 'Upgrade to Node 18+: https://nodejs.org' : undefined,
-        };
-      },
-    },
-    {
-      name: 'npm version',
-      check: () => {
-        try {
-          const v = execSync('npm --version', { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
-          return { ok: true, detail: `v${v}` };
-        } catch {
-          return { ok: false, detail: 'Not found', fix: 'Install npm: https://nodejs.org' };
-        }
-      },
-    },
-    {
-      name: 'Ollama running',
-      check: async () => {
-        try {
-          const controller = new AbortController();
-          const timeout = setTimeout(() => controller.abort(), 3000);
-          const r = await fetch('http://localhost:11434/api/tags', { signal: controller.signal });
-          clearTimeout(timeout);
-          const data = await r.json() as any;
-          return { ok: true, detail: `${data.models?.length || 0} models available` };
-        } catch {
-          return { ok: false, detail: 'Not running', fix: 'Install Ollama: https://ollama.ai' };
-        }
-      },
-    },
-    {
-      name: 'agent.yaml exists',
-      check: () => {
-        const found = existsSync('./agent.yaml');
-        return { ok: found, detail: found ? 'Found' : 'Not found', fix: found ? undefined : 'Run `opc init` to create a project' };
-      },
-    },
-    {
-      name: 'SOUL.md exists',
-      check: () => {
-        const found = existsSync('./SOUL.md');
-        return { ok: found, detail: found ? 'Found' : 'Not found', fix: found ? undefined : 'Run `opc init` to generate one' };
-      },
-    },
-    {
-      name: 'TypeScript installed',
-      check: () => {
-        try {
-          execSync('npx tsc --version', { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] });
-          return { ok: true, detail: 'Available' };
-        } catch {
-          return { ok: false, detail: 'Not found', fix: 'npm install -D typescript' };
-        }
-      },
-    },
-    {
-      name: 'Disk space',
-      check: () => {
-        return { ok: true, detail: 'Check passed' };
-      },
-    },
-    {
-      name: 'DeepBrain package',
-      check: () => {
-        try {
-          require.resolve('deepbrain');
-          return { ok: true, detail: 'Installed' };
-        } catch {
-          return { ok: false, detail: 'Not installed', fix: 'npm install deepbrain' };
-        }
-      },
-    },
-    {
-      name: 'Port 3000 available',
-      check: () => {
-        return new Promise<CheckResult>((resolve) => {
-          const server = net.createServer();
-          server.once('error', () => {
-            resolve({ ok: false, detail: 'In use', fix: 'Free port 3000 or configure a different port' });
-          });
-          server.once('listening', () => {
-            server.close(() => {
-              resolve({ ok: true, detail: 'Available' });
-            });
-          });
-          server.listen(3000);
-        });
-      },
-    },
-  ];
-}
-
-export async function runDoctor(): Promise<{ passed: number; total: number }> {
-  const checks = getDoctorChecks();
-  const color = {
-    green: (s: string) => `\x1b[32m${s}\x1b[0m`,
-    red: (s: string) => `\x1b[31m${s}\x1b[0m`,
-    dim: (s: string) => `\x1b[2m${s}\x1b[0m`,
-    bold: (s: string) => `\x1b[1m${s}\x1b[0m`,
-  };
-
-  console.log(`\n🔍 ${color.bold('OPC Agent Doctor')}\n`);
-
-  let passed = 0;
-  const total = checks.length;
-
-  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);
-      console.log(`  ${icon} ${name} ${result.detail}`);
-      if (!result.ok && result.fix) {
-        console.log(`     → ${result.fix}`);
-      }
-      if (result.ok) passed++;
-    } catch (err) {
-      const name = check.name.padEnd(22);
-      console.log(`  ${color.red('❌')} ${name} Error: ${err instanceof Error ? err.message : String(err)}`);
-    }
-  }
-
-  console.log(`\n  Result: ${passed}/${total} checks passed`);
-  if (passed < total) {
-    console.log(`\n  Fix the issues above to get the best experience.`);
-  } else {
-    console.log(`\n  ${color.green('All checks passed!')} You're good to go.`);
-  }
-  console.log();
-
-  return { passed, total };
-}
+import { execSync } from 'child_process';
+import { existsSync, readFileSync } from 'fs';
+import * as net from 'net';
+import * as yaml from 'js-yaml';
+
+export interface CheckResult {
+  ok: boolean;
+  detail: string;
+  fix?: string;
+  optional?: boolean; // ⚠️ 而不是 ❌
+}
+
+export interface DoctorCheck {
+  name: string;
+  check: () => CheckResult | Promise<CheckResult>;
+}
+
+/** 读取 .env 文件并解析为 key-value */
+function loadEnvFile(): Record<string, string> {
+  const envPath = '.env';
+  if (!existsSync(envPath)) return {};
+  const result: Record<string, string> = {};
+  try {
+    const content = 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(): string | undefined {
+  for (const f of ['oad.yaml', 'agent.yaml']) {
+    if (existsSync(f)) {
+      try {
+        const cfg = yaml.load(readFileSync(f, 'utf-8')) as any;
+        return cfg?.spec?.provider?.default;
+      } catch { /* ignore */ }
+    }
+  }
+  return undefined;
+}
+
+export function getDoctorChecks(): DoctorCheck[] {
+  return [
+    {
+      name: 'Node.js version',
+      check: () => {
+        const v = process.versions.node.split('.').map(Number);
+        return {
+          ok: v[0] >= 18,
+          detail: `v${process.versions.node}`,
+          fix: v[0] < 18 ? 'Upgrade to Node 18+: https://nodejs.org' : undefined,
+        };
+      },
+    },
+    {
+      name: 'npm version',
+      check: () => {
+        try {
+          const v = execSync('npm --version', { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+          return { ok: true, detail: `v${v}` };
+        } catch {
+          return { ok: false, detail: 'Not found', fix: 'Install npm: https://nodejs.org' };
+        }
+      },
+    },
+    {
+      // Ollama 是可选的（只有选了 ollama provider 才需要）
+      name: 'Ollama running',
+      check: async () => {
+        try {
+          const controller = new AbortController();
+          const timeout = setTimeout(() => controller.abort(), 3000);
+          const r = await fetch('http://localhost:11434/api/tags', { signal: controller.signal });
+          clearTimeout(timeout);
+          const data = await r.json() as any;
+          return { ok: true, detail: `${data.models?.length || 0} models available` };
+        } catch {
+          return { ok: false, detail: 'Not running', fix: 'Install Ollama: https://ollama.ai (optional, only needed for local models)', optional: true };
+        }
+      },
+    },
+    {
+      // 检查 oad.yaml 而不是 agent.yaml
+      name: 'oad.yaml exists',
+      check: () => {
+        const found = existsSync('./oad.yaml');
+        if (found) return { ok: true, detail: 'Found' };
+        // 检查是否有旧的 agent.yaml 需要迁移
+        if (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' };
+      },
+    },
+    {
+      name: 'SOUL.md exists',
+      check: () => {
+        const found = existsSync('./SOUL.md');
+        return { ok: found, detail: found ? 'Found' : 'Not found', fix: found ? undefined : 'Run `opc init` to generate one' };
+      },
+    },
+    {
+      // TypeScript 是可选的
+      name: 'TypeScript installed',
+      check: () => {
+        try {
+          execSync('npx tsc --version', { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] });
+          return { ok: true, detail: 'Available' };
+        } catch {
+          return { ok: false, detail: 'Not found', fix: 'npm install -D typescript (optional)', optional: true };
+        }
+      },
+    },
+    {
+      name: 'Disk space',
+      check: () => {
+        return { ok: true, detail: 'Check passed' };
+      },
+    },
+    {
+      // DeepBrain 是可选的
+      name: 'DeepBrain package',
+      check: () => {
+        try {
+          require.resolve('deepbrain');
+          return { ok: true, detail: 'Installed' };
+        } catch {
+          return { ok: false, detail: 'Not installed', fix: 'npm install deepbrain (optional, for long-term memory)', optional: true };
+        }
+      },
+    },
+    {
+      name: 'Port 3000 available',
+      check: () => {
+        return new Promise<CheckResult>((resolve) => {
+          const server = net.createServer();
+          server.once('error', () => {
+            resolve({ ok: false, detail: 'In use', fix: 'Free port 3000 or configure a different port' });
+          });
+          server.once('listening', () => {
+            server.close(() => {
+              resolve({ ok: true, detail: 'Available' });
+            });
+          });
+          server.listen(3000);
+        });
+      },
+    },
+    {
+      // 检查 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}` };
+      },
+    },
+  ];
+}
+
+export async function runDoctor(): Promise<{ passed: number; total: number }> {
+  const checks = getDoctorChecks();
+  const color = {
+    green: (s: string) => `\x1b[32m${s}\x1b[0m`,
+    red: (s: string) => `\x1b[31m${s}\x1b[0m`,
+    yellow: (s: string) => `\x1b[33m${s}\x1b[0m`,
+    dim: (s: string) => `\x1b[2m${s}\x1b[0m`,
+    bold: (s: string) => `\x1b[1m${s}\x1b[0m`,
+  };
+
+  console.log(`\n🔍 ${color.bold('OPC Agent Doctor')}\n`);
+
+  let passed = 0;
+  const total = checks.length;
+
+  for (const check of checks) {
+    try {
+      const result = await check.check();
+      // 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}`);
+      }
+      // optional 项即使失败也算 passed
+      if (result.ok || result.optional) passed++;
+    } catch (err) {
+      const name = check.name.padEnd(24);
+      console.log(`  ${color.red('❌')} ${name} Error: ${err instanceof Error ? err.message : String(err)}`);
+    }
+  }
+
+  console.log(`\n  Result: ${passed}/${total} checks passed`);
+  if (passed < total) {
+    console.log(`\n  Fix the issues above to get the best experience.`);
+  } else {
+    console.log(`\n  ${color.green('All checks passed!')} You're good to go.`);
+  }
+  console.log();
+
+  return { passed, total };
+}

package/src/memory/deepbrain.ts

@@ -1,9 +1,103 @@
 import type { Message, MemoryStore } from '../core/types';
 import { InMemoryStore } from './index';
+import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
+import { join, resolve } from 'path';
+
+/**
+ * 本地 JSON 文件持久化存储，作为 DeepBrain 不可用时的 fallback。
+ * 数据保存在 .opc/memory.json，进程重启后记忆不会丢失。
+ */
+class FileBackedStore implements MemoryStore {
+  private store: Map<string, unknown> = new Map();
+  private conversations: Map<string, Message[]> = new Map();
+  private filePath: string;
+  private dirty = false;
+  private saveTimer: ReturnType<typeof setTimeout> | null = null;
+
+  constructor(baseDir: string = '.') {
+    const opcDir = join(resolve(baseDir), '.opc');
+    if (!existsSync(opcDir)) mkdirSync(opcDir, { recursive: true });
+    this.filePath = join(opcDir, 'memory.json');
+    this.loadFromFile();
+  }
+
+  private loadFromFile(): void {
+    if (!existsSync(this.filePath)) return;
+    try {
+      const data = JSON.parse(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 as Message[]);
+        }
+      }
+    } catch { /* 文件损坏则忽略，从空开始 */ }
+  }
+
+  private scheduleSave(): void {
+    this.dirty = true;
+    if (this.saveTimer) return; // 已经有定时器在等了
+    // 延迟 1 秒批量写入，避免高频写磁盘
+    this.saveTimer = setTimeout(() => {
+      this.saveTimer = null;
+      if (this.dirty) this.saveToFile();
+    }, 1000);
+  }
+
+  private saveToFile(): void {
+    try {
+      const data = {
+        store: Object.fromEntries(this.store),
+        conversations: Object.fromEntries(this.conversations),
+        updatedAt: new Date().toISOString(),
+      };
+      writeFileSync(this.filePath, JSON.stringify(data, null, 2));
+      this.dirty = false;
+    } catch { /* 写入失败不影响运行 */ }
+  }
+
+  async get(key: string): Promise<unknown> {
+    return this.store.get(key);
+  }
+
+  async set(key: string, value: unknown): Promise<void> {
+    this.store.set(key, value);
+    this.scheduleSave();
+  }
+
+  async getConversation(sessionId: string): Promise<Message[]> {
+    return this.conversations.get(sessionId) ?? [];
+  }
+
+  async addMessage(sessionId: string, message: Message): Promise<void> {
+    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?: string): Promise<void> {
+    if (sessionId) {
+      this.conversations.delete(sessionId);
+    } else {
+      this.store.clear();
+      this.conversations.clear();
+    }
+    this.scheduleSave();
+  }
+}
 
 /**
  * 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>;
@@ -12,13 +106,13 @@ export interface DeepBrainClient {
 }
 
 export class DeepBrainMemoryStore implements MemoryStore {
-  private fallback: InMemoryStore;
+  private fallback: FileBackedStore;
   private client: DeepBrainClient | null = null;
   private collection: string;
   private ready: Promise<boolean>;
 
   constructor(options: { collection?: string; config?: Record<string, unknown> } = {}) {
-    this.fallback = new InMemoryStore();
+    this.fallback = new FileBackedStore();
     this.collection = options.collection ?? 'agent-memory';
     this.ready = this.initClient(options.config);
   }
@@ -29,12 +123,12 @@ export class DeepBrainMemoryStore implements MemoryStore {
       const deepbrain = await import(/* webpackIgnore: true */ 'deepbrain');
       this.client = (deepbrain as any).createClient?.(config) ?? (deepbrain as any).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/src/scheduler/cron-engine.ts

@@ -6,7 +6,6 @@
 
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
 import { join } from 'path';
-import * as os from 'os';
 import { parseCron, cronMatches, Scheduler } from '../core/scheduler';
 import type { CronJob, JobHandler } from '../core/scheduler';
 
@@ -29,8 +28,9 @@ export interface SchedulesStore {
   tasks: ScheduleTask[];
 }
 
-function getSchedulesPath(): string {
-  const dir = join(os.homedir(), '.opc');
+function getSchedulesPath(projectDir?: string): string {
+  // 使用项目本地路径而不是全局 ~/.opc/，避免新 agent 加载其他项目的任务
+  const dir = projectDir ? join(projectDir, '.opc') : join(process.cwd(), '.opc');
   if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
   return join(dir, 'schedules.json');
 }