@jgardner04/ghost-mcp-server 1.13.4 → 1.13.5

package/src/mcp_server.js

@@ -83,6 +83,49 @@ const escapeNqlValue = (value) => {
   return value.replace(/'/g, "''");
 };
 
+/**
+ * Higher-order function that wraps a tool handler with standardized
+ * input validation, service loading, and error handling.
+ *
+ * Note: Each registerTool call passes the schema twice — once as `inputSchema`
+ * (MCP protocol metadata exposed to clients) and once here for runtime input
+ * validation via validateToolInput. These serve different purposes and both
+ * are required.
+ *
+ * @param {string} toolName - The tool identifier (e.g., 'ghost_get_tags')
+ * @param {object} schema - Zod schema for input validation
+ * @param {Function} handler - Async function receiving validated input, returns MCP response
+ * @returns {Function} Wrapped async handler for server.registerTool
+ */
+const withErrorHandling = (toolName, schema, handler) => {
+  const zodContext = toolName.replace('ghost_', '').replace(/_/g, ' ');
+  return async (rawInput) => {
+    console.error(`Executing tool: ${toolName}`);
+    const validation = validateToolInput(schema, rawInput, toolName);
+    if (!validation.success) {
+      return validation.errorResponse;
+    }
+
+    try {
+      await loadServices();
+      return await handler(validation.data);
+    } catch (error) {
+      console.error(`Error in ${toolName}:`, error);
+      if (error.name === 'ZodError') {
+        const validationError = ValidationError.fromZod(error, zodContext);
+        return {
+          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
+          isError: true,
+        };
+      }
+      return {
+        content: [{ type: 'text', text: `Error in ${toolName}: ${error.message}` }],
+        isError: true,
+      };
+    }
+  };
+};
+
 // Create server instance with new API
 const server = new McpServer({
   name: 'ghost-mcp-server',
@@ -116,58 +159,32 @@ server.registerTool(
       'Retrieves a list of tags from Ghost CMS with pagination, filtering, sorting, and relation inclusion. Supports filtering by name, slug, visibility, or custom NQL filter expressions.',
     inputSchema: getTagsSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(getTagsSchema, rawInput, 'ghost_get_tags');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const input = validation.data;
-
-    console.error(`Executing tool: ghost_get_tags`);
-    try {
-      await loadServices();
-
-      // Build options object with provided parameters
-      const options = {};
-      if (input.limit !== undefined) options.limit = input.limit;
-      if (input.page !== undefined) options.page = input.page;
-      if (input.order !== undefined) options.order = input.order;
-      if (input.include !== undefined) options.include = input.include;
-
-      // Build filter string from individual filter parameters
-      const filters = [];
-      if (input.name) filters.push(`name:'${escapeNqlValue(input.name)}'`);
-      if (input.slug) filters.push(`slug:'${escapeNqlValue(input.slug)}'`);
-      if (input.visibility) filters.push(`visibility:'${input.visibility}'`); // visibility is enum-validated, no escaping needed
-      if (input.filter) filters.push(input.filter);
-
-      if (filters.length > 0) {
-        options.filter = filters.join('+');
-      }
-
-      const tags = await ghostService.getTags(options);
-      console.error(`Retrieved ${tags.length} tags from Ghost.`);
-
-      const result = tags;
-
-      return {
-        content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_get_tags:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Tags retrieval');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+  withErrorHandling('ghost_get_tags', getTagsSchema, async (input) => {
+    // Build options object with provided parameters
+    const options = {};
+    if (input.limit !== undefined) options.limit = input.limit;
+    if (input.page !== undefined) options.page = input.page;
+    if (input.order !== undefined) options.order = input.order;
+    if (input.include !== undefined) options.include = input.include;
+
+    // Build filter string from individual filter parameters
+    const filters = [];
+    if (input.name) filters.push(`name:'${escapeNqlValue(input.name)}'`);
+    if (input.slug) filters.push(`slug:'${escapeNqlValue(input.slug)}'`);
+    if (input.visibility) filters.push(`visibility:'${input.visibility}'`); // visibility is enum-validated, no escaping needed
+    if (input.filter) filters.push(input.filter);
+
+    if (filters.length > 0) {
+      options.filter = filters.join('+');
+    }
+
+    const tags = await ghostService.getTags(options);
+    console.error(`Retrieved ${tags.length} tags from Ghost.`);
+
+    return {
+      content: [{ type: 'text', text: JSON.stringify(tags, null, 2) }],
+    };
+  })
 );
 
 // Create Tag Tool
@@ -177,37 +194,14 @@ server.registerTool(
     description: 'Creates a new tag in Ghost CMS.',
     inputSchema: createTagSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(createTagSchema, rawInput, 'ghost_create_tag');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const input = validation.data;
-
-    console.error(`Executing tool: ghost_create_tag with name: ${input.name}`);
-    try {
-      await loadServices();
-      const createdTag = await ghostService.createTag(input);
-      console.error(`Tag created successfully. Tag ID: ${createdTag.id}`);
+  withErrorHandling('ghost_create_tag', createTagSchema, async (input) => {
+    const createdTag = await ghostService.createTag(input);
+    console.error(`Tag created successfully. Tag ID: ${createdTag.id}`);
 
-      return {
-        content: [{ type: 'text', text: JSON.stringify(createdTag, null, 2) }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_create_tag:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Tag creation');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+    return {
+      content: [{ type: 'text', text: JSON.stringify(createdTag, null, 2) }],
+    };
+  })
 );
 
 // Get Tag Tool
@@ -217,42 +211,22 @@ server.registerTool(
     description: 'Retrieves a single tag from Ghost CMS by ID or slug.',
     inputSchema: getTagSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(getTagSchema, rawInput, 'ghost_get_tag');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const { id, slug, include } = validation.data;
-
-    console.error(`Executing tool: ghost_get_tag`);
-    try {
-      await loadServices();
+  withErrorHandling('ghost_get_tag', getTagSchema, async (input) => {
+    const options = {};
+    if (input.include !== undefined) options.include = input.include;
 
-      // If slug is provided, use the slug/slug-name format
-      const identifier = slug ? `slug/${slug}` : id;
-      const options = include ? { include } : {};
+    if (!input.id && !input.slug) {
+      throw new Error('Either id or slug is required');
+    }
+    const identifier = input.id || `slug/${input.slug}`;
 
-      const tag = await ghostService.getTag(identifier, options);
-      console.error(`Tag retrieved successfully. Tag ID: ${tag.id}`);
+    const tag = await ghostService.getTag(identifier, options);
+    console.error(`Retrieved tag: ${tag.name} (ID: ${tag.id})`);
 
-      return {
-        content: [{ type: 'text', text: JSON.stringify(tag, null, 2) }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_get_tag:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Tag retrieval');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+    return {
+      content: [{ type: 'text', text: JSON.stringify(tag, null, 2) }],
+    };
+  })
 );
 
 // Update Tag Tool
@@ -262,90 +236,34 @@ server.registerTool(
     description: 'Updates an existing tag in Ghost CMS.',
     inputSchema: updateTagInputSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(updateTagInputSchema, rawInput, 'ghost_update_tag');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const input = validation.data;
-
-    console.error(`Executing tool: ghost_update_tag for ID: ${input.id}`);
-    try {
-      if (!input.id) {
-        throw new Error('Tag ID is required');
-      }
-
-      await loadServices();
-
-      // Build update data object with only provided fields (exclude id from update data)
-      const { id, ...updateData } = input;
-
-      const updatedTag = await ghostService.updateTag(id, updateData);
-      console.error(`Tag updated successfully. Tag ID: ${updatedTag.id}`);
-
-      return {
-        content: [{ type: 'text', text: JSON.stringify(updatedTag, null, 2) }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_update_tag:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Tag update');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+  withErrorHandling('ghost_update_tag', updateTagInputSchema, async (input) => {
+    const { id, ...updateData } = input;
+    const updatedTag = await ghostService.updateTag(id, updateData);
+    console.error(`Tag updated successfully. Tag ID: ${updatedTag.id}`);
+
+    return {
+      content: [{ type: 'text', text: JSON.stringify(updatedTag, null, 2) }],
+    };
+  })
 );
 
 // Delete Tag Tool
 server.registerTool(
   'ghost_delete_tag',
   {
-    description: 'Deletes a tag from Ghost CMS by ID. This operation is permanent.',
+    description:
+      'Deletes a tag from Ghost CMS by ID. This operation is permanent and cannot be undone.',
     inputSchema: deleteTagSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(deleteTagSchema, rawInput, 'ghost_delete_tag');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const { id } = validation.data;
-
-    console.error(`Executing tool: ghost_delete_tag for ID: ${id}`);
-    try {
-      if (!id) {
-        throw new Error('Tag ID is required');
-      }
-
-      await loadServices();
-
-      await ghostService.deleteTag(id);
-      console.error(`Tag deleted successfully. Tag ID: ${id}`);
-
-      return {
-        content: [{ type: 'text', text: `Tag with ID ${id} has been successfully deleted.` }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_delete_tag:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Tag deletion');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+  withErrorHandling('ghost_delete_tag', deleteTagSchema, async (input) => {
+    const { id } = input;
+    await ghostService.deleteTag(id);
+    console.error(`Tag deleted successfully. Tag ID: ${id}`);
+
+    return {
+      content: [{ type: 'text', text: `Tag ${id} has been successfully deleted.` }],
+    };
+  })
 );
 
 // --- Image Schema ---
@@ -357,7 +275,7 @@ const uploadImageSchema = z.object({
   }),
 });
 
-// Upload Image Tool
+// Upload Image Tool — unique handler with finally-clause cleanup
 server.registerTool(
   'ghost_upload_image',
   {
@@ -486,37 +404,14 @@ server.registerTool(
     description: 'Creates a new post in Ghost CMS.',
     inputSchema: createPostSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(createPostSchema, rawInput, 'ghost_create_post');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const input = validation.data;
+  withErrorHandling('ghost_create_post', createPostSchema, async (input) => {
+    const createdPost = await postService.createPostService(input);
+    console.error(`Post created successfully. Post ID: ${createdPost.id}`);
 
-    console.error(`Executing tool: ghost_create_post with title: ${input.title}`);
-    try {
-      await loadServices();
-      const createdPost = await postService.createPostService(input);
-      console.error(`Post created successfully. Post ID: ${createdPost.id}`);
-
-      return {
-        content: [{ type: 'text', text: JSON.stringify(createdPost, null, 2) }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_create_post:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Post creation');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error creating post: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+    return {
+      content: [{ type: 'text', text: JSON.stringify(createdPost, null, 2) }],
+    };
+  })
 );
 
 // Get Posts Tool
@@ -527,49 +422,25 @@ server.registerTool(
       'Retrieves a list of posts from Ghost CMS with pagination, filtering, and sorting options.',
     inputSchema: getPostsSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(getPostsSchema, rawInput, 'ghost_get_posts');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const input = validation.data;
-
-    console.error(`Executing tool: ghost_get_posts`);
-    try {
-      await loadServices();
-
-      // Build options object with provided parameters
-      const options = {};
-      if (input.limit !== undefined) options.limit = input.limit;
-      if (input.page !== undefined) options.page = input.page;
-      if (input.status !== undefined) options.status = input.status;
-      if (input.include !== undefined) options.include = input.include;
-      if (input.filter !== undefined) options.filter = input.filter;
-      if (input.order !== undefined) options.order = input.order;
-      if (input.fields !== undefined) options.fields = input.fields;
-      if (input.formats !== undefined) options.formats = input.formats;
-
-      const posts = await ghostService.getPosts(options);
-      console.error(`Retrieved ${posts.length} posts from Ghost.`);
-
-      return {
-        content: [{ type: 'text', text: JSON.stringify(posts, null, 2) }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_get_posts:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Posts retrieval');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error retrieving posts: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+  withErrorHandling('ghost_get_posts', getPostsSchema, async (input) => {
+    // Build options object with provided parameters
+    const options = {};
+    if (input.limit !== undefined) options.limit = input.limit;
+    if (input.page !== undefined) options.page = input.page;
+    if (input.status !== undefined) options.status = input.status;
+    if (input.include !== undefined) options.include = input.include;
+    if (input.filter !== undefined) options.filter = input.filter;
+    if (input.order !== undefined) options.order = input.order;
+    if (input.fields !== undefined) options.fields = input.fields;
+    if (input.formats !== undefined) options.formats = input.formats;
+
+    const posts = await ghostService.getPosts(options);
+    console.error(`Retrieved ${posts.length} posts from Ghost.`);
+
+    return {
+      content: [{ type: 'text', text: JSON.stringify(posts, null, 2) }],
+    };
+  })
 );
 
 // Get Post Tool
@@ -579,45 +450,24 @@ server.registerTool(
     description: 'Retrieves a single post from Ghost CMS by ID or slug.',
     inputSchema: getPostSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(getPostSchema, rawInput, 'ghost_get_post');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const input = validation.data;
-
-    console.error(`Executing tool: ghost_get_post`);
-    try {
-      await loadServices();
+  withErrorHandling('ghost_get_post', getPostSchema, async (input) => {
+    // Build options object
+    const options = {};
+    if (input.include !== undefined) options.include = input.include;
 
-      // Build options object
-      const options = {};
-      if (input.include !== undefined) options.include = input.include;
-
-      // Determine identifier (prefer ID over slug)
-      const identifier = input.id || `slug/${input.slug}`;
+    // Determine identifier (prefer ID over slug)
+    if (!input.id && !input.slug) {
+      throw new Error('Either id or slug is required');
+    }
+    const identifier = input.id || `slug/${input.slug}`;
 
-      const post = await ghostService.getPost(identifier, options);
-      console.error(`Retrieved post: ${post.title} (ID: ${post.id})`);
+    const post = await ghostService.getPost(identifier, options);
+    console.error(`Retrieved post: ${post.title} (ID: ${post.id})`);
 
-      return {
-        content: [{ type: 'text', text: JSON.stringify(post, null, 2) }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_get_post:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Post retrieval');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error retrieving post: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+    return {
+      content: [{ type: 'text', text: JSON.stringify(post, null, 2) }],
+    };
+  })
 );
 
 // Search Posts Tool
@@ -627,43 +477,19 @@ server.registerTool(
     description: 'Search for posts in Ghost CMS by query string with optional status filtering.',
     inputSchema: searchPostsSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(searchPostsSchema, rawInput, 'ghost_search_posts');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const input = validation.data;
-
-    console.error(`Executing tool: ghost_search_posts with query: ${input.query}`);
-    try {
-      await loadServices();
-
-      // Build options object with provided parameters
-      const options = {};
-      if (input.status !== undefined) options.status = input.status;
-      if (input.limit !== undefined) options.limit = input.limit;
-
-      const posts = await ghostService.searchPosts(input.query, options);
-      console.error(`Found ${posts.length} posts matching "${input.query}".`);
-
-      return {
-        content: [{ type: 'text', text: JSON.stringify(posts, null, 2) }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_search_posts:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Post search');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error searching posts: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+  withErrorHandling('ghost_search_posts', searchPostsSchema, async (input) => {
+    // Build options object with provided parameters
+    const options = {};
+    if (input.status !== undefined) options.status = input.status;
+    if (input.limit !== undefined) options.limit = input.limit;
+
+    const posts = await ghostService.searchPosts(input.query, options);
+    console.error(`Found ${posts.length} posts matching "${input.query}".`);
+
+    return {
+      content: [{ type: 'text', text: JSON.stringify(posts, null, 2) }],
+    };
+  })
 );
 
 // Update Post Tool
@@ -674,42 +500,18 @@ server.registerTool(
       'Updates an existing post in Ghost CMS. Can update title, content, status, tags, images, and SEO fields. Only the provided fields are changed; omitted fields remain unchanged. Note: tags and authors arrays are fully replaced, not merged with existing values.',
     inputSchema: updatePostInputSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(updatePostInputSchema, rawInput, 'ghost_update_post');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const input = validation.data;
+  withErrorHandling('ghost_update_post', updatePostInputSchema, async (input) => {
+    // Extract ID from input and build update data
+    const { id, ...updateData } = input;
 
-    console.error(`Executing tool: ghost_update_post for post ID: ${input.id}`);
-    try {
-      await loadServices();
+    const updatedPost = await ghostService.updatePost(id, updateData);
+    console.error(`Post updated successfully. Post ID: ${updatedPost.id}`);
 
-      // Extract ID from input and build update data
-      const { id, ...updateData } = input;
-
-      const updatedPost = await ghostService.updatePost(id, updateData);
-      console.error(`Post updated successfully. Post ID: ${updatedPost.id}`);
-
-      return {
-        content: [{ type: 'text', text: JSON.stringify(updatedPost, null, 2) }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_update_post:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Post update');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error updating post: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
-);
+    return {
+      content: [{ type: 'text', text: JSON.stringify(updatedPost, null, 2) }],
+    };
+  })
+);
 
 // Delete Post Tool
 server.registerTool(
@@ -719,38 +521,15 @@ server.registerTool(
       'Deletes a post from Ghost CMS by ID. This operation is permanent and cannot be undone.',
     inputSchema: deletePostSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(deletePostSchema, rawInput, 'ghost_delete_post');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const { id } = validation.data;
-
-    console.error(`Executing tool: ghost_delete_post for post ID: ${id}`);
-    try {
-      await loadServices();
-
-      await ghostService.deletePost(id);
-      console.error(`Post deleted successfully. Post ID: ${id}`);
-
-      return {
-        content: [{ type: 'text', text: `Post ${id} has been successfully deleted.` }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_delete_post:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Post deletion');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error deleting post: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+  withErrorHandling('ghost_delete_post', deletePostSchema, async (input) => {
+    const { id } = input;
+    await ghostService.deletePost(id);
+    console.error(`Post deleted successfully. Post ID: ${id}`);
+
+    return {
+      content: [{ type: 'text', text: `Post ${id} has been successfully deleted.` }],
+    };
+  })
 );
 
 // =============================================================================
@@ -804,47 +583,23 @@ server.registerTool(
       'Retrieves a list of pages from Ghost CMS with pagination, filtering, and sorting options.',
     inputSchema: pageQuerySchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(pageQuerySchema, rawInput, 'ghost_get_pages');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const input = validation.data;
-
-    console.error(`Executing tool: ghost_get_pages`);
-    try {
-      await loadServices();
-
-      const options = {};
-      if (input.limit !== undefined) options.limit = input.limit;
-      if (input.page !== undefined) options.page = input.page;
-      if (input.filter !== undefined) options.filter = input.filter;
-      if (input.include !== undefined) options.include = input.include;
-      if (input.fields !== undefined) options.fields = input.fields;
-      if (input.formats !== undefined) options.formats = input.formats;
-      if (input.order !== undefined) options.order = input.order;
-
-      const pages = await ghostService.getPages(options);
-      console.error(`Retrieved ${pages.length} pages from Ghost.`);
-
-      return {
-        content: [{ type: 'text', text: JSON.stringify(pages, null, 2) }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_get_pages:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Page query');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error retrieving pages: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+  withErrorHandling('ghost_get_pages', pageQuerySchema, async (input) => {
+    const options = {};
+    if (input.limit !== undefined) options.limit = input.limit;
+    if (input.page !== undefined) options.page = input.page;
+    if (input.filter !== undefined) options.filter = input.filter;
+    if (input.include !== undefined) options.include = input.include;
+    if (input.fields !== undefined) options.fields = input.fields;
+    if (input.formats !== undefined) options.formats = input.formats;
+    if (input.order !== undefined) options.order = input.order;
+
+    const pages = await ghostService.getPages(options);
+    console.error(`Retrieved ${pages.length} pages from Ghost.`);
+
+    return {
+      content: [{ type: 'text', text: JSON.stringify(pages, null, 2) }],
+    };
+  })
 );
 
 // Get Page Tool
@@ -854,43 +609,22 @@ server.registerTool(
     description: 'Retrieves a single page from Ghost CMS by ID or slug.',
     inputSchema: getPageSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(getPageSchema, rawInput, 'ghost_get_page');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const input = validation.data;
-
-    console.error(`Executing tool: ghost_get_page`);
-    try {
-      await loadServices();
-
-      const options = {};
-      if (input.include !== undefined) options.include = input.include;
+  withErrorHandling('ghost_get_page', getPageSchema, async (input) => {
+    const options = {};
+    if (input.include !== undefined) options.include = input.include;
 
-      const identifier = input.id || `slug/${input.slug}`;
+    if (!input.id && !input.slug) {
+      throw new Error('Either id or slug is required');
+    }
+    const identifier = input.id || `slug/${input.slug}`;
 
-      const page = await ghostService.getPage(identifier, options);
-      console.error(`Retrieved page: ${page.title} (ID: ${page.id})`);
+    const page = await ghostService.getPage(identifier, options);
+    console.error(`Retrieved page: ${page.title} (ID: ${page.id})`);
 
-      return {
-        content: [{ type: 'text', text: JSON.stringify(page, null, 2) }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_get_page:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Get page');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error retrieving page: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+    return {
+      content: [{ type: 'text', text: JSON.stringify(page, null, 2) }],
+    };
+  })
 );
 
 // Create Page Tool
@@ -901,38 +635,14 @@ server.registerTool(
       'Creates a new page in Ghost CMS. Note: Pages do NOT typically use tags (unlike posts).',
     inputSchema: createPageSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(createPageSchema, rawInput, 'ghost_create_page');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const input = validation.data;
-
-    console.error(`Executing tool: ghost_create_page with title: ${input.title}`);
-    try {
-      await loadServices();
-
-      const createdPage = await pageService.createPageService(input);
-      console.error(`Page created successfully. Page ID: ${createdPage.id}`);
+  withErrorHandling('ghost_create_page', createPageSchema, async (input) => {
+    const createdPage = await pageService.createPageService(input);
+    console.error(`Page created successfully. Page ID: ${createdPage.id}`);
 
-      return {
-        content: [{ type: 'text', text: JSON.stringify(createdPage, null, 2) }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_create_page:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Page creation');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error creating page: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+    return {
+      content: [{ type: 'text', text: JSON.stringify(createdPage, null, 2) }],
+    };
+  })
 );
 
 // Update Page Tool
@@ -943,40 +653,16 @@ server.registerTool(
       'Updates an existing page in Ghost CMS. Can update title, content, status, images, and SEO fields. Only the provided fields are changed; omitted fields remain unchanged.',
     inputSchema: updatePageInputSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(updatePageInputSchema, rawInput, 'ghost_update_page');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const input = validation.data;
-
-    console.error(`Executing tool: ghost_update_page for page ID: ${input.id}`);
-    try {
-      await loadServices();
+  withErrorHandling('ghost_update_page', updatePageInputSchema, async (input) => {
+    const { id, ...updateData } = input;
 
-      const { id, ...updateData } = input;
+    const updatedPage = await ghostService.updatePage(id, updateData);
+    console.error(`Page updated successfully. Page ID: ${updatedPage.id}`);
 
-      const updatedPage = await ghostService.updatePage(id, updateData);
-      console.error(`Page updated successfully. Page ID: ${updatedPage.id}`);
-
-      return {
-        content: [{ type: 'text', text: JSON.stringify(updatedPage, null, 2) }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_update_page:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Page update');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error updating page: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+    return {
+      content: [{ type: 'text', text: JSON.stringify(updatedPage, null, 2) }],
+    };
+  })
 );
 
 // Delete Page Tool
@@ -987,38 +673,15 @@ server.registerTool(
       'Deletes a page from Ghost CMS by ID. This operation is permanent and cannot be undone.',
     inputSchema: deletePageSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(deletePageSchema, rawInput, 'ghost_delete_page');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const { id } = validation.data;
-
-    console.error(`Executing tool: ghost_delete_page for page ID: ${id}`);
-    try {
-      await loadServices();
-
-      await ghostService.deletePage(id);
-      console.error(`Page deleted successfully. Page ID: ${id}`);
-
-      return {
-        content: [{ type: 'text', text: `Page ${id} has been successfully deleted.` }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_delete_page:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Page deletion');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error deleting page: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+  withErrorHandling('ghost_delete_page', deletePageSchema, async (input) => {
+    const { id } = input;
+    await ghostService.deletePage(id);
+    console.error(`Page deleted successfully. Page ID: ${id}`);
+
+    return {
+      content: [{ type: 'text', text: `Page ${id} has been successfully deleted.` }],
+    };
+  })
 );
 
 // Search Pages Tool
@@ -1028,42 +691,18 @@ server.registerTool(
     description: 'Search for pages in Ghost CMS by query string with optional status filtering.',
     inputSchema: searchPagesSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(searchPagesSchema, rawInput, 'ghost_search_pages');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const input = validation.data;
+  withErrorHandling('ghost_search_pages', searchPagesSchema, async (input) => {
+    const options = {};
+    if (input.status !== undefined) options.status = input.status;
+    if (input.limit !== undefined) options.limit = input.limit;
 
-    console.error(`Executing tool: ghost_search_pages with query: ${input.query}`);
-    try {
-      await loadServices();
-
-      const options = {};
-      if (input.status !== undefined) options.status = input.status;
-      if (input.limit !== undefined) options.limit = input.limit;
-
-      const pages = await ghostService.searchPages(input.query, options);
-      console.error(`Found ${pages.length} pages matching "${input.query}".`);
+    const pages = await ghostService.searchPages(input.query, options);
+    console.error(`Found ${pages.length} pages matching "${input.query}".`);
 
-      return {
-        content: [{ type: 'text', text: JSON.stringify(pages, null, 2) }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_search_pages:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Page search');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error searching pages: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+    return {
+      content: [{ type: 'text', text: JSON.stringify(pages, null, 2) }],
+    };
+  })
 );
 
 // =============================================================================
@@ -1104,38 +743,14 @@ server.registerTool(
     description: 'Creates a new member (subscriber) in Ghost CMS.',
     inputSchema: createMemberSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(createMemberSchema, rawInput, 'ghost_create_member');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const input = validation.data;
-
-    console.error(`Executing tool: ghost_create_member with email: ${input.email}`);
-    try {
-      await loadServices();
+  withErrorHandling('ghost_create_member', createMemberSchema, async (input) => {
+    const createdMember = await ghostService.createMember(input);
+    console.error(`Member created successfully. Member ID: ${createdMember.id}`);
 
-      const createdMember = await ghostService.createMember(input);
-      console.error(`Member created successfully. Member ID: ${createdMember.id}`);
-
-      return {
-        content: [{ type: 'text', text: JSON.stringify(createdMember, null, 2) }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_create_member:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Member creation');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error creating member: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+    return {
+      content: [{ type: 'text', text: JSON.stringify(createdMember, null, 2) }],
+    };
+  })
 );
 
 // Update Member Tool
@@ -1145,40 +760,16 @@ server.registerTool(
     description: 'Updates an existing member in Ghost CMS. All fields except id are optional.',
     inputSchema: updateMemberInputSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(updateMemberInputSchema, rawInput, 'ghost_update_member');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const input = validation.data;
-
-    console.error(`Executing tool: ghost_update_member for member ID: ${input.id}`);
-    try {
-      await loadServices();
-
-      const { id, ...updateData } = input;
+  withErrorHandling('ghost_update_member', updateMemberInputSchema, async (input) => {
+    const { id, ...updateData } = input;
 
-      const updatedMember = await ghostService.updateMember(id, updateData);
-      console.error(`Member updated successfully. Member ID: ${updatedMember.id}`);
+    const updatedMember = await ghostService.updateMember(id, updateData);
+    console.error(`Member updated successfully. Member ID: ${updatedMember.id}`);
 
-      return {
-        content: [{ type: 'text', text: JSON.stringify(updatedMember, null, 2) }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_update_member:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Member update');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error updating member: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+    return {
+      content: [{ type: 'text', text: JSON.stringify(updatedMember, null, 2) }],
+    };
+  })
 );
 
 // Delete Member Tool
@@ -1189,38 +780,15 @@ server.registerTool(
       'Deletes a member from Ghost CMS by ID. This operation is permanent and cannot be undone.',
     inputSchema: deleteMemberSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(deleteMemberSchema, rawInput, 'ghost_delete_member');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const { id } = validation.data;
-
-    console.error(`Executing tool: ghost_delete_member for member ID: ${id}`);
-    try {
-      await loadServices();
-
-      await ghostService.deleteMember(id);
-      console.error(`Member deleted successfully. Member ID: ${id}`);
-
-      return {
-        content: [{ type: 'text', text: `Member ${id} has been successfully deleted.` }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_delete_member:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Member deletion');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error deleting member: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+  withErrorHandling('ghost_delete_member', deleteMemberSchema, async (input) => {
+    const { id } = input;
+    await ghostService.deleteMember(id);
+    console.error(`Member deleted successfully. Member ID: ${id}`);
+
+    return {
+      content: [{ type: 'text', text: `Member ${id} has been successfully deleted.` }],
+    };
+  })
 );
 
 // Get Members Tool
@@ -1231,46 +799,22 @@ server.registerTool(
       'Retrieves a list of members (subscribers) from Ghost CMS with optional filtering, pagination, and includes.',
     inputSchema: getMembersSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(getMembersSchema, rawInput, 'ghost_get_members');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const input = validation.data;
-
-    console.error(`Executing tool: ghost_get_members`);
-    try {
-      await loadServices();
-
-      const options = {};
-      if (input.limit !== undefined) options.limit = input.limit;
-      if (input.page !== undefined) options.page = input.page;
-      if (input.filter !== undefined) options.filter = input.filter;
-      if (input.order !== undefined) options.order = input.order;
-      if (input.include !== undefined) options.include = input.include;
-
-      const members = await ghostService.getMembers(options);
-      console.error(`Retrieved ${members.length} members from Ghost.`);
-
-      return {
-        content: [{ type: 'text', text: JSON.stringify(members, null, 2) }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_get_members:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Member query');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error retrieving members: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
-);
+  withErrorHandling('ghost_get_members', getMembersSchema, async (input) => {
+    const options = {};
+    if (input.limit !== undefined) options.limit = input.limit;
+    if (input.page !== undefined) options.page = input.page;
+    if (input.filter !== undefined) options.filter = input.filter;
+    if (input.order !== undefined) options.order = input.order;
+    if (input.include !== undefined) options.include = input.include;
+
+    const members = await ghostService.getMembers(options);
+    console.error(`Retrieved ${members.length} members from Ghost.`);
+
+    return {
+      content: [{ type: 'text', text: JSON.stringify(members, null, 2) }],
+    };
+  })
+);
 
 // Get Member Tool
 server.registerTool(
@@ -1280,38 +824,15 @@ server.registerTool(
       'Retrieves a single member from Ghost CMS by ID or email. Provide either id OR email.',
     inputSchema: getMemberSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(getMemberSchema, rawInput, 'ghost_get_member');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const { id, email } = validation.data;
-
-    console.error(`Executing tool: ghost_get_member for ${id ? `ID: ${id}` : `email: ${email}`}`);
-    try {
-      await loadServices();
-
-      const member = await ghostService.getMember({ id, email });
-      console.error(`Retrieved member: ${member.email} (ID: ${member.id})`);
-
-      return {
-        content: [{ type: 'text', text: JSON.stringify(member, null, 2) }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_get_member:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Member lookup');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error retrieving member: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+  withErrorHandling('ghost_get_member', getMemberSchema, async (input) => {
+    const { id, email } = input;
+    const member = await ghostService.getMember({ id, email });
+    console.error(`Retrieved member: ${member.email} (ID: ${member.id})`);
+
+    return {
+      content: [{ type: 'text', text: JSON.stringify(member, null, 2) }],
+    };
+  })
 );
 
 // Search Members Tool
@@ -1321,41 +842,18 @@ server.registerTool(
     description: 'Searches for members by name or email in Ghost CMS.',
     inputSchema: searchMembersSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(searchMembersSchema, rawInput, 'ghost_search_members');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const { query, limit } = validation.data;
+  withErrorHandling('ghost_search_members', searchMembersSchema, async (input) => {
+    const { query, limit } = input;
+    const options = {};
+    if (limit !== undefined) options.limit = limit;
 
-    console.error(`Executing tool: ghost_search_members with query: ${query}`);
-    try {
-      await loadServices();
-
-      const options = {};
-      if (limit !== undefined) options.limit = limit;
+    const members = await ghostService.searchMembers(query, options);
+    console.error(`Found ${members.length} members matching "${query}".`);
 
-      const members = await ghostService.searchMembers(query, options);
-      console.error(`Found ${members.length} members matching "${query}".`);
-
-      return {
-        content: [{ type: 'text', text: JSON.stringify(members, null, 2) }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_search_members:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Member search');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error searching members: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+    return {
+      content: [{ type: 'text', text: JSON.stringify(members, null, 2) }],
+    };
+  })
 );
 
 // =============================================================================
@@ -1374,44 +872,20 @@ server.registerTool(
     description: 'Retrieves a list of newsletters from Ghost CMS with optional filtering.',
     inputSchema: newsletterQuerySchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(newsletterQuerySchema, rawInput, 'ghost_get_newsletters');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const input = validation.data;
-
-    console.error(`Executing tool: ghost_get_newsletters`);
-    try {
-      await loadServices();
-
-      const options = {};
-      if (input.limit !== undefined) options.limit = input.limit;
-      if (input.page !== undefined) options.page = input.page;
-      if (input.filter !== undefined) options.filter = input.filter;
-      if (input.order !== undefined) options.order = input.order;
-
-      const newsletters = await ghostService.getNewsletters(options);
-      console.error(`Retrieved ${newsletters.length} newsletters from Ghost.`);
-
-      return {
-        content: [{ type: 'text', text: JSON.stringify(newsletters, null, 2) }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_get_newsletters:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Newsletter query');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error retrieving newsletters: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+  withErrorHandling('ghost_get_newsletters', newsletterQuerySchema, async (input) => {
+    const options = {};
+    if (input.limit !== undefined) options.limit = input.limit;
+    if (input.page !== undefined) options.page = input.page;
+    if (input.filter !== undefined) options.filter = input.filter;
+    if (input.order !== undefined) options.order = input.order;
+
+    const newsletters = await ghostService.getNewsletters(options);
+    console.error(`Retrieved ${newsletters.length} newsletters from Ghost.`);
+
+    return {
+      content: [{ type: 'text', text: JSON.stringify(newsletters, null, 2) }],
+    };
+  })
 );
 
 // Get Newsletter Tool
@@ -1421,38 +895,15 @@ server.registerTool(
     description: 'Retrieves a single newsletter from Ghost CMS by ID.',
     inputSchema: getNewsletterSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(getNewsletterSchema, rawInput, 'ghost_get_newsletter');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const { id } = validation.data;
-
-    console.error(`Executing tool: ghost_get_newsletter for ID: ${id}`);
-    try {
-      await loadServices();
-
-      const newsletter = await ghostService.getNewsletter(id);
-      console.error(`Retrieved newsletter: ${newsletter.name} (ID: ${newsletter.id})`);
-
-      return {
-        content: [{ type: 'text', text: JSON.stringify(newsletter, null, 2) }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_get_newsletter:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Newsletter retrieval');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error retrieving newsletter: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+  withErrorHandling('ghost_get_newsletter', getNewsletterSchema, async (input) => {
+    const { id } = input;
+    const newsletter = await ghostService.getNewsletter(id);
+    console.error(`Retrieved newsletter: ${newsletter.name} (ID: ${newsletter.id})`);
+
+    return {
+      content: [{ type: 'text', text: JSON.stringify(newsletter, null, 2) }],
+    };
+  })
 );
 
 // Create Newsletter Tool
@@ -1463,42 +914,14 @@ server.registerTool(
       'Creates a new newsletter in Ghost CMS with customizable sender settings and display options.',
     inputSchema: createNewsletterSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(
-      createNewsletterSchema,
-      rawInput,
-      'ghost_create_newsletter'
-    );
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const input = validation.data;
-
-    console.error(`Executing tool: ghost_create_newsletter with name: ${input.name}`);
-    try {
-      await loadServices();
-
-      const createdNewsletter = await newsletterService.createNewsletterService(input);
-      console.error(`Newsletter created successfully. Newsletter ID: ${createdNewsletter.id}`);
+  withErrorHandling('ghost_create_newsletter', createNewsletterSchema, async (input) => {
+    const createdNewsletter = await newsletterService.createNewsletterService(input);
+    console.error(`Newsletter created successfully. Newsletter ID: ${createdNewsletter.id}`);
 
-      return {
-        content: [{ type: 'text', text: JSON.stringify(createdNewsletter, null, 2) }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_create_newsletter:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Newsletter creation');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error creating newsletter: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+    return {
+      content: [{ type: 'text', text: JSON.stringify(createdNewsletter, null, 2) }],
+    };
+  })
 );
 
 // Update Newsletter Tool
@@ -1509,44 +932,16 @@ server.registerTool(
       'Updates an existing newsletter in Ghost CMS. Can update name, description, sender settings, and display options.',
     inputSchema: updateNewsletterInputSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(
-      updateNewsletterInputSchema,
-      rawInput,
-      'ghost_update_newsletter'
-    );
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const input = validation.data;
+  withErrorHandling('ghost_update_newsletter', updateNewsletterInputSchema, async (input) => {
+    const { id, ...updateData } = input;
 
-    console.error(`Executing tool: ghost_update_newsletter for newsletter ID: ${input.id}`);
-    try {
-      await loadServices();
-
-      const { id, ...updateData } = input;
+    const updatedNewsletter = await ghostService.updateNewsletter(id, updateData);
+    console.error(`Newsletter updated successfully. Newsletter ID: ${updatedNewsletter.id}`);
 
-      const updatedNewsletter = await ghostService.updateNewsletter(id, updateData);
-      console.error(`Newsletter updated successfully. Newsletter ID: ${updatedNewsletter.id}`);
-
-      return {
-        content: [{ type: 'text', text: JSON.stringify(updatedNewsletter, null, 2) }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_update_newsletter:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Newsletter update');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error updating newsletter: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+    return {
+      content: [{ type: 'text', text: JSON.stringify(updatedNewsletter, null, 2) }],
+    };
+  })
 );
 
 // Delete Newsletter Tool
@@ -1557,42 +952,15 @@ server.registerTool(
       'Deletes a newsletter from Ghost CMS by ID. This operation is permanent and cannot be undone.',
     inputSchema: deleteNewsletterSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(
-      deleteNewsletterSchema,
-      rawInput,
-      'ghost_delete_newsletter'
-    );
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const { id } = validation.data;
-
-    console.error(`Executing tool: ghost_delete_newsletter for newsletter ID: ${id}`);
-    try {
-      await loadServices();
-
-      await ghostService.deleteNewsletter(id);
-      console.error(`Newsletter deleted successfully. Newsletter ID: ${id}`);
-
-      return {
-        content: [{ type: 'text', text: `Newsletter ${id} has been successfully deleted.` }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_delete_newsletter:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Newsletter deletion');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error deleting newsletter: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+  withErrorHandling('ghost_delete_newsletter', deleteNewsletterSchema, async (input) => {
+    const { id } = input;
+    await ghostService.deleteNewsletter(id);
+    console.error(`Newsletter deleted successfully. Newsletter ID: ${id}`);
+
+    return {
+      content: [{ type: 'text', text: `Newsletter ${id} has been successfully deleted.` }],
+    };
+  })
 );
 
 // --- Tier Tools ---
@@ -1610,38 +978,14 @@ server.registerTool(
       'Retrieves a list of tiers (membership levels) from Ghost CMS with optional filtering by type (free/paid).',
     inputSchema: tierQuerySchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(tierQuerySchema, rawInput, 'ghost_get_tiers');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const input = validation.data;
+  withErrorHandling('ghost_get_tiers', tierQuerySchema, async (input) => {
+    const tiers = await ghostService.getTiers(input);
+    console.error(`Retrieved ${tiers.length} tiers`);
 
-    console.error(`Executing tool: ghost_get_tiers`);
-    try {
-      await loadServices();
-
-      const tiers = await ghostService.getTiers(input);
-      console.error(`Retrieved ${tiers.length} tiers`);
-
-      return {
-        content: [{ type: 'text', text: JSON.stringify(tiers, null, 2) }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_get_tiers:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Tier query');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error getting tiers: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+    return {
+      content: [{ type: 'text', text: JSON.stringify(tiers, null, 2) }],
+    };
+  })
 );
 
 // Get Tier Tool
@@ -1651,38 +995,15 @@ server.registerTool(
     description: 'Retrieves a single tier (membership level) from Ghost CMS by ID.',
     inputSchema: getTierSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(getTierSchema, rawInput, 'ghost_get_tier');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const { id } = validation.data;
-
-    console.error(`Executing tool: ghost_get_tier for tier ID: ${id}`);
-    try {
-      await loadServices();
-
-      const tier = await ghostService.getTier(id);
-      console.error(`Tier retrieved successfully. Tier ID: ${tier.id}`);
-
-      return {
-        content: [{ type: 'text', text: JSON.stringify(tier, null, 2) }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_get_tier:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Tier retrieval');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error getting tier: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+  withErrorHandling('ghost_get_tier', getTierSchema, async (input) => {
+    const { id } = input;
+    const tier = await ghostService.getTier(id);
+    console.error(`Tier retrieved successfully. Tier ID: ${tier.id}`);
+
+    return {
+      content: [{ type: 'text', text: JSON.stringify(tier, null, 2) }],
+    };
+  })
 );
 
 // Create Tier Tool
@@ -1692,38 +1013,14 @@ server.registerTool(
     description: 'Creates a new tier (membership level) in Ghost CMS with pricing and benefits.',
     inputSchema: createTierSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(createTierSchema, rawInput, 'ghost_create_tier');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const input = validation.data;
+  withErrorHandling('ghost_create_tier', createTierSchema, async (input) => {
+    const tier = await ghostService.createTier(input);
+    console.error(`Tier created successfully. Tier ID: ${tier.id}`);
 
-    console.error(`Executing tool: ghost_create_tier`);
-    try {
-      await loadServices();
-
-      const tier = await ghostService.createTier(input);
-      console.error(`Tier created successfully. Tier ID: ${tier.id}`);
-
-      return {
-        content: [{ type: 'text', text: JSON.stringify(tier, null, 2) }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_create_tier:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Tier creation');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error creating tier: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+    return {
+      content: [{ type: 'text', text: JSON.stringify(tier, null, 2) }],
+    };
+  })
 );
 
 // Update Tier Tool
@@ -1734,40 +1031,16 @@ server.registerTool(
       'Updates an existing tier (membership level) in Ghost CMS. Can update pricing, benefits, and other tier properties.',
     inputSchema: updateTierInputSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(updateTierInputSchema, rawInput, 'ghost_update_tier');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const input = validation.data;
+  withErrorHandling('ghost_update_tier', updateTierInputSchema, async (input) => {
+    const { id, ...updateData } = input;
 
-    console.error(`Executing tool: ghost_update_tier for tier ID: ${input.id}`);
-    try {
-      await loadServices();
+    const updatedTier = await ghostService.updateTier(id, updateData);
+    console.error(`Tier updated successfully. Tier ID: ${updatedTier.id}`);
 
-      const { id, ...updateData } = input;
-
-      const updatedTier = await ghostService.updateTier(id, updateData);
-      console.error(`Tier updated successfully. Tier ID: ${updatedTier.id}`);
-
-      return {
-        content: [{ type: 'text', text: JSON.stringify(updatedTier, null, 2) }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_update_tier:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Tier update');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error updating tier: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+    return {
+      content: [{ type: 'text', text: JSON.stringify(updatedTier, null, 2) }],
+    };
+  })
 );
 
 // Delete Tier Tool
@@ -1778,38 +1051,15 @@ server.registerTool(
       'Deletes a tier (membership level) from Ghost CMS by ID. This operation is permanent and cannot be undone.',
     inputSchema: deleteTierSchema,
   },
-  async (rawInput) => {
-    const validation = validateToolInput(deleteTierSchema, rawInput, 'ghost_delete_tier');
-    if (!validation.success) {
-      return validation.errorResponse;
-    }
-    const { id } = validation.data;
-
-    console.error(`Executing tool: ghost_delete_tier for tier ID: ${id}`);
-    try {
-      await loadServices();
-
-      await ghostService.deleteTier(id);
-      console.error(`Tier deleted successfully. Tier ID: ${id}`);
-
-      return {
-        content: [{ type: 'text', text: `Tier ${id} has been successfully deleted.` }],
-      };
-    } catch (error) {
-      console.error(`Error in ghost_delete_tier:`, error);
-      if (error.name === 'ZodError') {
-        const validationError = ValidationError.fromZod(error, 'Tier deletion');
-        return {
-          content: [{ type: 'text', text: JSON.stringify(validationError.toJSON(), null, 2) }],
-          isError: true,
-        };
-      }
-      return {
-        content: [{ type: 'text', text: `Error deleting tier: ${error.message}` }],
-        isError: true,
-      };
-    }
-  }
+  withErrorHandling('ghost_delete_tier', deleteTierSchema, async (input) => {
+    const { id } = input;
+    await ghostService.deleteTier(id);
+    console.error(`Tier deleted successfully. Tier ID: ${id}`);
+
+    return {
+      content: [{ type: 'text', text: `Tier ${id} has been successfully deleted.` }],
+    };
+  })
 );
 
 // --- Main Entry Point ---