Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions pkg/agent/conversation.go
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,18 @@ func (s *Agent) Init(ctx context.Context) error {
},
)

if s.MCPClientEnabled {
if err := s.InitializeMCPClient(ctx); err != nil {
klog.Errorf("Failed to initialize MCP client: %v", err)
return fmt.Errorf("failed to initialize MCP client: %w", err)
}

// Update MCP status in session
if err := s.UpdateMCPStatus(ctx, s.MCPClientEnabled); err != nil {
klog.Warningf("Failed to update MCP status: %v", err)
}
}

if !s.EnableToolUseShim {
var functionDefinitions []*gollm.FunctionDefinition
for _, tool := range s.Tools.AllTools() {
Expand All @@ -234,19 +246,6 @@ func (s *Agent) Init(ctx context.Context) error {
}
s.workDir = workDir

// Initialize MCP client if enabled
if s.MCPClientEnabled {
if err := s.InitializeMCPClient(ctx); err != nil {
klog.Errorf("Failed to initialize MCP client: %v", err)
return fmt.Errorf("failed to initialize MCP client: %w", err)
}

// Update MCP status in session
if err := s.UpdateMCPStatus(ctx, s.MCPClientEnabled); err != nil {
klog.Warningf("Failed to update MCP status: %v", err)
}
}

return nil
}

Expand Down
Loading