@bobfrankston/npmglobalize 1.0.207 → 1.0.208

package/lib.js

@@ -4299,6 +4299,56 @@ async function waitForNpmVersionInWsl(spec, maxWaitMs = 180000) {
     process.stdout.write(' timed out\n');
     return false;
 }
+/** After a global WSL install, confirm a NON-interactive shell actually resolves
+ *  the binaries we just installed, rather than older copies of them.
+ *
+ *  WSL's npm prefix is per-user (~/.npm-global), and that directory reaches PATH
+ *  only via ~/.bashrc — which returns immediately when the shell is not
+ *  interactive. Every `wsl <cmd>` is non-interactive, so it searches the default
+ *  PATH from /etc/environment instead, where a stale /usr/local/bin entry left by
+ *  an earlier root-prefix install keeps winning. The install genuinely succeeds
+ *  and the version reported by `wsl <tool>` is genuinely stale, which is exactly
+ *  why this went unnoticed for four months. Repair with a symlink rather than a
+ *  copy, so it tracks later installs on its own. */
+async function verifyWslGlobalBins(cwd) {
+    let names = [];
+    try {
+        const pkg = readPackageJson(cwd);
+        if (typeof pkg?.bin === 'string')
+            names = [String(pkg.name || '').split('/').pop()].filter(Boolean);
+        else if (pkg?.bin && typeof pkg.bin === 'object')
+            names = Object.keys(pkg.bin);
+    }
+    catch {
+        return;
+    }
+    if (!names.length)
+        return;
+    const prefixResult = await runCommandAsync('wsl', ['npm', 'config', 'get', 'prefix'], { silent: true });
+    const prefix = (prefixResult.output || '').trim();
+    if (!prefixResult.success || !prefix.startsWith('/'))
+        return;
+    for (const name of names) {
+        const expected = `${prefix}/bin/${name}`;
+        // `bash -c` is non-interactive — the same shape as a bare `wsl <cmd>`,
+        // which is the case that breaks. A login shell would mask the problem.
+        const lookup = await runCommandAsync('wsl', ['bash', '-c', `command -v ${name} || true`], { silent: true });
+        const found = (lookup.output || '').trim();
+        if (!found || found === expected)
+            continue;
+        console.log(colors.yellow(`  WSL resolves ${name} to ${found}, not the copy just installed at ${expected}`));
+        if (!found.startsWith('/usr/local/bin/')) {
+            recordBuildIssue(name, 'warning', `WSL resolves ${name} to ${found} instead of ${expected}, so scripts run a different version than an interactive shell does. Left alone: only /usr/local/bin shadows are repaired automatically.`);
+            continue;
+        }
+        const repair = await runCommandAsync('wsl', ['bash', '-c', `sudo -n rm -f ${found} && sudo -n ln -s ${expected} ${found}`], { silent: true });
+        if (repair.success) {
+            console.log(colors.green(`  ✓ Repaired WSL shadow: ${found} -> ${expected}`));
+            continue;
+        }
+        recordBuildIssue(name, 'warning', `WSL resolves ${name} to a stale ${found}. Repair with: wsl sudo rm ${found} && wsl sudo ln -s ${expected} ${found}`);
+    }
+}
 export async function installInWsl(wslArgs, opts = {}) {
     // Same trust rule as the Windows installs: allow our own packages'
     // install scripts, leave third-party ones gated. Probed against WSL's
@@ -4317,9 +4367,16 @@ export async function installInWsl(wslArgs, opts = {}) {
             process.stderr.write(r.stderr);
         return r;
     };
+    // Every success path leaves through here, so the shadow check cannot be
+    // skipped by whichever retry happened to be the one that worked.
+    const succeed = async (fixed) => {
+        if (opts.cwd && wslArgs.includes('-g'))
+            await verifyWslGlobalBins(opts.cwd);
+        return { success: true, fixed };
+    };
     let result = await runOnce();
     if (result.success)
-        return { success: true, fixed: false };
+        return await succeed(false);
     let combined = (result.output || '') + '\n' + (result.stderr || '');
     // EACCES on a root-owned npm prefix → switch to a user prefix and retry.
     if (/EACCES/.test(combined) && /\/usr\/(?:local\/)?lib\/node_modules/.test(combined)) {
@@ -4335,7 +4392,7 @@ export async function installInWsl(wslArgs, opts = {}) {
         console.log(colors.green('✓ WSL npm prefix set to ~/.npm-global; PATH appended to ~/.bashrc'));
         result = await runOnce();
         if (result.success)
-            return { success: true, fixed: true };
+            return await succeed(true);
         combined = (result.output || '') + '\n' + (result.stderr || '');
     }
     // E404 on a scoped package has TWO causes, and npm gives the same error for
@@ -4352,7 +4409,7 @@ export async function installInWsl(wslArgs, opts = {}) {
                 console.log(colors.green('✓ Synced npm token to WSL'));
                 result = await runOnce();
                 if (result.success)
-                    return { success: true, fixed: true };
+                    return await succeed(true);
             }
             else {
                 console.error(colors.yellow('  Could not authenticate WSL npm. Run `wsl npm login` (or sync your ~/.npmrc token) and retry.'));
@@ -4364,7 +4421,7 @@ export async function installInWsl(wslArgs, opts = {}) {
             if (await waitForNpmVersionInWsl(spec)) {
                 result = await runOnce();
                 if (result.success)
-                    return { success: true, fixed: true };
+                    return await succeed(true);
             }
             else {
                 console.error(colors.yellow(`  ${spec} still not visible to WSL's npm after waiting — try the WSL install again shortly.`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/npmglobalize",
-  "version": "1.0.207",
+  "version": "1.0.208",
   "description": "Transform file: dependencies to npm versions for publishing",
   "main": "index.js",
   "type": "module",