Rename type definitions for consistency

Author: aiqlcom

src/main/IPCs.ts

@@ -1,10 +1,10 @@
 import { ipcMain, shell, IpcMainEvent, dialog, BrowserWindow } from 'electron'
 import Constants from './utils/Constants'
 import {
-  capabilitySchemas,
-  ClientObj,
-  FeatureObj,
-  ConfigMcpMetadata,
+  McpServerCapabilitySchemas,
+  McpClientObject,
+  McpFeatureObject,
+  McpMetadataConfig,
   McpProgressCallback
 } from './mcp/types'
 
@@ -39,8 +39,8 @@ interface ManifestResponse {
  * IPC Communications
  * */
 export default class IPCs {
-  static clients: ClientObj[] = []
-  static currentFeatures: FeatureObj[] = []
+  static clients: McpClientObject[] = []
+  static currentFeatures: McpFeatureObject[] = []
 
   static initialize(): void {
     // Get application version
@@ -72,7 +72,7 @@ export default class IPCs {
 
     ipcMain.handle(
       'msgMcpServersInit',
-      async (event: IpcMainEvent, metadata: ConfigMcpMetadata) => {
+      async (event: IpcMainEvent, metadata: McpMetadataConfig) => {
         IPCs.stopAllServers()
 
         const progressCallback: McpProgressCallback = (name, message, status) => {
@@ -258,12 +258,12 @@ export default class IPCs {
     })
   }
 
-  static updateMCP(newFeatures: FeatureObj[]): void {
+  static updateMCP(newFeatures: McpFeatureObject[]): void {
     this.currentFeatures = newFeatures
   }
 
   static stopAllServers() {
-    this.clients.forEach((client: ClientObj) => {
+    this.clients.forEach((client: McpClientObject) => {
       if (client.connection?.transport) {
         disconnect(client.connection.transport)
         delete client.connection.transport
@@ -281,7 +281,7 @@ export default class IPCs {
     handlerRegistry.clear()
   }
 
-  static initializeMCP(initialFeatures: FeatureObj[]): void {
+  static initializeMCP(initialFeatures: McpFeatureObject[]): void {
     this.currentFeatures = initialFeatures
     ipcMain.handle('list-clients', () => {
       return this.currentFeatures
@@ -295,8 +295,12 @@ export function responseToRenderer(responseChannel, resolve) {
   })
 }
 
-export function registerIpcHandlers({ name, connection, configJson }: ClientObj): FeatureObj {
-  const feature: FeatureObj = {
+export function registerIpcHandlers({
+  name,
+  connection,
+  configJson
+}: McpClientObject): McpFeatureObject {
+  const feature: McpFeatureObject = {
     name,
     config: configJson
   }
@@ -324,7 +328,7 @@ export function registerIpcHandlers({ name, connection, configJson }: ClientObj)
     return eventName
   }
 
-  for (const [type, actions] of Object.entries(capabilitySchemas)) {
+  for (const [type, actions] of Object.entries(McpServerCapabilitySchemas)) {
     const capabilities = connection.client.getServerCapabilities()
     if (capabilities?.[type]) {
       feature[type] = {}

src/main/mcp/client.ts

@@ -5,15 +5,15 @@ import {
 import { Client } from '@modelcontextprotocol/sdk/client/index.js'
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'
 
-import { ServerConfig, McpClientTransport, McpProgressCallback } from './types'
+import { McpServerConfig, McpClientTransport, McpProgressCallback } from './types'
 import { connect } from './connection'
 
 import { samplingTransferInvoke, elicitationTransferInvoke } from '../index'
 import Constants from '../utils/Constants'
 
 export async function initializeClient(
   name: string,
-  serverConfig: ServerConfig,
+  serverConfig: McpServerConfig,
   callback?: McpProgressCallback,
   idleTimeout: number = 90 // 90 sec by default
 ): Promise<McpClientTransport> {
@@ -43,7 +43,7 @@ export async function initializeClient(
 
 async function initializeStdioClient(
   name: string,
-  config: ServerConfig,
+  config: McpServerConfig,
   callback?: McpProgressCallback,
   onData?: () => void
 ): Promise<McpClientTransport> {

src/main/mcp/config.ts

@@ -1,7 +1,7 @@
 import { showNotification } from '../utils//notification'
 import fs from 'node:fs'
 import path from 'node:path'
-import { McpServersConfig } from './types'
+import { McpServerConfig } from './types'
 import { shell } from 'electron'
 import { debounce } from 'lodash'
 
@@ -31,7 +31,7 @@ function readConfig(configPath: string) {
   }
 }
 
-export function loadConfigFile(configPath: string): McpServersConfig {
+export function loadConfigFile(configPath: string): Record<string, McpServerConfig> {
   const resolvedConfigPath = path.isAbsolute(configPath)
     ? configPath
     : path.resolve(process.cwd(), configPath)

src/main/mcp/init.ts

@@ -1,12 +1,12 @@
-import { ClientObj, ConfigMcpMetadata, ServerConfig, McpProgressCallback } from './types'
+import { McpClientObject, McpMetadataConfig, McpServerConfig, McpProgressCallback } from './types'
 // import { Notification } from 'electron'
 import { initializeClient } from './client'
 import { loadConfigFile } from './config'
 import Constants from '../utils/Constants'
 import { getMcpConfigForDxt } from './dxt'
 import path from 'node:path'
 
-export async function loadConfig(): Promise<ClientObj[]> {
+export async function loadConfig(): Promise<McpClientObject[]> {
   try {
     const config = loadConfigFile(Constants.ASSETS_PATH.mcp)
     if (config) {
@@ -19,9 +19,9 @@ export async function loadConfig(): Promise<ClientObj[]> {
 }
 
 export async function initClients(
-  metadata: ConfigMcpMetadata,
+  metadata: McpMetadataConfig,
   callback?: McpProgressCallback
-): Promise<ClientObj[]> {
+): Promise<McpClientObject[]> {
   if (!metadata) {
     console.log('NO clients initialized.')
     return []
@@ -58,9 +58,9 @@ export async function initClients(
 
 export async function initSingleClient(
   name: string,
-  serverConfig: ServerConfig,
+  serverConfig: McpServerConfig,
   callback?: McpProgressCallback
-): Promise<ClientObj> {
+): Promise<McpClientObject> {
   console.log(`Initializing client for ${name} with config:`, serverConfig)
   const connection = await initializeClient(name, serverConfig, callback)
   console.log(`${name} initialized.`)

src/main/mcp/types.ts

@@ -15,9 +15,9 @@ import {
   StdioServerParameters
 } from '@modelcontextprotocol/sdk/client/stdio.js'
 
-import { McpMetadataStdio, McpMetadataDxt } from '@/types/mcp'
+import { McpMetadata } from '@/types/mcp'
 
-export const capabilitySchemas = {
+export const McpServerCapabilitySchemas = {
   tools: {
     list: ListToolsResultSchema,
     call: CallToolResultSchema
@@ -33,21 +33,13 @@ export const capabilitySchemas = {
   }
 }
 
-export type ServerConfig = StdioServerParameters
+export type McpServerConfig = StdioServerParameters
 
 export interface McpClientTransport {
   client: Client
   transport: StdioClientTransport
 }
 
-export interface McpServersConfig {
-  [key: string]: ServerConfig
-}
-
-export type ConfigObj = {
-  [key: string]: ServerConfig
-}
-
 export type McpCallback = {
   name: string
   message: string
@@ -58,17 +50,17 @@ export type McpProgressCallback = (
   ..._args: [McpCallback['name'], McpCallback['message'], McpCallback['status']]
 ) => void
 
-export type ConfigMcpMetadata = {
-  [key: string]: McpMetadataStdio | McpMetadataDxt
+export type McpMetadataConfig = {
+  [key: string]: McpMetadata
 }
 
-export type ClientObj = {
+export type McpClientObject = {
   name: string
-  configJson?: ServerConfig
+  configJson?: McpServerConfig
   connection?: McpClientTransport
 }
 
-export type FeatureObj = {
+export type McpFeatureObject = {
   name: string
-  config: ClientObj['configJson']
+  config: McpClientObject['configJson']
 }