@wyxos/zephyr 0.2.21 → 0.2.22

package/src/deploy/remote-exec.mjs

@@ -1,99 +1,99 @@
-function escapeForDoubleQuotes(value) {
-  return value.replace(/(["\\$`])/g, '\\$1')
-}
-
-function escapeForSingleQuotes(value) {
-  return value.replace(/'/g, "'\\''")
-}
-
-function createProfileBootstrap() {
-  return [
-    'if [ -f "$HOME/.profile" ]; then . "$HOME/.profile"; fi',
-    'if [ -f "$HOME/.bash_profile" ]; then . "$HOME/.bash_profile"; fi',
-    'if [ -f "$HOME/.bashrc" ]; then . "$HOME/.bashrc"; fi',
-    'if [ -f "$HOME/.zprofile" ]; then . "$HOME/.zprofile"; fi',
-    'if [ -f "$HOME/.zshrc" ]; then . "$HOME/.zshrc"; fi',
-    'if [ -s "$HOME/.nvm/nvm.sh" ]; then . "$HOME/.nvm/nvm.sh"; fi',
-    'if [ -s "$HOME/.config/nvm/nvm.sh" ]; then . "$HOME/.config/nvm/nvm.sh"; fi',
-    'if [ -s "/usr/local/opt/nvm/nvm.sh" ]; then . "/usr/local/opt/nvm/nvm.sh"; fi',
-    'if command -v npm >/dev/null 2>&1; then :',
-    'elif [ -d "$HOME/.nvm/versions/node" ]; then NODE_VERSION=$(ls -1 "$HOME/.nvm/versions/node" | tail -1) && export PATH="$HOME/.nvm/versions/node/$NODE_VERSION/bin:$PATH"',
-    'elif [ -d "/usr/local/lib/node_modules/npm/bin" ]; then export PATH="/usr/local/lib/node_modules/npm/bin:$PATH"',
-    'elif [ -d "/opt/homebrew/bin" ] && [ -f "/opt/homebrew/bin/npm" ]; then export PATH="/opt/homebrew/bin:$PATH"',
-    'elif [ -d "/usr/local/bin" ] && [ -f "/usr/local/bin/npm" ]; then export PATH="/usr/local/bin:$PATH"',
-    'elif [ -d "$HOME/.local/bin" ] && [ -f "$HOME/.local/bin/npm" ]; then export PATH="$HOME/.local/bin:$PATH"',
-    'fi'
-  ].join('; ')
-}
-
-export function createRemoteExecutor({ ssh, rootDir, remoteCwd, writeToLogFile, logProcessing, logSuccess, logError }) {
-  const profileBootstrap = createProfileBootstrap()
-
-  return async function executeRemote(label, command, options = {}) {
-    const {
-      cwd = remoteCwd,
-      allowFailure = false,
-      bootstrapEnv = true,
-      env = {}
-      // printStdout: legacy option, intentionally ignored (we log to file)
-    } = options
-
-    logProcessing?.(`\n→ ${label}`)
-
-    let wrappedCommand = command
-    let execOptions = { cwd }
-
-    let envExports = ''
-    if (env && Object.keys(env).length > 0) {
-      envExports = Object.entries(env)
-        .map(([key, value]) => `${key}='${escapeForSingleQuotes(String(value))}'`)
-        .join(' ') + ' '
-    }
-
-    if (bootstrapEnv && cwd) {
-      const cwdForShell = escapeForDoubleQuotes(cwd)
-      wrappedCommand = `${profileBootstrap}; cd "${cwdForShell}" && ${envExports}${command}`
-      execOptions = {}
-    } else if (envExports) {
-      wrappedCommand = `${envExports}${command}`
-    }
-
-    const result = await ssh.execCommand(wrappedCommand, execOptions)
-
-    if (result.stdout && result.stdout.trim()) {
-      await writeToLogFile(rootDir, `[${label}] STDOUT:\n${result.stdout.trim()}`)
-    }
-
-    if (result.stderr && result.stderr.trim()) {
-      await writeToLogFile(rootDir, `[${label}] STDERR:\n${result.stderr.trim()}`)
-    }
-
-    if (result.code !== 0) {
-      if (result.stdout && result.stdout.trim()) {
-        logError?.(`\n[${label}] Output:\n${result.stdout.trim()}`)
-      }
-
-      if (result.stderr && result.stderr.trim()) {
-        logError?.(`\n[${label}] Error:\n${result.stderr.trim()}`)
-      }
-    }
-
-    if (result.code !== 0 && !allowFailure) {
-      const stderr = result.stderr?.trim() ?? ''
-      if (/command not found/.test(stderr) || /is not recognized/.test(stderr)) {
-        throw new Error(
-          `Command failed: ${command}. Ensure the remote environment loads required tools for non-interactive shells (e.g. export PATH in profile scripts).`
-        )
-      }
-
-      throw new Error(`Command failed: ${command}`)
-    }
-
-    if (result.code === 0) {
-      logSuccess?.(`✓ ${command}`)
-    }
-
-    return result
-  }
-}
-
+function escapeForDoubleQuotes(value) {
+  return value.replace(/(["\\$`])/g, '\\$1')
+}
+
+function escapeForSingleQuotes(value) {
+  return value.replace(/'/g, "'\\''")
+}
+
+function createProfileBootstrap() {
+  return [
+    'if [ -f "$HOME/.profile" ]; then . "$HOME/.profile"; fi',
+    'if [ -f "$HOME/.bash_profile" ]; then . "$HOME/.bash_profile"; fi',
+    'if [ -f "$HOME/.bashrc" ]; then . "$HOME/.bashrc"; fi',
+    'if [ -f "$HOME/.zprofile" ]; then . "$HOME/.zprofile"; fi',
+    'if [ -f "$HOME/.zshrc" ]; then . "$HOME/.zshrc"; fi',
+    'if [ -s "$HOME/.nvm/nvm.sh" ]; then . "$HOME/.nvm/nvm.sh"; fi',
+    'if [ -s "$HOME/.config/nvm/nvm.sh" ]; then . "$HOME/.config/nvm/nvm.sh"; fi',
+    'if [ -s "/usr/local/opt/nvm/nvm.sh" ]; then . "/usr/local/opt/nvm/nvm.sh"; fi',
+    'if command -v npm >/dev/null 2>&1; then :',
+    'elif [ -d "$HOME/.nvm/versions/node" ]; then NODE_VERSION=$(ls -1 "$HOME/.nvm/versions/node" | tail -1) && export PATH="$HOME/.nvm/versions/node/$NODE_VERSION/bin:$PATH"',
+    'elif [ -d "/usr/local/lib/node_modules/npm/bin" ]; then export PATH="/usr/local/lib/node_modules/npm/bin:$PATH"',
+    'elif [ -d "/opt/homebrew/bin" ] && [ -f "/opt/homebrew/bin/npm" ]; then export PATH="/opt/homebrew/bin:$PATH"',
+    'elif [ -d "/usr/local/bin" ] && [ -f "/usr/local/bin/npm" ]; then export PATH="/usr/local/bin:$PATH"',
+    'elif [ -d "$HOME/.local/bin" ] && [ -f "$HOME/.local/bin/npm" ]; then export PATH="$HOME/.local/bin:$PATH"',
+    'fi'
+  ].join('; ')
+}
+
+export function createRemoteExecutor({ ssh, rootDir, remoteCwd, writeToLogFile, logProcessing, logSuccess, logError }) {
+  const profileBootstrap = createProfileBootstrap()
+
+  return async function executeRemote(label, command, options = {}) {
+    const {
+      cwd = remoteCwd,
+      allowFailure = false,
+      bootstrapEnv = true,
+      env = {}
+      // printStdout: legacy option, intentionally ignored (we log to file)
+    } = options
+
+    logProcessing?.(`\n→ ${label}`)
+
+    let wrappedCommand = command
+    let execOptions = { cwd }
+
+    let envExports = ''
+    if (env && Object.keys(env).length > 0) {
+      envExports = Object.entries(env)
+        .map(([key, value]) => `${key}='${escapeForSingleQuotes(String(value))}'`)
+        .join(' ') + ' '
+    }
+
+    if (bootstrapEnv && cwd) {
+      const cwdForShell = escapeForDoubleQuotes(cwd)
+      wrappedCommand = `${profileBootstrap}; cd "${cwdForShell}" && ${envExports}${command}`
+      execOptions = {}
+    } else if (envExports) {
+      wrappedCommand = `${envExports}${command}`
+    }
+
+    const result = await ssh.execCommand(wrappedCommand, execOptions)
+
+    if (result.stdout && result.stdout.trim()) {
+      await writeToLogFile(rootDir, `[${label}] STDOUT:\n${result.stdout.trim()}`)
+    }
+
+    if (result.stderr && result.stderr.trim()) {
+      await writeToLogFile(rootDir, `[${label}] STDERR:\n${result.stderr.trim()}`)
+    }
+
+    if (result.code !== 0) {
+      if (result.stdout && result.stdout.trim()) {
+        logError?.(`\n[${label}] Output:\n${result.stdout.trim()}`)
+      }
+
+      if (result.stderr && result.stderr.trim()) {
+        logError?.(`\n[${label}] Error:\n${result.stderr.trim()}`)
+      }
+    }
+
+    if (result.code !== 0 && !allowFailure) {
+      const stderr = result.stderr?.trim() ?? ''
+      if (/command not found/.test(stderr) || /is not recognized/.test(stderr)) {
+        throw new Error(
+          `Command failed: ${command}. Ensure the remote environment loads required tools for non-interactive shells (e.g. export PATH in profile scripts).`
+        )
+      }
+
+      throw new Error(`Command failed: ${command}`)
+    }
+
+    if (result.code === 0) {
+      logSuccess?.(`✓ ${command}`)
+    }
+
+    return result
+  }
+}
+

package/src/deploy/snapshots.mjs

@@ -1,35 +1,35 @@
-import fs from 'node:fs/promises'
-import { ensureDirectory, getPendingTasksPath, getProjectConfigDir } from '../utils/paths.mjs'
-
-export async function loadPendingTasksSnapshot(rootDir) {
-  const snapshotPath = getPendingTasksPath(rootDir)
-
-  try {
-    const raw = await fs.readFile(snapshotPath, 'utf8')
-    return JSON.parse(raw)
-  } catch (error) {
-    if (error.code === 'ENOENT') {
-      return null
-    }
-
-    throw error
-  }
-}
-
-export async function savePendingTasksSnapshot(rootDir, snapshot) {
-  const configDir = getProjectConfigDir(rootDir)
-  await ensureDirectory(configDir)
-  const payload = `${JSON.stringify(snapshot, null, 2)}\n`
-  await fs.writeFile(getPendingTasksPath(rootDir), payload)
-}
-
-export async function clearPendingTasksSnapshot(rootDir) {
-  try {
-    await fs.unlink(getPendingTasksPath(rootDir))
-  } catch (error) {
-    if (error.code !== 'ENOENT') {
-      throw error
-    }
-  }
-}
-
+import fs from 'node:fs/promises'
+import { ensureDirectory, getPendingTasksPath, getProjectConfigDir } from '../utils/paths.mjs'
+
+export async function loadPendingTasksSnapshot(rootDir) {
+  const snapshotPath = getPendingTasksPath(rootDir)
+
+  try {
+    const raw = await fs.readFile(snapshotPath, 'utf8')
+    return JSON.parse(raw)
+  } catch (error) {
+    if (error.code === 'ENOENT') {
+      return null
+    }
+
+    throw error
+  }
+}
+
+export async function savePendingTasksSnapshot(rootDir, snapshot) {
+  const configDir = getProjectConfigDir(rootDir)
+  await ensureDirectory(configDir)
+  const payload = `${JSON.stringify(snapshot, null, 2)}\n`
+  await fs.writeFile(getPendingTasksPath(rootDir), payload)
+}
+
+export async function clearPendingTasksSnapshot(rootDir) {
+  try {
+    await fs.unlink(getPendingTasksPath(rootDir))
+  } catch (error) {
+    if (error.code !== 'ENOENT') {
+      throw error
+    }
+  }
+}
+

package/src/index.mjs

@@ -1,91 +1,91 @@
-import chalk from 'chalk'
-import inquirer from 'inquirer'
-import { NodeSSH } from 'node-ssh'
-
-import { createChalkLogger } from './utils/output.mjs'
-import { runCommand as runCommandBase, runCommandCapture as runCommandCaptureBase } from './utils/command.mjs'
-import { createLocalCommandRunners } from './runtime/local-command.mjs'
-import { createRunPrompt } from './runtime/prompt.mjs'
-import { createSshClientFactory } from './runtime/ssh-client.mjs'
-import { generateId } from './utils/id.mjs'
-
-import { loadServers as loadServersImpl, saveServers } from './config/servers.mjs'
-import { loadProjectConfig as loadProjectConfigImpl, saveProjectConfig } from './config/project.mjs'
-import * as configFlow from './utils/config-flow.mjs'
-import * as sshKeys from './ssh/keys.mjs'
-import { writeToLogFile } from './utils/log-file.mjs'
-
-export { main, runRemoteTasks } from './main.mjs'
-export { connectToServer, executeRemoteCommand, readRemoteFile, downloadRemoteFile, deleteRemoteFile } from './ssh/index.mjs'
-
-const { logProcessing, logSuccess, logWarning, logError } = createChalkLogger(chalk)
-const runPrompt = createRunPrompt({ inquirer })
-const { runCommand, runCommandCapture } = createLocalCommandRunners({
-  runCommandBase,
-  runCommandCaptureBase
-})
-
-// Keep this aligned with main's test injection behavior
-const createSshClient = createSshClientFactory({ NodeSSH })
-
-export { logProcessing, logSuccess, logWarning, logError, runCommand, runCommandCapture, writeToLogFile, createSshClient }
-
-export async function loadServers() {
-  return await loadServersImpl({ logSuccess, logWarning })
-}
-
-export async function loadProjectConfig(rootDir, servers) {
-  return await loadProjectConfigImpl(rootDir, servers, { logSuccess, logWarning })
-}
-
-export function defaultProjectPath(currentDir) {
-  return configFlow.defaultProjectPath(currentDir)
-}
-
-export async function listGitBranches(currentDir) {
-  return await configFlow.listGitBranches(currentDir, { runCommandCapture, logWarning })
-}
-
-export async function promptSshDetails(currentDir, existing = {}) {
-  return await sshKeys.promptSshDetails(currentDir, existing, { runPrompt })
-}
-
-export async function promptServerDetails(existingServers = []) {
-  return await configFlow.promptServerDetails(existingServers, { runPrompt, generateId })
-}
-
-export async function selectServer(servers) {
-  return await configFlow.selectServer(servers, {
-    runPrompt,
-    logProcessing,
-    logSuccess,
-    saveServers,
-    promptServerDetails
-  })
-}
-
-export async function promptAppDetails(currentDir, existing = {}) {
-  return await configFlow.promptAppDetails(currentDir, existing, {
-    runPrompt,
-    listGitBranches,
-    defaultProjectPath,
-    promptSshDetails
-  })
-}
-
-export async function selectApp(projectConfig, server, currentDir) {
-  return await configFlow.selectApp(projectConfig, server, currentDir, {
-    runPrompt,
-    logWarning,
-    logProcessing,
-    logSuccess,
-    saveProjectConfig,
-    generateId,
-    promptAppDetails
-  })
-}
-
-export async function selectPreset(projectConfig, servers) {
-  return await configFlow.selectPreset(projectConfig, servers, { runPrompt })
-}
-
+import chalk from 'chalk'
+import inquirer from 'inquirer'
+import { NodeSSH } from 'node-ssh'
+
+import { createChalkLogger } from './utils/output.mjs'
+import { runCommand as runCommandBase, runCommandCapture as runCommandCaptureBase } from './utils/command.mjs'
+import { createLocalCommandRunners } from './runtime/local-command.mjs'
+import { createRunPrompt } from './runtime/prompt.mjs'
+import { createSshClientFactory } from './runtime/ssh-client.mjs'
+import { generateId } from './utils/id.mjs'
+
+import { loadServers as loadServersImpl, saveServers } from './config/servers.mjs'
+import { loadProjectConfig as loadProjectConfigImpl, saveProjectConfig } from './config/project.mjs'
+import * as configFlow from './utils/config-flow.mjs'
+import * as sshKeys from './ssh/keys.mjs'
+import { writeToLogFile } from './utils/log-file.mjs'
+
+export { main, runRemoteTasks } from './main.mjs'
+export { connectToServer, executeRemoteCommand, readRemoteFile, downloadRemoteFile, deleteRemoteFile } from './ssh/index.mjs'
+
+const { logProcessing, logSuccess, logWarning, logError } = createChalkLogger(chalk)
+const runPrompt = createRunPrompt({ inquirer })
+const { runCommand, runCommandCapture } = createLocalCommandRunners({
+  runCommandBase,
+  runCommandCaptureBase
+})
+
+// Keep this aligned with main's test injection behavior
+const createSshClient = createSshClientFactory({ NodeSSH })
+
+export { logProcessing, logSuccess, logWarning, logError, runCommand, runCommandCapture, writeToLogFile, createSshClient }
+
+export async function loadServers() {
+  return await loadServersImpl({ logSuccess, logWarning })
+}
+
+export async function loadProjectConfig(rootDir, servers) {
+  return await loadProjectConfigImpl(rootDir, servers, { logSuccess, logWarning })
+}
+
+export function defaultProjectPath(currentDir) {
+  return configFlow.defaultProjectPath(currentDir)
+}
+
+export async function listGitBranches(currentDir) {
+  return await configFlow.listGitBranches(currentDir, { runCommandCapture, logWarning })
+}
+
+export async function promptSshDetails(currentDir, existing = {}) {
+  return await sshKeys.promptSshDetails(currentDir, existing, { runPrompt })
+}
+
+export async function promptServerDetails(existingServers = []) {
+  return await configFlow.promptServerDetails(existingServers, { runPrompt, generateId })
+}
+
+export async function selectServer(servers) {
+  return await configFlow.selectServer(servers, {
+    runPrompt,
+    logProcessing,
+    logSuccess,
+    saveServers,
+    promptServerDetails
+  })
+}
+
+export async function promptAppDetails(currentDir, existing = {}) {
+  return await configFlow.promptAppDetails(currentDir, existing, {
+    runPrompt,
+    listGitBranches,
+    defaultProjectPath,
+    promptSshDetails
+  })
+}
+
+export async function selectApp(projectConfig, server, currentDir) {
+  return await configFlow.selectApp(projectConfig, server, currentDir, {
+    runPrompt,
+    logWarning,
+    logProcessing,
+    logSuccess,
+    saveProjectConfig,
+    generateId,
+    promptAppDetails
+  })
+}
+
+export async function selectPreset(projectConfig, servers) {
+  return await configFlow.selectPreset(projectConfig, servers, { runPrompt })
+}
+