fix(app): preserve settings server context

packages/app/src/components/project-settings-extensions.tsx

@@ -8,7 +8,7 @@ import { useSDK } from "@/context/sdk"
 import { useServerSDK } from "@/context/server-sdk"
 import { useServerSync } from "@/context/server-sync"
 import { useSync } from "@/context/sync"
-import { Link } from "./link"
+import { ExternalLink } from "./external-link"
 
 type SkillItem = {
   name: string
@@ -198,9 +198,9 @@ export const ProjectSettingsExtensions: Component = () => {
           <div class="project-settings-extension-section">
             <div class="project-settings-extension-section-header">
               <span>{language.t("project.settings.extensions.added")}</span>
-              <Link class="project-settings-extension-link" href="https://opencode.ai/docs/skills/">
+              <ExternalLink class="project-settings-extension-link" href="https://opencode.ai/docs/skills/">
                 {language.t("settings.extensions.addSkills")}
-              </Link>
+              </ExternalLink>
             </div>
             <Show when={projectSkills().length > 0}>
               <ExtensionCard>{skillRows(projectSkills())}</ExtensionCard>

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

@@ -9,7 +9,7 @@ import { ServerConnection } from "@/context/server"
 export const ServerRowMenu: Component<{
   server: ServerConnection.Any
   domain: ServerActionsController
-  onEdit: (server: ServerConnection.Any) => void
+  onEdit: (server: ServerConnection.Http) => void
   open?: boolean
   onOpenChange?: (open: boolean) => void
 }> = (props) => {
@@ -49,7 +49,7 @@ export const ServerRowMenuView: Component<{
   canDefault: boolean
   isDefault: boolean
   canRemove: boolean
-  onEdit: (server: ServerConnection.Any) => void
+  onEdit: (server: ServerConnection.Http) => void
   onSetDefault: () => void
   onRemoveDefault: () => void
   onRemove: () => void
@@ -57,6 +57,7 @@ export const ServerRowMenuView: Component<{
   onOpenChange?: (open: boolean) => void
 }> = (props) => {
   const builtin = () => ServerConnection.builtin(props.server)
+  const httpServer = () => (props.server.type === "http" ? props.server : undefined)
   return (
     <MenuV2 gutter={6} modal={false} placement="bottom-end" open={props.open} onOpenChange={props.onOpenChange}>
       <MenuV2.Trigger
@@ -70,7 +71,15 @@ export const ServerRowMenuView: Component<{
         <MenuV2.Content>
           <MenuV2.Group>
             <MenuV2.GroupLabel>{props.labels.server}</MenuV2.GroupLabel>
-            <MenuV2.Item onSelect={() => props.onEdit(props.server)}>{props.labels.edit}</MenuV2.Item>
+            <MenuV2.Item
+              disabled={builtin() || !httpServer()}
+              onSelect={() => {
+                const server = httpServer()
+                if (server) props.onEdit(server)
+              }}
+            >
+              {props.labels.edit}
+            </MenuV2.Item>
             <Show when={props.canDefault && !props.isDefault}>
               <MenuV2.Item onSelect={props.onSetDefault}>{props.labels.default}</MenuV2.Item>
             </Show>

packages/app/src/components/settings-v2/appearance.tsx

@@ -2,7 +2,7 @@ import { Component, createMemo } from "solid-js"
 import { SelectV2 } from "@opencode-ai/ui/v2/select-v2"
 import { TextInputV2 } from "@opencode-ai/ui/v2/text-input-v2"
 import { useLanguage } from "@/context/language"
-import { Link } from "../link"
+import { ExternalLink } from "../external-link"
 import { SettingsListV2 } from "./parts/list"
 import { SettingsRowV2 } from "./parts/row"
 import { createAppearanceSettingsController, type AppearanceSettingsController } from "./general-controllers"
@@ -104,9 +104,9 @@ export const SettingsAppearanceV2: Component = () => {
               description={
                 <>
                   {language.t("settings.general.row.theme.description")}{" "}
-                  <Link class="settings-v2-link" href="https://opencode.ai/docs/themes/">
+                  <ExternalLink class="settings-v2-link" href="https://opencode.ai/docs/themes/">
                     {language.t("common.learnMore")}
-                  </Link>
+                  </ExternalLink>
                 </>
               }
             >

packages/app/src/components/settings-v2/dialog-settings-v2.tsx

@@ -19,6 +19,7 @@ import { useLayout } from "@/context/layout"
 import { useTabs } from "@/context/tabs"
 import { useServerSync } from "@/context/server-sync"
 import { useGlobal } from "@/context/global"
+import { ServerConnection } from "@/context/server"
 import "./settings-v2.css"
 
 export const DialogSettings: Component<{
@@ -32,6 +33,8 @@ export const DialogSettings: Component<{
   const tabs = useTabs()
   const serverSync = useServerSync()
   const global = useGlobal()
+  const currentServer = global.servers.list().find((server) => global.ensureServerCtx(server).sync === serverSync())
+  if (currentServer) global.settings.server.set(ServerConnection.key(currentServer))
   const [tab, setTab] = createSignal(props.defaultValue ?? "general")
   const directory = createMemo(() => {
     const server = global.settings.server.selected()

packages/app/src/components/settings-v2/extensions.tsx

@@ -5,7 +5,7 @@ import { TabsV2 } from "@opencode-ai/ui/v2/tabs-v2"
 import { useLanguage } from "@/context/language"
 import { useServerSDK } from "@/context/server-sdk"
 import { useServerSync } from "@/context/server-sync"
-import { Link } from "../link"
+import { ExternalLink } from "../external-link"
 import { InlineServerSelect } from "./parts/server-select"
 import "./settings-v2.css"
 
@@ -128,12 +128,12 @@ export const SettingsExtensionsV2: Component = () => {
                 <span class="text-13-medium text-v2-text-text-base">
                   {language.t("settings.extensions.availableAll")}
                 </span>
-                <Link
+                <ExternalLink
                   class="text-13-regular text-v2-text-accent hover:underline"
                   href="https://opencode.ai/docs/skills/"
                 >
                   {language.t("settings.extensions.addSkills")}
-                </Link>
+                </ExternalLink>
               </div>
               <div class="bg-[var(--v2-background-bg-base)] border-[0.5px] border-[var(--v2-border-border-base)] rounded-[8px] pl-4 pr-3 overflow-hidden">
                 <For each={skills()}>

packages/app/src/components/settings-v2/servers.tsx

@@ -42,15 +42,10 @@ export const SettingsServersV2: Component = () => {
     void dialog.push(() => <DialogServerV2 mode="add" />)
   }
 
-  const openEdit = (server: ServerConnection.Any) => {
+  const openEdit = (server: ServerConnection.Http) => {
     void dialog.push(() => <DialogServerV2 mode="edit" server={server} />)
   }
 
-  const openWslEdit = (key: ServerConnection.Key) => {
-    const item = controller.collection.items().find((candidate) => ServerConnection.key(candidate) === key)
-    if (item) openEdit(item)
-  }
-
   return (
     <>
       <div
@@ -105,7 +100,7 @@ export const SettingsServersV2: Component = () => {
           }
         >
           <SettingsListV2>
-            <WslServerSettings domain={controller} servers={wslServers} onEdit={openWslEdit} />
+            <WslServerSettings domain={controller} servers={wslServers} />
             <For each={filtered()}>
               {(item) => {
                 const key = ServerConnection.key(item)

packages/app/src/pages/home/home-projects-controller.tsx

@@ -62,7 +62,7 @@ export function createHomeProjectsController(home: HomeController) {
         serverManagement.defaults.set(conn ? ServerConnection.key(conn) : null),
       canRemove: (conn: ServerConnection.Any) => serverManagement.connection.canRemove(ServerConnection.key(conn)),
       remove: (conn: ServerConnection.Any) => serverManagement.connection.remove(ServerConnection.key(conn)),
-      edit: (conn: ServerConnection.Any) => dialog.show(() => <DialogServerV2 mode="edit" server={conn} />),
+      edit: (conn: ServerConnection.Http) => dialog.show(() => <DialogServerV2 mode="edit" server={conn} />),
       focus: home.selection.focusServer,
     },
     project: {

packages/app/src/pages/home/home-projects-view.tsx

@@ -45,7 +45,7 @@ export type HomeProjectsViewProps = {
   onChooseProject: (server: ServerConnection.Any) => void
   onFocusServer: (server: ServerConnection.Any) => void
   onToggleCollapsed: (server: ServerConnection.Any) => void
-  onEditServer: (server: ServerConnection.Any) => void
+  onEditServer: (server: ServerConnection.Http) => void
   onSetDefaultServer: (server: ServerConnection.Any | undefined) => void
   canRemoveServer: (server: ServerConnection.Any) => boolean
   onRemoveServer: (server: ServerConnection.Any) => void

packages/app/src/wsl/settings.tsx

@@ -67,7 +67,6 @@ export function useFilteredWslServers(filter: Accessor<string>) {
 export function WslServerSettings(props: {
   domain: Pick<ServerCollectionController, "collection" | "defaults" | "connection">
   servers: ReturnType<typeof useFilteredWslServers>
-  onEdit: (key: ServerConnection.Key) => void
 }) {
   const platform = usePlatform()
   const language = useLanguage()
@@ -139,9 +138,6 @@ export function WslServerSettings(props: {
                     <MenuV2.Content>
                       <MenuV2.Group>
                         <MenuV2.GroupLabel>{language.t("wsl.server.menu.label")}</MenuV2.GroupLabel>
-                        <MenuV2.Item onSelect={() => props.onEdit(key)}>
-                          {language.t("dialog.server.menu.edit")}
-                        </MenuV2.Item>
                         <Show when={wslRuntimeRetryable(item.runtime)}>
                           <MenuV2.Item onSelect={() => api && request.mutate(() => api.startServer(key))}>
                             {language.t("wsl.server.retryStart")}