@bobfrankston/npmglobalize 1.0.181 → 1.0.183

package/lib.js

@@ -3883,10 +3883,10 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
             if (adoptable) {
                 choice = await promptChoice('How would you like to set up git?\n'
                     + '  1) Adopt history from existing remote (recommended)\n'
-                    + '  2) Initialize fresh git repository\n'
                     + '  a) Adopt ALL (don\'t ask again for remaining deps)\n'
+                    + '  2) Initialize fresh git repository\n'
                     + '  3) Use local install only (skip git/publish)\n'
-                    + '  4) Abort\nChoice:', ['1', '2', 'a', '3', '4', '']);
+                    + '  4) Abort\nChoice:', ['1', 'a', '2', '3', '4', '']);
                 if (choice === '3') {
                     console.log(colors.dim('Switching to local-only mode...'));
                     writeConfig(cwd, { ...configOptions, local: true }, new Set(['local']));
@@ -5463,6 +5463,27 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
         // before any subsequent install -g symlinks to these dep targets.
         if (stashedDepModules.length > 0)
             restoreNestedDepModules(stashedDepModules, verbose);
+        // Auto-retry on arborist crash if -clean-nested-modules wasn't already
+        // tried. The crash is the canonical sibling-junctions-in-junctions
+        // failure mode; the fix is mechanical (wipe nested node_modules in
+        // file: targets, pack, restore), so there's no reason to make the user
+        // re-run with the flag they'd pick 100% of the time anyway.
+        if (!packResult.success && !options.cleanNestedModules) {
+            const probe = diagnoseNpmPackFailure(cwd, packResult.output, packResult.stderr, pkg);
+            if (probe.summary.includes('arborist')) {
+                console.error(colors.yellow(`  Detected arborist crash — auto-retrying with --clean-nested-modules...`));
+                const autoStash = cleanNestedDepModules(pkg, cwd, verbose);
+                if (autoStash.length > 0) {
+                    console.log(colors.yellow(`  Cleaned node_modules in ${autoStash.length} file: dep target(s): ${autoStash.map(s => s.name).join(', ')}`));
+                }
+                packResult = await runCommandAsync('npm', ['pack'], { cwd, silent: true });
+                if (autoStash.length > 0)
+                    restoreNestedDepModules(autoStash, verbose);
+                if (packResult.success) {
+                    console.log(colors.green('  ✓ Auto-retry succeeded after cleaning nested node_modules.'));
+                }
+            }
+        }
         if (!packResult.success) {
             const d = diagnoseNpmPackFailure(cwd, packResult.output, packResult.stderr, pkg);
             console.error(colors.red(`ERROR: ${d.summary}`));
@@ -5472,8 +5493,8 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
                 console.error(colors.yellow(`  Caused by referenced module: ${d.referencedModule}`));
             if (d.hint)
                 console.error(colors.yellow(`  Hint: ${d.hint}`));
-            if (d.summary.includes('arborist') && !options.cleanNestedModules) {
-                console.error(colors.yellow(`  Retry with --clean-nested-modules to wipe node_modules/ inside each file: dep target`));
+            if (d.summary.includes('arborist') && options.cleanNestedModules) {
+                console.error(colors.yellow(`  Already used --clean-nested-modules; the crash is from a deeper sibling. Try running in WSL or wiping nested node_modules manually.`));
             }
             recordBuildIssue(pkg.name || path.basename(cwd), 'error', d.referencedModule ? `${d.summary} (via ${d.referencedModule})` : d.summary);
             return false;
@@ -5570,11 +5591,13 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
         if (!publishResult.success) {
             // Check for specific error types before recording
             const output = (publishResult.output + '\n' + publishResult.stderr).toLowerCase();
+            let alreadyPublished = false;
             // "Already published" is benign — don't record as error
             if (output.includes('cannot publish over') || output.includes('previously published')) {
                 const currentPkgVersion = readPackageJson(cwd).version;
                 if (output.includes(currentPkgVersion)) {
                     console.log(colors.green('✓ Already published — continuing'));
+                    alreadyPublished = true;
                 }
                 else {
                     console.error(colors.red('\nERROR: npm publish failed\n'));
@@ -5623,15 +5646,20 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
                 recordBuildIssue(pkg.name || path.basename(cwd), 'error', 'npm publish failed');
                 console.error(colors.yellow('Publish failed — run npm login or check npm whoami'));
             }
-            if (transformResult.transformed) {
-                console.log('Restoring file: dependencies...');
-                const failPkg = readPackageJson(cwd);
-                restoreDeps(failPkg, verbose);
-                writePackageJson(cwd, failPkg);
-                runCommand('git', ['add', 'package.json'], { cwd, silent: true });
-                gitCommit('Restore file: dependencies', cwd);
+            if (alreadyPublished) {
+                // Treat as success — fall through to post-publish steps (push, tags, .commitmsg)
+            }
+            else {
+                if (transformResult.transformed) {
+                    console.log('Restoring file: dependencies...');
+                    const failPkg = readPackageJson(cwd);
+                    restoreDeps(failPkg, verbose);
+                    writePackageJson(cwd, failPkg);
+                    runCommand('git', ['add', 'package.json'], { cwd, silent: true });
+                    gitCommit('Restore file: dependencies', cwd);
+                }
+                return false;
             }
-            return false;
         }
         // Determine what was published
         const finalAccess = effectiveNpmVisibility || currentAccess || (isScoped ? 'restricted' : 'public');

package/package.json

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