@studiometa/forge-cli 0.3.0 → 0.4.0

package/dist/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { a as createContext, c as colors, d as deleteToken, i as runCommand, l as setColorEnabled, m as setToken, n as exitWithValidationError, p as getToken, s as OutputFormatter, u as createConfigStore, v as ValidationError } from "./error-handler-Byuujxh1.js";
-import { activateCertificate, createAuditLogger, createBackupConfig, createCommand, createDatabaseUser, createMonitor, createNginxTemplate, createRedirectRule, createScheduledJob, createSecurityRule, deleteBackupConfig, deleteDatabaseUser, deleteMonitor, deleteNginxTemplate, deleteRedirectRule, deleteScheduledJob, deleteSecurityRule, deploySiteAndWait, getBackupConfig, getCertificate, getCommand, getDaemon, getDatabase, getDatabaseUser, getEnv, getFirewallRule, getMonitor, getNginxConfig, getNginxTemplate, getRecipe, getRedirectRule, getScheduledJob, getSecurityRule, getServer, getSite, getSshKey, getUser, listBackupConfigs, listCertificates, listCommands, listDaemons, listDatabaseUsers, listDatabases, listDeployments, listFirewallRules, listMonitors, listNginxTemplates, listRecipes, listRedirectRules, listScheduledJobs, listSecurityRules, listServers, listSites, listSshKeys, matchByName, rebootServer, restartDaemon, runRecipe, updateEnv, updateNginxConfig, updateNginxTemplate } from "@studiometa/forge-core";
+import { S as isOutputFormat, a as createContext, b as ValidationError, c as colors, d as deleteToken, g as setToken, h as setOrganizationSlug, i as runCommand, l as setColorEnabled, m as getToken, n as exitWithValidationError, p as getOrganizationSlug, s as OutputFormatter, u as createConfigStore } from "./error-handler-ByMitiOr.js";
+import { activateCertificate, createAuditLogger, createBackupConfig, createCommand, createDatabaseUser, createMonitor, createNginxTemplate, createRedirectRule, createScheduledJob, createSecurityRule, deleteBackupConfig, deleteDatabaseUser, deleteMonitor, deleteNginxTemplate, deleteRedirectRule, deleteScheduledJob, deleteSecurityRule, deploySiteAndWait, getBackupConfig, getCertificate, getCommand, getDaemon, getDatabase, getDatabaseUser, getEnv, getFirewallRule, getMonitor, getNginxConfig, getNginxTemplate, getRecipe, getRedirectRule, getScheduledJob, getSecurityRule, getServer, getSite, getSshKey, getUser, listBackupConfigs, listCommands, listDaemons, listDatabaseUsers, listDatabases, listDeployments, listFirewallRules, listMonitors, listNginxTemplates, listRecipes, listRedirectRules, listScheduledJobs, listSecurityRules, listServers, listSites, listSshKeys, matchByName, rebootServer, restartDaemon, runRecipe, updateBackupConfig, updateDaemon, updateDatabaseUser, updateEnv, updateNginxConfig, updateNginxTemplate, updateRecipe, updateSecurityRule, updateSite } from "@studiometa/forge-core";
 import { mkdirSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
@@ -18,7 +18,8 @@ function getCliAuditLogger() {
 */
 function createCommandRouter(config) {
 	return async function(subcommand, args, options) {
-		const formatter = new OutputFormatter(options.format ?? options.f ?? "human", options["no-color"] === true);
+		const rawFormat = options.format ?? options.f ?? "human";
+		const formatter = new OutputFormatter(isOutputFormat(rawFormat) ? rawFormat : "human", options["no-color"] === true);
 		const ctx = createContext(options);
 		const handler = config.handlers[subcommand];
 		if (!handler) {
@@ -114,10 +115,10 @@ async function backupsList(ctx) {
 		const result = await listBackupConfigs({ server_id: await resolveServerId(server, execCtx) }, execCtx);
 		ctx.formatter.outputList(result.data, [
 			"id",
-			"provider_name",
-			"frequency",
+			"name",
+			"schedule",
 			"status"
-		], "No backup configurations found.", (b) => `${String(b.id).padEnd(8)} ${b.provider_name.padEnd(20)} ${b.frequency.padEnd(12)} ${b.status}`);
+		], "No backup configurations found.", (b) => `${String(b.id).padEnd(8)} ${b.name.padEnd(20)} ${b.schedule.padEnd(12)} ${b.status}`);
 	}, ctx.formatter);
 }
 async function backupsGet(args, ctx) {
@@ -134,42 +135,70 @@ async function backupsGet(args, ctx) {
 		}, execCtx);
 		ctx.formatter.outputOne(result.data, [
 			"id",
+			"name",
 			"provider",
-			"provider_name",
-			"frequency",
+			"schedule",
+			"displayable_schedule",
 			"retention",
 			"status",
-			"last_backup_time"
+			"next_run_time"
 		]);
 	}, ctx.formatter);
 }
 async function backupsCreate(ctx) {
 	const server = String(ctx.options.server ?? "");
-	const provider = String(ctx.options.provider ?? "");
+	const storageProviderId = Number(ctx.options.provider ?? 0);
 	const frequency = String(ctx.options.frequency ?? "");
-	const databasesRaw = ctx.options.databases;
-	const databases = Array.isArray(databasesRaw) ? databasesRaw.map(Number) : databasesRaw ? [Number(databasesRaw)] : [];
+	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 (!provider) exitWithValidationError("provider", "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);
 	await runCommand(async () => {
 		const token = ctx.getToken();
 		const execCtx = ctx.createExecutorContext(token);
-		const result = await createBackupConfig({
+		await createBackupConfig({
 			server_id: await resolveServerId(server, execCtx),
-			provider,
+			storage_provider_id: storageProviderId,
 			frequency,
-			credentials: {},
-			databases
+			retention: 5,
+			database_ids
 		}, execCtx);
-		ctx.formatter.outputOne(result.data, [
-			"id",
-			"provider",
-			"provider_name",
-			"frequency",
-			"retention",
-			"status"
-		]);
+		ctx.formatter.success("Backup configuration created.");
+	}, ctx.formatter);
+}
+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);
+	await runCommand(async () => {
+		const token = ctx.getToken();
+		const execCtx = ctx.createExecutorContext(token);
+		await updateBackupConfig({
+			server_id: await resolveServerId(server, execCtx),
+			id,
+			storage_provider_id: storageProviderId,
+			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"]) } : {}
+		}, execCtx);
+		ctx.formatter.success(`Backup configuration ${id} updated.`);
 	}, ctx.formatter);
 }
 async function backupsDelete(args, ctx) {
@@ -194,9 +223,14 @@ const handleBackupsCommand = createCommandRouter({
 		ls: backupsList,
 		get: [backupsGet, "args"],
 		create: backupsCreate,
+		update: [backupsUpdate, "args"],
 		delete: [backupsDelete, "args"]
 	},
-	writeSubcommands: ["create", "delete"]
+	writeSubcommands: [
+		"create",
+		"update",
+		"delete"
+	]
 });
 function showBackupsHelp(subcommand) {
 	if (subcommand === "list" || subcommand === "ls") console.log(`
@@ -227,6 +261,27 @@ ${colors.bold("OPTIONS:")}
   --frequency <freq>    Backup frequency (required)
   --databases <ids>     Comma-separated database IDs to back up (optional)
   -f, --format <fmt>    Output format: json, human, table
+`);
+	else if (subcommand === "update") console.log(`
+${colors.bold("forge backups update")} - Update a backup configuration
+
+${colors.bold("USAGE:")}
+  forge backups update <backup_id> --server <server_id> --provider <provider> --frequency <frequency> --retention <retention> [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)
+  -f, --format <fmt>             Output format: json, human, table
 `);
 	else if (subcommand === "delete") console.log(`
 ${colors.bold("forge backups delete")} - Delete a backup configuration
@@ -244,6 +299,7 @@ ${colors.bold("SUBCOMMANDS:")}
   list, ls            List backup configurations
   get <id>            Get backup configuration details
   create              Create a new backup configuration
+  update <id>         Update a backup configuration
   delete <id>         Delete a backup configuration
 
 ${colors.bold("OPTIONS:")}
@@ -278,7 +334,7 @@ _forge_completions() {
   local daemons_cmds="list ls get restart"
   local env_cmds="get update"
   local nginx_cmds="get update"
-  local certificates_cmds="list ls get activate"
+  local certificates_cmds="get activate"
   local firewall_rules_cmds="list ls get"
   local ssh_keys_cmds="list ls get"
   local backups_cmds="list ls get create delete"
@@ -533,9 +589,7 @@ _forge() {
         certificates|certs)
           local -a certificates_cmds
           certificates_cmds=(
-            'list:List certificates'
-            'ls:List certificates (alias)'
-            'get:Get certificate details'
+            'get:Get certificate for a domain'
             'activate:Activate a certificate'
           )
           _describe 'certificates command' certificates_cmds
@@ -782,8 +836,7 @@ complete -c forge -f -n "__fish_seen_subcommand_from nginx" -a "get" -d "Get ngi
 complete -c forge -f -n "__fish_seen_subcommand_from nginx" -a "update" -d "Update nginx config"
 
 # certificates subcommands
-complete -c forge -f -n "__fish_seen_subcommand_from certificates certs" -a "list" -d "List certificates"
-complete -c forge -f -n "__fish_seen_subcommand_from certificates certs" -a "ls" -d "List certificates (alias)"
+complete -c forge -f -n "__fish_seen_subcommand_from certificates certs" -a "get" -d "Get certificate for a domain"
 complete -c forge -f -n "__fish_seen_subcommand_from certificates certs" -a "get" -d "Get certificate details"
 complete -c forge -f -n "__fish_seen_subcommand_from certificates certs" -a "activate" -d "Activate a certificate"
 
@@ -980,7 +1033,7 @@ function handleCompletionCommand(shell, options = {}) {
 		writeFileSync(installPath, script, "utf8");
 		console.log(`${colors.green("✓")} Installed ${shell} completion to ${colors.cyan(installPath)}`);
 		console.log();
-		console.log(`${colors.bold("Next steps:")}`);
+		console.log(colors.bold("Next steps:"));
 		switch (shellLower) {
 			case "bash":
 				console.log(`  1. Restart your shell: ${colors.cyan("exec bash")}`);
@@ -1000,40 +1053,22 @@ function handleCompletionCommand(shell, options = {}) {
 		process.exit(1);
 	}
 }
-function requireServerAndSiteRaw$3(ctx, usage) {
+function requireServerSiteDomainRaw(ctx, usage) {
 	const server = String(ctx.options.server ?? "");
 	const site = String(ctx.options.site ?? "");
+	const domain = String(ctx.options.domain ?? "");
 	if (!server) exitWithValidationError("server_id", usage, ctx.formatter);
 	if (!site) exitWithValidationError("site_id", usage, ctx.formatter);
+	if (!domain) exitWithValidationError("domain_id", usage, ctx.formatter);
 	return {
 		server,
-		site
+		site,
+		domain
 	};
 }
-async function certificatesList(ctx) {
-	const { server, site } = requireServerAndSiteRaw$3(ctx, "forge certificates list --server <server_id> --site <site_id>");
-	await runCommand(async () => {
-		const token = ctx.getToken();
-		const execCtx = ctx.createExecutorContext(token);
-		const server_id = await resolveServerId(server, execCtx);
-		const result = await listCertificates({
-			server_id,
-			site_id: await resolveSiteId(site, server_id, execCtx)
-		}, execCtx);
-		ctx.formatter.outputList(result.data, [
-			"id",
-			"domain",
-			"type",
-			"status",
-			"active"
-		], "No certificates found.", (c) => `${String(c.id).padEnd(8)} ${c.domain.padEnd(40)} ${c.type.padEnd(10)} ${c.status.padEnd(12)} ${c.active ? "active" : "—"}`);
-	}, ctx.formatter);
-}
 async function certificatesGet(args, ctx) {
-	const [id] = args;
-	const usage = "forge certificates get <cert_id> --server <server_id> --site <site_id>";
-	if (!id) exitWithValidationError("certificate_id", usage, ctx.formatter);
-	const { server, site } = requireServerAndSiteRaw$3(ctx, usage);
+	const { server, site, domain } = requireServerSiteDomainRaw(ctx, "forge certificates get --server <server_id> --site <site_id> --domain <domain_id>");
+	const domainId = args[0] || domain;
 	await runCommand(async () => {
 		const token = ctx.getToken();
 		const execCtx = ctx.createExecutorContext(token);
@@ -1041,25 +1076,22 @@ async function certificatesGet(args, ctx) {
 		const result = await getCertificate({
 			server_id,
 			site_id: await resolveSiteId(site, server_id, execCtx),
-			id
+			domain_id: domainId
 		}, execCtx);
 		ctx.formatter.outputOne(result.data, [
 			"id",
-			"domain",
 			"type",
+			"verification_method",
+			"key_type",
 			"status",
 			"request_status",
-			"active",
-			"existing",
 			"created_at"
 		]);
 	}, ctx.formatter);
 }
 async function certificatesActivate(args, ctx) {
-	const [id] = args;
-	const usage = "forge certificates activate <cert_id> --server <server_id> --site <site_id>";
-	if (!id) exitWithValidationError("certificate_id", usage, ctx.formatter);
-	const { server, site } = requireServerAndSiteRaw$3(ctx, usage);
+	const { server, site, domain } = requireServerSiteDomainRaw(ctx, "forge certificates activate --server <server_id> --site <site_id> --domain <domain_id>");
+	const domainId = args[0] || domain;
 	await runCommand(async () => {
 		const token = ctx.getToken();
 		const execCtx = ctx.createExecutorContext(token);
@@ -1067,39 +1099,31 @@ async function certificatesActivate(args, ctx) {
 		await activateCertificate({
 			server_id,
 			site_id: await resolveSiteId(site, server_id, execCtx),
-			id
+			domain_id: domainId
 		}, execCtx);
-		ctx.formatter.success(`Certificate ${id} activated.`);
+		ctx.formatter.success(`Certificate for domain ${domainId} activated.`);
 	}, ctx.formatter);
 }
 const handleCertificatesCommand = createCommandRouter({
 	resource: "certificates",
 	handlers: {
-		list: certificatesList,
-		ls: certificatesList,
 		get: [certificatesGet, "args"],
 		activate: [certificatesActivate, "args"]
 	},
 	writeSubcommands: ["activate"]
 });
 function showCertificatesHelp(subcommand) {
-	if (subcommand === "list" || subcommand === "ls") console.log(`
-${colors.bold("forge certificates list")} - List certificates for a site
-
-${colors.bold("USAGE:")}
-  forge certificates list --server <server_id> --site <site_id> [options]
-`);
-	else if (subcommand === "get") console.log(`
-${colors.bold("forge certificates get")} - Get certificate details
+	if (subcommand === "get") console.log(`
+${colors.bold("forge certificates get")} - Get certificate for a domain
 
 ${colors.bold("USAGE:")}
-  forge certificates get <cert_id> --server <server_id> --site <site_id>
+  forge certificates get --server <server_id> --site <site_id> --domain <domain_id>
 `);
 	else if (subcommand === "activate") console.log(`
 ${colors.bold("forge certificates activate")} - Activate a certificate
 
 ${colors.bold("USAGE:")}
-  forge certificates activate <cert_id> --server <server_id> --site <site_id>
+  forge certificates activate --server <server_id> --site <site_id> --domain <domain_id>
 `);
 	else console.log(`
 ${colors.bold("forge certificates")} - Manage SSL certificates
@@ -1111,15 +1135,18 @@ ${colors.bold("ALIASES:")}
   forge certs
 
 ${colors.bold("SUBCOMMANDS:")}
-  list, ls            List certificates
-  get <id>            Get certificate details
-  activate <id>       Activate a certificate
+  get                 Get certificate for a domain
+  activate            Activate a certificate
 
 ${colors.bold("OPTIONS:")}
   --server <id>       Server ID (required)
   --site <id>         Site ID (required)
+  --domain <id>       Domain record ID (required)
   -f, --format <fmt>  Output format: json, human, table
 
+${colors.bold("NOTE:")}
+  In Forge v2, certificates are per-domain. Use domains to manage certificates.
+
 Run ${colors.cyan("forge certificates <subcommand> --help")} for details.
 `);
 }
@@ -1169,7 +1196,8 @@ async function commandsGet(args, ctx) {
 			"id",
 			"command",
 			"status",
-			"user_name",
+			"user_id",
+			"duration",
 			"created_at"
 		]);
 	}, ctx.formatter);
@@ -1183,17 +1211,12 @@ async function commandsCreate(ctx) {
 		const token = ctx.getToken();
 		const execCtx = ctx.createExecutorContext(token);
 		const server_id = await resolveServerId(server, execCtx);
-		const result = await createCommand({
+		await createCommand({
 			server_id,
 			site_id: await resolveSiteId(site, server_id, execCtx),
 			command
 		}, execCtx);
-		ctx.formatter.outputOne(result.data, [
-			"id",
-			"command",
-			"status",
-			"created_at"
-		]);
+		ctx.formatter.success("Command queued for execution.");
 	}, ctx.formatter);
 }
 const handleCommandsCommand = createCommandRouter({
@@ -1263,56 +1286,82 @@ function showConfigHelp() {
 ${colors.bold("forge config")} - Manage CLI configuration
 
 ${colors.bold("USAGE:")}
-  forge config <subcommand> [options]
+  forge config <subcommand> [key] [value]
 
 ${colors.bold("SUBCOMMANDS:")}
-  set <token>         Save API token to config file
-  get                 Show current API token (masked)
-  delete              Delete stored API token
+  set <key> <value>   Save a config value
+  get                 Show current configuration (masked)
+  delete              Delete all stored configuration
+
+${colors.bold("CONFIG KEYS:")}
+  apiToken            Forge API token (scoped, from Forge dashboard)
+  organizationSlug    Default organization slug (e.g. 'studio-meta')
 
 ${colors.bold("EXAMPLES:")}
-  forge config set YOUR_FORGE_TOKEN
+  forge config set apiToken YOUR_FORGE_TOKEN
+  forge config set organizationSlug studio-meta
   forge config get
   forge config delete
 `);
 }
 function handleConfigCommand(subcommand, args, options) {
-	const format = String(options.format ?? options.f ?? "human");
+	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();
 	switch (subcommand) {
 		case "set": {
-			const [token] = args;
-			if (!token) {
-				formatter.error("Token is required. Usage: forge config set <token>");
+			const [key, value] = args;
+			if (!key || !value) {
+				formatter.error("Usage: forge config set <key> <value>");
+				formatter.info("Keys: apiToken, organizationSlug");
 				process.exit(1);
 				return;
 			}
-			setToken(token, store);
-			formatter.success("API token saved.");
+			switch (key) {
+				case "apiToken":
+					setToken(value, store);
+					formatter.success("API token saved.");
+					break;
+				case "organizationSlug":
+					setOrganizationSlug(value, store);
+					formatter.success(`Organization slug set to "${value}".`);
+					break;
+				default:
+					formatter.error(`Unknown config key: ${key}`);
+					formatter.info("Valid keys: apiToken, organizationSlug");
+					process.exit(1);
+			}
 			break;
 		}
 		case "get": {
 			const token = getToken(store);
-			if (!token) {
-				formatter.warning("No API token configured.");
-				formatter.info("Run: forge config set <token>");
-			} else {
-				const masked = token.length > 8 ? `${token.slice(0, 4)}${"*".repeat(token.length - 8)}${token.slice(-4)}` : "****";
-				if (format === "json") formatter.output({ apiToken: masked });
-				else console.log(`apiToken: ${masked}`);
+			const orgSlug = getOrganizationSlug(store);
+			if (format === "json") formatter.output({
+				apiToken: token ? maskToken(token) : null,
+				organizationSlug: orgSlug ?? null
+			});
+			else {
+				if (token) console.log(`apiToken: ${maskToken(token)}`);
+				else formatter.warning("No API token configured.");
+				if (orgSlug) console.log(`organizationSlug: ${orgSlug}`);
+				else formatter.warning("No organization slug configured.");
+				if (!token || !orgSlug) formatter.info("Run: forge config set <key> <value>");
 			}
 			break;
 		}
 		case "delete":
 			deleteToken(store);
-			formatter.success("API token deleted.");
+			formatter.success("Configuration deleted.");
 			break;
 		default:
 			showConfigHelp();
 			break;
 	}
 }
+function maskToken(token) {
+	return token.length > 8 ? `${token.slice(0, 4)}${"*".repeat(token.length - 8)}${token.slice(-4)}` : "****";
+}
 async function daemonsList(ctx) {
 	const server = String(ctx.options.server ?? "");
 	if (!server) exitWithValidationError("server_id", "forge daemons list --server <server_id>", ctx.formatter);
@@ -1351,6 +1400,34 @@ async function daemonsGet(args, ctx) {
 		]);
 	}, ctx.formatter);
 }
+async function daemonsUpdate(args, ctx) {
+	const [id] = args;
+	const server = String(ctx.options.server ?? "");
+	const name = String(ctx.options.name ?? "");
+	if (!id) exitWithValidationError("daemon_id", "forge daemons update <daemon_id> --server <server_id> --name <name>", ctx.formatter);
+	if (!server) exitWithValidationError("server_id", "forge daemons update <daemon_id> --server <server_id> --name <name>", ctx.formatter);
+	if (!name) exitWithValidationError("name", "forge daemons update <daemon_id> --server <server_id> --name <name>", ctx.formatter);
+	await runCommand(async () => {
+		const token = ctx.getToken();
+		const execCtx = ctx.createExecutorContext(token);
+		const options = {
+			server_id: await resolveServerId(server, execCtx),
+			id,
+			name
+		};
+		if (ctx.options.config) options.config = String(ctx.options.config);
+		const result = await updateDaemon(options, execCtx);
+		ctx.formatter.outputOne(result.data, [
+			"id",
+			"command",
+			"user",
+			"directory",
+			"processes",
+			"status",
+			"created_at"
+		]);
+	}, ctx.formatter);
+}
 async function daemonsRestart(args, ctx) {
 	const [id] = args;
 	const server = String(ctx.options.server ?? "");
@@ -1372,9 +1449,10 @@ const handleDaemonsCommand = createCommandRouter({
 		list: daemonsList,
 		ls: daemonsList,
 		get: [daemonsGet, "args"],
-		restart: [daemonsRestart, "args"]
+		restart: [daemonsRestart, "args"],
+		update: [daemonsUpdate, "args"]
 	},
-	writeSubcommands: ["restart"]
+	writeSubcommands: ["restart", "update"]
 });
 function showDaemonsHelp(subcommand) {
 	if (subcommand === "list" || subcommand === "ls") console.log(`
@@ -1388,6 +1466,12 @@ ${colors.bold("forge daemons get")} - Get daemon details
 
 ${colors.bold("USAGE:")}
   forge daemons get <daemon_id> --server <server_id>
+`);
+	else if (subcommand === "update") console.log(`
+${colors.bold("forge daemons update")} - Update a daemon
+
+${colors.bold("USAGE:")}
+  forge daemons update <daemon_id> --server <server_id> --name <name> [--config <config>]
 `);
 	else if (subcommand === "restart") console.log(`
 ${colors.bold("forge daemons restart")} - Restart a daemon
@@ -1404,6 +1488,7 @@ ${colors.bold("USAGE:")}
 ${colors.bold("SUBCOMMANDS:")}
   list, ls            List daemons
   get <id>            Get daemon details
+  update <id>         Update a daemon
   restart <id>        Restart a daemon
 
 ${colors.bold("OPTIONS:")}
@@ -1522,7 +1607,6 @@ async function databaseUsersGet(args, ctx) {
 			"id",
 			"name",
 			"status",
-			"databases",
 			"created_at"
 		]);
 	}, ctx.formatter);
@@ -1549,7 +1633,31 @@ async function databaseUsersCreate(ctx) {
 			"id",
 			"name",
 			"status",
-			"databases",
+			"created_at"
+		]);
+	}, ctx.formatter);
+}
+async function databaseUsersUpdate(args, ctx) {
+	const [id] = args;
+	const server = String(ctx.options.server ?? "");
+	const password = ctx.options.password != null ? String(ctx.options.password) : void 0;
+	const databaseIdsRaw = ctx.options["database-ids"] ?? ctx.options.database_ids;
+	const database_ids = Array.isArray(databaseIdsRaw) ? databaseIdsRaw.map(Number) : databaseIdsRaw ? [Number(databaseIdsRaw)] : void 0;
+	if (!id) exitWithValidationError("user_id", "forge database-users update <user_id> --server <server_id> [--password <password>] [--database-ids <ids>]", ctx.formatter);
+	if (!server) exitWithValidationError("server_id", "forge database-users update <user_id> --server <server_id> [--password <password>] [--database-ids <ids>]", ctx.formatter);
+	await runCommand(async () => {
+		const token = ctx.getToken();
+		const execCtx = ctx.createExecutorContext(token);
+		const result = await updateDatabaseUser({
+			server_id: await resolveServerId(server, execCtx),
+			id,
+			...password !== void 0 ? { password } : {},
+			...database_ids ? { database_ids } : {}
+		}, execCtx);
+		ctx.formatter.outputOne(result.data, [
+			"id",
+			"name",
+			"status",
 			"created_at"
 		]);
 	}, ctx.formatter);
@@ -1576,9 +1684,14 @@ const handleDatabaseUsersCommand = createCommandRouter({
 		ls: databaseUsersList,
 		get: [databaseUsersGet, "args"],
 		create: databaseUsersCreate,
+		update: [databaseUsersUpdate, "args"],
 		delete: [databaseUsersDelete, "args"]
 	},
-	writeSubcommands: ["create", "delete"]
+	writeSubcommands: [
+		"create",
+		"update",
+		"delete"
+	]
 });
 function showDatabaseUsersHelp(subcommand) {
 	if (subcommand === "list" || subcommand === "ls") console.log(`
@@ -1609,6 +1722,18 @@ ${colors.bold("OPTIONS:")}
   --password <pass>   User password (required)
   --databases <ids>   Comma-separated database IDs to grant access to (optional)
   -f, --format <fmt>  Output format: json, human, table
+`);
+	else if (subcommand === "update") console.log(`
+${colors.bold("forge database-users update")} - Update a database user
+
+${colors.bold("USAGE:")}
+  forge database-users update <user_id> --server <server_id> [options]
+
+${colors.bold("OPTIONS:")}
+  --server <id>           Server ID (required)
+  --password <pass>       New password (optional)
+  --database-ids <ids>    Comma-separated database IDs (optional)
+  -f, --format <fmt>      Output format: json, human, table
 `);
 	else if (subcommand === "delete") console.log(`
 ${colors.bold("forge database-users delete")} - Delete a database user
@@ -1626,6 +1751,7 @@ ${colors.bold("SUBCOMMANDS:")}
   list, ls            List database users
   get <id>            Get database user details
   create              Create a new database user
+  update <id>         Update a database user
   delete <id>         Delete a database user
 
 ${colors.bold("OPTIONS:")}
@@ -1651,14 +1777,15 @@ async function deploymentsList(ctx) {
 		ctx.formatter.outputList(result.data, [
 			"id",
 			"status",
-			"commit_hash",
+			"commit",
 			"started_at"
-		], "No deployments found.", (d) => `${String(d.id).padEnd(8)} ${d.status.padEnd(12)} ${(d.commit_hash ?? "—").padEnd(10)} ${d.started_at}`);
+		], "No deployments found.", (d) => `${String(d.id).padEnd(8)} ${d.status.padEnd(12)} ${(d.commit.hash ?? "—").padEnd(10)} ${d.started_at}`);
 	}, ctx.formatter);
 }
 async function deploymentsDeploy(ctx) {
 	const server = String(ctx.options.server ?? "");
 	const site = String(ctx.options.site ?? "");
+	const streamLogs = Boolean(ctx.options.stream);
 	if (!server) exitWithValidationError("server_id", "forge deployments deploy --server <server_id> --site <site_id>", ctx.formatter);
 	if (!site) exitWithValidationError("site_id", "forge deployments deploy --server <server_id> --site <site_id>", ctx.formatter);
 	await runCommand(async () => {
@@ -1669,15 +1796,18 @@ async function deploymentsDeploy(ctx) {
 		const result = await deploySiteAndWait({
 			server_id,
 			site_id,
-			onProgress: ({ status, elapsed_ms }) => {
+			onProgress: streamLogs ? void 0 : ({ status, elapsed_ms }) => {
 				process.stderr.write(`\rDeploying… ${status} (${(elapsed_ms / 1e3).toFixed(1)}s)`);
-			}
+			},
+			onLog: streamLogs ? (chunk) => {
+				process.stdout.write(chunk);
+			} : void 0
 		}, execCtx);
-		process.stderr.write("\n");
+		if (!streamLogs) process.stderr.write("\n");
 		const elapsedSec = (result.data.elapsed_ms / 1e3).toFixed(1);
 		if (result.data.status === "success") ctx.formatter.success(`Deployment succeeded for site ${site_id} (${elapsedSec}s).`);
-		else ctx.formatter.success(`Deployment failed for site ${site_id} (${elapsedSec}s).`);
-		if (result.data.log) ctx.formatter.output(result.data.log);
+		else ctx.formatter.error(`Deployment failed for site ${site_id} (${elapsedSec}s).`);
+		if (!streamLogs && result.data.log) ctx.formatter.output(result.data.log);
 	}, ctx.formatter);
 }
 const handleDeploymentsCommand = createCommandRouter({
@@ -1705,7 +1835,13 @@ ${colors.bold("OPTIONS:")}
 ${colors.bold("forge deployments deploy")} - Trigger a deployment
 
 ${colors.bold("USAGE:")}
-  forge deployments deploy --server <server_id> --site <site_id>
+  forge deployments deploy --server <server_id> --site <site_id> [options]
+
+${colors.bold("OPTIONS:")}
+  --server <id>       Server ID (required)
+  --site <id>         Site ID (required)
+  --stream            Stream deployment logs in real-time (default: show progress)
+  -f, --format <fmt>  Output format: json, human, table
 `);
 	else console.log(`
 ${colors.bold("forge deployments")} - Manage deployments
@@ -1929,6 +2065,7 @@ async function monitorsCreate(ctx) {
 	const type = String(ctx.options.type ?? "");
 	const operator = String(ctx.options.operator ?? "");
 	const threshold = Number(ctx.options.threshold ?? 0);
+	const notify = String(ctx.options.notify ?? "");
 	const minutes = Number(ctx.options.minutes ?? 0);
 	if (!server) exitWithValidationError("server_id", "forge monitors create --server <server_id> --type <type> --operator <operator> --threshold <threshold> --minutes <minutes>", ctx.formatter);
 	if (!type) exitWithValidationError("type", "forge monitors create --server <server_id> --type <type> --operator <operator> --threshold <threshold> --minutes <minutes>", ctx.formatter);
@@ -1941,6 +2078,7 @@ async function monitorsCreate(ctx) {
 			type,
 			operator,
 			threshold,
+			notify,
 			minutes
 		}, execCtx);
 		ctx.formatter.outputOne(result.data, [
@@ -2313,6 +2451,30 @@ async function recipesGet(args, ctx) {
 		]);
 	}, ctx.formatter);
 }
+async function recipesUpdate(args, ctx) {
+	const [id] = args;
+	if (!id) exitWithValidationError("id", "forge recipes update <recipe_id> [--name ...] [--user ...] [--script ...]", ctx.formatter);
+	const name = ctx.options.name;
+	const user = ctx.options.user;
+	const script = ctx.options.script;
+	await runCommand(async () => {
+		const token = ctx.getToken();
+		const execCtx = ctx.createExecutorContext(token);
+		const result = await updateRecipe({
+			id,
+			name,
+			user,
+			script
+		}, execCtx);
+		ctx.formatter.outputOne(result.data, [
+			"id",
+			"name",
+			"user",
+			"created_at",
+			"script"
+		]);
+	}, ctx.formatter);
+}
 async function recipesRun(args, ctx) {
 	const [id] = args;
 	const serversRaw = String(ctx.options.servers ?? "");
@@ -2335,9 +2497,10 @@ const handleRecipesCommand = createCommandRouter({
 		list: recipesList,
 		ls: recipesList,
 		get: [recipesGet, "args"],
+		update: [recipesUpdate, "args"],
 		run: [recipesRun, "args"]
 	},
-	writeSubcommands: ["run"]
+	writeSubcommands: ["update", "run"]
 });
 function showRecipesHelp(subcommand) {
 	if (subcommand === "list" || subcommand === "ls") console.log(`
@@ -2351,6 +2514,17 @@ ${colors.bold("forge recipes get")} - Get recipe details
 
 ${colors.bold("USAGE:")}
   forge recipes get <recipe_id>
+`);
+	else if (subcommand === "update") console.log(`
+${colors.bold("forge recipes update")} - Update a recipe
+
+${colors.bold("USAGE:")}
+  forge recipes update <recipe_id> [options]
+
+${colors.bold("OPTIONS:")}
+  --name <name>       New recipe name
+  --user <user>       New recipe user
+  --script <script>   New recipe script
 `);
 	else if (subcommand === "run") console.log(`
 ${colors.bold("forge recipes run")} - Run a recipe on servers
@@ -2370,6 +2544,7 @@ ${colors.bold("USAGE:")}
 ${colors.bold("SUBCOMMANDS:")}
   list, ls            List all recipes
   get <id>            Get recipe details
+  update <id>         Update a recipe
   run <id>            Run a recipe on servers
 
 ${colors.bold("OPTIONS:")}
@@ -2434,25 +2609,21 @@ async function redirectRulesCreate(ctx) {
 	const { server, site } = requireServerAndSiteRaw$1(ctx, usage);
 	const from = String(ctx.options.from ?? "");
 	const to = String(ctx.options.to ?? "");
+	const type = String(ctx.options.type ?? "redirect");
 	if (!from) exitWithValidationError("from", usage, ctx.formatter);
 	if (!to) exitWithValidationError("to", usage, ctx.formatter);
 	await runCommand(async () => {
 		const token = ctx.getToken();
 		const execCtx = ctx.createExecutorContext(token);
 		const server_id = await resolveServerId(server, execCtx);
-		const result = await createRedirectRule({
+		await createRedirectRule({
 			server_id,
 			site_id: await resolveSiteId(site, server_id, execCtx),
 			from,
-			to
+			to,
+			type
 		}, execCtx);
-		ctx.formatter.outputOne(result.data, [
-			"id",
-			"from",
-			"to",
-			"type",
-			"created_at"
-		]);
+		ctx.formatter.success("Redirect rule created.");
 	}, ctx.formatter);
 }
 async function redirectRulesDelete(args, ctx) {
@@ -2542,11 +2713,16 @@ Run ${colors.cyan("forge redirect-rules <subcommand> --help")} for details.
 }
 async function scheduledJobsList(ctx) {
 	const server = String(ctx.options.server ?? "");
+	const site = ctx.options.site ? String(ctx.options.site) : void 0;
 	if (!server) exitWithValidationError("server_id", "forge scheduled-jobs list --server <server_id>", ctx.formatter);
 	await runCommand(async () => {
 		const token = ctx.getToken();
 		const execCtx = ctx.createExecutorContext(token);
-		const result = await listScheduledJobs({ server_id: await resolveServerId(server, execCtx) }, execCtx);
+		const server_id = await resolveServerId(server, execCtx);
+		const result = await listScheduledJobs({
+			server_id,
+			site_id: site ? await resolveSiteId(site, server_id, execCtx) : void 0
+		}, execCtx);
 		ctx.formatter.outputList(result.data, [
 			"id",
 			"command",
@@ -2558,14 +2734,17 @@ async function scheduledJobsList(ctx) {
 async function scheduledJobsGet(args, ctx) {
 	const [id] = args;
 	const server = String(ctx.options.server ?? "");
+	const site = ctx.options.site ? String(ctx.options.site) : void 0;
 	if (!id) exitWithValidationError("job_id", "forge scheduled-jobs get <job_id> --server <server_id>", ctx.formatter);
 	if (!server) exitWithValidationError("server_id", "forge scheduled-jobs get <job_id> --server <server_id>", ctx.formatter);
 	await runCommand(async () => {
 		const token = ctx.getToken();
 		const execCtx = ctx.createExecutorContext(token);
+		const server_id = await resolveServerId(server, execCtx);
 		const result = await getScheduledJob({
-			server_id: await resolveServerId(server, execCtx),
-			id
+			server_id,
+			id,
+			site_id: site ? await resolveSiteId(site, server_id, execCtx) : void 0
 		}, execCtx);
 		ctx.formatter.outputOne(result.data, [
 			"id",
@@ -2580,15 +2759,24 @@ async function scheduledJobsGet(args, ctx) {
 }
 async function scheduledJobsCreate(ctx) {
 	const server = String(ctx.options.server ?? "");
+	const site = ctx.options.site ? String(ctx.options.site) : void 0;
 	const command = String(ctx.options.command ?? "");
-	if (!server) exitWithValidationError("server_id", "forge scheduled-jobs create --server <server_id> --command <command>", ctx.formatter);
-	if (!command) exitWithValidationError("command", "forge scheduled-jobs create --server <server_id> --command <command>", ctx.formatter);
+	const user = String(ctx.options.user ?? "forge");
+	const frequency = String(ctx.options.frequency ?? "custom");
+	const cron = ctx.options.cron ? String(ctx.options.cron) : void 0;
+	if (!server) exitWithValidationError("server_id", "forge scheduled-jobs create --server <server_id> --command <command> --user <user> --frequency <frequency>", ctx.formatter);
+	if (!command) exitWithValidationError("command", "forge scheduled-jobs create --server <server_id> --command <command> --user <user> --frequency <frequency>", ctx.formatter);
 	await runCommand(async () => {
 		const token = ctx.getToken();
 		const execCtx = ctx.createExecutorContext(token);
+		const server_id = await resolveServerId(server, execCtx);
 		const result = await createScheduledJob({
-			server_id: await resolveServerId(server, execCtx),
-			command
+			server_id,
+			site_id: site ? await resolveSiteId(site, server_id, execCtx) : void 0,
+			command,
+			user,
+			frequency,
+			cron
 		}, execCtx);
 		ctx.formatter.outputOne(result.data, [
 			"id",
@@ -2604,14 +2792,17 @@ async function scheduledJobsCreate(ctx) {
 async function scheduledJobsDelete(args, ctx) {
 	const [id] = args;
 	const server = String(ctx.options.server ?? "");
+	const site = ctx.options.site ? String(ctx.options.site) : void 0;
 	if (!id) exitWithValidationError("job_id", "forge scheduled-jobs delete <job_id> --server <server_id>", ctx.formatter);
 	if (!server) exitWithValidationError("server_id", "forge scheduled-jobs delete <job_id> --server <server_id>", ctx.formatter);
 	await runCommand(async () => {
 		const token = ctx.getToken();
 		const execCtx = ctx.createExecutorContext(token);
+		const server_id = await resolveServerId(server, execCtx);
 		await deleteScheduledJob({
-			server_id: await resolveServerId(server, execCtx),
-			id
+			server_id,
+			id,
+			site_id: site ? await resolveSiteId(site, server_id, execCtx) : void 0
 		}, execCtx);
 		ctx.formatter.success(`Scheduled job ${id} deleted.`);
 	}, ctx.formatter);
@@ -2725,7 +2916,6 @@ async function securityRulesGet(args, ctx) {
 			"id",
 			"name",
 			"path",
-			"credentials",
 			"created_at"
 		]);
 	}, ctx.formatter);
@@ -2753,6 +2943,32 @@ async function securityRulesCreate(ctx) {
 		]);
 	}, ctx.formatter);
 }
+async function securityRulesUpdate(args, ctx) {
+	const [id] = args;
+	const usage = "forge security-rules update <rule_id> --server <server_id> --site <site_id> --name <name>";
+	if (!id) exitWithValidationError("rule_id", usage, ctx.formatter);
+	const { server, site } = requireServerAndSiteRaw(ctx, usage);
+	const name = String(ctx.options.name ?? "");
+	if (!name) exitWithValidationError("name", usage, ctx.formatter);
+	await runCommand(async () => {
+		const token = ctx.getToken();
+		const execCtx = ctx.createExecutorContext(token);
+		const server_id = await resolveServerId(server, execCtx);
+		const result = await updateSecurityRule({
+			server_id,
+			site_id: await resolveSiteId(site, server_id, execCtx),
+			id,
+			name,
+			credentials: []
+		}, execCtx);
+		ctx.formatter.outputOne(result.data, [
+			"id",
+			"name",
+			"path",
+			"created_at"
+		]);
+	}, ctx.formatter);
+}
 async function securityRulesDelete(args, ctx) {
 	const [id] = args;
 	const usage = "forge security-rules delete <rule_id> --server <server_id> --site <site_id>";
@@ -2777,9 +2993,14 @@ const handleSecurityRulesCommand = createCommandRouter({
 		ls: securityRulesList,
 		get: [securityRulesGet, "args"],
 		create: securityRulesCreate,
+		update: [securityRulesUpdate, "args"],
 		delete: [securityRulesDelete, "args"]
 	},
-	writeSubcommands: ["create", "delete"]
+	writeSubcommands: [
+		"create",
+		"update",
+		"delete"
+	]
 });
 function showSecurityRulesHelp(subcommand) {
 	if (subcommand === "list" || subcommand === "ls") console.log(`
@@ -2805,6 +3026,18 @@ ${colors.bold("forge security-rules create")} - Create a new security rule
 ${colors.bold("USAGE:")}
   forge security-rules create --server <server_id> --site <site_id> --name <name> [options]
 
+${colors.bold("OPTIONS:")}
+  --server <id>         Server ID (required)
+  --site <id>           Site ID (required)
+  --name <name>         Security rule name (required)
+  -f, --format <fmt>    Output format: json, human, table
+`);
+	else if (subcommand === "update") console.log(`
+${colors.bold("forge security-rules update")} - Update a security rule
+
+${colors.bold("USAGE:")}
+  forge security-rules update <rule_id> --server <server_id> --site <site_id> --name <name> [options]
+
 ${colors.bold("OPTIONS:")}
   --server <id>         Server ID (required)
   --site <id>           Site ID (required)
@@ -2827,6 +3060,7 @@ ${colors.bold("SUBCOMMANDS:")}
   list, ls            List security rules
   get <id>            Get security rule details
   create              Create a new security rule
+  update <id>         Update a security rule
   delete <id>         Delete a security rule
 
 ${colors.bold("OPTIONS:")}
@@ -2855,7 +3089,7 @@ async function serversList(ctx) {
 				ctx.formatter.info("No servers found.");
 				return;
 			}
-			for (const server of result.data) console.log(`${String(server.id).padEnd(8)} ${server.name.padEnd(30)} ${server.ip_address.padEnd(16)} ${server.is_ready ? "ready" : "provisioning"}`);
+			for (const server of result.data) console.log(`${String(server.id).padEnd(8)} ${server.name.padEnd(30)} ${(server.ip_address ?? "—").padEnd(16)} ${server.is_ready ? "ready" : "provisioning"}`);
 		}
 	}, ctx.formatter);
 }
@@ -2998,12 +3232,43 @@ async function sitesGet(args, ctx) {
 			"name",
 			"status",
 			"php_version",
-			"project_type",
+			"app_type",
+			"repository",
+			"quick_deploy",
+			"deployment_status",
+			"https",
+			"created_at"
+		]);
+	}, ctx.formatter);
+}
+async function sitesUpdate(args, ctx) {
+	const [site_id] = args;
+	const server = String(ctx.options.server ?? "");
+	if (!site_id) exitWithValidationError("site_id", "forge sites update <site_id> --server <server_id>", ctx.formatter);
+	if (!server) exitWithValidationError("server_id", "forge sites update <site_id> --server <server_id>", ctx.formatter);
+	await runCommand(async () => {
+		const token = ctx.getToken();
+		const execCtx = ctx.createExecutorContext(token);
+		const result = await updateSite({
+			server_id: await resolveServerId(server, execCtx),
+			site_id,
+			root_path: ctx.options.root_path,
+			directory: ctx.options.directory,
+			type: ctx.options.type,
+			php_version: ctx.options.php_version,
+			push_to_deploy: ctx.options.push_to_deploy !== void 0 ? ctx.options.push_to_deploy === "true" || ctx.options.push_to_deploy === true : void 0,
+			repository_branch: ctx.options.repository_branch
+		}, execCtx);
+		ctx.formatter.outputOne(result.data, [
+			"id",
+			"name",
+			"status",
+			"php_version",
+			"app_type",
 			"repository",
-			"repository_branch",
 			"quick_deploy",
 			"deployment_status",
-			"is_secured",
+			"https",
 			"created_at"
 		]);
 	}, ctx.formatter);
@@ -3013,7 +3278,8 @@ const handleSitesCommand = createCommandRouter({
 	handlers: {
 		list: sitesList,
 		ls: sitesList,
-		get: [sitesGet, "args"]
+		get: [sitesGet, "args"],
+		update: [sitesUpdate, "args"]
 	}
 });
 function showSitesHelp(subcommand) {
@@ -3210,7 +3476,7 @@ function parseArgs(argv = process.argv.slice(2)) {
 		positional
 	};
 }
-var VERSION = "0.3.0";
+var VERSION = "0.4.0";
 function showHelp() {
 	console.log(`
 ${colors.bold("forge")} v${VERSION}
@@ -3260,8 +3526,8 @@ ${colors.bold("COMMANDS:")}
     get                 Get nginx config (requires --server --site)
     update              Update nginx config (requires --server --site --content)
 
-  certificates, certs Manage SSL certificates
-    list, ls            List certificates (requires --server --site)
+  certificates, certs Manage SSL certificates (per-domain in v2)
+    get                 Get certificate for a domain (requires --server --site --domain)
     get <id>            Get certificate details (requires --server --site)
     activate <id>       Activate a certificate (requires --server --site)
 
@@ -3330,8 +3596,10 @@ ${colors.bold("COMMANDS:")}
 
 ${colors.bold("OPTIONS:")}
   --token <token>     Forge API token (overrides config and env)
+  --org <slug>        Organization slug (overrides config and FORGE_ORG)
   --server <id>       Server ID (required for server-scoped commands)
   --site <id>         Site ID (required for site-scoped commands)
+  --domain <id>       Domain record ID (for certificate commands)
   -f, --format <fmt>  Output format: json, human, table (default: human)
   --no-color          Disable colored output
   -h, --help          Show help
@@ -3363,6 +3631,7 @@ ${colors.bold("CREDENTIAL PRIORITY:")}
 
 ${colors.bold("ENVIRONMENT VARIABLES:")}
   FORGE_API_TOKEN    API token
+  FORGE_ORG          Organization slug (e.g. studio-meta)
   NO_COLOR           Disable colors
   XDG_CONFIG_HOME    Config directory (respects XDG spec)
 `);