Skip to content

[v18] MCP access#56143

Merged
greedy52 merged 23 commits intobranch/v18from
STeve/v18_mcp_access_beta
Jul 21, 2025
Merged

[v18] MCP access#56143
greedy52 merged 23 commits intobranch/v18from
STeve/v18_mcp_access_beta

Conversation

gabrielcorado and others added 15 commits June 26, 2025 15:02
* 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
* 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

* catch unsupported mcp fields

* simplify mcpToolsToModel
* MCP access part 3: audit events and reporting

* add new icon, storybook, format
* MCP access part 4: mcp helpers

* address feedback

* address comment, minor edits

* update mcp-go
* claude desktop config

* rework

* split Config to Config and FileConfig

* add a comment on unofficial linux
* MCP access part 6: "tsh mcp ls"

* address feedback
* 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 login/logout

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

* switch to config and drop logout

* enable debug by default

* remove unused ut functions
…5547)

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

* fix tests and lint
* 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
* 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: dial database instead of using local proxy for MCP servers

* refactor: review suggestions
@greedy52 greedy52 self-assigned this Jun 26, 2025
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Jun 26, 2025

Amplify deployment status

Branch Commit Job ID Status Preview Updated (UTC)
STeve/v18_mcp_access_beta 7b76cc5 6 ✅SUCCEED steve-v18-mcp-access-beta 2025-07-21 20:26:37

@greedy52 greedy52 requested a review from gabrielcorado June 26, 2025 19:57
@ptgott
Copy link
Copy Markdown
Contributor

ptgott commented Jul 7, 2025

@greedy52 Just checking to see what we'll need to do to get this one ready to merge. Thanks!

@greedy52
Copy link
Copy Markdown
Contributor Author

greedy52 commented Jul 7, 2025

@greedy52 Just checking to see what we'll need to do to get this one ready to merge. Thanks!

We are still deciding the scope for the first release. i will open the doc changes for review tmr.

greedy52 and others added 5 commits July 18, 2025 10:10
* tctl users add/update to support mcp tools trait

* revert empty slice capability
* feat(mcp): enhances MCP servers usage with Cursor

* refactor: code review suggestions
* mcp server and mcputils refactor

* mcptest package

* allow testing in mcptest
* 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
@github-actions github-actions Bot added application-access audit-log Issues related to Teleports Audit Log documentation helm size/xl tctl tctl - Teleport admin tool tsh tsh - Teleport's command line tool for logging into nodes running Teleport. ui labels Jul 21, 2025
@public-teleport-github-review-bot
Copy link
Copy Markdown

@greedy52 - this PR will require admin approval to merge due to its size. Consider breaking it up into a series smaller changes.

@greedy52 greedy52 added this pull request to the merge queue Jul 21, 2025
Merged via the queue into branch/v18 with commit 37b6b0b Jul 21, 2025
45 checks passed
@greedy52 greedy52 deleted the STeve/v18_mcp_access_beta branch July 21, 2025 21:53
@camscale camscale mentioned this pull request Jul 23, 2025
@camscale camscale added the no-changelog Indicates that a PR does not require a changelog entry label Jul 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

application-access audit-log Issues related to Teleports Audit Log backport documentation helm MCP MCP Server related no-changelog Indicates that a PR does not require a changelog entry size/xl tctl tctl - Teleport admin tool tsh tsh - Teleport's command line tool for logging into nodes running Teleport. ui

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants