opc-agent 1.3.2 → 2.0.0

package/src/core/a2a.ts

@@ -1,143 +1,143 @@
-import { EventEmitter } from 'events';
-import { Room } from './room';
-import type { Message, IAgent } from './types';
-import { Logger } from './logger';
-
-// ── A2A Types ───────────────────────────────────────────────
-
-export interface AgentCapability {
-  name: string;
-  description: string;
-  inputSchema?: Record<string, unknown>;
-  outputSchema?: Record<string, unknown>;
-}
-
-export interface AgentRegistration {
-  agentName: string;
-  capabilities: AgentCapability[];
-  endpoint?: string;
-  metadata?: Record<string, unknown>;
-}
-
-export interface A2ARequest {
-  id: string;
-  from: string;
-  to: string;
-  capability: string;
-  payload: string;
-  timestamp: number;
-  timeout?: number;
-}
-
-export interface A2AResponse {
-  requestId: string;
-  from: string;
-  status: 'success' | 'error' | 'timeout';
-  payload?: string;
-  error?: string;
-  timestamp: number;
-}
-
-// ── Agent Registry ──────────────────────────────────────────
-
-export class AgentRegistry extends EventEmitter {
-  private registrations: Map<string, AgentRegistration> = new Map();
-  private agents: Map<string, IAgent> = new Map();
-  private room: Room;
-  private logger = new Logger('a2a');
-
-  constructor(room?: Room) {
-    super();
-    this.room = room ?? new Room('a2a-default');
-  }
-
-  register(agent: IAgent, capabilities: AgentCapability[]): void {
-    const reg: AgentRegistration = { agentName: agent.name, capabilities };
-    this.registrations.set(agent.name, reg);
-    this.agents.set(agent.name, agent);
-    this.room.addAgent(agent);
-    this.logger.info('Agent registered', { name: agent.name, capabilities: capabilities.map(c => c.name) });
-    this.emit('agent:registered', reg);
-  }
-
-  unregister(name: string): void {
-    this.registrations.delete(name);
-    this.agents.delete(name);
-    this.room.removeAgent(name);
-    this.emit('agent:unregistered', name);
-  }
-
-  discover(capability?: string): AgentRegistration[] {
-    const all = Array.from(this.registrations.values());
-    if (!capability) return all;
-    return all.filter(r => r.capabilities.some(c => c.name === capability));
-  }
-
-  getAgent(name: string): IAgent | undefined {
-    return this.agents.get(name);
-  }
-
-  async request(req: A2ARequest): Promise<A2AResponse> {
-    const agent = this.agents.get(req.to);
-    if (!agent) {
-      return {
-        requestId: req.id,
-        from: req.to,
-        status: 'error',
-        error: `Agent "${req.to}" not found`,
-        timestamp: Date.now(),
-      };
-    }
-
-    const message: Message = {
-      id: req.id,
-      role: 'user',
-      content: req.payload,
-      timestamp: req.timestamp,
-      metadata: { a2a: true, from: req.from, capability: req.capability },
-    };
-
-    this.emit('request', req);
-
-    try {
-      const timeoutMs = req.timeout ?? 30000;
-      const response = await Promise.race([
-        agent.handleMessage(message),
-        new Promise<never>((_, reject) =>
-          setTimeout(() => reject(new Error('A2A request timeout')), timeoutMs),
-        ),
-      ]);
-
-      const res: A2AResponse = {
-        requestId: req.id,
-        from: req.to,
-        status: 'success',
-        payload: response.content,
-        timestamp: Date.now(),
-      };
-      this.emit('response', res);
-      return res;
-    } catch (err) {
-      const res: A2AResponse = {
-        requestId: req.id,
-        from: req.to,
-        status: (err as Error).message.includes('timeout') ? 'timeout' : 'error',
-        error: (err as Error).message,
-        timestamp: Date.now(),
-      };
-      this.emit('response', res);
-      return res;
-    }
-  }
-
-  async call(from: string, to: string, capability: string, payload: string): Promise<A2AResponse> {
-    return this.request({
-      id: `a2a_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`,
-      from,
-      to,
-      capability,
-      payload,
-      timestamp: Date.now(),
-    });
-  }
-}
+import { EventEmitter } from 'events';
+import { Room } from './room';
+import type { Message, IAgent } from './types';
+import { Logger } from './logger';
+
+// ── A2A Types ───────────────────────────────────────────────
+
+export interface AgentCapability {
+  name: string;
+  description: string;
+  inputSchema?: Record<string, unknown>;
+  outputSchema?: Record<string, unknown>;
+}
+
+export interface AgentRegistration {
+  agentName: string;
+  capabilities: AgentCapability[];
+  endpoint?: string;
+  metadata?: Record<string, unknown>;
+}
+
+export interface A2ARequest {
+  id: string;
+  from: string;
+  to: string;
+  capability: string;
+  payload: string;
+  timestamp: number;
+  timeout?: number;
+}
+
+export interface A2AResponse {
+  requestId: string;
+  from: string;
+  status: 'success' | 'error' | 'timeout';
+  payload?: string;
+  error?: string;
+  timestamp: number;
+}
+
+// ── Agent Registry ──────────────────────────────────────────
+
+export class AgentRegistry extends EventEmitter {
+  private registrations: Map<string, AgentRegistration> = new Map();
+  private agents: Map<string, IAgent> = new Map();
+  private room: Room;
+  private logger = new Logger('a2a');
+
+  constructor(room?: Room) {
+    super();
+    this.room = room ?? new Room('a2a-default');
+  }
+
+  register(agent: IAgent, capabilities: AgentCapability[]): void {
+    const reg: AgentRegistration = { agentName: agent.name, capabilities };
+    this.registrations.set(agent.name, reg);
+    this.agents.set(agent.name, agent);
+    this.room.addAgent(agent);
+    this.logger.info('Agent registered', { name: agent.name, capabilities: capabilities.map(c => c.name) });
+    this.emit('agent:registered', reg);
+  }
+
+  unregister(name: string): void {
+    this.registrations.delete(name);
+    this.agents.delete(name);
+    this.room.removeAgent(name);
+    this.emit('agent:unregistered', name);
+  }
+
+  discover(capability?: string): AgentRegistration[] {
+    const all = Array.from(this.registrations.values());
+    if (!capability) return all;
+    return all.filter(r => r.capabilities.some(c => c.name === capability));
+  }
+
+  getAgent(name: string): IAgent | undefined {
+    return this.agents.get(name);
+  }
+
+  async request(req: A2ARequest): Promise<A2AResponse> {
+    const agent = this.agents.get(req.to);
+    if (!agent) {
+      return {
+        requestId: req.id,
+        from: req.to,
+        status: 'error',
+        error: `Agent "${req.to}" not found`,
+        timestamp: Date.now(),
+      };
+    }
+
+    const message: Message = {
+      id: req.id,
+      role: 'user',
+      content: req.payload,
+      timestamp: req.timestamp,
+      metadata: { a2a: true, from: req.from, capability: req.capability },
+    };
+
+    this.emit('request', req);
+
+    try {
+      const timeoutMs = req.timeout ?? 30000;
+      const response = await Promise.race([
+        agent.handleMessage(message),
+        new Promise<never>((_, reject) =>
+          setTimeout(() => reject(new Error('A2A request timeout')), timeoutMs),
+        ),
+      ]);
+
+      const res: A2AResponse = {
+        requestId: req.id,
+        from: req.to,
+        status: 'success',
+        payload: response.content,
+        timestamp: Date.now(),
+      };
+      this.emit('response', res);
+      return res;
+    } catch (err) {
+      const res: A2AResponse = {
+        requestId: req.id,
+        from: req.to,
+        status: (err as Error).message.includes('timeout') ? 'timeout' : 'error',
+        error: (err as Error).message,
+        timestamp: Date.now(),
+      };
+      this.emit('response', res);
+      return res;
+    }
+  }
+
+  async call(from: string, to: string, capability: string, payload: string): Promise<A2AResponse> {
+    return this.request({
+      id: `a2a_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`,
+      from,
+      to,
+      capability,
+      payload,
+      timestamp: Date.now(),
+    });
+  }
+}

package/src/core/agent.ts

@@ -2,6 +2,10 @@ 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;
@@ -12,6 +16,11 @@ export class BaseAgent extends EventEmitter implements IAgent {
   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;
@@ -20,6 +29,13 @@ export class BaseAgent extends EventEmitter implements IAgent {
     model?: string;
     memory?: MemoryStore;
     historyLimit?: number;
+    skillsDir?: string;
+    learning?: {
+      autoSkillCreation?: boolean;
+      minConversationLength?: number;
+      improveOnUse?: boolean;
+    };
+    maxToolRounds?: number;
   }) {
     super();
     this.name = options.name;
@@ -27,6 +43,15 @@ export class BaseAgent extends EventEmitter implements IAgent {
     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 {
@@ -45,6 +70,18 @@ export class BaseAgent extends EventEmitter implements IAgent {
     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;
@@ -52,6 +89,9 @@ export class BaseAgent extends EventEmitter implements IAgent {
   }
 
   async init(): Promise<void> {
+    if (this.skillLearner) {
+      await this.skillLearner.loadLearnedSkills();
+    }
     this.transition('ready');
   }
 
@@ -85,6 +125,21 @@ export class BaseAgent extends EventEmitter implements IAgent {
     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);
 
@@ -115,14 +170,102 @@ export class BaseAgent extends EventEmitter implements IAgent {
       }
     }
 
-    // Fall back to LLM
-    const llmResponse = await this._provider.chat(context.messages, this.systemPrompt);
-    const response = this.createResponse(llmResponse, message);
+    // 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);