opc-agent 4.1.0 → 4.1.2

package/src/core/node-network.ts

@@ -1,86 +1,86 @@
-import { randomUUID } from 'crypto';
-import { EventEmitter } from 'events';
-
-export interface RemoteNode {
-  id: string;
-  name: string;
-  host: string;
-  port: number;
-  type: 'vps' | 'pi' | 'phone' | 'desktop';
-  status: 'online' | 'offline' | 'pairing';
-  capabilities: string[];
-  lastSeen: number;
-}
-
-export class NodeNetwork extends EventEmitter {
-  private nodes = new Map<string, RemoteNode>();
-
-  addNode(config: Partial<RemoteNode>): RemoteNode {
-    const node: RemoteNode = {
-      id: config.id || randomUUID(),
-      name: config.name || 'unnamed',
-      host: config.host || 'localhost',
-      port: config.port || 8080,
-      type: config.type || 'desktop',
-      status: config.status || 'offline',
-      capabilities: config.capabilities || [],
-      lastSeen: Date.now(),
-    };
-    this.nodes.set(node.id, node);
-    return node;
-  }
-
-  removeNode(id: string): void {
-    if (!this.nodes.has(id)) throw new Error(`Node ${id} not found`);
-    this.nodes.delete(id);
-  }
-
-  listNodes(): RemoteNode[] {
-    return Array.from(this.nodes.values());
-  }
-
-  getNode(id: string): RemoteNode | null {
-    return this.nodes.get(id) || null;
-  }
-
-  async pair(nodeId: string, pairingCode: string): Promise<boolean> {
-    const node = this.nodes.get(nodeId);
-    if (!node) throw new Error(`Node ${nodeId} not found`);
-    if (!pairingCode || pairingCode.length < 4) return false;
-    node.status = 'online';
-    node.lastSeen = Date.now();
-    return true;
-  }
-
-  async sendCommand(nodeId: string, command: string): Promise<any> {
-    const node = this.nodes.get(nodeId);
-    if (!node) throw new Error(`Node ${nodeId} not found`);
-    if (node.status !== 'online') throw new Error(`Node ${nodeId} is ${node.status}`);
-    node.lastSeen = Date.now();
-    // Stub: return command echo
-    return { nodeId, command, status: 'sent', timestamp: Date.now() };
-  }
-
-  async broadcast(command: string): Promise<Map<string, any>> {
-    const results = new Map<string, any>();
-    for (const [id, node] of this.nodes) {
-      if (node.status === 'online') {
-        try {
-          results.set(id, await this.sendCommand(id, command));
-        } catch (e: any) {
-          results.set(id, { error: e.message });
-        }
-      }
-    }
-    return results;
-  }
-
-  async healthCheck(): Promise<Map<string, boolean>> {
-    const results = new Map<string, boolean>();
-    for (const [id, node] of this.nodes) {
-      results.set(id, node.status === 'online');
-      node.lastSeen = Date.now();
-    }
-    return results;
-  }
-}
+import { randomUUID } from 'crypto';
+import { EventEmitter } from 'events';
+
+export interface RemoteNode {
+  id: string;
+  name: string;
+  host: string;
+  port: number;
+  type: 'vps' | 'pi' | 'phone' | 'desktop';
+  status: 'online' | 'offline' | 'pairing';
+  capabilities: string[];
+  lastSeen: number;
+}
+
+export class NodeNetwork extends EventEmitter {
+  private nodes = new Map<string, RemoteNode>();
+
+  addNode(config: Partial<RemoteNode>): RemoteNode {
+    const node: RemoteNode = {
+      id: config.id || randomUUID(),
+      name: config.name || 'unnamed',
+      host: config.host || 'localhost',
+      port: config.port || 8080,
+      type: config.type || 'desktop',
+      status: config.status || 'offline',
+      capabilities: config.capabilities || [],
+      lastSeen: Date.now(),
+    };
+    this.nodes.set(node.id, node);
+    return node;
+  }
+
+  removeNode(id: string): void {
+    if (!this.nodes.has(id)) throw new Error(`Node ${id} not found`);
+    this.nodes.delete(id);
+  }
+
+  listNodes(): RemoteNode[] {
+    return Array.from(this.nodes.values());
+  }
+
+  getNode(id: string): RemoteNode | null {
+    return this.nodes.get(id) || null;
+  }
+
+  async pair(nodeId: string, pairingCode: string): Promise<boolean> {
+    const node = this.nodes.get(nodeId);
+    if (!node) throw new Error(`Node ${nodeId} not found`);
+    if (!pairingCode || pairingCode.length < 4) return false;
+    node.status = 'online';
+    node.lastSeen = Date.now();
+    return true;
+  }
+
+  async sendCommand(nodeId: string, command: string): Promise<any> {
+    const node = this.nodes.get(nodeId);
+    if (!node) throw new Error(`Node ${nodeId} not found`);
+    if (node.status !== 'online') throw new Error(`Node ${nodeId} is ${node.status}`);
+    node.lastSeen = Date.now();
+    // Stub: return command echo
+    return { nodeId, command, status: 'sent', timestamp: Date.now() };
+  }
+
+  async broadcast(command: string): Promise<Map<string, any>> {
+    const results = new Map<string, any>();
+    for (const [id, node] of this.nodes) {
+      if (node.status === 'online') {
+        try {
+          results.set(id, await this.sendCommand(id, command));
+        } catch (e: any) {
+          results.set(id, { error: e.message });
+        }
+      }
+    }
+    return results;
+  }
+
+  async healthCheck(): Promise<Map<string, boolean>> {
+    const results = new Map<string, boolean>();
+    for (const [id, node] of this.nodes) {
+      results.set(id, node.status === 'online');
+      node.lastSeen = Date.now();
+    }
+    return results;
+  }
+}

package/src/core/profiles.ts

@@ -1,122 +1,122 @@
-import * as fs from 'fs';
-import * as path from 'path';
-import * as os from 'os';
-
-// ─── Types ───────────────────────────────────────────────────
-
-export interface ProfileConfig {
-  model?: string;
-  systemPrompt?: string;
-  temperature?: number;
-  [key: string]: unknown;
-}
-
-export interface Profile {
-  name: string;
-  config: ProfileConfig;
-  createdAt: number;
-  lastUsed: number;
-}
-
-// ─── ProfileManager ─────────────────────────────────────────
-
-export class ProfileManager {
-  private profilesDir: string;
-  private currentName: string = 'default';
-
-  constructor(baseDir?: string) {
-    this.profilesDir = baseDir ?? path.join(os.homedir(), '.opc', 'profiles');
-    this.ensureDir(this.profilesDir);
-
-    // Load current profile pointer
-    const pointerFile = path.join(this.profilesDir, '.current');
-    if (fs.existsSync(pointerFile)) {
-      this.currentName = fs.readFileSync(pointerFile, 'utf-8').trim();
-    }
-  }
-
-  private ensureDir(dir: string): void {
-    if (!fs.existsSync(dir)) {
-      fs.mkdirSync(dir, { recursive: true });
-    }
-  }
-
-  private profileDir(name: string): string {
-    return path.join(this.profilesDir, name);
-  }
-
-  private profileFile(name: string): string {
-    return path.join(this.profileDir(name), 'profile.json');
-  }
-
-  create(name: string, config: ProfileConfig = {}): Profile {
-    const dir = this.profileDir(name);
-    if (fs.existsSync(dir)) {
-      throw new Error(`Profile '${name}' already exists`);
-    }
-    this.ensureDir(dir);
-    // Also create memory and sessions dirs
-    this.ensureDir(path.join(dir, 'memory'));
-    this.ensureDir(path.join(dir, 'sessions'));
-
-    const profile: Profile = {
-      name,
-      config,
-      createdAt: Date.now(),
-      lastUsed: Date.now(),
-    };
-    fs.writeFileSync(this.profileFile(name), JSON.stringify(profile, null, 2));
-    return profile;
-  }
-
-  switch(name: string): void {
-    if (!fs.existsSync(this.profileDir(name))) {
-      throw new Error(`Profile '${name}' does not exist`);
-    }
-    this.currentName = name;
-    fs.writeFileSync(path.join(this.profilesDir, '.current'), name);
-
-    // Update lastUsed
-    const profile = this.get(name);
-    profile.lastUsed = Date.now();
-    fs.writeFileSync(this.profileFile(name), JSON.stringify(profile, null, 2));
-  }
-
-  list(): Profile[] {
-    if (!fs.existsSync(this.profilesDir)) return [];
-    return fs.readdirSync(this.profilesDir)
-      .filter(f => {
-        const full = path.join(this.profilesDir, f);
-        return fs.statSync(full).isDirectory() && fs.existsSync(path.join(full, 'profile.json'));
-      })
-      .map(f => this.get(f));
-  }
-
-  get(name: string): Profile {
-    const file = this.profileFile(name);
-    if (!fs.existsSync(file)) {
-      throw new Error(`Profile '${name}' not found`);
-    }
-    return JSON.parse(fs.readFileSync(file, 'utf-8'));
-  }
-
-  delete(name: string): void {
-    if (name === this.currentName) {
-      throw new Error(`Cannot delete the current active profile '${name}'`);
-    }
-    const dir = this.profileDir(name);
-    if (!fs.existsSync(dir)) {
-      throw new Error(`Profile '${name}' does not exist`);
-    }
-    fs.rmSync(dir, { recursive: true, force: true });
-  }
-
-  current(): Profile {
-    try {
-      return this.get(this.currentName);
-    } catch {
-      // Auto-create default
-      return this.create(this.currentName);
-    }
-  }
-}
+import * as fs from 'fs';
+import * as path from 'path';
+import * as os from 'os';
+
+// ─── Types ───────────────────────────────────────────────────
+
+export interface ProfileConfig {
+  model?: string;
+  systemPrompt?: string;
+  temperature?: number;
+  [key: string]: unknown;
+}
+
+export interface Profile {
+  name: string;
+  config: ProfileConfig;
+  createdAt: number;
+  lastUsed: number;
+}
+
+// ─── ProfileManager ─────────────────────────────────────────
+
+export class ProfileManager {
+  private profilesDir: string;
+  private currentName: string = 'default';
+
+  constructor(baseDir?: string) {
+    this.profilesDir = baseDir ?? path.join(os.homedir(), '.opc', 'profiles');
+    this.ensureDir(this.profilesDir);
+
+    // Load current profile pointer
+    const pointerFile = path.join(this.profilesDir, '.current');
+    if (fs.existsSync(pointerFile)) {
+      this.currentName = fs.readFileSync(pointerFile, 'utf-8').trim();
+    }
+  }
+
+  private ensureDir(dir: string): void {
+    if (!fs.existsSync(dir)) {
+      fs.mkdirSync(dir, { recursive: true });
+    }
+  }
+
+  private profileDir(name: string): string {
+    return path.join(this.profilesDir, name);
+  }
+
+  private profileFile(name: string): string {
+    return path.join(this.profileDir(name), 'profile.json');
+  }
+
+  create(name: string, config: ProfileConfig = {}): Profile {
+    const dir = this.profileDir(name);
+    if (fs.existsSync(dir)) {
+      throw new Error(`Profile '${name}' already exists`);
+    }
+    this.ensureDir(dir);
+    // Also create memory and sessions dirs
+    this.ensureDir(path.join(dir, 'memory'));
+    this.ensureDir(path.join(dir, 'sessions'));
+
+    const profile: Profile = {
+      name,
+      config,
+      createdAt: Date.now(),
+      lastUsed: Date.now(),
+    };
+    fs.writeFileSync(this.profileFile(name), JSON.stringify(profile, null, 2));
+    return profile;
+  }
+
+  switch(name: string): void {
+    if (!fs.existsSync(this.profileDir(name))) {
+      throw new Error(`Profile '${name}' does not exist`);
+    }
+    this.currentName = name;
+    fs.writeFileSync(path.join(this.profilesDir, '.current'), name);
+
+    // Update lastUsed
+    const profile = this.get(name);
+    profile.lastUsed = Date.now();
+    fs.writeFileSync(this.profileFile(name), JSON.stringify(profile, null, 2));
+  }
+
+  list(): Profile[] {
+    if (!fs.existsSync(this.profilesDir)) return [];
+    return fs.readdirSync(this.profilesDir)
+      .filter(f => {
+        const full = path.join(this.profilesDir, f);
+        return fs.statSync(full).isDirectory() && fs.existsSync(path.join(full, 'profile.json'));
+      })
+      .map(f => this.get(f));
+  }
+
+  get(name: string): Profile {
+    const file = this.profileFile(name);
+    if (!fs.existsSync(file)) {
+      throw new Error(`Profile '${name}' not found`);
+    }
+    return JSON.parse(fs.readFileSync(file, 'utf-8'));
+  }
+
+  delete(name: string): void {
+    if (name === this.currentName) {
+      throw new Error(`Cannot delete the current active profile '${name}'`);
+    }
+    const dir = this.profileDir(name);
+    if (!fs.existsSync(dir)) {
+      throw new Error(`Profile '${name}' does not exist`);
+    }
+    fs.rmSync(dir, { recursive: true, force: true });
+  }
+
+  current(): Profile {
+    try {
+      return this.get(this.currentName);
+    } catch {
+      // Auto-create default
+      return this.create(this.currentName);
+    }
+  }
+}

package/src/core/runtime.ts

@@ -45,7 +45,16 @@ export class AgentRuntime {
 
   async loadConfig(filePath: string): Promise<OADDocument> {
     const fs = require('fs');
+    const path = require('path');
+
+    // 如果指定文件不存在，尝试 fallback
     if (!fs.existsSync(filePath)) {
+      // 如果发现旧的 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 = {
@@ -61,9 +70,16 @@ export class AgentRuntime {
       };
       fs.writeFileSync(filePath, yaml.dump(defaultOAD, { lineWidth: 120 }));
       this.logger.info('Created default oad.yaml (no config file found)');
+      }
     }
     this.config = 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;
   }
 
@@ -99,6 +115,15 @@ export 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: MemoryStore | undefined;
     const memCfg = cfg.spec.memory;
     if (memCfg && typeof memCfg.longTerm === 'object' && memCfg.longTerm.provider === 'deepbrain') {