edsger 0.37.0 → 0.37.1

package/dist/utils/validation.d.ts

@@ -22,7 +22,8 @@ export declare const validateMCPEnvironment: () => {
 export declare const validateCommandEnvironment: (options: CliOptions) => ValidationResult;
 /**
  * Ensure Playwright is installed, auto-installing if necessary.
- * Installs the npm package and Chromium browser when missing.
+ * Installs the npm package where edsger's module resolution can find it,
+ * plus the Chromium browser binary.
  */
 export declare const ensurePlaywright: (checkFunction: () => Promise<boolean>) => Promise<void>;
 /**

package/dist/utils/validation.js

@@ -1,7 +1,44 @@
-import { execSync } from 'child_process';
+import { execSync, spawnSync } from 'child_process';
+import { dirname, resolve, sep } from 'path';
+import { fileURLToPath } from 'url';
 import { getMcpServerUrl, getMcpToken } from '../auth/auth-store.js';
 import { loadConfig, validateConfig } from '../config.js';
 import { logInfo, logWarning } from './logger.js';
+/**
+ * Determine the correct npm install target for optional dependencies.
+ *
+ * `Function('return import("pkg")')()` resolves from the edsger module's
+ * own location, walking up the node_modules chain.  We need to install
+ * packages into a directory that sits on that resolution path.
+ *
+ * - Global install  → `npm install -g`
+ * - Project dependency  → `npm install` in the project root
+ * - Monorepo / development  → `npm install` in the edsger package dir
+ */
+function getNpmInstallTarget() {
+    const edsgerDir = resolve(dirname(fileURLToPath(import.meta.url)), '../..');
+    const nodeModulesSegment = `${sep}node_modules${sep}`;
+    if (!edsgerDir.includes(nodeModulesSegment)) {
+        // Source checkout / monorepo — install in edsger's own package dir
+        return { global: false, cwd: edsgerDir };
+    }
+    // edsger is inside some node_modules tree
+    try {
+        const globalPrefix = execSync('npm config get prefix', {
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'ignore'],
+        }).trim();
+        if (edsgerDir.startsWith(globalPrefix)) {
+            return { global: true };
+        }
+    }
+    catch {
+        // ignore — fall through to project-local
+    }
+    // Project dependency — install at the project root (parent of node_modules)
+    const projectRoot = edsgerDir.split(nodeModulesSegment)[0];
+    return { global: false, cwd: projectRoot };
+}
 /**
  * Common configuration validation for all CLI commands
  */
@@ -49,18 +86,50 @@ export const validateCommandEnvironment = (options) => {
         mcpToken,
     };
 };
+/**
+ * Re-exec the current CLI command in a fresh process.
+ * Node.js caches failed module resolutions for the lifetime of a process,
+ * so after installing a new package we must restart to pick it up.
+ * An env flag prevents infinite restart loops.
+ */
+const restartProcess = (envFlag) => {
+    const result = spawnSync(process.argv[0], process.argv.slice(1), {
+        stdio: 'inherit',
+        env: { ...process.env, [envFlag]: '1' },
+    });
+    return process.exit(result.status ?? 1);
+};
+/**
+ * Run `npm install <pkg>` targeting the correct location for edsger's
+ * module resolution chain.
+ */
+function npmInstall(packageName) {
+    const target = getNpmInstallTarget();
+    const globalFlag = target.global ? ' -g' : '';
+    const cmd = `npm install${globalFlag} ${packageName}`;
+    logInfo(`  $ ${cmd}${target.cwd ? ` (in ${target.cwd})` : ''}`);
+    execSync(cmd, { cwd: target.cwd, stdio: 'inherit' });
+}
 /**
  * Ensure Playwright is installed, auto-installing if necessary.
- * Installs the npm package and Chromium browser when missing.
+ * Installs the npm package where edsger's module resolution can find it,
+ * plus the Chromium browser binary.
  */
 export const ensurePlaywright = async (checkFunction) => {
     if (await checkFunction()) {
         return;
     }
+    // Already attempted install in a previous run — don't loop
+    if (process.env.__EDSGER_PW_INSTALLED) {
+        throw new Error('Playwright auto-install succeeded but it is still not loadable.\n\n' +
+            '  Please install it manually:\n\n' +
+            '    npm install playwright\n' +
+            '    npx playwright install chromium\n\n' +
+            '  Then re-run this command. Use --listings-only to skip screenshots.');
+    }
     logWarning('Playwright is not installed. Installing automatically (this may take a minute)...');
     try {
-        logInfo('  Installing playwright package...');
-        execSync('npm install playwright', { stdio: 'inherit' });
+        npmInstall('playwright');
         logInfo('  Installing Chromium browser...');
         execSync('npx playwright install chromium', { stdio: 'inherit' });
     }
@@ -71,15 +140,8 @@ export const ensurePlaywright = async (checkFunction) => {
             '    npx playwright install chromium\n\n' +
             '  Then re-run this command. Use --listings-only to skip screenshots.');
     }
-    // Verify installation succeeded
-    if (!(await checkFunction())) {
-        throw new Error('Playwright was installed but is still not available.\n\n' +
-            '  Try installing manually:\n\n' +
-            '    npm install playwright\n' +
-            '    npx playwright install chromium\n\n' +
-            '  Then re-run this command. Use --listings-only to skip screenshots.');
-    }
-    logInfo('  Playwright installed successfully!');
+    logInfo('  Playwright installed successfully! Restarting command...\n');
+    restartProcess('__EDSGER_PW_INSTALLED');
 };
 /**
  * Ensure an npm package is installed, auto-installing if necessary.
@@ -88,21 +150,24 @@ export const ensureNpmPackage = async (checkFunction, packageName) => {
     if (await checkFunction()) {
         return;
     }
+    const envFlag = `__EDSGER_PKG_${packageName.replace(/[^a-zA-Z0-9]/g, '_').toUpperCase()}`;
+    // Already attempted install in a previous run — don't loop
+    if (process.env[envFlag]) {
+        throw new Error(`${packageName} auto-install succeeded but it is still not loadable.\n\n` +
+            `  Please install it manually:\n\n` +
+            `    npm install ${packageName}`);
+    }
     logWarning(`${packageName} is not installed. Installing automatically...`);
     try {
-        execSync(`npm install ${packageName}`, { stdio: 'inherit' });
+        npmInstall(packageName);
     }
     catch {
         throw new Error(`Failed to auto-install ${packageName}.\n\n` +
             `  Please install it manually:\n\n` +
             `    npm install ${packageName}`);
     }
-    if (!(await checkFunction())) {
-        throw new Error(`${packageName} was installed but is still not available.\n\n` +
-            `  Try installing manually:\n\n` +
-            `    npm install ${packageName}`);
-    }
-    logInfo(`  ${packageName} installed successfully!`);
+    logInfo(`  ${packageName} installed successfully! Restarting command...\n`);
+    restartProcess(envFlag);
 };
 /**
  * Ensure ffmpeg is installed, auto-installing via Homebrew on macOS if possible.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edsger",
-  "version": "0.37.0",
+  "version": "0.37.1",
   "type": "module",
   "bin": {
     "edsger": "dist/index.js"