From 6fb752ad69bf0bbd9c5e40dbaee5e51e8dc9ef7e Mon Sep 17 00:00:00 2001 From: Brendan Allan Date: Tue, 28 Jul 2026 17:01:20 +0800 Subject: [PATCH] refactor(desktop): inline v2 sidecar flag --- packages/desktop/src/main/index.ts | 3 +-- packages/desktop/src/main/sidecar-version.test.ts | 8 -------- packages/desktop/src/main/sidecar-version.ts | 3 --- 3 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 packages/desktop/src/main/sidecar-version.test.ts delete mode 100644 packages/desktop/src/main/sidecar-version.ts diff --git a/packages/desktop/src/main/index.ts b/packages/desktop/src/main/index.ts index 7430b6c7ef..67696a5470 100644 --- a/packages/desktop/src/main/index.ts +++ b/packages/desktop/src/main/index.ts @@ -49,7 +49,6 @@ import { spawnWslSidecar } from "./wsl/sidecar" import { migrate } from "./migrate" import { cleanupStoreFiles } from "./store-cleanup" import { startBackgroundCli } from "./background-cli" -import { resolveSidecarVersion } from "./sidecar-version" const APP_NAMES: Record = { dev: "OpenCode Dev", @@ -62,7 +61,7 @@ const APP_IDS: Record = { prod: "ai.opencode.desktop", } const TEST_ONBOARDING = process.env.OPENCODE_TEST_ONBOARDING === "1" -const SIDECAR_VERSION = resolveSidecarVersion() +const SIDECAR_VERSION = process.env.OPENCODE_SIDECAR_V2 === "1" ? "v2" : "v1" const jsCallStackFeature = "DocumentPolicyIncludeJSCallStacksInCrashReports" let logger: ReturnType diff --git a/packages/desktop/src/main/sidecar-version.test.ts b/packages/desktop/src/main/sidecar-version.test.ts deleted file mode 100644 index 6fe5ba9747..0000000000 --- a/packages/desktop/src/main/sidecar-version.test.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { expect, test } from "bun:test" -import { resolveSidecarVersion } from "./sidecar-version" - -test("enables the v2 sidecar only for OPENCODE_SIDECAR_V2=1", () => { - expect(resolveSidecarVersion("1")).toBe("v2") - expect(resolveSidecarVersion("0")).toBe("v1") - expect(resolveSidecarVersion(undefined)).toBe("v1") -}) diff --git a/packages/desktop/src/main/sidecar-version.ts b/packages/desktop/src/main/sidecar-version.ts deleted file mode 100644 index 6e99255dfd..0000000000 --- a/packages/desktop/src/main/sidecar-version.ts +++ /dev/null @@ -1,3 +0,0 @@ -export function resolveSidecarVersion(value = process.env.OPENCODE_SIDECAR_V2) { - return value === "1" ? "v2" : "v1" -}