@studiometa/forge-cli 0.4.8 → 0.5.1

package/dist/cli.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
-import { C as isOutputFormat, _ as setToken, a as runCommand, c as OutputFormatter, d as createConfigStore, f as deleteToken, g as setOrganizationSlug, h as getToken, l as colors, m as getOrganizationSlug, n as exitWithError, o as createContext, r as exitWithValidationError, t as ExitCode, u as setColorEnabled, v as ApiError, x as ValidationError } from "./error-handler-Adi84RcF.js";
-import { PHP_CONFIG_TYPES, RESTARTABLE_SERVICES, activateCertificate, createAuditLogger, createBackupConfig, createCommand, createDatabaseUser, createMonitor, createNginxTemplate, createRedirectRule, createScheduledJob, createSecurityRule, createSshKey, deleteBackupConfig, deleteDatabaseUser, deleteMonitor, deleteNginxTemplate, deleteRedirectRule, deleteScheduledJob, deleteSecurityRule, deleteSshKey, deploySiteAndWait, disablePhpOpcache, enablePhpOpcache, getBackupConfig, getCertificate, getCommand, getDaemon, getDaemonLog, getDatabase, getDatabaseUser, getDeploymentLog, getDeploymentScript, getEnv, getFirewallRule, getMonitor, getNginxConfig, getNginxTemplate, getPhpConfig, getPhpMaxExecutionTime, getPhpMaxUploadSize, getPhpOpcache, getRecipe, getRedirectRule, getScheduledJob, getSecurityRule, getServer, getSite, getSshKey, getUser, listBackupConfigs, listCommands, listDaemons, listDatabaseUsers, listDatabases, listDeployments, listFirewallRules, listMonitors, listNginxTemplates, listPhpVersions, listRecipes, listRedirectRules, listScheduledJobs, listSecurityRules, listServers, listServices, listSites, listSshKeys, matchByName, rebootServer, restartDaemon, restartService, runRecipe, updateBackupConfig, updateDaemon, updateDatabaseUser, updateDeploymentScript, updateEnv, updateNginxConfig, updateNginxTemplate, updatePhpConfig, updatePhpMaxExecutionTime, updatePhpMaxUploadSize, updateRecipe, updateSecurityRule, updateSite } from "@studiometa/forge-core";
+import { C as isOutputFormat, _ as setToken, a as runCommand, c as OutputFormatter, d as createConfigStore$1, f as deleteToken, g as setOrganizationSlug, h as getToken$1, l as colors, m as getOrganizationSlug, n as exitWithError, o as createContext, r as exitWithValidationError, t as ExitCode, u as setColorEnabled, v as ApiError, x as ValidationError } from "./error-handler-Adi84RcF.js";
+import { STORAGE_PROVIDER_TYPES } from "@studiometa/forge-api";
+import { PHP_CONFIG_TYPES, RESTARTABLE_SERVICES, activateCertificate, createAuditLogger, createBackupConfig, createCommand, createDatabaseUser, createMonitor, createNginxTemplate, createRedirectRule, createScheduledJob, createSecurityRule, createServer, createSshKey, createStorageProvider, deleteBackupConfig, deleteDatabaseUser, deleteMonitor, deleteNginxTemplate, deleteRedirectRule, deleteScheduledJob, deleteSecurityRule, deleteSshKey, deleteStorageProvider, deploySiteAndWait, disablePhpOpcache, enablePhpOpcache, getBackupConfig, getCertificate, getCommand, getDaemon, getDaemonLog, getDatabase, getDatabaseUser, getDeploymentLog, getDeploymentScript, getEnv, getFirewallRule, getMonitor, getNginxConfig, getNginxTemplate, getPhpConfig, getPhpMaxExecutionTime, getPhpMaxUploadSize, getPhpOpcache, getRecipe, getRedirectRule, getScheduledJob, getSecurityRule, getServer, getSite, getSshKey, getStorageProvider, getUser, listBackupConfigs, listCommands, listDaemons, listDatabaseUsers, listDatabases, listDeployments, listFirewallRules, listMonitors, listNginxTemplates, listPhpVersions, listRecipes, listRedirectRules, listScheduledJobs, listSecurityRules, listServers, listServices, listSites, listSshKeys, listStorageProviders, matchByName, rebootServer, restartDaemon, restartService, runRecipe, updateBackupConfig, updateDaemon, updateDatabaseUser, updateDeploymentScript, updateEnv, updateNginxConfig, updateNginxTemplate, updatePhpConfig, updatePhpMaxExecutionTime, updatePhpMaxUploadSize, updateRecipe, updateSecurityRule, updateSite } from "@studiometa/forge-core";
 import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
@@ -122,7 +123,87 @@ async function resolveSiteId(value, serverId, execCtx) {
 	return String(partial[0].id);
 }
 //#endregion
+//#region src/commands/backups/options.ts
+/** Backup frequencies accepted by Forge. */
+var BACKUP_FREQUENCIES = [
+	"hourly",
+	"daily",
+	"weekly",
+	"custom"
+];
+/**
+* Read a list option: repeated and/or comma separated (`--databases 1,2 --databases app`).
+*/
+function listValues(value) {
+	return [value].flat().filter((v) => typeof v === "string").flatMap((v) => v.split(",")).map((v) => v.trim()).filter(Boolean);
+}
+/**
+* Whether a value is a numeric ID.
+*/
+function isId(value) {
+	return /^\d+$/.test(value);
+}
+/**
+* Check the --frequency value. Throws a ValidationError for an unknown frequency.
+*/
+function checkFrequency(frequency) {
+	if (!BACKUP_FREQUENCIES.includes(frequency)) throw new ValidationError(`Invalid frequency "${frequency}": use ${BACKUP_FREQUENCIES.join(", ")}`, "frequency");
+}
+/**
+* Parse the --retention value: an integer from 1 to 8760.
+*/
+function parseRetention(value) {
+	const retention = Number(value);
+	if (!Number.isInteger(retention) || retention < 1 || retention > 8760) throw new ValidationError(`Invalid retention "${String(value)}": use a number of backups from 1 to 8760`, "retention");
+	return retention;
+}
+/**
+* Resolve a storage provider ID or exact name to its numeric ID.
+*/
+async function resolveStorageProviderId(value, execCtx) {
+	if (isId(value)) return Number(value);
+	const { data } = await listStorageProviders({}, execCtx);
+	const matches = data.filter((p) => p.name === value);
+	if (matches.length === 0) throw new ValidationError(`No storage provider named "${value}"`, "storage-provider", ["List the storage providers with: forge storage-providers list"]);
+	if (matches.length > 1) throw new ValidationError(`${matches.length} storage providers are named "${value}": use the ID (${matches.map((p) => p.id).join(", ")})`, "storage-provider");
+	return matches[0].id;
+}
+/**
+* Resolve database IDs or exact names to numeric IDs. Names are looked up on the server.
+*/
+async function resolveDatabaseIds(values, server_id, execCtx) {
+	if (values.every(isId)) return values.map(Number);
+	const { data } = await listDatabases({ server_id }, execCtx);
+	return values.map((value) => {
+		if (isId(value)) return Number(value);
+		const database = data.find((db) => db.name === value);
+		if (!database) throw new ValidationError(`No database named "${value}" on the server`, "databases", [`List the databases with: forge databases list --server ${server_id}`]);
+		return database.id;
+	});
+}
+/**
+* Read the optional backup configuration fields that map one to one to the API.
+*/
+function optionalBackupFields(options) {
+	const fields = {};
+	for (const [option, field] of Object.entries({
+		name: "name",
+		bucket: "bucket",
+		directory: "directory",
+		day: "day",
+		time: "time",
+		cron: "cron",
+		"notification-email": "notification_email"
+	})) {
+		const value = options[option];
+		if (typeof value === "string") fields[field] = value;
+	}
+	return fields;
+}
+//#endregion
 //#region src/commands/backups/handlers.ts
+/** Retention when --retention is not given: Forge requires a value. */
+var DEFAULT_RETENTION = 5;
 async function backupsList(ctx) {
 	const server = String(ctx.options.server ?? "");
 	if (!server) exitWithValidationError("server_id", "forge backups list --server <server_id>", ctx.formatter);
@@ -153,7 +234,10 @@ async function backupsGet(args, ctx) {
 		ctx.formatter.outputOne(result.data, [
 			"id",
 			"name",
+			"storage_provider_id",
 			"provider",
+			"bucket",
+			"directory",
 			"schedule",
 			"displayable_schedule",
 			"retention",
@@ -162,58 +246,65 @@ async function backupsGet(args, ctx) {
 		]);
 	}, ctx.formatter);
 }
+var CREATE_USAGE$2 = "forge backups create --server <server> --storage-provider <id|name> --frequency <hourly|daily|weekly|custom> --databases <ids|names> [--retention <n>]";
 async function backupsCreate(ctx) {
 	const server = String(ctx.options.server ?? "");
-	const storageProviderId = Number(ctx.options.provider ?? 0);
-	const frequency = String(ctx.options.frequency ?? "");
-	const databaseIdsRaw = ctx.options.databases;
-	const database_ids = Array.isArray(databaseIdsRaw) ? databaseIdsRaw.map(Number) : databaseIdsRaw ? [Number(databaseIdsRaw)] : [];
-	if (!server) exitWithValidationError("server_id", "forge backups create --server <server_id> --provider <provider> --frequency <frequency>", ctx.formatter);
-	if (!storageProviderId) exitWithValidationError("provider", "forge backups create --server <server_id> --provider <provider> --frequency <frequency>", ctx.formatter);
-	if (!frequency) exitWithValidationError("frequency", "forge backups create --server <server_id> --provider <provider> --frequency <frequency>", ctx.formatter);
+	const storageProvider = ctx.options["storage-provider"];
+	const frequency = ctx.options.frequency;
+	const databases = listValues(ctx.options.databases);
+	if (!server) exitWithValidationError("server_id", CREATE_USAGE$2, ctx.formatter);
+	if (typeof storageProvider !== "string" || !storageProvider) exitWithValidationError("storage-provider", CREATE_USAGE$2, ctx.formatter);
+	if (typeof frequency !== "string" || !frequency) exitWithValidationError("frequency", CREATE_USAGE$2, ctx.formatter);
+	if (databases.length === 0) exitWithValidationError("databases", CREATE_USAGE$2, ctx.formatter);
 	await runCommand(async () => {
+		checkFrequency(frequency);
+		const retention = ctx.options.retention === void 0 ? DEFAULT_RETENTION : parseRetention(ctx.options.retention);
 		const token = ctx.getToken();
 		const execCtx = ctx.createExecutorContext(token);
+		const server_id = await resolveServerId(server, execCtx);
+		const storage_provider_id = await resolveStorageProviderId(storageProvider, execCtx);
+		const database_ids = await resolveDatabaseIds(databases, server_id, execCtx);
 		await createBackupConfig({
-			server_id: await resolveServerId(server, execCtx),
-			storage_provider_id: storageProviderId,
+			server_id,
+			storage_provider_id,
 			frequency,
-			retention: 5,
-			database_ids
+			retention,
+			database_ids,
+			...ctx.options["include-new-databases"] === true ? { include_new_databases: true } : {},
+			...optionalBackupFields(ctx.options)
 		}, execCtx);
 		ctx.formatter.success("Backup configuration created.");
 	}, ctx.formatter);
 }
+var UPDATE_USAGE = "forge backups update <backup_id> --server <server> --storage-provider <id|name> --frequency <hourly|daily|weekly|custom> --retention <n> --databases <ids|names>";
 async function backupsUpdate(args, ctx) {
 	const [id] = args;
 	const server = String(ctx.options.server ?? "");
-	const storageProviderId = Number(ctx.options.provider ?? 0);
-	const frequency = String(ctx.options.frequency ?? "");
-	const retention = Number(ctx.options.retention ?? 0);
-	const databaseIdsRaw = ctx.options.databases;
-	const database_ids = Array.isArray(databaseIdsRaw) ? databaseIdsRaw.map(Number) : databaseIdsRaw ? [Number(databaseIdsRaw)] : [];
-	if (!id) exitWithValidationError("backup_id", "forge backups update <backup_id> --server <server_id> --provider <provider> --frequency <frequency> --retention <retention>", ctx.formatter);
-	if (!server) exitWithValidationError("server_id", "forge backups update <backup_id> --server <server_id> --provider <provider> --frequency <frequency> --retention <retention>", ctx.formatter);
-	if (!storageProviderId) exitWithValidationError("provider", "forge backups update <backup_id> --server <server_id> --provider <provider> --frequency <frequency> --retention <retention>", ctx.formatter);
-	if (!frequency) exitWithValidationError("frequency", "forge backups update <backup_id> --server <server_id> --provider <provider> --frequency <frequency> --retention <retention>", ctx.formatter);
-	if (!retention) exitWithValidationError("retention", "forge backups update <backup_id> --server <server_id> --provider <provider> --frequency <frequency> --retention <retention>", ctx.formatter);
+	const storageProvider = ctx.options["storage-provider"];
+	const frequency = ctx.options.frequency;
+	const databases = listValues(ctx.options.databases);
+	if (!id) exitWithValidationError("backup_id", UPDATE_USAGE, ctx.formatter);
+	if (!server) exitWithValidationError("server_id", UPDATE_USAGE, ctx.formatter);
+	if (typeof storageProvider !== "string" || !storageProvider) exitWithValidationError("storage-provider", UPDATE_USAGE, ctx.formatter);
+	if (typeof frequency !== "string" || !frequency) exitWithValidationError("frequency", UPDATE_USAGE, ctx.formatter);
+	if (ctx.options.retention === void 0) exitWithValidationError("retention", UPDATE_USAGE, ctx.formatter);
+	if (databases.length === 0) exitWithValidationError("databases", UPDATE_USAGE, ctx.formatter);
 	await runCommand(async () => {
+		checkFrequency(frequency);
+		const retention = parseRetention(ctx.options.retention);
 		const token = ctx.getToken();
 		const execCtx = ctx.createExecutorContext(token);
+		const server_id = await resolveServerId(server, execCtx);
+		const storage_provider_id = await resolveStorageProviderId(storageProvider, execCtx);
+		const database_ids = await resolveDatabaseIds(databases, server_id, execCtx);
 		await updateBackupConfig({
-			server_id: await resolveServerId(server, execCtx),
+			server_id,
 			id,
-			storage_provider_id: storageProviderId,
+			storage_provider_id,
 			frequency,
 			retention,
 			database_ids,
-			...ctx.options.name != null ? { name: String(ctx.options.name) } : {},
-			...ctx.options.bucket != null ? { bucket: String(ctx.options.bucket) } : {},
-			...ctx.options.directory != null ? { directory: String(ctx.options.directory) } : {},
-			...ctx.options.day != null ? { day: String(ctx.options.day) } : {},
-			...ctx.options.time != null ? { time: String(ctx.options.time) } : {},
-			...ctx.options.cron != null ? { cron: String(ctx.options.cron) } : {},
-			...ctx.options["notification-email"] != null ? { notification_email: String(ctx.options["notification-email"]) } : {}
+			...optionalBackupFields(ctx.options)
 		}, execCtx);
 		ctx.formatter.success(`Backup configuration ${id} updated.`);
 	}, ctx.formatter);
@@ -271,37 +362,50 @@ ${colors.bold("USAGE:")}
   forge backups get <backup_id> --server <server_id> [options]
 `);
 	else if (subcommand === "create") console.log(`
-${colors.bold("forge backups create")} - Create a new backup configuration
+${colors.bold("forge backups create")} - Create a database backup configuration
 
 ${colors.bold("USAGE:")}
-  forge backups create --server <server_id> --provider <provider> --frequency <frequency> [options]
+  forge backups create --server <server> --storage-provider <id|name> --frequency <frequency> --databases <ids|names> [options]
 
 ${colors.bold("OPTIONS:")}
-  --server <id>         Server ID (required)
-  --provider <name>     Backup provider (required)
-  --frequency <freq>    Backup frequency (required)
-  --databases <ids>     Comma-separated database IDs to back up (optional)
-  -f, --format <fmt>    Output format: json, human, table
+  --server <id|name>             Server ID or name (required)
+  --storage-provider <id|name>   Storage provider ID or exact name (required, see forge storage-providers list)
+  --frequency <freq>             hourly, daily, weekly or custom (required)
+  --databases <ids|names>        Database IDs or exact names, comma separated or repeated (required)
+  --retention <n>                Number of backups to keep, 1 to 8760 (default: 5)
+  --time <HH:MM>                 Daily and weekly: time on the hour or half hour, e.g. 02:00
+  --day <0-6>                    Weekly: day of week, 0 is Sunday
+  --cron <expr>                  Custom: cron expression
+  --bucket <bucket>              Bucket (default: the storage provider bucket)
+  --directory <dir>              Directory in the bucket
+  --name <name>                  Configuration name
+  --notification-email <email>   Email notified when a backup fails
+  --include-new-databases        Also back up databases created later
+  -f, --format <fmt>             Output format: json, human, table
+
+${colors.bold("EXAMPLE:")}
+  forge backups create --server web-1 --storage-provider Backups --frequency daily \\
+    --time 02:00 --retention 7 --directory web-1 --databases app,wordpress
 `);
 	else if (subcommand === "update") console.log(`
-${colors.bold("forge backups update")} - Update a backup configuration
+${colors.bold("forge backups update")} - Update a database backup configuration
 
 ${colors.bold("USAGE:")}
-  forge backups update <backup_id> --server <server_id> --provider <provider> --frequency <frequency> --retention <retention> [options]
+  forge backups update <backup_id> --server <server> --storage-provider <id|name> --frequency <frequency> --retention <n> --databases <ids|names> [options]
 
 ${colors.bold("OPTIONS:")}
-  --server <id>                  Server ID (required)
-  --provider <id>                Storage provider ID (required)
-  --frequency <freq>             Backup frequency (required)
-  --retention <n>                Retention count (required)
-  --databases <ids>              Comma-separated database IDs (optional)
-  --name <name>                  Backup name (optional)
-  --bucket <bucket>              Bucket name (optional)
-  --directory <dir>              Directory (optional)
-  --day <day>                    Day of week (optional)
-  --time <time>                  Time (optional)
-  --cron <cron>                  Cron expression (optional)
-  --notification-email <email>   Notification email (optional)
+  --server <id|name>             Server ID or name (required)
+  --storage-provider <id|name>   Storage provider ID or exact name (required)
+  --frequency <freq>             hourly, daily, weekly or custom (required)
+  --retention <n>                Number of backups to keep, 1 to 8760 (required)
+  --databases <ids|names>        Database IDs or exact names, comma separated or repeated (required)
+  --time <HH:MM>                 Daily and weekly: time on the hour or half hour
+  --day <0-6>                    Weekly: day of week, 0 is Sunday
+  --cron <expr>                  Custom: cron expression
+  --bucket <bucket>              Bucket
+  --directory <dir>              Directory in the bucket
+  --name <name>                  Configuration name
+  --notification-email <email>   Email notified when a backup fails
   -f, --format <fmt>             Output format: json, human, table
 `);
 	else if (subcommand === "delete") console.log(`
@@ -345,11 +449,11 @@ _forge_completions() {
   prev="\${COMP_WORDS[COMP_CWORD-1]}"
 
   # Main commands
-  commands="config servers s sites deployments d databases db database-users daemons env nginx certificates certs firewall-rules fw ssh ssh-keys backups commands scheduled-jobs services php user monitors nginx-templates security-rules redirect-rules recipes completion help"
+  commands="config servers s sites deployments d databases db database-users daemons env nginx certificates certs firewall-rules fw ssh ssh-keys backups storage-providers commands scheduled-jobs services php user monitors nginx-templates security-rules redirect-rules recipes completion help"
 
   # Subcommands for each command
   local config_cmds="set get delete"
-  local servers_cmds="list ls get reboot"
+  local servers_cmds="list ls get create reboot"
   local sites_cmds="list ls get"
   local deployments_cmds="list ls deploy logs log script update-script"
   local databases_cmds="list ls get"
@@ -360,7 +464,8 @@ _forge_completions() {
   local certificates_cmds="get activate"
   local firewall_rules_cmds="list ls get"
   local ssh_keys_cmds="list ls get sync"
-  local backups_cmds="list ls get create delete"
+  local backups_cmds="list ls get create update delete"
+  local storage_providers_cmds="list ls get create delete"
   local commands_cmds="list ls get create"
   local scheduled_jobs_cmds="list ls get create delete"
   local services_cmds="list ls restart"
@@ -374,7 +479,7 @@ _forge_completions() {
   local completion_cmds="bash zsh fish"
 
   # Global options
-  options="--token --server --site -f --format --no-color -h --help -v --version --name --command --content --from --to --provider --frequency --type --operator --threshold --minutes --key --port --ip-address --user --private --dry-run --script --servers --domain --password --credential-id --region --size --project-type --directory --file --script-file --check --all-servers --prune"
+  options="--token --server --site -f --format --no-color -h --help -v --version --name --command --content --from --to --provider --frequency --cron --type --operator --threshold --minutes --key --port --ip-address --user --private --dry-run --script --servers --domain --password --credential-id --region --size --project-type --directory --file --script-file --check --all-servers --prune --ubuntu-version --php-version --database --private-ip --ssh-port --tag --storage-provider --databases --retention --time --day --bucket --notification-email --include-new-databases --endpoint --access-key --secret-key-file --assume-role"
 
   # Format options
   local formats="json human table"
@@ -427,6 +532,9 @@ _forge_completions() {
         backups)
           COMPREPLY=( $(compgen -W "\${backups_cmds}" -- "\${cur}") )
           ;;
+        storage-providers)
+          COMPREPLY=( $(compgen -W "\${storage_providers_cmds}" -- "\${cur}") )
+          ;;
         commands)
           COMPREPLY=( $(compgen -W "\${commands_cmds}" -- "\${cur}") )
           ;;
@@ -475,7 +583,7 @@ _forge_completions() {
           # Complete file paths
           COMPREPLY=( $(compgen -f -- "\${cur}") )
           ;;
-        --token|--server|--site|--version|--name|--command|--content|--from|--to|--provider|--frequency|--type|--operator|--threshold|--minutes|--key|--port|--ip-address|--user|--script|--servers|--domain|--password|--credential-id|--region|--size|--project-type|--directory)
+        --token|--server|--site|--version|--name|--command|--content|--from|--to|--provider|--frequency|--cron|--type|--operator|--threshold|--minutes|--key|--port|--ip-address|--user|--script|--servers|--domain|--password|--credential-id|--region|--size|--project-type|--directory|--ubuntu-version|--php-version|--database|--private-ip|--ssh-port|--tag|--storage-provider|--databases|--retention|--time|--day|--bucket|--notification-email|--endpoint|--access-key)
           # No completion for values requiring arguments
           COMPREPLY=()
           ;;
@@ -523,7 +631,8 @@ _forge() {
         'fw:Manage firewall rules (alias)'
         'ssh:Open an SSH session to a server'
         'ssh-keys:Manage SSH keys'
-        'backups:Manage backup configurations'
+        'backups:Manage database backup configurations'
+        'storage-providers:Manage the storage providers of database backups'
         'commands:Manage site commands'
         'scheduled-jobs:Manage scheduled jobs'
         'services:List and restart server services'
@@ -556,6 +665,7 @@ _forge() {
             'list:List all servers'
             'ls:List all servers (alias)'
             'get:Get server details'
+            'create:Create a server'
             'reboot:Reboot a server'
           )
           _describe 'servers command' servers_cmds
@@ -664,10 +774,22 @@ _forge() {
             'ls:List backup configurations (alias)'
             'get:Get backup configuration details'
             'create:Create a backup configuration'
+            'update:Update a backup configuration'
             'delete:Delete a backup configuration'
           )
           _describe 'backups command' backups_cmds
           ;;
+        storage-providers)
+          local -a storage_providers_cmds
+          storage_providers_cmds=(
+            'list:List storage providers'
+            'ls:List storage providers (alias)'
+            'get:Get storage provider details'
+            'create:Create a storage provider'
+            'delete:Delete a storage provider'
+          )
+          _describe 'storage-providers command' storage_providers_cmds
+          ;;
         commands)
           local -a commands_cmds
           commands_cmds=(
@@ -805,6 +927,7 @@ _forge() {
         '--to[To]:to:' \\
         '--provider[Provider]:provider:' \\
         '--frequency[Frequency]:frequency:' \\
+        '--cron[Cron expression]:cron:' \\
         '--type[Type]:type:' \\
         '--operator[Operator]:operator:' \\
         '--threshold[Threshold]:threshold:' \\
@@ -822,12 +945,31 @@ _forge() {
         '--size[Size]:size:' \\
         '--project-type[Project type]:project type:' \\
         '--directory[Directory]:directory:' \\
+        '--ubuntu-version[Ubuntu version]:ubuntu version:' \\
+        '--php-version[PHP version]:php version:' \\
+        '--database[Database type]:database type:' \\
+        '--private-ip[Private IP address]:private ip address:' \\
+        '--ssh-port[SSH port]:ssh port:' \\
+        '--tag[Tag]:tag:' \\
         '--file[File path (- for stdin)]:file:_files' \\
         '--script-file[Deployment script file]:file:_files' \\
         '--all-servers[Target every server]' \\
         '--prune[Remove SSH keys that are not in the file]' \\
         '--dry-run[Print the plan and change nothing]' \\
-        '--check[Compare with Forge, do not write]'
+        '--check[Compare with Forge, do not write]' \\
+        '--storage-provider[Storage provider ID or name]:storage provider:' \\
+        '--databases[Database IDs or names]:databases:' \\
+        '--retention[Number of backups to keep]:retention:' \\
+        '--time[Backup time (HH:MM)]:time:' \\
+        '--day[Backup day of week (0-6)]:day:' \\
+        '--cron[Cron expression]:cron:' \\
+        '--bucket[Bucket]:bucket:' \\
+        '--notification-email[Notification email]:email:' \\
+        '--include-new-databases[Also back up new databases]' \\
+        '--endpoint[S3 endpoint URL]:endpoint:' \\
+        '--access-key[Access key ID]:access key:' \\
+        '--secret-key-file[Secret key file (- for stdin)]:file:_files' \\
+        '--assume-role[Use the EC2 instance role]'
       ;;
   esac
 }
@@ -855,7 +997,8 @@ complete -c forge -f -n "__fish_use_subcommand" -a "firewall-rules" -d "Manage f
 complete -c forge -f -n "__fish_use_subcommand" -a "fw" -d "Manage firewall rules (alias)"
 complete -c forge -f -n "__fish_use_subcommand" -a "ssh" -d "Open an SSH session to a server"
 complete -c forge -f -n "__fish_use_subcommand" -a "ssh-keys" -d "Manage SSH keys"
-complete -c forge -f -n "__fish_use_subcommand" -a "backups" -d "Manage backup configurations"
+complete -c forge -f -n "__fish_use_subcommand" -a "backups" -d "Manage database backup configurations"
+complete -c forge -f -n "__fish_use_subcommand" -a "storage-providers" -d "Manage the storage providers of database backups"
 complete -c forge -f -n "__fish_use_subcommand" -a "commands" -d "Manage site commands"
 complete -c forge -f -n "__fish_use_subcommand" -a "scheduled-jobs" -d "Manage scheduled jobs"
 complete -c forge -f -n "__fish_use_subcommand" -a "services" -d "List and restart server services"
@@ -878,6 +1021,7 @@ complete -c forge -f -n "__fish_seen_subcommand_from config" -a "delete" -d "Del
 complete -c forge -f -n "__fish_seen_subcommand_from servers s" -a "list" -d "List all servers"
 complete -c forge -f -n "__fish_seen_subcommand_from servers s" -a "ls" -d "List all servers (alias)"
 complete -c forge -f -n "__fish_seen_subcommand_from servers s" -a "get" -d "Get server details"
+complete -c forge -f -n "__fish_seen_subcommand_from servers s" -a "create" -d "Create a server"
 complete -c forge -f -n "__fish_seen_subcommand_from servers s" -a "reboot" -d "Reboot a server"
 
 # sites subcommands
@@ -943,8 +1087,16 @@ complete -c forge -f -n "__fish_seen_subcommand_from backups" -a "list" -d "List
 complete -c forge -f -n "__fish_seen_subcommand_from backups" -a "ls" -d "List backup configurations (alias)"
 complete -c forge -f -n "__fish_seen_subcommand_from backups" -a "get" -d "Get backup configuration details"
 complete -c forge -f -n "__fish_seen_subcommand_from backups" -a "create" -d "Create a backup configuration"
+complete -c forge -f -n "__fish_seen_subcommand_from backups" -a "update" -d "Update a backup configuration"
 complete -c forge -f -n "__fish_seen_subcommand_from backups" -a "delete" -d "Delete a backup configuration"
 
+# storage-providers subcommands
+complete -c forge -f -n "__fish_seen_subcommand_from storage-providers" -a "list" -d "List storage providers"
+complete -c forge -f -n "__fish_seen_subcommand_from storage-providers" -a "ls" -d "List storage providers (alias)"
+complete -c forge -f -n "__fish_seen_subcommand_from storage-providers" -a "get" -d "Get storage provider details"
+complete -c forge -f -n "__fish_seen_subcommand_from storage-providers" -a "create" -d "Create a storage provider"
+complete -c forge -f -n "__fish_seen_subcommand_from storage-providers" -a "delete" -d "Delete a storage provider"
+
 # commands subcommands
 complete -c forge -f -n "__fish_seen_subcommand_from commands" -a "list" -d "List commands"
 complete -c forge -f -n "__fish_seen_subcommand_from commands" -a "ls" -d "List commands (alias)"
@@ -1034,6 +1186,7 @@ complete -c forge -l from -d "From" -r
 complete -c forge -l to -d "To" -r
 complete -c forge -l provider -d "Provider" -r
 complete -c forge -l frequency -d "Frequency" -r
+complete -c forge -l cron -d "Cron expression" -r
 complete -c forge -l type -d "Type" -r
 complete -c forge -l operator -d "Operator" -r
 complete -c forge -l threshold -d "Threshold" -r
@@ -1055,8 +1208,27 @@ complete -c forge -l file -d "File path (- for stdin)" -r -F
 complete -c forge -l script-file -d "Deployment script file" -r -F
 complete -c forge -l all-servers -d "Target every server"
 complete -c forge -l prune -d "Remove SSH keys that are not in the file"
+complete -c forge -l ubuntu-version -d "Ubuntu version" -r
+complete -c forge -l php-version -d "PHP version" -r
+complete -c forge -l database -d "Database type" -r
+complete -c forge -l private-ip -d "Private IP address" -r
+complete -c forge -l ssh-port -d "SSH port" -r
+complete -c forge -l tag -d "Tag" -r
 complete -c forge -l dry-run -d "Print the plan and change nothing"
 complete -c forge -l check -d "Compare with Forge, do not write"
+complete -c forge -l storage-provider -d "Storage provider ID or name" -r
+complete -c forge -l databases -d "Database IDs or names" -r
+complete -c forge -l retention -d "Number of backups to keep" -r
+complete -c forge -l time -d "Backup time (HH:MM)" -r
+complete -c forge -l day -d "Backup day of week (0-6)" -r
+complete -c forge -l cron -d "Cron expression" -r
+complete -c forge -l bucket -d "Bucket" -r
+complete -c forge -l notification-email -d "Notification email" -r
+complete -c forge -l include-new-databases -d "Also back up new databases"
+complete -c forge -l endpoint -d "S3 endpoint URL" -r
+complete -c forge -l access-key -d "Access key ID" -r
+complete -c forge -l secret-key-file -d "Secret key file (- for stdin)" -r -F
+complete -c forge -l assume-role -d "Use the EC2 instance role"
 `;
 /**
 * Get the appropriate completion file path for the shell
@@ -1434,7 +1606,7 @@ function handleConfigCommand(subcommand, args, options) {
 	const rawFormat = options.format ?? options.f ?? "human";
 	const format = isOutputFormat(rawFormat) ? rawFormat : "human";
 	const formatter = new OutputFormatter(format, options["no-color"] === true);
-	const store = createConfigStore();
+	const store = createConfigStore$1();
 	switch (subcommand) {
 		case "set": {
 			const [key, value] = args;
@@ -1461,7 +1633,7 @@ function handleConfigCommand(subcommand, args, options) {
 			break;
 		}
 		case "get": {
-			const token = getToken(store);
+			const token = getToken$1(store);
 			const orgSlug = getOrganizationSlug(store);
 			if (format === "json") formatter.output({
 				apiToken: token ? maskToken(token) : null,
@@ -3832,7 +4004,16 @@ ${colors.bold("USAGE:")}
 ${colors.bold("OPTIONS:")}
   --server <id>         Server ID (required)
   --command <cmd>       Command to run (required)
+  --site <id>           Site ID, to create the job on a site
+  --user <user>         User that runs the command (default: forge)
+  --frequency <freq>    minutely, hourly, nightly, weekly, monthly, reboot
+                        or custom (default: custom)
+  --cron <expr>         Cron expression, used when --frequency is custom
   -f, --format <fmt>    Output format: json, human, table
+
+${colors.bold("EXAMPLES:")}
+  forge scheduled-jobs create --server web-1 --command "php artisan schedule:run" --frequency minutely
+  forge scheduled-jobs create --server web-1 --command "php artisan backup:run" --cron "0 3 * * *"
 `);
 	else if (subcommand === "delete") console.log(`
 ${colors.bold("forge scheduled-jobs delete")} - Delete a scheduled job
@@ -4068,10 +4249,6 @@ Run ${colors.cyan("forge security-rules <subcommand> --help")} for details.
 //#endregion
 //#region src/commands/servers/handlers.ts
 /**
-* CLI handlers for servers commands.
-* Delegates all HTTP logic to forge-core executors.
-*/
-/**
 * List all servers.
 */
 async function serversList(ctx) {
@@ -4102,6 +4279,57 @@ async function serversGet(args, ctx) {
 		ctx.formatter.output(result.data);
 	}, ctx.formatter);
 }
+var CREATE_USAGE$1 = "forge servers create --name <name> --ip-address <ip> [options]";
+/**
+* Create a server. Defaults to a Custom VPS app server on Ubuntu 26.04.
+*/
+async function serversCreate(ctx) {
+	const name = String(ctx.options.name ?? "");
+	const provider = String(ctx.options.provider ?? "custom");
+	const ip_address = String(ctx.options["ip-address"] ?? "");
+	if (!name) exitWithValidationError("name", CREATE_USAGE$1, ctx.formatter);
+	if (provider === "custom" && !ip_address) exitWithValidationError("ip-address", CREATE_USAGE$1, ctx.formatter);
+	if (provider !== "custom") {
+		for (const option of [
+			"credential-id",
+			"region",
+			"size"
+		]) if (!ctx.options[option]) exitWithValidationError(option, CREATE_USAGE$1, ctx.formatter);
+	}
+	const options = {
+		name,
+		provider,
+		type: String(ctx.options.type ?? "app"),
+		ubuntu_version: String(ctx.options["ubuntu-version"] ?? "26.04"),
+		php_version: String(ctx.options["php-version"] ?? "php84")
+	};
+	if (ctx.options.database) options.database_type = String(ctx.options.database);
+	if (ctx.options["credential-id"]) options.credential_id = String(ctx.options["credential-id"]);
+	const tags = ctx.options.tag;
+	if (tags) options.tags = (Array.isArray(tags) ? tags : [tags]).map(String);
+	if (provider === "custom") {
+		options.custom = {
+			ip_address,
+			ssh_port: String(ctx.options["ssh-port"] ?? "22")
+		};
+		if (ctx.options["private-ip"]) options.custom.private_ip_address = String(ctx.options["private-ip"]);
+	} else options[provider] = {
+		region_id: String(ctx.options.region),
+		size_id: String(ctx.options.size)
+	};
+	await runCommand(async () => {
+		const token = ctx.getToken();
+		const execCtx = ctx.createExecutorContext(token);
+		const result = await createServer(options, execCtx);
+		const format = String(ctx.options.format ?? ctx.options.f ?? "human");
+		if (format === "table" || format === "json") {
+			ctx.formatter.output(result.data);
+			return;
+		}
+		ctx.formatter.success(`Server ${result.data.name} created (ID ${result.data.id}).`);
+		if (provider === "custom") ctx.formatter.info(`Run the provisioning command from the Forge server page as root on ${ip_address}.`);
+	}, ctx.formatter);
+}
 /**
 * Reboot a server by ID or name.
 */
@@ -4124,9 +4352,10 @@ var handleServersCommand = createCommandRouter({
 		list: serversList,
 		ls: serversList,
 		get: [serversGet, "args"],
+		create: serversCreate,
 		reboot: [serversReboot, "args"]
 	},
-	writeSubcommands: ["reboot"]
+	writeSubcommands: ["create", "reboot"]
 });
 //#endregion
 //#region src/commands/servers/help.ts
@@ -4162,6 +4391,35 @@ ${colors.bold("OPTIONS:")}
 ${colors.bold("EXAMPLES:")}
   forge servers get 123
   forge servers get 123 --format json
+`);
+	else if (subcommand === "create") console.log(`
+${colors.bold("forge servers create")} - Create a server
+
+${colors.bold("USAGE:")}
+  forge servers create --name <name> --ip-address <ip> [options]
+
+${colors.bold("OPTIONS:")}
+  --name <name>              Server name (required, 30 characters max)
+  --provider <provider>      Server provider (default: custom)
+  --ip-address <ip>          Public IP address (required for custom)
+  --private-ip <ip>          Private IP address (custom only)
+  --ssh-port <port>          SSH port (custom only, default: 22)
+  --region <id>              Region ID (cloud providers)
+  --size <id>                Size ID (cloud providers)
+  --credential-id <id>       Server provider credential ID (cloud providers)
+  --type <type>              Server type: app, web, loadbalancer, database... (default: app)
+  --ubuntu-version <ver>     Ubuntu version (default: 26.04)
+  --php-version <ver>        PHP version (default: php84)
+  --database <type>          Database type, e.g. mariadb1011
+  --tag <tag>                Tag, repeatable
+  -f, --format <fmt>         Output format: json, human, table
+
+A Custom VPS must run a fresh Ubuntu with root SSH access. After the
+command, run the provisioning command from the Forge server page as root.
+
+${colors.bold("EXAMPLES:")}
+  forge servers create --name web-1 --ip-address 203.0.113.10 --php-version php84 --database mariadb1011
+  forge servers create --name worker-1 --provider hetzner --credential-id 42 --region fsn1 --size cpx31
 `);
 	else if (subcommand === "reboot") console.log(`
 ${colors.bold("forge servers reboot")} - Reboot a server
@@ -4187,6 +4445,7 @@ ${colors.bold("ALIASES:")}
 ${colors.bold("SUBCOMMANDS:")}
   list, ls            List all servers
   get <id>            Get server details
+  create              Create a server (requires --name, and --ip-address for custom)
   reboot <id>         Reboot a server
 
 ${colors.bold("OPTIONS:")}
@@ -5007,6 +5266,183 @@ Run ${colors.cyan("forge ssh-keys <subcommand> --help")} for details.
 `);
 }
 //#endregion
+//#region src/commands/storage-providers/handlers.ts
+var FIELDS = [
+	"id",
+	"name",
+	"provider",
+	"provider_name",
+	"endpoint",
+	"region",
+	"bucket",
+	"directory",
+	"in_use"
+];
+var CREATE_USAGE = "forge storage-providers create --name <name> --provider <type> [--endpoint <url>] [--region <region>] [--bucket <bucket>] [--access-key <id>] [--secret-key-file <path|->]";
+async function storageProvidersList(ctx) {
+	const provider = typeof ctx.options.provider === "string" ? ctx.options.provider : void 0;
+	await runCommand(async () => {
+		const token = ctx.getToken();
+		const execCtx = ctx.createExecutorContext(token);
+		const result = await listStorageProviders(provider ? { provider } : {}, execCtx);
+		ctx.formatter.outputList(result.data, [
+			"id",
+			"name",
+			"provider",
+			"bucket",
+			"in_use"
+		], "No storage providers found.", (p) => `${String(p.id).padEnd(8)} ${p.name.padEnd(24)} ${p.provider.padEnd(10)} ${p.bucket ?? "—"}${p.in_use ? " (in use)" : ""}`);
+	}, ctx.formatter);
+}
+async function storageProvidersGet(args, ctx) {
+	const [id] = args;
+	if (!id) exitWithValidationError("id", "forge storage-providers get <id>", ctx.formatter);
+	await runCommand(async () => {
+		const token = ctx.getToken();
+		const execCtx = ctx.createExecutorContext(token);
+		const result = await getStorageProvider({ id }, execCtx);
+		ctx.formatter.outputOne(result.data, FIELDS);
+	}, ctx.formatter);
+}
+/**
+* Read an optional string option. A flag given without a value is a validation error.
+*/
+function stringOption(ctx, name) {
+	const value = ctx.options[name];
+	if (value === void 0) return void 0;
+	if (typeof value !== "string" || !value) exitWithError(new ValidationError(`--${name} requires a value`, name, [`Usage: ${CREATE_USAGE}`]), ctx.formatter);
+	return value;
+}
+async function storageProvidersCreate(ctx) {
+	const name = ctx.options.name;
+	const provider = ctx.options.provider;
+	if (typeof name !== "string" || !name) exitWithValidationError("name", CREATE_USAGE, ctx.formatter);
+	if (typeof provider !== "string" || !provider) exitWithValidationError("provider", CREATE_USAGE, ctx.formatter);
+	if (!STORAGE_PROVIDER_TYPES.includes(provider)) exitWithError(new ValidationError(`Invalid provider "${provider}": use ${STORAGE_PROVIDER_TYPES.join(", ")}`, "provider"), ctx.formatter);
+	const endpoint = stringOption(ctx, "endpoint");
+	const region = stringOption(ctx, "region");
+	const bucket = stringOption(ctx, "bucket");
+	const directory = stringOption(ctx, "directory");
+	const accessKey = stringOption(ctx, "access-key");
+	const secretKey = ctx.options["secret-key-file"] === void 0 ? void 0 : readContentFile(ctx.options["secret-key-file"], "secret-key-file", {
+		label: "secret key",
+		usage: CREATE_USAGE,
+		formatter: ctx.formatter
+	}).replace(/\r?\n$/, "");
+	await runCommand(async () => {
+		const token = ctx.getToken();
+		const execCtx = ctx.createExecutorContext(token);
+		const result = await createStorageProvider({
+			name,
+			provider,
+			...endpoint !== void 0 ? { endpoint } : {},
+			...region !== void 0 ? { region } : {},
+			...bucket !== void 0 ? { bucket } : {},
+			...directory !== void 0 ? { directory } : {},
+			...accessKey !== void 0 ? { access_key: accessKey } : {},
+			...secretKey !== void 0 ? { secret_key: secretKey } : {},
+			...ctx.options["assume-role"] === true ? { assume_role: true } : {}
+		}, execCtx);
+		ctx.formatter.outputOne(result.data, FIELDS);
+	}, ctx.formatter);
+}
+async function storageProvidersDelete(args, ctx) {
+	const [id] = args;
+	if (!id) exitWithValidationError("id", "forge storage-providers delete <id>", ctx.formatter);
+	await runCommand(async () => {
+		const token = ctx.getToken();
+		const execCtx = ctx.createExecutorContext(token);
+		await deleteStorageProvider({ id }, execCtx);
+		ctx.formatter.success(`Storage provider ${id} deleted.`);
+	}, ctx.formatter);
+}
+//#endregion
+//#region src/commands/storage-providers/command.ts
+var handleStorageProvidersCommand = createCommandRouter({
+	resource: "storage-providers",
+	handlers: {
+		list: storageProvidersList,
+		ls: storageProvidersList,
+		get: [storageProvidersGet, "args"],
+		create: storageProvidersCreate,
+		delete: [storageProvidersDelete, "args"]
+	},
+	writeSubcommands: ["create", "delete"]
+});
+//#endregion
+//#region src/commands/storage-providers/help.ts
+function showStorageProvidersHelp(subcommand) {
+	if (subcommand === "list" || subcommand === "ls") console.log(`
+${colors.bold("forge storage-providers list")} - List the organization's storage providers
+
+${colors.bold("USAGE:")}
+  forge storage-providers list [options]
+
+${colors.bold("OPTIONS:")}
+  --provider <type>   Only list one provider type (s3, spaces, hetzner, ovh, scaleway, custom)
+  -f, --format <fmt>  Output format: json, human, table
+`);
+	else if (subcommand === "get") console.log(`
+${colors.bold("forge storage-providers get")} - Get storage provider details
+
+${colors.bold("USAGE:")}
+  forge storage-providers get <id> [options]
+
+Forge never returns the access key or the secret key.
+`);
+	else if (subcommand === "create") console.log(`
+${colors.bold("forge storage-providers create")} - Create a storage provider for database backups
+
+${colors.bold("USAGE:")}
+  forge storage-providers create --name <name> --provider <type> [options]
+
+${colors.bold("OPTIONS:")}
+  --name <name>              Provider name (required)
+  --provider <type>          s3, spaces, hetzner, ovh, scaleway or custom (S3 compatible) (required)
+  --endpoint <url>           S3 endpoint URL (custom providers)
+  --region <region>          Bucket region
+  --bucket <bucket>          Default bucket
+  --directory <dir>          Default directory in the bucket
+  --access-key <id>          Access key ID
+  --secret-key-file <path>   Read the secret key from a file, or from stdin with -
+  --assume-role              Use the EC2 instance role instead of keys (s3)
+  -f, --format <fmt>         Output format: json, human, table
+
+The secret key is not accepted as an option value, so it does not show in the
+shell history or the process list. One trailing newline is removed.
+
+${colors.bold("EXAMPLE:")}
+  printf '%s' "$S3_SECRET_KEY" | forge storage-providers create --name Backups \\
+    --provider custom --endpoint https://s3.example.com --region eu-west-1 \\
+    --bucket my-bucket --access-key "$S3_ACCESS_KEY" --secret-key-file - --format json
+`);
+	else if (subcommand === "delete") console.log(`
+${colors.bold("forge storage-providers delete")} - Delete a storage provider
+
+${colors.bold("USAGE:")}
+  forge storage-providers delete <id> [options]
+
+Forge refuses to delete a provider that a backup configuration uses.
+`);
+	else console.log(`
+${colors.bold("forge storage-providers")} - Manage the storage providers of database backups
+
+${colors.bold("USAGE:")}
+  forge storage-providers <subcommand> [options]
+
+${colors.bold("SUBCOMMANDS:")}
+  list, ls            List storage providers
+  get <id>            Get storage provider details
+  create              Create a storage provider
+  delete <id>         Delete a storage provider
+
+${colors.bold("OPTIONS:")}
+  -f, --format <fmt>  Output format: json, human, table
+
+Run ${colors.cyan("forge storage-providers <subcommand> --help")} for details.
+`);
+}
+//#endregion
 //#region src/commands/user/handlers.ts
 async function userGet(ctx) {
 	await runCommand(async () => {
@@ -5060,7 +5496,11 @@ function isOptionValue(arg) {
 /**
 * Options that accept several values. Every other option keeps the last value.
 */
-var REPEATABLE = /* @__PURE__ */ new Set(["server"]);
+var REPEATABLE = /* @__PURE__ */ new Set([
+	"server",
+	"tag",
+	"databases"
+]);
 /**
 * Set an option value. A repeatable option given more than once collects its string
 * values into an array (`--server 1 --server 2` → `["1", "2"]`).
@@ -5114,7 +5554,7 @@ function isVersionRequest({ command, options }) {
 }
 //#endregion
 //#region src/cli.ts
-var VERSION = "0.4.8";
+var VERSION = "0.5.1";
 function showHelp() {
 	console.log(`
 ${colors.bold("forge")} v${VERSION}
@@ -5131,6 +5571,7 @@ ${colors.bold("COMMANDS:")}
   servers, s          Manage servers
     list, ls            List all servers
     get <id>            Get server details
+    create              Create a server (requires --name, and --ip-address for custom)
     reboot <id>         Reboot a server
 
   sites               Manage sites
@@ -5184,12 +5625,19 @@ ${colors.bold("COMMANDS:")}
     get <id>            Get SSH key details (requires --server)
     sync                Make server SSH keys match a file (requires --file, --server|--all-servers)
 
-  backups             Manage backup configurations
+  backups             Manage database backup configurations
     list, ls            List backup configurations (requires --server)
     get <id>            Get backup configuration details (requires --server)
-    create              Create a backup configuration (requires --server --provider --frequency)
+    create              Create a backup configuration (requires --server --storage-provider --frequency --databases)
+    update <id>         Update a backup configuration (requires --server --storage-provider --frequency --retention --databases)
     delete <id>         Delete a backup configuration (requires --server)
 
+  storage-providers   Manage the storage providers of database backups
+    list, ls            List storage providers
+    get <id>            Get storage provider details
+    create              Create a storage provider (requires --name --provider)
+    delete <id>         Delete a storage provider
+
   commands            Manage site commands
     list, ls            List commands (requires --server --site)
     get <id>            Get command details (requires --server --site)
@@ -5422,6 +5870,13 @@ async function main() {
 				}
 				await handleBackupsCommand(subcommand ?? "list", positional, options);
 				break;
+			case "storage-providers":
+				if (wantsHelp) {
+					showStorageProvidersHelp(subcommand);
+					process.exit(0);
+				}
+				await handleStorageProvidersCommand(subcommand ?? "list", positional, options);
+				break;
 			case "commands":
 				if (wantsHelp) {
 					showCommandsHelp(subcommand);