@cloudstreamsoftware/claude-tools 1.2.4 → 1.2.5

package/bin/cloudstream-setup.js

@@ -305,21 +305,23 @@ async function storeCredentials(licenseKey, installType) {
 
 /**
  * Configure MCP server connection
+ * Merges into settings.json (same pattern as mergeHooksIntoSettings)
  */
 async function configureMcpServer(licenseKey) {
-  const mcpConfigPath = path.join(CONFIG.claudeDir, 'mcp.json');
+  const settingsPath = path.join(CONFIG.claudeDir, 'settings.json');
 
-  let existingConfig = { mcpServers: {} };
+  // Read existing settings or create empty object
+  let settings = {};
   try {
-    const content = await fs.readFile(mcpConfigPath, 'utf8');
-    existingConfig = JSON.parse(content);
+    const content = await fs.readFile(settingsPath, 'utf8');
+    settings = JSON.parse(content);
   } catch {
-    // File doesn't exist or is invalid
+    // File doesn't exist, start fresh
   }
 
-  // Add CloudStream knowledge server
-  existingConfig.mcpServers = existingConfig.mcpServers || {};
-  existingConfig.mcpServers['cloudstream-knowledge'] = {
+  // Merge MCP server into settings
+  settings.mcpServers = settings.mcpServers || {};
+  settings.mcpServers['cloudstream-knowledge'] = {
     command: 'npx',
     args: ['@cloudstream/knowledge-mcp-client'],
     env: {
@@ -328,8 +330,17 @@ async function configureMcpServer(licenseKey) {
     }
   };
 
-  await fs.writeFile(mcpConfigPath, JSON.stringify(existingConfig, null, 2));
-  logSuccess('MCP server configured');
+  await fs.writeFile(settingsPath, JSON.stringify(settings, null, 2));
+  logSuccess('MCP server configured in settings.json');
+
+  // Clean up orphaned mcp.json if it exists (from previous installs)
+  const orphanedMcpPath = path.join(CONFIG.claudeDir, 'mcp.json');
+  try {
+    await fs.unlink(orphanedMcpPath);
+    logSuccess('Cleaned up orphaned mcp.json');
+  } catch {
+    // File doesn't exist, nothing to clean up
+  }
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudstreamsoftware/claude-tools",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "CloudStream Claude Code productivity tools - hooks, skills, agents, and knowledge server integration",
   "main": "dist/index.js",
   "bin": {