From 98ebfd12b394e943cdf240c268fb6cfc5571bed4 Mon Sep 17 00:00:00 2001
From: Vaayne <liu.vaayne@gmail.com>
Date: Tue, 23 Sep 2025 14:31:56 +0800
Subject: [PATCH] refactor: Improve logging and error handling in MCPApiService
 and ClaudeCodeService

---
 src/main/apiServer/services/mcp.ts            |  5 ---
 .../agents/services/SessionMessageService.ts  |  1 +
 .../agents/services/claudecode/index.ts       | 32 ++++++++++++-------
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/main/apiServer/services/mcp.ts b/src/main/apiServer/services/mcp.ts
index 4cb19477b8..e5cff2e156 100644
--- a/src/main/apiServer/services/mcp.ts
+++ b/src/main/apiServer/services/mcp.ts
@@ -102,19 +102,14 @@ class MCPApiService extends EventEmitter {
 
   async getServerInfo(id: string): Promise<any> {
     try {
-      logger.silly(`getServerInfo called with id: ${id}`)
       const server = await this.getServerById(id)
       if (!server) {
         logger.warn(`Server with id ${id} not found`)
         return null
       }
-      logger.silly(`Returning server info for id ${id}`)
 
       const client = await mcpService.initClient(server)
       const tools = await client.listTools()
-
-      logger.silly(`Server with id ${id} info:`, { tools: JSON.stringify(tools.tools) })
-
       return {
         id: server.id,
         name: server.name,
diff --git a/src/main/services/agents/services/SessionMessageService.ts b/src/main/services/agents/services/SessionMessageService.ts
index 64897ca2bc..9e0f3a73cb 100644
--- a/src/main/services/agents/services/SessionMessageService.ts
+++ b/src/main/services/agents/services/SessionMessageService.ts
@@ -270,6 +270,7 @@ export class SessionMessageService extends BaseService {
         .orderBy(desc(sessionMessagesTable.created_at))
         .limit(1)
 
+      logger.silly('Last agent session ID result:', { agentSessionId: result[0]?.agent_session_id, sessionId })
       return result[0]?.agent_session_id || ''
     } catch (error) {
       logger.error('Failed to get last agent session ID', {
diff --git a/src/main/services/agents/services/claudecode/index.ts b/src/main/services/agents/services/claudecode/index.ts
index 99000d9b33..3ddb34cf5a 100644
--- a/src/main/services/agents/services/claudecode/index.ts
+++ b/src/main/services/agents/services/claudecode/index.ts
@@ -74,6 +74,8 @@ class ClaudeCodeService implements AgentServiceInterface {
       ELECTRON_RUN_AS_NODE: '1'
     }
 
+    const errorChunks: string[] = []
+
     // Build SDK options from parameters
     const options: Options = {
       abortController,
@@ -82,7 +84,8 @@ class ClaudeCodeService implements AgentServiceInterface {
       model: modelInfo.modelId,
       pathToClaudeCodeExecutable: this.claudeExecutablePath,
       stderr: (chunk: string) => {
-        logger.info('claude stderr', { chunk })
+        logger.warn('claude stderr', { chunk })
+        errorChunks.push(chunk)
       },
       appendSystemPrompt: session.instructions,
       permissionMode: session.configuration?.permission_mode,
@@ -116,11 +119,16 @@ class ClaudeCodeService implements AgentServiceInterface {
 
     logger.silly('Starting Claude Code SDK query', {
       prompt,
-      options
+      cwd: options.cwd,
+      model: options.model,
+      permissionMode: options.permissionMode,
+      maxTurns: options.maxTurns,
+      allowedTools: options.allowedTools,
+      resume: options.resume
     })
 
     // Start async processing
-    this.processSDKQuery(prompt, options, aiStream)
+    this.processSDKQuery(prompt, options, aiStream, errorChunks)
 
     return aiStream
   }
@@ -142,7 +150,12 @@ class ClaudeCodeService implements AgentServiceInterface {
   /**
    * Process SDK query and emit stream events
    */
-  private async processSDKQuery(prompt: string, options: Options, stream: ClaudeCodeStream): Promise<void> {
+  private async processSDKQuery(
+    prompt: string,
+    options: Options,
+    stream: ClaudeCodeStream,
+    errorChunks: string[]
+  ): Promise<void> {
     const jsonOutput: SDKMessage[] = []
     let hasCompleted = false
     const startTime = Date.now()
@@ -209,17 +222,12 @@ class ClaudeCodeService implements AgentServiceInterface {
         return
       }
 
-      // Original error handling for non-abort errors
-      logger.error('SDK query error:', {
-        error: errorObj instanceof Error ? errorObj.message : String(errorObj),
-        duration,
-        messageCount: jsonOutput.length
-      })
-
+      errorChunks.push(errorObj instanceof Error ? errorObj.message : String(errorObj))
+      const errorMessage = errorChunks.join('\n\n')
       // Emit error event
       stream.emit('data', {
         type: 'error',
-        error: errorObj instanceof Error ? errorObj : new Error(String(errorObj))
+        error: new Error(errorMessage)
       })
     }
   }