Merge branch 'main' into shyang-agent-name

Author: shawnyang-coder

agent_client.go

@@ -15,22 +15,41 @@ import (
 type AgentClient struct {
 	agentClient livekit.CloudAgent
 	authBase
+	httpClient *http.Client
+	twirpOpts  []twirp.ClientOption
 }
 
-func NewAgentClient(url string, apiKey string, apiSecret string, opts ...twirp.ClientOption) (*AgentClient, error) {
+func NewAgentClient(url string, apiKey string, apiSecret string, opts ...AgentClientOption) (*AgentClient, error) {
 	serverUrl := os.Getenv("LK_AGENTS_URL")
 	if serverUrl == "" {
 		url = signalling.ToHttpURL(url)
 		pattern := `^https?://[^.]+\.`
 		re := regexp.MustCompile(pattern)
 		serverUrl = re.ReplaceAllString(url, "https://agents.")
 	}
+	c := &AgentClient{
+		authBase:   authBase{apiKey, apiSecret},
+		httpClient: &http.Client{},
+	}
+	for _, opt := range opts {
+		opt(c)
+	}
+	c.agentClient = livekit.NewCloudAgentProtobufClient(serverUrl, c.httpClient, c.twirpOpts...)
+	return c, nil
+}
+
+type AgentClientOption func(*AgentClient)
 
-	client := livekit.NewCloudAgentProtobufClient(serverUrl, &http.Client{}, opts...)
-	return &AgentClient{
-		agentClient: client,
-		authBase:    authBase{apiKey, apiSecret},
-	}, nil
+func WithHTTPClient(httpClient *http.Client) AgentClientOption {
+	return func(c *AgentClient) {
+		c.httpClient = httpClient
+	}
+}
+
+func WithTwirpClientOptions(opts ...twirp.ClientOption) AgentClientOption {
+	return func(c *AgentClient) {
+		c.twirpOpts = opts
+	}
 }
 
 func (c *AgentClient) CreateAgent(ctx context.Context, req *livekit.CreateAgentRequest) (*livekit.CreateAgentResponse, error) {

go.mod

@@ -149,4 +149,6 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
+replace github.com/livekit/protocol => ../protocol
+
 tool github.com/maxbrunsfeld/counterfeiter/v6

go.sum

@@ -159,8 +159,6 @@ github.com/livekit/media-sdk v0.0.0-20260424094251-1e21ae1138de h1:obfPAPRvdcmCA
 github.com/livekit/media-sdk v0.0.0-20260424094251-1e21ae1138de/go.mod h1:7ssWiG+U4xnbvLih9WiZbhQP6zIKMjgXdUtIE1bm/E8=
 github.com/livekit/mediatransportutil v0.0.0-20251128105421-19c7a7b81c22 h1:dzCBxOGLLWVtQhL7OYK2EGN+5Q+23Mq/jfz4vQisirA=
 github.com/livekit/mediatransportutil v0.0.0-20251128105421-19c7a7b81c22/go.mod h1:mSNtYzSf6iY9xM3UX42VEI+STHvMgHmrYzEHPcdhB8A=
-github.com/livekit/protocol v1.45.5-0.20260423163244-347de5a2ef78 h1:kT824Ziy89MSD2/UcvgGZWZ5iiEGepDAvu9phjYHiT0=
-github.com/livekit/protocol v1.45.5-0.20260423163244-347de5a2ef78/go.mod h1:e6QdWDkfot+M2nRh0eitJUS0ZLuwvKCsfiz2pWWSG3s=
 github.com/livekit/psrpc v0.7.1 h1:ms37az0QTD3UXIWuUC5D/SkmKOlRMVRsI261eBWu/Vw=
 github.com/livekit/psrpc v0.7.1/go.mod h1:bZ4iHFQptTkbPnB0LasvRNu/OBYXEu1NA6O5BMFo9kk=
 github.com/mackerelio/go-osstat v0.2.7 h1:TCavZi10wF49bT6iQZ9eT2keGZQpC69MTDfdJej5e94=

pkg/cloudagents/client.go

@@ -55,12 +55,14 @@ func New(opts ...ClientOption) (*Client, error) {
 	if client.projectURL == "" {
 		return nil, fmt.Errorf("project credentials are required")
 	}
-	agentClient, err := lksdk.NewAgentClient(client.projectURL, client.apiKey, client.apiSecret, twirp.WithClientHooks(&twirp.ClientHooks{
-		RequestPrepared: func(ctx context.Context, req *http.Request) (context.Context, error) {
-			client.setLivekitHeaders(req)
-			return ctx, nil
-		},
-	}))
+	agentClient, err := lksdk.NewAgentClient(client.projectURL, client.apiKey, client.apiSecret,
+		lksdk.WithTwirpClientOptions(
+			twirp.WithClientHooks(&twirp.ClientHooks{
+				RequestPrepared: func(ctx context.Context, req *http.Request) (context.Context, error) {
+					client.setLivekitHeaders(req)
+					return ctx, nil
+				},
+			})))
 	if err != nil {
 		return nil, err
 	}
@@ -108,10 +110,12 @@ func (c *Client) CreateAgentV2(
 	ctx context.Context,
 	secrets []*lkproto.AgentSecret,
 	regions []string,
+	agentName string,
 ) (*lkproto.CreateAgentV2Response, error) {
 	resp, err := c.AgentClient.CreateAgentV2(ctx, &lkproto.CreateAgentV2Request{
-		Secrets: secrets,
-		Regions: regions,
+		Secrets:   secrets,
+		Regions:   regions,
+		AgentName: agentName,
 	})
 	if err != nil {
 		return nil, err
@@ -146,6 +150,7 @@ func (c *Client) DeployAgent(
 func (c *Client) DeployAgentV2(
 	ctx context.Context,
 	agentID string,
+	agentName string,
 	source fs.FS,
 	secrets []*lkproto.AgentSecret,
 	environment string,
@@ -154,6 +159,7 @@ func (c *Client) DeployAgentV2(
 ) error {
 	resp, err := c.AgentClient.DeployAgentV2(ctx, &lkproto.DeployAgentV2Request{
 		AgentId:     agentID,
+		AgentName:   agentName,
 		Secrets:     secrets,
 		Environment: environment,
 	})