Skip to content

Commit 4846ba8

Browse files
only21milclaudejuliusmarminge
authored
fix(desktop): skip WSL distro probing while the WSL backend is off (pingdotgg#21225)
Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: Julius Marminge <[email protected]>
1 parent cfbd463 commit 4846ba8

3 files changed

Lines changed: 50 additions & 6 deletions

File tree

‎apps/desktop/src/ipc/methods/wsl.test.ts‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,43 @@ describe("WSL IPC", () => {
120120
),
121121
);
122122

123+
it.effect("does not enumerate distros until the WSL backend is enabled", () => {
124+
const distros = [
125+
{ name: "Ubuntu", isDefault: true, version: 2 as const },
126+
{ name: "Debian", isDefault: false, version: 2 as const },
127+
];
128+
const layer = Layer.mergeAll(
129+
DesktopAppSettings.layerTest({
130+
...DesktopAppSettings.DEFAULT_DESKTOP_SETTINGS,
131+
wslDistro: "Debian",
132+
}),
133+
DesktopWslEnvironment.layerTest({ isAvailable: true, distros }),
134+
layerWslBackend(),
135+
layerLifecycle([]),
136+
layerUnusedLifecycleRuntime,
137+
);
138+
139+
return Effect.gen(function* () {
140+
const wsl = yield* DesktopWslEnvironment.DesktopWslEnvironment;
141+
const state = yield* getWslState.handler(undefined).pipe(
142+
Effect.provideService(DesktopWslEnvironment.DesktopWslEnvironment, {
143+
...wsl,
144+
listDistros: Effect.die("must not enumerate distros"),
145+
}),
146+
Effect.flatMap(decodeWslState),
147+
);
148+
assert.equal(state.enabled, false);
149+
assert.equal(state.available, true);
150+
assert.equal(state.distro, "Debian");
151+
assert.deepEqual(state.distros, []);
152+
153+
const enabledState = yield* invokeSetWslBackendEnabled(true);
154+
assert.equal(enabledState.enabled, true);
155+
assert.equal(enabledState.distro, "Debian");
156+
assert.deepEqual(enabledState.distros, distros);
157+
}).pipe(Effect.provide(layer));
158+
});
159+
123160
it.effect("stages dual-backend preferences before enabling without relaunching", () => {
124161
const relaunchReasons: Array<string> = [];
125162
const layer = Layer.mergeAll(

‎apps/desktop/src/ipc/methods/wsl.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ const readWslState: Effect.Effect<
2222
const wslBackend = yield* DesktopWslBackend.DesktopWslBackend;
2323
const settings = yield* appSettings.get;
2424
const available = settings.localEnvironmentEnabled && (yield* wslEnvironment.isAvailable);
25-
// Only enumerate distros when WSL is actually available — listDistros on a
26-
// non-WSL host would spawn wsl.exe and hit the timeout for nothing.
27-
const distros = available ? yield* wslEnvironment.listDistros : [];
25+
// Windows ships a wsl.exe stub that can prompt to install WSL when invoked.
26+
// Keep disabled state reads from launching it to enumerate distros.
27+
const distros = available && settings.wslBackendEnabled ? yield* wslEnvironment.listDistros : [];
2828
const preflightError = yield* wslBackend.lastPreflightError;
2929
return {
3030
enabled: settings.wslBackendEnabled,

‎apps/web/src/components/settings/ConnectionsSettings.tsx‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3240,9 +3240,16 @@ export function ConnectionsSettings() {
32403240
Off
32413241
</SelectItem>
32423242
{desktopWslState.distros.length === 0 ? (
3243-
<SelectItem hideIndicator value={BACKEND_VALUE_DEFAULT_WSL}>
3244-
Default distro
3245-
</SelectItem>
3243+
<>
3244+
<SelectItem hideIndicator value={BACKEND_VALUE_DEFAULT_WSL}>
3245+
Default distro
3246+
</SelectItem>
3247+
{desktopWslState.distro !== null ? (
3248+
<SelectItem hideIndicator value={desktopWslState.distro}>
3249+
{desktopWslState.distro}
3250+
</SelectItem>
3251+
) : null}
3252+
</>
32463253
) : (
32473254
desktopWslState.distros.map((distro) => (
32483255
<SelectItem hideIndicator key={distro.name} value={distro.name}>

0 commit comments

Comments
 (0)