fix(cli): relax happier bin preflight for workspaces

Author: leeroybrun

apps/cli/bin/happier.mjs

@@ -4,24 +4,39 @@ import { execFileSync } from 'child_process';
 import { fileURLToPath } from 'url';
 import { join, dirname } from 'path';
 import { createRequire } from 'module';
-import { existsSync } from 'fs';
 
 function preflightRequiredDependencies(projectRoot) {
-  const protocolPackageJsonPath = join(projectRoot, 'node_modules', '@happier-dev', 'protocol', 'package.json');
-  if (!existsSync(protocolPackageJsonPath)) {
-    console.error('Missing bundled package: @happier-dev/protocol');
-    console.error('Reinstall @happier-dev/cli to repair your installation.');
-    process.exit(1);
+  const cliRequire = createRequire(import.meta.url);
+  let protocolPackageJsonPath;
+  try {
+    protocolPackageJsonPath = cliRequire.resolve('@happier-dev/protocol/package.json');
+  } catch (error) {
+    if (error && typeof error === 'object' && 'code' in error && error.code === 'MODULE_NOT_FOUND') {
+      console.error('Missing bundled package: @happier-dev/protocol');
+      console.error('Reinstall @happier-dev/cli to repair your installation.');
+      process.exit(1);
+    }
+    throw error;
   }
-  const require = createRequire(protocolPackageJsonPath);
-  const required = ['tweetnacl', 'base64-js', '@noble/hashes/hmac', '@noble/hashes/sha512'];
+
+  const protocolRequire = createRequire(protocolPackageJsonPath);
+
+  // `tweetnacl` is a direct runtime dependency of the CLI.
+  // `base64-js` and `@noble/hashes/*` are runtime dependencies of `@happier-dev/protocol` and may be
+  // vendored under the bundled protocol package's node_modules when installed via `npm`.
+  const required = [
+    { name: 'tweetnacl', resolveWith: cliRequire },
+    { name: 'base64-js', resolveWith: protocolRequire },
+    { name: '@noble/hashes/hmac', resolveWith: protocolRequire },
+    { name: '@noble/hashes/sha512', resolveWith: protocolRequire },
+  ];
 
   for (const dep of required) {
     try {
-      require.resolve(dep);
+      dep.resolveWith.resolve(dep.name);
     } catch (error) {
       if (error && typeof error === 'object' && 'code' in error && error.code === 'MODULE_NOT_FOUND') {
-        console.error(`Missing required dependency: ${dep}`);
+        console.error(`Missing required dependency: ${dep.name}`);
         console.error('Reinstall @happier-dev/cli to repair your installation.');
         process.exit(1);
       }

apps/cli/scripts/__tests__/happierDependencyPreflight.test.ts

@@ -8,6 +8,82 @@ import { spawnSync } from 'node:child_process';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
 describe('happier bin preflight', () => {
+  it('works when protocol deps are vendored under protocol/node_modules (not hoisted to the CLI root)', () => {
+    const repoRoot = resolve(__dirname, '..', '..', '..', '..');
+    const tempRoot = mkdtempSync(join(tmpdir(), 'happier-bin-preflight-'));
+
+    mkdirSync(resolve(tempRoot, 'bin'), { recursive: true });
+    mkdirSync(resolve(tempRoot, 'dist'), { recursive: true });
+
+    // Global-install / packed layout:
+    // - protocol is present as a bundled workspace package
+    // - protocol runtime deps are vendored under protocol/node_modules
+    mkdirSync(resolve(tempRoot, 'node_modules', '@happier-dev', 'protocol', 'node_modules', 'base64-js'), {
+      recursive: true,
+    });
+    mkdirSync(resolve(tempRoot, 'node_modules', '@happier-dev', 'protocol', 'node_modules', '@noble', 'hashes'), {
+      recursive: true,
+    });
+
+    // CLI direct dep is expected at the CLI root.
+    mkdirSync(resolve(tempRoot, 'node_modules', 'tweetnacl'), { recursive: true });
+
+    cpSync(resolve(repoRoot, 'apps', 'cli', 'bin', 'happier.mjs'), resolve(tempRoot, 'bin', 'happier.mjs'));
+
+    writeFileSync(
+      resolve(tempRoot, 'node_modules', '@happier-dev', 'protocol', 'package.json'),
+      JSON.stringify({ name: '@happier-dev/protocol', version: '0.0.0' }),
+      'utf8',
+    );
+    writeFileSync(
+      resolve(tempRoot, 'node_modules', 'tweetnacl', 'package.json'),
+      JSON.stringify({ name: 'tweetnacl', version: '0.0.0', main: 'index.js' }),
+      'utf8',
+    );
+    writeFileSync(resolve(tempRoot, 'node_modules', 'tweetnacl', 'index.js'), 'module.exports = {};\n', 'utf8');
+
+    writeFileSync(
+      resolve(tempRoot, 'node_modules', '@happier-dev', 'protocol', 'node_modules', 'base64-js', 'package.json'),
+      JSON.stringify({ name: 'base64-js', version: '0.0.0', main: 'index.js' }),
+      'utf8',
+    );
+    writeFileSync(
+      resolve(tempRoot, 'node_modules', '@happier-dev', 'protocol', 'node_modules', 'base64-js', 'index.js'),
+      'module.exports = {};\n',
+      'utf8',
+    );
+
+    writeFileSync(
+      resolve(tempRoot, 'node_modules', '@happier-dev', 'protocol', 'node_modules', '@noble', 'hashes', 'package.json'),
+      JSON.stringify({ name: '@noble/hashes', version: '0.0.0', main: 'index.js' }),
+      'utf8',
+    );
+    writeFileSync(
+      resolve(tempRoot, 'node_modules', '@happier-dev', 'protocol', 'node_modules', '@noble', 'hashes', 'hmac.js'),
+      'export {};\n',
+      'utf8',
+    );
+    writeFileSync(
+      resolve(tempRoot, 'node_modules', '@happier-dev', 'protocol', 'node_modules', '@noble', 'hashes', 'sha512.js'),
+      'export {};\n',
+      'utf8',
+    );
+
+    writeFileSync(resolve(tempRoot, 'dist', 'index.mjs'), "console.log('ok');\n", 'utf8');
+
+    const result = spawnSync(process.execPath, [resolve(tempRoot, 'bin', 'happier.mjs')], {
+      cwd: tempRoot,
+      encoding: 'utf8',
+      env: {
+        ...process.env,
+        NODE_OPTIONS: '',
+      },
+    });
+
+    expect(result.status).toBe(0);
+    expect(result.stdout).toContain('ok');
+  });
+
   it('prints a helpful error when tweetnacl is missing', () => {
     const repoRoot = resolve(__dirname, '..', '..', '..', '..');
     const tempRoot = mkdtempSync(join(tmpdir(), 'happier-bin-preflight-'));