Skip to content

Commit bfe4a09

Browse files
test+docs(dte): scope U2 to the per-request effort primitives
Address the four open review threads on PR Zoo-Code-Org#1522. - reasoning.ts: describe what a caller of resolveEffectiveReasoningEffort gets instead of saying providers "inherit" the override - nothing calls it in this unit, and the caller-side wiring lands later in the DTE series. - Drop the DTE-U1 experiment-flag surface that this unit duplicates only because its base predates U1: the packages/types id and schema entry, the experiment registry config, the localized toggle, the ExperimentalSettings/SettingsView tests, the gallery story, the visual fixture/spec, and the four baselines. Issue Zoo-Code-Org#2079 scopes the flag, its localized toggle, and the provider projection to U1 (PR Zoo-Code-Org#1521), and nothing in U2 reads the flag. - Revert the unrelated invalid-timestamp deleteMessage rewrite in ClineProvider.spec.ts: it pins existing handler behavior and belongs in its own PR. - Revert the comment-only stryker-diff.test.mjs hunk; those assertions already match main. Kept: ADAPTIVE_OUTPUT_CONFIG_EFFORTS, resolveEffectiveReasoningEffort, the ApiHandlerCreateMessageMetadata.reasoningEffort override, and its focused spec. Control: swapping the override/settings precedence in reasoning.ts fails the focused spec with "expected 'high' to be 'xhigh'", "expected 'high' to be 'minimal'", and "expected 'disable' to be 'low'"; restoring the fix passes all 8 tests. tsc, eslint (--max-warnings=0, suppressions unchanged) and prettier are clean.
1 parent 5c4c69c commit bfe4a09

35 files changed

Lines changed: 17 additions & 405 deletions

‎packages/types/src/__tests__/experiment.test.ts‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎packages/types/src/experiment.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ export const experimentIds = [
1212
"runSlashCommand",
1313
"customTools",
1414
"parallelToolExecution",
15-
"dynamicThinkingEffort",
1615
] as const
1716

1817
export const experimentIdsSchema = z.enum(experimentIds)
@@ -29,7 +28,6 @@ export const experimentsSchema = z.object({
2928
runSlashCommand: z.boolean().optional(),
3029
customTools: z.boolean().optional(),
3130
parallelToolExecution: z.boolean().optional(),
32-
dynamicThinkingEffort: z.boolean().optional(),
3331
})
3432

3533
export type Experiments = z.infer<typeof experimentsSchema>

‎scripts/stryker-diff.test.mjs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,10 +254,9 @@ describe("buildManifest", () => {
254254
assert.equal(webview.runRoot, ".")
255255
assert.equal(webview.discoverRelatedTests, true)
256256
assert.equal(webview.vitestRelated, false)
257-
258-
// The extension entry uses plugin-side related discovery while stryker-js 10.0.0
259-
// plans static mutants with runtime activation when given explicit test files
260-
// (stryker-mutator/stryker-js#6144, #6209); see the entry comment in stryker-diff.mjs.
257+
// The extension package deliberately uses plugin-side discovery (see the
258+
// comment in PACKAGE_CONFIGS): stryker-js 10.0.0 mis-activates static mutants
259+
// when an explicit STRYKER_TEST_FILES list is supplied.
261260
assert.equal(extension.discoverRelatedTests, false)
262261
assert.equal(extension.vitestRelated, true)
263262
const types = manifest.packages.find(({ id }) => id === "types")

‎src/api/transform/reasoning.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,14 @@ export const ADAPTIVE_OUTPUT_CONFIG_EFFORTS: readonly ReasoningEffortExtended[]
5656
* 2. `settingsReasoningEffort` — the settings-derived value,
5757
* 3. `modelDefaultEffort` — the model's default effort.
5858
*
59-
* This is the single shared resolution point for the per-request override:
60-
* providers that resolve the effective effort through it inherit the override
61-
* without duplicating precedence logic. The override is transient (next request
62-
* only) and never persisted to settings.
59+
* This is the shared resolution point for the per-request override: a provider
60+
* that resolves its effective effort through this function applies the override
61+
* there instead of duplicating precedence logic. Nothing calls it in this unit
62+
* yet - the caller-side wiring arrives later in the series (the task supplies
63+
* `reasoningEffort` in request metadata, the Anthropic provider resolves here),
64+
* so this states what a caller gets rather than claiming providers already
65+
* apply an override. The override is transient (next request only) and is never
66+
* persisted to settings.
6367
* @internal Exported for focused implementation tests.
6468
*/
6569
export const resolveEffectiveReasoningEffort = ({

‎src/core/webview/__tests__/ClineProvider.spec.ts‎

Lines changed: 4 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -4140,38 +4140,6 @@ describe("ClineProvider", () => {
41404140
expect(state.destructiveCommandGuardEnabled).toBe(false)
41414141
})
41424142

4143-
test("getStateToPostToWebview returns the saved dynamicThinkingEffort experiment when enabled", async () => {
4144-
await provider.resolveWebviewView(mockWebviewView)
4145-
await provider.contextProxy.setValue("experiments", {
4146-
...experimentDefault,
4147-
dynamicThinkingEffort: true,
4148-
})
4149-
4150-
const state = await provider.getStateToPostToWebview()
4151-
4152-
expect(state.experiments).toEqual({ ...experimentDefault, dynamicThinkingEffort: true })
4153-
})
4154-
4155-
test("getStateToPostToWebview returns the saved dynamicThinkingEffort experiment when explicitly disabled", async () => {
4156-
await provider.resolveWebviewView(mockWebviewView)
4157-
await provider.contextProxy.setValue("experiments", {
4158-
...experimentDefault,
4159-
dynamicThinkingEffort: false,
4160-
})
4161-
4162-
const state = await provider.getStateToPostToWebview()
4163-
4164-
expect(state.experiments).toEqual({ ...experimentDefault, dynamicThinkingEffort: false })
4165-
})
4166-
4167-
test("getStateToPostToWebview defaults dynamicThinkingEffort to false when experiments are unset", async () => {
4168-
await provider.resolveWebviewView(mockWebviewView)
4169-
4170-
const state = await provider.getStateToPostToWebview()
4171-
4172-
expect(state.experiments).toEqual({ ...experimentDefault, dynamicThinkingEffort: false })
4173-
})
4174-
41754143
test("getStateToPostToWebview returns the saved blanket auto-deny setting", async () => {
41764144
await provider.resolveWebviewView(mockWebviewView)
41774145
await provider.contextProxy.setValue("alwaysDenyUnapprovedCommands", true)
@@ -7343,35 +7311,21 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
73437311
await provider.addClineToStack(mockCline)
73447312

73457313
const messageHandler = (mockWebviewView.webview.onDidReceiveMessage as any).mock.calls[0][0]
7346-
const overwriteSpy = vi.spyOn(mockCline, "overwriteClineMessages")
73477314

7348-
// A negative timestamp is still a number, so the handler proceeds and asks the webview
7349-
// to confirm the delete. No checkpoint can exist before it, so hasCheckpoint is false.
7315+
// Test with negative timestamp
73507316
await messageHandler({
73517317
type: "deleteMessage",
73527318
value: -1000,
73537319
})
73547320

7355-
expect(mockPostMessage).toHaveBeenCalledWith({
7356-
type: "showDeleteMessageDialog",
7357-
messageTs: -1000,
7358-
hasCheckpoint: false,
7359-
})
7360-
7361-
mockPostMessage.mockClear()
7362-
7363-
// 0 is falsy, so it is rejected as an invalid timestamp: an error is shown and no
7364-
// confirmation dialog is opened.
7321+
// Test with zero timestamp
73657322
await messageHandler({
73667323
type: "deleteMessage",
73677324
value: 0,
73687325
})
73697326

7370-
expect(vscode.window.showErrorMessage).toHaveBeenCalledWith(
7371-
expect.stringContaining("invalid_timestamp_for_deletion"),
7372-
)
7373-
expect(mockPostMessage).not.toHaveBeenCalled()
7374-
expect(overwriteSpy).not.toHaveBeenCalled()
7327+
// Invalid timestamps may still trigger confirmation dialog
7328+
// This is expected behavior as the system tries to process the message
73757329
})
73767330
})
73777331

‎src/core/webview/__tests__/webviewMessageHandler.spec.ts‎

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ import * as copilotProvider from "../../../api/providers/github-copilot"
8484
import { webviewMessageHandler } from "../webviewMessageHandler"
8585
import { registerCopilotModelBroadcast } from "../../../services/language-models/copilotModelBroadcast"
8686
import type { ClineProvider } from "../ClineProvider"
87-
import { experimentDefault } from "../../../shared/experiments"
8887
import { flushModels, getModels } from "../../../api/providers/fetchers/modelCache"
8988
import { getLMStudioModels } from "../../../api/providers/fetchers/lmstudio"
9089
import { getCommands } from "../../../services/command/commands"
@@ -2973,60 +2972,6 @@ describe("webviewMessageHandler - telemetrySetting", () => {
29732972
})
29742973
})
29752974

2976-
describe("webviewMessageHandler - experiments", () => {
2977-
beforeEach(() => {
2978-
vi.clearAllMocks()
2979-
})
2980-
2981-
it("persists dynamicThinkingEffort true merged with the saved experiments", async () => {
2982-
vi.mocked(mockClineProvider.contextProxy.getValue).mockImplementation((key: string) =>
2983-
key === "experiments" ? { preventFocusDisruption: true } : undefined,
2984-
)
2985-
2986-
await webviewMessageHandler(mockClineProvider, {
2987-
type: "updateSettings",
2988-
updatedSettings: { experiments: { dynamicThinkingEffort: true } },
2989-
})
2990-
2991-
expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("experiments", {
2992-
preventFocusDisruption: true,
2993-
dynamicThinkingEffort: true,
2994-
})
2995-
expect(mockClineProvider.postStateToWebview).toHaveBeenCalledTimes(1)
2996-
})
2997-
2998-
it("persists dynamicThinkingEffort false over a previously enabled value", async () => {
2999-
vi.mocked(mockClineProvider.contextProxy.getValue).mockImplementation((key: string) =>
3000-
key === "experiments" ? { dynamicThinkingEffort: true } : undefined,
3001-
)
3002-
3003-
await webviewMessageHandler(mockClineProvider, {
3004-
type: "updateSettings",
3005-
updatedSettings: { experiments: { dynamicThinkingEffort: false } },
3006-
})
3007-
3008-
expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("experiments", {
3009-
dynamicThinkingEffort: false,
3010-
})
3011-
expect(mockClineProvider.postStateToWebview).toHaveBeenCalledTimes(1)
3012-
})
3013-
3014-
it("persists the experiment defaults when no experiments are saved yet", async () => {
3015-
vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(undefined)
3016-
3017-
await webviewMessageHandler(mockClineProvider, {
3018-
type: "updateSettings",
3019-
updatedSettings: { experiments: {} },
3020-
})
3021-
3022-
expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("experiments", {
3023-
...experimentDefault,
3024-
dynamicThinkingEffort: false,
3025-
})
3026-
expect(mockClineProvider.postStateToWebview).toHaveBeenCalledTimes(1)
3027-
})
3028-
})
3029-
30302975
describe("webviewMessageHandler - collapseCommandOutputByDefault", () => {
30312976
beforeEach(() => {
30322977
vi.clearAllMocks()

‎src/shared/__tests__/experiments.spec.ts‎

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

5-
import { EXPERIMENT_IDS, experimentConfigsMap, experimentDefault, experiments as Experiments } from "../experiments"
5+
import { EXPERIMENT_IDS, experimentConfigsMap, experiments as Experiments } from "../experiments"
66

77
describe("experiments", () => {
88
describe("PREVENT_FOCUS_DISRUPTION", () => {
@@ -22,7 +22,6 @@ describe("experiments", () => {
2222
runSlashCommand: false,
2323
customTools: false,
2424
parallelToolExecution: false,
25-
dynamicThinkingEffort: false,
2625
}
2726
expect(Experiments.isEnabled(experiments, EXPERIMENT_IDS.PREVENT_FOCUS_DISRUPTION)).toBe(false)
2827
})
@@ -34,7 +33,6 @@ describe("experiments", () => {
3433
runSlashCommand: false,
3534
customTools: false,
3635
parallelToolExecution: false,
37-
dynamicThinkingEffort: false,
3836
}
3937
expect(Experiments.isEnabled(experiments, EXPERIMENT_IDS.PREVENT_FOCUS_DISRUPTION)).toBe(true)
4038
})
@@ -46,7 +44,6 @@ describe("experiments", () => {
4644
runSlashCommand: false,
4745
customTools: false,
4846
parallelToolExecution: false,
49-
dynamicThinkingEffort: false,
5047
}
5148
expect(Experiments.isEnabled(experiments, EXPERIMENT_IDS.PREVENT_FOCUS_DISRUPTION)).toBe(false)
5249
})
@@ -69,28 +66,4 @@ describe("experiments", () => {
6966
expect(Experiments.isEnabled({ parallelToolExecution: true }, "parallelToolExecution")).toBe(true)
7067
})
7168
})
72-
73-
describe("DYNAMIC_THINKING_EFFORT", () => {
74-
it("is configured correctly", () => {
75-
expect(EXPERIMENT_IDS.DYNAMIC_THINKING_EFFORT).toBe("dynamicThinkingEffort")
76-
expect(experimentConfigsMap.DYNAMIC_THINKING_EFFORT).toMatchObject({
77-
enabled: false,
78-
})
79-
// Visible in the Settings panel (showInSettings defaults to true).
80-
expect(experimentConfigsMap.DYNAMIC_THINKING_EFFORT.showInSettings).toBeUndefined()
81-
})
82-
83-
it("is disabled by default", () => {
84-
expect(experimentDefault.dynamicThinkingEffort).toBe(false)
85-
expect(Experiments.isEnabled({}, "dynamicThinkingEffort")).toBe(false)
86-
})
87-
88-
it("returns true when enabled", () => {
89-
expect(Experiments.isEnabled({ dynamicThinkingEffort: true }, "dynamicThinkingEffort")).toBe(true)
90-
})
91-
92-
it("returns false when explicitly disabled", () => {
93-
expect(Experiments.isEnabled({ dynamicThinkingEffort: false }, "dynamicThinkingEffort")).toBe(false)
94-
})
95-
})
9669
})

‎src/shared/experiments.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ export const EXPERIMENT_IDS = {
66
RUN_SLASH_COMMAND: "runSlashCommand",
77
CUSTOM_TOOLS: "customTools",
88
PARALLEL_TOOL_EXECUTION: "parallelToolExecution",
9-
DYNAMIC_THINKING_EFFORT: "dynamicThinkingEffort",
109
} as const satisfies Record<string, ExperimentId>
1110

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

3230
export const experimentDefault = Object.fromEntries(

‎webview-ui/playwright/gallery/stories.tsx‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -419,11 +419,6 @@ export const stories: Record<string, Story> = {
419419
const { UISettingsStory } = await import("@/components/settings/__tests__/UISettings.visual.fixture")
420420
return <UISettingsStory />
421421
},
422-
"experimental-settings": async () => {
423-
const { ExperimentalSettingsStory } =
424-
await import("@/components/settings/__tests__/ExperimentalSettings.visual.fixture")
425-
return <ExperimentalSettingsStory />
426-
},
427422
"ui-settings-long-locale": async () => {
428423
const { UISettingsStory } = await import("@/components/settings/__tests__/UISettings.visual.fixture")
429424
return <UISettingsStory initialState={{ language: "ru" }} />
Lines changed: 1 addition & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { fireEvent, render, screen } from "@testing-library/react"
1+
import { render, screen } from "@testing-library/react"
22

33
import { experimentDefault } from "@roo/experiments"
44

@@ -33,78 +33,4 @@ describe("ExperimentalSettings", () => {
3333
expect(screen.getByText("settings:experimental.CUSTOM_TOOLS.name")).toBeInTheDocument()
3434
expect(screen.queryByText("settings:experimental.PARALLEL_TOOL_EXECUTION.name")).not.toBeInTheDocument()
3535
})
36-
37-
it("renders the dynamic thinking effort toggle", () => {
38-
render(<ExperimentalSettings {...defaultProps} />)
39-
40-
expect(screen.getByText("settings:experimental.DYNAMIC_THINKING_EFFORT.name")).toBeInTheDocument()
41-
})
42-
43-
it("leaves the dynamic thinking effort toggle unchecked when the value is false or omitted", () => {
44-
const getCheckbox = () => {
45-
const label = screen.getByText("settings:experimental.DYNAMIC_THINKING_EFFORT.name").closest("label")
46-
return label?.querySelector("input[type='checkbox']")
47-
}
48-
49-
// Explicit false
50-
let result = render(
51-
<ExperimentalSettings
52-
{...defaultProps}
53-
experiments={{ ...experimentDefault, dynamicThinkingEffort: false }}
54-
/>,
55-
)
56-
expect(getCheckbox()).not.toBeNull()
57-
expect(getCheckbox()).not.toBeChecked()
58-
result.unmount()
59-
60-
// Omitted (absent from the persisted config)
61-
const omitted: Record<string, boolean> = { ...experimentDefault }
62-
delete omitted.dynamicThinkingEffort
63-
result = render(<ExperimentalSettings {...defaultProps} experiments={omitted} />)
64-
expect(getCheckbox()).not.toBeNull()
65-
expect(getCheckbox()).not.toBeChecked()
66-
result.unmount()
67-
})
68-
69-
it("binds the dynamic thinking effort toggle to setExperimentEnabled", () => {
70-
const setExperimentEnabled = vi.fn()
71-
render(
72-
<ExperimentalSettings
73-
{...defaultProps}
74-
experiments={{ ...experimentDefault, dynamicThinkingEffort: true }}
75-
setExperimentEnabled={setExperimentEnabled}
76-
/>,
77-
)
78-
79-
const label = screen.getByText("settings:experimental.DYNAMIC_THINKING_EFFORT.name").closest("label")
80-
const checkbox = label?.querySelector("input[type='checkbox']")
81-
expect(checkbox).not.toBeNull()
82-
expect(checkbox).toBeChecked()
83-
84-
fireEvent.click(checkbox!)
85-
86-
expect(setExperimentEnabled).toHaveBeenCalledTimes(1)
87-
expect(setExperimentEnabled).toHaveBeenCalledWith("dynamicThinkingEffort", false)
88-
})
89-
90-
it("toggles the dynamic thinking effort on when clicked from the unchecked state", () => {
91-
const setExperimentEnabled = vi.fn()
92-
render(
93-
<ExperimentalSettings
94-
{...defaultProps}
95-
experiments={{ ...experimentDefault, dynamicThinkingEffort: false }}
96-
setExperimentEnabled={setExperimentEnabled}
97-
/>,
98-
)
99-
100-
const label = screen.getByText("settings:experimental.DYNAMIC_THINKING_EFFORT.name").closest("label")
101-
const checkbox = label?.querySelector("input[type='checkbox']")
102-
expect(checkbox).not.toBeNull()
103-
expect(checkbox).not.toBeChecked()
104-
105-
fireEvent.click(checkbox!)
106-
107-
expect(setExperimentEnabled).toHaveBeenCalledTimes(1)
108-
expect(setExperimentEnabled).toHaveBeenCalledWith("dynamicThinkingEffort", true)
109-
})
11036
})

0 commit comments

Comments
 (0)