Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 19 additions & 0 deletions packages/types/src/__tests__/experiment.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { experimentIds, experimentIdsSchema, experimentsSchema } from "../experiment.js"

describe("dynamicThinkingEffort experiment", () => {
it("is part of the experiment id enum", () => {
expect(experimentIds).toContain("dynamicThinkingEffort")
expect(experimentIdsSchema.safeParse("dynamicThinkingEffort").success).toBe(true)
})

it("parses enabled and disabled states", () => {
expect(experimentsSchema.parse({ dynamicThinkingEffort: true })).toEqual({ dynamicThinkingEffort: true })
expect(experimentsSchema.parse({ dynamicThinkingEffort: false })).toEqual({ dynamicThinkingEffort: false })
expect(experimentsSchema.parse({})).toEqual({})
})

it("rejects non-boolean values", () => {
expect(experimentsSchema.safeParse({ dynamicThinkingEffort: "yes" }).success).toBe(false)
expect(experimentIdsSchema.safeParse("dynamic-thinking-effort").success).toBe(false)
})
})
2 changes: 2 additions & 0 deletions packages/types/src/experiment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export const experimentIds = [
"runSlashCommand",
"customTools",
"parallelToolExecution",
"dynamicThinkingEffort",
] as const

export const experimentIdsSchema = z.enum(experimentIds)
Expand All @@ -28,6 +29,7 @@ export const experimentsSchema = z.object({
runSlashCommand: z.boolean().optional(),
customTools: z.boolean().optional(),
parallelToolExecution: z.boolean().optional(),
dynamicThinkingEffort: z.boolean().optional(),
})

export type Experiments = z.infer<typeof experimentsSchema>
Expand Down
10 changes: 8 additions & 2 deletions scripts/stryker-diff.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,14 @@ export const PACKAGE_CONFIGS = [
root: "src",
sourceRoot: "src/",
vitestConfig: "vitest.config.ts",
vitestRelated: false,
discoverRelatedTests: true,
// Use plugin-side related-test discovery: with an explicit STRYKER_TEST_FILES
// list, stryker-js 10.0.0 plans static mutants with runtime activation
// (stryker-mutator/stryker-js#6144, #6209), which the vitest plugin can only
// apply after top-level code has run, producing false Survived results.
// Revert to vitestRelated: false / discoverRelatedTests: true once the
// upstream planner fix lands.
vitestRelated: true,
discoverRelatedTests: false,
excludedPaths: ["src/esbuild.mjs", "src/eslint.config.mjs", "src/utils/vitest-verbosity.ts"],
},
]
Expand Down
7 changes: 5 additions & 2 deletions scripts/stryker-diff.test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,11 @@ describe("buildManifest", () => {
assert.equal(webview.runRoot, ".")
assert.equal(webview.discoverRelatedTests, true)
assert.equal(webview.vitestRelated, false)
assert.equal(extension.discoverRelatedTests, true)
assert.equal(extension.vitestRelated, false)
// The extension entry uses plugin-side related discovery while stryker-js 10.0.0
// plans static mutants with runtime activation when given explicit test files
// (stryker-mutator/stryker-js#6144, #6209); see the entry comment in stryker-diff.mjs.
assert.equal(extension.discoverRelatedTests, false)
assert.equal(extension.vitestRelated, true)
})

it("returns no packages for tests, barrels, unsupported packages, and type-only changes", () => {
Expand Down
9 changes: 9 additions & 0 deletions src/api/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
retiredProviderIdentifiers,
type ProviderSettings,
type ModelInfo,
type ReasoningEffortExtended,
} from "@roo-code/types"

import { getRouterRemovalMessage } from "../core/config/routerRemoval"
Expand Down Expand Up @@ -115,6 +116,14 @@ export interface ApiHandlerCreateMessageMetadata {
* when the user clicks stop, preventing wasted API tokens/compute on the provider side.
*/
abortSignal?: AbortSignal
/**
* Per-request thinking effort override (DTE series 2/5).
* When defined, takes precedence over the settings-derived `reasoningEffort`
* wherever the effective effort is resolved (see `resolveEffectiveReasoningEffort`).
* Task-scoped and transient: it applies to this request only (the next request
* after being set — no mid-stream effect) and is never persisted to settings.
*/
reasoningEffort?: ReasoningEffortExtended
}

export interface ApiHandler {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
// npx vitest run src/api/transform/__tests__/dte-effective-reasoning-effort.spec.ts

import { ADAPTIVE_OUTPUT_CONFIG_EFFORTS, resolveEffectiveReasoningEffort } from "../reasoning"

describe("DTE series 2/5 — resolveEffectiveReasoningEffort", () => {
const settingsEffort = "high"
const modelDefault = "medium"

it("returns the per-request override when present (strongest precedence)", () => {
expect(
resolveEffectiveReasoningEffort({
override: "xhigh",
settingsReasoningEffort: settingsEffort,
modelDefaultEffort: modelDefault,
}),
).toBe("xhigh")
})

it("lets the override win even when it is out-of-range for the adaptive envelope", () => {
// "minimal" is a valid override value but outside the adaptive envelope set;
// resolution still returns it — envelope gating is the caller's concern.
expect(
resolveEffectiveReasoningEffort({
override: "minimal",
settingsReasoningEffort: settingsEffort,
modelDefaultEffort: modelDefault,
}),
).toBe("minimal")
})

it("falls back to the settings value when no override is present", () => {
expect(
resolveEffectiveReasoningEffort({ settingsReasoningEffort: "low", modelDefaultEffort: modelDefault }),
).toBe("low")
})

it("preserves the settings 'disable' sentinel when no override is present", () => {
expect(
resolveEffectiveReasoningEffort({ settingsReasoningEffort: "disable", modelDefaultEffort: modelDefault }),
).toBe("disable")
})

it("an explicit override wins over a settings 'disable' sentinel", () => {
expect(resolveEffectiveReasoningEffort({ override: "low", settingsReasoningEffort: "disable" })).toBe("low")
})

it("falls back to the model default when neither override nor settings is set", () => {
expect(resolveEffectiveReasoningEffort({ modelDefaultEffort: "low" })).toBe("low")
})

it("returns undefined when nothing is set", () => {
expect(resolveEffectiveReasoningEffort({})).toBeUndefined()
})

it("exposes exactly the in-range adaptive envelope efforts", () => {
expect([...ADAPTIVE_OUTPUT_CONFIG_EFFORTS]).toEqual(["low", "medium", "high", "xhigh", "max"])
})
})
45 changes: 45 additions & 0 deletions src/api/transform/reasoning.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,51 @@ export type AnthropicProviderReasoningParams = AnthropicReasoningParams | { type

export type OpenAiReasoningParams = { reasoning_effort: OpenAI.Chat.ChatCompletionCreateParams["reasoning_effort"] }

/**
* DTE series 2/5 — effort levels accepted by the Claude 4.7+ adaptive-thinking
* `output_config.effort` envelope. Efforts outside this set (e.g. "none",
* "minimal", "disable") omit the envelope so the API applies its own default.
*/
export const ADAPTIVE_OUTPUT_CONFIG_EFFORTS: readonly ReasoningEffortExtended[] = [
"low",
"medium",
"high",
"xhigh",
"max",
]

/**
* DTE series 2/5 — resolves the effective thinking effort for a single request.
*
* Resolution order (strongest first):
* 1. `override` — the per-request task-local effort
* (`ApiHandlerCreateMessageMetadata.reasoningEffort`),
* 2. `settingsReasoningEffort` — the settings-derived value,
* 3. `modelDefaultEffort` — the model's default effort.
*
* This is the single shared resolution point for the per-request override:
* providers that resolve the effective effort through it inherit the override
* without duplicating precedence logic. The override is transient (next request
* only) and never persisted to settings.
*/
export const resolveEffectiveReasoningEffort = ({
override,
settingsReasoningEffort,
modelDefaultEffort,
}: {
override?: ReasoningEffortExtended
settingsReasoningEffort?: ReasoningEffortExtended | "disable"
modelDefaultEffort?: ReasoningEffortExtended
}): ReasoningEffortExtended | "disable" | undefined => {
if (override !== undefined) {
return override
}
if (settingsReasoningEffort !== undefined) {
return settingsReasoningEffort
}
return modelDefaultEffort
}

// Valid Gemini thinking levels for effort-based reasoning
const GEMINI_THINKING_LEVELS = ["minimal", "low", "medium", "high"] as const

Expand Down
32 changes: 32 additions & 0 deletions src/core/webview/__tests__/ClineProvider.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1566,6 +1566,38 @@ describe("ClineProvider", () => {
expect(state.destructiveCommandGuardEnabled).toBe(false)
})

test("getStateToPostToWebview returns the saved dynamicThinkingEffort experiment when enabled", async () => {
await provider.resolveWebviewView(mockWebviewView)
await provider.contextProxy.setValue("experiments", {
...experimentDefault,
dynamicThinkingEffort: true,
})

const state = await provider.getStateToPostToWebview()

expect(state.experiments).toEqual({ ...experimentDefault, dynamicThinkingEffort: true })
})

test("getStateToPostToWebview returns the saved dynamicThinkingEffort experiment when explicitly disabled", async () => {
await provider.resolveWebviewView(mockWebviewView)
await provider.contextProxy.setValue("experiments", {
...experimentDefault,
dynamicThinkingEffort: false,
})

const state = await provider.getStateToPostToWebview()

expect(state.experiments).toEqual({ ...experimentDefault, dynamicThinkingEffort: false })
})

test("getStateToPostToWebview defaults dynamicThinkingEffort to false when experiments are unset", async () => {
await provider.resolveWebviewView(mockWebviewView)

const state = await provider.getStateToPostToWebview()

expect(state.experiments).toEqual({ ...experimentDefault, dynamicThinkingEffort: false })
})

test("language is set to VSCode language", async () => {
// Mock VSCode language as Spanish
;(vscode.env as any).language = "pt-BR"
Expand Down
55 changes: 55 additions & 0 deletions src/core/webview/__tests__/webviewMessageHandler.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ import type { ModelRecord } from "@roo-code/types"

import { webviewMessageHandler } from "../webviewMessageHandler"
import type { ClineProvider } from "../ClineProvider"
import { experimentDefault } from "../../../shared/experiments"
import { flushModels, getModels } from "../../../api/providers/fetchers/modelCache"
import { getLMStudioModels } from "../../../api/providers/fetchers/lmstudio"
import { getCommands } from "../../../services/command/commands"
Expand Down Expand Up @@ -2273,3 +2274,57 @@ describe("webviewMessageHandler - telemetrySetting", () => {
expect(TelemetryService.instance.updateTelemetryState).not.toHaveBeenCalled()
})
})

describe("webviewMessageHandler - experiments", () => {
beforeEach(() => {
vi.clearAllMocks()
})

it("persists dynamicThinkingEffort true merged with the saved experiments", async () => {
vi.mocked(mockClineProvider.contextProxy.getValue).mockImplementation((key: string) =>
key === "experiments" ? { preventFocusDisruption: true } : undefined,
)

await webviewMessageHandler(mockClineProvider, {
type: "updateSettings",
updatedSettings: { experiments: { dynamicThinkingEffort: true } },
})

expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("experiments", {
preventFocusDisruption: true,
dynamicThinkingEffort: true,
})
expect(mockClineProvider.postStateToWebview).toHaveBeenCalledTimes(1)
})

it("persists dynamicThinkingEffort false over a previously enabled value", async () => {
vi.mocked(mockClineProvider.contextProxy.getValue).mockImplementation((key: string) =>
key === "experiments" ? { dynamicThinkingEffort: true } : undefined,
)

await webviewMessageHandler(mockClineProvider, {
type: "updateSettings",
updatedSettings: { experiments: { dynamicThinkingEffort: false } },
})

expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("experiments", {
dynamicThinkingEffort: false,
})
expect(mockClineProvider.postStateToWebview).toHaveBeenCalledTimes(1)
})

it("persists the experiment defaults when no experiments are saved yet", async () => {
vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(undefined)

await webviewMessageHandler(mockClineProvider, {
type: "updateSettings",
updatedSettings: { experiments: {} },
})

expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("experiments", {
...experimentDefault,
dynamicThinkingEffort: false,
})
expect(mockClineProvider.postStateToWebview).toHaveBeenCalledTimes(1)
})
})
29 changes: 28 additions & 1 deletion src/shared/__tests__/experiments.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import type { ExperimentId } from "@roo-code/types"

import { EXPERIMENT_IDS, experimentConfigsMap, experiments as Experiments } from "../experiments"
import { EXPERIMENT_IDS, experimentConfigsMap, experimentDefault, experiments as Experiments } from "../experiments"

describe("experiments", () => {
describe("PREVENT_FOCUS_DISRUPTION", () => {
Expand All @@ -22,6 +22,7 @@ describe("experiments", () => {
runSlashCommand: false,
customTools: false,
parallelToolExecution: false,
dynamicThinkingEffort: false,
}
expect(Experiments.isEnabled(experiments, EXPERIMENT_IDS.PREVENT_FOCUS_DISRUPTION)).toBe(false)
})
Expand All @@ -33,6 +34,7 @@ describe("experiments", () => {
runSlashCommand: false,
customTools: false,
parallelToolExecution: false,
dynamicThinkingEffort: false,
}
expect(Experiments.isEnabled(experiments, EXPERIMENT_IDS.PREVENT_FOCUS_DISRUPTION)).toBe(true)
})
Expand All @@ -44,6 +46,7 @@ describe("experiments", () => {
runSlashCommand: false,
customTools: false,
parallelToolExecution: false,
dynamicThinkingEffort: false,
}
expect(Experiments.isEnabled(experiments, EXPERIMENT_IDS.PREVENT_FOCUS_DISRUPTION)).toBe(false)
})
Expand All @@ -66,4 +69,28 @@ describe("experiments", () => {
expect(Experiments.isEnabled({ parallelToolExecution: true }, "parallelToolExecution")).toBe(true)
})
})

describe("DYNAMIC_THINKING_EFFORT", () => {
it("is configured correctly", () => {
expect(EXPERIMENT_IDS.DYNAMIC_THINKING_EFFORT).toBe("dynamicThinkingEffort")
expect(experimentConfigsMap.DYNAMIC_THINKING_EFFORT).toMatchObject({
enabled: false,
})
// Visible in the Settings panel (showInSettings defaults to true).
expect(experimentConfigsMap.DYNAMIC_THINKING_EFFORT.showInSettings).toBeUndefined()
})

it("is disabled by default", () => {
expect(experimentDefault.dynamicThinkingEffort).toBe(false)
expect(Experiments.isEnabled({}, "dynamicThinkingEffort")).toBe(false)
})

it("returns true when enabled", () => {
expect(Experiments.isEnabled({ dynamicThinkingEffort: true }, "dynamicThinkingEffort")).toBe(true)
})

it("returns false when explicitly disabled", () => {
expect(Experiments.isEnabled({ dynamicThinkingEffort: false }, "dynamicThinkingEffort")).toBe(false)
})
})
})
2 changes: 2 additions & 0 deletions src/shared/experiments.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export const EXPERIMENT_IDS = {
RUN_SLASH_COMMAND: "runSlashCommand",
CUSTOM_TOOLS: "customTools",
PARALLEL_TOOL_EXECUTION: "parallelToolExecution",
DYNAMIC_THINKING_EFFORT: "dynamicThinkingEffort",
} as const satisfies Record<string, ExperimentId>

type _AssertExperimentIds = AssertEqual<Equals<ExperimentId, Values<typeof EXPERIMENT_IDS>>>
Expand All @@ -25,6 +26,7 @@ export const experimentConfigsMap: Record<ExperimentKey, ExperimentConfig> = {
CUSTOM_TOOLS: { enabled: false },
// TODO: add i18n keys (settings:experimental.PARALLEL_TOOL_EXECUTION.name/.description) in the same PR that sets showInSettings: true
PARALLEL_TOOL_EXECUTION: { enabled: false, showInSettings: false },
DYNAMIC_THINKING_EFFORT: { enabled: false },
}

export const experimentDefault = Object.fromEntries(
Expand Down
5 changes: 5 additions & 0 deletions webview-ui/playwright/gallery/stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,11 @@ export const stories: Record<string, Story> = {
const { UISettingsStory } = await import("@/components/settings/__tests__/UISettings.visual.fixture")
return <UISettingsStory />
},
"experimental-settings": async () => {
const { ExperimentalSettingsStory } =
await import("@/components/settings/__tests__/ExperimentalSettings.visual.fixture")
return <ExperimentalSettingsStory />
},
"ui-settings-long-locale": async () => {
const [{ UISettingsStory }, { default: i18next }] = await Promise.all([
import("@/components/settings/__tests__/UISettings.visual.fixture"),
Expand Down
Loading
Loading