Use server naming for shared API/events

packages/ui/src/components/directory-browser-dialog.tsx

@@ -2,7 +2,7 @@ import { Component, Show, For, createSignal, createMemo, createEffect, onCleanup
 import { ArrowUpLeft, Folder as FolderIcon, Loader2, X } from "lucide-solid"
 import type { FileSystemEntry, FileSystemListingMetadata } from "../../../server/src/api-types"
 import { WINDOWS_DRIVES_ROOT } from "../../../server/src/api-types"
-import { cliApi } from "../lib/api-client"
+import { serverApi } from "../lib/api-client"
 
 function normalizePathKey(input?: string | null) {
   if (!input || input === "." || input === "./") {
@@ -144,7 +144,7 @@ const DirectoryBrowserDialog: Component<DirectoryBrowserDialogProps> = (props) =
         })
       }
 
-      const response = await cliApi.listFileSystem(targetPath, { includeFiles: false })
+      const response = await serverApi.listFileSystem(targetPath, { includeFiles: false })
       const canonicalKey = normalizePathKey(response.metadata.currentPath)
       const directories = response.entries
         .filter((entry) => entry.type === "directory")

packages/ui/src/components/filesystem-browser-dialog.tsx

@@ -1,7 +1,7 @@
 import { Component, Show, For, createSignal, createMemo, createEffect, onCleanup } from "solid-js"
 import { Folder as FolderIcon, File as FileIcon, Loader2, Search, X, ArrowUpLeft } from "lucide-solid"
 import type { FileSystemEntry, FileSystemListingMetadata } from "../../../server/src/api-types"
-import { cliApi } from "../lib/api-client"
+import { serverApi } from "../lib/api-client"
 
 const MAX_RESULTS = 200
 
@@ -91,7 +91,7 @@ const FileSystemBrowserDialog: Component<FileSystemBrowserDialogProps> = (props)
 
     const loadPromise = (async () => {
       setLoadingPath(normalized)
-      const response = await cliApi.listFileSystem(normalized === "." ? "." : normalized, {
+      const response = await serverApi.listFileSystem(normalized === "." ? "." : normalized, {
         includeFiles: props.mode === "files",
       })
       directoryCache.set(normalized, response.entries)

packages/ui/src/components/opencode-binary-selector.tsx

@@ -1,7 +1,7 @@
 import { Component, For, Show, createEffect, createMemo, createSignal, onCleanup } from "solid-js"
 import { FolderOpen, Trash2, Check, AlertCircle, Loader2, Plus } from "lucide-solid"
 import { useConfig } from "../stores/preferences"
-import { cliApi } from "../lib/api-client"
+import { serverApi } from "../lib/api-client"
 import FileSystemBrowserDialog from "./filesystem-browser-dialog"
 
 interface BinaryOption {
@@ -105,7 +105,7 @@ const OpenCodeBinarySelector: Component<OpenCodeBinarySelectorProps> = (props) =
       setValidating(true)
       setValidationError(null)
 
-      const result = await cliApi.validateBinary(path)
+      const result = await serverApi.validateBinary(path)
 
       if (result.valid && result.version) {
         const updatedVersionInfo = new Map(versionInfo())

packages/ui/src/components/unified-picker.tsx

@@ -1,7 +1,7 @@
 import { Component, createSignal, createEffect, For, Show, onCleanup } from "solid-js"
 import type { Agent } from "../types/session"
 import type { OpencodeClient } from "@opencode-ai/sdk/client"
-import { cliApi } from "../lib/api-client"
+import { serverApi } from "../lib/api-client"
 
 const SEARCH_RESULT_LIMIT = 100
 const SEARCH_DEBOUNCE_MS = 200
@@ -115,7 +115,7 @@ const UnifiedPicker: Component<UnifiedPickerProps> = (props) => {
     }
  
     inflightWorkspaceId = workspaceId
-    inflightSnapshotPromise = cliApi
+    inflightSnapshotPromise = serverApi
       .listWorkspaceFiles(workspaceId)
       .then((entries) => mapEntriesToFileItems(entries))
       .then((snapshot) => {
@@ -169,7 +169,7 @@ const UnifiedPicker: Component<UnifiedPickerProps> = (props) => {
         return
       }
 
-      const results = await cliApi.searchWorkspaceFiles(workspaceId, normalizedQuery, {
+      const results = await serverApi.searchWorkspaceFiles(workspaceId, normalizedQuery, {
         limit: SEARCH_RESULT_LIMIT,
       })
       if (!shouldApplyResults(requestId, workspaceId)) {

packages/ui/src/lib/api-client.ts

@@ -80,7 +80,7 @@ async function request<T>(path: string, init?: RequestInit): Promise<T> {
 }
 
 
-export const cliApi = {
+export const serverApi = {
   fetchWorkspaces(): Promise<WorkspaceDescriptor[]> {
     return request<WorkspaceDescriptor[]>("/api/workspaces")
   },

packages/ui/src/lib/server-events.ts

@@ -1,5 +1,5 @@
 import type { WorkspaceEventPayload, WorkspaceEventType } from "../../../server/src/api-types"
-import { cliApi } from "./api-client"
+import { serverApi } from "./api-client"
 
 const RETRY_BASE_DELAY = 1000
 const RETRY_MAX_DELAY = 10000
@@ -13,7 +13,7 @@ function logSse(message: string, context?: Record<string, unknown>) {
   console.log(`${SSE_PREFIX} ${message}`)
 }
 
-class CliEvents {
+class ServerEvents {
   private handlers = new Map<WorkspaceEventType | "*", Set<(event: WorkspaceEventPayload) => void>>()
   private source: EventSource | null = null
   private retryDelay = RETRY_BASE_DELAY
@@ -27,7 +27,7 @@ class CliEvents {
       this.source.close()
     }
     logSse("Connecting to backend events stream")
-    this.source = cliApi.connectEvents((event) => this.dispatch(event), () => this.scheduleReconnect())
+    this.source = serverApi.connectEvents((event) => this.dispatch(event), () => this.scheduleReconnect())
     this.source.onopen = () => {
       logSse("Events stream connected")
       this.retryDelay = RETRY_BASE_DELAY
@@ -62,4 +62,4 @@ class CliEvents {
   }
 }
 
-export const cliEvents = new CliEvents()
+export const serverEvents = new ServerEvents()

packages/ui/src/lib/server-meta.ts

@@ -1,5 +1,5 @@
 import type { ServerMeta } from "../../../server/src/api-types"
-import { cliApi } from "./api-client"
+import { serverApi } from "./api-client"
 
 let cachedMeta: ServerMeta | null = null
 let pendingMeta: Promise<ServerMeta> | null = null
@@ -11,7 +11,7 @@ export async function getServerMeta(): Promise<ServerMeta> {
   if (pendingMeta) {
     return pendingMeta
   }
-  pendingMeta = cliApi.fetchServerMeta().then((meta) => {
+  pendingMeta = serverApi.fetchServerMeta().then((meta) => {
     cachedMeta = meta
     pendingMeta = null
     return meta

packages/ui/src/lib/storage.ts

@@ -1,6 +1,6 @@
 import type { AppConfig, InstanceData } from "../../../server/src/api-types"
-import { cliApi } from "./api-client"
-import { cliEvents } from "./cli-events"
+import { serverApi } from "./api-client"
+import { serverEvents } from "./server-events"
 
 export type ConfigData = AppConfig
 
@@ -35,12 +35,12 @@ export class ServerStorage {
   private instanceLoadPromises = new Map<string, Promise<InstanceData>>()
 
   constructor() {
-    cliEvents.on("config.appChanged", (event) => {
+    serverEvents.on("config.appChanged", (event) => {
       if (event.type !== "config.appChanged") return
       this.setConfigCache(event.config)
     })
 
-    cliEvents.on("instance.dataChanged", (event) => {
+    serverEvents.on("instance.dataChanged", (event) => {
       if (event.type !== "instance.dataChanged") return
       this.setInstanceDataCache(event.instanceId, event.data)
     })
@@ -52,7 +52,7 @@ export class ServerStorage {
     }
 
     if (!this.loadPromise) {
-      this.loadPromise = cliApi
+      this.loadPromise = serverApi
         .fetchConfig()
         .then((config) => {
           this.setConfigCache(config)
@@ -67,7 +67,7 @@ export class ServerStorage {
   }
 
   async updateConfig(next: ConfigData): Promise<ConfigData> {
-    const nextConfig = await cliApi.updateConfig(next)
+    const nextConfig = await serverApi.updateConfig(next)
     this.setConfigCache(nextConfig)
     return nextConfig
   }
@@ -79,7 +79,7 @@ export class ServerStorage {
     }
 
     if (!this.instanceLoadPromises.has(instanceId)) {
-      const promise = cliApi
+      const promise = serverApi
         .readInstanceData(instanceId)
         .then((data) => {
           const normalized = this.normalizeInstanceData(data)
@@ -98,12 +98,12 @@ export class ServerStorage {
 
   async saveInstanceData(instanceId: string, data: InstanceData): Promise<void> {
     const normalized = this.normalizeInstanceData(data)
-    await cliApi.writeInstanceData(instanceId, normalized)
+    await serverApi.writeInstanceData(instanceId, normalized)
     this.setInstanceDataCache(instanceId, normalized)
   }
 
   async deleteInstanceData(instanceId: string): Promise<void> {
-    await cliApi.deleteInstanceData(instanceId)
+    await serverApi.deleteInstanceData(instanceId)
     this.setInstanceDataCache(instanceId, DEFAULT_INSTANCE_DATA)
   }
 

packages/ui/src/stores/instances.ts

@@ -4,8 +4,8 @@ import type { LspStatus, Permission } from "@opencode-ai/sdk"
 import type { ClientPart, Message } from "../types/message"
 import { sdkManager } from "../lib/sdk-manager"
 import { sseManager } from "../lib/sse-manager"
-import { cliApi } from "../lib/api-client"
-import { cliEvents } from "../lib/cli-events"
+import { serverApi } from "../lib/api-client"
+import { serverEvents } from "../lib/server-events"
 import type { WorkspaceDescriptor, WorkspaceEventPayload, WorkspaceLogEntry } from "../../../server/src/api-types"
 import { ensureInstanceConfigLoaded } from "./instance-config"
 import {
@@ -129,7 +129,7 @@ async function hydrateInstanceData(instanceId: string) {
 
 void (async function initializeWorkspaces() {
   try {
-    const workspaces = await cliApi.fetchWorkspaces()
+    const workspaces = await serverApi.fetchWorkspaces()
     workspaces.forEach((workspace) => upsertWorkspace(workspace))
     if (workspaces.length === 0) {
       setHasInstances(false)
@@ -139,7 +139,7 @@ void (async function initializeWorkspaces() {
   }
 })()
 
-cliEvents.on("*", (event) => handleWorkspaceEvent(event))
+serverEvents.on("*", (event) => handleWorkspaceEvent(event))
 
 function handleWorkspaceEvent(event: WorkspaceEventPayload) {
   switch (event.type) {
@@ -299,7 +299,7 @@ function removeInstance(id: string) {
 
 async function createInstance(folder: string, _binaryPath?: string): Promise<string> {
   try {
-    const workspace = await cliApi.createWorkspace({ path: folder })
+    const workspace = await serverApi.createWorkspace({ path: folder })
     upsertWorkspace(workspace)
     setActiveInstanceId(workspace.id)
     return workspace.id
@@ -316,7 +316,7 @@ async function stopInstance(id: string) {
   releaseInstanceResources(id)
 
   try {
-    await cliApi.deleteWorkspace(id)
+    await serverApi.deleteWorkspace(id)
   } catch (error) {
     console.error("Failed to stop workspace", error)
   }