Skip to content

Enhances MCP servers usage with Cursor#56474

Merged
gabrielcorado merged 2 commits intomasterfrom
gabrielcorado/mcp-cursor-enhancement
Jul 9, 2025
Merged

Enhances MCP servers usage with Cursor#56474
gabrielcorado merged 2 commits intomasterfrom
gabrielcorado/mcp-cursor-enhancement

Conversation

@gabrielcorado
Copy link
Copy Markdown
Contributor

@gabrielcorado gabrielcorado commented Jul 4, 2025

This PR consists of two changes:

  1. Cursor MCP configuration support: Cursor follows the same format as Claude Desktop. This PR only adds an alias for updating Cursor's global MCP configuration (--client-config=cursor), and updates the tip message to include Cursor instructions.
  2. Update teleport_list_databases function (MCP DB) to return text instead of embedded resources so Cursor can use this function. Cursor completely removed support for MCP resources, and any tool that returns its type is not parsed and returns an error. This change doesn't affect the server functionality, and other clients (like Claude Desktop) should have the same behavior.

For reviewers: Given that Cursor and Claude Desktop use the same configuration format, I've added small helper functions for Cursor (instead of duplicating or moving the implementation to a shared package).

Note: Cursor MCP deeplinks generation wasn't added as hyperlinks on terminals might not be the best UX. The links would probably be available on WebUI.

@gabrielcorado gabrielcorado added the no-changelog Indicates that a PR does not require a changelog entry label Jul 4, 2025
@github-actions github-actions Bot requested a review from atburke July 4, 2025 21:19
@github-actions github-actions Bot added size/sm tsh tsh - Teleport's command line tool for logging into nodes running Teleport. labels Jul 4, 2025
@greedy52 greedy52 added the MCP MCP Server related label Jul 7, 2025
Comment thread lib/client/db/mcp/server.go
Comment thread tool/tsh/common/mcp.go
Comment thread lib/client/mcp/claude/config.go
Comment thread tool/tsh/common/mcp.go Outdated
@gabrielcorado gabrielcorado requested a review from greedy52 July 7, 2025 15:01
@gabrielcorado gabrielcorado added this pull request to the merge queue Jul 9, 2025
Merged via the queue into master with commit 1789a2e Jul 9, 2025
40 checks passed
@gabrielcorado gabrielcorado deleted the gabrielcorado/mcp-cursor-enhancement branch July 9, 2025 17:29
marcoandredinis pushed a commit that referenced this pull request Jul 10, 2025
* feat(mcp): enhances MCP servers usage with Cursor

* refactor: code review suggestions
@greedy52 greedy52 mentioned this pull request Jul 15, 2025
greedy52 pushed a commit that referenced this pull request Jul 18, 2025
* feat(mcp): enhances MCP servers usage with Cursor

* refactor: code review suggestions
github-merge-queue Bot pushed a commit that referenced this pull request Jul 21, 2025
* Initial PostgreSQL MCP support (#54431)

* feat(mcp): initial postgres mcp

* test(postgres): fix missing mock function

* fix(gomod): go mod tidy all

* refactor: code review suggestions

* fix(tsh): mcp init missing logger

* chore(tsh): missing other route to database field

* refactor: use in-memory net listener

* test(tsh): add mcp db command test

* chore: fix license

* refactor(tsh): move logger init

* test(mcp): sort slices to avoid flakiness

* chore: fix lint

* test(mcp): sort the resources before assertion

* fix(mcp): update error handler for better message

* refactor: code review suggestions

* feat: add external error retriever for more accurate error messages

* refactor: use the same logger init for mcp purposes

* refactor: code review suggestions

* refactor(tsh): rename command to `tsh mcp db start`

* refactor(mcp): protect database resources with rw mutex

* chore: update server godocs

* chore: go mod tidy

* refactor: update command to take list of databases

* chore(mcp): license

* chore(tsh): remove unused function

* refactor: code review suggestions

* refactor(tsh): validate duplicated databases in MCP configuration

* refactor(tsh): rename files to mcp_db

* feat(mcp): add cluster name to the database resource

* fix(tsh): update InitLogger return type (#55479)

* MCP access part 1: update app definition and config (#54706)

* MCP access part 1: update app definition and config

* address feedback

* make -C integrations/operator crd

* MCP access part 2: new role options, access checker, role editor (#54734)

* MCP access part 2: new role options, access checker, role editor

* catch unsupported mcp fields

* simplify mcpToolsToModel

* MCP access part 3: audit events and reporting (#54779)

* MCP access part 3: audit events and reporting

* add new icon, storybook, format

* MCP access part 4: mcputils (#54880)

* MCP access part 4: mcp helpers

* address feedback

* address comment, minor edits

* update mcp-go

* MCP access part 5: Claude desktop config parser (#55179)

* claude desktop config

* rework

* split Config to Config and FileConfig

* add a comment on unofficial linux

* MCP access part 6: "tsh mcp ls" (#55292)

* MCP access part 6: "tsh mcp ls"

* address feedback

* MCP access part 7: MCP app in Web UI (#55306)

* MCP access part 7: MCP app in Web UI

* Make spacing in modal closer to what's in database modal

* add mcp app to ResourceActionButton.story.tsx

* move AppSubKind to shared/services/types.

* remove --format claude (not needed see part 8)

* add jsdoc

---------

Co-authored-by: Rafał Cieślak <rafal.cieslak@goteleport.com>

* MCP access part 8: tsh mcp config (#55370)

* MCP access part 8: tsh mcp login/logout

* change to --format and --config-file

* switch to config and drop logout

* enable debug by default

* remove unused ut functions

* MCP access part 9: tsh mcp connect, stub server, integration test (#55547)

* MCP access part 9: tsh mcp connect, stub server, integration test

* fix tests and lint

* MCP access part 10: server handler (#55644)

* MCP access part 10: server handler

* address feedback and fix docker tests

* add more comments

* minor lint fix

* move set logger default after other checks

* Implement `tsh mcp db config` (#55781)

* feat(tsh): add `tsh mcp db config` subcommand

* chore(claude): fix lint

* refactor: code review suggestions

* refactor: code review suggestions

* test(tsh): add missing option on test case

* chore(tsh): add message on manually adding database URI

* Refactor MCP database access to dial ALPN proxy directly (#55836)

* refactor: dial database instead of using local proxy for MCP servers

* refactor: review suggestions

* manual fixes

* tctl users add/update to support mcp tools trait (#56771)

* tctl users add/update to support mcp tools trait

* revert empty slice capability

* Enhances MCP servers usage with Cursor (#56474)

* feat(mcp): enhances MCP servers usage with Cursor

* refactor: code review suggestions

* mcputils refactor and new mcptest package (#56010)

* mcp server and mcputils refactor

* mcptest package

* allow testing in mcptest

* Teleport MCP demo server (#56637)

* Teleport MCP demo server

* replace guide tool with session tool, and switch to resource label

* add new flag to teleport configure

* replace teleport_session_id with mcp_transport_type

* feat(gomod): update mcp-go to v0.32.0

* eslint-disable-next-line (same in master)

---------

Co-authored-by: Gabriel Corado <gabriel.oliveira@goteleport.com>
Co-authored-by: Rafał Cieślak <rafal.cieslak@goteleport.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

MCP MCP Server related no-changelog Indicates that a PR does not require a changelog entry size/sm tsh tsh - Teleport's command line tool for logging into nodes running Teleport.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants