Skip to content

fix(cli): fix prompt issue in mcp configure claude-code #17599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 29, 2025
Merged

fix(cli): fix prompt issue in mcp configure claude-code #17599

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63e6379
fix(cli): fix prompt issue in mcp configure claude-code
johnstcn Apr 29, 2025
ca56ef5
tweak prompt
johnstcn Apr 29, 2025
8902a93
feat(cli): allow overriding default coder prompt in exp mcp configure…
johnstcn Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
tweak prompt
  • Loading branch information
@johnstcn
johnstcn committed Apr 29, 2025
commit ca56ef52d706815490271c9a8d7d45b64fb61fd1
29 changes: 15 additions & 14 deletions cli/exp_mcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,24 +576,25 @@ func configureClaude(fs afero.Fs, cfg ClaudeConfig) error {
}

var (
coderPrompt = `You are a helpful Coding assistant. Aim to autonomously investigate
defaultCoderPrompt = `You are a helpful Coding assistant. Aim to autonomously investigate
and solve issues the user gives you and test your work, whenever possible.
Avoid shortcuts like mocking tests. When you get stuck, you can ask the user
but opt for autonomy.`

defaultReportTaskPrompt = `Report all tasks to Coder, following these EXACT guidelines:
defaultReportTaskPrompt = `YOU MUST REPORT ALL TASKS TO CODER.
When reporting tasks, you MUST follow these EXACT instructions:
- IMMEDIATELY report status after receiving ANY user message.
- Be granular. If you are investigating with multiple steps, report each step to coder.

1. Be granular. If you are investigating with multiple steps, report each step to coder.
2. IMMEDIATELY report status after receiving ANY user message.
3. Use "state": "working" when actively processing WITHOUT needing additional user input.
4. Use "state": "complete" only when finished with a task.
5. Use "state": "failure" when you need ANY user input, lack sufficient details, or encounter blockers.
Task state MUST be one of the following:
- Use "state": "working" when actively processing WITHOUT needing additional user input.
- Use "state": "complete" only when finished with a task.
- Use "state": "failure" when you need ANY user input, lack sufficient details, or encounter blockers.

In your summary, you MUST:
- Be specific about what you're doing.
- Clearly indicate what information you need from the user when in "failure" state
- Keep it under 160 characters. Summaries longer than 160 characters are not accepted.
- Make it actionable.`
Task summaries MUST:
- Include specifics about what you're doing.
- Include clear and actionable steps for the user.
- Be less than 160 characters in length.`

// Define the guard strings
coderPromptStartGuard = "<coder-prompt>"
Expand All @@ -613,7 +614,7 @@ func injectClaudeMD(fs afero.Fs, systemPrompt, reportTaskPrompt, claudeMDPath st
return xerrors.Errorf("failed to create claude config directory: %w", err)
}

return afero.WriteFile(fs, claudeMDPath, []byte(promptsBlock(coderPrompt, reportTaskPrompt, systemPrompt, "")), 0o600)
return afero.WriteFile(fs, claudeMDPath, []byte(promptsBlock(defaultCoderPrompt, reportTaskPrompt, systemPrompt, "")), 0o600)
}

bs, err := afero.ReadFile(fs, claudeMDPath)
Expand Down Expand Up @@ -646,7 +647,7 @@ func injectClaudeMD(fs afero.Fs, systemPrompt, reportTaskPrompt, claudeMDPath st
cleanContent = strings.TrimSpace(cleanContent)

// Create the new content with coder and system prompt prepended
newContent := promptsBlock(coderPrompt, reportTaskPrompt, systemPrompt, cleanContent)
newContent := promptsBlock(defaultCoderPrompt, reportTaskPrompt, systemPrompt, cleanContent)

// Write the updated content back to the file
err = afero.WriteFile(fs, claudeMDPath, []byte(newContent), 0o600)
Expand Down
73 changes: 38 additions & 35 deletions cli/exp_mcp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,19 +295,20 @@ and solve issues the user gives you and test your work, whenever possible.
Avoid shortcuts like mocking tests. When you get stuck, you can ask the user
but opt for autonomy.

Report all tasks to Coder, following these EXACT guidelines:

1. Be granular. If you are investigating with multiple steps, report each step to coder.
2. IMMEDIATELY report status after receiving ANY user message.
3. Use "state": "working" when actively processing WITHOUT needing additional user input.
4. Use "state": "complete" only when finished with a task.
5. Use "state": "failure" when you need ANY user input, lack sufficient details, or encounter blockers.

In your summary, you MUST:
- Be specific about what you're doing.
- Clearly indicate what information you need from the user when in "failure" state
- Keep it under 160 characters. Summaries longer than 160 characters are not accepted.
- Make it actionable.
YOU MUST REPORT ALL TASKS TO CODER.
When reporting tasks, you MUST follow these EXACT instructions:
- IMMEDIATELY report status after receiving ANY user message.
- Be granular. If you are investigating with multiple steps, report each step to coder.

Task state MUST be one of the following:
- Use "state": "working" when actively processing WITHOUT needing additional user input.
- Use "state": "complete" only when finished with a task.
- Use "state": "failure" when you need ANY user input, lack sufficient details, or encounter blockers.

Task summaries MUST:
- Include specifics about what you're doing.
- Include clear and actionable steps for the user.
- Be less than 160 characters in length.
</coder-prompt>
<system-prompt>
test-system-prompt
Expand Down Expand Up @@ -403,19 +404,20 @@ and solve issues the user gives you and test your work, whenever possible.
Avoid shortcuts like mocking tests. When you get stuck, you can ask the user
but opt for autonomy.

Report all tasks to Coder, following these EXACT guidelines:
YOU MUST REPORT ALL TASKS TO CODER.
When reporting tasks, you MUST follow these EXACT instructions:
- IMMEDIATELY report status after receiving ANY user message.
- Be granular. If you are investigating with multiple steps, report each step to coder.

1. Be granular. If you are investigating with multiple steps, report each step to coder.
2. IMMEDIATELY report status after receiving ANY user message.
3. Use "state": "working" when actively processing WITHOUT needing additional user input.
4. Use "state": "complete" only when finished with a task.
5. Use "state": "failure" when you need ANY user input, lack sufficient details, or encounter blockers.
Task state MUST be one of the following:
- Use "state": "working" when actively processing WITHOUT needing additional user input.
- Use "state": "complete" only when finished with a task.
- Use "state": "failure" when you need ANY user input, lack sufficient details, or encounter blockers.

In your summary, you MUST:
- Be specific about what you're doing.
- Clearly indicate what information you need from the user when in "failure" state
- Keep it under 160 characters. Summaries longer than 160 characters are not accepted.
- Make it actionable.
Task summaries MUST:
- Include specifics about what you're doing.
- Include clear and actionable steps for the user.
- Be less than 160 characters in length.
</coder-prompt>
<system-prompt>
test-system-prompt
Expand Down Expand Up @@ -520,19 +522,20 @@ and solve issues the user gives you and test your work, whenever possible.
Avoid shortcuts like mocking tests. When you get stuck, you can ask the user
but opt for autonomy.

Report all tasks to Coder, following these EXACT guidelines:
YOU MUST REPORT ALL TASKS TO CODER.
When reporting tasks, you MUST follow these EXACT instructions:
- IMMEDIATELY report status after receiving ANY user message.
- Be granular. If you are investigating with multiple steps, report each step to coder.

1. Be granular. If you are investigating with multiple steps, report each step to coder.
2. IMMEDIATELY report status after receiving ANY user message.
3. Use "state": "working" when actively processing WITHOUT needing additional user input.
4. Use "state": "complete" only when finished with a task.
5. Use "state": "failure" when you need ANY user input, lack sufficient details, or encounter blockers.
Task state MUST be one of the following:
- Use "state": "working" when actively processing WITHOUT needing additional user input.
- Use "state": "complete" only when finished with a task.
- Use "state": "failure" when you need ANY user input, lack sufficient details, or encounter blockers.

In your summary, you MUST:
- Be specific about what you're doing.
- Clearly indicate what information you need from the user when in "failure" state
- Keep it under 160 characters. Summaries longer than 160 characters are not accepted.
- Make it actionable.
Task summaries MUST:
- Include specifics about what you're doing.
- Include clear and actionable steps for the user.
- Be less than 160 characters in length.
</coder-prompt>
<system-prompt>
test-system-prompt
Expand Down