portkey-admin-mcp 0.3.5 → 0.3.7

package/build/server.js

@@ -205,15 +205,19 @@ var BaseService = class {
   apiKey;
   baseUrl;
   timeout = 3e4;
-  constructor(apiKeyOverride) {
+  constructor(apiKeyOverride, baseUrlOverride) {
     const apiKey = apiKeyOverride ?? process.env.PORTKEY_API_KEY;
     if (!apiKey) {
       throw new Error("PORTKEY_API_KEY environment variable is not set");
     }
     this.apiKey = apiKey;
-    const baseUrl = process.env.PORTKEY_BASE_URL ?? DEFAULT_BASE_URL;
-    validateUrl(baseUrl);
-    this.baseUrl = baseUrl;
+    if (baseUrlOverride !== void 0) {
+      this.baseUrl = baseUrlOverride;
+    } else {
+      const baseUrl = process.env.PORTKEY_BASE_URL ?? DEFAULT_BASE_URL;
+      validateUrl(baseUrl);
+      this.baseUrl = baseUrl;
+    }
   }
   encodePathSegment(value) {
     return encodeURIComponent(value);
@@ -276,7 +280,7 @@ var BaseService = class {
       if (options.allowNoContent && response.status === 204) {
         return {};
       }
-      return response.json();
+      return await response.json();
     } catch (error) {
       const duration_ms = Date.now() - startTime;
       if (!(error instanceof FetchError)) {
@@ -530,8 +534,11 @@ var ConfigsService = class extends BaseService {
       config: JSON.parse(response.config || "{}")
     };
   }
-  async listConfigs() {
-    return this.get("/configs");
+  async listConfigs(params) {
+    return this.get("/configs", {
+      page_size: params?.page_size,
+      current_page: params?.current_page
+    });
   }
   async getConfig(slug) {
     const response = await this.get(
@@ -611,6 +618,7 @@ var GuardrailsService = class extends BaseService {
 // src/services/health.service.ts
 var CACHE_TTL_MS = 1e4;
 var HealthService = class extends BaseService {
+  timeout = 5e3;
   cachedHealth = null;
   /**
    * Ping the Portkey API to check health
@@ -629,7 +637,7 @@ var HealthService = class extends BaseService {
     }
     const startTime = Date.now();
     try {
-      await this.getWithTimeout("/configs", 5e3);
+      await this.get("/configs");
       const latency_ms = Date.now() - startTime;
       const result = {
         status: "ok",
@@ -646,35 +654,6 @@ var HealthService = class extends BaseService {
       throw new Error(`Health check failed: ${errorMessage} (${latency_ms}ms)`);
     }
   }
-  /**
-   * Internal method to call GET with custom timeout
-   */
-  async getWithTimeout(path, timeout) {
-    const url = `${this.baseUrl}${path}`;
-    const controller = new AbortController();
-    const timeoutId = setTimeout(() => controller.abort(), timeout);
-    try {
-      const response = await fetch(url, {
-        method: "GET",
-        headers: {
-          "x-portkey-api-key": this.apiKey,
-          Accept: "application/json"
-        },
-        signal: controller.signal
-      });
-      if (!response.ok) {
-        throw new Error(`HTTP ${response.status}`);
-      }
-      return response.json();
-    } catch (error) {
-      if (error instanceof Error && error.name === "AbortError") {
-        throw new Error(`Request timed out after ${timeout}ms`);
-      }
-      throw error;
-    } finally {
-      clearTimeout(timeoutId);
-    }
-  }
 };
 
 // src/services/integrations.service.ts
@@ -756,8 +735,11 @@ var IntegrationsService = class extends BaseService {
 // src/services/keys.service.ts
 var KeysService = class extends BaseService {
   // Virtual Keys
-  async listVirtualKeys() {
-    return this.get("/virtual-keys");
+  async listVirtualKeys(params) {
+    return this.get("/virtual-keys", {
+      page_size: params?.page_size,
+      current_page: params?.current_page
+    });
   }
   // Phase 2: Virtual Keys CRUD
   async createVirtualKey(data) {
@@ -1079,9 +1061,13 @@ var McpServersService = class extends BaseService {
       {}
     );
   }
-  async listMcpServerCapabilities(id) {
+  async listMcpServerCapabilities(id, params) {
     return this.get(
-      `/mcp-servers/${this.encodePathSegment(id)}/capabilities`
+      `/mcp-servers/${this.encodePathSegment(id)}/capabilities`,
+      {
+        current_page: params?.current_page,
+        page_size: params?.page_size
+      }
     );
   }
   async updateMcpServerCapabilities(id, data) {
@@ -1091,9 +1077,13 @@ var McpServersService = class extends BaseService {
     );
     return { success: true };
   }
-  async listMcpServerUserAccess(id) {
+  async listMcpServerUserAccess(id, params) {
     return this.get(
-      `/mcp-servers/${this.encodePathSegment(id)}/user-access`
+      `/mcp-servers/${this.encodePathSegment(id)}/user-access`,
+      {
+        current_page: params?.current_page,
+        page_size: params?.page_size
+      }
     );
   }
   async updateMcpServerUserAccess(id, data) {
@@ -1277,7 +1267,8 @@ var PromptsService = class extends BaseService {
     const { dry_run = false, app, env } = data;
     const existingPrompts = await this.listPrompts({
       collection_id: data.collection_id,
-      search: data.name
+      search: data.name,
+      page_size: 10
     });
     const existingPrompt = existingPrompts.data.find(
       (p) => p.name.toLowerCase() === data.name.toLowerCase()
@@ -1384,7 +1375,8 @@ var PromptsService = class extends BaseService {
     const targetName = data.target_name || sourcePrompt.name.replace(/-(dev|staging|prod)$/, "") + `-${data.target_env}`;
     const existingTargets = await this.listPrompts({
       collection_id: data.target_collection_id,
-      search: targetName
+      search: targetName,
+      page_size: 10
     });
     const existingTarget = existingTargets.data.find(
       (p) => p.name.toLowerCase() === targetName.toLowerCase()
@@ -1514,8 +1506,11 @@ var TracingService = class extends BaseService {
 
 // src/services/users.service.ts
 var UsersService = class extends BaseService {
-  async listUsers() {
-    return this.get("/admin/users");
+  async listUsers(params) {
+    return this.get("/admin/users", {
+      page_size: params?.page_size,
+      current_page: params?.current_page
+    });
   }
   async inviteUser(data) {
     return this.post("/admin/users/invites", data);
@@ -1564,8 +1559,11 @@ var UsersService = class extends BaseService {
     return { success: true };
   }
   // Phase 1: User Invites CRUD
-  async listUserInvites() {
-    return this.get("/admin/users/invites");
+  async listUserInvites(params) {
+    return this.get("/admin/users/invites", {
+      page_size: params?.page_size,
+      current_page: params?.current_page
+    });
   }
   async getUserInvite(inviteId) {
     return this.get(
@@ -1642,6 +1640,7 @@ var WorkspacesService = class extends BaseService {
 };
 
 // src/services/index.ts
+import crypto2 from "node:crypto";
 function resolvePortkeyApiKey(apiKey) {
   const resolvedApiKey = apiKey ?? process.env.PORTKEY_API_KEY;
   if (!resolvedApiKey) {
@@ -1652,23 +1651,13 @@ function resolvePortkeyApiKey(apiKey) {
   return resolvedApiKey;
 }
 function getSharedServiceCacheKey(apiKey) {
+  const keyDigest = crypto2.createHash("sha256").update(resolvePortkeyApiKey(apiKey)).digest("hex");
   return JSON.stringify({
-    apiKey: resolvePortkeyApiKey(apiKey),
+    apiKey: keyDigest,
     baseUrl: process.env.PORTKEY_BASE_URL?.trim() || ""
   });
 }
 var sharedPortkeyServices = /* @__PURE__ */ new Map();
-var sharedHealthServices = /* @__PURE__ */ new Map();
-function getSharedHealthService(apiKey) {
-  const cacheKey = getSharedServiceCacheKey(apiKey);
-  const cached = sharedHealthServices.get(cacheKey);
-  if (cached) {
-    return cached;
-  }
-  const service = new HealthService(resolvePortkeyApiKey(apiKey));
-  sharedHealthServices.set(cacheKey, service);
-  return service;
-}
 var PortkeyService = class {
   users;
   workspaces;
@@ -1691,25 +1680,33 @@ var PortkeyService = class {
   health;
   constructor(apiKey) {
     const resolvedApiKey = resolvePortkeyApiKey(apiKey);
-    this.users = new UsersService(resolvedApiKey);
-    this.workspaces = new WorkspacesService(resolvedApiKey);
-    this.configs = new ConfigsService(resolvedApiKey);
-    this.keys = new KeysService(resolvedApiKey);
-    this.collections = new CollectionsService(resolvedApiKey);
-    this.prompts = new PromptsService(resolvedApiKey);
-    this.analytics = new AnalyticsService(resolvedApiKey);
-    this.guardrails = new GuardrailsService(resolvedApiKey);
-    this.integrations = new IntegrationsService(resolvedApiKey);
-    this.limits = new LimitsService(resolvedApiKey);
-    this.audit = new AuditService(resolvedApiKey);
-    this.labels = new LabelsService(resolvedApiKey);
-    this.partials = new PartialsService(resolvedApiKey);
-    this.tracing = new TracingService(resolvedApiKey);
-    this.logging = new LoggingService(resolvedApiKey);
-    this.providers = new ProvidersService(resolvedApiKey);
-    this.mcpIntegrations = new McpIntegrationsService(resolvedApiKey);
-    this.mcpServers = new McpServersService(resolvedApiKey);
-    this.health = getSharedHealthService(resolvedApiKey);
+    const resolvedBaseUrl = process.env.PORTKEY_BASE_URL ?? "https://api.portkey.ai/v1";
+    validateUrl(resolvedBaseUrl);
+    this.users = new UsersService(resolvedApiKey, resolvedBaseUrl);
+    this.workspaces = new WorkspacesService(resolvedApiKey, resolvedBaseUrl);
+    this.configs = new ConfigsService(resolvedApiKey, resolvedBaseUrl);
+    this.keys = new KeysService(resolvedApiKey, resolvedBaseUrl);
+    this.collections = new CollectionsService(resolvedApiKey, resolvedBaseUrl);
+    this.prompts = new PromptsService(resolvedApiKey, resolvedBaseUrl);
+    this.analytics = new AnalyticsService(resolvedApiKey, resolvedBaseUrl);
+    this.guardrails = new GuardrailsService(resolvedApiKey, resolvedBaseUrl);
+    this.integrations = new IntegrationsService(
+      resolvedApiKey,
+      resolvedBaseUrl
+    );
+    this.limits = new LimitsService(resolvedApiKey, resolvedBaseUrl);
+    this.audit = new AuditService(resolvedApiKey, resolvedBaseUrl);
+    this.labels = new LabelsService(resolvedApiKey, resolvedBaseUrl);
+    this.partials = new PartialsService(resolvedApiKey, resolvedBaseUrl);
+    this.tracing = new TracingService(resolvedApiKey, resolvedBaseUrl);
+    this.logging = new LoggingService(resolvedApiKey, resolvedBaseUrl);
+    this.providers = new ProvidersService(resolvedApiKey, resolvedBaseUrl);
+    this.mcpIntegrations = new McpIntegrationsService(
+      resolvedApiKey,
+      resolvedBaseUrl
+    );
+    this.mcpServers = new McpServersService(resolvedApiKey, resolvedBaseUrl);
+    this.health = new HealthService(resolvedApiKey, resolvedBaseUrl);
   }
 };
 function getSharedPortkeyService(apiKey) {
@@ -1726,6 +1723,11 @@ function getSharedPortkeyService(apiKey) {
 // src/tools/index.ts
 import { z as z20 } from "zod";
 
+// src/lib/type-guards.ts
+function isRecord(value) {
+  return typeof value === "object" && value !== null;
+}
+
 // src/tools/analytics.tools.ts
 import { z } from "zod";
 var baseAnalyticsSchema = {
@@ -1801,41 +1803,6 @@ var baseAnalyticsSchema = {
   ),
   prompt_slug: z.string().optional().describe("Filter by prompt slug")
 };
-var requestAnalyticsSchema = {
-  ...baseAnalyticsSchema,
-  status_codes: z.array(z.string()).optional().describe(
-    "Structured alias for status_code. Use an array of HTTP status codes; normalized to the legacy comma-separated Portkey query param."
-  ),
-  virtual_key_slugs: z.array(z.string()).optional().describe(
-    "Structured alias for virtual_keys. Use an array of virtual key slugs; normalized to the legacy comma-separated Portkey query param."
-  ),
-  config_slugs: z.array(z.string()).optional().describe(
-    "Structured alias for configs. Use an array of config slugs; normalized to the legacy comma-separated Portkey query param."
-  ),
-  api_key_ids: z.preprocess((value) => {
-    if (value == null) {
-      return value;
-    }
-    if (Array.isArray(value)) {
-      return value.map((item) => String(item)).join(",");
-    }
-    return value;
-  }, z.string().optional()).describe(
-    "API key UUIDs. Accepts the legacy comma-separated string or a structured array; normalized to the legacy Portkey query param before the request is sent."
-  ),
-  trace_ids: z.array(z.string()).optional().describe(
-    "Structured alias for trace_id. Use an array of trace IDs; normalized to the legacy comma-separated Portkey query param."
-  ),
-  span_ids: z.array(z.string()).optional().describe(
-    "Structured alias for span_id. Use an array of span IDs; normalized to the legacy comma-separated Portkey query param."
-  ),
-  provider_models: z.array(z.string()).optional().describe(
-    "Structured alias for ai_org_model. Use provider__model strings in an array; normalized to the legacy comma-separated Portkey query param."
-  ),
-  metadata_filter: z.record(z.string(), z.unknown()).optional().describe(
-    "Structured alias for metadata. Use an object such as { env: 'prod' }; normalized to a JSON string before the request is sent."
-  )
-};
 var paginatedAnalyticsSchema = {
   ...baseAnalyticsSchema,
   current_page: z.coerce.number().positive().optional().describe("Page number for pagination"),
@@ -1960,9 +1927,7 @@ function registerAnalyticsTools(server, service) {
                   average_cost_per_request: analytics.summary.avg
                 },
                 dataPoints
-              ),
-              null,
-              2
+              )
             )
           }
         ]
@@ -1972,7 +1937,7 @@ function registerAnalyticsTools(server, service) {
   server.tool(
     "get_request_analytics",
     "Get request-volume time-series data with summary.total_requests, summary.successful_requests, summary.failed_requests, and per-bucket total/success/failed counts. Use this for traffic and reliability trends; use get_error_analytics when you only need error counts.",
-    requestAnalyticsSchema,
+    baseAnalyticsSchema,
     async (params) => {
       const analytics = await service.analytics.getRequestAnalytics(
         normalizeAnalyticsParams(params)
@@ -1995,9 +1960,7 @@ function registerAnalyticsTools(server, service) {
                   failed_requests: analytics.summary.failed
                 },
                 dataPoints
-              ),
-              null,
-              2
+              )
             )
           }
         ]
@@ -2030,9 +1993,7 @@ function registerAnalyticsTools(server, service) {
                   completion_tokens: analytics.summary.completion
                 },
                 dataPoints
-              ),
-              null,
-              2
+              )
             )
           }
         ]
@@ -2067,9 +2028,7 @@ function registerAnalyticsTools(server, service) {
                   p99_latency_ms: analytics.summary.p99
                 },
                 dataPoints
-              ),
-              null,
-              2
+              )
             )
           }
         ]
@@ -2098,9 +2057,7 @@ function registerAnalyticsTools(server, service) {
                   total_errors: analytics.summary.total
                 },
                 dataPoints
-              ),
-              null,
-              2
+              )
             )
           }
         ]
@@ -2129,9 +2086,7 @@ function registerAnalyticsTools(server, service) {
                   error_rate_percent: analytics.summary.rate
                 },
                 dataPoints
-              ),
-              null,
-              2
+              )
             )
           }
         ]
@@ -2162,9 +2117,7 @@ function registerAnalyticsTools(server, service) {
                   avg_latency: analytics.summary.avg
                 },
                 dataPoints
-              ),
-              null,
-              2
+              )
             )
           }
         ]
@@ -2197,9 +2150,7 @@ function registerAnalyticsTools(server, service) {
                   total_misses: analytics.summary.total_misses
                 },
                 dataPoints
-              ),
-              null,
-              2
+              )
             )
           }
         ]
@@ -2230,9 +2181,7 @@ function registerAnalyticsTools(server, service) {
                   total_new_users: analytics.summary.total_new_users
                 },
                 dataPoints
-              ),
-              null,
-              2
+              )
             )
           }
         ]
@@ -2251,11 +2200,7 @@ function registerAnalyticsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              formatGenericGraphAnalytics(analytics),
-              null,
-              2
-            )
+            text: JSON.stringify(formatGenericGraphAnalytics(analytics))
           }
         ]
       };
@@ -2273,11 +2218,7 @@ function registerAnalyticsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              formatGenericGraphAnalytics(analytics),
-              null,
-              2
-            )
+            text: JSON.stringify(formatGenericGraphAnalytics(analytics))
           }
         ]
       };
@@ -2295,11 +2236,7 @@ function registerAnalyticsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              formatGenericGraphAnalytics(analytics),
-              null,
-              2
-            )
+            text: JSON.stringify(formatGenericGraphAnalytics(analytics))
           }
         ]
       };
@@ -2317,11 +2254,7 @@ function registerAnalyticsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              formatGenericGraphAnalytics(analytics),
-              null,
-              2
-            )
+            text: JSON.stringify(formatGenericGraphAnalytics(analytics))
           }
         ]
       };
@@ -2339,11 +2272,7 @@ function registerAnalyticsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              formatGenericGraphAnalytics(analytics),
-              null,
-              2
-            )
+            text: JSON.stringify(formatGenericGraphAnalytics(analytics))
           }
         ]
       };
@@ -2361,11 +2290,7 @@ function registerAnalyticsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              formatGenericGraphAnalytics(analytics),
-              null,
-              2
-            )
+            text: JSON.stringify(formatGenericGraphAnalytics(analytics))
           }
         ]
       };
@@ -2383,11 +2308,7 @@ function registerAnalyticsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              formatGenericGraphAnalytics(analytics),
-              null,
-              2
-            )
+            text: JSON.stringify(formatGenericGraphAnalytics(analytics))
           }
         ]
       };
@@ -2405,11 +2326,7 @@ function registerAnalyticsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              formatGenericGraphAnalytics(analytics),
-              null,
-              2
-            )
+            text: JSON.stringify(formatGenericGraphAnalytics(analytics))
           }
         ]
       };
@@ -2427,11 +2344,7 @@ function registerAnalyticsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              formatGroupedAnalytics(analytics, "users"),
-              null,
-              2
-            )
+            text: JSON.stringify(formatGroupedAnalytics(analytics, "users"))
           }
         ]
       };
@@ -2449,11 +2362,7 @@ function registerAnalyticsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              formatGroupedAnalytics(analytics, "models"),
-              null,
-              2
-            )
+            text: JSON.stringify(formatGroupedAnalytics(analytics, "models"))
           }
         ]
       };
@@ -2474,9 +2383,7 @@ function registerAnalyticsTools(server, service) {
           {
             type: "text",
             text: JSON.stringify(
-              formatGroupedAnalytics(analytics, "metadata_groups"),
-              null,
-              2
+              formatGroupedAnalytics(analytics, "metadata_groups")
             )
           }
         ]
@@ -2529,31 +2436,27 @@ function registerAuditTools(server, service) {
         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
-                }))
-              },
-              null,
-              2
-            )
+            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
+              }))
+            })
           }
         ]
       };
@@ -2599,21 +2502,17 @@ function registerCollectionsTools(server, service) {
         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
-                }))
-              },
-              null,
-              2
-            )
+            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
+              }))
+            })
           }
         ]
       };
@@ -2629,15 +2528,11 @@ function registerCollectionsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully created collection "${params.name}"`,
-                id: result.id,
-                slug: result.slug
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully created collection "${params.name}"`,
+              id: result.id,
+              slug: result.slug
+            })
           }
         ]
       };
@@ -2655,18 +2550,14 @@ function registerCollectionsTools(server, service) {
         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
-              },
-              null,
-              2
-            )
+            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
+            })
           }
         ]
       };
@@ -2685,14 +2576,10 @@ function registerCollectionsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully updated collection "${params.collection_id}"`,
-                success: true
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully updated collection "${params.collection_id}"`,
+              success: true
+            })
           }
         ]
       };
@@ -2710,14 +2597,10 @@ function registerCollectionsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully deleted collection "${params.collection_id}"`,
-                success: result.success
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully deleted collection "${params.collection_id}"`,
+              success: result.success
+            })
           }
         ]
       };
@@ -2728,7 +2611,10 @@ function registerCollectionsTools(server, service) {
 // src/tools/configs.tools.ts
 import { z as z4 } from "zod";
 var CONFIGS_TOOL_SCHEMAS = {
-  listConfigs: {},
+  listConfigs: {
+    current_page: z4.coerce.number().positive().optional().describe("Page number for pagination"),
+    page_size: z4.coerce.number().positive().max(100).optional().describe("Number of results per page (max 100)")
+  },
   getConfig: {
     slug: z4.string().describe(
       "The unique identifier (slug) of the configuration to retrieve. This can be found in the configuration's URL or from the list_configs tool response"
@@ -2776,6 +2662,19 @@ var CONFIGS_TOOL_SCHEMAS = {
     slug: z4.string().describe("Configuration slug to list versions for")
   }
 };
+var configPayloadSchema = z4.object({
+  cache_mode: z4.enum(["simple", "semantic"]).optional(),
+  cache_max_age: z4.coerce.number().positive().optional(),
+  retry_attempts: z4.coerce.number().positive().max(5).optional(),
+  retry_on_status_codes: z4.array(z4.coerce.number()).optional(),
+  strategy_mode: z4.enum(["loadbalance", "fallback"]).optional(),
+  targets: z4.array(
+    z4.object({
+      provider: z4.string().optional(),
+      virtual_key: z4.string().optional()
+    })
+  ).optional()
+});
 function buildConfigPayload(params) {
   const cache = params.cache_mode !== void 0 || params.cache_max_age !== void 0 ? {
     ...params.cache_mode !== void 0 ? { mode: params.cache_mode } : {},
@@ -2800,31 +2699,30 @@ function registerConfigsTools(server, service) {
     "list_configs",
     "List configs in the org with id, slug, name, status, workspace, and timestamps. Use this summary view to find a slug; use get_config for the full routing, cache, retry, and target settings before updating or deleting.",
     CONFIGS_TOOL_SCHEMAS.listConfigs,
-    async () => {
-      const configs = await service.configs.listConfigs();
+    async (params) => {
+      const configs = await service.configs.listConfigs({
+        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
-                }))
-              },
-              null,
-              2
-            )
+            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
+              }))
+            })
           }
         ]
       };
@@ -2840,35 +2738,31 @@ function registerConfigsTools(server, service) {
         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
-                    })
-                  )
-                }
-              },
-              null,
-              2
-            )
+            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
+                  })
+                )
+              }
+            })
           }
         ]
       };
@@ -2900,15 +2794,11 @@ function registerConfigsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully created configuration "${params.name}"`,
-                id: result.id,
-                version_id: result.version_id
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully created configuration "${params.name}"`,
+              id: result.id,
+              version_id: result.version_id
+            })
           }
         ]
       };
@@ -2934,16 +2824,12 @@ function registerConfigsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully updated configuration "${params.slug}"`,
-                id: result.id,
-                slug: result.slug,
-                config: result.config
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully updated configuration "${params.slug}"`,
+              id: result.id,
+              slug: result.slug,
+              config: result.config
+            })
           }
         ]
       };
@@ -2959,14 +2845,10 @@ function registerConfigsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully deleted configuration "${params.slug}"`,
-                success: result.success
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully deleted configuration "${params.slug}"`,
+              success: result.success
+            })
           }
         ]
       };
@@ -2982,20 +2864,16 @@ function registerConfigsTools(server, service) {
         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
-                }))
-              },
-              null,
-              2
-            )
+            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
+              }))
+            })
           }
         ]
       };
@@ -3064,25 +2942,21 @@ function registerGuardrailsTools(server, service) {
         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
-                }))
-              },
-              null,
-              2
-            )
+            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
+              }))
+            })
           }
         ]
       };
@@ -3100,24 +2974,20 @@ function registerGuardrailsTools(server, service) {
         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
-              },
-              null,
-              2
-            )
+            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
+            })
           }
         ]
       };
@@ -3139,16 +3009,12 @@ function registerGuardrailsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully created guardrail "${params.name}"`,
-                id: result.id,
-                slug: result.slug,
-                version_id: result.version_id
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully created guardrail "${params.name}"`,
+              id: result.id,
+              slug: result.slug,
+              version_id: result.version_id
+            })
           }
         ]
       };
@@ -3177,16 +3043,12 @@ function registerGuardrailsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully updated guardrail "${params.guardrail_id}"`,
-                id: result.id,
-                slug: result.slug,
-                version_id: result.version_id
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully updated guardrail "${params.guardrail_id}"`,
+              id: result.id,
+              slug: result.slug,
+              version_id: result.version_id
+            })
           }
         ]
       };
@@ -3204,14 +3066,10 @@ function registerGuardrailsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully deleted guardrail "${params.guardrail_id}"`,
-                success: result.success
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully deleted guardrail "${params.guardrail_id}"`,
+              success: result.success
+            })
           }
         ]
       };
@@ -3354,6 +3212,28 @@ var INTEGRATIONS_TOOL_SCHEMAS = {
     ).describe("Array of workspace configurations to update")
   }
 };
+function buildIntegrationConfigurations(params) {
+  const configurations = {};
+  if (params.api_version !== void 0)
+    configurations.api_version = params.api_version;
+  if (params.resource_name !== void 0)
+    configurations.resource_name = params.resource_name;
+  if (params.deployment_name !== void 0)
+    configurations.deployment_name = params.deployment_name;
+  if (params.aws_region !== void 0)
+    configurations.aws_region = params.aws_region;
+  if (params.aws_access_key_id !== void 0)
+    configurations.aws_access_key_id = params.aws_access_key_id;
+  if (params.aws_secret_access_key !== void 0)
+    configurations.aws_secret_access_key = params.aws_secret_access_key;
+  if (params.vertex_project_id !== void 0)
+    configurations.vertex_project_id = params.vertex_project_id;
+  if (params.vertex_region !== void 0)
+    configurations.vertex_region = params.vertex_region;
+  if (params.custom_host !== void 0)
+    configurations.custom_host = params.custom_host;
+  return Object.keys(configurations).length > 0 ? configurations : void 0;
+}
 function registerIntegrationsTools(server, service) {
   server.tool(
     "list_integrations",
@@ -3370,24 +3250,20 @@ function registerIntegrationsTools(server, service) {
         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
-                }))
-              },
-              null,
-              2
-            )
+            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
+              }))
+            })
           }
         ]
       };
@@ -3398,22 +3274,6 @@ function registerIntegrationsTools(server, service) {
     "Create an org-level provider integration. Some backends need provider-specific fields, and the new integration becomes the source for downstream providers and workspace access. Returns the new integration id and slug.",
     INTEGRATIONS_TOOL_SCHEMAS.createIntegration,
     async (params) => {
-      const configurations = {};
-      if (params.api_version) configurations.api_version = params.api_version;
-      if (params.resource_name)
-        configurations.resource_name = params.resource_name;
-      if (params.deployment_name)
-        configurations.deployment_name = params.deployment_name;
-      if (params.aws_region) configurations.aws_region = params.aws_region;
-      if (params.aws_access_key_id)
-        configurations.aws_access_key_id = params.aws_access_key_id;
-      if (params.aws_secret_access_key)
-        configurations.aws_secret_access_key = params.aws_secret_access_key;
-      if (params.vertex_project_id)
-        configurations.vertex_project_id = params.vertex_project_id;
-      if (params.vertex_region)
-        configurations.vertex_region = params.vertex_region;
-      if (params.custom_host) configurations.custom_host = params.custom_host;
       const result = await service.integrations.createIntegration({
         name: params.name,
         ai_provider_id: params.ai_provider_id,
@@ -3421,21 +3281,17 @@ function registerIntegrationsTools(server, service) {
         key: params.key,
         description: params.description,
         workspace_id: params.workspace_id,
-        configurations: Object.keys(configurations).length > 0 ? configurations : void 0
+        configurations: buildIntegrationConfigurations(params)
       });
       return {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully created integration "${params.name}"`,
-                id: result.id,
-                slug: result.slug
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully created integration "${params.name}"`,
+              id: result.id,
+              slug: result.slug
+            })
           }
         ]
       };
@@ -3453,26 +3309,22 @@ function registerIntegrationsTools(server, service) {
         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,
-                created_at: integration.created_at,
-                last_updated_at: integration.last_updated_at
-              },
-              null,
-              2
-            )
+            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,
+              created_at: integration.created_at,
+              last_updated_at: integration.last_updated_at
+            })
           }
         ]
       };
@@ -3483,43 +3335,20 @@ function registerIntegrationsTools(server, service) {
     "Update an integration's name, key, or provider-specific config. Key and config changes take effect immediately and can disrupt dependent providers or live requests.",
     INTEGRATIONS_TOOL_SCHEMAS.updateIntegration,
     async (params) => {
-      const configurations = {};
-      if (params.api_version !== void 0)
-        configurations.api_version = params.api_version;
-      if (params.resource_name !== void 0)
-        configurations.resource_name = params.resource_name;
-      if (params.deployment_name !== void 0)
-        configurations.deployment_name = params.deployment_name;
-      if (params.aws_region !== void 0)
-        configurations.aws_region = params.aws_region;
-      if (params.aws_access_key_id !== void 0)
-        configurations.aws_access_key_id = params.aws_access_key_id;
-      if (params.aws_secret_access_key !== void 0)
-        configurations.aws_secret_access_key = params.aws_secret_access_key;
-      if (params.vertex_project_id !== void 0)
-        configurations.vertex_project_id = params.vertex_project_id;
-      if (params.vertex_region !== void 0)
-        configurations.vertex_region = params.vertex_region;
-      if (params.custom_host !== void 0)
-        configurations.custom_host = params.custom_host;
       const result = await service.integrations.updateIntegration(params.slug, {
         name: params.name,
         key: params.key,
         description: params.description,
-        configurations: Object.keys(configurations).length > 0 ? configurations : void 0
+        configurations: buildIntegrationConfigurations(params)
       });
       return {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully updated integration "${params.slug}"`,
-                success: result.success
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully updated integration "${params.slug}"`,
+              success: result.success
+            })
           }
         ]
       };
@@ -3535,14 +3364,10 @@ function registerIntegrationsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully deleted integration "${params.slug}"`,
-                success: result.success
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully deleted integration "${params.slug}"`,
+              success: result.success
+            })
           }
         ]
       };
@@ -3564,23 +3389,19 @@ function registerIntegrationsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                total: models.total,
-                integration_slug: params.slug,
-                models: models.data.map((model) => ({
-                  id: model.id,
-                  model_id: model.model_id,
-                  model_name: model.model_name,
-                  enabled: model.enabled,
-                  custom: model.custom,
-                  created_at: model.created_at,
-                  last_updated_at: model.last_updated_at
-                }))
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              total: models.total,
+              integration_slug: params.slug,
+              models: models.data.map((model) => ({
+                id: model.id,
+                model_id: model.model_id,
+                model_name: model.model_name,
+                enabled: model.enabled,
+                custom: model.custom,
+                created_at: model.created_at,
+                last_updated_at: model.last_updated_at
+              }))
+            })
           }
         ]
       };
@@ -3601,15 +3422,11 @@ function registerIntegrationsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully updated models for integration "${params.slug}"`,
-                success: result.success,
-                models_updated: params.models.length
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully updated models for integration "${params.slug}"`,
+              success: result.success,
+              models_updated: params.models.length
+            })
           }
         ]
       };
@@ -3628,14 +3445,10 @@ function registerIntegrationsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully deleted model "${params.model_slug}" from integration "${params.slug}"`,
-                success: result.success
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully deleted model "${params.model_slug}" from integration "${params.slug}"`,
+              success: result.success
+            })
           }
         ]
       };
@@ -3657,24 +3470,20 @@ function registerIntegrationsTools(server, service) {
         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,
-                  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
-                }))
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              total: workspaces.total,
+              integration_slug: params.slug,
+              workspaces: workspaces.data.map((ws) => ({
+                id: ws.id,
+                workspace_id: ws.workspace_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
+              }))
+            })
           }
         ]
       };
@@ -3706,15 +3515,11 @@ function registerIntegrationsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully updated workspace access for integration "${params.slug}"`,
-                success: result.success,
-                workspaces_updated: params.workspaces.length
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully updated workspace access for integration "${params.slug}"`,
+              success: result.success,
+              workspaces_updated: params.workspaces.length
+            })
           }
         ]
       };
@@ -3725,7 +3530,10 @@ function registerIntegrationsTools(server, service) {
 // src/tools/keys.tools.ts
 import { z as z7 } from "zod";
 var KEYS_TOOL_SCHEMAS = {
-  listVirtualKeys: {},
+  listVirtualKeys: {
+    current_page: z7.coerce.number().positive().optional().describe("Page number for pagination"),
+    page_size: z7.coerce.number().positive().max(100).optional().describe("Number of results per page (max 100)")
+  },
   createVirtualKey: {
     name: z7.string().describe("Display name for the virtual key"),
     provider: z7.string().describe(
@@ -3807,43 +3615,58 @@ var KEYS_TOOL_SCHEMAS = {
     id: z7.string().uuid().describe("The UUID of the API key to delete")
   }
 };
+var createApiKeySchema = z7.object(KEYS_TOOL_SCHEMAS.createApiKey).superRefine((value, ctx) => {
+  if (value.type === "workspace" && !value.workspace_id) {
+    ctx.addIssue({
+      code: z7.ZodIssueCode.custom,
+      path: ["workspace_id"],
+      message: "workspace_id is required when type is 'workspace'"
+    });
+  }
+  if (value.sub_type === "user" && !value.user_id) {
+    ctx.addIssue({
+      code: z7.ZodIssueCode.custom,
+      path: ["user_id"],
+      message: "user_id is required when sub_type is 'user'"
+    });
+  }
+});
 function registerKeysTools(server, service) {
   server.tool(
     "list_virtual_keys",
     "List provider API keys stored as virtual keys in your Portkey org. Use this to find slugs before wiring prompts/configs or auditing limits. Returns total plus name, slug, status, usage limits, rate limits, reset state, and model config.",
     KEYS_TOOL_SCHEMAS.listVirtualKeys,
-    async () => {
-      const virtualKeys = await service.keys.listVirtualKeys();
+    async (params) => {
+      const virtualKeys = await service.keys.listVirtualKeys({
+        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
-                }))
-              },
-              null,
-              2
-            )
+            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
+              }))
+            })
           }
         ]
       };
@@ -3874,15 +3697,11 @@ function registerKeysTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully created virtual key "${params.name}"`,
-                success: result.success,
-                slug
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully created virtual key "${params.name}"`,
+              success: result.success,
+              slug
+            })
           }
         ]
       };
@@ -3898,29 +3717,25 @@ function registerKeysTools(server, service) {
         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
-              },
-              null,
-              2
-            )
+            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
+            })
           }
         ]
       };
@@ -3945,16 +3760,12 @@ function registerKeysTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully updated virtual key "${params.slug}"`,
-                name: result.name,
-                slug: result.slug,
-                status: result.status
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully updated virtual key "${params.slug}"`,
+              name: result.name,
+              slug: result.slug,
+              status: result.status
+            })
           }
         ]
       };
@@ -3970,14 +3781,10 @@ function registerKeysTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully deleted virtual key "${params.slug}"`,
-                success: result.success
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully deleted virtual key "${params.slug}"`,
+              success: result.success
+            })
           }
         ]
       };
@@ -3985,70 +3792,45 @@ function registerKeysTools(server, service) {
   );
   server.tool(
     "create_api_key",
-    "Create a Portkey API key for auth. Org keys grant broader access; workspace keys are scoped. The secret is only returned once, and using the key grants access immediately according to its scopes, defaults, and limits. Workspace keys require workspace_id and user keys require user_id.",
+    "Create a Portkey API key for auth. Org keys grant broader access; workspace keys are scoped. WARNING: The key secret is returned ONCE in the tool result and will be visible in MCP transcripts and LLM context \u2014 store it securely immediately. Using the key grants access immediately according to its scopes, defaults, and limits. Workspace keys require workspace_id and user keys require user_id.",
     KEYS_TOOL_SCHEMAS.createApiKey,
     async (params) => {
-      if (params.type === "workspace" && !params.workspace_id) {
-        return {
-          content: [
-            {
-              type: "text",
-              text: "Error creating API key: workspace_id is required for workspace-type keys"
-            }
-          ],
-          isError: true
-        };
-      }
-      if (params.sub_type === "user" && !params.user_id) {
-        return {
-          content: [
-            {
-              type: "text",
-              text: "Error creating API key: user_id is required for user sub-type keys"
-            }
-          ],
-          isError: true
-        };
-      }
+      const validated = createApiKeySchema.parse(params);
       const result = await service.keys.createApiKey(
-        params.type,
-        params.sub_type,
+        validated.type,
+        validated.sub_type,
         {
-          name: params.name,
-          description: params.description,
-          workspace_id: params.workspace_id,
-          user_id: params.user_id,
-          scopes: params.scopes,
+          name: validated.name,
+          description: validated.description,
+          workspace_id: validated.workspace_id,
+          user_id: validated.user_id,
+          scopes: validated.scopes,
           usage_limits: buildUsageLimits({
-            credit_limit: params.credit_limit,
-            alert_threshold: params.alert_threshold
+            credit_limit: validated.credit_limit,
+            alert_threshold: validated.alert_threshold
           }),
-          rate_limits: buildRateLimitsRpm(params.rate_limit_rpm),
+          rate_limits: buildRateLimitsRpm(validated.rate_limit_rpm),
           defaults: (() => {
             const d = {};
-            if (params.default_config_id !== void 0)
-              d.config_id = params.default_config_id;
-            if (params.default_metadata !== void 0)
-              d.metadata = params.default_metadata;
+            if (validated.default_config_id !== void 0)
+              d.config_id = validated.default_config_id;
+            if (validated.default_metadata !== void 0)
+              d.metadata = validated.default_metadata;
             return Object.keys(d).length > 0 ? d : void 0;
           })(),
-          alert_emails: params.alert_emails,
-          expires_at: params.expires_at
+          alert_emails: validated.alert_emails,
+          expires_at: validated.expires_at
         }
       );
       return {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully created API key "${params.name}"`,
-                id: result.id,
-                key: result.key
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully created API key "${validated.name}"`,
+              id: result.id,
+              key: result.key
+            })
           }
         ]
       };
@@ -4068,40 +3850,36 @@ function registerKeysTools(server, service) {
         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
-                }))
-              },
-              null,
-              2
-            )
+            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
+              }))
+            })
           }
         ]
       };
@@ -4117,38 +3895,34 @@ function registerKeysTools(server, service) {
         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
-              },
-              null,
-              2
-            )
+            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
+            })
           }
         ]
       };
@@ -4179,14 +3953,10 @@ function registerKeysTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully updated API key "${params.id}"`,
-                success: result.success
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully updated API key "${params.id}"`,
+              success: result.success
+            })
           }
         ]
       };
@@ -4202,14 +3972,10 @@ function registerKeysTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully deleted API key "${params.id}"`,
-                success: result.success
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully deleted API key "${params.id}"`,
+              success: result.success
+            })
           }
         ]
       };
@@ -4279,14 +4045,10 @@ function registerLabelsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully created label "${params.name}"`,
-                id: result.id
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully created label "${params.name}"`,
+              id: result.id
+            })
           }
         ]
       };
@@ -4302,23 +4064,19 @@ function registerLabelsTools(server, service) {
         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
-                }))
-              },
-              null,
-              2
-            )
+            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
+              }))
+            })
           }
         ]
       };
@@ -4337,22 +4095,18 @@ function registerLabelsTools(server, service) {
         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
-              },
-              null,
-              2
-            )
+            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
+            })
           }
         ]
       };
@@ -4369,14 +4123,10 @@ function registerLabelsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully updated label "${label_id}"`,
-                success: true
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully updated label "${label_id}"`,
+              success: true
+            })
           }
         ]
       };
@@ -4392,14 +4142,10 @@ function registerLabelsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully deleted label "${params.label_id}"`,
-                success: true
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully deleted label "${params.label_id}"`,
+              success: true
+            })
           }
         ]
       };
@@ -4544,14 +4290,10 @@ function registerLimitsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                total: result.total,
-                rate_limits: result.data.map(formatRateLimit)
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              total: result.total,
+              rate_limits: result.data.map(formatRateLimit)
+            })
           }
         ]
       };
@@ -4567,7 +4309,7 @@ function registerLimitsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(formatRateLimit(result), null, 2)
+            text: JSON.stringify(formatRateLimit(result))
           }
         ]
       };
@@ -4592,14 +4334,10 @@ function registerLimitsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully created rate limit${params.name ? ` "${params.name}"` : ""}`,
-                rate_limit: formatRateLimit(result)
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully created rate limit${params.name ? ` "${params.name}"` : ""}`,
+              rate_limit: formatRateLimit(result)
+            })
           }
         ]
       };
@@ -4619,14 +4357,10 @@ function registerLimitsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully updated rate limit "${params.id}"`,
-                rate_limit: formatRateLimit(result)
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully updated rate limit "${params.id}"`,
+              rate_limit: formatRateLimit(result)
+            })
           }
         ]
       };
@@ -4642,14 +4376,10 @@ function registerLimitsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully deleted rate limit "${params.id}"`,
-                success: true
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully deleted rate limit "${params.id}"`,
+              success: true
+            })
           }
         ]
       };
@@ -4665,14 +4395,10 @@ function registerLimitsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                total: result.total,
-                usage_limits: result.data.map(formatUsageLimit)
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              total: result.total,
+              usage_limits: result.data.map(formatUsageLimit)
+            })
           }
         ]
       };
@@ -4688,7 +4414,7 @@ function registerLimitsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(formatUsageLimit(result), null, 2)
+            text: JSON.stringify(formatUsageLimit(result))
           }
         ]
       };
@@ -4714,14 +4440,10 @@ function registerLimitsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully created usage limit${params.name ? ` "${params.name}"` : ""}`,
-                usage_limit: formatUsageLimit(result)
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully created usage limit${params.name ? ` "${params.name}"` : ""}`,
+              usage_limit: formatUsageLimit(result)
+            })
           }
         ]
       };
@@ -4743,14 +4465,10 @@ function registerLimitsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully updated usage limit "${params.id}"`,
-                usage_limit: formatUsageLimit(result)
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully updated usage limit "${params.id}"`,
+              usage_limit: formatUsageLimit(result)
+            })
           }
         ]
       };
@@ -4766,14 +4484,10 @@ function registerLimitsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully deleted usage limit "${params.id}"`,
-                success: true
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully deleted usage limit "${params.id}"`,
+              success: true
+            })
           }
         ]
       };
@@ -4791,14 +4505,10 @@ function registerLimitsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                total: result.total,
-                entities: result.data.map(formatUsageLimitEntity)
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              total: result.total,
+              entities: result.data.map(formatUsageLimitEntity)
+            })
           }
         ]
       };
@@ -4817,14 +4527,10 @@ function registerLimitsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully reset usage for entity "${params.entity_id}" on limit "${params.limit_id}"`,
-                success: true
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully reset usage for entity "${params.entity_id}" on limit "${params.limit_id}"`,
+              success: true
+            })
           }
         ]
       };
@@ -4956,14 +4662,10 @@ function registerLoggingTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: "Successfully inserted log entry",
-                success: result.success
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: "Successfully inserted log entry",
+              success: result.success
+            })
           }
         ]
       };
@@ -4992,16 +4694,12 @@ function registerLoggingTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: "Successfully created log export",
-                id: result.id,
-                total: result.total,
-                object: result.object
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: "Successfully created log export",
+              id: result.id,
+              total: result.total,
+              object: result.object
+            })
           }
         ]
       };
@@ -5019,24 +4717,20 @@ function registerLoggingTools(server, service) {
         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
-                }))
-              },
-              null,
-              2
-            )
+            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
+              }))
+            })
           }
         ]
       };
@@ -5052,22 +4746,18 @@ function registerLoggingTools(server, service) {
         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
-              },
-              null,
-              2
-            )
+            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
+            })
           }
         ]
       };
@@ -5083,15 +4773,11 @@ function registerLoggingTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: result.message,
-                export_id: params.export_id,
-                status: "started"
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: result.message,
+              export_id: params.export_id,
+              status: "started"
+            })
           }
         ]
       };
@@ -5107,15 +4793,11 @@ function registerLoggingTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: result.message,
-                export_id: params.export_id,
-                status: "cancelled"
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: result.message,
+              export_id: params.export_id,
+              status: "cancelled"
+            })
           }
         ]
       };
@@ -5131,15 +4813,11 @@ function registerLoggingTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: "Download URL generated successfully",
-                export_id: params.export_id,
-                signed_url: result.signed_url
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: "Download URL generated successfully",
+              export_id: params.export_id,
+              signed_url: result.signed_url
+            })
           }
         ]
       };
@@ -5170,16 +4848,12 @@ function registerLoggingTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: "Successfully updated log export",
-                id: result.id,
-                total: result.total,
-                object: result.object
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: "Successfully updated log export",
+              id: result.id,
+              total: result.total,
+              object: result.object
+            })
           }
         ]
       };
@@ -5259,12 +4933,12 @@ var MCP_INTEGRATIONS_TOOL_SCHEMAS = {
     ).min(1).describe("Array of workspace access updates")
   }
 };
-function isRecord(value) {
+function isRecord2(value) {
   return typeof value === "object" && value !== null;
 }
 function getCustomHeaderNames(configurations) {
   const customHeaders = configurations?.custom_headers;
-  return isRecord(customHeaders) ? Object.keys(customHeaders) : void 0;
+  return isRecord2(customHeaders) ? Object.keys(customHeaders) : void 0;
 }
 function formatMcpIntegration(integration) {
   return {
@@ -5322,15 +4996,11 @@ function registerMcpIntegrationsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                total: result.total,
-                has_more: result.has_more,
-                integrations: result.data.map(formatMcpIntegration)
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              total: result.total,
+              has_more: result.has_more,
+              integrations: result.data.map(formatMcpIntegration)
+            })
           }
         ]
       };
@@ -5361,15 +5031,11 @@ function registerMcpIntegrationsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully created MCP integration "${params.name}"`,
-                id: result.id,
-                slug: result.slug
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully created MCP integration "${params.name}"`,
+              id: result.id,
+              slug: result.slug
+            })
           }
         ]
       };
@@ -5387,7 +5053,7 @@ function registerMcpIntegrationsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(formatMcpIntegration(integration), null, 2)
+            text: JSON.stringify(formatMcpIntegration(integration))
           }
         ]
       };
@@ -5407,14 +5073,10 @@ function registerMcpIntegrationsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully updated MCP integration "${id}"`,
-                success: true
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully updated MCP integration "${id}"`,
+              success: true
+            })
           }
         ]
       };
@@ -5430,14 +5092,10 @@ function registerMcpIntegrationsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully deleted MCP integration "${params.id}"`,
-                success: true
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully deleted MCP integration "${params.id}"`,
+              success: true
+            })
           }
         ]
       };
@@ -5455,11 +5113,7 @@ function registerMcpIntegrationsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              formatMcpIntegrationMetadata(metadata),
-              null,
-              2
-            )
+            text: JSON.stringify(formatMcpIntegrationMetadata(metadata))
           }
         ]
       };
@@ -5475,11 +5129,10 @@ function registerMcpIntegrationsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              { total: result.total, capabilities: result.data },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              total: result.total,
+              capabilities: result.data
+            })
           }
         ]
       };
@@ -5500,14 +5153,10 @@ function registerMcpIntegrationsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully updated capabilities for MCP integration "${params.id}"`,
-                success: true
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully updated capabilities for MCP integration "${params.id}"`,
+              success: true
+            })
           }
         ]
       };
@@ -5525,17 +5174,11 @@ function registerMcpIntegrationsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                global_workspace_access: result.global_workspace_access,
-                workspace_count: result.workspaces.length,
-                workspaces: result.workspaces.map(
-                  formatMcpIntegrationWorkspace
-                )
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              global_workspace_access: result.global_workspace_access,
+              workspace_count: result.workspaces.length,
+              workspaces: result.workspaces.map(formatMcpIntegrationWorkspace)
+            })
           }
         ]
       };
@@ -5553,14 +5196,10 @@ function registerMcpIntegrationsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully updated workspace access for MCP integration "${params.id}"`,
-                success: true
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully updated workspace access for MCP integration "${params.id}"`,
+              success: true
+            })
           }
         ]
       };
@@ -5570,6 +5209,13 @@ function registerMcpIntegrationsTools(server, service) {
 
 // src/tools/mcp-servers.tools.ts
 import { z as z12 } 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: z12.coerce.number().positive().optional().describe("Page number for pagination"),
@@ -5597,7 +5243,9 @@ var MCP_SERVERS_TOOL_SCHEMAS = {
     id: z12.string().describe("The MCP server ID or slug to test")
   },
   listMcpServerCapabilities: {
-    id: z12.string().describe("The MCP server ID or slug")
+    id: z12.string().describe("The MCP server ID or slug"),
+    current_page: z12.coerce.number().positive().optional().describe("Page number for pagination"),
+    page_size: z12.coerce.number().positive().max(100).optional().describe("Number of results per page (max 100)")
   },
   updateMcpServerCapabilities: {
     id: z12.string().describe("The MCP server ID or slug"),
@@ -5610,7 +5258,9 @@ var MCP_SERVERS_TOOL_SCHEMAS = {
     ).min(1).describe("Array of capability updates")
   },
   listMcpServerUserAccess: {
-    id: z12.string().describe("The MCP server ID or slug")
+    id: z12.string().describe("The MCP server ID or slug"),
+    current_page: z12.coerce.number().positive().optional().describe("Page number for pagination"),
+    page_size: z12.coerce.number().positive().max(100).optional().describe("Number of results per page (max 100)")
   },
   updateMcpServerUserAccess: {
     id: z12.string().describe("The MCP server ID or slug"),
@@ -5621,10 +5271,7 @@ var MCP_SERVERS_TOOL_SCHEMAS = {
       })
     ).min(1).describe("Array of user access updates")
   }
-};
-function formatFullName(firstName, lastName) {
-  return [firstName, lastName].filter(Boolean).join(" ").trim();
-}
+};
 function formatMcpServer(server) {
   return {
     id: server.id,
@@ -5666,14 +5313,10 @@ function registerMcpServersTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                total: result.total,
-                servers: result.data.map(formatMcpServer)
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              total: result.total,
+              servers: result.data.map(formatMcpServer)
+            })
           }
         ]
       };
@@ -5689,15 +5332,11 @@ function registerMcpServersTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully created MCP server "${params.name}"`,
-                id: result.id,
-                slug: result.slug
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully created MCP server "${params.name}"`,
+              id: result.id,
+              slug: result.slug
+            })
           }
         ]
       };
@@ -5713,7 +5352,7 @@ function registerMcpServersTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(formatMcpServer(mcpServer), null, 2)
+            text: JSON.stringify(formatMcpServer(mcpServer))
           }
         ]
       };
@@ -5730,14 +5369,10 @@ function registerMcpServersTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully updated MCP server "${id}"`,
-                success: true
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully updated MCP server "${id}"`,
+              success: true
+            })
           }
         ]
       };
@@ -5753,14 +5388,10 @@ function registerMcpServersTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully deleted MCP server "${params.id}"`,
-                success: true
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully deleted MCP server "${params.id}"`,
+              success: true
+            })
           }
         ]
       };
@@ -5776,7 +5407,7 @@ function registerMcpServersTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(formatMcpServerTest(result), null, 2)
+            text: JSON.stringify(formatMcpServerTest(result))
           }
         ]
       };
@@ -5788,17 +5419,21 @@ function registerMcpServersTools(server, service) {
     MCP_SERVERS_TOOL_SCHEMAS.listMcpServerCapabilities,
     async (params) => {
       const result = await service.mcpServers.listMcpServerCapabilities(
-        params.id
+        params.id,
+        {
+          current_page: params.current_page,
+          page_size: params.page_size
+        }
       );
       return {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              { total: result.total, capabilities: result.data },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              total: result.total,
+              has_more: result.has_more,
+              capabilities: result.data
+            })
           }
         ]
       };
@@ -5816,14 +5451,10 @@ function registerMcpServersTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully updated capabilities for MCP server "${params.id}"`,
-                success: true
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully updated capabilities for MCP server "${params.id}"`,
+              success: true
+            })
           }
         ]
       };
@@ -5835,21 +5466,22 @@ function registerMcpServersTools(server, service) {
     MCP_SERVERS_TOOL_SCHEMAS.listMcpServerUserAccess,
     async (params) => {
       const result = await service.mcpServers.listMcpServerUserAccess(
-        params.id
+        params.id,
+        {
+          current_page: params.current_page,
+          page_size: params.page_size
+        }
       );
       return {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                default_user_access: result.default_user_access,
-                total: result.total,
-                users: result.data.map(formatMcpServerUserAccess)
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              default_user_access: result.default_user_access,
+              total: result.total,
+              has_more: result.has_more,
+              users: result.data.map(formatMcpServerUserAccess)
+            })
           }
         ]
       };
@@ -5867,14 +5499,10 @@ function registerMcpServersTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully updated user access for MCP server "${params.id}"`,
-                success: true
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully updated user access for MCP server "${params.id}"`,
+              success: true
+            })
           }
         ]
       };
@@ -5935,16 +5563,12 @@ function registerPartialsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully created prompt partial "${params.name}"`,
-                id: result.id,
-                slug: result.slug,
-                version_id: result.version_id
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully created prompt partial "${params.name}"`,
+              id: result.id,
+              slug: result.slug,
+              version_id: result.version_id
+            })
           }
         ]
       };
@@ -5960,22 +5584,18 @@ function registerPartialsTools(server, service) {
         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
-                }))
-              },
-              null,
-              2
-            )
+            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
+              }))
+            })
           }
         ]
       };
@@ -5993,23 +5613,19 @@ function registerPartialsTools(server, service) {
         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
-              },
-              null,
-              2
-            )
+            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
+            })
           }
         ]
       };
@@ -6029,14 +5645,10 @@ function registerPartialsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully updated prompt partial "${prompt_partial_id}"`,
-                prompt_partial_version_id: result.prompt_partial_version_id
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully updated prompt partial "${prompt_partial_id}"`,
+              prompt_partial_version_id: result.prompt_partial_version_id
+            })
           }
         ]
       };
@@ -6052,14 +5664,10 @@ function registerPartialsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully deleted prompt partial "${params.prompt_partial_id}"`,
-                success: true
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully deleted prompt partial "${params.prompt_partial_id}"`,
+              success: true
+            })
           }
         ]
       };
@@ -6077,24 +5685,20 @@ function registerPartialsTools(server, service) {
         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
-                }))
-              },
-              null,
-              2
-            )
+            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
+              }))
+            })
           }
         ]
       };
@@ -6112,16 +5716,12 @@ function registerPartialsTools(server, service) {
         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
-              },
-              null,
-              2
-            )
+            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
+            })
           }
         ]
       };
@@ -6497,16 +6097,12 @@ function registerPromptsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully created prompt "${params.name}"`,
-                id: result.id,
-                slug: result.slug,
-                version_id: result.version_id
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully created prompt "${params.name}"`,
+              id: result.id,
+              slug: result.slug,
+              version_id: result.version_id
+            })
           }
         ]
       };
@@ -6522,11 +6118,7 @@ function registerPromptsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              formatPromptListResponse(prompts, params),
-              null,
-              2
-            )
+            text: JSON.stringify(formatPromptListResponse(prompts, params))
           }
         ]
       };
@@ -6558,37 +6150,33 @@ function registerPromptsTools(server, service) {
         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
-                }))
-              },
-              null,
-              2
-            )
+            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
+              }))
+            })
           }
         ]
       };
@@ -6644,16 +6232,12 @@ function registerPromptsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: "Successfully updated prompt",
-                id: result.id,
-                slug: result.slug,
-                new_version_id: result.prompt_version_id
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: "Successfully updated prompt",
+              id: result.id,
+              slug: result.slug,
+              new_version_id: result.prompt_version_id
+            })
           }
         ]
       };
@@ -6669,14 +6253,10 @@ function registerPromptsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully deleted prompt "${params.prompt_id}"`,
-                success: true
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully deleted prompt "${params.prompt_id}"`,
+              success: true
+            })
           }
         ]
       };
@@ -6694,16 +6274,12 @@ function registerPromptsTools(server, service) {
         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
-              },
-              null,
-              2
-            )
+            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
+            })
           }
         ]
       };
@@ -6721,27 +6297,23 @@ function registerPromptsTools(server, service) {
         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 ? "..." : "");
-                  })()
-                }))
-              },
-              null,
-              2
-            )
+            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 ? "..." : "");
+                })()
+              }))
+            })
           }
         ]
       };
@@ -6760,20 +6332,16 @@ function registerPromptsTools(server, service) {
         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
-                }
-              },
-              null,
-              2
-            )
+            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
+              }
+            })
           }
         ]
       };
@@ -6798,21 +6366,17 @@ function registerPromptsTools(server, service) {
         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
-              },
-              null,
-              2
-            )
+            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
+            })
           }
         ]
       };
@@ -6855,18 +6419,14 @@ function registerPromptsTools(server, service) {
         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
-              },
-              null,
-              2
-            )
+            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
+            })
           }
         ]
       };
@@ -6888,23 +6448,19 @@ function registerPromptsTools(server, service) {
         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
+            text: JSON.stringify({
+              message: `Successfully promoted prompt to ${params.target_env}`,
+              source: {
+                prompt_id: result.source_prompt_id,
+                version_id: result.source_version_id
               },
-              null,
-              2
-            )
+              target: {
+                prompt_id: result.target_prompt_id,
+                version_id: result.target_version_id,
+                action: result.action
+              },
+              promoted_at: result.promoted_at
+            })
           }
         ]
       };
@@ -6920,16 +6476,12 @@ function registerPromptsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                valid: result.valid,
-                errors: result.errors,
-                warnings: result.warnings,
-                metadata: params
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              valid: result.valid,
+              errors: result.errors,
+              warnings: result.warnings,
+              metadata: params
+            })
           }
         ]
       };
@@ -6948,7 +6500,7 @@ function registerPromptsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(formatPromptVersion(version), null, 2)
+            text: JSON.stringify(formatPromptVersion(version))
           }
         ]
       };
@@ -6959,17 +6511,6 @@ function registerPromptsTools(server, service) {
     "Update a specific prompt version's label assignment. This only assigns or removes a label, and null clears the label after you look up ids with list_prompt_labels.",
     PROMPTS_TOOL_SCHEMAS.updatePromptVersion,
     async (params) => {
-      if (params.label_id === void 0) {
-        return {
-          content: [
-            {
-              type: "text",
-              text: "Error: label_id is required \u2014 pass a label ID to assign, or null to remove the label"
-            }
-          ],
-          isError: true
-        };
-      }
       await service.prompts.updatePromptVersion(
         params.prompt_id,
         params.version_id,
@@ -6981,14 +6522,10 @@ function registerPromptsTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully updated version "${params.version_id}" of prompt "${params.prompt_id}"`,
-                success: true
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully updated version "${params.version_id}" of prompt "${params.prompt_id}"`,
+              success: true
+            })
           }
         ]
       };
@@ -7076,33 +6613,29 @@ function registerProvidersTools(server, service) {
         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
-                }))
-              },
-              null,
-              2
-            )
+            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
+              }))
+            })
           }
         ]
       };
@@ -7135,15 +6668,11 @@ function registerProvidersTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully created provider "${params.name}"`,
-                id: result.id,
-                slug: result.slug
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully created provider "${params.name}"`,
+              id: result.id,
+              slug: result.slug
+            })
           }
         ]
       };
@@ -7162,30 +6691,26 @@ function registerProvidersTools(server, service) {
         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
-              },
-              null,
-              2
-            )
+            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
+            })
           }
         ]
       };
@@ -7220,15 +6745,11 @@ function registerProvidersTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully updated provider "${params.slug}"`,
-                id: result.id,
-                slug: result.slug
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully updated provider "${params.slug}"`,
+              id: result.id,
+              slug: result.slug
+            })
           }
         ]
       };
@@ -7244,14 +6765,10 @@ function registerProvidersTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully deleted provider "${params.slug}"`,
-                success: true
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully deleted provider "${params.slug}"`,
+              success: true
+            })
           }
         ]
       };
@@ -7301,15 +6818,11 @@ function registerTracingTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully created feedback for trace "${params.trace_id}"`,
-                status: result.status,
-                feedback_ids: result.feedback_ids
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully created feedback for trace "${params.trace_id}"`,
+              status: result.status,
+              feedback_ids: result.feedback_ids
+            })
           }
         ]
       };
@@ -7329,15 +6842,11 @@ function registerTracingTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully updated feedback "${params.id}"`,
-                status: result.status,
-                feedback_ids: result.feedback_ids
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully updated feedback "${params.id}"`,
+              status: result.status,
+              feedback_ids: result.feedback_ids
+            })
           }
         ]
       };
@@ -7348,7 +6857,10 @@ function registerTracingTools(server, service) {
 // src/tools/users.tools.ts
 import { z as z18 } from "zod";
 var USERS_TOOL_SCHEMAS = {
-  listAllUsers: {},
+  listAllUsers: {
+    current_page: z18.coerce.number().positive().optional().describe("Page number for pagination"),
+    page_size: z18.coerce.number().positive().max(100).optional().describe("Number of results per page (max 100)")
+  },
   inviteUser: {
     email: z18.string().email().describe("Email address of the user to invite"),
     role: z18.enum(["admin", "member"]).describe(
@@ -7402,7 +6914,10 @@ var USERS_TOOL_SCHEMAS = {
   deleteUser: {
     user_id: z18.string().describe("The user ID to delete")
   },
-  listUserInvites: {},
+  listUserInvites: {
+    current_page: z18.coerce.number().positive().optional().describe("Page number for pagination"),
+    page_size: z18.coerce.number().positive().max(100).optional().describe("Number of results per page (max 100)")
+  },
   getUserInvite: {
     invite_id: z18.string().describe("The invite ID to retrieve")
   },
@@ -7413,13 +6928,10 @@ var USERS_TOOL_SCHEMAS = {
     invite_id: z18.string().describe("The invite ID to resend")
   }
 };
-function formatFullName2(firstName, lastName) {
-  return [firstName, lastName].filter(Boolean).join(" ").trim();
-}
 function formatUser(user) {
   return {
     id: user.id,
-    name: formatFullName2(user.first_name, user.last_name),
+    name: formatFullName(user.first_name, user.last_name),
     email: user.email,
     role: user.role,
     created_at: user.created_at,
@@ -7448,20 +6960,19 @@ function registerUsersTools(server, service) {
     "list_all_users",
     "List accepted org users with id, name, email, role, and timestamps. Use this to find a user_id before get_user, update_user, delete_user, or add_workspace_member; use list_user_invites for pending invitations.",
     USERS_TOOL_SCHEMAS.listAllUsers,
-    async () => {
-      const users = await service.users.listUsers();
+    async (params) => {
+      const users = await service.users.listUsers({
+        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)
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              total: users.total,
+              users: users.data.map(formatUser)
+            })
           }
         ]
       };
@@ -7477,15 +6988,11 @@ function registerUsersTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully invited ${params.email} as ${params.role}`,
-                invite_id: result.id,
-                invite_link: result.invite_link
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully invited ${params.email} as ${params.role}`,
+              invite_id: result.id,
+              invite_link: result.invite_link
+            })
           }
         ]
       };
@@ -7501,14 +7008,10 @@ function registerUsersTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                total_users: stats.total,
-                users: stats.data.map(formatUserAnalyticsGroup)
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              total_users: stats.total,
+              users: stats.data.map(formatUserAnalyticsGroup)
+            })
           }
         ]
       };
@@ -7524,7 +7027,7 @@ function registerUsersTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(formatUser(user), null, 2)
+            text: JSON.stringify(formatUser(user))
           }
         ]
       };
@@ -7541,14 +7044,10 @@ function registerUsersTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: "Successfully updated user",
-                user: formatUser(user)
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: "Successfully updated user",
+              user: formatUser(user)
+            })
           }
         ]
       };
@@ -7564,14 +7063,10 @@ function registerUsersTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully deleted user ${params.user_id}`,
-                success: true
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully deleted user ${params.user_id}`,
+              success: true
+            })
           }
         ]
       };
@@ -7581,20 +7076,19 @@ function registerUsersTools(server, service) {
     "list_user_invites",
     "List pending and sent invitations with id, email, role, status, and expiry. Use this to check invite state; use list_all_users for users who already accepted.",
     USERS_TOOL_SCHEMAS.listUserInvites,
-    async () => {
-      const invites = await service.users.listUserInvites();
+    async (params) => {
+      const invites = await service.users.listUserInvites({
+        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)
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              total: invites.total,
+              invites: invites.data.map(formatUserInvite)
+            })
           }
         ]
       };
@@ -7610,7 +7104,7 @@ function registerUsersTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(formatUserInvite(invite), null, 2)
+            text: JSON.stringify(formatUserInvite(invite))
           }
         ]
       };
@@ -7626,14 +7120,10 @@ function registerUsersTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully deleted invite ${params.invite_id}`,
-                success: true
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully deleted invite ${params.invite_id}`,
+              success: true
+            })
           }
         ]
       };
@@ -7649,14 +7139,10 @@ function registerUsersTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully resent invite ${params.invite_id}`,
-                success: true
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully resent invite ${params.invite_id}`,
+              success: true
+            })
           }
         ]
       };
@@ -7722,9 +7208,6 @@ var WORKSPACES_TOOL_SCHEMAS = {
     user_id: z19.string().describe("The user ID to remove")
   }
 };
-function formatFullName3(firstName, lastName) {
-  return [firstName, lastName].filter(Boolean).join(" ").trim();
-}
 function formatWorkspaceDefaults(defaults) {
   if (!defaults) {
     return null;
@@ -7748,7 +7231,7 @@ function formatWorkspaceSummary(workspace) {
 function formatWorkspaceMember(user) {
   return {
     id: user.id,
-    name: formatFullName3(user.first_name, user.last_name),
+    name: formatFullName(user.first_name, user.last_name),
     organization_role: user.org_role,
     workspace_role: user.role,
     status: user.status,
@@ -7779,14 +7262,10 @@ function registerWorkspacesTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                total: workspaces.total,
-                workspaces: workspaces.data.map(formatWorkspaceSummary)
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              total: workspaces.total,
+              workspaces: workspaces.data.map(formatWorkspaceSummary)
+            })
           }
         ]
       };
@@ -7804,7 +7283,7 @@ function registerWorkspacesTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(formatWorkspaceDetail(workspace), null, 2)
+            text: JSON.stringify(formatWorkspaceDetail(workspace))
           }
         ]
       };
@@ -7828,14 +7307,10 @@ function registerWorkspacesTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully created workspace "${params.name}"`,
-                workspace: formatWorkspaceSummary(workspace)
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully created workspace "${params.name}"`,
+              workspace: formatWorkspaceSummary(workspace)
+            })
           }
         ]
       };
@@ -7858,14 +7333,10 @@ function registerWorkspacesTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: "Successfully updated workspace",
-                workspace: formatWorkspaceSummary(workspace)
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: "Successfully updated workspace",
+              workspace: formatWorkspaceSummary(workspace)
+            })
           }
         ]
       };
@@ -7881,14 +7352,10 @@ function registerWorkspacesTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully deleted workspace ${params.workspace_id}`,
-                success: true
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully deleted workspace ${params.workspace_id}`,
+              success: true
+            })
           }
         ]
       };
@@ -7910,14 +7377,10 @@ function registerWorkspacesTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully added user to workspace as ${params.role}`,
-                member: formatWorkspaceMember(member)
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully added user to workspace as ${params.role}`,
+              member: formatWorkspaceMember(member)
+            })
           }
         ]
       };
@@ -7935,14 +7398,10 @@ function registerWorkspacesTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                total: members.total,
-                members: members.data.map(formatWorkspaceMember)
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              total: members.total,
+              members: members.data.map(formatWorkspaceMember)
+            })
           }
         ]
       };
@@ -7961,7 +7420,7 @@ function registerWorkspacesTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(formatWorkspaceMember(member), null, 2)
+            text: JSON.stringify(formatWorkspaceMember(member))
           }
         ]
       };
@@ -7983,14 +7442,10 @@ function registerWorkspacesTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully updated member role to ${params.role}`,
-                member: formatWorkspaceMember(member)
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully updated member role to ${params.role}`,
+              member: formatWorkspaceMember(member)
+            })
           }
         ]
       };
@@ -8009,14 +7464,10 @@ function registerWorkspacesTools(server, service) {
         content: [
           {
             type: "text",
-            text: JSON.stringify(
-              {
-                message: `Successfully removed user from workspace`,
-                success: true
-              },
-              null,
-              2
-            )
+            text: JSON.stringify({
+              message: `Successfully removed user from workspace`,
+              success: true
+            })
           }
         ]
       };
@@ -8110,7 +7561,7 @@ var ENTERPRISE_GATED_TOOL_NAMES = /* @__PURE__ */ new Set([
 ]);
 var ENTERPRISE_GATED_DESCRIPTION_NOTE = "Enterprise-gated. Returns 403 on non-Enterprise Portkey plans.";
 function isToolAnnotationsLike(value) {
-  if (!isRecord2(value)) {
+  if (!isRecord(value)) {
     return false;
   }
   const keys = Object.keys(value);
@@ -8170,17 +7621,14 @@ var STANDARD_TOOL_OUTPUT_SCHEMA = {
     details: z20.unknown().optional().describe("Optional structured error details")
   }).optional().describe("Structured error payload when ok is false")
 };
-function isRecord2(value) {
-  return typeof value === "object" && value !== null;
-}
 function isStandardToolEnvelope(value) {
-  if (!isRecord2(value) || typeof value.ok !== "boolean") {
+  if (!isRecord(value) || typeof value.ok !== "boolean") {
     return false;
   }
   if (value.ok) {
     return "data" in value;
   }
-  return isRecord2(value.error) && typeof value.error.message === "string";
+  return isRecord(value.error) && typeof value.error.message === "string";
 }
 function tryParseJson(text) {
   try {
@@ -8210,13 +7658,13 @@ function getErrorDetails(result) {
   if (parsed === void 0) {
     return { message: text };
   }
-  if (isRecord2(parsed) && typeof parsed.message === "string") {
+  if (isRecord(parsed) && typeof parsed.message === "string") {
     return { message: parsed.message, details: parsed };
   }
   return { message: text, details: parsed };
 }
 function formatToolEnvelope(envelope) {
-  return JSON.stringify(envelope, null, 2);
+  return JSON.stringify(envelope);
 }
 function normalizeToolResult(result) {
   const envelope = isStandardToolEnvelope(result.structuredContent) ? result.structuredContent : result.isError ? {
@@ -8354,7 +7802,7 @@ function registerAllTools(server, service, options = {}) {
 }
 
 // src/lib/auth.ts
-import crypto2 from "node:crypto";
+import crypto3 from "node:crypto";
 import { createRemoteJWKSet, jwtVerify } from "jose";
 var AUTH_SCHEMES = {
   bearer: "Bearer"
@@ -8469,9 +7917,9 @@ function extractBearerToken(req) {
   return token.trim();
 }
 function timingSafeEqual(a, b) {
-  const left = crypto2.createHash("sha256").update(a, "utf8").digest();
-  const right = crypto2.createHash("sha256").update(b, "utf8").digest();
-  return crypto2.timingSafeEqual(left, right);
+  const left = crypto3.createHash("sha256").update(a, "utf8").digest();
+  const right = crypto3.createHash("sha256").update(b, "utf8").digest();
+  return crypto3.timingSafeEqual(left, right);
 }
 var jwksCache = /* @__PURE__ */ new Map();
 async function verifyClerkToken(token, config) {
@@ -8637,7 +8085,6 @@ function getServerConfig() {
 }
 
 // src/lib/event-store.ts
-import { createClient } from "redis";
 var EVENT_STORE_CLEANUP_INTERVAL_MS = 3e4;
 var SAFE_EVENT_ID_PATTERN = /^[\w-]{1,128}$/;
 function assertSafeRedisId(id, kind) {
@@ -8753,22 +8200,14 @@ var InMemoryEventStore = class {
 };
 var RedisEventStore = class {
   client;
+  redisUrl;
   ttlSeconds;
   keyPrefix;
   connectPromise;
   constructor(redisUrl, keyPrefix, ttlSeconds) {
+    this.redisUrl = redisUrl;
     this.ttlSeconds = ttlSeconds;
     this.keyPrefix = keyPrefix;
-    this.client = createClient({
-      url: redisUrl
-    });
-    this.client.on("error", (error) => {
-      Logger.error("Redis event store error", {
-        metadata: {
-          error: error instanceof Error ? error.message : String(error)
-        }
-      });
-    });
   }
   counterKey() {
     return `${this.keyPrefix}:counter`;
@@ -8780,6 +8219,17 @@ var RedisEventStore = class {
     return `${this.keyPrefix}:stream:${assertSafeRedisId(streamId, "streamId")}:events`;
   }
   async ensureConnected() {
+    if (!this.client) {
+      const { createClient } = await import("redis");
+      this.client = createClient({ url: this.redisUrl });
+      this.client.on("error", (error) => {
+        Logger.error("Redis event store error", {
+          metadata: {
+            error: error instanceof Error ? error.message : String(error)
+          }
+        });
+      });
+    }
     if (this.client.isOpen) {
       return;
     }
@@ -8791,12 +8241,19 @@ var RedisEventStore = class {
     }
     await this.connectPromise;
   }
+  getConnectedClient() {
+    if (!this.client) {
+      throw new Error("Redis client not initialized");
+    }
+    return this.client;
+  }
   async storeEvent(streamId, message) {
     await this.ensureConnected();
-    const eventId = String(await this.client.incr(this.counterKey()));
+    const client = this.getConnectedClient();
+    const eventId = String(await client.incr(this.counterKey()));
     const eventKey = this.eventKey(eventId);
     const streamKey = this.streamEventsKey(streamId);
-    const tx = this.client.multi();
+    const tx = client.multi();
     tx.hSet(eventKey, {
       streamId,
       message: JSON.stringify(message)
@@ -8815,14 +8272,18 @@ var RedisEventStore = class {
       return void 0;
     }
     await this.ensureConnected();
-    const streamId = await this.client.hGet(this.eventKey(eventId), "streamId");
+    const streamId = await this.getConnectedClient().hGet(
+      this.eventKey(eventId),
+      "streamId"
+    );
     return streamId || void 0;
   }
   async replayEventsAfter(lastEventId, {
     send
   }) {
     await this.ensureConnected();
-    const baseEvent = await this.client.hGetAll(this.eventKey(lastEventId));
+    const client = this.getConnectedClient();
+    const baseEvent = await client.hGetAll(this.eventKey(lastEventId));
     const streamId = baseEvent.streamId;
     if (!streamId) {
       throw new Error(`Event not found for replay: ${lastEventId}`);
@@ -8831,7 +8292,7 @@ var RedisEventStore = class {
     if (!Number.isFinite(baseScore)) {
       throw new Error(`Invalid replay event ID: ${lastEventId}`);
     }
-    const eventIds = await this.client.zRangeByScore(
+    const eventIds = await client.zRangeByScore(
       this.streamEventsKey(streamId),
       `(${baseScore}`,
       "+inf"
@@ -8839,7 +8300,7 @@ var RedisEventStore = class {
     if (eventIds.length === 0) {
       return streamId;
     }
-    const tx = this.client.multi();
+    const tx = client.multi();
     for (const eventId of eventIds) {
       tx.hGet(this.eventKey(eventId), "message");
     }
@@ -8860,6 +8321,9 @@ var RedisEventStore = class {
     return streamId;
   }
   async close() {
+    if (!this.client) {
+      return;
+    }
     if (!this.client.isOpen && this.connectPromise) {
       try {
         await this.connectPromise;
@@ -9459,9 +8923,6 @@ function respondJsonRpcClientError(res, statusCode, message, code = -32602) {
     id: null
   });
 }
-function isRecord3(value) {
-  return typeof value === "object" && value !== null;
-}
 function parseRequestedToolDomains(rawQuery) {
   if (rawQuery === void 0) {
     return void 0;
@@ -9502,7 +8963,7 @@ function areToolDomainsEqual(left, right) {
   );
 }
 function getNegotiatedProtocolVersion(body) {
-  if (!isRecord3(body) || !isRecord3(body.params)) {
+  if (!isRecord(body) || !isRecord(body.params)) {
     return void 0;
   }
   const requestedVersion = body.params.protocolVersion;
@@ -9511,15 +8972,24 @@ function getNegotiatedProtocolVersion(body) {
   }
   return SUPPORTED_PROTOCOL_VERSIONS.includes(requestedVersion) ? requestedVersion : LATEST_PROTOCOL_VERSION;
 }
+function sanitizeProtocolVersion(version) {
+  return version.replace(/[^A-Za-z0-9._-]/g, "").slice(0, 64);
+}
+function getMcpProtocolVersion(req) {
+  const raw = req.headers["mcp-protocol-version"];
+  return typeof raw === "string" ? raw : void 0;
+}
 function validateRequiredProtocolVersion(protocolVersion, expectedProtocolVersion) {
   if (!protocolVersion) {
     return "Bad Request: MCP-Protocol-Version header is required for requests after initialization";
   }
   if (!SUPPORTED_PROTOCOL_VERSIONS.includes(protocolVersion)) {
-    return `Bad Request: Unsupported protocol version: ${protocolVersion} (supported versions: ${SUPPORTED_PROTOCOL_VERSIONS.join(", ")})`;
+    const safe = sanitizeProtocolVersion(protocolVersion);
+    return `Bad Request: Unsupported protocol version: ${safe} (supported versions: ${SUPPORTED_PROTOCOL_VERSIONS.join(", ")})`;
   }
   if (expectedProtocolVersion !== void 0 && protocolVersion !== expectedProtocolVersion) {
-    return `Bad Request: MCP-Protocol-Version ${protocolVersion} does not match negotiated session protocol version ${expectedProtocolVersion}`;
+    const safe = sanitizeProtocolVersion(protocolVersion);
+    return `Bad Request: MCP-Protocol-Version ${safe} does not match negotiated session protocol version ${expectedProtocolVersion}`;
   }
   return void 0;
 }
@@ -9534,7 +9004,12 @@ function createHttpAppRuntime() {
   const corsOriginConfig = allowedOrigins.includes(
     "*"
   ) ? true : allowedOrigins;
-  const healthService = process.env.PORTKEY_API_KEY ? getSharedHealthService() : null;
+  if (allowedOrigins.includes("*") && authConfig.mode === "none") {
+    Logger.warn(
+      "CORS wildcard (ALLOWED_ORIGINS=*) combined with MCP_AUTH_MODE=none: all origins are accepted with no authentication. Do not expose this server publicly."
+    );
+  }
+  const healthService = process.env.PORTKEY_API_KEY ? getSharedPortkeyService().health : null;
   const isStatefulSessionMode = config.sessionMode === "stateful";
   const publicBaseUrl = buildConfiguredPublicBaseUrl(config);
   const sessionStore = new SessionStore(config.maxSessions);
@@ -9585,10 +9060,10 @@ function createHttpAppRuntime() {
   app.use(
     helmet({
       frameguard: { action: "deny" },
-      strictTransportSecurity: {
+      strictTransportSecurity: config.tls.enabled ? {
         maxAge: 31536e3,
         includeSubDomains: true
-      }
+      } : false
     })
   );
   app.use(express.json({ limit: requestBodyLimit }));
@@ -9745,15 +9220,12 @@ function createHttpAppRuntime() {
       tls: {
         enabled: config.tls.enabled,
         protocol: config.protocol
-      },
-      redis: {
-        configured: Boolean(config.eventStore.redisUrl)
       }
     });
   });
   app.post("/mcp", async (req, res) => {
     let requestedToolDomains;
-    const protocolVersionHeader = typeof req.headers["mcp-protocol-version"] === "string" ? req.headers["mcp-protocol-version"] : void 0;
+    const protocolVersionHeader = getMcpProtocolVersion(req);
     try {
       requestedToolDomains = parseRequestedToolDomains(req.query.tools);
     } catch (error) {
@@ -9915,7 +9387,7 @@ function createHttpAppRuntime() {
       return;
     }
     const sessionId = req.headers["mcp-session-id"];
-    const protocolVersionHeader = typeof req.headers["mcp-protocol-version"] === "string" ? req.headers["mcp-protocol-version"] : void 0;
+    const protocolVersionHeader = getMcpProtocolVersion(req);
     let requestedToolDomains;
     try {
       requestedToolDomains = parseRequestedToolDomains(req.query.tools);
@@ -9983,7 +9455,7 @@ function createHttpAppRuntime() {
       return;
     }
     const sessionId = req.headers["mcp-session-id"];
-    const protocolVersionHeader = typeof req.headers["mcp-protocol-version"] === "string" ? req.headers["mcp-protocol-version"] : void 0;
+    const protocolVersionHeader = getMcpProtocolVersion(req);
     if (!sessionId) {
       res.status(400).json({
         jsonrpc: "2.0",