@polymorphism-tech/morph-spec 8.33.0 → 8.34.2

package/src/commands/e2e/e2e.js

@@ -7,6 +7,11 @@
  * running still matches the working tree, and `down` releases it — which
  * `morph-spec finish` also does as part of teardown.
  *
+ * Every subcommand acts in the TREE THAT OWNS THE FEATURE: run from the
+ * primary root for a feature that lives in a worktree, the compose file, the
+ * bind mount and the stamp are all the worktree's — the root's copy is a
+ * different checkout of different code.
+ *
  * All the real logic lives in framework/hooks/shared/e2e-check.js, shared with
  * the `verify` e2e node so the two can never drift.
  *
@@ -22,16 +27,21 @@ import {
   bringUpStack,
   composeProjectName,
   computeSourceStamp,
+  decideIsolation,
   defaultExec,
+  deleteStamp,
   getStackStatus,
   isDockerAvailable,
+  lintComposeIsolation,
   prepareAuth,
   readStamp,
   resolveComposeFile,
   resolveSpecCommand,
   tearDownStack,
 } from '../../../framework/hooks/shared/e2e-check.js';
+import { isSecondaryWorktree } from '../../../framework/hooks/shared/git-paths.js';
 import { buildComposeEnv } from '../../lib/e2e/compose-env.js';
+import { findWorktreeForFeature, resolvePrimaryRoot } from '../project/worktree.js';
 
 /** Exit code for a usage error, matching `verify`'s convention. */
 const EXIT_USAGE = 2;
@@ -41,20 +51,26 @@ const EXIT_USAGE = 2;
 // ============================================================================
 
 /**
- * Everything the three subcommands need, resolved once.
- * Returns null (after printing) when the project has no compose file — that is
- * a usage error here, unlike in the verify node where it is a graded skip.
+ * Everything the three subcommands need, resolved once — against the tree
+ * that owns the feature (its live worktree when it has one, the root
+ * otherwise).
+ *
+ * Returns null (after printing) when that tree has no compose file — a usage
+ * error here, unlike in the verify node where it is a graded skip.
  */
 function resolveContext(featureName, { json = false } = {}) {
-  const cwd = process.cwd();
-  const config = readConfig(cwd);
+  const root = resolvePrimaryRoot(process.cwd());
+  const found = findWorktreeForFeature(featureName, root);
+  const cwd = found?.path ?? root;
+
+  const config = readConfig(cwd) ?? readConfig(root);
   const composeFile = resolveComposeFile(cwd, config);
 
   if (!composeFile) {
     const message =
-      'No compose file found (compose.yaml, docker-compose.yml, …). ' +
+      `No compose file found in ${cwd} (compose.yaml, docker-compose.yml, …). ` +
       'Set project.e2e.composeFile in .morph/config/config.json if it lives elsewhere.';
-    if (json) console.log(JSON.stringify({ error: message }, null, 2));
+    if (json) console.log(JSON.stringify({ error: message, tree: cwd }, null, 2));
     else console.error(chalk.red(`\n❌ ${message}\n`));
     return null;
   }
@@ -64,6 +80,9 @@ function resolveContext(featureName, { json = false } = {}) {
 
   return {
     cwd,
+    root,
+    tree: cwd,
+    insideWorktree: isSecondaryWorktree(cwd),
     config,
     composeFile,
     projectName,
@@ -79,39 +98,17 @@ function resolveContext(featureName, { json = false } = {}) {
  * The port block comes from `buildComposeEnv` rather than being assembled here
  * so this command and the `e2e` node inside `verify` agree by construction —
  * isolation that exists only in the command nobody runs is no isolation at all.
- * `COMPOSE_PROJECT_NAME` isolates container NAMES but not host ports; a compose
- * that hardcodes ports instead of reading `${PORT:-3000}` cannot be isolated at
- * all, which is surfaced as a warning rather than silently accepted.
  */
 function buildEnv({ cwd, config, featureName, projectName, gitCommonDir }) {
+  // COMPOSE_PROJECT_NAME is part of the port layout now; the explicit key stays
+  // as the fail-open floor for a repo with no git common dir (no block → no
+  // layout), where the project name is still what isolates the containers.
   return {
     COMPOSE_PROJECT_NAME: projectName,
     ...buildComposeEnv({ cwd, config, featureName, gitCommonDir }),
   };
 }
 
-/**
- * Warn once when the compose file publishes fixed host ports: with a hardcoded
- * `"3000:3000"` the fleet port block cannot take effect, so two features
- * running simultaneously will collide no matter what we inject.
- */
-function warnOnFixedPorts(cwd, composeFile) {
-  try {
-    const raw = readFileSync(join(cwd, composeFile), 'utf8');
-    const publishesFixed = /^\s*-\s*["']?\d+:\d+["']?\s*$/m.test(raw);
-    if (publishesFixed) {
-      console.log(
-        chalk.yellow(
-          '⚠️  Compose publishes fixed host ports. Parallel worktrees will collide — ' +
-            'use ${PORT:-3000}:3000 so the fleet port block applies.'
-        )
-      );
-    }
-  } catch {
-    // Unreadable compose is the caller's problem, not this warning's.
-  }
-}
-
 // ============================================================================
 // up
 // ============================================================================
@@ -119,20 +116,42 @@ function warnOnFixedPorts(cwd, composeFile) {
 /**
  * `morph-spec e2e up <feature> [--fresh]`
  *
- * Exit codes: 0 = stack healthy · 1 = failed to come up (or auth broke) ·
- * 2 = usage (no compose file / no docker).
+ * Exit codes: 0 = stack healthy · 1 = failed to come up (or auth broke, or the
+ * compose cannot be isolated inside a worktree) · 2 = usage (no compose file /
+ * no docker).
  */
 export async function e2eUpCommand(featureName, options = {}) {
   const ctx = resolveContext(featureName, options);
   if (!ctx) process.exit(EXIT_USAGE);
 
+  // Isolation BEFORE the docker check: `COMPOSE_PROJECT_NAME` isolates
+  // container names but not host ports, and a compose that hardcodes them (or
+  // names its containers) collides with the sibling worktree no matter what we
+  // inject. Same rule as the verify node — see decideIsolation().
+  const lint = lintComposeIsolation(readComposeText(ctx.cwd, ctx.composeFile));
+  const isolation = decideIsolation({ findings: lint.findings, insideWorktree: ctx.insideWorktree });
+  if (isolation.status === 'fail') {
+    if (options.json) {
+      console.log(JSON.stringify(
+        { error: 'compose-not-isolable', feature: featureName, tree: ctx.tree, composeFile: ctx.composeFile, reason: isolation.reason, findings: lint.findings },
+        null, 2,
+      ));
+    } else {
+      console.error(chalk.red(`\n❌ ${isolation.reason}`));
+      for (const f of lint.findings) console.error(chalk.gray(`   ${ctx.composeFile}:${f.line}: ${f.text}`));
+      console.error('');
+    }
+    process.exit(1);
+  }
+  if (isolation.status === 'warn' && !options.json) {
+    console.log(chalk.yellow(`⚠️  ${isolation.reason}`));
+  }
+
   if (!isDockerAvailable(ctx.cwd)) {
     console.error(chalk.red('\n❌ Docker is not available in this environment.\n'));
     process.exit(EXIT_USAGE);
   }
 
-  if (!options.json) warnOnFixedPorts(ctx.cwd, ctx.composeFile);
-
   const result = bringUpStack(ctx.cwd, {
     composeFile: ctx.composeFile,
     projectName: ctx.projectName,
@@ -150,11 +169,13 @@ export async function e2eUpCommand(featureName, options = {}) {
   const payload = {
     feature: featureName,
     project: ctx.projectName,
+    tree: ctx.tree,
     composeFile: ctx.composeFile,
     status: failed ? 'fail' : 'pass',
     reused: result.reused,
     reason: result.reason,
     auth: { status: auth.status, reason: auth.reason },
+    ...(isolation.status === 'warn' ? { warnings: [isolation.reason] } : {}),
   };
 
   if (options.json) {
@@ -165,6 +186,7 @@ export async function e2eUpCommand(featureName, options = {}) {
   } else {
     const how = result.reused ? chalk.gray(`(${result.reason})`) : chalk.gray('(built)');
     console.log(chalk.green(`\n✓ Stack up — ${ctx.projectName} ${how}`));
+    console.log(chalk.gray(`  tree: ${ctx.tree}`));
     if (auth.reason) console.log(chalk.gray(`  auth: ${auth.reason}`));
     console.log('');
   }
@@ -217,6 +239,7 @@ export async function e2eStatusCommand(featureName, options = {}) {
   const payload = {
     feature: featureName,
     project: ctx.projectName,
+    tree: ctx.tree,
     composeFile: ctx.composeFile,
     up: status.up,
     healthy: status.healthy,
@@ -236,6 +259,7 @@ export async function e2eStatusCommand(featureName, options = {}) {
   } else {
     console.log('');
     console.log(chalk.bold(`E2E stack — ${ctx.projectName}`));
+    console.log(chalk.gray(`tree:    ${ctx.tree}`));
     console.log(chalk.gray(`compose: ${ctx.composeFile}`));
     console.log(chalk.gray(`url:     ${payload.baseUrl}`));
     console.log('');
@@ -262,7 +286,8 @@ export async function e2eStatusCommand(featureName, options = {}) {
  * `morph-spec e2e down <feature> [--volumes]`
  *
  * Teardown is best-effort by design — a stack that will not come down must
- * never block `finish`.
+ * never block `finish`. The freshness stamp goes regardless: a stamp that
+ * outlives its containers would let the next `up` reuse a stack that is gone.
  */
 export async function e2eDownCommand(featureName, options = {}) {
   const ctx = resolveContext(featureName, options);
@@ -274,11 +299,16 @@ export async function e2eDownCommand(featureName, options = {}) {
     env: ctx.env,
     volumes: Boolean(options.volumes),
   });
+  const stampDeleted = deleteStamp(ctx.gitCommonDir, ctx.projectName);
 
   if (options.json) {
-    console.log(JSON.stringify({ feature: featureName, project: ctx.projectName, status: result.status }, null, 2));
+    console.log(JSON.stringify(
+      { feature: featureName, project: ctx.projectName, tree: ctx.tree, status: result.status, stampDeleted },
+      null, 2,
+    ));
   } else if (result.status === 'pass') {
-    console.log(chalk.green(`\n✓ Stack down — ${ctx.projectName}\n`));
+    console.log(chalk.green(`\n✓ Stack down — ${ctx.projectName}`));
+    console.log(chalk.gray(`  tree: ${ctx.tree}\n`));
   } else {
     console.log(chalk.yellow(`\n⚠️  Teardown reported a problem (not fatal):\n${result.output}\n`));
   }
@@ -300,6 +330,14 @@ function readConfig(cwd) {
   }
 }
 
+function readComposeText(cwd, composeFile) {
+  try {
+    return readFileSync(join(cwd, composeFile), 'utf8');
+  } catch {
+    return '';
+  }
+}
+
 /** Same resolution (and same fail-open) as verify-runner's. */
 function resolveGitCommonDir(cwd) {
   try {

package/src/commands/index.js

@@ -1,13 +1,13 @@
-/**
- * All Commands - Category Exports
- *
- * Commands organized by functional category.
- */
-
-export * from './state/index.js';
-export * from './validation/index.js';
-export * from './templates/index.js';
-export * from './project/index.js';
-export * from './tasks/index.js';
-export * from './agents/index.js';
-export * from './utils/index.js';
+/**
+ * All Commands - Category Exports
+ *
+ * Commands organized by functional category.
+ */
+
+export * from './state/index.js';
+export * from './validation/index.js';
+export * from './templates/index.js';
+export * from './project/index.js';
+export * from './tasks/index.js';
+export * from './agents/index.js';
+export * from './utils/index.js';