Merge pull request #550 from neoragex2002/PR

Author: zerob13

src/main/events.ts

@@ -40,7 +40,9 @@ export const CONVERSATION_EVENTS = {
 
   ACTIVATED: 'conversation:activated', // 替代 conversation-activated
   DEACTIVATED: 'conversation:deactivated', // 替代 active-conversation-cleared
-  MESSAGE_EDITED: 'conversation:message-edited' // 替代 message-edited
+  MESSAGE_EDITED: 'conversation:message-edited', // 替代 message-edited
+
+  MESSAGE_GENERATED: 'conversation:message-generated' // 主进程内部事件，一条完整的消息已生成
 }
 
 // 通信相关事件
@@ -157,3 +159,8 @@ export const TRAY_EVENTS = {
   SHOW_HIDDEN_WINDOW: 'tray:show-hidden-window', // 从托盘显示/隐藏窗口
   CHECK_FOR_UPDATES: 'tray:check-for-updates' // 托盘检查更新
 }
+
+// MCP会议专用事件
+export const MEETING_EVENTS = {
+  INSTRUCTION: 'mcp:meeting-instruction', // 主进程向渲染进程发送指令
+}

src/main/presenter/configPresenter/mcpConfHelper.ts

@@ -171,6 +171,16 @@ const DEFAULT_INMEMORY_SERVERS: Record<string, MCPServerConfig> = {
     command: 'deepchat-inmemory/conversation-search-server',
     env: {},
     disable: false
+  },
+  'deepchat-inmemory/meeting-server': {
+    args: [],
+    descriptions: 'DeepChat内置会议服务，用于组织多Agent讨论',
+    icons: '👥',
+    autoApprove: ['all'],
+    type: 'inmemory' as MCPServerType,
+    command: 'deepchat-inmemory/meeting-server',
+    env: {},
+    disable: false
   }
 }
 

src/main/presenter/configPresenter/modelDefaultSettings.ts

@@ -554,7 +554,7 @@ export const defaultModelsSettings: DefaultModelSetting[] = [
     id: 'deepseek-chat',
     name: 'DeepSeek chat',
     temperature: 1,
-    maxTokens: 16000,
+    maxTokens: 8192,
     contextLength: 65536,
     match: ['deepseek-chat'],
     vision: false,

src/main/presenter/mcpPresenter/inMemoryServers/builder.ts

@@ -11,6 +11,7 @@ import { CustomPromptsServer } from './customPromptsServer'
 import { DeepResearchServer } from './deepResearchServer'
 import { AutoPromptingServer } from './autoPromptingServer'
 import { ConversationSearchServer } from './conversationSearchServer'
+import { MeetingServer } from './meetingServer'
 
 export function getInMemoryServer(
   serverName: string,
@@ -76,6 +77,8 @@ export function getInMemoryServer(
       return new AutoPromptingServer()
     case 'deepchat-inmemory/conversation-search-server':
       return new ConversationSearchServer()
+    case 'deepchat-inmemory/meeting-server':
+      return new MeetingServer()
     default:
       throw new Error(`Unknown in-memory server: ${serverName}`)
   }

src/main/presenter/mcpPresenter/inMemoryServers/conversationSearchServer.ts

@@ -6,7 +6,7 @@ import { zodToJsonSchema } from 'zod-to-json-schema'
 import { Transport } from '@modelcontextprotocol/sdk/shared/transport'
 import { presenter } from '@/presenter' // 导入全局的 presenter 对象
 import { eventBus } from '@/eventbus' // 引入 eventBus
-import { TAB_EVENTS } from '@/events' // 引入 TAB_EVENTS
+import { TAB_EVENTS } from '@/events'
 
 // Schema definitions
 const SearchConversationsArgsSchema = z.object({
@@ -659,4 +659,4 @@ export class ConversationSearchServer {
       }
     })
   }
-}
+}