@agenticmail/enterprise 0.5.7 → 0.5.9

package/src/setup/index.ts

@@ -57,39 +57,45 @@ async function ensureDbDriver(dbType: string, ora: any, chalk: any): Promise<voi
   const packages = DB_DRIVER_MAP[dbType];
   if (!packages?.length) return;
 
-  // Resolve the enterprise package's own directory for installing drivers
-  const __filename = fileURLToPath(import.meta.url);
-  const pkgDir = join(dirname(__filename), '..');
-
+  // Check if any packages are missing
   const missing: string[] = [];
   for (const pkg of packages) {
-    try {
-      // Check if resolvable from the package directory
-      const require = createRequire(join(pkgDir, 'node_modules', '.package-lock.json'));
-      require.resolve(pkg);
-    } catch {
-      // Also try dynamic import as fallback
+    let found = false;
+    // Try ESM import
+    try { await import(pkg); found = true; } catch {}
+    // Try CJS require from cwd
+    if (!found) {
+      try {
+        const req = createRequire(join(process.cwd(), 'index.js'));
+        req.resolve(pkg);
+        found = true;
+      } catch {}
+    }
+    // Try CJS require from global
+    if (!found) {
       try {
-        await import(pkg);
-      } catch {
-        missing.push(pkg);
-      }
+        const globalPrefix = execSync('npm prefix -g', { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+        const req = createRequire(join(globalPrefix, 'lib', 'node_modules', '.package-lock.json'));
+        req.resolve(pkg);
+        found = true;
+      } catch {}
     }
+    if (!found) missing.push(pkg);
   }
   if (!missing.length) return;
 
   const spinner = ora(`Installing database driver: ${missing.join(', ')}...`).start();
   try {
-    // Install into the enterprise package's node_modules so dynamic imports find them
+    // Install in cwd so createRequire(cwd) can find it
     execSync(`npm install --no-save ${missing.join(' ')}`, {
       stdio: 'pipe',
       timeout: 120_000,
-      cwd: pkgDir,
+      cwd: process.cwd(),
     });
     spinner.succeed(`Database driver installed: ${missing.join(', ')}`);
   } catch (err: any) {
     spinner.fail(`Failed to install ${missing.join(', ')}`);
-    console.error(chalk.red(`\n  Run manually: cd ${pkgDir} && npm install ${missing.join(' ')}\n`));
+    console.error(chalk.red(`\n  Run manually: npm install ${missing.join(' ')}\n`));
     process.exit(1);
   }
 }