@wyxos/zephyr 0.2.21 → 0.2.22

package/src/utils/git.mjs

@@ -1,91 +1,91 @@
-import process from 'node:process'
-import { runCommand, runCommandCapture } from './command.mjs'
-
-export async function getCurrentBranch(rootDir = process.cwd(), { method = 'rev-parse' } = {}) {
-  if (method === 'show-current') {
-    const { stdout } = await runCommandCapture('git', ['branch', '--show-current'], { cwd: rootDir })
-    return stdout.trim() || null
-  }
-
-  const { stdout } = await runCommandCapture('git', ['rev-parse', '--abbrev-ref', 'HEAD'], { cwd: rootDir })
-  return stdout.trim() || null
-}
-
-export async function getUpstreamRef(rootDir = process.cwd()) {
-  try {
-    const { stdout } = await runCommandCapture(
-      'git',
-      ['rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{u}'],
-      { cwd: rootDir }
-    )
-
-    return stdout.trim() || null
-  } catch {
-    return null
-  }
-}
-
-export async function ensureUpToDateWithUpstream({
-  branch,
-  upstreamRef,
-  rootDir = process.cwd(),
-  logStep = null,
-  logWarning = null
-}) {
-  if (!upstreamRef) {
-    logWarning?.(`Branch ${branch} has no upstream configured; skipping ahead/behind checks.`)
-    return
-  }
-
-  const [remoteName, ...branchParts] = upstreamRef.split('/')
-  const remoteBranch = branchParts.join('/')
-
-  if (remoteName && remoteBranch) {
-    logStep?.(`Fetching latest updates from ${remoteName}/${remoteBranch}...`)
-    try {
-      await runCommand('git', ['fetch', remoteName, remoteBranch], { cwd: rootDir, stdio: 'ignore' })
-    } catch (error) {
-      throw new Error(`Failed to fetch ${upstreamRef}: ${error.message}`)
-    }
-  }
-
-  const aheadResult = await runCommandCapture('git', ['rev-list', '--count', `${upstreamRef}..HEAD`], {
-    cwd: rootDir
-  })
-  const behindResult = await runCommandCapture('git', ['rev-list', '--count', `HEAD..${upstreamRef}`], {
-    cwd: rootDir
-  })
-
-  const ahead = Number.parseInt(aheadResult.stdout || '0', 10)
-  const behind = Number.parseInt(behindResult.stdout || '0', 10)
-
-  if (Number.isFinite(behind) && behind > 0) {
-    if (remoteName && remoteBranch) {
-      logStep?.(`Fast-forwarding ${branch} with ${upstreamRef}...`)
-
-      try {
-        await runCommand('git', ['pull', '--ff-only', remoteName, remoteBranch], { cwd: rootDir, stdio: 'ignore' })
-      } catch (error) {
-        throw new Error(
-          `Unable to fast-forward ${branch} with ${upstreamRef}. Resolve conflicts manually, then rerun.\n${error.message}`
-        )
-      }
-
-      await ensureUpToDateWithUpstream({ branch, upstreamRef, rootDir, logStep, logWarning })
-      return
-    }
-
-    throw new Error(
-      `Branch ${branch} is behind ${upstreamRef} by ${behind} commit${behind === 1 ? '' : 's'}. Pull or rebase first.`
-    )
-  }
-
-  if (Number.isFinite(ahead) && ahead > 0) {
-    logWarning?.(`Branch ${branch} is ahead of ${upstreamRef} by ${ahead} commit${ahead === 1 ? '' : 's'}.`)
-  }
-}
-
-export async function pushQuiet(rootDir = process.cwd(), args = []) {
-  await runCommandCapture('git', ['push', ...args], { cwd: rootDir })
-}
-
+import process from 'node:process'
+import { runCommand, runCommandCapture } from './command.mjs'
+
+export async function getCurrentBranch(rootDir = process.cwd(), { method = 'rev-parse' } = {}) {
+  if (method === 'show-current') {
+    const { stdout } = await runCommandCapture('git', ['branch', '--show-current'], { cwd: rootDir })
+    return stdout.trim() || null
+  }
+
+  const { stdout } = await runCommandCapture('git', ['rev-parse', '--abbrev-ref', 'HEAD'], { cwd: rootDir })
+  return stdout.trim() || null
+}
+
+export async function getUpstreamRef(rootDir = process.cwd()) {
+  try {
+    const { stdout } = await runCommandCapture(
+      'git',
+      ['rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{u}'],
+      { cwd: rootDir }
+    )
+
+    return stdout.trim() || null
+  } catch {
+    return null
+  }
+}
+
+export async function ensureUpToDateWithUpstream({
+  branch,
+  upstreamRef,
+  rootDir = process.cwd(),
+  logStep = null,
+  logWarning = null
+}) {
+  if (!upstreamRef) {
+    logWarning?.(`Branch ${branch} has no upstream configured; skipping ahead/behind checks.`)
+    return
+  }
+
+  const [remoteName, ...branchParts] = upstreamRef.split('/')
+  const remoteBranch = branchParts.join('/')
+
+  if (remoteName && remoteBranch) {
+    logStep?.(`Fetching latest updates from ${remoteName}/${remoteBranch}...`)
+    try {
+      await runCommand('git', ['fetch', remoteName, remoteBranch], { cwd: rootDir, stdio: 'ignore' })
+    } catch (error) {
+      throw new Error(`Failed to fetch ${upstreamRef}: ${error.message}`)
+    }
+  }
+
+  const aheadResult = await runCommandCapture('git', ['rev-list', '--count', `${upstreamRef}..HEAD`], {
+    cwd: rootDir
+  })
+  const behindResult = await runCommandCapture('git', ['rev-list', '--count', `HEAD..${upstreamRef}`], {
+    cwd: rootDir
+  })
+
+  const ahead = Number.parseInt(aheadResult.stdout || '0', 10)
+  const behind = Number.parseInt(behindResult.stdout || '0', 10)
+
+  if (Number.isFinite(behind) && behind > 0) {
+    if (remoteName && remoteBranch) {
+      logStep?.(`Fast-forwarding ${branch} with ${upstreamRef}...`)
+
+      try {
+        await runCommand('git', ['pull', '--ff-only', remoteName, remoteBranch], { cwd: rootDir, stdio: 'ignore' })
+      } catch (error) {
+        throw new Error(
+          `Unable to fast-forward ${branch} with ${upstreamRef}. Resolve conflicts manually, then rerun.\n${error.message}`
+        )
+      }
+
+      await ensureUpToDateWithUpstream({ branch, upstreamRef, rootDir, logStep, logWarning })
+      return
+    }
+
+    throw new Error(
+      `Branch ${branch} is behind ${upstreamRef} by ${behind} commit${behind === 1 ? '' : 's'}. Pull or rebase first.`
+    )
+  }
+
+  if (Number.isFinite(ahead) && ahead > 0) {
+    logWarning?.(`Branch ${branch} is ahead of ${upstreamRef} by ${ahead} commit${ahead === 1 ? '' : 's'}.`)
+  }
+}
+
+export async function pushQuiet(rootDir = process.cwd(), args = []) {
+  await runCommandCapture('git', ['push', ...args], { cwd: rootDir })
+}
+

package/src/utils/id.mjs

@@ -1,6 +1,6 @@
-import crypto from 'node:crypto'
-
-export function generateId() {
-  return crypto.randomBytes(8).toString('hex')
-}
-
+import crypto from 'node:crypto'
+
+export function generateId() {
+  return crypto.randomBytes(8).toString('hex')
+}
+

package/src/utils/log-file.mjs

@@ -1,76 +1,76 @@
-import fs from 'node:fs/promises'
-import path from 'node:path'
-import { ensureDirectory, getProjectConfigDir } from './paths.mjs'
-
-let logFilePath = null
-
-export async function getLogFilePath(rootDir) {
-  if (logFilePath) {
-    return logFilePath
-  }
-
-  const configDir = getProjectConfigDir(rootDir)
-  await ensureDirectory(configDir)
-
-  const now = new Date()
-  const dateStr = now.toISOString().replace(/:/g, '-').replace(/\..+/, '')
-  logFilePath = path.join(configDir, `${dateStr}.log`)
-
-  return logFilePath
-}
-
-export async function writeToLogFile(rootDir, message) {
-  const logPath = await getLogFilePath(rootDir)
-  const timestamp = new Date().toISOString()
-  await fs.appendFile(logPath, `${timestamp} - ${message}\n`)
-}
-
-export async function closeLogFile() {
-  logFilePath = null
-}
-
-export async function cleanupOldLogs(rootDir) {
-  const configDir = getProjectConfigDir(rootDir)
-
-  try {
-    const files = await fs.readdir(configDir)
-    const logFiles = files
-      .filter((file) => file.endsWith('.log'))
-      .map((file) => ({
-        name: file,
-        path: path.join(configDir, file)
-      }))
-
-    if (logFiles.length <= 3) {
-      return
-    }
-
-    const filesWithStats = await Promise.all(
-      logFiles.map(async (file) => {
-        const stats = await fs.stat(file.path)
-        return {
-          ...file,
-          mtime: stats.mtime
-        }
-      })
-    )
-
-    filesWithStats.sort((a, b) => b.mtime - a.mtime)
-
-    const filesToDelete = filesWithStats.slice(3)
-
-    for (const file of filesToDelete) {
-      try {
-        await fs.unlink(file.path)
-      } catch (_error) {
-        // Ignore errors when deleting old logs
-      }
-    }
-  } catch (error) {
-    // Ignore errors during log cleanup
-    if (error.code !== 'ENOENT') {
-      // Only log if it's not a "directory doesn't exist" error
-    }
-  }
-}
-
+import fs from 'node:fs/promises'
+import path from 'node:path'
+import { ensureDirectory, getProjectConfigDir } from './paths.mjs'
+
+let logFilePath = null
+
+export async function getLogFilePath(rootDir) {
+  if (logFilePath) {
+    return logFilePath
+  }
+
+  const configDir = getProjectConfigDir(rootDir)
+  await ensureDirectory(configDir)
+
+  const now = new Date()
+  const dateStr = now.toISOString().replace(/:/g, '-').replace(/\..+/, '')
+  logFilePath = path.join(configDir, `${dateStr}.log`)
+
+  return logFilePath
+}
+
+export async function writeToLogFile(rootDir, message) {
+  const logPath = await getLogFilePath(rootDir)
+  const timestamp = new Date().toISOString()
+  await fs.appendFile(logPath, `${timestamp} - ${message}\n`)
+}
+
+export async function closeLogFile() {
+  logFilePath = null
+}
+
+export async function cleanupOldLogs(rootDir) {
+  const configDir = getProjectConfigDir(rootDir)
+
+  try {
+    const files = await fs.readdir(configDir)
+    const logFiles = files
+      .filter((file) => file.endsWith('.log'))
+      .map((file) => ({
+        name: file,
+        path: path.join(configDir, file)
+      }))
+
+    if (logFiles.length <= 3) {
+      return
+    }
+
+    const filesWithStats = await Promise.all(
+      logFiles.map(async (file) => {
+        const stats = await fs.stat(file.path)
+        return {
+          ...file,
+          mtime: stats.mtime
+        }
+      })
+    )
+
+    filesWithStats.sort((a, b) => b.mtime - a.mtime)
+
+    const filesToDelete = filesWithStats.slice(3)
+
+    for (const file of filesToDelete) {
+      try {
+        await fs.unlink(file.path)
+      } catch (_error) {
+        // Ignore errors when deleting old logs
+      }
+    }
+  } catch (error) {
+    // Ignore errors during log cleanup
+    if (error.code !== 'ENOENT') {
+      // Only log if it's not a "directory doesn't exist" error
+    }
+  }
+}
+

package/src/utils/output.mjs

@@ -1,29 +1,29 @@
-import process from 'node:process'
-
-export function writeStdoutLine(message = '') {
-  const text = message == null ? '' : String(message)
-  process.stdout.write(`${text}\n`)
-}
-
-export function writeStderrLine(message = '') {
-  const text = message == null ? '' : String(message)
-  process.stderr.write(`${text}\n`)
-}
-
-export function writeStderr(message = '') {
-  const text = message == null ? '' : String(message)
-  process.stderr.write(text)
-  if (text && !text.endsWith('\n')) {
-    process.stderr.write('\n')
-  }
-}
-
-export function createChalkLogger(chalk) {
-  return {
-    logProcessing: (message = '') => writeStdoutLine(chalk.yellow(message)),
-    logSuccess: (message = '') => writeStdoutLine(chalk.green(message)),
-    logWarning: (message = '') => writeStderrLine(chalk.yellow(message)),
-    logError: (message = '') => writeStderrLine(chalk.red(message))
-  }
-}
-
+import process from 'node:process'
+
+export function writeStdoutLine(message = '') {
+  const text = message == null ? '' : String(message)
+  process.stdout.write(`${text}\n`)
+}
+
+export function writeStderrLine(message = '') {
+  const text = message == null ? '' : String(message)
+  process.stderr.write(`${text}\n`)
+}
+
+export function writeStderr(message = '') {
+  const text = message == null ? '' : String(message)
+  process.stderr.write(text)
+  if (text && !text.endsWith('\n')) {
+    process.stderr.write('\n')
+  }
+}
+
+export function createChalkLogger(chalk) {
+  return {
+    logProcessing: (message = '') => writeStdoutLine(chalk.yellow(message)),
+    logSuccess: (message = '') => writeStdoutLine(chalk.green(message)),
+    logWarning: (message = '') => writeStderrLine(chalk.yellow(message)),
+    logError: (message = '') => writeStderrLine(chalk.red(message))
+  }
+}
+

package/src/utils/paths.mjs

@@ -1,28 +1,28 @@
-import fs from 'node:fs/promises'
-import path from 'node:path'
-
-export const PROJECT_CONFIG_DIR = '.zephyr'
-export const PROJECT_CONFIG_FILE = 'config.json'
-export const PROJECT_LOCK_FILE = 'deploy.lock'
-export const PENDING_TASKS_FILE = 'pending-tasks.json'
-
-export async function ensureDirectory(dirPath) {
-  await fs.mkdir(dirPath, { recursive: true })
-}
-
-export function getProjectConfigDir(rootDir) {
-  return path.join(rootDir, PROJECT_CONFIG_DIR)
-}
-
-export function getProjectConfigPath(rootDir) {
-  return path.join(rootDir, PROJECT_CONFIG_DIR, PROJECT_CONFIG_FILE)
-}
-
-export function getPendingTasksPath(rootDir) {
-  return path.join(getProjectConfigDir(rootDir), PENDING_TASKS_FILE)
-}
-
-export function getLockFilePath(rootDir) {
-  return path.join(getProjectConfigDir(rootDir), PROJECT_LOCK_FILE)
-}
-
+import fs from 'node:fs/promises'
+import path from 'node:path'
+
+export const PROJECT_CONFIG_DIR = '.zephyr'
+export const PROJECT_CONFIG_FILE = 'config.json'
+export const PROJECT_LOCK_FILE = 'deploy.lock'
+export const PENDING_TASKS_FILE = 'pending-tasks.json'
+
+export async function ensureDirectory(dirPath) {
+  await fs.mkdir(dirPath, { recursive: true })
+}
+
+export function getProjectConfigDir(rootDir) {
+  return path.join(rootDir, PROJECT_CONFIG_DIR)
+}
+
+export function getProjectConfigPath(rootDir) {
+  return path.join(rootDir, PROJECT_CONFIG_DIR, PROJECT_CONFIG_FILE)
+}
+
+export function getPendingTasksPath(rootDir) {
+  return path.join(getProjectConfigDir(rootDir), PENDING_TASKS_FILE)
+}
+
+export function getLockFilePath(rootDir) {
+  return path.join(getProjectConfigDir(rootDir), PROJECT_LOCK_FILE)
+}
+

package/src/utils/php-version.mjs

@@ -0,0 +1,137 @@
+import fs from 'node:fs/promises'
+import path from 'node:path'
+import semver from 'semver'
+
+/**
+ * Extracts the minimum PHP version requirement from a composer.json object
+ * @param {object} composer - Parsed composer.json object
+ * @returns {string|null} - PHP version requirement (e.g., "8.4.0") or null
+ */
+export function parsePhpVersionRequirement(composer) {
+  const phpRequirement = composer?.require?.php || composer?.['require-dev']?.php
+  if (!phpRequirement) {
+    return null
+  }
+
+  // Parse version constraint (e.g., "^8.4", ">=8.4.0", "8.4.*", "~8.4.0")
+  // Extract the minimum version needed
+  const versionMatch = phpRequirement.match(/(\d+)\.(\d+)(?:\.(\d+))?/)
+  if (!versionMatch) {
+    return null
+  }
+
+  const major = versionMatch[1]
+  const minor = versionMatch[2]
+  const patch = versionMatch[3] || '0'
+  
+  const versionStr = `${major}.${minor}.${patch}`
+  
+  // Normalize to semver format
+  if (semver.valid(versionStr)) {
+    return versionStr
+  }
+  
+  // Try to coerce to valid semver
+  const coerced = semver.coerce(versionStr)
+  if (coerced) {
+    return coerced.version
+  }
+
+  return null
+}
+
+/**
+ * Extracts the minimum PHP version requirement from composer.json file
+ * @param {string} rootDir - Project root directory
+ * @returns {Promise<string|null>} - PHP version requirement (e.g., "8.4.0") or null
+ */
+export async function getPhpVersionRequirement(rootDir) {
+  try {
+    const composerPath = path.join(rootDir, 'composer.json')
+    const raw = await fs.readFile(composerPath, 'utf8')
+    const composer = JSON.parse(raw)
+    return parsePhpVersionRequirement(composer)
+  } catch {
+    return null
+  }
+}
+
+/**
+ * Finds the appropriate PHP binary command for a given version
+ * Tries common patterns: php8.4, php8.3, etc.
+ * @param {object} ssh - SSH client instance
+ * @param {string} remoteCwd - Remote working directory
+ * @param {string} requiredVersion - Required PHP version (e.g., "8.4.0")
+ * @returns {Promise<string>} - PHP command prefix (e.g., "php8.4" or "php")
+ */
+export async function findPhpBinary(ssh, remoteCwd, requiredVersion) {
+  if (!requiredVersion) {
+    return 'php'
+  }
+
+  // Extract major.minor version (e.g., "8.4" from "8.4.0")
+  const majorMinor = semver.major(requiredVersion) + '.' + semver.minor(requiredVersion)
+  const versionedPhp = `php${majorMinor.replace('.', '')}` // e.g., "php84"
+
+  // Try versioned PHP binary first (e.g., php8.4, php84)
+  const candidates = [
+    `php${majorMinor}`, // php8.4
+    versionedPhp, // php84
+    'php' // fallback
+  ]
+
+  for (const candidate of candidates) {
+    try {
+      const result = await ssh.execCommand(`command -v ${candidate}`, { cwd: remoteCwd })
+      if (result.code === 0 && result.stdout.trim()) {
+        // Verify it's actually the right version
+        const versionCheck = await ssh.execCommand(`${candidate} -r "echo PHP_VERSION;"`, { cwd: remoteCwd })
+        if (versionCheck.code === 0) {
+          const actualVersion = versionCheck.stdout.trim()
+          // Normalize version and check if it satisfies the requirement
+          const normalizedVersion = semver.coerce(actualVersion)
+          if (normalizedVersion && semver.gte(normalizedVersion, semver.coerce(requiredVersion))) {
+            return candidate
+          }
+        }
+      }
+    } catch {
+      // Continue to next candidate
+    }
+  }
+
+  // Fallback: try to use default php and check version
+  try {
+    const versionCheck = await ssh.execCommand('php -r "echo PHP_VERSION;"', { cwd: remoteCwd })
+    if (versionCheck.code === 0) {
+      const actualVersion = versionCheck.stdout.trim()
+      const normalizedVersion = semver.coerce(actualVersion)
+      if (normalizedVersion && semver.gte(normalizedVersion, semver.coerce(requiredVersion))) {
+        return 'php'
+      }
+    }
+  } catch {
+    // Ignore
+  }
+
+  // If we can't find a suitable version, return the versioned command anyway
+  // The error will be clearer when the command fails
+  return `php${majorMinor}`
+}
+
+/**
+ * Gets the PHP command prefix for use in commands
+ * @param {object} ssh - SSH client instance
+ * @param {string} remoteCwd - Remote working directory
+ * @param {string} rootDir - Local project root directory
+ * @returns {Promise<string>} - PHP command prefix (e.g., "php8.4" or "php")
+ */
+export async function getPhpCommandPrefix(ssh, remoteCwd, rootDir) {
+  const requiredVersion = await getPhpVersionRequirement(rootDir)
+  
+  if (!requiredVersion) {
+    return 'php'
+  }
+
+  return await findPhpBinary(ssh, remoteCwd, requiredVersion)
+}

package/src/utils/remote-path.mjs

@@ -1,23 +1,23 @@
-export function resolveRemotePath(projectPath, remoteHome) {
-  if (!projectPath) {
-    return projectPath
-  }
-
-  const sanitizedHome = remoteHome.replace(/\/+$/, '')
-
-  if (projectPath === '~') {
-    return sanitizedHome
-  }
-
-  if (projectPath.startsWith('~/')) {
-    const remainder = projectPath.slice(2)
-    return remainder ? `${sanitizedHome}/${remainder}` : sanitizedHome
-  }
-
-  if (projectPath.startsWith('/')) {
-    return projectPath
-  }
-
-  return `${sanitizedHome}/${projectPath}`
-}
-
+export function resolveRemotePath(projectPath, remoteHome) {
+  if (!projectPath) {
+    return projectPath
+  }
+
+  const sanitizedHome = remoteHome.replace(/\/+$/, '')
+
+  if (projectPath === '~') {
+    return sanitizedHome
+  }
+
+  if (projectPath.startsWith('~/')) {
+    const remainder = projectPath.slice(2)
+    return remainder ? `${sanitizedHome}/${remainder}` : sanitizedHome
+  }
+
+  if (projectPath.startsWith('/')) {
+    return projectPath
+  }
+
+  return `${sanitizedHome}/${projectPath}`
+}
+