Team selector ux fix

[a-effort]

UX issue

If a user has only one team, an error message appears in the form being filled out, and the user is required to leave the workflow to find the team switcher and make a selection, even when they belong to only one team. For example:

Changes

• Team selection is no longer required when only one team exists
• Team selection is available in the form, rather than requiring a trip to the sidebar selector
• Validation happens on form submit, not on entering visibility
• Editing a record preserves the team it already belongs to

The sidebar switcher remains authoritative for an open form (#5077) while creating, until the caller picks a team in the selector. Editing is pinned to the record's own team. See "Team resolution" below.

Root cause

Team visibility was driven entirely by the sidebar switcher, and selectedTeamId starts as null ("All teams") every session (AuthContext.tsx, also reset on login). The forms never consulted the actual team list, so they could not distinguish "no team chosen" from "only one team exists."

A second, independent defect: usePromptForm re-validated in an effect whenever visibility was team, so the field turned red the moment the user picked "Team," before anything had gone wrong.

What was added

• src/hooks/useTeams.ts: useTeams(), resolveTeamId(teams, selectedTeamId, explicitTeamId), and useTeamScope(). Resolution order: explicit choice → sidebar's active team → the caller's personal team → first team. The last two steps prevent a single-team caller from ever being asked, and give multi-team callers a reasonable default instead of an empty required field behind a disabled submit button.
• useTeamScope() owns the entire visibility→team effect for the forms that hold team state as a teamId/onTeamIdChange pair. It holds the caller's pick as an id rather than a "has picked" flag, and passes it to resolveTeamId as the explicit team, so the pick outranks the defaults by priority rather than by short-circuiting the resolve. usePromptForm resolves the same way against its own derived state.
• src/components/common/TeamSelect.tsx: renders nothing below two teams; renders a labeled select above. It still renders an error with no selector, so a failed /teams load explains an inert submit button rather than failing silently.

Both are shared by all three forms, which previously each carried their own copy of the sidebar-mirroring logic: prompts (usePromptForm + PromptForm), tools (ToolAdvancedSettings), servers (mcp-servers/AdvancedSettings).

Team resolution

One table, since three forms depend on it:

Situation	Team the form uses
Creating, sidebar on a team	that team
Creating, sidebar on "All teams"	personal team, else first team
Creating, caller picked in the form	their pick; a later sidebar switch does not override it
Editing	the record's own team
Editing, caller picked in the form	their pick
Visibility leaves Team and returns	the pick if there was one, else the record's team, else re-resolved

Other changes

• Error moved from visibility to teamId in the prompt schema, so the message lands on the selector rather than the visibility dropdown. API team_id field errors now map to teamId as well (previously visibility).
• i18n cleanup across all three locales (en-US, es-ES, pt-BR): removed prompts.add.visibility.team.selectedHint, ...selectFromSidebarHint, and mcpServer.advanced.teamScoped / ...teamNotSelected (the last two arrived on main while this was open, i18n-ing hints this PR deletes); added common.team.label, common.team.placeholder, common.required.
• teamError prop added to ToolAdvancedSettings and mcp-servers/AdvancedSettings. errors.teamId existed in both form hooks but was never rendered anywhere.
• usePromptForm now owns team state (teamId + setTeamId) instead of deriving it read-only from the sidebar.

Testing

npm test green: 171 files, 2971 passed / 1 skipped. tsc -b --noEmit and lint clean.

New: useTeams.test.ts (including a useTeamScope block), TeamSelect.test.tsx. Updated the team-visibility cases in usePromptForm.test.ts, PromptForm.test.tsx, MCPServerForm.test.tsx, AdvancedSettings.test.tsx, ToolAdvancedSettings.test.tsx.

The old cases asserted the sidebar hint text and the pre-submit error, both of which are the behavior being removed.

Every edit-mode and round-trip test was checked against a deliberately broken build (dropping the explicit team argument from resolveTeamId): 11 fail, so none of them pass for the wrong reason.

Changes after review (thanks @marekdano)

• Editing no longer reassigns the team (findings 1 and 2). useTeamScope takes the record's own team as the explicit argument, threaded in from the loaded server (useMCPServerForm.initialTeamId) and the edited tool (ToolForm). Covered end-to-end in MCPServerForm.test.tsx (fresh session, sidebar on "All teams", server scoped to a non-personal team), plus component-level cases in both forms.
• Resolution logic centralized (finding 3). The duplicated effect is gone from both components; useTeamScope is the only copy.
• requiresSelection removed (finding 4). TeamSelect owns the < 2 threshold.
• One more, found while verifying the above: the in-form pick was tracked as a boolean that latched for the life of the mount, so picking a team, switching visibility away from Team, then switching back left teamId empty with nothing able to refill it. Holding the picked id instead of the flag removes the latch and the dead end together.

Notes

1. MCPServerForm.test.tsx > team visibility > shows the selector for several teams asserts only that the selector renders, not that it defaults to the personal team. The defaulting behavior is asserted in AdvancedSettings.test.tsx and PromptForm.test.tsx; edit-mode pinning now has its own composed test in the same file.
2. One test was removed: ToolAuth.test.tsx > shows team scope hint.... The hint no longer exists, and that file has no /teams mock, so any replacement would have passed for the wrong reason. Equivalent coverage lives in ToolAdvancedSettings.test.tsx.
3. format:check is red here for a reason unrelated to this branch: chore: Pre-commit hooks #2 broadened it to cover root-level *.md, and README.md/DOCKER.md had never been formatted, so main itself is red and every open PR inherits it through the merge ref. chore: format root markdown with Prettier #50 fixes that; this goes green once it lands and this branch is rebased.

[gcgoncalves]

Nice validation addition. 👏

[marekdano]

Findings

1. Editing a team-scoped MCP server silently reassigns its team (CRITICAL)

File: src/components/mcp-servers/AdvancedSettings.tsx:151

resolveTeamId(teams, selectedTeamId) is called without the record's current teamId as the explicit third argument, so opening the edit form for a team-scoped MCP server silently overwrites its team as soon as team data loads.

Failure scenario: A caller with a fresh session (selectedTeamId is null — AuthContext resets it on every login) opens the edit form for an MCP server scoped to a shared team that isn't their personal team. On mount, pickedInForm is false, so the effect runs resolveTeamId(teams, null), which falls back to the caller's personal team — differing from the server's actual teamId — and fires onTeamIdChange(personalTeamId) immediately, before the user touches anything. If they submit without noticing, the server is reassigned from the shared team to their personal team. This exact overwrite is even asserted as expected behavior by the existing test "propagates selectedTeamId change after teamId is already set (regression: was ignored by !teamId guard)" in AdvancedSettings.test.tsx.

---

2. Same defect in the Tools form (CRITICAL)

File: src/components/tools/ToolAdvancedSettings.tsx:93

Identical bug: resolveTeamId(teams, selectedTeamId) omits the tool's current teamId as the explicit override, so editing a team-scoped tool silently reassigns its team on mount.

Failure scenario: Same as above — opening the edit form for a tool scoped to a non-personal team, with the sidebar on its default "All teams," retargets the tool to the caller's personal team before they interact with the selector. Notably, usePromptForm.ts (same PR) avoids this exact bug by seeding chosenTeamId from initialValues.teamId and passing it as resolveTeamId's third argument — that protection was not applied to the Tools/Servers forms.

---

3. Team-resolution logic duplicated instead of centralized (altitude)

File: src/components/mcp-servers/AdvancedSettings.tsx:144

The pickedInForm state + useEffect calling resolveTeamId is duplicated near-verbatim in ToolAdvancedSettings.tsx, despite this PR's stated goal of centralizing the sidebar-mirroring logic that used to be copy-pasted per form.

Cost: Because this effect lives separately in both files rather than in a shared hook (e.g., alongside resolveTeamId in useTeams.ts), findings #1 and #2 had to be (and were) introduced independently twice, and a fix must likewise be applied twice.

---

4. Unused requiresSelection field (dead code)

File: src/hooks/useTeams.ts:13

useTeams()'s requiresSelection is computed and unit-tested but never consumed - AdvancedSettings, ToolAdvancedSettings, and usePromptForm all read only teams, and TeamSelect.tsx re-derives its own teams.length < 2 check independently.

Cost: Not a runtime bug, but a maintenance trap — a future call site could wire up requiresSelection while TeamSelect uses its own separate threshold, creating two sources of truth that can drift.

[a-effort]

Thanks @marekdano. All four are addressed.

1 and 2, editing reassigns the team. Both correct. Separating them because the severities differ.

Finding 2 (tools) is a regression this PR introduced. The old effect was guarded by if (selectedTeamId && !teamId), which preserved a loaded team. That guard was dropped here.

Finding 1 (servers) was flagged in Note 1 as pre-existing. That was true of the root cause but understated the impact. The old code did onTeamIdChange(selectedTeamId ?? ""), so on a fresh session it cleared teamId: isValid went false and submit was visibly disabled. The new code substitutes a valid personal-team id, so the form submits and retargets the record. Broken-and-blocked becoming silently-wrong is a change in impact, so it belonged here rather than in a follow-up.

Fix for both: useTeamScope takes the record's own team and passes it as resolveTeamId's explicit argument, so the sidebar is authoritative while creating only. Threaded in from the loaded server (useMCPServerForm.initialTeamId) and the edited tool (ToolForm). usePromptForm already had the shape and served as the reference.

3, duplication. Fixed as framed: the effect now lives in useTeamScope() next to resolveTeamId, and both components call it. The framing that duplication is why the bug appeared twice held up. While consolidating, a third defect surfaced (below), and it only needed fixing once.

4, requiresSelection. Removed. TeamSelect owns the < 2 threshold.

One more, found while verifying the above. The in-form pick was tracked as a boolean that latched for the life of the mount. Picking a team, switching visibility away from Team, then switching back left teamId as "" with nothing able to refill it: the latch suppressed the re-resolve, leaving a required field empty behind a disabled submit. Fixed by holding the picked id rather than a "has picked" flag, so it outranks the defaults inside resolveTeamId by priority instead of by short-circuit. That also makes the resolve idempotent, so the round-trip works without special-casing.

Verification. npm test: 171 files / 2971 passed. tsc -b --noEmit and lint clean. Every edit-mode and round-trip test was run against a deliberately broken build (explicit team argument removed): 11 fail, so none pass for the wrong reason.

format:check is red for an unrelated reason: #2 broadened it to root-level *.md, and README.md/DOCKER.md had never been formatted, so main is red and every open PR inherits it through the merge ref. #50 fixes that; this goes green after it lands and this branch is rebased.

[marekdano]

The PR looks good!
Just one finding

src/components/mcp-servers/AdvancedSettings.tsx

7+ previously localized strings replaced with hardcoded English literals — auth type label, one-time auth label/description/warning, passthrough label/description/placeholder, and visibility placeholder. The corresponding keys still exist in all three locale JSON files but are no longer consumed. Es-ES and pt-BR users see English for these strings.

Strings affected:

• mcpServer.advanced.authTypeLabel → "Authentication type"
• mcpServer.advanced.oneTimeAuthLabel → "One-time authentication"
• mcpServer.advanced.oneTimeAuthDescription → "Use credentials once, don't store them..."
• mcpServer.advanced.oneTimeAuthWarning → "Add passthrough headers when..."
• mcpServer.advanced.passthroughLabel → "Passthrough headers"
• mcpServer.advanced.passthroughDescription → "Add comma-separate headers..."
• mcpServer.advanced.passthroughPlaceholder → "e.g. Authorization, X-Tenant-Id..."
• mcpServer.advanced.visibilityPlaceholder → "Select visibility"

**Suggestion: ** Either restore the intl.formatMessage calls, or explicitly remove the dead keys from all three locale files and treat the file as English-only until translated.