opc-agent 1.4.0 → 2.0.0

package/src/core/agent.ts

@@ -1,152 +1,295 @@
-import { EventEmitter } from 'events';
-import type { AgentState, IAgent, IChannel, ISkill, Message, MemoryStore, AgentContext } from './types';
-import { InMemoryStore } from '../memory';
-import { createProvider, type LLMProvider } from '../providers';
-
-export class BaseAgent extends EventEmitter implements IAgent {
-  readonly name: string;
-  private _state: AgentState = 'init';
-  private skills: Map<string, ISkill> = new Map();
-  private channels: IChannel[] = [];
-  private memory: MemoryStore;
-  private _provider: LLMProvider;
-  private systemPrompt: string;
-  private historyLimit: number;
-
-  constructor(options: {
-    name: string;
-    systemPrompt?: string;
-    provider?: string;
-    model?: string;
-    memory?: MemoryStore;
-    historyLimit?: number;
-  }) {
-    super();
-    this.name = options.name;
-    this.systemPrompt = options.systemPrompt ?? 'You are a helpful AI agent.';
-    this.memory = options.memory ?? new InMemoryStore();
-    this._provider = createProvider(options.provider ?? 'openai', options.model);
-    this.historyLimit = options.historyLimit ?? 50;
-  }
-
-  get state(): AgentState {
-    return this._state;
-  }
-
-  get provider(): LLMProvider {
-    return this._provider;
-  }
-
-  getSystemPrompt(): string {
-    return this.systemPrompt;
-  }
-
-  getMemory(): MemoryStore {
-    return this.memory;
-  }
-
-  private transition(to: AgentState): void {
-    const from = this._state;
-    this._state = to;
-    this.emit('state:change', from, to);
-  }
-
-  async init(): Promise<void> {
-    this.transition('ready');
-  }
-
-  async start(): Promise<void> {
-    if (this._state !== 'ready') {
-      throw new Error(`Cannot start agent in state: ${this._state}`);
-    }
-    for (const channel of this.channels) {
-      channel.onMessage((msg) => this.handleMessage(msg));
-      await channel.start();
-    }
-    this.transition('running');
-  }
-
-  async stop(): Promise<void> {
-    for (const channel of this.channels) {
-      await channel.stop();
-    }
-    this.transition('stopped');
-  }
-
-  registerSkill(skill: ISkill): void {
-    this.skills.set(skill.name, skill);
-  }
-
-  bindChannel(channel: IChannel): void {
-    this.channels.push(channel);
-  }
-
-  getChannels(): IChannel[] {
-    return this.channels;
-  }
-
-  async handleMessage(message: Message): Promise<Message> {
-    this.emit('message:in', message);
-
-    const sessionId = (message.metadata?.sessionId as string) ?? 'default';
-    await this.memory.addMessage(sessionId, message);
-
-    const context: AgentContext = {
-      agentName: this.name,
-      sessionId,
-      messages: (await this.memory.getConversation(sessionId)).slice(-this.historyLimit),
-      memory: this.memory,
-      metadata: {},
-    };
-
-    // Try skills first
-    for (const [name, skill] of this.skills) {
-      try {
-        const result = await skill.execute(context, message);
-        this.emit('skill:execute', name, result);
-        if (result.handled && result.response) {
-          const response = this.createResponse(result.response, message);
-          await this.memory.addMessage(sessionId, response);
-          this.emit('message:out', response);
-          return response;
-        }
-      } catch (err) {
-        this.emit('error', err instanceof Error ? err : new Error(String(err)));
-      }
-    }
-
-    // Fall back to LLM
-    const llmResponse = await this._provider.chat(context.messages, this.systemPrompt);
-    const response = this.createResponse(llmResponse, message);
-    await this.memory.addMessage(sessionId, response);
-    this.emit('message:out', response);
-    return response;
-  }
-
-  async *handleMessageStream(message: Message): AsyncIterable<string> {
-    const sessionId = (message.metadata?.sessionId as string) ?? 'default';
-    await this.memory.addMessage(sessionId, message);
-
-    const history = (await this.memory.getConversation(sessionId)).slice(-this.historyLimit);
-
-    let fullResponse = '';
-    for await (const chunk of this._provider.chatStream(history, this.systemPrompt)) {
-      fullResponse += chunk;
-      yield chunk;
-    }
-
-    const response = this.createResponse(fullResponse, message);
-    await this.memory.addMessage(sessionId, response);
-    this.emit('message:out', response);
-  }
-
-  private createResponse(content: string, inReplyTo: Message): Message {
-    return {
-      id: `msg_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`,
-      role: 'assistant',
-      content,
-      timestamp: Date.now(),
-      metadata: { inReplyTo: inReplyTo.id },
-    };
-  }
-}
+import { EventEmitter } from 'events';
+import type { AgentState, IAgent, IChannel, ISkill, Message, MemoryStore, AgentContext } from './types';
+import { InMemoryStore } from '../memory';
+import { createProvider, type LLMProvider } from '../providers';
+import { SkillLearner } from '../skills/auto-learn';
+import type { MCPTool } from '../tools/mcp';
+import { MCPToolRegistry } from '../tools/mcp';
+import { SubAgentManager, type SubAgentConfig, type SubAgentResult } from './subagent';
+
+export class BaseAgent extends EventEmitter implements IAgent {
+  readonly name: string;
+  private _state: AgentState = 'init';
+  private skills: Map<string, ISkill> = new Map();
+  private channels: IChannel[] = [];
+  private memory: MemoryStore;
+  private _provider: LLMProvider;
+  private systemPrompt: string;
+  private historyLimit: number;
+  private toolRegistry: MCPToolRegistry = new MCPToolRegistry();
+  private maxToolRounds: number;
+  private skillLearner?: SkillLearner;
+  private autoLearnConfig: { enabled: boolean; minConversationLength: number; improveOnUse: boolean };
+  private _subAgentManager?: SubAgentManager;
+
+  constructor(options: {
+    name: string;
+    systemPrompt?: string;
+    provider?: string;
+    model?: string;
+    memory?: MemoryStore;
+    historyLimit?: number;
+    skillsDir?: string;
+    learning?: {
+      autoSkillCreation?: boolean;
+      minConversationLength?: number;
+      improveOnUse?: boolean;
+    };
+    maxToolRounds?: number;
+  }) {
+    super();
+    this.name = options.name;
+    this.systemPrompt = options.systemPrompt ?? 'You are a helpful AI agent.';
+    this.memory = options.memory ?? new InMemoryStore();
+    this._provider = createProvider(options.provider ?? 'openai', options.model);
+    this.historyLimit = options.historyLimit ?? 50;
+    this.maxToolRounds = options.maxToolRounds ?? 10;
+    this.autoLearnConfig = {
+      enabled: options.learning?.autoSkillCreation !== false,
+      minConversationLength: options.learning?.minConversationLength ?? 3,
+      improveOnUse: options.learning?.improveOnUse !== false,
+    };
+    if (options.skillsDir) {
+      this.skillLearner = new SkillLearner(options.skillsDir);
+    }
+  }
+
+  get state(): AgentState {
+    return this._state;
+  }
+
+  get provider(): LLMProvider {
+    return this._provider;
+  }
+
+  getSystemPrompt(): string {
+    return this.systemPrompt;
+  }
+
+  getMemory(): MemoryStore {
+    return this.memory;
+  }
+
+  getSkillLearner(): SkillLearner | undefined {
+    return this.skillLearner;
+  }
+
+  getToolRegistry(): MCPToolRegistry {
+    return this.toolRegistry;
+  }
+
+  registerTool(tool: MCPTool): void {
+    this.toolRegistry.register(tool);
+  }
+
+  private transition(to: AgentState): void {
+    const from = this._state;
+    this._state = to;
+    this.emit('state:change', from, to);
+  }
+
+  async init(): Promise<void> {
+    if (this.skillLearner) {
+      await this.skillLearner.loadLearnedSkills();
+    }
+    this.transition('ready');
+  }
+
+  async start(): Promise<void> {
+    if (this._state !== 'ready') {
+      throw new Error(`Cannot start agent in state: ${this._state}`);
+    }
+    for (const channel of this.channels) {
+      channel.onMessage((msg) => this.handleMessage(msg));
+      await channel.start();
+    }
+    this.transition('running');
+  }
+
+  async stop(): Promise<void> {
+    for (const channel of this.channels) {
+      await channel.stop();
+    }
+    this.transition('stopped');
+  }
+
+  registerSkill(skill: ISkill): void {
+    this.skills.set(skill.name, skill);
+  }
+
+  bindChannel(channel: IChannel): void {
+    this.channels.push(channel);
+  }
+
+  getChannels(): IChannel[] {
+    return this.channels;
+  }
+
+  private getSubAgentManager(): SubAgentManager {
+    if (!this._subAgentManager) {
+      this._subAgentManager = new SubAgentManager();
+    }
+    return this._subAgentManager;
+  }
+
+  async spawnSubAgent(config: SubAgentConfig): Promise<SubAgentResult> {
+    return this.getSubAgentManager().spawn(config, this._provider);
+  }
+
+  async spawnParallel(configs: SubAgentConfig[]): Promise<SubAgentResult[]> {
+    return this.getSubAgentManager().spawnParallel(configs, this._provider);
+  }
+
+  async handleMessage(message: Message): Promise<Message> {
+    this.emit('message:in', message);
+
+    const sessionId = (message.metadata?.sessionId as string) ?? 'default';
+    await this.memory.addMessage(sessionId, message);
+
+    const context: AgentContext = {
+      agentName: this.name,
+      sessionId,
+      messages: (await this.memory.getConversation(sessionId)).slice(-this.historyLimit),
+      memory: this.memory,
+      metadata: {},
+    };
+
+    // Try skills first
+    for (const [name, skill] of this.skills) {
+      try {
+        const result = await skill.execute(context, message);
+        this.emit('skill:execute', name, result);
+        if (result.handled && result.response) {
+          const response = this.createResponse(result.response, message);
+          await this.memory.addMessage(sessionId, response);
+          this.emit('message:out', response);
+          return response;
+        }
+      } catch (err) {
+        this.emit('error', err instanceof Error ? err : new Error(String(err)));
+      }
+    }
+
+    // Check if a learned skill matches — prepend instructions to system prompt
+    let effectiveSystemPrompt = this.systemPrompt;
+    const matchedSkill = this.skillLearner?.matchSkill(message.content);
+    if (matchedSkill) {
+      matchedSkill.usageCount++;
+      matchedSkill.lastUsed = new Date();
+      effectiveSystemPrompt = `[Learned Skill: ${matchedSkill.name}]\n${matchedSkill.instructions}\n\n${this.systemPrompt}`;
+      this.emit('skill:matched', matchedSkill);
+    }
+
+    // Fall back to LLM with tool use loop
+    const tools = this.toolRegistry.list();
+    const llmMessages = [...context.messages];
+    let finalResponse = '';
+
+    for (let round = 0; round <= this.maxToolRounds; round++) {
+      const llmResponse = await this._provider.chat(
+        llmMessages,
+        effectiveSystemPrompt,
+        { tools: tools.length > 0 ? tools : undefined },
+      );
+
+      const toolCall = this.parseToolCall(llmResponse);
+      if (!toolCall || tools.length === 0 || round === this.maxToolRounds) {
+        finalResponse = llmResponse;
+        break;
+      }
+
+      // Execute tool
+      const toolResult = await this.toolRegistry.execute(toolCall.name, toolCall.arguments, context);
+      this.emit('tool:execute', toolCall.name, toolResult);
+
+      // Add tool call and result to messages for next round
+      llmMessages.push({
+        id: `tool_call_${Date.now()}`,
+        role: 'assistant',
+        content: llmResponse,
+        timestamp: Date.now(),
+      });
+      llmMessages.push({
+        id: `tool_result_${Date.now()}`,
+        role: 'user',
+        content: `[Tool Result for ${toolCall.name}]: ${toolResult.content}`,
+        timestamp: Date.now(),
+      });
+    }
+
+    const response = this.createResponse(finalResponse, message);
+    await this.memory.addMessage(sessionId, response);
+    this.emit('message:out', response);
+
+    // After response, check if we should learn a skill
+    if (
+      this.skillLearner &&
+      this.autoLearnConfig.enabled &&
+      context.messages.length >= this.autoLearnConfig.minConversationLength
+    ) {
+      this.skillLearner
+        .analyzeForSkillCreation(context.messages, this._provider)
+        .then(async (learnedSkill) => {
+          if (learnedSkill) {
+            await this.skillLearner!.saveSkill(learnedSkill);
+            this.emit('skill:learned', learnedSkill);
+          }
+        })
+        .catch(() => {});
+    }
+
+    // Improve matched skill after use
+    if (matchedSkill && this.skillLearner && this.autoLearnConfig.improveOnUse) {
+      this.skillLearner
+        .improveSkill(matchedSkill, context.messages, this._provider)
+        .then(() => this.skillLearner!.saveSkill(matchedSkill))
+        .catch(() => {});
+    }
+
+    return response;
+  }
+
+  private parseToolCall(response: string): { name: string; arguments: Record<string, unknown> } | null {
+    try {
+      const parsed = JSON.parse(response);
+      if (parsed.tool_call) return parsed.tool_call;
+      if (parsed.name && parsed.arguments !== undefined) return parsed;
+    } catch { /* not JSON */ }
+
+    const match = response.match(/<tool_call>\s*(\{[\s\S]*?\})\s*<\/tool_call>/);
+    if (match) {
+      try {
+        const parsed = JSON.parse(match[1]);
+        if (parsed.name) return parsed;
+      } catch { /* not valid JSON */ }
+    }
+    return null;
+  }
+
+  async *handleMessageStream(message: Message): AsyncIterable<string> {
+    const sessionId = (message.metadata?.sessionId as string) ?? 'default';
+    await this.memory.addMessage(sessionId, message);
+
+    const history = (await this.memory.getConversation(sessionId)).slice(-this.historyLimit);
+
+    let fullResponse = '';
+    for await (const chunk of this._provider.chatStream(history, this.systemPrompt)) {
+      fullResponse += chunk;
+      yield chunk;
+    }
+
+    const response = this.createResponse(fullResponse, message);
+    await this.memory.addMessage(sessionId, response);
+    this.emit('message:out', response);
+  }
+
+  private createResponse(content: string, inReplyTo: Message): Message {
+    return {
+      id: `msg_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`,
+      role: 'assistant',
+      content,
+      timestamp: Date.now(),
+      metadata: { inReplyTo: inReplyTo.id },
+    };
+  }
+}

package/src/core/runtime.ts

@@ -7,6 +7,8 @@ import { WebSocketChannel } from '../channels/websocket';
 import { DeepBrainMemoryStore } from '../memory/deepbrain';
 import { Analytics } from '../analytics';
 import type { OADDocument } from '../schema/oad';
+import { Scheduler } from './scheduler';
+import type { CronJob } from './scheduler';
 import type { ISkill, MemoryStore, Message } from './types';
 import type { Response } from 'express';
 
@@ -27,6 +29,7 @@ export class AgentRuntime {
   private shutdownHandlers: (() => Promise<void>)[] = [];
   private isShuttingDown = false;
   private analytics: Analytics = new Analytics();
+  private scheduler: Scheduler | null = null;
 
   async loadConfig(filePath: string): Promise<OADDocument> {
     this.config = loadOAD(filePath);
@@ -122,6 +125,42 @@ export class AgentRuntime {
     });
 
     this.logger.info('Agent initialized', { name: cfg.metadata.name });
+
+    // Initialize scheduler if jobs are configured
+    const schedulerCfg = (cfg.spec as any).scheduler;
+    if (schedulerCfg?.jobs && Array.isArray(schedulerCfg.jobs) && schedulerCfg.jobs.length > 0) {
+      this.scheduler = new Scheduler(async (job: CronJob) => {
+        this.logger.info('Scheduler firing job', { name: job.name, task: job.task });
+        if (this.agent) {
+          const msg: Message = {
+            id: `cron-${job.id}-${Date.now()}`,
+            role: 'user',
+            content: job.task,
+            timestamp: Date.now(),
+            metadata: { source: 'scheduler', jobId: job.id, jobName: job.name },
+          };
+          try {
+            await this.agent.handleMessage(msg);
+          } catch (err) {
+            this.logger.error('Scheduler job failed', { name: job.name, error: err instanceof Error ? err.message : String(err) });
+          }
+        }
+      });
+
+      for (let i = 0; i < schedulerCfg.jobs.length; i++) {
+        const j = schedulerCfg.jobs[i];
+        const id = j.id || j.name?.toLowerCase().replace(/\s+/g, '-') || `job-${i}`;
+        this.scheduler.addJob({
+          id,
+          name: j.name || id,
+          schedule: j.schedule,
+          task: j.task || '',
+          enabled: j.enabled !== false,
+        });
+      }
+      this.logger.info('Scheduler configured', { jobs: schedulerCfg.jobs.length });
+    }
+
     return this.agent;
   }
 
@@ -129,12 +168,20 @@ export class AgentRuntime {
     if (!this.agent) throw new Error('Agent not initialized.');
     this.setupGracefulShutdown();
     await this.agent.start();
+    if (this.scheduler) {
+      this.scheduler.start();
+      this.logger.info('Scheduler started');
+    }
     this.logger.info('Agent started');
   }
 
   async stop(): Promise<void> {
     if (!this.agent) return;
     this.logger.info('Stopping agent...');
+    if (this.scheduler) {
+      this.scheduler.stop();
+      this.logger.info('Scheduler stopped');
+    }
     await this.agent.stop();
     for (const handler of this.shutdownHandlers) {
       await handler();