diff --git a/packages/kit/src/client/docks.ts b/packages/kit/src/client/docks.ts
index 54763467..6b377e7c 100644
--- a/packages/kit/src/client/docks.ts
+++ b/packages/kit/src/client/docks.ts
@@ -16,14 +16,14 @@ export interface DockPanelStorage {
 
 export type DockClientType = 'embedded' | 'standalone'
 
-export interface DevToolsClientContext {
+export interface DevToolsRpcContext {
   /**
    * The RPC client to interact with the server
    */
   readonly rpc: DevToolsRpcClient
 }
 
-export interface DocksContext extends DevToolsClientContext {
+export interface DocksContext extends DevToolsRpcContext {
   /**
    * Type of the client environment
    *
@@ -57,7 +57,9 @@ export interface WhenClauseContext {
   readonly context: WhenContext
 }
 
-export type DevToolsClientRpcHost = RpcFunctionsCollector<DevToolsRpcClientFunctions, DevToolsClientContext>
+export type DevToolsClientRpcHost = RpcFunctionsCollector<DevToolsRpcClientFunctions, DevToolsRpcContext>
+
+export type DevToolsClientContext = DocksContext
 
 export interface DocksPanelContext {
   store: DockPanelStorage
diff --git a/packages/kit/src/client/rpc.ts b/packages/kit/src/client/rpc.ts
index 70672364..cae2db3b 100644
--- a/packages/kit/src/client/rpc.ts
+++ b/packages/kit/src/client/rpc.ts
@@ -1,7 +1,7 @@
 import type { WebSocketRpcClientOptions } from '@vitejs/devtools-rpc/presets/ws/client'
 import type { BirpcOptions, BirpcReturn } from 'birpc'
 import type { ConnectionMeta, DevToolsRpcClientFunctions, DevToolsRpcServerFunctions, EventEmitter, RpcSharedStateHost } from '../types'
-import type { DevToolsClientContext, DevToolsClientRpcHost, RpcClientEvents } from './docks'
+import type { DevToolsClientRpcHost, DevToolsRpcContext, RpcClientEvents } from './docks'
 import { RpcFunctionsCollectorBase } from '@vitejs/devtools-rpc'
 import {
   DEVTOOLS_CONNECTION_META_FILENAME,
@@ -188,11 +188,11 @@ export async function getDevToolsRpcClient(
     }
   }
 
-  const context: DevToolsClientContext = {
+  const context: DevToolsRpcContext = {
     rpc: undefined!,
   }
   const authToken = getConnectionAuthTokenFromWindows(options.authToken)
-  const clientRpc: DevToolsClientRpcHost = new RpcFunctionsCollectorBase<DevToolsRpcClientFunctions, DevToolsClientContext>(context)
+  const clientRpc: DevToolsClientRpcHost = new RpcFunctionsCollectorBase<DevToolsRpcClientFunctions, DevToolsRpcContext>(context)
 
   async function fetchJsonFromBases(path: string): Promise<any> {
     const candidates = [