create-catalyst-app-internal 0.1.8 → 0.1.10

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "create-catalyst-app-internal",
     "bin": "scripts/cli.cjs",
-    "version": "0.1.8",
+    "version": "0.1.10",
     "description": "cli package to scaffold Catalyst application",
     "dependencies": {
         "commander": "^8.2.0",

package/scripts/cli.cjs

@@ -118,11 +118,6 @@ const program = new Commander.Command()
                         })
                     }
 
-                    if (mcpSupport) {
-                        const newMcpDir = path.join(process.cwd(), projectName, "node_modules/catalyst-core/mcp_v2")
-                        runMcpSetup(newMcpDir, path.join(process.cwd(), projectName))
-                    }
-
                     execSync(
                         `cd ${projectName} && git add . && git commit -m "initial commit from Create Catalyst App"`,
                         {
@@ -144,6 +139,11 @@ const program = new Commander.Command()
 
                     console.log("\nWe suggest you to begin, by running")
                     console.log(` ${cyan("cd")} ${projectName} && ${cyan("npm start")} \n\n`)
+
+                    if (mcpSupport) {
+                        const newMcpDir = path.join(process.cwd(), projectName, "node_modules/catalyst-core/mcp_v2")
+                        runMcpSetup(newMcpDir, path.join(process.cwd(), projectName))
+                    }
                 } catch (error) {
                     console.error(`Error: ${error.message}`)
                     process.exit(1)
@@ -217,7 +217,7 @@ const program = new Commander.Command()
     .allowUnknownOption()
 
 program
-    .command("mcp-setup")
+    .command("catalyst-mcp")
     .description("Set up MCP server in an existing catalyst project")
     .action(() => {
         try {
@@ -249,15 +249,29 @@ program
 program.parse(process.argv)
 
 function runMcpSetup(mcpDir, cwd = process.cwd()) {
+    const pkgPath = path.join(mcpDir, "package.json")
+    const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"))
+    pkg.dependencies["better-sqlite3"] = "^12.8.0"
+    fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2))
+
     const mcpNodeModules = path.join(mcpDir, "node_modules")
-    if (!fs.existsSync(mcpNodeModules)) {
-        const pkgPath = path.join(mcpDir, "package.json")
-        const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"))
-        pkg.dependencies["better-sqlite3"] = "^12.8.0"
-        fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2))
+    let needsInstall = !fs.existsSync(mcpNodeModules)
+
+    if (!needsInstall) {
+        try {
+            execSync(`node -e "require('better-sqlite3')"`, { cwd: mcpDir, stdio: "pipe" })
+        } catch {
+            console.log(cyan("Detected incompatible better-sqlite3 build. Reinstalling..."))
+            fs.rmSync(mcpNodeModules, { recursive: true, force: true })
+            needsInstall = true
+        }
+    }
+
+    if (needsInstall) {
         console.log(cyan("Installing mcp_v2 dependencies..."))
         execSync("npm install", { cwd: mcpDir, stdio: "inherit" })
     }
+
     execSync(`node ${path.join(mcpDir, "setup.js")}`, { cwd, stdio: "inherit" })
 }