Skip to content

refactor(server-edition): rename Teams → Server edition (identifiers, config key alias, docs)#607

Closed
Dumbris wants to merge 1 commit into
mainfrom
rename-teams-to-server-edition
Closed

refactor(server-edition): rename Teams → Server edition (identifiers, config key alias, docs)#607
Dumbris wants to merge 1 commit into
mainfrom
rename-teams-to-server-edition

Conversation

@Dumbris

@Dumbris Dumbris commented Jun 5, 2026

Copy link
Copy Markdown
Member

What

Reconciles the multi-user code/config to the product's Server edition naming. The editions are Server and Personal; the multi-user feature still carried the legacy name "Teams". This is Child A (backend + docs) of MCP-1085. Frontend (frontend/src/{views,components}/teams) is Child B, tracked separately and blocked on this.

Changes

  • Go identifiers: TeamsConfigServerEditionConfig, TeamsOAuthConfigServerEditionOAuthConfig, TeamsAuthMiddlewareServerEditionAuthMiddleware, TeamsStatusInfo/TeamsInfoServerEdition*, locals/test names too.
  • Package: internal/teams/internal/serveredition/ (via git mv, history preserved); package teamsserveredition; all import paths + aliases (teamsauthseauth, teamsapiseapi) updated.
  • Config key: teamsserver_edition with a backward-compat alias. The legacy teams key is normalized on read in Config.UnmarshalJSON (mirrors the provenance normalize-on-read in feat(registry): simplify trust/quarantine + add edit endpoint (MCP-1072) #594), so existing deployments keep working; SaveConfig always writes the new key. The new key wins when both are present.
  • Files renamed: teams_config.goserver_edition_config.go, teams_register.goserver_edition_register.go, teams_wire.goserver_edition_wire.go, edition_teams.goedition_server.go, status_teams*.gostatus_server_edition*.go (+ stubs/tests).
  • Docs/comments/strings: Teams → Server edition (CLAUDE.md paths + config example + alias note, docs/features/settings-page.md, code comments, validation error messages).

Unchanged by design

  • The //go:build server build tag and the server/personal edition strings (binary identity) — per the issue.
  • Dated historical design snapshot docs/plans/2026-03-08-repo-restructure-design.md and specs/029-* left as archival record (they describe the original decision, even using the since-superseded -tags teams).

Verification

  • go build ./... (personal) + go build -tags server ./... — both green.
  • New config-alias unit tests (TDD): legacy teams key → ServerEdition, new key wins, output always writes server_edition — pass in both editions.
  • go test -tags server -race ./internal/serveredition/... — all green.
  • ./scripts/test-api-e2e.sh — 65/65.
  • ./scripts/run-linter.sh — 0 issues. CLAUDE.md kept under the 40k CI gate (39,904) by trimming 4 zero-value auto-generated "Active Technologies" N/A lines.

Related MCP-1085

Reconcile the multi-user code/config to the product's "Server edition"
naming (editions are Server and Personal; "Teams" was the legacy name).

- Go identifiers: TeamsConfig→ServerEditionConfig, TeamsOAuthConfig,
  TeamsAuthMiddleware, TeamsStatusInfo/Info, and locals → ServerEdition*.
- Package: internal/teams/ → internal/serveredition/ (git-mv, history
  preserved); package teams → serveredition; import paths/aliases updated.
- Config key: "teams" → "server_edition" with a backward-compat alias —
  the legacy key is normalized on read (Config.UnmarshalJSON) so existing
  deployments keep working; SaveConfig always writes the new key. New key
  wins when both are present.
- Docs/comments/strings: Teams → Server edition (CLAUDE.md, settings-page).
- Unchanged by design: the //go:build server tag and the server/personal
  edition strings (binary identity).

Tested: builds (personal + server), config alias unit tests (both
editions), full serveredition suite -race, API E2E 65/65, linter clean.

Related MCP-1085
@cloudflare-workers-and-pages

Copy link
Copy Markdown

Deploying mcpproxy-docs with  Cloudflare Pages  Cloudflare Pages

Latest commit: 8cdbf6c
Status: ✅  Deploy successful!
Preview URL: https://175647a8.mcpproxy-docs.pages.dev
Branch Preview URL: https://rename-teams-to-server-editi.mcpproxy-docs.pages.dev

View logs

@codecov-commenter

codecov-commenter commented Jun 5, 2026

Copy link
Copy Markdown

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

❌ Patch coverage is 63.63636% with 8 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
cmd/mcpproxy/status_cmd.go 20.00% 3 Missing and 1 partial ⚠️
internal/config/config.go 71.42% 2 Missing and 2 partials ⚠️

📢 Thoughts on this report? Let us know!

@github-actions

github-actions Bot commented Jun 5, 2026

Copy link
Copy Markdown

📦 Build Artifacts

Workflow Run: View Run
Branch: rename-teams-to-server-edition

Available Artifacts

  • archive-darwin-amd64 (28 MB)
  • archive-darwin-arm64 (25 MB)
  • archive-linux-amd64 (16 MB)
  • archive-linux-arm64 (14 MB)
  • archive-windows-amd64 (28 MB)
  • archive-windows-arm64 (24 MB)
  • frontend-dist-pr (0 MB)
  • installer-dmg-darwin-amd64 (21 MB)
  • installer-dmg-darwin-arm64 (19 MB)

How to Download

Option 1: GitHub Web UI (easiest)

  1. Go to the workflow run page linked above
  2. Scroll to the bottom "Artifacts" section
  3. Click on the artifact you want to download

Option 2: GitHub CLI

gh run download 26997568596 --repo smart-mcp-proxy/mcpproxy-go

Note: Artifacts expire in 14 days.

@Dumbris

Dumbris commented Jun 8, 2026

Copy link
Copy Markdown
Member Author

Triage (release-eng PR sweep, MCP-1760) — held, not merged.

Not routing to Codex review until the dedup decision is made.

@Dumbris

Dumbris commented Jun 9, 2026

Copy link
Copy Markdown
Member Author

Closing in favor of #603 (owner decision, 2026-06-09). #603 lands the Teams→ServerEdition config rename, is green, and is already in QA. This PR overlapped on the config rename (would conflict on merge) and is red on a Windows unit test.

The branch rename-teams-to-server-edition is preserved — the identifier-level renames and doc updates unique to this PR can be re-PR'd separately on top of #603 if we want them. Not deleting.

@Dumbris Dumbris closed this Jun 9, 2026
Dumbris added a commit that referenced this pull request Jun 9, 2026
…n" (#626)

The server-edition Settings surface used legacy "Teams" wording (the tab
label and the "Teams / Server" section heading). Align it to "Server
Edition" to match the edition identity (`/api/v1/status` edition ===
"server"), which the frontend already keys off.

Extract the section into SERVER_EDITION_FIELDS + label constants in
settings/fields.ts and add a vitest guard. The config dot-paths stay on
the legacy `teams.*` key on purpose: the backend config-key rename
(`teams` -> `server_edition`, MCP-1085 / PR #607) is not merged, so a
live config is still `teams`-keyed. Flipping the keys early would make
`hasTeams` read `state.working.server_edition` and silently hide the
whole tab. The key switch is tracked as a follow-up blocked by that
backend change.

Related MCP-1087
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants