From 70443cd2de0d8c07a22f626c353c24d536cd7cc7 Mon Sep 17 00:00:00 2001 From: LukeParkerDev <10430890+Hona@users.noreply.github.com> Date: Tue, 28 Apr 2026 09:20:16 +1000 Subject: [PATCH] kill --- packages/app/src/context/platform.tsx | 7 ----- packages/desktop-electron/src/main/index.ts | 1 - packages/desktop-electron/src/main/ipc.ts | 7 ----- .../desktop-electron/src/main/wsl-servers.ts | 26 ------------------- .../desktop-electron/src/preload/index.ts | 1 - .../desktop-electron/src/preload/types.ts | 7 ----- 6 files changed, 49 deletions(-) diff --git a/packages/app/src/context/platform.tsx b/packages/app/src/context/platform.tsx index 8acf83c1a8..4221f31831 100644 --- a/packages/app/src/context/platform.tsx +++ b/packages/app/src/context/platform.tsx @@ -44,15 +44,9 @@ export type WslOpencodeCheck = { matchesDesktop: boolean | null error: string | null } -export type WslServerAcknowledgements = { - root: boolean - mismatch: { path: string; version: string } | null -} - export type WslServerConfig = { id: string distro: string - acknowledgements: WslServerAcknowledgements } export type WslServerRuntime = @@ -103,7 +97,6 @@ export type WslServersPlatform = { startServer(id: string): Promise stopServer(id: string): Promise cancelJob(): Promise - updateAcknowledgements(id: string, acks: Partial): Promise } export type Platform = { diff --git a/packages/desktop-electron/src/main/index.ts b/packages/desktop-electron/src/main/index.ts index eaf694cb5c..d98282f264 100644 --- a/packages/desktop-electron/src/main/index.ts +++ b/packages/desktop-electron/src/main/index.ts @@ -373,7 +373,6 @@ registerIpcHandlers({ wslServersStartServer: (id) => wslServers.startServer(id), wslServersStopServer: (id) => wslServers.stopServer(id), wslServersCancelJob: () => wslServers.cancelJob(), - wslServersUpdateAcknowledgements: (id, acks) => wslServers.updateAcknowledgements(id, acks), getWindowConfig: () => ({ updaterEnabled: UPDATER_ENABLED }), consumeInitialDeepLinks: () => pendingDeepLinks.splice(0), getDefaultServerUrl: () => getDefaultServerUrl(), diff --git a/packages/desktop-electron/src/main/ipc.ts b/packages/desktop-electron/src/main/ipc.ts index f7a6cfce3a..fc6cec5204 100644 --- a/packages/desktop-electron/src/main/ipc.ts +++ b/packages/desktop-electron/src/main/ipc.ts @@ -8,7 +8,6 @@ import type { SqliteMigrationProgress, TitlebarTheme, WindowConfig, - WslServerAcknowledgements, WslServerConfig, WslServersEvent, WslServersState, @@ -40,7 +39,6 @@ type Deps = { wslServersStartServer: (id: string) => Promise | void wslServersStopServer: (id: string) => Promise | void wslServersCancelJob: () => Promise | void - wslServersUpdateAcknowledgements: (id: string, acks: Partial) => Promise | void getWindowConfig: () => Promise | WindowConfig consumeInitialDeepLinks: () => Promise | string[] getDefaultServerUrl: () => Promise | string | null @@ -171,11 +169,6 @@ export function registerIpcHandlers(deps: Deps) { deps.wslServersStopServer(requireString("server id", id)), ) handle("wsl-servers-cancel", () => deps.wslServersCancelJob()) - handle( - "wsl-servers-update-acknowledgements", - (_event: IpcMainInvokeEvent, id: string, acks: Partial) => - deps.wslServersUpdateAcknowledgements(requireString("server id", id), acks), - ) handle("get-window-config", () => deps.getWindowConfig()) handle("consume-initial-deep-links", () => deps.consumeInitialDeepLinks()) handle("get-default-server-url", () => deps.getDefaultServerUrl()) diff --git a/packages/desktop-electron/src/main/wsl-servers.ts b/packages/desktop-electron/src/main/wsl-servers.ts index dd3e1b9b16..4c5885e4ec 100644 --- a/packages/desktop-electron/src/main/wsl-servers.ts +++ b/packages/desktop-electron/src/main/wsl-servers.ts @@ -5,7 +5,6 @@ import type { WslOnlineDistro, WslOpencodeCheck, WslRuntimeCheck, - WslServerAcknowledgements, WslServerConfig, WslServerItem, WslServerRuntime, @@ -331,7 +330,6 @@ export function createWslServersController(appVersion: string, spawnSidecar: Spa const config: WslServerConfig = { id, distro, - acknowledgements: { root: false, mismatch: null }, } persistServers([...readPersistedServers(), config]) setState({ @@ -357,15 +355,6 @@ export function createWslServersController(appVersion: string, spawnSidecar: Spa setRuntime(id, { kind: "stopped" }) }, - async updateAcknowledgements(id: string, acks: Partial) { - const persisted = readPersistedServers() - const next = persisted.map((config) => - config.id === id ? { ...config, acknowledgements: { ...config.acknowledgements, ...acks } } : config, - ) - persistServers(next) - refreshFromStore() - }, - stopAll() { for (const item of state.servers) invalidateStartAttempt(item.config.id) for (const existing of sidecars.values()) { @@ -417,7 +406,6 @@ function migrateLegacyLocalServer(): WslServerConfig[] { { id: wslServerIdForDistro(distro), distro, - acknowledgements: { root: false, mismatch: null }, }, ] } @@ -432,24 +420,10 @@ function normalizePersistedServer(value: unknown): WslServerConfig[] { { id, distro, - acknowledgements: normalizeAcks(record.acknowledgements), }, ] } -function normalizeAcks(value: unknown): WslServerAcknowledgements { - const record = value && typeof value === "object" ? (value as Record) : {} - const mismatch = - record.mismatch && typeof record.mismatch === "object" ? (record.mismatch as Record) : null - return { - root: record.root === true, - mismatch: - mismatch && typeof mismatch.path === "string" && typeof mismatch.version === "string" - ? { path: mismatch.path, version: mismatch.version } - : null, - } -} - function opencodeCheck( distro: string, resolvedPath: string | null, diff --git a/packages/desktop-electron/src/preload/index.ts b/packages/desktop-electron/src/preload/index.ts index 412afbfe2d..b72ac6b934 100644 --- a/packages/desktop-electron/src/preload/index.ts +++ b/packages/desktop-electron/src/preload/index.ts @@ -35,7 +35,6 @@ const api: ElectronAPI = { startServer: (id) => ipcRenderer.invoke("wsl-servers-start", id), stopServer: (id) => ipcRenderer.invoke("wsl-servers-stop", id), cancelJob: () => ipcRenderer.invoke("wsl-servers-cancel"), - updateAcknowledgements: (id, acks) => ipcRenderer.invoke("wsl-servers-update-acknowledgements", id, acks), }, getWindowConfig: () => ipcRenderer.invoke("get-window-config"), consumeInitialDeepLinks: () => ipcRenderer.invoke("consume-initial-deep-links"), diff --git a/packages/desktop-electron/src/preload/types.ts b/packages/desktop-electron/src/preload/types.ts index 3dfffc3ad0..f2e379e8b1 100644 --- a/packages/desktop-electron/src/preload/types.ts +++ b/packages/desktop-electron/src/preload/types.ts @@ -47,15 +47,9 @@ export type WslOpencodeCheck = { matchesDesktop: boolean | null error: string | null } -export type WslServerAcknowledgements = { - root: boolean - mismatch: { path: string; version: string } | null -} - export type WslServerConfig = { id: string distro: string - acknowledgements: WslServerAcknowledgements } export type WslServerRuntime = @@ -106,7 +100,6 @@ export type WslServersAPI = { startServer: (id: string) => Promise stopServer: (id: string) => Promise cancelJob: () => Promise - updateAcknowledgements: (id: string, acks: Partial) => Promise } export type LinuxDisplayBackend = "wayland" | "auto"