@wyxos/zephyr 0.2.17 → 0.2.18

package/README.md

@@ -30,6 +30,12 @@ Follow the interactive prompts to configure your deployment target:
 
 Configuration is saved automatically for future deployments.
 
+## Update Checks
+
+When run via `npx`, Zephyr can prompt to re-run itself using the latest published version.
+
+- **Skip update check**: set `ZEPHYR_SKIP_VERSION_CHECK=1`
+
 ## Features
 
 - Automated Git operations (branch switching, commits, pushes)
@@ -49,11 +55,12 @@ Configuration is saved automatically for future deployments.
 Zephyr analyzes changed files and runs appropriate tasks:
 
 - **Always**: `git pull origin <branch>`
-- **Composer files changed**: `composer update --no-dev --no-interaction --prefer-dist`
-- **Migration files added**: `php artisan migrate --force`
-- **package.json changed**: `npm install`
-- **Frontend files changed**: `npm run build`
-- **PHP files changed**: Clear Laravel caches, restart queues
+- **Composer files changed** (`composer.json` / `composer.lock`): `composer update --no-dev --no-interaction --prefer-dist`
+- **Migrations changed** (`database/migrations/*.php`): `php artisan migrate --force`
+- **Node dependency files changed** (`package.json` / `package-lock.json`, including nested): `npm install`
+- **Frontend files changed** (`.vue/.js/.ts/.tsx/.css/.scss/.less`): `npm run build`
+  - Note: `npm run build` is also scheduled when `npm install` is scheduled.
+- **PHP files changed**: clear caches + restart queue workers (Horizon if configured)
 
 ## Configuration
 
@@ -64,6 +71,7 @@ Servers are stored globally at `~/.config/zephyr/servers.json`:
 ```json
 [
   {
+    "id": "server_abc123",
     "serverName": "production",
     "serverIp": "192.168.1.100"
   }
@@ -76,8 +84,17 @@ Deployment targets are stored per-project at `.zephyr/config.json`:
 
 ```json
 {
+  "presets": [
+    {
+      "name": "prod-main",
+      "appId": "app_def456",
+      "branch": "main"
+    }
+  ],
   "apps": [
     {
+      "id": "app_def456",
+      "serverId": "server_abc123",
       "serverName": "production",
       "projectPath": "~/webapps/myapp",
       "branch": "main",
@@ -98,6 +115,11 @@ Zephyr creates a `.zephyr/` directory in your project with:
 
 The `.zephyr/` directory is automatically added to `.gitignore`.
 
+## Notes
+
+- If Zephyr reports **"No upstream file changes detected"**, it means the remote repository already matches `origin/<branch>` after `git fetch`. In that case, Zephyr will only run `git pull` and skip all conditional maintenance tasks.
+- If Zephyr prompts to update local file dependencies (path-based deps outside the repo), it may also prompt to commit those updates before continuing.
+
 ## Requirements
 
 - Node.js 16+

package/bin/zephyr.mjs

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 import process from 'node:process'
 import { logError, main } from '../src/index.mjs'
 

package/package.json

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

package/src/dependency-scanner.mjs

@@ -219,16 +219,16 @@ async function updateComposerJsonDependency(rootDir, packageName, newVersion, fi
 
 async function runCommand(command, args, { cwd = process.cwd(), capture = false } = {}) {
   return new Promise((resolve, reject) => {
+    const resolvedCommand = IS_WINDOWS && (command === 'npm' || command === 'npx' || command === 'pnpm' || command === 'yarn')
+      ? `${command}.cmd`
+      : command
+
     const spawnOptions = {
       stdio: capture ? ['ignore', 'pipe', 'pipe'] : 'inherit',
       cwd
     }
 
-    if (IS_WINDOWS && command !== 'git') {
-      spawnOptions.shell = true
-    }
-
-    const child = spawn(command, args, spawnOptions)
+    const child = spawn(resolvedCommand, args, spawnOptions)
     let stdout = ''
     let stderr = ''
 
@@ -247,7 +247,7 @@ async function runCommand(command, args, { cwd = process.cwd(), capture = false
       if (code === 0) {
         resolve(capture ? { stdout: stdout.trim(), stderr: stderr.trim() } : undefined)
       } else {
-        const error = new Error(`Command failed (${code}): ${command} ${args.join(' ')}`)
+        const error = new Error(`Command failed (${code}): ${resolvedCommand} ${args.join(' ')}`)
         if (capture) {
           error.stdout = stdout
           error.stderr = stderr

package/src/index.mjs

@@ -23,10 +23,20 @@ const PENDING_TASKS_FILE = 'pending-tasks.json'
 const RELEASE_SCRIPT_NAME = 'release'
 const RELEASE_SCRIPT_COMMAND = 'npx @wyxos/zephyr@latest'
 
-const logProcessing = (message = '') => console.log(chalk.yellow(message))
-const logSuccess = (message = '') => console.log(chalk.green(message))
-const logWarning = (message = '') => console.warn(chalk.yellow(message))
-const logError = (message = '') => console.error(chalk.red(message))
+function writeStdoutLine(message = '') {
+  const text = message == null ? '' : String(message)
+  process.stdout.write(`${text}\n`)
+}
+
+function writeStderrLine(message = '') {
+  const text = message == null ? '' : String(message)
+  process.stderr.write(`${text}\n`)
+}
+
+const logProcessing = (message = '') => writeStdoutLine(chalk.yellow(message))
+const logSuccess = (message = '') => writeStdoutLine(chalk.green(message))
+const logWarning = (message = '') => writeStderrLine(chalk.yellow(message))
+const logError = (message = '') => writeStderrLine(chalk.red(message))
 
 let logFilePath = null
 
@@ -120,25 +130,23 @@ const runPrompt = async (questions) => {
 
 async function runCommand(command, args, { silent = false, cwd } = {}) {
   return new Promise((resolve, reject) => {
+    const resolvedCommand = IS_WINDOWS && (command === 'npm' || command === 'npx' || command === 'pnpm' || command === 'yarn')
+      ? `${command}.cmd`
+      : command
+
     const spawnOptions = {
       stdio: silent ? 'ignore' : 'inherit',
       cwd
     }
 
-    // On Windows, use shell for commands that might need PATH resolution (php, composer, etc.)
-    // Git commands work fine without shell
-    if (IS_WINDOWS && command !== 'git') {
-      spawnOptions.shell = true
-    }
-
-    const child = spawn(command, args, spawnOptions)
+    const child = spawn(resolvedCommand, args, spawnOptions)
 
     child.on('error', reject)
     child.on('close', (code) => {
       if (code === 0) {
         resolve()
       } else {
-        const error = new Error(`${command} exited with code ${code}`)
+        const error = new Error(`${resolvedCommand} exited with code ${code}`)
         error.exitCode = code
         reject(error)
       }
@@ -148,6 +156,10 @@ async function runCommand(command, args, { silent = false, cwd } = {}) {
 
 async function runCommandCapture(command, args, { cwd } = {}) {
   return new Promise((resolve, reject) => {
+    const resolvedCommand = IS_WINDOWS && (command === 'npm' || command === 'npx' || command === 'pnpm' || command === 'yarn')
+      ? `${command}.cmd`
+      : command
+
     let stdout = ''
     let stderr = ''
 
@@ -156,13 +168,7 @@ async function runCommandCapture(command, args, { cwd } = {}) {
       cwd
     }
 
-    // On Windows, use shell for commands that might need PATH resolution (php, composer, etc.)
-    // Git commands work fine without shell
-    if (IS_WINDOWS && command !== 'git') {
-      spawnOptions.shell = true
-    }
-
-    const child = spawn(command, args, spawnOptions)
+    const child = spawn(resolvedCommand, args, spawnOptions)
 
     child.stdout.on('data', (chunk) => {
       stdout += chunk
@@ -177,7 +183,7 @@ async function runCommandCapture(command, args, { cwd } = {}) {
       if (code === 0) {
         resolve(stdout)
       } else {
-        const error = new Error(`${command} exited with code ${code}: ${stderr.trim()}`)
+        const error = new Error(`${resolvedCommand} exited with code ${code}: ${stderr.trim()}`)
         error.exitCode = code
         reject(error)
       }
@@ -297,7 +303,9 @@ async function ensureCommittedChangesPushed(targetBranch, rootDir) {
   const commitLabel = aheadCount === 1 ? 'commit' : 'commits'
   logProcessing(`Found ${aheadCount} ${commitLabel} not yet pushed to ${upstreamRef}. Pushing before deployment...`)
 
-  await runCommand('git', ['push', remoteName, `${targetBranch}:${upstreamBranch}`], { cwd: rootDir })
+  // Keep terminal output clean: suppress git push progress output (it is very noisy),
+  // but still surface errors via the thrown exception message.
+  await runCommandCapture('git', ['push', remoteName, `${targetBranch}:${upstreamBranch}`], { cwd: rootDir })
   logSuccess(`Pushed committed changes to ${upstreamRef}.`)
 
   return { pushed: true, upstreamRef }
@@ -1882,7 +1890,7 @@ async function main(releaseType = null) {
       logError('\nRelease failed:')
       logError(error.message)
       if (error.stack) {
-        console.error(error.stack)
+        writeStderrLine(error.stack)
       }
       process.exit(1)
     }
@@ -1897,7 +1905,7 @@ async function main(releaseType = null) {
       logError('\nRelease failed:')
       logError(error.message)
       if (error.stack) {
-        console.error(error.stack)
+        writeStderrLine(error.stack)
       }
       process.exit(1)
     }
@@ -2018,7 +2026,7 @@ async function main(releaseType = null) {
   }
 
   logProcessing('\nSelected deployment target:')
-  console.log(JSON.stringify(deploymentConfig, null, 2))
+  writeStdoutLine(JSON.stringify(deploymentConfig, null, 2))
 
   if (isCreatingNewPreset || !preset) {
     const { presetName } = await runPrompt([

package/src/release-node.mjs

@@ -10,16 +10,34 @@ import { validateLocalDependencies } from './dependency-scanner.mjs'
 
 const IS_WINDOWS = process.platform === 'win32'
 
+function writeStdoutLine(message = '') {
+  const text = message == null ? '' : String(message)
+  process.stdout.write(`${text}\n`)
+}
+
+function writeStderrLine(message = '') {
+  const text = message == null ? '' : String(message)
+  process.stderr.write(`${text}\n`)
+}
+
+function writeStderr(message = '') {
+  const text = message == null ? '' : String(message)
+  process.stderr.write(text)
+  if (text && !text.endsWith('\n')) {
+    process.stderr.write('\n')
+  }
+}
+
 function logStep(message) {
-  console.log(chalk.yellow(`→ ${message}`))
+  writeStdoutLine(chalk.yellow(`→ ${message}`))
 }
 
 function logSuccess(message) {
-  console.log(chalk.green(`✔ ${message}`))
+  writeStdoutLine(chalk.green(`✔ ${message}`))
 }
 
 function logWarning(message) {
-  console.warn(chalk.yellow(`⚠ ${message}`))
+  writeStderrLine(chalk.yellow(`⚠ ${message}`))
 }
 
 function runCommand(command, args, { cwd = process.cwd(), capture = false, useShell = false } = {}) {
@@ -155,7 +173,7 @@ async function ensureUpToDateWithUpstream(branch, upstreamRef, rootDir = process
       await runCommand('git', ['fetch', remoteName, remoteBranch], { capture: true, cwd: rootDir })
     } catch (error) {
       if (error.stderr) {
-        console.error(error.stderr)
+        writeStderr(error.stderr)
       }
       throw new Error(`Failed to fetch ${upstreamRef}: ${error.message}`)
     }
@@ -181,7 +199,7 @@ async function ensureUpToDateWithUpstream(branch, upstreamRef, rootDir = process
         await runCommand('git', ['pull', '--ff-only', remoteName, remoteBranch], { capture: true, cwd: rootDir })
       } catch (error) {
         if (error.stderr) {
-          console.error(error.stderr)
+          writeStderr(error.stderr)
         }
         throw new Error(
           `Unable to fast-forward ${branch} with ${upstreamRef}. Resolve conflicts manually, then rerun the release.\n${error.message}`
@@ -251,10 +269,10 @@ async function runLint(skipLint, pkg, rootDir = process.cwd()) {
     logSuccess('Lint passed.')
   } catch (error) {
     if (error.stdout) {
-      console.error(error.stdout)
+      writeStderr(error.stdout)
     }
     if (error.stderr) {
-      console.error(error.stderr)
+      writeStderr(error.stderr)
     }
     throw error
   }
@@ -287,10 +305,10 @@ async function runTests(skipTests, pkg, rootDir = process.cwd()) {
     logSuccess('Tests passed.')
   } catch (error) {
     if (error.stdout) {
-      console.error(error.stdout)
+      writeStderr(error.stdout)
     }
     if (error.stderr) {
-      console.error(error.stderr)
+      writeStderr(error.stderr)
     }
     throw error
   }
@@ -314,10 +332,10 @@ async function runBuild(skipBuild, pkg, rootDir = process.cwd()) {
     logSuccess('Build completed.')
   } catch (error) {
     if (error.stdout) {
-      console.error(error.stdout)
+      writeStderr(error.stdout)
     }
     if (error.stderr) {
-      console.error(error.stderr)
+      writeStderr(error.stderr)
     }
     throw error
   }
@@ -341,10 +359,10 @@ async function runLibBuild(skipBuild, pkg, rootDir = process.cwd()) {
     logSuccess('Library built.')
   } catch (error) {
     if (error.stdout) {
-      console.error(error.stdout)
+      writeStderr(error.stdout)
     }
     if (error.stderr) {
-      console.error(error.stderr)
+      writeStderr(error.stderr)
     }
     throw error
   }
@@ -377,7 +395,7 @@ async function ensureNpmAuth(rootDir = process.cwd()) {
     logSuccess('npm authenticated.')
   } catch (error) {
     if (error.stderr) {
-      console.error(error.stderr)
+      writeStderr(error.stderr)
     }
     throw error
   }
@@ -438,10 +456,10 @@ async function pushChanges(rootDir = process.cwd()) {
     logSuccess('Git push completed.')
   } catch (error) {
     if (error.stdout) {
-      console.error(error.stdout)
+      writeStderr(error.stdout)
     }
     if (error.stderr) {
-      console.error(error.stderr)
+      writeStderr(error.stderr)
     }
     throw error
   }
@@ -472,10 +490,10 @@ async function publishPackage(pkg, rootDir = process.cwd()) {
     logSuccess('npm publish completed.')
   } catch (error) {
     if (error.stdout) {
-      console.error(error.stdout)
+      writeStderr(error.stdout)
     }
     if (error.stderr) {
-      console.error(error.stderr)
+      writeStderr(error.stderr)
     }
     throw error
   }
@@ -566,10 +584,10 @@ async function deployGHPages(skipDeploy, pkg, rootDir = process.cwd()) {
     logSuccess('GitHub Pages deployment completed.')
   } catch (error) {
     if (error.stdout) {
-      console.error(error.stdout)
+      writeStderr(error.stdout)
     }
     if (error.stderr) {
-      console.error(error.stderr)
+      writeStderr(error.stderr)
     }
     throw error
   }
@@ -611,8 +629,8 @@ export async function releaseNode() {
 
     logSuccess(`Release workflow completed for ${updatedPkg.name}@${updatedPkg.version}.`)
   } catch (error) {
-    console.error('\nRelease failed:')
-    console.error(error.message)
+    writeStderrLine('\nRelease failed:')
+    writeStderrLine(error.message)
     throw error
   }
 }

package/src/release-packagist.mjs

@@ -13,16 +13,34 @@ const WARN_PREFIX = '⚠'
 
 const IS_WINDOWS = process.platform === 'win32'
 
+function writeStdoutLine(message = '') {
+  const text = message == null ? '' : String(message)
+  process.stdout.write(`${text}\n`)
+}
+
+function writeStderrLine(message = '') {
+  const text = message == null ? '' : String(message)
+  process.stderr.write(`${text}\n`)
+}
+
+function writeStderr(message = '') {
+  const text = message == null ? '' : String(message)
+  process.stderr.write(text)
+  if (text && !text.endsWith('\n')) {
+    process.stderr.write('\n')
+  }
+}
+
 function logStep(message) {
-  console.log(`${STEP_PREFIX} ${message}`)
+  writeStdoutLine(`${STEP_PREFIX} ${message}`)
 }
 
 function logSuccess(message) {
-  console.log(`${OK_PREFIX} ${message}`)
+  writeStdoutLine(`${OK_PREFIX} ${message}`)
 }
 
 function logWarning(message) {
-  console.warn(`${WARN_PREFIX} ${message}`)
+  writeStderrLine(`${WARN_PREFIX} ${message}`)
 }
 
 function runCommand(command, args, { cwd = process.cwd(), capture = false, useShell = false } = {}) {
@@ -269,10 +287,10 @@ async function runLint(skipLint, rootDir = process.cwd()) {
     }
     process.stdout.write('\n')
     if (error.stdout) {
-      console.error(error.stdout)
+      writeStderr(error.stdout)
     }
     if (error.stderr) {
-      console.error(error.stderr)
+      writeStderr(error.stderr)
     }
     throw error
   }
@@ -322,10 +340,10 @@ async function runTests(skipTests, composer, rootDir = process.cwd()) {
     }
     process.stdout.write('\n')
     if (error.stdout) {
-      console.error(error.stdout)
+      writeStderr(error.stdout)
     }
     if (error.stderr) {
-      console.error(error.stderr)
+      writeStderr(error.stderr)
     }
     throw error
   }

package/src/ssh-utils.mjs

@@ -3,13 +3,24 @@ import os from 'node:os'
 import path from 'node:path'
 import { NodeSSH } from 'node-ssh'
 import chalk from 'chalk'
+import process from 'node:process'
 
 // Import utility functions - these need to be passed in or redefined to avoid circular dependency
 // For now, we'll redefine the simple ones and accept others as parameters
-const logProcessing = (message = '') => console.log(chalk.yellow(message))
-const logSuccess = (message = '') => console.log(chalk.green(message))
-const logError = (message = '') => console.error(chalk.red(message))
-const logWarning = (message = '') => console.warn(chalk.yellow(message))
+function writeStdoutLine(message = '') {
+  const text = message == null ? '' : String(message)
+  process.stdout.write(`${text}\n`)
+}
+
+function writeStderrLine(message = '') {
+  const text = message == null ? '' : String(message)
+  process.stderr.write(`${text}\n`)
+}
+
+const logProcessing = (message = '') => writeStdoutLine(chalk.yellow(message))
+const logSuccess = (message = '') => writeStdoutLine(chalk.green(message))
+const logError = (message = '') => writeStderrLine(chalk.red(message))
+const logWarning = (message = '') => writeStderrLine(chalk.yellow(message))
 
 function expandHomePath(targetPath) {
   if (!targetPath) {

package/src/version-checker.mjs

@@ -97,7 +97,6 @@ async function reExecuteWithLatest(args) {
   return new Promise((resolve, reject) => {
     const child = spawn(command, npxArgs, {
       stdio: 'inherit',
-      shell: IS_WINDOWS,
       env: {
         ...process.env,
         [ZEPHYR_SKIP_VERSION_CHECK_ENV]: '1'