feat(cli): add mcp prompt support via slash commands #1323

kalvinnchau · 2025-02-21T01:24:54Z

update `Prompt` structs for align with MCP spec, add basic prompt commands to mcp-client

Prompts description and arguments are optional fields, use optional in the structs
- similarly PromptArguments description and required are optional too
add list_prompts and get_prompt method to the McpClientTrait
add implementation of list_prompts and get_prompt to call prompts/list and prompts/get respectively
update stdio and sse clients to handle JsonRpcMessage::Error responses to send back to the user instead of doing nothing

- add new endpoints `list_prompts` and `get_prompt` in the MCP client - update prompt model in mcp-core to make `description` and `arguments` optional, following MCP spec

salman1993 · 2025-02-21T15:55:39Z

crates/goose-mcp/src/developer/mod.rs

@@ -70,9 +70,9 @@ pub fn load_prompt_files() -> HashMap<String, Prompt> {
                description: arg.description,
                required: arg.required,
            })
-            .collect();
+            .collect::<Vec<PromptArgument>>();


unrelated to this PR: i don't think we need this mapping - https://github.com/block/goose/blob/main/crates/goose-mcp/src/developer/prompts/unit_test.json

it'd be easier to stay closer to the MCP prompt in the json to avoid this mapping (description instead of template)

salman1993 · 2025-02-21T16:03:09Z

nit: you can add a prompt in the mcp-server example here: https://github.com/modelcontextprotocol/rust-sdk/blob/main/crates/mcp-server/src/main.rs. that'll make it easier to test from this mcp-client example: https://github.com/modelcontextprotocol/rust-sdk/blob/main/crates/mcp-client/examples/stdio_integration.rs

…e implementing types to define them, similar to other methods

… test both new methods

- extend CLI input handling to support `/prompts` for listing available prompts - add `ListPrompts` variant in the input enum and update help documentation - implement prompt rendering in the session output module - update agent traits and capabilities to aggregate and list prompts from all extensions

kalvinnchau · 2025-02-21T19:09:58Z

Moved this back into a draft PR for now, since we're in progress of moving the mcp stuff to the rust-sdk, I'm keeping the commits in sync manually for now but I'll hold off on diverging for nwo.

fix: cherry-pick conflicts resolved

kalvinnchau · 2025-02-21T19:26:09Z

Added some basic cli based prompting scaffolding, mainly to list prompts and get the information about them.

Calling the prompt is not yet implemented.

Ex:

( O)> /prompts

 mcp_test
  - no_args_prompt
  - one_arg_prompt
 developer
  - unit_test

( O)> /prompt unit_test --info

 Extension: developer
Prompt: unit_test

 Generate or update unit tests for a given source code file.

The source code file is provided in {source_code}.
Please update the existing tests, ensure they are passing, and add any new tests as needed.

The test suite should:
- Follow language-specific test naming conventions for {language}
- Include all necessary imports and annotations
- Thoroughly test the specified functionality
- Ensure tests are passing before completion
- Handle edge cases and error conditions
- Use clear test names that reflect what is being tested

 Arguments:
  source_code (required) The source code file content to be tested
  language (required) The programming language of the source code

( O)>

With prompt execution support:

/prompt unit_test source_code="~/stage/unit_test/file.py" language=python
# Unit Test Generation and Update

I'll help you generate or update unit tests for the source code file at `~/stage/unit_test/file.py`. First, let me check if this file exists and examine its c
ontents to understand what we need to test.

─── shell | developer ──────────────────────────
command: ls -la ~stage/unit_test/
...

Now, let's run the existing tests to see if they pass:

─── shell | developer ──────────────────────────
command: cd /Users/kalvin/stage/unit_test/ && python -m unittest test_file.py


.....
----------------------------------------------------------------------
Ran 5 tests in 0.005s

OK

Great! The existing tests are already passing. Let's analyze the current test coverage and see if we need to add any additional tests:

...

However, we can enhance the test suite with a few additional tests:

1. Test reading a file with special characters
2. Test reading a file with different encodings
3. Test reading a large file (performance test)

Let's update the test file with these additional tests:

─── text_editor | developer ──────────────────────────
path: ~/stage/unit_test/test_file.py

from the mcp server

agent loop Add functionality to transform PromptMessageContent to MessageContent with proper handling in the session module and add test coverage. Add the results of GetPrompt to the message conversation and run the agent loop with prompt response.

fix: update process_agent_response call

* main: feat: allow user to turn off smart approve (#1407) feat: Read .gooseignore to Restrict access to files or Directories (#1199) docs: adding update command to cli command guide (#1411) docs: Adding YT short for Computer Controller Tutorial (#1420) feat(cli): support arbitrary path for sessions (#1414) feat: remove the disable state from chat input box (#1341) feat: Add extra details to prompt for gui (#1387) style: added launch text and styling (#1406) fix(docs): update default session location (#1412) feat: moved extension add button and updated label (#1408) draft: use rust messages in typescript (#1393) fix: detect read only tool when only mode is approve (#1398) docs: Add Puppeteer Extension Tutorial (#1396) chore(release): release version v1.0.10 (#1404) chore(release): release 1.10.0 (#1385) feat: wip on ConfigProvider and integration in settings_v2 (#1395) feat: Add command `goose update` to update goose CLI version (#1308)

kalvinnchau · 2025-02-27T20:38:55Z

Screen.Recording.2025-02-27.at.12.37.09.PM.mov

salman1993 · 2025-02-27T21:17:45Z

crates/goose-cli/src/session/mod.rs

+        Ok(None)
+    }
+
+    pub async fn get_prompt(&mut self, name: &str, arguments: Value) -> Result<Vec<PromptMessage>> {


if we invoked a PromptMessage that starts with assistant role - i think that would error because the CLI assumes its user msg and we also need to alternate between user & assistant. can you check this? if so, we might wanna enforce some checks.

added enforcement for user first, and that the messages alternate user & assistant

crates/goose-cli/src/session/mod.rs

- render user messages to the user's session - enforce user-assistant-user pattern and cleanup with bad patterns

kalvinnchau added 3 commits February 20, 2025 16:15

feat: add prompts support to mcp-client, ahere to MCP spec for prompts

34a4bac

- add new endpoints `list_prompts` and `get_prompt` in the MCP client - update prompt model in mcp-core to make `description` and `arguments` optional, following MCP spec

feat: handle JsonRpcMessage::Error messages to propagate to the user

5c4258b

test: update MockClient in test with list_prompts and get_prompt

2523e61

kalvinnchau requested review from salman1993 and baxen February 21, 2025 01:54

salman1993 reviewed Feb 21, 2025

View reviewed changes

salman1993 approved these changes Feb 21, 2025

View reviewed changes

kalvinnchau added 5 commits February 21, 2025 11:00

feat: remove concrete impl of get_prompt and list_prompts, and requir…

529b7fd

…e implementing types to define them, similar to other methods

test: add impl of list/get prompt to main.rs and stdio_integration to…

a0110ac

… test both new methods

refactor: implement list_prompts and get_prompts for mcp servers

0f776c0

feat: add /prompt $NAME --info and placeholder for exeuction

ead9c1d

kalvinnchau marked this pull request as draft February 21, 2025 19:09

refactor: revert handle_slash_command, match existing patterns

8025a93

fix: cherry-pick conflicts resolved

kalvinnchau and others added 4 commits February 25, 2025 14:28

feat: first pass at enabling /prompt support, just rendering the output

2407051

from the mcp server

Merge branch 'main' into kalvin/mcp-prompt

5e5d7e9

style: cargo fmt after merge

a1ef0b9

fix: update process_agent_response call

kalvinnchau force-pushed the kalvin/mcp-prompt branch from 34bb93a to a1ef0b9 Compare February 26, 2025 17:16

lily-de mentioned this pull request Feb 26, 2025

MCP prompts #1402

Open

2 tasks

kalvinnchau changed the title ~~feat: update mcp-core prompt to match spec, add mcp list/get to mcp-client~~ feat(cli): add mcp prompt support via slash commands Feb 26, 2025

kalvinnchau marked this pull request as ready for review February 26, 2025 18:40

kalvinnchau force-pushed the kalvin/mcp-prompt branch from eb42a64 to a1ef0b9 Compare February 27, 2025 18:35

kalvinnchau added 2 commits February 27, 2025 10:39

refactor: cleanup PromptMessage to Message using impl From

e2ef3d1

salman1993 reviewed Feb 27, 2025

View reviewed changes

crates/goose-cli/src/session/mod.rs Show resolved Hide resolved

feat: enforce PromptMessages that we start with User messages

1c2a15a

- render user messages to the user's session - enforce user-assistant-user pattern and cleanup with bad patterns

kalvinnchau force-pushed the kalvin/mcp-prompt branch from e876bac to 1c2a15a Compare February 27, 2025 22:28

kalvinnchau merged commit d0ca469 into main Feb 27, 2025
6 checks passed

kalvinnchau deleted the kalvin/mcp-prompt branch February 27, 2025 23:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(cli): add mcp prompt support via slash commands #1323

feat(cli): add mcp prompt support via slash commands #1323

kalvinnchau commented Feb 21, 2025

salman1993 Feb 21, 2025 •

edited

Loading

salman1993 commented Feb 21, 2025

kalvinnchau commented Feb 21, 2025 •

edited

Loading

kalvinnchau commented Feb 21, 2025 •

edited

Loading

kalvinnchau commented Feb 27, 2025

salman1993 Feb 27, 2025 •

edited

Loading

kalvinnchau Feb 27, 2025

feat(cli): add mcp prompt support via slash commands #1323

feat(cli): add mcp prompt support via slash commands #1323

Conversation

kalvinnchau commented Feb 21, 2025

update Prompt structs for align with MCP spec, add basic prompt commands to mcp-client

salman1993 Feb 21, 2025 • edited Loading

Choose a reason for hiding this comment

salman1993 commented Feb 21, 2025

kalvinnchau commented Feb 21, 2025 • edited Loading

kalvinnchau commented Feb 21, 2025 • edited Loading

kalvinnchau commented Feb 27, 2025

salman1993 Feb 27, 2025 • edited Loading

Choose a reason for hiding this comment

kalvinnchau Feb 27, 2025

Choose a reason for hiding this comment

update `Prompt` structs for align with MCP spec, add basic prompt commands to mcp-client

salman1993 Feb 21, 2025 •

edited

Loading

kalvinnchau commented Feb 21, 2025 •

edited

Loading

kalvinnchau commented Feb 21, 2025 •

edited

Loading

salman1993 Feb 27, 2025 •

edited

Loading