@glash/cli 0.2.40 → 0.2.42

package/commands/deploy.mjs

@@ -5,7 +5,7 @@ import fg from 'fast-glob';
 import { execSync } from 'node:child_process';
 import { createHash } from 'node:crypto';
 import { zipDirectory } from '../lib/zip.mjs';
-import { buildProjectBeforeDeploy, compactBuildOutputLine } from '../lib/project-build.mjs';
+import { buildProjectBeforeDeploy } from '../lib/project-build.mjs';
 import { join, basename, extname } from 'node:path';
 import { tmpdir } from 'node:os';
 import { createReadStream, openAsBlob } from 'node:fs';
@@ -182,13 +182,7 @@ export async function deploy({ flags }) {
       localBuild = await buildProjectBeforeDeploy(process.cwd(), {
         packageJson: projectProfile.runtime?.pkg,
         skip: Boolean(flags['no-build']) || process.env.GLASH_CLI_BUILD_RUNNING === '1',
-        onStart: (plan) => {
-          indicator.setPhase('prebuilding', `Building project (${plan.displayCommand})`);
-        },
-        onLine: ({ line }) => {
-          const detail = compactBuildOutputLine(line);
-          if (detail) indicator.setDetail(`Building project — ${detail}`);
-        },
+        onStart: () => indicator.setPhase('prebuilding'),
       });
       report.localBuild = localBuild;
     } catch (e) {
@@ -197,7 +191,7 @@ export async function deploy({ flags }) {
         command: e.buildPlan?.displayCommand || '',
       };
       report.localBuild = localBuild;
-      indicator.fail('failed', 'Project build failed');
+      indicator.fail('failed');
       printBuildFailureOutput(e.buildOutput);
       printDeployReport({ ...report, status: 'failed', error: `Project build failed: ${e.message}` });
       return fail(`Project build failed: ${e.message}`);
@@ -1443,7 +1437,7 @@ function createDeployIndicator() {
   function updateProgress(nextProgress, nextPhase = phase, nextDetail) {
     const bounded = Math.max(0, Math.min(100, Number(nextProgress) || 0));
     const advanced = Math.max(progress, bounded);
-    const resolvedDetail = nextDetail || (nextPhase !== phase ? detailFromPhase(nextPhase) : detail);
+    const resolvedDetail = twoWordAction(nextDetail || (nextPhase !== phase ? detailFromPhase(nextPhase) : detail));
     const changed = nextPhase !== phase || advanced !== progress || resolvedDetail !== detail;
     phase = nextPhase;
     progress = advanced;
@@ -1469,7 +1463,7 @@ function createDeployIndicator() {
       updateProgress(nextProgress, nextPhase, nextDetail);
     },
     setDetail(nextDetail) {
-      const value = String(nextDetail || '').trim();
+      const value = twoWordAction(nextDetail);
       if (!value || value === detail) return;
       detail = value;
       render();
@@ -1477,7 +1471,7 @@ function createDeployIndicator() {
     finish(finalPhase = 'complete', finalDetail = detailFromPhase(finalPhase)) {
       stopTimer();
       phase = finalPhase;
-      detail = finalDetail;
+      detail = twoWordAction(finalDetail);
       progress = 100;
       render({ force: true });
       if (interactive) stdout.write('\n');
@@ -1485,7 +1479,7 @@ function createDeployIndicator() {
     fail(finalPhase = 'failed', finalDetail = detailFromPhase(finalPhase)) {
       stopTimer();
       phase = finalPhase;
-      detail = finalDetail;
+      detail = twoWordAction(finalDetail);
       render({ force: true });
       if (interactive) stdout.write('\n');
     },
@@ -1500,27 +1494,32 @@ function createDeployIndicator() {
   };
 }
 
+function twoWordAction(value) {
+  const words = String(value || '').trim().split(/\s+/).filter(Boolean);
+  return words.length >= 2 ? words.slice(0, 2).join(' ') : (words[0] ? `${words[0]} Now` : 'Working Now');
+}
+
 function detailFromPhase(phase) {
   const details = {
-    doing: 'Preparing deployment',
-    prebuilding: 'Building project',
-    syncing: 'Syncing environment variables',
-    assets: 'Preparing public assets',
-    packaging: 'Packaging source files',
-    uploading: 'Uploading source chunks',
-    glashing: 'Uploading source bundle',
-    hatching: 'Waiting for a Glash build worker',
-    waiting: 'Waiting for deployment updates',
-    building: 'Building project on Glash',
-    deploying: 'Deploying application',
-    routing: 'Configuring domains and routing',
-    checking: 'Checking the live deployment',
-    complete: 'Deployment complete',
-    queued: 'Deployment queued',
-    failed: 'Deployment failed',
-    'timed out': 'Deployment timed out',
+    doing: 'Preparing Deploy',
+    prebuilding: 'Building Project',
+    syncing: 'Syncing Environment',
+    assets: 'Preparing Assets',
+    packaging: 'Packaging Source',
+    uploading: 'Uploading Chunks',
+    glashing: 'Uploading Bundle',
+    hatching: 'Waiting Worker',
+    waiting: 'Waiting Updates',
+    building: 'Building Project',
+    deploying: 'Deploying App',
+    routing: 'Configuring Routing',
+    checking: 'Checking Deployment',
+    complete: 'Deployment Complete',
+    queued: 'Deployment Queued',
+    failed: 'Deployment Failed',
+    'timed out': 'Deployment Timeout',
   };
-  return details[phase] || String(phase || 'Working');
+  return details[phase] || 'Working Now';
 }
 
 function progressFromPhase(phase) {

package/lib/project-build.mjs

@@ -63,9 +63,15 @@ export async function buildProjectBeforeDeploy(cwd, {
   };
 
   await new Promise((resolve, reject) => {
+    // Build scripts are arbitrary project code. Do not hand them Glash control
+    // plane or package-publishing credentials inherited by the CLI process.
+    const buildEnv = { ...env, GLASH_CLI_BUILD_RUNNING: '1' };
+    for (const key of ['GLASH_TOKEN', 'GLASH_API_TOKEN', 'NPM_TOKEN', 'NODE_AUTH_TOKEN']) {
+      delete buildEnv[key];
+    }
     const child = spawnImpl(plan.command, plan.args, {
       cwd,
-      env: { ...env, GLASH_CLI_BUILD_RUNNING: '1' },
+      env: buildEnv,
       stdio: ['inherit', 'pipe', 'pipe'],
     });
 

package/lib/zip.mjs

@@ -72,6 +72,15 @@ export async function zipDirectory(sourceDir, outPath, { ignore = [], includeGla
     '**/.env.production',
     '.env.development',
     '**/.env.development',
+    '.env.*',
+    '**/.env.*',
+    '.npmrc',
+    '**/.npmrc',
+    '**/credentials*.json',
+    '**/*service-account*.json',
+    '**/*.pem',
+    '**/*.key',
+    '**/.ssh/**',
   ];
   const allIgnore = [...new Set([...defaultIgnore, ...loadIgnorePatterns(sourceDir), ...ignore])];
   const overridePaths = new Set(Object.keys(overrides));

package/package.json

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