@wyxos/zephyr 0.2.16 → 0.2.17

package/bin/zephyr.mjs

@@ -1,24 +1,15 @@
 #!/usr/bin/env node
-import { main } from '../src/index.mjs'
-import { checkAndUpdateVersion } from '../src/version-checker.mjs'
-import inquirer from 'inquirer'
+import process from 'node:process'
+import { logError, main } from '../src/index.mjs'
 
 // Parse --type flag from command line arguments
 const args = process.argv.slice(2)
 const typeFlag = args.find(arg => arg.startsWith('--type='))
 const releaseType = typeFlag ? typeFlag.split('=')[1] : null
 
-// Check for updates and re-execute if user confirms
-checkAndUpdateVersion((questions) => inquirer.prompt(questions), args)
-  .then((reExecuted) => {
-    if (reExecuted) {
-      // Version was updated and script re-executed, exit this process
-      process.exit(0)
-    }
-    // No update or user declined, continue with normal execution
-    return main(releaseType)
-  })
-  .catch((error) => {
-    console.error(error.message)
-    process.exit(1)
-  })
+try {
+  await main(releaseType)
+} catch (error) {
+  logError(error?.message || String(error))
+  process.exitCode = 1
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wyxos/zephyr",
-  "version": "0.2.16",
+  "version": "0.2.17",
   "description": "A streamlined deployment tool for web applications with intelligent Laravel project detection",
   "type": "module",
   "main": "./src/index.mjs",
@@ -13,6 +13,7 @@
   },
   "scripts": {
     "test": "vitest run",
+    "lint": "eslint .",
     "release": "node bin/zephyr.mjs --type=node"
   },
   "keywords": [
@@ -48,6 +49,9 @@
     "semver": "^7.6.3"
   },
   "devDependencies": {
+    "@eslint/js": "^9.39.2",
+    "eslint": "^9.39.2",
+    "globals": "^17.0.0",
     "vitest": "^2.1.8"
   }
 }

package/src/dependency-scanner.mjs

@@ -2,6 +2,7 @@ import { readFile, writeFile } from 'node:fs/promises'
 import path from 'node:path'
 import { spawn } from 'node:child_process'
 import process from 'node:process'
+import chalk from 'chalk'
 
 const IS_WINDOWS = process.platform === 'win32'
 
@@ -147,7 +148,7 @@ async function fetchLatestNpmVersion(packageName) {
     }
     const data = await response.json()
     return data.version || null
-  } catch (error) {
+  } catch (_error) {
     return null
   }
 }
@@ -166,7 +167,7 @@ async function fetchLatestPackagistVersion(packageName) {
       return latest.version || null
     }
     return null
-  } catch (error) {
+  } catch (_error) {
     return null
   }
 }
@@ -262,7 +263,7 @@ async function getGitStatus(rootDir) {
   try {
     const result = await runCommand('git', ['status', '--porcelain'], { capture: true, cwd: rootDir })
     return result.stdout || ''
-  } catch (error) {
+  } catch (_error) {
     return ''
   }
 }
@@ -280,7 +281,7 @@ function hasStagedChanges(statusOutput) {
   })
 }
 
-async function commitDependencyUpdates(rootDir, updatedFiles, logFn) {
+async function commitDependencyUpdates(rootDir, updatedFiles, promptFn, logFn) {
   try {
     // Check if we're in a git repository
     await runCommand('git', ['rev-parse', '--is-inside-work-tree'], { capture: true, cwd: rootDir })
@@ -289,7 +290,30 @@ async function commitDependencyUpdates(rootDir, updatedFiles, logFn) {
     return false
   }
 
-  const status = await getGitStatus(rootDir)
+  const statusBefore = await getGitStatus(rootDir)
+
+  // Avoid accidentally committing unrelated staged changes
+  if (hasStagedChanges(statusBefore)) {
+    if (logFn) {
+      logFn('Staged changes detected. Skipping auto-commit of dependency updates.')
+    }
+    return false
+  }
+
+  const fileList = updatedFiles.map((f) => path.basename(f)).join(', ')
+
+  const { shouldCommit } = await promptFn([
+    {
+      type: 'confirm',
+      name: 'shouldCommit',
+      message: `Commit dependency updates now? (${fileList})`,
+      default: true
+    }
+  ])
+
+  if (!shouldCommit) {
+    return false
+  }
 
   // Stage the updated files
   for (const file of updatedFiles) {
@@ -306,7 +330,6 @@ async function commitDependencyUpdates(rootDir, updatedFiles, logFn) {
   }
 
   // Build commit message
-  const fileList = updatedFiles.map(f => path.basename(f)).join(', ')
   const commitMessage = `chore: update local file dependencies to online versions (${fileList})`
 
   if (logFn) {
@@ -353,20 +376,27 @@ async function validateLocalDependencies(rootDir, promptFn, logFn = null) {
     })
   )
 
-  // Build warning messages
+  // Build warning messages with colored output (danger color for package name and version)
   const messages = depsWithVersions.map((dep) => {
+    const packageNameColored = chalk.red(dep.packageName)
+    const pathColored = chalk.dim(dep.path)
     const versionInfo = dep.latestVersion
-      ? ` Latest version available: ${dep.latestVersion}.`
+      ? ` Latest version available: ${chalk.red(dep.latestVersion)}.`
       : ' Latest version could not be determined.'
-    return `Dependency '${dep.packageName}' is pointing to a local path outside the repository: ${dep.path}.${versionInfo}`
+    return `Dependency ${packageNameColored} is pointing to a local path outside the repository: ${pathColored}.${versionInfo}`
   })
 
+  // Build the prompt message with colored count (danger color)
+  const countColored = chalk.red(allDeps.length)
+  const countText = allDeps.length === 1 ? 'dependency' : 'dependencies'
+  const promptMessage = `Found ${countColored} local file ${countText} pointing outside the repository:\n\n${messages.join('\n\n')}\n\nUpdate to latest version?`
+
   // Prompt user
   const { shouldUpdate } = await promptFn([
     {
       type: 'confirm',
       name: 'shouldUpdate',
-      message: `Found ${allDeps.length} local file dependency/dependencies pointing outside the repository:\n\n${messages.join('\n\n')}\n\nUpdate to latest version?`,
+      message: promptMessage,
       default: true
     }
   ])
@@ -441,7 +471,7 @@ async function validateLocalDependencies(rootDir, promptFn, logFn = null) {
 
   // Commit the changes if any files were updated
   if (updatedFiles.size > 0) {
-    await commitDependencyUpdates(rootDir, Array.from(updatedFiles), logFn)
+    await commitDependencyUpdates(rootDir, Array.from(updatedFiles), promptFn, logFn)
   }
 }
 

package/src/index.mjs

@@ -10,6 +10,7 @@ import { NodeSSH } from 'node-ssh'
 import { releaseNode } from './release-node.mjs'
 import { releasePackagist } from './release-packagist.mjs'
 import { validateLocalDependencies } from './dependency-scanner.mjs'
+import { checkAndUpdateVersion } from './version-checker.mjs'
 
 const IS_WINDOWS = process.platform === 'win32'
 
@@ -89,7 +90,7 @@ async function cleanupOldLogs(rootDir) {
     for (const file of filesToDelete) {
       try {
         await fs.unlink(file.path)
-      } catch (error) {
+      } catch (_error) {
         // Ignore errors when deleting old logs
       }
     }
@@ -414,7 +415,7 @@ async function ensureProjectReleaseScript(rootDir) {
   let packageJson
   try {
     packageJson = JSON.parse(raw)
-  } catch (error) {
+  } catch (_error) {
     logWarning('Unable to parse package.json; skipping release script injection.')
     return false
   }
@@ -453,7 +454,7 @@ async function ensureProjectReleaseScript(rootDir) {
   try {
     await runCommand('git', ['rev-parse', '--is-inside-work-tree'], { cwd: rootDir, silent: true })
     isGitRepo = true
-  } catch (error) {
+  } catch (_error) {
     logWarning('Not a git repository; skipping commit for release script addition.')
   }
 
@@ -541,7 +542,7 @@ async function readRemoteLock(ssh, remoteCwd) {
   if (checkResult.stdout && checkResult.stdout.trim() !== 'LOCK_NOT_FOUND' && checkResult.stdout.trim() !== '') {
     try {
       return JSON.parse(checkResult.stdout.trim())
-    } catch (error) {
+    } catch (_error) {
       return { raw: checkResult.stdout.trim() }
     }
   }
@@ -605,7 +606,7 @@ async function acquireRemoteLock(ssh, remoteCwd, rootDir) {
         let details = {}
         try {
           details = JSON.parse(checkResult.stdout.trim())
-        } catch (error) {
+        } catch (_error) {
           details = { raw: checkResult.stdout.trim() }
         }
 
@@ -620,7 +621,7 @@ async function acquireRemoteLock(ssh, remoteCwd, rootDir) {
       let details = {}
       try {
         details = JSON.parse(checkResult.stdout.trim())
-      } catch (error) {
+      } catch (_error) {
         details = { raw: checkResult.stdout.trim() }
       }
 
@@ -727,7 +728,7 @@ async function ensureGitignoreEntry(rootDir) {
       cwd: rootDir
     })
     isGitRepo = true
-  } catch (error) {
+  } catch (_error) {
     logWarning('Not a git repository; skipping commit for .gitignore update.')
   }
 
@@ -949,7 +950,7 @@ async function listGitBranches(currentDir) {
       .filter(Boolean)
 
     return branches.length ? branches : ['master']
-  } catch (error) {
+  } catch (_error) {
     logWarning('Unable to read git branches; defaulting to master.')
     return ['master']
   }
@@ -1002,7 +1003,7 @@ async function isPrivateKeyFile(filePath) {
   try {
     const content = await fs.readFile(filePath, 'utf8')
     return /-----BEGIN [A-Z ]*PRIVATE KEY-----/.test(content)
-  } catch (error) {
+  } catch (_error) {
     return false
   }
 }
@@ -1091,7 +1092,7 @@ async function resolveSshKeyPath(targetPath) {
 
   try {
     await fs.access(expanded)
-  } catch (error) {
+  } catch (_error) {
     throw new Error(`SSH key not accessible at ${expanded}`)
   }
 
@@ -1247,14 +1248,14 @@ async function runRemoteTasks(config, options = {}) {
     }
 
     // Run tests for Laravel projects
-  if (isLaravel) {
-    logProcessing('Running Laravel tests locally...')
-    try {
-      await runCommand('php', ['artisan', 'test', '--compact'], { cwd: rootDir })
-      logSuccess('Local tests passed.')
-    } catch (error) {
-      throw new Error(`Local tests failed. Fix test failures before deploying. ${error.message}`)
-    }
+    if (isLaravel) {
+      logProcessing('Running Laravel tests locally...')
+      try {
+        await runCommand('php', ['artisan', 'test', '--compact'], { cwd: rootDir })
+        logSuccess('Local tests passed.')
+      } catch (error) {
+        throw new Error(`Local tests failed. Fix test failures before deploying. ${error.message}`)
+      }
     }
   } else {
     logProcessing('Pre-push git hook detected. Skipping local linting and test execution.')
@@ -1314,7 +1315,7 @@ async function runRemoteTasks(config, options = {}) {
     const escapeForDoubleQuotes = (value) => value.replace(/(["\\$`])/g, '\\$1')
 
     const executeRemote = async (label, command, options = {}) => {
-      const { cwd = remoteCwd, allowFailure = false, printStdout = true, bootstrapEnv = true } = options
+      const { cwd = remoteCwd, allowFailure = false, bootstrapEnv = true } = options
       logProcessing(`\n→ ${label}`)
 
       let wrappedCommand = command
@@ -1583,7 +1584,7 @@ async function runRemoteTasks(config, options = {}) {
         const remoteHome = remoteHomeResult.stdout.trim() || `/home/${sshUser}`
         const remoteCwd = resolveRemotePath(config.projectPath, remoteHome)
         await compareLocksAndPrompt(rootDir, ssh, remoteCwd)
-      } catch (lockError) {
+      } catch (_lockError) {
         // Ignore lock comparison errors during error handling
       }
     }
@@ -1739,9 +1740,9 @@ async function selectApp(projectConfig, server, currentDir) {
     if (apps.length > 0) {
       const availableServers = [...new Set(apps.map((app) => app.serverName).filter(Boolean))]
       if (availableServers.length > 0) {
-      logWarning(
-        `No applications configured for server "${server.serverName}". Available servers: ${availableServers.join(', ')}`
-      )
+        logWarning(
+          `No applications configured for server "${server.serverName}". Available servers: ${availableServers.join(', ')}`
+        )
       }
     }
     logProcessing(`No applications configured for ${server.serverName}. Let's create one.`)
@@ -1758,7 +1759,7 @@ async function selectApp(projectConfig, server, currentDir) {
     return appConfig
   }
 
-  const choices = matches.map(({ app, index }, matchIndex) => ({
+  const choices = matches.map(({ app }, matchIndex) => ({
     name: `${app.projectPath} (${app.branch})`,
     value: matchIndex
   }))
@@ -1796,23 +1797,6 @@ async function selectApp(projectConfig, server, currentDir) {
   return chosen
 }
 
-async function promptPresetName() {
-  const { presetName } = await runPrompt([
-    {
-      type: 'input',
-      name: 'presetName',
-      message: 'Enter a name for this preset',
-      validate: (value) => (value && value.trim().length > 0 ? true : 'Preset name cannot be empty.')
-    }
-  ])
-
-  return presetName.trim()
-}
-
-function generatePresetKey(serverName, projectPath) {
-  return `${serverName}:${projectPath}`
-}
-
 async function selectPreset(projectConfig, servers) {
   const presets = projectConfig.presets ?? []
   const apps = projectConfig.apps ?? []
@@ -1844,7 +1828,7 @@ async function selectPreset(projectConfig, servers) {
 
     return {
       name: displayName,
-    value: index
+      value: index
     }
   })
 
@@ -1871,6 +1855,24 @@ async function selectPreset(projectConfig, servers) {
 }
 
 async function main(releaseType = null) {
+  // Best-effort update check (skip during tests or when explicitly disabled)
+  // If an update is accepted, the process will re-execute via npx @latest and we should exit early.
+  if (
+    process.env.ZEPHYR_SKIP_VERSION_CHECK !== '1' &&
+    process.env.NODE_ENV !== 'test' &&
+    process.env.VITEST !== 'true'
+  ) {
+    try {
+      const args = process.argv.slice(2)
+      const reExecuted = await checkAndUpdateVersion(runPrompt, args)
+      if (reExecuted) {
+        return
+      }
+    } catch (_error) {
+      // Never block execution due to update check issues
+    }
+  }
+
   // Handle node/vue package release
   if (releaseType === 'node' || releaseType === 'vue') {
     try {
@@ -2041,11 +2043,11 @@ async function main(releaseType = null) {
       } else {
         // Check if preset with this appId already exists
         const existingIndex = presets.findIndex((p) => p.appId === appId)
-      if (existingIndex >= 0) {
+        if (existingIndex >= 0) {
           presets[existingIndex].name = trimmedName
           presets[existingIndex].branch = deploymentConfig.branch
-      } else {
-        presets.push({
+        } else {
+          presets.push({
             name: trimmedName,
             appId: appId,
             branch: deploymentConfig.branch

package/src/release-node.mjs

@@ -1,6 +1,5 @@
 import { spawn, exec } from 'node:child_process'
-import { fileURLToPath } from 'node:url'
-import { dirname, join } from 'node:path'
+import { join } from 'node:path'
 import { readFile } from 'node:fs/promises'
 import fs from 'node:fs'
 import path from 'node:path'
@@ -489,7 +488,7 @@ function extractDomainFromHomepage(homepage) {
     return url.hostname
   } catch {
     // If it's not a valid URL, try to extract domain from string
-    const match = homepage.match(/(?:https?:\/\/)?([^\/]+)/)
+    const match = homepage.match(/(?:https?:\/\/)?([^/]+)/)
     return match ? match[1] : null
   }
 }
@@ -537,7 +536,9 @@ async function deployGHPages(skipDeploy, pkg, rootDir = process.cwd()) {
   try {
     try {
       await runCommand('git', ['worktree', 'remove', worktreeDir, '-f'], { capture: true, cwd: rootDir })
-    } catch { }
+    } catch (_error) {
+      // Ignore if worktree doesn't exist
+    }
 
     try {
       await runCommand('git', ['worktree', 'add', worktreeDir, 'gh-pages'], { capture: true, cwd: rootDir })

package/src/release-packagist.mjs

@@ -1,9 +1,7 @@
 import { spawn } from 'node:child_process'
-import { fileURLToPath } from 'node:url'
-import { dirname, join } from 'node:path'
+import { join } from 'node:path'
 import { readFile, writeFile } from 'node:fs/promises'
 import fs from 'node:fs'
-import path from 'node:path'
 import process from 'node:process'
 import semver from 'semver'
 import inquirer from 'inquirer'

package/src/ssh-utils.mjs

@@ -25,7 +25,7 @@ async function resolveSshKeyPath(targetPath) {
   const expanded = expandHomePath(targetPath)
   try {
     await fs.access(expanded)
-  } catch (error) {
+  } catch (_error) {
     throw new Error(`SSH key not accessible at ${expanded}`)
   }
   return expanded
@@ -64,7 +64,7 @@ const createSshClient = () => {
  * @param {string} rootDir - Local root directory for logging
  * @returns {Promise<{ssh: NodeSSH, remoteCwd: string, remoteHome: string}>}
  */
-export async function connectToServer(config, rootDir) {
+export async function connectToServer(config, _rootDir) {
   const ssh = createSshClient()
   const sshUser = config.sshUser || os.userInfo().username
   const privateKeyPath = await resolveSshKeyPath(config.sshKey)
@@ -96,7 +96,7 @@ export async function connectToServer(config, rootDir) {
  * @returns {Promise<Object>} Command result
  */
 export async function executeRemoteCommand(ssh, label, command, options = {}) {
-  const { cwd, allowFailure = false, printStdout = true, bootstrapEnv = true, rootDir = null, writeToLogFile = null, env = {} } = options
+  const { cwd, allowFailure = false, bootstrapEnv = true, rootDir = null, writeToLogFile = null, env = {} } = options
 
   logProcessing(`\n→ ${label}`)
 

package/src/version-checker.mjs

@@ -3,9 +3,11 @@ import { fileURLToPath } from 'node:url'
 import path from 'node:path'
 import { spawn } from 'node:child_process'
 import process from 'node:process'
+import https from 'node:https'
 import semver from 'semver'
 
 const IS_WINDOWS = process.platform === 'win32'
+const ZEPHYR_SKIP_VERSION_CHECK_ENV = 'ZEPHYR_SKIP_VERSION_CHECK'
 
 async function getCurrentVersion() {
   try {
@@ -18,21 +20,57 @@ async function getCurrentVersion() {
     )
     const packageJson = JSON.parse(await readFile(packageJsonPath, 'utf8'))
     return packageJson.version
-  } catch (error) {
+  } catch (_error) {
     // If we can't read package.json, return null
     return null
   }
 }
 
+function httpsGetJson(url) {
+  return new Promise((resolve, reject) => {
+    const request = https.get(
+      url,
+      {
+        headers: {
+          accept: 'application/json'
+        }
+      },
+      (response) => {
+        const { statusCode } = response
+        if (!statusCode || statusCode < 200 || statusCode >= 300) {
+          response.resume()
+          resolve(null)
+          return
+        }
+
+        response.setEncoding('utf8')
+        let raw = ''
+        response.on('data', (chunk) => {
+          raw += chunk
+        })
+        response.on('end', () => {
+          try {
+            resolve(JSON.parse(raw))
+          } catch (error) {
+            reject(error)
+          }
+        })
+      }
+    )
+
+    request.on('error', reject)
+    request.end()
+  })
+}
+
 async function getLatestVersion() {
   try {
-    const response = await fetch('https://registry.npmjs.org/@wyxos/zephyr/latest')
-    if (!response.ok) {
+    const data = await httpsGetJson('https://registry.npmjs.org/@wyxos/zephyr/latest')
+    if (!data) {
       return null
     }
-    const data = await response.json()
     return data.version || null
-  } catch (error) {
+  } catch (_error) {
     return null
   }
 }
@@ -45,7 +83,7 @@ function isNewerVersionAvailable(current, latest) {
   // Use semver to properly compare versions
   try {
     return semver.gt(latest, current)
-  } catch (error) {
+  } catch (_error) {
     // If semver comparison fails, fall back to simple string comparison
     return latest !== current
   }
@@ -59,7 +97,11 @@ async function reExecuteWithLatest(args) {
   return new Promise((resolve, reject) => {
     const child = spawn(command, npxArgs, {
       stdio: 'inherit',
-      shell: IS_WINDOWS
+      shell: IS_WINDOWS,
+      env: {
+        ...process.env,
+        [ZEPHYR_SKIP_VERSION_CHECK_ENV]: '1'
+      }
     })
 
     child.on('error', reject)
@@ -75,12 +117,7 @@ async function reExecuteWithLatest(args) {
 
 export async function checkAndUpdateVersion(promptFn, args) {
   try {
-    // Skip check if already running @latest (detected via environment or process)
-    // When npx runs @latest, the version should already be latest
-    const isRunningLatest = process.env.npm_config_user_config?.includes('@latest') ||
-                           process.argv.some(arg => arg.includes('@latest'))
-
-    if (isRunningLatest) {
+    if (process.env[ZEPHYR_SKIP_VERSION_CHECK_ENV] === '1') {
       return false
     }
 
@@ -118,7 +155,7 @@ export async function checkAndUpdateVersion(promptFn, args) {
     // User confirmed, re-execute with latest version
     await reExecuteWithLatest(args)
     return true // Indicates we've re-executed, so the current process should exit
-  } catch (error) {
+  } catch (_error) {
     // If version check fails, just continue with current version
     // Don't block the user from using the tool
     return false