@polymorphism-tech/morph-spec 8.34.2 → 8.35.1

package/src/lib/detectors/index.js

@@ -1,217 +1,217 @@
-/**
- * @fileoverview Project Detector
- *
- * Scans a project directory for stack, architecture, UI library, and integrations.
- * Used by mcp-setup, morph-init, and session-start hooks.
- *
- * @module detectors/index
- */
-
-import { existsSync, readFileSync, readdirSync } from 'fs';
-import { join } from 'path';
-
-/**
- * Detect project structure from filesystem evidence.
- *
- * @param {string} targetPath - Root path of the project
- * @param {Object} [opts] - Options
- * @param {boolean} [opts.generateStandards=false] - Whether to generate inferred markdown
- * @returns {{ structure: { stack: string, architecture: string|null, uiLibrary: string|null, integrations: string[], hasVercel: boolean }, inferred: { markdown: string } }}
- */
-export function detectProject(targetPath, opts = {}) {
-  const structure = {
-    stack: 'unknown',
-    architecture: null,
-    uiLibrary: null,
-    integrations: [],
-    hasVercel: false,
-  };
-
-  try {
-    // ── Package.json analysis ──────────────────────────────────────────────
-    // Collect deps from root and common monorepo subfolders
-    const pkgLocations = ['.', 'src/frontend', 'src/web', 'frontend', 'apps/web', 'packages/app'];
-    const allDeps = {};
-    let rootPkg = null;
-    let scripts = [];
-    for (const loc of pkgLocations) {
-      const pkgPath = join(targetPath, loc, 'package.json');
-      if (!existsSync(pkgPath)) continue;
-      try {
-        const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
-        if (loc === '.') rootPkg = pkg;
-        Object.assign(allDeps, pkg.dependencies, pkg.devDependencies);
-        scripts.push(...Object.keys(pkg.scripts || {}));
-        // Track frontend path for config
-        if (loc !== '.' && (pkg.dependencies?.next || pkg.dependencies?.react || pkg.dependencies?.vue)) {
-          structure.frontendPath = loc;
-        }
-      } catch { /* invalid JSON */ }
-    }
-    const depNames = Object.keys(allDeps);
-
-    if (depNames.length > 0) {
-
-      // Stack detection from deps
-      if (depNames.includes('next')) {
-        structure.stack = 'nextjs';
-      } else if (depNames.includes('react')) {
-        structure.stack = 'react';
-      } else if (depNames.includes('vue')) {
-        structure.stack = 'vue';
-      } else if (depNames.includes('express') || depNames.includes('fastify') || depNames.includes('hono')) {
-        structure.stack = 'nodejs';
-      } else if (rootPkg?.name) {
-        structure.stack = 'nodejs';
-      }
-
-      // UI library detection
-      if (existsSync(join(targetPath, 'components.json')) || existsSync(join(targetPath, structure.frontendPath || '.', 'components.json')) || depNames.includes('@shadcn/ui')) {
-        structure.uiLibrary = 'shadcn';
-      }
-
-      // Integrations
-      if (depNames.includes('@neondatabase/serverless') || depNames.includes('postgres') || depNames.includes('pg')) {
-        structure.integrations.push('neon');
-      }
-      if (depNames.includes('@neondatabase/auth')) {
-        structure.integrations.push('neon-auth');
-      }
-      if (depNames.includes('stripe')) {
-        structure.integrations.push('stripe');
-      }
-
-      // Vercel detection
-      if (depNames.includes('vercel') || scripts.includes('vercel')) {
-        structure.hasVercel = true;
-      }
-    }
-
-    // ── .csproj detection ──────────────────────────────────────────────────
-    let hasDotnet = false;
-    const csprojLocations = ['.', 'src', 'src/Api', 'src/Web', 'src/backend'];
-
-    function checkCsproj(filePath) {
-      hasDotnet = true;
-      try {
-        const content = readFileSync(filePath, 'utf8');
-        if (content.includes('Hangfire')) {
-          if (!structure.integrations.includes('hangfire')) structure.integrations.push('hangfire');
-        }
-      } catch { /* ignore */ }
-    }
-
-    for (const loc of csprojLocations) {
-      try {
-        const dir = join(targetPath, loc);
-        if (!existsSync(dir)) continue;
-        const entries = readdirSyncSafe(dir);
-        // Direct .csproj files
-        for (const e of entries.filter(f => f.endsWith('.csproj'))) {
-          checkCsproj(join(dir, e));
-        }
-        // One level deeper (e.g., src/backend/MyProject/*.csproj)
-        for (const sub of entries) {
-          const subDir = join(dir, sub);
-          for (const e of readdirSyncSafe(subDir).filter(f => f.endsWith('.csproj'))) {
-            checkCsproj(join(subDir, e));
-          }
-        }
-      } catch { /* ignore */ }
-    }
-
-    // Determine stack: monorepo (nextjs+dotnet), dotnet, or keep frontend stack
-    if (hasDotnet) {
-      if (structure.stack === 'nextjs' || structure.stack === 'react' || structure.stack === 'vue') {
-        // Monorepo: frontend + .NET backend
-        structure.stack = `${structure.stack}+dotnet`;
-      } else if (structure.stack === 'unknown') {
-        structure.stack = 'dotnet';
-      }
-    }
-
-    // ── vercel.json detection ──────────────────────────────────────────────
-    if (existsSync(join(targetPath, 'vercel.json'))) {
-      structure.hasVercel = true;
-    }
-
-    // ── tsconfig.json detection (fallback for stack) ────────────────────────
-    if (structure.stack === 'unknown' && existsSync(join(targetPath, 'tsconfig.json'))) {
-      structure.stack = 'nodejs';
-    }
-
-    // ── Architecture detection ─────────────────────────────────────────────
-    try {
-      const configPath = join(targetPath, '.morph/config/config.json');
-      if (existsSync(configPath)) {
-        const config = JSON.parse(readFileSync(configPath, 'utf8'));
-        if (config.architecture?.style) {
-          structure.architecture = config.architecture.style;
-        }
-      }
-    } catch { /* ignore */ }
-
-    // ── Docker detection ───────────────────────────────────────────────────
-    if (existsSync(join(targetPath, 'docker-compose.yml')) ||
-        existsSync(join(targetPath, 'docker-compose.yaml')) ||
-        existsSync(join(targetPath, 'Dockerfile'))) {
-      if (!structure.integrations.includes('docker')) structure.integrations.push('docker');
-    }
-
-    // ── Azure detection ────────────────────────────────────────────────────
-    const azureSignals = [
-      '.azure',
-      'azure-pipelines.yml',
-      'infra/main.bicep',
-      'infra',
-    ];
-    const hasAzure = azureSignals.some(signal => {
-      const p = join(targetPath, signal);
-      if (!existsSync(p)) return false;
-      if (signal === 'infra') {
-        // Check for .bicep files inside infra/
-        return readdirSyncSafe(p).some(f => f.endsWith('.bicep'));
-      }
-      return true;
-    });
-    if (hasAzure && !structure.integrations.includes('azure')) {
-      structure.integrations.push('azure');
-    }
-  } catch {
-    // Fail-safe — return defaults
-  }
-
-  return {
-    structure,
-    inferred: {
-      markdown: opts.generateStandards ? generateInferredMarkdown(structure) : '',
-    },
-  };
-}
-
-/**
- * Safe readdir that returns [] on error.
- * @param {string} dir
- * @returns {string[]}
- */
-function readdirSyncSafe(dir) {
-  try {
-    return readdirSync(dir);
-  } catch {
-    return [];
-  }
-}
-
-/**
- * Generate a markdown summary from detected structure.
- * @param {Object} structure
- * @returns {string}
- */
-function generateInferredMarkdown(structure) {
-  const lines = [`## Detected Stack: ${structure.stack}`];
-  if (structure.architecture) lines.push(`Architecture: ${structure.architecture}`);
-  if (structure.uiLibrary) lines.push(`UI Library: ${structure.uiLibrary}`);
-  if (structure.integrations.length > 0) lines.push(`Integrations: ${structure.integrations.join(', ')}`);
-  if (structure.hasVercel) lines.push(`Vercel: detected`);
-  return lines.join('\n');
-}
+/**
+ * @fileoverview Project Detector
+ *
+ * Scans a project directory for stack, architecture, UI library, and integrations.
+ * Used by mcp-setup, morph-init, and session-start hooks.
+ *
+ * @module detectors/index
+ */
+
+import { existsSync, readFileSync, readdirSync } from 'fs';
+import { join } from 'path';
+
+/**
+ * Detect project structure from filesystem evidence.
+ *
+ * @param {string} targetPath - Root path of the project
+ * @param {Object} [opts] - Options
+ * @param {boolean} [opts.generateStandards=false] - Whether to generate inferred markdown
+ * @returns {{ structure: { stack: string, architecture: string|null, uiLibrary: string|null, integrations: string[], hasVercel: boolean }, inferred: { markdown: string } }}
+ */
+export function detectProject(targetPath, opts = {}) {
+  const structure = {
+    stack: 'unknown',
+    architecture: null,
+    uiLibrary: null,
+    integrations: [],
+    hasVercel: false,
+  };
+
+  try {
+    // ── Package.json analysis ──────────────────────────────────────────────
+    // Collect deps from root and common monorepo subfolders
+    const pkgLocations = ['.', 'src/frontend', 'src/web', 'frontend', 'apps/web', 'packages/app'];
+    const allDeps = {};
+    let rootPkg = null;
+    let scripts = [];
+    for (const loc of pkgLocations) {
+      const pkgPath = join(targetPath, loc, 'package.json');
+      if (!existsSync(pkgPath)) continue;
+      try {
+        const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
+        if (loc === '.') rootPkg = pkg;
+        Object.assign(allDeps, pkg.dependencies, pkg.devDependencies);
+        scripts.push(...Object.keys(pkg.scripts || {}));
+        // Track frontend path for config
+        if (loc !== '.' && (pkg.dependencies?.next || pkg.dependencies?.react || pkg.dependencies?.vue)) {
+          structure.frontendPath = loc;
+        }
+      } catch { /* invalid JSON */ }
+    }
+    const depNames = Object.keys(allDeps);
+
+    if (depNames.length > 0) {
+
+      // Stack detection from deps
+      if (depNames.includes('next')) {
+        structure.stack = 'nextjs';
+      } else if (depNames.includes('react')) {
+        structure.stack = 'react';
+      } else if (depNames.includes('vue')) {
+        structure.stack = 'vue';
+      } else if (depNames.includes('express') || depNames.includes('fastify') || depNames.includes('hono')) {
+        structure.stack = 'nodejs';
+      } else if (rootPkg?.name) {
+        structure.stack = 'nodejs';
+      }
+
+      // UI library detection
+      if (existsSync(join(targetPath, 'components.json')) || existsSync(join(targetPath, structure.frontendPath || '.', 'components.json')) || depNames.includes('@shadcn/ui')) {
+        structure.uiLibrary = 'shadcn';
+      }
+
+      // Integrations
+      if (depNames.includes('@neondatabase/serverless') || depNames.includes('postgres') || depNames.includes('pg')) {
+        structure.integrations.push('neon');
+      }
+      if (depNames.includes('@neondatabase/auth')) {
+        structure.integrations.push('neon-auth');
+      }
+      if (depNames.includes('stripe')) {
+        structure.integrations.push('stripe');
+      }
+
+      // Vercel detection
+      if (depNames.includes('vercel') || scripts.includes('vercel')) {
+        structure.hasVercel = true;
+      }
+    }
+
+    // ── .csproj detection ──────────────────────────────────────────────────
+    let hasDotnet = false;
+    const csprojLocations = ['.', 'src', 'src/Api', 'src/Web', 'src/backend'];
+
+    function checkCsproj(filePath) {
+      hasDotnet = true;
+      try {
+        const content = readFileSync(filePath, 'utf8');
+        if (content.includes('Hangfire')) {
+          if (!structure.integrations.includes('hangfire')) structure.integrations.push('hangfire');
+        }
+      } catch { /* ignore */ }
+    }
+
+    for (const loc of csprojLocations) {
+      try {
+        const dir = join(targetPath, loc);
+        if (!existsSync(dir)) continue;
+        const entries = readdirSyncSafe(dir);
+        // Direct .csproj files
+        for (const e of entries.filter(f => f.endsWith('.csproj'))) {
+          checkCsproj(join(dir, e));
+        }
+        // One level deeper (e.g., src/backend/MyProject/*.csproj)
+        for (const sub of entries) {
+          const subDir = join(dir, sub);
+          for (const e of readdirSyncSafe(subDir).filter(f => f.endsWith('.csproj'))) {
+            checkCsproj(join(subDir, e));
+          }
+        }
+      } catch { /* ignore */ }
+    }
+
+    // Determine stack: monorepo (nextjs+dotnet), dotnet, or keep frontend stack
+    if (hasDotnet) {
+      if (structure.stack === 'nextjs' || structure.stack === 'react' || structure.stack === 'vue') {
+        // Monorepo: frontend + .NET backend
+        structure.stack = `${structure.stack}+dotnet`;
+      } else if (structure.stack === 'unknown') {
+        structure.stack = 'dotnet';
+      }
+    }
+
+    // ── vercel.json detection ──────────────────────────────────────────────
+    if (existsSync(join(targetPath, 'vercel.json'))) {
+      structure.hasVercel = true;
+    }
+
+    // ── tsconfig.json detection (fallback for stack) ────────────────────────
+    if (structure.stack === 'unknown' && existsSync(join(targetPath, 'tsconfig.json'))) {
+      structure.stack = 'nodejs';
+    }
+
+    // ── Architecture detection ─────────────────────────────────────────────
+    try {
+      const configPath = join(targetPath, '.morph/config/config.json');
+      if (existsSync(configPath)) {
+        const config = JSON.parse(readFileSync(configPath, 'utf8'));
+        if (config.architecture?.style) {
+          structure.architecture = config.architecture.style;
+        }
+      }
+    } catch { /* ignore */ }
+
+    // ── Docker detection ───────────────────────────────────────────────────
+    if (existsSync(join(targetPath, 'docker-compose.yml')) ||
+        existsSync(join(targetPath, 'docker-compose.yaml')) ||
+        existsSync(join(targetPath, 'Dockerfile'))) {
+      if (!structure.integrations.includes('docker')) structure.integrations.push('docker');
+    }
+
+    // ── Azure detection ────────────────────────────────────────────────────
+    const azureSignals = [
+      '.azure',
+      'azure-pipelines.yml',
+      'infra/main.bicep',
+      'infra',
+    ];
+    const hasAzure = azureSignals.some(signal => {
+      const p = join(targetPath, signal);
+      if (!existsSync(p)) return false;
+      if (signal === 'infra') {
+        // Check for .bicep files inside infra/
+        return readdirSyncSafe(p).some(f => f.endsWith('.bicep'));
+      }
+      return true;
+    });
+    if (hasAzure && !structure.integrations.includes('azure')) {
+      structure.integrations.push('azure');
+    }
+  } catch {
+    // Fail-safe — return defaults
+  }
+
+  return {
+    structure,
+    inferred: {
+      markdown: opts.generateStandards ? generateInferredMarkdown(structure) : '',
+    },
+  };
+}
+
+/**
+ * Safe readdir that returns [] on error.
+ * @param {string} dir
+ * @returns {string[]}
+ */
+function readdirSyncSafe(dir) {
+  try {
+    return readdirSync(dir);
+  } catch {
+    return [];
+  }
+}
+
+/**
+ * Generate a markdown summary from detected structure.
+ * @param {Object} structure
+ * @returns {string}
+ */
+function generateInferredMarkdown(structure) {
+  const lines = [`## Detected Stack: ${structure.stack}`];
+  if (structure.architecture) lines.push(`Architecture: ${structure.architecture}`);
+  if (structure.uiLibrary) lines.push(`UI Library: ${structure.uiLibrary}`);
+  if (structure.integrations.length > 0) lines.push(`Integrations: ${structure.integrations.join(', ')}`);
+  if (structure.hasVercel) lines.push(`Vercel: detected`);
+  return lines.join('\n');
+}

package/src/lib/e2e/compose-env.js

@@ -20,6 +20,8 @@
 
 import { join } from 'path';
 
+import chalk from 'chalk';
+
 import { loadEnvFile } from '../../../framework/hooks/shared/e2e-check.js';
 import { allocateEnvBlock, portLayout, resolveFleetConfig } from '../worktree/env-allocator.js';
 
@@ -36,8 +38,19 @@ import { allocateEnvBlock, portLayout, resolveFleetConfig } from '../worktree/en
  * on port 4020 gets tested against a hardcoded localhost:3000 and fails with
  * ECONNREFUSED that looks exactly like a broken app.
  *
+ * The credentials env file loads AFTER the layout but cannot outrank it: a
+ * `.env.e2e` copied from a sibling worktree carries THAT worktree's block, and
+ * letting it win points this stack at the neighbour's postgres while every
+ * other surface still reports the allocated port. The protected keys are the
+ * ones actually assigned above — never a second literal list, which is exactly
+ * how an offset lands in one writer and not the other. A key that gets ignored
+ * is announced on stderr (never stdout: `morph-spec env` writes shell-eval
+ * output there), because swapping a silent override for a silent discard just
+ * moves the debugging session.
+ *
  * Fail-open throughout: with no git dir (or a corrupt registry) the caller gets
- * default ports, which only matters when two stacks run at once.
+ * default ports, which only matters when two stacks run at once. With no layout
+ * applied nothing is filtered — there the env file is the only port source.
  *
  * @param {object} params
  * @param {string} params.cwd - project root
@@ -48,14 +61,20 @@ import { allocateEnvBlock, portLayout, resolveFleetConfig } from '../worktree/en
  */
 export function buildComposeEnv({ cwd, config, featureName, gitCommonDir }) {
   const env = {};
+  /** @type {Set<string>|null} - null while no layout has been applied */
+  let layoutKeys = null;
 
   if (gitCommonDir) {
     try {
       const { basePort, blockSize } = resolveFleetConfig(cwd);
       const block = allocateEnvBlock(featureName, { gitCommonDir, basePort, blockSize });
 
-      Object.assign(env, portLayout(block, { stack: config?.project?.stack ?? '', feature: featureName }));
-      env.PLAYWRIGHT_BASE_URL = `http://localhost:${block.base}`;
+      const layout = {
+        ...portLayout(block, { stack: config?.project?.stack ?? '', feature: featureName }),
+        PLAYWRIGHT_BASE_URL: `http://localhost:${block.base}`,
+      };
+      Object.assign(env, layout);
+      layoutKeys = new Set(Object.keys(layout));
     } catch {
       // No block → default ports. Surfaces later as a port conflict, never here.
     }
@@ -63,7 +82,34 @@ export function buildComposeEnv({ cwd, config, featureName, gitCommonDir }) {
 
   // Credentials live in a gitignored env file, never in the committed config.
   const envFile = config?.e2e?.auth?.envFile;
-  if (envFile) Object.assign(env, loadEnvFile(join(cwd, envFile)));
+  if (envFile) {
+    const ignored = [];
+    for (const [key, value] of Object.entries(loadEnvFile(join(cwd, envFile)))) {
+      if (layoutKeys?.has(key)) ignored.push(key);
+      else env[key] = value;
+    }
+    if (ignored.length) reportIgnoredLayoutKeys(envFile, ignored, env);
+  }
 
   return env;
 }
+
+/**
+ * Tell the caller — `e2e up`, the `e2e` node of `verify`, `stack-teardown` and
+ * `morph-spec env` all reach this through `buildComposeEnv` — which keys of the
+ * credentials file were dropped and what won instead.
+ *
+ * stderr, always: `morph-spec env` prints `export K=v` on stdout for a
+ * shell to eval, and `verify` prints JSON there.
+ *
+ * @param {string} envFile
+ * @param {string[]} ignored
+ * @param {Record<string,string>} env - the layout that won
+ */
+function reportIgnoredLayoutKeys(envFile, ignored, env) {
+  const shown = ignored.map((key) => `${key}=${env[key]}`).join(', ');
+  console.warn(chalk.yellow(
+    `  ⚠ ${envFile}: ${ignored.join(', ')} ignorada(s) — o bloco de portas desta worktree prevalece (${shown}). `
+    + 'O envFile carrega credenciais; portas vêm do bloco alocado.',
+  ));
+}