edsger 0.72.4 → 0.72.5

package/dist/utils/validation.d.ts

@@ -1,5 +1,37 @@
 import { loadConfig } from '../config.js';
 import { type CliOptions } from '../types/index.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.
+ *
+ * - Source checkout / monorepo  → `npm install` in the edsger package dir
+ * - Project dependency  → `npm install` in the project root (has package.json)
+ * - Global-style install  → `npm install -g --prefix <prefix>`
+ *
+ * The global-style case covers both a plain `npm install -g edsger` and the
+ * desktop app's managed install (`npm install -g edsger --prefix <userData>/cli`).
+ * In both, edsger lives at `<prefix>/lib/node_modules/edsger` (or
+ * `<prefix>/node_modules/edsger` on Windows) and there is NO package.json at
+ * the directory that owns that node_modules. Running a *project-local*
+ * `npm install` there would treat every already-installed package — including
+ * edsger and all its dependencies — as extraneous and PRUNE them, destroying
+ * the install. We must install with `--prefix` into the same prefix instead.
+ */
+export interface NpmInstallTarget {
+    global: boolean;
+    cwd?: string;
+    prefix?: string;
+}
+/**
+ * Pure resolution of the npm install target, given edsger's own directory and
+ * a predicate for testing whether a path exists. Separated from
+ * {@link getNpmInstallTarget} so it can be unit-tested without touching the
+ * real filesystem or `import.meta.url`.
+ */
+export declare function resolveNpmInstallTarget(edsgerDir: string, fileExists: (p: string) => boolean): NpmInstallTarget;
 export interface ValidationResult {
     config: ReturnType<typeof loadConfig>;
     mcpServerUrl: string;

package/dist/utils/validation.js

@@ -1,9 +1,37 @@
 import { execSync, spawnSync } from 'child_process';
-import { dirname, resolve, sep } from 'path';
+import { existsSync } from 'fs';
+import { basename, dirname, join, 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';
+/**
+ * Pure resolution of the npm install target, given edsger's own directory and
+ * a predicate for testing whether a path exists. Separated from
+ * {@link getNpmInstallTarget} so it can be unit-tested without touching the
+ * real filesystem or `import.meta.url`.
+ */
+export function resolveNpmInstallTarget(edsgerDir, fileExists) {
+    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. The directory that owns the
+    // outermost node_modules containing edsger is the candidate install root.
+    const installRoot = edsgerDir.split(nodeModulesSegment)[0];
+    // A real project dependency has a package.json at that root, so a
+    // project-local install safely adds to its dependencies without pruning.
+    if (fileExists(join(installRoot, 'package.json'))) {
+        return { global: false, cwd: installRoot };
+    }
+    // No package.json → global-style install. Derive the npm prefix so the
+    // package lands on edsger's resolution path. Unix global installs nest
+    // under `<prefix>/lib`; Windows installs put node_modules directly under
+    // `<prefix>`.
+    const prefix = basename(installRoot) === 'lib' ? dirname(installRoot) : installRoot;
+    return { global: true, prefix };
+}
 /**
  * Determine the correct npm install target for optional dependencies.
  *
@@ -11,33 +39,22 @@ import { logInfo, logWarning } from './logger.js';
  * 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
+ * - Source checkout / monorepo  → `npm install` in the edsger package dir
+ * - Project dependency  → `npm install` in the project root (has package.json)
+ * - Global-style install  → `npm install -g --prefix <prefix>`
+ *
+ * The global-style case covers both a plain `npm install -g edsger` and the
+ * desktop app's managed install (`npm install -g edsger --prefix <userData>/cli`).
+ * In both, edsger lives at `<prefix>/lib/node_modules/edsger` (or
+ * `<prefix>/node_modules/edsger` on Windows) and there is NO package.json at
+ * the directory that owns that node_modules. Running a *project-local*
+ * `npm install` there would treat every already-installed package — including
+ * edsger and all its dependencies — as extraneous and PRUNE them, destroying
+ * the install. We must install with `--prefix` into the same prefix instead.
  */
 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 };
+    return resolveNpmInstallTarget(edsgerDir, existsSync);
 }
 /**
  * Common configuration validation for all CLI commands
@@ -106,7 +123,8 @@ const restartProcess = (envFlag) => {
 function npmInstall(packageName) {
     const target = getNpmInstallTarget();
     const globalFlag = target.global ? ' -g' : '';
-    const cmd = `npm install${globalFlag} ${packageName}`;
+    const prefixFlag = target.prefix ? ` --prefix "${target.prefix}"` : '';
+    const cmd = `npm install${globalFlag}${prefixFlag} ${packageName}`;
     logInfo(`  $ ${cmd}${target.cwd ? ` (in ${target.cwd})` : ''}`);
     execSync(cmd, { cwd: target.cwd, stdio: 'inherit' });
 }

package/package.json

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