@polymorphism-tech/morph-spec 8.33.0 → 8.34.2

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

@@ -21,14 +21,15 @@
 import { join } from 'path';
 
 import { loadEnvFile } from '../../../framework/hooks/shared/e2e-check.js';
-import { allocateEnvBlock, resolveFleetConfig } from '../worktree/env-allocator.js';
+import { allocateEnvBlock, portLayout, resolveFleetConfig } from '../worktree/env-allocator.js';
 
 /**
  * Build the environment a `docker compose` invocation should carry.
  *
- * Port variables mirror `buildEnvFileContent()` in env-allocator.js so a
- * compose file and a `.morph/worktree.env` describe the same world: `PORT` for
- * the web tier, `ASPNETCORE_URLS` on base+1 for a .NET backend.
+ * Port variables come from `portLayout()` in env-allocator.js — the SAME
+ * function that renders `.morph/worktree.env` — so a compose file and the
+ * worktree manifest describe the same world by construction (`PORT`,
+ * `API_PORT`/`ASPNETCORE_URLS`, `POSTGRES_PORT`, `COMPOSE_PROJECT_NAME`).
  *
  * `PLAYWRIGHT_BASE_URL` is derived here rather than left to the spec config —
  * the suite has to be told where the app actually landed, otherwise a feature
@@ -53,14 +54,8 @@ export function buildComposeEnv({ cwd, config, featureName, gitCommonDir }) {
       const { basePort, blockSize } = resolveFleetConfig(cwd);
       const block = allocateEnvBlock(featureName, { gitCommonDir, basePort, blockSize });
 
-      env.MORPH_PORT_BASE = String(block.base);
-      env.MORPH_PORT_RANGE = `${block.range[0]}-${block.range[1]}`;
-      env.PORT = String(block.base);
+      Object.assign(env, portLayout(block, { stack: config?.project?.stack ?? '', feature: featureName }));
       env.PLAYWRIGHT_BASE_URL = `http://localhost:${block.base}`;
-
-      if (/\bdotnet\b/i.test(String(config?.project?.stack ?? ''))) {
-        env.ASPNETCORE_URLS = `http://localhost:${block.base + 1}`;
-      }
     } catch {
       // No block → default ports. Surfaces later as a port conflict, never here.
     }

package/src/lib/e2e/stack-teardown.js

@@ -0,0 +1,115 @@
+/**
+ * Reclaim a feature's verification stack — containers, ports, named volumes
+ * and the freshness stamp — from the tree that owns the feature.
+ *
+ * `morph-spec verify` leaves the stack UP on purpose (cold-starting a
+ * container per task is what makes the loop unusable), so something has to be
+ * the one place that brings it down when the feature closes. That place is
+ * this module, shared by `finish` and `delete --with-worktree`.
+ *
+ * Three things the old root-side teardown got wrong, each pinned by a test:
+ *   1. It ran from the ROOT. A compose that exists only in the worktree was
+ *      never found, and a bind mount resolved to the wrong checkout.
+ *   2. It passed a bare `COMPOSE_PROJECT_NAME`. Without the port block
+ *      (`PORT`, `POSTGRES_PORT`, …) compose resolves a different config than
+ *      the one that came up, and `down` misses the containers.
+ *   3. It never removed volumes or the stamp. Postgres data and a stamp saying
+ *      "source unchanged since build" outlived the feature.
+ *
+ * Entirely fail-open: no compose, no docker, or a stubborn container are all
+ * non-events for the caller — a stack that refuses to come down must never
+ * fail a finish that already merged.
+ *
+ * @module lib/e2e/stack-teardown
+ */
+
+import { execFileSync } from 'child_process';
+import { existsSync, readFileSync } from 'fs';
+import { join, resolve } from 'path';
+
+import {
+  composeProjectName,
+  defaultExec,
+  deleteStamp,
+  resolveComposeFile,
+  tearDownStack,
+} from '../../../framework/hooks/shared/e2e-check.js';
+import { buildComposeEnv } from './compose-env.js';
+
+/**
+ * @param {string} feature
+ * @param {object} params
+ * @param {string} params.root - primary root (absolute)
+ * @param {string|null} [params.worktreePath] - the feature's live worktree, if any
+ * @param {boolean} [params.volumes=true] - also remove named volumes (`down -v`)
+ * @param {Function} [params._exec] - injectable executor (testing)
+ * @returns {{ attempted: boolean, cwd: string, status: 'pass'|'fail'|'skip', stampDeleted: boolean, output?: string }}
+ */
+export function tearDownFeatureStack(feature, { root, worktreePath = null, volumes = true, _exec = defaultExec } = {}) {
+  const cwd = worktreePath && existsSync(worktreePath) ? worktreePath : root;
+  const projectName = composeProjectName(feature);
+  const gitCommonDir = resolveGitCommonDir(root);
+
+  try {
+    const config = readConfig(cwd) ?? readConfig(root);
+
+    // The owning tree's compose first; the root's copy is the fallback for a
+    // worktree already half torn down (versioned file, so equivalent).
+    let composeCwd = cwd;
+    let composeFile = resolveComposeFile(cwd, config);
+    if (!composeFile && cwd !== root) {
+      composeCwd = root;
+      composeFile = resolveComposeFile(root, config);
+    }
+
+    if (!composeFile) {
+      // Nothing to bring down — but a stamp left behind would tell the next
+      // `up` that a stack it cannot see is still fresh.
+      return { attempted: false, cwd, status: 'skip', stampDeleted: deleteStamp(gitCommonDir, projectName) };
+    }
+
+    const env = {
+      COMPOSE_PROJECT_NAME: projectName,
+      ...buildComposeEnv({ cwd: composeCwd, config, featureName: feature, gitCommonDir }),
+    };
+    const result = tearDownStack(composeCwd, { composeFile, projectName, env, volumes }, _exec);
+
+    return {
+      attempted: true,
+      cwd: composeCwd,
+      status: result.status,
+      stampDeleted: deleteStamp(gitCommonDir, projectName),
+      ...(result.status === 'fail' && result.output ? { output: result.output } : {}),
+    };
+  } catch {
+    // Unconditional even when the teardown itself blew up: the stamp must not
+    // outlive the stack it described.
+    return { attempted: false, cwd, status: 'fail', stampDeleted: deleteStamp(gitCommonDir, projectName) };
+  }
+}
+
+/** BOM-tolerant config read; null when absent or malformed. */
+function readConfig(dir) {
+  try {
+    const path = join(dir, '.morph', 'config', 'config.json');
+    if (!existsSync(path)) return null;
+    return JSON.parse(readFileSync(path, 'utf8').replace(/^/, ''));
+  } catch {
+    return null;
+  }
+}
+
+/** Same resolution (and same fail-open) as verify-runner's. */
+function resolveGitCommonDir(cwd) {
+  try {
+    const common = execFileSync('git', ['rev-parse', '--git-common-dir'], {
+      cwd,
+      stdio: 'pipe',
+      encoding: 'utf-8',
+      windowsHide: true,
+    }).trim();
+    return common ? resolve(cwd, common) : null;
+  } catch {
+    return null;
+  }
+}

package/src/lib/generators/architecture-scanner.js

@@ -20,8 +20,9 @@ import { fileURLToPath } from 'url';
 import { existsSync, readFileSync } from 'fs';
 import { scanGraph } from '../graph/god-nodes.js';
 import { renderTemplate } from '../../core/templates/template-renderer.js';
+import { WORKTREE_DIR_NAMES } from '../worktree/dirs.js';
 
-const SKIP_DIRS = new Set(['node_modules', 'bin', 'obj', '.git', '.morph', '.next', 'dist', 'out', 'worktrees', '.worktrees']);
+export const SKIP_DIRS = new Set(['node_modules', 'bin', 'obj', '.git', '.morph', '.next', 'dist', 'out', ...WORKTREE_DIR_NAMES]);
 const MAX_FILES_PER_SCANNER = 200;
 
 /**