create-catalyst-app 0.1.0-canary.7 → 0.1.0-canary.9

package/package.json

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

package/scripts/cli.cjs

@@ -43,12 +43,6 @@ const program = new Commander.Command()
                 return
             }
 
-            if (process.argv.includes("mcp-setup")) {
-                const setupPath = path.join(process.cwd(), "node_modules/catalyst-core/mcp_v2/setup.js")
-                execSync(`node ${setupPath}`, { stdio: "inherit" })
-                return
-            }
-
             console.log(cyan(`Using create-catalyst-app version ${bold(packageJson.version)}`))
 
             // Use options provided through commander or prompt the user
@@ -124,11 +118,6 @@ const program = new Commander.Command()
                         })
                     }
 
-                    if (mcpSupport) {
-                        const setupPath = path.join(process.cwd(), projectName, "node_modules/catalyst-core/mcp_v2/setup.js")
-                        execSync(`node ${setupPath}`, { stdio: "inherit" })
-                    }
-
                     execSync(
                         `cd ${projectName} && git add . && git commit -m "initial commit from Create Catalyst App"`,
                         {
@@ -150,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)
@@ -222,8 +216,65 @@ const program = new Commander.Command()
     })
     .allowUnknownOption()
 
+program
+    .command("catalyst-mcp")
+    .description("Set up MCP server in an existing catalyst project")
+    .action(() => {
+        try {
+            const mcpDir = path.join(process.cwd(), "node_modules/catalyst-core/mcp_v2")
+            const setupPath = path.join(mcpDir, "setup.js")
+
+            if (!fs.existsSync(setupPath)) {
+                console.log(cyan("mcp_v2 not found in catalyst-core. Downloading from GitHub..."))
+                const catalystCoreDir = path.join(process.cwd(), "node_modules/catalyst-core")
+                const tarballUrl = "https://github.com/tata1mg/catalyst-core/archive/refs/heads/main.tar.gz"
+                const tarballPath = path.join(catalystCoreDir, "_mcp_v2_tarball.tar.gz")
+                execSync(`curl -fsSL "${tarballUrl}" -o "${tarballPath}"`, { stdio: "inherit" })
+                fs.mkdirSync(mcpDir, { recursive: true })
+                execSync(
+                    `tar -xzf "${tarballPath}" -C "${mcpDir}" --strip-components=2 "catalyst-core-main/mcp_v2"`,
+                    { stdio: "inherit" }
+                )
+                fs.unlinkSync(tarballPath)
+                console.log(cyan("mcp_v2 downloaded successfully."))
+            }
+
+            runMcpSetup(mcpDir)
+        } catch (error) {
+            console.error(red("An error occurred:"), error.message)
+            process.exit(1)
+        }
+    })
+
 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")
+    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" })
+}
+
 async function promptStateManagement() {
     const response = await prompts({
         type: "select",