refactor(all): update MCP event schemas for consistency and clarity

Lasim · Lasim · commit 2258555a56dc · 2025-10-14T22:45:42.000+02:00
diff --git a/services/backend/src/events/satellite/mcp-server-crashed.ts b/services/backend/src/events/satellite/mcp-server-crashed.ts
@@ -15,57 +15,63 @@ export const EVENT_TYPE = 'mcp.server.crashed';
 export const SCHEMA = {
   type: 'object',
   properties: {
-    processId: {
-      type: 'string',
-      minLength: 1,
-      description: 'Process identifier in satelliteProcesses table'
-    },
-    serverId: {
+    server_id: {
       type: 'string',
       minLength: 1,
       description: 'MCP server identifier that crashed'
     },
-    serverName: {
+    server_slug: {
       type: 'string',
       minLength: 1,
-      description: 'Human-readable MCP server name'
+      description: 'MCP server slug'
     },
-    teamId: {
+    team_id: {
       type: 'string',
       minLength: 1,
       description: 'Team identifier for the crashed server'
     },
-    exitCode: {
+    process_id: {
+      type: 'number',
+      description: 'Operating system process ID'
+    },
+    exit_code: {
       type: 'number',
       description: 'Process exit code'
     },
     signal: {
       type: 'string',
-      description: 'Signal that terminated the process (e.g., SIGKILL, SIGSEGV)'
+      description: 'Signal that terminated the process (e.g., SIGTERM, SIGKILL)'
     },
-    errorMessage: {
-      type: 'string',
-      description: 'Error message or crash reason'
+    uptime_seconds: {
+      type: 'number',
+      minimum: 0,
+      description: 'Process uptime in seconds before crash'
     },
-    stackTrace: {
-      type: 'string',
-      description: 'Stack trace if available'
+    crash_count: {
+      type: 'number',
+      minimum: 1,
+      description: 'Number of crashes for this process'
+    },
+    will_restart: {
+      type: 'boolean',
+      description: 'Whether the process will be automatically restarted'
     }
   },
-  required: ['processId', 'serverId', 'serverName', 'teamId'],
+  required: ['server_id', 'server_slug', 'team_id', 'process_id', 'exit_code', 'signal', 'uptime_seconds', 'crash_count', 'will_restart'],
   additionalProperties: true
 } as const;
 
 // TypeScript interface for type safety
 interface ServerCrashedData {
-  processId: string;
-  serverId: string;
-  serverName: string;
-  teamId: string;
-  exitCode?: number;
-  signal?: string;
-  errorMessage?: string;
-  stackTrace?: string;
+  server_id: string;
+  server_slug: string;
+  team_id: string;
+  process_id: number;
+  exit_code: number;
+  signal: string;
+  uptime_seconds: number;
+  crash_count: number;
+  will_restart: boolean;
 }
 
 /**
@@ -83,14 +89,7 @@ export async function handle(
   const data = eventData as unknown as ServerCrashedData;
   
   // Build error message from available data
-  const errorDetails = [];
-  if (data.exitCode !== undefined) errorDetails.push(`Exit code: ${data.exitCode}`);
-  if (data.signal) errorDetails.push(`Signal: ${data.signal}`);
-  if (data.errorMessage) errorDetails.push(data.errorMessage);
-  
-  const errorMessage = errorDetails.length > 0 
-    ? errorDetails.join(' | ') 
-    : 'Process crashed unexpectedly';
+  const errorMessage = `Process crashed: Exit code ${data.exit_code}, Signal: ${data.signal}, Uptime: ${data.uptime_seconds}s, Crash #${data.crash_count}`;
   
   // Update process status to failed
   await db
@@ -102,7 +101,7 @@ export async function handle(
       stopped_at: eventTimestamp,
       updated_at: new Date()
     })
-    .where(eq(satelliteProcesses.id, data.processId));
+    .where(eq(satelliteProcesses.id, data.server_id));
   
   // Future enhancement: Trigger alert notifications
   // Future enhancement: Create incident tracking record
diff --git a/services/backend/src/events/satellite/mcp-server-started.ts b/services/backend/src/events/satellite/mcp-server-started.ts
@@ -15,47 +15,54 @@ export const EVENT_TYPE = 'mcp.server.started';
 export const SCHEMA = {
   type: 'object',
   properties: {
-    processId: {
+    server_id: {
       type: 'string',
       minLength: 1,
-      description: 'Unique process identifier in satelliteProcesses table'
+      description: 'MCP server identifier (installation_id)'
     },
-    serverId: {
+    server_slug: {
       type: 'string',
       minLength: 1,
-      description: 'MCP server identifier'
+      description: 'MCP server slug (installation_name)'
     },
-    serverName: {
-      type: 'string',
-      minLength: 1,
-      description: 'Human-readable MCP server name'
-    },
-    teamId: {
+    team_id: {
       type: 'string',
       minLength: 1,
       description: 'Team identifier'
     },
-    pid: {
+    process_id: {
       type: 'number',
       description: 'Operating system process ID'
     },
-    localPort: {
+    transport: {
+      type: 'string',
+      enum: ['stdio', 'http'],
+      description: 'Transport protocol type'
+    },
+    tool_count: {
+      type: 'number',
+      minimum: 0,
+      description: 'Number of tools discovered'
+    },
+    spawn_duration_ms: {
       type: 'number',
-      description: 'Local port for HTTP communication'
+      minimum: 0,
+      description: 'Time taken to spawn process in milliseconds'
     }
   },
-  required: ['processId', 'serverId', 'serverName', 'teamId'],
+  required: ['server_id', 'server_slug', 'team_id', 'process_id', 'transport', 'tool_count', 'spawn_duration_ms'],
   additionalProperties: true
 } as const;
 
 // TypeScript interface for type safety
 interface ServerStartedData {
-  processId: string;
-  serverId: string;
-  serverName: string;
-  teamId: string;
-  pid?: number;
-  localPort?: number;
+  server_id: string;
+  server_slug: string;
+  team_id: string;
+  process_id: number;
+  transport: 'stdio' | 'http';
+  tool_count: number;
+  spawn_duration_ms: number;
 }
 
 /**
@@ -77,11 +84,10 @@ export async function handle(
     .update(satelliteProcesses)
     .set({
       status: 'running',
-      process_pid: data.pid || null,
-      local_port: data.localPort || null,
+      process_pid: data.process_id,
       health_status: 'healthy',
       started_at: eventTimestamp,
       updated_at: new Date()
     })
-    .where(eq(satelliteProcesses.id, data.processId));
+    .where(eq(satelliteProcesses.id, data.server_id));
 }
diff --git a/services/backend/src/events/satellite/mcp-tool-executed.ts b/services/backend/src/events/satellite/mcp-tool-executed.ts
@@ -15,79 +15,47 @@ export const EVENT_TYPE = 'mcp.tool.executed';
 export const SCHEMA = {
   type: 'object',
   properties: {
-    processId: {
-      type: 'string',
-      description: 'Process identifier in satelliteProcesses table'
-    },
-    toolName: {
+    tool_name: {
       type: 'string',
       minLength: 1,
-      description: 'MCP tool name (e.g., filesystem/read_file)'
+      description: 'MCP tool name (e.g., filesystem-read_file)'
     },
-    serverId: {
+    server_id: {
       type: 'string',
       minLength: 1,
       description: 'MCP server identifier that executed the tool'
     },
-    teamId: {
+    team_id: {
       type: 'string',
       minLength: 1,
       description: 'Team identifier for the execution context'
     },
-    userId: {
-      type: 'string',
-      description: 'User who triggered the tool execution'
-    },
-    durationMs: {
+    duration_ms: {
       type: 'number',
       minimum: 0,
       description: 'Tool execution duration in milliseconds'
     },
-    statusCode: {
-      type: 'number',
-      description: 'Execution status code (200 = success, 4xx/5xx = error)'
+    success: {
+      type: 'boolean',
+      description: 'Whether the tool execution succeeded'
     },
-    errorMessage: {
+    error_message: {
       type: 'string',
       description: 'Error message if execution failed'
-    },
-    requestSizeBytes: {
-      type: 'number',
-      minimum: 0,
-      description: 'Input payload size in bytes'
-    },
-    responseSizeBytes: {
-      type: 'number',
-      minimum: 0,
-      description: 'Output payload size in bytes'
-    },
-    userAgent: {
-      type: 'string',
-      description: 'Client user agent (e.g., VS Code version)'
-    },
-    ipAddress: {
-      type: 'string',
-      description: 'Client IP address if available'
     }
   },
-  required: ['toolName', 'serverId', 'teamId'],
+  required: ['tool_name', 'server_id', 'team_id', 'duration_ms', 'success'],
   additionalProperties: true
 } as const;
 
 // TypeScript interface for type safety
 interface ToolExecutedData {
-  processId?: string;
-  toolName: string;
-  serverId: string;
-  teamId: string;
-  userId?: string;
-  durationMs?: number;
-  statusCode?: number;
-  errorMessage?: string;
-  requestSizeBytes?: number;
-  responseSizeBytes?: number;
-  userAgent?: string;
-  ipAddress?: string;
+  tool_name: string;
+  server_id: string;
+  team_id: string;
+  duration_ms: number;
+  success: boolean;
+  error_message?: string;
 }
 
 /**
@@ -111,19 +79,19 @@ export async function handle(
   await db.insert(satelliteUsageLogs).values({
     id: nanoid(),
     satellite_id: satelliteId,
-    user_id: data.userId || null,
-    team_id: data.teamId,
-    process_id: data.processId || null,
-    request_method: 'POST', // MCP tools are typically POST requests
-    request_path: `/mcp/tool/${data.toolName}`,
-    tool_name: data.toolName,
-    duration_ms: data.durationMs || null,
-    status_code: data.statusCode || (data.errorMessage ? 500 : 200),
-    error_message: data.errorMessage || null,
-    request_size_bytes: data.requestSizeBytes || null,
-    response_size_bytes: data.responseSizeBytes || null,
-    user_agent: data.userAgent || null,
-    ip_address: data.ipAddress || null,
+    user_id: null,
+    team_id: data.team_id,
+    process_id: null,
+    request_method: 'POST',
+    request_path: `/mcp/tool/${data.tool_name}`,
+    tool_name: data.tool_name,
+    duration_ms: data.duration_ms,
+    status_code: data.success ? 200 : 500,
+    error_message: data.error_message || null,
+    request_size_bytes: null,
+    response_size_bytes: null,
+    user_agent: null,
+    ip_address: null,
     timestamp: eventTimestamp,
     date_partition: datePartition
   });
diff --git a/services/satellite/src/server.ts b/services/satellite/src/server.ts
@@ -368,8 +368,8 @@ export async function createServer() {
   }, 'Automatic stdio tool discovery handler registered for process spawn events');
 
 
-  // Initialize MCP Protocol Handler (after HTTP Proxy Manager and Tool Discovery Manager)
-  const mcpProtocolHandler = new McpProtocolHandler(httpProxyManager, toolDiscoveryManager, server.log);
+  // Initialize MCP Protocol Handler (after HTTP Proxy Manager, Tool Discovery Manager, and Process Manager)
+  const mcpProtocolHandler = new McpProtocolHandler(httpProxyManager, toolDiscoveryManager, processManager, server.log);
 
   // Initialize Command Processor with stdio process management dependencies
   const commandProcessor = new CommandProcessor(
diff --git a/services/satellite/src/services/mcp-protocol-handler.ts b/services/satellite/src/services/mcp-protocol-handler.ts
