diff --git a/ccw/frontend/src/lib/api.ts b/ccw/frontend/src/lib/api.ts
index 645d166c..35c6d889 100644
--- a/ccw/frontend/src/lib/api.ts
+++ b/ccw/frontend/src/lib/api.ts
@@ -4373,10 +4373,13 @@ function buildCcwMcpServerConfig(config: {
 
   // Only use default when enabledTools is undefined (not provided)
   // When enabledTools is an empty array, set to empty string to disable all tools
+  console.log('[buildCcwMcpServerConfig] config.enabledTools:', config.enabledTools);
   if (config.enabledTools !== undefined) {
     env.CCW_ENABLED_TOOLS = config.enabledTools.join(',');
+    console.log('[buildCcwMcpServerConfig] Set CCW_ENABLED_TOOLS to:', env.CCW_ENABLED_TOOLS);
   } else {
     env.CCW_ENABLED_TOOLS = 'write_file,edit_file,read_file,core_memory,ask_question,smart_search';
+    console.log('[buildCcwMcpServerConfig] Using default CCW_ENABLED_TOOLS');
   }
 
   if (config.projectRoot) {
diff --git a/ccw/frontend/src/pages/McpManagerPage.tsx b/ccw/frontend/src/pages/McpManagerPage.tsx
index e11c5d91..5d80fd2a 100644
--- a/ccw/frontend/src/pages/McpManagerPage.tsx
+++ b/ccw/frontend/src/pages/McpManagerPage.tsx
@@ -412,8 +412,7 @@ export function McpManagerPage() {
   };
 
   const handleUpdateCcwConfig = async (config: Partial<CcwMcpConfig>) => {
-    // Read BEFORE optimistic update to capture actual server state
-    const currentConfig = queryClient.getQueryData<CcwMcpConfig>(ccwMcpQueryKey) ?? ccwConfig;
+    // Read BEFORE optimistic update to capture previous state for rollback
     const previousConfig = queryClient.getQueryData<CcwMcpConfig>(ccwMcpQueryKey);
 
     // Optimistic cache update for immediate UI response
@@ -422,8 +421,17 @@ export function McpManagerPage() {
       return { ...old, ...config };
     });
 
+    // Read AFTER optimistic update to get the latest merged state
+    const currentConfig = queryClient.getQueryData<CcwMcpConfig>(ccwMcpQueryKey) ?? ccwConfig;
+
     try {
-      await updateCcwConfig({ ...currentConfig, ...config });
+      // Only pass the fields that updateCcwConfig expects
+      await updateCcwConfig({
+        enabledTools: currentConfig.enabledTools,
+        projectRoot: currentConfig.projectRoot,
+        allowedDirs: currentConfig.allowedDirs,
+        enableSandbox: currentConfig.enableSandbox,
+      });
     } catch (error) {
       console.error('Failed to update CCW config:', error);
       queryClient.setQueryData(ccwMcpQueryKey, previousConfig);
diff --git a/ccw/src/core/routes/mcp-routes.ts b/ccw/src/core/routes/mcp-routes.ts
index aa4d84fc..59d9eb1f 100644
--- a/ccw/src/core/routes/mcp-routes.ts
+++ b/ccw/src/core/routes/mcp-routes.ts
@@ -945,6 +945,11 @@ function addGlobalMcpServer(serverName: string, serverConfig: unknown) {
       config.mcpServers = {};
     }
 
+    // Debug logging for ccw-tools
+    if (serverName === 'ccw-tools') {
+      console.log('[addGlobalMcpServer] Saving ccw-tools config:', JSON.stringify(serverConfig, null, 2));
+    }
+
     // Add the server to top-level mcpServers
     config.mcpServers[serverName] = serverConfig;