neuron-technologies/neuron
3
0
Fork 0
Code Issues 44 Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(app): rename global context files to server context files (#28790)

Browse Source
This commit is contained in:
Brendan Allan
2026-05-25 09:01:02 +08:00
committed by GitHub
parent c5c9a1d435
commit eab34b46d0
56 changed files with 338 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/app/src/app.tsx
+6 -6
View File
@@ -30,8 +30,8 @@ import { Dynamic } from "solid-js/web"
import { CommandProvider } from "@/context/command" import { CommandProvider } from "@/context/command"
import { CommentsProvider } from "@/context/comments" import { CommentsProvider } from "@/context/comments"
import { FileProvider } from "@/context/file" import { FileProvider } from "@/context/file"
import { GlobalSDKProvider } from "@/context/global-sdk" import { ServerSDKProvider } from "@/context/server-sdk"
import { GlobalSyncProvider } from "@/context/global-sync" import { ServerSyncProvider } from "@/context/server-sync"
import { HighlightsProvider } from "@/context/highlights" import { HighlightsProvider } from "@/context/highlights"
import { LanguageProvider, type Locale, useLanguage } from "@/context/language" import { LanguageProvider, type Locale, useLanguage } from "@/context/language"
import { LayoutProvider } from "@/context/layout" import { LayoutProvider } from "@/context/layout"
@@ -304,8 +304,8 @@ export function AppInterface(props: {
<ConnectionGate disableHealthCheck={props.disableHealthCheck}> <ConnectionGate disableHealthCheck={props.disableHealthCheck}>
<ServerKey> <ServerKey>
<QueryProvider> <QueryProvider>
<GlobalSDKProvider> <ServerSDKProvider>
<GlobalSyncProvider> <ServerSyncProvider>
<Dynamic <Dynamic
component={props.router ?? Router} component={props.router ?? Router}
root={(routerProps) => <RouterRoot appChildren={props.children}>{routerProps.children}</RouterRoot>} root={(routerProps) => <RouterRoot appChildren={props.children}>{routerProps.children}</RouterRoot>}
@@ -316,8 +316,8 @@ export function AppInterface(props: {
<Route path="/session/:id?" component={SessionRoute} /> <Route path="/session/:id?" component={SessionRoute} />
</Route> </Route>
</Dynamic> </Dynamic>
</GlobalSyncProvider> </ServerSyncProvider>
</GlobalSDKProvider> </ServerSDKProvider>
</QueryProvider> </QueryProvider>
</ServerKey> </ServerKey>
</ConnectionGate> </ConnectionGate>
packages/app/src/components/dialog-connect-provider.tsx
+15 -15
View File
@@ -12,15 +12,15 @@ import { showToast } from "@opencode-ai/ui/toast"
import { createEffect, createMemo, createResource, Match, onCleanup, onMount, Switch } from "solid-js" import { createEffect, createMemo, createResource, Match, onCleanup, onMount, Switch } from "solid-js"
import { createStore, produce } from "solid-js/store" import { createStore, produce } from "solid-js/store"
import { Link } from "@/components/link" import { Link } from "@/components/link"
import { useGlobalSDK } from "@/context/global-sdk" import { useServerSDK } from "@/context/server-sdk"
import { useGlobalSync } from "@/context/global-sync" import { useServerSync } from "@/context/server-sync"
import { useLanguage } from "@/context/language" import { useLanguage } from "@/context/language"
import { useProviders } from "@/hooks/use-providers" import { useProviders } from "@/hooks/use-providers"
export function DialogConnectProvider(props: { provider: string }) { export function DialogConnectProvider(props: { provider: string }) {
const dialog = useDialog() const dialog = useDialog()
const globalSync = useGlobalSync() const serverSync = useServerSync()
const globalSDK = useGlobalSDK() const serverSDK = useServerSDK()
const language = useLanguage() const language = useLanguage()
const providers = useProviders() const providers = useProviders()
@@ -41,7 +41,7 @@ export function DialogConnectProvider(props: { provider: string }) {
}) })
const provider = createMemo( const provider = createMemo(
() => providers.all().get(props.provider) ?? globalSync.data.provider.all.get(props.provider)!, () => providers.all().get(props.provider) ?? serverSync.data.provider.all.get(props.provider)!,
) )
const fallback = createMemo<ProviderAuthMethod[]>(() => [ const fallback = createMemo<ProviderAuthMethod[]>(() => [
{ {
@@ -52,16 +52,16 @@ export function DialogConnectProvider(props: { provider: string }) {
const [auth] = createResource( const [auth] = createResource(
() => props.provider, () => props.provider,
async () => { async () => {
const cached = globalSync.data.provider_auth[props.provider] const cached = serverSync.data.provider_auth[props.provider]
if (cached) return cached if (cached) return cached
const res = await globalSDK.client.provider.auth() const res = await serverSDK.client.provider.auth()
if (!alive.value) return fallback() if (!alive.value) return fallback()
globalSync.set("provider_auth", res.data ?? {}) serverSync.set("provider_auth", res.data ?? {})
return res.data?.[props.provider] ?? fallback() return res.data?.[props.provider] ?? fallback()
}, },
) )
const loading = createMemo(() => auth.loading && !globalSync.data.provider_auth[props.provider]) const loading = createMemo(() => auth.loading && !serverSync.data.provider_auth[props.provider])
const methods = createMemo(() => auth.latest ?? globalSync.data.provider_auth[props.provider] ?? fallback()) const methods = createMemo(() => auth.latest ?? serverSync.data.provider_auth[props.provider] ?? fallback())
const [store, setStore] = createStore({ const [store, setStore] = createStore({
methodIndex: undefined as undefined | number, methodIndex: undefined as undefined | number,
authorization: undefined as undefined | ProviderAuthAuthorization, authorization: undefined as undefined | ProviderAuthAuthorization,
@@ -158,7 +158,7 @@ export function DialogConnectProvider(props: { provider: string }) {
} }
dispatch({ type: "auth.pending" }) dispatch({ type: "auth.pending" })
const start = Date.now() const start = Date.now()
await globalSDK.client.provider.oauth await serverSDK.client.provider.oauth
.authorize( .authorize(
{ {
providerID: props.provider, providerID: props.provider,
@@ -330,7 +330,7 @@ export function DialogConnectProvider(props: { provider: string }) {
}) })
async function complete() { async function complete() {
await globalSDK.client.global.dispose() await serverSDK.client.global.dispose()
dialog.close() dialog.close()
showToast({ showToast({
variant: "success", variant: "success",
@@ -407,7 +407,7 @@ export function DialogConnectProvider(props: { provider: string }) {
} }
setFormStore("error", undefined) setFormStore("error", undefined)
await globalSDK.client.auth.set({ await serverSDK.client.auth.set({
providerID: props.provider, providerID: props.provider,
auth: { auth: {
type: "api", type: "api",
@@ -478,7 +478,7 @@ export function DialogConnectProvider(props: { provider: string }) {
} }
setFormStore("error", undefined) setFormStore("error", undefined)
const result = await globalSDK.client.provider.oauth const result = await serverSDK.client.provider.oauth
.callback({ .callback({
providerID: props.provider, providerID: props.provider,
method: store.methodIndex, method: store.methodIndex,
@@ -531,7 +531,7 @@ export function DialogConnectProvider(props: { provider: string }) {
onMount(() => { onMount(() => {
void (async () => { void (async () => {
const result = await globalSDK.client.provider.oauth const result = await serverSDK.client.provider.oauth
.callback({ .callback({
providerID: props.provider, providerID: props.provider,
method: store.methodIndex, method: store.methodIndex,
packages/app/src/components/dialog-custom-provider.tsx
+9 -9
View File
@@ -9,8 +9,8 @@ import { showToast } from "@opencode-ai/ui/toast"
import { batch, For } from "solid-js" import { batch, For } from "solid-js"
import { createStore, produce } from "solid-js/store" import { createStore, produce } from "solid-js/store"
import { Link } from "@/components/link" import { Link } from "@/components/link"
import { useGlobalSDK } from "@/context/global-sdk" import { useServerSDK } from "@/context/server-sdk"
import { useGlobalSync } from "@/context/global-sync" import { useServerSync } from "@/context/server-sync"
import { useLanguage } from "@/context/language" import { useLanguage } from "@/context/language"
import { type FormState, headerRow, modelRow, validateCustomProvider } from "./dialog-custom-provider-form" import { type FormState, headerRow, modelRow, validateCustomProvider } from "./dialog-custom-provider-form"
import { DialogSelectProvider } from "./dialog-select-provider" import { DialogSelectProvider } from "./dialog-select-provider"
@@ -21,8 +21,8 @@ type Props = {
export function DialogCustomProvider(props: Props) { export function DialogCustomProvider(props: Props) {
const dialog = useDialog() const dialog = useDialog()
const globalSync = useGlobalSync() const serverSync = useServerSync()
const globalSDK = useGlobalSDK() const serverSDK = useServerSDK()
const language = useLanguage() const language = useLanguage()
const [form, setForm] = createStore<FormState>({ const [form, setForm] = createStore<FormState>({
@@ -105,8 +105,8 @@ export function DialogCustomProvider(props: Props) {
const output = validateCustomProvider({ const output = validateCustomProvider({
form, form,
t: language.t, t: language.t,
disabledProviders: globalSync.data.config.disabled_providers ?? [], disabledProviders: serverSync.data.config.disabled_providers ?? [],
existingProviderIDs: new Set(globalSync.data.provider.all.keys()), existingProviderIDs: new Set(serverSync.data.provider.all.keys()),
}) })
batch(() => { batch(() => {
setForm("err", output.err) setForm("err", output.err)
@@ -118,11 +118,11 @@ export function DialogCustomProvider(props: Props) {
const saveMutation = useMutation(() => ({ const saveMutation = useMutation(() => ({
mutationFn: async (result: NonNullable<ReturnType<typeof validate>>) => { mutationFn: async (result: NonNullable<ReturnType<typeof validate>>) => {
const disabledProviders = globalSync.data.config.disabled_providers ?? [] const disabledProviders = serverSync.data.config.disabled_providers ?? []
const nextDisabled = disabledProviders.filter((id) => id !== result.providerID) const nextDisabled = disabledProviders.filter((id) => id !== result.providerID)
if (result.key) { if (result.key) {
await globalSDK.client.auth.set({ await serverSDK.client.auth.set({
providerID: result.providerID, providerID: result.providerID,
auth: { auth: {
type: "api", type: "api",
@@ -131,7 +131,7 @@ export function DialogCustomProvider(props: Props) {
}) })
} }
await globalSync.updateConfig({ await serverSync.updateConfig({
provider: { [result.providerID]: result.config }, provider: { [result.providerID]: result.config },
disabled_providers: nextDisabled, disabled_providers: nextDisabled,
}) })
packages/app/src/components/dialog-edit-project.tsx
+7 -7
View File
@@ -6,8 +6,8 @@ import { useMutation } from "@tanstack/solid-query"
import { Icon } from "@opencode-ai/ui/icon" import { Icon } from "@opencode-ai/ui/icon"
import { createMemo, For, Show } from "solid-js" import { createMemo, For, Show } from "solid-js"
import { createStore } from "solid-js/store" import { createStore } from "solid-js/store"
import { useGlobalSDK } from "@/context/global-sdk" import { useServerSDK } from "@/context/server-sdk"
import { useGlobalSync } from "@/context/global-sync" import { useServerSync } from "@/context/server-sync"
import { type LocalProject, getAvatarColors } from "@/context/layout" import { type LocalProject, getAvatarColors } from "@/context/layout"
import { getFilename } from "@opencode-ai/core/util/path" import { getFilename } from "@opencode-ai/core/util/path"
import { Avatar } from "@opencode-ai/ui/avatar" import { Avatar } from "@opencode-ai/ui/avatar"
@@ -18,8 +18,8 @@ const AVATAR_COLOR_KEYS = ["pink", "mint", "orange", "purple", "cyan", "lime"] a
export function DialogEditProject(props: { project: LocalProject }) { export function DialogEditProject(props: { project: LocalProject }) {
const dialog = useDialog() const dialog = useDialog()
const globalSDK = useGlobalSDK() const serverSDK = useServerSDK()
const globalSync = useGlobalSync() const serverSync = useServerSync()
const language = useLanguage() const language = useLanguage()
const folderName = createMemo(() => getFilename(props.project.worktree)) const folderName = createMemo(() => getFilename(props.project.worktree))
@@ -78,19 +78,19 @@ export function DialogEditProject(props: { project: LocalProject }) {
const start = store.startup.trim() const start = store.startup.trim()
if (props.project.id && props.project.id !== "global") { if (props.project.id && props.project.id !== "global") {
await globalSDK.client.project.update({ await serverSDK.client.project.update({
projectID: props.project.id, projectID: props.project.id,
directory: props.project.worktree, directory: props.project.worktree,
name, name,
icon: { color: store.color || "", override: store.iconOverride || "" }, icon: { color: store.color || "", override: store.iconOverride || "" },
commands: { start }, commands: { start },
}) })
globalSync.project.icon(props.project.worktree, store.iconOverride || undefined) serverSync.project.icon(props.project.worktree, store.iconOverride || undefined)
dialog.close() dialog.close()
return return
} }
globalSync.project.meta(props.project.worktree, { serverSync.project.meta(props.project.worktree, {
name, name,
icon: { color: store.color || undefined, override: store.iconOverride || undefined }, icon: { color: store.color || undefined, override: store.iconOverride || undefined },
commands: { start: start || undefined }, commands: { start: start || undefined },
packages/app/src/components/dialog-select-directory.tsx
+5 -5
View File
@@ -6,8 +6,8 @@ import type { ListRef } from "@opencode-ai/ui/list"
import { getDirectory, getFilename } from "@opencode-ai/core/util/path" import { getDirectory, getFilename } from "@opencode-ai/core/util/path"
import fuzzysort from "fuzzysort" import fuzzysort from "fuzzysort"
import { createMemo, createResource, createSignal } from "solid-js" import { createMemo, createResource, createSignal } from "solid-js"
import { useGlobalSDK } from "@/context/global-sdk" import { useServerSDK } from "@/context/server-sdk"
import { useGlobalSync } from "@/context/global-sync" import { useServerSync } from "@/context/server-sync"
import { useLayout } from "@/context/layout" import { useLayout } from "@/context/layout"
import { useLanguage } from "@/context/language" import { useLanguage } from "@/context/language"
@@ -128,7 +128,7 @@ function uniqueRows(rows: Row[]) {
} }
function useDirectorySearch(args: { function useDirectorySearch(args: {
sdk: ReturnType<typeof useGlobalSDK> sdk: ReturnType<typeof useServerSDK>
start: () => string | undefined start: () => string | undefined
home: () => string home: () => string
}) { }) {
@@ -246,8 +246,8 @@ function useDirectorySearch(args: {
} }
export function DialogSelectDirectory(props: DialogSelectDirectoryProps) { export function DialogSelectDirectory(props: DialogSelectDirectoryProps) {
const sync = useGlobalSync() const sync = useServerSync()
const sdk = useGlobalSDK() const sdk = useServerSDK()
const layout = useLayout() const layout = useLayout()
const dialog = useDialog() const dialog = useDialog()
const language = useLanguage() const language = useLanguage()
packages/app/src/components/dialog-select-file.tsx
+9 -9
View File
@@ -9,8 +9,8 @@ import { getDirectory, getFilename } from "@opencode-ai/core/util/path"
import { useNavigate } from "@solidjs/router" import { useNavigate } from "@solidjs/router"
import { createMemo, createSignal, Match, onCleanup, Show, Switch } from "solid-js" import { createMemo, createSignal, Match, onCleanup, Show, Switch } from "solid-js"
import { formatKeybind, useCommand, type CommandOption } from "@/context/command" import { formatKeybind, useCommand, type CommandOption } from "@/context/command"
import { useGlobalSDK } from "@/context/global-sdk" import { useServerSDK } from "@/context/server-sdk"
import { useGlobalSync } from "@/context/global-sync" import { useServerSync } from "@/context/server-sync"
import { useLayout } from "@/context/layout" import { useLayout } from "@/context/layout"
import { useFile } from "@/context/file" import { useFile } from "@/context/file"
import { useLanguage } from "@/context/language" import { useLanguage } from "@/context/language"
@@ -175,7 +175,7 @@ function createFileEntries(props: {
function createSessionEntries(props: { function createSessionEntries(props: {
workspaces: () => string[] workspaces: () => string[]
label: (directory: string) => string label: (directory: string) => string
globalSDK: ReturnType<typeof useGlobalSDK> serverSDK: ReturnType<typeof useServerSDK>
language: ReturnType<typeof useLanguage> language: ReturnType<typeof useLanguage>
}) { }) {
const state: { const state: {
@@ -207,7 +207,7 @@ function createSessionEntries(props: {
state.inflight = Promise.all( state.inflight = Promise.all(
dirs.map((directory) => { dirs.map((directory) => {
const description = props.label(directory) const description = props.label(directory)
return props.globalSDK.client.session return props.serverSDK.client.session
.list({ directory, roots: true }) .list({ directory, roots: true })
.then((x) => .then((x) =>
(x.data ?? []) (x.data ?? [])
@@ -268,8 +268,8 @@ export function DialogSelectFile(props: { mode?: DialogSelectFileMode; onOpenFil
const file = useFile() const file = useFile()
const dialog = useDialog() const dialog = useDialog()
const navigate = useNavigate() const navigate = useNavigate()
const globalSDK = useGlobalSDK() const serverSDK = useServerSDK()
const globalSync = useGlobalSync() const serverSync = useServerSync()
const { params, tabs, view } = useSessionLayout() const { params, tabs, view } = useSessionLayout()
const filesOnly = () => props.mode === "files" const filesOnly = () => props.mode === "files"
const state = { cleanup: undefined as (() => void) | void, committed: false } const state = { cleanup: undefined as (() => void) | void, committed: false }
@@ -292,21 +292,21 @@ export function DialogSelectFile(props: { mode?: DialogSelectFileMode; onOpenFil
if (directory && !dirs.includes(directory)) return [...dirs, directory] if (directory && !dirs.includes(directory)) return [...dirs, directory]
return dirs return dirs
}) })
const homedir = createMemo(() => globalSync.data.path.home) const homedir = createMemo(() => serverSync.data.path.home)
const label = (directory: string) => { const label = (directory: string) => {
const current = project() const current = project()
const kind = const kind =
current && directory === current.worktree current && directory === current.worktree
? language.t("workspace.type.local") ? language.t("workspace.type.local")
: language.t("workspace.type.sandbox") : language.t("workspace.type.sandbox")
const [store] = globalSync.child(directory, { bootstrap: false }) const [store] = serverSync.child(directory, { bootstrap: false })
const home = homedir() const home = homedir()
const path = home ? directory.replace(home, "~") : directory const path = home ? directory.replace(home, "~") : directory
const name = store.vcs?.branch ?? getFilename(directory) const name = store.vcs?.branch ?? getFilename(directory)
return `${kind} : ${name || path}` return `${kind} : ${name || path}`
} }
const { sessions } = createSessionEntries({ workspaces, label, globalSDK, language }) const { sessions } = createSessionEntries({ workspaces, label, serverSDK, language })
const items = async (text: string) => { const items = async (text: string) => {
const query = text.trim() const query = text.trim()
packages/app/src/components/dialog-select-mcp.tsx
+1 -1
View File
@@ -6,7 +6,7 @@ import { Dialog } from "@opencode-ai/ui/dialog"
import { List } from "@opencode-ai/ui/list" import { List } from "@opencode-ai/ui/list"
import { Switch } from "@opencode-ai/ui/switch" import { Switch } from "@opencode-ai/ui/switch"
import { useLanguage } from "@/context/language" import { useLanguage } from "@/context/language"
import { useQueryOptions } from "@/context/global-sync" import { useQueryOptions } from "@/context/server-sync"
import { pathKey } from "@/utils/path-key" import { pathKey } from "@/utils/path-key"
const statusLabels = { const statusLabels = {
packages/app/src/components/prompt-input.tsx
+1 -1
View File
@@ -66,7 +66,7 @@ import { PromptDragOverlay } from "./prompt-input/drag-overlay"
import { promptPlaceholder } from "./prompt-input/placeholder" import { promptPlaceholder } from "./prompt-input/placeholder"
import { ImagePreview } from "@opencode-ai/ui/image-preview" import { ImagePreview } from "@opencode-ai/ui/image-preview"
import { useQueries } from "@tanstack/solid-query" import { useQueries } from "@tanstack/solid-query"
import { useQueryOptions } from "@/context/global-sync" import { useQueryOptions } from "@/context/server-sync"
import { pathKey } from "@/utils/path-key" import { pathKey } from "@/utils/path-key"
import { getFilename } from "@opencode-ai/core/util/path" import { getFilename } from "@opencode-ai/core/util/path"
packages/app/src/components/prompt-input/submit.test.ts
+2 -2
View File
@@ -162,8 +162,8 @@ beforeAll(async () => {
}), }),
})) }))
mock.module("@/context/global-sync", () => ({ mock.module("@/context/server-sync", () => ({
useGlobalSync: () => ({ useServerSync: () => ({
child: (directory: string) => { child: (directory: string) => {
syncedDirectories.push(directory) syncedDirectories.push(directory)
storedSessions[directory] ??= [] storedSessions[directory] ??= []
packages/app/src/components/prompt-input/submit.ts
+9 -9
View File
@@ -5,7 +5,7 @@ import { Binary } from "@opencode-ai/core/util/binary"
import { useNavigate, useParams } from "@solidjs/router" import { useNavigate, useParams } from "@solidjs/router"
import { batch, type Accessor } from "solid-js" import { batch, type Accessor } from "solid-js"
import type { FileSelection } from "@/context/file" import type { FileSelection } from "@/context/file"
import { useGlobalSync } from "@/context/global-sync" import { useServerSync } from "@/context/server-sync"
import { useLanguage } from "@/context/language" import { useLanguage } from "@/context/language"
import { useLayout } from "@/context/layout" import { useLayout } from "@/context/layout"
import { useLocal } from "@/context/local" import { useLocal } from "@/context/local"
@@ -38,7 +38,7 @@ export type FollowupDraft = {
type FollowupSendInput = { type FollowupSendInput = {
client: ReturnType<typeof useSDK>["client"] client: ReturnType<typeof useSDK>["client"]
globalSync: ReturnType<typeof useGlobalSync> serverSync: ReturnType<typeof useServerSync>
sync: ReturnType<typeof useSync> sync: ReturnType<typeof useSync>
draft: FollowupDraft draft: FollowupDraft
messageID?: string messageID?: string
@@ -53,7 +53,7 @@ const draftImages = (prompt: Prompt) => prompt.filter((part): part is ImageAttac
export async function sendFollowupDraft(input: FollowupSendInput) { export async function sendFollowupDraft(input: FollowupSendInput) {
const text = draftText(input.draft.prompt) const text = draftText(input.draft.prompt)
const images = draftImages(input.draft.prompt) const images = draftImages(input.draft.prompt)
const [, setStore] = input.globalSync.child(input.draft.sessionDirectory) const [, setStore] = input.serverSync.child(input.draft.sessionDirectory)
const setBusy = () => { const setBusy = () => {
if (!input.optimisticBusy) return if (!input.optimisticBusy) return
@@ -205,7 +205,7 @@ export function createPromptSubmit(input: PromptSubmitInput) {
const navigate = useNavigate() const navigate = useNavigate()
const sdk = useSDK() const sdk = useSDK()
const sync = useSync() const sync = useSync()
const globalSync = useGlobalSync() const serverSync = useServerSync()
const local = useLocal() const local = useLocal()
const permission = usePermission() const permission = usePermission()
const prompt = usePrompt() const prompt = usePrompt()
@@ -226,8 +226,8 @@ export function createPromptSubmit(input: PromptSubmitInput) {
const sessionID = params.id const sessionID = params.id
if (!sessionID) return Promise.resolve() if (!sessionID) return Promise.resolve()
globalSync.todo.set(sessionID, []) serverSync.todo.set(sessionID, [])
const [, setStore] = globalSync.child(sdk.directory) const [, setStore] = serverSync.child(sdk.directory)
setStore("todo", sessionID, []) setStore("todo", sessionID, [])
input.onAbort?.() input.onAbort?.()
@@ -273,7 +273,7 @@ export function createPromptSubmit(input: PromptSubmitInput) {
} }
const seed = (dir: string, info: Session) => { const seed = (dir: string, info: Session) => {
const [, setStore] = globalSync.child(dir) const [, setStore] = serverSync.child(dir)
setStore("session", (list: Session[]) => { setStore("session", (list: Session[]) => {
const result = Binary.search(list, info.id, (item) => item.id) const result = Binary.search(list, info.id, (item) => item.id)
const next = [...list] const next = [...list]
@@ -354,7 +354,7 @@ export function createPromptSubmit(input: PromptSubmitInput) {
directory: sessionDirectory, directory: sessionDirectory,
throwOnError: true, throwOnError: true,
}) })
globalSync.child(sessionDirectory) serverSync.child(sessionDirectory)
} }
input.onNewSessionWorktreeReset?.() input.onNewSessionWorktreeReset?.()
@@ -557,7 +557,7 @@ export function createPromptSubmit(input: PromptSubmitInput) {
void sendFollowupDraft({ void sendFollowupDraft({
client, client,
sync, sync,
globalSync, serverSync,
draft, draft,
messageID, messageID,
optimisticBusy: sessionDirectory === projectDirectory, optimisticBusy: sessionDirectory === projectDirectory,
packages/app/src/components/session/session-new-design-view.tsx
+3 -3
View File
@@ -1,7 +1,7 @@
import type { JSX } from "solid-js" import type { JSX } from "solid-js"
import { createMemo } from "solid-js" import { createMemo } from "solid-js"
import { useNavigate } from "@solidjs/router" import { useNavigate } from "@solidjs/router"
import { useGlobalSync } from "@/context/global-sync" import { useServerSync } from "@/context/server-sync"
import { useLayout } from "@/context/layout" import { useLayout } from "@/context/layout"
import { useSDK } from "@/context/sdk" import { useSDK } from "@/context/sdk"
import { useServer } from "@/context/server" import { useServer } from "@/context/server"
@@ -15,7 +15,7 @@ import { WordmarkV2 } from "@opencode-ai/ui/v2/components/wordmark-v2.jsx"
const MAIN_WORKTREE = "main" const MAIN_WORKTREE = "main"
export function NewSessionDesignView(props: { worktree: string; children: JSX.Element }) { export function NewSessionDesignView(props: { worktree: string; children: JSX.Element }) {
const globalSync = useGlobalSync() const serverSync = useServerSync()
const layout = useLayout() const layout = useLayout()
const navigate = useNavigate() const navigate = useNavigate()
const sdk = useSDK() const sdk = useSDK()
@@ -24,7 +24,7 @@ export function NewSessionDesignView(props: { worktree: string; children: JSX.El
const projectRoot = createMemo(() => sync.project?.worktree ?? sdk.directory) const projectRoot = createMemo(() => sync.project?.worktree ?? sdk.directory)
const projects = createMemo(() => { const projects = createMemo(() => {
const roots = globalSync.data.project.map((project) => project.worktree) const roots = serverSync.data.project.map((project) => project.worktree)
if (roots.includes(projectRoot())) return roots if (roots.includes(projectRoot())) return roots
return [projectRoot(), ...roots] return [projectRoot(), ...roots]
}) })
packages/app/src/components/settings-general.tsx
+7 -7
View File
@@ -12,8 +12,8 @@ import { useParams } from "@solidjs/router"
import { useLanguage } from "@/context/language" import { useLanguage } from "@/context/language"
import { usePermission } from "@/context/permission" import { usePermission } from "@/context/permission"
import { usePlatform, type DisplayBackend } from "@/context/platform" import { usePlatform, type DisplayBackend } from "@/context/platform"
import { useGlobalSync } from "@/context/global-sync" import { useServerSync } from "@/context/server-sync"
import { useGlobalSDK } from "@/context/global-sdk" import { useServerSDK } from "@/context/server-sdk"
import { import {
monoDefault, monoDefault,
monoFontFamily, monoFontFamily,
@@ -175,8 +175,8 @@ export const SettingsGeneral: Component = () => {
const themeOptions = createMemo<ThemeOption[]>(() => theme.ids().map((id) => ({ id, name: theme.name(id) }))) const themeOptions = createMemo<ThemeOption[]>(() => theme.ids().map((id) => ({ id, name: theme.name(id) })))
const globalSync = useGlobalSync() const serverSync = useServerSync()
const globalSdk = useGlobalSDK() const globalSdk = useServerSDK()
const [shells] = createResource( const [shells] = createResource(
() => () =>
@@ -204,11 +204,11 @@ export const SettingsGeneral: Component = () => {
}) })
const autoOption = { id: "auto", value: "", label: language.t("settings.general.row.shell.autoDefault") } const autoOption = { id: "auto", value: "", label: language.t("settings.general.row.shell.autoDefault") }
const currentShell = createMemo(() => globalSync.data.config.shell ?? "") const currentShell = createMemo(() => serverSync.data.config.shell ?? "")
const shellOptions = createMemo<ShellSelectOption[]>(() => { const shellOptions = createMemo<ShellSelectOption[]>(() => {
const list = shells.latest const list = shells.latest
const current = globalSync.data.config.shell const current = serverSync.data.config.shell
const nameCounts = new Map<string, number>() const nameCounts = new Map<string, number>()
for (const s of list) { for (const s of list) {
@@ -343,7 +343,7 @@ export const SettingsGeneral: Component = () => {
onSelect={(option) => { onSelect={(option) => {
if (!option) return if (!option) return
if (option.value === currentShell()) return if (option.value === currentShell()) return
globalSync.updateConfig({ shell: option.value }) serverSync.updateConfig({ shell: option.value })
}} }}
variant="secondary" variant="secondary"
size="small" size="small"
packages/app/src/components/settings-providers.tsx
+12 -12
View File
@@ -6,8 +6,8 @@ import { showToast } from "@opencode-ai/ui/toast"
import { popularProviders, useProviders } from "@/hooks/use-providers" import { popularProviders, useProviders } from "@/hooks/use-providers"
import { createMemo, type Component, For, Show } from "solid-js" import { createMemo, type Component, For, Show } from "solid-js"
import { useLanguage } from "@/context/language" import { useLanguage } from "@/context/language"
import { useGlobalSDK } from "@/context/global-sdk" import { useServerSDK } from "@/context/server-sdk"
import { useGlobalSync } from "@/context/global-sync" import { useServerSync } from "@/context/server-sync"
import { DialogConnectProvider } from "./dialog-connect-provider" import { DialogConnectProvider } from "./dialog-connect-provider"
import { DialogSelectProvider } from "./dialog-select-provider" import { DialogSelectProvider } from "./dialog-select-provider"
import { DialogCustomProvider } from "./dialog-custom-provider" import { DialogCustomProvider } from "./dialog-custom-provider"
@@ -30,8 +30,8 @@ const PROVIDER_NOTES = [
export const SettingsProviders: Component = () => { export const SettingsProviders: Component = () => {
const dialog = useDialog() const dialog = useDialog()
const language = useLanguage() const language = useLanguage()
const globalSDK = useGlobalSDK() const serverSDK = useServerSDK()
const globalSync = useGlobalSync() const serverSync = useServerSync()
const providers = useProviders() const providers = useProviders()
const connected = createMemo(() => { const connected = createMemo(() => {
@@ -74,7 +74,7 @@ export const SettingsProviders: Component = () => {
const note = (id: string) => PROVIDER_NOTES.find((item) => item.match(id))?.key const note = (id: string) => PROVIDER_NOTES.find((item) => item.match(id))?.key
const isConfigCustom = (providerID: string) => { const isConfigCustom = (providerID: string) => {
const provider = globalSync.data.config.provider?.[providerID] const provider = serverSync.data.config.provider?.[providerID]
if (!provider) return false if (!provider) return false
if (provider.npm !== "@ai-sdk/openai-compatible") return false if (provider.npm !== "@ai-sdk/openai-compatible") return false
if (!provider.models || Object.keys(provider.models).length === 0) return false if (!provider.models || Object.keys(provider.models).length === 0) return false
@@ -82,11 +82,11 @@ export const SettingsProviders: Component = () => {
} }
const disableProvider = async (providerID: string, name: string) => { const disableProvider = async (providerID: string, name: string) => {
const before = globalSync.data.config.disabled_providers ?? [] const before = serverSync.data.config.disabled_providers ?? []
const next = before.includes(providerID) ? before : [...before, providerID] const next = before.includes(providerID) ? before : [...before, providerID]
globalSync.set("config", "disabled_providers", next) serverSync.set("config", "disabled_providers", next)
await globalSync await serverSync
.updateConfig({ disabled_providers: next }) .updateConfig({ disabled_providers: next })
.then(() => { .then(() => {
showToast({ showToast({
@@ -97,7 +97,7 @@ export const SettingsProviders: Component = () => {
}) })
}) })
.catch((err: unknown) => { .catch((err: unknown) => {
globalSync.set("config", "disabled_providers", before) serverSync.set("config", "disabled_providers", before)
const message = err instanceof Error ? err.message : String(err) const message = err instanceof Error ? err.message : String(err)
showToast({ title: language.t("common.requestFailed"), description: message }) showToast({ title: language.t("common.requestFailed"), description: message })
}) })
@@ -105,14 +105,14 @@ export const SettingsProviders: Component = () => {
const disconnect = async (providerID: string, name: string) => { const disconnect = async (providerID: string, name: string) => {
if (isConfigCustom(providerID)) { if (isConfigCustom(providerID)) {
await globalSDK.client.auth.remove({ providerID }).catch(() => undefined) await serverSDK.client.auth.remove({ providerID }).catch(() => undefined)
await disableProvider(providerID, name) await disableProvider(providerID, name)
return return
} }
await globalSDK.client.auth await serverSDK.client.auth
.remove({ providerID }) .remove({ providerID })
.then(async () => { .then(async () => {
await globalSDK.client.global.dispose() await serverSDK.client.global.dispose()
showToast({ showToast({
variant: "success", variant: "success",
icon: "circle-check", icon: "circle-check",
packages/app/src/components/status-popover-body.tsx
+1 -1
View File
@@ -15,7 +15,7 @@ import { useSDK } from "@/context/sdk"
import { normalizeServerUrl, ServerConnection, useServer } from "@/context/server" import { normalizeServerUrl, ServerConnection, useServer } from "@/context/server"
import { useSync } from "@/context/sync" import { useSync } from "@/context/sync"
import { useCheckServerHealth, type ServerHealth } from "@/utils/server-health" import { useCheckServerHealth, type ServerHealth } from "@/utils/server-health"
import { useQueryOptions } from "@/context/global-sync" import { useQueryOptions } from "@/context/server-sync"
import { pathKey } from "@/utils/path-key" import { pathKey } from "@/utils/path-key"
const pollMs = 10_000 const pollMs = 10_000
packages/app/src/components/titlebar.tsx
+3 -3
View File
@@ -16,7 +16,7 @@ import { useLanguage } from "@/context/language"
import { useSettings } from "@/context/settings" import { useSettings } from "@/context/settings"
import { WindowsAppMenu } from "./windows-app-menu" import { WindowsAppMenu } from "./windows-app-menu"
import { applyPath, backPath, forwardPath } from "./titlebar-history" import { applyPath, backPath, forwardPath } from "./titlebar-history"
import { useGlobalSync } from "@/context/global-sync" import { useServerSync } from "@/context/server-sync"
import { decodeDirectory } from "@/pages/directory-layout" import { decodeDirectory } from "@/pages/directory-layout"
import { iife } from "@opencode-ai/core/util/iife" import { iife } from "@opencode-ai/core/util/iife"
import { base64Encode } from "@opencode-ai/core/util/encode" import { base64Encode } from "@opencode-ai/core/util/encode"
@@ -221,7 +221,7 @@ export function Titlebar(props: { update?: TitlebarUpdate }) {
<Switch> <Switch>
<Match when={USE_V2_TITLEBAR}> <Match when={USE_V2_TITLEBAR}>
{(_) => { {(_) => {
const globalSync = useGlobalSync() const serverSync = useServerSync()
const navigate = useNavigate() const navigate = useNavigate()
const homeMatch = useMatch(() => "/") const homeMatch = useMatch(() => "/")
@@ -391,7 +391,7 @@ export function Titlebar(props: { update?: TitlebarUpdate }) {
const base = mapArray( const base = mapArray(
() => tabsStore, () => tabsStore,
(tab) => { (tab) => {
const sync = globalSync.createDirSyncContext(tab.dir) const sync = serverSync.createDirSyncContext(tab.dir)
const session = sync.session.get(tab.sessionId) const session = sync.session.get(tab.sessionId)
return session ? { ...tab, info: session } : null return session ? { ...tab, info: session } : null
}, },
packages/app/src/context/directory-sync.ts
+20 -20
View File
@@ -8,7 +8,7 @@ import {
getSessionPrefetchPromise, getSessionPrefetchPromise,
setSessionPrefetch, setSessionPrefetch,
} from "./global-sync/session-prefetch" } from "./global-sync/session-prefetch"
import { useGlobalSync } from "./global-sync" import { useServerSync } from "./server-sync"
import type { Message, OpencodeClient, Part } from "@opencode-ai/sdk/v2/client" import type { Message, OpencodeClient, Part } from "@opencode-ai/sdk/v2/client"
import { SESSION_CACHE_LIMIT, dropSessionCaches, pickSessionCacheEvictions } from "./global-sync/session-cache" import { SESSION_CACHE_LIMIT, dropSessionCaches, pickSessionCacheEvictions } from "./global-sync/session-cache"
import { diffs as list, message as clean } from "@/utils/diffs" import { diffs as list, message as clean } from "@/utils/diffs"
@@ -165,15 +165,15 @@ function setOptimisticRemove(setStore: (...args: unknown[]) => void, input: Opti
} }
export const createDirSyncContext = (client: OpencodeClient, directory: string) => { export const createDirSyncContext = (client: OpencodeClient, directory: string) => {
const globalSync = useGlobalSync() const serverSync = useServerSync()
type Child = ReturnType<(typeof globalSync)["child"]> type Child = ReturnType<(typeof serverSync)["child"]>
type Setter = Child[1] type Setter = Child[1]
const current = createMemo(() => globalSync.child(directory)) const current = createMemo(() => serverSync.child(directory))
const target = (directory?: string) => { const target = (directory?: string) => {
if (!directory || directory === directory) return current() if (!directory || directory === directory) return current()
return globalSync.child(directory) return serverSync.child(directory)
} }
const absolute = (path: string) => (current()[0].path.directory + "/" + path).replace("//", "/") const absolute = (path: string) => (current()[0].path.directory + "/" + path).replace("//", "/")
const initialMessagePageSize = 80 const initialMessagePageSize = 80
@@ -239,7 +239,7 @@ export const createDirSyncContext = (client: OpencodeClient, directory: string)
if (!first) break if (!first) break
const stale = [...(seen.get(first) ?? [])] const stale = [...(seen.get(first) ?? [])]
seen.delete(first) seen.delete(first)
const [, setStore] = globalSync.child(first, { bootstrap: false }) const [, setStore] = serverSync.child(first, { bootstrap: false })
evict(first, setStore, stale) evict(first, setStore, stale)
} }
return created return created
@@ -267,7 +267,7 @@ export const createDirSyncContext = (client: OpencodeClient, directory: string)
if (sessionIDs.length === 0) return if (sessionIDs.length === 0) return
clearSessionPrefetch(directory, sessionIDs) clearSessionPrefetch(directory, sessionIDs)
for (const sessionID of sessionIDs) { for (const sessionID of sessionIDs) {
globalSync.todo.set(sessionID, undefined) serverSync.todo.set(sessionID, undefined)
} }
setStore( setStore(
produce((draft) => { produce((draft) => {
@@ -324,7 +324,7 @@ export const createDirSyncContext = (client: OpencodeClient, directory: string)
for (const messageID of next.confirmed) { for (const messageID of next.confirmed) {
clearOptimistic(input.directory, input.sessionID, messageID) clearOptimistic(input.directory, input.sessionID, messageID)
} }
const [store] = globalSync.child(input.directory, { bootstrap: false }) const [store] = serverSync.child(input.directory, { bootstrap: false })
const cached = input.mode === "prepend" ? (store.message[input.sessionID] ?? []) : [] const cached = input.mode === "prepend" ? (store.message[input.sessionID] ?? []) : []
const message = input.mode === "prepend" ? merge(cached, next.session) : next.session const message = input.mode === "prepend" ? merge(cached, next.session) : next.session
batch(() => { batch(() => {
@@ -373,8 +373,8 @@ export const createDirSyncContext = (client: OpencodeClient, directory: string)
}, },
get project() { get project() {
const store = current()[0] const store = current()[0]
const match = Binary.search(globalSync.data.project, store.project, (p) => p.id) const match = Binary.search(serverSync.data.project, store.project, (p) => p.id)
if (match.found) return globalSync.data.project[match.index] if (match.found) return serverSync.data.project[match.index]
return undefined return undefined
}, },
session: { session: {
@@ -418,7 +418,7 @@ export const createDirSyncContext = (client: OpencodeClient, directory: string)
}) })
}, },
async sync(sessionID: string, opts?: { force?: boolean }) { async sync(sessionID: string, opts?: { force?: boolean }) {
const [store, setStore] = globalSync.child(directory) const [store, setStore] = serverSync.child(directory)
const key = keyFor(directory, sessionID) const key = keyFor(directory, sessionID)
touch(directory, setStore, sessionID) touch(directory, setStore, sessionID)
@@ -488,7 +488,7 @@ export const createDirSyncContext = (client: OpencodeClient, directory: string)
}) })
}, },
async diff(sessionID: string, opts?: { force?: boolean }) { async diff(sessionID: string, opts?: { force?: boolean }) {
const [store, setStore] = globalSync.child(directory) const [store, setStore] = serverSync.child(directory)
touch(directory, setStore, sessionID) touch(directory, setStore, sessionID)
if (store.session_diff[sessionID] !== undefined && !opts?.force) return if (store.session_diff[sessionID] !== undefined && !opts?.force) return
@@ -501,13 +501,13 @@ export const createDirSyncContext = (client: OpencodeClient, directory: string)
) )
}, },
async todo(sessionID: string, opts?: { force?: boolean }) { async todo(sessionID: string, opts?: { force?: boolean }) {
const [store, setStore] = globalSync.child(directory) const [store, setStore] = serverSync.child(directory)
touch(directory, setStore, sessionID) touch(directory, setStore, sessionID)
const existing = store.todo[sessionID] const existing = store.todo[sessionID]
const cached = globalSync.data.session_todo[sessionID] const cached = serverSync.data.session_todo[sessionID]
if (existing !== undefined) { if (existing !== undefined) {
if (cached === undefined) { if (cached === undefined) {
globalSync.todo.set(sessionID, existing) serverSync.todo.set(sessionID, existing)
} }
if (!opts?.force) return if (!opts?.force) return
} }
@@ -522,7 +522,7 @@ export const createDirSyncContext = (client: OpencodeClient, directory: string)
if (!tracked(directory, sessionID)) return if (!tracked(directory, sessionID)) return
const list = todo.data ?? [] const list = todo.data ?? []
setStore("todo", sessionID, reconcile(list, { key: "id" })) setStore("todo", sessionID, reconcile(list, { key: "id" }))
globalSync.todo.set(sessionID, list) serverSync.todo.set(sessionID, list)
}), }),
) )
}, },
@@ -540,7 +540,7 @@ export const createDirSyncContext = (client: OpencodeClient, directory: string)
return meta.loading[key] ?? false return meta.loading[key] ?? false
}, },
async loadMore(sessionID: string, count?: number) { async loadMore(sessionID: string, count?: number) {
const [, setStore] = globalSync.child(directory) const [, setStore] = serverSync.child(directory)
touch(directory, setStore, sessionID) touch(directory, setStore, sessionID)
const key = keyFor(directory, sessionID) const key = keyFor(directory, sessionID)
const step = count ?? historyMessagePageSize const step = count ?? historyMessagePageSize
@@ -561,12 +561,12 @@ export const createDirSyncContext = (client: OpencodeClient, directory: string)
}, },
}, },
evict(sessionID: string, _directory = directory) { evict(sessionID: string, _directory = directory) {
const [, setStore] = globalSync.child(_directory) const [, setStore] = serverSync.child(_directory)
seenFor(_directory).delete(sessionID) seenFor(_directory).delete(sessionID)
evict(_directory, setStore, [sessionID]) evict(_directory, setStore, [sessionID])
}, },
fetch: async (count = 10) => { fetch: async (count = 10) => {
const [store, setStore] = globalSync.child(directory) const [store, setStore] = serverSync.child(directory)
setStore("limit", (x) => x + count) setStore("limit", (x) => x + count)
await client.session.list().then((x) => { await client.session.list().then((x) => {
const sessions = (x.data ?? []) const sessions = (x.data ?? [])
@@ -578,7 +578,7 @@ export const createDirSyncContext = (client: OpencodeClient, directory: string)
}, },
more: createMemo(() => current()[0].session.length >= current()[0].limit), more: createMemo(() => current()[0].session.length >= current()[0].limit),
archive: async (sessionID: string) => { archive: async (sessionID: string) => {
const [, setStore] = globalSync.child(directory) const [, setStore] = serverSync.child(directory)
await client.session.update({ sessionID, time: { archived: Date.now() } }) await client.session.update({ sessionID, time: { archived: Date.now() } })
setStore( setStore(
produce((draft) => { produce((draft) => {
packages/app/src/context/global-sync/bootstrap.ts
+6 -6
View File
@@ -18,7 +18,7 @@ import type { State, VcsCache } from "./types"
import { cmp, normalizeAgentList, normalizeProviderList } from "./utils" import { cmp, normalizeAgentList, normalizeProviderList } from "./utils"
import { formatServerError } from "@/utils/server-errors" import { formatServerError } from "@/utils/server-errors"
import { QueryClient, queryOptions } from "@tanstack/solid-query" import { QueryClient, queryOptions } from "@tanstack/solid-query"
import { loadMcpQuery } from "../global-sync" import { loadMcpQuery } from "../server-sync"
import { NormalizedProviderListResponse } from "@opencode-ai/ui/context" import { NormalizedProviderListResponse } from "@opencode-ai/ui/context"
type GlobalStore = { type GlobalStore = {
@@ -105,7 +105,7 @@ export const loadProjectsQuery = (sdk: OpencodeClient) =>
}) })
export async function bootstrapGlobal(input: { export async function bootstrapGlobal(input: {
globalSDK: OpencodeClient serverSDK: OpencodeClient
requestFailedTitle: string requestFailedTitle: string
translate: (key: string, vars?: Record<string, string | number>) => string translate: (key: string, vars?: Record<string, string | number>) => string
formatMoreCount: (count: number) => string formatMoreCount: (count: number) => string
@@ -113,12 +113,12 @@ export async function bootstrapGlobal(input: {
queryClient: QueryClient queryClient: QueryClient
}) { }) {
const slow = [ const slow = [
() => input.queryClient.fetchQuery(loadGlobalConfigQuery(input.globalSDK)), () => input.queryClient.fetchQuery(loadGlobalConfigQuery(input.serverSDK)),
() => input.queryClient.fetchQuery(loadProvidersQuery(null, input.globalSDK)), () => input.queryClient.fetchQuery(loadProvidersQuery(null, input.serverSDK)),
() => input.queryClient.fetchQuery(loadPathQuery(null, input.globalSDK)), () => input.queryClient.fetchQuery(loadPathQuery(null, input.serverSDK)),
() => () =>
input.queryClient input.queryClient
.fetchQuery(loadProjectsQuery(input.globalSDK)) .fetchQuery(loadProjectsQuery(input.serverSDK))
.then((data) => input.setGlobalStore("project", data)), .then((data) => input.setGlobalStore("project", data)),
] ]
await runAll(slow) await runAll(slow)
packages/app/src/context/global-sync/child-store.test.ts
+1 -1
View File
@@ -3,7 +3,7 @@ import { createRoot, getOwner, type Owner } from "solid-js"
import { createStore } from "solid-js/store" import { createStore } from "solid-js/store"
import type { NormalizedProviderListResponse } from "@opencode-ai/ui/context" import type { NormalizedProviderListResponse } from "@opencode-ai/ui/context"
import type { State } from "./types" import type { State } from "./types"
import type { QueryOptionsApi } from "../global-sync" import type { QueryOptionsApi } from "../server-sync"
let createChildStoreManager: typeof import("./child-store").createChildStoreManager let createChildStoreManager: typeof import("./child-store").createChildStoreManager
packages/app/src/context/global-sync/child-store.ts
+1 -1
View File
@@ -15,7 +15,7 @@ import {
} from "./types" } from "./types"
import { canDisposeDirectory, pickDirectoriesToEvict } from "./eviction" import { canDisposeDirectory, pickDirectoriesToEvict } from "./eviction"
import { useQueries } from "@tanstack/solid-query" import { useQueries } from "@tanstack/solid-query"
import { QueryOptionsApi } from "../global-sync" import { QueryOptionsApi } from "../server-sync"
import { directoryKey, type DirectoryKey } from "./utils" import { directoryKey, type DirectoryKey } from "./utils"
import { NormalizedProviderListResponse } from "@opencode-ai/ui/context" import { NormalizedProviderListResponse } from "@opencode-ai/ui/context"
packages/app/src/context/layout.tsx
+13 -13
View File
@@ -2,8 +2,8 @@ import { createStore, produce } from "solid-js/store"
import { batch, createEffect, createMemo, onCleanup, onMount, type Accessor } from "solid-js" import { batch, createEffect, createMemo, onCleanup, onMount, type Accessor } from "solid-js"
import { createSimpleContext } from "@opencode-ai/ui/context" import { createSimpleContext } from "@opencode-ai/ui/context"
import { makeEventListener } from "@solid-primitives/event-listener" import { makeEventListener } from "@solid-primitives/event-listener"
import { useGlobalSync } from "./global-sync" import { useServerSync } from "./server-sync"
import { useGlobalSDK } from "./global-sdk" import { useServerSDK } from "./server-sdk"
import { useServer } from "./server" import { useServer } from "./server"
import { usePlatform } from "./platform" import { usePlatform } from "./platform"
import { Project } from "@opencode-ai/sdk/v2" import { Project } from "@opencode-ai/sdk/v2"
@@ -136,8 +136,8 @@ const normalizeStoredSessionTabs = (key: string, tabs: SessionTabs) => {
export const { use: useLayout, provider: LayoutProvider } = createSimpleContext({ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext({
name: "Layout", name: "Layout",
init: () => { init: () => {
const globalSdk = useGlobalSDK() const globalSdk = useServerSDK()
const globalSync = useGlobalSync() const serverSync = useServerSync()
const server = useServer() const server = useServer()
const platform = usePlatform() const platform = usePlatform()
@@ -386,11 +386,11 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
} }
function enrich(project: { worktree: string; expanded: boolean }) { function enrich(project: { worktree: string; expanded: boolean }) {
const [childStore] = globalSync.child(project.worktree, { bootstrap: false }) const [childStore] = serverSync.child(project.worktree, { bootstrap: false })
const projectID = childStore.project const projectID = childStore.project
const metadata = projectID const metadata = projectID
? globalSync.data.project.find((x) => x.id === projectID) ? serverSync.data.project.find((x) => x.id === projectID)
: globalSync.data.project.find((x) => x.worktree === project.worktree) : serverSync.data.project.find((x) => x.worktree === project.worktree)
// Preserve local icon override from per-workspace localStorage cache (childStore.icon). // Preserve local icon override from per-workspace localStorage cache (childStore.icon).
// Without this, different subdirectories of the same git repo would share the same // Without this, different subdirectories of the same git repo would share the same
@@ -404,7 +404,7 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
const roots = createMemo(() => { const roots = createMemo(() => {
const map = new Map<string, string>() const map = new Map<string, string>()
for (const project of globalSync.data.project) { for (const project of serverSync.data.project) {
const sandboxes = project.sandboxes ?? [] const sandboxes = project.sandboxes ?? []
for (const sandbox of sandboxes) { for (const sandbox of sandboxes) {
map.set(sandbox, project.worktree) map.set(sandbox, project.worktree)
@@ -470,12 +470,12 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
createEffect(() => { createEffect(() => {
const projects = enriched() const projects = enriched()
if (projects.length === 0) return if (projects.length === 0) return
if (!globalSync.ready) return if (!serverSync.ready) return
for (const project of projects) { for (const project of projects) {
if (!project.id) continue if (!project.id) continue
if (project.id === "global") continue if (project.id === "global") continue
globalSync.project.icon(project.worktree, project.icon?.override) serverSync.project.icon(project.worktree, project.icon?.override)
} }
}) })
@@ -509,7 +509,7 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
colorRequested.set(worktree, color) colorRequested.set(worktree, color)
if (project.id === "global") { if (project.id === "global") {
globalSync.project.meta(worktree, { icon: { color } }) serverSync.project.meta(worktree, { icon: { color } })
continue continue
} }
@@ -531,7 +531,7 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
sessionTimer = undefined sessionTimer = undefined
void Promise.all( void Promise.all(
server.projects.list().map((project) => { server.projects.list().map((project) => {
return globalSync.project.loadSessions(project.worktree) return serverSync.project.loadSessions(project.worktree)
}), }),
) )
}, 0) }, 0)
@@ -560,7 +560,7 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
open(directory: string) { open(directory: string) {
const root = rootFor(directory) const root = rootFor(directory)
if (server.projects.list().find((x) => x.worktree === root)) return if (server.projects.list().find((x) => x.worktree === root)) return
void globalSync.project.loadSessions(root) void serverSync.project.loadSessions(root)
server.projects.open(root) server.projects.open(root)
}, },
close(directory: string) { close(directory: string) {
packages/app/src/context/notification.tsx
+7 -7
View File
@@ -2,8 +2,8 @@ import { createStore, reconcile } from "solid-js/store"
import { batch, createEffect, createMemo, onCleanup } from "solid-js" import { batch, createEffect, createMemo, onCleanup } from "solid-js"
import { useParams } from "@solidjs/router" import { useParams } from "@solidjs/router"
import { createSimpleContext } from "@opencode-ai/ui/context" import { createSimpleContext } from "@opencode-ai/ui/context"
import { useGlobalSDK } from "./global-sdk" import { useServerSDK } from "./server-sdk"
import { useGlobalSync } from "./global-sync" import { useServerSync } from "./server-sync"
import { usePlatform } from "@/context/platform" import { usePlatform } from "@/context/platform"
import { useLanguage } from "@/context/language" import { useLanguage } from "@/context/language"
import { useSettings } from "@/context/settings" import { useSettings } from "@/context/settings"
@@ -109,8 +109,8 @@ export const { use: useNotification, provider: NotificationProvider } = createSi
name: "Notification", name: "Notification",
init: () => { init: () => {
const params = useParams() const params = useParams()
const globalSDK = useGlobalSDK() const serverSDK = useServerSDK()
const globalSync = useGlobalSync() const serverSync = useServerSync()
const platform = usePlatform() const platform = usePlatform()
const settings = useSettings() const settings = useSettings()
const language = useLanguage() const language = useLanguage()
@@ -207,10 +207,10 @@ export const { use: useNotification, provider: NotificationProvider } = createSi
const lookup = async (directory: string, sessionID?: string) => { const lookup = async (directory: string, sessionID?: string) => {
if (!sessionID) return undefined if (!sessionID) return undefined
const [syncStore] = globalSync.child(directory, { bootstrap: false }) const [syncStore] = serverSync.child(directory, { bootstrap: false })
const match = Binary.search(syncStore.session, sessionID, (s) => s.id) const match = Binary.search(syncStore.session, sessionID, (s) => s.id)
if (match.found) return syncStore.session[match.index] if (match.found) return syncStore.session[match.index]
return globalSDK.client.session return serverSDK.client.session
.get({ directory, sessionID }) .get({ directory, sessionID })
.then((x) => x.data) .then((x) => x.data)
.catch(() => undefined) .catch(() => undefined)
@@ -285,7 +285,7 @@ export const { use: useNotification, provider: NotificationProvider } = createSi
}) })
} }
const unsub = globalSDK.event.listen((e) => { const unsub = serverSDK.event.listen((e) => {
const event = e.details const event = e.details
if (event.type !== "session.idle" && event.type !== "session.error") return if (event.type !== "session.idle" && event.type !== "session.error") return
packages/app/src/context/permission.tsx
+13 -13
View File
@@ -3,8 +3,8 @@ import { createStore, produce } from "solid-js/store"
import { createSimpleContext } from "@opencode-ai/ui/context" import { createSimpleContext } from "@opencode-ai/ui/context"
import type { PermissionRequest } from "@opencode-ai/sdk/v2/client" import type { PermissionRequest } from "@opencode-ai/sdk/v2/client"
import { Persist, persisted } from "@/utils/persist" import { Persist, persisted } from "@/utils/persist"
import { useGlobalSDK } from "@/context/global-sdk" import { useServerSDK } from "@/context/server-sdk"
import { useGlobalSync } from "./global-sync" import { useServerSync } from "./server-sync"
import { useParams } from "@solidjs/router" import { useParams } from "@solidjs/router"
import { decode64 } from "@/utils/base64" import { decode64 } from "@/utils/base64"
import { import {
@@ -48,13 +48,13 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
name: "Permission", name: "Permission",
init: () => { init: () => {
const params = useParams() const params = useParams()
const globalSDK = useGlobalSDK() const serverSDK = useServerSDK()
const globalSync = useGlobalSync() const serverSync = useServerSync()
const permissionsEnabled = createMemo(() => { const permissionsEnabled = createMemo(() => {
const directory = decode64(params.dir) const directory = decode64(params.dir)
if (!directory) return false if (!directory) return false
const [store] = globalSync.child(directory) const [store] = serverSync.child(directory)
return hasPermissionPromptRules(store.config.permission) return hasPermissionPromptRules(store.config.permission)
}) })
@@ -86,7 +86,7 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
if (!ready()) return if (!ready()) return
const directory = decode64(params.dir) const directory = decode64(params.dir)
if (!directory) return if (!directory) return
const [childStore] = globalSync.child(directory) const [childStore] = serverSync.child(directory)
const perm = childStore.config.permission const perm = childStore.config.permission
if (typeof perm === "string" && perm === "allow") { if (typeof perm === "string" && perm === "allow") {
const key = directoryAcceptKey(directory) const key = directoryAcceptKey(directory)
@@ -118,7 +118,7 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
} }
const respond: PermissionRespondFn = (input) => { const respond: PermissionRespondFn = (input) => {
globalSDK.client.permission.respond(input).catch(() => { serverSDK.client.permission.respond(input).catch(() => {
responded.delete(input.permissionID) responded.delete(input.permissionID)
}) })
} }
@@ -139,7 +139,7 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
} }
function isAutoAccepting(sessionID: string, directory?: string) { function isAutoAccepting(sessionID: string, directory?: string) {
const session = directory ? globalSync.child(directory, { bootstrap: false })[0].session : [] const session = directory ? serverSync.child(directory, { bootstrap: false })[0].session : []
return autoRespondsPermission(store.autoAccept, session, { sessionID }, directory) return autoRespondsPermission(store.autoAccept, session, { sessionID }, directory)
} }
@@ -148,7 +148,7 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
} }
function shouldAutoRespond(permission: PermissionRequest, directory?: string) { function shouldAutoRespond(permission: PermissionRequest, directory?: string) {
const session = directory ? globalSync.child(directory, { bootstrap: false })[0].session : [] const session = directory ? serverSync.child(directory, { bootstrap: false })[0].session : []
return autoRespondsPermission(store.autoAccept, session, permission, directory) return autoRespondsPermission(store.autoAccept, session, permission, directory)
} }
@@ -159,7 +159,7 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
return next return next
} }
const unsubscribe = globalSDK.event.listen((e) => { const unsubscribe = serverSDK.event.listen((e) => {
const event = e.details const event = e.details
if (event?.type !== "permission.asked") return if (event?.type !== "permission.asked") return
@@ -178,7 +178,7 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
}), }),
) )
globalSDK.client.permission serverSDK.client.permission
.list({ directory }) .list({ directory })
.then((x) => { .then((x) => {
if (!isAutoAcceptingDirectory(directory)) return if (!isAutoAcceptingDirectory(directory)) return
@@ -210,7 +210,7 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
}), }),
) )
globalSDK.client.permission serverSDK.client.permission
.list({ directory }) .list({ directory })
.then((x) => { .then((x) => {
if (enableVersion.get(key) !== version) return if (enableVersion.get(key) !== version) return
@@ -268,7 +268,7 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
}, },
permissionsEnabled, permissionsEnabled,
isPermissionAllowAll(directory: string) { isPermissionAllowAll(directory: string) {
const [childStore] = globalSync.child(directory) const [childStore] = serverSync.child(directory)
const perm = childStore.config.permission const perm = childStore.config.permission
return typeof perm === "string" && perm === "allow" return typeof perm === "string" && perm === "allow"
}, },
packages/app/src/context/sdk.tsx
+3 -3
View File
@@ -1,11 +1,11 @@
import { createSimpleContext } from "@opencode-ai/ui/context" import { createSimpleContext } from "@opencode-ai/ui/context"
import { useGlobalSDK } from "./global-sdk" import { useServerSDK } from "./server-sdk"
export const { use: useSDK, provider: SDKProvider } = createSimpleContext({ export const { use: useSDK, provider: SDKProvider } = createSimpleContext({
name: "SDK", name: "SDK",
init: (props: { directory: string }) => { init: (props: { directory: string }) => {
const globalSDK = useGlobalSDK() const serverSDK = useServerSDK()
return globalSDK.createDirSyncContext(props.directory) return serverSDK.createDirSyncContext(props.directory)
}, },
}) })
packages/app/src/context/global-sdk.tsx → packages/app/src/context/server-sdk.tsx
+9 -9
View File
@@ -11,7 +11,7 @@ import { useServer } from "./server"
const isAbortError = (error: unknown) => const isAbortError = (error: unknown) =>
error !== null && typeof error === "object" && "name" in error && error.name === "AbortError" error !== null && typeof error === "object" && "name" in error && error.name === "AbortError"
export const { use: useGlobalSDK, provider: GlobalSDKProvider } = createSimpleContext({ export const { use: useServerSDK, provider: ServerSDKProvider } = createSimpleContext({
name: "GlobalSDK", name: "GlobalSDK",
init: () => { init: () => {
const language = useLanguage() const language = useLanguage()
@@ -31,7 +31,7 @@ export const { use: useGlobalSDK, provider: GlobalSDKProvider } = createSimpleCo
})() })()
const currentServer = server.current const currentServer = server.current
if (!currentServer) throw new Error(language.t("error.globalSDK.noServerAvailable")) if (!currentServer) throw new Error(language.t("error.serverSDK.noServerAvailable"))
const eventSdk = createSdkForServer({ const eventSdk = createSdkForServer({
signal: abort.signal, signal: abort.signal,
@@ -245,7 +245,7 @@ export const { use: useGlobalSDK, provider: GlobalSDKProvider } = createSimpleCo
}, },
createClient(opts: Omit<Parameters<typeof createSdkForServer>[0], "server" | "fetch">) { createClient(opts: Omit<Parameters<typeof createSdkForServer>[0], "server" | "fetch">) {
const s = server.current const s = server.current
if (!s) throw new Error(language.t("error.globalSDK.serverNotAvailable")) if (!s) throw new Error(language.t("error.serverSDK.serverNotAvailable"))
return createSdkForServer({ return createSdkForServer({
server: s.http, server: s.http,
fetch: platform.fetch, fetch: platform.fetch,
@@ -281,16 +281,16 @@ type SDKEventMap = {
} }
function createDirSdkContext(directory: string) { function createDirSdkContext(directory: string) {
const globalSDK = useGlobalSDK() const serverSDK = useServerSDK()
const client = globalSDK.createClient({ const client = serverSDK.createClient({
directory, directory,
throwOnError: true, throwOnError: true,
}) })
const emitter = createGlobalEmitter<SDKEventMap>() const emitter = createGlobalEmitter<SDKEventMap>()
const unsub = globalSDK.event.on(directory, (event) => { const unsub = serverSDK.event.on(directory, (event) => {
emitter.emit(event.type, event) emitter.emit(event.type, event)
}) })
onCleanup(unsub) onCleanup(unsub)
@@ -300,10 +300,10 @@ function createDirSdkContext(directory: string) {
client, client,
event: emitter, event: emitter,
get url() { get url() {
return globalSDK.url return serverSDK.url
}, },
createClient(opts: Parameters<typeof globalSDK.createClient>[0]) { createClient(opts: Parameters<typeof serverSDK.createClient>[0]) {
return globalSDK.createClient(opts) return serverSDK.createClient(opts)
}, },
} }
} }
packages/app/src/context/global-sync.test.ts → packages/app/src/context/server-sync.test.ts
View File
packages/app/src/context/global-sync.tsx → packages/app/src/context/server-sync.tsx
+26 -26
View File
@@ -5,7 +5,7 @@ import { batch, createContext, getOwner, onCleanup, onMount, type ParentProps, u
import { createStore, produce, reconcile } from "solid-js/store" import { createStore, produce, reconcile } from "solid-js/store"
import { useLanguage } from "@/context/language" import { useLanguage } from "@/context/language"
import type { InitError } from "../pages/error" import type { InitError } from "../pages/error"
import { useGlobalSDK } from "./global-sdk" import { useServerSDK } from "./server-sdk"
import { import {
bootstrapDirectory, bootstrapDirectory,
bootstrapGlobal, bootstrapGlobal,
@@ -57,13 +57,13 @@ export const loadLspQuery = (directory: string, sdk: OpencodeClient) =>
queryFn: () => sdk.lsp.status().then((r) => r.data ?? []), queryFn: () => sdk.lsp.status().then((r) => r.data ?? []),
}) })
function makeQueryOptionsApi(globalSDK: () => OpencodeClient, sdkFor: (dir: PathKey) => OpencodeClient) { function makeQueryOptionsApi(serverSDK: () => OpencodeClient, sdkFor: (dir: PathKey) => OpencodeClient) {
return { return {
globalConfig: () => loadGlobalConfigQuery(globalSDK()), globalConfig: () => loadGlobalConfigQuery(serverSDK()),
projects: () => loadProjectsQuery(globalSDK()), projects: () => loadProjectsQuery(serverSDK()),
providers: (directory: PathKey | null) => providers: (directory: PathKey | null) =>
loadProvidersQuery(directory, directory === null ? globalSDK() : sdkFor(directory)), loadProvidersQuery(directory, directory === null ? serverSDK() : sdkFor(directory)),
path: (directory: PathKey | null) => loadPathQuery(directory, directory === null ? globalSDK() : sdkFor(directory)), path: (directory: PathKey | null) => loadPathQuery(directory, directory === null ? serverSDK() : sdkFor(directory)),
agents: (directory: PathKey) => loadAgentsQuery(directory, sdkFor(directory)), agents: (directory: PathKey) => loadAgentsQuery(directory, sdkFor(directory)),
mcp: (directory: PathKey) => loadMcpQuery(directory, sdkFor(directory)), mcp: (directory: PathKey) => loadMcpQuery(directory, sdkFor(directory)),
lsp: (directory: PathKey) => loadLspQuery(directory, sdkFor(directory)), lsp: (directory: PathKey) => loadLspQuery(directory, sdkFor(directory)),
@@ -72,11 +72,11 @@ function makeQueryOptionsApi(globalSDK: () => OpencodeClient, sdkFor: (dir: Path
} }
export type QueryOptionsApi = ReturnType<typeof makeQueryOptionsApi> export type QueryOptionsApi = ReturnType<typeof makeQueryOptionsApi>
function createGlobalSync() { function createServerSyncContext() {
const globalSDK = useGlobalSDK() const serverSDK = useServerSDK()
const language = useLanguage() const language = useLanguage()
const owner = getOwner() const owner = getOwner()
if (!owner) throw new Error("GlobalSync must be created within owner") if (!owner) throw new Error("ServerSync must be created within owner")
const sdkCache = new Map<string, OpencodeClient>() const sdkCache = new Map<string, OpencodeClient>()
const booting = new Map<string, Promise<void>>() const booting = new Map<string, Promise<void>>()
@@ -87,7 +87,7 @@ function createGlobalSync() {
const key = directoryKey(directory) const key = directoryKey(directory)
const cached = sdkCache.get(key) const cached = sdkCache.get(key)
if (cached) return cached if (cached) return cached
const sdk = globalSDK.createClient({ const sdk = serverSDK.createClient({
directory, directory,
throwOnError: true, throwOnError: true,
}) })
@@ -95,7 +95,7 @@ function createGlobalSync() {
return sdk return sdk
} }
const queryOptionsApi = makeQueryOptionsApi(() => globalSDK.client, sdkFor) const queryOptionsApi = makeQueryOptionsApi(() => serverSDK.client, sdkFor)
const [configQuery, providerQuery, pathQuery] = useQueries(() => ({ const [configQuery, providerQuery, pathQuery] = useQueries(() => ({
queries: [queryOptionsApi.globalConfig(), queryOptionsApi.providers(null), queryOptionsApi.path(null)], queries: [queryOptionsApi.globalConfig(), queryOptionsApi.providers(null), queryOptionsApi.path(null)],
@@ -154,7 +154,7 @@ function createGlobalSync() {
queryKey: ["bootstrap"], queryKey: ["bootstrap"],
queryFn: async () => { queryFn: async () => {
await bootstrapGlobal({ await bootstrapGlobal({
globalSDK: globalSDK.client, serverSDK: serverSDK.client,
requestFailedTitle: language.t("common.requestFailed"), requestFailedTitle: language.t("common.requestFailed"),
translate: language.t, translate: language.t,
formatMoreCount: (count) => language.t("common.moreCountSuffix", { count }), formatMoreCount: (count) => language.t("common.moreCountSuffix", { count }),
@@ -248,7 +248,7 @@ function createGlobalSync() {
loadRootSessionsWithFallback({ loadRootSessionsWithFallback({
directory, directory,
limit, limit,
list: (query) => globalSDK.client.session.list(query), list: (query) => serverSDK.client.session.list(query),
}) })
.then((x) => { .then((x) => {
const nonArchived = (x.data ?? []) const nonArchived = (x.data ?? [])
@@ -334,7 +334,7 @@ function createGlobalSync() {
return promise return promise
} }
const unsub = globalSDK.event.listen((e) => { const unsub = serverSDK.event.listen((e) => {
const directory = e.name const directory = e.name
const key = directoryKey(directory) const key = directoryKey(directory)
const event = e.details const event = e.details
@@ -393,13 +393,13 @@ function createGlobalSync() {
eventFrame = undefined eventFrame = undefined
eventTimer = setTimeout(() => { eventTimer = setTimeout(() => {
eventTimer = undefined eventTimer = undefined
void globalSDK.event.start() void serverSDK.event.start()
}, 0) }, 0)
}) })
} else { } else {
eventTimer = setTimeout(() => { eventTimer = setTimeout(() => {
eventTimer = undefined eventTimer = undefined
void globalSDK.event.start() void serverSDK.event.start()
}, 0) }, 0)
} }
}) })
@@ -415,7 +415,7 @@ function createGlobalSync() {
} }
const updateConfigMutation = useMutation(() => ({ const updateConfigMutation = useMutation(() => ({
mutationFn: (config: Config) => globalSDK.client.global.config.update({ config }), mutationFn: (config: Config) => serverSDK.client.global.config.update({ config }),
onSuccess: () => { onSuccess: () => {
bootstrap.refetch() bootstrap.refetch()
// Invalidate all provider queries so newly configured custom providers // Invalidate all provider queries so newly configured custom providers
@@ -460,7 +460,7 @@ function createGlobalSync() {
dirSyncContextRefCounts.set(directory, (dirSyncContextRefCounts.get(directory) ?? 0) + 1) dirSyncContextRefCounts.set(directory, (dirSyncContextRefCounts.get(directory) ?? 0) + 1)
return cached return cached
} }
const ctx = createDirSyncContext(globalSDK.createClient({ directory, throwOnError: true }), directory) const ctx = createDirSyncContext(serverSDK.createClient({ directory, throwOnError: true }), directory)
dirSyncContexts.set(directory, ctx) dirSyncContexts.set(directory, ctx)
dirSyncContextRefCounts.set(directory, 1) dirSyncContextRefCounts.set(directory, 1)
@@ -469,19 +469,19 @@ function createGlobalSync() {
} }
} }
const GlobalSyncContext = createContext<ReturnType<typeof createGlobalSync>>() const ServerSyncContext = createContext<ReturnType<typeof createServerSyncContext>>()
export function GlobalSyncProvider(props: ParentProps) { export function ServerSyncProvider(props: ParentProps) {
const value = createGlobalSync() const value = createServerSyncContext()
return <GlobalSyncContext.Provider value={value}>{props.children}</GlobalSyncContext.Provider> return <ServerSyncContext.Provider value={value}>{props.children}</ServerSyncContext.Provider>
} }
export function useGlobalSync() { export function useServerSync() {
const context = useContext(GlobalSyncContext) const context = useContext(ServerSyncContext)
if (!context) throw new Error("useGlobalSync must be used within GlobalSyncProvider") if (!context) throw new Error("useServerSync must be used within ServerSyncProvider")
return context return context
} }
export function useQueryOptions() { export function useQueryOptions() {
return useGlobalSync().queryOptions return useServerSync().queryOptions
} }
packages/app/src/context/sync.tsx
+3 -3
View File
@@ -1,5 +1,5 @@
import { Binary } from "@opencode-ai/core/util/binary" import { Binary } from "@opencode-ai/core/util/binary"
import { useGlobalSync } from "./global-sync" import { useServerSync } from "./server-sync"
import { useSDK } from "./sdk" import { useSDK } from "./sdk"
import type { Message, Part } from "@opencode-ai/sdk/v2/client" import type { Message, Part } from "@opencode-ai/sdk/v2/client"
@@ -109,8 +109,8 @@ export function applyOptimisticRemove(draft: OptimisticStore, input: OptimisticR
} }
export const useSync = () => { export const useSync = () => {
const globalSync = useGlobalSync() const serverSync = useServerSync()
const sdk = useSDK() const sdk = useSDK()
return globalSync.createDirSyncContext(sdk.directory) return serverSync.createDirSyncContext(sdk.directory)
} }
packages/app/src/hooks/use-providers.ts
+4 -4
View File
@@ -1,4 +1,4 @@
import { useGlobalSync } from "@/context/global-sync" import { useServerSync } from "@/context/server-sync"
import { decode64 } from "@/utils/base64" import { decode64 } from "@/utils/base64"
import { useParams } from "@solidjs/router" import { useParams } from "@solidjs/router"
import { Iterable, pipe } from "effect" import { Iterable, pipe } from "effect"
@@ -17,15 +17,15 @@ export const popularProviders = [
const popularProviderSet = new Set(popularProviders) const popularProviderSet = new Set(popularProviders)
export function useProviders() { export function useProviders() {
const globalSync = useGlobalSync() const serverSync = useServerSync()
const params = useParams() const params = useParams()
const dir = createMemo(() => decode64(params.dir) ?? "") const dir = createMemo(() => decode64(params.dir) ?? "")
const providers = () => { const providers = () => {
if (dir()) { if (dir()) {
const [projectStore] = globalSync.child(dir()) const [projectStore] = serverSync.child(dir())
if (projectStore.provider_ready) return projectStore.provider if (projectStore.provider_ready) return projectStore.provider
} }
return globalSync.data.provider return serverSync.data.provider
} }
return { return {
all: () => providers().all, all: () => providers().all,
packages/app/src/i18n/ar.ts
+3 -3
View File
@@ -413,7 +413,7 @@ export const dict = {
"error.page.version": "الإصدار: {{version}}", "error.page.version": "الإصدار: {{version}}",
"error.dev.rootNotFound": "error.dev.rootNotFound":
"لم يتم العثور على العنصر الجذري. هل نسيت إضافته إلى index.html؟ أو ربما تمت كتابة سمة id بشكل خاطئ؟", "لم يتم العثور على العنصر الجذري. هل نسيت إضافته إلى index.html؟ أو ربما تمت كتابة سمة id بشكل خاطئ؟",
"error.globalSync.connectFailed": "تعذر الاتصال بالخادم. هل هناك خادم يعمل في `{{url}}`؟", "error.serverSync.connectFailed": "تعذر الاتصال بالخادم. هل هناك خادم يعمل في `{{url}}`؟",
"directory.error.invalidUrl": "دليل غير صالح في عنوان URL.", "directory.error.invalidUrl": "دليل غير صالح في عنوان URL.",
"error.chain.unknown": "خطأ غير معروف", "error.chain.unknown": "خطأ غير معروف",
"error.chain.causedBy": "بسبب:", "error.chain.causedBy": "بسبب:",
@@ -837,8 +837,8 @@ export const dict = {
"common.key.insert": "Insert", "common.key.insert": "Insert",
"common.unknown": "غير معروف", "common.unknown": "غير معروف",
"error.page.circular": "[دائري]", "error.page.circular": "[دائري]",
"error.globalSDK.noServerAvailable": "لا يوجد خادم متاح", "error.serverSDK.noServerAvailable": "لا يوجد خادم متاح",
"error.globalSDK.serverNotAvailable": "الخادم غير متاح", "error.serverSDK.serverNotAvailable": "الخادم غير متاح",
"error.childStore.persistedCacheCreateFailed": "فشل إنشاء ذاكرة التخزين المؤقت الدائمة", "error.childStore.persistedCacheCreateFailed": "فشل إنشاء ذاكرة التخزين المؤقت الدائمة",
"error.childStore.persistedProjectMetadataCreateFailed": "فشل إنشاء بيانات تعريف المشروع الدائمة", "error.childStore.persistedProjectMetadataCreateFailed": "فشل إنشاء بيانات تعريف المشروع الدائمة",
"error.childStore.persistedProjectIconCreateFailed": "فشل إنشاء أيقونة المشروع الدائمة", "error.childStore.persistedProjectIconCreateFailed": "فشل إنشاء أيقونة المشروع الدائمة",
packages/app/src/i18n/br.ts
+3 -3
View File
@@ -414,7 +414,7 @@ export const dict = {
"error.page.version": "Versão: {{version}}", "error.page.version": "Versão: {{version}}",
"error.dev.rootNotFound": "error.dev.rootNotFound":
"Elemento raiz não encontrado. Você esqueceu de adicioná-lo ao seu index.html? Ou talvez o atributo id foi escrito incorretamente?", "Elemento raiz não encontrado. Você esqueceu de adicioná-lo ao seu index.html? Ou talvez o atributo id foi escrito incorretamente?",
"error.globalSync.connectFailed": "Não foi possível conectar ao servidor. Há um servidor executando em `{{url}}`?", "error.serverSync.connectFailed": "Não foi possível conectar ao servidor. Há um servidor executando em `{{url}}`?",
"directory.error.invalidUrl": "Diretório inválido na URL.", "directory.error.invalidUrl": "Diretório inválido na URL.",
"error.chain.unknown": "Erro desconhecido", "error.chain.unknown": "Erro desconhecido",
"error.chain.causedBy": "Causado por:", "error.chain.causedBy": "Causado por:",
@@ -850,8 +850,8 @@ export const dict = {
"common.key.insert": "Insert", "common.key.insert": "Insert",
"common.unknown": "desconhecido", "common.unknown": "desconhecido",
"error.page.circular": "[Circular]", "error.page.circular": "[Circular]",
"error.globalSDK.noServerAvailable": "Nenhum servidor disponível", "error.serverSDK.noServerAvailable": "Nenhum servidor disponível",
"error.globalSDK.serverNotAvailable": "Servidor indisponível", "error.serverSDK.serverNotAvailable": "Servidor indisponível",
"error.childStore.persistedCacheCreateFailed": "Falha ao criar cache persistente", "error.childStore.persistedCacheCreateFailed": "Falha ao criar cache persistente",
"error.childStore.persistedProjectMetadataCreateFailed": "Falha ao criar metadados de projeto persistentes", "error.childStore.persistedProjectMetadataCreateFailed": "Falha ao criar metadados de projeto persistentes",
"error.childStore.persistedProjectIconCreateFailed": "Falha ao criar ícone de projeto persistente", "error.childStore.persistedProjectIconCreateFailed": "Falha ao criar ícone de projeto persistente",
packages/app/src/i18n/bs.ts
+3 -3
View File
@@ -462,7 +462,7 @@ export const dict = {
"error.dev.rootNotFound": "error.dev.rootNotFound":
"Korijenski element nije pronađen. Da li si zaboravio da ga dodaš u index.html? Ili je možda id atribut pogrešno napisan?", "Korijenski element nije pronađen. Da li si zaboravio da ga dodaš u index.html? Ili je možda id atribut pogrešno napisan?",
"error.globalSync.connectFailed": "Nije moguće povezati se na server. Da li server radi na `{{url}}`?", "error.serverSync.connectFailed": "Nije moguće povezati se na server. Da li server radi na `{{url}}`?",
"directory.error.invalidUrl": "Nevažeći direktorij u URL-u.", "directory.error.invalidUrl": "Nevažeći direktorij u URL-u.",
"error.chain.unknown": "Nepoznata greška", "error.chain.unknown": "Nepoznata greška",
@@ -926,8 +926,8 @@ export const dict = {
"common.key.insert": "Insert", "common.key.insert": "Insert",
"common.unknown": "nepoznato", "common.unknown": "nepoznato",
"error.page.circular": "[Kružno]", "error.page.circular": "[Kružno]",
"error.globalSDK.noServerAvailable": "Nema dostupnog servera", "error.serverSDK.noServerAvailable": "Nema dostupnog servera",
"error.globalSDK.serverNotAvailable": "Server nije dostupan", "error.serverSDK.serverNotAvailable": "Server nije dostupan",
"error.childStore.persistedCacheCreateFailed": "Nije uspjelo kreiranje trajnog keša", "error.childStore.persistedCacheCreateFailed": "Nije uspjelo kreiranje trajnog keša",
"error.childStore.persistedProjectMetadataCreateFailed": "Nije uspjelo kreiranje trajnih metapodataka projekta", "error.childStore.persistedProjectMetadataCreateFailed": "Nije uspjelo kreiranje trajnih metapodataka projekta",
"error.childStore.persistedProjectIconCreateFailed": "Nije uspjelo kreiranje trajne ikone projekta", "error.childStore.persistedProjectIconCreateFailed": "Nije uspjelo kreiranje trajne ikone projekta",
packages/app/src/i18n/da.ts
+3 -3
View File
@@ -459,7 +459,7 @@ export const dict = {
"error.dev.rootNotFound": "error.dev.rootNotFound":
"Rodelement ikke fundet. Har du glemt at tilføje det til din index.html? Eller måske er id-attributten stavet forkert?", "Rodelement ikke fundet. Har du glemt at tilføje det til din index.html? Eller måske er id-attributten stavet forkert?",
"error.globalSync.connectFailed": "Kunne ikke forbinde til server. Kører der en server på `{{url}}`?", "error.serverSync.connectFailed": "Kunne ikke forbinde til server. Kører der en server på `{{url}}`?",
"directory.error.invalidUrl": "Ugyldig mappe i URL.", "directory.error.invalidUrl": "Ugyldig mappe i URL.",
"error.chain.unknown": "Ukendt fejl", "error.chain.unknown": "Ukendt fejl",
@@ -920,8 +920,8 @@ export const dict = {
"common.key.insert": "Insert", "common.key.insert": "Insert",
"common.unknown": "ukendt", "common.unknown": "ukendt",
"error.page.circular": "[Cirkulær]", "error.page.circular": "[Cirkulær]",
"error.globalSDK.noServerAvailable": "Ingen server tilgængelig", "error.serverSDK.noServerAvailable": "Ingen server tilgængelig",
"error.globalSDK.serverNotAvailable": "Server ikke tilgængelig", "error.serverSDK.serverNotAvailable": "Server ikke tilgængelig",
"error.childStore.persistedCacheCreateFailed": "Kunne ikke oprette vedvarende cache", "error.childStore.persistedCacheCreateFailed": "Kunne ikke oprette vedvarende cache",
"error.childStore.persistedProjectMetadataCreateFailed": "Kunne ikke oprette vedvarende projektmetadata", "error.childStore.persistedProjectMetadataCreateFailed": "Kunne ikke oprette vedvarende projektmetadata",
"error.childStore.persistedProjectIconCreateFailed": "Kunne ikke oprette vedvarende projektikon", "error.childStore.persistedProjectIconCreateFailed": "Kunne ikke oprette vedvarende projektikon",
packages/app/src/i18n/de.ts
+3 -3
View File
@@ -421,7 +421,7 @@ export const dict = {
"error.page.version": "Version: {{version}}", "error.page.version": "Version: {{version}}",
"error.dev.rootNotFound": "error.dev.rootNotFound":
"Wurzelelement nicht gefunden. Haben Sie vergessen, es in Ihre index.html aufzunehmen? Oder wurde das id-Attribut falsch geschrieben?", "Wurzelelement nicht gefunden. Haben Sie vergessen, es in Ihre index.html aufzunehmen? Oder wurde das id-Attribut falsch geschrieben?",
"error.globalSync.connectFailed": "Verbindung zum Server fehlgeschlagen. Läuft ein Server unter `{{url}}`?", "error.serverSync.connectFailed": "Verbindung zum Server fehlgeschlagen. Läuft ein Server unter `{{url}}`?",
"directory.error.invalidUrl": "Ungültiges Verzeichnis in der URL.", "directory.error.invalidUrl": "Ungültiges Verzeichnis in der URL.",
"error.chain.unknown": "Unbekannter Fehler", "error.chain.unknown": "Unbekannter Fehler",
"error.chain.causedBy": "Verursacht durch:", "error.chain.causedBy": "Verursacht durch:",
@@ -862,8 +862,8 @@ export const dict = {
"common.key.insert": "Einfg", "common.key.insert": "Einfg",
"common.unknown": "unbekannt", "common.unknown": "unbekannt",
"error.page.circular": "[Zirkulär]", "error.page.circular": "[Zirkulär]",
"error.globalSDK.noServerAvailable": "Kein Server verfügbar", "error.serverSDK.noServerAvailable": "Kein Server verfügbar",
"error.globalSDK.serverNotAvailable": "Server nicht verfügbar", "error.serverSDK.serverNotAvailable": "Server nicht verfügbar",
"error.childStore.persistedCacheCreateFailed": "Dauerhafter Cache konnte nicht erstellt werden", "error.childStore.persistedCacheCreateFailed": "Dauerhafter Cache konnte nicht erstellt werden",
"error.childStore.persistedProjectMetadataCreateFailed": "Dauerhafte Projektmetadaten konnten nicht erstellt werden", "error.childStore.persistedProjectMetadataCreateFailed": "Dauerhafte Projektmetadaten konnten nicht erstellt werden",
"error.childStore.persistedProjectIconCreateFailed": "Dauerhaftes Projekticon konnte nicht erstellt werden", "error.childStore.persistedProjectIconCreateFailed": "Dauerhaftes Projekticon konnte nicht erstellt werden",
packages/app/src/i18n/en.ts
+3 -3
View File
@@ -482,9 +482,9 @@ export const dict = {
"error.dev.rootNotFound": "error.dev.rootNotFound":
"Root element not found. Did you forget to add it to your index.html? Or maybe the id attribute got misspelled?", "Root element not found. Did you forget to add it to your index.html? Or maybe the id attribute got misspelled?",
"error.globalSync.connectFailed": "Could not connect to server. Is there a server running at `{{url}}`?", "error.serverSync.connectFailed": "Could not connect to server. Is there a server running at `{{url}}`?",
"error.globalSDK.noServerAvailable": "No server available", "error.serverSDK.noServerAvailable": "No server available",
"error.globalSDK.serverNotAvailable": "Server not available", "error.serverSDK.serverNotAvailable": "Server not available",
"error.childStore.persistedCacheCreateFailed": "Failed to create persisted cache", "error.childStore.persistedCacheCreateFailed": "Failed to create persisted cache",
"error.childStore.persistedProjectMetadataCreateFailed": "Failed to create persisted project metadata", "error.childStore.persistedProjectMetadataCreateFailed": "Failed to create persisted project metadata",
"error.childStore.persistedProjectIconCreateFailed": "Failed to create persisted project icon", "error.childStore.persistedProjectIconCreateFailed": "Failed to create persisted project icon",
packages/app/src/i18n/es.ts
+3 -3
View File
@@ -462,7 +462,7 @@ export const dict = {
"error.dev.rootNotFound": "error.dev.rootNotFound":
"Elemento raíz no encontrado. ¿Olvidaste añadirlo a tu index.html? ¿O tal vez el atributo id está mal escrito?", "Elemento raíz no encontrado. ¿Olvidaste añadirlo a tu index.html? ¿O tal vez el atributo id está mal escrito?",
"error.globalSync.connectFailed": "No se pudo conectar al servidor. ¿Hay un servidor ejecutándose en `{{url}}`?", "error.serverSync.connectFailed": "No se pudo conectar al servidor. ¿Hay un servidor ejecutándose en `{{url}}`?",
"directory.error.invalidUrl": "URL de directorio inválida.", "directory.error.invalidUrl": "URL de directorio inválida.",
"error.chain.unknown": "Error desconocido", "error.chain.unknown": "Error desconocido",
@@ -933,8 +933,8 @@ export const dict = {
"common.key.insert": "Insert", "common.key.insert": "Insert",
"common.unknown": "desconocido", "common.unknown": "desconocido",
"error.page.circular": "[Circular]", "error.page.circular": "[Circular]",
"error.globalSDK.noServerAvailable": "Ningún servidor disponible", "error.serverSDK.noServerAvailable": "Ningún servidor disponible",
"error.globalSDK.serverNotAvailable": "Servidor no disponible", "error.serverSDK.serverNotAvailable": "Servidor no disponible",
"error.childStore.persistedCacheCreateFailed": "Error al crear caché persistente", "error.childStore.persistedCacheCreateFailed": "Error al crear caché persistente",
"error.childStore.persistedProjectMetadataCreateFailed": "Error al crear metadatos de proyecto persistentes", "error.childStore.persistedProjectMetadataCreateFailed": "Error al crear metadatos de proyecto persistentes",
"error.childStore.persistedProjectIconCreateFailed": "Error al crear icono de proyecto persistente", "error.childStore.persistedProjectIconCreateFailed": "Error al crear icono de proyecto persistente",
packages/app/src/i18n/fr.ts
+3 -3
View File
@@ -417,7 +417,7 @@ export const dict = {
"error.page.version": "Version : {{version}}", "error.page.version": "Version : {{version}}",
"error.dev.rootNotFound": "error.dev.rootNotFound":
"Élément racine introuvable. Avez-vous oublié de l'ajouter à votre index.html ? Ou peut-être que l'attribut id est mal orthographié ?", "Élément racine introuvable. Avez-vous oublié de l'ajouter à votre index.html ? Ou peut-être que l'attribut id est mal orthographié ?",
"error.globalSync.connectFailed": "error.serverSync.connectFailed":
"Impossible de se connecter au serveur. Y a-t-il un serveur en cours d'exécution à `{{url}}` ?", "Impossible de se connecter au serveur. Y a-t-il un serveur en cours d'exécution à `{{url}}` ?",
"directory.error.invalidUrl": "Répertoire invalide dans l'URL.", "directory.error.invalidUrl": "Répertoire invalide dans l'URL.",
"error.chain.unknown": "Erreur inconnue", "error.chain.unknown": "Erreur inconnue",
@@ -860,8 +860,8 @@ export const dict = {
"common.key.insert": "Inser", "common.key.insert": "Inser",
"common.unknown": "inconnu", "common.unknown": "inconnu",
"error.page.circular": "[Circulaire]", "error.page.circular": "[Circulaire]",
"error.globalSDK.noServerAvailable": "Aucun serveur disponible", "error.serverSDK.noServerAvailable": "Aucun serveur disponible",
"error.globalSDK.serverNotAvailable": "Serveur non disponible", "error.serverSDK.serverNotAvailable": "Serveur non disponible",
"error.childStore.persistedCacheCreateFailed": "Échec de la création du cache persistant", "error.childStore.persistedCacheCreateFailed": "Échec de la création du cache persistant",
"error.childStore.persistedProjectMetadataCreateFailed": "error.childStore.persistedProjectMetadataCreateFailed":
"Échec de la création des métadonnées de projet persistantes", "Échec de la création des métadonnées de projet persistantes",
packages/app/src/i18n/ja.ts
+3 -3
View File
@@ -413,7 +413,7 @@ export const dict = {
"error.page.version": "バージョン: {{version}}", "error.page.version": "バージョン: {{version}}",
"error.dev.rootNotFound": "error.dev.rootNotFound":
"ルート要素が見つかりません。index.htmlに追加するのを忘れていませんか？またはid属性のスペルが間違っていませんか？", "ルート要素が見つかりません。index.htmlに追加するのを忘れていませんか？またはid属性のスペルが間違っていませんか？",
"error.globalSync.connectFailed": "サーバーに接続できませんでした。`{{url}}`でサーバーが実行されていますか？", "error.serverSync.connectFailed": "サーバーに接続できませんでした。`{{url}}`でサーバーが実行されていますか？",
"directory.error.invalidUrl": "URL内のディレクトリが無効です。", "directory.error.invalidUrl": "URL内のディレクトリが無効です。",
"error.chain.unknown": "不明なエラー", "error.chain.unknown": "不明なエラー",
"error.chain.causedBy": "原因:", "error.chain.causedBy": "原因:",
@@ -844,8 +844,8 @@ export const dict = {
"common.key.insert": "Insert", "common.key.insert": "Insert",
"common.unknown": "不明", "common.unknown": "不明",
"error.page.circular": "[循環]", "error.page.circular": "[循環]",
"error.globalSDK.noServerAvailable": "利用可能なサーバーがありません", "error.serverSDK.noServerAvailable": "利用可能なサーバーがありません",
"error.globalSDK.serverNotAvailable": "サーバーが利用できません", "error.serverSDK.serverNotAvailable": "サーバーが利用できません",
"error.childStore.persistedCacheCreateFailed": "永続キャッシュの作成に失敗しました", "error.childStore.persistedCacheCreateFailed": "永続キャッシュの作成に失敗しました",
"error.childStore.persistedProjectMetadataCreateFailed": "永続プロジェクトメタデータの作成に失敗しました", "error.childStore.persistedProjectMetadataCreateFailed": "永続プロジェクトメタデータの作成に失敗しました",
"error.childStore.persistedProjectIconCreateFailed": "永続プロジェクトアイコンの作成に失敗しました", "error.childStore.persistedProjectIconCreateFailed": "永続プロジェクトアイコンの作成に失敗しました",
packages/app/src/i18n/ko.ts
+3 -3
View File
@@ -412,7 +412,7 @@ export const dict = {
"error.page.version": "버전: {{version}}", "error.page.version": "버전: {{version}}",
"error.dev.rootNotFound": "error.dev.rootNotFound":
"루트 요소를 찾을 수 없습니다. index.html에 추가하는 것을 잊으셨나요? 또는 id 속성의 철자가 틀렸을 수 있습니다.", "루트 요소를 찾을 수 없습니다. index.html에 추가하는 것을 잊으셨나요? 또는 id 속성의 철자가 틀렸을 수 있습니다.",
"error.globalSync.connectFailed": "서버에 연결할 수 없습니다. `{{url}}`에서 서버가 실행 중인가요?", "error.serverSync.connectFailed": "서버에 연결할 수 없습니다. `{{url}}`에서 서버가 실행 중인가요?",
"directory.error.invalidUrl": "URL에 유효하지 않은 디렉터리가 있습니다.", "directory.error.invalidUrl": "URL에 유효하지 않은 디렉터리가 있습니다.",
"error.chain.unknown": "알 수 없는 오류", "error.chain.unknown": "알 수 없는 오류",
"error.chain.causedBy": "원인:", "error.chain.causedBy": "원인:",
@@ -839,8 +839,8 @@ export const dict = {
"common.key.insert": "Insert", "common.key.insert": "Insert",
"common.unknown": "알 수 없음", "common.unknown": "알 수 없음",
"error.page.circular": "[순환]", "error.page.circular": "[순환]",
"error.globalSDK.noServerAvailable": "사용 가능한 서버 없음", "error.serverSDK.noServerAvailable": "사용 가능한 서버 없음",
"error.globalSDK.serverNotAvailable": "서버를 사용할 수 없음", "error.serverSDK.serverNotAvailable": "서버를 사용할 수 없음",
"error.childStore.persistedCacheCreateFailed": "영구 캐시 생성 실패", "error.childStore.persistedCacheCreateFailed": "영구 캐시 생성 실패",
"error.childStore.persistedProjectMetadataCreateFailed": "영구 프로젝트 메타데이터 생성 실패", "error.childStore.persistedProjectMetadataCreateFailed": "영구 프로젝트 메타데이터 생성 실패",
"error.childStore.persistedProjectIconCreateFailed": "영구 프로젝트 아이콘 생성 실패", "error.childStore.persistedProjectIconCreateFailed": "영구 프로젝트 아이콘 생성 실패",
packages/app/src/i18n/no.ts
+3 -3
View File
@@ -463,7 +463,7 @@ export const dict = {
"error.dev.rootNotFound": "error.dev.rootNotFound":
"Rotelement ikke funnet. Glemte du å legge det til i index.html? Eller kanskje id-attributten er feilstavet?", "Rotelement ikke funnet. Glemte du å legge det til i index.html? Eller kanskje id-attributten er feilstavet?",
"error.globalSync.connectFailed": "Kunne ikke koble til server. Kjører det en server på `{{url}}`?", "error.serverSync.connectFailed": "Kunne ikke koble til server. Kjører det en server på `{{url}}`?",
"directory.error.invalidUrl": "Invalid directory in URL.", "directory.error.invalidUrl": "Invalid directory in URL.",
"error.chain.unknown": "Ukjent feil", "error.chain.unknown": "Ukjent feil",
@@ -927,8 +927,8 @@ export const dict = {
"common.key.insert": "Insert", "common.key.insert": "Insert",
"common.unknown": "ukjent", "common.unknown": "ukjent",
"error.page.circular": "[Sirkulær]", "error.page.circular": "[Sirkulær]",
"error.globalSDK.noServerAvailable": "Ingen server tilgjengelig", "error.serverSDK.noServerAvailable": "Ingen server tilgjengelig",
"error.globalSDK.serverNotAvailable": "Server ikke tilgjengelig", "error.serverSDK.serverNotAvailable": "Server ikke tilgjengelig",
"error.childStore.persistedCacheCreateFailed": "Kunne ikke opprette vedvarende hurtigbuffer", "error.childStore.persistedCacheCreateFailed": "Kunne ikke opprette vedvarende hurtigbuffer",
"error.childStore.persistedProjectMetadataCreateFailed": "Kunne ikke opprette vedvarende prosjektmetadata", "error.childStore.persistedProjectMetadataCreateFailed": "Kunne ikke opprette vedvarende prosjektmetadata",
"error.childStore.persistedProjectIconCreateFailed": "Kunne ikke opprette vedvarende prosjektikon", "error.childStore.persistedProjectIconCreateFailed": "Kunne ikke opprette vedvarende prosjektikon",
packages/app/src/i18n/pl.ts
+3 -3
View File
@@ -414,7 +414,7 @@ export const dict = {
"error.page.version": "Wersja: {{version}}", "error.page.version": "Wersja: {{version}}",
"error.dev.rootNotFound": "error.dev.rootNotFound":
"Nie znaleziono elementu głównego. Czy zapomniałeś dodać go do swojego index.html? A może atrybut id został błędnie wpisany?", "Nie znaleziono elementu głównego. Czy zapomniałeś dodać go do swojego index.html? A może atrybut id został błędnie wpisany?",
"error.globalSync.connectFailed": "Nie można połączyć się z serwerem. Czy serwer działa pod adresem `{{url}}`?", "error.serverSync.connectFailed": "Nie można połączyć się z serwerem. Czy serwer działa pod adresem `{{url}}`?",
"directory.error.invalidUrl": "Nieprawidłowy katalog w URL.", "directory.error.invalidUrl": "Nieprawidłowy katalog w URL.",
"error.chain.unknown": "Nieznany błąd", "error.chain.unknown": "Nieznany błąd",
"error.chain.causedBy": "Spowodowany przez:", "error.chain.causedBy": "Spowodowany przez:",
@@ -848,8 +848,8 @@ export const dict = {
"common.key.insert": "Insert", "common.key.insert": "Insert",
"common.unknown": "nieznany", "common.unknown": "nieznany",
"error.page.circular": "[Cykliczne]", "error.page.circular": "[Cykliczne]",
"error.globalSDK.noServerAvailable": "Brak dostępnego serwera", "error.serverSDK.noServerAvailable": "Brak dostępnego serwera",
"error.globalSDK.serverNotAvailable": "Serwer niedostępny", "error.serverSDK.serverNotAvailable": "Serwer niedostępny",
"error.childStore.persistedCacheCreateFailed": "Nie udało się utworzyć trwałej pamięci podręcznej", "error.childStore.persistedCacheCreateFailed": "Nie udało się utworzyć trwałej pamięci podręcznej",
"error.childStore.persistedProjectMetadataCreateFailed": "Nie udało się utworzyć trwałych metadanych projektu", "error.childStore.persistedProjectMetadataCreateFailed": "Nie udało się utworzyć trwałych metadanych projektu",
"error.childStore.persistedProjectIconCreateFailed": "Nie udało się utworzyć trwałej ikony projektu", "error.childStore.persistedProjectIconCreateFailed": "Nie udało się utworzyć trwałej ikony projektu",
packages/app/src/i18n/ru.ts
+3 -3
View File
@@ -461,7 +461,7 @@ export const dict = {
"error.dev.rootNotFound": "error.dev.rootNotFound":
"Корневой элемент не найден. Вы забыли добавить его в index.html? Или, может быть, атрибут id был написан неправильно?", "Корневой элемент не найден. Вы забыли добавить его в index.html? Или, может быть, атрибут id был написан неправильно?",
"error.globalSync.connectFailed": "Не удалось подключиться к серверу. Запущен ли сервер по адресу `{{url}}`?", "error.serverSync.connectFailed": "Не удалось подключиться к серверу. Запущен ли сервер по адресу `{{url}}`?",
"directory.error.invalidUrl": "Недопустимая директория в URL.", "directory.error.invalidUrl": "Недопустимая директория в URL.",
"error.chain.unknown": "Неизвестная ошибка", "error.chain.unknown": "Неизвестная ошибка",
@@ -929,8 +929,8 @@ export const dict = {
"common.key.insert": "Insert", "common.key.insert": "Insert",
"common.unknown": "неизвестно", "common.unknown": "неизвестно",
"error.page.circular": "[Циклично]", "error.page.circular": "[Циклично]",
"error.globalSDK.noServerAvailable": "Нет доступного сервера", "error.serverSDK.noServerAvailable": "Нет доступного сервера",
"error.globalSDK.serverNotAvailable": "Сервер недоступен", "error.serverSDK.serverNotAvailable": "Сервер недоступен",
"error.childStore.persistedCacheCreateFailed": "Не удалось создать постоянный кэш", "error.childStore.persistedCacheCreateFailed": "Не удалось создать постоянный кэш",
"error.childStore.persistedProjectMetadataCreateFailed": "Не удалось создать постоянные метаданные проекта", "error.childStore.persistedProjectMetadataCreateFailed": "Не удалось создать постоянные метаданные проекта",
"error.childStore.persistedProjectIconCreateFailed": "Не удалось создать постоянный значок проекта", "error.childStore.persistedProjectIconCreateFailed": "Не удалось создать постоянный значок проекта",
packages/app/src/i18n/th.ts
+3 -3
View File
@@ -459,7 +459,7 @@ export const dict = {
"error.dev.rootNotFound": "ไม่พบองค์ประกอบรูท คุณลืมเพิ่มใน index.html หรือบางทีแอตทริบิวต์ id อาจสะกดผิด?", "error.dev.rootNotFound": "ไม่พบองค์ประกอบรูท คุณลืมเพิ่มใน index.html หรือบางทีแอตทริบิวต์ id อาจสะกดผิด?",
"error.globalSync.connectFailed": "ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ มีเซิร์ฟเวอร์ทำงานอยู่ที่ `{{url}}` หรือไม่?", "error.serverSync.connectFailed": "ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ มีเซิร์ฟเวอร์ทำงานอยู่ที่ `{{url}}` หรือไม่?",
"directory.error.invalidUrl": "ไดเรกทอรีใน URL ไม่ถูกต้อง", "directory.error.invalidUrl": "ไดเรกทอรีใน URL ไม่ถูกต้อง",
"error.chain.unknown": "ข้อผิดพลาดที่ไม่รู้จัก", "error.chain.unknown": "ข้อผิดพลาดที่ไม่รู้จัก",
@@ -916,8 +916,8 @@ export const dict = {
"common.key.insert": "Insert", "common.key.insert": "Insert",
"common.unknown": "ไม่ทราบ", "common.unknown": "ไม่ทราบ",
"error.page.circular": "[วงกลม]", "error.page.circular": "[วงกลม]",
"error.globalSDK.noServerAvailable": "ไม่มีเซิร์ฟเวอร์", "error.serverSDK.noServerAvailable": "ไม่มีเซิร์ฟเวอร์",
"error.globalSDK.serverNotAvailable": "เซิร์ฟเวอร์ไม่พร้อมใช้งาน", "error.serverSDK.serverNotAvailable": "เซิร์ฟเวอร์ไม่พร้อมใช้งาน",
"error.childStore.persistedCacheCreateFailed": "ไม่สามารถสร้างแคชถาวร", "error.childStore.persistedCacheCreateFailed": "ไม่สามารถสร้างแคชถาวร",
"error.childStore.persistedProjectMetadataCreateFailed": "ไม่สามารถสร้างเมตาดาต้าโปรเจกต์ถาวร", "error.childStore.persistedProjectMetadataCreateFailed": "ไม่สามารถสร้างเมตาดาต้าโปรเจกต์ถาวร",
"error.childStore.persistedProjectIconCreateFailed": "ไม่สามารถสร้างไอคอนโปรเจกต์ถาวร", "error.childStore.persistedProjectIconCreateFailed": "ไม่สามารถสร้างไอคอนโปรเจกต์ถาวร",
packages/app/src/i18n/tr.ts
+3 -3
View File
@@ -465,7 +465,7 @@ export const dict = {
"error.dev.rootNotFound": "error.dev.rootNotFound":
"Kök eleman bulunamadı. index.html dosyanıza eklemeyi unuttunuz mu? Ya da id özelliği yanlış mı yazıldı?", "Kök eleman bulunamadı. index.html dosyanıza eklemeyi unuttunuz mu? Ya da id özelliği yanlış mı yazıldı?",
"error.globalSync.connectFailed": "Sunucuya bağlanılamadı. `{{url}}` adresinde çalışan bir sunucu var mı?", "error.serverSync.connectFailed": "Sunucuya bağlanılamadı. `{{url}}` adresinde çalışan bir sunucu var mı?",
"directory.error.invalidUrl": "URL'de geçersiz dizin.", "directory.error.invalidUrl": "URL'de geçersiz dizin.",
"error.chain.unknown": "Bilinmeyen hata", "error.chain.unknown": "Bilinmeyen hata",
@@ -935,8 +935,8 @@ export const dict = {
"common.key.insert": "Insert", "common.key.insert": "Insert",
"common.unknown": "bilinmiyor", "common.unknown": "bilinmiyor",
"error.page.circular": "[Döngüsel]", "error.page.circular": "[Döngüsel]",
"error.globalSDK.noServerAvailable": "Sunucu yok", "error.serverSDK.noServerAvailable": "Sunucu yok",
"error.globalSDK.serverNotAvailable": "Sunucu mevcut değil", "error.serverSDK.serverNotAvailable": "Sunucu mevcut değil",
"error.childStore.persistedCacheCreateFailed": "Kalıcı önbellek oluşturulamadı", "error.childStore.persistedCacheCreateFailed": "Kalıcı önbellek oluşturulamadı",
"error.childStore.persistedProjectMetadataCreateFailed": "Kalıcı proje meta verileri oluşturulamadı", "error.childStore.persistedProjectMetadataCreateFailed": "Kalıcı proje meta verileri oluşturulamadı",
"error.childStore.persistedProjectIconCreateFailed": "Kalıcı proje simgesi oluşturulamadı", "error.childStore.persistedProjectIconCreateFailed": "Kalıcı proje simgesi oluşturulamadı",
packages/app/src/i18n/uk.ts
+3 -3
View File
@@ -483,9 +483,9 @@ export const dict = {
"error.dev.rootNotFound": "error.dev.rootNotFound":
"Кореневий елемент не знайдено. Ви забули додати його до index.html? Або, можливо, атрибут id було написано з помилкою?", "Кореневий елемент не знайдено. Ви забули додати його до index.html? Або, можливо, атрибут id було написано з помилкою?",
"error.globalSync.connectFailed": "Не вдалося підключитися до сервера. Чи працює сервер за адресою `{{url}}`?", "error.serverSync.connectFailed": "Не вдалося підключитися до сервера. Чи працює сервер за адресою `{{url}}`?",
"error.globalSDK.noServerAvailable": "Сервер недоступний", "error.serverSDK.noServerAvailable": "Сервер недоступний",
"error.globalSDK.serverNotAvailable": "Сервер недоступний", "error.serverSDK.serverNotAvailable": "Сервер недоступний",
"error.childStore.persistedCacheCreateFailed": "Не вдалося створити постійний кеш", "error.childStore.persistedCacheCreateFailed": "Не вдалося створити постійний кеш",
"error.childStore.persistedProjectMetadataCreateFailed": "Не вдалося створити постійні метадані проєкту", "error.childStore.persistedProjectMetadataCreateFailed": "Не вдалося створити постійні метадані проєкту",
"error.childStore.persistedProjectIconCreateFailed": "Не вдалося створити постійну іконку проєкту", "error.childStore.persistedProjectIconCreateFailed": "Не вдалося створити постійну іконку проєкту",
packages/app/src/i18n/zh.ts
+3 -3
View File
@@ -462,7 +462,7 @@ export const dict = {
"error.page.report.discord": "在 Discord 上", "error.page.report.discord": "在 Discord 上",
"error.page.version": "版本：{{version}}", "error.page.version": "版本：{{version}}",
"error.dev.rootNotFound": "未找到根元素。你是不是忘了把它添加到 index.html？或者 id 属性拼写错了？", "error.dev.rootNotFound": "未找到根元素。你是不是忘了把它添加到 index.html？或者 id 属性拼写错了？",
"error.globalSync.connectFailed": "无法连接到服务器。是否有服务器正在 `{{url}}` 运行？", "error.serverSync.connectFailed": "无法连接到服务器。是否有服务器正在 `{{url}}` 运行？",
"directory.error.invalidUrl": "URL 中的目录无效。", "directory.error.invalidUrl": "URL 中的目录无效。",
@@ -919,8 +919,8 @@ export const dict = {
"common.key.insert": "Insert", "common.key.insert": "Insert",
"common.unknown": "未知", "common.unknown": "未知",
"error.page.circular": "[循环]", "error.page.circular": "[循环]",
"error.globalSDK.noServerAvailable": "无可用服务器", "error.serverSDK.noServerAvailable": "无可用服务器",
"error.globalSDK.serverNotAvailable": "服务器不可用", "error.serverSDK.serverNotAvailable": "服务器不可用",
"error.childStore.persistedCacheCreateFailed": "创建持久化缓存失败", "error.childStore.persistedCacheCreateFailed": "创建持久化缓存失败",
"error.childStore.persistedProjectMetadataCreateFailed": "创建持久化项目元数据失败", "error.childStore.persistedProjectMetadataCreateFailed": "创建持久化项目元数据失败",
"error.childStore.persistedProjectIconCreateFailed": "创建持久化项目图标失败", "error.childStore.persistedProjectIconCreateFailed": "创建持久化项目图标失败",
packages/app/src/i18n/zht.ts
+3 -3
View File
@@ -457,7 +457,7 @@ export const dict = {
"error.dev.rootNotFound": "找不到根元素。你是不是忘了把它新增到 index.html? 或者 id 屬性拼錯了?", "error.dev.rootNotFound": "找不到根元素。你是不是忘了把它新增到 index.html? 或者 id 屬性拼錯了?",
"error.globalSync.connectFailed": "無法連線到伺服器。是否有伺服器正在 `{{url}}` 執行?", "error.serverSync.connectFailed": "無法連線到伺服器。是否有伺服器正在 `{{url}}` 執行?",
"directory.error.invalidUrl": "URL 中的目錄無效。", "directory.error.invalidUrl": "URL 中的目錄無效。",
"error.chain.unknown": "未知錯誤", "error.chain.unknown": "未知錯誤",
@@ -907,8 +907,8 @@ export const dict = {
"common.key.insert": "Insert", "common.key.insert": "Insert",
"common.unknown": "未知", "common.unknown": "未知",
"error.page.circular": "[循環]", "error.page.circular": "[循環]",
"error.globalSDK.noServerAvailable": "無可用的伺服器", "error.serverSDK.noServerAvailable": "無可用的伺服器",
"error.globalSDK.serverNotAvailable": "伺服器無法使用", "error.serverSDK.serverNotAvailable": "伺服器無法使用",
"error.childStore.persistedCacheCreateFailed": "建立持續性快取失敗", "error.childStore.persistedCacheCreateFailed": "建立持續性快取失敗",
"error.childStore.persistedProjectMetadataCreateFailed": "建立持續性專案中繼資料失敗", "error.childStore.persistedProjectMetadataCreateFailed": "建立持續性專案中繼資料失敗",
"error.childStore.persistedProjectIconCreateFailed": "建立持續性專案圖示失敗", "error.childStore.persistedProjectIconCreateFailed": "建立持續性專案圖示失敗",
packages/app/src/pages/home.tsx
+5 -5
View File
@@ -19,7 +19,7 @@ import { useDialog } from "@opencode-ai/ui/context/dialog"
import { DialogSelectDirectory } from "@/components/dialog-select-directory" import { DialogSelectDirectory } from "@/components/dialog-select-directory"
import { DialogSelectServer } from "@/components/dialog-select-server" import { DialogSelectServer } from "@/components/dialog-select-server"
import { useServer } from "@/context/server" import { useServer } from "@/context/server"
import { useGlobalSync } from "@/context/global-sync" import { useServerSync } from "@/context/server-sync"
import { useLanguage } from "@/context/language" import { useLanguage } from "@/context/language"
import { useNotification } from "@/context/notification" import { useNotification } from "@/context/notification"
import { usePermission } from "@/context/permission" import { usePermission } from "@/context/permission"
@@ -55,7 +55,7 @@ export default function Home() {
} }
function HomeDesign() { function HomeDesign() {
const sync = useGlobalSync() const sync = useServerSync()
const layout = useLayout() const layout = useLayout()
const platform = usePlatform() const platform = usePlatform()
const dialog = useDialog() const dialog = useDialog()
@@ -358,10 +358,10 @@ function HomeSessionGroupHeader(props: { title: string; onNewSession?: () => voi
} }
function HomeSessionRow(props: { record: HomeSessionRecord; openSession: (session: Session) => void }) { function HomeSessionRow(props: { record: HomeSessionRecord; openSession: (session: Session) => void }) {
const globalSync = useGlobalSync() const serverSync = useServerSync()
const notification = useNotification() const notification = useNotification()
const permission = usePermission() const permission = usePermission()
const [sessionStore] = globalSync.child(props.record.session.directory, { bootstrap: false }) const [sessionStore] = serverSync.child(props.record.session.directory, { bootstrap: false })
const title = createMemo(() => sessionTitle(props.record.session.title) || props.record.session.id) const title = createMemo(() => sessionTitle(props.record.session.title) || props.record.session.id)
const unseenCount = createMemo(() => notification.session.unseenCount(props.record.session.id)) const unseenCount = createMemo(() => notification.session.unseenCount(props.record.session.id))
const hasError = createMemo(() => notification.session.unseenHasError(props.record.session.id)) const hasError = createMemo(() => notification.session.unseenHasError(props.record.session.id))
@@ -459,7 +459,7 @@ function groupSessions(records: HomeSessionRecord[], language: ReturnType<typeof
} }
function LegacyHome() { function LegacyHome() {
const sync = useGlobalSync() const sync = useServerSync()
const layout = useLayout() const layout = useLayout()
const platform = usePlatform() const platform = usePlatform()
const dialog = useDialog() const dialog = useDialog()
packages/app/src/pages/layout.tsx
+43 -43
View File
@@ -16,7 +16,7 @@ import { makeEventListener } from "@solid-primitives/event-listener"
import { useLocation, useNavigate, useParams } from "@solidjs/router" import { useLocation, useNavigate, useParams } from "@solidjs/router"
import { useQuery } from "@tanstack/solid-query" import { useQuery } from "@tanstack/solid-query"
import { useLayout, LocalProject } from "@/context/layout" import { useLayout, LocalProject } from "@/context/layout"
import { useGlobalSync } from "@/context/global-sync" import { useServerSync } from "@/context/server-sync"
import { Persist, persisted } from "@/utils/persist" import { Persist, persisted } from "@/utils/persist"
import { base64Encode } from "@opencode-ai/core/util/encode" import { base64Encode } from "@opencode-ai/core/util/encode"
import { decode64 } from "@/utils/base64" import { decode64 } from "@/utils/base64"
@@ -35,7 +35,7 @@ import { DragDropProvider, DragDropSensors, DragOverlay, SortableProvider, close
import type { DragEvent } from "@thisbeyond/solid-dnd" import type { DragEvent } from "@thisbeyond/solid-dnd"
import { useProviders } from "@/hooks/use-providers" import { useProviders } from "@/hooks/use-providers"
import { showToast, Toast, toaster } from "@opencode-ai/ui/toast" import { showToast, Toast, toaster } from "@opencode-ai/ui/toast"
import { useGlobalSDK } from "@/context/global-sdk" import { useServerSDK } from "@/context/server-sdk"
import { clearWorkspaceTerminals, getTerminalServerScope } from "@/context/terminal" import { clearWorkspaceTerminals, getTerminalServerScope } from "@/context/terminal"
import { dropSessionCaches, pickSessionCacheEvictions } from "@/context/global-sync/session-cache" import { dropSessionCaches, pickSessionCacheEvictions } from "@/context/global-sync/session-cache"
import { import {
@@ -113,8 +113,8 @@ export default function Layout(props: ParentProps) {
let dialogDead = false let dialogDead = false
const params = useParams() const params = useParams()
const globalSDK = useGlobalSDK() const serverSDK = useServerSDK()
const globalSync = useGlobalSync() const serverSync = useServerSync()
const layout = useLayout() const layout = useLayout()
const layoutReady = createMemo(() => layout.ready()) const layoutReady = createMemo(() => layout.ready())
const platform = usePlatform() const platform = usePlatform()
@@ -136,7 +136,7 @@ export default function Layout(props: ParentProps) {
if (!slug) return { slug, dir: "" } if (!slug) return { slug, dir: "" }
const dir = decode64(slug) const dir = decode64(slug)
if (!dir) return { slug, dir: "" } if (!dir) return { slug, dir: "" }
const store = globalSync.peek(dir, { bootstrap: false }) const store = serverSync.peek(dir, { bootstrap: false })
return { return {
slug, slug,
store, store,
@@ -226,7 +226,7 @@ export default function Layout(props: ParentProps) {
active: () => state.hoverProject, active: () => state.hoverProject,
el: () => state.nav?.querySelector<HTMLElement>("[data-component='sidebar-rail']") ?? state.nav, el: () => state.nav?.querySelector<HTMLElement>("[data-component='sidebar-rail']") ?? state.nav,
onActivate: (directory) => { onActivate: (directory) => {
globalSync.child(directory) serverSync.child(directory)
setState("hoverProject", directory) setState("hoverProject", directory)
}, },
}) })
@@ -410,7 +410,7 @@ export default function Layout(props: ParentProps) {
alertedAtBySession.delete(sessionKey) alertedAtBySession.delete(sessionKey)
} }
const unsub = globalSDK.event.listen((e) => { const unsub = serverSDK.event.listen((e) => {
if (e.details?.type === "worktree.ready") { if (e.details?.type === "worktree.ready") {
setBusy(e.name, false) setBusy(e.name, false)
WorktreeState.ready(e.name) WorktreeState.ready(e.name)
@@ -444,7 +444,7 @@ export default function Layout(props: ParentProps) {
const props = e.details.properties const props = e.details.properties
if (e.details.type === "permission.asked" && permission.autoResponds(e.details.properties, directory)) return if (e.details.type === "permission.asked" && permission.autoResponds(e.details.properties, directory)) return
const [store] = globalSync.child(directory, { bootstrap: false }) const [store] = serverSync.child(directory, { bootstrap: false })
const session = store.session.find((s) => s.id === props.sessionID) const session = store.session.find((s) => s.id === props.sessionID)
const sessionKey = `${directory}:${props.sessionID}` const sessionKey = `${directory}:${props.sessionID}`
@@ -507,7 +507,7 @@ export default function Layout(props: ParentProps) {
if (!currentDir() || !currentSession) return if (!currentDir() || !currentSession) return
const sessionKey = `${currentDir()}:${currentSession}` const sessionKey = `${currentDir()}:${currentSession}`
dismissSessionAlert(sessionKey) dismissSessionAlert(sessionKey)
const [store] = globalSync.child(currentDir(), { bootstrap: false }) const [store] = serverSync.child(currentDir(), { bootstrap: false })
const childSessions = store.session.filter((s) => s.parentID === currentSession) const childSessions = store.session.filter((s) => s.parentID === currentSession)
for (const child of childSessions) { for (const child of childSessions) {
dismissSessionAlert(`${currentDir()}:${child.id}`) dismissSessionAlert(`${currentDir()}:${child.id}`)
@@ -545,11 +545,11 @@ export default function Layout(props: ParentProps) {
const direct = projects.find((p) => pathKey(p.worktree) === key) const direct = projects.find((p) => pathKey(p.worktree) === key)
if (direct) return direct if (direct) return direct
const [child] = globalSync.child(directory, { bootstrap: false }) const [child] = serverSync.child(directory, { bootstrap: false })
const id = child.project const id = child.project
if (!id) return if (!id) return
const meta = globalSync.data.project.find((p) => p.id === id) const meta = serverSync.data.project.find((p) => p.id === id)
const root = meta?.worktree const root = meta?.worktree
if (!root) return if (!root) return
@@ -640,7 +640,7 @@ export default function Layout(props: ParentProps) {
const result: Session[] = [] const result: Session[] = []
for (const dir of dirs) { for (const dir of dirs) {
const [dirStore] = globalSync.child(dir, { bootstrap: true }) const [dirStore] = serverSync.child(dir, { bootstrap: true })
const dirSessions = sortedRootSessions(dirStore, now) const dirSessions = sortedRootSessions(dirStore, now)
result.push(...dirSessions) result.push(...dirSessions)
} }
@@ -692,7 +692,7 @@ export default function Layout(props: ParentProps) {
createEffect(() => { createEffect(() => {
route() route()
globalSDK.url serverSDK.url
prefetchToken.value += 1 prefetchToken.value += 1
clearSessionPrefetchInflight() clearSessionPrefetchInflight()
@@ -739,13 +739,13 @@ export default function Layout(props: ParentProps) {
} }
async function prefetchMessages(directory: string, sessionID: string, token: number) { async function prefetchMessages(directory: string, sessionID: string, token: number) {
const [store, setStore] = globalSync.child(directory, { bootstrap: false }) const [store, setStore] = serverSync.child(directory, { bootstrap: false })
return runSessionPrefetch({ return runSessionPrefetch({
directory, directory,
sessionID, sessionID,
task: (rev) => task: (rev) =>
retry(() => globalSDK.client.session.messages({ directory, sessionID, limit: prefetchChunk })) retry(() => serverSDK.client.session.messages({ directory, sessionID, limit: prefetchChunk }))
.then((messages) => { .then((messages) => {
if (prefetchToken.value !== token) return if (prefetchToken.value !== token) return
if (!isSessionPrefetchCurrent(directory, sessionID, rev)) return if (!isSessionPrefetchCurrent(directory, sessionID, rev)) return
@@ -765,7 +765,7 @@ export default function Layout(props: ParentProps) {
if (stale.length > 0) { if (stale.length > 0) {
clearSessionPrefetch(directory, stale) clearSessionPrefetch(directory, stale)
for (const id of stale) { for (const id of stale) {
globalSync.todo.set(id, undefined) serverSync.todo.set(id, undefined)
} }
} }
@@ -830,7 +830,7 @@ export default function Layout(props: ParentProps) {
const directory = session.directory const directory = session.directory
if (!directory) return if (!directory) return
const [store] = globalSync.child(directory, { bootstrap: false }) const [store] = serverSync.child(directory, { bootstrap: false })
const cached = untrack(() => { const cached = untrack(() => {
const info = getSessionPrefetch(directory, session.id) const info = getSessionPrefetch(directory, session.id)
return shouldSkipSessionPrefetch({ return shouldSkipSessionPrefetch({
@@ -935,7 +935,7 @@ export default function Layout(props: ParentProps) {
if (!target) return if (!target) return
// warm up child store to prevent flicker // warm up child store to prevent flicker
globalSync.child(target.worktree) serverSync.child(target.worktree)
void openProject(target.worktree) void openProject(target.worktree)
} }
@@ -944,7 +944,7 @@ export default function Layout(props: ParentProps) {
const target = projects[index] const target = projects[index]
if (!target) return if (!target) return
globalSync.child(target.worktree) serverSync.child(target.worktree)
void openProject(target.worktree) void openProject(target.worktree)
} }
@@ -973,12 +973,12 @@ export default function Layout(props: ParentProps) {
} }
async function archiveSession(session: Session) { async function archiveSession(session: Session) {
const [store, setStore] = globalSync.child(session.directory) const [store, setStore] = serverSync.child(session.directory)
const sessions = store.session ?? [] const sessions = store.session ?? []
const index = sessions.findIndex((s) => s.id === session.id) const index = sessions.findIndex((s) => s.id === session.id)
const nextSession = sessions[index + 1] ?? sessions[index - 1] const nextSession = sessions[index + 1] ?? sessions[index - 1]
await globalSDK.client.session.update({ await serverSDK.client.session.update({
directory: session.directory, directory: session.directory,
sessionID: session.id, sessionID: session.id,
time: { archived: Date.now() }, time: { archived: Date.now() },
@@ -1246,11 +1246,11 @@ export default function Layout(props: ParentProps) {
) )
if (known) return known[0] if (known) return known[0]
const [child] = globalSync.child(directory, { bootstrap: false }) const [child] = serverSync.child(directory, { bootstrap: false })
const id = child.project const id = child.project
if (!id) return directory if (!id) return directory
const meta = globalSync.data.project.find((item) => item.id === id) const meta = serverSync.data.project.find((item) => item.id === id)
return meta?.worktree ?? directory return meta?.worktree ?? directory
} }
@@ -1298,7 +1298,7 @@ export default function Layout(props: ParentProps) {
} }
const refreshDirs = async (target?: string) => { const refreshDirs = async (target?: string) => {
if (!target || target === root || canOpen(target)) return canOpen(target) if (!target || target === root || canOpen(target)) return canOpen(target)
const listed = await globalSDK.client.worktree const listed = await serverSDK.client.worktree
.list({ directory: root }) .list({ directory: root })
.then((x) => x.data ?? []) .then((x) => x.data ?? [])
.catch(() => [] as string[]) .catch(() => [] as string[])
@@ -1307,13 +1307,13 @@ export default function Layout(props: ParentProps) {
} }
const openSession = async (target: { directory: string; id: string }) => { const openSession = async (target: { directory: string; id: string }) => {
if (!canOpen(target.directory)) return false if (!canOpen(target.directory)) return false
const [data] = globalSync.child(target.directory, { bootstrap: false }) const [data] = serverSync.child(target.directory, { bootstrap: false })
if (data.session.some((item) => item.id === target.id)) { if (data.session.some((item) => item.id === target.id)) {
setStore("lastProjectSession", root, { directory: target.directory, id: target.id, at: Date.now() }) setStore("lastProjectSession", root, { directory: target.directory, id: target.id, at: Date.now() })
navigateWithSidebarReset(`/${base64Encode(target.directory)}/session/${target.id}`) navigateWithSidebarReset(`/${base64Encode(target.directory)}/session/${target.id}`)
return true return true
} }
const resolved = await globalSDK.client.session const resolved = await serverSDK.client.session
.get({ sessionID: target.id }) .get({ sessionID: target.id })
.then((x) => x.data) .then((x) => x.data)
.catch(() => undefined) .catch(() => undefined)
@@ -1333,7 +1333,7 @@ export default function Layout(props: ParentProps) {
} }
const latest = latestRootSession( const latest = latestRootSession(
dirs.map((item) => globalSync.child(item, { bootstrap: false })[0]), dirs.map((item) => serverSync.child(item, { bootstrap: false })[0]),
Date.now(), Date.now(),
) )
if (latest && (await openSession(latest))) { if (latest && (await openSession(latest))) {
@@ -1344,7 +1344,7 @@ export default function Layout(props: ParentProps) {
await Promise.all( await Promise.all(
dirs.map(async (item) => ({ dirs.map(async (item) => ({
path: { directory: item }, path: { directory: item },
session: await globalSDK.client.session session: await serverSDK.client.session
.list({ directory: item }) .list({ directory: item })
.then((x) => x.data ?? []) .then((x) => x.data ?? [])
.catch(() => []), .catch(() => []),
@@ -1405,11 +1405,11 @@ export default function Layout(props: ParentProps) {
const name = next === getFilename(project.worktree) ? "" : next const name = next === getFilename(project.worktree) ? "" : next
if (project.id && project.id !== "global") { if (project.id && project.id !== "global") {
await globalSDK.client.project.update({ projectID: project.id, directory: project.worktree, name }) await serverSDK.client.project.update({ projectID: project.id, directory: project.worktree, name })
return return
} }
globalSync.project.meta(project.worktree, { name }) serverSync.project.meta(project.worktree, { name })
} }
const renameWorkspace = (directory: string, next: string, projectId?: string, branch?: string) => { const renameWorkspace = (directory: string, next: string, projectId?: string, branch?: string) => {
@@ -1506,7 +1506,7 @@ export default function Layout(props: ParentProps) {
setBusy(directory, true) setBusy(directory, true)
const result = await globalSDK.client.worktree const result = await serverSDK.client.worktree
.remove({ directory: root, worktreeRemoveInput: { directory } }) .remove({ directory: root, worktreeRemoveInput: { directory } })
.then((x) => x.data) .then((x) => x.data)
.catch((err) => { .catch((err) => {
@@ -1525,7 +1525,7 @@ export default function Layout(props: ParentProps) {
clearLastProjectSession(root) clearLastProjectSession(root)
} }
globalSync.set( serverSync.set(
"project", "project",
produce((draft) => { produce((draft) => {
const project = draft.find((item) => item.worktree === root) const project = draft.find((item) => item.worktree === root)
@@ -1564,7 +1564,7 @@ export default function Layout(props: ParentProps) {
}) })
const dismiss = () => toaster.dismiss(progress) const dismiss = () => toaster.dismiss(progress)
const sessions: Session[] = await globalSDK.client.session const sessions: Session[] = await serverSDK.client.session
.list({ directory }) .list({ directory })
.then((x) => x.data ?? []) .then((x) => x.data ?? [])
.catch(() => []) .catch(() => [])
@@ -1575,9 +1575,9 @@ export default function Layout(props: ParentProps) {
platform, platform,
getTerminalServerScope(server.current, server.key), getTerminalServerScope(server.current, server.key),
) )
await globalSDK.client.instance.dispose({ directory }).catch(() => undefined) await serverSDK.client.instance.dispose({ directory }).catch(() => undefined)
const result = await globalSDK.client.worktree const result = await serverSDK.client.worktree
.reset({ directory: root, worktreeResetInput: { directory } }) .reset({ directory: root, worktreeResetInput: { directory } })
.then((x) => x.data) .then((x) => x.data)
.catch((err) => { .catch((err) => {
@@ -1599,7 +1599,7 @@ export default function Layout(props: ParentProps) {
sessions sessions
.filter((session) => session.time.archived === undefined) .filter((session) => session.time.archived === undefined)
.map((session) => .map((session) =>
globalSDK.client.session serverSDK.client.session
.update({ .update({
sessionID: session.id, sessionID: session.id,
directory: session.directory, directory: session.directory,
@@ -1640,7 +1640,7 @@ export default function Layout(props: ParentProps) {
}) })
onMount(() => { onMount(() => {
globalSDK.client.file serverSDK.client.file
.status({ directory: props.directory }) .status({ directory: props.directory })
.then((x) => { .then((x) => {
const files = x.data ?? [] const files = x.data ?? []
@@ -1699,7 +1699,7 @@ export default function Layout(props: ParentProps) {
}) })
const refresh = async () => { const refresh = async () => {
const sessions = await globalSDK.client.session const sessions = await serverSDK.client.session
.list({ directory: props.directory }) .list({ directory: props.directory })
.then((x) => x.data ?? []) .then((x) => x.data ?? [])
.catch(() => []) .catch(() => [])
@@ -1708,7 +1708,7 @@ export default function Layout(props: ParentProps) {
} }
onMount(() => { onMount(() => {
globalSDK.client.file serverSDK.client.file
.status({ directory: props.directory }) .status({ directory: props.directory })
.then((x) => { .then((x) => {
const files = x.data ?? [] const files = x.data ?? []
@@ -1842,7 +1842,7 @@ export default function Layout(props: ParentProps) {
const next = new Set(dirs) const next = new Set(dirs)
for (const directory of next) { for (const directory of next) {
if (loadedSessionDirs.has(directory)) continue if (loadedSessionDirs.has(directory)) continue
void globalSync.project.loadSessions(directory) void serverSync.project.loadSessions(directory)
} }
loadedSessionDirs.clear() loadedSessionDirs.clear()
@@ -1939,7 +1939,7 @@ export default function Layout(props: ParentProps) {
const createWorkspace = async (project: LocalProject) => { const createWorkspace = async (project: LocalProject) => {
clearSidebarHoverState() clearSidebarHoverState()
const created = await globalSDK.client.worktree const created = await serverSDK.client.worktree
.create({ directory: project.worktree }) .create({ directory: project.worktree })
.then((x) => x.data) .then((x) => x.data)
.catch((err) => { .catch((err) => {
@@ -1973,7 +1973,7 @@ export default function Layout(props: ParentProps) {
return [created.directory, ...next] return [created.directory, ...next]
}) })
globalSync.child(created.directory) serverSync.child(created.directory)
navigateWithSidebarReset(`/${base64Encode(created.directory)}/session`) navigateWithSidebarReset(`/${base64Encode(created.directory)}/session`)
} }
@@ -2078,7 +2078,7 @@ export default function Layout(props: ParentProps) {
if (!item) return false if (!item) return false
return item.vcs === "git" || layout.sidebar.workspaces(item.worktree)() return item.vcs === "git" || layout.sidebar.workspaces(item.worktree)()
}) })
const homedir = createMemo(() => globalSync.data.path.home) const homedir = createMemo(() => serverSync.data.path.home)
return ( return (
<div <div
packages/app/src/pages/layout/sidebar-items.tsx
+5 -5
View File
@@ -7,7 +7,7 @@ import { Tooltip } from "@opencode-ai/ui/tooltip"
import { getFilename } from "@opencode-ai/core/util/path" import { getFilename } from "@opencode-ai/core/util/path"
import { A, useParams } from "@solidjs/router" import { A, useParams } from "@solidjs/router"
import { type Accessor, createMemo, For, type JSX, Match, Show, Switch } from "solid-js" import { type Accessor, createMemo, For, type JSX, Match, Show, Switch } from "solid-js"
import { useGlobalSync } from "@/context/global-sync" import { useServerSync } from "@/context/server-sync"
import { useLanguage } from "@/context/language" import { useLanguage } from "@/context/language"
import { getAvatarColors, type LocalProject, useLayout } from "@/context/layout" import { getAvatarColors, type LocalProject, useLayout } from "@/context/layout"
import { useNotification } from "@/context/notification" import { useNotification } from "@/context/notification"
@@ -23,7 +23,7 @@ export const ProjectIcon = (props: {
notify?: boolean notify?: boolean
working?: boolean working?: boolean
}): JSX.Element => { }): JSX.Element => {
const globalSync = useGlobalSync() const serverSync = useServerSync()
const notification = useNotification() const notification = useNotification()
const permission = usePermission() const permission = usePermission()
const dirs = createMemo(() => [props.project.worktree, ...(props.project.sandboxes ?? [])]) const dirs = createMemo(() => [props.project.worktree, ...(props.project.sandboxes ?? [])])
@@ -33,7 +33,7 @@ export const ProjectIcon = (props: {
const hasError = createMemo(() => dirs().some((directory) => notification.project.unseenHasError(directory))) const hasError = createMemo(() => dirs().some((directory) => notification.project.unseenHasError(directory)))
const hasPermissions = createMemo(() => const hasPermissions = createMemo(() =>
dirs().some((directory) => { dirs().some((directory) => {
const [store] = globalSync.child(directory, { bootstrap: false }) const [store] = serverSync.child(directory, { bootstrap: false })
return hasProjectPermissions(store.permission, (item) => !permission.autoResponds(item, directory)) return hasProjectPermissions(store.permission, (item) => !permission.autoResponds(item, directory))
}), }),
) )
@@ -146,10 +146,10 @@ export const SessionItem = (props: SessionItemProps): JSX.Element => {
const language = useLanguage() const language = useLanguage()
const notification = useNotification() const notification = useNotification()
const permission = usePermission() const permission = usePermission()
const globalSync = useGlobalSync() const serverSync = useServerSync()
const unseenCount = createMemo(() => notification.session.unseenCount(props.session.id)) const unseenCount = createMemo(() => notification.session.unseenCount(props.session.id))
const hasError = createMemo(() => notification.session.unseenHasError(props.session.id)) const hasError = createMemo(() => notification.session.unseenHasError(props.session.id))
const [sessionStore] = globalSync.child(props.session.directory) const [sessionStore] = serverSync.child(props.session.directory)
const hasPermissions = createMemo(() => { const hasPermissions = createMemo(() => {
return !!sessionPermissionRequest(sessionStore.session, sessionStore.permission, props.session.id, (item) => { return !!sessionPermissionRequest(sessionStore.session, sessionStore.permission, props.session.id, (item) => {
return !permission.autoResponds(item, props.session.directory) return !permission.autoResponds(item, props.session.directory)
packages/app/src/pages/layout/sidebar-project.tsx
+6 -6
View File
@@ -7,7 +7,7 @@ import { HoverCard } from "@opencode-ai/ui/hover-card"
import { Icon } from "@opencode-ai/ui/icon" import { Icon } from "@opencode-ai/ui/icon"
import { createSortable } from "@thisbeyond/solid-dnd" import { createSortable } from "@thisbeyond/solid-dnd"
import { useLayout, type LocalProject } from "@/context/layout" import { useLayout, type LocalProject } from "@/context/layout"
import { useGlobalSync } from "@/context/global-sync" import { useServerSync } from "@/context/server-sync"
import { useLanguage } from "@/context/language" import { useLanguage } from "@/context/language"
import { useNotification } from "@/context/notification" import { useNotification } from "@/context/notification"
import { ProjectIcon, SessionItem, type SessionItemProps } from "./sidebar-items" import { ProjectIcon, SessionItem, type SessionItemProps } from "./sidebar-items"
@@ -274,7 +274,7 @@ export const SortableProject = (props: {
ctx: ProjectSidebarContext ctx: ProjectSidebarContext
sortNow: Accessor<number> sortNow: Accessor<number>
}): JSX.Element => { }): JSX.Element => {
const globalSync = useGlobalSync() const serverSync = useServerSync()
const language = useLanguage() const language = useLanguage()
const sortable = createSortable(props.project.worktree) const sortable = createSortable(props.project.worktree)
const selected = createMemo(() => props.ctx.currentProject()?.worktree === props.project.worktree) const selected = createMemo(() => props.ctx.currentProject()?.worktree === props.project.worktree)
@@ -294,23 +294,23 @@ export const SortableProject = (props: {
const hoverOpen = () => isHoverProject() && preview() && !selected() && !state.menu const hoverOpen = () => isHoverProject() && preview() && !selected() && !state.menu
const label = (directory: string) => { const label = (directory: string) => {
const [data] = globalSync.child(directory, { bootstrap: false }) const [data] = serverSync.child(directory, { bootstrap: false })
const kind = const kind =
directory === props.project.worktree ? language.t("workspace.type.local") : language.t("workspace.type.sandbox") directory === props.project.worktree ? language.t("workspace.type.local") : language.t("workspace.type.sandbox")
const name = props.ctx.workspaceLabel(directory, data.vcs?.branch, props.project.id) const name = props.ctx.workspaceLabel(directory, data.vcs?.branch, props.project.id)
return `${kind} : ${name}` return `${kind} : ${name}`
} }
const projectStore = createMemo(() => globalSync.child(props.project.worktree, { bootstrap: false })[0]) const projectStore = createMemo(() => serverSync.child(props.project.worktree, { bootstrap: false })[0])
const isWorking = createMemo(() => const isWorking = createMemo(() =>
dirs().some((directory) => { dirs().some((directory) => {
const [store] = globalSync.child(directory, { bootstrap: false }) const [store] = serverSync.child(directory, { bootstrap: false })
return Object.keys(store.session_status).some((id) => store.session_working(id)) return Object.keys(store.session_status).some((id) => store.session_working(id))
}), }),
) )
const projectSessions = createMemo(() => sortedRootSessions(projectStore(), props.sortNow())) const projectSessions = createMemo(() => sortedRootSessions(projectStore(), props.sortNow()))
const workspaceSessions = (directory: string) => { const workspaceSessions = (directory: string) => {
const [data] = globalSync.child(directory, { bootstrap: false }) const [data] = serverSync.child(directory, { bootstrap: false })
return sortedRootSessions(data, props.sortNow()) return sortedRootSessions(data, props.sortNow())
} }
const tile = () => ( const tile = () => (
packages/app/src/pages/layout/sidebar-workspace.tsx
+10 -10
View File
@@ -14,7 +14,7 @@ import { Spinner } from "@opencode-ai/ui/spinner"
import { Tooltip } from "@opencode-ai/ui/tooltip" import { Tooltip } from "@opencode-ai/ui/tooltip"
import { type Session } from "@opencode-ai/sdk/v2/client" import { type Session } from "@opencode-ai/sdk/v2/client"
import { type LocalProject } from "@/context/layout" import { type LocalProject } from "@/context/layout"
import { useGlobalSync, useQueryOptions } from "@/context/global-sync" import { useServerSync, useQueryOptions } from "@/context/server-sync"
import { useLanguage } from "@/context/language" import { useLanguage } from "@/context/language"
import { pathKey } from "@/utils/path-key" import { pathKey } from "@/utils/path-key"
import { NewSessionItem, SessionItem, SessionSkeleton } from "./sidebar-items" import { NewSessionItem, SessionItem, SessionSkeleton } from "./sidebar-items"
@@ -60,7 +60,7 @@ export const WorkspaceDragOverlay = (props: {
activeWorkspace: Accessor<string | undefined> activeWorkspace: Accessor<string | undefined>
workspaceLabel: (directory: string, branch?: string, projectId?: string) => string workspaceLabel: (directory: string, branch?: string, projectId?: string) => string
}): JSX.Element => { }): JSX.Element => {
const globalSync = useGlobalSync() const serverSync = useServerSync()
const language = useLanguage() const language = useLanguage()
const label = createMemo(() => { const label = createMemo(() => {
const project = props.sidebarProject() const project = props.sidebarProject()
@@ -68,7 +68,7 @@ export const WorkspaceDragOverlay = (props: {
const directory = props.activeWorkspace() const directory = props.activeWorkspace()
if (!directory) return if (!directory) return
const [workspaceStore] = globalSync.child(directory, { bootstrap: false }) const [workspaceStore] = serverSync.child(directory, { bootstrap: false })
const kind = const kind =
directory === project.worktree ? language.t("workspace.type.local") : language.t("workspace.type.sandbox") directory === project.worktree ? language.t("workspace.type.local") : language.t("workspace.type.sandbox")
const name = props.workspaceLabel(directory, workspaceStore.vcs?.branch, project.id) const name = props.workspaceLabel(directory, workspaceStore.vcs?.branch, project.id)
@@ -299,11 +299,11 @@ export const SortableWorkspace = (props: {
}): JSX.Element => { }): JSX.Element => {
const navigate = useNavigate() const navigate = useNavigate()
const params = useParams() const params = useParams()
const globalSync = useGlobalSync() const serverSync = useServerSync()
const queryOptions = useQueryOptions() const queryOptions = useQueryOptions()
const language = useLanguage() const language = useLanguage()
const sortable = createSortable(props.directory) const sortable = createSortable(props.directory)
const [workspaceStore, setWorkspaceStore] = globalSync.child(props.directory, { bootstrap: false }) const [workspaceStore, setWorkspaceStore] = serverSync.child(props.directory, { bootstrap: false })
const [menu, setMenu] = createStore({ const [menu, setMenu] = createStore({
open: false, open: false,
pendingRename: false, pendingRename: false,
@@ -328,7 +328,7 @@ export const SortableWorkspace = (props: {
const showNew = createMemo(() => !loading() && (touch() || count() === 0 || (active() && !params.id))) const showNew = createMemo(() => !loading() && (touch() || count() === 0 || (active() && !params.id)))
const loadMore = async () => { const loadMore = async () => {
setWorkspaceStore("limit", (limit) => (limit ?? 0) + 5) setWorkspaceStore("limit", (limit) => (limit ?? 0) + 5)
await globalSync.project.loadSessions(props.directory) await serverSync.project.loadSessions(props.directory)
} }
const workspaceEditActive = createMemo(() => props.ctx.editorOpen(`workspace:${props.directory}`)) const workspaceEditActive = createMemo(() => props.ctx.editorOpen(`workspace:${props.directory}`))
@@ -357,7 +357,7 @@ export const SortableWorkspace = (props: {
createEffect(() => { createEffect(() => {
if (!boot()) return if (!boot()) return
globalSync.child(props.directory, { bootstrap: true }) serverSync.child(props.directory, { bootstrap: true })
}) })
return ( return (
@@ -446,11 +446,11 @@ export const LocalWorkspace = (props: {
sortNow: Accessor<number> sortNow: Accessor<number>
mobile?: boolean mobile?: boolean
}): JSX.Element => { }): JSX.Element => {
const globalSync = useGlobalSync() const serverSync = useServerSync()
const queryOptions = useQueryOptions() const queryOptions = useQueryOptions()
const language = useLanguage() const language = useLanguage()
const workspace = createMemo(() => { const workspace = createMemo(() => {
const [store, setStore] = globalSync.child(props.project.worktree) const [store, setStore] = serverSync.child(props.project.worktree)
return { store, setStore } return { store, setStore }
}) })
const slug = createMemo(() => base64Encode(props.project.worktree)) const slug = createMemo(() => base64Encode(props.project.worktree))
@@ -461,7 +461,7 @@ export const LocalWorkspace = (props: {
const loading = () => fetching() > 0 && count() === 0 const loading = () => fetching() > 0 && count() === 0
const loadMore = async () => { const loadMore = async () => {
workspace().setStore("limit", (limit) => (limit ?? 0) + 5) workspace().setStore("limit", (limit) => (limit ?? 0) + 5)
await globalSync.project.loadSessions(props.project.worktree) await serverSync.project.loadSessions(props.project.worktree)
} }
return ( return (
packages/app/src/pages/session.tsx
+8 -8
View File
@@ -34,7 +34,7 @@ import { useLocation, useSearchParams } from "@solidjs/router"
import { NewSessionDesignView, NewSessionView, SessionHeader } from "@/components/session" import { NewSessionDesignView, NewSessionView, SessionHeader } from "@/components/session"
import { useComments } from "@/context/comments" import { useComments } from "@/context/comments"
import { getSessionPrefetch, SESSION_PREFETCH_TTL } from "@/context/global-sync/session-prefetch" import { getSessionPrefetch, SESSION_PREFETCH_TTL } from "@/context/global-sync/session-prefetch"
import { useGlobalSync } from "@/context/global-sync" import { useServerSync } from "@/context/server-sync"
import { useLanguage } from "@/context/language" import { useLanguage } from "@/context/language"
import { useLayout } from "@/context/layout" import { useLayout } from "@/context/layout"
import { usePrompt } from "@/context/prompt" import { usePrompt } from "@/context/prompt"
@@ -182,7 +182,7 @@ function createSessionHistoryLoader(input: SessionHistoryWindowInput) {
} }
export default function Page() { export default function Page() {
const globalSync = useGlobalSync() const serverSync = useServerSync()
const layout = useLayout() const layout = useLayout()
const local = useLocal() const local = useLocal()
const file = useFile() const file = useFile()
@@ -560,11 +560,11 @@ export default function Page() {
} }
function upsert(next: Project) { function upsert(next: Project) {
const list = globalSync.data.project const list = serverSync.data.project
sync.set("project", next.id) sync.set("project", next.id)
const idx = list.findIndex((item) => item.id === next.id) const idx = list.findIndex((item) => item.id === next.id)
if (idx >= 0) { if (idx >= 0) {
globalSync.set( serverSync.set(
"project", "project",
list.map((item, i) => (i === idx ? { ...item, ...next } : item)), list.map((item, i) => (i === idx ? { ...item, ...next } : item)),
) )
@@ -572,10 +572,10 @@ export default function Page() {
} }
const at = list.findIndex((item) => item.id > next.id) const at = list.findIndex((item) => item.id > next.id)
if (at >= 0) { if (at >= 0) {
globalSync.set("project", [...list.slice(0, at), next, ...list.slice(at)]) serverSync.set("project", [...list.slice(0, at), next, ...list.slice(at)])
return return
} }
globalSync.set("project", [...list, next]) serverSync.set("project", [...list, next])
} }
const gitMutation = useMutation(() => ({ const gitMutation = useMutation(() => ({
@@ -673,7 +673,7 @@ export default function Page() {
todoTimer = undefined todoTimer = undefined
if (!id) return if (!id) return
if (status === "idle" && !blocked) return if (status === "idle" && !blocked) return
const cached = untrack(() => sync.data.todo[id] !== undefined || globalSync.data.session_todo[id] !== undefined) const cached = untrack(() => sync.data.todo[id] !== undefined || serverSync.data.session_todo[id] !== undefined)
todoFrame = requestAnimationFrame(() => { todoFrame = requestAnimationFrame(() => {
todoFrame = undefined todoFrame = undefined
@@ -1386,7 +1386,7 @@ export default function Page() {
const ok = await sendFollowupDraft({ const ok = await sendFollowupDraft({
client: sdk.client, client: sdk.client,
sync, sync,
globalSync, serverSync,
draft: item, draft: item,
optimisticBusy: item.sessionDirectory === sdk.directory, optimisticBusy: item.sessionDirectory === sdk.directory,
}).catch((err) => { }).catch((err) => {
packages/app/src/pages/session/composer/session-composer-state.ts
+4 -4
View File
@@ -3,7 +3,7 @@ import { createStore } from "solid-js/store"
import type { PermissionRequest, QuestionRequest, Todo } from "@opencode-ai/sdk/v2" import type { PermissionRequest, QuestionRequest, Todo } from "@opencode-ai/sdk/v2"
import { useParams } from "@solidjs/router" import { useParams } from "@solidjs/router"
import { showToast } from "@opencode-ai/ui/toast" import { showToast } from "@opencode-ai/ui/toast"
import { useGlobalSync } from "@/context/global-sync" import { useServerSync } from "@/context/server-sync"
import { useLanguage } from "@/context/language" import { useLanguage } from "@/context/language"
import { usePermission } from "@/context/permission" import { usePermission } from "@/context/permission"
import { useSDK } from "@/context/sdk" import { useSDK } from "@/context/sdk"
@@ -27,7 +27,7 @@ export function createSessionComposerState(options?: { closeMs?: number | (() =>
const params = useParams() const params = useParams()
const sdk = useSDK() const sdk = useSDK()
const sync = useSync() const sync = useSync()
const globalSync = useGlobalSync() const serverSync = useServerSync()
const language = useLanguage() const language = useLanguage()
const permission = usePermission() const permission = usePermission()
@@ -50,7 +50,7 @@ export function createSessionComposerState(options?: { closeMs?: number | (() =>
const todos = createMemo((): Todo[] => { const todos = createMemo((): Todo[] => {
const id = params.id const id = params.id
if (!id) return [] if (!id) return []
return globalSync.data.session_todo[id] ?? [] return serverSync.data.session_todo[id] ?? []
}) })
const done = createMemo( const done = createMemo(
@@ -111,7 +111,7 @@ export function createSessionComposerState(options?: { closeMs?: number | (() =>
const clear = () => { const clear = () => {
const id = params.id const id = params.id
if (!id) return if (!id) return
globalSync.todo.set(id, []) serverSync.todo.set(id, [])
sync.set("todo", id, []) sync.set("todo", id, [])
} }
packages/app/src/pages/session/message-timeline.tsx
+4 -4
View File
@@ -48,7 +48,7 @@ import { useDialog } from "@opencode-ai/ui/context/dialog"
import { createResizeObserver } from "@solid-primitives/resize-observer" import { createResizeObserver } from "@solid-primitives/resize-observer"
import { useLanguage } from "@/context/language" import { useLanguage } from "@/context/language"
import { useSessionKey } from "@/pages/session/session-layout" import { useSessionKey } from "@/pages/session/session-layout"
import { useGlobalSDK } from "@/context/global-sdk" import { useServerSDK } from "@/context/server-sdk"
import { usePlatform } from "@/context/platform" import { usePlatform } from "@/context/platform"
import { useSettings } from "@/context/settings" import { useSettings } from "@/context/settings"
import { useSDK } from "@/context/sdk" import { useSDK } from "@/context/sdk"
@@ -273,7 +273,7 @@ export function MessageTimeline(props: {
let touchGesture: number | undefined let touchGesture: number | undefined
const navigate = useNavigate() const navigate = useNavigate()
const globalSDK = useGlobalSDK() const serverSDK = useServerSDK()
const sdk = useSDK() const sdk = useSDK()
const sync = useSync() const sync = useSync()
const settings = useSettings() const settings = useSettings()
@@ -704,14 +704,14 @@ export function MessageTimeline(props: {
} }
const shareMutation = useMutation(() => ({ const shareMutation = useMutation(() => ({
mutationFn: (id: string) => globalSDK.client.session.share({ sessionID: id, directory: sdk.directory }), mutationFn: (id: string) => serverSDK.client.session.share({ sessionID: id, directory: sdk.directory }),
onError: (err) => { onError: (err) => {
console.error("Failed to share session", err) console.error("Failed to share session", err)
}, },
})) }))
const unshareMutation = useMutation(() => ({ const unshareMutation = useMutation(() => ({
mutationFn: (id: string) => globalSDK.client.session.unshare({ sessionID: id, directory: sdk.directory }), mutationFn: (id: string) => serverSDK.client.session.unshare({ sessionID: id, directory: sdk.directory }),
onError: (err) => { onError: (err) => {
console.error("Failed to unshare session", err) console.error("Failed to unshare session", err)
}, },
packages/storybook/.storybook/mocks/app/context/global-sync.ts
+1 -1
View File
@@ -24,7 +24,7 @@ const [store, setStore] = createStore({
config: { permission: {} }, config: { permission: {} },
}) })
export function useGlobalSync() { export function useServerSync() {
return { return {
data: { data: {
provider, provider,
packages/ui/src/components/todo-panel-motion.stories.tsx
+2 -2
View File
@@ -2,7 +2,7 @@
import { createEffect, createMemo, onCleanup } from "solid-js" import { createEffect, createMemo, onCleanup } from "solid-js"
import { createStore } from "solid-js/store" import { createStore } from "solid-js/store"
import type { Todo } from "@opencode-ai/sdk/v2" import type { Todo } from "@opencode-ai/sdk/v2"
import { useGlobalSync } from "@/context/global-sync" import { useServerSync } from "@/context/global-sync"
import { SessionComposerRegion, createSessionComposerState } from "@/pages/session/composer" import { SessionComposerRegion, createSessionComposerState } from "@/pages/session/composer"
export default { export default {
@@ -129,7 +129,7 @@ const css = `
export const Playground = { export const Playground = {
render: () => { render: () => {
const global = useGlobalSync() const global = useServerSync()
const [cfg, setCfg] = createStore({ const [cfg, setCfg] = createStore({
open: true, open: true,
step: 1, step: 1,