opencode-agent[bot] 2 месяцев назад
Родитель
Сommit
34ee94232f

+ 8 - 9
packages/app/src/wsl/dialog-add-server.tsx

@@ -82,9 +82,7 @@ export function DialogAddWslServer(props: DialogWslServerProps = {}) {
         <Dialog fit class="settings-v2-wsl-dialog">
           <DialogHeader hideClose={true}>
             <DialogTitle>
-              {controller.view() === "main"
-                ? language.t("wsl.server.add")
-                : language.t("wsl.onboarding.installDistro")}
+              {controller.view() === "main" ? language.t("wsl.server.add") : language.t("wsl.onboarding.installDistro")}
             </DialogTitle>
           </DialogHeader>
           <DividerV2 />
@@ -144,7 +142,12 @@ export function DialogAddWslServer(props: DialogWslServerProps = {}) {
             <DialogBody class="settings-v2-wsl-dialog-body">
               <div class="settings-v2-wsl-section-header">
                 <span class="settings-v2-wsl-section-title">{language.t("wsl.onboarding.installedDistros")}</span>
-                <ButtonV2 variant="ghost-muted" size="small" disabled={model().busy} onClick={controller.refreshDistros}>
+                <ButtonV2
+                  variant="ghost-muted"
+                  size="small"
+                  disabled={model().busy}
+                  onClick={controller.refreshDistros}
+                >
                   {language.t("wsl.onboarding.checkAgain")}
                 </ButtonV2>
               </div>
@@ -436,11 +439,7 @@ function DialogWslSetup(props: {
           </Show>
         </div>
         <Show when={props.state === "unavailable" && props.installable}>
-          <ButtonV2
-            variant="neutral"
-            disabled={props.busy}
-            onClick={props.onInstall}
-          >
+          <ButtonV2 variant="neutral" disabled={props.busy} onClick={props.onInstall}>
             {language.t("wsl.onboarding.installWsl")}
           </ButtonV2>
         </Show>

+ 1 - 3
packages/app/src/wsl/settings-model.ts

@@ -36,9 +36,7 @@ export type AddableProbePlan = {
   distros: string[]
 }
 
-export type AutoProbePlan =
-  | { key: "runtime"; action: "probeRuntime" }
-  | { key: "distros"; action: "refreshDistros" }
+export type AutoProbePlan = { key: "runtime"; action: "probeRuntime" } | { key: "distros"; action: "refreshDistros" }
 
 export type AddServerProbePlan =
   | { kind: "auto"; key: string; plan: AutoProbePlan }

+ 31 - 33
packages/desktop/src/main/wsl/servers.test.ts

@@ -1,5 +1,11 @@
 import { expect, test } from "bun:test"
-import { clearWslDistroState, requireWslIpcString, requireWslIpcStrings, wslServerIdToRestart, wslTerminalArgs } from "./policy"
+import {
+  clearWslDistroState,
+  requireWslIpcString,
+  requireWslIpcStrings,
+  wslServerIdToRestart,
+  wslTerminalArgs,
+} from "./policy"
 import {
   expectOpencodeVersion,
   pendingRestartAfterWslInstall,
@@ -149,22 +155,18 @@ test("probes addable distros in parallel before checking OpenCode", async () =>
   const started: string[] = []
   const release = new Map<string, () => void>()
   const opencode: string[] = []
-  const controller = createWslServersController(
-    "1.16.2",
-    async () => new Promise<never>(() => undefined),
-    {
-      ...testControllerOptions(),
-      probeDistro: async (distro) => {
-        started.push(distro)
-        await new Promise<void>((resolve) => release.set(distro, resolve))
-        return { name: distro, canExecute: true, hasBash: true, hasCurl: true, error: null }
-      },
-      resolveOpencode: async (distro) => {
-        opencode.push(distro)
-        return "/home/me/.opencode/bin/opencode"
-      },
+  const controller = createWslServersController("1.16.2", async () => new Promise<never>(() => undefined), {
+    ...testControllerOptions(),
+    probeDistro: async (distro) => {
+      started.push(distro)
+      await new Promise<void>((resolve) => release.set(distro, resolve))
+      return { name: distro, canExecute: true, hasBash: true, hasCurl: true, error: null }
     },
-  )
+    resolveOpencode: async (distro) => {
+      opencode.push(distro)
+      return "/home/me/.opencode/bin/opencode"
+    },
+  })
 
   const task = controller.probeAddable(["Debian", "Ubuntu"])
   await waitFor(() => started.length === 2)
@@ -182,24 +184,20 @@ test("probes addable distros in parallel before checking OpenCode", async () =>
 test("does not check OpenCode in addable distros that cannot execute commands", async () => {
   persistedServers = []
   const opencode: string[] = []
-  const controller = createWslServersController(
-    "1.16.2",
-    async () => new Promise<never>(() => undefined),
-    {
-      ...testControllerOptions(),
-      probeDistro: async (distro) => ({
-        name: distro,
-        canExecute: distro === "Debian",
-        hasBash: distro === "Debian",
-        hasCurl: distro === "Debian",
-        error: distro === "Debian" ? null : "Open Ubuntu once to finish setup",
-      }),
-      resolveOpencode: async (distro) => {
-        opencode.push(distro)
-        return "/home/me/.opencode/bin/opencode"
-      },
+  const controller = createWslServersController("1.16.2", async () => new Promise<never>(() => undefined), {
+    ...testControllerOptions(),
+    probeDistro: async (distro) => ({
+      name: distro,
+      canExecute: distro === "Debian",
+      hasBash: distro === "Debian",
+      hasCurl: distro === "Debian",
+      error: distro === "Debian" ? null : "Open Ubuntu once to finish setup",
+    }),
+    resolveOpencode: async (distro) => {
+      opencode.push(distro)
+      return "/home/me/.opencode/bin/opencode"
     },
-  )
+  })
 
   await controller.probeAddable(["Debian", "Ubuntu"])