Make workspace selection discoverable to MCP clients#17
Open
kevingil wants to merge 1 commit into
Open
Conversation
When a tool returned ErrNoWorkspace, the message told the model to "prompt
the user" but never named list_workspaces / select_workspace, so models
that hit the error often concluded no such tool existed and stalled.
Two changes:
1. Rewrite ErrNoWorkspace to spell out the recovery path
(list_workspaces -> ask user -> select_workspace -> retry) and
explain why the model must not auto-select.
2. Pass server.WithInstructions on the MCP server so the workspace
flow is in the host's system context from session start, before
any workspace-gated tool is attempted.
Author
|
Relates to issue #16 |
Author
|
Not sure if the new serverInstructions is too much. Updated ErrNoWorkspace might be all we need. |
scutuatua-crypto
approved these changes
May 19, 2026
michaelmelanson
suggested changes
Jun 4, 2026
michaelmelanson
left a comment
michaelmelanson
left a comment
Contributor
There was a problem hiding this comment.
Hi @kevingil, thanks for your pull request!
As you called out, it seems like the server instructions aren't needed. Other than that the changes look great, so once you've removed them I'd be happy to merge.
Contributor
There was a problem hiding this comment.
You're right that these server instructions don't seem to be needed. I tested it out without them, and it works fine. Would you mind removing these instructions to keep it minimal?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When a tool returned ErrNoWorkspace, the message told the model to "prompt the user" but never named list_workspaces / select_workspace, so models that hit the error often concluded no such tool existed and stalled.
Two changes:
Rewrite ErrNoWorkspace to spell out the recovery path (list_workspaces -> ask user -> select_workspace -> retry) and explain why the model must not auto-select.
Pass server.WithInstructions on the MCP server so the workspace flow is in the host's system context from session start, before any workspace-gated tool is attempted.