Skip to content

fix: always include mode instructions regardless of Power Steering setting #7279

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

Closed
wants to merge 1 commit into from
+15 −8
Closed

fix: always include mode instructions regardless of Power Steering setting #7279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions src/core/environment/__tests__/getEnvironmentDetails.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,11 +313,21 @@ describe("getEnvironmentDetails", () => {
expect(mockInactiveTerminal.getCurrentWorkingDirectory).toHaveBeenCalled()
})

it("should include experiment-specific details when Power Steering is enabled", async () => {
it("should always include mode role and custom instructions regardless of Power Steering", async () => {
Copy link
Contributor Author

@roomote roomote bot Aug 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good test coverage for both scenarios! The test name clearly indicates the behavior we're verifying - that mode instructions should always be included regardless of experimental features.

// Test with Power Steering disabled
mockState.experiments = { [EXPERIMENT_IDS.POWER_STEERING]: false }
;(experiments.isEnabled as Mock).mockReturnValue(false)

let result = await getEnvironmentDetails(mockCline as Task)

expect(result).toContain("<role>You are a code assistant</role>")
expect(result).toContain("<custom_instructions>Custom instructions</custom_instructions>")

// Test with Power Steering enabled
mockState.experiments = { [EXPERIMENT_IDS.POWER_STEERING]: true }
;(experiments.isEnabled as Mock).mockReturnValue(true)

const result = await getEnvironmentDetails(mockCline as Task)
result = await getEnvironmentDetails(mockCline as Task)

expect(result).toContain("<role>You are a code assistant</role>")
expect(result).toContain("<custom_instructions>Custom instructions</custom_instructions>")
Expand Down
9 changes: 3 additions & 6 deletions src/core/environment/getEnvironmentDetails.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,13 +228,10 @@ export async function getEnvironmentDetails(cline: Task, includeFileDetails: boo
details += `<slug>${currentMode}</slug>\n`
details += `<name>${modeDetails.name}</name>\n`
details += `<model>${modelId}</model>\n`
details += `<role>${modeDetails.roleDefinition}</role>\n`
Copy link
Contributor Author

@roomote roomote bot Aug 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Clean fix! This correctly ensures mode instructions are always included. Though after this change, you might want to check if the EXPERIMENT_IDS import is still needed in this file since we're no longer checking for POWER_STEERING.


if (Experiments.isEnabled(experiments ?? {}, EXPERIMENT_IDS.POWER_STEERING)) {
details += `<role>${modeDetails.roleDefinition}</role>\n`

if (modeDetails.customInstructions) {
details += `<custom_instructions>${modeDetails.customInstructions}</custom_instructions>\n`
}
if (modeDetails.customInstructions) {
details += `<custom_instructions>${modeDetails.customInstructions}</custom_instructions>\n`
}

if (includeFileDetails) {
Expand Down
Loading