@wyxos/zephyr 0.9.12 → 0.9.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wyxos/zephyr",
-  "version": "0.9.12",
+  "version": "0.9.13",
   "description": "A streamlined deployment tool for web applications with intelligent Laravel project detection",
   "type": "module",
   "main": "./src/index.mjs",

package/src/application/deploy/run-local-deployment-checks.mjs

@@ -1,6 +1,6 @@
 import * as localRepo from '../../deploy/local-repo.mjs'
 import * as preflight from '../../deploy/preflight.mjs'
-import {commandExists} from '../../utils/command.mjs'
+import {commandExists, formatCommandError} from '../../utils/command.mjs'
 
 async function getGitStatus(rootDir, {runCommandCapture} = {}) {
     return await localRepo.getGitStatus(rootDir, {runCommandCapture})
@@ -98,7 +98,7 @@ async function runLocalLaravelBuild(rootDir, {runCommand, logProcessing, logSucc
             )
         }
 
-        throw new Error(`Local frontend build failed. Fix build failures before deploying.\n${error.message}`)
+        throw new Error(`Local frontend build failed. Fix build failures before deploying.\n${formatCommandError(error)}`)
     }
 }
 
@@ -106,7 +106,7 @@ async function runLocalLaravelTests(rootDir, {runCommand, logProcessing, logSucc
     logProcessing?.('Running Laravel tests locally...')
 
     try {
-        await runCommand(testCommand.command, testCommand.args, {cwd: rootDir})
+        await runCommand(testCommand.command, testCommand.args, {cwd: rootDir, capture: true})
         logSuccess?.('Local tests passed.')
     } catch (error) {
         if (error.code === 'ENOENT') {
@@ -116,7 +116,7 @@ async function runLocalLaravelTests(rootDir, {runCommand, logProcessing, logSucc
             )
         }
 
-        throw new Error(`Local tests failed. Fix test failures before deploying.\n${error.message}`)
+        throw new Error(`Local tests failed. Fix test failures before deploying.\n${formatCommandError(error)}`)
     }
 }
 

package/src/deploy/local-repo.mjs

@@ -1,6 +1,7 @@
 import { getCurrentBranch as getCurrentBranchImpl, getUpstreamRef as getUpstreamRefImpl } from '../utils/git.mjs'
 import {hasPrePushHook} from './preflight.mjs'
 import {gitCommitArgs, gitPushArgs} from '../utils/git-hooks.mjs'
+import {formatCommandError} from '../utils/command.mjs'
 import {
   formatWorkingTreePreview,
   parseWorkingTreeEntries,
@@ -207,6 +208,13 @@ async function commitAndPushPendingChanges(targetBranch, rootDir, {
     await runCommand(command, args, { cwd })
     return undefined
   }
+  const runCapturedCommand = async (command, args) => {
+    try {
+      await runCommand(command, args, {cwd: rootDir, capture: true})
+    } catch (error) {
+      throw new Error(formatCommandError(error))
+    }
+  }
 
   const suggestedCommitMessage = await suggestCommitMessage(rootDir, {
     runCommand: captureAwareRunCommand,
@@ -244,10 +252,10 @@ async function commitAndPushPendingChanges(targetBranch, rootDir, {
   }
 
   logProcessing?.('Staging all pending changes before deployment...')
-  await runCommand('git', ['add', '-A'], { cwd: rootDir })
+  await runCapturedCommand('git', ['add', '-A'])
 
   logProcessing?.('Committing pending changes before deployment...')
-  await runCommand('git', gitCommitArgs(['-m', message], {skipGitHooks}), { cwd: rootDir })
+  await runCapturedCommand('git', gitCommitArgs(['-m', message], {skipGitHooks}))
 
   const prePushHookPresent = await hasPrePushHook(rootDir)
   if (prePushHookPresent) {
@@ -259,10 +267,10 @@ async function commitAndPushPendingChanges(targetBranch, rootDir, {
   }
 
   try {
-    await runCommand('git', gitPushArgs(['origin', targetBranch], {skipGitHooks}), { cwd: rootDir })
+    await runCapturedCommand('git', gitPushArgs(['origin', targetBranch], {skipGitHooks}))
   } catch (error) {
     if (prePushHookPresent) {
-      throw new Error(`Git push failed while the pre-push hook was running. See hook output above.\n${error.message}`)
+      throw new Error(`Git push failed while the pre-push hook was running.\n${error.message}`)
     }
 
     throw error

package/src/deploy/preflight.mjs

@@ -2,6 +2,7 @@ import fs from 'node:fs/promises'
 import path from 'node:path'
 
 import {gitCommitArgs} from '../utils/git-hooks.mjs'
+import {formatCommandError} from '../utils/command.mjs'
 
 export async function hasPrePushHook(rootDir) {
   const hookPaths = [
@@ -137,14 +138,22 @@ export async function runLinting(rootDir, {
 
   if (selectedLintCommand.type === 'npm') {
     logProcessing?.('Running npm lint...')
-    await runCommand(selectedLintCommand.command, selectedLintCommand.args, { cwd: rootDir })
+    try {
+      await runCommand(selectedLintCommand.command, selectedLintCommand.args, {cwd: rootDir, capture: true})
+    } catch (error) {
+      throw new Error(`Linting failed. Fix lint failures before deploying.\n${formatCommandError(error)}`)
+    }
     logSuccess?.('Linting completed.')
     return true
   }
 
   if (selectedLintCommand.type === 'pint') {
     logProcessing?.('Running Laravel Pint...')
-    await runCommand(selectedLintCommand.command, selectedLintCommand.args, { cwd: rootDir })
+    try {
+      await runCommand(selectedLintCommand.command, selectedLintCommand.args, {cwd: rootDir, capture: true})
+    } catch (error) {
+      throw new Error(`Laravel Pint failed. Fix formatting failures before deploying.\n${formatCommandError(error)}`)
+    }
     logSuccess?.('Linting completed.')
     return true
   }
@@ -166,7 +175,7 @@ export async function runBuild(rootDir, {
   }
 
   logProcessing?.('Running local frontend build...')
-  await runCommand(selectedBuildCommand.command, selectedBuildCommand.args, {cwd: rootDir})
+  await runCommand(selectedBuildCommand.command, selectedBuildCommand.args, {cwd: rootDir, capture: true})
   logSuccess?.('Local frontend build completed.')
   return true
 }

package/src/utils/command.mjs

@@ -12,12 +12,11 @@ export function commandExists(command) {
   const resolvedCommand = resolveCommandForPlatform(command)
 
   // On Windows, use 'where', on Unix use 'which'
-  const checker = DEFAULT_IS_WINDOWS ? 'where' : 'which'
+  const checker = DEFAULT_IS_WINDOWS ? 'where.exe' : 'which'
 
   try {
     const result = spawnSync(checker, [resolvedCommand], {
-      stdio: ['ignore', 'pipe', 'ignore'],
-      shell: DEFAULT_IS_WINDOWS
+      stdio: ['ignore', 'pipe', 'ignore']
     })
     return result.status === 0
   } catch {
@@ -67,7 +66,11 @@ function quoteForCmd(arg) {
   return value
 }
 
-export async function runCommand(command, args, { cwd = process.cwd(), stdio = 'inherit' } = {}) {
+export async function runCommand(command, args, { cwd = process.cwd(), stdio = 'inherit', capture = false } = {}) {
+  if (capture) {
+    return runCommandCapture(command, args, {cwd})
+  }
+
   const resolvedCommand = resolveCommandForPlatform(command)
   const useShell = isWindowsShellShim(resolvedCommand) || shouldUseShellOnWindows(command)
 
@@ -152,3 +155,23 @@ export async function runCommandCapture(command, args, { cwd = process.cwd() } =
   })
 }
 
+export function formatCapturedCommandOutput(error) {
+  const sections = [
+    ['stdout', error?.stdout],
+    ['stderr', error?.stderr]
+  ]
+    .map(([label, value]) => {
+      const text = typeof value === 'string' ? value.trim() : ''
+      return text ? `[${label}]\n${text}` : null
+    })
+    .filter(Boolean)
+
+  return sections.join('\n')
+}
+
+export function formatCommandError(error) {
+  const message = error?.message ?? String(error)
+  const output = formatCapturedCommandOutput(error)
+
+  return output ? `${message}\n${output}` : message
+}