Skip to content

agent_ui: Remove duplicate MCP Servers menu item (#60712) (cherry-pick to preview) - #60714

Merged
zed-zippy[bot] merged 1 commit into
v1.11.xfrom
cherry-pick-v1.11.x-a5f696bf
Jul 9, 2026
Merged

agent_ui: Remove duplicate MCP Servers menu item (#60712) (cherry-pick to preview)#60714
zed-zippy[bot] merged 1 commit into
v1.11.xfrom
cherry-pick-v1.11.x-a5f696bf

Conversation

@zed-zippy

@zed-zippy zed-zippy Bot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

Cherry-pick of #60712 to preview


Objective

Fixes #60709 by removing the
duplicate menu section for "MCP Servers".

Solution

Update agent_ui::agent_panel::AgentPanel::render_panel_options_menu to
ensure the "MCP Servers" section is only rendered once, if not using a
Terminal Thread.

Testing

Tested manually, comparing against the stable release, as this bug is
present in Preview. Screenshot is shown in the "Showcase" section.

Self-Review Checklist:

  • I've reviewed my own diff for quality, security, and reliability
  • Unsafe blocks (if any) have justifying comments
  • The content adheres to Zed's UI standards
    (UX/UI
    and
    icon
    guidelines)
  • Tests cover the new/changed behavior
  • Performance impact has been considered and is acceptable

Showcase

Before CleanShot 2026-07-09 at 23 14
34@2x
After CleanShot 2026-07-09 at 23 15
13@2x

Release Notes:

  • N/A

# Objective

Fixes #60709 by removing the
duplicate menu section for "MCP Servers".

## Solution

Update `agent_ui::agent_panel::AgentPanel::render_panel_options_menu` to
ensure the "MCP Servers" section is only rendered once, if not using a
Terminal Thread.

## Testing

Tested manually, comparing against the stable release, as this bug is
present in Preview. Screenshot is shown in the "Showcase" section.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

## Showcase

<details>
  <summary>Before</summary>
<img width="2736" height="1586" alt="CleanShot 2026-07-09 at 23 14
34@2x"
src="https://github.com/user-attachments/assets/ce2014db-bd72-46fb-bfa1-247cd5471daf"
/>

</details>

<details>
  <summary>After</summary>
<img width="2736" height="1586" alt="CleanShot 2026-07-09 at 23 15
13@2x"
src="https://github.com/user-attachments/assets/bbba9965-3f6a-4137-94e5-17704efd2cce"
/>

</details>


---

Release Notes:

- N/A
@cla-bot cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label Jul 9, 2026
@zed-community-bot zed-community-bot Bot added the bot Pull requests authored by a bot label Jul 9, 2026
@zed-zippy
zed-zippy Bot merged commit fefc88b into v1.11.x Jul 9, 2026
46 checks passed
@zed-zippy
zed-zippy Bot deleted the cherry-pick-v1.11.x-a5f696bf branch July 9, 2026 22:43
jolutz pushed a commit to jolutz/zed that referenced this pull request Aug 8, 2026
… (cherry-pick to preview) (zed-industries#60714)

Cherry-pick of zed-industries#60712 to preview

----
# Objective

Fixes zed-industries#60709 by removing the
duplicate menu section for "MCP Servers".

## Solution

Update `agent_ui::agent_panel::AgentPanel::render_panel_options_menu` to
ensure the "MCP Servers" section is only rendered once, if not using a
Terminal Thread.

## Testing

Tested manually, comparing against the stable release, as this bug is
present in Preview. Screenshot is shown in the "Showcase" section.

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content adheres to Zed's UI standards

([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and

[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [ ] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

## Showcase

<details>
  <summary>Before</summary>
<img width="2736" height="1586" alt="CleanShot 2026-07-09 at 23 14
34@2x"

src="https://github.com/user-attachments/assets/ce2014db-bd72-46fb-bfa1-247cd5471daf"
/>

</details>

<details>
  <summary>After</summary>
<img width="2736" height="1586" alt="CleanShot 2026-07-09 at 23 15
13@2x"

src="https://github.com/user-attachments/assets/bbba9965-3f6a-4137-94e5-17704efd2cce"
/>

</details>


---

Release Notes:

- N/A

Co-authored-by: Dino <dinojoaocosta@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bot Pull requests authored by a bot cla-signed The user has signed the Contributor License Agreement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant