@terreno/api 57.20.0 → 58.0.0-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (183) hide show
  1. package/CHANGELOG.md +93 -0
  2. package/README.md +1 -1
  3. package/biome.jsonc +3 -2
  4. package/dist/api.d.ts +3 -16
  5. package/dist/api.js +0 -9
  6. package/dist/auth.d.ts +3 -2
  7. package/dist/auth.js +95 -5
  8. package/dist/authRecovery.d.ts +2 -1
  9. package/dist/authRecovery.js +35 -17
  10. package/dist/collectionRegistry.d.ts +3 -4
  11. package/dist/collectionRegistry.js +0 -1
  12. package/dist/consentApp.d.ts +1 -1
  13. package/dist/consentApp.js +58 -2
  14. package/dist/frameworkModelNames.d.ts +4 -0
  15. package/dist/frameworkModelNames.js +4 -0
  16. package/dist/index.d.ts +8 -5
  17. package/dist/index.js +14 -20
  18. package/dist/mcp/adminTracking.d.ts +28 -0
  19. package/dist/mcp/adminTracking.js +80 -0
  20. package/dist/mcp/auth.d.ts +6 -0
  21. package/dist/mcp/auth.js +12 -2
  22. package/dist/mcp/server.d.ts +8 -0
  23. package/dist/mcp/server.js +48 -4
  24. package/dist/mcp/serviceTokens.d.ts +21 -1
  25. package/dist/mcp/serviceTokens.js +159 -183
  26. package/dist/migrations/builtin/mcpServiceTokenStringIds.d.ts +18 -0
  27. package/dist/migrations/builtin/mcpServiceTokenStringIds.js +67 -0
  28. package/dist/models/mcpOAuthToken.js +27 -0
  29. package/dist/models/mcpRequestLog.d.ts +2 -0
  30. package/dist/models/mcpRequestLog.js +73 -0
  31. package/dist/models/mcpServiceToken.js +40 -4
  32. package/dist/models/mcpToolSetting.d.ts +2 -0
  33. package/dist/models/mcpToolSetting.js +119 -0
  34. package/dist/models/versionConfig.d.ts +2 -0
  35. package/dist/openApiBuilder.d.ts +4 -0
  36. package/dist/openApiBuilder.js +2 -0
  37. package/dist/rbac/auditModel.d.ts +2 -1
  38. package/dist/rbac/realtimeAccess.d.ts +5 -4
  39. package/dist/rbac/realtimeAccess.js +17 -64
  40. package/dist/realtime/changeStreamWatcher.d.ts +8 -63
  41. package/dist/realtime/changeStreamWatcher.js +32 -391
  42. package/dist/realtime/realtimeApp.d.ts +14 -27
  43. package/dist/realtime/realtimeApp.js +14 -220
  44. package/dist/realtime/types.d.ts +0 -64
  45. package/dist/sync/executors.js +14 -2
  46. package/dist/sync/socketHandlers.d.ts +1 -1
  47. package/dist/sync/socketHandlers.js +1 -1
  48. package/dist/terrenoApp.d.ts +19 -5
  49. package/dist/terrenoApp.js +21 -14
  50. package/dist/tests/models.d.ts +17 -22
  51. package/dist/tests/models.js +7 -1
  52. package/dist/tests/openApiResponseSchema.d.ts +39 -0
  53. package/dist/tests/openApiResponseSchema.js +56 -0
  54. package/dist/tests/testHelper.d.ts +6 -12
  55. package/dist/tests.d.ts +2 -0
  56. package/dist/tests.js +6 -1
  57. package/dist/types/mcpAdmin.d.ts +58 -0
  58. package/dist/types/mcpAdmin.js +2 -0
  59. package/dist/types/mcpOAuth.d.ts +2 -0
  60. package/dist/types/mcpServiceToken.d.ts +9 -4
  61. package/dist/versionCheckPlugin.d.ts +1 -1
  62. package/dist/versionCheckPlugin.js +25 -2
  63. package/e2e/smoke.ts +193 -0
  64. package/package.json +14 -8
  65. package/src/__snapshots__/openApi.test.ts.snap +4986 -2478
  66. package/src/__snapshots__/openApiBuilder.test.ts.snap +836 -0
  67. package/src/__tests__/openApiResponseSchema.test.ts +148 -0
  68. package/src/__tests__/versionCheckPlugin.test.ts +72 -0
  69. package/src/adminModelRouter.test.ts +8 -6
  70. package/src/api.arrayOperations.test.ts +31 -22
  71. package/src/api.hooks.test.ts +12 -11
  72. package/src/api.query.test.ts +2 -2
  73. package/src/api.test.ts +17 -14
  74. package/src/api.ts +3 -27
  75. package/src/audit/auditApp.test.ts +1 -1
  76. package/src/audit/cloudTasksEnqueue.test.ts +19 -14
  77. package/src/auth.test.ts +21 -7
  78. package/src/auth.ts +116 -5
  79. package/src/authOpenApi.test.ts +316 -0
  80. package/src/authRecovery.test.ts +10 -10
  81. package/src/authRecovery.ts +47 -19
  82. package/src/authVerification.test.ts +7 -7
  83. package/src/betterAuthFeatures.test.ts +3 -2
  84. package/src/betterAuthLinking.test.ts +3 -1
  85. package/src/betterAuthOAuthHandoff.test.ts +13 -5
  86. package/src/betterAuthSetup.test.ts +77 -51
  87. package/src/collectionRegistry.test.ts +4 -4
  88. package/src/collectionRegistry.ts +3 -5
  89. package/src/consentApp.test.ts +98 -0
  90. package/src/consentApp.ts +67 -2
  91. package/src/frameworkModelNames.test.ts +8 -0
  92. package/src/frameworkModelNames.ts +4 -0
  93. package/src/githubAuth.test.ts +11 -11
  94. package/src/index.ts +14 -28
  95. package/src/isolated/migrateCliConnect.isolated.ts +3 -2
  96. package/src/mcp/actionTools.test.ts +13 -7
  97. package/src/mcp/adminTracking.test.ts +272 -0
  98. package/src/mcp/adminTracking.ts +104 -0
  99. package/src/mcp/auth.test.ts +7 -3
  100. package/src/mcp/auth.ts +18 -2
  101. package/src/mcp/oauth.test.ts +13 -13
  102. package/src/mcp/server.ts +67 -4
  103. package/src/mcp/serviceTokens.sync.test.ts +230 -0
  104. package/src/mcp/serviceTokens.test.ts +114 -62
  105. package/src/mcp/serviceTokens.ts +193 -212
  106. package/src/mcp/toolGenerator.test.ts +9 -5
  107. package/src/migrations/builtin/mcpServiceTokenStringIds.test.ts +194 -0
  108. package/src/migrations/builtin/mcpServiceTokenStringIds.ts +121 -0
  109. package/src/migrations/cli.test.ts +15 -14
  110. package/src/migrations/cli.ts +1 -1
  111. package/src/migrations/generate.test.ts +2 -2
  112. package/src/migrations/load.test.ts +1 -1
  113. package/src/migrations/lock.test.ts +8 -3
  114. package/src/migrations/runner.test.ts +16 -5
  115. package/src/migrations/schemaCatalog.test.ts +4 -1
  116. package/src/models/mcpOAuthToken.test.ts +42 -0
  117. package/src/models/mcpOAuthToken.ts +32 -0
  118. package/src/models/mcpRequestLog.ts +81 -0
  119. package/src/models/mcpServiceToken.test.ts +75 -5
  120. package/src/models/mcpServiceToken.ts +61 -14
  121. package/src/models/mcpToolSetting.test.ts +69 -0
  122. package/src/models/mcpToolSetting.ts +138 -0
  123. package/src/models/versionConfig.ts +2 -0
  124. package/src/notifications/notificationsApp.test.ts +5 -8
  125. package/src/notifiers/slackWebApi.test.ts +30 -8
  126. package/src/openApi.test.ts +4 -4
  127. package/src/openApiBuilder.test.ts +34 -1
  128. package/src/openApiBuilder.ts +5 -0
  129. package/src/openApiValidator.test.ts +3 -3
  130. package/src/orgs/orgPermissions.test.ts +2 -2
  131. package/src/orgs/orgPlugin.test.ts +4 -3
  132. package/src/orgs/orgSecurityDefects.test.ts +3 -1
  133. package/src/orgs/organizationSettings.test.ts +1 -1
  134. package/src/orgs/orgsApp.test.ts +5 -3
  135. package/src/permissions.test.ts +2 -2
  136. package/src/rateLimit/rateLimit.test.ts +25 -10
  137. package/src/rateLimit/redisStore.ioredis.test.ts +3 -2
  138. package/src/rbac/assertAllowed.test.ts +1 -1
  139. package/src/rbac/auditModel.ts +10 -2
  140. package/src/rbac/realtimeAccess.test.ts +20 -171
  141. package/src/rbac/realtimeAccess.ts +17 -82
  142. package/src/rbac/routes.test.ts +1 -1
  143. package/src/rbac/userWriteGuards.test.ts +8 -5
  144. package/src/realtime/changeStreamWatcher.ts +43 -506
  145. package/src/realtime/realtime.test.ts +211 -2547
  146. package/src/realtime/realtimeApp.ts +16 -295
  147. package/src/realtime/types.ts +0 -72
  148. package/src/scrubAdminFields.test.ts +1 -1
  149. package/src/sync/adminWindowMutation.test.ts +4 -3
  150. package/src/sync/executors.test.ts +29 -1
  151. package/src/sync/executors.ts +23 -2
  152. package/src/sync/scripts/compactTombstones.test.ts +4 -3
  153. package/src/sync/socketHandlers.ts +1 -1
  154. package/src/sync/sync.test.ts +1 -1
  155. package/src/sync/syncPhaseC.test.ts +14 -11
  156. package/src/sync/syncRoutes.test.ts +8 -8
  157. package/src/sync/syncSeqPlugin.test.ts +1 -2
  158. package/src/sync/syncSocket.test.ts +78 -113
  159. package/src/terrenoApp.mcpServiceTokens.test.ts +16 -8
  160. package/src/terrenoApp.migrations.test.ts +8 -7
  161. package/src/terrenoApp.ts +38 -18
  162. package/src/tests/betterAuthStubs.ts +3 -2
  163. package/src/tests/bunSetup.ts +1 -1
  164. package/src/tests/models.ts +10 -0
  165. package/src/tests/openApiResponseSchema.ts +104 -0
  166. package/src/tests/testEnv.ts +7 -0
  167. package/src/tests.ts +8 -0
  168. package/src/types/mcpAdmin.ts +80 -0
  169. package/src/types/mcpOAuth.ts +5 -0
  170. package/src/types/mcpServiceToken.ts +12 -4
  171. package/src/versionCheckPlugin.ts +41 -2
  172. package/src/webhooks/verifiers/hmac.test.ts +1 -1
  173. package/tsconfig.typecheck.json +14 -0
  174. package/dist/realtime/deprecation.d.ts +0 -13
  175. package/dist/realtime/deprecation.js +0 -31
  176. package/dist/realtime/queryStore.d.ts +0 -37
  177. package/dist/realtime/queryStore.js +0 -103
  178. package/dist/realtime/registry.d.ts +0 -15
  179. package/dist/realtime/registry.js +0 -52
  180. package/src/realtime/deprecation.test.ts +0 -60
  181. package/src/realtime/deprecation.ts +0 -33
  182. package/src/realtime/queryStore.ts +0 -122
  183. package/src/realtime/registry.ts +0 -84
@@ -9,7 +9,11 @@ export declare const FRAMEWORK_MODEL_PUBLIC_NAMES: {
9
9
  readonly TerrenoInboxNotification: "Notification";
10
10
  readonly TerrenoJob: "Job";
11
11
  readonly TerrenoJobSchedule: "JobSchedule";
12
+ readonly TerrenoMcpOAuthClient: "McpOAuthClient";
13
+ readonly TerrenoMcpOAuthToken: "McpOAuthToken";
14
+ readonly TerrenoMcpRequestLog: "McpRequestLog";
12
15
  readonly TerrenoMcpServiceToken: "McpServiceToken";
16
+ readonly TerrenoMcpToolSetting: "McpToolSetting";
13
17
  readonly TerrenoMembership: "Membership";
14
18
  readonly TerrenoNotificationPreference: "NotificationPreference";
15
19
  readonly TerrenoOrganization: "Organization";
@@ -12,7 +12,11 @@ exports.FRAMEWORK_MODEL_PUBLIC_NAMES = {
12
12
  TerrenoInboxNotification: "Notification",
13
13
  TerrenoJob: "Job",
14
14
  TerrenoJobSchedule: "JobSchedule",
15
+ TerrenoMcpOAuthClient: "McpOAuthClient",
16
+ TerrenoMcpOAuthToken: "McpOAuthToken",
17
+ TerrenoMcpRequestLog: "McpRequestLog",
15
18
  TerrenoMcpServiceToken: "McpServiceToken",
19
+ TerrenoMcpToolSetting: "McpToolSetting",
16
20
  TerrenoMembership: "Membership",
17
21
  TerrenoNotificationPreference: "NotificationPreference",
18
22
  TerrenoOrganization: "Organization",
package/dist/index.d.ts CHANGED
@@ -36,6 +36,7 @@ export { FRAMEWORK_MODEL_PUBLIC_NAMES, type FrameworkModelCompiledName, type Fra
36
36
  export * from "./githubAuth";
37
37
  export * from "./httpClient";
38
38
  export * from "./logger";
39
+ export { type McpRequestLogAppOption, type ResolvedMcpRequestLogOptions, resolveMcpRequestLogOption, } from "./mcp/adminTracking";
39
40
  export { extractAuthFromHeaders, extractUserFromHeaders, type MCPAuthContext, type MCPAuthResult, } from "./mcp/auth";
40
41
  export { addMcpOAuthRoutes, type McpOAuthRoutesOptions } from "./mcp/oauth";
41
42
  export { buildAuthorizationServerMetadata, buildProtectedResourceMetadata, type McpOAuthAppOption, type McpOAuthOptions, type ResolvedMcpOAuthOptions, resolveMcpOAuthOption, sendMcpOAuthChallenge, } from "./mcp/oauthMetadata";
@@ -43,10 +44,11 @@ export type { MCPCustomTool } from "./mcp/registry";
43
44
  export { clearMCPRegistry, getMCPRegistry, registerMCPModel, registerMCPTool, updateMCPRegistryOptions, } from "./mcp/registry";
44
45
  export { generateInputSchema, generateToolDescription } from "./mcp/schemaGenerator";
45
46
  export { type MCPServerOptions, mountMCPServer } from "./mcp/server";
46
- export { addMcpServiceTokenRoutes, MAX_ACTIVE_MCP_SERVICE_TOKENS, type McpServiceTokenRoutesOptions, type McpServiceTokensAppOption, resolveMcpServiceTokensOption, } from "./mcp/serviceTokens";
47
+ export { addMcpServiceTokenRoutes, createMcpServiceTokenRouter, MAX_ACTIVE_MCP_SERVICE_TOKENS, MCP_SERVICE_TOKENS_ROUTE_PATH, MCP_SERVICE_TOKENS_SYNC_COLLECTION, type McpServiceTokenRoutesOptions, type McpServiceTokensAppOption, resolveMcpServiceTokensOption, toPublicMcpServiceToken, } from "./mcp/serviceTokens";
47
48
  export { generateAllTools, generateToolsForEntry, getAllMCPTools, type MCPToolDefinition, } from "./mcp/toolGenerator";
48
49
  export type { MCPConfig, MCPMethod, MCPRegistryEntry, MCPRequest, MCPToolArgs, MCPToolResult, } from "./mcp/types";
49
50
  export * from "./middleware";
51
+ export * from "./migrations/builtin/mcpServiceTokenStringIds";
50
52
  export * from "./migrations/generate";
51
53
  export * from "./migrations/load";
52
54
  export * from "./migrations/lock";
@@ -59,7 +61,9 @@ export { McpOAuthAuthorization } from "./models/mcpOAuthAuthorization";
59
61
  export { McpOAuthClient } from "./models/mcpOAuthClient";
60
62
  export { McpOAuthRevokedFamily } from "./models/mcpOAuthRevokedFamily";
61
63
  export { McpOAuthFamilyRevokedError, McpOAuthToken } from "./models/mcpOAuthToken";
64
+ export { McpRequestLog } from "./models/mcpRequestLog";
62
65
  export * from "./models/mcpServiceToken";
66
+ export { McpToolSetting } from "./models/mcpToolSetting";
63
67
  export * from "./models/notification";
64
68
  export * from "./models/notificationPreference";
65
69
  export * from "./models/versionConfig";
@@ -103,13 +107,11 @@ export * from "./rbac/userPlugin";
103
107
  export { assertCanWriteTargetUser, assertCanWriteUserIdentity, isRbacUserModelName, isWriteKeyForField, USER_IDENTITY_FIELDS, USER_UPDATE_IDENTITY_ACTION, } from "./rbac/userWriteGuards";
104
108
  export { type AuthorizedEmitEntry, emitPayloadToAuthorizedRoom, emitSyncDeltaForChange, startChangeStreamWatcher, stopChangeStreamWatcher, } from "./realtime/changeStreamWatcher";
105
109
  export { matchesQuery } from "./realtime/queryMatcher";
106
- export { addQuerySubscription, clearQueryStore, computeQueryId, getQuerySubscriptionsForCollection, removeAllSocketQueries, removeQuerySubscription, } from "./realtime/queryStore";
107
- export { installRealtimeSocketHandlers, MAX_DOCUMENT_SUBSCRIPTIONS, MAX_MODEL_SUBSCRIPTIONS, MAX_QUERY_SUBSCRIPTIONS, RealtimeApp, type RealtimeSocketLike, } from "./realtime/realtimeApp";
108
- export { clearRealtimeRegistry, findRegistryEntryByCollection, findRegistryEntryByRoutePath, getRealtimeRegistry, type RealtimeRegistryEntry, registerRealtime, updateRealtimeRegistryOptions, } from "./realtime/registry";
110
+ export { installRealtimeSocketHandlers, RealtimeApp, type RealtimeSocketLike, } from "./realtime/realtimeApp";
109
111
  export { DEFAULT_SESSION_REVALIDATION_INTERVAL_MS, loadFullUserForSocket, type RevalidatableSocket, type RevalidationOutcome, reresolveSyncRoomsForSocket, revalidateSocketSession, runSessionRevalidationSweep, type SessionRevalidationHandle, type SessionRevalidationOptions, startSessionRevalidationSweep, } from "./realtime/sessionRevalidation";
110
112
  export { type AuthenticatableSocket, type BetterAuthSocketOptions, createBetterAuthValidator, createLegacyJwtValidator, createSocketAuthMiddleware, type SocketAuthValidator, } from "./realtime/socketAuth";
111
113
  export { type DecodedRealtimeToken, getSocketUser, type SocketDataBag, type SocketWithDecodedToken, } from "./realtime/socketUser";
112
- export type { ChangeStreamConfig, DocumentSubscription, QuerySubscription, RealtimeAppOptions, RealtimeConfig, RealtimeEvent, } from "./realtime/types";
114
+ export type { ChangeStreamConfig, RealtimeAppOptions } from "./realtime/types";
113
115
  export * from "./requestContext";
114
116
  export { type DescribeModelForRouterOptions, type DescribeModelOptions, describeModel, describeModelForRouter, type FieldDescription, type FieldKind, fieldDescriptionToAdminMeta, fieldDescriptionToOpenApiProperty, fieldDescriptionToZodType, type ModelDescription, modelDescriptionToAdminFields, modelDescriptionToOpenApiSpec, nestDottedFieldDescriptions, SYSTEM_FIELD_PATHS, } from "./schemaMetadata";
115
117
  export * from "./scriptRunner";
@@ -137,6 +139,7 @@ export * from "./terrenoPlugin";
137
139
  export * from "./transformers";
138
140
  export * from "./types/consentForm";
139
141
  export * from "./types/consentResponse";
142
+ export type * from "./types/mcpAdmin";
140
143
  export type { McpOAuthAuthorizationDocument, McpOAuthAuthorizationStatus, McpOAuthClientDocument, McpOAuthConfidentialClientOptions, McpOAuthRevokedFamilyDocument, McpOAuthTokenDocument, McpOAuthTokenEndpointAuthMethod, } from "./types/mcpOAuth";
141
144
  export * from "./utils";
142
145
  export * from "./versionCheckPlugin";
package/dist/index.js CHANGED
@@ -14,9 +14,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
14
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
- exports.createNotificationService = exports.configureNotificationService = exports.McpOAuthToken = exports.McpOAuthFamilyRevokedError = exports.McpOAuthRevokedFamily = exports.McpOAuthClient = exports.McpOAuthAuthorization = exports.getAllMCPTools = exports.generateToolsForEntry = exports.generateAllTools = exports.resolveMcpServiceTokensOption = exports.MAX_ACTIVE_MCP_SERVICE_TOKENS = exports.addMcpServiceTokenRoutes = exports.mountMCPServer = exports.generateToolDescription = exports.generateInputSchema = exports.updateMCPRegistryOptions = exports.registerMCPTool = exports.registerMCPModel = exports.getMCPRegistry = exports.clearMCPRegistry = exports.sendMcpOAuthChallenge = exports.resolveMcpOAuthOption = exports.buildProtectedResourceMetadata = exports.buildAuthorizationServerMetadata = exports.addMcpOAuthRoutes = exports.extractUserFromHeaders = exports.extractAuthFromHeaders = exports.publicFrameworkModelName = exports.FRAMEWORK_MODEL_PUBLIC_NAMES = exports.getConsentStatuses = exports.resetAuditRecorderForTests = exports.recordAuditEvent = exports.persistEnqueuedAuditEvent = exports.maybeRecordAdminAudit = exports.isAuditRecorderInstalled = exports.flushAuditRecorderForTests = exports.persistRbacAuditToAuditEvent = exports.createCloudTasksAuditEnqueue = exports.auditEnqueueFromEnv = exports.AUDIT_SECRET_HEADER = exports.createAuditEventModel = exports.AUDIT_EVENT_SOURCES = exports.AuditApp = exports.recordSelfSecurityAction = exports.createSecurityEventsPlugin = exports.mountOrgSecurityRoutes = exports.createOrgSecurityAuthorizer = exports.suspendMembershipAction = exports.ISSUE_SIGN_IN_LINK_PERMISSION = void 0;
18
- exports.loadFullUserForSocket = exports.DEFAULT_SESSION_REVALIDATION_INTERVAL_MS = exports.updateRealtimeRegistryOptions = exports.registerRealtime = exports.getRealtimeRegistry = exports.findRegistryEntryByRoutePath = exports.findRegistryEntryByCollection = exports.clearRealtimeRegistry = exports.RealtimeApp = exports.MAX_QUERY_SUBSCRIPTIONS = exports.MAX_MODEL_SUBSCRIPTIONS = exports.MAX_DOCUMENT_SUBSCRIPTIONS = exports.installRealtimeSocketHandlers = exports.removeQuerySubscription = exports.removeAllSocketQueries = exports.getQuerySubscriptionsForCollection = exports.computeQueryId = exports.clearQueryStore = exports.addQuerySubscription = exports.matchesQuery = exports.stopChangeStreamWatcher = exports.startChangeStreamWatcher = exports.emitSyncDeltaForChange = exports.emitPayloadToAuthorizedRoom = exports.USER_UPDATE_IDENTITY_ACTION = exports.USER_IDENTITY_FIELDS = exports.isWriteKeyForField = exports.isRbacUserModelName = exports.assertCanWriteUserIdentity = exports.assertCanWriteTargetUser = exports.rbacRouter = exports.terrenoDefaultRoles = exports.READ_ONLY_ROLE_PERMISSIONS = exports.organizationOperatorRole = exports.expandRolePermissions = exports.createRbacRoleModel = exports.ORG_ADMIN_PERMISSION_BUNDLE = exports.membershipOrgAdminPermissionSource = exports.MEMBERSHIP_ORG_ADMIN_PERMISSION_SOURCE_NAME = exports.backfillAdmins = exports.recordRbacAudit = exports.createRbacAuditModel = exports.assertAllowed = exports.DEFAULT_WINDOW_MS = exports.DEFAULT_AUTH_MAX = exports.DEFAULT_API_MAX = exports.createRouteRateLimitMiddleware = exports.notificationsBeforeSend = exports.NotificationsApp = exports.getNotificationService = void 0;
19
- exports.z = exports.WebhooksApp = exports.twilioSignature = exports.stripeSignature = exports.sendgridEventSignature = exports.hmacSignature = exports.createMemoryIdempotencyStore = exports.stripAdminBodyFields = exports.scrubAdminFields = exports.adminBodyFieldsToStrip = exports.SYSTEM_FIELD_PATHS = exports.nestDottedFieldDescriptions = exports.modelDescriptionToOpenApiSpec = exports.modelDescriptionToAdminFields = exports.fieldDescriptionToZodType = exports.fieldDescriptionToOpenApiProperty = exports.fieldDescriptionToAdminMeta = exports.describeModelForRouter = exports.describeModel = exports.getSocketUser = exports.createSocketAuthMiddleware = exports.createLegacyJwtValidator = exports.createBetterAuthValidator = exports.startSessionRevalidationSweep = exports.runSessionRevalidationSweep = exports.revalidateSocketSession = exports.reresolveSyncRoomsForSocket = void 0;
17
+ exports.McpOAuthClient = exports.McpOAuthAuthorization = exports.getAllMCPTools = exports.generateToolsForEntry = exports.generateAllTools = exports.toPublicMcpServiceToken = exports.resolveMcpServiceTokensOption = exports.MCP_SERVICE_TOKENS_SYNC_COLLECTION = exports.MCP_SERVICE_TOKENS_ROUTE_PATH = exports.MAX_ACTIVE_MCP_SERVICE_TOKENS = exports.createMcpServiceTokenRouter = exports.addMcpServiceTokenRoutes = exports.mountMCPServer = exports.generateToolDescription = exports.generateInputSchema = exports.updateMCPRegistryOptions = exports.registerMCPTool = exports.registerMCPModel = exports.getMCPRegistry = exports.clearMCPRegistry = exports.sendMcpOAuthChallenge = exports.resolveMcpOAuthOption = exports.buildProtectedResourceMetadata = exports.buildAuthorizationServerMetadata = exports.addMcpOAuthRoutes = exports.extractUserFromHeaders = exports.extractAuthFromHeaders = exports.resolveMcpRequestLogOption = exports.publicFrameworkModelName = exports.FRAMEWORK_MODEL_PUBLIC_NAMES = exports.getConsentStatuses = exports.resetAuditRecorderForTests = exports.recordAuditEvent = exports.persistEnqueuedAuditEvent = exports.maybeRecordAdminAudit = exports.isAuditRecorderInstalled = exports.flushAuditRecorderForTests = exports.persistRbacAuditToAuditEvent = exports.createCloudTasksAuditEnqueue = exports.auditEnqueueFromEnv = exports.AUDIT_SECRET_HEADER = exports.createAuditEventModel = exports.AUDIT_EVENT_SOURCES = exports.AuditApp = exports.recordSelfSecurityAction = exports.createSecurityEventsPlugin = exports.mountOrgSecurityRoutes = exports.createOrgSecurityAuthorizer = exports.suspendMembershipAction = exports.ISSUE_SIGN_IN_LINK_PERMISSION = void 0;
18
+ exports.getSocketUser = exports.createSocketAuthMiddleware = exports.createLegacyJwtValidator = exports.createBetterAuthValidator = exports.startSessionRevalidationSweep = exports.runSessionRevalidationSweep = exports.revalidateSocketSession = exports.reresolveSyncRoomsForSocket = exports.loadFullUserForSocket = exports.DEFAULT_SESSION_REVALIDATION_INTERVAL_MS = exports.RealtimeApp = exports.installRealtimeSocketHandlers = exports.matchesQuery = exports.stopChangeStreamWatcher = exports.startChangeStreamWatcher = exports.emitSyncDeltaForChange = exports.emitPayloadToAuthorizedRoom = exports.USER_UPDATE_IDENTITY_ACTION = exports.USER_IDENTITY_FIELDS = exports.isWriteKeyForField = exports.isRbacUserModelName = exports.assertCanWriteUserIdentity = exports.assertCanWriteTargetUser = exports.rbacRouter = exports.terrenoDefaultRoles = exports.READ_ONLY_ROLE_PERMISSIONS = exports.organizationOperatorRole = exports.expandRolePermissions = exports.createRbacRoleModel = exports.ORG_ADMIN_PERMISSION_BUNDLE = exports.membershipOrgAdminPermissionSource = exports.MEMBERSHIP_ORG_ADMIN_PERMISSION_SOURCE_NAME = exports.backfillAdmins = exports.recordRbacAudit = exports.createRbacAuditModel = exports.assertAllowed = exports.DEFAULT_WINDOW_MS = exports.DEFAULT_AUTH_MAX = exports.DEFAULT_API_MAX = exports.createRouteRateLimitMiddleware = exports.notificationsBeforeSend = exports.NotificationsApp = exports.getNotificationService = exports.createNotificationService = exports.configureNotificationService = exports.McpToolSetting = exports.McpRequestLog = exports.McpOAuthToken = exports.McpOAuthFamilyRevokedError = exports.McpOAuthRevokedFamily = void 0;
19
+ exports.z = exports.WebhooksApp = exports.twilioSignature = exports.stripeSignature = exports.sendgridEventSignature = exports.hmacSignature = exports.createMemoryIdempotencyStore = exports.stripAdminBodyFields = exports.scrubAdminFields = exports.adminBodyFieldsToStrip = exports.SYSTEM_FIELD_PATHS = exports.nestDottedFieldDescriptions = exports.modelDescriptionToOpenApiSpec = exports.modelDescriptionToAdminFields = exports.fieldDescriptionToZodType = exports.fieldDescriptionToOpenApiProperty = exports.fieldDescriptionToAdminMeta = exports.describeModelForRouter = exports.describeModel = void 0;
20
20
  var accessActions_1 = require("./accountSecurity/accessActions");
21
21
  Object.defineProperty(exports, "ISSUE_SIGN_IN_LINK_PERMISSION", { enumerable: true, get: function () { return accessActions_1.ISSUE_SIGN_IN_LINK_PERMISSION; } });
22
22
  __exportStar(require("./accountSecurity/accountSecurityApp"), exports);
@@ -77,6 +77,8 @@ Object.defineProperty(exports, "publicFrameworkModelName", { enumerable: true, g
77
77
  __exportStar(require("./githubAuth"), exports);
78
78
  __exportStar(require("./httpClient"), exports);
79
79
  __exportStar(require("./logger"), exports);
80
+ var adminTracking_1 = require("./mcp/adminTracking");
81
+ Object.defineProperty(exports, "resolveMcpRequestLogOption", { enumerable: true, get: function () { return adminTracking_1.resolveMcpRequestLogOption; } });
80
82
  var auth_1 = require("./mcp/auth");
81
83
  Object.defineProperty(exports, "extractAuthFromHeaders", { enumerable: true, get: function () { return auth_1.extractAuthFromHeaders; } });
82
84
  Object.defineProperty(exports, "extractUserFromHeaders", { enumerable: true, get: function () { return auth_1.extractUserFromHeaders; } });
@@ -100,13 +102,18 @@ var server_1 = require("./mcp/server");
100
102
  Object.defineProperty(exports, "mountMCPServer", { enumerable: true, get: function () { return server_1.mountMCPServer; } });
101
103
  var serviceTokens_1 = require("./mcp/serviceTokens");
102
104
  Object.defineProperty(exports, "addMcpServiceTokenRoutes", { enumerable: true, get: function () { return serviceTokens_1.addMcpServiceTokenRoutes; } });
105
+ Object.defineProperty(exports, "createMcpServiceTokenRouter", { enumerable: true, get: function () { return serviceTokens_1.createMcpServiceTokenRouter; } });
103
106
  Object.defineProperty(exports, "MAX_ACTIVE_MCP_SERVICE_TOKENS", { enumerable: true, get: function () { return serviceTokens_1.MAX_ACTIVE_MCP_SERVICE_TOKENS; } });
107
+ Object.defineProperty(exports, "MCP_SERVICE_TOKENS_ROUTE_PATH", { enumerable: true, get: function () { return serviceTokens_1.MCP_SERVICE_TOKENS_ROUTE_PATH; } });
108
+ Object.defineProperty(exports, "MCP_SERVICE_TOKENS_SYNC_COLLECTION", { enumerable: true, get: function () { return serviceTokens_1.MCP_SERVICE_TOKENS_SYNC_COLLECTION; } });
104
109
  Object.defineProperty(exports, "resolveMcpServiceTokensOption", { enumerable: true, get: function () { return serviceTokens_1.resolveMcpServiceTokensOption; } });
110
+ Object.defineProperty(exports, "toPublicMcpServiceToken", { enumerable: true, get: function () { return serviceTokens_1.toPublicMcpServiceToken; } });
105
111
  var toolGenerator_1 = require("./mcp/toolGenerator");
106
112
  Object.defineProperty(exports, "generateAllTools", { enumerable: true, get: function () { return toolGenerator_1.generateAllTools; } });
107
113
  Object.defineProperty(exports, "generateToolsForEntry", { enumerable: true, get: function () { return toolGenerator_1.generateToolsForEntry; } });
108
114
  Object.defineProperty(exports, "getAllMCPTools", { enumerable: true, get: function () { return toolGenerator_1.getAllMCPTools; } });
109
115
  __exportStar(require("./middleware"), exports);
116
+ __exportStar(require("./migrations/builtin/mcpServiceTokenStringIds"), exports);
110
117
  __exportStar(require("./migrations/generate"), exports);
111
118
  __exportStar(require("./migrations/load"), exports);
112
119
  __exportStar(require("./migrations/lock"), exports);
@@ -124,7 +131,11 @@ Object.defineProperty(exports, "McpOAuthRevokedFamily", { enumerable: true, get:
124
131
  var mcpOAuthToken_1 = require("./models/mcpOAuthToken");
125
132
  Object.defineProperty(exports, "McpOAuthFamilyRevokedError", { enumerable: true, get: function () { return mcpOAuthToken_1.McpOAuthFamilyRevokedError; } });
126
133
  Object.defineProperty(exports, "McpOAuthToken", { enumerable: true, get: function () { return mcpOAuthToken_1.McpOAuthToken; } });
134
+ var mcpRequestLog_1 = require("./models/mcpRequestLog");
135
+ Object.defineProperty(exports, "McpRequestLog", { enumerable: true, get: function () { return mcpRequestLog_1.McpRequestLog; } });
127
136
  __exportStar(require("./models/mcpServiceToken"), exports);
137
+ var mcpToolSetting_1 = require("./models/mcpToolSetting");
138
+ Object.defineProperty(exports, "McpToolSetting", { enumerable: true, get: function () { return mcpToolSetting_1.McpToolSetting; } });
128
139
  __exportStar(require("./models/notification"), exports);
129
140
  __exportStar(require("./models/notificationPreference"), exports);
130
141
  __exportStar(require("./models/versionConfig"), exports);
@@ -200,26 +211,9 @@ Object.defineProperty(exports, "startChangeStreamWatcher", { enumerable: true, g
200
211
  Object.defineProperty(exports, "stopChangeStreamWatcher", { enumerable: true, get: function () { return changeStreamWatcher_1.stopChangeStreamWatcher; } });
201
212
  var queryMatcher_1 = require("./realtime/queryMatcher");
202
213
  Object.defineProperty(exports, "matchesQuery", { enumerable: true, get: function () { return queryMatcher_1.matchesQuery; } });
203
- var queryStore_1 = require("./realtime/queryStore");
204
- Object.defineProperty(exports, "addQuerySubscription", { enumerable: true, get: function () { return queryStore_1.addQuerySubscription; } });
205
- Object.defineProperty(exports, "clearQueryStore", { enumerable: true, get: function () { return queryStore_1.clearQueryStore; } });
206
- Object.defineProperty(exports, "computeQueryId", { enumerable: true, get: function () { return queryStore_1.computeQueryId; } });
207
- Object.defineProperty(exports, "getQuerySubscriptionsForCollection", { enumerable: true, get: function () { return queryStore_1.getQuerySubscriptionsForCollection; } });
208
- Object.defineProperty(exports, "removeAllSocketQueries", { enumerable: true, get: function () { return queryStore_1.removeAllSocketQueries; } });
209
- Object.defineProperty(exports, "removeQuerySubscription", { enumerable: true, get: function () { return queryStore_1.removeQuerySubscription; } });
210
214
  var realtimeApp_1 = require("./realtime/realtimeApp");
211
215
  Object.defineProperty(exports, "installRealtimeSocketHandlers", { enumerable: true, get: function () { return realtimeApp_1.installRealtimeSocketHandlers; } });
212
- Object.defineProperty(exports, "MAX_DOCUMENT_SUBSCRIPTIONS", { enumerable: true, get: function () { return realtimeApp_1.MAX_DOCUMENT_SUBSCRIPTIONS; } });
213
- Object.defineProperty(exports, "MAX_MODEL_SUBSCRIPTIONS", { enumerable: true, get: function () { return realtimeApp_1.MAX_MODEL_SUBSCRIPTIONS; } });
214
- Object.defineProperty(exports, "MAX_QUERY_SUBSCRIPTIONS", { enumerable: true, get: function () { return realtimeApp_1.MAX_QUERY_SUBSCRIPTIONS; } });
215
216
  Object.defineProperty(exports, "RealtimeApp", { enumerable: true, get: function () { return realtimeApp_1.RealtimeApp; } });
216
- var registry_2 = require("./realtime/registry");
217
- Object.defineProperty(exports, "clearRealtimeRegistry", { enumerable: true, get: function () { return registry_2.clearRealtimeRegistry; } });
218
- Object.defineProperty(exports, "findRegistryEntryByCollection", { enumerable: true, get: function () { return registry_2.findRegistryEntryByCollection; } });
219
- Object.defineProperty(exports, "findRegistryEntryByRoutePath", { enumerable: true, get: function () { return registry_2.findRegistryEntryByRoutePath; } });
220
- Object.defineProperty(exports, "getRealtimeRegistry", { enumerable: true, get: function () { return registry_2.getRealtimeRegistry; } });
221
- Object.defineProperty(exports, "registerRealtime", { enumerable: true, get: function () { return registry_2.registerRealtime; } });
222
- Object.defineProperty(exports, "updateRealtimeRegistryOptions", { enumerable: true, get: function () { return registry_2.updateRealtimeRegistryOptions; } });
223
217
  var sessionRevalidation_1 = require("./realtime/sessionRevalidation");
224
218
  Object.defineProperty(exports, "DEFAULT_SESSION_REVALIDATION_INTERVAL_MS", { enumerable: true, get: function () { return sessionRevalidation_1.DEFAULT_SESSION_REVALIDATION_INTERVAL_MS; } });
225
219
  Object.defineProperty(exports, "loadFullUserForSocket", { enumerable: true, get: function () { return sessionRevalidation_1.loadFullUserForSocket; } });
@@ -0,0 +1,28 @@
1
+ import type { McpRequestLogOutcome } from "../types/mcpAdmin";
2
+ import type { MCPAuthResult } from "./auth";
3
+ import type { MCPToolDefinition } from "./toolGenerator";
4
+ /** `true` is `{enabled: true}`. Rows keep metadata only and expire after `retentionDays`. */
5
+ export type McpRequestLogAppOption = boolean | {
6
+ enabled: boolean;
7
+ retentionDays?: number;
8
+ };
9
+ export interface ResolvedMcpRequestLogOptions {
10
+ retentionDays: number;
11
+ }
12
+ export declare const resolveMcpRequestLogOption: (option: McpRequestLogAppOption | undefined) => ResolvedMcpRequestLogOptions | undefined;
13
+ export interface McpToolCallRecord {
14
+ auth?: MCPAuthResult;
15
+ durationMs: number;
16
+ errorName?: string;
17
+ outcome: McpRequestLogOutcome;
18
+ toolName: string;
19
+ }
20
+ /**
21
+ * Write one request-log row without blocking or failing the tool call. A failed write is
22
+ * logged at debug level and dropped.
23
+ */
24
+ export declare const recordMcpToolCall: (record: McpToolCallRecord, options: ResolvedMcpRequestLogOptions) => void;
25
+ /** Register every tool in `McpToolSetting` so admins can see and switch them. */
26
+ export declare const syncMcpToolSettings: (tools: MCPToolDefinition[]) => Promise<void>;
27
+ /** Tools an admin left on. A tool without a settings row counts as on. */
28
+ export declare const filterEnabledMcpTools: (tools: MCPToolDefinition[]) => Promise<MCPToolDefinition[]>;
@@ -0,0 +1,80 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.filterEnabledMcpTools = exports.syncMcpToolSettings = exports.recordMcpToolCall = exports.resolveMcpRequestLogOption = void 0;
7
+ const luxon_1 = require("luxon");
8
+ const mongoose_1 = __importDefault(require("mongoose"));
9
+ const errors_1 = require("../errors");
10
+ const logger_1 = require("../logger");
11
+ const mcpRequestLog_1 = require("../models/mcpRequestLog");
12
+ const mcpToolSetting_1 = require("../models/mcpToolSetting");
13
+ const registry_1 = require("./registry");
14
+ const DEFAULT_REQUEST_LOG_RETENTION_DAYS = 30;
15
+ const resolveMcpRequestLogOption = (option) => {
16
+ if (option === true) {
17
+ return { retentionDays: DEFAULT_REQUEST_LOG_RETENTION_DAYS };
18
+ }
19
+ if (!option || typeof option !== "object" || option.enabled !== true) {
20
+ return undefined;
21
+ }
22
+ const retentionDays = option.retentionDays ?? DEFAULT_REQUEST_LOG_RETENTION_DAYS;
23
+ if (!Number.isFinite(retentionDays) || retentionDays <= 0) {
24
+ throw new errors_1.APIError({
25
+ code: "mcp-request-log-misconfigured",
26
+ detail: `mcpRequestLog.retentionDays must be a positive number, got ${retentionDays}`,
27
+ status: 500,
28
+ title: "MCP request log is misconfigured",
29
+ });
30
+ }
31
+ return { retentionDays };
32
+ };
33
+ exports.resolveMcpRequestLogOption = resolveMcpRequestLogOption;
34
+ const toObjectId = (value) => {
35
+ if (!value || !mongoose_1.default.isValidObjectId(value)) {
36
+ return undefined;
37
+ }
38
+ return new mongoose_1.default.Types.ObjectId(value);
39
+ };
40
+ /**
41
+ * Write one request-log row without blocking or failing the tool call. A failed write is
42
+ * logged at debug level and dropped.
43
+ */
44
+ const recordMcpToolCall = (record, options) => {
45
+ const { auth } = record;
46
+ void mcpRequestLog_1.McpRequestLog.create({
47
+ credential: auth?.credential,
48
+ durationMs: Math.round(record.durationMs),
49
+ errorName: record.errorName,
50
+ expiresAt: luxon_1.DateTime.now().plus({ days: options.retentionDays }).toJSDate(),
51
+ oauthClientId: auth?.oauthClientId,
52
+ oauthFamilyId: auth?.oauthFamilyId,
53
+ outcome: record.outcome,
54
+ serviceTokenId: auth?.serviceTokenId,
55
+ toolName: record.toolName,
56
+ userId: toObjectId(auth?.user?.id ? String(auth.user.id) : undefined),
57
+ }).catch((error) => {
58
+ logger_1.logger.debug(`[mcp] Request log write failed: ${String(error)}`);
59
+ });
60
+ };
61
+ exports.recordMcpToolCall = recordMcpToolCall;
62
+ /** Register every tool in `McpToolSetting` so admins can see and switch them. */
63
+ const syncMcpToolSettings = async (tools) => {
64
+ const customNames = new Set((0, registry_1.getMCPCustomTools)().map((tool) => tool.name));
65
+ await mcpToolSetting_1.McpToolSetting.syncRegistered(tools.map((tool) => ({
66
+ description: tool.description,
67
+ name: tool.name,
68
+ source: (customNames.has(tool.name) ? "custom" : "model"),
69
+ })));
70
+ };
71
+ exports.syncMcpToolSettings = syncMcpToolSettings;
72
+ /** Tools an admin left on. A tool without a settings row counts as on. */
73
+ const filterEnabledMcpTools = async (tools) => {
74
+ const disabled = await mcpToolSetting_1.McpToolSetting.disabledNames();
75
+ if (disabled.size === 0) {
76
+ return tools;
77
+ }
78
+ return tools.filter((tool) => !disabled.has(tool.name));
79
+ };
80
+ exports.filterEnabledMcpTools = filterEnabledMcpTools;
@@ -11,6 +11,12 @@ export interface MCPAuthContext {
11
11
  /** The authenticated user plus the credential type that proved it. */
12
12
  export interface MCPAuthResult {
13
13
  credential: RequestCredential;
14
+ /** OAuth client id for an MCP OAuth access token. Never a secret. */
15
+ oauthClientId?: string;
16
+ /** OAuth rotation-chain id for an MCP OAuth access token. Never a secret. */
17
+ oauthFamilyId?: string;
18
+ /** `McpServiceToken` document id for a service token. Never the token or its hash. */
19
+ serviceTokenId?: string;
14
20
  /** Scopes granted to an MCP OAuth access token; unset for other credentials. */
15
21
  scopes?: string[];
16
22
  user: User;
package/dist/mcp/auth.js CHANGED
@@ -66,7 +66,11 @@ const authenticateServiceToken = async (token, userModel) => {
66
66
  void mcpServiceToken_1.McpServiceToken.updateOne({ _id: serviceToken._id }, { $set: { lastUsedAt: luxon_1.DateTime.now().toJSDate() } }).catch((error) => {
67
67
  logger_1.logger.debug(`MCP service token last-used update failed: ${error}`);
68
68
  });
69
- return { credential: "mcp-service-token", user: activeUser };
69
+ return {
70
+ credential: "mcp-service-token",
71
+ serviceTokenId: String(serviceToken._id),
72
+ user: activeUser,
73
+ };
70
74
  };
71
75
  const authenticateOAuthAccessToken = async (token, userModel) => {
72
76
  const accessToken = await mcpOAuthToken_1.McpOAuthToken.verifyAccessToken(token);
@@ -84,7 +88,13 @@ const authenticateOAuthAccessToken = async (token, userModel) => {
84
88
  return undefined;
85
89
  }
86
90
  const scopes = (accessToken.scope ?? "").split(" ").filter((scope) => scope.length > 0);
87
- return { credential: "oauth", scopes, user: activeUser };
91
+ return {
92
+ credential: "oauth",
93
+ oauthClientId: accessToken.clientId,
94
+ oauthFamilyId: accessToken.familyId,
95
+ scopes,
96
+ user: activeUser,
97
+ };
88
98
  };
89
99
  /**
90
100
  * Resolve the caller and the credential type from raw headers using whichever auth providers
@@ -1,6 +1,7 @@
1
1
  import type { Application } from "express";
2
2
  import type { UserModel } from "../auth";
3
3
  import type { BetterAuthInstance } from "../betterAuthSetup";
4
+ import { type ResolvedMcpRequestLogOptions } from "./adminTracking";
4
5
  import { type ResolvedMcpOAuthOptions } from "./oauthMetadata";
5
6
  export interface MCPServerOptions {
6
7
  userModel: UserModel;
@@ -11,5 +12,12 @@ export interface MCPServerOptions {
11
12
  * request without valid credentials with a 401 RFC 9728 challenge.
12
13
  */
13
14
  mcpOAuth?: ResolvedMcpOAuthOptions;
15
+ /** When set, each tool call writes a metadata-only `McpRequestLog` row. */
16
+ requestLog?: ResolvedMcpRequestLogOptions;
17
+ /**
18
+ * When true, tools are registered in `McpToolSetting` on mount and tools an admin turned off
19
+ * are left out of `tools/list` and `tools/call`.
20
+ */
21
+ toolSettings?: boolean;
14
22
  }
15
23
  export declare const mountMCPServer: (app: Application, options: MCPServerOptions) => void;
@@ -6,6 +6,7 @@ const node_1 = require("@modelcontextprotocol/node");
6
6
  const server_1 = require("@modelcontextprotocol/server");
7
7
  const logger_1 = require("../logger");
8
8
  const requestContext_1 = require("../requestContext");
9
+ const adminTracking_1 = require("./adminTracking");
9
10
  const auth_1 = require("./auth");
10
11
  const oauthMetadata_1 = require("./oauthMetadata");
11
12
  const toolGenerator_1 = require("./toolGenerator");
@@ -24,12 +25,26 @@ const mountMCPServer = (app, options) => {
24
25
  userModel: options.userModel,
25
26
  };
26
27
  logger_1.logger.info(`Mounting MCP server with ${tools.length} tools at /mcp`);
28
+ if (options.toolSettings) {
29
+ void (0, adminTracking_1.syncMcpToolSettings)(tools).catch((error) => {
30
+ logger_1.logger.warn(`[mcp] Could not register tools in McpToolSetting: ${String(error)}`);
31
+ });
32
+ }
33
+ const buildServer = async (auth) => {
34
+ const served = options.toolSettings ? await (0, adminTracking_1.filterEnabledMcpTools)(tools) : tools;
35
+ const onToolCall = options.requestLog
36
+ ? (record) => {
37
+ (0, adminTracking_1.recordMcpToolCall)({ ...record, auth }, options.requestLog);
38
+ }
39
+ : undefined;
40
+ return createMcpServerInstance(served, auth?.user, onToolCall);
41
+ };
27
42
  // The 2026-07-28 handler is stateless: it creates one server per request and also serves
28
43
  // 2025-era clients through the SDK's stateless legacy fallback.
29
44
  const handler = (0, server_1.createMcpHandler)(async ({ requestInfo }) => {
30
45
  const stored = mcpAuthStorage.getStore();
31
46
  if (stored) {
32
- return createMcpServerInstance(tools, stored.auth?.user);
47
+ return buildServer(stored.auth);
33
48
  }
34
49
  const headers = {};
35
50
  requestInfo?.headers.forEach((value, key) => {
@@ -37,7 +52,7 @@ const mountMCPServer = (app, options) => {
37
52
  });
38
53
  const auth = await (0, auth_1.extractAuthFromHeaders)(headers, authContext);
39
54
  recordMcpAuth(auth);
40
- return createMcpServerInstance(tools, auth?.user);
55
+ return buildServer(auth);
41
56
  }, {
42
57
  legacy: "stateless",
43
58
  onerror: (error) => logger_1.logger.catch(error),
@@ -79,7 +94,13 @@ const recordMcpAuth = (auth) => {
79
94
  userId: auth.user.id,
80
95
  });
81
96
  };
82
- const createMcpServerInstance = (tools, user) => {
97
+ const errorName = (error) => {
98
+ if (error instanceof Error) {
99
+ return error.name;
100
+ }
101
+ return typeof error;
102
+ };
103
+ const createMcpServerInstance = (tools, user, onToolCall) => {
83
104
  const server = new server_1.McpServer({
84
105
  name: "terreno-api-mcp",
85
106
  version: "1.0.0",
@@ -93,7 +114,30 @@ const createMcpServerInstance = (tools, user) => {
93
114
  server.registerTool(tool.name, {
94
115
  description: tool.description,
95
116
  inputSchema: tool.zodSchema,
96
- }, async (args) => tool.handler(args, user));
117
+ }, async (args) => {
118
+ if (!onToolCall) {
119
+ return tool.handler(args, user);
120
+ }
121
+ const startedAt = performance.now();
122
+ try {
123
+ const result = await tool.handler(args, user);
124
+ onToolCall({
125
+ durationMs: performance.now() - startedAt,
126
+ outcome: result.isError ? "tool_error" : "ok",
127
+ toolName: tool.name,
128
+ });
129
+ return result;
130
+ }
131
+ catch (error) {
132
+ onToolCall({
133
+ durationMs: performance.now() - startedAt,
134
+ errorName: errorName(error),
135
+ outcome: "exception",
136
+ toolName: tool.name,
137
+ });
138
+ throw error;
139
+ }
140
+ });
97
141
  }
98
142
  return server;
99
143
  };
@@ -1,6 +1,10 @@
1
1
  import type { Application } from "express";
2
- import { type OpenApiMiddleware } from "../api";
2
+ import { type ModelRouterRegistration, type OpenApiMiddleware } from "../api";
3
3
  export declare const MAX_ACTIVE_MCP_SERVICE_TOKENS = 10;
4
+ /** Route path of the self-serve MCP service token router. */
5
+ export declare const MCP_SERVICE_TOKENS_ROUTE_PATH = "/mcp/service-tokens";
6
+ /** Sync collection tag clients subscribe to (`mcp/service-tokens|owner:{userId}`). */
7
+ export declare const MCP_SERVICE_TOKENS_SYNC_COLLECTION = "mcp/service-tokens";
4
8
  export interface McpServiceTokenRoutesOptions {
5
9
  openApi?: OpenApiMiddleware;
6
10
  publicMcpUrl?: string;
@@ -13,4 +17,20 @@ export declare const resolveMcpServiceTokensOption: (option: McpServiceTokensApp
13
17
  enabled: boolean;
14
18
  publicMcpUrl?: string;
15
19
  };
20
+ /**
21
+ * Public shape of a stored MCP service token: every field except `tokenHash`, plus `id`.
22
+ * Used for REST responses, sync snapshots, and sync deltas so the hash never leaves the server.
23
+ */
24
+ export declare const toPublicMcpServiceToken: (doc: Record<string, unknown>) => Record<string, unknown>;
25
+ /**
26
+ * Build the self-serve `/mcp/service-tokens` router. The collection is synced read-only
27
+ * (owner scope on `userId`): list/read over REST and sync, no client create/update/delete.
28
+ * Minting and revoking are the `create` collection action and `revoke` instance action.
29
+ */
30
+ export declare const createMcpServiceTokenRouter: (options?: McpServiceTokenRoutesOptions) => ModelRouterRegistration;
31
+ /**
32
+ * Mount the self-serve MCP service token routes at `/mcp/service-tokens`. Callers must
33
+ * authenticate with a session or JWT; an `mcp_` bearer is rejected so a service token
34
+ * cannot list, mint, or revoke tokens.
35
+ */
16
36
  export declare const addMcpServiceTokenRoutes: (app: Application, options?: McpServiceTokenRoutesOptions) => void;