release: v1.14.35

.github/workflows/publish.yml

@@ -304,7 +304,7 @@ jobs:
 
       - name: Prepare
         run: bun ./scripts/prepare.ts
-        working-directory: packages/desktop
+        working-directory: packages/desktop-electron
         env:
           OPENCODE_VERSION: ${{ needs.version.outputs.version }}
           OPENCODE_CHANNEL: ${{ (github.ref_name == 'beta' && 'beta') || 'prod' }}
@@ -315,7 +315,7 @@ jobs:
 
       - name: Build
         run: bun run build
-        working-directory: packages/desktop
+        working-directory: packages/desktop-electron
         env:
           OPENCODE_CHANNEL: ${{ (github.ref_name == 'beta' && 'beta') || 'prod' }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
@@ -329,7 +329,7 @@ jobs:
       - name: Package and publish
         if: needs.version.outputs.release
         run: npx electron-builder ${{ matrix.settings.platform_flag }} --publish always --config electron-builder.config.ts
-        working-directory: packages/desktop
+        working-directory: packages/desktop-electron
         timeout-minutes: 60
         env:
           OPENCODE_CHANNEL: ${{ (github.ref_name == 'beta' && 'beta') || 'prod' }}
@@ -343,14 +343,14 @@ jobs:
       - name: Package (no publish)
         if: ${{ !needs.version.outputs.release }}
         run: npx electron-builder ${{ matrix.settings.platform_flag }} --publish never --config electron-builder.config.ts
-        working-directory: packages/desktop
+        working-directory: packages/desktop-electron
         timeout-minutes: 60
         env:
           OPENCODE_CHANNEL: ${{ (github.ref_name == 'beta' && 'beta') || 'prod' }}
 
       - name: Create and upload macOS .app.tar.gz
         if: runner.os == 'macOS' && needs.version.outputs.release
-        working-directory: packages/desktop/dist
+        working-directory: packages/desktop-electron/dist
         env:
           GH_TOKEN: ${{ steps.committer.outputs.token }}
         run: |
@@ -377,9 +377,9 @@ jobs:
         shell: pwsh
         run: |
           $files = @()
-          $files += Get-ChildItem "${{ github.workspace }}\packages\desktop\dist\*.exe" | Select-Object -ExpandProperty FullName
-          $files += Get-ChildItem "${{ github.workspace }}\packages\desktop\dist\*unpacked\*.exe" | Select-Object -ExpandProperty FullName
-          $files += Get-ChildItem "${{ github.workspace }}\packages\desktop\dist\*unpacked\resources\opencode-cli.exe" -ErrorAction SilentlyContinue | Select-Object -ExpandProperty FullName
+          $files += Get-ChildItem "${{ github.workspace }}\packages\desktop-electron\dist\*.exe" | Select-Object -ExpandProperty FullName
+          $files += Get-ChildItem "${{ github.workspace }}\packages\desktop-electron\dist\*unpacked\*.exe" | Select-Object -ExpandProperty FullName
+          $files += Get-ChildItem "${{ github.workspace }}\packages\desktop-electron\dist\*unpacked\resources\opencode-cli.exe" -ErrorAction SilentlyContinue | Select-Object -ExpandProperty FullName
 
           foreach ($file in $files | Select-Object -Unique) {
             $sig = Get-AuthenticodeSignature $file
@@ -391,13 +391,13 @@ jobs:
       - uses: actions/upload-artifact@v4
         with:
           name: opencode-desktop-${{ matrix.settings.target }}
-          path: packages/desktop/dist/*
+          path: packages/desktop-electron/dist/*
 
       - uses: actions/upload-artifact@v4
         if: needs.version.outputs.release
         with:
           name: latest-yml-${{ matrix.settings.target }}
-          path: packages/desktop/dist/latest*.yml
+          path: packages/desktop-electron/dist/latest*.yml
 
   publish:
     needs:

bun.lock

@@ -29,7 +29,7 @@
     },
     "packages/app": {
       "name": "@opencode-ai/app",
-      "version": "1.14.37",
+      "version": "1.14.35",
       "dependencies": {
         "@kobalte/core": "catalog:",
         "@opencode-ai/core": "workspace:*",
@@ -85,7 +85,7 @@
     },
     "packages/console/app": {
       "name": "@opencode-ai/console-app",
-      "version": "1.14.37",
+      "version": "1.14.35",
       "dependencies": {
         "@cloudflare/vite-plugin": "1.15.2",
         "@ibm/plex": "6.4.1",
@@ -119,7 +119,7 @@
     },
     "packages/console/core": {
       "name": "@opencode-ai/console-core",
-      "version": "1.14.37",
+      "version": "1.14.35",
       "dependencies": {
         "@aws-sdk/client-sts": "3.782.0",
         "@jsx-email/render": "1.1.1",
@@ -146,7 +146,7 @@
     },
     "packages/console/function": {
       "name": "@opencode-ai/console-function",
-      "version": "1.14.37",
+      "version": "1.14.35",
       "dependencies": {
         "@ai-sdk/anthropic": "3.0.64",
         "@ai-sdk/openai": "3.0.48",
@@ -170,7 +170,7 @@
     },
     "packages/console/mail": {
       "name": "@opencode-ai/console-mail",
-      "version": "1.14.37",
+      "version": "1.14.35",
       "dependencies": {
         "@jsx-email/all": "2.2.3",
         "@jsx-email/cli": "1.4.3",
@@ -194,7 +194,7 @@
     },
     "packages/core": {
       "name": "@opencode-ai/core",
-      "version": "1.14.37",
+      "version": "1.14.35",
       "bin": {
         "opencode": "./bin/opencode",
       },
@@ -228,7 +228,42 @@
     },
     "packages/desktop": {
       "name": "@opencode-ai/desktop",
-      "version": "1.14.37",
+      "version": "1.14.35",
+      "dependencies": {
+        "@opencode-ai/app": "workspace:*",
+        "@opencode-ai/ui": "workspace:*",
+        "@sentry/solid": "catalog:",
+        "@solid-primitives/i18n": "2.2.1",
+        "@solid-primitives/storage": "catalog:",
+        "@solidjs/meta": "catalog:",
+        "@tauri-apps/api": "^2",
+        "@tauri-apps/plugin-clipboard-manager": "~2",
+        "@tauri-apps/plugin-deep-link": "~2",
+        "@tauri-apps/plugin-dialog": "~2",
+        "@tauri-apps/plugin-http": "~2",
+        "@tauri-apps/plugin-notification": "~2",
+        "@tauri-apps/plugin-opener": "^2",
+        "@tauri-apps/plugin-os": "~2",
+        "@tauri-apps/plugin-process": "~2",
+        "@tauri-apps/plugin-shell": "~2",
+        "@tauri-apps/plugin-store": "~2",
+        "@tauri-apps/plugin-updater": "~2",
+        "@tauri-apps/plugin-window-state": "~2",
+        "solid-js": "catalog:",
+      },
+      "devDependencies": {
+        "@actions/artifact": "4.0.0",
+        "@sentry/vite-plugin": "catalog:",
+        "@tauri-apps/cli": "^2",
+        "@types/bun": "catalog:",
+        "@typescript/native-preview": "catalog:",
+        "typescript": "~5.6.2",
+        "vite": "catalog:",
+      },
+    },
+    "packages/desktop-electron": {
+      "name": "@opencode-ai/desktop-electron",
+      "version": "1.14.35",
       "dependencies": {
         "drizzle-orm": "catalog:",
         "effect": "catalog:",
@@ -274,7 +309,7 @@
     },
     "packages/enterprise": {
       "name": "@opencode-ai/enterprise",
-      "version": "1.14.37",
+      "version": "1.14.35",
       "dependencies": {
         "@opencode-ai/core": "workspace:*",
         "@opencode-ai/ui": "workspace:*",
@@ -303,7 +338,7 @@
     },
     "packages/function": {
       "name": "@opencode-ai/function",
-      "version": "1.14.37",
+      "version": "1.14.35",
       "dependencies": {
         "@octokit/auth-app": "8.0.1",
         "@octokit/rest": "catalog:",
@@ -319,7 +354,7 @@
     },
     "packages/opencode": {
       "name": "opencode",
-      "version": "1.14.37",
+      "version": "1.14.35",
       "bin": {
         "opencode": "./bin/opencode",
       },
@@ -461,7 +496,7 @@
     },
     "packages/plugin": {
       "name": "@opencode-ai/plugin",
-      "version": "1.14.37",
+      "version": "1.14.35",
       "dependencies": {
         "@opencode-ai/sdk": "workspace:*",
         "effect": "catalog:",
@@ -496,7 +531,7 @@
     },
     "packages/sdk/js": {
       "name": "@opencode-ai/sdk",
-      "version": "1.14.37",
+      "version": "1.14.35",
       "dependencies": {
         "cross-spawn": "catalog:",
       },
@@ -511,7 +546,7 @@
     },
     "packages/slack": {
       "name": "@opencode-ai/slack",
-      "version": "1.14.37",
+      "version": "1.14.35",
       "dependencies": {
         "@opencode-ai/sdk": "workspace:*",
         "@slack/bolt": "^3.17.1",
@@ -546,7 +581,7 @@
     },
     "packages/ui": {
       "name": "@opencode-ai/ui",
-      "version": "1.14.37",
+      "version": "1.14.35",
       "dependencies": {
         "@kobalte/core": "catalog:",
         "@opencode-ai/core": "workspace:*",
@@ -595,7 +630,7 @@
     },
     "packages/web": {
       "name": "@opencode-ai/web",
-      "version": "1.14.37",
+      "version": "1.14.35",
       "dependencies": {
         "@astrojs/cloudflare": "12.6.3",
         "@astrojs/markdown-remark": "6.3.1",
@@ -1535,6 +1570,8 @@
 
     "@opencode-ai/desktop": ["@opencode-ai/desktop@workspace:packages/desktop"],
 
+    "@opencode-ai/desktop-electron": ["@opencode-ai/desktop-electron@workspace:packages/desktop-electron"],
+
     "@opencode-ai/enterprise": ["@opencode-ai/enterprise@workspace:packages/enterprise"],
 
     "@opencode-ai/function": ["@opencode-ai/function@workspace:packages/function"],
@@ -2233,8 +2270,54 @@
 
     "@tauri-apps/api": ["@tauri-apps/api@2.10.1", "", {}, "sha512-hKL/jWf293UDSUN09rR69hrToyIXBb8CjGaWC7gfinvnQrBVvnLr08FeFi38gxtugAVyVcTa5/FD/Xnkb1siBw=="],
 
+    "@tauri-apps/cli": ["@tauri-apps/cli@2.10.1", "", { "optionalDependencies": { "@tauri-apps/cli-darwin-arm64": "2.10.1", "@tauri-apps/cli-darwin-x64": "2.10.1", "@tauri-apps/cli-linux-arm-gnueabihf": "2.10.1", "@tauri-apps/cli-linux-arm64-gnu": "2.10.1", "@tauri-apps/cli-linux-arm64-musl": "2.10.1", "@tauri-apps/cli-linux-riscv64-gnu": "2.10.1", "@tauri-apps/cli-linux-x64-gnu": "2.10.1", "@tauri-apps/cli-linux-x64-musl": "2.10.1", "@tauri-apps/cli-win32-arm64-msvc": "2.10.1", "@tauri-apps/cli-win32-ia32-msvc": "2.10.1", "@tauri-apps/cli-win32-x64-msvc": "2.10.1" }, "bin": { "tauri": "tauri.js" } }, "sha512-jQNGF/5quwORdZSSLtTluyKQ+o6SMa/AUICfhf4egCGFdMHqWssApVgYSbg+jmrZoc8e1DscNvjTnXtlHLS11g=="],
+
+    "@tauri-apps/cli-darwin-arm64": ["@tauri-apps/cli-darwin-arm64@2.10.1", "", { "os": "darwin", "cpu": "arm64" }, "sha512-Z2OjCXiZ+fbYZy7PmP3WRnOpM9+Fy+oonKDEmUE6MwN4IGaYqgceTjwHucc/kEEYZos5GICve35f7ZiizgqEnQ=="],
+
+    "@tauri-apps/cli-darwin-x64": ["@tauri-apps/cli-darwin-x64@2.10.1", "", { "os": "darwin", "cpu": "x64" }, "sha512-V/irQVvjPMGOTQqNj55PnQPVuH4VJP8vZCN7ajnj+ZS8Kom1tEM2hR3qbbIRoS3dBKs5mbG8yg1WC+97dq17Pw=="],
+
+    "@tauri-apps/cli-linux-arm-gnueabihf": ["@tauri-apps/cli-linux-arm-gnueabihf@2.10.1", "", { "os": "linux", "cpu": "arm" }, "sha512-Hyzwsb4VnCWKGfTw+wSt15Z2pLw2f0JdFBfq2vHBOBhvg7oi6uhKiF87hmbXOBXUZaGkyRDkCHsdzJcIfoJC2w=="],
+
+    "@tauri-apps/cli-linux-arm64-gnu": ["@tauri-apps/cli-linux-arm64-gnu@2.10.1", "", { "os": "linux", "cpu": "arm64" }, "sha512-OyOYs2t5GkBIvyWjA1+h4CZxTcdz1OZPCWAPz5DYEfB0cnWHERTnQ/SLayQzncrT0kwRoSfSz9KxenkyJoTelA=="],
+
+    "@tauri-apps/cli-linux-arm64-musl": ["@tauri-apps/cli-linux-arm64-musl@2.10.1", "", { "os": "linux", "cpu": "arm64" }, "sha512-MIj78PDDGjkg3NqGptDOGgfXks7SYJwhiMh8SBoZS+vfdz7yP5jN18bNaLnDhsVIPARcAhE1TlsZe/8Yxo2zqg=="],
+
+    "@tauri-apps/cli-linux-riscv64-gnu": ["@tauri-apps/cli-linux-riscv64-gnu@2.10.1", "", { "os": "linux", "cpu": "none" }, "sha512-X0lvOVUg8PCVaoEtEAnpxmnkwlE1gcMDTqfhbefICKDnOTJ5Est3qL0SrWxizDackIOKBcvtpejrSiVpuJI1kw=="],
+
+    "@tauri-apps/cli-linux-x64-gnu": ["@tauri-apps/cli-linux-x64-gnu@2.10.1", "", { "os": "linux", "cpu": "x64" }, "sha512-2/12bEzsJS9fAKybxgicCDFxYD1WEI9kO+tlDwX5znWG2GwMBaiWcmhGlZ8fi+DMe9CXlcVarMTYc0L3REIRxw=="],
+
+    "@tauri-apps/cli-linux-x64-musl": ["@tauri-apps/cli-linux-x64-musl@2.10.1", "", { "os": "linux", "cpu": "x64" }, "sha512-Y8J0ZzswPz50UcGOFuXGEMrxbjwKSPgXftx5qnkuMs2rmwQB5ssvLb6tn54wDSYxe7S6vlLob9vt0VKuNOaCIQ=="],
+
+    "@tauri-apps/cli-win32-arm64-msvc": ["@tauri-apps/cli-win32-arm64-msvc@2.10.1", "", { "os": "win32", "cpu": "arm64" }, "sha512-iSt5B86jHYAPJa/IlYw++SXtFPGnWtFJriHn7X0NFBVunF6zu9+/zOn8OgqIWSl8RgzhLGXQEEtGBdR4wzpVgg=="],
+
+    "@tauri-apps/cli-win32-ia32-msvc": ["@tauri-apps/cli-win32-ia32-msvc@2.10.1", "", { "os": "win32", "cpu": "ia32" }, "sha512-gXyxgEzsFegmnWywYU5pEBURkcFN/Oo45EAwvZrHMh+zUSEAvO5E8TXsgPADYm31d1u7OQU3O3HsYfVBf2moHw=="],
+
+    "@tauri-apps/cli-win32-x64-msvc": ["@tauri-apps/cli-win32-x64-msvc@2.10.1", "", { "os": "win32", "cpu": "x64" }, "sha512-6Cn7YpPFwzChy0ERz6djKEmUehWrYlM+xTaNzGPgZocw3BD7OfwfWHKVWxXzdjEW2KfKkHddfdxK1XXTYqBRLg=="],
+
+    "@tauri-apps/plugin-clipboard-manager": ["@tauri-apps/plugin-clipboard-manager@2.3.2", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-CUlb5Hqi2oZbcZf4VUyUH53XWPPdtpw43EUpCza5HWZJwxEoDowFzNUDt1tRUXA8Uq+XPn17Ysfptip33sG4eQ=="],
+
+    "@tauri-apps/plugin-deep-link": ["@tauri-apps/plugin-deep-link@2.4.8", "", { "dependencies": { "@tauri-apps/api": "^2.10.1" } }, "sha512-Cd2Cs960MGuGONeIwxOPx9wqwedetAHOGlwK5boJ/SMTfAtAyfErpfVPEn+EJzgXsJun8EKzsEumHjr+64V4fw=="],
+
+    "@tauri-apps/plugin-dialog": ["@tauri-apps/plugin-dialog@2.7.0", "", { "dependencies": { "@tauri-apps/api": "^2.10.1" } }, "sha512-4nS/hfGMGCXiAS3LtVjH9AgsSAPJeG/7R+q8agTFqytjnMa4Zq95Bq8WzVDkckpanX+yyRHXnRtrKXkANKDHvw=="],
+
+    "@tauri-apps/plugin-http": ["@tauri-apps/plugin-http@2.5.8", "", { "dependencies": { "@tauri-apps/api": "^2.10.1" } }, "sha512-oxd7oypzQeu8kAfFCrw534Kq7Cw+NzozcnCY21O4rz3A+veJiIiuSCMIprgGcZOcLAXFP9GmDhKUbhuKWcunRw=="],
+
+    "@tauri-apps/plugin-notification": ["@tauri-apps/plugin-notification@2.3.3", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-Zw+ZH18RJb41G4NrfHgIuofJiymusqN+q8fGUIIV7vyCH+5sSn5coqRv/MWB9qETsUs97vmU045q7OyseCV3Qg=="],
+
+    "@tauri-apps/plugin-opener": ["@tauri-apps/plugin-opener@2.5.3", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-CCcUltXMOfUEArbf3db3kCE7Ggy1ExBEBl51Ko2ODJ6GDYHRp1nSNlQm5uNCFY5k7/ufaK5Ib3Du/Zir19IYQQ=="],
+
+    "@tauri-apps/plugin-os": ["@tauri-apps/plugin-os@2.3.2", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-n+nXWeuSeF9wcEsSPmRnBEGrRgOy6jjkSU+UVCOV8YUGKb2erhDOxis7IqRXiRVHhY8XMKks00BJ0OAdkpf6+A=="],
+
+    "@tauri-apps/plugin-process": ["@tauri-apps/plugin-process@2.3.1", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-nCa4fGVaDL/B9ai03VyPOjfAHRHSBz5v6F/ObsB73r/dA3MHHhZtldaDMIc0V/pnUw9ehzr2iEG+XkSEyC0JJA=="],
+
+    "@tauri-apps/plugin-shell": ["@tauri-apps/plugin-shell@2.3.5", "", { "dependencies": { "@tauri-apps/api": "^2.10.1" } }, "sha512-jewtULhiQ7lI7+owCKAjc8tYLJr92U16bPOeAa472LHJdgaibLP83NcfAF2e+wkEcA53FxKQAZ7byDzs2eeizg=="],
+
     "@tauri-apps/plugin-store": ["@tauri-apps/plugin-store@2.4.2", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-0ClHS50Oq9HEvLPhNzTNFxbWVOqoAp3dRvtewQBeqfIQ0z5m3JRnOISIn2ZVPCrQC0MyGyhTS9DWhHjpigQE7A=="],
 
+    "@tauri-apps/plugin-updater": ["@tauri-apps/plugin-updater@2.10.1", "", { "dependencies": { "@tauri-apps/api": "^2.10.1" } }, "sha512-NFYMg+tWOZPJdzE/PpFj2qfqwAWwNS3kXrb1tm1gnBJ9mYzZ4WDRrwy8udzWoAnfGCHLuePNLY1WVCNHnh3eRA=="],
+
+    "@tauri-apps/plugin-window-state": ["@tauri-apps/plugin-window-state@2.4.1", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-OuvdrzyY8Q5Dbzpj+GcrnV1iCeoZbcFdzMjanZMMcAEUNy/6PH5pxZPXpaZLOR7whlzXiuzx0L9EKZbH7zpdRw=="],
+
     "@tediousjs/connection-string": ["@tediousjs/connection-string@0.5.0", "", {}, "sha512-7qSgZbincDDDFyRweCIEvZULFAw5iz/DeunhvuxpL31nfntX3P4Yd4HkHBRg9H8CdqY1e5WFN1PZIz/REL9MVQ=="],
 
     "@testing-library/dom": ["@testing-library/dom@10.4.1", "", { "dependencies": { "@babel/code-frame": "^7.10.4", "@babel/runtime": "^7.12.5", "@types/aria-query": "^5.0.1", "aria-query": "5.3.0", "dom-accessibility-api": "^0.5.9", "lz-string": "^1.5.0", "picocolors": "1.1.1", "pretty-format": "^27.0.2" } }, "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg=="],
@@ -5545,10 +5628,14 @@
 
     "@opencode-ai/desktop/@actions/artifact": ["@actions/artifact@4.0.0", "", { "dependencies": { "@actions/core": "^1.10.0", "@actions/github": "^6.0.1", "@actions/http-client": "^2.1.0", "@azure/core-http": "^3.0.5", "@azure/storage-blob": "^12.15.0", "@octokit/core": "^5.2.1", "@octokit/plugin-request-log": "^1.0.4", "@octokit/plugin-retry": "^3.0.9", "@octokit/request": "^8.4.1", "@octokit/request-error": "^5.1.1", "@protobuf-ts/plugin": "^2.2.3-alpha.1", "archiver": "^7.0.1", "jwt-decode": "^3.1.2", "unzip-stream": "^0.3.1" } }, "sha512-HCc2jMJRAfviGFAh0FsOR/jNfWhirxl7W6z8zDtttt0GltwxBLdEIjLiweOPFl9WbyJRW1VWnPUSAixJqcWUMQ=="],
 
-    "@opencode-ai/desktop/marked": ["marked@15.0.12", "", { "bin": { "marked": "bin/marked.js" } }, "sha512-8dD6FusOQSrpv9Z1rdNMdlSgQOIP880DHqnohobOmYLElGEqAL/JvxvuxZO16r4HtjTlfPRDC1hbvxC9dPN2nA=="],
-
     "@opencode-ai/desktop/typescript": ["typescript@5.6.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw=="],
 
+    "@opencode-ai/desktop-electron/@actions/artifact": ["@actions/artifact@4.0.0", "", { "dependencies": { "@actions/core": "^1.10.0", "@actions/github": "^6.0.1", "@actions/http-client": "^2.1.0", "@azure/core-http": "^3.0.5", "@azure/storage-blob": "^12.15.0", "@octokit/core": "^5.2.1", "@octokit/plugin-request-log": "^1.0.4", "@octokit/plugin-retry": "^3.0.9", "@octokit/request": "^8.4.1", "@octokit/request-error": "^5.1.1", "@protobuf-ts/plugin": "^2.2.3-alpha.1", "archiver": "^7.0.1", "jwt-decode": "^3.1.2", "unzip-stream": "^0.3.1" } }, "sha512-HCc2jMJRAfviGFAh0FsOR/jNfWhirxl7W6z8zDtttt0GltwxBLdEIjLiweOPFl9WbyJRW1VWnPUSAixJqcWUMQ=="],
+
+    "@opencode-ai/desktop-electron/marked": ["marked@15.0.12", "", { "bin": { "marked": "bin/marked.js" } }, "sha512-8dD6FusOQSrpv9Z1rdNMdlSgQOIP880DHqnohobOmYLElGEqAL/JvxvuxZO16r4HtjTlfPRDC1hbvxC9dPN2nA=="],
+
+    "@opencode-ai/desktop-electron/typescript": ["typescript@5.6.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw=="],
+
     "@opencode-ai/ui/@solid-primitives/resize-observer": ["@solid-primitives/resize-observer@2.1.3", "", { "dependencies": { "@solid-primitives/event-listener": "^2.4.3", "@solid-primitives/rootless": "^1.5.2", "@solid-primitives/static-store": "^0.1.2", "@solid-primitives/utils": "^6.3.2" }, "peerDependencies": { "solid-js": "^1.6.12" } }, "sha512-zBLje5E06TgOg93S7rGPldmhDnouNGhvfZVKOp+oG2XU8snA+GoCSSCz1M+jpNAg5Ek2EakU5UVQqL152WmdXQ=="],
 
     "@opencode-ai/web/@shikijs/transformers": ["@shikijs/transformers@3.20.0", "", { "dependencies": { "@shikijs/core": "3.20.0", "@shikijs/types": "3.20.0" } }, "sha512-PrHHMRr3Q5W1qB/42kJW6laqFyWdhrPF2hNR9qjOm1xcSiAO3hAHo7HaVyHE6pMyevmy3i51O8kuGGXC78uK3g=="],
@@ -6531,6 +6618,8 @@
 
     "@octokit/rest/@octokit/core/before-after-hook": ["before-after-hook@4.0.0", "", {}, "sha512-q6tR3RPqIB1pMiTRMFcZwuG5T8vwp+vUvEG0vuI6B+Rikh5BfPp2fQ82c925FOs+b0lcFQ8CFrL+KbilfZFhOQ=="],
 
+    "@opencode-ai/desktop-electron/@actions/artifact/@actions/http-client": ["@actions/http-client@2.2.3", "", { "dependencies": { "tunnel": "^0.0.6", "undici": "^5.25.4" } }, "sha512-mx8hyJi/hjFvbPokCg4uRd4ZX78t+YyRPtnKWwIl+RzNaVuFpQHfmlGVfsKEJN8LwTCvL+DfVgAM04XaHkm6bA=="],
+
     "@opencode-ai/desktop/@actions/artifact/@actions/http-client": ["@actions/http-client@2.2.3", "", { "dependencies": { "tunnel": "^0.0.6", "undici": "^5.25.4" } }, "sha512-mx8hyJi/hjFvbPokCg4uRd4ZX78t+YyRPtnKWwIl+RzNaVuFpQHfmlGVfsKEJN8LwTCvL+DfVgAM04XaHkm6bA=="],
 
     "@opencode-ai/web/@shikijs/transformers/@shikijs/core": ["@shikijs/core@3.20.0", "", { "dependencies": { "@shikijs/types": "3.20.0", "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4", "hast-util-to-html": "^9.0.5" } }, "sha512-f2ED7HYV4JEk827mtMDwe/yQ25pRiXZmtHjWF8uzZKuKiEsJR7Ce1nuQ+HhV9FzDcbIo4ObBCD9GPTzNuy9S1g=="],
@@ -6979,6 +7068,8 @@
 
     "@octokit/rest/@octokit/core/@octokit/types/@octokit/openapi-types": ["@octokit/openapi-types@27.0.0", "", {}, "sha512-whrdktVs1h6gtR+09+QsNk2+FO+49j6ga1c55YZudfEG+oKJVvJLQi3zkOm5JjiUXAagWK2tI2kTGKJ2Ys7MGA=="],
 
+    "@opencode-ai/desktop-electron/@actions/artifact/@actions/http-client/undici": ["undici@5.29.0", "", { "dependencies": { "@fastify/busboy": "^2.0.0" } }, "sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg=="],
+
     "@opencode-ai/desktop/@actions/artifact/@actions/http-client/undici": ["undici@5.29.0", "", { "dependencies": { "@fastify/busboy": "^2.0.0" } }, "sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg=="],
 
     "@sentry/bundler-plugin-core/glob/minimatch/brace-expansion": ["brace-expansion@2.1.0", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w=="],

nix/hashes.json

@@ -1,8 +1,8 @@
 {
   "nodeModules": {
-    "x86_64-linux": "sha256-Ys5o1r+th/bJ385QTPO+yv28/786UKtBlQy/9kMCkys=",
-    "aarch64-linux": "sha256-uhYCqWpNX4SgLF1QB/ubRjhZ8Nsv2CCnmhbQMuYnYYU=",
-    "aarch64-darwin": "sha256-rN5TY3qU+29vucCGqasDDKg27iitkqZPbF5mF/zmF+E=",
-    "x86_64-darwin": "sha256-VTGpb+t/0PYUAxCMo+GA2sdoUbj3bZL+2D53arHzQd0="
+    "x86_64-linux": "sha256-9wTDLZsuGjkWyVOb6AG2VRYPiaSj/lnXwVkSwNeDcns=",
+    "aarch64-linux": "sha256-gmKlL2fQxY8bo+//8m9e1TNYJK3RXa4i8xsgtd046bc=",
+    "aarch64-darwin": "sha256-ENSJK+7rZi3m342mjtGg9N0P6zWEypXMpI7QdFMydbc=",
+    "x86_64-darwin": "sha256-gkxCxGh5dlwj03vZdz20pbiAwFEDpAlu/5iU8cwZOGI="
   }
 }

package.json

@@ -7,7 +7,7 @@
   "packageManager": "bun@1.3.13",
   "scripts": {
     "dev": "bun run --cwd packages/opencode --conditions=browser src/index.ts",
-    "dev:desktop": "bun --cwd packages/desktop dev",
+    "dev:desktop": "bun --cwd packages/desktop-electron dev",
     "dev:web": "bun --cwd packages/app dev",
     "dev:console": "ulimit -n 10240 2>/dev/null; bun run --cwd packages/console/app dev",
     "dev:storybook": "bun --cwd packages/storybook storybook",

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/app",
-  "version": "1.14.37",
+  "version": "1.14.35",
   "description": "",
   "type": "module",
   "exports": {

packages/app/src/app.tsx

@@ -42,7 +42,6 @@ import { PromptProvider } from "@/context/prompt"
 import { ServerConnection, ServerProvider, serverName, useServer } from "@/context/server"
 import { SettingsProvider } from "@/context/settings"
 import { TerminalProvider } from "@/context/terminal"
-import { WslServersProvider } from "@/context/wsl-servers"
 import DirectoryLayout from "@/pages/directory-layout"
 import Layout from "@/pages/layout"
 import { ErrorPage } from "./pages/error"
@@ -75,7 +74,7 @@ declare global {
     __OPENCODE__?: {
       updaterEnabled?: boolean
       deepLinks?: string[]
-      activeServer?: string
+      wsl?: boolean
     }
     api?: {
       setTitlebar?: (theme: { mode: "light" | "dark" }) => Promise<void>
@@ -157,13 +156,11 @@ export function AppBaseProviders(props: ParentProps<{ locale?: Locale }>) {
               }}
             >
               <QueryProvider>
-                <WslServersProvider>
-                  <DialogProvider>
-                    <MarkedProvider>
-                      <FileComponentProvider component={File}>{props.children}</FileComponentProvider>
-                    </MarkedProvider>
-                  </DialogProvider>
-                </WslServersProvider>
+                <DialogProvider>
+                  <MarkedProvider>
+                    <FileComponentProvider component={File}>{props.children}</FileComponentProvider>
+                  </MarkedProvider>
+                </DialogProvider>
               </QueryProvider>
             </ErrorBoundary>
           </UiI18nBridge>
@@ -286,11 +283,11 @@ function ConnectionError(props: { onRetry?: () => void; onServerSelected?: (key:
   )
 }
 
-function ServerKey(props: { children: (key: ServerConnection.Key) => JSX.Element }) {
+function ServerKey(props: ParentProps) {
   const server = useServer()
   return (
     <Show when={server.key} keyed>
-      {(key) => props.children(key)}
+      {props.children}
     </Show>
   )
 }
@@ -310,24 +307,22 @@ export function AppInterface(props: {
     >
       <ConnectionGate disableHealthCheck={props.disableHealthCheck}>
         <ServerKey>
-          {() => (
-            <QueryProvider>
-              <GlobalSDKProvider>
-                <GlobalSyncProvider>
-                  <Dynamic
-                    component={props.router ?? Router}
-                    root={(routerProps) => <RouterRoot appChildren={props.children}>{routerProps.children}</RouterRoot>}
-                  >
-                    <Route path="/" component={HomeRoute} />
-                    <Route path="/:dir" component={DirectoryLayout}>
-                      <Route path="/" component={SessionIndexRoute} />
-                      <Route path="/session/:id?" component={SessionRoute} />
-                    </Route>
-                  </Dynamic>
-                </GlobalSyncProvider>
-              </GlobalSDKProvider>
-            </QueryProvider>
-          )}
+          <QueryProvider>
+            <GlobalSDKProvider>
+              <GlobalSyncProvider>
+                <Dynamic
+                  component={props.router ?? Router}
+                  root={(routerProps) => <RouterRoot appChildren={props.children}>{routerProps.children}</RouterRoot>}
+                >
+                  <Route path="/" component={HomeRoute} />
+                  <Route path="/:dir" component={DirectoryLayout}>
+                    <Route path="/" component={SessionIndexRoute} />
+                    <Route path="/session/:id?" component={SessionRoute} />
+                  </Route>
+                </Dynamic>
+              </GlobalSyncProvider>
+            </GlobalSDKProvider>
+          </QueryProvider>
         </ServerKey>
       </ConnectionGate>
     </ServerProvider>

packages/app/src/components/dialog-select-server.tsx

@@ -5,26 +5,20 @@ import { DropdownMenu } from "@opencode-ai/ui/dropdown-menu"
 import { Icon } from "@opencode-ai/ui/icon"
 import { IconButton } from "@opencode-ai/ui/icon-button"
 import { List } from "@opencode-ai/ui/list"
-import { Spinner } from "@opencode-ai/ui/spinner"
 import { TextField } from "@opencode-ai/ui/text-field"
 import { useMutation } from "@tanstack/solid-query"
 import { showToast } from "@opencode-ai/ui/toast"
-import { batch, createEffect, createMemo, createResource, For, onCleanup, Show, untrack } from "solid-js"
+import { useNavigate } from "@solidjs/router"
+import { createEffect, createMemo, createResource, onCleanup, Show } from "solid-js"
 import { createStore, reconcile } from "solid-js/store"
-import { DialogWslServer } from "@/components/dialog-wsl-server"
 import { ServerHealthIndicator, ServerRow } from "@/components/server/server-row"
 import { useLanguage } from "@/context/language"
 import { usePlatform } from "@/context/platform"
 import { normalizeServerUrl, ServerConnection, useServer } from "@/context/server"
-import { useWslServers } from "@/context/wsl-servers"
 import { type ServerHealth, useCheckServerHealth } from "@/utils/server-health"
 
 const DEFAULT_USERNAME = "opencode"
 
-interface DialogSelectServerProps {
-  onNavigateHome?: () => void
-}
-
 interface ServerFormProps {
   value: string
   name: string
@@ -33,6 +27,7 @@ interface ServerFormProps {
   placeholder: string
   busy: boolean
   error: string
+  status: boolean | undefined
   onChange: (value: string) => void
   onNameChange: (value: string) => void
   onUsernameChange: (value: string) => void
@@ -49,17 +44,15 @@ function showRequestError(language: ReturnType<typeof useLanguage>, err: unknown
   })
 }
 
-function isWslSidecar(conn: ServerConnection.Any): conn is ServerConnection.Sidecar & { variant: "wsl" } {
-  return conn.type === "sidecar" && conn.variant === "wsl"
-}
-
 function useDefaultServer() {
   const language = useLanguage()
   const platform = usePlatform()
-  const [defaultKey, defaultActions] = createResource(
+  const [defaultKey, defaultUrlActions] = createResource(
     async () => {
       try {
-        return (await platform.getDefaultServer?.()) ?? null
+        const key = await platform.getDefaultServer?.()
+        if (!key) return null
+        return key
       } catch (err) {
         showRequestError(language, err)
         return null
@@ -67,18 +60,52 @@ function useDefaultServer() {
     },
     { initialValue: null },
   )
+
   const canDefault = createMemo(() => !!platform.getDefaultServer && !!platform.setDefaultServer)
   const setDefault = async (key: ServerConnection.Key | null) => {
     try {
       await platform.setDefaultServer?.(key)
-      defaultActions.mutate(key)
+      defaultUrlActions.mutate(key)
     } catch (err) {
       showRequestError(language, err)
     }
   }
+
   return { defaultKey, canDefault, setDefault }
 }
 
+function useServerPreview() {
+  const checkServerHealth = useCheckServerHealth()
+
+  const looksComplete = (value: string) => {
+    const normalized = normalizeServerUrl(value)
+    if (!normalized) return false
+    const host = normalized.replace(/^https?:\/\//, "").split("/")[0]
+    if (!host) return false
+    if (host.includes("localhost") || host.startsWith("127.0.0.1")) return true
+    return host.includes(".") || host.includes(":")
+  }
+
+  const previewStatus = async (
+    value: string,
+    username: string,
+    password: string,
+    setStatus: (value: boolean | undefined) => void,
+  ) => {
+    setStatus(undefined)
+    if (!looksComplete(value)) return
+    const normalized = normalizeServerUrl(value)
+    if (!normalized) return
+    const http: ServerConnection.HttpBase = { url: normalized }
+    if (username) http.username = username
+    if (password) http.password = password
+    const result = await checkServerHealth(http)
+    setStatus(result.healthy)
+  }
+
+  return { previewStatus }
+}
+
 function ServerForm(props: ServerFormProps) {
   const language = useLanguage()
   const keyDown = (event: KeyboardEvent) => {
@@ -144,18 +171,15 @@ function ServerForm(props: ServerFormProps) {
   )
 }
 
-export function DialogSelectServer(props: DialogSelectServerProps = {}) {
+export function DialogSelectServer() {
+  const navigate = useNavigate()
   const dialog = useDialog()
   const server = useServer()
   const platform = usePlatform()
   const language = useLanguage()
-  const wslServers = useWslServers()
-  const defaultServer = useDefaultServer()
+  const { defaultKey, canDefault, setDefault } = useDefaultServer()
+  const { previewStatus } = useServerPreview()
   const checkServerHealth = useCheckServerHealth()
-  let disposed = false
-  onCleanup(() => {
-    disposed = true
-  })
   const [store, setStore] = createStore({
     status: {} as Record<ServerConnection.Key, ServerHealth | undefined>,
     addServer: {
@@ -165,9 +189,7 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
       password: "",
       error: "",
       showForm: false,
-    },
-    addWsl: {
-      showWizard: false,
+      status: undefined as boolean | undefined,
     },
     editServer: {
       id: undefined as string | undefined,
@@ -176,6 +198,7 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
       username: "",
       password: "",
       error: "",
+      status: undefined as boolean | undefined,
     },
   })
 
@@ -187,6 +210,7 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
       password: "",
       error: "",
       showForm: false,
+      status: undefined,
     })
   }
   const resetEdit = () => {
@@ -197,6 +221,7 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
       username: "",
       password: "",
       error: "",
+      status: undefined,
     })
   }
 
@@ -269,31 +294,6 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
     },
   }))
 
-  const removeWslMutation = useMutation(() => ({
-    mutationFn: async (key: ServerConnection.Key) => {
-      await platform.wslServers?.removeServer(key)
-      return key
-    },
-    onSuccess: async (key) => {
-      server.remove(key)
-    },
-    onError: (err) => showRequestError(language, err),
-  }))
-
-  const retryWslMutation = useMutation(() => ({
-    mutationFn: async (key: ServerConnection.Key) => {
-      await platform.wslServers?.startServer(key)
-    },
-    onError: (err) => showRequestError(language, err),
-  }))
-
-  const updateWslMutation = useMutation(() => ({
-    mutationFn: async (distro: string) => {
-      await platform.wslServers?.installOpencode(distro)
-    },
-    onError: (err) => showRequestError(language, err),
-  }))
-
   const replaceServer = (original: ServerConnection.Http, next: ServerConnection.Http) => {
     const active = server.key
     const newConn = server.add(next)
@@ -312,32 +312,6 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
   })
 
   const current = createMemo(() => items().find((x) => ServerConnection.key(x) === server.key) ?? items()[0])
-  const wslState = () => wslServers.data
-  const healthPollKey = createMemo(() =>
-    items()
-      .map((conn) =>
-        [ServerConnection.key(conn), conn.http.url, conn.http.username ?? "", conn.http.password ?? ""].join("\n"),
-      )
-      .join("\n\n"),
-  )
-  const health = (key: ServerConnection.Key) => store.status[key]
-  const wslRuntime = (conn: ServerConnection.Any) => {
-    if (!isWslSidecar(conn)) return
-    return wslState()?.servers.find((item) => item.config.id === ServerConnection.key(conn))?.runtime
-  }
-  const nonReadyWslServers = createMemo(() =>
-    (wslState()?.servers ?? []).filter((item) => item.runtime.kind !== "ready"),
-  )
-  const canRetryWsl = (conn: ServerConnection.Any) => {
-    const runtime = wslRuntime(conn)
-    return runtime?.kind === "failed" || runtime?.kind === "stopped"
-  }
-  const canRetryWslRuntime = (kind: string) => kind === "failed" || kind === "stopped"
-  const wslRuntimeLabel = (kind: string) => {
-    if (kind === "starting") return "Starting"
-    if (kind === "failed") return "Failed"
-    return "Stopped"
-  }
 
   const sortedItems = createMemo(() => {
     const list = items()
@@ -352,7 +326,7 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
     return list.slice().sort((a, b) => {
       if (a === active) return -1
       if (b === active) return 1
-      const diff = rank(health(ServerConnection.key(a))) - rank(health(ServerConnection.key(b)))
+      const diff = rank(store.status[ServerConnection.key(a)]) - rank(store.status[ServerConnection.key(b)])
       if (diff !== 0) return diff
       return (order.get(a) ?? 0) - (order.get(b) ?? 0)
     })
@@ -360,60 +334,39 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
 
   async function refreshHealth() {
     const results: Record<ServerConnection.Key, ServerHealth> = {}
-    const list = untrack(items)
     await Promise.all(
-      list.map(async (conn) => {
+      items().map(async (conn) => {
         results[ServerConnection.key(conn)] = await checkServerHealth(conn.http)
       }),
     )
-    if (disposed) return
     setStore("status", reconcile(results))
   }
 
   createEffect(() => {
-    healthPollKey()
+    items()
     void refreshHealth()
     const interval = setInterval(refreshHealth, 10_000)
     onCleanup(() => clearInterval(interval))
   })
 
-  const wslCheck = (conn: ServerConnection.Any) => {
-    if (!isWslSidecar(conn)) return null
-    return wslState()?.opencodeChecks[conn.distro] ?? null
-  }
-
   async function select(conn: ServerConnection.Any, persist?: boolean) {
-    if (!persist && health(ServerConnection.key(conn))?.healthy === false) return
-    const nextKey = ServerConnection.key(conn)
-    const changed = server.key !== nextKey
-
-    const navigateHome = () => props.onNavigateHome?.()
-
-    const apply = () => {
-      dialog.close()
-      if (persist && conn.type === "http") {
-        server.add(conn)
-        navigateHome()
-        return
-      }
-
-      batch(() => {
-        navigateHome()
-        server.setActive(nextKey)
-      })
-    }
-
-    if (!changed) {
-      await apply()
+    if (!persist && store.status[ServerConnection.key(conn)]?.healthy === false) return
+    dialog.close()
+    if (persist && conn.type === "http") {
+      server.add(conn)
+      navigate("/")
       return
     }
-
-    apply()
+    navigate("/")
+    queueMicrotask(() => server.setActive(ServerConnection.key(conn)))
   }
 
   const handleAddChange = (value: string) => {
     if (addMutation.isPending) return
     setStore("addServer", { url: value, error: "" })
+    void previewStatus(value, store.addServer.username, store.addServer.password, (next) =>
+      setStore("addServer", { status: next }),
+    )
   }
 
   const handleAddNameChange = (value: string) => {
@@ -424,16 +377,25 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
   const handleAddUsernameChange = (value: string) => {
     if (addMutation.isPending) return
     setStore("addServer", { username: value, error: "" })
+    void previewStatus(store.addServer.url, value, store.addServer.password, (next) =>
+      setStore("addServer", { status: next }),
+    )
   }
 
   const handleAddPasswordChange = (value: string) => {
     if (addMutation.isPending) return
     setStore("addServer", { password: value, error: "" })
+    void previewStatus(store.addServer.url, store.addServer.username, value, (next) =>
+      setStore("addServer", { status: next }),
+    )
   }
 
   const handleEditChange = (value: string) => {
     if (editMutation.isPending) return
     setStore("editServer", { value, error: "" })
+    void previewStatus(value, store.editServer.username, store.editServer.password, (next) =>
+      setStore("editServer", { status: next }),
+    )
   }
 
   const handleEditNameChange = (value: string) => {
@@ -444,15 +406,20 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
   const handleEditUsernameChange = (value: string) => {
     if (editMutation.isPending) return
     setStore("editServer", { username: value, error: "" })
+    void previewStatus(store.editServer.value, value, store.editServer.password, (next) =>
+      setStore("editServer", { status: next }),
+    )
   }
 
   const handleEditPasswordChange = (value: string) => {
     if (editMutation.isPending) return
     setStore("editServer", { password: value, error: "" })
+    void previewStatus(store.editServer.value, store.editServer.username, value, (next) =>
+      setStore("editServer", { status: next }),
+    )
   }
 
-  const mode = createMemo<"list" | "add-wsl" | "add" | "edit">(() => {
-    if (store.addWsl.showWizard) return "add-wsl"
+  const mode = createMemo<"list" | "add" | "edit">(() => {
     if (store.editServer.id) return "edit"
     if (store.addServer.showForm) return "add"
     return "list"
@@ -466,11 +433,9 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
   const resetForm = () => {
     resetAdd()
     resetEdit()
-    setStore("addWsl", "showWizard", false)
   }
 
   const startAdd = () => {
-    setStore("addWsl", "showWizard", false)
     resetEdit()
     setStore("addServer", {
       showForm: true,
@@ -479,11 +444,11 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
       username: DEFAULT_USERNAME,
       password: "",
       error: "",
+      status: undefined,
     })
   }
 
   const startEdit = (conn: ServerConnection.Http) => {
-    setStore("addWsl", "showWizard", false)
     resetAdd()
     setStore("editServer", {
       id: conn.http.url,
@@ -492,22 +457,10 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
       username: conn.http.username ?? "",
       password: conn.http.password ?? "",
       error: "",
+      status: store.status[ServerConnection.key(conn)]?.healthy,
     })
   }
 
-  const startAddWsl = () => {
-    resetAdd()
-    resetEdit()
-    setStore("addWsl", "showWizard", true)
-  }
-
-  const handleAddedWsl = async (distro: string) => {
-    const key = ServerConnection.Key.make(`wsl:${distro}`)
-    setStore("addWsl", "showWizard", false)
-    const conn = items().find((item) => ServerConnection.key(item) === key)
-    if (conn) await select(conn)
-  }
-
   const submitForm = () => {
     if (mode() === "add") {
       if (addMutation.isPending) return
@@ -524,22 +477,14 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
 
   const isFormMode = createMemo(() => mode() !== "list")
   const isAddMode = createMemo(() => mode() === "add")
-  const isAddWslMode = createMemo(() => mode() === "add-wsl")
   const formBusy = createMemo(() => (isAddMode() ? addMutation.isPending : editMutation.isPending))
-  const canAddWsl = createMemo(() => !!platform.wslServers && platform.os === "windows")
 
   const formTitle = createMemo(() => {
     if (!isFormMode()) return language.t("dialog.server.title")
     return (
       <div class="flex items-center gap-2 -ml-2">
         <IconButton icon="arrow-left" variant="ghost" onClick={resetForm} aria-label={language.t("common.goBack")} />
-        <span>
-          {isAddWslMode()
-            ? "Add WSL server"
-            : isAddMode()
-              ? language.t("dialog.server.add.title")
-              : language.t("dialog.server.edit.title")}
-        </span>
+        <span>{isAddMode() ? language.t("dialog.server.add.title") : language.t("dialog.server.edit.title")}</span>
       </div>
     )
   })
@@ -550,107 +495,37 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
     resetEdit()
   })
 
-  async function handleRemove(key: ServerConnection.Key) {
-    server.remove(key)
-    if (defaultServer.defaultKey() === key) await defaultServer.setDefault(null)
+  async function handleRemove(url: ServerConnection.Key) {
+    server.remove(url)
+    if ((await platform.getDefaultServer?.()) === url) {
+      void platform.setDefaultServer?.(null)
+    }
   }
 
   return (
-    <Dialog
-      title={formTitle()}
-      fit={isAddWslMode()}
-      class={isAddWslMode() ? "[&_[data-slot=dialog-body]]:flex-none [&_[data-slot=dialog-body]]:overflow-visible" : undefined}
-    >
-      <div class={isAddWslMode() ? "flex flex-col gap-2" : "flex flex-1 min-h-0 flex-col gap-2"}>
+    <Dialog title={formTitle()}>
+      <div class="flex flex-1 min-h-0 flex-col gap-2">
         <Show
           when={!isFormMode()}
           fallback={
-            <Show
-              when={isAddWslMode()}
-              fallback={
-                <ServerForm
-                  value={isAddMode() ? store.addServer.url : store.editServer.value}
-                  name={isAddMode() ? store.addServer.name : store.editServer.name}
-                  username={isAddMode() ? store.addServer.username : store.editServer.username}
-                  password={isAddMode() ? store.addServer.password : store.editServer.password}
-                  placeholder={language.t("dialog.server.add.placeholder")}
-                  busy={formBusy()}
-                  error={isAddMode() ? store.addServer.error : store.editServer.error}
-                  onChange={isAddMode() ? handleAddChange : handleEditChange}
-                  onNameChange={isAddMode() ? handleAddNameChange : handleEditNameChange}
-                  onUsernameChange={isAddMode() ? handleAddUsernameChange : handleEditUsernameChange}
-                  onPasswordChange={isAddMode() ? handleAddPasswordChange : handleEditPasswordChange}
-                  onSubmit={submitForm}
-                  onBack={resetForm}
-                />
-              }
-            >
-              <DialogWslServer onAdded={handleAddedWsl} />
-            </Show>
+            <ServerForm
+              value={isAddMode() ? store.addServer.url : store.editServer.value}
+              name={isAddMode() ? store.addServer.name : store.editServer.name}
+              username={isAddMode() ? store.addServer.username : store.editServer.username}
+              password={isAddMode() ? store.addServer.password : store.editServer.password}
+              placeholder={language.t("dialog.server.add.placeholder")}
+              busy={formBusy()}
+              error={isAddMode() ? store.addServer.error : store.editServer.error}
+              status={isAddMode() ? store.addServer.status : store.editServer.status}
+              onChange={isAddMode() ? handleAddChange : handleEditChange}
+              onNameChange={isAddMode() ? handleAddNameChange : handleEditNameChange}
+              onUsernameChange={isAddMode() ? handleAddUsernameChange : handleEditUsernameChange}
+              onPasswordChange={isAddMode() ? handleAddPasswordChange : handleEditPasswordChange}
+              onSubmit={submitForm}
+              onBack={resetForm}
+            />
           }
         >
-          <Show when={nonReadyWslServers().length > 0}>
-            <div class="px-5">
-              <div class="bg-surface-base rounded-md overflow-hidden">
-                <For each={nonReadyWslServers()}>
-                  {(item) => {
-                    const key = ServerConnection.Key.make(item.config.id)
-                    const retryable = () => canRetryWslRuntime(item.runtime.kind)
-                    return (
-                      <div class="min-h-14 p-3 flex items-center gap-3 border-b border-border-weak-base last:border-b-0">
-                        <div
-                          classList={{
-                            "size-1.5 rounded-full shrink-0": true,
-                            "bg-icon-critical-base": item.runtime.kind === "failed",
-                            "bg-border-weak-base": item.runtime.kind !== "failed",
-                          }}
-                        />
-                        <div class="flex items-center gap-2 min-w-0 flex-1">
-                          <span class="text-14-medium text-text-base truncate">{item.config.distro}</span>
-                          <span class="text-11-regular text-text-weak border border-border-weak-base bg-surface-base px-1.5 py-0.5 rounded-md shrink-0">
-                            WSL
-                          </span>
-                          <span class="text-12-regular text-text-weak truncate">
-                            {wslRuntimeLabel(item.runtime.kind)}
-                          </span>
-                        </div>
-                        <DropdownMenu>
-                          <DropdownMenu.Trigger
-                            as={IconButton}
-                            icon="dot-grid"
-                            variant="ghost"
-                            class="shrink-0 size-8 hover:bg-surface-base-hover data-[expanded]:bg-surface-base-active"
-                            onClick={(e: MouseEvent) => e.stopPropagation()}
-                            onPointerDown={(e: PointerEvent) => e.stopPropagation()}
-                          />
-                          <DropdownMenu.Portal>
-                            <DropdownMenu.Content class="mt-1">
-                              <Show when={retryable()}>
-                                <DropdownMenu.Item onSelect={() => retryWslMutation.mutate(key)}>
-                                  <DropdownMenu.ItemLabel>Retry start</DropdownMenu.ItemLabel>
-                                </DropdownMenu.Item>
-                              </Show>
-                              <Show when={retryable()}>
-                                <DropdownMenu.Separator />
-                              </Show>
-                              <DropdownMenu.Item
-                                onSelect={() => removeWslMutation.mutate(key)}
-                                class="text-text-on-critical-base hover:bg-surface-critical-weak"
-                              >
-                                <DropdownMenu.ItemLabel>
-                                  {language.t("dialog.server.menu.delete")}
-                                </DropdownMenu.ItemLabel>
-                              </DropdownMenu.Item>
-                            </DropdownMenu.Content>
-                          </DropdownMenu.Portal>
-                        </DropdownMenu>
-                      </div>
-                    )
-                  }}
-                </For>
-              </div>
-            </div>
-          </Show>
           <List
             search={{
               placeholder: language.t("dialog.server.search.placeholder"),
@@ -659,7 +534,7 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
             noInitialSelection
             emptyMessage={language.t("dialog.server.empty")}
             items={sortedItems}
-            key={(x) => ServerConnection.key(x)}
+            key={(x) => x.http.url}
             onSelect={(x) => {
               if (x) void select(x)
             }}
@@ -668,35 +543,18 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
           >
             {(i) => {
               const key = ServerConnection.key(i)
-              const wsl = isWslSidecar(i)
-              const wslDistro = wsl ? i.distro : undefined
-              const blocked = () => health(key)?.healthy === false
-              const canChangeDefault = () => defaultServer.canDefault() && i.type === "http"
-              const canRemove = () => i.type === "http" || wsl
-              const opencodeAction = () => {
-                const check = wslCheck(i)
-                if (!check) return null
-                if (!check.resolvedPath) return "Install OpenCode"
-                if (check.matchesDesktop === false) return "Update OpenCode"
-                return null
-              }
-              const updating = () => {
-                const job = wslState()?.job
-                return job?.kind === "install-opencode" && job.distro === wslDistro
-              }
               return (
                 <div class="flex items-center gap-3 min-w-0 flex-1 w-full group/item">
                   <div class="flex flex-col h-full items-start w-5">
-                    <ServerHealthIndicator health={health(key)} />
+                    <ServerHealthIndicator health={store.status[key]} />
                   </div>
                   <ServerRow
                     conn={i}
-                    dimmed={blocked()}
-                    status={health(key)}
-                    version={wslCheck(i)?.version ?? undefined}
+                    dimmed={store.status[key]?.healthy === false}
+                    status={store.status[key]}
                     class="flex items-center gap-3 min-w-0 flex-1"
                     badge={
-                      <Show when={defaultServer.defaultKey() === ServerConnection.key(i)}>
+                      <Show when={defaultKey() === ServerConnection.key(i)}>
                         <span class="text-text-base bg-surface-base text-14-regular px-1.5 rounded-xs">
                           {language.t("dialog.server.status.default")}
                         </span>
@@ -704,32 +562,12 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
                     }
                     showCredentials
                   />
-                  <div class="flex items-center justify-center gap-3 pl-4">
-                    <Show when={wsl && opencodeAction()}>
-                      {(label) => (
-                        <Button
-                          variant="secondary"
-                          size="small"
-                          disabled={!!wslState()?.job}
-                          class="shrink-0"
-                          onPointerDown={(e: PointerEvent) => e.stopPropagation()}
-                          onClick={(e: MouseEvent) => {
-                            e.stopPropagation()
-                            if (wslDistro) updateWslMutation.mutate(wslDistro)
-                          }}
-                        >
-                          <Show when={updating()}>
-                            <Spinner class="size-3.5 shrink-0" />
-                          </Show>
-                          {label()}
-                        </Button>
-                      )}
-                    </Show>
+                  <div class="flex items-center justify-center gap-4 pl-4">
                     <Show when={ServerConnection.key(current()) === key}>
                       <Icon name="check" class="h-6" />
                     </Show>
 
-                    <Show when={i.type === "http" || i.type === "sidecar"}>
+                    <Show when={i.type === "http"}>
                       <DropdownMenu>
                         <DropdownMenu.Trigger
                           as={IconButton}
@@ -741,54 +579,35 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
                         />
                         <DropdownMenu.Portal>
                           <DropdownMenu.Content class="mt-1">
-                            <Show when={i.type === "http"}>
-                              <DropdownMenu.Item
-                                onSelect={() => {
-                                  if (i.type !== "http") return
-                                  startEdit(i)
-                                }}
-                              >
-                                <DropdownMenu.ItemLabel>{language.t("dialog.server.menu.edit")}</DropdownMenu.ItemLabel>
-                              </DropdownMenu.Item>
-                            </Show>
-                            <Show when={wsl && canRetryWsl(i)}>
-                              <DropdownMenu.Item onSelect={() => retryWslMutation.mutate(key)}>
-                                <DropdownMenu.ItemLabel>Retry start</DropdownMenu.ItemLabel>
-                              </DropdownMenu.Item>
-                            </Show>
-                            <Show when={canChangeDefault() && defaultServer.defaultKey() !== key}>
-                              <DropdownMenu.Item onSelect={() => void defaultServer.setDefault(key)}>
+                            <DropdownMenu.Item
+                              onSelect={() => {
+                                if (i.type !== "http") return
+                                startEdit(i)
+                              }}
+                            >
+                              <DropdownMenu.ItemLabel>{language.t("dialog.server.menu.edit")}</DropdownMenu.ItemLabel>
+                            </DropdownMenu.Item>
+                            <Show when={canDefault() && defaultKey() !== key}>
+                              <DropdownMenu.Item onSelect={() => setDefault(key)}>
                                 <DropdownMenu.ItemLabel>
                                   {language.t("dialog.server.menu.default")}
                                 </DropdownMenu.ItemLabel>
                               </DropdownMenu.Item>
                             </Show>
-                            <Show when={canChangeDefault() && defaultServer.defaultKey() === key}>
-                              <DropdownMenu.Item onSelect={() => void defaultServer.setDefault(null)}>
+                            <Show when={canDefault() && defaultKey() === key}>
+                              <DropdownMenu.Item onSelect={() => setDefault(null)}>
                                 <DropdownMenu.ItemLabel>
                                   {language.t("dialog.server.menu.defaultRemove")}
                                 </DropdownMenu.ItemLabel>
                               </DropdownMenu.Item>
                             </Show>
-                            <Show when={canRemove() && (i.type === "http" || canChangeDefault() || canRetryWsl(i))}>
-                              <DropdownMenu.Separator />
-                            </Show>
-                            <Show when={canRemove()}>
-                              <DropdownMenu.Item
-                                onSelect={() => {
-                                  if (wsl) {
-                                    removeWslMutation.mutate(key)
-                                    return
-                                  }
-                                  void handleRemove(key)
-                                }}
-                                class="text-text-on-critical-base hover:bg-surface-critical-weak"
-                              >
-                                <DropdownMenu.ItemLabel>
-                                  {language.t("dialog.server.menu.delete")}
-                                </DropdownMenu.ItemLabel>
-                              </DropdownMenu.Item>
-                            </Show>
+                            <DropdownMenu.Separator />
+                            <DropdownMenu.Item
+                              onSelect={() => handleRemove(ServerConnection.key(i))}
+                              class="text-text-on-critical-base hover:bg-surface-critical-weak"
+                            >
+                              <DropdownMenu.ItemLabel>{language.t("dialog.server.menu.delete")}</DropdownMenu.ItemLabel>
+                            </DropdownMenu.Item>
                           </DropdownMenu.Content>
                         </DropdownMenu.Portal>
                       </DropdownMenu>
@@ -802,32 +621,17 @@ export function DialogSelectServer(props: DialogSelectServerProps = {}) {
 
         <div class="shrink-0 px-5 pb-5">
           <Show
-            when={!isAddWslMode() && isFormMode()}
+            when={isFormMode()}
             fallback={
-              <Show when={!isAddWslMode()}>
-                <div class="flex items-center gap-2">
-                  <Button
-                    variant="secondary"
-                    icon="plus-small"
-                    size="large"
-                    onClick={startAdd}
-                    class="py-1.5 pl-1.5 pr-3 flex items-center gap-1.5"
-                  >
-                    {language.t("dialog.server.add.button")}
-                  </Button>
-                  <Show when={canAddWsl()}>
-                    <Button
-                      variant="secondary"
-                      icon="plus-small"
-                      size="large"
-                      onClick={startAddWsl}
-                      class="py-1.5 pl-1.5 pr-3 flex items-center gap-1.5"
-                    >
-                      Add WSL
-                    </Button>
-                  </Show>
-                </div>
-              </Show>
+              <Button
+                variant="secondary"
+                icon="plus-small"
+                size="large"
+                onClick={startAdd}
+                class="py-1.5 pl-1.5 pr-3 flex items-center gap-1.5"
+              >
+                {language.t("dialog.server.add.button")}
+              </Button>
             }
           >
             <Button variant="primary" size="large" onClick={submitForm} disabled={formBusy()} class="px-3 py-1.5">

packages/app/src/components/dialog-wsl-server.tsx

@@ -1,582 +0,0 @@
-import { Button } from "@opencode-ai/ui/button"
-import { useDialog } from "@opencode-ai/ui/context/dialog"
-import { Spinner } from "@opencode-ai/ui/spinner"
-import { showToast } from "@opencode-ai/ui/toast"
-import { createEffect, createMemo, For, Match, onCleanup, Show, Switch } from "solid-js"
-import { createStore } from "solid-js/store"
-import { useLanguage } from "@/context/language"
-import { usePlatform } from "@/context/platform"
-import { useWslServers } from "@/context/wsl-servers"
-
-type WslServerStep = "wsl" | "distro" | "opencode"
-
-const STEPS: WslServerStep[] = ["wsl", "distro", "opencode"]
-
-function isHiddenDistro(name: string) {
-  return /^docker-desktop(?:-data)?$/i.test(name)
-}
-
-interface DialogWslServerProps {
-  onAdded?: (distro: string) => void | Promise<void>
-}
-
-export function DialogWslServer(props: DialogWslServerProps = {}) {
-  const language = useLanguage()
-  const platform = usePlatform()
-  const dialog = useDialog()
-  const wslServers = useWslServers()
-  const api = platform.wslServers!
-  const [store, setStore] = createStore({
-    step: undefined as WslServerStep | undefined,
-    selectedDistro: null as string | null,
-    installTarget: undefined as string | undefined,
-    adding: false,
-  })
-  const current = () => wslServers.data
-  let disposed = false
-  onCleanup(() => {
-    disposed = true
-  })
-  const busy = createMemo(() => !!current()?.job || store.adding)
-  const selectedProbe = createMemo(() => {
-    const distro = store.selectedDistro
-    if (!distro) return null
-    return current()?.distroProbes[distro] ?? null
-  })
-  const selectedInstalled = createMemo(() => {
-    const distro = store.selectedDistro
-    if (!distro) return null
-    return (current()?.installed ?? []).find((item) => item.name === distro) ?? null
-  })
-  const visibleInstalledDistros = createMemo(() =>
-    (current()?.installed ?? []).filter((item) => !isHiddenDistro(item.name)),
-  )
-  const visibleOnlineDistros = createMemo(() => (current()?.online ?? []).filter((item) => !isHiddenDistro(item.name)))
-  const defaultInstalledDistro = createMemo(() => visibleInstalledDistros().find((item) => item.isDefault) ?? null)
-  const opencodeCheck = createMemo(() => {
-    const distro = store.selectedDistro
-    if (!distro) return null
-    return current()?.opencodeChecks[distro] ?? null
-  })
-  const distroWarningProbe = createMemo(() => {
-    const probe = selectedProbe()
-    if (!probe) return null
-    if (distroReady()) return null
-    return probe
-  })
-  const distroUnavailableMessage = createMemo(() => {
-    const probe = distroWarningProbe()
-    const distro = store.selectedDistro
-    if (!probe || probe.canExecute || !distro) return null
-    if (!selectedInstalled()) return `${distro} is not installed yet.`
-    return `Open ${distro} once to finish setup.`
-  })
-  const distroMissingTools = createMemo(() => {
-    const probe = distroWarningProbe()
-    if (!probe?.canExecute) return null
-    if (probe.hasBash && probe.hasCurl) return null
-    return probe
-  })
-  const existingServerDistros = createMemo(() => new Set((current()?.servers ?? []).map((item) => item.config.distro)))
-  const addableInstalledDistros = createMemo(() => {
-    return visibleInstalledDistros().filter((item) => !existingServerDistros().has(item.name))
-  })
-  const installableDistros = createMemo(() => {
-    const online = visibleOnlineDistros()
-    const installed = new Set(visibleInstalledDistros().map((item) => item.name))
-    const hasVersionedUbuntu = online.some((item) => /^Ubuntu-\d/.test(item.name))
-    return online
-      .filter((item) => !installed.has(item.name))
-      .filter((item) => !(item.name === "Ubuntu" && hasVersionedUbuntu))
-  })
-  const installTarget = createMemo(() => installableDistros().find((item) => item.name === store.installTarget) ?? null)
-  const installingDistro = createMemo(() => current()?.job?.kind === "install-distro")
-  const installingOpencode = createMemo(() => {
-    const job = current()?.job
-    return job?.kind === "install-opencode" && job.distro === store.selectedDistro
-  })
-  const wslReady = createMemo(() => !!current()?.runtime?.available && !current()?.pendingRestart)
-  const distroReady = createMemo(() => {
-    const probe = selectedProbe()
-    if (!probe || !store.selectedDistro) return false
-    if (selectedInstalled()?.version === 1) return false
-    return probe.canExecute && probe.hasBash && probe.hasCurl
-  })
-  const opencodeReady = createMemo(() => {
-    const check = opencodeCheck()
-    return !!check?.resolvedPath && !check.error
-  })
-  const allReady = createMemo(() => wslReady() && distroReady() && opencodeReady())
-  const addDisabled = createMemo(() => {
-    const job = current()?.job
-    if (!job) return store.adding
-    return store.adding || job.kind !== "probe-opencode"
-  })
-  const recommendedStep = createMemo<WslServerStep>(() => {
-    if (!wslReady()) return "wsl"
-    if (!distroReady()) return "distro"
-    return "opencode"
-  })
-  // activeStep falls back to recommendedStep when the user hasn't picked one.
-  // Once the user clicks a step tab we respect their choice rather than snapping
-  // them back when a probe result updates recommendedStep.
-  const activeStep = createMemo(() => store.step ?? recommendedStep())
-
-  const autoProbe = createMemo(() => {
-    const state = current()
-    if (!state || busy()) return null
-    if (state.pendingRestart) return null
-    if (!state.runtime) return { key: "runtime", run: () => api.probeRuntime() }
-    if (!wslReady()) return null
-    if (!state.installed.length && !state.online.length) {
-      return { key: "distros", run: () => api.refreshDistros() }
-    }
-    const distro = store.selectedDistro
-    if (distro && !state.distroProbes[distro]) {
-      return { key: `probe-distro:${distro}`, run: () => api.probeDistro(distro) }
-    }
-    if (!distro || !distroReady()) return null
-    if (!state.opencodeChecks[distro]) {
-      return { key: `probe-opencode:${distro}`, run: () => api.probeOpencode(distro) }
-    }
-    return null
-  })
-
-  let lastAutoProbe: string | null = null
-  createEffect(() => {
-    const probe = autoProbe()
-    if (!probe || probe.key === lastAutoProbe) return
-    const key = probe.key
-    lastAutoProbe = key
-    void (async () => {
-      try {
-        await probe.run()
-      } catch (err) {
-        if (disposed) return
-        // Allow the same probe to run again when reactive inputs next change
-        // (e.g. user reselects a distro). Without this the user would be stuck
-        // on a transient wsl.exe failure until they pick a different distro.
-        if (lastAutoProbe === key) lastAutoProbe = null
-        requestError(language, err)
-      }
-    })()
-  })
-
-  createEffect(() => {
-    const state = current()
-    const distro = defaultInstalledDistro()
-    if (!state || !distro || busy()) return
-    if (store.selectedDistro) return
-    if (existingServerDistros().has(distro.name)) return
-    setStore("selectedDistro", distro.name)
-  })
-
-  createEffect(() => {
-    const distros = installableDistros()
-    if (!distros.length) {
-      if (store.installTarget) setStore("installTarget", undefined)
-      return
-    }
-    if (store.installTarget && distros.some((item) => item.name === store.installTarget)) return
-    setStore("installTarget", distros[0]!.name)
-  })
-
-  const wslMessage = createMemo(() => {
-    const state = current()
-    if (!state || state.job?.kind === "runtime") return "Checking WSL..."
-    if (state.pendingRestart) return "Windows needs a restart to finish installing WSL."
-    if (state.runtime?.available) return state.runtime.version ?? "WSL is ready."
-    return state.runtime?.error ?? "WSL is required to continue."
-  })
-
-  const distroMessage = createMemo(() => {
-    const state = current()
-    if (!state) return "Checking distros..."
-    const distro = store.selectedDistro
-    if (state.job?.kind === "install-distro") return `Installing ${state.job.distro}...`
-    if (state.job?.kind === "probe-distro") return `Checking ${state.job.distro}...`
-    if (state.job?.kind === "distros") return "Listing distros..."
-    if (distroUnavailableMessage()) return distroUnavailableMessage()!
-    if (selectedProbe() && distroReady()) return `${selectedProbe()!.name} is ready.`
-    if (distro) return `Finishing setup for ${distro}.`
-    return "Pick a distro or install one below."
-  })
-
-  const opencodeMessage = createMemo(() => {
-    const state = current()
-    if (!state) return "Checking OpenCode..."
-    const distro = store.selectedDistro
-    if (state.job?.kind === "probe-opencode" || state.job?.kind === "install-opencode") {
-      return distro ? `Checking OpenCode in ${distro}...` : "Checking OpenCode..."
-    }
-    if (opencodeCheck()?.error) return opencodeCheck()!.error
-    if (opencodeCheck()?.matchesDesktop === false) {
-      return distro ? `Update OpenCode in ${distro}.` : "Update OpenCode."
-    }
-    if (opencodeReady()) return distro ? `OpenCode is ready in ${distro}.` : "OpenCode is ready."
-    return distro ? `Install OpenCode in ${distro}.` : "Choose a distro first."
-  })
-
-  const run = async (action: () => Promise<unknown>) => {
-    try {
-      await action()
-    } catch (err) {
-      requestError(language, err)
-    }
-  }
-
-  const runSelectedDistro = (action: (distro: string) => Promise<unknown>) => {
-    const distro = store.selectedDistro
-    if (!distro) return
-    void run(() => action(distro))
-  }
-
-  const selectDistro = (name: string) => {
-    setStore("selectedDistro", name)
-    setStore("step", undefined)
-  }
-
-  const finish = async () => {
-    const distro = store.selectedDistro
-    if (!distro) return
-    setStore("adding", true)
-    try {
-      await api.addServer(distro)
-      if (props.onAdded) {
-        await props.onAdded(distro)
-      } else {
-        dialog.close()
-      }
-    } catch (err) {
-      requestError(language, err)
-    } finally {
-      setStore("adding", false)
-    }
-  }
-
-  const steps = createMemo(() => {
-    const active = activeStep()
-    const activeIndex = STEPS.indexOf(active)
-    const recommendedIndex = STEPS.indexOf(recommendedStep())
-    return STEPS.map((step) => {
-      const index = STEPS.indexOf(step)
-      return {
-        step,
-        title: step === "wsl" ? "WSL" : step === "distro" ? "Choose distro" : "OpenCode",
-        state:
-          active === step
-            ? "current"
-            : step === "wsl"
-              ? wslReady()
-                ? "done"
-                : "warning"
-              : step === "distro"
-                ? distroReady()
-                  ? "done"
-                  : index > activeIndex
-                    ? "locked"
-                    : "warning"
-                : opencodeCheck()?.matchesDesktop === false
-                  ? "warning"
-                  : opencodeReady()
-                    ? "done"
-                    : index > activeIndex
-                      ? "locked"
-                      : "warning",
-        locked: index > recommendedIndex,
-      }
-    })
-  })
-  const loadError = createMemo(() => {
-    const error = wslServers.error
-    if (!error) return "Failed to load WSL state."
-    return error instanceof Error ? error.message : String(error)
-  })
-
-  return (
-    <div class="px-5 pb-5 flex flex-col gap-4">
-      <Show when={!wslServers.isPending} fallback={<div class="px-1 py-6 text-14-regular text-text-weak">Loading...</div>}>
-        <Show when={!wslServers.isError} fallback={<div class="px-1 py-6 text-14-regular text-text-weak">{loadError()}</div>}>
-          <div class="flex gap-2 pb-1">
-            <For each={steps()}>
-              {(item) => (
-                <button
-                  type="button"
-                  class="basis-0 flex-1 min-w-0 rounded-md border px-3 py-2 text-left transition-colors"
-                  classList={{
-                    "border-border-strong-base bg-surface-base-hover": item.state === "current",
-                    "border-icon-success-base/40 bg-surface-base": item.state === "done",
-                    "border-border-weak-base bg-background-base opacity-60": item.state === "locked",
-                    "border-icon-warning-base/40 bg-surface-base": item.state === "warning",
-                  }}
-                  disabled={item.locked}
-                  onClick={() => setStore("step", item.step)}
-                >
-                  <div class="text-13-medium text-text-strong">{item.title}</div>
-                </button>
-              )}
-            </For>
-          </div>
-
-          <Switch>
-          <Match when={activeStep() === "wsl"}>
-            <div class="rounded-md bg-surface-base p-4 flex flex-col gap-3">
-              <div class="flex items-center justify-between gap-3">
-                <div class="text-14-medium text-text-strong">WSL</div>
-                <Show when={current()?.runtime && !wslReady() && !current()?.pendingRestart}>
-                  <Button
-                    variant="secondary"
-                    size="large"
-                    disabled={busy()}
-                    onClick={() => void run(() => api.installWsl())}
-                  >
-                    Install WSL
-                  </Button>
-                </Show>
-              </div>
-              <div class="text-12-regular text-text-weak whitespace-pre-wrap break-words">{wslMessage()}</div>
-              <Show when={current()?.pendingRestart}>
-                <div class="rounded-md border border-border-weak-base px-3 py-3 flex items-center justify-between gap-3">
-                  <div class="text-12-regular text-text-warning-base">Windows restart required.</div>
-                  <Button variant="secondary" size="large" onClick={() => void platform.restart()}>
-                    Relaunch OpenCode
-                  </Button>
-                </div>
-              </Show>
-              <div class="flex items-center justify-end">
-                <Button variant="secondary" size="large" disabled={busy() || !wslReady()} onClick={() => setStore("step", "distro")}>
-                  Next
-                </Button>
-              </div>
-            </div>
-          </Match>
-
-          <Match when={activeStep() === "distro"}>
-            <div class="rounded-md bg-surface-base p-4 flex flex-col gap-3">
-              <div class="flex items-center justify-between gap-3">
-                <div class="text-14-medium text-text-strong">Choose a distro</div>
-                <Show when={store.selectedDistro}>
-                  <Button
-                    variant="ghost"
-                    size="small"
-                    disabled={busy()}
-                    onClick={() => runSelectedDistro((distro) => api.probeDistro(distro))}
-                  >
-                    Refresh
-                  </Button>
-                </Show>
-              </div>
-              <div class="text-12-regular text-text-weak whitespace-pre-wrap break-words">{distroMessage()}</div>
-
-              <div class="flex flex-col gap-2">
-                <Show
-                  when={addableInstalledDistros().length > 0}
-                  fallback={
-                    <div class="text-12-regular text-text-weak">
-                      {visibleInstalledDistros().length
-                        ? "All installed distros are already added."
-                        : current()?.runtime?.available
-                          ? "No distros detected yet."
-                          : "Checking distros..."}
-                    </div>
-                  }
-                >
-                  <For each={addableInstalledDistros()}>
-                    {(item) => (
-                      <button
-                        type="button"
-                        class="rounded-md border border-border-weak-base px-3 py-2 text-left transition-colors"
-                        classList={{ "bg-surface-raised-base": store.selectedDistro === item.name }}
-                        onClick={() => selectDistro(item.name)}
-                      >
-                        <div class="text-13-medium text-text-strong">{item.name}</div>
-                        <Show when={item.isDefault}>
-                          <div class="text-12-regular text-text-weak">Default</div>
-                        </Show>
-                      </button>
-                    )}
-                  </For>
-                </Show>
-              </div>
-
-              <Show when={installableDistros().length > 0}>
-                <div class="rounded-md border border-border-weak-base p-2 flex flex-col gap-2">
-                  <div class="px-1 flex items-center justify-between gap-3">
-                    <div class="text-12-medium text-text-weak">Install</div>
-                    <div class="flex items-center gap-2 shrink-0">
-                      <Show when={installingDistro()}>
-                        <Spinner class="h-4 w-4 text-icon-info-base shrink-0" />
-                      </Show>
-                      <Button
-                        variant="secondary"
-                        size="small"
-                        disabled={busy() || !installTarget()}
-                        onClick={() => void run(() => api.installDistro(installTarget()!.name))}
-                      >
-                        {installingDistro() ? "Installing..." : "Install"}
-                      </Button>
-                    </div>
-                  </div>
-                  <div
-                    role="radiogroup"
-                    aria-label="Install distro"
-                    class="max-h-52 overflow-y-auto rounded-md bg-background-base"
-                  >
-                    <For each={installableDistros()}>
-                      {(item) => {
-                        const selected = () => store.installTarget === item.name
-                        return (
-                          <button
-                            type="button"
-                            role="radio"
-                            aria-checked={selected()}
-                            disabled={busy()}
-                            class="w-full px-3 py-2 flex items-center gap-3 text-left border-b border-border-weak-base last:border-b-0 transition-colors"
-                            classList={{
-                              "bg-surface-raised-base": selected(),
-                              "hover:bg-surface-base": !selected(),
-                            }}
-                            onClick={() => setStore("installTarget", item.name)}
-                          >
-                            <div
-                              class="mt-0.5 h-4 w-4 rounded-full border border-border-strong-base flex items-center justify-center shrink-0"
-                              classList={{ "border-text-strong": selected() }}
-                            >
-                              <div class="h-2 w-2 rounded-full bg-text-strong" classList={{ hidden: !selected() }} />
-                            </div>
-                            <div class="min-w-0 flex-1 text-13-medium text-text-strong truncate">{item.label}</div>
-                          </button>
-                        )
-                      }}
-                    </For>
-                  </div>
-                </div>
-              </Show>
-
-              <Show
-                when={
-                  selectedInstalled()?.version === 1 ||
-                  distroUnavailableMessage() ||
-                  distroMissingTools()
-                }
-              >
-                <div class="rounded-md border border-border-weak-base px-3 py-3 flex flex-col gap-1">
-                  <Show when={selectedInstalled()?.version === 1}>
-                    <div class="text-12-regular text-text-warning-base">WSL 2 is required.</div>
-                  </Show>
-                  <Show when={distroUnavailableMessage()}>
-                    {(message) => <div class="text-12-regular text-text-warning-base">{message()}</div>}
-                  </Show>
-                  <Show when={distroMissingTools()}>
-                    <div class="text-12-regular text-text-warning-base">This distro needs bash and curl.</div>
-                  </Show>
-                </div>
-              </Show>
-
-              <div class="flex items-center gap-2">
-                <Button
-                  variant="secondary"
-                  size="large"
-                  disabled={busy() || !selectedInstalled()}
-                  onClick={() => runSelectedDistro((distro) => api.openTerminal(distro))}
-                >
-                  Open terminal
-                </Button>
-                <Button
-                  variant="ghost"
-                  size="large"
-                  disabled={busy() || !store.selectedDistro}
-                  onClick={() => runSelectedDistro((distro) => api.probeDistro(distro))}
-                >
-                  Refresh
-                </Button>
-              </div>
-
-              <div class="flex items-center justify-end">
-                <Button
-                  variant="secondary"
-                  size="large"
-                  disabled={busy() || !store.selectedDistro || !distroReady()}
-                  onClick={() => setStore("step", "opencode")}
-                >
-                  Next
-                </Button>
-              </div>
-            </div>
-          </Match>
-
-          <Match when={activeStep() === "opencode"}>
-            <div class="rounded-md bg-surface-base p-4 flex flex-col gap-3">
-              <div class="flex items-center justify-between gap-3">
-                <div class="text-14-medium text-text-strong">OpenCode</div>
-                <div class="flex items-center gap-2">
-                  <Show when={store.selectedDistro}>
-                    <Button
-                      variant="ghost"
-                      size="large"
-                      disabled={busy()}
-                      onClick={() => runSelectedDistro((distro) => api.probeOpencode(distro))}
-                    >
-                      Refresh
-                    </Button>
-                  </Show>
-                  <Show when={!opencodeReady() || opencodeCheck()?.matchesDesktop === false}>
-                    <Button
-                      variant="secondary"
-                      size="large"
-                      disabled={busy()}
-                      onClick={() => runSelectedDistro((distro) => api.installOpencode(distro))}
-                    >
-                      <Show when={installingOpencode()}>
-                        <Spinner class="size-4 shrink-0" />
-                      </Show>
-                      {opencodeCheck()?.resolvedPath ? "Update OpenCode" : "Install OpenCode"}
-                    </Button>
-                  </Show>
-                </div>
-              </div>
-              <div class="text-12-regular text-text-weak whitespace-pre-wrap break-words">{opencodeMessage()}</div>
-              <Show when={opencodeCheck()?.matchesDesktop === false ? opencodeCheck() : null}>
-                {(check) => (
-                  <div class="rounded-md border border-border-weak-base px-3 py-3 flex flex-col gap-1">
-                    <div class="text-12-regular text-text-weak">Path: {check().resolvedPath ?? "not found"}</div>
-                    <div class="text-12-regular text-text-weak">
-                      Version: {check().version ?? "unknown"}
-                      <Show when={check().expectedVersion}>
-                        {(expected) => <span>{` · desktop ${expected()}`}</span>}
-                      </Show>
-                    </div>
-                    <div class="text-12-regular text-text-warning-base">
-                      Installed version does not match the desktop app version.
-                    </div>
-                  </div>
-                )}
-              </Show>
-            </div>
-          </Match>
-          </Switch>
-
-          <Show when={activeStep() === "opencode" && allReady() && store.selectedDistro}>
-            <div class="flex items-center justify-end gap-2">
-              <Button variant="ghost" size="large" disabled={store.adding} onClick={() => dialog.close()}>
-                Cancel
-              </Button>
-              <Button variant="primary" size="large" disabled={addDisabled()} onClick={() => void finish()}>
-                {store.adding ? "Adding..." : "Add WSL server"}
-              </Button>
-            </div>
-          </Show>
-        </Show>
-      </Show>
-    </div>
-  )
-}
-
-function requestError(language: ReturnType<typeof useLanguage>, err: unknown) {
-  console.error("WSL servers request failed", err instanceof Error ? (err.stack ?? err.message) : String(err))
-  showToast({
-    variant: "error",
-    title: language.t("common.requestFailed"),
-    description: err instanceof Error ? err.message : String(err),
-  })
-}

packages/app/src/components/server/server-row.tsx

@@ -17,7 +17,6 @@ import type { ServerHealth } from "@/utils/server-health"
 interface ServerRowProps extends ParentProps {
   conn: ServerConnection.Any
   status?: ServerHealth
-  version?: string
   class?: string
   nameClass?: string
   versionClass?: string
@@ -32,8 +31,6 @@ export function ServerRow(props: ServerRowProps) {
   let nameRef: HTMLSpanElement | undefined
   let versionRef: HTMLSpanElement | undefined
   const name = createMemo(() => serverName(props.conn))
-  const isWsl = createMemo(() => props.conn.type === "sidecar" && props.conn.variant === "wsl")
-  const version = createMemo(() => props.version ?? props.status?.version)
 
   const check = () => {
     const nameTruncated = nameRef ? nameRef.scrollWidth > nameRef.clientWidth : false
@@ -44,7 +41,7 @@ export function ServerRow(props: ServerRowProps) {
   createEffect(() => {
     name()
     props.conn.http.url
-    version()
+    props.status?.version
     queueMicrotask(check)
   })
 
@@ -57,11 +54,8 @@ export function ServerRow(props: ServerRowProps) {
   const tooltipValue = () => (
     <span class="flex items-center gap-2">
       <span>{serverName(props.conn, true)}</span>
-      <Show when={isWsl()}>
-        <span class="text-text-invert-weak">WSL</span>
-      </Show>
-      <Show when={version()}>
-        <span class="text-text-invert-weak">v{version()}</span>
+      <Show when={props.status?.version}>
+        <span class="text-text-invert-weak">v{props.status?.version}</span>
       </Show>
     </span>
   )
@@ -82,20 +76,15 @@ export function ServerRow(props: ServerRowProps) {
             <span ref={nameRef} class={`${props.nameClass ?? "truncate"} min-w-0`}>
               {name()}
             </span>
-            <Show when={isWsl()}>
-              <span class="text-11-regular text-text-weak border border-border-weak-base bg-surface-base px-1.5 py-0.5 rounded-md shrink-0">
-                WSL
-              </span>
-            </Show>
             <Show
               when={badge()}
               fallback={
-                <Show when={version()}>
+                <Show when={props.status?.version}>
                   <span
                     ref={versionRef}
                     class={`${props.versionClass ?? "text-text-weak text-14-regular truncate"} min-w-0`}
                   >
-                    v{version()}
+                    v{props.status?.version}
                   </span>
                 </Show>
               }

packages/app/src/components/status-popover-body.tsx

@@ -5,7 +5,7 @@ import { Switch } from "@opencode-ai/ui/switch"
 import { Tabs } from "@opencode-ai/ui/tabs"
 import { useMutation, useQueryClient } from "@tanstack/solid-query"
 import { showToast } from "@opencode-ai/ui/toast"
-import { useLocation, useNavigate } from "@solidjs/router"
+import { useNavigate } from "@solidjs/router"
 import { type Accessor, createEffect, createMemo, For, type JSXElement, onCleanup, Show } from "solid-js"
 import { createStore, reconcile } from "solid-js/store"
 import { ServerHealthIndicator, ServerRow } from "@/components/server/server-row"
@@ -156,14 +156,13 @@ const useMcpToggleMutation = () => {
   }))
 }
 
-export function StatusPopoverBody(props: { shown: Accessor<boolean>; close?: () => void }) {
+export function StatusPopoverBody(props: { shown: Accessor<boolean> }) {
   const sync = useSync()
   const server = useServer()
   const platform = usePlatform()
   const dialog = useDialog()
   const language = useLanguage()
   const navigate = useNavigate()
-  const location = useLocation()
 
   const fail = (err: unknown) => {
     showToast({
@@ -252,16 +251,8 @@ export function StatusPopoverBody(props: { shown: Accessor<boolean>; close?: ()
                       aria-disabled={blocked()}
                       onClick={() => {
                         if (blocked()) return
-                        props.close?.()
                         navigate("/")
-                        const activate = () => {
-                          if (location.pathname !== "/") {
-                            setTimeout(activate, 16)
-                            return
-                          }
-                          setTimeout(() => server.setActive(key), 0)
-                        }
-                        setTimeout(activate, 0)
+                        queueMicrotask(() => server.setActive(key))
                       }}
                     >
                       <ServerHealthIndicator health={health[key]} />

packages/app/src/components/status-popover.tsx

@@ -58,7 +58,7 @@ export function StatusPopover() {
             <div class="w-[360px] h-14 rounded-xl bg-background-strong shadow-[var(--shadow-lg-border-base)]" />
           }
         >
-          <Body shown={shown} close={() => setShown(false)} />
+          <Body shown={shown} />
         </Suspense>
       </Show>
     </Popover>

packages/app/src/components/titlebar.tsx

@@ -35,9 +35,6 @@ type TauriApi = {
 const tauriApi = () => (window as unknown as { __TAURI__?: TauriApi }).__TAURI__
 const currentDesktopWindow = () => tauriApi()?.window?.getCurrentWindow?.()
 const currentThemeWindow = () => tauriApi()?.webviewWindow?.getCurrentWebviewWindow?.()
-const titlebarHeight = 40
-const minTitlebarZoom = 0.25
-const windowsControlsBaseWidth = 138 // 3 native Windows caption buttons at 46px each.
 
 export function Titlebar() {
   const layout = useLayout()
@@ -54,14 +51,7 @@ export function Titlebar() {
   const windows = createMemo(() => platform.platform === "desktop" && platform.os === "windows")
   const web = createMemo(() => platform.platform === "web")
   const zoom = () => platform.webviewZoom?.() ?? 1
-  const titlebarZoom = () => (windows() ? Math.max(zoom(), minTitlebarZoom) : zoom())
-  const counterZoom = () => (windows() && titlebarZoom() < 1 ? 1 / titlebarZoom() : 1)
-  const minHeight = () => {
-    if (mac()) return `${titlebarHeight / zoom()}px`
-    if (windows()) return `${titlebarHeight / Math.min(titlebarZoom(), 1)}px`
-    return undefined
-  }
-  const windowsControlsWidth = () => `${windowsControlsBaseWidth / Math.max(titlebarZoom(), 1)}px`
+  const minHeight = () => (mac() ? `${40 / zoom()}px` : undefined)
 
   const [history, setHistory] = createStore({
     stack: [] as string[],
@@ -175,161 +165,156 @@ export function Titlebar() {
 
   return (
     <header
-      class="h-10 shrink-0 bg-background-base relative overflow-hidden"
+      class="h-10 shrink-0 bg-background-base relative grid grid-cols-[minmax(0,1fr)_auto_minmax(0,1fr)] items-center"
       style={{ "min-height": minHeight() }}
       data-tauri-drag-region
       onMouseDown={drag}
       onDblClick={maximize}
     >
       <div
-        class="grid h-full min-h-full w-full grid-cols-[minmax(0,1fr)_auto_minmax(0,1fr)] items-center"
-        style={{ zoom: counterZoom() }}
+        classList={{
+          "flex items-center min-w-0": true,
+          "pl-2": !mac(),
+        }}
       >
-        <div
-          classList={{
-            "flex items-center min-w-0": true,
-            "pl-2": !mac(),
-          }}
-        >
-          <Show when={mac()}>
-            <div class="h-full shrink-0" style={{ width: `${72 / zoom()}px` }} />
-            <div class="xl:hidden w-10 shrink-0 flex items-center justify-center">
-              <IconButton
-                icon="menu"
-                variant="ghost"
-                class="titlebar-icon rounded-md"
-                onClick={layout.mobileSidebar.toggle}
-                aria-label={language.t("sidebar.menu.toggle")}
-                aria-expanded={layout.mobileSidebar.opened()}
-              />
-            </div>
-          </Show>
-          <Show when={!mac()}>
-            <div class="xl:hidden w-[48px] shrink-0 flex items-center justify-center">
-              <IconButton
-                icon="menu"
-                variant="ghost"
-                class="titlebar-icon rounded-md"
-                onClick={layout.mobileSidebar.toggle}
-                aria-label={language.t("sidebar.menu.toggle")}
-                aria-expanded={layout.mobileSidebar.opened()}
-              />
-            </div>
-          </Show>
-          <div class="flex items-center gap-1 shrink-0">
-            <TooltipKeybind
-              class={web() ? "hidden xl:flex shrink-0 ml-14" : "hidden xl:flex shrink-0 ml-2"}
-              placement="bottom"
-              title={language.t("command.sidebar.toggle")}
-              keybind={command.keybind("sidebar.toggle")}
+        <Show when={mac()}>
+          <div class="h-full shrink-0" style={{ width: `${72 / zoom()}px` }} />
+          <div class="xl:hidden w-10 shrink-0 flex items-center justify-center">
+            <IconButton
+              icon="menu"
+              variant="ghost"
+              class="titlebar-icon rounded-md"
+              onClick={layout.mobileSidebar.toggle}
+              aria-label={language.t("sidebar.menu.toggle")}
+              aria-expanded={layout.mobileSidebar.opened()}
+            />
+          </div>
+        </Show>
+        <Show when={!mac()}>
+          <div class="xl:hidden w-[48px] shrink-0 flex items-center justify-center">
+            <IconButton
+              icon="menu"
+              variant="ghost"
+              class="titlebar-icon rounded-md"
+              onClick={layout.mobileSidebar.toggle}
+              aria-label={language.t("sidebar.menu.toggle")}
+              aria-expanded={layout.mobileSidebar.opened()}
+            />
+          </div>
+        </Show>
+        <div class="flex items-center gap-1 shrink-0">
+          <TooltipKeybind
+            class={web() ? "hidden xl:flex shrink-0 ml-14" : "hidden xl:flex shrink-0 ml-2"}
+            placement="bottom"
+            title={language.t("command.sidebar.toggle")}
+            keybind={command.keybind("sidebar.toggle")}
+          >
+            <Button
+              variant="ghost"
+              class="group/sidebar-toggle titlebar-icon w-8 h-6 p-0 box-border"
+              onClick={layout.sidebar.toggle}
+              aria-label={language.t("command.sidebar.toggle")}
+              aria-expanded={layout.sidebar.opened()}
             >
-              <Button
-                variant="ghost"
-                class="group/sidebar-toggle titlebar-icon w-8 h-6 p-0 box-border"
-                onClick={layout.sidebar.toggle}
-                aria-label={language.t("command.sidebar.toggle")}
-                aria-expanded={layout.sidebar.opened()}
+              <Icon size="small" name={layout.sidebar.opened() ? "sidebar-active" : "sidebar"} />
+            </Button>
+          </TooltipKeybind>
+          <div class="hidden xl:flex items-center shrink-0">
+            <Show when={params.dir}>
+              <div
+                class="flex items-center shrink-0 w-8 mr-1"
+                aria-hidden={layout.sidebar.opened() ? "true" : undefined}
               >
-                <Icon size="small" name={layout.sidebar.opened() ? "sidebar-active" : "sidebar"} />
-              </Button>
-            </TooltipKeybind>
-            <div class="hidden xl:flex items-center shrink-0">
-              <Show when={params.dir}>
                 <div
-                  class="flex items-center shrink-0 w-8 mr-1"
-                  aria-hidden={layout.sidebar.opened() ? "true" : undefined}
+                  class="transition-opacity"
+                  classList={{
+                    "opacity-100 duration-120 ease-out": !layout.sidebar.opened(),
+                    "opacity-0 duration-120 ease-in delay-0 pointer-events-none": layout.sidebar.opened(),
+                  }}
                 >
-                  <div
-                    class="transition-opacity"
-                    classList={{
-                      "opacity-100 duration-120 ease-out": !layout.sidebar.opened(),
-                      "opacity-0 duration-120 ease-in delay-0 pointer-events-none": layout.sidebar.opened(),
-                    }}
+                  <TooltipKeybind
+                    placement="bottom"
+                    title={language.t("command.session.new")}
+                    keybind={command.keybind("session.new")}
+                    openDelay={2000}
                   >
-                    <TooltipKeybind
-                      placement="bottom"
-                      title={language.t("command.session.new")}
-                      keybind={command.keybind("session.new")}
-                      openDelay={2000}
-                    >
-                      <Button
-                        variant="ghost"
-                        icon={creating() ? "new-session-active" : "new-session"}
-                        class="titlebar-icon w-8 h-6 p-0 box-border"
-                        disabled={layout.sidebar.opened()}
-                        tabIndex={layout.sidebar.opened() ? -1 : undefined}
-                        onClick={() => {
-                          if (!params.dir) return
-                          navigate(`/${params.dir}/session`)
-                        }}
-                        aria-label={language.t("command.session.new")}
-                        aria-current={creating() ? "page" : undefined}
-                      />
-                    </TooltipKeybind>
-                  </div>
+                    <Button
+                      variant="ghost"
+                      icon={creating() ? "new-session-active" : "new-session"}
+                      class="titlebar-icon w-8 h-6 p-0 box-border"
+                      disabled={layout.sidebar.opened()}
+                      tabIndex={layout.sidebar.opened() ? -1 : undefined}
+                      onClick={() => {
+                        if (!params.dir) return
+                        navigate(`/${params.dir}/session`)
+                      }}
+                      aria-label={language.t("command.session.new")}
+                      aria-current={creating() ? "page" : undefined}
+                    />
+                  </TooltipKeybind>
+                </div>
+              </div>
+            </Show>
+            <div
+              class="flex items-center shrink-0"
+              classList={{
+                "-translate-x-[36px]": layout.sidebar.opened() && !!params.dir,
+                "duration-180 ease-out": !layout.sidebar.opened(),
+                "duration-180 ease-in": layout.sidebar.opened(),
+              }}
+            >
+              <Show when={hasProjects() && nav()}>
+                <div class="flex items-center gap-0 transition-transform">
+                  <Tooltip placement="bottom" value={language.t("common.goBack")} openDelay={2000}>
+                    <Button
+                      variant="ghost"
+                      icon="chevron-left"
+                      class="titlebar-icon w-6 h-6 p-0 box-border"
+                      disabled={!canBack()}
+                      onClick={back}
+                      aria-label={language.t("common.goBack")}
+                    />
+                  </Tooltip>
+                  <Tooltip placement="bottom" value={language.t("common.goForward")} openDelay={2000}>
+                    <Button
+                      variant="ghost"
+                      icon="chevron-right"
+                      class="titlebar-icon w-6 h-6 p-0 box-border"
+                      disabled={!canForward()}
+                      onClick={forward}
+                      aria-label={language.t("common.goForward")}
+                    />
+                  </Tooltip>
                 </div>
               </Show>
-              <div
-                class="flex items-center shrink-0"
-                classList={{
-                  "-translate-x-[36px]": layout.sidebar.opened() && !!params.dir,
-                  "duration-180 ease-out": !layout.sidebar.opened(),
-                  "duration-180 ease-in": layout.sidebar.opened(),
-                }}
-              >
-                <Show when={hasProjects() && nav()}>
-                  <div class="flex items-center gap-0 transition-transform">
-                    <Tooltip placement="bottom" value={language.t("common.goBack")} openDelay={2000}>
-                      <Button
-                        variant="ghost"
-                        icon="chevron-left"
-                        class="titlebar-icon w-6 h-6 p-0 box-border"
-                        disabled={!canBack()}
-                        onClick={back}
-                        aria-label={language.t("common.goBack")}
-                      />
-                    </Tooltip>
-                    <Tooltip placement="bottom" value={language.t("common.goForward")} openDelay={2000}>
-                      <Button
-                        variant="ghost"
-                        icon="chevron-right"
-                        class="titlebar-icon w-6 h-6 p-0 box-border"
-                        disabled={!canForward()}
-                        onClick={forward}
-                        aria-label={language.t("common.goForward")}
-                      />
-                    </Tooltip>
-                  </div>
-                </Show>
-                <div id="opencode-titlebar-left" class="flex items-center gap-3 min-w-0 px-2" />
-                {["beta", "dev"].includes(import.meta.env.VITE_OPENCODE_CHANNEL) && (
-                  <div class="bg-icon-interactive-base text-[#FFF] font-medium px-2 rounded-sm uppercase font-mono">
-                    {import.meta.env.VITE_OPENCODE_CHANNEL.toUpperCase()}
-                  </div>
-                )}
-              </div>
+              <div id="opencode-titlebar-left" class="flex items-center gap-3 min-w-0 px-2" />
+              {["beta", "dev"].includes(import.meta.env.VITE_OPENCODE_CHANNEL) && (
+                <div class="bg-icon-interactive-base text-[#FFF] font-medium px-2 rounded-sm uppercase font-mono">
+                  {import.meta.env.VITE_OPENCODE_CHANNEL.toUpperCase()}
+                </div>
+              )}
             </div>
           </div>
         </div>
+      </div>
 
-        <div class="min-w-0 flex items-center justify-center pointer-events-none">
-          <div id="opencode-titlebar-center" class="pointer-events-auto min-w-0 flex justify-center w-fit max-w-full" />
-        </div>
+      <div class="min-w-0 flex items-center justify-center pointer-events-none">
+        <div id="opencode-titlebar-center" class="pointer-events-auto min-w-0 flex justify-center w-fit max-w-full" />
+      </div>
 
-        <div
-          classList={{
-            "flex items-center min-w-0 justify-end": true,
-            "pr-2": !windows(),
-          }}
-          data-tauri-drag-region
-          onMouseDown={drag}
-        >
-          <div id="opencode-titlebar-right" class="flex items-center gap-1 shrink-0 justify-end" />
-          <Show when={windows()}>
-            {!tauriApi() && <div class="shrink-0" style={{ width: windowsControlsWidth() }} />}
-            <div data-tauri-decorum-tb class="flex flex-row" />
-          </Show>
-        </div>
+      <div
+        classList={{
+          "flex items-center min-w-0 justify-end": true,
+          "pr-2": !windows(),
+        }}
+        data-tauri-drag-region
+        onMouseDown={drag}
+      >
+        <div id="opencode-titlebar-right" class="flex items-center gap-1 shrink-0 justify-end" />
+        <Show when={windows()}>
+          {!tauriApi() && <div class="w-36 shrink-0" />}
+          <div data-tauri-decorum-tb class="flex flex-row" />
+        </Show>
       </div>
     </header>
   )

packages/app/src/context/global-sync.tsx

@@ -371,7 +371,11 @@ function createGlobalSync() {
   onCleanup(() => {
     queue.dispose()
   })
-  onCleanup(children.disposeAll)
+  onCleanup(() => {
+    for (const directory of Object.keys(children.children)) {
+      children.disposeDirectory(directoryKey(directory))
+    }
+  })
 
   onMount(() => {
     if (typeof requestAnimationFrame === "function") {

packages/app/src/context/global-sync/child-store.ts

@@ -92,22 +92,6 @@ export function createChildStoreManager(input: {
     })
   }
 
-  function disposeChild(key: DirectoryKey) {
-    const dispose = disposers.get(key)
-    if (!key || !children[key]) return false
-    vcsCache.delete(key)
-    metaCache.delete(key)
-    iconCache.delete(key)
-    lifecycle.delete(key)
-    disposers.delete(key)
-    delete children[key]
-    input.onDispose(key)
-    if (dispose) {
-      dispose()
-    }
-    return true
-  }
-
   function disposeDirectory(directory: DirectoryKey) {
     const key = directory
     if (
@@ -122,13 +106,18 @@ export function createChildStoreManager(input: {
       return false
     }
 
-    return disposeChild(key)
-  }
-
-  function disposeAll() {
-    for (const directory of Object.keys(children)) {
-      disposeChild(directoryKey(directory))
+    vcsCache.delete(key)
+    metaCache.delete(key)
+    iconCache.delete(key)
+    lifecycle.delete(key)
+    const dispose = disposers.get(key)
+    if (dispose) {
+      dispose()
+      disposers.delete(key)
     }
+    delete children[key]
+    input.onDispose(key)
+    return true
   }
 
   function runEviction(skip?: string) {
@@ -340,7 +329,6 @@ export function createChildStoreManager(input: {
     unpin,
     pinned,
     disposeDirectory,
-    disposeAll,
     runEviction,
     vcsCache,
     metaCache,

packages/app/src/context/platform.tsx

@@ -9,88 +9,6 @@ type OpenFilePickerOptions = { title?: string; multiple?: boolean; accept?: stri
 type SaveFilePickerOptions = { title?: string; defaultPath?: string }
 type UpdateInfo = { updateAvailable: boolean; version?: string }
 
-export type WslRuntimeCheck = {
-  available: boolean
-  version: string | null
-  error: string | null
-}
-export type WslInstalledDistro = {
-  name: string
-  version: number | null
-  isDefault: boolean
-}
-export type WslOnlineDistro = {
-  name: string
-  label: string
-}
-export type WslDistroProbe = {
-  name: string
-  canExecute: boolean
-  hasBash: boolean
-  hasCurl: boolean
-  error: string | null
-}
-export type WslOpencodeCheck = {
-  distro: string
-  resolvedPath: string | null
-  version: string | null
-  expectedVersion: string | null
-  matchesDesktop: boolean | null
-  error: string | null
-}
-export type WslServerConfig = {
-  id: string
-  distro: string
-}
-
-export type WslServerRuntime =
-  | { kind: "starting" }
-  | { kind: "ready"; url: string; username: string | null; password: string | null }
-  | { kind: "failed"; message: string }
-  | { kind: "stopped" }
-
-export type WslServerItem = {
-  config: WslServerConfig
-  runtime: WslServerRuntime
-}
-
-export type WslJob =
-  | { kind: "runtime"; startedAt: number }
-  | { kind: "distros"; startedAt: number }
-  | { kind: "install-wsl"; startedAt: number }
-  | { kind: "install-distro"; distro: string; startedAt: number }
-  | { kind: "probe-distro"; distro: string; startedAt: number }
-  | { kind: "probe-opencode"; distro: string; startedAt: number }
-  | { kind: "install-opencode"; distro: string; startedAt: number }
-
-export type WslServersState = {
-  runtime: WslRuntimeCheck | null
-  installed: WslInstalledDistro[]
-  online: WslOnlineDistro[]
-  distroProbes: Record<string, WslDistroProbe>
-  opencodeChecks: Record<string, WslOpencodeCheck>
-  pendingRestart: boolean
-  servers: WslServerItem[]
-  job: WslJob | null
-}
-export type WslServersEvent = { type: "state"; state: WslServersState }
-
-export type WslServersPlatform = {
-  getState(): Promise<WslServersState>
-  subscribe(cb: (event: WslServersEvent) => void): () => void
-  probeRuntime(): Promise<void>
-  refreshDistros(): Promise<void>
-  installWsl(): Promise<void>
-  installDistro(name: string): Promise<void>
-  probeDistro(name: string): Promise<void>
-  probeOpencode(name: string): Promise<void>
-  installOpencode(name: string): Promise<void>
-  openTerminal(name: string): Promise<void>
-  addServer(distro: string): Promise<WslServerConfig>
-  removeServer(id: string): Promise<void>
-  startServer(id: string): Promise<void>
-}
-
 export type Platform = {
   /** Platform discriminator */
   platform: "web" | "desktop"
@@ -146,8 +64,11 @@ export type Platform = {
   /** Set the default server URL to use on app startup (platform-specific) */
   setDefaultServer?(url: ServerConnection.Key | null): Promise<void> | void
 
-  /** Manage WSL sidecar servers (Electron on Windows only) */
-  wslServers?: WslServersPlatform
+  /** Get the configured WSL integration (desktop only) */
+  getWslEnabled?(): Promise<boolean>
+
+  /** Set the configured WSL integration (desktop only) */
+  setWslEnabled?(config: boolean): Promise<void> | void
 
   /** Get the preferred display backend (desktop only) */
   getDisplayBackend?(): Promise<DisplayBackend | null> | DisplayBackend | null

packages/app/src/context/server.tsx

@@ -180,12 +180,6 @@ export const { use: useServer, provider: ServerProvider } = createSimpleContext(
       if (state.active !== input) setState("active", input)
     }
 
-    createEffect(() => {
-      if (typeof window === "undefined") return
-      window.__OPENCODE__ ??= {}
-      window.__OPENCODE__.activeServer = state.active
-    })
-
     function add(input: ServerConnection.Http) {
       const url_ = normalizeServerUrl(input.http.url)
       if (!url_) return
@@ -236,7 +230,7 @@ export const { use: useServer, provider: ServerProvider } = createSimpleContext(
     )
     const isLocal = createMemo(() => {
       const c = current()
-      return c?.type === "sidecar" || (c?.type === "http" && isLocalHost(c.http.url))
+      return (c?.type === "sidecar" && c.variant === "base") || (c?.type === "http" && isLocalHost(c.http.url))
     })
 
     return {

packages/app/src/context/wsl-servers.tsx

@@ -1,35 +0,0 @@
-import { createSimpleContext } from "@opencode-ai/ui/context"
-import { queryOptions, skipToken, useQuery, useQueryClient } from "@tanstack/solid-query"
-import { createEffect, onCleanup } from "solid-js"
-import type { WslServersPlatform, WslServersState } from "./platform"
-import { usePlatform } from "./platform"
-
-const wslServersQueryKey = ["platform", "wslServers"] as const
-
-export const { use: useWslServers, provider: WslServersProvider } = createSimpleContext({
-  name: "WslServers",
-  init: () => {
-    const platform = usePlatform()
-    const queryClient = useQueryClient()
-    const query = useQuery(() => {
-      const api = platform.wslServers
-      return queryOptions<WslServersState>({
-        queryKey: wslServersQueryKey,
-        queryFn: api ? () => api.getState() : skipToken,
-        staleTime: Number.POSITIVE_INFINITY,
-        gcTime: Number.POSITIVE_INFINITY,
-      })
-    })
-
-    createEffect(() => {
-      const api = platform.wslServers
-      if (!api) return
-      const off = api.subscribe((event) => {
-        queryClient.setQueryData(wslServersQueryKey, event.state)
-      })
-      onCleanup(off)
-    })
-
-    return query
-  },
-})

packages/app/src/index.ts

@@ -2,19 +2,6 @@ export { AppBaseProviders, AppInterface } from "./app"
 export { ACCEPTED_FILE_EXTENSIONS, ACCEPTED_FILE_TYPES, filePickerFilters } from "./constants/file-picker"
 export { useCommand } from "./context/command"
 export { loadLocaleDict, normalizeLocale, type Locale } from "./context/language"
-export { useWslServers } from "./context/wsl-servers"
-export {
-  type DisplayBackend,
-  type Platform,
-  PlatformProvider,
-  type WslInstalledDistro,
-  type WslOnlineDistro,
-  type WslOpencodeCheck,
-  type WslServerConfig,
-  type WslServerItem,
-  type WslServersEvent,
-  type WslServersPlatform,
-  type WslServersState,
-} from "./context/platform"
+export { type DisplayBackend, type Platform, PlatformProvider } from "./context/platform"
 export { ServerConnection } from "./context/server"
 export { handleNotificationClick } from "./utils/notification-click"

packages/app/src/pages/home.tsx

@@ -36,7 +36,6 @@ export default function Home() {
     if (healthy === false) return "bg-icon-critical-base"
     return "bg-border-weak-base"
   })
-  const useWebDirectoryPicker = createMemo(() => server.current?.type === "sidecar" && server.current.variant === "wsl")
 
   function openProject(directory: string) {
     layout.projects.open(directory)
@@ -55,7 +54,7 @@ export default function Home() {
       }
     }
 
-    if (platform.openDirectoryPickerDialog && server.isLocal() && !useWebDirectoryPicker()) {
+    if (platform.openDirectoryPickerDialog && server.isLocal()) {
       const result = await platform.openDirectoryPickerDialog?.({
         title: language.t("command.project.open"),
         multiple: true,
@@ -76,7 +75,7 @@ export default function Home() {
         size="large"
         variant="ghost"
         class="mt-4 mx-auto text-14-regular text-text-weak"
-        onClick={() => dialog.show(() => <DialogSelectServer onNavigateHome={() => navigate("/")} />)}
+        onClick={() => dialog.show(() => <DialogSelectServer />)}
       >
         <div
           classList={{

packages/app/src/pages/layout.tsx

@@ -149,7 +149,6 @@ export default function Layout(props: ParentProps) {
   }
   const colorSchemeLabel = (scheme: ColorScheme) => language.t(colorSchemeKey[scheme])
   const currentDir = createMemo(() => route().dir)
-  const useWebDirectoryPicker = createMemo(() => server.current?.type === "sidecar" && server.current.variant === "wsl")
 
   const [state, setState] = createStore({
     autoselect: !initialDirectory,
@@ -1208,7 +1207,7 @@ export default function Layout(props: ParentProps) {
     const run = ++dialogRun
     void import("@/components/dialog-select-server").then((x) => {
       if (dialogDead || dialogRun !== run) return
-      dialog.show(() => <x.DialogSelectServer onNavigateHome={() => navigate("/")} />)
+      dialog.show(() => <x.DialogSelectServer />)
     })
   }
 
@@ -1460,7 +1459,7 @@ export default function Layout(props: ParentProps) {
       }
     }
 
-    if (platform.openDirectoryPickerDialog && server.isLocal() && !useWebDirectoryPicker()) {
+    if (platform.openDirectoryPickerDialog && server.isLocal()) {
       const result = await platform.openDirectoryPickerDialog?.({
         title: language.t("command.project.open"),
         multiple: true,

packages/app/src/utils/solid-dnd.tsx

@@ -1,6 +1,6 @@
 import { useDragDropContext } from "@thisbeyond/solid-dnd"
 import type { Transformer } from "@thisbeyond/solid-dnd"
-import type { JSXElement } from "solid-js"
+import { createRoot, onCleanup, type JSXElement } from "solid-js"
 
 type DragEvent = { draggable?: { id?: unknown } }
 
@@ -27,16 +27,20 @@ const createAxisConstraint = (axis: "x" | "y", transformerId: string) => (): JSX
   if (!context) return null
   const [, { onDragStart, onDragEnd, addTransformer, removeTransformer }] = context
   const transformer = createTransformer(transformerId, axis)
-  onDragStart((event) => {
-    const id = getDraggableId(event)
-    if (!id) return
-    addTransformer("draggables", id, transformer)
-  })
-  onDragEnd((event) => {
-    const id = getDraggableId(event)
-    if (!id) return
-    removeTransformer("draggables", id, transformer.id)
+  const dispose = createRoot((dispose) => {
+    onDragStart((event) => {
+      const id = getDraggableId(event)
+      if (!id) return
+      addTransformer("draggables", id, transformer)
+    })
+    onDragEnd((event) => {
+      const id = getDraggableId(event)
+      if (!id) return
+      removeTransformer("draggables", id, transformer.id)
+    })
+    return dispose
   })
+  onCleanup(dispose)
   return null
 }
 

packages/console/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/console-app",
-  "version": "1.14.37",
+  "version": "1.14.35",
   "type": "module",
   "license": "MIT",
   "scripts": {

packages/console/app/src/routes/download/[channel]/[platform].ts

@@ -2,11 +2,11 @@ import type { APIEvent } from "@solidjs/start"
 import type { DownloadPlatform } from "../types"
 
 const prodAssetNames: Record<string, string> = {
-  "darwin-aarch64-dmg": "opencode-desktop-mac-arm64.dmg",
-  "darwin-x64-dmg": "opencode-desktop-mac-x64.dmg",
-  "windows-x64-nsis": "opencode-desktop-win-x64.exe",
+  "darwin-aarch64-dmg": "opencode-desktop-darwin-aarch64.dmg",
+  "darwin-x64-dmg": "opencode-desktop-darwin-x64.dmg",
+  "windows-x64-nsis": "opencode-desktop-windows-x64.exe",
   "linux-x64-deb": "opencode-desktop-linux-amd64.deb",
-  "linux-x64-appimage": "opencode-desktop-linux-x86_64.AppImage",
+  "linux-x64-appimage": "opencode-desktop-linux-amd64.AppImage",
   "linux-x64-rpm": "opencode-desktop-linux-x86_64.rpm",
 } satisfies Record<DownloadPlatform, string>
 
@@ -32,6 +32,13 @@ export async function GET({ params: { platform, channel } }: APIEvent) {
 
   const resp = await fetch(
     `https://github.com/anomalyco/${channel === "stable" ? "opencode" : "opencode-beta"}/releases/latest/download/${assetName}`,
+    {
+      cf: {
+        // in case gh releases has rate limits
+        cacheTtl: 60 * 5,
+        cacheEverything: true,
+      },
+    } as any,
   )
 
   const downloadName = downloadNames[platform]

packages/console/core/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/console-core",
-  "version": "1.14.37",
+  "version": "1.14.35",
   "private": true,
   "type": "module",
   "license": "MIT",

packages/console/function/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/console-function",
-  "version": "1.14.37",
+  "version": "1.14.35",
   "$schema": "https://json.schemastore.org/package.json",
   "private": true,
   "type": "module",

packages/console/mail/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/console-mail",
-  "version": "1.14.37",
+  "version": "1.14.35",
   "dependencies": {
     "@jsx-email/all": "2.2.3",
     "@jsx-email/cli": "1.4.3",

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.14.37",
+  "version": "1.14.35",
   "name": "@opencode-ai/core",
   "type": "module",
   "license": "MIT",

packages/core/src/global.ts

@@ -71,8 +71,6 @@ export const layer = Layer.effect(
   Effect.sync(() => Service.of(make())),
 )
 
-export const defaultLayer = layer
-
 export const layerWith = (input: Partial<Interface>) =>
   Layer.effect(
     Service,

packages/desktop-electron/.gitignore

@@ -0,0 +1,28 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+out/
+
+resources/opencode-cli*
+resources/icons

packages/desktop-electron/AGENTS.md

@@ -0,0 +1,4 @@
+# Desktop package notes
+
+- Renderer process should only call `window.api` from `src/preload`.
+- Main process should register IPC handlers in `src/main/ipc.ts`.

packages/desktop-electron/README.md

@@ -0,0 +1,32 @@
+# OpenCode Desktop
+
+Native OpenCode desktop app, built with Tauri v2.
+
+## Development
+
+From the repo root:
+
+```bash
+bun install
+bun run --cwd packages/desktop tauri dev
+```
+
+This starts the Vite dev server on http://localhost:1420 and opens the native window.
+
+If you only want the web dev server (no native shell):
+
+```bash
+bun run --cwd packages/desktop dev
+```
+
+## Build
+
+To create a production `dist/` and build the native app bundle:
+
+```bash
+bun run --cwd packages/desktop tauri build
+```
+
+## Prerequisites
+
+Running the desktop app requires additional Tauri dependencies (Rust toolchain, platform-specific libraries). See the [Tauri prerequisites](https://v2.tauri.app/start/prerequisites/) for setup instructions.