v1.0.4: Feature parity with yoagent - MCP, OpenAPI, enhanced tools

Author: Patel230

agent.go

@@ -260,6 +260,11 @@ func (a *Agent) GetTools() []Tool {
 	return tools
 }
 
+func (a *Agent) AddTool(tool Tool) *Agent {
+	a.tools[tool.Name] = tool
+	return a
+}
+
 func (a *Agent) Prompt(ctx context.Context, text string) chan Event {
 	events := make(chan Event, 64)
 	go func() {

mcp/helpers.go

@@ -0,0 +1,106 @@
+package mcp
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+)
+
+type McpClient struct {
+	Transport Transport
+}
+
+func NewMcpClient(t Transport) *McpClient {
+	return &McpClient{Transport: t}
+}
+
+func ConnectStdio(command string, args []string, env map[string]string) (*McpClient, error) {
+	transport, err := NewStdioTransport(command, args, env)
+	if err != nil {
+		return nil, err
+	}
+	return &McpClient{Transport: transport}, nil
+}
+
+func ConnectHTTP(url string, headers map[string]string) *McpClient {
+	transport := NewHTTPTransport(url, headers)
+	return &McpClient{Transport: transport}
+}
+
+func (c *McpClient) ListTools(ctx context.Context) ([]Tool, error) {
+	req := JsonRpcRequest{
+		JSONRPC: "2.0",
+		Method:  "tools/list",
+		Params:  nil,
+		ID:      1,
+	}
+
+	resp, err := c.Transport.Send(req)
+	if err != nil {
+		return nil, err
+	}
+
+	var result struct {
+		Tools []Tool `json:"tools"`
+	}
+	if resp.Result != nil {
+		if err := json.Unmarshal(resp.Result, &result); err != nil {
+			return nil, err
+		}
+	}
+	return result.Tools, nil
+}
+
+func (c *McpClient) CallTool(ctx context.Context, name string, args map[string]string) (string, error) {
+	paramsRaw, _ := json.Marshal(map[string]interface{}{
+		"name":      name,
+		"arguments": args,
+	})
+
+	req := JsonRpcRequest{
+		JSONRPC: "2.0",
+		Method:  "tools/call",
+		Params:  paramsRaw,
+		ID:      2,
+	}
+
+	resp, err := c.Transport.Send(req)
+	if err != nil {
+		return "", err
+	}
+
+	if resp.Error != nil {
+		return "", fmt.Errorf("MCP error: %s", resp.Error.Message)
+	}
+
+	var result struct {
+		Content []struct {
+			Text string `json:"text"`
+		} `json:"content"`
+	}
+	if resp.Result != nil {
+		if err := json.Unmarshal(resp.Result, &result); err != nil {
+			return "", err
+		}
+	}
+
+	text := ""
+	for _, c := range result.Content {
+		text += c.Text
+	}
+	return text, nil
+}
+
+func RunMCPCommand(ctx context.Context, cmd string, args []string) ([]Tool, error) {
+	parts := append([]string{cmd}, args...)
+	command := parts[0]
+	commandArgs := parts[1:]
+
+	transport, err := NewStdioTransport(command, commandArgs, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	client := &McpClient{Transport: transport}
+	return client.ListTools(ctx)
+}

mcp/tool_adapter.go

@@ -4,10 +4,14 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-
-	iteragent "github.com/GrayCodeAI/iteragent"
 )
 
+type ExecutableTool struct {
+	Name        string
+	Description string
+	Execute     func(ctx context.Context, args map[string]string) (string, error)
+}
+
 type ToolAdapter struct {
 	client *Client
 }
@@ -16,16 +20,16 @@ func NewToolAdapter(client *Client) *ToolAdapter {
 	return &ToolAdapter{client: client}
 }
 
-func (a *ToolAdapter) GetTools(ctx context.Context) ([]iteragent.Tool, error) {
+func (a *ToolAdapter) GetTools(ctx context.Context) ([]ExecutableTool, error) {
 	mcpTools, err := a.client.ListTools(ctx)
 	if err != nil {
 		return nil, err
 	}
 
-	tools := make([]iteragent.Tool, len(mcpTools))
+	tools := make([]ExecutableTool, len(mcpTools))
 	for i, t := range mcpTools {
 		mt := t
-		tools[i] = iteragent.Tool{
+		tools[i] = ExecutableTool{
 			Name:        mt.Name,
 			Description: mt.Description,
 			Execute: func(ctx context.Context, args map[string]string) (string, error) {

openapi/adapter.go

@@ -7,8 +7,6 @@ import (
 	"io"
 	"net/http"
 	"strings"
-
-	iteragent "github.com/GrayCodeAI/iteragent"
 )
 
 type Spec struct {
@@ -87,6 +85,10 @@ func LoadSpec(data []byte) (*Spec, error) {
 	return &spec, nil
 }
 
+func ParseSpec(data []byte) (*Spec, error) {
+	return LoadSpec(data)
+}
+
 func NewAdapter(spec *Spec, config Config) *Adapter {
 	baseURL := config.BaseURL
 	if baseURL == "" && len(spec.Servers) > 0 {
@@ -100,8 +102,14 @@ func NewAdapter(spec *Spec, config Config) *Adapter {
 	}
 }
 
-func (a *Adapter) GetTools() ([]iteragent.Tool, error) {
-	var tools []iteragent.Tool
+type Tool struct {
+	Name        string
+	Description string
+	Execute     func(ctx context.Context, args map[string]string) (string, error)
+}
+
+func (a *Adapter) GetTools() ([]Tool, error) {
+	var tools []Tool
 
 	for path, item := range a.spec.Paths {
 		for method, op := range map[string]*Operation{"get": item.Get, "post": item.Post, "put": item.Put, "delete": item.Delete} {
@@ -113,7 +121,7 @@ func (a *Adapter) GetTools() ([]iteragent.Tool, error) {
 			pathStr := path
 			methodStr := method
 
-			tool := iteragent.Tool{
+			tool := Tool{
 				Name:        fmt.Sprintf("%s_%s", methodStr, cleanPath(pathStr)),
 				Description: operation.Description,
 				Execute: func(ctx context.Context, args map[string]string) (string, error) {