@bobfrankston/npmglobalize 1.0.97 → 1.0.99

package/.claude/settings.local.json

@@ -36,7 +36,9 @@
       "Bash(find:*)",
       "Bash(npx globalize:*)",
       "Bash(globalize:*)",
-      "Bash(wztest:*)"
+      "Bash(wztest:*)",
+      "Bash(xargs grep:*)",
+      "Bash(cmd.exe:*)"
     ]
   }
 }

package/index.d.ts

@@ -3,5 +3,6 @@
  * npmglobalize - Main entry point
  */
 import './cli.js';
-export { globalize, globalizeWorkspace, GlobalizeOptions, WorkspaceResult } from './lib.js';
+export { globalize, globalizeWorkspace } from './lib.js';
+export type { GlobalizeOptions, WorkspaceResult } from './lib.js';
 //# sourceMappingURL=index.d.ts.map

package/lib.js

@@ -71,6 +71,51 @@ function removeNulFiles(dir, visited = new Set()) {
     }
     return count;
 }
+/** Repair a corrupted git index by rebuilding it.
+ *  Handles "invalid object" / "Error building trees" errors caused by
+ *  stale entries in .git/index referencing missing objects. */
+function repairGitIndex(cwd) {
+    const indexPath = path.join(cwd, '.git', 'index');
+    try {
+        console.log(colors.yellow('Detected corrupted git index — rebuilding...'));
+        // Delete the corrupted index
+        if (fs.existsSync(indexPath)) {
+            fs.unlinkSync(indexPath);
+        }
+        // Rebuild from HEAD (reset index to match last commit)
+        const resetResult = spawnSafe('git', ['reset'], {
+            encoding: 'utf-8',
+            stdio: 'pipe',
+            cwd,
+            env: process.env
+        });
+        if (resetResult.status !== 0) {
+            // If no commits yet, just proceed — git add -A will build a fresh index
+            const stderr = resetResult.stderr || '';
+            if (!stderr.includes('does not have any commits')) {
+                console.error(colors.red('Failed to reset git index:'), stderr.trim());
+                return false;
+            }
+        }
+        // Re-stage all files
+        const addResult = spawnSafe('git', ['add', '-A'], {
+            encoding: 'utf-8',
+            stdio: 'pipe',
+            cwd,
+            env: process.env
+        });
+        if (addResult.status !== 0) {
+            console.error(colors.red('Failed to re-add files after index rebuild:'), (addResult.stderr || '').trim());
+            return false;
+        }
+        console.log(colors.green('✓ Git index rebuilt successfully'));
+        return true;
+    }
+    catch (err) {
+        console.error(colors.red('Failed to repair git index:'), err.message);
+        return false;
+    }
+}
 /** Get npm command for current platform (npm.cmd on Windows, npm elsewhere) */
 function getNpmCommand() {
     return process.platform === 'win32' ? 'npm.cmd' : 'npm';
@@ -833,7 +878,7 @@ export function fixVersionTagMismatch(cwd, pkg, verbose = false) {
     return deletedAny;
 }
 /** Wait for a package version to appear on the npm registry */
-function waitForNpmVersion(pkgName, version, maxWaitMs = 60000) {
+function waitForNpmVersion(pkgName, version, maxWaitMs = 90000) {
     const interval = 3000;
     const maxAttempts = Math.ceil(maxWaitMs / interval);
     process.stdout.write(`Waiting for ${pkgName}@${version} on npm registry`);
@@ -853,6 +898,16 @@ function waitForNpmVersion(pkgName, version, maxWaitMs = 60000) {
     process.stdout.write(' timed out\n');
     return false;
 }
+/** Run npm install -g with retries for registry propagation delay */
+function installGlobalWithRetry(pkgSpec, cwd, maxRetries = 3) {
+    let result = runCommand('npm', ['install', '-g', pkgSpec], { cwd, silent: false });
+    for (let attempt = 1; attempt < maxRetries && !result.success; attempt++) {
+        console.log(colors.yellow(`  Retrying install (attempt ${attempt + 1}/${maxRetries}) in 10 seconds...`));
+        spawnSafe(process.platform === 'win32' ? 'timeout' : 'sleep', process.platform === 'win32' ? ['/t', '10', '/nobreak'] : ['10'], { stdio: 'pipe', shell: process.platform === 'win32' });
+        result = runCommand('npm', ['install', '-g', pkgSpec], { cwd, silent: false });
+    }
+    return result;
+}
 /** Run a command and return success status */
 export function runCommand(cmd, args, options = {}) {
     const { silent = false, cwd } = options;
@@ -958,6 +1013,27 @@ export function runCommandOrThrow(cmd, args, options = {}) {
             }
             throw new Error('Failed to add safe.directory to git config.');
         }
+        // Detect corrupted git index and auto-repair
+        if (cmd === 'git' && (stderr.includes('invalid object') || stderr.includes('Error building trees'))) {
+            if (options.cwd && repairGitIndex(options.cwd)) {
+                // Retry the original command
+                const retry = spawnSafe(cmd, args, {
+                    encoding: 'utf-8',
+                    stdio: 'pipe',
+                    cwd: options.cwd,
+                    env: process.env,
+                    shell: needsShell
+                });
+                if (retry.status === 0) {
+                    return (retry.stdout || '') + (retry.stderr || '');
+                }
+                const retryStderr = retry.stderr || '';
+                if (retryStderr.trim()) {
+                    console.error(colors.red(retryStderr.trim()));
+                }
+                throw new Error(`Command failed after git index repair: ${cmd} ${args.join(' ')}`);
+            }
+        }
         // Show the error output
         if (stderr.trim()) {
             console.error(colors.red(stderr.trim()));
@@ -2471,7 +2547,7 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
                 else if (install) {
                     waitForNpmVersion(pkgName, pkgVersion);
                     console.log(`Installing ${pkgName}@${pkgVersion} globally from registry...`);
-                    const registryInstallResult = runCommand('npm', ['install', '-g', `${pkgName}@${pkgVersion}`], { cwd, silent: false });
+                    const registryInstallResult = installGlobalWithRetry(`${pkgName}@${pkgVersion}`, cwd);
                     if (registryInstallResult.success) {
                         console.log(colors.green(`✓ Installed globally: ${pkgName}@${pkgVersion}`));
                     }
@@ -2520,13 +2596,25 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
                 }
                 console.log(colors.yellow('Continuing with --force...'));
             }
-            const commitResult = runCommand('git', ['commit', '-m', commitMsg], { cwd });
+            let commitResult = runCommand('git', ['commit', '-m', commitMsg], { cwd });
             if (!commitResult.success) {
-                console.error(colors.red('ERROR: Failed to commit changes:'), commitResult.stderr);
-                if (!force) {
-                    return false;
+                // Check for corrupted git index ("invalid object" / "Error building trees")
+                // Run silently to capture stderr for detection
+                const probe = runCommand('git', ['commit', '-m', commitMsg], { cwd, silent: true });
+                const errText = probe.stderr + probe.output;
+                if (errText.includes('invalid object') || errText.includes('Error building trees')) {
+                    if (repairGitIndex(cwd)) {
+                        // Retry commit after repair
+                        commitResult = runCommand('git', ['commit', '-m', commitMsg], { cwd });
+                    }
+                }
+                if (!commitResult.success) {
+                    console.error(colors.red('ERROR: Failed to commit changes:'), commitResult.stderr);
+                    if (!force) {
+                        return false;
+                    }
+                    console.log(colors.yellow('Continuing with --force...'));
                 }
-                console.log(colors.yellow('Continuing with --force...'));
             }
         }
         else {
@@ -2930,7 +3018,7 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
             console.log(`Installing globally from registry: ${pkgName}@${pkgVersion}...`);
             if (!dryRun) {
                 waitForNpmVersion(pkgName, pkgVersion);
-                const installResult = runCommand('npm', ['install', '-g', `${pkgName}@${pkgVersion}`], { cwd, silent: false });
+                const installResult = installGlobalWithRetry(`${pkgName}@${pkgVersion}`, cwd);
                 if (installResult.success) {
                     console.log(colors.green(`✓ Installed globally: ${pkgName}@${pkgVersion}`));
                 }

package/package.json

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