@dewtech/dare-cli 2.17.0 → 3.1.0

package/dist/utils/project-generator.js

@@ -117,6 +117,16 @@ export async function generateProjectStructure(config) {
     // in `runStackBootstrap`). The legacy fake templates are only used when
     // bootstrap is explicitly skipped (tests / CI without toolchains) or for
     // the MCP server, which has no widely-adopted scaffold to defer to.
+    //
+    // v3.1: when bootstrap runs (the normal path), every stack — backend, MCP,
+    // and rails — is fully produced by its internalized registry scaffolder in
+    // `runStackBootstrap`. We must NOT overlay the legacy inline templates on
+    // top (that clobbered the scaffolder's package.json/server.ts in v3.0.x).
+    //
+    // The legacy generators remain only as the `skipBootstrap` fallback, used by
+    // tests/CI that intentionally skip the scaffold step. Frontend stacks still
+    // use their own bootstrap (vite/leptos) and the legacy frontend template
+    // fallback when skipped.
     if (config.skipBootstrap) {
         if (structure === 'mcp-server') {
             await generateMcpTemplate(outputDir, config);
@@ -132,12 +142,6 @@ export async function generateProjectStructure(config) {
             }
         }
     }
-    else if (structure === 'mcp-server') {
-        // Even with bootstrap, the MCP server still needs the DARE-flavored
-        // starter (server.ts / main.py with the right transport wired up). The
-        // bootstrap step only ran `npm init` / `python -m venv`, no source code.
-        await generateMcpTemplate(outputDir, config);
-    }
 }
 export async function installDareToExistingProject(projectDir, config) {
     const outputDir = projectDir;
@@ -191,94 +195,94 @@ async function generateMcpTemplate(dir, config) {
         const transportSetup = mcpTransport === 'stdio'
             ? `const transport = new StdioServerTransport();\nawait server.connect(transport);`
             : `const app = express();\napp.get('/sse', async (req, res) => {\n  const transport = new SSEServerTransport('/messages', res);\n  await server.connect(transport);\n});\napp.post('/messages', express.json(), (req, res) => { /* message handler */ });\napp.listen(3000, () => console.error('MCP SSE server running on :3000'));`;
-        const resourceSection = hasResources ? `
-import {
-  ListResourcesRequestSchema,
-  ReadResourceRequestSchema,
-} from '@modelcontextprotocol/sdk/types.js';
-
-server.setRequestHandler(ListResourcesRequestSchema, async () => ({
-  resources: [
-    {
-      uri: 'resource://example',
-      name: 'Example Resource',
-      description: 'An example resource',
-      mimeType: 'text/plain',
-    },
-  ],
-}));
-
-server.setRequestHandler(ReadResourceRequestSchema, async (request) => {
-  if (request.params.uri === 'resource://example') {
-    return { contents: [{ uri: request.params.uri, mimeType: 'text/plain', text: 'Example content' }] };
-  }
-  throw new Error(\`Unknown resource: \${request.params.uri}\`);
-});
+        const resourceSection = hasResources ? `
+import {
+  ListResourcesRequestSchema,
+  ReadResourceRequestSchema,
+} from '@modelcontextprotocol/sdk/types.js';
+
+server.setRequestHandler(ListResourcesRequestSchema, async () => ({
+  resources: [
+    {
+      uri: 'resource://example',
+      name: 'Example Resource',
+      description: 'An example resource',
+      mimeType: 'text/plain',
+    },
+  ],
+}));
+
+server.setRequestHandler(ReadResourceRequestSchema, async (request) => {
+  if (request.params.uri === 'resource://example') {
+    return { contents: [{ uri: request.params.uri, mimeType: 'text/plain', text: 'Example content' }] };
+  }
+  throw new Error(\`Unknown resource: \${request.params.uri}\`);
+});
 ` : '';
-        const promptSection = hasPrompts ? `
-import {
-  ListPromptsRequestSchema,
-  GetPromptRequestSchema,
-} from '@modelcontextprotocol/sdk/types.js';
-
-server.setRequestHandler(ListPromptsRequestSchema, async () => ({
-  prompts: [
-    {
-      name: 'example-prompt',
-      description: 'An example prompt template',
-      arguments: [{ name: 'topic', description: 'Topic to write about', required: true }],
-    },
-  ],
-}));
-
-server.setRequestHandler(GetPromptRequestSchema, async (request) => {
-  if (request.params.name === 'example-prompt') {
-    const topic = request.params.arguments?.topic ?? 'general';
-    return {
-      description: 'Example prompt',
-      messages: [{ role: 'user', content: { type: 'text', text: \`Write about: \${topic}\` } }],
-    };
-  }
-  throw new Error(\`Unknown prompt: \${request.params.name}\`);
-});
+        const promptSection = hasPrompts ? `
+import {
+  ListPromptsRequestSchema,
+  GetPromptRequestSchema,
+} from '@modelcontextprotocol/sdk/types.js';
+
+server.setRequestHandler(ListPromptsRequestSchema, async () => ({
+  prompts: [
+    {
+      name: 'example-prompt',
+      description: 'An example prompt template',
+      arguments: [{ name: 'topic', description: 'Topic to write about', required: true }],
+    },
+  ],
+}));
+
+server.setRequestHandler(GetPromptRequestSchema, async (request) => {
+  if (request.params.name === 'example-prompt') {
+    const topic = request.params.arguments?.topic ?? 'general';
+    return {
+      description: 'Example prompt',
+      messages: [{ role: 'user', content: { type: 'text', text: \`Write about: \${topic}\` } }],
+    };
+  }
+  throw new Error(\`Unknown prompt: \${request.params.name}\`);
+});
 ` : '';
-        const indexContent = `import { Server } from '@modelcontextprotocol/sdk/server/index.js';
-${transportImport}
-import {
-  CallToolRequestSchema,
-  ListToolsRequestSchema,
-} from '@modelcontextprotocol/sdk/types.js';
-
-const server = new Server(
-  { name: '${config.name}', version: '0.1.0' },
-  { capabilities: { ${capabilities.join(', ')} } }
-);
-
-server.setRequestHandler(ListToolsRequestSchema, async () => ({
-  tools: [
-    {
-      name: 'hello',
-      description: 'Says hello to a given name',
-      inputSchema: {
-        type: 'object',
-        properties: {
-          name: { type: 'string', description: 'Name to greet' },
-        },
-        required: ['name'],
-      },
-    },
-  ],
-}));
-
-server.setRequestHandler(CallToolRequestSchema, async (request) => {
-  if (request.params.name === 'hello') {
-    const { name } = request.params.arguments as { name: string };
-    return { content: [{ type: 'text', text: \`Hello, \${name}!\` }] };
-  }
-  throw new Error(\`Unknown tool: \${request.params.name}\`);
-});
-${resourceSection}${promptSection}
-${transportSetup}
+        const indexContent = `import { Server } from '@modelcontextprotocol/sdk/server/index.js';
+${transportImport}
+import {
+  CallToolRequestSchema,
+  ListToolsRequestSchema,
+} from '@modelcontextprotocol/sdk/types.js';
+
+const server = new Server(
+  { name: '${config.name}', version: '0.1.0' },
+  { capabilities: { ${capabilities.join(', ')} } }
+);
+
+server.setRequestHandler(ListToolsRequestSchema, async () => ({
+  tools: [
+    {
+      name: 'hello',
+      description: 'Says hello to a given name',
+      inputSchema: {
+        type: 'object',
+        properties: {
+          name: { type: 'string', description: 'Name to greet' },
+        },
+        required: ['name'],
+      },
+    },
+  ],
+}));
+
+server.setRequestHandler(CallToolRequestSchema, async (request) => {
+  if (request.params.name === 'hello') {
+    const { name } = request.params.arguments as { name: string };
+    return { content: [{ type: 'text', text: \`Hello, \${name}!\` }] };
+  }
+  throw new Error(\`Unknown tool: \${request.params.name}\`);
+});
+${resourceSection}${promptSection}
+${transportSetup}
 `;
         await fs.writeFile(path.join(dir, 'src', 'index.ts'), indexContent);
         const extraDeps = mcpTransport !== 'stdio' ? { express: '^4.18.0' } : {};
@@ -324,45 +328,45 @@ ${transportSetup}
         // Python MCP
         const hasResources = mcpFeatures.includes('resources');
         const hasPrompts = mcpFeatures.includes('prompts');
-        const resourceSection = hasResources ? `
-
-@mcp.resource("resource://example")
-def example_resource() -> str:
-    """An example resource."""
-    return "Example content"
+        const resourceSection = hasResources ? `
+
+@mcp.resource("resource://example")
+def example_resource() -> str:
+    """An example resource."""
+    return "Example content"
 ` : '';
-        const promptSection = hasPrompts ? `
-
-@mcp.prompt()
-def example_prompt(topic: str) -> str:
-    """An example prompt template."""
-    return f"Write about: {topic}"
+        const promptSection = hasPrompts ? `
+
+@mcp.prompt()
+def example_prompt(topic: str) -> str:
+    """An example prompt template."""
+    return f"Write about: {topic}"
 ` : '';
         const transportLine = mcpTransport === 'stdio' ? '' : '\n# For SSE transport:\n# mcp.run(transport="sse", host="0.0.0.0", port=8000)\n';
-        await fs.writeFile(path.join(dir, 'main.py'), `from mcp.server.fastmcp import FastMCP
-
-mcp = FastMCP("${config.name}")
-
-
-@mcp.tool()
-def hello(name: str) -> str:
-    """Says hello to a given name."""
-    return f"Hello, {name}!"
-${resourceSection}${promptSection}
-
-if __name__ == "__main__":
-    mcp.run()${transportLine}
+        await fs.writeFile(path.join(dir, 'main.py'), `from mcp.server.fastmcp import FastMCP
+
+mcp = FastMCP("${config.name}")
+
+
+@mcp.tool()
+def hello(name: str) -> str:
+    """Says hello to a given name."""
+    return f"Hello, {name}!"
+${resourceSection}${promptSection}
+
+if __name__ == "__main__":
+    mcp.run()${transportLine}
 `);
         await fs.writeFile(path.join(dir, 'requirements.txt'), `mcp>=1.0.0\n`);
-        await fs.writeFile(path.join(dir, 'pyproject.toml'), `[project]
-name = "${config.name}"
-version = "0.1.0"
-requires-python = ">=3.11"
-dependencies = ["mcp>=1.0.0"]
-
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
+        await fs.writeFile(path.join(dir, 'pyproject.toml'), `[project]
+name = "${config.name}"
+version = "0.1.0"
+requires-python = ">=3.11"
+dependencies = ["mcp>=1.0.0"]
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
 `);
     }
 }
@@ -432,92 +436,92 @@ async function writeGraphragConfig(dir, config) {
     const { graphrag } = config;
     let content;
     if (graphrag === 'sqlite') {
-        content = `# DARE Knowledge Graph — SQLite
-backend: sqlite
-
-sqlite:
-  path: .dare/graph.db
-
-# Node types tracked in the graph
-nodes:
-  - task
-  - file
-  - schema
-  - endpoint
-  - component
-  - entity
-  - concept
-
-# Relationship types
-edges:
-  - depends_on
-  - implements
-  - uses
-  - references
-  - related_to
-  - contains
-  - extends
+        content = `# DARE Knowledge Graph — SQLite
+backend: sqlite
+
+sqlite:
+  path: .dare/graph.db
+
+# Node types tracked in the graph
+nodes:
+  - task
+  - file
+  - schema
+  - endpoint
+  - component
+  - entity
+  - concept
+
+# Relationship types
+edges:
+  - depends_on
+  - implements
+  - uses
+  - references
+  - related_to
+  - contains
+  - extends
 `;
     }
     else if (graphrag === 'neo4j') {
-        content = `# DARE Knowledge Graph — Neo4j
-backend: neo4j
-
-neo4j:
-  url: http://localhost:7474   # Neo4j HTTP API endpoint (not Bolt)
-  database: dare               # database name
-  username: neo4j
-  password: password
-  # auth: "Bearer <token>"     # alternative to username/password
-
-# Node types tracked in the graph
-nodes:
-  - task
-  - file
-  - schema
-  - endpoint
-  - component
-  - entity
-  - concept
-
-# Relationship types
-edges:
-  - depends_on
-  - implements
-  - uses
-  - references
-  - related_to
-  - contains
-  - extends
+        content = `# DARE Knowledge Graph — Neo4j
+backend: neo4j
+
+neo4j:
+  url: http://localhost:7474   # Neo4j HTTP API endpoint (not Bolt)
+  database: dare               # database name
+  username: neo4j
+  password: password
+  # auth: "Bearer <token>"     # alternative to username/password
+
+# Node types tracked in the graph
+nodes:
+  - task
+  - file
+  - schema
+  - endpoint
+  - component
+  - entity
+  - concept
+
+# Relationship types
+edges:
+  - depends_on
+  - implements
+  - uses
+  - references
+  - related_to
+  - contains
+  - extends
 `;
     }
     else {
         // json
-        content = `# DARE Knowledge Graph — JSON
-backend: json
-
-json:
-  path: .dare/graph.json
-
-# Node types tracked in the graph
-nodes:
-  - task
-  - file
-  - schema
-  - endpoint
-  - component
-  - entity
-  - concept
-
-# Relationship types
-edges:
-  - depends_on
-  - implements
-  - uses
-  - references
-  - related_to
-  - contains
-  - extends
+        content = `# DARE Knowledge Graph — JSON
+backend: json
+
+json:
+  path: .dare/graph.json
+
+# Node types tracked in the graph
+nodes:
+  - task
+  - file
+  - schema
+  - endpoint
+  - component
+  - entity
+  - concept
+
+# Relationship types
+edges:
+  - depends_on
+  - implements
+  - uses
+  - references
+  - related_to
+  - contains
+  - extends
 `;
     }
     const destPath = path.join(dir, 'dare-graph.yml');
@@ -639,33 +643,34 @@ async function generateFrontendTemplate(dir, stack, projectName = 'frontend') {
 }
 function generateMcpStackSkill(language) {
     if (language === 'python') {
-        return `---
-description: Python MCP server development skill
----
-# Python MCP Skill
-- Use FastMCP for rapid server development
-- Decorate tools with @mcp.tool(), resources with @mcp.resource(), prompts with @mcp.prompt()
-- Use type hints — FastMCP derives the JSON schema automatically
-- Test with: npx @modelcontextprotocol/inspector python main.py
-- Use mcp.run() for stdio, mcp.run(transport="sse") for SSE
+        return `---
+description: Python MCP server development skill
+---
+# Python MCP Skill
+- Use FastMCP for rapid server development
+- Decorate tools with @mcp.tool(), resources with @mcp.resource(), prompts with @mcp.prompt()
+- Use type hints — FastMCP derives the JSON schema automatically
+- Test with: npx @modelcontextprotocol/inspector python main.py
+- Use mcp.run() for stdio, mcp.run(transport="sse") for SSE
 `;
     }
-    return `---
-description: Node.js/TypeScript MCP server development skill
----
-# TypeScript MCP Skill
-- Import Server from @modelcontextprotocol/sdk/server/index.js
-- Use StdioServerTransport for CLI tools, SSEServerTransport for web integrations
-- Define tools with ListToolsRequestSchema + CallToolRequestSchema handlers
-- Keep inputSchema strict — Claude uses it to call your tools correctly
-- Test with: npm run inspect (uses @modelcontextprotocol/inspector)
-- Build before shipping: npm run build
+    return `---
+description: Node.js/TypeScript MCP server development skill
+---
+# TypeScript MCP Skill
+- Import Server from @modelcontextprotocol/sdk/server/index.js
+- Use StdioServerTransport for CLI tools, SSEServerTransport for web integrations
+- Define tools with ListToolsRequestSchema + CallToolRequestSchema handlers
+- Keep inputSchema strict — Claude uses it to call your tools correctly
+- Test with: npm run inspect (uses @modelcontextprotocol/inspector)
+- Build before shipping: npm run build
 `;
 }
 // ─────────────────────────────────────────────────────────────────────────────
 // Stack bootstrap orchestration
 // ─────────────────────────────────────────────────────────────────────────────
 const BACKEND_STACKS = new Set([
+    'ruby-rails-8',
     'php-laravel',
     'node-nestjs',
     'python-fastapi',
@@ -722,7 +727,7 @@ function rustMonorepoDir(outputDir, crateType, layout, name, cratePrefix) {
     return path.join(outputDir, 'crates', crateType);
 }
 async function runStackBootstrap(config) {
-    const { outputDir, name, structure, backend, frontend, mcpLanguage, toolchain, rustWorkspaceLayout, cratePrefix } = config;
+    const { outputDir, name, structure, backend, frontend, mcpLanguage, mcpTransport, toolchain, rustWorkspaceLayout, cratePrefix } = config;
     const isRustMonorepo = structure === 'monorepo' &&
         backend === 'rust-axum' &&
         (frontend === 'rust-leptos' || frontend === 'rust-leptos-csr');
@@ -778,11 +783,15 @@ async function runStackBootstrap(config) {
     // MCP Server
     if (structure === 'mcp-server') {
         const lang = (mcpLanguage ?? 'node-ts');
+        // ProjectConfig uses 'http-stream' historically; the scaffolder transport
+        // enum is 'http'. Normalize here.
+        const transport = mcpTransport === 'http-stream' ? 'http' : (mcpTransport ?? 'stdio');
         await bootstrapMcp({
             language: lang,
             dir: outputDir,
             projectName: name,
             toolchain,
+            transport: transport,
         });
     }
     // Combo: rust-axum + rust-leptos(csr) in monorepo → unified Cargo workspace
@@ -838,9 +847,9 @@ async function createRustFullstackWorkspace(outputDir, projectName, layout, fron
     ].join('\n'));
     // Root .cargo/config.toml guard
     await fs.ensureDir(path.join(outputDir, '.cargo'));
-    await fs.writeFile(path.join(outputDir, '.cargo', 'config.toml'), `# DARE: Do NOT add a global [build] target here.
-# This workspace mixes Leptos WASM crates with native Axum crates.
-# A global target breaks one or the other — cargo-leptos manages wasm32 internally.
+    await fs.writeFile(path.join(outputDir, '.cargo', 'config.toml'), `# DARE: Do NOT add a global [build] target here.
+# This workspace mixes Leptos WASM crates with native Axum crates.
+# A global target breaks one or the other — cargo-leptos manages wasm32 internally.
 `);
     // Multi-crate: create core and cli scaffold crates
     if (layout === 'multi') {
@@ -921,38 +930,38 @@ async function createCliCrate(outputDir, slug) {
 }
 function generateStackSkill(stack) {
     const skills = {
-        'rust-leptos': `---
-description: Leptos fullstack (SSR + WASM) development skill
----
-# Leptos Fullstack Skill
-- Use \`#[component]\` macro for all components — no class components
-- State: \`signal()\` (RwSignal), \`ReadSignal\`/\`WriteSignal\` — fine-grained reactivity
-- Async data: \`Resource\` for fetching, never \`Effect\` that calls fetch
-- Mutations: \`Action\` for server calls (forms, submits)
-- Loading states: \`Suspense\` and \`Transition\` — never block the render
-- Conditionals: \`Show\`, \`For\` components — not if/for in view!
-- Server functions: \`#[server]\` macro — only available with \`ssr\` feature
-- Shared types (server + WASM): use \`#[cfg_attr(feature = "ssr", derive(sqlx::FromRow))]\`
-- Avoid: \`tokio::spawn\` on client (no async runtime in WASM), \`panic!\` in components, \`wasm_bindgen\` direct
-- Build: \`cargo leptos build\` (not \`cargo build\`)
-- Test: \`cargo test --workspace\` (not \`cargo leptos test\` — that doesn't exist)
-- Lint: \`cargo clippy --all-targets --all-features -- -D warnings && cargo fmt --check\`
-- Dev server: \`cargo leptos watch\` (port 3000 + hot reload on port 3001)
+        'rust-leptos': `---
+description: Leptos fullstack (SSR + WASM) development skill
+---
+# Leptos Fullstack Skill
+- Use \`#[component]\` macro for all components — no class components
+- State: \`signal()\` (RwSignal), \`ReadSignal\`/\`WriteSignal\` — fine-grained reactivity
+- Async data: \`Resource\` for fetching, never \`Effect\` that calls fetch
+- Mutations: \`Action\` for server calls (forms, submits)
+- Loading states: \`Suspense\` and \`Transition\` — never block the render
+- Conditionals: \`Show\`, \`For\` components — not if/for in view!
+- Server functions: \`#[server]\` macro — only available with \`ssr\` feature
+- Shared types (server + WASM): use \`#[cfg_attr(feature = "ssr", derive(sqlx::FromRow))]\`
+- Avoid: \`tokio::spawn\` on client (no async runtime in WASM), \`panic!\` in components, \`wasm_bindgen\` direct
+- Build: \`cargo leptos build\` (not \`cargo build\`)
+- Test: \`cargo test --workspace\` (not \`cargo leptos test\` — that doesn't exist)
+- Lint: \`cargo clippy --all-targets --all-features -- -D warnings && cargo fmt --check\`
+- Dev server: \`cargo leptos watch\` (port 3000 + hot reload on port 3001)
 `,
-        'rust-leptos-csr': `---
-description: Leptos CSR (WASM + trunk) development skill
----
-# Leptos CSR Skill
-- Pure client-side WASM — no server rendering, no \`#[server]\` functions
-- Use \`#[component]\` macro for all components
-- State: \`signal()\`, \`create_memo()\` for derived state
-- Async data: \`Resource\` — never \`Effect\` that calls fetch
-- Entry point: \`leptos::mount::mount_to_body(App)\` called from \`main()\`
-- Build tool: \`trunk build\` (NOT \`cargo leptos build\` — wrong tool for CSR)
-- Dev server: \`trunk serve\` (port 3001 by default, configured in Trunk.toml)
-- Test: \`cargo test --workspace\`
-- Lint: \`cargo clippy --all-targets --all-features -- -D warnings && cargo fmt --check\`
-- Deploy: \`trunk build --release\` produces \`dist/\` — static files, deployable to any CDN
+        'rust-leptos-csr': `---
+description: Leptos CSR (WASM + trunk) development skill
+---
+# Leptos CSR Skill
+- Pure client-side WASM — no server rendering, no \`#[server]\` functions
+- Use \`#[component]\` macro for all components
+- State: \`signal()\`, \`create_memo()\` for derived state
+- Async data: \`Resource\` — never \`Effect\` that calls fetch
+- Entry point: \`leptos::mount::mount_to_body(App)\` called from \`main()\`
+- Build tool: \`trunk build\` (NOT \`cargo leptos build\` — wrong tool for CSR)
+- Dev server: \`trunk serve\` (port 3001 by default, configured in Trunk.toml)
+- Test: \`cargo test --workspace\`
+- Lint: \`cargo clippy --all-targets --all-features -- -D warnings && cargo fmt --check\`
+- Deploy: \`trunk build --release\` produces \`dist/\` — static files, deployable to any CDN
 `,
         'rust-axum': `---\ndescription: Rust/Axum API development skill\n---\n# Rust/Axum Skill\n- Use Axum for HTTP routing\n- Use Tokio for async runtime\n- Use SQLx for database\n- Run clippy and cargo test\n`,
         'go-gin': `---\ndescription: Go/Gin API development skill\n---\n# Go + Gin Skill\n- Use Gin for HTTP routing (github.com/gin-gonic/gin)\n- Project layout: cmd/api/main.go (entrypoint), internal/handlers, internal/middleware, internal/services, internal/repository\n- Use context.Context propagation in every handler/service\n- Use struct tags for binding/validation (binding:"required" on DTOs)\n- For SQL: prefer database/sql + sqlx, parametrize ALL queries, no string concat\n- Errors: return wrapped errors (fmt.Errorf("...: %w", err)), not panics\n- Tests: use net/http/httptest + table-driven tests; place *_test.go alongside the package\n- Ralph Loop: \`go build ./...\`, \`go test ./...\`, \`go vet ./...\`\n`,