Merge remote-tracking branch 'origin/main' into feat/mcp-3233-isolation-mode-merge

# Conflicts:
#	oas/docs.go

Author: Dumbris

.github/workflows/bench.yml

@@ -131,13 +131,28 @@ jobs:
           retention-days: 90
           if-no-files-found: warn
 
+      # Bootstrap: create the Cloudflare Pages project if it does not yet exist.
+      # Idempotent — fails silently (continue-on-error) when the project already
+      # exists (Cloudflare error 8000007). Requires Pages:Edit scope on the token.
+      # If the token is deploy-only, create the project once manually in the
+      # Cloudflare dashboard (name: mcpproxy-bench, production branch: main) and
+      # this step will harmlessly fail every run thereafter.
+      - name: Create Cloudflare Pages project (if missing)
+        continue-on-error: true
+        uses: cloudflare/wrangler-action@ebbaa1584979971c8614a24965b4405ff95890e0  # v4.0.0
+        with:
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          command: pages project create mcpproxy-bench --production-branch=main
+
       # Publish to Cloudflare Pages (mcpproxy-bench project).
-      # On first deploy, wrangler auto-creates the project; subsequent deploys
-      # update it. The Pages URL will be mcpproxy-bench.pages.dev (or a custom
-      # domain such as bench.mcpproxy.app once configured in Cloudflare).
+      # --commit-dirty=true: bench results are written into the working tree during
+      # the run and never committed to git, so wrangler would otherwise reject the
+      # dirty-tree check. The Pages URL will be mcpproxy-bench.pages.dev (or a
+      # custom domain such as bench.mcpproxy.app once configured in Cloudflare).
       - name: Deploy benchmark dashboard to Cloudflare Pages
         uses: cloudflare/wrangler-action@ebbaa1584979971c8614a24965b4405ff95890e0  # v4.0.0
         with:
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-          command: pages deploy bench/results --project-name=mcpproxy-bench
+          command: pages deploy bench/results --project-name=mcpproxy-bench --commit-dirty=true

cmd/mcpproxy-tray/internal/api/adapter.go

@@ -8,6 +8,7 @@ import (
 	"runtime"
 
 	internalRuntime "github.com/smart-mcp-proxy/mcpproxy-go/internal/runtime"
+	"github.com/smart-mcp-proxy/mcpproxy-go/internal/tray"
 )
 
 // ClientInterface defines the methods required by ServerAdapter from the API client.
@@ -20,6 +21,9 @@ type ClientInterface interface {
 	UnquarantineServer(serverName string) error
 	TriggerOAuthLogin(serverName string) error
 	StatusChannel() <-chan StatusUpdate
+	GetProfiles() ([]tray.ProfileInfo, error)
+	GetActiveProfile() (string, error)
+	SetActiveProfile(name string) error
 }
 
 // isServerHealthy returns true if the server is considered healthy.
@@ -122,7 +126,7 @@ func (a *ServerAdapter) GetStatus() interface{} {
 
 	// Fallback to empty if we couldn't get it
 	if listenAddr == "" {
-		listenAddr = ""  // Empty means tray will show "Status: Running" without address
+		listenAddr = "" // Empty means tray will show "Status: Running" without address
 	}
 
 	servers, serverErr := a.client.GetServers()
@@ -186,6 +190,21 @@ func (a *ServerAdapter) EventsChannel() <-chan internalRuntime.Event {
 	return nil
 }
 
+// GetProfiles returns the configured profiles for the tray switcher (Profiles v2 T5).
+func (a *ServerAdapter) GetProfiles() ([]tray.ProfileInfo, error) {
+	return a.client.GetProfiles()
+}
+
+// GetActiveProfile returns the server-level default active profile (empty = all servers).
+func (a *ServerAdapter) GetActiveProfile() (string, error) {
+	return a.client.GetActiveProfile()
+}
+
+// SetActiveProfile sets the server-level default active profile (empty clears it).
+func (a *ServerAdapter) SetActiveProfile(name string) error {
+	return a.client.SetActiveProfile(name)
+}
+
 // GetQuarantinedServers returns quarantined servers
 func (a *ServerAdapter) GetQuarantinedServers() ([]map[string]interface{}, error) {
 	servers, err := a.client.GetServers()

cmd/mcpproxy-tray/internal/api/adapter_test.go

@@ -6,6 +6,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/smart-mcp-proxy/mcpproxy-go/internal/tray"
 )
 
 // =============================================================================
@@ -21,11 +23,13 @@ type MockClient struct {
 	enableErr            error
 	quarantineErr        error
 	oauthErr             error
-	enabledServers       map[string]bool   // tracks enable/disable calls
-	quarantinedServers   map[string]bool   // tracks quarantine calls
-	unquarantinedServers []string          // tracks unquarantine calls
-	oauthTriggered       []string          // tracks OAuth login calls
+	enabledServers       map[string]bool // tracks enable/disable calls
+	quarantinedServers   map[string]bool // tracks quarantine calls
+	unquarantinedServers []string        // tracks unquarantine calls
+	oauthTriggered       []string        // tracks OAuth login calls
 	statusCh             chan StatusUpdate
+	profiles             []tray.ProfileInfo // Profiles v2 T5
+	activeProfile        string             // Profiles v2 T5
 }
 
 func NewMockClient() *MockClient {
@@ -87,6 +91,46 @@ func (m *MockClient) StatusChannel() <-chan StatusUpdate {
 	return m.statusCh
 }
 
+func (m *MockClient) GetProfiles() ([]tray.ProfileInfo, error) {
+	return m.profiles, nil
+}
+
+func (m *MockClient) GetActiveProfile() (string, error) {
+	return m.activeProfile, nil
+}
+
+func (m *MockClient) SetActiveProfile(name string) error {
+	m.activeProfile = name
+	return nil
+}
+
+// TestServerAdapterProfileDelegation verifies the adapter forwards the profile
+// switcher calls (Profiles v2 T5) to the underlying client.
+func TestServerAdapterProfileDelegation(t *testing.T) {
+	mock := NewMockClient()
+	mock.profiles = []tray.ProfileInfo{
+		{Name: "research", ToolCount: 3},
+		{Name: "deploy", ToolCount: 2},
+	}
+	mock.activeProfile = "research"
+	adapter := NewServerAdapter(mock)
+
+	profiles, err := adapter.GetProfiles()
+	require.NoError(t, err)
+	require.Len(t, profiles, 2)
+	assert.Equal(t, "research", profiles[0].Name)
+	assert.Equal(t, 3, profiles[0].ToolCount)
+
+	active, err := adapter.GetActiveProfile()
+	require.NoError(t, err)
+	assert.Equal(t, "research", active)
+
+	require.NoError(t, adapter.SetActiveProfile("deploy"))
+	active, err = adapter.GetActiveProfile()
+	require.NoError(t, err)
+	assert.Equal(t, "deploy", active)
+}
+
 // =============================================================================
 // isServerHealthy Unit Tests
 // =============================================================================

cmd/mcpproxy-tray/internal/api/client.go

@@ -2,12 +2,14 @@ package api
 
 import (
 	"bufio"
+	"bytes"
 	"context"
 	"crypto/sha256"
 	"crypto/tls"
 	"crypto/x509"
 	"encoding/json"
 	"fmt"
+	"io"
 	"net/http"
 	"net/url"
 	"os"
@@ -638,6 +640,63 @@ func (c *Client) TriggerOAuthLogin(serverName string) error {
 	return nil
 }
 
+// GetProfiles fetches the configured profiles (Profiles v2 T5) from
+// GET /api/v1/profiles for the tray profile switcher.
+func (c *Client) GetProfiles() ([]tray.ProfileInfo, error) {
+	resp, err := c.makeRequest("GET", "/api/v1/profiles", nil)
+	if err != nil {
+		return nil, err
+	}
+	if !resp.Success {
+		return nil, fmt.Errorf("API error: %s", resp.Error)
+	}
+
+	raw, ok := resp.Data["profiles"].([]interface{})
+	if !ok {
+		// No profiles configured is a valid, empty result.
+		return nil, nil
+	}
+
+	var result []tray.ProfileInfo
+	for _, p := range raw {
+		pm, ok := p.(map[string]interface{})
+		if !ok {
+			continue
+		}
+		result = append(result, tray.ProfileInfo{
+			Name:      getString(pm, "name"),
+			ToolCount: getInt(pm, "tool_count"),
+		})
+	}
+	return result, nil
+}
+
+// GetActiveProfile fetches the server-level default active profile from
+// GET /api/v1/profiles/active. An empty string means "all servers".
+func (c *Client) GetActiveProfile() (string, error) {
+	resp, err := c.makeRequest("GET", "/api/v1/profiles/active", nil)
+	if err != nil {
+		return "", err
+	}
+	if !resp.Success {
+		return "", fmt.Errorf("API error: %s", resp.Error)
+	}
+	return getString(resp.Data, "active_profile"), nil
+}
+
+// SetActiveProfile sets the server-level default active profile via
+// PUT /api/v1/profiles/active. An empty name clears the selection (all servers).
+func (c *Client) SetActiveProfile(name string) error {
+	resp, err := c.makeRequest("PUT", "/api/v1/profiles/active", map[string]string{"profile": name})
+	if err != nil {
+		return err
+	}
+	if !resp.Success {
+		return fmt.Errorf("API error: %s", resp.Error)
+	}
+	return nil
+}
+
 // GetServerTools gets tools for a specific server
 func (c *Client) GetServerTools(serverName string) ([]Tool, error) {
 	endpoint := fmt.Sprintf("/api/v1/servers/%s/tools", serverName)
@@ -887,17 +946,32 @@ func (c *Client) OpenWebUI() error {
 	}
 }
 
-// makeRequest makes an HTTP request to the API with enhanced error handling and retry logic
-func (c *Client) makeRequest(method, path string, _ interface{}) (*Response, error) {
+// makeRequest makes an HTTP request to the API with enhanced error handling and retry logic.
+// When body is non-nil it is JSON-encoded and sent as the request payload (e.g. PUT bodies);
+// nil yields a bodyless request, preserving every existing call site.
+func (c *Client) makeRequest(method, path string, body interface{}) (*Response, error) {
 	url, err := c.buildURL(path)
 	if err != nil {
 		return nil, err
 	}
 	maxRetries := 3
 	baseDelay := 1 * time.Second
 
+	var bodyBytes []byte
+	if body != nil {
+		bodyBytes, err = json.Marshal(body)
+		if err != nil {
+			return nil, fmt.Errorf("failed to marshal request body: %w", err)
+		}
+	}
+
 	for attempt := 1; attempt <= maxRetries; attempt++ {
-		req, err := http.NewRequest(method, url, http.NoBody)
+		// Recreate the reader each attempt so retries resend the full body.
+		var bodyReader io.Reader = http.NoBody
+		if bodyBytes != nil {
+			bodyReader = bytes.NewReader(bodyBytes)
+		}
+		req, err := http.NewRequest(method, url, bodyReader)
 		if err != nil {
 			return nil, fmt.Errorf("failed to create request: %w", err)
 		}

cmd/mcpproxy/token_cmd.go

@@ -23,6 +23,7 @@ var (
 	tokenServers     string
 	tokenPermissions string
 	tokenExpires     string
+	tokenProfilePin  string
 )
 
 // GetTokenCommand returns the token parent command.
@@ -73,6 +74,7 @@ Examples:
 	cmd.Flags().StringVar(&tokenServers, "servers", "", "Comma-separated list of allowed server names, or \"*\" for all (required)")
 	cmd.Flags().StringVar(&tokenPermissions, "permissions", "", "Comma-separated permission tiers: read, write, destructive (required, must include read)")
 	cmd.Flags().StringVar(&tokenExpires, "expires", "30d", "Token expiry duration (e.g., 7d, 30d, 90d, 365d)")
+	cmd.Flags().StringVar(&tokenProfilePin, "profile-pin", "", "Pin this token to a profile; it can only operate in that profile (cannot switch via set_profile or /mcp/p/<other>)")
 	_ = cmd.MarkFlagRequired("name")
 	_ = cmd.MarkFlagRequired("servers")
 	_ = cmd.MarkFlagRequired("permissions")
@@ -160,6 +162,9 @@ func runTokenCreate(_ *cobra.Command, _ []string) error {
 		"permissions":     permissions,
 		"expires_in":      tokenExpires,
 	}
+	if tokenProfilePin != "" {
+		body["profile_pin"] = tokenProfilePin
+	}
 
 	bodyJSON, err := json.Marshal(body)
 	if err != nil {
@@ -209,6 +214,9 @@ func runTokenCreate(_ *cobra.Command, _ []string) error {
 	printField("  Name:        ", result, "name")
 	printListField("  Servers:     ", result, "allowed_servers")
 	printListField("  Permissions: ", result, "permissions")
+	if pin := getMapString(result, "profile_pin"); pin != "" {
+		fmt.Printf("  Profile Pin: %s\n", pin)
+	}
 	printField("  Expires:     ", result, "expires_at")
 
 	return nil
@@ -257,9 +265,9 @@ func runTokenList(_ *cobra.Command, _ []string) error {
 	}
 
 	// Table format
-	fmt.Printf("%-20s %-14s %-25s %-20s %-8s %-25s\n",
-		"NAME", "PREFIX", "SERVERS", "PERMISSIONS", "REVOKED", "EXPIRES")
-	fmt.Println(strings.Repeat("-", 115))
+	fmt.Printf("%-20s %-14s %-25s %-20s %-8s %-12s %-25s\n",
+		"NAME", "PREFIX", "SERVERS", "PERMISSIONS", "REVOKED", "PROFILE PIN", "EXPIRES")
+	fmt.Println(strings.Repeat("-", 128))
 
 	for _, t := range tokens {
 		tok, ok := t.(map[string]interface{})
@@ -276,15 +284,20 @@ func runTokenList(_ *cobra.Command, _ []string) error {
 		serverList := joinInterfaceSlice(tok, "allowed_servers", 23)
 		permList := joinInterfaceSlice(tok, "permissions", 0)
 
+		pin := getMapString(tok, "profile_pin")
+		if pin == "" {
+			pin = "-"
+		}
+
 		expiresAt := getMapString(tok, "expires_at")
 		if expiresAt != "" {
 			if t, parseErr := time.Parse(time.RFC3339, expiresAt); parseErr == nil {
 				expiresAt = t.Format("2006-01-02 15:04")
 			}
 		}
 
-		fmt.Printf("%-20s %-14s %-25s %-20s %-8s %-25s\n",
-			name, prefix, serverList, permList, revoked, expiresAt)
+		fmt.Printf("%-20s %-14s %-25s %-20s %-8s %-12s %-25s\n",
+			name, prefix, serverList, permList, revoked, pin, expiresAt)
 	}
 
 	return nil
@@ -335,6 +348,9 @@ func runTokenShow(_ *cobra.Command, args []string) error {
 	printField("Token Prefix:   ", result, "token_prefix")
 	printListField("Servers:        ", result, "allowed_servers")
 	printListField("Permissions:    ", result, "permissions")
+	if pin := getMapString(result, "profile_pin"); pin != "" {
+		fmt.Printf("Profile Pin:    %s\n", pin)
+	}
 	if revoked, ok := result["revoked"].(bool); ok {
 		fmt.Printf("Revoked:        %v\n", revoked)
 	}