Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

@markijbema
Copy link
Contributor

@markijbema markijbema commented Jan 21, 2026

Summary

This PR merges the MCP Servers settings tab into the Modes tab, renaming it to 'Agent Behaviour' with two sub-tabs: 'Modes' and 'MCP Servers'. The MCP Servers sub-tab only shows installed servers (marketplace tab removed).

Changes

  • Renamed 'Modes' settings tab to 'Agent Behaviour'
  • Added four sub-tabs: 'Modes', 'MCP Servers', 'Rules', 'Workflows'
  • MCP Servers tab shows only installed servers (marketplace removed)
  • Removed MCP Servers from top bar
  • also show all these four tabs in the popup below the chat area which previously showed only rules and workflows
CleanShot 2026-01-21 at 13 43 44@2x CleanShot 2026-01-21 at 13 44 10@2x

- Renamed 'Modes' settings tab to 'Agent Behaviour'
- Added two sub-tabs: 'Modes' and 'MCP Servers'
- MCP Servers tab shows only installed servers (marketplace removed)
- Created new AgentBehaviourView component to manage both tabs
- Modified ModesView to support hideHeader prop
- Updated kilocodeMcp/McpView to only export TabButton component
- Added translations for 'Agent Behaviour' in all 22 languages
- Marked all changes with kilocode_change comments for easier upstream merging
@changeset-bot
Copy link

changeset-bot bot commented Jan 21, 2026

🦋 Changeset detected

Latest commit: 3ea0a9b

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
Name Type
kilo-code Minor

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

…cp/McpView

- Moved TabButton component directly into AgentBehaviourView.tsx
- Deleted webview-ui/src/components/kilocodeMcp/McpView.tsx (not in upstream)
- This eliminates a Kilo-specific file that could cause merge conflicts
- Remove MCP button command definition from package.json
- Remove MCP button from sidebar and editor title menus
- Update navigation button positions after removal
- Remove mcpButtonClicked command handler from registerCommands.ts
- Remove mcpButtonClicked action from App.tsx tab mapping
- Remove mcpButtonClicked from ExtensionMessage and WebviewMessage types

The MCP settings are now only accessible through the centralized settings view.
@markijbema markijbema force-pushed the mark/merge-mcp-into-modes branch from e5a04cd to 84c9bc0 Compare January 21, 2026 11:58
@markijbema markijbema force-pushed the mark/merge-mcp-into-modes branch from 1defe4e to 61af1e7 Compare January 21, 2026 12:05
@markijbema markijbema force-pushed the mark/merge-mcp-into-modes branch from 8d66543 to 02e8d7c Compare January 21, 2026 12:47
@markijbema markijbema marked this pull request as ready for review January 21, 2026 12:54
@kiloconnect
Copy link
Contributor

kiloconnect bot commented Jan 21, 2026

Code Review Summary

Status: No Issues Found | Recommendation: Merge

This PR cleanly removes the MCP button from the top bar and centralizes agent behavior settings into the Agent Behaviour modal. The changes are well-structured and consistent across all affected files.

Key Changes Reviewed

  • ✅ Removed mcpButtonClicked command from types, handlers, and package.json
  • ✅ Updated KiloRulesToggleModal to include Modes and MCP tabs
  • ✅ Removed MCP button click handler from App.tsx
  • ✅ Added proper i18n translations for all supported locales
  • ✅ Changeset properly formatted with minor version bump
Files Reviewed (28 files)
  • .changeset/remove-mcp-top-bar-button.md
  • packages/types/src/vscode.ts
  • src/activate/registerCommands.ts
  • src/package.json
  • src/shared/ExtensionMessage.ts
  • src/shared/WebviewMessage.ts
  • webview-ui/src/App.tsx
  • webview-ui/src/components/kilocode/rules/KiloRulesToggleModal.tsx
  • webview-ui/src/i18n/locales/de/kilocode.json
  • webview-ui/src/i18n/locales/en/kilocode.json
  • webview-ui/src/i18n/locales/es/kilocode.json
  • webview-ui/src/i18n/locales/fr/kilocode.json
  • webview-ui/src/i18n/locales/hi/kilocode.json
  • webview-ui/src/i18n/locales/id/kilocode.json
  • webview-ui/src/i18n/locales/it/kilocode.json
  • webview-ui/src/i18n/locales/ja/kilocode.json
  • webview-ui/src/i18n/locales/ko/kilocode.json
  • webview-ui/src/i18n/locales/nl/kilocode.json
  • webview-ui/src/i18n/locales/pl/kilocode.json
  • webview-ui/src/i18n/locales/pt-BR/kilocode.json
  • webview-ui/src/i18n/locales/ru/kilocode.json
  • webview-ui/src/i18n/locales/th/kilocode.json
  • webview-ui/src/i18n/locales/tr/kilocode.json
  • webview-ui/src/i18n/locales/uk/kilocode.json
  • webview-ui/src/i18n/locales/vi/kilocode.json
  • webview-ui/src/i18n/locales/zh-CN/kilocode.json
  • webview-ui/src/i18n/locales/zh-TW/kilocode.json

markijbema added a commit that referenced this pull request Jan 21, 2026
Updates documentation to reflect the UI changes from PR #5264:
- 'Modes' settings tab renamed to 'Agent Behaviour'
- Four sub-tabs: Modes, MCP Servers, Rules, Workflows
- MCP Servers no longer in top bar
- Updated navigation instructions throughout docs
@markijbema
Copy link
Contributor Author

Doc changes: https://github.com/Kilo-Org/kilocode/pull/5273/changes

Waiting for approval on this one, then I'll also update the screenshots there

@markijbema markijbema merged commit 3a08425 into main Jan 21, 2026
12 checks passed
@markijbema markijbema deleted the mark/merge-mcp-into-modes branch January 21, 2026 13:40
markijbema added a commit that referenced this pull request Jan 21, 2026
The mcpButtonClicked command was removed from VSCode in PR #5264.
This removes the corresponding action from the JetBrains plugin to
maintain consistency between the two platforms.
kiloconnect bot pushed a commit that referenced this pull request Jan 21, 2026
The mcpButtonClicked command was removed from VSCode in PR #5264.
This removes the corresponding action from the JetBrains plugin to
maintain consistency between the two platforms.
markijbema added a commit that referenced this pull request Jan 22, 2026
Updates documentation to reflect the UI changes from PR #5264:
- 'Modes' settings tab renamed to 'Agent Behaviour'
- Four sub-tabs: Modes, MCP Servers, Rules, Workflows
- MCP Servers no longer in top bar
- Updated navigation instructions throughout docs
maywzh pushed a commit to maywzh/kilocode that referenced this pull request Jan 25, 2026
feat: merge MCP Servers into Modes as 'Agent Behaviour'
maywzh pushed a commit to maywzh/kilocode that referenced this pull request Jan 25, 2026
Updates documentation to reflect the UI changes from PR Kilo-Org#5264:
- 'Modes' settings tab renamed to 'Agent Behaviour'
- Four sub-tabs: Modes, MCP Servers, Rules, Workflows
- MCP Servers no longer in top bar
- Updated navigation instructions throughout docs
maywzh pushed a commit to maywzh/kilocode that referenced this pull request Jan 25, 2026
The mcpButtonClicked command was removed from VSCode in PR Kilo-Org#5264.
This removes the corresponding action from the JetBrains plugin to
maintain consistency between the two platforms.
maywzh pushed a commit to maywzh/kilocode that referenced this pull request Jan 25, 2026
feat: merge MCP Servers into Modes as 'Agent Behaviour'
maywzh pushed a commit to maywzh/kilocode that referenced this pull request Jan 25, 2026
The mcpButtonClicked command was removed from VSCode in PR Kilo-Org#5264.
This removes the corresponding action from the JetBrains plugin to
maintain consistency between the two platforms.
catrielmuller pushed a commit that referenced this pull request Jan 26, 2026
Updates documentation to reflect the UI changes from PR #5264:
- 'Modes' settings tab renamed to 'Agent Behaviour'
- Four sub-tabs: Modes, MCP Servers, Rules, Workflows
- MCP Servers no longer in top bar
- Updated navigation instructions throughout docs
catrielmuller pushed a commit that referenced this pull request Jan 26, 2026
The mcpButtonClicked command was removed from VSCode in PR #5264.
This removes the corresponding action from the JetBrains plugin to
maintain consistency between the two platforms.
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.

3 participants