@studiometa/forge-mcp 0.3.0 → 0.4.0

package/dist/{version-CIiN0iJr.js → version-CHrJu_54.js}

@@ -2,7 +2,7 @@ import { readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { HttpClient, isForgeApiError } from "@studiometa/forge-api";
-import { RESOURCES, activateCertificate, createAuditLogger, createBackupConfig, createCertificate, createCommand, createDaemon, createDatabase, createDatabaseUser, createFirewallRule, createMonitor, createNginxTemplate, createRecipe, createRedirectRule, createScheduledJob, createSecurityRule, createServer, createSite, createSshKey, deleteBackupConfig, deleteCertificate, deleteDaemon, deleteDatabase, deleteDatabaseUser, deleteFirewallRule, deleteMonitor, deleteNginxTemplate, deleteRecipe, deleteRedirectRule, deleteScheduledJob, deleteSecurityRule, deleteServer, deleteSite, deleteSshKey, deploySiteAndWait, getBackupConfig, getCertificate, getCommand, getDaemon, getDatabase, getDatabaseUser, getDeploymentOutput, getDeploymentScript, 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, rebootServer, resolveServers, resolveSites, restartDaemon, runRecipe, updateDeploymentScript, updateEnv, updateNginxConfig, updateNginxTemplate } from "@studiometa/forge-core";
+import { RESOURCES, activateCertificate, createAuditLogger, createBackupConfig, createCertificate, createCommand, createDaemon, createDatabase, createDatabaseUser, createFirewallRule, createMonitor, createNginxTemplate, createRecipe, createRedirectRule, createScheduledJob, createSecurityRule, createServer, createSite, createSshKey, deleteBackupConfig, deleteCertificate, deleteDaemon, deleteDatabase, deleteDatabaseUser, deleteFirewallRule, deleteMonitor, deleteNginxTemplate, deleteRecipe, deleteRedirectRule, deleteScheduledJob, deleteSecurityRule, deleteServer, deleteSite, deleteSshKey, deploySiteAndWait, getBackupConfig, getCertificate, getCommand, getDaemon, getDatabase, getDatabaseUser, getDeploymentLog, getDeploymentScript, 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, rebootServer, resolveServers, resolveSites, restartDaemon, runRecipe, updateBackupConfig, updateDaemon, updateDatabaseUser, updateDeploymentScript, updateEnv, updateNginxConfig, updateNginxTemplate, updateRecipe, updateSecurityRule, updateSite } from "@studiometa/forge-core";
 /**
 * MCP Server Instructions
 *
@@ -25,6 +25,398 @@ function loadInstructions() {
 	}
 }
 const INSTRUCTIONS = loadInstructions();
+var store$4;
+/**
+* Returns the global configuration.
+*
+* @param config The config to merge.
+*
+* @returns The configuration.
+*/
+/* @__NO_SIDE_EFFECTS__ */
+function getGlobalConfig(config$1) {
+	return {
+		lang: config$1?.lang ?? store$4?.lang,
+		message: config$1?.message,
+		abortEarly: config$1?.abortEarly ?? store$4?.abortEarly,
+		abortPipeEarly: config$1?.abortPipeEarly ?? store$4?.abortPipeEarly
+	};
+}
+var store$3;
+/**
+* Returns a global error message.
+*
+* @param lang The language of the message.
+*
+* @returns The error message.
+*/
+/* @__NO_SIDE_EFFECTS__ */
+function getGlobalMessage(lang) {
+	return store$3?.get(lang);
+}
+var store$2;
+/**
+* Returns a schema error message.
+*
+* @param lang The language of the message.
+*
+* @returns The error message.
+*/
+/* @__NO_SIDE_EFFECTS__ */
+function getSchemaMessage(lang) {
+	return store$2?.get(lang);
+}
+var store$1;
+/**
+* Returns a specific error message.
+*
+* @param reference The identifier reference.
+* @param lang The language of the message.
+*
+* @returns The error message.
+*/
+/* @__NO_SIDE_EFFECTS__ */
+function getSpecificMessage(reference, lang) {
+	return store$1?.get(reference)?.get(lang);
+}
+/**
+* Stringifies an unknown input to a literal or type string.
+*
+* @param input The unknown input.
+*
+* @returns A literal or type string.
+*
+* @internal
+*/
+/* @__NO_SIDE_EFFECTS__ */
+function _stringify(input) {
+	const type = typeof input;
+	if (type === "string") return `"${input}"`;
+	if (type === "number" || type === "bigint" || type === "boolean") return `${input}`;
+	if (type === "object" || type === "function") return (input && Object.getPrototypeOf(input)?.constructor?.name) ?? "null";
+	return type;
+}
+/**
+* Adds an issue to the dataset.
+*
+* @param context The issue context.
+* @param label The issue label.
+* @param dataset The input dataset.
+* @param config The configuration.
+* @param other The optional props.
+*
+* @internal
+*/
+function _addIssue(context, label, dataset, config$1, other) {
+	const input = other && "input" in other ? other.input : dataset.value;
+	const expected = other?.expected ?? context.expects ?? null;
+	const received = other?.received ?? /* @__PURE__ */ _stringify(input);
+	const issue = {
+		kind: context.kind,
+		type: context.type,
+		input,
+		expected,
+		received,
+		message: `Invalid ${label}: ${expected ? `Expected ${expected} but r` : "R"}eceived ${received}`,
+		requirement: context.requirement,
+		path: other?.path,
+		issues: other?.issues,
+		lang: config$1.lang,
+		abortEarly: config$1.abortEarly,
+		abortPipeEarly: config$1.abortPipeEarly
+	};
+	const isSchema = context.kind === "schema";
+	const message$1 = other?.message ?? context.message ?? /* @__PURE__ */ getSpecificMessage(context.reference, issue.lang) ?? (isSchema ? /* @__PURE__ */ getSchemaMessage(issue.lang) : null) ?? config$1.message ?? /* @__PURE__ */ getGlobalMessage(issue.lang);
+	if (message$1 !== void 0) issue.message = typeof message$1 === "function" ? message$1(issue) : message$1;
+	if (isSchema) dataset.typed = false;
+	if (dataset.issues) dataset.issues.push(issue);
+	else dataset.issues = [issue];
+}
+/**
+* Returns the Standard Schema properties.
+*
+* @param context The schema context.
+*
+* @returns The Standard Schema properties.
+*/
+/* @__NO_SIDE_EFFECTS__ */
+function _getStandardProps(context) {
+	return {
+		version: 1,
+		vendor: "valibot",
+		validate(value$1) {
+			return context["~run"]({ value: value$1 }, /* @__PURE__ */ getGlobalConfig());
+		}
+	};
+}
+/**
+* Returns the fallback value of the schema.
+*
+* @param schema The schema to get it from.
+* @param dataset The output dataset if available.
+* @param config The config if available.
+*
+* @returns The fallback value.
+*/
+/* @__NO_SIDE_EFFECTS__ */
+function getFallback(schema, dataset, config$1) {
+	return typeof schema.fallback === "function" ? schema.fallback(dataset, config$1) : schema.fallback;
+}
+/**
+* Returns the default value of the schema.
+*
+* @param schema The schema to get it from.
+* @param dataset The input dataset if available.
+* @param config The config if available.
+*
+* @returns The default value.
+*/
+/* @__NO_SIDE_EFFECTS__ */
+function getDefault(schema, dataset, config$1) {
+	return typeof schema.default === "function" ? schema.default(dataset, config$1) : schema.default;
+}
+/* @__NO_SIDE_EFFECTS__ */
+function array(item, message$1) {
+	return {
+		kind: "schema",
+		type: "array",
+		reference: array,
+		expects: "Array",
+		async: false,
+		item,
+		message: message$1,
+		get "~standard"() {
+			return /* @__PURE__ */ _getStandardProps(this);
+		},
+		"~run"(dataset, config$1) {
+			const input = dataset.value;
+			if (Array.isArray(input)) {
+				dataset.typed = true;
+				dataset.value = [];
+				for (let key = 0; key < input.length; key++) {
+					const value$1 = input[key];
+					const itemDataset = this.item["~run"]({ value: value$1 }, config$1);
+					if (itemDataset.issues) {
+						const pathItem = {
+							type: "array",
+							origin: "value",
+							input,
+							key,
+							value: value$1
+						};
+						for (const issue of itemDataset.issues) {
+							if (issue.path) issue.path.unshift(pathItem);
+							else issue.path = [pathItem];
+							dataset.issues?.push(issue);
+						}
+						if (!dataset.issues) dataset.issues = itemDataset.issues;
+						if (config$1.abortEarly) {
+							dataset.typed = false;
+							break;
+						}
+					}
+					if (!itemDataset.typed) dataset.typed = false;
+					dataset.value.push(itemDataset.value);
+				}
+			} else _addIssue(this, "type", dataset, config$1);
+			return dataset;
+		}
+	};
+}
+/* @__NO_SIDE_EFFECTS__ */
+function nullable(wrapped, default_) {
+	return {
+		kind: "schema",
+		type: "nullable",
+		reference: nullable,
+		expects: `(${wrapped.expects} | null)`,
+		async: false,
+		wrapped,
+		default: default_,
+		get "~standard"() {
+			return /* @__PURE__ */ _getStandardProps(this);
+		},
+		"~run"(dataset, config$1) {
+			if (dataset.value === null) {
+				if (this.default !== void 0) dataset.value = /* @__PURE__ */ getDefault(this, dataset, config$1);
+				if (dataset.value === null) {
+					dataset.typed = true;
+					return dataset;
+				}
+			}
+			return this.wrapped["~run"](dataset, config$1);
+		}
+	};
+}
+/* @__NO_SIDE_EFFECTS__ */
+function number(message$1) {
+	return {
+		kind: "schema",
+		type: "number",
+		reference: number,
+		expects: "number",
+		async: false,
+		message: message$1,
+		get "~standard"() {
+			return /* @__PURE__ */ _getStandardProps(this);
+		},
+		"~run"(dataset, config$1) {
+			if (typeof dataset.value === "number" && !isNaN(dataset.value)) dataset.typed = true;
+			else _addIssue(this, "type", dataset, config$1);
+			return dataset;
+		}
+	};
+}
+/* @__NO_SIDE_EFFECTS__ */
+function object(entries$1, message$1) {
+	return {
+		kind: "schema",
+		type: "object",
+		reference: object,
+		expects: "Object",
+		async: false,
+		entries: entries$1,
+		message: message$1,
+		get "~standard"() {
+			return /* @__PURE__ */ _getStandardProps(this);
+		},
+		"~run"(dataset, config$1) {
+			const input = dataset.value;
+			if (input && typeof input === "object") {
+				dataset.typed = true;
+				dataset.value = {};
+				for (const key in this.entries) {
+					const valueSchema = this.entries[key];
+					if (key in input || (valueSchema.type === "exact_optional" || valueSchema.type === "optional" || valueSchema.type === "nullish") && valueSchema.default !== void 0) {
+						const value$1 = key in input ? input[key] : /* @__PURE__ */ getDefault(valueSchema);
+						const valueDataset = valueSchema["~run"]({ value: value$1 }, config$1);
+						if (valueDataset.issues) {
+							const pathItem = {
+								type: "object",
+								origin: "value",
+								input,
+								key,
+								value: value$1
+							};
+							for (const issue of valueDataset.issues) {
+								if (issue.path) issue.path.unshift(pathItem);
+								else issue.path = [pathItem];
+								dataset.issues?.push(issue);
+							}
+							if (!dataset.issues) dataset.issues = valueDataset.issues;
+							if (config$1.abortEarly) {
+								dataset.typed = false;
+								break;
+							}
+						}
+						if (!valueDataset.typed) dataset.typed = false;
+						dataset.value[key] = valueDataset.value;
+					} else if (valueSchema.fallback !== void 0) dataset.value[key] = /* @__PURE__ */ getFallback(valueSchema);
+					else if (valueSchema.type !== "exact_optional" && valueSchema.type !== "optional" && valueSchema.type !== "nullish") {
+						_addIssue(this, "key", dataset, config$1, {
+							input: void 0,
+							expected: `"${key}"`,
+							path: [{
+								type: "object",
+								origin: "key",
+								input,
+								key,
+								value: input[key]
+							}]
+						});
+						if (config$1.abortEarly) break;
+					}
+				}
+			} else _addIssue(this, "type", dataset, config$1);
+			return dataset;
+		}
+	};
+}
+/* @__NO_SIDE_EFFECTS__ */
+function optional(wrapped, default_) {
+	return {
+		kind: "schema",
+		type: "optional",
+		reference: optional,
+		expects: `(${wrapped.expects} | undefined)`,
+		async: false,
+		wrapped,
+		default: default_,
+		get "~standard"() {
+			return /* @__PURE__ */ _getStandardProps(this);
+		},
+		"~run"(dataset, config$1) {
+			if (dataset.value === void 0) {
+				if (this.default !== void 0) dataset.value = /* @__PURE__ */ getDefault(this, dataset, config$1);
+				if (dataset.value === void 0) {
+					dataset.typed = true;
+					return dataset;
+				}
+			}
+			return this.wrapped["~run"](dataset, config$1);
+		}
+	};
+}
+/* @__NO_SIDE_EFFECTS__ */
+function string(message$1) {
+	return {
+		kind: "schema",
+		type: "string",
+		reference: string,
+		expects: "string",
+		async: false,
+		message: message$1,
+		get "~standard"() {
+			return /* @__PURE__ */ _getStandardProps(this);
+		},
+		"~run"(dataset, config$1) {
+			if (typeof dataset.value === "string") dataset.typed = true;
+			else _addIssue(this, "type", dataset, config$1);
+			return dataset;
+		}
+	};
+}
+/**
+* Creates a unknown schema.
+*
+* @returns A unknown schema.
+*/
+/* @__NO_SIDE_EFFECTS__ */
+function unknown() {
+	return {
+		kind: "schema",
+		type: "unknown",
+		reference: unknown,
+		expects: "unknown",
+		async: false,
+		get "~standard"() {
+			return /* @__PURE__ */ _getStandardProps(this);
+		},
+		"~run"(dataset) {
+			dataset.typed = true;
+			return dataset;
+		}
+	};
+}
+/**
+* Parses an unknown input based on a schema.
+*
+* @param schema The schema to be used.
+* @param input The input to be parsed.
+* @param config The parse configuration.
+*
+* @returns The parse result.
+*/
+/* @__NO_SIDE_EFFECTS__ */
+function safeParse(schema, input, config$1) {
+	const dataset = schema["~run"]({ value: input }, /* @__PURE__ */ getGlobalConfig(config$1));
+	return {
+		typed: dataset.typed,
+		success: !dataset.issues,
+		output: dataset.value,
+		issues: dataset.issues
+	};
+}
 /**
 * Format a list of servers.
 */
@@ -52,7 +444,7 @@ function formatServer(server) {
 */
 function formatSiteList(sites, serverId) {
 	if (sites.length === 0) return serverId ? `No sites on server ${serverId}.` : "No sites found.";
-	const lines = sites.map((s) => `• ${s.name} (ID: ${s.id}) — ${s.project_type} — ${s.status}`);
+	const lines = sites.map((s) => `• ${s.name} (ID: ${s.id}) — ${s.app_type} — ${s.status}`);
 	return `${serverId ? `${sites.length} site(s) on server ${serverId}:` : `${sites.length} site(s):`}\n${lines.join("\n")}`;
 }
 /**
@@ -61,10 +453,9 @@ function formatSiteList(sites, serverId) {
 function formatSite(site) {
 	return [
 		`Site: ${site.name} (ID: ${site.id})`,
-		`Type: ${site.project_type}`,
-		`Directory: ${site.directory}`,
-		`Repository: ${site.repository ?? "none"}`,
-		`Branch: ${site.repository_branch ?? "none"}`,
+		`Type: ${site.app_type}`,
+		`Directory: ${site.root_directory}`,
+		`Repository: ${site.repository?.url ?? "none"}`,
 		`Status: ${site.status}`,
 		`Deploy status: ${site.deployment_status ?? "none"}`,
 		`Quick deploy: ${site.quick_deploy ? "enabled" : "disabled"}`,
@@ -101,7 +492,6 @@ function formatDatabaseUser(user) {
 	return [
 		`Database User: ${user.name} (ID: ${user.id})`,
 		`Status: ${user.status}`,
-		`Databases: ${user.databases.length > 0 ? user.databases.join(", ") : "none"}`,
 		`Created: ${user.created_at}`
 	].join("\n");
 }
@@ -110,7 +500,7 @@ function formatDatabaseUser(user) {
 */
 function formatDeploymentList(deployments) {
 	if (deployments.length === 0) return "No deployments found.";
-	const lines = deployments.map((d) => `• #${d.id} — ${d.status} — ${d.commit_hash?.slice(0, 7) ?? "no commit"} — ${d.started_at}`);
+	const lines = deployments.map((d) => `• #${d.id} — ${d.status} — ${d.commit?.hash?.slice(0, 7) ?? "no commit"} — ${d.started_at}`);
 	return `${deployments.length} deployment(s):\n${lines.join("\n")}`;
 }
 /**
@@ -148,16 +538,11 @@ function formatDeploymentScriptUpdated(siteId, serverId) {
 /**
 * Format a list of certificates.
 */
-function formatCertificateList(certificates) {
-	if (certificates.length === 0) return "No certificates found.";
-	const lines = certificates.map((c) => `• ${c.domain} (ID: ${c.id}) — ${c.type} — ${c.active ? "active" : "inactive"} — ${c.status}`);
-	return `${certificates.length} certificate(s):\n${lines.join("\n")}`;
-}
 /**
-* Format a single certificate.
+* Format a single certificate (v2: one certificate per domain).
 */
 function formatCertificate(cert) {
-	return `Certificate: ${cert.domain} (ID: ${cert.id})\nType: ${cert.type}\nStatus: ${cert.status}\nActive: ${cert.active}`;
+	return `Certificate (ID: ${cert.id})\nType: ${cert.type}\nStatus: ${cert.status}\nRequest: ${cert.request_status}`;
 }
 /**
 * Format a list of daemons.
@@ -289,7 +674,7 @@ function formatNginxTemplate(template) {
 */
 function formatBackupConfigList(backups) {
 	if (backups.length === 0) return "No backup configurations found.";
-	const lines = backups.map((b) => `• ${b.provider_name} (ID: ${b.id}) — ${b.frequency} — ${b.status} — last: ${b.last_backup_time ?? "never"}`);
+	const lines = backups.map((b) => `• ${b.name} (ID: ${b.id}) — ${b.schedule} — ${b.status} — next: ${b.next_run_time ?? "—"}`);
 	return `${backups.length} backup config(s):\n${lines.join("\n")}`;
 }
 /**
@@ -297,12 +682,11 @@ function formatBackupConfigList(backups) {
 */
 function formatBackupConfig(backup) {
 	return [
-		`Backup Config: ${backup.provider_name} (ID: ${backup.id})`,
-		`Frequency: ${backup.frequency}`,
+		`Backup Config: ${backup.name} (ID: ${backup.id})`,
+		`Schedule: ${backup.displayable_schedule}`,
 		`Status: ${backup.status}`,
 		`Retention: ${backup.retention} backups`,
-		`Databases: ${backup.databases.map((d) => d.name).join(", ") || "none"}`,
-		`Last backup: ${backup.last_backup_time ?? "never"}`
+		`Next run: ${backup.next_run_time ?? "—"}`
 	].join("\n");
 }
 /**
@@ -324,7 +708,7 @@ function formatRecipe(recipe) {
 */
 function formatCommandList(commands) {
 	if (commands.length === 0) return "No commands found.";
-	const lines = commands.map((c) => `• #${c.id} — ${c.status} — ${c.user_name} — ${c.command.slice(0, 60)}`);
+	const lines = commands.map((c) => `• #${c.id} — ${c.status} — user ${c.user_id} — ${c.command.slice(0, 60)}`);
 	return `${commands.length} command(s):\n${lines.join("\n")}`;
 }
 /**
@@ -335,7 +719,8 @@ function formatCommand(command) {
 		`Command #${command.id}`,
 		`Command: ${command.command}`,
 		`Status: ${command.status}`,
-		`User: ${command.user_name}`,
+		`User ID: ${command.user_id}`,
+		`Duration: ${command.duration}`,
 		`Created: ${command.created_at}`
 	].join("\n");
 }
@@ -352,9 +737,7 @@ function formatUser(user) {
 	return [
 		`User: ${user.name} (ID: ${user.id})`,
 		`Email: ${user.email}`,
-		`GitHub: ${user.connected_to_github ? "connected" : "not connected"}`,
-		`GitLab: ${user.connected_to_gitlab ? "connected" : "not connected"}`,
-		`2FA: ${user.two_factor_enabled ? "enabled" : "disabled"}`
+		`Created: ${user.created_at}`
 	].join("\n");
 }
 /**
@@ -436,49 +819,39 @@ function errorResult(message) {
 	};
 }
 /**
-* Create a resource handler from configuration.
-*
-* Returns a function that routes actions to the correct executor,
-* validates required fields, and formats results.
+* Factory for creating Forge resource handlers.
 *
-* @example
-* ```typescript
-* export const handleDatabases = createResourceHandler({
-*   resource: 'databases',
-*   actions: ['list', 'get', 'create', 'delete'],
-*   requiredFields: {
-*     list: ['server_id'],
-*     get: ['server_id', 'id'],
-*     create: ['server_id', 'name'],
-*     delete: ['server_id', 'id'],
-*   },
-*   executors: {
-*     list: listDatabases,
-*     get: getDatabase,
-*     create: createDatabase,
-*     delete: deleteDatabase,
-*   },
-*   formatResult: (action, data) => {
-*     if (action === 'list') return formatDatabaseList(data);
-*     if (action === 'get') return formatDatabase(data);
-*     return 'Done.';
-*   },
-* });
-* ```
+* Encapsulates the repetitive list/get/create/update/delete pattern
+* shared by all MCP resource handlers.
+*/
+/**
+* Format Valibot validation issues into field-level error messages.
+*/
+function formatValidationIssues(issues) {
+	return issues.map((issue) => {
+		return `${issue.path?.map((p) => p.key).join(".") || "(root)"}: ${issue.message}`;
+	}).join(", ");
+}
+/**
+* Create a resource handler from configuration.
 */
 function createResourceHandler(config) {
-	const { resource, actions, requiredFields = {}, executors, hints, mapOptions, formatResult } = config;
+	const { resource, actions, inputSchemas = {}, executors, hints, mapOptions, formatResult } = config;
 	return async (action, args, ctx) => {
 		if (!actions.includes(action)) return errorResult(`Unknown action "${action}" for ${resource}. Valid actions: ${actions.join(", ")}.`);
-		const required = requiredFields[action] ?? [];
-		for (const field of required) if (!args[field]) return errorResult(`Missing required field: ${field}`);
+		const schema = inputSchemas[action];
+		if (schema) {
+			const parsed = /* @__PURE__ */ safeParse(schema, args);
+			if (!parsed.success) return errorResult(`Invalid input: ${formatValidationIssues(parsed.issues)}`);
+		}
 		for (const field of [
 			"id",
 			"server_id",
 			"site_id"
 		]) {
 			const value = args[field];
-			if (value !== void 0 && !sanitizeId(String(value))) return errorResult(`Invalid ${field}: "${value}". IDs must be alphanumeric.`);
+			const idStr = typeof value === "string" || typeof value === "number" ? String(value) : "";
+			if (value !== void 0 && !sanitizeId(idStr)) return errorResult(`Invalid ${field}: "${idStr}". IDs must be alphanumeric.`);
 		}
 		const executor = executors[action];
 		if (!executor) return errorResult(`Action "${action}" is not yet implemented for ${resource}.`);
@@ -495,8 +868,8 @@ function createResourceHandler(config) {
 			/* v8 ignore start */
 			const id = args.id ?? args.server_id ?? "";
 			return jsonResult({
-				...result.data,
-				_hints: hints(result.data, String(id))
+				...typeof result.data === "object" && result.data !== null ? result.data : {},
+				_hints: hints(result.data, String(id), args)
 			});
 		}
 		return jsonResult(result.data);
@@ -508,31 +881,55 @@ const handleBackups = createResourceHandler({
 		"list",
 		"get",
 		"create",
+		"update",
 		"delete"
 	],
-	requiredFields: {
-		list: ["server_id"],
-		get: ["server_id", "id"],
-		create: [
-			"server_id",
-			"provider",
-			"credentials",
-			"frequency",
-			"databases"
-		],
-		delete: ["server_id", "id"]
+	inputSchemas: {
+		list: /* @__PURE__ */ object({ server_id: /* @__PURE__ */ string() }),
+		get: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string()
+		}),
+		create: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			provider: /* @__PURE__ */ string(),
+			frequency: /* @__PURE__ */ string(),
+			credentials: /* @__PURE__ */ unknown(),
+			databases: /* @__PURE__ */ unknown()
+		}),
+		update: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string(),
+			storage_provider_id: /* @__PURE__ */ number(),
+			frequency: /* @__PURE__ */ string(),
+			retention: /* @__PURE__ */ number(),
+			database_ids: /* @__PURE__ */ array(/* @__PURE__ */ number()),
+			name: /* @__PURE__ */ optional(/* @__PURE__ */ nullable(/* @__PURE__ */ string())),
+			bucket: /* @__PURE__ */ optional(/* @__PURE__ */ nullable(/* @__PURE__ */ string())),
+			directory: /* @__PURE__ */ optional(/* @__PURE__ */ nullable(/* @__PURE__ */ string())),
+			day: /* @__PURE__ */ optional(/* @__PURE__ */ string()),
+			time: /* @__PURE__ */ optional(/* @__PURE__ */ string()),
+			cron: /* @__PURE__ */ optional(/* @__PURE__ */ string()),
+			notification_email: /* @__PURE__ */ optional(/* @__PURE__ */ nullable(/* @__PURE__ */ string()))
+		}),
+		delete: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string()
+		})
 	},
 	executors: {
 		list: listBackupConfigs,
 		get: getBackupConfig,
 		create: createBackupConfig,
+		update: updateBackupConfig,
 		delete: deleteBackupConfig
 	},
 	formatResult: (action, data, args) => {
 		switch (action) {
 			case "list": return formatBackupConfigList(data);
 			case "get": return formatBackupConfig(data);
-			case "create": return formatBackupConfig(data);
+			case "create": return "Done.";
+			case "update": return "Done.";
 			case "delete": return `Backup config ${args.id} deleted.`;
 			default: return "Done.";
 		}
@@ -740,13 +1137,9 @@ const TOOLS = [{
 			},
 			domain: {
 				type: "string",
-				description: "Site domain name (e.g. example.com)"
-			},
-			project_type: {
-				type: "string",
-				description: "Site project type (e.g. php, html, symfony, laravel)"
+				description: "Site domain name (alias for name, e.g. example.com)"
 			},
-			directory: {
+			web_directory: {
 				type: "string",
 				description: "Web directory relative to site root (e.g. /public)"
 			},
@@ -833,7 +1226,7 @@ function getTools(options) {
 const STDIO_ONLY_TOOLS = [{
 	name: "forge_configure",
 	title: "Configure Forge",
-	description: "Configure Laravel Forge API token. The token is stored locally in the XDG config directory.",
+	description: "Configure Laravel Forge API credentials. The token is stored locally in the XDG config directory.",
 	annotations: {
 		title: "Configure Forge",
 		readOnlyHint: false,
@@ -843,11 +1236,16 @@ const STDIO_ONLY_TOOLS = [{
 	},
 	inputSchema: {
 		type: "object",
-		properties: { apiToken: {
-			type: "string",
-			description: "Your Laravel Forge API token"
-		} },
-		required: ["apiToken"]
+		properties: {
+			apiToken: {
+				type: "string",
+				description: "Your Laravel Forge API token"
+			},
+			organizationSlug: {
+				type: "string",
+				description: "Default organization slug (e.g. 'studio-meta'). Required for all API calls."
+			}
+		}
 	},
 	outputSchema: {
 		type: "object",
@@ -860,6 +1258,10 @@ const STDIO_ONLY_TOOLS = [{
 			apiToken: {
 				type: "string",
 				description: "Masked API token (last 4 chars)"
+			},
+			organizationSlug: {
+				type: "string",
+				description: "Organization slug"
 			}
 		},
 		required: ["success"]
@@ -896,6 +1298,33 @@ const STDIO_ONLY_TOOLS = [{
 }];
 var MAX_OPERATIONS = 10;
 /**
+* Validate and narrow an array element to a BatchOperation.
+* Returns an error message string on failure, or the typed operation on success.
+*/
+function validateOperation(op, index) {
+	if (!op || typeof op !== "object") return {
+		ok: false,
+		error: `Operation at index ${index} must be an object.`
+	};
+	const record = op;
+	if (!record["resource"] || typeof record["resource"] !== "string") return {
+		ok: false,
+		error: `Operation at index ${index} is missing required field "resource".`
+	};
+	if (!record["action"] || typeof record["action"] !== "string") return {
+		ok: false,
+		error: `Operation at index ${index} is missing required field "action".`
+	};
+	if (!isReadAction(record["action"])) return {
+		ok: false,
+		error: `Operation at index ${index} has invalid action "${record["action"]}". Only read actions are allowed in batch: list, get, help, schema.`
+	};
+	return {
+		ok: true,
+		value: record
+	};
+}
+/**
 * Handle batch action — executes multiple read operations in parallel.
 */
 async function handleBatch(action, args, ctx, routeToHandler) {
@@ -904,14 +1333,13 @@ async function handleBatch(action, args, ctx, routeToHandler) {
 	if (operations === void 0 || operations === null) return errorResult("Missing required field: \"operations\". Provide an array of operations.");
 	if (!Array.isArray(operations)) return errorResult("\"operations\" must be an array of operation objects.");
 	if (operations.length > MAX_OPERATIONS) return errorResult(`Too many operations: ${operations.length}. Maximum is ${MAX_OPERATIONS} per batch.`);
+	const validated = [];
 	for (let i = 0; i < operations.length; i++) {
-		const op = operations[i];
-		if (!op || typeof op !== "object") return errorResult(`Operation at index ${i} must be an object.`);
-		if (!op["resource"] || typeof op["resource"] !== "string") return errorResult(`Operation at index ${i} is missing required field "resource".`);
-		if (!op["action"] || typeof op["action"] !== "string") return errorResult(`Operation at index ${i} is missing required field "action".`);
-		if (!isReadAction(op["action"])) return errorResult(`Operation at index ${i} has invalid action "${op["action"]}". Only read actions are allowed in batch: list, get, help, schema.`);
+		const result = validateOperation(operations[i], i);
+		if (!result.ok) return errorResult(result.error);
+		validated.push(result.value);
 	}
-	const settled = await Promise.allSettled(operations.map((op) => {
+	const settled = await Promise.allSettled(validated.map((op) => {
 		const { resource, action: opAction, ...rest } = op;
 		return routeToHandler(resource, opAction, {
 			resource,
@@ -922,9 +1350,7 @@ async function handleBatch(action, args, ctx, routeToHandler) {
 	let succeeded = 0;
 	let failed = 0;
 	const results = settled.map((outcome, index) => {
-		const op = operations[index];
-		const resource = op["resource"];
-		const opAction = op["action"];
+		const { resource, action: opAction } = validated[index];
 		if (outcome.status === "fulfilled") {
 			const toolResult = outcome.value;
 			if (toolResult.isError) {
@@ -955,7 +1381,7 @@ async function handleBatch(action, args, ctx, routeToHandler) {
 	});
 	return jsonResult({
 		_batch: {
-			total: operations.length,
+			total: validated.length,
 			succeeded,
 			failed
 		},
@@ -1052,12 +1478,13 @@ function getSiteHints(serverId, siteId) {
 			},
 			{
 				resource: "certificates",
-				description: "List SSL certificates",
+				description: "Get certificate for a domain (requires domain_id)",
 				example: {
 					resource: "certificates",
-					action: "list",
+					action: "get",
 					server_id: serverId,
-					site_id: siteId
+					site_id: siteId,
+					domain_id: "<domain_id>"
 				}
 			},
 			{
@@ -1176,16 +1603,16 @@ function getDaemonHints(serverId, daemonId) {
 /**
 * Hints after getting a certificate.
 */
-function getCertificateHints(serverId, siteId, certificateId) {
+function getCertificateHints(serverId, siteId, domainId) {
 	return {
 		related_resources: [{
-			resource: "certificates",
-			description: "List all certificates for this site",
+			resource: "sites",
+			description: "Get the parent site",
 			example: {
-				resource: "certificates",
-				action: "list",
+				resource: "sites",
+				action: "get",
 				server_id: serverId,
-				site_id: siteId
+				id: siteId
 			}
 		}],
 		common_actions: [{
@@ -1195,7 +1622,7 @@ function getCertificateHints(serverId, siteId, certificateId) {
 				action: "activate",
 				server_id: serverId,
 				site_id: siteId,
-				id: certificateId
+				domain_id: domainId
 			}
 		}, {
 			action: "Delete this certificate",
@@ -1204,7 +1631,7 @@ function getCertificateHints(serverId, siteId, certificateId) {
 				action: "delete",
 				server_id: serverId,
 				site_id: siteId,
-				id: certificateId
+				domain_id: domainId
 			}
 		}]
 	};
@@ -1327,53 +1754,47 @@ function getNginxTemplateHints(serverId, templateId) {
 const handleCertificates = createResourceHandler({
 	resource: "certificates",
 	actions: [
-		"list",
 		"get",
 		"create",
 		"delete",
 		"activate"
 	],
-	requiredFields: {
-		list: ["server_id", "site_id"],
-		get: [
-			"server_id",
-			"site_id",
-			"id"
-		],
-		create: [
-			"server_id",
-			"site_id",
-			"domain"
-		],
-		delete: [
-			"server_id",
-			"site_id",
-			"id"
-		],
-		activate: [
-			"server_id",
-			"site_id",
-			"id"
-		]
+	inputSchemas: {
+		get: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			site_id: /* @__PURE__ */ string(),
+			domain_id: /* @__PURE__ */ string()
+		}),
+		create: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			site_id: /* @__PURE__ */ string(),
+			domain_id: /* @__PURE__ */ string(),
+			type: /* @__PURE__ */ string()
+		}),
+		delete: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			site_id: /* @__PURE__ */ string(),
+			domain_id: /* @__PURE__ */ string()
+		}),
+		activate: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			site_id: /* @__PURE__ */ string(),
+			domain_id: /* @__PURE__ */ string()
+		})
 	},
 	executors: {
-		list: listCertificates,
 		get: getCertificate,
 		create: createCertificate,
 		delete: deleteCertificate,
 		activate: activateCertificate
 	},
-	hints: (data, id) => {
-		const cert = data;
-		return getCertificateHints(String(cert.server_id), String(cert.site_id), id);
-	},
+	hints: (_data, _id, args) => getCertificateHints(String(args.server_id), String(args.site_id), String(args.domain_id)),
 	formatResult: (action, data, args) => {
 		switch (action) {
-			case "list": return formatCertificateList(data);
 			case "get": return formatCertificate(data);
 			case "create": return formatCertificate(data);
-			case "delete": return `Certificate ${args.id} deleted.`;
-			case "activate": return `Certificate ${args.id} activated.`;
+			case "delete": return `Certificate for domain ${String(args.domain_id)} deleted.`;
+			case "activate": return `Certificate for domain ${String(args.domain_id)} activated.`;
 			default: return "Done.";
 		}
 	}
@@ -1385,18 +1806,21 @@ const handleCommands = createResourceHandler({
 		"get",
 		"create"
 	],
-	requiredFields: {
-		list: ["server_id", "site_id"],
-		get: [
-			"server_id",
-			"site_id",
-			"id"
-		],
-		create: [
-			"server_id",
-			"site_id",
-			"command"
-		]
+	inputSchemas: {
+		list: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			site_id: /* @__PURE__ */ string()
+		}),
+		get: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			site_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string()
+		}),
+		create: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			site_id: /* @__PURE__ */ string(),
+			command: /* @__PURE__ */ string()
+		})
 	},
 	executors: {
 		list: listCommands,
@@ -1407,7 +1831,7 @@ const handleCommands = createResourceHandler({
 		switch (action) {
 			case "list": return formatCommandList(data);
 			case "get": return formatCommand(data);
-			case "create": return formatCommand(data);
+			case "create": return "Done.";
 			default: return "Done.";
 		}
 	}
@@ -1418,32 +1842,50 @@ const handleDaemons = createResourceHandler({
 		"list",
 		"get",
 		"create",
+		"update",
 		"delete",
 		"restart"
 	],
-	requiredFields: {
-		list: ["server_id"],
-		get: ["server_id", "id"],
-		create: ["server_id", "command"],
-		delete: ["server_id", "id"],
-		restart: ["server_id", "id"]
+	inputSchemas: {
+		list: /* @__PURE__ */ object({ server_id: /* @__PURE__ */ string() }),
+		get: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string()
+		}),
+		create: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			command: /* @__PURE__ */ string()
+		}),
+		update: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string(),
+			name: /* @__PURE__ */ string(),
+			config: /* @__PURE__ */ optional(/* @__PURE__ */ string())
+		}),
+		delete: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string()
+		}),
+		restart: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string()
+		})
 	},
 	executors: {
 		list: listDaemons,
 		get: getDaemon,
 		create: createDaemon,
+		update: updateDaemon,
 		delete: deleteDaemon,
 		restart: restartDaemon
 	},
-	hints: (data, id) => {
-		const daemon = data;
-		return getDaemonHints(String(daemon.server_id), id);
-	},
+	hints: (_data, id, args) => getDaemonHints(String(args.server_id), id),
 	formatResult: (action, data, args) => {
 		switch (action) {
 			case "list": return formatDaemonList(data);
 			case "get": return formatDaemon(data);
 			case "create": return formatDaemon(data);
+			case "update": return formatDaemon(data);
 			case "delete": return `Daemon ${args.id} deleted.`;
 			case "restart": return `Daemon ${args.id} restarted.`;
 			default: return "Done.";
@@ -1458,11 +1900,20 @@ const handleDatabases = createResourceHandler({
 		"create",
 		"delete"
 	],
-	requiredFields: {
-		list: ["server_id"],
-		get: ["server_id", "id"],
-		create: ["server_id", "name"],
-		delete: ["server_id", "id"]
+	inputSchemas: {
+		list: /* @__PURE__ */ object({ server_id: /* @__PURE__ */ string() }),
+		get: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string()
+		}),
+		create: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			name: /* @__PURE__ */ string()
+		}),
+		delete: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string()
+		})
 	},
 	executors: {
 		list: listDatabases,
@@ -1470,10 +1921,7 @@ const handleDatabases = createResourceHandler({
 		create: createDatabase,
 		delete: deleteDatabase
 	},
-	hints: (data, id) => {
-		const db = data;
-		return getDatabaseHints(String(db.server_id), id);
-	},
+	hints: (_data, id, args) => getDatabaseHints(String(args.server_id), id),
 	formatResult: (action, data, args) => {
 		switch (action) {
 			case "list": return formatDatabaseList(data);
@@ -1490,33 +1938,45 @@ const handleDatabaseUsers = createResourceHandler({
 		"list",
 		"get",
 		"create",
+		"update",
 		"delete"
 	],
-	requiredFields: {
-		list: ["server_id"],
-		get: ["server_id", "id"],
-		create: [
-			"server_id",
-			"name",
-			"password"
-		],
-		delete: ["server_id", "id"]
+	inputSchemas: {
+		list: /* @__PURE__ */ object({ server_id: /* @__PURE__ */ string() }),
+		get: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string()
+		}),
+		create: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			name: /* @__PURE__ */ string(),
+			password: /* @__PURE__ */ string()
+		}),
+		update: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string(),
+			password: /* @__PURE__ */ optional(/* @__PURE__ */ nullable(/* @__PURE__ */ string())),
+			database_ids: /* @__PURE__ */ optional(/* @__PURE__ */ array(/* @__PURE__ */ number()))
+		}),
+		delete: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string()
+		})
 	},
 	executors: {
 		list: listDatabaseUsers,
 		get: getDatabaseUser,
 		create: createDatabaseUser,
+		update: updateDatabaseUser,
 		delete: deleteDatabaseUser
 	},
-	hints: (data, id) => {
-		const user = data;
-		return getDatabaseUserHints(String(user.server_id), id);
-	},
+	hints: (_data, id, args) => getDatabaseUserHints(String(args.server_id), id),
 	formatResult: (action, data, args) => {
 		switch (action) {
 			case "list": return formatDatabaseUserList(data);
 			case "get": return formatDatabaseUser(data);
 			case "create": return formatDatabaseUser(data);
+			case "update": return formatDatabaseUser(data);
 			case "delete": return `Database user ${args.id} deleted.`;
 			default: return "Done.";
 		}
@@ -1550,7 +2010,7 @@ async function handleDeployments(action, args, ctx) {
 		}
 		case "get":
 			if (args.id) {
-				const result = await getDeploymentOutput({
+				const result = await getDeploymentLog({
 					...opts,
 					deployment_id: args.id
 				}, ctx.executorContext);
@@ -1570,13 +2030,16 @@ async function handleDeployments(action, args, ctx) {
 const handleEnv = createResourceHandler({
 	resource: "env",
 	actions: ["get", "update"],
-	requiredFields: {
-		get: ["server_id", "site_id"],
-		update: [
-			"server_id",
-			"site_id",
-			"content"
-		]
+	inputSchemas: {
+		get: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			site_id: /* @__PURE__ */ string()
+		}),
+		update: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			site_id: /* @__PURE__ */ string(),
+			content: /* @__PURE__ */ string()
+		})
 	},
 	executors: {
 		get: getEnv,
@@ -1603,15 +2066,21 @@ const handleFirewallRules = createResourceHandler({
 		"create",
 		"delete"
 	],
-	requiredFields: {
-		list: ["server_id"],
-		get: ["server_id", "id"],
-		create: [
-			"server_id",
-			"name",
-			"port"
-		],
-		delete: ["server_id", "id"]
+	inputSchemas: {
+		list: /* @__PURE__ */ object({ server_id: /* @__PURE__ */ string() }),
+		get: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string()
+		}),
+		create: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			name: /* @__PURE__ */ string(),
+			port: /* @__PURE__ */ string()
+		}),
+		delete: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string()
+		})
 	},
 	executors: {
 		list: listFirewallRules,
@@ -1619,15 +2088,12 @@ const handleFirewallRules = createResourceHandler({
 		create: createFirewallRule,
 		delete: deleteFirewallRule
 	},
-	hints: (data, id) => {
-		const rule = data;
-		return getFirewallRuleHints(String(rule.server_id), id);
-	},
+	hints: (_data, id, args) => getFirewallRuleHints(String(args.server_id), id),
 	formatResult: (action, data, args) => {
 		switch (action) {
 			case "list": return formatFirewallRuleList(data);
 			case "get": return formatFirewallRule(data);
-			case "create": return formatFirewallRule(data);
+			case "create": return "Done.";
 			case "delete": return `Firewall rule ${args.id} deleted.`;
 			default: return "Done.";
 		}
@@ -1703,17 +2169,17 @@ var RESOURCE_HELP = {
 		actions: {
 			list: "List all sites on a server",
 			get: "Get a single site by ID",
-			create: "Create a new site (requires domain, project_type)",
+			create: "Create a new site (requires type; optionally name, web_directory)",
 			delete: "Delete a site by ID",
-			context: "Get full site context: site details + recent deployments (last 5) + certificates + redirect rules + security rules in one call",
+			context: "Get full site context: site details + recent deployments (last 5) + redirect rules + security rules in one call",
 			resolve: "Find sites by domain name (partial, case-insensitive match, requires server_id)"
 		},
 		fields: {
 			id: "Site ID",
 			server_id: "Parent server ID",
 			name: "Domain name (e.g. example.com)",
-			project_type: "Project type (php, html, symfony, symfony_dev, symfony_four, laravel)",
-			directory: "Web root directory (e.g. /public)",
+			type: "Site type (php, html, symfony, symfony_dev, symfony_four, laravel)",
+			web_directory: "Web root directory (e.g. /public)",
 			repository: "Git repository URL (if connected)",
 			deployment_status: "Last deployment status (null, deploying, deployed, failed)"
 		},
@@ -1741,13 +2207,13 @@ var RESOURCE_HELP = {
 					resource: "sites",
 					action: "create",
 					server_id: "123",
-					domain: "app.example.com",
-					project_type: "php",
-					directory: "/public"
+					type: "php",
+					name: "app.example.com",
+					web_directory: "/public"
 				}
 			},
 			{
-				description: "Get full site context (site + deployments + certificates + rules)",
+				description: "Get full site context (site + deployments + rules)",
 				params: {
 					resource: "sites",
 					action: "context",
@@ -1868,23 +2334,23 @@ var RESOURCE_HELP = {
 		}]
 	},
 	certificates: {
-		description: "Manage SSL/TLS certificates for a site — Let's Encrypt, custom, or cloned",
-		scope: "site (requires server_id + site_id)",
+		description: "Manage SSL/TLS certificates per domain — Let's Encrypt, CSR, existing, or cloned (v2: one cert per domain)",
+		scope: "domain (requires server_id + site_id + domain_id)",
 		actions: {
-			list: "List certificates for a site",
-			get: "Get certificate details",
-			create: "Create/request a new certificate",
-			delete: "Delete a certificate",
-			activate: "Activate a certificate (make it the active cert for the site)"
+			get: "Get certificate for a domain",
+			create: "Create/request a new certificate for a domain",
+			delete: "Delete a domain certificate",
+			activate: "Activate a domain certificate"
 		},
 		examples: [
 			{
-				description: "List certificates",
+				description: "Get certificate for a domain",
 				params: {
 					resource: "certificates",
-					action: "list",
+					action: "get",
 					server_id: "123",
-					site_id: "456"
+					site_id: "456",
+					domain_id: "789"
 				}
 			},
 			{
@@ -1894,8 +2360,8 @@ var RESOURCE_HELP = {
 					action: "create",
 					server_id: "123",
 					site_id: "456",
-					domain: "example.com",
-					type: "new"
+					domain_id: "789",
+					type: "letsencrypt"
 				}
 			},
 			{
@@ -1905,7 +2371,7 @@ var RESOURCE_HELP = {
 					action: "activate",
 					server_id: "123",
 					site_id: "456",
-					id: "789"
+					domain_id: "789"
 				}
 			}
 		]
@@ -2228,7 +2694,7 @@ var RESOURCE_HELP = {
 		fields: {
 			provider: "Backup provider (s3, spaces, custom)",
 			credentials: "Provider credentials (keys, bucket, region)",
-			frequency: "Backup frequency (daily, weekly, custom)",
+			schedule: "Backup schedule (daily, weekly, custom cron)",
 			databases: "Array of database IDs to back up",
 			retention: "Number of backups to retain"
 		},
@@ -2318,7 +2784,7 @@ var RESOURCE_HELP = {
 	user: {
 		description: "Get the currently authenticated Forge user profile",
 		scope: "global (no parent ID needed)",
-		actions: { get: "Get the authenticated user's profile (name, email, connected services)" },
+		actions: { get: "Get the authenticated user's profile (name, email)" },
 		examples: [{
 			description: "Get user profile",
 			params: {
@@ -2431,17 +2897,23 @@ const handleMonitors = createResourceHandler({
 		"create",
 		"delete"
 	],
-	requiredFields: {
-		list: ["server_id"],
-		get: ["server_id", "id"],
-		create: [
-			"server_id",
-			"type",
-			"operator",
-			"threshold",
-			"minutes"
-		],
-		delete: ["server_id", "id"]
+	inputSchemas: {
+		list: /* @__PURE__ */ object({ server_id: /* @__PURE__ */ string() }),
+		get: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string()
+		}),
+		create: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			type: /* @__PURE__ */ string(),
+			operator: /* @__PURE__ */ string(),
+			threshold: /* @__PURE__ */ string(),
+			minutes: /* @__PURE__ */ string()
+		}),
+		delete: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string()
+		})
 	},
 	executors: {
 		list: listMonitors,
@@ -2462,13 +2934,16 @@ const handleMonitors = createResourceHandler({
 const handleNginxConfig = createResourceHandler({
 	resource: "nginx",
 	actions: ["get", "update"],
-	requiredFields: {
-		get: ["server_id", "site_id"],
-		update: [
-			"server_id",
-			"site_id",
-			"content"
-		]
+	inputSchemas: {
+		get: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			site_id: /* @__PURE__ */ string()
+		}),
+		update: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			site_id: /* @__PURE__ */ string(),
+			content: /* @__PURE__ */ string()
+		})
 	},
 	executors: {
 		get: getNginxConfig,
@@ -2496,16 +2971,25 @@ const handleNginxTemplates = createResourceHandler({
 		"update",
 		"delete"
 	],
-	requiredFields: {
-		list: ["server_id"],
-		get: ["server_id", "id"],
-		create: [
-			"server_id",
-			"name",
-			"content"
-		],
-		update: ["server_id", "id"],
-		delete: ["server_id", "id"]
+	inputSchemas: {
+		list: /* @__PURE__ */ object({ server_id: /* @__PURE__ */ string() }),
+		get: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string()
+		}),
+		create: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			name: /* @__PURE__ */ string(),
+			content: /* @__PURE__ */ string()
+		}),
+		update: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string()
+		}),
+		delete: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string()
+		})
 	},
 	executors: {
 		list: listNginxTemplates,
@@ -2514,10 +2998,7 @@ const handleNginxTemplates = createResourceHandler({
 		update: updateNginxTemplate,
 		delete: deleteNginxTemplate
 	},
-	hints: (data, id) => {
-		const template = data;
-		return getNginxTemplateHints(String(template.server_id), id);
-	},
+	hints: (_data, id, args) => getNginxTemplateHints(String(args.server_id), id),
 	formatResult: (action, data, args) => {
 		switch (action) {
 			case "list": return formatNginxTemplateList(data);
@@ -2535,20 +3016,34 @@ const handleRecipes = createResourceHandler({
 		"list",
 		"get",
 		"create",
+		"update",
 		"delete",
 		"run"
 	],
-	requiredFields: {
-		get: ["id"],
-		create: ["name", "script"],
-		delete: ["id"],
-		run: ["id", "servers"]
+	inputSchemas: {
+		get: /* @__PURE__ */ object({ id: /* @__PURE__ */ string() }),
+		create: /* @__PURE__ */ object({
+			name: /* @__PURE__ */ string(),
+			script: /* @__PURE__ */ string()
+		}),
+		delete: /* @__PURE__ */ object({ id: /* @__PURE__ */ string() }),
+		update: /* @__PURE__ */ object({
+			id: /* @__PURE__ */ string(),
+			name: /* @__PURE__ */ optional(/* @__PURE__ */ string()),
+			user: /* @__PURE__ */ optional(/* @__PURE__ */ string()),
+			script: /* @__PURE__ */ optional(/* @__PURE__ */ string())
+		}),
+		run: /* @__PURE__ */ object({
+			id: /* @__PURE__ */ string(),
+			servers: /* @__PURE__ */ unknown()
+		})
 	},
 	executors: {
 		list: listRecipes,
 		get: getRecipe,
 		create: createRecipe,
 		delete: deleteRecipe,
+		update: updateRecipe,
 		run: runRecipe
 	},
 	hints: (_data, id) => getRecipeHints(id),
@@ -2557,6 +3052,7 @@ const handleRecipes = createResourceHandler({
 			case "list": return formatRecipeList(data);
 			case "get": return formatRecipe(data);
 			case "create": return formatRecipe(data);
+			case "update": return formatRecipe(data);
 			case "delete": return `Recipe ${args.id} deleted.`;
 			case "run": {
 				const servers = args.servers;
@@ -2575,24 +3071,27 @@ const handleRedirectRules = createResourceHandler({
 		"create",
 		"delete"
 	],
-	requiredFields: {
-		list: ["server_id", "site_id"],
-		get: [
-			"server_id",
-			"site_id",
-			"id"
-		],
-		create: [
-			"server_id",
-			"site_id",
-			"from",
-			"to"
-		],
-		delete: [
-			"server_id",
-			"site_id",
-			"id"
-		]
+	inputSchemas: {
+		list: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			site_id: /* @__PURE__ */ string()
+		}),
+		get: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			site_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string()
+		}),
+		create: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			site_id: /* @__PURE__ */ string(),
+			from: /* @__PURE__ */ string(),
+			to: /* @__PURE__ */ string()
+		}),
+		delete: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			site_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string()
+		})
 	},
 	executors: {
 		list: listRedirectRules,
@@ -2604,7 +3103,7 @@ const handleRedirectRules = createResourceHandler({
 		switch (action) {
 			case "list": return formatRedirectRuleList(data);
 			case "get": return formatRedirectRule(data);
-			case "create": return formatRedirectRule(data);
+			case "create": return "Done.";
 			case "delete": return `Redirect rule ${args.id} deleted.`;
 			default: return "Done.";
 		}
@@ -2618,11 +3117,26 @@ const handleScheduledJobs = createResourceHandler({
 		"create",
 		"delete"
 	],
-	requiredFields: {
-		list: ["server_id"],
-		get: ["server_id", "id"],
-		create: ["server_id", "command"],
-		delete: ["server_id", "id"]
+	inputSchemas: {
+		list: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			site_id: /* @__PURE__ */ optional(/* @__PURE__ */ string())
+		}),
+		get: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string(),
+			site_id: /* @__PURE__ */ optional(/* @__PURE__ */ string())
+		}),
+		create: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			command: /* @__PURE__ */ string(),
+			site_id: /* @__PURE__ */ optional(/* @__PURE__ */ string())
+		}),
+		delete: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string(),
+			site_id: /* @__PURE__ */ optional(/* @__PURE__ */ string())
+		})
 	},
 	executors: {
 		list: listScheduledJobs,
@@ -2709,25 +3223,21 @@ var RESOURCE_SCHEMAS = {
 		required: {
 			list: ["server_id"],
 			get: ["server_id", "id"],
-			create: [
-				"server_id",
-				"domain",
-				"project_type"
-			],
+			create: ["server_id", "type"],
 			delete: ["server_id", "id"],
 			context: ["server_id", "id"],
 			resolve: ["server_id", "query"]
 		},
 		create: {
-			domain: {
-				required: true,
-				type: "string — e.g. example.com"
-			},
-			project_type: {
+			type: {
 				required: true,
 				type: "string — php, html, symfony, etc."
 			},
-			directory: {
+			name: {
+				required: false,
+				type: "string — domain name (e.g. example.com)"
+			},
+			web_directory: {
 				required: false,
 				type: "string — web root (/public)"
 			}
@@ -3343,31 +3853,44 @@ const handleSecurityRules = createResourceHandler({
 		"list",
 		"get",
 		"create",
+		"update",
 		"delete"
 	],
-	requiredFields: {
-		list: ["server_id", "site_id"],
-		get: [
-			"server_id",
-			"site_id",
-			"id"
-		],
-		create: [
-			"server_id",
-			"site_id",
-			"name",
-			"credentials"
-		],
-		delete: [
-			"server_id",
-			"site_id",
-			"id"
-		]
+	inputSchemas: {
+		list: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			site_id: /* @__PURE__ */ string()
+		}),
+		get: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			site_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string()
+		}),
+		create: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			site_id: /* @__PURE__ */ string(),
+			name: /* @__PURE__ */ string(),
+			credentials: /* @__PURE__ */ unknown()
+		}),
+		update: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			site_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string(),
+			name: /* @__PURE__ */ string(),
+			path: /* @__PURE__ */ optional(/* @__PURE__ */ nullable(/* @__PURE__ */ string())),
+			credentials: /* @__PURE__ */ unknown()
+		}),
+		delete: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			site_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string()
+		})
 	},
 	executors: {
 		list: listSecurityRules,
 		get: getSecurityRule,
 		create: createSecurityRule,
+		update: updateSecurityRule,
 		delete: deleteSecurityRule
 	},
 	formatResult: (action, data, args) => {
@@ -3375,6 +3898,7 @@ const handleSecurityRules = createResourceHandler({
 			case "list": return formatSecurityRuleList(data);
 			case "get": return formatSecurityRule(data);
 			case "create": return formatSecurityRule(data);
+			case "update": return formatSecurityRule(data);
 			case "delete": return `Security rule ${args.id} deleted.`;
 			default: return "Done.";
 		}
@@ -3419,7 +3943,7 @@ async function handleSiteContext(args, ctx) {
 	if (!serverId) return errorResult("Missing required field: server_id");
 	if (!siteId) return errorResult("Missing required field: id");
 	const execCtx = ctx.executorContext;
-	const [site, deployments, certificates, redirectRules, securityRules] = await Promise.all([
+	const [site, deployments, redirectRules, securityRules] = await Promise.all([
 		getSite({
 			server_id: serverId,
 			site_id: siteId
@@ -3428,10 +3952,6 @@ async function handleSiteContext(args, ctx) {
 			server_id: serverId,
 			site_id: siteId
 		}, execCtx),
-		listCertificates({
-			server_id: serverId,
-			site_id: siteId
-		}, execCtx),
 		listRedirectRules({
 			server_id: serverId,
 			site_id: siteId
@@ -3445,7 +3965,6 @@ async function handleSiteContext(args, ctx) {
 	return jsonResult({
 		site: site.data,
 		deployments: recentDeployments,
-		certificates: certificates.data,
 		redirect_rules: redirectRules.data,
 		security_rules: securityRules.data
 	});
@@ -3460,17 +3979,17 @@ var _handleServers = createResourceHandler({
 		"reboot",
 		"resolve"
 	],
-	requiredFields: {
-		get: ["id"],
-		create: [
-			"provider",
-			"name",
-			"type",
-			"region"
-		],
-		delete: ["id"],
-		reboot: ["id"],
-		resolve: ["query"]
+	inputSchemas: {
+		get: /* @__PURE__ */ object({ id: /* @__PURE__ */ string() }),
+		create: /* @__PURE__ */ object({
+			provider: /* @__PURE__ */ string(),
+			name: /* @__PURE__ */ string(),
+			type: /* @__PURE__ */ string(),
+			region: /* @__PURE__ */ string()
+		}),
+		delete: /* @__PURE__ */ object({ id: /* @__PURE__ */ string() }),
+		reboot: /* @__PURE__ */ object({ id: /* @__PURE__ */ string() }),
+		resolve: /* @__PURE__ */ object({ query: /* @__PURE__ */ string() })
 	},
 	executors: {
 		list: listServers,
@@ -3529,27 +4048,42 @@ var _handleSites = createResourceHandler({
 		"list",
 		"get",
 		"create",
+		"update",
 		"delete",
 		"resolve"
 	],
-	requiredFields: {
-		list: ["server_id"],
-		get: ["server_id", "id"],
-		create: ["server_id", "domain"],
-		delete: ["server_id", "id"],
-		resolve: ["server_id", "query"]
+	inputSchemas: {
+		list: /* @__PURE__ */ object({ server_id: /* @__PURE__ */ string() }),
+		get: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string()
+		}),
+		create: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			type: /* @__PURE__ */ string()
+		}),
+		update: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string()
+		}),
+		delete: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string()
+		}),
+		resolve: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			query: /* @__PURE__ */ string()
+		})
 	},
 	executors: {
 		list: listSites,
 		get: getSite,
 		create: createSite,
+		update: updateSite,
 		delete: deleteSite,
 		resolve: resolveSites
 	},
-	hints: (data, id) => {
-		const site = data;
-		return getSiteHints(String(site.server_id), id);
-	},
+	hints: (_data, id, args) => getSiteHints(String(args.server_id), id),
 	mapOptions: (action, args) => {
 		switch (action) {
 			case "list": return { server_id: args.server_id };
@@ -3559,9 +4093,19 @@ var _handleSites = createResourceHandler({
 			};
 			case "create": return {
 				server_id: args.server_id,
-				domain: args.domain,
-				project_type: args.project_type ?? "php",
-				directory: args.directory
+				type: args.type ?? "php",
+				name: args.name ?? args.domain,
+				web_directory: args.web_directory ?? args.directory
+			};
+			case "update": return {
+				server_id: args.server_id,
+				site_id: args.id,
+				root_path: args.root_path,
+				directory: args.directory,
+				type: args.type,
+				php_version: args.php_version,
+				push_to_deploy: args.push_to_deploy,
+				repository_branch: args.repository_branch
 			};
 			case "delete": return {
 				server_id: args.server_id,
@@ -3579,6 +4123,7 @@ var _handleSites = createResourceHandler({
 			case "list": return formatSiteList(data, args.server_id);
 			case "get": return formatSite(data);
 			case "create": return formatSite(data);
+			case "update": return formatSite(data);
 			case "delete": return `Site ${args.id} deleted from server ${args.server_id}.`;
 			case "resolve": {
 				const result = data;
@@ -3606,15 +4151,21 @@ const handleSshKeys = createResourceHandler({
 		"create",
 		"delete"
 	],
-	requiredFields: {
-		list: ["server_id"],
-		get: ["server_id", "id"],
-		create: [
-			"server_id",
-			"name",
-			"key"
-		],
-		delete: ["server_id", "id"]
+	inputSchemas: {
+		list: /* @__PURE__ */ object({ server_id: /* @__PURE__ */ string() }),
+		get: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string()
+		}),
+		create: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			name: /* @__PURE__ */ string(),
+			key: /* @__PURE__ */ string()
+		}),
+		delete: /* @__PURE__ */ object({
+			server_id: /* @__PURE__ */ string(),
+			id: /* @__PURE__ */ string()
+		})
 	},
 	executors: {
 		list: listSshKeys,
@@ -3622,15 +4173,12 @@ const handleSshKeys = createResourceHandler({
 		create: createSshKey,
 		delete: deleteSshKey
 	},
-	hints: (data, id) => {
-		const key = data;
-		return getSshKeyHints(String(key.server_id), id);
-	},
+	hints: (_data, id, args) => getSshKeyHints(String(args.server_id), id),
 	formatResult: (action, data, args) => {
 		switch (action) {
 			case "list": return formatSshKeyList(data);
 			case "get": return formatSshKey(data);
-			case "create": return formatSshKey(data);
+			case "create": return "Done.";
 			case "delete": return `SSH key ${args.id} deleted.`;
 			default: return "Done.";
 		}
@@ -3749,12 +4297,18 @@ function routeToHandler(resource, action, args, ctx) {
 * Validates that the action matches the tool (read vs write).
 */
 async function executeToolWithCredentials(name, args, credentials) {
-	const { resource, action, compact, ...rest } = args;
+	const resource = typeof args.resource === "string" ? args.resource : void 0;
+	const action = typeof args.action === "string" ? args.action : void 0;
+	const compact = typeof args.compact === "boolean" ? args.compact : void 0;
+	const { resource: _r, action: _a, compact: _c, ...rest } = args;
 	if (!resource || !action) return errorResult("Missing required fields: \"resource\" and \"action\".");
 	if (resource === "batch") {
 		if (name !== "forge") return errorResult("The \"batch\" resource is read-only and must be used with the \"forge\" tool, not \"forge_write\".");
 		const handlerContext = {
-			executorContext: { client: new HttpClient({ token: credentials.apiToken }) },
+			executorContext: {
+				client: new HttpClient({ token: credentials.apiToken }),
+				organizationSlug: credentials.organizationSlug
+			},
 			compact: compact ?? true
 		};
 		return routeToHandler(resource, action, {
@@ -3772,7 +4326,11 @@ async function executeToolWithCredentials(name, args, credentials) {
  /* v8 ignore start */
 	return resource ? handleSchema(resource) : handleSchemaOverview();
 	if (!VALID_RESOURCES.includes(resource)) return errorResult(`Unknown resource "${resource}". Valid resources: ${VALID_RESOURCES.join(", ")}. Use action="help" for documentation.`);
-	const executorContext = { client: new HttpClient({ token: credentials.apiToken }) };
+	if (resource !== "user" && !credentials.organizationSlug) return errorResult("organizationSlug is required — configure it via FORGE_ORG env var, config file, or pass it in the request.");
+	const executorContext = {
+		client: new HttpClient({ token: credentials.apiToken }),
+		organizationSlug: credentials.organizationSlug
+	};
 	const handlerContext = {
 		executorContext,
 		compact: compact ?? action !== "get",
@@ -3813,7 +4371,7 @@ async function executeToolWithCredentials(name, args, credentials) {
 		return errorResult(errorMessage);
 	}
 }
-const VERSION = "0.3.0";
+const VERSION = "0.4.0";
 export { INSTRUCTIONS as a, getTools as i, executeToolWithCredentials as n, STDIO_ONLY_TOOLS as r, VERSION as t };
 
-//# sourceMappingURL=version-CIiN0iJr.js.map
+//# sourceMappingURL=version-CHrJu_54.js.map