Merge pull request #778 from rumpl/cleanup-redirect-uri

Remove the redirectUri flag

Author: rumpl

cmd/root/flags.go

@@ -9,6 +9,5 @@ import (
 func addRuntimeConfigFlags(cmd *cobra.Command, runConfig *config.RuntimeConfig) {
 	addGatewayFlags(cmd, runConfig)
 	cmd.PersistentFlags().StringSliceVar(&runConfig.EnvFiles, "env-from-file", nil, "Set environment variables from file")
-	cmd.PersistentFlags().StringVar(&runConfig.RedirectURI, "redirect-uri", "http://localhost:8083/oauth-callback", "Set the redirect URI for OAuth2 flows")
 	cmd.PersistentFlags().BoolVar(&runConfig.GlobalCodeMode, "code-mode-tools", false, "Provide a single tool to call other tools via Javascript")
 }

pkg/config/runtime.go

@@ -6,7 +6,6 @@ type RuntimeConfig struct {
 	DefaultEnvProvider environment.Provider
 	EnvFiles           []string
 	ModelsGateway      string
-	RedirectURI        string
 	GlobalCodeMode     bool
 	WorkingDir         string
 }

pkg/teamloader/teamloader.go

@@ -76,14 +76,14 @@ func NewDefaultToolsetRegistry() *ToolsetRegistry {
 	return r
 }
 
-func createTodoTool(ctx context.Context, toolset latest.Toolset, parentDir string, envProvider environment.Provider, runtimeConfig config.RuntimeConfig) (tools.ToolSet, error) {
+func createTodoTool(ctx context.Context, toolset latest.Toolset, parentDir string, envProvider environment.Provider, _ config.RuntimeConfig) (tools.ToolSet, error) {
 	if toolset.Shared {
 		return builtin.NewSharedTodoTool(), nil
 	}
 	return builtin.NewTodoTool(), nil
 }
 
-func createMemoryTool(ctx context.Context, toolset latest.Toolset, parentDir string, envProvider environment.Provider, runtimeConfig config.RuntimeConfig) (tools.ToolSet, error) {
+func createMemoryTool(ctx context.Context, toolset latest.Toolset, parentDir string, envProvider environment.Provider, _ config.RuntimeConfig) (tools.ToolSet, error) {
 	var memoryPath string
 	if filepath.IsAbs(toolset.Path) {
 		memoryPath = ""
@@ -109,11 +109,11 @@ func createMemoryTool(ctx context.Context, toolset latest.Toolset, parentDir str
 	return builtin.NewMemoryTool(db), nil
 }
 
-func createThinkTool(ctx context.Context, toolset latest.Toolset, parentDir string, envProvider environment.Provider, runtimeConfig config.RuntimeConfig) (tools.ToolSet, error) {
+func createThinkTool(ctx context.Context, toolset latest.Toolset, parentDir string, envProvider environment.Provider, _ config.RuntimeConfig) (tools.ToolSet, error) {
 	return builtin.NewThinkTool(), nil
 }
 
-func createShellTool(ctx context.Context, toolset latest.Toolset, parentDir string, envProvider environment.Provider, runtimeConfig config.RuntimeConfig) (tools.ToolSet, error) {
+func createShellTool(ctx context.Context, toolset latest.Toolset, parentDir string, envProvider environment.Provider, _ config.RuntimeConfig) (tools.ToolSet, error) {
 	env, err := environment.ExpandAll(ctx, environment.ToValues(toolset.Env), envProvider)
 	if err != nil {
 		return nil, fmt.Errorf("failed to expand the tool's environment variables: %w", err)
@@ -122,7 +122,7 @@ func createShellTool(ctx context.Context, toolset latest.Toolset, parentDir stri
 	return builtin.NewShellTool(env), nil
 }
 
-func createScriptTool(ctx context.Context, toolset latest.Toolset, parentDir string, envProvider environment.Provider, runtimeConfig config.RuntimeConfig) (tools.ToolSet, error) {
+func createScriptTool(ctx context.Context, toolset latest.Toolset, parentDir string, envProvider environment.Provider, _ config.RuntimeConfig) (tools.ToolSet, error) {
 	if len(toolset.Shell) == 0 {
 		return nil, fmt.Errorf("shell is required for script toolset")
 	}
@@ -169,7 +169,7 @@ func createFilesystemTool(ctx context.Context, toolset latest.Toolset, parentDir
 	return builtin.NewFilesystemTool([]string{wd}, opts...), nil
 }
 
-func createAPITool(ctx context.Context, toolset latest.Toolset, parentDir string, envProvider environment.Provider, runtimeConfig config.RuntimeConfig) (tools.ToolSet, error) {
+func createAPITool(ctx context.Context, toolset latest.Toolset, parentDir string, envProvider environment.Provider, _ config.RuntimeConfig) (tools.ToolSet, error) {
 	if toolset.APIConfig.Endpoint == "" {
 		return nil, fmt.Errorf("api tool requires an endpoint in api_config")
 	}
@@ -179,7 +179,7 @@ func createAPITool(ctx context.Context, toolset latest.Toolset, parentDir string
 	return builtin.NewAPITool(toolset.APIConfig), nil
 }
 
-func createFetchTool(ctx context.Context, toolset latest.Toolset, parentDir string, envProvider environment.Provider, runtimeConfig config.RuntimeConfig) (tools.ToolSet, error) {
+func createFetchTool(ctx context.Context, toolset latest.Toolset, parentDir string, envProvider environment.Provider, _ config.RuntimeConfig) (tools.ToolSet, error) {
 	var opts []builtin.FetchToolOption
 	if toolset.Timeout > 0 {
 		timeout := time.Duration(toolset.Timeout) * time.Second
@@ -188,7 +188,7 @@ func createFetchTool(ctx context.Context, toolset latest.Toolset, parentDir stri
 	return builtin.NewFetchTool(opts...), nil
 }
 
-func createMCPTool(ctx context.Context, toolset latest.Toolset, parentDir string, envProvider environment.Provider, runtimeConfig config.RuntimeConfig) (tools.ToolSet, error) {
+func createMCPTool(ctx context.Context, toolset latest.Toolset, parentDir string, envProvider environment.Provider, _ config.RuntimeConfig) (tools.ToolSet, error) {
 	// MCP tool has three different modes: ref, command, and remote
 	if toolset.Ref != "" {
 		mcpServerName := gateway.ParseServerRef(toolset.Ref)
@@ -199,7 +199,7 @@ func createMCPTool(ctx context.Context, toolset latest.Toolset, parentDir string
 
 		// TODO(dga): until the MCP Gateway supports oauth with cagent, we fetch the remote url and directly connect to it.
 		if serverSpec.Type == "remote" {
-			return mcp.NewRemoteToolset(serverSpec.Remote.URL, serverSpec.Remote.TransportType, nil, runtimeConfig.RedirectURI), nil
+			return mcp.NewRemoteToolset(serverSpec.Remote.URL, serverSpec.Remote.TransportType, nil), nil
 		}
 
 		return mcp.NewGatewayToolset(ctx, mcpServerName, toolset.Config, envProvider)
@@ -225,7 +225,7 @@ func createMCPTool(ctx context.Context, toolset latest.Toolset, parentDir string
 			headers[k] = expanded
 		}
 
-		return mcp.NewRemoteToolset(toolset.Remote.URL, toolset.Remote.TransportType, headers, runtimeConfig.RedirectURI), nil
+		return mcp.NewRemoteToolset(toolset.Remote.URL, toolset.Remote.TransportType, headers), nil
 	}
 
 	return nil, fmt.Errorf("mcp toolset requires either ref, command, or remote configuration")

pkg/tools/mcp/mcp.go

@@ -46,11 +46,11 @@ func NewToolsetCommand(command string, args, env []string) *Toolset {
 }
 
 // NewRemoteToolset creates a new MCP toolset from a remote MCP Server.
-func NewRemoteToolset(url, transport string, headers map[string]string, redirectURI string) *Toolset {
-	slog.Debug("Creating Remote MCP toolset", "url", url, "transport", transport, "headers", headers, "redirectURI", redirectURI)
+func NewRemoteToolset(url, transport string, headers map[string]string) *Toolset {
+	slog.Debug("Creating Remote MCP toolset", "url", url, "transport", transport, "headers", headers)
 
 	return &Toolset{
-		mcpClient: newRemoteClient(url, transport, headers, redirectURI, NewInMemoryTokenStore()),
+		mcpClient: newRemoteClient(url, transport, headers, NewInMemoryTokenStore()),
 		logID:     url,
 	}
 }

pkg/tools/mcp/remote.go

@@ -18,15 +18,14 @@ type remoteMCPClient struct {
 	url                 string
 	transportType       string
 	headers             map[string]string
-	redirectURI         string
 	tokenStore          OAuthTokenStore
 	elicitationHandler  tools.ElicitationHandler
 	oauthSuccessHandler func()
 	mu                  sync.RWMutex
 }
 
-func newRemoteClient(url, transportType string, headers map[string]string, redirectURI string, tokenStore OAuthTokenStore) *remoteMCPClient {
-	slog.Debug("Creating remote MCP client", "url", url, "transport", transportType, "headers", headers, "redirectURI", redirectURI)
+func newRemoteClient(url, transportType string, headers map[string]string, tokenStore OAuthTokenStore) *remoteMCPClient {
+	slog.Debug("Creating remote MCP client", "url", url, "transport", transportType, "headers", headers)
 
 	if tokenStore == nil {
 		tokenStore = NewInMemoryTokenStore()
@@ -36,7 +35,6 @@ func newRemoteClient(url, transportType string, headers map[string]string, redir
 		url:           url,
 		transportType: transportType,
 		headers:       headers,
-		redirectURI:   redirectURI,
 		tokenStore:    tokenStore,
 	}
 }