refactor(config): rename Teams→ServerEdition; internal/teams→serveredition; teams→server_edition key (alias)

Renames the server-edition surface for clarity and to disambiguate from any
"teams" collaboration concept (MCP-1086).

Go:
- config.TeamsConfig→ServerEditionConfig, TeamsOAuthConfig→ServerEditionOAuthConfig,
  DefaultTeamsConfig→DefaultServerEditionConfig; Config.Teams→Config.ServerEdition.
- Config key/tag teams→server_edition. Legacy "teams" key still loads onto
  ServerEdition via normalize-on-load in loadConfigFile (new key wins). Compiles
  in both editions (ServerEditionConfig is a struct{} stub in personal builds).
- Move internal/teams/→internal/serveredition/ (package teams→serveredition,
  incl. broker/ from #588); update all imports and selectors.
- Rename exported symbols: TeamsAuthMiddleware→ServerEditionAuthMiddleware,
  TeamsStatusInfo→ServerEditionStatusInfo, TeamsInfo→ServerEditionInfo,
  wireTeamsOAuth→wireServerEditionOAuth.
- `mcpproxy status -o json` server-edition block key teams→server_edition (aligns
  output with the rename).

Edition strings ("personal"/"server"), the `server` build tag, and the
edition_teams.go build-tag filename are unchanged per scope.

Tests:
- New file-load back-compat tests: new server_edition key, legacy teams key,
  and both-keys-new-wins (server-tagged).

Docs:
- CLAUDE.md path/config-key references (kept under the 40k char gate); active
  feature docs; specs config-key + code-path references. Spec directory slugs
  (029-mcpproxy-teams, 024-teams-multiuser-oauth) and historical narrative are
  preserved intact.

swagger: teams config is swaggerignore — no REST surface change (verified).

Related MCP-1086

Author: Dumbris

CLAUDE.md

@@ -45,13 +45,13 @@ MCPProxy is built in two editions from the same codebase using Go build tags:
 |-----------|---------|
 | `cmd/mcpproxy/edition.go` | Default edition = "personal" |
 | `cmd/mcpproxy/edition_teams.go` | Build-tagged override for server edition |
-| `cmd/mcpproxy/teams_register.go` | Server feature registration entry point |
-| `internal/teams/` | Server-only code (all files have `//go:build server`) |
-| `internal/teams/auth/` | OAuth authentication, session management, JWT tokens, middleware |
-| `internal/teams/users/` | User/session models, BBolt store, user server management |
-| `internal/teams/workspace/` | Per-user workspace manager for personal upstream servers |
-| `internal/teams/multiuser/` | Multi-user router, tool filtering, activity isolation |
-| `internal/teams/api/` | Server REST API endpoints (user, admin, auth) |
+| `cmd/mcpproxy/serveredition_register.go` | Server feature registration entry point |
+| `internal/serveredition/` | Server-only code (all files have `//go:build server`) |
+| `internal/serveredition/auth/` | OAuth, sessions, JWT tokens, middleware |
+| `internal/serveredition/users/` | User/session models, BBolt store |
+| `internal/serveredition/workspace/` | Per-user workspace for personal upstreams |
+| `internal/serveredition/multiuser/` | Multi-user router, tool filtering, activity isolation |
+| `internal/serveredition/api/` | Server REST API endpoints (user, admin, auth) |
 | `native/macos/MCPProxy/` | Swift macOS tray app (SwiftUI, macOS 13+) |
 | `native/macos/MCPProxyUITest/` | Swift MCP server for UI testing (accessibility + screenshots) |
 | `native/windows/` | Future C# tray app (placeholder) |
@@ -70,7 +70,7 @@ Server edition supports OAuth-based multi-user authentication with Google, GitHu
 
 ```json
 {
-  "teams": {
+  "server_edition": {
     "enabled": true,
     "admin_emails": ["admin@company.com"],
     "oauth": {
@@ -117,7 +117,7 @@ Server edition supports OAuth-based multi-user authentication with Google, GitHu
 ### Server Testing
 
 ```bash
-go test -tags server ./internal/teams/... -v -race  # All server unit + integration tests
+go test -tags server ./internal/serveredition/... -v -race  # All server unit + integration tests
 go build -tags server ./cmd/mcpproxy                # Build server edition
 go build ./cmd/mcpproxy                            # Verify personal edition unaffected
 ```

cmd/mcpproxy/edition.go

@@ -1,5 +1,5 @@
 package main
 
 // Edition identifies which MCPProxy edition this binary is.
-// This is the default value; teams edition overrides it via build tags.
+// This is the default value; server edition overrides it via build tags.
 var Edition = "personal"

cmd/mcpproxy/serveredition_register.go

@@ -0,0 +1,11 @@
+//go:build server
+
+package main
+
+// Server edition features are registered via init() functions in their
+// respective packages. The actual setup happens when the server calls
+// serveredition.SetupAll() during HTTP server initialization (see internal/server/serveredition_wire.go).
+//
+// This file imports the serveredition package for its init() side effects,
+// which register feature modules in the server registry.
+import _ "github.com/smart-mcp-proxy/mcpproxy-go/internal/serveredition"

cmd/mcpproxy/status_cmd.go

@@ -21,24 +21,24 @@ import (
 
 // StatusInfo holds the collected status data for display.
 type StatusInfo struct {
-	State         string            `json:"state"`
-	Edition       string            `json:"edition"`
-	ListenAddr    string            `json:"listen_addr"`
-	Uptime        string            `json:"uptime,omitempty"`
-	UptimeSeconds float64           `json:"uptime_seconds,omitempty"`
-	APIKey        string            `json:"api_key"`
-	WebUIURL      string            `json:"web_ui_url"`
-	RoutingMode   string            `json:"routing_mode"`
-	Endpoints     map[string]string `json:"endpoints"`
-	Servers       *ServerCounts     `json:"servers,omitempty"`
-	SocketPath    string            `json:"socket_path,omitempty"`
-	ConfigPath    string            `json:"config_path,omitempty"`
-	Version       string            `json:"version,omitempty"`
-	TeamsInfo     *TeamsStatusInfo  `json:"teams,omitempty"`
+	State             string                   `json:"state"`
+	Edition           string                   `json:"edition"`
+	ListenAddr        string                   `json:"listen_addr"`
+	Uptime            string                   `json:"uptime,omitempty"`
+	UptimeSeconds     float64                  `json:"uptime_seconds,omitempty"`
+	APIKey            string                   `json:"api_key"`
+	WebUIURL          string                   `json:"web_ui_url"`
+	RoutingMode       string                   `json:"routing_mode"`
+	Endpoints         map[string]string        `json:"endpoints"`
+	Servers           *ServerCounts            `json:"servers,omitempty"`
+	SocketPath        string                   `json:"socket_path,omitempty"`
+	ConfigPath        string                   `json:"config_path,omitempty"`
+	Version           string                   `json:"version,omitempty"`
+	ServerEditionInfo *ServerEditionStatusInfo `json:"server_edition,omitempty"`
 }
 
-// TeamsStatusInfo holds teams-specific status information.
-type TeamsStatusInfo struct {
+// ServerEditionStatusInfo holds server-edition-specific status information.
+type ServerEditionStatusInfo struct {
 	OAuthProvider string   `json:"oauth_provider"`
 	AdminEmails   []string `json:"admin_emails"`
 }
@@ -173,8 +173,8 @@ func collectStatusFromDaemon(cfg *config.Config, socketPath, configPath string)
 		info.RoutingMode = config.RoutingModeRetrieveTools
 	}
 
-	// Add teams info if available
-	info.TeamsInfo = collectTeamsInfo(cfg)
+	// Add server edition info if available
+	info.ServerEditionInfo = collectServerEditionInfo(cfg)
 
 	// Get status data (running, listen_addr, upstream_stats)
 	statusData, err := client.GetStatus(ctx)
@@ -247,7 +247,7 @@ func collectStatusFromConfig(cfg *config.Config, socketPath, configPath string)
 		ConfigPath:  configPath,
 	}
 
-	info.TeamsInfo = collectTeamsInfo(cfg)
+	info.ServerEditionInfo = collectServerEditionInfo(cfg)
 
 	return info
 }
@@ -416,11 +416,11 @@ func printStatusTable(info *StatusInfo) {
 		}
 	}
 
-	if info.TeamsInfo != nil {
+	if info.ServerEditionInfo != nil {
 		fmt.Println()
 		fmt.Println("Server Edition")
-		fmt.Printf("  %-12s %s\n", "OAuth:", info.TeamsInfo.OAuthProvider)
-		fmt.Printf("  %-12s %s\n", "Admins:", strings.Join(info.TeamsInfo.AdminEmails, ", "))
+		fmt.Printf("  %-12s %s\n", "OAuth:", info.ServerEditionInfo.OAuthProvider)
+		fmt.Printf("  %-12s %s\n", "Admins:", strings.Join(info.ServerEditionInfo.AdminEmails, ", "))
 	}
 }
 

cmd/mcpproxy/status_serveredition.go

@@ -0,0 +1,18 @@
+//go:build server
+
+package main
+
+import "github.com/smart-mcp-proxy/mcpproxy-go/internal/config"
+
+func collectServerEditionInfo(cfg *config.Config) *ServerEditionStatusInfo {
+	if cfg.ServerEdition == nil || !cfg.ServerEdition.Enabled {
+		return nil
+	}
+	info := &ServerEditionStatusInfo{
+		AdminEmails: cfg.ServerEdition.AdminEmails,
+	}
+	if cfg.ServerEdition.OAuth != nil {
+		info.OAuthProvider = cfg.ServerEdition.OAuth.Provider
+	}
+	return info
+}

cmd/mcpproxy/status_teams_stub.go cmd/mcpproxy/status_serveredition_stub.gocmd/mcpproxy/status_teams_stub.go renamed to cmd/mcpproxy/status_serveredition_stub.go

@@ -4,6 +4,6 @@ package main
 
 import "github.com/smart-mcp-proxy/mcpproxy-go/internal/config"
 
-func collectTeamsInfo(_ *config.Config) *TeamsStatusInfo {
+func collectServerEditionInfo(_ *config.Config) *ServerEditionStatusInfo {
 	return nil
 }

cmd/mcpproxy/status_teams.go

@@ -12,7 +12,7 @@ friendly, prioritized form sections instead of raw JSON:
   isolation, sensitive-data detection, output validation, output sanitisation,
   activity retention, logging, TLS, …).
 - **Raw JSON** — the full Monaco editor, kept as an escape hatch.
-- **Teams** — server edition only.
+- **Server edition** — server build only.
 
 ## How saving works
 

cmd/mcpproxy/teams_register.go

@@ -42,7 +42,7 @@ type AgentToken struct {
 	CreatedAt      time.Time  `json:"created_at"`
 	LastUsedAt     *time.Time `json:"last_used_at,omitempty"`
 	Revoked        bool       `json:"revoked"`
-	UserID         string     `json:"user_id,omitempty"` // Owner user ID (teams edition)
+	UserID         string     `json:"user_id,omitempty"` // Owner user ID (server edition)
 }
 
 // IsExpired returns true if the token has passed its expiry time.