@glash/cli 0.2.48 → 0.2.49

package/bin/glash.mjs

@@ -91,7 +91,7 @@ ${color.bold('PULL')}
   pull [<slug>] [--out dir] [--no-env]  Unpack a project (asks which, if no slug)
 
 ${color.bold('SYSTEM')}
-  update                      Update @glash/cli to the latest version
+  update [--sudo]             Update the glash CLI to the latest version
 
 ${color.bold('FLAGS')}
   --project <slug|id>         Override the linked project for this command

package/commands/update.mjs

@@ -1,46 +1,107 @@
 import { spawnSync } from 'node:child_process';
+import { accessSync, constants } from 'node:fs';
+import { join } from 'node:path';
+import { stdout } from 'node:process';
 import { ok, fail, info, warn, color } from '../lib/ui.mjs';
 import { VERSION } from '../lib/version.mjs';
 
-export async function update() {
-  info(color.dim('→ updating @glash/cli to the latest version...'));
+// Both package names install the same CLI: @glash/cli is the primary, glashdb
+// the alias. Update whichever one this machine actually has.
+const PRIMARY = '@glash/cli';
+const ALIAS = 'glashdb';
 
-  // Quiet npm's funding/audit chatter so the only output is our own clean
-  // status line. --loglevel=error keeps real failures visible.
-  const child = spawnSync(
-    'npm',
-    ['install', '-g', '@glash/cli@latest', '--no-fund', '--no-audit', '--loglevel=error'],
-    { stdio: ['ignore', 'pipe', 'pipe'], encoding: 'utf8' },
-  );
+export async function update(parsed) {
+  const useSudo = Boolean(parsed?.flags?.sudo);
+  const pkg = installedPackage() ?? PRIMARY;
+
+  info(color.dim(`→ updating ${pkg} to the latest version...`));
+
+  const args = ['install', '-g', `${pkg}@latest`, '--no-fund', '--no-audit', '--loglevel=error'];
+  const child = useSudo
+    // Inherit stdio so sudo can prompt for the password.
+    ? spawnSync('sudo', ['npm', ...args], { stdio: 'inherit', encoding: 'utf8' })
+    : spawnSync('npm', args, { stdio: ['ignore', 'pipe', 'pipe'], encoding: 'utf8' });
+
+  if (child.error) {
+    return fail(`Could not run npm: ${child.error.message}`);
+  }
 
   if (child.status !== 0) {
     const stderr = (child.stderr || '').trim();
-    if (/EACCES|permission denied|EPERM/i.test(stderr)) {
-      warn('npm needs elevated permissions to write the global package directory.');
-      return fail('Run `sudo npm install -g @glash/cli@latest`, or set a user-writable npm prefix (`npm config set prefix ~/.npm-global`).');
+    // Show what npm actually said before any advice: guessing at the cause and
+    // hiding the error is how this command used to send people to sudo for
+    // problems sudo could not fix.
+    if (stderr) stdout.write(color.dim(`\n${stderr}\n\n`));
+
+    const target = globalLibDir();
+    const writable = target ? isWritable(target) : null;
+
+    if (writable === false) {
+      warn(`The global package directory is not writable: ${target}`);
+      return fail(
+        `Either re-run as \`glash update --sudo\`, or move npm's prefix somewhere you own:\n` +
+        `    npm config set prefix ~/.npm-global\n` +
+        `    export PATH="$HOME/.npm-global/bin:$PATH"   # add to ~/.zshrc`,
+      );
+    }
+
+    if (/EACCES|EPERM|permission denied/i.test(stderr)) {
+      // Writable prefix but a permission error: almost always a cache left
+      // root-owned by an earlier `sudo npm install`.
+      warn(`${target ?? 'The global package directory'} is writable, so this is probably npm's cache, not the install location.`);
+      return fail(
+        `Check the cache owner and fix it if root owns it:\n` +
+        `    ls -ld ~/.npm\n` +
+        `    sudo chown -R "$(whoami)" ~/.npm\n` +
+        `Then run \`glash update\` again.`,
+      );
     }
-    if (stderr) info(color.dim(stderr));
-    return fail(`Update failed with exit code ${child.status ?? 'unknown'}. Run \`npm install -g @glash/cli@latest\` manually.`);
+
+    return fail(`Update failed with exit code ${child.status ?? 'unknown'}. Run \`npm install -g ${pkg}@latest\` to see the full output.`);
   }
 
-  const installed = resolveInstalledVersion();
+  const installed = resolveInstalledVersion(pkg);
   if (installed && installed === VERSION) {
     ok(`Already on the latest version (${color.bold(`v${installed}`)}).`);
   } else if (installed) {
-    ok(`Updated @glash/cli → ${color.bold(`v${installed}`)}.`);
+    ok(`Updated ${pkg} → ${color.bold(`v${installed}`)}.`);
   } else {
-    ok('Updated @glash/cli to the latest version.');
+    ok(`Updated ${pkg} to the latest version.`);
+  }
+}
+
+/** Which of the two package names is installed globally, if either. */
+function installedPackage() {
+  for (const name of [PRIMARY, ALIAS]) {
+    if (resolveInstalledVersion(name)) return name;
+  }
+  return null;
+}
+
+function globalLibDir() {
+  const res = spawnSync('npm', ['prefix', '-g'], { stdio: ['ignore', 'pipe', 'ignore'], encoding: 'utf8' });
+  const prefix = (res.stdout || '').trim();
+  if (!prefix) return null;
+  return process.platform === 'win32' ? join(prefix, 'node_modules') : join(prefix, 'lib', 'node_modules');
+}
+
+function isWritable(dir) {
+  try {
+    accessSync(dir, constants.W_OK);
+    return true;
+  } catch {
+    return false;
   }
 }
 
-function resolveInstalledVersion() {
+function resolveInstalledVersion(pkg = PRIMARY) {
   try {
-    const res = spawnSync('npm', ['ls', '-g', '@glash/cli', '--depth=0', '--json'], {
+    const res = spawnSync('npm', ['ls', '-g', pkg, '--depth=0', '--json'], {
       stdio: ['ignore', 'pipe', 'ignore'],
       encoding: 'utf8',
     });
     const parsed = JSON.parse(res.stdout || '{}');
-    return parsed?.dependencies?.['@glash/cli']?.version || null;
+    return parsed?.dependencies?.[pkg]?.version || null;
   } catch {
     return null;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glash/cli",
-  "version": "0.2.48",
+  "version": "0.2.49",
   "description": "glashDB command-line interface - deploy projects, pull source + env, manage env vars.",
   "license": "Apache-2.0",
   "homepage": "https://glashdb.com",