@glash/cli 0.2.14 → 0.2.16

package/commands/deploy.mjs

@@ -178,12 +178,13 @@ export async function deploy({ flags }) {
   const seen = new Set();
   let lastStatus = '';
   const start = Date.now();
+  const timeoutMs = deployTimeoutMs(flags);
   let pollDelayMs = 5000;
   let lastProgressAt = Date.now();
   let currentPhase = 'queued';
   const indicator = createDeployIndicator({ start, getPhase: () => currentPhase });
   indicator.start();
-  while (Date.now() - start < 15 * 60 * 1000) {
+  while (Date.now() - start < timeoutMs) {
     let pipe;
     try {
       pipe = await apiGet(`/deployments/${dep.id}/pipeline`);
@@ -224,14 +225,16 @@ export async function deploy({ flags }) {
     }
     if (['error', 'failed'].includes(status)) {
       indicator.stop();
-      return fail(`Deployment failed (${status}). Run \`glash logs ${dep.id}\` for details.`);
+      const lastError = [...(pipe.events ?? [])].reverse().find((ev) => ev.status === 'error' || ev.status === 'failed');
+      const detail = lastError?.message ? `: ${lastError.message}` : '';
+      return fail(`Deployment failed (${status})${detail}. Run \`glash logs ${dep.id}\` for details.`);
     }
     currentPhase = phaseFromPipeline(pipe, currentPhase);
     pollDelayMs = nextPollDelay(pipe);
     await indicator.wait(pollDelayMs);
   }
   indicator.stop();
-  warn('Timed out waiting for deployment. Check `glash status <id>`.');
+  warn(`Timed out after ${formatDuration(timeoutMs)} waiting for deployment. Check \`glash status ${dep.id}\`.`);
 }
 
 async function syncEnvBeforeDeploy(projectId, target, flags) {
@@ -310,6 +313,23 @@ function nextPollDelay(pipe) {
   return 5000;
 }
 
+function deployTimeoutMs(flags) {
+  const raw = flags['wait-timeout'] ?? flags.timeout ?? process.env.GLASH_DEPLOY_TIMEOUT_MS;
+  if (raw !== undefined && raw !== null && raw !== '') {
+    const parsed = Number(raw);
+    if (Number.isFinite(parsed) && parsed > 0) {
+      return parsed < 1000 ? parsed * 60_000 : parsed;
+    }
+  }
+  return 45 * 60_000;
+}
+
+function formatDuration(ms) {
+  const seconds = Math.round(ms / 1000);
+  if (seconds < 90) return `${seconds}s`;
+  return `${Math.round(seconds / 60)}m`;
+}
+
 function phaseFromEvent(ev) {
   if (ev.step === 'detect') return 'detecting';
   if (ev.step === 'host') return 'assigning host';

package/lib/version.mjs

@@ -1 +1 @@
-export const VERSION = '0.2.14';
+export const VERSION = '0.2.16';

package/package.json

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