[ai-assisted] fix: IPC start server button had no effect

Remove serverManagerAdapter indirection layer and have IPC handlers
call TalkToFigmaService directly, matching the cmd+s code path.

Co-Authored-By: Claude <noreply@anthropic.com>

Author: JooHyung Park

src/main.ts

@@ -9,10 +9,10 @@ import path from 'node:path';
 import inspector from 'node:inspector';
 import started from 'electron-squirrel-startup';
 import { initialize } from '@aptabase/electron/main';
-import { registerIpcHandlers, setServerManager, setAuthManager, emitToRenderer } from './main/ipc-handlers';
+import { registerIpcHandlers, setAuthManager, emitToRenderer } from './main/ipc-handlers';
 import { createLogger, setMainWindow } from './main/utils/logger';
 import { TalkToFigmaService, TalkToFigmaServerManager, TalkToFigmaTray } from './main/server';
-import { trackAppStart, trackAppQuit, trackUserEngagement, trackFirstOpenIfNeeded, trackAppException, trackServerAction, trackOAuthAction, APTABASE_APP_KEY } from './main/analytics';
+import { trackAppStart, trackAppQuit, trackUserEngagement, trackFirstOpenIfNeeded, trackAppException, trackOAuthAction, APTABASE_APP_KEY } from './main/analytics';
 import { FigmaOAuthService } from './main/figma/oauth/FigmaOAuthService';
 import { FigmaApiClient } from './main/figma/api/FigmaApiClient';
 import { IPC_CHANNELS, STORE_KEYS } from './shared/constants';
@@ -209,95 +209,6 @@ const initializeServers = (window: BrowserWindow) => {
     }
   });
 
-  // Create adapter for IPC handlers to use the new service
-  const serverManagerAdapter: {
-    start: () => Promise<void>;
-    stop: () => Promise<void>;
-    restart: () => Promise<void>;
-    getStatus: () => ServerState;
-  } = {
-    start: async () => {
-      const startTime = Date.now();
-      try {
-        const result = await service!.startAll();
-        if (!result.success) {
-          throw new Error(result.error || 'Failed to start servers');
-        }
-        // Track successful server start with startup time
-        const startupTimeMs = Date.now() - startTime;
-        trackServerAction('start', 'all', 3055, startupTimeMs, true);
-        // Note: emitStatusChange is called via TrayUpdateCallback in service.startAll()
-        // No need to call it explicitly here to avoid duplicate events
-      } catch (error) {
-        // Track failed server start
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        trackServerAction('start', 'all', 3055, undefined, false, errorMessage);
-        // Ensure UI reflects error state
-        emitStatusChange();
-        throw error;
-      }
-    },
-    stop: async () => {
-      try {
-        const result = await service!.stopAll();
-        if (!result.success) {
-          throw new Error(result.error || 'Failed to stop servers');
-        }
-        // Track successful server stop
-        trackServerAction('stop', 'all', 3055, undefined, true);
-        // Note: emitStatusChange is called via TrayUpdateCallback in service.stopAll()
-        // No need to call it explicitly here to avoid duplicate events
-      } catch (error) {
-        // Track failed server stop
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        trackServerAction('stop', 'all', 3055, undefined, false, errorMessage);
-        // Ensure UI reflects error state
-        emitStatusChange();
-        throw error;
-      }
-    },
-    restart: async () => {
-      // Track server restart at the beginning
-      trackServerAction('restart', 'all', 3055, undefined, true);
-      // Delegate to stop and start - they handle their own tracking
-      await serverManagerAdapter.stop();
-      await new Promise(resolve => setTimeout(resolve, 1000));
-      await serverManagerAdapter.start();
-    },
-    getStatus: () => {
-      const result = service!.getStatus();
-      if (result.success && result.status) {
-        // Convert FigmaServerState to ServerState format
-        const figmaState = result.status;
-        return {
-          websocket: {
-            status: figmaState.websocket.running ? 'running' : 'stopped',
-            port: figmaState.websocket.port,
-            connectedClients: figmaState.websocket.clientCount || 0,
-            mcpClientCount: figmaState.websocket.mcpClientCount,
-            figmaClientCount: figmaState.websocket.figmaClientCount,
-          },
-          mcp: {
-            status: 'running', // stdio mode is always available when app is running
-            transport: 'stdio',
-          },
-          operationInProgress: false,
-          lastError: null,
-        };
-      }
-      // Return default stopped state if getStatus fails
-      return {
-        websocket: { status: 'stopped', port: 3055, connectedClients: 0 },
-        mcp: { status: 'stopped', transport: 'stdio' },
-        operationInProgress: false,
-        lastError: result.error || null,
-      };
-    },
-  };
-
-  // Set the adapter for IPC handlers
-  setServerManager(serverManagerAdapter);
-
   // Create auth manager adapter
   const authManagerAdapter = {
     startOAuth: async () => {

src/main/ipc-handlers.ts

@@ -10,30 +10,19 @@ import { createLogger } from './utils/logger';
 import * as storeUtils from './utils/store';
 import type { ServerState, FigmaAuthState } from '../shared/types';
 import { registerMcpConfigHandlers } from './handlers/mcp-config-handler';
-import { trackTutorialAction, trackThemeChange, trackPageView } from './analytics';
+import { trackTutorialAction, trackThemeChange, trackPageView, trackServerAction } from './analytics';
 import { checkForUpdates } from './utils/updater';
+import { TalkToFigmaService } from './server/TalkToFigmaService';
 
 const logger = createLogger('IPC');
 
-// Placeholder for server manager (will be implemented in Phase 2)
-let serverManager: {
-  start: () => Promise<void>;
-  stop: () => Promise<void>;
-  restart: () => Promise<void>;
-  getStatus: () => ServerState;
-} | null = null;
-
-// Placeholder for auth manager (will be implemented in Phase 4)
+// Auth manager (set by main.ts after initialization)
 let authManager: {
   startOAuth: () => Promise<void>;
   logout: () => Promise<void>;
   getStatus: () => FigmaAuthState;
 } | null = null;
 
-export function setServerManager(manager: typeof serverManager): void {
-  serverManager = manager;
-}
-
 export function setAuthManager(manager: typeof authManager): void {
   authManager = manager;
 }
@@ -44,38 +33,67 @@ export function registerIpcHandlers(mainWindow: BrowserWindow): void {
   // ===== Server Control =====
   ipcMain.handle(IPC_CHANNELS.SERVER_START, async () => {
     logger.info('IPC: server:start');
-    if (!serverManager) {
-      throw new Error('Server manager not initialized');
+    const service = TalkToFigmaService.getInstance();
+    const startTime = Date.now();
+    const result = await service.startAll({ showNotification: false });
+    if (!result.success) {
+      trackServerAction('start', 'all', 3055, undefined, false, result.error);
+      throw new Error(result.error || 'Failed to start servers');
     }
-    await serverManager.start();
+    trackServerAction('start', 'all', 3055, Date.now() - startTime, true);
   });
 
   ipcMain.handle(IPC_CHANNELS.SERVER_STOP, async () => {
     logger.info('IPC: server:stop');
-    if (!serverManager) {
-      throw new Error('Server manager not initialized');
+    const service = TalkToFigmaService.getInstance();
+    const result = await service.stopAll({ showNotification: false });
+    if (!result.success) {
+      trackServerAction('stop', 'all', 3055, undefined, false, result.error);
+      throw new Error(result.error || 'Failed to stop servers');
     }
-    await serverManager.stop();
+    trackServerAction('stop', 'all', 3055, undefined, true);
   });
 
   ipcMain.handle(IPC_CHANNELS.SERVER_RESTART, async () => {
     logger.info('IPC: server:restart');
-    if (!serverManager) {
-      throw new Error('Server manager not initialized');
+    const service = TalkToFigmaService.getInstance();
+    await service.stopAll({ showNotification: false });
+    await new Promise(resolve => setTimeout(resolve, 1000));
+    const result = await service.startAll({ showNotification: false });
+    if (!result.success) {
+      trackServerAction('restart', 'all', 3055, undefined, false, result.error);
+      throw new Error(result.error || 'Failed to restart servers');
     }
-    await serverManager.restart();
+    trackServerAction('restart', 'all', 3055, undefined, true);
   });
 
   ipcMain.handle(IPC_CHANNELS.SERVER_GET_STATUS, async () => {
-    if (!serverManager) {
+    const service = TalkToFigmaService.getInstance();
+    const result = service.getStatus();
+    if (result.success && result.status) {
+      const figmaState = result.status;
       return {
-        websocket: { status: 'stopped', port: 3055, connectedClients: 0 },
-        mcp: { status: 'stopped', port: 3056 },
+        websocket: {
+          status: figmaState.websocket.running ? 'running' : 'stopped',
+          port: figmaState.websocket.port,
+          connectedClients: figmaState.websocket.clientCount || 0,
+          mcpClientCount: figmaState.websocket.mcpClientCount,
+          figmaClientCount: figmaState.websocket.figmaClientCount,
+        },
+        mcp: {
+          status: 'running',
+          transport: 'stdio',
+        },
         operationInProgress: false,
         lastError: null,
       } as ServerState;
     }
-    return serverManager.getStatus();
+    return {
+      websocket: { status: 'stopped', port: 3055, connectedClients: 0 },
+      mcp: { status: 'stopped', port: 3056 },
+      operationInProgress: false,
+      lastError: result.error || null,
+    } as ServerState;
   });
 
   // ===== Authentication =====