@wyxos/zephyr 0.3.4 → 0.4.1

package/src/application/deploy/run-deployment.mjs

@@ -12,7 +12,7 @@ import {createRemoteExecutor} from '../../deploy/remote-exec.mjs'
 import {resolveSshKeyPath} from '../../ssh/keys.mjs'
 import {cleanupOldLogs, closeLogFile, getLogFilePath, writeToLogFile} from '../../utils/log-file.mjs'
 import {resolveRemotePath} from '../../utils/remote-path.mjs'
-import {buildRemoteDeploymentPlan} from './build-remote-deployment-plan.mjs'
+import {buildRemoteDeploymentPlan, resolveRemoteDeploymentState} from './build-remote-deployment-plan.mjs'
 import {executeRemoteDeploymentPlan} from './execute-remote-deployment-plan.mjs'
 import {prepareLocalDeployment} from './prepare-local-deployment.mjs'
 
@@ -21,12 +21,45 @@ async function resolveRemoteHome(ssh, sshUser) {
     return remoteHomeResult.stdout.trim() || `/home/${sshUser}`
 }
 
+async function connectToRemoteDeploymentTarget({
+                                                   config,
+                                                   createSshClient,
+                                                   sshUser,
+                                                   privateKey,
+                                                   remoteCwd = null,
+                                                   logProcessing,
+                                                   message
+                                               } = {}) {
+    const ssh = createSshClient()
+
+    logProcessing?.(`\n${message ?? `Connecting to ${config.serverIp} as ${sshUser}...`}`)
+
+    await ssh.connect({
+        host: config.serverIp,
+        username: sshUser,
+        privateKey
+    })
+
+    if (remoteCwd) {
+        return {ssh, remoteCwd}
+    }
+
+    const remoteHome = await resolveRemoteHome(ssh, sshUser)
+
+    return {
+        ssh,
+        remoteCwd: resolveRemotePath(config.projectPath, remoteHome)
+    }
+}
+
 async function maybeRecoverLaravelMaintenanceMode({
     remotePlan,
     executionState,
     executeRemote,
     runPrompt,
-    logWarning
+    logProcessing,
+    logWarning,
+    executionMode = {}
 } = {}) {
     if (!remotePlan?.remoteIsLaravel || !remotePlan?.maintenanceModeEnabled) {
         return
@@ -36,12 +69,27 @@ async function maybeRecoverLaravelMaintenanceMode({
         return
     }
 
-    if (typeof runPrompt !== 'function' || typeof executeRemote !== 'function') {
+    if (typeof executeRemote !== 'function') {
         logWarning?.('Deployment failed while Laravel maintenance mode may still be enabled.')
         return
     }
 
     try {
+        if (executionMode?.interactive === false) {
+            logProcessing?.('Deployment failed after Laravel maintenance mode was enabled. Running `artisan up` automatically...')
+            await executeRemote(
+                'Disable Laravel maintenance mode',
+                remotePlan.maintenanceUpCommand ?? `${remotePlan.phpCommand} artisan up`
+            )
+            executionState.exitedMaintenanceMode = true
+            return
+        }
+
+        if (typeof runPrompt !== 'function') {
+            logWarning?.('Deployment failed while Laravel maintenance mode may still be enabled.')
+            return
+        }
+
         const answers = await runPrompt([
             {
                 type: 'confirm',
@@ -82,51 +130,79 @@ export async function runDeployment(config, options = {}) {
         logError,
         runPrompt,
         createSshClient,
-        runCommand
+        runCommand,
+        executionMode
     } = context
 
     await cleanupOldLogs(rootDir)
 
-    const {requiredPhpVersion} = await prepareLocalDeployment(config, {
-        snapshot,
-        rootDir,
-        versionArg,
-        runPrompt,
-        runCommand,
-        runCommandCapture: context.runCommandCapture,
-        logProcessing,
-        logSuccess,
-        logWarning
-    })
-
-    const ssh = createSshClient()
     const sshUser = config.sshUser || os.userInfo().username
     const privateKeyPath = await resolveSshKeyPath(config.sshKey)
     const privateKey = await fs.readFile(privateKeyPath, 'utf8')
+    let ssh = null
     let remoteCwd = null
     let executeRemote = null
     let remotePlan = null
+    let remoteState = null
     const executionState = {
         enteredMaintenanceMode: false,
         exitedMaintenanceMode: false
     }
 
-    logProcessing(`\nConnecting to ${config.serverIp} as ${sshUser}...`)
-
     let lockAcquired = false
 
     try {
-        await ssh.connect({
-            host: config.serverIp,
-            username: sshUser,
-            privateKey
+        ({ssh, remoteCwd} = await connectToRemoteDeploymentTarget({
+            config,
+            createSshClient,
+            sshUser,
+            privateKey,
+            logProcessing,
+            message: `Connecting to ${config.serverIp} as ${sshUser} to inspect remote deployment state...`
+        }))
+
+        remoteState = await resolveRemoteDeploymentState({
+            snapshot,
+            executionMode,
+            ssh,
+            remoteCwd,
+            runPrompt,
+            logSuccess,
+            logWarning
+        })
+
+        // Reconnect after local checks so long-running validation does not hold a stale SSH session open.
+        await ssh.dispose()
+        ssh = null
+
+        const {requiredPhpVersion} = await prepareLocalDeployment(config, {
+            snapshot,
+            rootDir,
+            versionArg,
+            runPrompt,
+            runCommand,
+            runCommandCapture: context.runCommandCapture,
+            logProcessing,
+            logSuccess,
+            logWarning
         })
 
-        const remoteHome = await resolveRemoteHome(ssh, sshUser)
-        remoteCwd = resolveRemotePath(config.projectPath, remoteHome)
+        ;({ssh} = await connectToRemoteDeploymentTarget({
+            config,
+            createSshClient,
+            sshUser,
+            privateKey,
+            remoteCwd,
+            logProcessing,
+            message: `Reconnecting to ${config.serverIp} as ${sshUser}...`
+        }))
 
         logProcessing('Connection established. Acquiring deployment lock on server...')
-        await acquireRemoteLock(ssh, remoteCwd, rootDir, {runPrompt, logWarning})
+        await acquireRemoteLock(ssh, remoteCwd, rootDir, {
+            runPrompt,
+            logWarning,
+            interactive: executionMode?.interactive !== false
+        })
         lockAcquired = true
         logProcessing(`Lock acquired. Running deployment commands in ${remoteCwd}...`)
 
@@ -145,6 +221,9 @@ export async function runDeployment(config, options = {}) {
             snapshot,
             rootDir,
             requiredPhpVersion,
+            executionMode,
+            remoteIsLaravel: remoteState?.remoteIsLaravel,
+            maintenanceModeEnabled: remoteState?.maintenanceModeEnabled,
             ssh,
             remoteCwd,
             executeRemote,
@@ -179,12 +258,18 @@ export async function runDeployment(config, options = {}) {
             executionState,
             executeRemote,
             runPrompt,
-            logWarning
+            logProcessing,
+            logWarning,
+            executionMode
         })
 
         if (lockAcquired && ssh && remoteCwd) {
             try {
-                await compareLocksAndPrompt(rootDir, ssh, remoteCwd, {runPrompt, logWarning})
+                await compareLocksAndPrompt(rootDir, ssh, remoteCwd, {
+                    runPrompt,
+                    logWarning,
+                    interactive: executionMode?.interactive !== false
+                })
             } catch {
                 // Ignore lock comparison errors during error handling
             }
@@ -206,4 +291,4 @@ export async function runDeployment(config, options = {}) {
             ssh.dispose()
         }
     }
-}
+}

package/src/application/release/release-node-package.mjs

@@ -8,7 +8,7 @@ import {writeStderr} from '../../utils/output.mjs'
 import {
     ensureCleanWorkingTree,
     ensureReleaseBranchReady,
-    runReleaseCommand as runCommand,
+    runReleaseCommand,
     validateReleaseDependencies
 } from '../../release/shared.mjs'
 
@@ -22,7 +22,12 @@ function hasScript(pkg, scriptName) {
     return pkg?.scripts?.[scriptName] !== undefined
 }
 
-async function runLint(skipLint, pkg, rootDir = process.cwd(), {logStep, logSuccess, logWarning} = {}) {
+async function runLint(skipLint, pkg, rootDir = process.cwd(), {
+    logStep,
+    logSuccess,
+    logWarning,
+    runCommand = runReleaseCommand
+} = {}) {
     if (skipLint) {
         logWarning?.('Skipping lint because --skip-lint flag was provided.')
         return
@@ -49,7 +54,12 @@ async function runLint(skipLint, pkg, rootDir = process.cwd(), {logStep, logSucc
     }
 }
 
-async function runTests(skipTests, pkg, rootDir = process.cwd(), {logStep, logSuccess, logWarning} = {}) {
+async function runTests(skipTests, pkg, rootDir = process.cwd(), {
+    logStep,
+    logSuccess,
+    logWarning,
+    runCommand = runReleaseCommand
+} = {}) {
     if (skipTests) {
         logWarning?.('Skipping tests because --skip-tests flag was provided.')
         return
@@ -91,7 +101,12 @@ async function runTests(skipTests, pkg, rootDir = process.cwd(), {logStep, logSu
     }
 }
 
-async function runBuild(skipBuild, pkg, rootDir = process.cwd(), {logStep, logSuccess, logWarning} = {}) {
+async function runBuild(skipBuild, pkg, rootDir = process.cwd(), {
+    logStep,
+    logSuccess,
+    logWarning,
+    runCommand = runReleaseCommand
+} = {}) {
     if (skipBuild) {
         logWarning?.('Skipping build because --skip-build flag was provided.')
         return
@@ -118,7 +133,12 @@ async function runBuild(skipBuild, pkg, rootDir = process.cwd(), {logStep, logSu
     }
 }
 
-async function runLibBuild(skipBuild, pkg, rootDir = process.cwd(), {logStep, logSuccess, logWarning} = {}) {
+async function runLibBuild(skipBuild, pkg, rootDir = process.cwd(), {
+    logStep,
+    logSuccess,
+    logWarning,
+    runCommand = runReleaseCommand
+} = {}) {
     if (skipBuild) {
         logWarning?.('Skipping library build because --skip-build flag was provided.')
         return false
@@ -160,7 +180,11 @@ async function runLibBuild(skipBuild, pkg, rootDir = process.cwd(), {logStep, lo
     return hasLibChanges
 }
 
-async function bumpVersion(releaseType, rootDir = process.cwd(), {logStep, logSuccess} = {}) {
+async function bumpVersion(releaseType, rootDir = process.cwd(), {
+    logStep,
+    logSuccess,
+    runCommand = runReleaseCommand
+} = {}) {
     logStep?.('Bumping package version...')
 
     const {stdout: statusBefore} = await runCommand('git', ['status', '--porcelain'], {capture: true, cwd: rootDir})
@@ -197,7 +221,11 @@ async function bumpVersion(releaseType, rootDir = process.cwd(), {logStep, logSu
     return pkg
 }
 
-async function pushChanges(rootDir = process.cwd(), {logStep, logSuccess} = {}) {
+async function pushChanges(rootDir = process.cwd(), {
+    logStep,
+    logSuccess,
+    runCommand = runReleaseCommand
+} = {}) {
     logStep?.('Pushing commits and tags to origin...')
     try {
         await runCommand('git', ['push', '--follow-tags'], {capture: true, cwd: rootDir})
@@ -224,7 +252,12 @@ function extractDomainFromHomepage(homepage) {
     }
 }
 
-async function deployGHPages(skipDeploy, pkg, rootDir = process.cwd(), {logStep, logSuccess, logWarning} = {}) {
+async function deployGHPages(skipDeploy, pkg, rootDir = process.cwd(), {
+    logStep,
+    logSuccess,
+    logWarning,
+    runCommand = runReleaseCommand
+} = {}) {
     if (skipDeploy) {
         logWarning?.('Skipping GitHub Pages deployment because --skip-deploy flag was provided.')
         return
@@ -315,26 +348,40 @@ export async function releaseNodePackage({
                                              rootDir = process.cwd(),
                                              logStep,
                                              logSuccess,
-                                             logWarning
+                                             logWarning,
+                                             runPrompt,
+                                             runCommandImpl,
+                                             runCommandCaptureImpl,
+                                             interactive = true
                                          } = {}) {
+    const runCommand = (command, args, options = {}) => runReleaseCommand(command, args, {
+        ...options,
+        runCommandImpl,
+        runCommandCaptureImpl
+    })
+
     logStep?.('Reading package metadata...')
     const pkg = await readPackage(rootDir)
 
     logStep?.('Validating dependencies...')
-    await validateReleaseDependencies(rootDir, {logSuccess})
+    await validateReleaseDependencies(rootDir, {
+        prompt: runPrompt,
+        logSuccess,
+        interactive
+    })
 
     logStep?.('Checking working tree status...')
     await ensureCleanWorkingTree(rootDir, {runCommand})
     await ensureReleaseBranchReady({rootDir, branchMethod: 'show-current', logStep, logWarning})
 
-    await runLint(skipLint, pkg, rootDir, {logStep, logSuccess, logWarning})
-    await runTests(skipTests, pkg, rootDir, {logStep, logSuccess, logWarning})
-    await runLibBuild(skipBuild, pkg, rootDir, {logStep, logSuccess, logWarning})
+    await runLint(skipLint, pkg, rootDir, {logStep, logSuccess, logWarning, runCommand})
+    await runTests(skipTests, pkg, rootDir, {logStep, logSuccess, logWarning, runCommand})
+    await runLibBuild(skipBuild, pkg, rootDir, {logStep, logSuccess, logWarning, runCommand})
 
-    const updatedPkg = await bumpVersion(releaseType, rootDir, {logStep, logSuccess})
-    await runBuild(skipBuild, updatedPkg, rootDir, {logStep, logSuccess, logWarning})
-    await pushChanges(rootDir, {logStep, logSuccess})
-    await deployGHPages(skipDeploy, updatedPkg, rootDir, {logStep, logSuccess, logWarning})
+    const updatedPkg = await bumpVersion(releaseType, rootDir, {logStep, logSuccess, runCommand})
+    await runBuild(skipBuild, updatedPkg, rootDir, {logStep, logSuccess, logWarning, runCommand})
+    await pushChanges(rootDir, {logStep, logSuccess, runCommand})
+    await deployGHPages(skipDeploy, updatedPkg, rootDir, {logStep, logSuccess, logWarning, runCommand})
 
     logStep?.('Publishing will be handled by GitHub Actions via trusted publishing.')
     logSuccess?.(`Release workflow completed for ${updatedPkg.name}@${updatedPkg.version}.`)

package/src/application/release/release-packagist-package.mjs

@@ -8,7 +8,7 @@ import {writeStderr} from '../../utils/output.mjs'
 import {
     ensureCleanWorkingTree,
     ensureReleaseBranchReady,
-    runReleaseCommand as runCommand,
+    runReleaseCommand,
     validateReleaseDependencies
 } from '../../release/shared.mjs'
 
@@ -50,7 +50,13 @@ async function hasArtisan(rootDir = process.cwd()) {
     }
 }
 
-async function runLint(skipLint, rootDir = process.cwd(), {logStep, logSuccess, logWarning} = {}) {
+async function runLint(skipLint, rootDir = process.cwd(), {
+    logStep,
+    logSuccess,
+    logWarning,
+    runCommand = runReleaseCommand,
+    progressWriter = process.stdout
+} = {}) {
     if (skipLint) {
         logWarning?.('Skipping lint because --skip-lint flag was provided.')
         return
@@ -67,9 +73,9 @@ async function runLint(skipLint, rootDir = process.cwd(), {logStep, logSuccess,
 
     let dotInterval = null
     try {
-        process.stdout.write('  ')
+        progressWriter.write('  ')
         dotInterval = setInterval(() => {
-            process.stdout.write('.')
+            progressWriter.write('.')
         }, 200)
 
         await runCommand('php', [pintPath], {capture: true, cwd: rootDir})
@@ -78,14 +84,14 @@ async function runLint(skipLint, rootDir = process.cwd(), {logStep, logSuccess,
             clearInterval(dotInterval)
             dotInterval = null
         }
-        process.stdout.write('\n')
+        progressWriter.write('\n')
         logSuccess?.('Lint passed.')
     } catch (error) {
         if (dotInterval) {
             clearInterval(dotInterval)
             dotInterval = null
         }
-        process.stdout.write('\n')
+        progressWriter.write('\n')
         if (error.stdout) {
             writeStderr(error.stdout)
         }
@@ -96,7 +102,13 @@ async function runLint(skipLint, rootDir = process.cwd(), {logStep, logSuccess,
     }
 }
 
-async function runTests(skipTests, composer, rootDir = process.cwd(), {logStep, logSuccess, logWarning} = {}) {
+async function runTests(skipTests, composer, rootDir = process.cwd(), {
+    logStep,
+    logSuccess,
+    logWarning,
+    runCommand = runReleaseCommand,
+    progressWriter = process.stdout
+} = {}) {
     if (skipTests) {
         logWarning?.('Skipping tests because --skip-tests flag was provided.')
         return
@@ -114,9 +126,9 @@ async function runTests(skipTests, composer, rootDir = process.cwd(), {logStep,
 
     let dotInterval = null
     try {
-        process.stdout.write('  ')
+        progressWriter.write('  ')
         dotInterval = setInterval(() => {
-            process.stdout.write('.')
+            progressWriter.write('.')
         }, 200)
 
         if (hasArtisanFile) {
@@ -129,14 +141,14 @@ async function runTests(skipTests, composer, rootDir = process.cwd(), {logStep,
             clearInterval(dotInterval)
             dotInterval = null
         }
-        process.stdout.write('\n')
+        progressWriter.write('\n')
         logSuccess?.('Tests passed.')
     } catch (error) {
         if (dotInterval) {
             clearInterval(dotInterval)
             dotInterval = null
         }
-        process.stdout.write('\n')
+        progressWriter.write('\n')
         if (error.stdout) {
             writeStderr(error.stdout)
         }
@@ -147,7 +159,11 @@ async function runTests(skipTests, composer, rootDir = process.cwd(), {logStep,
     }
 }
 
-async function bumpVersion(releaseType, rootDir = process.cwd(), {logStep, logSuccess} = {}) {
+async function bumpVersion(releaseType, rootDir = process.cwd(), {
+    logStep,
+    logSuccess,
+    runCommand = runReleaseCommand
+} = {}) {
     logStep?.('Bumping composer version...')
 
     const composer = await readComposer(rootDir)
@@ -179,7 +195,11 @@ async function bumpVersion(releaseType, rootDir = process.cwd(), {logStep, logSu
     return {...composer, version: newVersion}
 }
 
-async function pushChanges(rootDir = process.cwd(), {logStep, logSuccess} = {}) {
+async function pushChanges(rootDir = process.cwd(), {
+    logStep,
+    logSuccess,
+    runCommand = runReleaseCommand
+} = {}) {
     logStep?.('Pushing commits to origin...')
     await runCommand('git', ['push'], {cwd: rootDir})
 
@@ -196,8 +216,19 @@ export async function releasePackagistPackage({
                                                   rootDir = process.cwd(),
                                                   logStep,
                                                   logSuccess,
-                                                  logWarning
+                                                  logWarning,
+                                                  runPrompt,
+                                                  runCommandImpl,
+                                                  runCommandCaptureImpl,
+                                                  interactive = true,
+                                                  progressWriter = process.stdout
                                               } = {}) {
+    const runCommand = (command, args, options = {}) => runReleaseCommand(command, args, {
+        ...options,
+        runCommandImpl,
+        runCommandCaptureImpl
+    })
+
     logStep?.('Reading composer metadata...')
     const composer = await readComposer(rootDir)
 
@@ -206,17 +237,21 @@ export async function releasePackagistPackage({
     }
 
     logStep?.('Validating dependencies...')
-    await validateReleaseDependencies(rootDir, {logSuccess})
+    await validateReleaseDependencies(rootDir, {
+        prompt: runPrompt,
+        logSuccess,
+        interactive
+    })
 
     logStep?.('Checking working tree status...')
     await ensureCleanWorkingTree(rootDir, {runCommand})
     await ensureReleaseBranchReady({rootDir, branchMethod: 'show-current', logStep, logWarning})
 
-    await runLint(skipLint, rootDir, {logStep, logSuccess, logWarning})
-    await runTests(skipTests, composer, rootDir, {logStep, logSuccess, logWarning})
+    await runLint(skipLint, rootDir, {logStep, logSuccess, logWarning, runCommand, progressWriter})
+    await runTests(skipTests, composer, rootDir, {logStep, logSuccess, logWarning, runCommand, progressWriter})
 
-    const updatedComposer = await bumpVersion(releaseType, rootDir, {logStep, logSuccess})
-    await pushChanges(rootDir, {logStep, logSuccess})
+    const updatedComposer = await bumpVersion(releaseType, rootDir, {logStep, logSuccess, runCommand})
+    await pushChanges(rootDir, {logStep, logSuccess, runCommand})
 
     logSuccess?.(`Release workflow completed for ${composer.name}@${updatedComposer.version}.`)
     logStep?.('Note: Packagist will automatically detect the new git tag and update the package.')

package/src/cli/options.mjs

@@ -0,0 +1,122 @@
+import process from 'node:process'
+
+import {Command} from 'commander'
+
+import {InvalidCliOptionsError} from '../runtime/errors.mjs'
+
+const WORKFLOW_TYPES = new Set(['node', 'vue', 'packagist'])
+function normalizeMaintenanceMode(value) {
+    if (value == null) {
+        return null
+    }
+
+    if (value === 'on') {
+        return true
+    }
+
+    if (value === 'off') {
+        return false
+    }
+
+    throw new InvalidCliOptionsError('Invalid value for --maintenance. Use "on" or "off".')
+}
+
+export function parseCliOptions(args = process.argv.slice(2)) {
+    const program = new Command()
+
+    program
+        .allowExcessArguments(false)
+        .allowUnknownOption(false)
+        .exitOverride()
+        .option('--type <type>', 'Workflow type (node|vue|packagist). Omit for normal app deployments.')
+        .option('--non-interactive', 'Fail instead of prompting when Zephyr needs user input.')
+        .option('--json', 'Emit NDJSON events to stdout. Requires --non-interactive.')
+        .option('--preset <name>', 'Preset name to use for non-interactive app deployments.')
+        .option('--resume-pending', 'Resume a saved pending deployment snapshot without prompting.')
+        .option('--discard-pending', 'Discard a saved pending deployment snapshot without prompting.')
+        .option('--maintenance <mode>', 'Laravel maintenance mode policy for non-interactive app deploys (on|off).')
+        .option('--skip-tests', 'Skip test execution in package release workflows.')
+        .option('--skip-lint', 'Skip lint execution in package release workflows.')
+        .option('--skip-build', 'Skip build execution in node/vue release workflows.')
+        .option('--skip-deploy', 'Skip GitHub Pages deployment in node/vue release workflows.')
+        .argument(
+            '[version]',
+            'Version or npm bump type for deployments (e.g. 1.2.3, patch, minor, major).'
+        )
+
+    try {
+        program.parse(args, {from: 'user'})
+    } catch (error) {
+        throw new InvalidCliOptionsError(error.message)
+    }
+
+    const options = program.opts()
+    const workflowType = options.type ?? null
+
+    if (workflowType && !WORKFLOW_TYPES.has(workflowType)) {
+        throw new InvalidCliOptionsError('Invalid value for --type. Use one of: node, vue, packagist.')
+    }
+
+    return {
+        workflowType,
+        versionArg: program.args[0] ?? null,
+        nonInteractive: Boolean(options.nonInteractive),
+        json: Boolean(options.json),
+        presetName: options.preset ?? null,
+        resumePending: Boolean(options.resumePending),
+        discardPending: Boolean(options.discardPending),
+        maintenanceMode: normalizeMaintenanceMode(options.maintenance),
+        skipTests: Boolean(options.skipTests),
+        skipLint: Boolean(options.skipLint),
+        skipBuild: Boolean(options.skipBuild),
+        skipDeploy: Boolean(options.skipDeploy)
+    }
+}
+
+export function validateCliOptions(options = {}) {
+    const {
+        workflowType = null,
+        nonInteractive = false,
+        json = false,
+        presetName = null,
+        resumePending = false,
+        discardPending = false,
+        maintenanceMode = null,
+        skipTests = false,
+        skipLint = false,
+        skipBuild = false,
+        skipDeploy = false
+    } = options
+
+    if (json && !nonInteractive) {
+        throw new InvalidCliOptionsError('--json requires --non-interactive.')
+    }
+
+    if (resumePending && discardPending) {
+        throw new InvalidCliOptionsError('Use either --resume-pending or --discard-pending, not both.')
+    }
+
+    const isPackageRelease = workflowType === 'node' || workflowType === 'vue' || workflowType === 'packagist'
+
+    if (isPackageRelease) {
+        if (presetName) {
+            throw new InvalidCliOptionsError('--preset is only valid for app deployments.')
+        }
+
+        if (resumePending || discardPending) {
+            throw new InvalidCliOptionsError('--resume-pending and --discard-pending are only valid for app deployments.')
+        }
+
+        if (maintenanceMode !== null) {
+            throw new InvalidCliOptionsError('--maintenance is only valid for app deployments.')
+        }
+    } else {
+        if (skipTests || skipLint || skipBuild || skipDeploy) {
+            throw new InvalidCliOptionsError('Release-only skip flags are not valid for app deployments.')
+        }
+
+        if (nonInteractive && !presetName) {
+            throw new InvalidCliOptionsError('--non-interactive app deployments require --preset <name>.')
+        }
+    }
+}