@@ -136,9 +131,6 @@ export function ServerConnectionList(props: {
emptyMessage={language.t("dialog.server.empty")}
items={props.domain.collection.items}
key={(x) => x.http.url}
- onSelect={(x) => {
- if (x && !settings.general.newLayoutDesigns()) void props.domain.selection.select(x)
- }}
divider={true}
>
{(i) => {
@@ -163,15 +155,6 @@ export function ServerConnectionList(props: {
showCredentials
/>
-
-
-
-
{
{ initialValue: {} },
)
const globalMcpNames = createMemo(() =>
- [...new Set([...Object.keys(serverSync().data.config.mcp ?? {}), ...Object.keys(serverMcp.latest)])].sort(),
+ [...new Set([...Object.keys(serverSync.data.config.mcp ?? {}), ...Object.keys(serverMcp.latest)])].sort(),
)
const projectMcpNames = createMemo(() => {
const shared = new Set(globalMcpNames())
@@ -102,7 +102,7 @@ export const ProjectSettingsExtensions: Component = () => {
})
const mcpEnabled = (name: string) => sync().data.mcp?.[name]?.status === "connected"
- const globalPlugins = createMemo(() => (serverSync().data.config.plugin ?? []).map(pluginName))
+ const globalPlugins = createMemo(() => (serverSync.data.config.plugin ?? []).map(pluginName))
const projectPlugins = createMemo(() => {
const shared = new Set(globalPlugins())
return (sync().data.config.plugin ?? []).map(pluginName).filter((name) => !shared.has(name))
diff --git a/packages/app/src/components/prompt-input.tsx b/packages/app/src/components/prompt-input.tsx
index 6c0045fcac7..731a5eba4ff 100644
--- a/packages/app/src/components/prompt-input.tsx
+++ b/packages/app/src/components/prompt-input.tsx
@@ -45,7 +45,6 @@ import { Select } from "@opencode-ai/ui/select"
import { useDialog } from "@opencode-ai/ui/context/dialog"
import { ModelSelectorPopover, ModelSelectorPopoverV2 } from "@/components/dialog-select-model"
import { DialogSelectModelUnpaid } from "@/components/dialog-select-model-unpaid"
-import { DialogSelectModelUnpaidV2 } from "@/components/dialog-select-model-unpaid-v2"
import { useCommand } from "@/context/command"
import { usePermission } from "@/context/permission"
import { useLanguage } from "@/context/language"
diff --git a/packages/app/src/components/prompt-input/submit.test.ts b/packages/app/src/components/prompt-input/submit.test.ts
index 9559dd83bb2..ab905c28c67 100644
--- a/packages/app/src/components/prompt-input/submit.test.ts
+++ b/packages/app/src/components/prompt-input/submit.test.ts
@@ -218,14 +218,6 @@ beforeAll(async () => {
usePrompt: () => prompt,
}))
- mock.module("@/context/layout", () => ({
- useLayout: () => ({
- handoff: {
- setTabs: () => undefined,
- },
- }),
- }))
-
mock.module("@/context/sdk", () => ({
useSDK: () => {
return () => ({
@@ -262,7 +254,7 @@ beforeAll(async () => {
}))
mock.module("@/context/server-sync", () => ({
- useServerSync: () => () => {
+ useServerSync: () => {
const server = activeServerSync
return {
session: {
diff --git a/packages/app/src/components/prompt-input/submit.ts b/packages/app/src/components/prompt-input/submit.ts
index 73c75b2abcb..da717534f21 100644
--- a/packages/app/src/components/prompt-input/submit.ts
+++ b/packages/app/src/components/prompt-input/submit.ts
@@ -8,7 +8,6 @@ import { batch, startTransition, type Accessor } from "solid-js"
import { useTabs } from "@/context/tabs"
import { useServerSync, type ServerSync } from "@/context/server-sync"
import { useLanguage } from "@/context/language"
-import { useLayout } from "@/context/layout"
import { useLocal, type ModelSelection } from "@/context/local"
import { usePermission } from "@/context/permission"
import { type ContextItem, type ImageAttachmentPart, type Prompt, type usePrompt } from "@/context/prompt"
@@ -232,7 +231,6 @@ export function createPromptSubmit(input: PromptSubmitInput) {
const local = useLocal()
const permission = usePermission()
const prompt = input.prompt
- const layout = useLayout()
const language = useLanguage()
const params = useParams()
const [search] = useSearchParams<{ draftId?: string }>()
@@ -250,7 +248,7 @@ export function createPromptSubmit(input: PromptSubmitInput) {
const abort = async () => {
const sessionID = params.id
if (!sessionID) return Promise.resolve()
- serverSync().session.set("todo", sessionID, [])
+ serverSync.session.set("todo", sessionID, [])
input.onAbort?.()
@@ -330,7 +328,7 @@ export function createPromptSubmit(input: PromptSubmitInput) {
const submissionSDK = sdk()
const submissionSync = sync()
- const submissionServerSync = serverSync()
+ const submissionServerSync = serverSync
const submissionScope = submissionSDK.scope
const projectDirectory = submissionSDK.directory
const sessionID = params.id
@@ -340,10 +338,9 @@ export function createPromptSubmit(input: PromptSubmitInput) {
const draftServer = draftID ? tabs.draft(draftID).server : undefined
const capturePrompt = prompt.capture
const localSession = local.session
- const handoff = layout.handoff
const resetWorktree = input.onNewSessionWorktreeReset
const onSubmit = input.onSubmit
- const permissionState = permission.currentServerState()
+ const permissionState = permission
const shouldAutoAccept = isNewSession && input.autoAccept()
const worktreeSelection = input.newSessionWorktree?.() || "main"
const submissionKey = ScopedKey.from(
@@ -418,7 +415,6 @@ export function createPromptSubmit(input: PromptSubmitInput) {
model: { providerID: currentModel.provider.id, modelID: currentModel.id },
variant: variant ?? null,
})
- handoff.setTabs(base64Encode(sessionDirectory), session.id)
if (draftID && draftServer) tabs.promoteDraft(draftID, { server: draftServer, sessionId: session.id })
else navigate(`/${base64Encode(sessionDirectory)}/session/${session.id}`)
submission.retarget(
diff --git a/packages/app/src/components/provider-connection-controller.ts b/packages/app/src/components/provider-connection-controller.ts
index a9136fa3c8b..271ea032097 100644
--- a/packages/app/src/components/provider-connection-controller.ts
+++ b/packages/app/src/components/provider-connection-controller.ts
@@ -27,8 +27,8 @@ export function createProviderConnectionController(options: {
const [integration] = createResource(
() => ({ provider: options.provider(), directory: options.directory() }),
(input) =>
- serverSDK()
- .api.integration.get({ integrationID: input.provider, location: location() })
+ serverSDK.api.integration
+ .get({ integrationID: input.provider, location: location() })
.then((result) => result.data),
)
const methods = createMemo(() => {
@@ -120,14 +120,14 @@ export function createProviderConnectionController(options: {
cancelPolling()
const directory = options.directory()
await queryClient
- .refetchQueries(serverSync().queryOptions.providers(directory ? pathKey(directory) : null))
+ .refetchQueries(serverSync.queryOptions.providers(directory ? pathKey(directory) : null))
.catch(() => undefined)
if (polling.disposed) return
options.onComplete()
}
const poll = async (authorization: Authorization, generation: number) => {
- const result = await serverSDK()
- .api.integration.oauth.status({
+ const result = await serverSDK.api.integration.oauth
+ .status({
integrationID: options.provider(),
attemptID: authorization.attemptID,
location: location(),
@@ -175,8 +175,8 @@ export function createProviderConnectionController(options: {
return
}
dispatch({ type: "auth.pending" })
- const result = await serverSDK()
- .api.integration.oauth.connect({
+ const result = await serverSDK.api.integration.oauth
+ .connect({
integrationID: options.provider(),
methodID: selected.id,
...(answer ? { answer } : {}),
@@ -197,7 +197,7 @@ export function createProviderConnectionController(options: {
dispatch({ type: "method.reset" })
}
const connectKey = async (key: string) => {
- await serverSDK().api.integration.connect.key({
+ await serverSDK.api.integration.connect.key({
integrationID: options.provider(),
location: location(),
key,
@@ -208,8 +208,8 @@ export function createProviderConnectionController(options: {
const completeCode = async (code: string) => {
const authorization = store.authorization
if (!authorization) return language.t("provider.connect.oauth.code.invalid")
- const result = await serverSDK()
- .api.integration.oauth.complete({
+ const result = await serverSDK.api.integration.oauth
+ .complete({
integrationID: options.provider(),
attemptID: authorization.attemptID,
location: location(),
diff --git a/packages/app/src/components/server/server-management-controller.ts b/packages/app/src/components/server/server-management-controller.ts
index 09d7afde573..44acf356322 100644
--- a/packages/app/src/components/server/server-management-controller.ts
+++ b/packages/app/src/components/server/server-management-controller.ts
@@ -3,7 +3,7 @@ import { createMemo, createResource } from "solid-js"
import { useGlobal } from "@/context/global"
import { useLanguage } from "@/context/language"
import { usePlatform } from "@/context/platform"
-import { ServerConnection, useServer } from "@/context/server"
+import { ServerConnection, useServers } from "@/context/servers"
import { useSettings } from "@/context/settings"
import { useTabs } from "@/context/tabs"
import { type ServerHealth } from "@/utils/server-health"
@@ -49,7 +49,7 @@ function useDefaultServer() {
}
export function useServerActionsController() {
- const server = useServer()
+ const server = useServers()
const tabs = useTabs()
const platform = usePlatform()
const language = useLanguage()
@@ -72,28 +72,16 @@ export function useServerActionsController() {
export type ServerActionsController = ReturnType
export function useServerCollectionController() {
- const server = useServer()
+ const server = useServers()
const global = useGlobal()
const settings = useSettings()
const actions = useServerActionsController()
- const items = createMemo(() => {
- const current = server.current
- const list = server.list
- if (!current) return list
- if (!list.includes(current)) return [current, ...list]
- return [current, ...list.filter((item) => item !== current)]
- })
- const current = createMemo(() =>
- settings.general.newLayoutDesigns()
- ? undefined
- : (items().find((item) => ServerConnection.key(item) === server.key) ?? items()[0]),
- )
+ const items = createMemo(() => server.list)
const sorted = createMemo(() => {
const raw = items()
const list = raw
if (!list.length) return list
- const active = current()
const order = new Map(list.map((item, index) => [item, index] as const))
const rank = (value?: ServerHealth) => {
if (value?.healthy === true) return 0
@@ -101,8 +89,6 @@ export function useServerCollectionController() {
return 1
}
return list.slice().sort((a, b) => {
- if (a === active) return -1
- if (b === active) return 1
const diff =
rank(global.servers.health[ServerConnection.key(a)]) - rank(global.servers.health[ServerConnection.key(b)])
if (diff !== 0) return diff
@@ -113,7 +99,6 @@ export function useServerCollectionController() {
return {
collection: {
items: sorted,
- current,
health: () => global.servers.health,
},
...actions,
@@ -121,21 +106,3 @@ export function useServerCollectionController() {
}
export type ServerCollectionController = ReturnType
-
-export function useServerDomainController(options: { onSelect?: () => void } = {}) {
- const navigate = useNavigate()
- const server = useServer()
- const global = useGlobal()
- const collection = useServerCollectionController()
-
- const select = async (connection: ServerConnection.Any) => {
- if (global.servers.health[ServerConnection.key(connection)]?.healthy === false) return
- options.onSelect?.()
- navigate("/")
- queueMicrotask(() => server.setActive(ServerConnection.key(connection)))
- }
-
- return { ...collection, selection: { select } }
-}
-
-export type ServerDomainController = ReturnType
diff --git a/packages/app/src/components/server/server-management.test.ts b/packages/app/src/components/server/server-management.test.ts
index a26489756b3..e3d52f0f278 100644
--- a/packages/app/src/components/server/server-management.test.ts
+++ b/packages/app/src/components/server/server-management.test.ts
@@ -1,5 +1,5 @@
import { describe, expect, test } from "bun:test"
-import { ServerConnection } from "@/context/server"
+import { ServerConnection } from "@/context/servers"
import { createServerHealthPreview, replaceServerConnection, type ServerFormValues } from "./server-management"
function deferred() {
@@ -65,20 +65,17 @@ describe("replaceServerConnection", () => {
const calls: string[] = []
replaceServerConnection(ServerConnection.key(original), next, {
- active: () => ServerConnection.key(original),
removeTabs: (key) => calls.push(`tabs:${key}`),
add: (server) => {
calls.push(`add:${ServerConnection.key(server)}`)
return server
},
- setActive: (key) => calls.push(`active:${key}`),
remove: (key) => calls.push(`remove:${key}`),
})
expect(calls).toEqual([
"tabs:https://old.example.com",
"add:https://new.example.com",
- "active:https://new.example.com",
"remove:https://old.example.com",
])
})
@@ -87,10 +84,8 @@ describe("replaceServerConnection", () => {
const removed: ServerConnection.Key[] = []
replaceServerConnection(ServerConnection.key(original), next, {
- active: () => ServerConnection.key(original),
removeTabs: () => {},
add: () => undefined,
- setActive: () => {},
remove: (key) => removed.push(key),
})
diff --git a/packages/app/src/components/server/server-management.ts b/packages/app/src/components/server/server-management.ts
index 1d343efda13..5b228339c91 100644
--- a/packages/app/src/components/server/server-management.ts
+++ b/packages/app/src/components/server/server-management.ts
@@ -1,4 +1,4 @@
-import { normalizeServerUrl, ServerConnection } from "@/context/server"
+import { normalizeServerUrl, ServerConnection } from "@/context/servers"
import type { ServerHealth } from "@/utils/server-health"
export type ServerFormValues = {
@@ -42,18 +42,13 @@ export function replaceServerConnection(
originalKey: ServerConnection.Key,
next: ServerConnection.Http,
operations: {
- active: () => ServerConnection.Key | undefined
removeTabs: (key: ServerConnection.Key) => void
add: (server: ServerConnection.Http) => ServerConnection.Any | undefined
- setActive: (key: ServerConnection.Key) => void
remove: (key: ServerConnection.Key) => void
},
) {
- const active = operations.active()
operations.removeTabs(originalKey)
const added = operations.add(next)
if (!added) return
- const nextActive = active === originalKey ? ServerConnection.key(added) : active
- if (nextActive) operations.setActive(nextActive)
operations.remove(originalKey)
}
diff --git a/packages/app/src/components/server/server-row-menu.tsx b/packages/app/src/components/server/server-row-menu.tsx
index 619c8a50be5..bf4eb2a7fc9 100644
--- a/packages/app/src/components/server/server-row-menu.tsx
+++ b/packages/app/src/components/server/server-row-menu.tsx
@@ -4,7 +4,7 @@ import { MenuV2 } from "@opencode-ai/ui/v2/menu-v2"
import { type Component, Show } from "solid-js"
import type { ServerActionsController } from "@/components/server/server-management-controller"
import { useLanguage } from "@/context/language"
-import { ServerConnection } from "@/context/server"
+import { ServerConnection } from "@/context/servers"
export const ServerRowMenu: Component<{
server: ServerConnection.Any
diff --git a/packages/app/src/components/server/server-row.tsx b/packages/app/src/components/server/server-row.tsx
index 0c98bc9c18c..8bcf4db51ff 100644
--- a/packages/app/src/components/server/server-row.tsx
+++ b/packages/app/src/components/server/server-row.tsx
@@ -11,7 +11,7 @@ import {
Show,
} from "solid-js"
import { useLanguage } from "@/context/language"
-import { type ServerConnection, serverName } from "@/context/server"
+import { type ServerConnection, serverName } from "@/context/servers"
import type { ServerHealth } from "@/utils/server-health"
interface ServerRowProps extends ParentProps {
diff --git a/packages/app/src/components/session-context-usage.tsx b/packages/app/src/components/session-context-usage.tsx
index c1e0ccde059..0fd47c694c8 100644
--- a/packages/app/src/components/session-context-usage.tsx
+++ b/packages/app/src/components/session-context-usage.tsx
@@ -39,8 +39,7 @@ function openSessionContext(args: {
}) {
args.view.reviewPanel.open(args.view.reviewPanel.opened() ? "other" : "context-button")
if (args.layout.fileTree.opened() && args.layout.fileTree.tab() !== "all") args.layout.fileTree.setTab("all")
- void args.tabs.open("context")
- args.tabs.setActive("context")
+ void args.tabs.open("context").then(() => args.tabs.setActive("context"))
}
export function SessionContextUsage(props: SessionContextUsageProps) {
diff --git a/packages/app/src/components/session-workspace-menu.tsx b/packages/app/src/components/session-workspace-menu.tsx
index 93693746552..f133107e3b9 100644
--- a/packages/app/src/components/session-workspace-menu.tsx
+++ b/packages/app/src/components/session-workspace-menu.tsx
@@ -30,14 +30,14 @@ export function SessionWorkspaceMenu(props: {
const openWorkspaces = useSettingsDialog("workspaces")
const [store, setStore] = createStore({ selected: undefined as string | undefined })
const [directories, setDirectories] = createSignal(workspaceDirectories(props.project))
- const blocked = () => props.eligible === false || serverSync().session.data.session_working(props.sessionID)
+ const blocked = () => props.eligible === false || serverSync.session.data.session_working(props.sessionID)
const currentWorkspace = () => directories().find((workspace) => containsDirectory(workspace, props.directory))
const workspaces = () =>
directories().filter((workspace) => pathKey(workspace) !== pathKey(currentWorkspace() ?? props.directory))
const onOpenChange = (open: boolean) => {
props.onOpenChange?.(open)
if (!open) return
- const sdk = serverSDK()
+ const sdk = serverSDK
void sdk.api.worktree
.refresh({ projectID: props.project.id })
.then(() => sdk.api.worktree.list({ projectID: props.project.id }))
@@ -50,7 +50,7 @@ export function SessionWorkspaceMenu(props: {
}
const move = async (selection: "create" | string) => {
if (store.selected || blocked()) return
- const sdk = serverSDK()
+ const sdk = serverSDK
const sessionID = props.sessionID
setStore("selected", selection)
@@ -125,7 +125,7 @@ export function SessionWorkspaceMenu(props: {
)
}
-async function createWorkspace(project: Project, serverSDK: ReturnType>) {
+async function createWorkspace(project: Project, serverSDK: ReturnType) {
const created = await serverSDK.api.worktree.create({
projectID: project.id,
strategy: "git",
diff --git a/packages/app/src/components/session/open-in-app.tsx b/packages/app/src/components/session/open-in-app.tsx
index cd363d00c49..a8bc9b936c9 100644
--- a/packages/app/src/components/session/open-in-app.tsx
+++ b/packages/app/src/components/session/open-in-app.tsx
@@ -2,9 +2,9 @@ import { createEffect, createMemo } from "solid-js"
import { createStore } from "solid-js/store"
import { useLanguage } from "@/context/language"
import { usePlatform } from "@/context/platform"
-import { useServer } from "@/context/server"
import { Persist, persisted } from "@/utils/persist"
import { showToast } from "@/utils/toast"
+import { useServer } from "@/context/server"
export const OPEN_APPS = [
"vscode",
@@ -169,7 +169,7 @@ export function useOpenInApp(input: { directory: () => string }) {
app: undefined as OpenApp | undefined,
})
- const canOpen = createMemo(() => platform.platform === "desktop" && !!platform.openPath && server.isLocal())
+ const canOpen = createMemo(() => platform.platform === "desktop" && !!platform.openPath && server.isLocal)
const current = createMemo(
() =>
options().find((o) => o.id === prefs.app) ??
diff --git a/packages/app/src/components/session/session-header.tsx b/packages/app/src/components/session/session-header.tsx
index dc6cdaa6f3f..2719f4c9faa 100644
--- a/packages/app/src/components/session/session-header.tsx
+++ b/packages/app/src/components/session/session-header.tsx
@@ -1,32 +1,12 @@
-import { AppIcon } from "@opencode-ai/ui/app-icon"
-import { Button } from "@opencode-ai/ui/button"
-import { DropdownMenu } from "@opencode-ai/ui/dropdown-menu"
-import { Icon } from "@opencode-ai/ui/icon"
-import { IconButton } from "@opencode-ai/ui/icon-button"
-import { Keybind } from "@opencode-ai/ui/keybind"
-import { Spinner } from "@opencode-ai/ui/spinner"
-import { showToast } from "@/utils/toast"
-import { Tooltip, TooltipKeybind } from "@opencode-ai/ui/tooltip"
-import { getFilename } from "@opencode-ai/core/util/path"
-import { createEffect, createMemo, createSignal, For, onMount, Show } from "solid-js"
-import { createStore } from "solid-js/store"
+import { Tooltip } from "@opencode-ai/ui/tooltip"
+import { createMemo, Show } from "solid-js"
import { createMediaQuery } from "@solid-primitives/media"
import { Portal } from "solid-js/web"
import { useCommand } from "@/context/command"
import { useLanguage } from "@/context/language"
-import { useLayout } from "@/context/layout"
-import { usePlatform } from "@/context/platform"
-import { useServer } from "@/context/server"
import { useSettings } from "@/context/settings"
-import { useSync } from "@/context/sync"
-import { useTerminal } from "@/context/terminal"
-import { focusTerminalById } from "@/pages/session/helpers"
import { useSessionLayout } from "@/pages/session/session-layout"
-import { messageAgentColor } from "@/utils/agent"
-import { decode64 } from "@/utils/base64"
-import { fileManagerApp } from "@/utils/file-manager"
-import { Persist, persisted } from "@/utils/persist"
-import { StatusPopover, StatusPopoverV2 } from "../status-popover"
+import { StatusPopoverV2 } from "../status-popover"
import { IconButtonV2 } from "@opencode-ai/ui/v2/icon-button-v2"
import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon"
import { KeybindV2 } from "@opencode-ai/ui/v2/keybind-v2"
@@ -34,206 +14,15 @@ import { TooltipV2 } from "@opencode-ai/ui/v2/tooltip-v2"
import { reviewTooltipKeybind } from "../command-tooltip-keybind"
import { useTitlebarRightMount } from "../titlebar"
-const OPEN_APPS = [
- "vscode",
- "cursor",
- "zed",
- "textmate",
- "antigravity",
- "finder",
- "terminal",
- "iterm2",
- "ghostty",
- "warp",
- "xcode",
- "android-studio",
- "powershell",
- "sublime-text",
-] as const
-
-type OpenApp = (typeof OPEN_APPS)[number]
-type OS = "macos" | "windows" | "linux" | "unknown"
-
-const MAC_APPS = [
- {
- id: "vscode",
- label: "session.header.open.app.vscode",
- icon: "vscode",
- openWith: "Visual Studio Code",
- },
- { id: "cursor", label: "session.header.open.app.cursor", icon: "cursor", openWith: "Cursor" },
- { id: "zed", label: "session.header.open.app.zed", icon: "zed", openWith: "Zed" },
- { id: "textmate", label: "session.header.open.app.textmate", icon: "textmate", openWith: "TextMate" },
- {
- id: "antigravity",
- label: "session.header.open.app.antigravity",
- icon: "antigravity",
- openWith: "Antigravity",
- },
- { id: "terminal", label: "session.header.open.app.terminal", icon: "terminal", openWith: "Terminal" },
- { id: "iterm2", label: "session.header.open.app.iterm2", icon: "iterm2", openWith: "iTerm" },
- { id: "ghostty", label: "session.header.open.app.ghostty", icon: "ghostty", openWith: "Ghostty" },
- { id: "warp", label: "session.header.open.app.warp", icon: "warp", openWith: "Warp" },
- { id: "xcode", label: "session.header.open.app.xcode", icon: "xcode", openWith: "Xcode" },
- {
- id: "android-studio",
- label: "session.header.open.app.androidStudio",
- icon: "android-studio",
- openWith: "Android Studio",
- },
- {
- id: "sublime-text",
- label: "session.header.open.app.sublimeText",
- icon: "sublime-text",
- openWith: "Sublime Text",
- },
-] as const
-
-const WINDOWS_APPS = [
- { id: "vscode", label: "session.header.open.app.vscode", icon: "vscode", openWith: "code" },
- { id: "cursor", label: "session.header.open.app.cursor", icon: "cursor", openWith: "cursor" },
- { id: "zed", label: "session.header.open.app.zed", icon: "zed", openWith: "zed" },
- {
- id: "powershell",
- label: "session.header.open.app.powershell",
- icon: "powershell",
- openWith: "powershell",
- },
- {
- id: "sublime-text",
- label: "session.header.open.app.sublimeText",
- icon: "sublime-text",
- openWith: "Sublime Text",
- },
-] as const
-
-const LINUX_APPS = [
- { id: "vscode", label: "session.header.open.app.vscode", icon: "vscode", openWith: "code" },
- { id: "cursor", label: "session.header.open.app.cursor", icon: "cursor", openWith: "cursor" },
- { id: "zed", label: "session.header.open.app.zed", icon: "zed", openWith: "zed" },
- {
- id: "sublime-text",
- label: "session.header.open.app.sublimeText",
- icon: "sublime-text",
- openWith: "Sublime Text",
- },
-] as const
-
-const detectOS = (platform: ReturnType): OS => {
- if (platform.platform === "desktop" && platform.os) return platform.os
- if (typeof navigator !== "object") return "unknown"
- const value = navigator.platform || navigator.userAgent
- if (/Mac/i.test(value)) return "macos"
- if (/Win/i.test(value)) return "windows"
- if (/Linux/i.test(value)) return "linux"
- return "unknown"
-}
-
-const showRequestError = (language: ReturnType, err: unknown) => {
- showToast({
- variant: "error",
- title: language.t("common.requestFailed"),
- description: err instanceof Error ? err.message : String(err),
- })
-}
-
export function SessionHeader() {
- const layout = useLayout()
const command = useCommand()
- const server = useServer()
- const platform = usePlatform()
const language = useLanguage()
const settings = useSettings()
- const sync = useSync()
- const terminal = useTerminal()
- const { params, view } = useSessionLayout()
+ const { view } = useSessionLayout()
- const projectDirectory = createMemo(() => decode64(params.dir) ?? "")
- const project = createMemo(() => {
- const directory = projectDirectory()
- if (!directory) return
- return layout.projects.list().find((p) => p.worktree === directory || p.sandboxes?.includes(directory))
- })
- const name = createMemo(() => {
- const current = project()
- if (current) return current.name || getFilename(current.worktree)
- return getFilename(projectDirectory())
- })
- const hotkey = createMemo(() => command.keybind("file.open"))
- const os = createMemo(() => detectOS(platform))
- const isV2 = settings.general.newLayoutDesigns
- const search = settings.visibility.search
const status = settings.visibility.status
const isDesktop = createMediaQuery("(min-width: 768px)")
- const [exists, setExists] = createStore>>({
- finder: true,
- })
-
- const apps = createMemo(() => {
- if (os() === "macos") return MAC_APPS
- if (os() === "windows") return WINDOWS_APPS
- return LINUX_APPS
- })
-
- const fileManager = createMemo(() => fileManagerApp(os()))
-
- createEffect(() => {
- if (platform.platform !== "desktop") return
- if (!platform.checkAppExists) return
-
- const list = apps()
-
- setExists(Object.fromEntries(list.map((app) => [app.id, undefined])) as Partial>)
-
- void Promise.all(
- list.map((app) =>
- Promise.resolve(platform.checkAppExists?.(app.openWith))
- .then((value) => Boolean(value))
- .catch(() => false)
- .then((ok) => [app.id, ok] as const),
- ),
- ).then((entries) => {
- setExists(Object.fromEntries(entries) as Partial>)
- })
- })
-
- const options = createMemo(() => {
- return [
- { id: "finder", label: language.t(fileManager().label), icon: fileManager().icon },
- ...apps()
- .filter((app) => exists[app.id])
- .map((app) => ({ ...app, label: language.t(app.label) })),
- ] as const
- })
-
- const toggleTerminal = () => {
- const next = !view().terminal.opened()
- view().terminal.toggle()
- if (!next) return
-
- const id = terminal.active()
- if (!id) return
- focusTerminalById(id)
- }
-
- const [prefs, setPrefs] = persisted(Persist.global("open.app"), createStore({ app: "finder" as OpenApp }))
- const [menu, setMenu] = createStore({ open: false })
- const [openRequest, setOpenRequest] = createStore({
- app: undefined as OpenApp | undefined,
- })
-
- const canOpen = createMemo(() => platform.platform === "desktop" && !!platform.openPath && server.isLocal())
- const current = createMemo(
- () =>
- options().find((o) => o.id === prefs.app) ??
- options()[0] ??
- ({ id: "finder", label: fileManager().label, icon: fileManager().icon } as const),
- )
- const opening = createMemo(() => openRequest.app !== undefined)
- const tint = createMemo(() =>
- messageAgentColor(params.id ? sync().data.message[params.id] : undefined, sync().data.agent),
- )
const v2ActionsState = createMemo(() => ({
statusVisible: status(),
statusLabel: language.t("status.popover.trigger"),
@@ -244,275 +33,16 @@ export function SessionHeader() {
onReviewToggle: () => view().reviewPanel.toggle(),
}))
- const selectApp = (app: OpenApp) => {
- if (!options().some((item) => item.id === app)) return
- setPrefs("app", app)
- }
-
- const openDir = (app: OpenApp) => {
- if (opening() || !canOpen() || !platform.openPath) return
- const directory = projectDirectory()
- if (!directory) return
-
- const item = options().find((o) => o.id === app)
- const openWith = item && "openWith" in item ? item.openWith : undefined
- setOpenRequest("app", app)
- platform
- .openPath(directory, openWith)
- .catch((err: unknown) => showRequestError(language, err))
- .finally(() => {
- setOpenRequest("app", undefined)
- })
- }
-
- const copyPath = () => {
- const directory = projectDirectory()
- if (!directory) return
- navigator.clipboard
- .writeText(directory)
- .then(() => {
- showToast({
- variant: "success",
- icon: "circle-check",
- title: language.t("session.share.copy.copied"),
- description: directory,
- })
- })
- .catch((err: unknown) => showRequestError(language, err))
- }
-
- const [centerMount, setCenterMount] = createSignal(null)
const rightMount = useTitlebarRightMount()
- onMount(() => {
- setCenterMount(document.getElementById("opencode-titlebar-center"))
- })
return (
- <>
-
- {(mount) => (
-
-
-
- )}
-
-
- {(mount) => (
-
-
-
-
-
-
-
-
-
-
setMenu("open", open)}
- >
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/packages/app/src/components/settings-v2/models.tsx b/packages/app/src/components/settings-v2/models.tsx
index 738d282d72d..49b004fd1a7 100644
--- a/packages/app/src/components/settings-v2/models.tsx
+++ b/packages/app/src/components/settings-v2/models.tsx
@@ -25,7 +25,7 @@ export const SettingsModelsV2: Component = () => {
const models = useModels()
const serverSdk = useServerSDK()
const [store, setStore] = persisted(
- Persist.serverGlobal(serverSdk().scope, "settings-v2.models.providers"),
+ Persist.serverGlobal(serverSdk.scope, "settings-v2.models.providers"),
createStore({ collapsed: {} as Record
}),
)
diff --git a/packages/app/src/components/settings-v2/parts/server-select.tsx b/packages/app/src/components/settings-v2/parts/server-select.tsx
index 7d99dc26788..816fdbd45f0 100644
--- a/packages/app/src/components/settings-v2/parts/server-select.tsx
+++ b/packages/app/src/components/settings-v2/parts/server-select.tsx
@@ -1,7 +1,7 @@
import { Show, createMemo, type Component } from "solid-js"
import { SelectV2 } from "@opencode-ai/ui/v2/select-v2"
import { useGlobal } from "@/context/global"
-import { ServerConnection, serverName } from "@/context/server"
+import { ServerConnection, serverName } from "@/context/servers"
const allServers = { type: "all" } as const
type ServerOption = ServerConnection.Any | typeof allServers
diff --git a/packages/app/src/components/settings-v2/projects.tsx b/packages/app/src/components/settings-v2/projects.tsx
index 04afe99959a..1359378710d 100644
--- a/packages/app/src/components/settings-v2/projects.tsx
+++ b/packages/app/src/components/settings-v2/projects.tsx
@@ -6,7 +6,7 @@ import { useDialog } from "@opencode-ai/ui/context/dialog"
import { useLanguage } from "@/context/language"
import { useGlobal } from "@/context/global"
import { getProjectAvatarVariant } from "@/context/layout"
-import { ServerConnection, serverName } from "@/context/server"
+import { ServerConnection, serverName } from "@/context/servers"
import { displayName } from "@/pages/layout/helpers"
import { InlineServerSelect } from "./parts/server-select"
import { DialogEditProjectV2 } from "../dialog-edit-project-v2"
diff --git a/packages/app/src/components/settings-v2/providers.tsx b/packages/app/src/components/settings-v2/providers.tsx
index 0615000bcd8..6e02686ada4 100644
--- a/packages/app/src/components/settings-v2/providers.tsx
+++ b/packages/app/src/components/settings-v2/providers.tsx
@@ -97,7 +97,7 @@ export const SettingsProvidersV2: Component<{
const note = (id: string) => PROVIDER_NOTES.find((item) => item.match(id))?.key
const isConfigCustom = (providerID: string) => {
- const provider = serverSync().data.config.provider?.[providerID]
+ const provider = serverSync.data.config.provider?.[providerID]
if (!provider) return false
if (provider.npm !== "@ai-sdk/openai-compatible") return false
if (!provider.models || Object.keys(provider.models).length === 0) return false
@@ -106,13 +106,13 @@ export const SettingsProvidersV2: Component<{
const disconnect = async (providerID: string, name: string) => {
const location = props.directory ? { directory: props.directory } : undefined
- await serverSdk()
- .api.integration.get({ integrationID: providerID, location })
+ await serverSdk.api.integration
+ .get({ integrationID: providerID, location })
.then(async (integration) => {
const credentials = integration.data?.connections.filter((item) => item.type === "credential") ?? []
if (credentials.length === 0) throw new Error(`No removable credentials found for ${name}`)
await Promise.all(
- credentials.map((credential) => serverSdk().api.credential.remove({ credentialID: credential.id, location })),
+ credentials.map((credential) => serverSdk.api.credential.remove({ credentialID: credential.id, location })),
)
showToast({
variant: "success",
diff --git a/packages/app/src/components/settings-v2/servers.tsx b/packages/app/src/components/settings-v2/servers.tsx
index e30e9e99dbd..748c477f9ec 100644
--- a/packages/app/src/components/settings-v2/servers.tsx
+++ b/packages/app/src/components/settings-v2/servers.tsx
@@ -9,7 +9,7 @@ import { createStore } from "solid-js/store"
import { ServerRowMenu } from "@/components/server/server-row-menu"
import { ServerHealthIndicator } from "@/components/server/server-row"
import { useLanguage } from "@/context/language"
-import { ServerConnection, serverName } from "@/context/server"
+import { ServerConnection, serverName } from "@/context/servers"
import { useServerCollectionController } from "../server/server-management-controller"
import { DialogServerV2 } from "./dialog-server-v2"
import { SettingsListV2 } from "./parts/list"
diff --git a/packages/app/src/components/settings-v2/workspaces.tsx b/packages/app/src/components/settings-v2/workspaces.tsx
index c0baff78a4a..3b316bbe066 100644
--- a/packages/app/src/components/settings-v2/workspaces.tsx
+++ b/packages/app/src/components/settings-v2/workspaces.tsx
@@ -22,7 +22,7 @@ import { InlineServerSelect } from "./parts/server-select"
import { useTabs } from "@/context/tabs"
import { usePlatform } from "@/context/platform"
import { clearWorkspaceTerminals } from "@/context/terminal"
-import { ServerConnection } from "@/context/server"
+import { ServerConnection } from "@/context/servers"
import type { Project } from "@/types"
import {
containsDirectory,
@@ -56,9 +56,9 @@ export const SettingsWorkspacesV2: Component<{ activeDirectory?: string }> = (pr
transaction: undefined as "confirm" | "running" | undefined,
})
- const workspaces = createMemo(() => workspaceInventory(serverSync().data.project))
+ const workspaces = createMemo(() => workspaceInventory(serverSync.data.project))
const projects = createMemo(() =>
- serverSync().data.project.filter((project) => managedWorkspaceDirectories(project).length > 0),
+ serverSync.data.project.filter((project) => managedWorkspaceDirectories(project).length > 0),
)
const projectName = (project: Project) => project.name || getFilename(project.worktree)
const projectOptions = createMemo(() => [
@@ -70,8 +70,8 @@ export const SettingsWorkspacesV2: Component<{ activeDirectory?: string }> = (pr
)
const filtered = createMemo(() => filterWorkspaceInventory(workspaces(), selectedProject()))
const captureDeleteContext = () => {
- const sdk = serverSDK()
- return { sdk, sync: serverSync(), server: ServerConnection.key(sdk.server), activeDirectory: props.activeDirectory }
+ const sdk = serverSDK
+ return { sdk, sync: serverSync, server: ServerConnection.key(sdk.server), activeDirectory: props.activeDirectory }
}
const loadSessions = async (context = captureDeleteContext()) => {
const fetched = await listAllSessions(context.sdk.api.session, { order: "desc" })
@@ -81,7 +81,7 @@ export const SettingsWorkspacesV2: Component<{ activeDirectory?: string }> = (pr
)
}
const sessionQuery = useQuery(() => ({
- queryKey: [serverSDK().scope, null, "settings-workspace-sessions"] as const,
+ queryKey: [serverSDK.scope, null, "settings-workspace-sessions"] as const,
queryFn: () => loadSessions(),
refetchOnMount: "always",
}))
diff --git a/packages/app/src/components/status-popover-body.tsx b/packages/app/src/components/status-popover-body.tsx
index cfb1232c67e..427c86458d6 100644
--- a/packages/app/src/components/status-popover-body.tsx
+++ b/packages/app/src/components/status-popover-body.tsx
@@ -5,12 +5,13 @@ import { createEffect, createMemo, createResource, For, type JSXElement, onClean
import { createStore } from "solid-js/store"
import { useLanguage } from "@/context/language"
import { usePlatform } from "@/context/platform"
-import { ServerConnection, useServer } from "@/context/server"
+import { ServerConnection, useServers } from "@/context/servers"
import { useSync } from "@/context/sync"
import { type ServerHealth } from "@/utils/server-health"
import { useGlobal } from "@/context/global"
import { useMcpToggle } from "@/context/mcp"
import { useSDK } from "@/context/sdk"
+import { useServer } from "@/context/server"
const pluginEmptyMessage = (value: string, file: string): JSXElement => {
const parts = value.split(file)
@@ -103,9 +104,6 @@ type ServerStatusItem = {
export function StatusPopoverBody(props: { shown: boolean }) {
const sync = useSync()
const sdk = useSDK()
- const global = useGlobal()
- const server = useServer()
- const platform = usePlatform()
const language = useLanguage()
const fail = (err: unknown) => {
@@ -117,17 +115,10 @@ export function StatusPopoverBody(props: { shown: boolean }) {
}
let dialogRun = 0
- let dialogDead = false
onCleanup(() => {
- dialogDead = true
dialogRun += 1
})
- const sortedServers = createMemo(() => {
- const list = global.servers.list()
- return listServersByHealth(list, server.key, global.servers.health)
- })
const toggleMcp = useMcpToggle()
- const defaultServer = useDefaultServerKey(platform.getDefaultServer)
const mcpNames = createMemo(() => Object.keys(sync().data.mcp ?? {}).sort((a, b) => a.localeCompare(b)))
const mcpStatus = (name: string) => sync().data.mcp?.[name]?.status
const mcpConnected = createMemo(() => mcpNames().filter((name) => mcpStatus(name) === "connected").length)
diff --git a/packages/app/src/components/status-popover.tsx b/packages/app/src/components/status-popover.tsx
index 189be5ce2d5..9d4689515b4 100644
--- a/packages/app/src/components/status-popover.tsx
+++ b/packages/app/src/components/status-popover.tsx
@@ -5,7 +5,7 @@ import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon"
import { Popover } from "@opencode-ai/ui/popover"
import { Suspense, createMemo, createSignal, lazy, Show, type JSX } from "solid-js"
import { useLanguage } from "@/context/language"
-import { ServerConnection, useServer } from "@/context/server"
+import { ServerConnection, useServers } from "@/context/servers"
import { useServerSDK } from "@/context/server-sdk"
import { useSync } from "@/context/sync"
import { useGlobal } from "@/context/global"
@@ -14,6 +14,7 @@ import {
hasServiceNeedingAttention,
serverStatusDotClass,
} from "./status-popover-indicator"
+import { useServer } from "@/context/server"
const Body = lazy(() => import("./status-popover-body").then((x) => ({ default: x.StatusPopoverBody })))
@@ -82,16 +83,12 @@ export function StatusPopover() {
}
export function StatusPopoverV2() {
- return
-}
-
-function DirectoryStatusPopover() {
const language = useLanguage()
- const server = useServerSDK()
+ const server = useServer()
const global = useGlobal()
const sync = useSync()
const [shown, setShown] = createSignal(false)
- const serverHealth = () => global.servers.health[ServerConnection.key(server().server)]?.healthy
+ const serverHealth = () => global.servers.health[server.key]?.healthy
const ready = createMemo(() => serverHealth() === false || (sync().data.mcp_ready && sync().data.lsp_ready))
const attention = createMemo(() =>
hasServiceNeedingAttention({
diff --git a/packages/app/src/components/titlebar-session-events.test.ts b/packages/app/src/components/titlebar-session-events.test.ts
index d73abe944dc..18301a98360 100644
--- a/packages/app/src/components/titlebar-session-events.test.ts
+++ b/packages/app/src/components/titlebar-session-events.test.ts
@@ -1,5 +1,5 @@
import { describe, expect, test } from "bun:test"
-import type { ServerConnection } from "@/context/server"
+import type { ServerConnection } from "@/context/servers"
import { readSessionTabsRemovedDetail, SESSION_TABS_REMOVED_EVENT } from "./titlebar-session-events"
const remote = "remote" as ServerConnection.Key
diff --git a/packages/app/src/components/titlebar-session-events.ts b/packages/app/src/components/titlebar-session-events.ts
index 7d914d7c71b..2d5727e0ac6 100644
--- a/packages/app/src/components/titlebar-session-events.ts
+++ b/packages/app/src/components/titlebar-session-events.ts
@@ -1,9 +1,9 @@
-import type { ServerConnection } from "@/context/server"
+import { ServerConnection } from "@/context/servers"
export const SESSION_TABS_REMOVED_EVENT = "opencode:session-tabs-removed"
export type SessionTabsRemovedDetail = {
- server?: ServerConnection.Key
+ server: ServerConnection.Key
directory: string
sessionIDs: string[]
}
@@ -19,16 +19,15 @@ export function readSessionTabsRemovedDetail(event: Event): SessionTabsRemovedDe
if (!detail || typeof detail !== "object") return undefined
if (!("directory" in detail)) return undefined
if (!("sessionIDs" in detail)) return undefined
+ if (!("server" in detail) || typeof detail.server !== "string") return undefined
if (typeof detail.directory !== "string") return undefined
if (!Array.isArray(detail.sessionIDs)) return undefined
- if ("server" in detail && detail.server !== undefined && typeof detail.server !== "string") return undefined
const sessionIDs = detail.sessionIDs.filter((id): id is string => typeof id === "string")
if (sessionIDs.length === 0) return undefined
return {
- server:
- "server" in detail && typeof detail.server === "string" ? (detail.server as ServerConnection.Key) : undefined,
+ server: ServerConnection.Key.make(detail.server),
directory: detail.directory,
sessionIDs,
}
diff --git a/packages/app/src/components/titlebar-tab-nav.tsx b/packages/app/src/components/titlebar-tab-nav.tsx
index aec1b25c0f7..a64aec6687f 100644
--- a/packages/app/src/components/titlebar-tab-nav.tsx
+++ b/packages/app/src/components/titlebar-tab-nav.tsx
@@ -4,9 +4,9 @@ import { createResizeObserver } from "@solid-primitives/resize-observer"
import { createMutation } from "@tanstack/solid-query"
import { IconButtonV2 } from "@opencode-ai/ui/v2/icon-button-v2"
import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon"
-import { useGlobal } from "@/context/global"
+import { useGlobal, useServerCtx } from "@/context/global"
import { useLanguage } from "@/context/language"
-import { ServerConnection, serverName } from "@/context/server"
+import { ServerConnection, serverName, useServers } from "@/context/servers"
import { displayName, projectForSession } from "@/pages/layout/helpers"
import { SessionTabAvatar } from "@/pages/layout/session-tab-avatar"
import type { SessionInfo } from "@opencode-ai/client/promise"
@@ -46,11 +46,8 @@ export function TabNavItem(props: {
event.stopPropagation()
props.onClose()
}
- const global = useGlobal()
- const serverCtx = createMemo(() => {
- const conn = global.servers.list().find((item) => ServerConnection.key(item) === props.server)
- if (conn) return global.ensureServerCtx(conn)
- })
+ const servers = useServers()
+ const serverCtx = useServerCtx(() => servers.list.find((item) => ServerConnection.key(item) === props.server))
const project = createMemo(() => {
const session = props.session
if (!session) return
@@ -74,8 +71,8 @@ export function TabNavItem(props: {
})
// Only label the server when multiple servers are connected.
const serverLabel = createMemo(() => {
- if (global.servers.list().length <= 1) return
- const conn = global.servers.list().find((item) => ServerConnection.key(item) === props.server)
+ if (servers.list.length <= 1) return
+ const conn = servers.list.find((item) => ServerConnection.key(item) === props.server)
return conn ? serverName(conn) : undefined
})
diff --git a/packages/app/src/components/titlebar-tab-strip.tsx b/packages/app/src/components/titlebar-tab-strip.tsx
index 9f395bb123b..845290a44f3 100644
--- a/packages/app/src/components/titlebar-tab-strip.tsx
+++ b/packages/app/src/components/titlebar-tab-strip.tsx
@@ -8,9 +8,9 @@ import { RestrictToHorizontalAxis } from "@dnd-kit/abstract/modifiers"
import { RestrictToElement } from "@dnd-kit/dom/modifiers"
import { arrayMove } from "@dnd-kit/helpers"
import { tabHref, tabKey, type SessionTab, type Tab } from "@/context/tabs"
-import { ServerConnection } from "@/context/server"
+import { ServerConnection } from "@/context/servers"
import { DraftTabItem, TabNavItem } from "@/components/titlebar-tab-nav"
-import { useGlobal, type ServerCtx } from "@/context/global"
+import { useGlobal, useServerCtx, type ServerCtx } from "@/context/global"
import { useLanguage } from "@/context/language"
import { useCommand } from "@/context/command"
import { useTabs } from "@/context/tabs"
@@ -339,10 +339,9 @@ export function TitlebarTabStrip(props: {
let ref!: HTMLDivElement
const visibleIndex = () => visibleTabs().findIndex((item) => tabKey(item) === id)
useTabShortcut(visibleIndex, () => props.onNavigate(tab, ref))
- const serverCtx = createMemo(() => {
+ const serverCtx = useServerCtx(() => {
if (tab.type !== "session") return
- const conn = global.servers.list().find((item) => ServerConnection.key(item) === tab.server)
- if (conn) return global.ensureServerCtx(conn)
+ return global.servers.list().find((item) => ServerConnection.key(item) === tab.server)
})
if (tab.type === "session") {
diff --git a/packages/app/src/components/titlebar.tsx b/packages/app/src/components/titlebar.tsx
index 7b0a1ae93b7..831e45dbf81 100644
--- a/packages/app/src/components/titlebar.tsx
+++ b/packages/app/src/components/titlebar.tsx
@@ -32,8 +32,8 @@ import { TitlebarTabStrip } from "@/components/titlebar-tab-strip"
import { makeEventListener } from "@solid-primitives/event-listener"
import { createMediaQuery } from "@solid-primitives/media"
import { readSessionTabsRemovedDetail, SESSION_TABS_REMOVED_EVENT } from "@/components/titlebar-session-events"
-import { useGlobal } from "@/context/global"
-import { ServerConnection, useServer } from "@/context/server"
+import { useGlobal, useServerCtx } from "@/context/global"
+import { ServerConnection, useServers } from "@/context/servers"
import { tabKey, useTabs } from "@/context/tabs"
import type { PromptSession } from "@/context/prompt"
import "./titlebar.css"
@@ -61,15 +61,13 @@ export function useTitlebarRightMount() {
}
export function Titlebar(props: { update?: TitlebarUpdate; debugTools?: { visible: boolean; toggle: () => void } }) {
- const layout = useLayout()
const platform = usePlatform()
const command = useCommand()
const language = useLanguage()
const settings = useSettings()
- const server = useServer()
+ const servers = useServers()
const navigate = useNavigate()
const location = useLocation()
- const params = useParams()
const useV2Titlebar = createMemo(() => settings.general.newLayoutDesigns())
const mobile = createMediaQuery("(max-width: 767px)")
const bottom = createMemo(() => useV2Titlebar() && mobile() && settings.general.mobileTitlebarPosition() === "bottom")
@@ -77,11 +75,9 @@ export function Titlebar(props: { update?: TitlebarUpdate; debugTools?: { visibl
const mac = createMemo(() => platform.platform === "desktop" && platform.os === "macos")
const windows = createMemo(() => platform.platform === "desktop" && platform.os === "windows")
const linux = createMemo(() => platform.platform === "desktop" && platform.os === "linux")
- const web = createMemo(() => platform.platform === "web")
const macTrafficLights = createMemo(() => mac() && !platform.windowFullscreen?.())
const zoom = () => platform.webviewZoom?.() ?? 1
const titlebarZoom = () => (windows() ? Math.max(zoom(), minTitlebarZoom) : zoom())
- const counterZoom = () => (windows() && titlebarZoom() < 1 ? 1 / titlebarZoom() : 1)
const minHeight = () => {
const height = useV2Titlebar() ? v2TitlebarHeight : legacyTitlebarHeight
if (mac()) return `${height / zoom()}px`
@@ -97,14 +93,6 @@ export function Titlebar(props: { update?: TitlebarUpdate; debugTools?: { visibl
})
const path = () => `${location.pathname}${location.search}${location.hash}`
- const creating = createMemo(() => {
- const route = layout.route()
- if (route.type === "draft" || route.type === "dir-new-sesssion") return true
- if (!params.dir) return false
- if (params.id) return false
- const parts = location.pathname.replace(/\/+$/, "").split("/")
- return parts.at(-1) === "session"
- })
createEffect(() => {
const current = path()
@@ -116,10 +104,6 @@ export function Titlebar(props: { update?: TitlebarUpdate; debugTools?: { visibl
})
})
- const canBack = createMemo(() => history.index > 0)
- const canForward = createMemo(() => history.index < history.stack.length - 1)
- const hasProjects = createMemo(() => layout.projects.list().length > 0)
- const nav = createMemo(() => (useV2Titlebar() ? settings.general.showNavigation() : true))
const updateState = createMemo(() => {
const installing = props.update?.installing ?? false
const version = props.update?.version
@@ -188,7 +172,7 @@ export function Titlebar(props: { update?: TitlebarUpdate; debugTools?: { visibl
data-tauri-drag-region
>
-
+
{(_) => {
const layout = useLayout()
const global = useGlobal()
@@ -200,9 +184,7 @@ export function Titlebar(props: { update?: TitlebarUpdate; debugTools?: { visibl
() => {
const route = layout.route()
if (route.type !== "session") return undefined
- const conn = global.servers
- .list()
- .find((item) => ServerConnection.key(item) === (route.server ?? server.key))
+ const conn = global.servers.list().find((item) => ServerConnection.key(item) === route.server)
return conn ? { route, sdk: global.ensureServerCtx(conn).sdk } : undefined
},
({ route, sdk }) => sdk.api.session.get({ sessionID: route.sessionId }).catch(() => {}),
@@ -245,7 +227,7 @@ export function Titlebar(props: { update?: TitlebarUpdate; debugTools?: { visibl
const s = session()
if (!s) return
const sessionId = s.parentID ?? s.id
- const next = { server: route.server ?? server.key, sessionId }
+ const next = { server: route.server, sessionId }
tabsStoreActions.addSessionTab(next)
}
})
@@ -258,53 +240,43 @@ export function Titlebar(props: { update?: TitlebarUpdate; debugTools?: { visibl
const openNewTab = () => {
const route = layout.route()
- const activeSession = session()
- if (route.type === "session" && activeSession) {
- const sessionTab = {
- type: "session" as const,
- server: route.server ?? server.key,
- sessionId: activeSession.id,
- }
- const model = tabs.stateValue(sessionTab, "prompt")?.model.current()
- tabs.newDraft({ server: sessionTab.server, directory: activeSession.location.directory }, "", model)
- return
- }
+ switch (route.type) {
+ case "session": {
+ const activeSession = session()
+ if (!activeSession) return
- const activeTab = currentTab()
- if (activeTab?.type === "draft") {
- const model = tabs.stateValue(activeTab, "prompt")?.model.current()
- tabs.newDraft({ server: activeTab.server, directory: activeTab.directory }, "", model)
- return
- }
-
- if (route.type === "home") {
- const selection = layout.home.selection()
- const conn = global.servers.list().find((item) => ServerConnection.key(item) === selection.server)
- const project = conn
- ? global
- .ensureServerCtx(conn)
- .projects.list()
- .find((item) => item.worktree === selection.directory)
- : undefined
- if (conn && project) {
- tabs.newDraft({ server: ServerConnection.key(conn), directory: project.worktree }, "")
+ const sessionTab = {
+ type: "session" as const,
+ server: route.server,
+ sessionId: activeSession.id,
+ }
+ const model = tabs.stateValue(sessionTab, "prompt")?.model.current()
+ tabs.newDraft({ server: sessionTab.server, directory: activeSession.location.directory }, "", model)
return
}
+ case "draft": {
+ const activeTab = currentTab()
+ if (activeTab?.type !== "draft") return
+
+ const model = tabs.stateValue(activeTab, "prompt")?.model.current()
+ tabs.newDraft({ server: activeTab.server, directory: activeTab.directory }, "", model)
+ return
+ }
+ case "home": {
+ const selection = layout.home.selection()
+ const conn = global.servers.list().find((item) => ServerConnection.key(item) === selection.server)
+ const project = conn
+ ? global
+ .ensureServerCtx(conn)
+ .projects.list()
+ .find((item) => item.worktree === selection.directory)
+ : undefined
+ if (conn && project) {
+ tabs.newDraft({ server: ServerConnection.key(conn), directory: project.worktree }, "")
+ return
+ }
+ }
}
-
- const current = layout.projects.list()[0]
- if (current) {
- tabs.newDraft({ server: server.key, directory: current.worktree }, "")
- return
- }
-
- const fallback = global.servers.list().flatMap((conn) => {
- const project = global.ensureServerCtx(conn).projects.list()[0]
- return project ? [{ server: ServerConnection.key(conn), project }] : []
- })[0]
- if (!fallback) return
-
- tabs.newDraft({ server: fallback.server, directory: fallback.project.worktree }, "")
}
const toggleHome = () => tabs.toggleHome({ home: layout.route().type === "home", current: currentTab() })
@@ -430,158 +402,6 @@ export function Titlebar(props: { update?: TitlebarUpdate; debugTools?: { visibl
)
}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -404,49 +384,11 @@ export default function Page() {
const inputController = createPromptInputController({
sessionKey: controller.identity.sessionKey,
sessionID: () => controller.identity.params.id,
- queryOptions: serverSync().queryOptions,
+ queryOptions: serverSync.queryOptions,
})
- const workspaceTabs = createMemo(() => layout.tabs(controller.identity.workspaceKey))
const sessionPanelKey = createMemo(() =>
- controller.identity.params.id ? `${serverSDK().scope}\0${controller.identity.params.id}` : undefined,
- )
-
- createEffect(
- on(
- () => controller.identity.params.id,
- (id, prev) => {
- if (!id) return
- if (prev) return
-
- const pending = layout.handoff.tabs()
- if (!pending) return
- if (Date.now() - pending.at > 60_000) {
- layout.handoff.clearTabs()
- return
- }
- if (pending.scope !== serverSDK().scope) return
-
- if (pending.id !== id) return
- layout.handoff.clearTabs()
- if (pending.dir !== base64Encode(sdk().directory)) return
-
- const from = workspaceTabs().tabs()
- if (from.all.length === 0 && !from.active) return
-
- const current = controller.layout.tabs().tabs()
- if (current.all.length > 0 || current.active) return
-
- const all = controller.tabs.normalizeAll(from.all)
- const active = from.active ? controller.tabs.normalize(from.active) : undefined
- controller.layout.tabs().setAll(all)
- controller.layout.tabs().setActive(active && all.includes(active) ? active : all[0])
-
- workspaceTabs().setAll([])
- workspaceTabs().setActive(undefined)
- },
- { defer: true },
- ),
+ controller.identity.params.id ? `${serverSDK.scope}\0${controller.identity.params.id}` : undefined,
)
const size = createSizing()
@@ -580,7 +522,7 @@ export default function Page() {
})
const [followup, setFollowup] = persisted(
- Persist.serverWorkspace(serverSDK().scope, sdk().directory, "followup", ["followup.v1"]),
+ Persist.serverWorkspace(serverSDK.scope, sdk().directory, "followup", ["followup.v1"]),
createStore<{
items: Record
failed: Record
@@ -656,7 +598,7 @@ export default function Page() {
const vcsKey = createMemo(
() =>
[
- serverSDK().scope,
+ serverSDK.scope,
"session-vcs",
sdk().directory,
sync().data.vcs?.branch ?? "",
@@ -665,7 +607,7 @@ export default function Page() {
)
const vcsQuery = createQuery(() => {
const mode = vcsMode()
- const enabled = serverSDK().connection.status() === "connected" && wantsReview() && sync().project?.vcs === "git"
+ const enabled = serverSDK.connection.status() === "connected" && wantsReview() && sync().project?.vcs === "git"
return {
queryKey: [...vcsKey(), mode] as const,
@@ -681,9 +623,8 @@ export default function Page() {
}
})
const sessionDetailsQuery = createQuery(() => ({
- queryKey: [serverSDK().scope, "session-details", sessionDirectory()] as const,
- enabled:
- store.sessionDetailsOpen && serverSDK().connection.status() === "connected" && sync().project?.vcs === "git",
+ queryKey: [serverSDK.scope, "session-details", sessionDirectory()] as const,
+ enabled: store.sessionDetailsOpen && serverSDK.connection.status() === "connected" && sync().project?.vcs === "git",
queryFn: () =>
sdk()
.api.vcs.diff({ location: { directory: sessionDirectory() }, mode: "working" })
@@ -696,7 +637,7 @@ export default function Page() {
const sessionDetailsDiffs = () => (sessionDetailsQuery.isFetched ? (sessionDetailsQuery.data ?? []) : undefined)
const refreshVcs = debounce(() => {
void queryClient.invalidateQueries({ queryKey: vcsKey() })
- void queryClient.invalidateQueries({ queryKey: [serverSDK().scope, "session-details", sessionDirectory()] })
+ void queryClient.invalidateQueries({ queryKey: [serverSDK.scope, "session-details", sessionDirectory()] })
}, 100)
onCleanup(
sdk().event.listen((event) => {
@@ -746,7 +687,7 @@ export default function Page() {
const request = (scope: string, context?: number) =>
queryClient
.fetchQuery({
- queryKey: [...vcsKey(), mode, "directory", scope, context, version] as const,
+ queryKey: [serverSDK.scope, ...vcsKey(), mode, "directory", scope, context, version] as const,
staleTime: Number.POSITIVE_INFINITY,
retry: 2,
queryFn: () =>
@@ -841,11 +782,11 @@ export default function Page() {
}
function upsert(next: Project) {
- const list = serverSync().data.project
+ const list = serverSync.data.project
sync().set("project", next.id)
const idx = list.findIndex((item) => item.id === next.id)
if (idx >= 0) {
- serverSync().set(
+ serverSync.set(
"project",
list.map((item, i) => (i === idx ? { ...item, ...next } : item)),
)
@@ -853,10 +794,10 @@ export default function Page() {
}
const at = list.findIndex((item) => item.id > next.id)
if (at >= 0) {
- serverSync().set("project", [...list.slice(0, at), next, ...list.slice(at)])
+ serverSync.set("project", [...list.slice(0, at), next, ...list.slice(at)])
return
}
- serverSync().set("project", [...list, next])
+ serverSync.set("project", [...list, next])
}
const gitMutation = useMutation(() => ({
@@ -1736,7 +1677,7 @@ export default function Page() {
const ok = await sendFollowupDraft({
api: sdk().api.session,
sync: sync(),
- serverSync: serverSync(),
+ serverSync: serverSync,
session: () => sync().session.get(input.sessionID),
draft: item,
optimisticBusy: item.sessionDirectory === sdk().directory,
diff --git a/packages/app/src/pages/session/composer/session-composer-controls.ts b/packages/app/src/pages/session/composer/session-composer-controls.ts
index c46ef6ddf82..4d2476c5606 100644
--- a/packages/app/src/pages/session/composer/session-composer-controls.ts
+++ b/packages/app/src/pages/session/composer/session-composer-controls.ts
@@ -5,12 +5,12 @@ import { type Accessor, createMemo } from "solid-js"
import type { PromptInputControls } from "@/components/prompt-input/contracts"
import type { PromptProjectControls } from "@/components/prompt-project-selector"
import { useDirectoryPicker } from "@/components/directory-picker"
-import { useGlobal } from "@/context/global"
+import { useGlobal, useServerCtx } from "@/context/global"
import { useLayout } from "@/context/layout"
import { useLocal, type ModelSelection } from "@/context/local"
import type { QueryOptionsApi } from "@/context/server-sync"
import { useServerSDK } from "@/context/server-sdk"
-import { serverName, ServerConnection, useServer } from "@/context/server"
+import { serverName, ServerConnection, useServers } from "@/context/servers"
import { useSDK } from "@/context/sdk"
import { useSync } from "@/context/sync"
import { useTabs } from "@/context/tabs"
@@ -55,21 +55,18 @@ export function createPromptInputController(input: {
})
}
-export function createPromptProjectControls() {
- const navigate = useNavigate()
- const layout = useLayout()
- const server = useServer()
+export function createPromptProjectControls(props: { draftId: string }) {
+ const server = useServers()
const serverSDK = useServerSDK()
const sdk = useSDK()
const tabs = useTabs()
const global = useGlobal()
const pickDirectory = useDirectoryPicker()
- const [search] = useSearchParams<{ draftId?: string }>()
- const projectServer = () => serverSDK().server
- const projectServerCtx = createMemo(() => global.ensureServerCtx(projectServer()))
+ const projectServer = () => serverSDK.server
+ const projectServerCtx = useServerCtx(projectServer)
const projects = createMemo(() => {
if (server.list.length <= 1) {
- return search.draftId ? projectServerCtx().projects.list() : layout.projects.list()
+ return projectServerCtx().projects.list()
}
return server.list.flatMap((conn) => {
const item = { key: ServerConnection.key(conn), name: serverName(conn) }
@@ -81,28 +78,12 @@ export function createPromptProjectControls() {
})
const selectProject = (worktree: string, serverKey?: string) => {
const conn = serverKey ? server.list.find((conn) => ServerConnection.key(conn) === serverKey) : projectServer()
- if (search.draftId) {
- if (!conn) return
- const target = global.ensureServerCtx(conn)
- target.projects.open(worktree)
- target.projects.touch(worktree)
- tabs.updateDraft(search.draftId, { server: ServerConnection.key(conn), directory: worktree, worktree: undefined })
- return
- }
-
- if (!serverKey) {
- layout.projects.open(worktree)
- server.projects.touch(worktree)
- navigate(`/${base64Encode(worktree)}/session`)
- return
- }
-
if (!conn) return
+
const target = global.ensureServerCtx(conn)
target.projects.open(worktree)
target.projects.touch(worktree)
- server.setActive(ServerConnection.key(conn))
- navigate(`/${base64Encode(worktree)}/session`)
+ tabs.updateDraft(props.draftId, { server: ServerConnection.key(conn), directory: worktree, worktree: undefined })
}
const addProject = (title: string, serverKey?: string) => {
diff --git a/packages/app/src/pages/session/composer/session-composer-state.ts b/packages/app/src/pages/session/composer/session-composer-state.ts
index 44a707214ee..9baa69eddb4 100644
--- a/packages/app/src/pages/session/composer/session-composer-state.ts
+++ b/packages/app/src/pages/session/composer/session-composer-state.ts
@@ -37,10 +37,10 @@ export function createSessionComposerController(options?: { closeMs?: number | (
const queryClient = useQueryClient()
const language = useLanguage()
const permission = usePermission()
- const shellKey = () => [serverSDK().scope, sdk().directory, "shell"] as const
+ const shellKey = () => [serverSDK.scope, sdk().directory, "shell"] as const
const shells = createQuery(() => ({
queryKey: shellKey(),
- enabled: !!params.id && serverSDK().connection.status() === "connected",
+ enabled: !!params.id && serverSDK.connection.status() === "connected",
queryFn: () =>
sdk()
.api.shell.list({ location: { directory: sdk().directory } })
@@ -59,7 +59,7 @@ export function createSessionComposerController(options?: { closeMs?: number | (
)
const questionRequest = createMemo((): FormInfo | undefined => {
- return sessionQuestionForm(sync().data.session, serverSync().session.data.form, params.id)
+ return sessionQuestionForm(sync().data.session, serverSync.session.data.form, params.id)
})
const permissionRequest = createMemo((): PermissionRequest | undefined => {
@@ -77,7 +77,7 @@ export function createSessionComposerController(options?: { closeMs?: number | (
const todos = createMemo((): Todo[] => {
const id = params.id
if (!id) return []
- return serverSync().session.data.todo[id] ?? []
+ return serverSync.session.data.todo[id] ?? []
})
const done = createMemo(
@@ -87,13 +87,13 @@ export function createSessionComposerController(options?: { closeMs?: number | (
const live = createMemo(() => sync().data.session_working(params.id ?? "") || blocked())
const primary = () => {
const id = params.id
- return !!id && !serverSync().session.get(id)?.parentID
+ return !!id && !serverSync.session.get(id)?.parentID
}
const backgroundBlocking = createMemo(() => {
if (!primary()) return []
const id = params.id
if (!id) return []
- const assistant = (serverSync().session.data.session_message[id] ?? []).findLast(
+ const assistant = (serverSync.session.data.session_message[id] ?? []).findLast(
(message) => message.type === "assistant" && message.time.completed === undefined,
)
if (assistant?.type !== "assistant") return []
@@ -116,7 +116,7 @@ export function createSessionComposerController(options?: { closeMs?: number | (
const id = params.id
if (!id) return []
const blocking = backgroundBlocking()
- const messages = serverSync().session.data.session_message[id] ?? []
+ const messages = serverSync.session.data.session_message[id] ?? []
const completed = new Set(
messages.flatMap((message) => {
if (message.type !== "synthetic") return []
@@ -144,9 +144,9 @@ export function createSessionComposerController(options?: { closeMs?: number | (
]
})
})
- const active = Object.values(serverSync().session.data.info).flatMap((info) => {
+ const active = Object.values(serverSync.session.data.info).flatMap((info) => {
if (info?.parentID !== id) return []
- if ((serverSync().session.data.session_status[info.id]?.type ?? "idle") === "idle") return []
+ if ((serverSync.session.data.session_status[info.id]?.type ?? "idle") === "idle") return []
if (
blocking.some(
(item) => item.type === "subagent" && (item.id === info.id || (!!item.label && info.title === item.label)),
diff --git a/packages/app/src/pages/session/composer/session-question-dock.tsx b/packages/app/src/pages/session/composer/session-question-dock.tsx
index 61c6289a750..3b0dd8f5004 100644
--- a/packages/app/src/pages/session/composer/session-question-dock.tsx
+++ b/packages/app/src/pages/session/composer/session-question-dock.tsx
@@ -71,7 +71,7 @@ export const SessionQuestionDock: Component<{ request: FormInfo; onSubmit: () =>
const sdk = useSDK()
const serverSDK = useServerSDK()
const language = useLanguage()
- const cacheKey = ScopedKey.from(serverSDK().scope, props.request.id)
+ const cacheKey = ScopedKey.from(serverSDK.scope, props.request.id)
const questions = createMemo(() =>
props.request.fields.filter(questionField).map((field) => ({
diff --git a/packages/app/src/pages/session/session-layout.ts b/packages/app/src/pages/session/session-layout.ts
index 1adf6c1a967..199635735de 100644
--- a/packages/app/src/pages/session/session-layout.ts
+++ b/packages/app/src/pages/session/session-layout.ts
@@ -10,7 +10,7 @@ export const useSessionKey = () => {
const params = useParams()
const sdk = useSDK()
const serverSDK = useServerSDK()
- const scope = createMemo(() => serverSDK().scope)
+ const scope = createMemo(() => serverSDK.scope)
const directory = createMemo(() => base64Encode(sdk().directory))
const workspaceKey = createMemo(() => SessionStateKey.from(scope(), SessionRouteKey.fromRoute(directory())))
const sessionKey = createMemo(() => SessionStateKey.from(scope(), SessionRouteKey.fromRoute(directory(), params.id)))
diff --git a/packages/app/src/pages/session/timeline/controller.tsx b/packages/app/src/pages/session/timeline/controller.tsx
index ffa1d787b25..63f56040b63 100644
--- a/packages/app/src/pages/session/timeline/controller.tsx
+++ b/packages/app/src/pages/session/timeline/controller.tsx
@@ -21,6 +21,7 @@ import { downloadSessionExport, fetchSessionExport, sessionExportFilename } from
import { showToast } from "@/utils/toast"
import { timelineChildTitle, timelineRemovedSessionIDs } from "./controller-projection"
import { createTimelineProjection } from "./projection"
+import { useServer } from "@/context/server"
const emptyMessages: Message[] = []
const emptyParts: Part[] = []
@@ -46,6 +47,7 @@ export function createTimelineController(input: {
const navigate = useNavigate()
const sdk = useSDK()
const sync = useSync()
+ const server = useServer()
const settings = useSettings()
const tabs = useTabs()
const dialog = useDialog()
@@ -195,7 +197,7 @@ export function createTimelineController(input: {
void navigateAfterRemoval(id, session.parentID, next?.id)
sync().set(produce((draft) => void (draft.session = draft.session.filter((item) => !removed.has(item.id)))))
removed.forEach((sessionID) => sync().session.evict(sessionID))
- notifySessionTabsRemoved({ directory: sdk().directory, sessionIDs: [...removed] })
+ notifySessionTabsRemoved({ server: server.key, directory: sdk().directory, sessionIDs: [...removed] })
return true
}
diff --git a/packages/app/src/pages/session/timeline/message-timeline.tsx b/packages/app/src/pages/session/timeline/message-timeline.tsx
index 59d94be0d56..9a0a3f61d5c 100644
--- a/packages/app/src/pages/session/timeline/message-timeline.tsx
+++ b/packages/app/src/pages/session/timeline/message-timeline.tsx
@@ -1469,7 +1469,7 @@ function MessageTimelineView(
directory={sessionDirectory()}
local={!workspaceSession()}
branch={sync().data.vcs?.branch}
- baseBranch={serverSync().child(project().worktree)[0].vcs?.branch}
+ baseBranch={serverSync.child(project().worktree)[0].vcs?.branch}
diffs={sessionDiffs()}
sessionID={id}
moveEligible={props.workspaceMoveEligible}
diff --git a/packages/app/src/pages/session/timeline/model.ts b/packages/app/src/pages/session/timeline/model.ts
index e28d1345ada..8a905f8764a 100644
--- a/packages/app/src/pages/session/timeline/model.ts
+++ b/packages/app/src/pages/session/timeline/model.ts
@@ -24,7 +24,7 @@ export function createTimelineModel(input: { session: Pick sync().data.message[id] !== undefined)
- const stale = cached && !serverSync().session.fresh(id, sessionFreshness)
+ const stale = cached && !serverSync.session.fresh(id, sessionFreshness)
refreshFrame = requestAnimationFrame(() => {
refreshFrame = undefined
@@ -42,7 +42,7 @@ export function createTimelineModel(input: { session: Pick {
const id = input.session.identity.sessionID()
- return !id || isTimelineReady(sync().data.message[id], serverSync().session.history.loading(id))
+ return !id || isTimelineReady(sync().data.message[id], serverSync.session.history.loading(id))
})
const more = createMemo(() => {
const id = input.session.identity.sessionID()
diff --git a/packages/app/src/pages/session/v2/review-panel-v2-state.ts b/packages/app/src/pages/session/v2/review-panel-v2-state.ts
index 645055e107e..587b55c7089 100644
--- a/packages/app/src/pages/session/v2/review-panel-v2-state.ts
+++ b/packages/app/src/pages/session/v2/review-panel-v2-state.ts
@@ -6,9 +6,10 @@ import {
} from "@opencode-ai/session-ui/v2/session-review-v2"
import { createSignal } from "solid-js"
import { createStore } from "solid-js/store"
+import type { Platform } from "@/context/platform"
import { Persist, persisted } from "@/utils/persist"
-export function createReviewPanelV2State() {
+export function createReviewPanelV2State(platform?: Platform) {
const [store, setStore, , ready] = persisted(
Persist.global("review-panel-v2"),
createStore({
@@ -16,6 +17,7 @@ export function createReviewPanelV2State() {
sidebarWidth: SESSION_REVIEW_V2_SIDEBAR_WIDTH_DEFAULT,
expandMode: "collapse" as SessionReviewExpandMode,
}),
+ platform,
)
// The filter is transient by design: a persisted filter would silently hide
// files after a reload.
diff --git a/packages/app/src/pages/session/v2/session-file-browser-tab.tsx b/packages/app/src/pages/session/v2/session-file-browser-tab.tsx
index b5570283269..18ee78a13fd 100644
--- a/packages/app/src/pages/session/v2/session-file-browser-tab.tsx
+++ b/packages/app/src/pages/session/v2/session-file-browser-tab.tsx
@@ -14,6 +14,7 @@ import { useSessionLayout } from "@/pages/session/session-layout"
import { SessionFileView } from "@/pages/session/file-tabs"
import { applyFileListKeyDown, SessionFileListV2 } from "@/pages/session/v2/session-file-list-v2"
import { pathKey } from "@/utils/path-key"
+import { useServer } from "@/context/server"
const emptyFiles: string[] = []
@@ -39,6 +40,7 @@ export function SessionFileBrowserTab(props: {
const language = useLanguage()
const layout = useLayout()
const sdk = useSDK()
+ const server = useServer()
const serverSDK = useServerSDK()
const { workspaceKey } = useSessionLayout()
const resultsID = `session-file-browser-results-${createUniqueId()}`
@@ -49,8 +51,8 @@ export function SessionFileBrowserTab(props: {
const search = createQuery(() => {
const value = query()
return {
- queryKey: [serverSDK().scope, "session-open-file", workspaceKey(), value] as const,
- enabled: serverSDK().connection.status() === "connected" && value.length > 0,
+ queryKey: [serverSDK.scope, "session-open-file", workspaceKey(), value] as const,
+ enabled: serverSDK.connection.status() === "connected" && value.length > 0,
queryFn: ({ signal }) => file.searchFiles(value, { limit: 200, signal }),
}
})
@@ -65,10 +67,11 @@ export function SessionFileBrowserTab(props: {
if (explicit && values.includes(explicit)) return explicit
return values[0]
})
+
const loading = createMemo(() => query().length > 0 && search.isPending)
const project = createMemo(() => {
const directory = pathKey(sdk().directory)
- return layout.projects
+ return server.ctx.projects
.list()
.find(
(item) =>
diff --git a/packages/app/src/utils/server-health.test.ts b/packages/app/src/utils/server-health.test.ts
index 97d5559b726..2b6da620c54 100644
--- a/packages/app/src/utils/server-health.test.ts
+++ b/packages/app/src/utils/server-health.test.ts
@@ -1,5 +1,5 @@
import { describe, expect, test } from "bun:test"
-import type { ServerConnection } from "@/context/server"
+import type { ServerConnection } from "@/context/servers"
import { checkServerHealth } from "./server-health"
const server: ServerConnection.HttpBase = {
diff --git a/packages/app/src/utils/server-health.ts b/packages/app/src/utils/server-health.ts
index fdd0df08989..28e183c37cf 100644
--- a/packages/app/src/utils/server-health.ts
+++ b/packages/app/src/utils/server-health.ts
@@ -1,5 +1,5 @@
import { usePlatform } from "@/context/platform"
-import { ServerConnection } from "@/context/server"
+import { ServerConnection } from "@/context/servers"
import { authTokenFromCredentials } from "./server"
import { ClientError, OpenCode } from "@opencode-ai/client"
import { Accessor, createEffect, onCleanup } from "solid-js"
diff --git a/packages/app/src/utils/server-scope.ts b/packages/app/src/utils/server-scope.ts
index 9a4e941d389..07d8507ecfb 100644
--- a/packages/app/src/utils/server-scope.ts
+++ b/packages/app/src/utils/server-scope.ts
@@ -1,4 +1,4 @@
-import type { ServerConnection } from "@/context/server"
+import type { ServerConnection } from "@/context/servers"
export type ServerScope = string & { readonly __brand: "ServerScope" }
export type SessionRouteKey = string & { readonly __brand: "SessionRouteKey" }
diff --git a/packages/app/src/utils/server.ts b/packages/app/src/utils/server.ts
index 68f6bdca848..27006d151db 100644
--- a/packages/app/src/utils/server.ts
+++ b/packages/app/src/utils/server.ts
@@ -1,5 +1,5 @@
import { OpenCode, type OpenCodeClient } from "@opencode-ai/client/promise"
-import type { ServerConnection } from "@/context/server"
+import type { ServerConnection } from "@/context/servers"
import { decode64 } from "@/utils/base64"
export function authTokenFromCredentials(input: { username?: string; password: string }) {
diff --git a/packages/app/src/utils/session-route.test.ts b/packages/app/src/utils/session-route.test.ts
index 6a87e366cf8..576a27d9608 100644
--- a/packages/app/src/utils/session-route.test.ts
+++ b/packages/app/src/utils/session-route.test.ts
@@ -1,5 +1,5 @@
import { describe, expect, test } from "bun:test"
-import { ServerConnection } from "@/context/server"
+import { ServerConnection } from "@/context/servers"
import { legacySessionHref, legacySessionServer, requireServerKey, rootSession, sessionHref } from "./session-route"
describe("session routes", () => {
diff --git a/packages/app/src/utils/session-route.ts b/packages/app/src/utils/session-route.ts
index 4721611d2ea..12e1226f512 100644
--- a/packages/app/src/utils/session-route.ts
+++ b/packages/app/src/utils/session-route.ts
@@ -1,5 +1,5 @@
import { base64Encode } from "@opencode-ai/core/util/encode"
-import { ServerConnection } from "@/context/server"
+import { ServerConnection } from "@/context/servers"
import { decode64 } from "@/utils/base64"
export function sessionHref(server: ServerConnection.Key, sessionID: string) {
diff --git a/packages/app/src/wsl/settings.tsx b/packages/app/src/wsl/settings.tsx
index 22b302e51ae..62c981c9f32 100644
--- a/packages/app/src/wsl/settings.tsx
+++ b/packages/app/src/wsl/settings.tsx
@@ -11,7 +11,7 @@ import type { ServerCollectionController } from "@/components/server/server-mana
import { ServerHealthIndicator } from "@/components/server/server-row"
import { useLanguage } from "@/context/language"
import { usePlatform } from "@/context/platform"
-import { ServerConnection } from "@/context/server"
+import { ServerConnection } from "@/context/servers"
import { showToast } from "@/utils/toast"
import { DialogAddWslServer } from "./dialog-add-server"
import { useWslServers } from "./context"
diff --git a/packages/app/test-browser/command-palette.test.ts b/packages/app/test-browser/command-palette.test.ts
index a8d9acf7a61..a74b078e67d 100644
--- a/packages/app/test-browser/command-palette.test.ts
+++ b/packages/app/test-browser/command-palette.test.ts
@@ -4,7 +4,7 @@ import type { SessionInfo } from "@opencode-ai/client/promise"
import { createRoot } from "solid-js"
import { createServerSessionEntries } from "@/components/command-palette"
import type { LocalProject } from "@/context/layout"
-import { ServerConnection } from "@/context/server"
+import { ServerConnection } from "@/context/servers"
import { getProjectAvatarSource } from "@/pages/layout/helpers"
const stored: Project = {
diff --git a/packages/app/test-browser/prompt-scope.test.ts b/packages/app/test-browser/prompt-scope.test.ts
index fad19dcff77..a8d077e3c16 100644
--- a/packages/app/test-browser/prompt-scope.test.ts
+++ b/packages/app/test-browser/prompt-scope.test.ts
@@ -1,5 +1,5 @@
import { expect, test } from "bun:test"
-import { ServerConnection } from "@/context/server"
+import { ServerConnection } from "@/context/servers"
import { selectPromptTab } from "@/context/prompt"
import type { Tab } from "@/context/tabs"
diff --git a/packages/app/test-browser/review-panel-v2-state.test.ts b/packages/app/test-browser/review-panel-v2-state.test.ts
index 2a7862ce171..5f1073d2982 100644
--- a/packages/app/test-browser/review-panel-v2-state.test.ts
+++ b/packages/app/test-browser/review-panel-v2-state.test.ts
@@ -1,6 +1,7 @@
import { beforeAll, expect, mock, test } from "bun:test"
import type { AsyncStorage } from "@solid-primitives/storage"
import { createEffect, createRoot } from "solid-js"
+import type { Platform } from "@/context/platform"
let createReviewPanelV2State: typeof import("@/pages/session/v2/review-panel-v2-state").createReviewPanelV2State
let read: ((value: string | null) => void) | undefined
@@ -15,15 +16,21 @@ const storage: AsyncStorage = {
length: Promise.resolve(0),
}
+const platform: Platform = {
+ platform: "desktop",
+ storage: () => storage,
+ openExternal: () => undefined,
+ restart: async () => undefined,
+ notify: async () => undefined,
+ openDirectoryPickerDialog: async () => null,
+}
+
beforeAll(async () => {
mock.module("@opencode-ai/session-ui/v2/session-review-v2", () => ({
SESSION_REVIEW_V2_SIDEBAR_WIDTH_DEFAULT: 240,
SESSION_REVIEW_V2_SIDEBAR_WIDTH_MIN: 200,
SESSION_REVIEW_V2_SIDEBAR_WIDTH_MAX: 480,
}))
- mock.module("@/context/platform", () => ({
- usePlatform: () => ({ platform: "desktop", storage: () => storage }),
- }))
createReviewPanelV2State = (await import("@/pages/session/v2/review-panel-v2-state")).createReviewPanelV2State
})
@@ -31,15 +38,10 @@ beforeAll(async () => {
test("enables sidebar motion only after custom width hydration", async () => {
await new Promise((resolve, reject) => {
createRoot((dispose) => {
- const state = createReviewPanelV2State()
- const transition =
- "sidebarTransition" in state && typeof state.sidebarTransition === "function"
- ? (state.sidebarTransition as () => boolean)
- : undefined
+ const state = createReviewPanelV2State(platform)
try {
- expect(transition).toBeFunction()
- expect(transition?.()).toBeFalse()
+ expect(state.sidebarTransition()).toBeFalse()
expect(state.sidebarWidth()).toBe(240)
} catch (error) {
dispose()
@@ -48,7 +50,7 @@ test("enables sidebar motion only after custom width hydration", async () => {
}
createEffect(() => {
- if (!transition?.()) return
+ if (!state.sidebarTransition()) return
try {
expect(state.sidebarWidth()).toBe(360)
dispose()
diff --git a/packages/desktop/src/renderer/index.tsx b/packages/desktop/src/renderer/index.tsx
index 3a79dfe9a72..586e82703d7 100644
--- a/packages/desktop/src/renderer/index.tsx
+++ b/packages/desktop/src/renderer/index.tsx
@@ -406,18 +406,12 @@ function DesktopRoot(props: { windowState: DesktopWindowState }) {
}>
{(key) => (
-
- }
- >
+
+
)}
diff --git a/packages/desktop/src/renderer/onboarding.tsx b/packages/desktop/src/renderer/onboarding.tsx
index 4f9c3540c28..2e56d8a15a3 100644
--- a/packages/desktop/src/renderer/onboarding.tsx
+++ b/packages/desktop/src/renderer/onboarding.tsx
@@ -1,8 +1,12 @@
-import { ServerConnection, useServer, useTabs } from "@opencode-ai/app"
+import { ServerConnection, useServers, useTabs } from "@opencode-ai/app"
import { onMount } from "solid-js"
-export function DesktopFirstLaunchOnboarding(props: { initialUrl: string; onLoaded: () => void }) {
- const server = useServer()
+export function DesktopFirstLaunchOnboarding(props: {
+ serverKey: ServerConnection.Key
+ initialUrl: string
+ onLoaded: () => void
+}) {
+ const server = useServers()
const tabs = useTabs()
onMount(() => {
@@ -11,11 +15,8 @@ export function DesktopFirstLaunchOnboarding(props: { initialUrl: string; onLoad
async function runFirstLaunchOnboarding() {
try {
- await Promise.all(
- [server.ready.promise, tabs.ready.promise, tabs.recentReady.promise].map((p) => p ?? Promise.resolve()),
- )
+ await Promise.all([tabs.ready.promise, tabs.recentReady.promise].map((p) => p ?? Promise.resolve()))
const existingInstall = await window.api.isOldLayoutEligible()
- if (!server.isLocal()) return
const pending = await window.api.isFirstLaunchOnboardingPending()
if (!pending) return
@@ -39,9 +40,10 @@ export function DesktopFirstLaunchOnboarding(props: { initialUrl: string; onLoad
if (!shouldTrigger || !directory) return
console.info("[desktop-onboarding] starting first launch draft", { directory })
- server.projects.open(directory)
- server.projects.touch(directory)
- tabs.select(await tabs.newDraft({ server: server.key, directory }))
+ const projects = server.projects.forServer(props.serverKey)
+ projects.open(directory)
+ projects.touch(directory)
+ tabs.select(await tabs.newDraft({ server: props.serverKey, directory }))
} catch (error) {
console.error("[desktop-onboarding] first launch onboarding failed", error)
}
diff --git a/packages/session-ui/src/v2/components/prompt-input/index.tsx b/packages/session-ui/src/v2/components/prompt-input/index.tsx
index 15c5ca9d75a..21c3a39c2f6 100644
--- a/packages/session-ui/src/v2/components/prompt-input/index.tsx
+++ b/packages/session-ui/src/v2/components/prompt-input/index.tsx
@@ -162,7 +162,7 @@ export function PromptInputV2(props: PromptInputV2Props) {
spellcheck={state.mode === "normal"}
// @ts-expect-error
autocomplete="off"
- class="relative z-10 block min-h-[60px] max-h-[180px] w-full overflow-y-auto whitespace-pre-wrap bg-transparent px-4 pt-4 pb-2 text-[13px] font-[440] leading-5 text-v2-text-text-base focus:outline-none empty:before:content-['\200B'] [&_[data-mention=file]]:text-syntax-property [&_[data-mention=agent]]:text-syntax-type [&_[data-mention=reference]]:text-syntax-keyword"
+ class="relative z-10 block min-h-[60px] max-h-[180px] w-full overflow-y-auto whitespace-pre-wrap bg-transparent px-4 pt-4 pb-2 text-[13px] font-[440] leading-5 text-v2-text-text-base focus:outline-none empty:before:content-['\\200B'] [&_[data-mention=file]]:text-syntax-property [&_[data-mention=agent]]:text-syntax-type [&_[data-mention=reference]]:text-syntax-keyword"
classList={{ "font-mono!": state.mode === "shell", "opacity-50": props.disabled }}
style={{
"unicode-bidi": state.mode === "normal" ? "plaintext" : undefined,