quicklify 1.1.0 → 1.2.0

package/dist/mcp/tools/serverProvision.js

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { isSafeMode } from "../../core/manage.js";
 import { provisionServer } from "../../core/provision.js";
-import { getErrorMessage } from "../../utils/errorMapper.js";
+import { mcpSuccess, mcpError } from "../utils.js";
 // ─── Schema ──────────────────────────────────────────────────────────────────
 export const serverProvisionSchema = {
     provider: z
@@ -22,23 +22,17 @@ export const serverProvisionSchema = {
         .enum(["starter", "production", "dev"])
         .default("starter")
         .describe("Template for default region/size. 'starter' = cheapest, 'production' = more resources, 'dev' = development. Explicit region/size override template defaults. Default: starter"),
+    mode: z
+        .enum(["coolify", "bare"])
+        .default("coolify")
+        .describe("Server mode: 'coolify' installs Coolify, 'bare' provisions generic VPS without Coolify. Default: coolify"),
 };
 // ─── Handler ─────────────────────────────────────────────────────────────────
 export async function handleServerProvision(params) {
+    const mode = params.mode ?? "coolify";
     // SAFE_MODE guard
     if (isSafeMode()) {
-        return {
-            content: [
-                {
-                    type: "text",
-                    text: JSON.stringify({
-                        error: "Provision is disabled in SAFE_MODE",
-                        hint: "Set QUICKLIFY_SAFE_MODE=false to enable server provisioning. WARNING: This creates billable cloud resources.",
-                    }),
-                },
-            ],
-            isError: true,
-        };
+        return mcpError("Provision is disabled in SAFE_MODE", "Set QUICKLIFY_SAFE_MODE=false to enable server provisioning. WARNING: This creates billable cloud resources.");
     }
     try {
         const result = await provisionServer({
@@ -47,79 +41,76 @@ export async function handleServerProvision(params) {
             size: params.size,
             name: params.name,
             template: params.template,
+            mode,
         });
         if (!result.success) {
-            return {
-                content: [
-                    {
-                        type: "text",
-                        text: JSON.stringify({
-                            error: result.error,
-                            ...(result.hint ? { hint: result.hint } : {}),
-                            suggested_actions: [
-                                {
-                                    command: "server_info { action: 'list' }",
-                                    reason: "Check existing servers",
-                                },
-                            ],
-                        }),
-                    },
-                ],
-                isError: true,
-            };
+            return mcpError(result.error ?? "Provision failed", result.hint, [
+                {
+                    command: "server_info { action: 'list' }",
+                    reason: "Check existing servers",
+                },
+            ]);
         }
         if (!result.server) {
-            return {
-                content: [{ type: "text", text: JSON.stringify({ error: "Unexpected: server record missing" }) }],
-                isError: true,
-            };
+            return mcpError("Unexpected: server record missing");
         }
         const server = result.server;
-        return {
-            content: [
+        const suggestedActions = mode === "bare"
+            ? [
+                {
+                    command: `ssh root@${server.ip}`,
+                    reason: "Connect to your bare server via SSH",
+                },
+                {
+                    command: `server_secure { action: 'secure-setup', server: '${server.name}' }`,
+                    reason: "Harden SSH security + install fail2ban",
+                },
+                {
+                    command: `server_secure { action: 'firewall-setup', server: '${server.name}' }`,
+                    reason: "Setup UFW firewall",
+                },
                 {
-                    type: "text",
-                    text: JSON.stringify({
-                        success: true,
-                        message: `Server "${server.name}" provisioned on ${server.provider}`,
-                        server: {
-                            id: server.id,
-                            name: server.name,
-                            provider: server.provider,
-                            ip: server.ip,
-                            region: server.region,
-                            size: server.size,
-                            createdAt: server.createdAt,
-                        },
-                        ...(result.hint ? { hint: result.hint } : {}),
-                        suggested_actions: [
-                            {
-                                command: `server_info { action: 'health', server: '${server.name}' }`,
-                                reason: "Check Coolify health (wait 3-5 minutes after creation for Coolify to initialize)",
-                            },
-                            {
-                                command: `server_secure { action: 'secure-setup', server: '${server.name}' }`,
-                                reason: "Harden SSH security + install fail2ban",
-                            },
-                            {
-                                command: `server_secure { action: 'firewall-setup', server: '${server.name}' }`,
-                                reason: "Setup UFW firewall with Coolify ports",
-                            },
-                            {
-                                command: `server_info { action: 'status', server: '${server.name}' }`,
-                                reason: "Check cloud provider status",
-                            },
-                        ],
-                    }),
+                    command: `server_info { action: 'status', server: '${server.name}' }`,
+                    reason: "Check cloud provider status",
                 },
-            ],
-        };
+            ]
+            : [
+                {
+                    command: `server_info { action: 'health', server: '${server.name}' }`,
+                    reason: "Check Coolify health (wait 3-5 minutes after creation for Coolify to initialize)",
+                },
+                {
+                    command: `server_secure { action: 'secure-setup', server: '${server.name}' }`,
+                    reason: "Harden SSH security + install fail2ban",
+                },
+                {
+                    command: `server_secure { action: 'firewall-setup', server: '${server.name}' }`,
+                    reason: "Setup UFW firewall with Coolify ports",
+                },
+                {
+                    command: `server_info { action: 'status', server: '${server.name}' }`,
+                    reason: "Check cloud provider status",
+                },
+            ];
+        return mcpSuccess({
+            success: true,
+            message: `Server "${server.name}" provisioned on ${server.provider}`,
+            server: {
+                id: server.id,
+                name: server.name,
+                provider: server.provider,
+                ip: server.ip,
+                region: server.region,
+                size: server.size,
+                mode,
+                createdAt: server.createdAt,
+            },
+            ...(result.hint ? { hint: result.hint } : {}),
+            suggested_actions: suggestedActions,
+        });
     }
     catch (error) {
-        return {
-            content: [{ type: "text", text: JSON.stringify({ error: getErrorMessage(error) }) }],
-            isError: true,
-        };
+        return mcpError(error instanceof Error ? error.message : String(error));
     }
 }
 //# sourceMappingURL=serverProvision.js.map

package/dist/mcp/tools/serverProvision.js.map

@@ -1 +1 @@
-{"version":3,"file":"serverProvision.js","sourceRoot":"","sources":["../../../src/mcp/tools/serverProvision.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"serverProvision.js","sourceRoot":"","sources":["../../../src/mcp/tools/serverProvision.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEnD,gFAAgF;AAEhF,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,QAAQ,EAAE,CAAC;SACR,IAAI,CAAC,CAAC,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;SACpD,QAAQ,CAAC,oCAAoC,CAAC;IACjD,MAAM,EAAE,CAAC;SACN,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CACP,iJAAiJ,CAClJ;IACH,IAAI,EAAE,CAAC;SACJ,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CACP,mHAAmH,CACpH;IACH,IAAI,EAAE,CAAC;SACJ,MAAM,EAAE;SACR,QAAQ,CACP,uHAAuH,CACxH;IACH,QAAQ,EAAE,CAAC;SACR,IAAI,CAAC,CAAC,SAAS,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC;SACtC,OAAO,CAAC,SAAS,CAAC;SAClB,QAAQ,CACP,+KAA+K,CAChL;IACH,IAAI,EAAE,CAAC;SACJ,IAAI,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;SACzB,OAAO,CAAC,SAAS,CAAC;SAClB,QAAQ,CACP,0GAA0G,CAC3G;CACJ,CAAC;AAEF,gFAAgF;AAEhF,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,MAO3C;IACC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,SAAS,CAAC;IAEtC,kBAAkB;IAClB,IAAI,UAAU,EAAE,EAAE,CAAC;QACjB,OAAO,QAAQ,CACb,oCAAoC,EACpC,8GAA8G,CAC/G,CAAC;IACJ,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC;YACnC,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,IAAI;SACL,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,OAAO,QAAQ,CACb,MAAM,CAAC,KAAK,IAAI,kBAAkB,EAClC,MAAM,CAAC,IAAI,EACX;gBACE;oBACE,OAAO,EAAE,gCAAgC;oBACzC,MAAM,EAAE,wBAAwB;iBACjC;aACF,CACF,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACnB,OAAO,QAAQ,CAAC,mCAAmC,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAE7B,MAAM,gBAAgB,GACpB,IAAI,KAAK,MAAM;YACb,CAAC,CAAC;gBACE;oBACE,OAAO,EAAE,YAAY,MAAM,CAAC,EAAE,EAAE;oBAChC,MAAM,EAAE,qCAAqC;iBAC9C;gBACD;oBACE,OAAO,EAAE,oDAAoD,MAAM,CAAC,IAAI,KAAK;oBAC7E,MAAM,EAAE,wCAAwC;iBACjD;gBACD;oBACE,OAAO,EAAE,sDAAsD,MAAM,CAAC,IAAI,KAAK;oBAC/E,MAAM,EAAE,oBAAoB;iBAC7B;gBACD;oBACE,OAAO,EAAE,4CAA4C,MAAM,CAAC,IAAI,KAAK;oBACrE,MAAM,EAAE,6BAA6B;iBACtC;aACF;YACH,CAAC,CAAC;gBACE;oBACE,OAAO,EAAE,4CAA4C,MAAM,CAAC,IAAI,KAAK;oBACrE,MAAM,EAAE,kFAAkF;iBAC3F;gBACD;oBACE,OAAO,EAAE,oDAAoD,MAAM,CAAC,IAAI,KAAK;oBAC7E,MAAM,EAAE,wCAAwC;iBACjD;gBACD;oBACE,OAAO,EAAE,sDAAsD,MAAM,CAAC,IAAI,KAAK;oBAC/E,MAAM,EAAE,uCAAuC;iBAChD;gBACD;oBACE,OAAO,EAAE,4CAA4C,MAAM,CAAC,IAAI,KAAK;oBACrE,MAAM,EAAE,6BAA6B;iBACtC;aACF,CAAC;QAER,OAAO,UAAU,CAAC;YAChB,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,WAAW,MAAM,CAAC,IAAI,oBAAoB,MAAM,CAAC,QAAQ,EAAE;YACpE,MAAM,EAAE;gBACN,EAAE,EAAE,MAAM,CAAC,EAAE;gBACb,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,EAAE,EAAE,MAAM,CAAC,EAAE;gBACb,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,IAAI;gBACJ,SAAS,EAAE,MAAM,CAAC,SAAS;aAC5B;YACD,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7C,iBAAiB,EAAE,gBAAgB;SACpC,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,OAAO,QAAQ,CACb,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CACvD,CAAC;IACJ,CAAC;AACH,CAAC"}

package/dist/mcp/tools/serverSecure.d.ts

@@ -1,4 +1,5 @@
 import { z } from "zod";
+import { type McpResponse } from "../utils.js";
 export declare const serverSecureSchema: {
     action: z.ZodEnum<{
         "secure-setup": "secure-setup";
@@ -29,12 +30,6 @@ export declare function handleServerSecure(params: {
     protocol?: "tcp" | "udp";
     domain?: string;
     ssl?: boolean;
-}): Promise<{
-    content: Array<{
-        type: "text";
-        text: string;
-    }>;
-    isError?: boolean;
-}>;
+}): Promise<McpResponse>;
 export {};
 //# sourceMappingURL=serverSecure.d.ts.map

package/dist/mcp/tools/serverSecure.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serverSecure.d.ts","sourceRoot":"","sources":["../../../src/mcp/tools/serverSecure.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAqBxB,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;CAuB9B,CAAC;AAEF,KAAK,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,MAAM,CAAC,CAAC;AAYxD,wBAAsB,kBAAkB,CAAC,MAAM,EAAE;IAC/C,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,CAoZjF"}
+{"version":3,"file":"serverSecure.d.ts","sourceRoot":"","sources":["../../../src/mcp/tools/serverSecure.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAmBxB,OAAO,EAIL,KAAK,WAAW,EACjB,MAAM,aAAa,CAAC;AAIrB,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;CAuB9B,CAAC;AAEF,KAAK,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,MAAM,CAAC,CAAC;AAExD,wBAAsB,kBAAkB,CAAC,MAAM,EAAE;IAC/C,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,GAAG,OAAO,CAAC,WAAW,CAAC,CAiXvB"}

package/dist/mcp/tools/serverSecure.js

@@ -1,8 +1,10 @@
 import { z } from "zod";
-import { getServers, findServer } from "../../utils/config.js";
+import { getServers } from "../../utils/config.js";
 import { applySecureSetup, runSecureAudit, } from "../../core/secure.js";
 import { setupFirewall, addFirewallRule, removeFirewallRule, getFirewallStatus, COOLIFY_PORTS, } from "../../core/firewall.js";
 import { setDomain, removeDomain, getDomain, checkDns, } from "../../core/domain.js";
+import { resolveServerForMcp, mcpSuccess, mcpError, } from "../utils.js";
+import { requireCoolifyMode } from "../../utils/modeGuard.js";
 import { getErrorMessage } from "../../utils/errorMapper.js";
 export const serverSecureSchema = {
     action: z.enum([
@@ -16,45 +18,27 @@ export const serverSecureSchema = {
     domain: z.string().optional().describe("Domain name. Required for domain-set and domain-check."),
     ssl: z.boolean().default(true).describe("Enable SSL (https) for domain. Default: true."),
 };
-function resolveServer(params, servers) {
-    if (params.server) {
-        return findServer(params.server);
-    }
-    if (servers.length === 1) {
-        return servers[0];
-    }
-    return undefined;
-}
 export async function handleServerSecure(params) {
     try {
         const servers = getServers();
         if (servers.length === 0) {
-            return {
-                content: [{ type: "text", text: JSON.stringify({
-                            error: "No servers found",
-                            suggested_actions: [{ command: "quicklify init", reason: "Deploy a server first" }],
-                        }) }],
-                isError: true,
-            };
+            return mcpError("No servers found", undefined, [
+                { command: "quicklify init", reason: "Deploy a server first" },
+            ]);
         }
-        const server = resolveServer(params, servers);
+        const server = resolveServerForMcp(params, servers);
         if (!server) {
             if (params.server) {
-                return {
-                    content: [{ type: "text", text: JSON.stringify({
-                                error: `Server not found: ${params.server}`,
-                                available_servers: servers.map((s) => s.name),
-                            }) }],
-                    isError: true,
-                };
+                return mcpError(`Server not found: ${params.server}`, `Available servers: ${servers.map((s) => s.name).join(", ")}`);
+            }
+            return mcpError("Multiple servers found. Specify which server to use.", `Available: ${servers.map((s) => s.name).join(", ")}`);
+        }
+        const domainActions = ["domain-set", "domain-remove", "domain-check", "domain-info"];
+        if (domainActions.includes(params.action)) {
+            const modeError = requireCoolifyMode(server, params.action);
+            if (modeError) {
+                return mcpError(modeError, "Domain management requires Coolify. Use SSH for bare server DNS configuration.");
             }
-            return {
-                content: [{ type: "text", text: JSON.stringify({
-                            error: "Multiple servers found. Specify which server to use.",
-                            available_servers: servers.map((s) => ({ name: s.name, ip: s.ip })),
-                        }) }],
-                isError: true,
-            };
         }
         switch (params.action) {
             case "secure-setup": {
@@ -109,21 +93,19 @@ export async function handleServerSecure(params) {
                 const suggestedActions = result.score < 100
                     ? [{ command: `server_secure { action: 'secure-setup', server: '${server.name}' }`, reason: "Improve security score" }]
                     : [{ command: `server_secure { action: 'firewall-status', server: '${server.name}' }`, reason: "Check firewall configuration" }];
-                return {
-                    content: [{ type: "text", text: JSON.stringify({
-                                server: server.name,
-                                ip: server.ip,
-                                score: result.score,
-                                maxScore: 100,
-                                checks: {
-                                    passwordAuth: result.audit.passwordAuth,
-                                    rootLogin: result.audit.rootLogin,
-                                    fail2ban: result.audit.fail2ban,
-                                    sshPort: result.audit.sshPort,
-                                },
-                                suggested_actions: suggestedActions,
-                            }) }],
-                };
+                return mcpSuccess({
+                    server: server.name,
+                    ip: server.ip,
+                    score: result.score,
+                    maxScore: 100,
+                    checks: {
+                        passwordAuth: result.audit.passwordAuth,
+                        rootLogin: result.audit.rootLogin,
+                        fail2ban: result.audit.fail2ban,
+                        sshPort: result.audit.sshPort,
+                    },
+                    suggested_actions: suggestedActions,
+                });
             }
             case "firewall-setup": {
                 const result = await setupFirewall(server.ip);
@@ -138,27 +120,19 @@ export async function handleServerSecure(params) {
                         isError: true,
                     };
                 }
-                return {
-                    content: [{ type: "text", text: JSON.stringify({
-                                success: true,
-                                server: server.name,
-                                ip: server.ip,
-                                message: `UFW enabled with Coolify ports (${COOLIFY_PORTS.join(", ")}) + SSH (22)`,
-                                suggested_actions: [
-                                    { command: `server_secure { action: 'firewall-status', server: '${server.name}' }`, reason: "Verify firewall rules" },
-                                ],
-                            }) }],
-                };
+                return mcpSuccess({
+                    success: true,
+                    server: server.name,
+                    ip: server.ip,
+                    message: `UFW enabled with Coolify ports (${COOLIFY_PORTS.join(", ")}) + SSH (22)`,
+                    suggested_actions: [
+                        { command: `server_secure { action: 'firewall-status', server: '${server.name}' }`, reason: "Verify firewall rules" },
+                    ],
+                });
             }
             case "firewall-add": {
                 if (params.port === undefined) {
-                    return {
-                        content: [{ type: "text", text: JSON.stringify({
-                                    error: "Port is required for firewall-add action",
-                                    hint: "Specify a port number (1-65535)",
-                                }) }],
-                        isError: true,
-                    };
+                    return mcpError("Port is required for firewall-add action", "Specify a port number (1-65535)");
                 }
                 const result = await addFirewallRule(server.ip, params.port, params.protocol || "tcp");
                 if (!result.success) {
@@ -172,27 +146,19 @@ export async function handleServerSecure(params) {
                         isError: true,
                     };
                 }
-                return {
-                    content: [{ type: "text", text: JSON.stringify({
-                                success: true,
-                                server: server.name,
-                                ip: server.ip,
-                                message: `Port ${params.port}/${params.protocol || "tcp"} opened`,
-                                suggested_actions: [
-                                    { command: `server_secure { action: 'firewall-status', server: '${server.name}' }`, reason: "Verify firewall rules" },
-                                ],
-                            }) }],
-                };
+                return mcpSuccess({
+                    success: true,
+                    server: server.name,
+                    ip: server.ip,
+                    message: `Port ${params.port}/${params.protocol || "tcp"} opened`,
+                    suggested_actions: [
+                        { command: `server_secure { action: 'firewall-status', server: '${server.name}' }`, reason: "Verify firewall rules" },
+                    ],
+                });
             }
             case "firewall-remove": {
                 if (params.port === undefined) {
-                    return {
-                        content: [{ type: "text", text: JSON.stringify({
-                                    error: "Port is required for firewall-remove action",
-                                    hint: "Specify a port number (1-65535)",
-                                }) }],
-                        isError: true,
-                    };
+                    return mcpError("Port is required for firewall-remove action", "Specify a port number (1-65535)");
                 }
                 const result = await removeFirewallRule(server.ip, params.port, params.protocol || "tcp");
                 if (!result.success) {
@@ -207,18 +173,16 @@ export async function handleServerSecure(params) {
                         isError: true,
                     };
                 }
-                return {
-                    content: [{ type: "text", text: JSON.stringify({
-                                success: true,
-                                server: server.name,
-                                ip: server.ip,
-                                message: `Port ${params.port}/${params.protocol || "tcp"} closed`,
-                                ...(result.warning ? { warning: result.warning } : {}),
-                                suggested_actions: [
-                                    { command: `server_secure { action: 'firewall-status', server: '${server.name}' }`, reason: "Verify firewall rules" },
-                                ],
-                            }) }],
-                };
+                return mcpSuccess({
+                    success: true,
+                    server: server.name,
+                    ip: server.ip,
+                    message: `Port ${params.port}/${params.protocol || "tcp"} closed`,
+                    ...(result.warning ? { warning: result.warning } : {}),
+                    suggested_actions: [
+                        { command: `server_secure { action: 'firewall-status', server: '${server.name}' }`, reason: "Verify firewall rules" },
+                    ],
+                });
             }
             case "firewall-status": {
                 const result = await getFirewallStatus(server.ip);
@@ -236,26 +200,18 @@ export async function handleServerSecure(params) {
                 const suggestedActions = !result.status.active
                     ? [{ command: `server_secure { action: 'firewall-setup', server: '${server.name}' }`, reason: "Enable firewall" }]
                     : [{ command: `server_secure { action: 'firewall-add', server: '${server.name}', port: 3000 }`, reason: "Open additional ports if needed" }];
-                return {
-                    content: [{ type: "text", text: JSON.stringify({
-                                server: server.name,
-                                ip: server.ip,
-                                active: result.status.active,
-                                rules: result.status.rules,
-                                ruleCount: result.status.rules.length,
-                                suggested_actions: suggestedActions,
-                            }) }],
-                };
+                return mcpSuccess({
+                    server: server.name,
+                    ip: server.ip,
+                    active: result.status.active,
+                    rules: result.status.rules,
+                    ruleCount: result.status.rules.length,
+                    suggested_actions: suggestedActions,
+                });
             }
             case "domain-set": {
                 if (!params.domain) {
-                    return {
-                        content: [{ type: "text", text: JSON.stringify({
-                                    error: "Domain is required for domain-set action",
-                                    hint: "Specify a domain name (e.g., coolify.example.com)",
-                                }) }],
-                        isError: true,
-                    };
+                    return mcpError("Domain is required for domain-set action", "Specify a domain name (e.g., coolify.example.com)");
                 }
                 const result = await setDomain(server.ip, params.domain, params.ssl ?? true);
                 if (!result.success) {
@@ -270,19 +226,17 @@ export async function handleServerSecure(params) {
                     };
                 }
                 const protocol = (params.ssl ?? true) ? "https" : "http";
-                return {
-                    content: [{ type: "text", text: JSON.stringify({
-                                success: true,
-                                server: server.name,
-                                ip: server.ip,
-                                message: `Domain set to ${params.domain}`,
-                                url: `${protocol}://${params.domain}`,
-                                suggested_actions: [
-                                    { command: `server_secure { action: 'domain-check', server: '${server.name}', domain: '${params.domain}' }`, reason: "Verify DNS points to this server" },
-                                    { command: `server_info { action: 'health', server: '${server.name}' }`, reason: "Verify Coolify is accessible" },
-                                ],
-                            }) }],
-                };
+                return mcpSuccess({
+                    success: true,
+                    server: server.name,
+                    ip: server.ip,
+                    message: `Domain set to ${params.domain}`,
+                    url: `${protocol}://${params.domain}`,
+                    suggested_actions: [
+                        { command: `server_secure { action: 'domain-check', server: '${server.name}', domain: '${params.domain}' }`, reason: "Verify DNS points to this server" },
+                        { command: `server_info { action: 'health', server: '${server.name}' }`, reason: "Verify Coolify is accessible" },
+                    ],
+                });
             }
             case "domain-remove": {
                 const result = await removeDomain(server.ip);
@@ -297,28 +251,20 @@ export async function handleServerSecure(params) {
                         isError: true,
                     };
                 }
-                return {
-                    content: [{ type: "text", text: JSON.stringify({
-                                success: true,
-                                server: server.name,
-                                ip: server.ip,
-                                message: "Domain removed. Coolify reset to default.",
-                                url: `http://${server.ip}:8000`,
-                                suggested_actions: [
-                                    { command: `server_info { action: 'health', server: '${server.name}' }`, reason: "Verify Coolify is accessible" },
-                                ],
-                            }) }],
-                };
+                return mcpSuccess({
+                    success: true,
+                    server: server.name,
+                    ip: server.ip,
+                    message: "Domain removed. Coolify reset to default.",
+                    url: `http://${server.ip}:8000`,
+                    suggested_actions: [
+                        { command: `server_info { action: 'health', server: '${server.name}' }`, reason: "Verify Coolify is accessible" },
+                    ],
+                });
             }
             case "domain-check": {
                 if (!params.domain) {
-                    return {
-                        content: [{ type: "text", text: JSON.stringify({
-                                    error: "Domain is required for domain-check action",
-                                    hint: "Specify a domain name to check DNS for",
-                                }) }],
-                        isError: true,
-                    };
+                    return mcpError("Domain is required for domain-check action", "Specify a domain name to check DNS for");
                 }
                 const result = await checkDns(server.ip, params.domain);
                 if (result.error) {
@@ -333,19 +279,17 @@ export async function handleServerSecure(params) {
                         isError: true,
                     };
                 }
-                return {
-                    content: [{ type: "text", text: JSON.stringify({
-                                server: server.name,
-                                ip: server.ip,
-                                domain: params.domain,
-                                resolvedIp: result.resolvedIp,
-                                match: result.match,
-                                ...(result.hint ? { hint: result.hint } : {}),
-                                suggested_actions: result.match
-                                    ? [{ command: `server_secure { action: 'domain-set', server: '${server.name}', domain: '${params.domain}' }`, reason: "Set this domain as Coolify FQDN" }]
-                                    : [{ command: `server_secure { action: 'domain-info', server: '${server.name}' }`, reason: "Check current domain setting" }],
-                            }) }],
-                };
+                return mcpSuccess({
+                    server: server.name,
+                    ip: server.ip,
+                    domain: params.domain,
+                    resolvedIp: result.resolvedIp,
+                    match: result.match,
+                    ...(result.hint ? { hint: result.hint } : {}),
+                    suggested_actions: result.match
+                        ? [{ command: `server_secure { action: 'domain-set', server: '${server.name}', domain: '${params.domain}' }`, reason: "Set this domain as Coolify FQDN" }]
+                        : [{ command: `server_secure { action: 'domain-info', server: '${server.name}' }`, reason: "Check current domain setting" }],
+                });
             }
             case "domain-info": {
                 const result = await getDomain(server.ip);
@@ -374,23 +318,18 @@ export async function handleServerSecure(params) {
                         reason: "Set a custom domain",
                     });
                 }
-                return {
-                    content: [{ type: "text", text: JSON.stringify({
-                                server: server.name,
-                                ip: server.ip,
-                                fqdn: result.fqdn,
-                                message: result.fqdn ? `Current domain: ${result.fqdn}` : `No custom domain set. Default: http://${server.ip}:8000`,
-                                suggested_actions: domainSuggestedActions,
-                            }) }],
-                };
+                return mcpSuccess({
+                    server: server.name,
+                    ip: server.ip,
+                    fqdn: result.fqdn,
+                    message: result.fqdn ? `Current domain: ${result.fqdn}` : `No custom domain set. Default: http://${server.ip}:8000`,
+                    suggested_actions: domainSuggestedActions,
+                });
             }
         }
     }
     catch (error) {
-        return {
-            content: [{ type: "text", text: JSON.stringify({ error: getErrorMessage(error) }) }],
-            isError: true,
-        };
+        return mcpError(getErrorMessage(error));
     }
 }
 //# sourceMappingURL=serverSecure.js.map