portkey-admin-mcp 0.7.0 → 0.8.0

package/build/index.js

@@ -197,6 +197,10 @@ function validateUrl(url) {
     );
   }
 }
+var NO_CONTENT = /* @__PURE__ */ Symbol("NoContent");
+function isNoContent(value) {
+  return value === NO_CONTENT;
+}
 var BaseService = class {
   apiKey;
   baseUrl;
@@ -269,7 +273,7 @@ var BaseService = class {
         duration_ms
       });
       if (options.allowNoContent && response.status === 204) {
-        return {};
+        return NO_CONTENT;
       }
       return await response.json();
     } catch (error) {
@@ -286,23 +290,50 @@ var BaseService = class {
       throw error;
     }
   }
+  /**
+   * Asserts that a request known not to set `allowNoContent` never actually
+   * resolves to the {@link NoContent} sentinel. `get`/`post`/`put`/`getPublic`
+   * never pass `allowNoContent`, so `executeRequest` cannot take the 204
+   * branch for them — this only guards against that invariant breaking.
+   */
+  rejectNoContent(result) {
+    if (isNoContent(result)) {
+      throw new Error(
+        "Unexpected HTTP 204 No Content response for a request that did not allow it"
+      );
+    }
+    return result;
+  }
   async get(path, params) {
-    return this.executeRequest("GET", path, { params });
+    return this.rejectNoContent(
+      await this.executeRequest("GET", path, { params })
+    );
   }
   /** Read an unauthenticated Portkey public-catalog endpoint outside /v1. */
   async getPublic(path, params) {
-    return this.executeRequest("GET", path, {
-      params,
-      baseUrl: DEFAULT_PUBLIC_BASE_URL,
-      authenticate: false
-    });
+    return this.rejectNoContent(
+      await this.executeRequest("GET", path, {
+        params,
+        baseUrl: DEFAULT_PUBLIC_BASE_URL,
+        authenticate: false
+      })
+    );
   }
   async post(path, body) {
-    return this.executeRequest("POST", path, { body });
+    return this.rejectNoContent(
+      await this.executeRequest("POST", path, { body })
+    );
   }
   async put(path, body) {
-    return this.executeRequest("PUT", path, { body });
+    return this.rejectNoContent(
+      await this.executeRequest("PUT", path, { body })
+    );
   }
+  /**
+   * DELETE responses may legitimately come back as HTTP 204. Callers get
+   * `T | NoContent` back and must narrow with {@link isNoContent} instead of
+   * being handed a fabricated `{}` that silently claims to be a real `T`.
+   */
   async delete(path, params) {
     return this.executeRequest("DELETE", path, {
       params,
@@ -522,9 +553,10 @@ var CollectionsService = class extends BaseService {
     );
   }
   async deleteCollection(collectionId) {
-    return this.delete(
+    const result = await this.delete(
       `/collections/${this.encodePathSegment(collectionId)}`
     );
+    return isNoContent(result) ? { success: true } : result;
   }
 };
 
@@ -561,9 +593,10 @@ var ConfigsService = class extends BaseService {
     return this.parseConfigResponse(response);
   }
   async deleteConfig(slug) {
-    return this.delete(
+    const result = await this.delete(
       `/configs/${this.encodePathSegment(slug)}`
     );
+    return isNoContent(result) ? { success: true } : result;
   }
   async listConfigVersions(slug) {
     return this.get(
@@ -861,9 +894,10 @@ var LabelsService = class extends BaseService {
     );
   }
   async deleteLabel(labelId) {
-    return this.delete(
+    const result = await this.delete(
       `/labels/${this.encodePathSegment(labelId)}`
     );
+    return isNoContent(result) ? {} : result;
   }
 };
 
@@ -899,9 +933,10 @@ var LimitsService = class extends BaseService {
     if (!id?.trim()) {
       throw new Error("Rate limit ID is required");
     }
-    return this.delete(
+    const result = await this.delete(
       `/policies/rate-limits/${this.encodePathSegment(id)}`
     );
+    return isNoContent(result) ? { success: true } : result;
   }
   // ── Usage Limits ──
   async listUsageLimits(workspace_id) {
@@ -933,9 +968,10 @@ var LimitsService = class extends BaseService {
     if (!id?.trim()) {
       throw new Error("Usage limit ID is required");
     }
-    return this.delete(
+    const result = await this.delete(
       `/policies/usage-limits/${this.encodePathSegment(id)}`
     );
+    return isNoContent(result) ? { success: true } : result;
   }
   // ── Usage Limit Entities ──
   async listUsageLimitEntities(limitId) {
@@ -1198,9 +1234,10 @@ var PartialsService = class extends BaseService {
     );
   }
   async deletePromptPartial(promptPartialId) {
-    return this.delete(
+    const result = await this.delete(
       `/prompts/partials/${this.encodePathSegment(promptPartialId)}`
     );
+    return isNoContent(result) ? {} : result;
   }
   async listPartialVersions(promptPartialId) {
     const response = await this.get(
@@ -1277,9 +1314,10 @@ var PromptsService = class extends BaseService {
     );
   }
   async deletePrompt(promptId) {
-    return this.delete(
+    const result = await this.delete(
       `/prompts/${this.encodePathSegment(promptId)}`
     );
+    return isNoContent(result) ? {} : result;
   }
   async publishPrompt(promptId, data) {
     return this.put(
@@ -1560,7 +1598,8 @@ var ProvidersService = class extends BaseService {
   }
   async deleteProvider(slug, workspaceId) {
     const path = workspaceId ? `/providers/${this.encodePathSegment(slug)}?workspace_id=${encodeURIComponent(workspaceId)}` : `/providers/${this.encodePathSegment(slug)}`;
-    return this.delete(path);
+    const result = await this.delete(path);
+    return isNoContent(result) ? {} : result;
   }
 };
 
@@ -1896,6 +1935,20 @@ var CreateSecretReferenceResponseSchema = z.object({
 
 // src/tools/analytics.tools.ts
 import { z as z2 } from "zod";
+
+// src/tools/utils.ts
+function formatFullName(firstName, lastName) {
+  return [firstName, lastName].filter(Boolean).join(" ").trim();
+}
+function jsonResult(data) {
+  const serialized = JSON.stringify(data) ?? "null";
+  return {
+    content: [{ type: "text", text: serialized }],
+    ...isRecord(data) && !Array.isArray(data) ? { structuredContent: data } : {}
+  };
+}
+
+// src/tools/analytics.tools.ts
 var baseAnalyticsSchema = {
   time_of_generation_min: z2.string().describe(
     "Start time for the analytics period (ISO8601 format, e.g., '2024-01-01T00:00:00Z')"
@@ -1988,6 +2041,48 @@ function formatGraphAnalytics(summary, dataPoints) {
 function formatGenericGraphAnalytics(analytics) {
   return formatGraphAnalytics(analytics.summary, analytics.data_points);
 }
+var GENERIC_GRAPH_ANALYTICS_TOOLS = [
+  {
+    name: "get_error_stacks_analytics",
+    description: "Get stacked error-series data grouped by HTTP status code over time, with summary and per-code series. Use this to see which error classes dominate; use get_error_status_codes_analytics for distinct-code distribution instead.",
+    method: (analytics, params) => analytics.getErrorStacksAnalytics(params)
+  },
+  {
+    name: "get_error_status_codes_analytics",
+    description: "Get HTTP error-code distribution time-series data with summary and per-code series. Use this to see which codes occur most often; use get_error_stacks_analytics for stacked or cumulative breakdowns.",
+    method: (analytics, params) => analytics.getErrorStatusCodesAnalytics(params)
+  },
+  {
+    name: "get_user_requests_analytics",
+    description: "Get per-user request-count time-series data with counts grouped by user. Use this to find heavy users and traffic concentration; use get_users_analytics for aggregate active and new user trends instead.",
+    method: (analytics, params) => analytics.getUserRequestsAnalytics(params)
+  },
+  {
+    name: "get_rescued_requests_analytics",
+    description: "Get rescued-request time-series data showing requests recovered by retry or fallback handling. Use this only when your configs include resilience features, and use it to measure how often recovery logic saved requests.",
+    method: (analytics, params) => analytics.getRescuedRequestsAnalytics(params)
+  },
+  {
+    name: "get_feedback_analytics",
+    description: "Get feedback-submission time-series data with summary totals and per-bucket counts. Use this as the top-level feedback trend view; use get_feedback_models_analytics, get_feedback_scores_analytics, or get_feedback_weighted_analytics for breakdowns.",
+    method: (analytics, params) => analytics.getFeedbackAnalytics(params)
+  },
+  {
+    name: "get_feedback_models_analytics",
+    description: "Get feedback time-series data grouped by model, with per-model counts over time. Use this to compare feedback volume and satisfaction across models; use get_feedback_analytics for the overall total instead.",
+    method: (analytics, params) => analytics.getFeedbackModelsAnalytics(params)
+  },
+  {
+    name: "get_feedback_scores_analytics",
+    description: "Get raw feedback-score distribution time-series data with per-score buckets. Use this to understand sentiment mix; use get_feedback_weighted_analytics for calibrated scores with weighting.",
+    method: (analytics, params) => analytics.getFeedbackScoresAnalytics(params)
+  },
+  {
+    name: "get_feedback_weighted_analytics",
+    description: "Get weighted feedback-score time-series data using the weight recorded at feedback creation. Use this for calibrated quality metrics; use get_feedback_scores_analytics for the raw unweighted distribution.",
+    method: (analytics, params) => analytics.getFeedbackWeightedAnalytics(params)
+  }
+];
 function formatGroupedAnalytics(analytics, groupLabel) {
   return {
     total_groups: analytics.total,
@@ -2082,22 +2177,15 @@ function registerAnalyticsTools(server, service) {
         total_cost: point.total,
         average_cost: point.avg
       }));
-      return {
-        content: [
+      return jsonResult(
+        formatGraphAnalytics(
           {
-            type: "text",
-            text: JSON.stringify(
-              formatGraphAnalytics(
-                {
-                  total_cost: analytics.summary.total,
-                  average_cost_per_request: analytics.summary.avg
-                },
-                dataPoints
-              )
-            )
-          }
-        ]
-      };
+            total_cost: analytics.summary.total,
+            average_cost_per_request: analytics.summary.avg
+          },
+          dataPoints
+        )
+      );
     }
   );
   server.tool(
@@ -2114,23 +2202,16 @@ function registerAnalyticsTools(server, service) {
         success: point.success,
         failed: point.failed
       }));
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(
-              formatGraphAnalytics(
-                {
-                  total_requests: analytics.summary.total,
-                  successful_requests: analytics.summary.success,
-                  failed_requests: analytics.summary.failed
-                },
-                dataPoints
-              )
-            )
-          }
-        ]
-      };
+      return jsonResult(
+        formatGraphAnalytics(
+          {
+            total_requests: analytics.summary.total,
+            successful_requests: analytics.summary.success,
+            failed_requests: analytics.summary.failed
+          },
+          dataPoints
+        )
+      );
     }
   );
   server.tool(
@@ -2147,23 +2228,16 @@ function registerAnalyticsTools(server, service) {
         prompt: point.prompt,
         completion: point.completion
       }));
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(
-              formatGraphAnalytics(
-                {
-                  total_tokens: analytics.summary.total,
-                  prompt_tokens: analytics.summary.prompt,
-                  completion_tokens: analytics.summary.completion
-                },
-                dataPoints
-              )
-            )
-          }
-        ]
-      };
+      return jsonResult(
+        formatGraphAnalytics(
+          {
+            total_tokens: analytics.summary.total,
+            prompt_tokens: analytics.summary.prompt,
+            completion_tokens: analytics.summary.completion
+          },
+          dataPoints
+        )
+      );
     }
   );
   server.tool(
@@ -2181,24 +2255,17 @@ function registerAnalyticsTools(server, service) {
         p90: point.p90,
         p99: point.p99
       }));
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(
-              formatGraphAnalytics(
-                {
-                  avg_latency_ms: analytics.summary.avg,
-                  p50_latency_ms: analytics.summary.p50,
-                  p90_latency_ms: analytics.summary.p90,
-                  p99_latency_ms: analytics.summary.p99
-                },
-                dataPoints
-              )
-            )
-          }
-        ]
-      };
+      return jsonResult(
+        formatGraphAnalytics(
+          {
+            avg_latency_ms: analytics.summary.avg,
+            p50_latency_ms: analytics.summary.p50,
+            p90_latency_ms: analytics.summary.p90,
+            p99_latency_ms: analytics.summary.p99
+          },
+          dataPoints
+        )
+      );
     }
   );
   server.tool(
@@ -2213,21 +2280,14 @@ function registerAnalyticsTools(server, service) {
         timestamp: point.timestamp,
         total_errors: point.total
       }));
-      return {
-        content: [
+      return jsonResult(
+        formatGraphAnalytics(
           {
-            type: "text",
-            text: JSON.stringify(
-              formatGraphAnalytics(
-                {
-                  total_errors: analytics.summary.total
-                },
-                dataPoints
-              )
-            )
-          }
-        ]
-      };
+            total_errors: analytics.summary.total
+          },
+          dataPoints
+        )
+      );
     }
   );
   server.tool(
@@ -2242,21 +2302,14 @@ function registerAnalyticsTools(server, service) {
         timestamp: point.timestamp,
         error_rate_percent: point.rate
       }));
-      return {
-        content: [
+      return jsonResult(
+        formatGraphAnalytics(
           {
-            type: "text",
-            text: JSON.stringify(
-              formatGraphAnalytics(
-                {
-                  error_rate_percent: analytics.summary.rate
-                },
-                dataPoints
-              )
-            )
-          }
-        ]
-      };
+            error_rate_percent: analytics.summary.rate
+          },
+          dataPoints
+        )
+      );
     }
   );
   server.tool(
@@ -2272,22 +2325,15 @@ function registerAnalyticsTools(server, service) {
         total: point.total,
         avg: point.avg
       }));
-      return {
-        content: [
+      return jsonResult(
+        formatGraphAnalytics(
           {
-            type: "text",
-            text: JSON.stringify(
-              formatGraphAnalytics(
-                {
-                  total_latency: analytics.summary.total,
-                  avg_latency: analytics.summary.avg
-                },
-                dataPoints
-              )
-            )
-          }
-        ]
-      };
+            total_latency: analytics.summary.total,
+            avg_latency: analytics.summary.avg
+          },
+          dataPoints
+        )
+      );
     }
   );
   server.tool(
@@ -2304,23 +2350,16 @@ function registerAnalyticsTools(server, service) {
         hits: point.hits,
         misses: point.misses
       }));
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(
-              formatGraphAnalytics(
-                {
-                  hit_rate: analytics.summary.rate,
-                  total_hits: analytics.summary.total_hits,
-                  total_misses: analytics.summary.total_misses
-                },
-                dataPoints
-              )
-            )
-          }
-        ]
-      };
+      return jsonResult(
+        formatGraphAnalytics(
+          {
+            hit_rate: analytics.summary.rate,
+            total_hits: analytics.summary.total_hits,
+            total_misses: analytics.summary.total_misses
+          },
+          dataPoints
+        )
+      );
     }
   );
   server.tool(
@@ -2336,168 +2375,31 @@ function registerAnalyticsTools(server, service) {
         active_users: point.active_users,
         new_users: point.new_users
       }));
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(
-              formatGraphAnalytics(
-                {
-                  total_active_users: analytics.summary.total_active_users,
-                  total_new_users: analytics.summary.total_new_users
-                },
-                dataPoints
-              )
-            )
-          }
-        ]
-      };
-    }
-  );
-  server.tool(
-    "get_error_stacks_analytics",
-    "Get stacked error-series data grouped by HTTP status code over time, with summary and per-code series. Use this to see which error classes dominate; use get_error_status_codes_analytics for distinct-code distribution instead.",
-    baseAnalyticsSchema,
-    async (params) => {
-      const analytics = await service.analytics.getErrorStacksAnalytics(
-        normalizeAnalyticsParams(params)
-      );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(formatGenericGraphAnalytics(analytics))
-          }
-        ]
-      };
-    }
-  );
-  server.tool(
-    "get_error_status_codes_analytics",
-    "Get HTTP error-code distribution time-series data with summary and per-code series. Use this to see which codes occur most often; use get_error_stacks_analytics for stacked or cumulative breakdowns.",
-    baseAnalyticsSchema,
-    async (params) => {
-      const analytics = await service.analytics.getErrorStatusCodesAnalytics(
-        normalizeAnalyticsParams(params)
-      );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(formatGenericGraphAnalytics(analytics))
-          }
-        ]
-      };
-    }
-  );
-  server.tool(
-    "get_user_requests_analytics",
-    "Get per-user request-count time-series data with counts grouped by user. Use this to find heavy users and traffic concentration; use get_users_analytics for aggregate active and new user trends instead.",
-    baseAnalyticsSchema,
-    async (params) => {
-      const analytics = await service.analytics.getUserRequestsAnalytics(
-        normalizeAnalyticsParams(params)
-      );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(formatGenericGraphAnalytics(analytics))
-          }
-        ]
-      };
-    }
-  );
-  server.tool(
-    "get_rescued_requests_analytics",
-    "Get rescued-request time-series data showing requests recovered by retry or fallback handling. Use this only when your configs include resilience features, and use it to measure how often recovery logic saved requests.",
-    baseAnalyticsSchema,
-    async (params) => {
-      const analytics = await service.analytics.getRescuedRequestsAnalytics(
-        normalizeAnalyticsParams(params)
-      );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(formatGenericGraphAnalytics(analytics))
-          }
-        ]
-      };
-    }
-  );
-  server.tool(
-    "get_feedback_analytics",
-    "Get feedback-submission time-series data with summary totals and per-bucket counts. Use this as the top-level feedback trend view; use get_feedback_models_analytics, get_feedback_scores_analytics, or get_feedback_weighted_analytics for breakdowns.",
-    baseAnalyticsSchema,
-    async (params) => {
-      const analytics = await service.analytics.getFeedbackAnalytics(
-        normalizeAnalyticsParams(params)
-      );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(formatGenericGraphAnalytics(analytics))
-          }
-        ]
-      };
-    }
-  );
-  server.tool(
-    "get_feedback_models_analytics",
-    "Get feedback time-series data grouped by model, with per-model counts over time. Use this to compare feedback volume and satisfaction across models; use get_feedback_analytics for the overall total instead.",
-    baseAnalyticsSchema,
-    async (params) => {
-      const analytics = await service.analytics.getFeedbackModelsAnalytics(
-        normalizeAnalyticsParams(params)
-      );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(formatGenericGraphAnalytics(analytics))
-          }
-        ]
-      };
-    }
-  );
-  server.tool(
-    "get_feedback_scores_analytics",
-    "Get raw feedback-score distribution time-series data with per-score buckets. Use this to understand sentiment mix; use get_feedback_weighted_analytics for calibrated scores with weighting.",
-    baseAnalyticsSchema,
-    async (params) => {
-      const analytics = await service.analytics.getFeedbackScoresAnalytics(
-        normalizeAnalyticsParams(params)
-      );
-      return {
-        content: [
+      return jsonResult(
+        formatGraphAnalytics(
           {
-            type: "text",
-            text: JSON.stringify(formatGenericGraphAnalytics(analytics))
-          }
-        ]
-      };
-    }
-  );
-  server.tool(
-    "get_feedback_weighted_analytics",
-    "Get weighted feedback-score time-series data using the weight recorded at feedback creation. Use this for calibrated quality metrics; use get_feedback_scores_analytics for the raw unweighted distribution.",
-    baseAnalyticsSchema,
-    async (params) => {
-      const analytics = await service.analytics.getFeedbackWeightedAnalytics(
-        normalizeAnalyticsParams(params)
+            total_active_users: analytics.summary.total_active_users,
+            total_new_users: analytics.summary.total_new_users
+          },
+          dataPoints
+        )
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(formatGenericGraphAnalytics(analytics))
-          }
-        ]
-      };
     }
   );
+  for (const tool of GENERIC_GRAPH_ANALYTICS_TOOLS) {
+    server.tool(
+      tool.name,
+      tool.description,
+      baseAnalyticsSchema,
+      async (params) => {
+        const analytics = await tool.method(
+          service.analytics,
+          normalizeAnalyticsParams(params)
+        );
+        return jsonResult(formatGenericGraphAnalytics(analytics));
+      }
+    );
+  }
   server.tool(
     "get_analytics_group_users",
     "Get a paginated per-user breakdown with total_groups, group_count, and a users array containing request count, cost, and token usage. Use this for billing, audits, or top-consumer analysis; use get_users_analytics for aggregate active and new user trends.",
@@ -2506,14 +2408,7 @@ function registerAnalyticsTools(server, service) {
       const analytics = await service.analytics.getAnalyticsGroupUsers(
         normalizeAnalyticsParams(params)
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(formatGroupedAnalytics(analytics, "users"))
-          }
-        ]
-      };
+      return jsonResult(formatGroupedAnalytics(analytics, "users"));
     }
   );
   server.tool(
@@ -2524,14 +2419,7 @@ function registerAnalyticsTools(server, service) {
       const analytics = await service.analytics.getAnalyticsGroupModels(
         normalizeAnalyticsParams(params)
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(formatGroupedAnalytics(analytics, "models"))
-          }
-        ]
-      };
+      return jsonResult(formatGroupedAnalytics(analytics, "models"));
     }
   );
   server.tool(
@@ -2544,16 +2432,7 @@ function registerAnalyticsTools(server, service) {
         metadata_key,
         normalizeAnalyticsParams(analyticsParams)
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(
-              formatGroupedAnalytics(analytics, "metadata_groups")
-            )
-          }
-        ]
-      };
+      return jsonResult(formatGroupedAnalytics(analytics, "metadata_groups"));
     }
   );
 }
@@ -2598,34 +2477,27 @@ function registerAuditTools(server, service) {
         current_page: params.current_page,
         page_size: params.page_size
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total: result.total,
-              current_page: result.current_page,
-              page_size: result.page_size,
-              audit_logs: result.data.map((log) => ({
-                id: log.id,
-                action: log.action,
-                actor_id: log.actor_id,
-                actor_email: log.actor_email,
-                actor_name: log.actor_name,
-                resource_type: log.resource_type,
-                resource_id: log.resource_id,
-                resource_name: log.resource_name,
-                workspace_id: log.workspace_id,
-                organisation_id: log.organisation_id,
-                metadata: log.metadata,
-                ip_address: log.ip_address,
-                user_agent: log.user_agent,
-                created_at: log.created_at
-              }))
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total: result.total,
+        current_page: result.current_page,
+        page_size: result.page_size,
+        audit_logs: result.data.map((log) => ({
+          id: log.id,
+          action: log.action,
+          actor_id: log.actor_id,
+          actor_email: log.actor_email,
+          actor_name: log.actor_name,
+          resource_type: log.resource_type,
+          resource_id: log.resource_id,
+          resource_name: log.resource_name,
+          workspace_id: log.workspace_id,
+          organisation_id: log.organisation_id,
+          metadata: log.metadata,
+          ip_address: log.ip_address,
+          user_agent: log.user_agent,
+          created_at: log.created_at
+        }))
+      });
     }
   );
 }
@@ -2664,24 +2536,17 @@ function registerCollectionsTools(server, service) {
     COLLECTIONS_TOOL_SCHEMAS.listCollections,
     async (params) => {
       const collections = await service.collections.listCollections(params);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total: collections.total,
-              collections: collections.data.map((collection) => ({
-                id: collection.id,
-                name: collection.name,
-                slug: collection.slug,
-                workspace_id: collection.workspace_id,
-                created_at: collection.created_at,
-                last_updated_at: collection.last_updated_at
-              }))
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total: collections.total,
+        collections: collections.data.map((collection) => ({
+          id: collection.id,
+          name: collection.name,
+          slug: collection.slug,
+          workspace_id: collection.workspace_id,
+          created_at: collection.created_at,
+          last_updated_at: collection.last_updated_at
+        }))
+      });
     }
   );
   server.tool(
@@ -2690,18 +2555,11 @@ function registerCollectionsTools(server, service) {
     COLLECTIONS_TOOL_SCHEMAS.createCollection,
     async (params) => {
       const result = await service.collections.createCollection(params);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully created collection "${params.name}"`,
-              id: result.id,
-              slug: result.slug
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully created collection "${params.name}"`,
+        id: result.id,
+        slug: result.slug
+      });
     }
   );
   server.tool(
@@ -2712,21 +2570,14 @@ function registerCollectionsTools(server, service) {
       const collection = await service.collections.getCollection(
         params.collection_id
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              id: collection.id,
-              name: collection.name,
-              slug: collection.slug,
-              workspace_id: collection.workspace_id,
-              created_at: collection.created_at,
-              last_updated_at: collection.last_updated_at
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        id: collection.id,
+        name: collection.name,
+        slug: collection.slug,
+        workspace_id: collection.workspace_id,
+        created_at: collection.created_at,
+        last_updated_at: collection.last_updated_at
+      });
     }
   );
   server.tool(
@@ -2738,17 +2589,10 @@ function registerCollectionsTools(server, service) {
         name: params.name,
         description: params.description
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully updated collection "${params.collection_id}"`,
-              success: true
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully updated collection "${params.collection_id}"`,
+        success: true
+      });
     }
   );
   server.tool(
@@ -2759,17 +2603,10 @@ function registerCollectionsTools(server, service) {
       const result = await service.collections.deleteCollection(
         params.collection_id
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully deleted collection "${params.collection_id}"`,
-              success: result.success
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully deleted collection "${params.collection_id}"`,
+        success: result.success
+      });
     }
   );
 }
@@ -2857,28 +2694,21 @@ function registerConfigsTools(server, service) {
         current_page: params.current_page,
         page_size: params.page_size
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total: configs.total,
-              configurations: (configs.data ?? []).map((config) => ({
-                id: config.id,
-                name: config.name,
-                slug: config.slug,
-                workspace_id: config.workspace_id,
-                status: config.status,
-                is_default: config.is_default,
-                created_at: config.created_at,
-                last_updated_at: config.last_updated_at,
-                owner_id: config.owner_id,
-                updated_by: config.updated_by
-              }))
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total: configs.total,
+        configurations: (configs.data ?? []).map((config) => ({
+          id: config.id,
+          name: config.name,
+          slug: config.slug,
+          workspace_id: config.workspace_id,
+          status: config.status,
+          is_default: config.is_default,
+          created_at: config.created_at,
+          last_updated_at: config.last_updated_at,
+          owner_id: config.owner_id,
+          updated_by: config.updated_by
+        }))
+      });
     }
   );
   server.tool(
@@ -2887,38 +2717,31 @@ function registerConfigsTools(server, service) {
     CONFIGS_TOOL_SCHEMAS.getConfig,
     async (params) => {
       const response = await service.configs.getConfig(params.slug);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              id: response.id,
-              slug: response.slug,
-              name: response.name,
-              status: response.status,
-              config: {
-                cache: response.config.cache && {
-                  mode: response.config.cache.mode,
-                  max_age: response.config.cache.max_age
-                },
-                retry: response.config.retry && {
-                  attempts: response.config.retry.attempts,
-                  on_status_codes: response.config.retry.on_status_codes
-                },
-                strategy: response.config.strategy && {
-                  mode: response.config.strategy.mode
-                },
-                targets: response.config.targets?.map(
-                  (target) => ({
-                    provider: target.provider,
-                    virtual_key: target.virtual_key
-                  })
-                )
-              }
+      return jsonResult({
+        id: response.id,
+        slug: response.slug,
+        name: response.name,
+        status: response.status,
+        config: {
+          cache: response.config.cache && {
+            mode: response.config.cache.mode,
+            max_age: response.config.cache.max_age
+          },
+          retry: response.config.retry && {
+            attempts: response.config.retry.attempts,
+            on_status_codes: response.config.retry.on_status_codes
+          },
+          strategy: response.config.strategy && {
+            mode: response.config.strategy.mode
+          },
+          targets: response.config.targets?.map(
+            (target) => ({
+              provider: target.provider,
+              virtual_key: target.virtual_key
             })
-          }
-        ]
-      };
+          )
+        }
+      });
     }
   );
   server.tool(
@@ -2943,18 +2766,11 @@ function registerConfigsTools(server, service) {
         config,
         workspace_id: params.workspace_id
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully created configuration "${params.name}"`,
-              id: result.id,
-              version_id: result.version_id
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully created configuration "${params.name}"`,
+        id: result.id,
+        version_id: result.version_id
+      });
     }
   );
   server.tool(
@@ -2979,19 +2795,12 @@ function registerConfigsTools(server, service) {
         params.slug,
         updateData
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully updated configuration "${params.slug}"`,
-              id: result.id,
-              slug: result.slug,
-              config: result.config
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully updated configuration "${params.slug}"`,
+        id: result.id,
+        slug: result.slug,
+        config: result.config
+      });
     }
   );
   server.tool(
@@ -3000,17 +2809,10 @@ function registerConfigsTools(server, service) {
     CONFIGS_TOOL_SCHEMAS.deleteConfig,
     async (params) => {
       const result = await service.configs.deleteConfig(params.slug);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully deleted configuration "${params.slug}"`,
-              success: result.success
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully deleted configuration "${params.slug}"`,
+        success: result.success
+      });
     }
   );
   server.tool(
@@ -3019,23 +2821,16 @@ function registerConfigsTools(server, service) {
     CONFIGS_TOOL_SCHEMAS.listConfigVersions,
     async (params) => {
       const result = await service.configs.listConfigVersions(params.slug);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total: result.total,
-              versions: (result.data ?? []).map((version) => ({
-                id: version.id,
-                version: version.version,
-                config: version.config,
-                created_at: version.created_at,
-                created_by: version.created_by
-              }))
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total: result.total,
+        versions: (result.data ?? []).map((version) => ({
+          id: version.id,
+          version: version.version,
+          config: version.config,
+          created_at: version.created_at,
+          created_by: version.created_by
+        }))
+      });
     }
   );
 }
@@ -3120,16 +2915,7 @@ function registerGuardrailsTools(server, service) {
     "Get the organisation-wide input and output guardrails that workspaces inherit by default. Use this before update_organisation_defaults or when auditing baseline enforcement; it does not include per-workspace exclusions, which are available from the directional exclusion list tools. Requires an organisation service API key with organisation_settings.read scope.",
     GUARDRAILS_TOOL_SCHEMAS.getOrganisationDefaults,
     GET_ORGANISATION_DEFAULTS_ANNOTATIONS,
-    async () => ({
-      content: [
-        {
-          type: "text",
-          text: JSON.stringify(
-            await service.guardrails.getOrganisationDefaults()
-          )
-        }
-      ]
-    })
+    async () => jsonResult(await service.guardrails.getOrganisationDefaults())
   );
   server.tool(
     "update_organisation_defaults",
@@ -3142,16 +2928,7 @@ function registerGuardrailsTools(server, service) {
       idempotentHint: true,
       openWorldHint: true
     },
-    async (params) => ({
-      content: [
-        {
-          type: "text",
-          text: JSON.stringify(
-            await service.guardrails.updateOrganisationDefaults(params)
-          )
-        }
-      ]
-    })
+    async (params) => jsonResult(await service.guardrails.updateOrganisationDefaults(params))
   );
   server.tool(
     "list_input_guardrail_workspace_exclusions",
@@ -3164,16 +2941,9 @@ function registerGuardrailsTools(server, service) {
       idempotentHint: true,
       openWorldHint: true
     },
-    async (params) => ({
-      content: [
-        {
-          type: "text",
-          text: JSON.stringify(
-            await service.guardrails.listWorkspaceExclusions("input", params)
-          )
-        }
-      ]
-    })
+    async (params) => jsonResult(
+      await service.guardrails.listWorkspaceExclusions("input", params)
+    )
   );
   server.tool(
     "update_input_guardrail_workspace_exclusions",
@@ -3186,16 +2956,9 @@ function registerGuardrailsTools(server, service) {
       idempotentHint: true,
       openWorldHint: true
     },
-    async (params) => ({
-      content: [
-        {
-          type: "text",
-          text: JSON.stringify(
-            await service.guardrails.updateWorkspaceExclusions("input", params)
-          )
-        }
-      ]
-    })
+    async (params) => jsonResult(
+      await service.guardrails.updateWorkspaceExclusions("input", params)
+    )
   );
   server.tool(
     "list_output_guardrail_workspace_exclusions",
@@ -3208,16 +2971,9 @@ function registerGuardrailsTools(server, service) {
       idempotentHint: true,
       openWorldHint: true
     },
-    async (params) => ({
-      content: [
-        {
-          type: "text",
-          text: JSON.stringify(
-            await service.guardrails.listWorkspaceExclusions("output", params)
-          )
-        }
-      ]
-    })
+    async (params) => jsonResult(
+      await service.guardrails.listWorkspaceExclusions("output", params)
+    )
   );
   server.tool(
     "update_output_guardrail_workspace_exclusions",
@@ -3230,19 +2986,9 @@ function registerGuardrailsTools(server, service) {
       idempotentHint: true,
       openWorldHint: true
     },
-    async (params) => ({
-      content: [
-        {
-          type: "text",
-          text: JSON.stringify(
-            await service.guardrails.updateWorkspaceExclusions(
-              "output",
-              params
-            )
-          )
-        }
-      ]
-    })
+    async (params) => jsonResult(
+      await service.guardrails.updateWorkspaceExclusions("output", params)
+    )
   );
   server.tool(
     "list_guardrails",
@@ -3250,28 +2996,21 @@ function registerGuardrailsTools(server, service) {
     GUARDRAILS_TOOL_SCHEMAS.listGuardrails,
     async (params) => {
       const result = await service.guardrails.listGuardrails(params);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total: result.total,
-              guardrails: result.data.map((guardrail) => ({
-                id: guardrail.id,
-                name: guardrail.name,
-                slug: guardrail.slug,
-                status: guardrail.status,
-                workspace_id: guardrail.workspace_id,
-                organisation_id: guardrail.organisation_id,
-                created_at: guardrail.created_at,
-                last_updated_at: guardrail.last_updated_at,
-                owner_id: guardrail.owner_id,
-                updated_by: guardrail.updated_by
-              }))
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total: result.total,
+        guardrails: result.data.map((guardrail) => ({
+          id: guardrail.id,
+          name: guardrail.name,
+          slug: guardrail.slug,
+          status: guardrail.status,
+          workspace_id: guardrail.workspace_id,
+          organisation_id: guardrail.organisation_id,
+          created_at: guardrail.created_at,
+          last_updated_at: guardrail.last_updated_at,
+          owner_id: guardrail.owner_id,
+          updated_by: guardrail.updated_by
+        }))
+      });
     }
   );
   server.tool(
@@ -3282,27 +3021,20 @@ function registerGuardrailsTools(server, service) {
       const guardrail = await service.guardrails.getGuardrail(
         params.guardrail_id
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              id: guardrail.id,
-              name: guardrail.name,
-              slug: guardrail.slug,
-              status: guardrail.status,
-              workspace_id: guardrail.workspace_id,
-              organisation_id: guardrail.organisation_id,
-              checks: guardrail.checks,
-              actions: guardrail.actions,
-              created_at: guardrail.created_at,
-              last_updated_at: guardrail.last_updated_at,
-              owner_id: guardrail.owner_id,
-              updated_by: guardrail.updated_by
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        id: guardrail.id,
+        name: guardrail.name,
+        slug: guardrail.slug,
+        status: guardrail.status,
+        workspace_id: guardrail.workspace_id,
+        organisation_id: guardrail.organisation_id,
+        checks: guardrail.checks,
+        actions: guardrail.actions,
+        created_at: guardrail.created_at,
+        last_updated_at: guardrail.last_updated_at,
+        owner_id: guardrail.owner_id,
+        updated_by: guardrail.updated_by
+      });
     }
   );
   server.tool(
@@ -3317,19 +3049,12 @@ function registerGuardrailsTools(server, service) {
         workspace_id: params.workspace_id,
         organisation_id: params.organisation_id
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully created guardrail "${params.name}"`,
-              id: result.id,
-              slug: result.slug,
-              version_id: result.version_id
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully created guardrail "${params.name}"`,
+        id: result.id,
+        slug: result.slug,
+        version_id: result.version_id
+      });
     }
   );
   server.tool(
@@ -3351,19 +3076,12 @@ function registerGuardrailsTools(server, service) {
         params.guardrail_id,
         updateData
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully updated guardrail "${params.guardrail_id}"`,
-              id: result.id,
-              slug: result.slug,
-              version_id: result.version_id
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully updated guardrail "${params.guardrail_id}"`,
+        id: result.id,
+        slug: result.slug,
+        version_id: result.version_id
+      });
     }
   );
   server.tool(
@@ -3374,17 +3092,10 @@ function registerGuardrailsTools(server, service) {
       const result = await service.guardrails.deleteGuardrail(
         params.guardrail_id
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully deleted guardrail "${params.guardrail_id}"`,
-              success: result.success
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully deleted guardrail "${params.guardrail_id}"`,
+        success: result.success
+      });
     }
   );
 }
@@ -3719,19 +3430,12 @@ function registerIntegrationsTools(server, service) {
       idempotentHint: true,
       openWorldHint: true
     },
-    async (params) => ({
-      content: [
-        {
-          type: "text",
-          text: JSON.stringify(
-            await service.integrations.getModelPricing(
-              params.provider,
-              params.model
-            )
-          )
-        }
-      ]
-    })
+    async (params) => jsonResult(
+      await service.integrations.getModelPricing(
+        params.provider,
+        params.model
+      )
+    )
   );
   server.tool(
     "list_integrations",
@@ -3744,27 +3448,20 @@ function registerIntegrationsTools(server, service) {
         workspace_id: params.workspace_id,
         type: params.type
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total: integrations.total,
-              integrations: integrations.data.map((integration) => ({
-                id: integration.id,
-                name: integration.name,
-                slug: integration.slug,
-                ai_provider_id: integration.ai_provider_id,
-                status: integration.status,
-                description: integration.description,
-                organisation_id: integration.organisation_id,
-                created_at: integration.created_at,
-                last_updated_at: integration.last_updated_at
-              }))
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total: integrations.total,
+        integrations: integrations.data.map((integration) => ({
+          id: integration.id,
+          name: integration.name,
+          slug: integration.slug,
+          ai_provider_id: integration.ai_provider_id,
+          status: integration.status,
+          description: integration.description,
+          organisation_id: integration.organisation_id,
+          created_at: integration.created_at,
+          last_updated_at: integration.last_updated_at
+        }))
+      });
     }
   );
   server.tool(
@@ -3792,18 +3489,11 @@ function registerIntegrationsTools(server, service) {
         ...params.secret_mappings !== void 0 ? { secret_mappings: params.secret_mappings } : {},
         ...params.pricing_adjustments !== void 0 ? { pricing_adjustments: params.pricing_adjustments } : {}
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully created integration "${params.name}"`,
-              id: result.id,
-              slug: result.slug
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully created integration "${params.name}"`,
+        id: result.id,
+        slug: result.slug
+      });
     }
   );
   server.tool(
@@ -3814,31 +3504,24 @@ function registerIntegrationsTools(server, service) {
       const integration = await service.integrations.getIntegration(
         params.slug
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              id: integration.id,
-              name: integration.name,
-              slug: integration.slug,
-              ai_provider_id: integration.ai_provider_id,
-              status: integration.status,
-              description: integration.description,
-              organisation_id: integration.organisation_id,
-              masked_key: integration.masked_key,
-              configurations: integration.configurations,
-              global_workspace_access_settings: integration.global_workspace_access_settings,
-              allow_all_models: integration.allow_all_models,
-              workspace_count: integration.workspace_count,
-              secret_mappings: integration.secret_mappings,
-              pricing_adjustments: integration.pricing_adjustments,
-              created_at: integration.created_at,
-              last_updated_at: integration.last_updated_at
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        id: integration.id,
+        name: integration.name,
+        slug: integration.slug,
+        ai_provider_id: integration.ai_provider_id,
+        status: integration.status,
+        description: integration.description,
+        organisation_id: integration.organisation_id,
+        masked_key: integration.masked_key,
+        configurations: integration.configurations,
+        global_workspace_access_settings: integration.global_workspace_access_settings,
+        allow_all_models: integration.allow_all_models,
+        workspace_count: integration.workspace_count,
+        secret_mappings: integration.secret_mappings,
+        pricing_adjustments: integration.pricing_adjustments,
+        created_at: integration.created_at,
+        last_updated_at: integration.last_updated_at
+      });
     }
   );
   server.tool(
@@ -3861,17 +3544,10 @@ function registerIntegrationsTools(server, service) {
         secret_mappings: params.secret_mappings,
         pricing_adjustments: params.pricing_adjustments
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully updated integration "${params.slug}"`,
-              success: result.success
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully updated integration "${params.slug}"`,
+        success: result.success
+      });
     }
   );
   server.tool(
@@ -3880,17 +3556,10 @@ function registerIntegrationsTools(server, service) {
     INTEGRATIONS_TOOL_SCHEMAS.deleteIntegration,
     async (params) => {
       const result = await service.integrations.deleteIntegration(params.slug);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully deleted integration "${params.slug}"`,
-              success: result.success
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully deleted integration "${params.slug}"`,
+        success: result.success
+      });
     }
   );
   server.tool(
@@ -3905,30 +3574,23 @@ function registerIntegrationsTools(server, service) {
           page_size: params.page_size
         }
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total: models.total,
-              integration_slug: params.slug,
-              models: models.data.map((model) => ({
-                id: model.id,
-                slug: model.slug ?? model.model_id,
-                name: model.name ?? model.model_name,
-                enabled: model.enabled,
-                is_custom: model.is_custom ?? model.custom,
-                is_finetune: model.is_finetune,
-                base_model_slug: model.base_model_slug,
-                configurations: model.configurations,
-                pricing_config: model.pricing_config,
-                created_at: model.created_at,
-                last_updated_at: model.last_updated_at
-              }))
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total: models.total,
+        integration_slug: params.slug,
+        models: models.data.map((model) => ({
+          id: model.id,
+          slug: model.slug ?? model.model_id,
+          name: model.name ?? model.model_name,
+          enabled: model.enabled,
+          is_custom: model.is_custom ?? model.custom,
+          is_finetune: model.is_finetune,
+          base_model_slug: model.base_model_slug,
+          configurations: model.configurations,
+          pricing_config: model.pricing_config,
+          created_at: model.created_at,
+          last_updated_at: model.last_updated_at
+        }))
+      });
     }
   );
   server.tool(
@@ -3950,18 +3612,11 @@ function registerIntegrationsTools(server, service) {
           allow_all_models: params.allow_all_models
         }
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully updated models for integration "${params.slug}"`,
-              success: result.success,
-              models_updated: params.models.length
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully updated models for integration "${params.slug}"`,
+        success: result.success,
+        models_updated: params.models.length
+      });
     }
   );
   server.tool(
@@ -3973,17 +3628,10 @@ function registerIntegrationsTools(server, service) {
         params.slug,
         params.model_slug
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully deleted model "${params.model_slug}" from integration "${params.slug}"`,
-              success: result.success
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully deleted model "${params.model_slug}" from integration "${params.slug}"`,
+        success: result.success
+      });
     }
   );
   server.tool(
@@ -3998,27 +3646,20 @@ function registerIntegrationsTools(server, service) {
           page_size: params.page_size
         }
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total: workspaces.total,
-              integration_slug: params.slug,
-              workspaces: workspaces.data.map((ws) => ({
-                id: ws.id,
-                workspace_id: ws.workspace_id ?? ws.id,
-                workspace_name: ws.workspace_name,
-                enabled: ws.enabled,
-                usage_limits: ws.usage_limits,
-                rate_limits: ws.rate_limits,
-                created_at: ws.created_at,
-                last_updated_at: ws.last_updated_at
-              }))
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total: workspaces.total,
+        integration_slug: params.slug,
+        workspaces: workspaces.data.map((ws) => ({
+          id: ws.id,
+          workspace_id: ws.workspace_id ?? ws.id,
+          workspace_name: ws.workspace_name,
+          enabled: ws.enabled,
+          usage_limits: ws.usage_limits,
+          rate_limits: ws.rate_limits,
+          created_at: ws.created_at,
+          last_updated_at: ws.last_updated_at
+        }))
+      });
     }
   );
   server.tool(
@@ -4082,18 +3723,11 @@ function registerIntegrationsTools(server, service) {
           default_provider_slug: params.default_provider_slug
         }
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully updated workspace access for integration "${params.slug}"`,
-              success: result.success,
-              workspaces_updated: params.workspaces.length
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully updated workspace access for integration "${params.slug}"`,
+        success: result.success,
+        workspaces_updated: params.workspaces.length
+      });
     }
   );
 }
@@ -4208,6 +3842,76 @@ var createApiKeySchema = z9.object(KEYS_TOOL_SCHEMAS.createApiKey).superRefine((
     });
   }
 });
+function formatKeyUsageLimits(limits) {
+  return limits ? {
+    credit_limit: limits.credit_limit,
+    alert_threshold: limits.alert_threshold,
+    periodic_reset: limits.periodic_reset
+  } : null;
+}
+function formatKeyRateLimits(limits) {
+  return limits?.map((limit) => ({
+    type: limit.type,
+    unit: limit.unit,
+    value: limit.value
+  })) ?? null;
+}
+function formatVirtualKey(key) {
+  return {
+    name: key.name,
+    slug: key.slug,
+    status: key.status,
+    note: key.note,
+    usage_limits: formatKeyUsageLimits(key.usage_limits),
+    rate_limits: formatKeyRateLimits(key.rate_limits),
+    reset_usage: key.reset_usage,
+    created_at: key.created_at,
+    model_config: key.model_config
+  };
+}
+function formatApiKeySummary(apiKey) {
+  return {
+    id: apiKey.id,
+    name: apiKey.name,
+    description: apiKey.description,
+    type: apiKey.type,
+    status: apiKey.status,
+    organisation_id: apiKey.organisation_id,
+    workspace_id: apiKey.workspace_id,
+    user_id: apiKey.user_id,
+    scopes: apiKey.scopes,
+    usage_limits: formatKeyUsageLimits(apiKey.usage_limits),
+    rate_limits: formatKeyRateLimits(apiKey.rate_limits),
+    defaults: apiKey.defaults,
+    alert_emails: apiKey.alert_emails,
+    expires_at: apiKey.expires_at,
+    created_at: apiKey.created_at,
+    last_updated_at: apiKey.last_updated_at,
+    creation_mode: apiKey.creation_mode
+  };
+}
+function formatApiKey(apiKey) {
+  return {
+    id: apiKey.id,
+    name: apiKey.name,
+    description: apiKey.description,
+    type: apiKey.type,
+    status: apiKey.status,
+    organisation_id: apiKey.organisation_id,
+    workspace_id: apiKey.workspace_id,
+    user_id: apiKey.user_id,
+    scopes: apiKey.scopes,
+    usage_limits: formatKeyUsageLimits(apiKey.usage_limits),
+    rate_limits: formatKeyRateLimits(apiKey.rate_limits),
+    defaults: apiKey.defaults,
+    alert_emails: apiKey.alert_emails,
+    expires_at: apiKey.expires_at,
+    reset_usage: apiKey.reset_usage,
+    created_at: apiKey.created_at,
+    last_updated_at: apiKey.last_updated_at,
+    creation_mode: apiKey.creation_mode
+  };
+}
 function registerKeysTools(server, service) {
   server.tool(
     "list_virtual_keys",
@@ -4218,35 +3922,10 @@ function registerKeysTools(server, service) {
         current_page: params.current_page,
         page_size: params.page_size
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total: virtualKeys.total,
-              virtual_keys: virtualKeys.data.map((key) => ({
-                name: key.name,
-                slug: key.slug,
-                status: key.status,
-                note: key.note,
-                usage_limits: key.usage_limits ? {
-                  credit_limit: key.usage_limits.credit_limit,
-                  alert_threshold: key.usage_limits.alert_threshold,
-                  periodic_reset: key.usage_limits.periodic_reset
-                } : null,
-                rate_limits: key.rate_limits?.map((limit) => ({
-                  type: limit.type,
-                  unit: limit.unit,
-                  value: limit.value
-                })) ?? null,
-                reset_usage: key.reset_usage,
-                created_at: key.created_at,
-                model_config: key.model_config
-              }))
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total: virtualKeys.total,
+        virtual_keys: virtualKeys.data.map(formatVirtualKey)
+      });
     }
   );
   server.tool(
@@ -4270,18 +3949,11 @@ function registerKeysTools(server, service) {
         rate_limits: buildRateLimitsRpm(params.rate_limit_rpm)
       });
       const slug = result.data?.slug ?? result.slug;
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully created virtual key "${params.name}"`,
-              success: result.success,
-              slug
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully created virtual key "${params.name}"`,
+        success: result.success,
+        slug
+      });
     }
   );
   server.tool(
@@ -4290,32 +3962,7 @@ function registerKeysTools(server, service) {
     KEYS_TOOL_SCHEMAS.getVirtualKey,
     async (params) => {
       const virtualKey = await service.keys.getVirtualKey(params.slug);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              name: virtualKey.name,
-              slug: virtualKey.slug,
-              status: virtualKey.status,
-              note: virtualKey.note,
-              usage_limits: virtualKey.usage_limits ? {
-                credit_limit: virtualKey.usage_limits.credit_limit,
-                alert_threshold: virtualKey.usage_limits.alert_threshold,
-                periodic_reset: virtualKey.usage_limits.periodic_reset
-              } : null,
-              rate_limits: virtualKey.rate_limits?.map((limit) => ({
-                type: limit.type,
-                unit: limit.unit,
-                value: limit.value
-              })) ?? null,
-              reset_usage: virtualKey.reset_usage,
-              created_at: virtualKey.created_at,
-              model_config: virtualKey.model_config
-            })
-          }
-        ]
-      };
+      return jsonResult(formatVirtualKey(virtualKey));
     }
   );
   server.tool(
@@ -4333,19 +3980,12 @@ function registerKeysTools(server, service) {
         }),
         rate_limits: buildRateLimitsRpm(params.rate_limit_rpm)
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully updated virtual key "${params.slug}"`,
-              name: result.name,
-              slug: result.slug,
-              status: result.status
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully updated virtual key "${params.slug}"`,
+        name: result.name,
+        slug: result.slug,
+        status: result.status
+      });
     }
   );
   server.tool(
@@ -4354,17 +3994,10 @@ function registerKeysTools(server, service) {
     KEYS_TOOL_SCHEMAS.deleteVirtualKey,
     async (params) => {
       const result = await service.keys.deleteVirtualKey(params.slug);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully deleted virtual key "${params.slug}"`,
-              success: result.success
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully deleted virtual key "${params.slug}"`,
+        success: result.success
+      });
     }
   );
   server.tool(
@@ -4399,18 +4032,11 @@ function registerKeysTools(server, service) {
           expires_at: validated.expires_at
         }
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully created API key "${validated.name}"`,
-              id: result.id,
-              key: result.key
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully created API key "${validated.name}"`,
+        id: result.id,
+        key: result.key
+      });
     }
   );
   server.tool(
@@ -4423,43 +4049,10 @@ function registerKeysTools(server, service) {
         current_page: params.current_page,
         workspace_id: params.workspace_id
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total: apiKeys.total,
-              api_keys: apiKeys.data.map((key) => ({
-                id: key.id,
-                name: key.name,
-                description: key.description,
-                type: key.type,
-                status: key.status,
-                organisation_id: key.organisation_id,
-                workspace_id: key.workspace_id,
-                user_id: key.user_id,
-                scopes: key.scopes,
-                usage_limits: key.usage_limits ? {
-                  credit_limit: key.usage_limits.credit_limit,
-                  alert_threshold: key.usage_limits.alert_threshold,
-                  periodic_reset: key.usage_limits.periodic_reset
-                } : null,
-                rate_limits: key.rate_limits?.map((limit) => ({
-                  type: limit.type,
-                  unit: limit.unit,
-                  value: limit.value
-                })) ?? null,
-                defaults: key.defaults,
-                alert_emails: key.alert_emails,
-                expires_at: key.expires_at,
-                created_at: key.created_at,
-                last_updated_at: key.last_updated_at,
-                creation_mode: key.creation_mode
-              }))
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total: apiKeys.total,
+        api_keys: apiKeys.data.map(formatApiKeySummary)
+      });
     }
   );
   server.tool(
@@ -4468,41 +4061,7 @@ function registerKeysTools(server, service) {
     KEYS_TOOL_SCHEMAS.getApiKey,
     async (params) => {
       const apiKey = await service.keys.getApiKey(params.id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              id: apiKey.id,
-              name: apiKey.name,
-              description: apiKey.description,
-              type: apiKey.type,
-              status: apiKey.status,
-              organisation_id: apiKey.organisation_id,
-              workspace_id: apiKey.workspace_id,
-              user_id: apiKey.user_id,
-              scopes: apiKey.scopes,
-              usage_limits: apiKey.usage_limits ? {
-                credit_limit: apiKey.usage_limits.credit_limit,
-                alert_threshold: apiKey.usage_limits.alert_threshold,
-                periodic_reset: apiKey.usage_limits.periodic_reset
-              } : null,
-              rate_limits: apiKey.rate_limits?.map((limit) => ({
-                type: limit.type,
-                unit: limit.unit,
-                value: limit.value
-              })) ?? null,
-              defaults: apiKey.defaults,
-              alert_emails: apiKey.alert_emails,
-              expires_at: apiKey.expires_at,
-              reset_usage: apiKey.reset_usage,
-              created_at: apiKey.created_at,
-              last_updated_at: apiKey.last_updated_at,
-              creation_mode: apiKey.creation_mode
-            })
-          }
-        ]
-      };
+      return jsonResult(formatApiKey(apiKey));
     }
   );
   server.tool(
@@ -4526,17 +4085,10 @@ function registerKeysTools(server, service) {
         alert_emails: params.alert_emails,
         expires_at: params.expires_at
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully updated API key "${params.id}"`,
-              success: result.success
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully updated API key "${params.id}"`,
+        success: result.success
+      });
     }
   );
   server.tool(
@@ -4545,17 +4097,10 @@ function registerKeysTools(server, service) {
     KEYS_TOOL_SCHEMAS.deleteApiKey,
     async (params) => {
       const result = await service.keys.deleteApiKey(params.id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully deleted API key "${params.id}"`,
-              success: result.success
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully deleted API key "${params.id}"`,
+        success: result.success
+      });
     }
   );
   server.tool(
@@ -4573,20 +4118,13 @@ function registerKeysTools(server, service) {
       const result = await service.keys.rotateApiKey(params.id, {
         key_transition_period_ms: params.key_transition_period_ms
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully rotated API key "${result.id}"`,
-              warning: "Copy this new key now; it is returned only once. Replace callers before key_transition_expires_at and never log either key.",
-              id: result.id,
-              key: result.key,
-              key_transition_expires_at: result.key_transition_expires_at
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully rotated API key "${result.id}"`,
+        warning: "Copy this new key now; it is returned only once. Replace callers before key_transition_expires_at and never log either key.",
+        id: result.id,
+        key: result.key,
+        key_transition_expires_at: result.key_transition_expires_at
+      });
     }
   );
 }
@@ -4649,17 +4187,10 @@ function registerLabelsTools(server, service) {
         description: params.description,
         color_code: params.color_code
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully created label "${params.name}"`,
-              id: result.id
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully created label "${params.name}"`,
+        id: result.id
+      });
     }
   );
   server.tool(
@@ -4668,26 +4199,19 @@ function registerLabelsTools(server, service) {
     LABELS_TOOL_SCHEMAS.listPromptLabels,
     async (params) => {
       const result = await service.labels.listLabels(params);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total: result.total,
-              labels: result.data.map((label) => ({
-                id: label.id,
-                name: label.name,
-                description: label.description,
-                color_code: label.color_code,
-                is_universal: label.is_universal,
-                status: label.status,
-                created_at: label.created_at,
-                last_updated_at: label.last_updated_at
-              }))
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total: result.total,
+        labels: result.data.map((label) => ({
+          id: label.id,
+          name: label.name,
+          description: label.description,
+          color_code: label.color_code,
+          is_universal: label.is_universal,
+          status: label.status,
+          created_at: label.created_at,
+          last_updated_at: label.last_updated_at
+        }))
+      });
     }
   );
   server.tool(
@@ -4699,25 +4223,18 @@ function registerLabelsTools(server, service) {
         organisation_id: params.organisation_id,
         workspace_id: params.workspace_id
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              id: label.id,
-              name: label.name,
-              description: label.description,
-              color_code: label.color_code,
-              organisation_id: label.organisation_id,
-              workspace_id: label.workspace_id,
-              is_universal: label.is_universal,
-              status: label.status,
-              created_at: label.created_at,
-              last_updated_at: label.last_updated_at
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        id: label.id,
+        name: label.name,
+        description: label.description,
+        color_code: label.color_code,
+        organisation_id: label.organisation_id,
+        workspace_id: label.workspace_id,
+        is_universal: label.is_universal,
+        status: label.status,
+        created_at: label.created_at,
+        last_updated_at: label.last_updated_at
+      });
     }
   );
   server.tool(
@@ -4727,17 +4244,10 @@ function registerLabelsTools(server, service) {
     async (params) => {
       const { label_id, ...updateData } = params;
       await service.labels.updateLabel(label_id, updateData);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully updated label "${label_id}"`,
-              success: true
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully updated label "${label_id}"`,
+        success: true
+      });
     }
   );
   server.tool(
@@ -4746,17 +4256,10 @@ function registerLabelsTools(server, service) {
     LABELS_TOOL_SCHEMAS.deletePromptLabel,
     async (params) => {
       await service.labels.deleteLabel(params.label_id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully deleted label "${params.label_id}"`,
-              success: true
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully deleted label "${params.label_id}"`,
+        success: true
+      });
     }
   );
 }
@@ -4894,17 +4397,10 @@ function registerLimitsTools(server, service) {
     LIMITS_TOOL_SCHEMAS.listRateLimits,
     async (params) => {
       const result = await service.limits.listRateLimits(params.workspace_id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total: result.total,
-              rate_limits: result.data.map(formatRateLimit)
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total: result.total,
+        rate_limits: result.data.map(formatRateLimit)
+      });
     }
   );
   server.tool(
@@ -4913,14 +4409,7 @@ function registerLimitsTools(server, service) {
     LIMITS_TOOL_SCHEMAS.getRateLimit,
     async (params) => {
       const result = await service.limits.getRateLimit(params.id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(formatRateLimit(result))
-          }
-        ]
-      };
+      return jsonResult(formatRateLimit(result));
     }
   );
   server.tool(
@@ -4938,17 +4427,10 @@ function registerLimitsTools(server, service) {
         workspace_id: params.workspace_id,
         organisation_id: params.organisation_id
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully created rate limit${params.name ? ` "${params.name}"` : ""}`,
-              rate_limit: formatRateLimit(result)
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully created rate limit${params.name ? ` "${params.name}"` : ""}`,
+        rate_limit: formatRateLimit(result)
+      });
     }
   );
   server.tool(
@@ -4961,17 +4443,10 @@ function registerLimitsTools(server, service) {
         unit: params.unit,
         value: params.value
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully updated rate limit "${params.id}"`,
-              rate_limit: formatRateLimit(result)
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully updated rate limit "${params.id}"`,
+        rate_limit: formatRateLimit(result)
+      });
     }
   );
   server.tool(
@@ -4980,17 +4455,10 @@ function registerLimitsTools(server, service) {
     LIMITS_TOOL_SCHEMAS.deleteRateLimit,
     async (params) => {
       await service.limits.deleteRateLimit(params.id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully deleted rate limit "${params.id}"`,
-              success: true
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully deleted rate limit "${params.id}"`,
+        success: true
+      });
     }
   );
   server.tool(
@@ -4999,17 +4467,10 @@ function registerLimitsTools(server, service) {
     LIMITS_TOOL_SCHEMAS.listUsageLimits,
     async (params) => {
       const result = await service.limits.listUsageLimits(params.workspace_id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total: result.total,
-              usage_limits: result.data.map(formatUsageLimit)
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total: result.total,
+        usage_limits: result.data.map(formatUsageLimit)
+      });
     }
   );
   server.tool(
@@ -5018,14 +4479,7 @@ function registerLimitsTools(server, service) {
     LIMITS_TOOL_SCHEMAS.getUsageLimit,
     async (params) => {
       const result = await service.limits.getUsageLimit(params.id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(formatUsageLimit(result))
-          }
-        ]
-      };
+      return jsonResult(formatUsageLimit(result));
     }
   );
   server.tool(
@@ -5044,17 +4498,10 @@ function registerLimitsTools(server, service) {
         workspace_id: params.workspace_id,
         organisation_id: params.organisation_id
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully created usage limit${params.name ? ` "${params.name}"` : ""}`,
-              usage_limit: formatUsageLimit(result)
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully created usage limit${params.name ? ` "${params.name}"` : ""}`,
+        usage_limit: formatUsageLimit(result)
+      });
     }
   );
   server.tool(
@@ -5069,17 +4516,10 @@ function registerLimitsTools(server, service) {
         periodic_reset: params.periodic_reset,
         reset_usage_for_value: params.reset_usage_for_value
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully updated usage limit "${params.id}"`,
-              usage_limit: formatUsageLimit(result)
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully updated usage limit "${params.id}"`,
+        usage_limit: formatUsageLimit(result)
+      });
     }
   );
   server.tool(
@@ -5088,17 +4528,10 @@ function registerLimitsTools(server, service) {
     LIMITS_TOOL_SCHEMAS.deleteUsageLimit,
     async (params) => {
       await service.limits.deleteUsageLimit(params.id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully deleted usage limit "${params.id}"`,
-              success: true
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully deleted usage limit "${params.id}"`,
+        success: true
+      });
     }
   );
   server.tool(
@@ -5109,17 +4542,10 @@ function registerLimitsTools(server, service) {
       const result = await service.limits.listUsageLimitEntities(
         params.limit_id
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total: result.total,
-              entities: result.data.map(formatUsageLimitEntity)
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total: result.total,
+        entities: result.data.map(formatUsageLimitEntity)
+      });
     }
   );
   server.tool(
@@ -5131,17 +4557,10 @@ function registerLimitsTools(server, service) {
         params.limit_id,
         params.entity_id
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully reset usage for entity "${params.entity_id}" on limit "${params.limit_id}"`,
-              success: true
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully reset usage for entity "${params.entity_id}" on limit "${params.limit_id}"`,
+        success: true
+      });
     }
   );
 }
@@ -5271,9 +4690,7 @@ function registerLoggingTools(server, service) {
         created_at: params.created_at,
         type: params.type
       });
-      return {
-        content: [{ type: "text", text: JSON.stringify(result) }]
-      };
+      return jsonResult(result);
     }
   );
   server.tool(
@@ -5291,9 +4708,7 @@ function registerLoggingTools(server, service) {
       const result = await service.logging.getLogExportFieldRestrictions({
         workspace_id: params.workspace_id
       });
-      return {
-        content: [{ type: "text", text: JSON.stringify(result) }]
-      };
+      return jsonResult(result);
     }
   );
   server.tool(
@@ -5327,17 +4742,10 @@ function registerLoggingTools(server, service) {
         }
       };
       const result = await service.logging.insertLog(entry);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: "Successfully inserted log entry",
-              success: result.success
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: "Successfully inserted log entry",
+        success: result.success
+      });
     }
   );
   server.tool(
@@ -5359,19 +4767,12 @@ function registerLoggingTools(server, service) {
         },
         requested_data: params.requested_fields
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: "Successfully created log export",
-              id: result.id,
-              total: result.total,
-              object: result.object
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: "Successfully created log export",
+        id: result.id,
+        total: result.total,
+        object: result.object
+      });
     }
   );
   server.tool(
@@ -5382,27 +4783,20 @@ function registerLoggingTools(server, service) {
       const result = await service.logging.listLogExports({
         workspace_id: params.workspace_id
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total: result.total,
-              exports: result.data.map((exp) => ({
-                id: exp.id,
-                status: exp.status,
-                description: exp.description,
-                filters: exp.filters,
-                requested_data: exp.requested_data,
-                workspace_id: exp.workspace_id,
-                created_at: exp.created_at,
-                last_updated_at: exp.last_updated_at,
-                created_by: exp.created_by
-              }))
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total: result.total,
+        exports: result.data.map((exp) => ({
+          id: exp.id,
+          status: exp.status,
+          description: exp.description,
+          filters: exp.filters,
+          requested_data: exp.requested_data,
+          workspace_id: exp.workspace_id,
+          created_at: exp.created_at,
+          last_updated_at: exp.last_updated_at,
+          created_by: exp.created_by
+        }))
+      });
     }
   );
   server.tool(
@@ -5411,25 +4805,18 @@ function registerLoggingTools(server, service) {
     LOGGING_TOOL_SCHEMAS.getLogExport,
     async (params) => {
       const result = await service.logging.getLogExport(params.export_id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              id: result.id,
-              status: result.status,
-              description: result.description,
-              filters: result.filters,
-              requested_data: result.requested_data,
-              organisation_id: result.organisation_id,
-              workspace_id: result.workspace_id,
-              created_at: result.created_at,
-              last_updated_at: result.last_updated_at,
-              created_by: result.created_by
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        id: result.id,
+        status: result.status,
+        description: result.description,
+        filters: result.filters,
+        requested_data: result.requested_data,
+        organisation_id: result.organisation_id,
+        workspace_id: result.workspace_id,
+        created_at: result.created_at,
+        last_updated_at: result.last_updated_at,
+        created_by: result.created_by
+      });
     }
   );
   server.tool(
@@ -5438,18 +4825,11 @@ function registerLoggingTools(server, service) {
     LOGGING_TOOL_SCHEMAS.startLogExport,
     async (params) => {
       const result = await service.logging.startLogExport(params.export_id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: result.message,
-              export_id: params.export_id,
-              status: "started"
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: result.message,
+        export_id: params.export_id,
+        status: "started"
+      });
     }
   );
   server.tool(
@@ -5458,18 +4838,11 @@ function registerLoggingTools(server, service) {
     LOGGING_TOOL_SCHEMAS.cancelLogExport,
     async (params) => {
       const result = await service.logging.cancelLogExport(params.export_id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: result.message,
-              export_id: params.export_id,
-              status: "cancelled"
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: result.message,
+        export_id: params.export_id,
+        status: "cancelled"
+      });
     }
   );
   server.tool(
@@ -5478,18 +4851,11 @@ function registerLoggingTools(server, service) {
     LOGGING_TOOL_SCHEMAS.downloadLogExport,
     async (params) => {
       const result = await service.logging.downloadLogExport(params.export_id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: "Download URL generated successfully",
-              export_id: params.export_id,
-              signed_url: result.signed_url
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: "Download URL generated successfully",
+        export_id: params.export_id,
+        signed_url: result.signed_url
+      });
     }
   );
   server.tool(
@@ -5513,19 +4879,12 @@ function registerLoggingTools(server, service) {
         params.export_id,
         updateData
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: "Successfully updated log export",
-              id: result.id,
-              total: result.total,
-              object: result.object
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: "Successfully updated log export",
+        id: result.id,
+        total: result.total,
+        object: result.object
+      });
     }
   );
 }
@@ -5677,18 +5036,11 @@ function registerMcpIntegrationsTools(server, service) {
     MCP_INTEGRATIONS_TOOL_SCHEMAS.listMcpIntegrations,
     async (params) => {
       const result = await service.mcpIntegrations.listMcpIntegrations(params);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total: result.total,
-              has_more: result.has_more,
-              integrations: result.data.map(formatMcpIntegration)
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total: result.total,
+        has_more: result.has_more,
+        integrations: result.data.map(formatMcpIntegration)
+      });
     }
   );
   server.tool(
@@ -5721,18 +5073,11 @@ function registerMcpIntegrationsTools(server, service) {
         ...rest,
         ...custom_headers ? { configurations: { custom_headers } } : {}
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully created MCP integration "${params.name}"`,
-              id: result.id,
-              slug: result.slug
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully created MCP integration "${params.name}"`,
+        id: result.id,
+        slug: result.slug
+      });
     }
   );
   server.tool(
@@ -5743,14 +5088,7 @@ function registerMcpIntegrationsTools(server, service) {
       const integration = await service.mcpIntegrations.getMcpIntegration(
         params.id
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(formatMcpIntegration(integration))
-          }
-        ]
-      };
+      return jsonResult(formatMcpIntegration(integration));
     }
   );
   server.tool(
@@ -5770,17 +5108,10 @@ function registerMcpIntegrationsTools(server, service) {
         ...rest,
         ...custom_headers ? { configurations: { custom_headers } } : {}
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully updated MCP integration "${id}"`,
-              success: true
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully updated MCP integration "${id}"`,
+        success: true
+      });
     }
   );
   server.tool(
@@ -5789,17 +5120,10 @@ function registerMcpIntegrationsTools(server, service) {
     MCP_INTEGRATIONS_TOOL_SCHEMAS.deleteMcpIntegration,
     async (params) => {
       await service.mcpIntegrations.deleteMcpIntegration(params.id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully deleted MCP integration "${params.id}"`,
-              success: true
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully deleted MCP integration "${params.id}"`,
+        success: true
+      });
     }
   );
   server.tool(
@@ -5810,14 +5134,7 @@ function registerMcpIntegrationsTools(server, service) {
       const metadata = await service.mcpIntegrations.getMcpIntegrationMetadata(
         params.id
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(formatMcpIntegrationMetadata(metadata))
-          }
-        ]
-      };
+      return jsonResult(formatMcpIntegrationMetadata(metadata));
     }
   );
   server.tool(
@@ -5826,17 +5143,10 @@ function registerMcpIntegrationsTools(server, service) {
     MCP_INTEGRATIONS_TOOL_SCHEMAS.listMcpIntegrationCapabilities,
     async (params) => {
       const result = await service.mcpIntegrations.listMcpIntegrationCapabilities(params.id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total: result.total,
-              capabilities: result.data
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total: result.total,
+        capabilities: result.data
+      });
     }
   );
   server.tool(
@@ -5856,17 +5166,10 @@ function registerMcpIntegrationsTools(server, service) {
           capabilities: params.capabilities
         }
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully updated capabilities for MCP integration "${params.id}"`,
-              success: true
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully updated capabilities for MCP integration "${params.id}"`,
+        success: true
+      });
     }
   );
   server.tool(
@@ -5877,18 +5180,11 @@ function registerMcpIntegrationsTools(server, service) {
       const result = await service.mcpIntegrations.listMcpIntegrationWorkspaces(
         params.id
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              global_workspace_access: result.global_workspace_access,
-              workspace_count: result.workspaces.length,
-              workspaces: result.workspaces.map(formatMcpIntegrationWorkspace)
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        global_workspace_access: result.global_workspace_access,
+        workspace_count: result.workspaces.length,
+        workspaces: result.workspaces.map(formatMcpIntegrationWorkspace)
+      });
     }
   );
   server.tool(
@@ -5905,30 +5201,16 @@ function registerMcpIntegrationsTools(server, service) {
       await service.mcpIntegrations.updateMcpIntegrationWorkspaces(params.id, {
         workspaces: params.workspaces
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully updated workspace access for MCP integration "${params.id}"`,
-              success: true
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully updated workspace access for MCP integration "${params.id}"`,
+        success: true
+      });
     }
   );
 }
 
 // src/tools/mcp-servers.tools.ts
 import { z as z14 } from "zod";
-
-// src/tools/utils.ts
-function formatFullName(firstName, lastName) {
-  return [firstName, lastName].filter(Boolean).join(" ").trim();
-}
-
-// src/tools/mcp-servers.tools.ts
 var MCP_SERVERS_TOOL_SCHEMAS = {
   listMcpServers: {
     current_page: z14.coerce.number().int().positive().optional().describe("Page number for pagination"),
@@ -6057,18 +5339,11 @@ function registerMcpServersTools(server, service) {
           page_size: params.page_size
         }
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total: result.total,
-              has_more: result.has_more,
-              connections: result.data
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total: result.total,
+        has_more: result.has_more,
+        connections: result.data
+      });
     }
   );
   server.tool(
@@ -6090,17 +5365,10 @@ function registerMcpServersTools(server, service) {
           workspace_id: params.workspace_id
         }
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Disconnected MCP server connection for "${params.id}"`,
-              ...result
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Disconnected MCP server connection for "${params.id}"`,
+        ...result
+      });
     }
   );
   server.tool(
@@ -6109,17 +5377,10 @@ function registerMcpServersTools(server, service) {
     MCP_SERVERS_TOOL_SCHEMAS.listMcpServers,
     async (params) => {
       const result = await service.mcpServers.listMcpServers(params);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total: result.total,
-              servers: result.data.map(formatMcpServer)
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total: result.total,
+        servers: result.data.map(formatMcpServer)
+      });
     }
   );
   server.tool(
@@ -6128,18 +5389,11 @@ function registerMcpServersTools(server, service) {
     MCP_SERVERS_TOOL_SCHEMAS.createMcpServer,
     async (params) => {
       const result = await service.mcpServers.createMcpServer(params);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully created MCP server "${params.name}"`,
-              id: result.id,
-              slug: result.slug
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully created MCP server "${params.name}"`,
+        id: result.id,
+        slug: result.slug
+      });
     }
   );
   server.tool(
@@ -6148,14 +5402,7 @@ function registerMcpServersTools(server, service) {
     MCP_SERVERS_TOOL_SCHEMAS.getMcpServer,
     async (params) => {
       const mcpServer = await service.mcpServers.getMcpServer(params.id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(formatMcpServer(mcpServer))
-          }
-        ]
-      };
+      return jsonResult(formatMcpServer(mcpServer));
     }
   );
   server.tool(
@@ -6164,18 +5411,11 @@ function registerMcpServersTools(server, service) {
     MCP_SERVERS_TOOL_SCHEMAS.updateMcpServer,
     async (params) => {
       const { id, ...data } = params;
-      await service.mcpServers.updateMcpServer(id, data);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully updated MCP server "${id}"`,
-              success: true
-            })
-          }
-        ]
-      };
+      await service.mcpServers.updateMcpServer(id, data);
+      return jsonResult({
+        message: `Successfully updated MCP server "${id}"`,
+        success: true
+      });
     }
   );
   server.tool(
@@ -6184,17 +5424,10 @@ function registerMcpServersTools(server, service) {
     MCP_SERVERS_TOOL_SCHEMAS.deleteMcpServer,
     async (params) => {
       await service.mcpServers.deleteMcpServer(params.id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully deleted MCP server "${params.id}"`,
-              success: true
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully deleted MCP server "${params.id}"`,
+        success: true
+      });
     }
   );
   server.tool(
@@ -6203,14 +5436,7 @@ function registerMcpServersTools(server, service) {
     MCP_SERVERS_TOOL_SCHEMAS.testMcpServer,
     async (params) => {
       const result = await service.mcpServers.testMcpServer(params.id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(formatMcpServerTest(result))
-          }
-        ]
-      };
+      return jsonResult(formatMcpServerTest(result));
     }
   );
   server.tool(
@@ -6225,18 +5451,11 @@ function registerMcpServersTools(server, service) {
           page_size: params.page_size
         }
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total: result.total,
-              has_more: result.has_more,
-              capabilities: result.data
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total: result.total,
+        has_more: result.has_more,
+        capabilities: result.data
+      });
     }
   );
   server.tool(
@@ -6247,17 +5466,10 @@ function registerMcpServersTools(server, service) {
       await service.mcpServers.updateMcpServerCapabilities(params.id, {
         capabilities: params.capabilities
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully updated capabilities for MCP server "${params.id}"`,
-              success: true
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully updated capabilities for MCP server "${params.id}"`,
+        success: true
+      });
     }
   );
   server.tool(
@@ -6272,19 +5484,12 @@ function registerMcpServersTools(server, service) {
           page_size: params.page_size
         }
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              default_user_access: result.default_user_access,
-              total: result.total,
-              has_more: result.has_more,
-              users: result.data.map(formatMcpServerUserAccess)
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        default_user_access: result.default_user_access,
+        total: result.total,
+        has_more: result.has_more,
+        users: result.data.map(formatMcpServerUserAccess)
+      });
     }
   );
   server.tool(
@@ -6295,17 +5500,10 @@ function registerMcpServersTools(server, service) {
       await service.mcpServers.updateMcpServerUserAccess(params.id, {
         user_access: params.users
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully updated user access for MCP server "${params.id}"`,
-              success: true
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully updated user access for MCP server "${params.id}"`,
+        success: true
+      });
     }
   );
 }
@@ -6359,19 +5557,12 @@ function registerPartialsTools(server, service) {
         workspace_id: params.workspace_id,
         version_description: params.version_description
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully created prompt partial "${params.name}"`,
-              id: result.id,
-              slug: result.slug,
-              version_id: result.version_id
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully created prompt partial "${params.name}"`,
+        id: result.id,
+        slug: result.slug,
+        version_id: result.version_id
+      });
     }
   );
   server.tool(
@@ -6380,25 +5571,18 @@ function registerPartialsTools(server, service) {
     PARTIALS_TOOL_SCHEMAS.listPromptPartials,
     async (params) => {
       const partials = await service.partials.listPromptPartials(params);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total: partials.length,
-              partials: partials.map((p) => ({
-                id: p.id,
-                slug: p.slug,
-                name: p.name,
-                collection_id: p.collection_id,
-                status: p.status,
-                created_at: p.created_at,
-                last_updated_at: p.last_updated_at
-              }))
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total: partials.length,
+        partials: partials.map((p) => ({
+          id: p.id,
+          slug: p.slug,
+          name: p.name,
+          collection_id: p.collection_id,
+          status: p.status,
+          created_at: p.created_at,
+          last_updated_at: p.last_updated_at
+        }))
+      });
     }
   );
   server.tool(
@@ -6409,26 +5593,19 @@ function registerPartialsTools(server, service) {
       const partial = await service.partials.getPromptPartial(
         params.prompt_partial_id
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              id: partial.id,
-              slug: partial.slug,
-              name: partial.name,
-              collection_id: partial.collection_id,
-              string: partial.string,
-              version: partial.version,
-              version_description: partial.version_description,
-              prompt_partial_version_id: partial.prompt_partial_version_id,
-              status: partial.status,
-              created_at: partial.created_at,
-              last_updated_at: partial.last_updated_at
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        id: partial.id,
+        slug: partial.slug,
+        name: partial.name,
+        collection_id: partial.collection_id,
+        string: partial.string,
+        version: partial.version,
+        version_description: partial.version_description,
+        prompt_partial_version_id: partial.prompt_partial_version_id,
+        status: partial.status,
+        created_at: partial.created_at,
+        last_updated_at: partial.last_updated_at
+      });
     }
   );
   server.tool(
@@ -6441,17 +5618,10 @@ function registerPartialsTools(server, service) {
         prompt_partial_id,
         updateData
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully updated prompt partial "${prompt_partial_id}"`,
-              prompt_partial_version_id: result.prompt_partial_version_id
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully updated prompt partial "${prompt_partial_id}"`,
+        prompt_partial_version_id: result.prompt_partial_version_id
+      });
     }
   );
   server.tool(
@@ -6460,17 +5630,10 @@ function registerPartialsTools(server, service) {
     PARTIALS_TOOL_SCHEMAS.deletePromptPartial,
     async (params) => {
       await service.partials.deletePromptPartial(params.prompt_partial_id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully deleted prompt partial "${params.prompt_partial_id}"`,
-              success: true
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully deleted prompt partial "${params.prompt_partial_id}"`,
+        success: true
+      });
     }
   );
   server.tool(
@@ -6481,27 +5644,20 @@ function registerPartialsTools(server, service) {
       const versions = await service.partials.listPartialVersions(
         params.prompt_partial_id
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              prompt_partial_id: params.prompt_partial_id,
-              total_versions: versions.length,
-              versions: versions.map((v) => ({
-                prompt_partial_id: v.prompt_partial_id,
-                prompt_partial_version_id: v.prompt_partial_version_id,
-                slug: v.slug,
-                version: v.version,
-                description: v.description,
-                status: v.prompt_version_status,
-                created_at: v.created_at,
-                content_preview: v.string.length > 200 ? `${v.string.substring(0, 200)}...` : v.string
-              }))
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        prompt_partial_id: params.prompt_partial_id,
+        total_versions: versions.length,
+        versions: versions.map((v) => ({
+          prompt_partial_id: v.prompt_partial_id,
+          prompt_partial_version_id: v.prompt_partial_version_id,
+          slug: v.slug,
+          version: v.version,
+          description: v.description,
+          status: v.prompt_version_status,
+          created_at: v.created_at,
+          content_preview: v.string.length > 200 ? `${v.string.substring(0, 200)}...` : v.string
+        }))
+      });
     }
   );
   server.tool(
@@ -6512,19 +5668,12 @@ function registerPartialsTools(server, service) {
       await service.partials.publishPartial(params.prompt_partial_id, {
         version: params.version
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully published version ${params.version} as default for partial "${params.prompt_partial_id}"`,
-              prompt_partial_id: params.prompt_partial_id,
-              published_version: params.version,
-              success: true
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully published version ${params.version} as default for partial "${params.prompt_partial_id}"`,
+        prompt_partial_id: params.prompt_partial_id,
+        published_version: params.version,
+        success: true
+      });
     }
   );
 }
@@ -6854,29 +6003,18 @@ function registerPromptsTools(server, service) {
         };
       }
       if (params.dry_run) {
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify(
-                {
-                  dry_run: true,
-                  action: "create",
-                  message: `Would create prompt "${params.name}" in collection ${params.collection_id}`,
-                  prompt_preview: {
-                    name: params.name,
-                    collection_id: params.collection_id,
-                    model: params.model,
-                    template_length: templateString.length,
-                    parameter_count: Object.keys(params.parameters ?? {}).length
-                  }
-                },
-                null,
-                2
-              )
-            }
-          ]
-        };
+        return jsonResult({
+          dry_run: true,
+          action: "create",
+          message: `Would create prompt "${params.name}" in collection ${params.collection_id}`,
+          prompt_preview: {
+            name: params.name,
+            collection_id: params.collection_id,
+            model: params.model,
+            template_length: templateString.length,
+            parameter_count: Object.keys(params.parameters ?? {}).length
+          }
+        });
       }
       const result = await service.prompts.createPrompt({
         name: params.name,
@@ -6893,19 +6031,12 @@ function registerPromptsTools(server, service) {
         ...params.tools !== void 0 ? { tools: params.tools } : {},
         ...params.tool_choice !== void 0 ? { tool_choice: toPromptToolChoice(params.tool_choice) } : {}
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully created prompt "${params.name}"`,
-              id: result.id,
-              slug: result.slug,
-              version_id: result.version_id
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully created prompt "${params.name}"`,
+        id: result.id,
+        slug: result.slug,
+        version_id: result.version_id
+      });
     }
   );
   server.tool(
@@ -6914,14 +6045,7 @@ function registerPromptsTools(server, service) {
     PROMPTS_TOOL_SCHEMAS.listPrompts,
     async (params) => {
       const prompts = await service.prompts.listPrompts(params);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(formatPromptListResponse(prompts, params))
-          }
-        ]
-      };
+      return jsonResult(formatPromptListResponse(prompts, params));
     }
   );
   server.tool(
@@ -6946,40 +6070,33 @@ function registerPromptsTools(server, service) {
           }
         }
       }
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              id: prompt.id,
-              name: prompt.name,
-              slug: prompt.slug,
-              collection_id: prompt.collection_id,
-              created_at: prompt.created_at,
-              last_updated_at: prompt.last_updated_at,
-              current_version: prompt.current_version ? {
-                id: prompt.current_version.id,
-                version_number: prompt.current_version.version_number,
-                description: prompt.current_version.version_description,
-                model: prompt.current_version.model,
-                template_format: templateFormat,
-                template: templateString,
-                parameters: prompt.current_version.parameters,
-                metadata: prompt.current_version.template_metadata,
-                has_tools: !!prompt.current_version.tools?.length,
-                has_functions: !!prompt.current_version.functions?.length
-              } : null,
-              version_count: (prompt.versions || []).length,
-              versions: (prompt.versions || []).map((v) => ({
-                id: v.id,
-                version_number: v.version_number,
-                description: v.version_description,
-                created_at: v.created_at
-              }))
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        id: prompt.id,
+        name: prompt.name,
+        slug: prompt.slug,
+        collection_id: prompt.collection_id,
+        created_at: prompt.created_at,
+        last_updated_at: prompt.last_updated_at,
+        current_version: prompt.current_version ? {
+          id: prompt.current_version.id,
+          version_number: prompt.current_version.version_number,
+          description: prompt.current_version.version_description,
+          model: prompt.current_version.model,
+          template_format: templateFormat,
+          template: templateString,
+          parameters: prompt.current_version.parameters,
+          metadata: prompt.current_version.template_metadata,
+          has_tools: !!prompt.current_version.tools?.length,
+          has_functions: !!prompt.current_version.functions?.length
+        } : null,
+        version_count: (prompt.versions || []).length,
+        versions: (prompt.versions || []).map((v) => ({
+          id: v.id,
+          version_number: v.version_number,
+          description: v.version_description,
+          created_at: v.created_at
+        }))
+      });
     }
   );
   server.tool(
@@ -6994,26 +6111,15 @@ function registerPromptsTools(server, service) {
       });
       if (dry_run) {
         const current = await service.prompts.getPrompt(prompt_id);
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify(
-                {
-                  dry_run: true,
-                  action: "update",
-                  message: `Would update prompt "${current.name}"`,
-                  current_version: current.current_version?.version_number ?? null,
-                  changes: Object.keys(updateData).filter(
-                    (k) => updateData[k] !== void 0
-                  )
-                },
-                null,
-                2
-              )
-            }
-          ]
-        };
+        return jsonResult({
+          dry_run: true,
+          action: "update",
+          message: `Would update prompt "${current.name}"`,
+          current_version: current.current_version?.version_number ?? null,
+          changes: Object.keys(updateData).filter(
+            (k) => updateData[k] !== void 0
+          )
+        });
       }
       const result = await service.prompts.updatePrompt(prompt_id, {
         ...updateData.name !== void 0 ? { name: updateData.name } : {},
@@ -7028,19 +6134,12 @@ function registerPromptsTools(server, service) {
         ...updateData.tools !== void 0 ? { tools: updateData.tools } : {},
         ...updateData.tool_choice !== void 0 ? { tool_choice: toPromptToolChoice(updateData.tool_choice) } : {}
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: "Successfully updated prompt",
-              id: result.id,
-              slug: result.slug,
-              new_version_id: result.prompt_version_id
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: "Successfully updated prompt",
+        id: result.id,
+        slug: result.slug,
+        new_version_id: result.prompt_version_id
+      });
     }
   );
   server.tool(
@@ -7049,17 +6148,10 @@ function registerPromptsTools(server, service) {
     PROMPTS_TOOL_SCHEMAS.deletePrompt,
     async (params) => {
       await service.prompts.deletePrompt(params.prompt_id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully deleted prompt "${params.prompt_id}"`,
-              success: true
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully deleted prompt "${params.prompt_id}"`,
+        success: true
+      });
     }
   );
   server.tool(
@@ -7070,19 +6162,12 @@ function registerPromptsTools(server, service) {
       await service.prompts.publishPrompt(params.prompt_id, {
         version: params.version
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully published version ${params.version} of prompt "${params.prompt_id}"`,
-              prompt_id: params.prompt_id,
-              published_version: params.version,
-              success: true
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully published version ${params.version} of prompt "${params.prompt_id}"`,
+        prompt_id: params.prompt_id,
+        published_version: params.version,
+        success: true
+      });
     }
   );
   server.tool(
@@ -7093,30 +6178,23 @@ function registerPromptsTools(server, service) {
       const versions = await service.prompts.listPromptVersions(
         params.prompt_id
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              prompt_id: params.prompt_id,
-              total_versions: versions.length,
-              versions: versions.map((v) => ({
-                id: v.id,
-                version_number: v.prompt_version,
-                description: v.prompt_description,
-                status: v.status,
-                label_id: v.label_id,
-                created_at: v.created_at,
-                template_preview: (() => {
-                  const tmpl = v.prompt_template;
-                  const str = typeof tmpl === "string" ? tmpl : typeof tmpl === "object" && tmpl !== null && "string" in tmpl ? tmpl.string : JSON.stringify(tmpl);
-                  return str.substring(0, 200) + (str.length > 200 ? "..." : "");
-                })()
-              }))
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        prompt_id: params.prompt_id,
+        total_versions: versions.length,
+        versions: versions.map((v) => ({
+          id: v.id,
+          version_number: v.prompt_version,
+          description: v.prompt_description,
+          status: v.status,
+          label_id: v.label_id,
+          created_at: v.created_at,
+          template_preview: (() => {
+            const tmpl = v.prompt_template;
+            const str = typeof tmpl === "string" ? tmpl : typeof tmpl === "object" && tmpl !== null && "string" in tmpl ? tmpl.string : JSON.stringify(tmpl);
+            return str.substring(0, 200) + (str.length > 200 ? "..." : "");
+          })()
+        }))
+      });
     }
   );
   server.tool(
@@ -7128,23 +6206,16 @@ function registerPromptsTools(server, service) {
         variables: params.variables,
         hyperparameters: params.hyperparameters
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              success: result.success,
-              rendered_messages: result.data.messages,
-              model: result.data.model,
-              hyperparameters: {
-                max_tokens: result.data.max_tokens,
-                temperature: result.data.temperature,
-                top_p: result.data.top_p
-              }
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        success: result.success,
+        rendered_messages: result.data.messages,
+        model: result.data.model,
+        hyperparameters: {
+          max_tokens: result.data.max_tokens,
+          temperature: result.data.temperature,
+          top_p: result.data.top_p
+        }
+      });
     }
   );
   server.tool(
@@ -7162,24 +6233,17 @@ function registerPromptsTools(server, service) {
         }
       );
       const choice = result.choices?.[0];
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              id: result.id,
-              model: result.model,
-              response: choice?.message?.content ?? null,
-              finish_reason: choice?.finish_reason ?? null,
-              usage: result.usage ? {
-                prompt_tokens: result.usage.prompt_tokens,
-                completion_tokens: result.usage.completion_tokens,
-                total_tokens: result.usage.total_tokens
-              } : null
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        id: result.id,
+        model: result.model,
+        response: choice?.message?.content ?? null,
+        finish_reason: choice?.finish_reason ?? null,
+        usage: result.usage ? {
+          prompt_tokens: result.usage.prompt_tokens,
+          completion_tokens: result.usage.completion_tokens,
+          total_tokens: result.usage.total_tokens
+        } : null
+      });
     }
   );
   server.tool(
@@ -7221,21 +6285,14 @@ function registerPromptsTools(server, service) {
         ...params.tool_choice !== void 0 ? { tool_choice: toPromptToolChoice(params.tool_choice) } : {},
         ...params.dry_run !== void 0 ? { dry_run: params.dry_run } : {}
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              action: result.action,
-              dry_run: result.dry_run,
-              message: result.message,
-              prompt_id: result.prompt_id ?? void 0,
-              slug: result.slug ?? void 0,
-              version_id: result.version_id ?? void 0
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        action: result.action,
+        dry_run: result.dry_run,
+        message: result.message,
+        prompt_id: result.prompt_id ?? void 0,
+        slug: result.slug ?? void 0,
+        version_id: result.version_id ?? void 0
+      });
     }
   );
   server.tool(
@@ -7250,26 +6307,19 @@ function registerPromptsTools(server, service) {
         target_env: params.target_env,
         virtual_key: params.virtual_key
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully promoted prompt to ${params.target_env}`,
-              source: {
-                prompt_id: result.source_prompt_id,
-                version_id: result.source_version_id
-              },
-              target: {
-                prompt_id: result.target_prompt_id,
-                version_id: result.target_version_id,
-                action: result.action
-              },
-              promoted_at: result.promoted_at
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully promoted prompt to ${params.target_env}`,
+        source: {
+          prompt_id: result.source_prompt_id,
+          version_id: result.source_version_id
+        },
+        target: {
+          prompt_id: result.target_prompt_id,
+          version_id: result.target_version_id,
+          action: result.action
+        },
+        promoted_at: result.promoted_at
+      });
     }
   );
   server.tool(
@@ -7278,19 +6328,12 @@ function registerPromptsTools(server, service) {
     PROMPTS_TOOL_SCHEMAS.validateCompletionMetadata,
     async (params) => {
       const result = service.prompts.validateBillingMetadata(params);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              valid: result.valid,
-              errors: result.errors,
-              warnings: result.warnings,
-              metadata: params
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        valid: result.valid,
+        errors: result.errors,
+        warnings: result.warnings,
+        metadata: params
+      });
     }
   );
   server.tool(
@@ -7302,14 +6345,7 @@ function registerPromptsTools(server, service) {
         params.prompt_id,
         params.version_id
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(formatPromptVersion(version))
-          }
-        ]
-      };
+      return jsonResult(formatPromptVersion(version));
     }
   );
   server.tool(
@@ -7324,17 +6360,10 @@ function registerPromptsTools(server, service) {
           label_id: params.label_id
         }
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully updated version "${params.version_id}" of prompt "${params.prompt_id}"`,
-              success: true
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully updated version "${params.version_id}" of prompt "${params.prompt_id}"`,
+        success: true
+      });
     }
   );
 }
@@ -7415,36 +6444,29 @@ function registerProvidersTools(server, service) {
         page_size: params.page_size,
         workspace_id: params.workspace_id
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total: providers.total,
-              providers: providers.data.map((provider) => ({
-                name: provider.name,
-                slug: provider.slug,
-                integration_id: provider.integration_id,
-                status: provider.status,
-                note: provider.note,
-                usage_limits: provider.usage_limits ? {
-                  credit_limit: provider.usage_limits.credit_limit,
-                  alert_threshold: provider.usage_limits.alert_threshold,
-                  periodic_reset: provider.usage_limits.periodic_reset
-                } : null,
-                rate_limits: provider.rate_limits?.map((limit) => ({
-                  type: limit.type,
-                  unit: limit.unit,
-                  value: limit.value
-                })) ?? null,
-                reset_usage: provider.reset_usage,
-                expires_at: provider.expires_at,
-                created_at: provider.created_at
-              }))
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total: providers.total,
+        providers: providers.data.map((provider) => ({
+          name: provider.name,
+          slug: provider.slug,
+          integration_id: provider.integration_id,
+          status: provider.status,
+          note: provider.note,
+          usage_limits: provider.usage_limits ? {
+            credit_limit: provider.usage_limits.credit_limit,
+            alert_threshold: provider.usage_limits.alert_threshold,
+            periodic_reset: provider.usage_limits.periodic_reset
+          } : null,
+          rate_limits: provider.rate_limits?.map((limit) => ({
+            type: limit.type,
+            unit: limit.unit,
+            value: limit.value
+          })) ?? null,
+          reset_usage: provider.reset_usage,
+          expires_at: provider.expires_at,
+          created_at: provider.created_at
+        }))
+      });
     }
   );
   server.tool(
@@ -7470,18 +6492,11 @@ function registerProvidersTools(server, service) {
         }) : void 0,
         expires_at: params.expires_at
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully created provider "${params.name}"`,
-              id: result.id,
-              slug: result.slug
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully created provider "${params.name}"`,
+        id: result.id,
+        slug: result.slug
+      });
     }
   );
   server.tool(
@@ -7493,33 +6508,26 @@ function registerProvidersTools(server, service) {
         params.slug,
         params.workspace_id
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              name: provider.name,
-              slug: provider.slug,
-              integration_id: provider.integration_id,
-              status: provider.status,
-              note: provider.note,
-              usage_limits: provider.usage_limits ? {
-                credit_limit: provider.usage_limits.credit_limit,
-                alert_threshold: provider.usage_limits.alert_threshold,
-                periodic_reset: provider.usage_limits.periodic_reset
-              } : null,
-              rate_limits: provider.rate_limits?.map((limit) => ({
-                type: limit.type,
-                unit: limit.unit,
-                value: limit.value
-              })) ?? null,
-              reset_usage: provider.reset_usage,
-              expires_at: provider.expires_at,
-              created_at: provider.created_at
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        name: provider.name,
+        slug: provider.slug,
+        integration_id: provider.integration_id,
+        status: provider.status,
+        note: provider.note,
+        usage_limits: provider.usage_limits ? {
+          credit_limit: provider.usage_limits.credit_limit,
+          alert_threshold: provider.usage_limits.alert_threshold,
+          periodic_reset: provider.usage_limits.periodic_reset
+        } : null,
+        rate_limits: provider.rate_limits?.map((limit) => ({
+          type: limit.type,
+          unit: limit.unit,
+          value: limit.value
+        })) ?? null,
+        reset_usage: provider.reset_usage,
+        expires_at: provider.expires_at,
+        created_at: provider.created_at
+      });
     }
   );
   server.tool(
@@ -7547,18 +6555,11 @@ function registerProvidersTools(server, service) {
         },
         params.workspace_id
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully updated provider "${params.slug}"`,
-              id: result.id,
-              slug: result.slug
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully updated provider "${params.slug}"`,
+        id: result.id,
+        slug: result.slug
+      });
     }
   );
   server.tool(
@@ -7567,17 +6568,10 @@ function registerProvidersTools(server, service) {
     PROVIDERS_TOOL_SCHEMAS.deleteProvider,
     async (params) => {
       await service.providers.deleteProvider(params.slug, params.workspace_id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully deleted provider "${params.slug}"`,
-              success: true
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully deleted provider "${params.slug}"`,
+        success: true
+      });
     }
   );
 }
@@ -7843,18 +6837,11 @@ function registerSecretReferencesTools(server, service) {
       validateWorkspaceAccess(params);
       validateManagerAuth(params.manager_type, params.auth_config);
       const result = await service.secretReferences.createSecretReference(params);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully created Secret Reference "${result.slug}"`,
-              id: result.id,
-              slug: result.slug
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully created Secret Reference "${result.slug}"`,
+        id: result.id,
+        slug: result.slug
+      });
     }
   );
   server.tool(
@@ -7873,25 +6860,18 @@ function registerSecretReferencesTools(server, service) {
         ...params,
         tags: params.tags ? JSON.stringify(params.tags) : void 0
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total: result.total,
-              secret_references: result.data.map((reference) => ({
-                id: reference.id,
-                name: reference.name,
-                slug: reference.slug,
-                manager_type: reference.manager_type,
-                status: reference.status,
-                created_at: reference.created_at,
-                last_updated_at: reference.last_updated_at
-              }))
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total: result.total,
+        secret_references: result.data.map((reference) => ({
+          id: reference.id,
+          name: reference.name,
+          slug: reference.slug,
+          manager_type: reference.manager_type,
+          status: reference.status,
+          created_at: reference.created_at,
+          last_updated_at: reference.last_updated_at
+        }))
+      });
     }
   );
   server.tool(
@@ -7907,17 +6887,10 @@ function registerSecretReferencesTools(server, service) {
     },
     async ({ id }) => {
       const result = await service.secretReferences.getSecretReference(id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              ...result,
-              auth_config: redactAuthConfig(result.auth_config)
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        ...result,
+        auth_config: redactAuthConfig(result.auth_config)
+      });
     }
   );
   server.tool(
@@ -7938,17 +6911,10 @@ function registerSecretReferencesTools(server, service) {
       }
       if (updates.auth_config) validateAuthUpdate(updates.auth_config);
       await service.secretReferences.updateSecretReference(id, updates);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully updated Secret Reference "${id}"`,
-              success: true
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully updated Secret Reference "${id}"`,
+        success: true
+      });
     }
   );
   server.tool(
@@ -7964,17 +6930,10 @@ function registerSecretReferencesTools(server, service) {
     },
     async ({ id }) => {
       const result = await service.secretReferences.deleteSecretReference(id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully deleted Secret Reference "${id}"`,
-              success: result.success
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully deleted Secret Reference "${id}"`,
+        success: result.success
+      });
     }
   );
 }
@@ -8017,18 +6976,11 @@ function registerTracingTools(server, service) {
         weight: params.weight,
         metadata: params.metadata
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully created feedback for trace "${params.trace_id}"`,
-              status: result.status,
-              feedback_ids: result.feedback_ids
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully created feedback for trace "${params.trace_id}"`,
+        status: result.status,
+        feedback_ids: result.feedback_ids
+      });
     }
   );
   server.tool(
@@ -8041,18 +6993,11 @@ function registerTracingTools(server, service) {
         weight: params.weight,
         metadata: params.metadata
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully updated feedback "${params.id}"`,
-              status: result.status,
-              feedback_ids: result.feedback_ids
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully updated feedback "${params.id}"`,
+        status: result.status,
+        feedback_ids: result.feedback_ids
+      });
     }
   );
 }
@@ -8168,17 +7113,10 @@ function registerUsersTools(server, service) {
         current_page: params.current_page,
         page_size: params.page_size
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total: users.total,
-              users: users.data.map(formatUser)
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total: users.total,
+        users: users.data.map(formatUser)
+      });
     }
   );
   server.tool(
@@ -8187,18 +7125,11 @@ function registerUsersTools(server, service) {
     USERS_TOOL_SCHEMAS.inviteUser,
     async (params) => {
       const result = await service.users.inviteUser(params);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully invited ${params.email} as ${params.role}`,
-              invite_id: result.id,
-              invite_link: result.invite_link
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully invited ${params.email} as ${params.role}`,
+        invite_id: result.id,
+        invite_link: result.invite_link
+      });
     }
   );
   server.tool(
@@ -8207,17 +7138,10 @@ function registerUsersTools(server, service) {
     USERS_TOOL_SCHEMAS.getUserStats,
     async (params) => {
       const stats = await service.users.getUserGroupedData(params);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total_users: stats.total,
-              users: stats.data.map(formatUserAnalyticsGroup)
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total_users: stats.total,
+        users: stats.data.map(formatUserAnalyticsGroup)
+      });
     }
   );
   server.tool(
@@ -8226,14 +7150,7 @@ function registerUsersTools(server, service) {
     USERS_TOOL_SCHEMAS.getUser,
     async (params) => {
       const user = await service.users.getUser(params.user_id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(formatUser(user))
-          }
-        ]
-      };
+      return jsonResult(formatUser(user));
     }
   );
   server.tool(
@@ -8243,17 +7160,10 @@ function registerUsersTools(server, service) {
     async (params) => {
       const { user_id, ...updateData } = params;
       const user = await service.users.updateUser(user_id, updateData);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: "Successfully updated user",
-              user: formatUser(user)
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: "Successfully updated user",
+        user: formatUser(user)
+      });
     }
   );
   server.tool(
@@ -8262,17 +7172,10 @@ function registerUsersTools(server, service) {
     USERS_TOOL_SCHEMAS.deleteUser,
     async (params) => {
       await service.users.deleteUser(params.user_id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully deleted user ${params.user_id}`,
-              success: true
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully deleted user ${params.user_id}`,
+        success: true
+      });
     }
   );
   server.tool(
@@ -8284,17 +7187,10 @@ function registerUsersTools(server, service) {
         current_page: params.current_page,
         page_size: params.page_size
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total: invites.total,
-              invites: invites.data.map(formatUserInvite)
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total: invites.total,
+        invites: invites.data.map(formatUserInvite)
+      });
     }
   );
   server.tool(
@@ -8303,14 +7199,7 @@ function registerUsersTools(server, service) {
     USERS_TOOL_SCHEMAS.getUserInvite,
     async (params) => {
       const invite = await service.users.getUserInvite(params.invite_id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(formatUserInvite(invite))
-          }
-        ]
-      };
+      return jsonResult(formatUserInvite(invite));
     }
   );
   server.tool(
@@ -8319,17 +7208,10 @@ function registerUsersTools(server, service) {
     USERS_TOOL_SCHEMAS.deleteUserInvite,
     async (params) => {
       await service.users.deleteUserInvite(params.invite_id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully deleted invite ${params.invite_id}`,
-              success: true
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully deleted invite ${params.invite_id}`,
+        success: true
+      });
     }
   );
   server.tool(
@@ -8338,17 +7220,10 @@ function registerUsersTools(server, service) {
     USERS_TOOL_SCHEMAS.resendUserInvite,
     async (params) => {
       await service.users.resendUserInvite(params.invite_id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully resent invite ${params.invite_id}`,
-              success: true
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully resent invite ${params.invite_id}`,
+        success: true
+      });
     }
   );
 }
@@ -8418,16 +7293,26 @@ var WORKSPACES_TOOL_SCHEMAS = {
   },
   getWorkspaceMember: {
     workspace_id: z22.string().describe("The workspace ID"),
-    user_id: z22.string().describe("The user ID to retrieve")
+    user_id: z22.string().uuid(
+      "user_id must be a valid UUID (use list_all_users to find user IDs)"
+    ).describe(
+      "The user ID to retrieve (must be a valid UUID from list_all_users, not an email address)"
+    )
   },
   updateWorkspaceMember: {
     workspace_id: z22.string().describe("The workspace ID"),
-    user_id: z22.string().describe("The user ID to update"),
+    user_id: z22.string().uuid(
+      "user_id must be a valid UUID (use list_all_users to find user IDs)"
+    ).describe(
+      "The user ID to update (must be a valid UUID from list_all_users, not an email address)"
+    ),
     role: z22.enum(["admin", "member", "manager"]).describe("New role in the workspace")
   },
   removeWorkspaceMember: {
     workspace_id: z22.string().describe("The workspace ID"),
-    user_id: z22.string().describe("The user ID to remove")
+    user_id: z22.string().uuid(
+      "user_id must be a valid UUID (use list_all_users to find user IDs)"
+    ).describe("The user ID to remove")
   },
   listScimWorkspaceMappings: {
     workspace_id: z22.string().optional().describe("Return only mappings for this Portkey workspace ID"),
@@ -8435,7 +7320,9 @@ var WORKSPACES_TOOL_SCHEMAS = {
       "Return only mappings for this identity-provider SCIM group ID"
     ),
     role: z22.enum(["admin", "member", "manager"]).optional().describe("Return only mappings that grant this workspace role"),
-    page: z22.coerce.number().int().nonnegative().optional().describe("Zero-based results page to retrieve; the first page is 0"),
+    page: z22.coerce.number().int().nonnegative().optional().describe(
+      "Zero-based results page to retrieve; the first page is 0. Unlike current_page used by other list tools in this API (which is 1-based), do not pass 1 for the first page here."
+    ),
     page_size: z22.coerce.number().int().positive().max(100).optional().describe("Mappings per page, from 1 through 100")
   },
   deleteScimWorkspaceMapping: {
@@ -8443,7 +7330,9 @@ var WORKSPACES_TOOL_SCHEMAS = {
   },
   listScimGroups: {
     search: z22.string().optional().describe("Case-insensitive text to match against SCIM group names"),
-    page: z22.coerce.number().int().nonnegative().optional().describe("Zero-based results page to retrieve; the first page is 0"),
+    page: z22.coerce.number().int().nonnegative().optional().describe(
+      "Zero-based results page to retrieve; the first page is 0. Unlike current_page used by other list tools in this API (which is 1-based), do not pass 1 for the first page here."
+    ),
     page_size: z22.coerce.number().int().positive().max(100).optional().describe("SCIM groups per page, from 1 through 100")
   }
 };
@@ -8502,16 +7391,7 @@ function registerWorkspacesTools(server, service) {
       idempotentHint: true,
       openWorldHint: true
     },
-    async (params) => ({
-      content: [
-        {
-          type: "text",
-          text: JSON.stringify(
-            await service.workspaces.listScimWorkspaceMappings(params)
-          )
-        }
-      ]
-    })
+    async (params) => jsonResult(await service.workspaces.listScimWorkspaceMappings(params))
   );
   server.registerTool(
     "create_scim_workspace_mapping",
@@ -8546,9 +7426,7 @@ function registerWorkspacesTools(server, service) {
         );
       }
       const result = await service.workspaces.createScimWorkspaceMapping(request);
-      return {
-        content: [{ type: "text", text: JSON.stringify(result) }]
-      };
+      return jsonResult(result);
     }
   );
   server.tool(
@@ -8566,17 +7444,10 @@ function registerWorkspacesTools(server, service) {
       const result = await service.workspaces.deleteScimWorkspaceMapping(
         params.mapping_id
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Deleted SCIM workspace mapping "${params.mapping_id}"`,
-              ...result
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Deleted SCIM workspace mapping "${params.mapping_id}"`,
+        ...result
+      });
     }
   );
   server.tool(
@@ -8590,14 +7461,7 @@ function registerWorkspacesTools(server, service) {
       idempotentHint: true,
       openWorldHint: true
     },
-    async (params) => ({
-      content: [
-        {
-          type: "text",
-          text: JSON.stringify(await service.workspaces.listScimGroups(params))
-        }
-      ]
-    })
+    async (params) => jsonResult(await service.workspaces.listScimGroups(params))
   );
   server.tool(
     "list_workspaces",
@@ -8605,17 +7469,10 @@ function registerWorkspacesTools(server, service) {
     WORKSPACES_TOOL_SCHEMAS.listWorkspaces,
     async (params) => {
       const workspaces = await service.workspaces.listWorkspaces(params);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total: workspaces.total,
-              workspaces: workspaces.data.map(formatWorkspaceSummary)
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total: workspaces.total,
+        workspaces: workspaces.data.map(formatWorkspaceSummary)
+      });
     }
   );
   server.tool(
@@ -8626,14 +7483,7 @@ function registerWorkspacesTools(server, service) {
       const workspace = await service.workspaces.getWorkspace(
         params.workspace_id
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(formatWorkspaceDetail(workspace))
-          }
-        ]
-      };
+      return jsonResult(formatWorkspaceDetail(workspace));
     }
   );
   server.tool(
@@ -8650,17 +7500,10 @@ function registerWorkspacesTools(server, service) {
           metadata: params.metadata
         } : void 0
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully created workspace "${params.name}"`,
-              workspace: formatWorkspaceSummary(workspace)
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully created workspace "${params.name}"`,
+        workspace: formatWorkspaceSummary(workspace)
+      });
     }
   );
   server.tool(
@@ -8676,17 +7519,10 @@ function registerWorkspacesTools(server, service) {
         ...rest,
         ...Object.keys(defaults).length > 0 ? { defaults } : {}
       });
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: "Successfully updated workspace",
-              workspace: formatWorkspaceSummary(workspace)
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: "Successfully updated workspace",
+        workspace: formatWorkspaceSummary(workspace)
+      });
     }
   );
   server.tool(
@@ -8695,17 +7531,10 @@ function registerWorkspacesTools(server, service) {
     WORKSPACES_TOOL_SCHEMAS.deleteWorkspace,
     async (params) => {
       await service.workspaces.deleteWorkspace(params.workspace_id);
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully deleted workspace ${params.workspace_id}`,
-              success: true
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully deleted workspace ${params.workspace_id}`,
+        success: true
+      });
     }
   );
   server.tool(
@@ -8720,17 +7549,10 @@ function registerWorkspacesTools(server, service) {
           role: params.role
         }
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully added user to workspace as ${params.role}`,
-              member: formatWorkspaceMember(member)
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully added user to workspace as ${params.role}`,
+        member: formatWorkspaceMember(member)
+      });
     }
   );
   server.tool(
@@ -8741,17 +7563,10 @@ function registerWorkspacesTools(server, service) {
       const members = await service.workspaces.listWorkspaceMembers(
         params.workspace_id
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              total: members.total,
-              members: members.data.map(formatWorkspaceMember)
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        total: members.total,
+        members: members.data.map(formatWorkspaceMember)
+      });
     }
   );
   server.tool(
@@ -8763,14 +7578,7 @@ function registerWorkspacesTools(server, service) {
         params.workspace_id,
         params.user_id
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify(formatWorkspaceMember(member))
-          }
-        ]
-      };
+      return jsonResult(formatWorkspaceMember(member));
     }
   );
   server.tool(
@@ -8785,17 +7593,10 @@ function registerWorkspacesTools(server, service) {
           role: params.role
         }
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully updated member role to ${params.role}`,
-              member: formatWorkspaceMember(member)
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully updated member role to ${params.role}`,
+        member: formatWorkspaceMember(member)
+      });
     }
   );
   server.tool(
@@ -8807,17 +7608,10 @@ function registerWorkspacesTools(server, service) {
         params.workspace_id,
         params.user_id
       );
-      return {
-        content: [
-          {
-            type: "text",
-            text: JSON.stringify({
-              message: `Successfully removed user from workspace`,
-              success: true
-            })
-          }
-        ]
-      };
+      return jsonResult({
+        message: `Successfully removed user from workspace`,
+        success: true
+      });
     }
   );
 }
@@ -9106,7 +7900,7 @@ function normalizeToolResult(result) {
     error: getErrorDetails(result)
   } : {
     ok: true,
-    data: getSuccessData(result)
+    data: result.structuredContent !== void 0 ? result.structuredContent : getSuccessData(result)
   };
   return {
     ...result,