@wyxos/zephyr 0.2.21 → 0.2.22

package/src/deploy/locks.mjs

@@ -1,171 +1,171 @@
-import fs from 'node:fs/promises'
-import os from 'node:os'
-import process from 'node:process'
-
-import { PROJECT_LOCK_FILE, ensureDirectory, getLockFilePath, getProjectConfigDir } from '../utils/paths.mjs'
-
-function createLockPayload() {
-  return {
-    user: os.userInfo().username,
-    pid: process.pid,
-    hostname: os.hostname(),
-    startedAt: new Date().toISOString()
-  }
-}
-
-export async function acquireLocalLock(rootDir) {
-  const lockPath = getLockFilePath(rootDir)
-  const configDir = getProjectConfigDir(rootDir)
-  await ensureDirectory(configDir)
-
-  const payload = createLockPayload()
-  const payloadJson = JSON.stringify(payload, null, 2)
-  await fs.writeFile(lockPath, payloadJson, 'utf8')
-
-  return payload
-}
-
-export async function releaseLocalLock(rootDir, { logWarning } = {}) {
-  const lockPath = getLockFilePath(rootDir)
-  try {
-    await fs.unlink(lockPath)
-  } catch (error) {
-    if (error.code !== 'ENOENT') {
-      logWarning?.(`Failed to remove local lock file: ${error.message}`)
-    }
-  }
-}
-
-export async function readLocalLock(rootDir) {
-  const lockPath = getLockFilePath(rootDir)
-  try {
-    const content = await fs.readFile(lockPath, 'utf8')
-    return JSON.parse(content)
-  } catch (error) {
-    if (error.code === 'ENOENT') {
-      return null
-    }
-    throw error
-  }
-}
-
-export async function readRemoteLock(ssh, remoteCwd) {
-  const lockPath = `.zephyr/${PROJECT_LOCK_FILE}`
-  const escapedLockPath = lockPath.replace(/'/g, "'\\''")
-  const checkCommand = `mkdir -p .zephyr && if [ -f '${escapedLockPath}' ]; then cat '${escapedLockPath}'; else echo "LOCK_NOT_FOUND"; fi`
-
-  const checkResult = await ssh.execCommand(checkCommand, { cwd: remoteCwd })
-
-  if (checkResult.stdout && checkResult.stdout.trim() !== 'LOCK_NOT_FOUND' && checkResult.stdout.trim() !== '') {
-    try {
-      return JSON.parse(checkResult.stdout.trim())
-    } catch (_error) {
-      return { raw: checkResult.stdout.trim() }
-    }
-  }
-
-  return null
-}
-
-export async function compareLocksAndPrompt(rootDir, ssh, remoteCwd, { runPrompt, logWarning } = {}) {
-  const localLock = await readLocalLock(rootDir)
-  const remoteLock = await readRemoteLock(ssh, remoteCwd)
-
-  if (!localLock || !remoteLock) {
-    return false
-  }
-
-  const localKey = `${localLock.user}@${localLock.hostname}:${localLock.pid}:${localLock.startedAt}`
-  const remoteKey = `${remoteLock.user}@${remoteLock.hostname}:${remoteLock.pid}:${remoteLock.startedAt}`
-
-  if (localKey === remoteKey) {
-    const startedBy = remoteLock.user ? `${remoteLock.user}@${remoteLock.hostname ?? 'unknown'}` : 'unknown user'
-    const startedAt = remoteLock.startedAt ? ` at ${remoteLock.startedAt}` : ''
-    const { shouldRemove } = await runPrompt([
-      {
-        type: 'confirm',
-        name: 'shouldRemove',
-        message: `Stale lock detected on server (started by ${startedBy}${startedAt}). This appears to be from a failed deployment. Remove it?`,
-        default: true
-      }
-    ])
-
-    if (shouldRemove) {
-      const lockPath = `.zephyr/${PROJECT_LOCK_FILE}`
-      const escapedLockPath = lockPath.replace(/'/g, "'\\''")
-      const removeCommand = `rm -f '${escapedLockPath}'`
-      await ssh.execCommand(removeCommand, { cwd: remoteCwd })
-      await releaseLocalLock(rootDir, { logWarning })
-      return true
-    }
-  }
-
-  return false
-}
-
-export async function acquireRemoteLock(ssh, remoteCwd, rootDir, { runPrompt, logWarning } = {}) {
-  const lockPath = `.zephyr/${PROJECT_LOCK_FILE}`
-  const escapedLockPath = lockPath.replace(/'/g, "'\\''")
-  const checkCommand = `mkdir -p .zephyr && if [ -f '${escapedLockPath}' ]; then cat '${escapedLockPath}'; else echo "LOCK_NOT_FOUND"; fi`
-
-  const checkResult = await ssh.execCommand(checkCommand, { cwd: remoteCwd })
-
-  if (checkResult.stdout && checkResult.stdout.trim() !== 'LOCK_NOT_FOUND' && checkResult.stdout.trim() !== '') {
-    const localLock = await readLocalLock(rootDir)
-    if (localLock) {
-      const removed = await compareLocksAndPrompt(rootDir, ssh, remoteCwd, { runPrompt, logWarning })
-      if (!removed) {
-        let details = {}
-        try {
-          details = JSON.parse(checkResult.stdout.trim())
-        } catch (_error) {
-          details = { raw: checkResult.stdout.trim() }
-        }
-
-        const startedBy = details.user ? `${details.user}@${details.hostname ?? 'unknown'}` : 'unknown user'
-        const startedAt = details.startedAt ? ` at ${details.startedAt}` : ''
-        throw new Error(
-          `Another deployment is currently in progress on the server (started by ${startedBy}${startedAt}). Remove ${remoteCwd}/${lockPath} if you are sure it is stale.`
-        )
-      }
-    } else {
-      let details = {}
-      try {
-        details = JSON.parse(checkResult.stdout.trim())
-      } catch (_error) {
-        details = { raw: checkResult.stdout.trim() }
-      }
-
-      const startedBy = details.user ? `${details.user}@${details.hostname ?? 'unknown'}` : 'unknown user'
-      const startedAt = details.startedAt ? ` at ${details.startedAt}` : ''
-      throw new Error(
-        `Another deployment is currently in progress on the server (started by ${startedBy}${startedAt}). Remove ${remoteCwd}/${lockPath} if you are sure it is stale.`
-      )
-    }
-  }
-
-  const payload = createLockPayload()
-  const payloadJson = JSON.stringify(payload, null, 2)
-  const payloadBase64 = Buffer.from(payloadJson).toString('base64')
-  const createCommand = `mkdir -p .zephyr && echo '${payloadBase64}' | base64 --decode > '${escapedLockPath}'`
-
-  const createResult = await ssh.execCommand(createCommand, { cwd: remoteCwd })
-  if (createResult.code !== 0) {
-    throw new Error(`Failed to create lock file on server: ${createResult.stderr}`)
-  }
-
-  await acquireLocalLock(rootDir)
-  return lockPath
-}
-
-export async function releaseRemoteLock(ssh, remoteCwd, { logWarning } = {}) {
-  const lockPath = `.zephyr/${PROJECT_LOCK_FILE}`
-  const escapedLockPath = lockPath.replace(/'/g, "'\\''")
-  const removeCommand = `rm -f '${escapedLockPath}'`
-
-  const result = await ssh.execCommand(removeCommand, { cwd: remoteCwd })
-  if (result.code !== 0 && result.code !== 1) {
-    logWarning?.(`Failed to remove lock file: ${result.stderr}`)
-  }
-}
-
+import fs from 'node:fs/promises'
+import os from 'node:os'
+import process from 'node:process'
+
+import { PROJECT_LOCK_FILE, ensureDirectory, getLockFilePath, getProjectConfigDir } from '../utils/paths.mjs'
+
+function createLockPayload() {
+  return {
+    user: os.userInfo().username,
+    pid: process.pid,
+    hostname: os.hostname(),
+    startedAt: new Date().toISOString()
+  }
+}
+
+export async function acquireLocalLock(rootDir) {
+  const lockPath = getLockFilePath(rootDir)
+  const configDir = getProjectConfigDir(rootDir)
+  await ensureDirectory(configDir)
+
+  const payload = createLockPayload()
+  const payloadJson = JSON.stringify(payload, null, 2)
+  await fs.writeFile(lockPath, payloadJson, 'utf8')
+
+  return payload
+}
+
+export async function releaseLocalLock(rootDir, { logWarning } = {}) {
+  const lockPath = getLockFilePath(rootDir)
+  try {
+    await fs.unlink(lockPath)
+  } catch (error) {
+    if (error.code !== 'ENOENT') {
+      logWarning?.(`Failed to remove local lock file: ${error.message}`)
+    }
+  }
+}
+
+export async function readLocalLock(rootDir) {
+  const lockPath = getLockFilePath(rootDir)
+  try {
+    const content = await fs.readFile(lockPath, 'utf8')
+    return JSON.parse(content)
+  } catch (error) {
+    if (error.code === 'ENOENT') {
+      return null
+    }
+    throw error
+  }
+}
+
+export async function readRemoteLock(ssh, remoteCwd) {
+  const lockPath = `.zephyr/${PROJECT_LOCK_FILE}`
+  const escapedLockPath = lockPath.replace(/'/g, "'\\''")
+  const checkCommand = `mkdir -p .zephyr && if [ -f '${escapedLockPath}' ]; then cat '${escapedLockPath}'; else echo "LOCK_NOT_FOUND"; fi`
+
+  const checkResult = await ssh.execCommand(checkCommand, { cwd: remoteCwd })
+
+  if (checkResult.stdout && checkResult.stdout.trim() !== 'LOCK_NOT_FOUND' && checkResult.stdout.trim() !== '') {
+    try {
+      return JSON.parse(checkResult.stdout.trim())
+    } catch (_error) {
+      return { raw: checkResult.stdout.trim() }
+    }
+  }
+
+  return null
+}
+
+export async function compareLocksAndPrompt(rootDir, ssh, remoteCwd, { runPrompt, logWarning } = {}) {
+  const localLock = await readLocalLock(rootDir)
+  const remoteLock = await readRemoteLock(ssh, remoteCwd)
+
+  if (!localLock || !remoteLock) {
+    return false
+  }
+
+  const localKey = `${localLock.user}@${localLock.hostname}:${localLock.pid}:${localLock.startedAt}`
+  const remoteKey = `${remoteLock.user}@${remoteLock.hostname}:${remoteLock.pid}:${remoteLock.startedAt}`
+
+  if (localKey === remoteKey) {
+    const startedBy = remoteLock.user ? `${remoteLock.user}@${remoteLock.hostname ?? 'unknown'}` : 'unknown user'
+    const startedAt = remoteLock.startedAt ? ` at ${remoteLock.startedAt}` : ''
+    const { shouldRemove } = await runPrompt([
+      {
+        type: 'confirm',
+        name: 'shouldRemove',
+        message: `Stale lock detected on server (started by ${startedBy}${startedAt}). This appears to be from a failed deployment. Remove it?`,
+        default: true
+      }
+    ])
+
+    if (shouldRemove) {
+      const lockPath = `.zephyr/${PROJECT_LOCK_FILE}`
+      const escapedLockPath = lockPath.replace(/'/g, "'\\''")
+      const removeCommand = `rm -f '${escapedLockPath}'`
+      await ssh.execCommand(removeCommand, { cwd: remoteCwd })
+      await releaseLocalLock(rootDir, { logWarning })
+      return true
+    }
+  }
+
+  return false
+}
+
+export async function acquireRemoteLock(ssh, remoteCwd, rootDir, { runPrompt, logWarning } = {}) {
+  const lockPath = `.zephyr/${PROJECT_LOCK_FILE}`
+  const escapedLockPath = lockPath.replace(/'/g, "'\\''")
+  const checkCommand = `mkdir -p .zephyr && if [ -f '${escapedLockPath}' ]; then cat '${escapedLockPath}'; else echo "LOCK_NOT_FOUND"; fi`
+
+  const checkResult = await ssh.execCommand(checkCommand, { cwd: remoteCwd })
+
+  if (checkResult.stdout && checkResult.stdout.trim() !== 'LOCK_NOT_FOUND' && checkResult.stdout.trim() !== '') {
+    const localLock = await readLocalLock(rootDir)
+    if (localLock) {
+      const removed = await compareLocksAndPrompt(rootDir, ssh, remoteCwd, { runPrompt, logWarning })
+      if (!removed) {
+        let details = {}
+        try {
+          details = JSON.parse(checkResult.stdout.trim())
+        } catch (_error) {
+          details = { raw: checkResult.stdout.trim() }
+        }
+
+        const startedBy = details.user ? `${details.user}@${details.hostname ?? 'unknown'}` : 'unknown user'
+        const startedAt = details.startedAt ? ` at ${details.startedAt}` : ''
+        throw new Error(
+          `Another deployment is currently in progress on the server (started by ${startedBy}${startedAt}). Remove ${remoteCwd}/${lockPath} if you are sure it is stale.`
+        )
+      }
+    } else {
+      let details = {}
+      try {
+        details = JSON.parse(checkResult.stdout.trim())
+      } catch (_error) {
+        details = { raw: checkResult.stdout.trim() }
+      }
+
+      const startedBy = details.user ? `${details.user}@${details.hostname ?? 'unknown'}` : 'unknown user'
+      const startedAt = details.startedAt ? ` at ${details.startedAt}` : ''
+      throw new Error(
+        `Another deployment is currently in progress on the server (started by ${startedBy}${startedAt}). Remove ${remoteCwd}/${lockPath} if you are sure it is stale.`
+      )
+    }
+  }
+
+  const payload = createLockPayload()
+  const payloadJson = JSON.stringify(payload, null, 2)
+  const payloadBase64 = Buffer.from(payloadJson).toString('base64')
+  const createCommand = `mkdir -p .zephyr && echo '${payloadBase64}' | base64 --decode > '${escapedLockPath}'`
+
+  const createResult = await ssh.execCommand(createCommand, { cwd: remoteCwd })
+  if (createResult.code !== 0) {
+    throw new Error(`Failed to create lock file on server: ${createResult.stderr}`)
+  }
+
+  await acquireLocalLock(rootDir)
+  return lockPath
+}
+
+export async function releaseRemoteLock(ssh, remoteCwd, { logWarning } = {}) {
+  const lockPath = `.zephyr/${PROJECT_LOCK_FILE}`
+  const escapedLockPath = lockPath.replace(/'/g, "'\\''")
+  const removeCommand = `rm -f '${escapedLockPath}'`
+
+  const result = await ssh.execCommand(removeCommand, { cwd: remoteCwd })
+  if (result.code !== 0 && result.code !== 1) {
+    logWarning?.(`Failed to remove lock file: ${result.stderr}`)
+  }
+}
+

package/src/deploy/preflight.mjs

@@ -1,117 +1,117 @@
-import fs from 'node:fs/promises'
-import path from 'node:path'
-
-export async function hasPrePushHook(rootDir) {
-  const hookPaths = [
-    path.join(rootDir, '.git', 'hooks', 'pre-push'),
-    path.join(rootDir, '.husky', 'pre-push'),
-    path.join(rootDir, '.githooks', 'pre-push')
-  ]
-
-  for (const hookPath of hookPaths) {
-    try {
-      await fs.access(hookPath)
-      const stats = await fs.stat(hookPath)
-      if (stats.isFile()) {
-        return true
-      }
-    } catch {
-      // Hook doesn't exist at this path, continue checking
-    }
-  }
-
-  return false
-}
-
-export async function hasLintScript(rootDir) {
-  try {
-    const packageJsonPath = path.join(rootDir, 'package.json')
-    const raw = await fs.readFile(packageJsonPath, 'utf8')
-    const packageJson = JSON.parse(raw)
-    return packageJson.scripts && typeof packageJson.scripts.lint === 'string'
-  } catch {
-    return false
-  }
-}
-
-export async function hasLaravelPint(rootDir) {
-  try {
-    const pintPath = path.join(rootDir, 'vendor', 'bin', 'pint')
-    await fs.access(pintPath)
-    const stats = await fs.stat(pintPath)
-    return stats.isFile()
-  } catch {
-    return false
-  }
-}
-
-export async function runLinting(rootDir, { runCommand, logProcessing, logSuccess } = {}) {
-  const hasNpmLint = await hasLintScript(rootDir)
-  const hasPint = await hasLaravelPint(rootDir)
-
-  if (hasNpmLint) {
-    logProcessing?.('Running npm lint...')
-    await runCommand('npm', ['run', 'lint'], { cwd: rootDir })
-    logSuccess?.('Linting completed.')
-    return true
-  }
-
-  if (hasPint) {
-    logProcessing?.('Running Laravel Pint...')
-    await runCommand('php', ['vendor/bin/pint'], { cwd: rootDir })
-    logSuccess?.('Linting completed.')
-    return true
-  }
-
-  return false
-}
-
-export function hasStagedChanges(statusOutput) {
-  if (!statusOutput || statusOutput.length === 0) {
-    return false
-  }
-
-  const lines = statusOutput.split('\n').filter((line) => line.trim().length > 0)
-
-  return lines.some((line) => {
-    const firstChar = line[0]
-    return firstChar && firstChar !== ' ' && firstChar !== '?'
-  })
-}
-
-export async function commitLintingChanges(rootDir, { getGitStatus, runCommand, logProcessing, logSuccess } = {}) {
-  const status = await getGitStatus(rootDir)
-
-  if (!hasStagedChanges(status)) {
-    await runCommand('git', ['add', '-u'], { cwd: rootDir })
-    const newStatus = await getGitStatus(rootDir)
-    if (!hasStagedChanges(newStatus)) {
-      return false
-    }
-  }
-
-  logProcessing?.('Committing linting changes...')
-  await runCommand('git', ['commit', '-m', 'style: apply linting fixes'], { cwd: rootDir })
-  logSuccess?.('Linting changes committed.')
-  return true
-}
-
-export async function isLocalLaravelProject(rootDir) {
-  try {
-    const artisanPath = path.join(rootDir, 'artisan')
-    const composerPath = path.join(rootDir, 'composer.json')
-
-    await fs.access(artisanPath)
-    const composerContent = await fs.readFile(composerPath, 'utf8')
-    const composerJson = JSON.parse(composerContent)
-
-    return (
-      composerJson.require &&
-      typeof composerJson.require === 'object' &&
-      'laravel/framework' in composerJson.require
-    )
-  } catch {
-    return false
-  }
-}
-
+import fs from 'node:fs/promises'
+import path from 'node:path'
+
+export async function hasPrePushHook(rootDir) {
+  const hookPaths = [
+    path.join(rootDir, '.git', 'hooks', 'pre-push'),
+    path.join(rootDir, '.husky', 'pre-push'),
+    path.join(rootDir, '.githooks', 'pre-push')
+  ]
+
+  for (const hookPath of hookPaths) {
+    try {
+      await fs.access(hookPath)
+      const stats = await fs.stat(hookPath)
+      if (stats.isFile()) {
+        return true
+      }
+    } catch {
+      // Hook doesn't exist at this path, continue checking
+    }
+  }
+
+  return false
+}
+
+export async function hasLintScript(rootDir) {
+  try {
+    const packageJsonPath = path.join(rootDir, 'package.json')
+    const raw = await fs.readFile(packageJsonPath, 'utf8')
+    const packageJson = JSON.parse(raw)
+    return packageJson.scripts && typeof packageJson.scripts.lint === 'string'
+  } catch {
+    return false
+  }
+}
+
+export async function hasLaravelPint(rootDir) {
+  try {
+    const pintPath = path.join(rootDir, 'vendor', 'bin', 'pint')
+    await fs.access(pintPath)
+    const stats = await fs.stat(pintPath)
+    return stats.isFile()
+  } catch {
+    return false
+  }
+}
+
+export async function runLinting(rootDir, { runCommand, logProcessing, logSuccess } = {}) {
+  const hasNpmLint = await hasLintScript(rootDir)
+  const hasPint = await hasLaravelPint(rootDir)
+
+  if (hasNpmLint) {
+    logProcessing?.('Running npm lint...')
+    await runCommand('npm', ['run', 'lint'], { cwd: rootDir })
+    logSuccess?.('Linting completed.')
+    return true
+  }
+
+  if (hasPint) {
+    logProcessing?.('Running Laravel Pint...')
+    await runCommand('php', ['vendor/bin/pint'], { cwd: rootDir })
+    logSuccess?.('Linting completed.')
+    return true
+  }
+
+  return false
+}
+
+export function hasStagedChanges(statusOutput) {
+  if (!statusOutput || statusOutput.length === 0) {
+    return false
+  }
+
+  const lines = statusOutput.split('\n').filter((line) => line.trim().length > 0)
+
+  return lines.some((line) => {
+    const firstChar = line[0]
+    return firstChar && firstChar !== ' ' && firstChar !== '?'
+  })
+}
+
+export async function commitLintingChanges(rootDir, { getGitStatus, runCommand, logProcessing, logSuccess } = {}) {
+  const status = await getGitStatus(rootDir)
+
+  if (!hasStagedChanges(status)) {
+    await runCommand('git', ['add', '-u'], { cwd: rootDir })
+    const newStatus = await getGitStatus(rootDir)
+    if (!hasStagedChanges(newStatus)) {
+      return false
+    }
+  }
+
+  logProcessing?.('Committing linting changes...')
+  await runCommand('git', ['commit', '-m', 'style: apply linting fixes'], { cwd: rootDir })
+  logSuccess?.('Linting changes committed.')
+  return true
+}
+
+export async function isLocalLaravelProject(rootDir) {
+  try {
+    const artisanPath = path.join(rootDir, 'artisan')
+    const composerPath = path.join(rootDir, 'composer.json')
+
+    await fs.access(artisanPath)
+    const composerContent = await fs.readFile(composerPath, 'utf8')
+    const composerJson = JSON.parse(composerContent)
+
+    return (
+      composerJson.require &&
+      typeof composerJson.require === 'object' &&
+      'laravel/framework' in composerJson.require
+    )
+  } catch {
+    return false
+  }
+}
+