@opengeni/api-router 3.3.0 → 3.4.0

package/src/index.ts

@@ -343,6 +343,9 @@ export async function startApi(
     max: settings.apiDatabasePoolMax,
     ...(searchPath ? { searchPath } : {}),
     rlsStrategy: settings.rlsStrategy,
+    ...(settings.databasePreparedStatements === undefined
+      ? {}
+      : { preparedStatements: settings.databasePreparedStatements }),
   });
   let bus: Awaited<ReturnType<typeof createNatsEventBus>> | undefined;
   let workflowClient: Awaited<ReturnType<typeof createTemporalWorkflowClient>> | undefined;

package/src/mcp/action-catalog.gen.ts

@@ -191,6 +191,17 @@ export const ACTION_CATALOG: readonly ActionCatalogEntry[] = [
       "WorkspaceMember"
     ]
   },
+  {
+    "id": "adoptBrowserSessionWorkingCopy",
+    "method": "POST",
+    "path": "/v1/workspaces/:workspaceId/browser-sessions/:browserSessionId/working-copy/adoptions",
+    "request": [
+      "BrowserWorkingCopyAdoptionRequest"
+    ],
+    "response": [
+      "BrowserWorkingCopyAdoptionResponse"
+    ]
+  },
   {
     "id": "advanceConnectAttempt",
     "method": "POST",
@@ -427,6 +438,17 @@ export const ACTION_CATALOG: readonly ActionCatalogEntry[] = [
       "ToolGatewayDeclarationsResponse"
     ]
   },
+  {
+    "id": "cancelBillingSubscription",
+    "method": "POST",
+    "path": "/v1/billing/subscription/cancel",
+    "request": [
+      "CancelBillingSubscriptionRequest"
+    ],
+    "response": [
+      "BillingSubscriptionChange"
+    ]
+  },
   {
     "id": "cancelConnectAttempt",
     "method": "POST",
@@ -482,6 +504,17 @@ export const ACTION_CATALOG: readonly ActionCatalogEntry[] = [
     "request": [],
     "response": []
   },
+  {
+    "id": "changeBillingSubscription",
+    "method": "POST",
+    "path": "/v1/billing/subscription/change",
+    "request": [
+      "ChangeBillingSubscriptionRequest"
+    ],
+    "response": [
+      "BillingSubscriptionChange"
+    ]
+  },
   {
     "id": "changeMachineAudience",
     "method": "PUT",
@@ -1112,6 +1145,28 @@ export const ACTION_CATALOG: readonly ActionCatalogEntry[] = [
       "AutomationSource"
     ]
   },
+  {
+    "id": "createSubscriptionCheckout",
+    "method": "POST",
+    "path": "/v1/billing/subscription/checkout",
+    "request": [
+      "CreateSubscriptionCheckoutRequest"
+    ],
+    "response": [
+      "CreateSubscriptionCheckoutResponse"
+    ]
+  },
+  {
+    "id": "createSubscriptionPortalSession",
+    "method": "POST",
+    "path": "/v1/billing/subscription/portal",
+    "request": [
+      "CreateBillingPortalRequest"
+    ],
+    "response": [
+      "CreateBillingPortalResponse"
+    ]
+  },
   {
     "id": "createTranscriptionRecording",
     "method": "POST",
@@ -2543,6 +2598,15 @@ export const ACTION_CATALOG: readonly ActionCatalogEntry[] = [
     "request": [],
     "response": []
   },
+  {
+    "id": "getBillingSubscriptionPlans",
+    "method": "GET",
+    "path": "/v1/billing/subscription/plans",
+    "request": [],
+    "response": [
+      "BillingSubscriptionCatalog"
+    ]
+  },
   {
     "id": "getBillingUsage",
     "method": "GET",
@@ -2586,6 +2650,15 @@ export const ACTION_CATALOG: readonly ActionCatalogEntry[] = [
       "BrowserSession"
     ]
   },
+  {
+    "id": "getBrowserSessionWorkingCopyAdoption",
+    "method": "GET",
+    "path": "/v1/workspaces/:workspaceId/browser-sessions/:browserSessionId/working-copy/adoptions/:operationId",
+    "request": [],
+    "response": [
+      "BrowserWorkingCopyAdoptionResponse"
+    ]
+  },
   {
     "id": "getBrowserTargetState",
     "method": "GET",
@@ -3584,6 +3657,17 @@ export const ACTION_CATALOG: readonly ActionCatalogEntry[] = [
       "WorkspaceInsightsResponse"
     ]
   },
+  {
+    "id": "getWorkspaceInsightsSiteUsage",
+    "method": "GET",
+    "path": "/v1/workspaces/:workspaceId/insights/sites",
+    "request": [
+      "InsightsSiteUsageQuery"
+    ],
+    "response": [
+      "InsightsSiteUsageResponse"
+    ]
+  },
   {
     "id": "getWorkspaceInsightsUsage",
     "method": "GET",
@@ -3850,6 +3934,15 @@ export const ACTION_CATALOG: readonly ActionCatalogEntry[] = [
     ],
     "response": []
   },
+  {
+    "id": "inspectBrowserSessionWorkingCopy",
+    "method": "POST",
+    "path": "/v1/workspaces/:workspaceId/browser-sessions/:browserSessionId/working-copy/inspection",
+    "request": [],
+    "response": [
+      "BrowserWorkingCopyInspection"
+    ]
+  },
   {
     "id": "inspectMcpAuthentication",
     "method": "POST",
@@ -6565,6 +6658,15 @@ export const ACTION_CATALOG: readonly ActionCatalogEntry[] = [
       "SessionRetryResponse"
     ]
   },
+  {
+    "id": "revertBrowserSessionWorkingCopyAdoption",
+    "method": "POST",
+    "path": "/v1/workspaces/:workspaceId/browser-sessions/:browserSessionId/working-copy/adoptions/:operationId/revert",
+    "request": [],
+    "response": [
+      "BrowserWorkingCopyAdoptionResponse"
+    ]
+  },
   {
     "id": "reviewAgentInstruction",
     "method": "POST",
@@ -8183,6 +8285,17 @@ export const ACTION_CATALOG: readonly ActionCatalogEntry[] = [
       "WorkspaceWebhook"
     ]
   },
+  {
+    "id": "upgradeBillingSubscription",
+    "method": "POST",
+    "path": "/v1/billing/subscription/upgrade",
+    "request": [
+      "ChangeBillingSubscriptionRequest"
+    ],
+    "response": [
+      "BillingSubscriptionChange"
+    ]
+  },
   {
     "id": "uploadTranscriptionRecordingChunk",
     "method": "PUT",

package/src/mcp/action-schema-imports.gen.ts

@@ -1,6 +1,6 @@
 // Generated by scripts/public-api/action-catalog.ts. Do not edit.
 // Named imports keep unrelated response and tool validators out of the API graph.
-import { AcceptOrganizationInvitationRequest, AcceptOrganizationRecoveryCustodyRequest, AcknowledgeStreamRequest, ActivateCodexRealtimeConnectionRequest, ActivateCompanyProfileRevisionRequest, ActivatePreferenceRegistryRevisionRequest, ActivateWorkspaceInstructionPolicyRequest, AddDocumentRequest, AddWorkspaceMemberRequest, AgentInstructionReviewRequest, AgentLearningContext, ApiIntegrationOAuthStartRequest, AppendArchivedSessionEventsRequest, ApplySessionGoalRevisionRequest, ApproveSlackUserLinkAccessRequest, ArtifactCatalogKind, AtlassianLifecycleActionRequest, AttachViewerRequest, BeginSessionRealtimeRequest, BrowserActionRequest, BrowserDomReadRequest, BrowserDownloadSaveRequest, BrowserOpenTargetRequest, BrowserSessionAttachmentRequest, BrowserSessionLifecycleRequest, ChangeMachineAudienceRequest, ChangePreferenceRegistryScopeRequest, ClaudeSubscriptionOAuthCompleteRequest, ClaudeSubscriptionOAuthStartRequest, ClaudeSubscriptionSetupTokenRequest, ClearWorkspaceAllowanceRequest, CodexAppsDesignationRequest, CodexRealtimeWebrtcRequest, CodexSourceRequest, CompanyProfileDiffRequest, ComputerActionRequest, ComputerNativeCallRequest, ComputerSessionAttachmentRequest, ComputerSessionLifecycleRequest, ConfigureOrganizationRecoveryPolicyRequest, CorrectPreferenceRegistryRequest, CreateAdditionalOrganizationRequest, CreateApiKeyRequest, CreateAutomationSourceRequest, CreateAutomationTriggerRequest, CreateBillingPortalRequest, CreateBrowserIdentityRequest, CreateBrowserSessionRequest, CreateCapabilityCatalogItemRequest, CreateChannelRequest, CreateCheckoutRequest, CreateComputerSessionRequest, CreateConnectionRequest, CreateDocumentBaseRequest, CreateFeedbackRequest, CreateFileUploadRequest, CreateInteractionInterventionRequest, CreateKnowledgeDropRequest, CreateNetworkRouteRequest, CreateOrganizationApiKeyRequest, CreateOrganizationInvitationRequest, CreateOrganizationProviderCustomModelRequest, CreateOrganizationRequest, CreateOrganizationServiceAccountRequest, CreateOrganizationWebhookRequest, CreateOrganizationWorkspaceRequest, CreatePersonalApiKeyRequest, CreatePrReviewAppRegistrationRequest, CreatePrReviewRepositoryBindingRequest, CreatePreferenceRegistryProposalRequest, CreateRigRequest, CreateScheduledTaskRequest, CreateSessionRequest, CreateSiteAuthConnectionRequest, CreateWorkspaceArtifactRequest, CreateWorkspaceGatewayCustomModelRequest, CreateWorkspaceInstructionPolicyDraftRequest, CreateWorkspaceInstructionPolicyOnboardingProposalRequest, CreateWorkspaceOpenRouterCustomModelRequest, CreateWorkspaceOpperCustomModelRequest, CreateWorkspaceRequest, CreateWorkspaceWebhookRequest, DeactivatePreferenceRegistryRequest, DeleteOrganizationProviderCustomModelRequest, DeleteSessionQueueItemRequest, DeleteWorkspaceGatewayCustomModelRequest, DeleteWorkspaceOpenRouterCustomModelRequest, DeleteWorkspaceOpperCustomModelRequest, DeviceEnrollmentApproveRequest, DisableOrganizationRecoveryPolicyRequest, EditSessionQueueItemRequest, EnableCapabilityRequest, EndSessionRealtimeRequest, EnsureWorkspaceRequest, ExternalAuthInteractiveRequest, ExternalAuthRunRequest, FikenInstallRequest, FikenOAuthStartRequest, FileListRequest, ForkSessionRequest, FsDeleteRequest, FsListBatchRequest, FsListRequest, FsMkdirRequest, FsMoveRequest, FsReadRequest, FsWriteRequest, GatewayRealtimeConnectRequest, GetMyUsageRequest, GetUsageRequest, GitDiffRequest, GitLogRequest, GitReadBatchRequest, GitShowRequest, GitStatusRequest, GrantSessionAdminAccessRequest, GrantWorkspaceCreditsRequest, ImportArchivedSessionRequest, ImportLegacyWorkspaceInstructionPolicyDraftRequest, InboxItem, InboxSettings, InsightsRange, InstallApiIntegrationRequest, InstallLibrarySkillRequest, InstallPluginRequest, InstallSkillRequest, InstallVaultProviderRequest, IssueUserResourceGrantRequest, KnowledgeEntryBatchReviewRequest, KnowledgeEntryListRequest, KnowledgeEntryRestoreRequest, KnowledgeEntryReviewRequest, KnowledgeEntrySaveRequest, KnowledgeReviewBatchListRequest, KnowledgeSavePreparationRequest, MachineAudiencePreviewRequest, McpConnectionDecision, MemberNotificationsSetting, MemorySlackPublicationActionRequest, MintEnrollTokenRequest, ModelConnectionAccessPolicy, MoveDocumentRequest, MoveSessionQueueItemRequest, MutateIntegrationFacetRequest, OAuthStartRequest, OpenGeniSlackBotInstallRequest, OpenMachinePrivacySettingsRequest, OrganizationModelProviderKind, OrganizationRecoveryOperationCommandRequest, OrganizationUsagePeriod, PrepareSlackUserLinkAccessRequest, PreviewApiIntegrationRequest, PreviewPluginRequest, PreviewSkillImportRequest, ProposeRigChangeRequest, PtyCloseRequest, PtyOpenRequest, PtyResizeRequest, PtyWriteRequest, PublishBrowserRevisionRequest, PublishSandboxFileArtifactRequest, PublishWorkspaceArtifactVersionRequest, PutOrganizationCredentialProviderRequest, PutOrganizationWorkspaceMemberRequest, PutWorkspaceCredentialProviderRequest, ReclassifyDocumentAuthorityRequest, RefreshScheduledTaskAccessRequest, RejectPreferenceRegistryProposalRequest, RejectSessionGoalRevisionRequest, RemoveEnrollmentRequest, RenewSessionRealtimeRequest, ReorderChannelsRequest, ReplaceVaultProviderCredentialsRequest, ReportAuthRunRequest, ResolveInteractionInterventionRequest, RetryOrganizationUserSetupDeliveryRequest, RevokeOrganizationInvitationRequest, RevokeOrganizationModelProviderConnectionRequest, RevokeOrganizationWorkspaceMemberRequest, RollbackCompanyProfileRequest, RollbackSessionGoalRevisionRequest, RollbackWorkspaceArtifactRequest, RollbackWorkspaceInstructionPolicyRequest, RotateSessionMcpCredentialsRequest, RunDocumentDefaultCollectionBackfillRequest, SandboxRecoveryRequest, SaveAtlassianSourcesRequest, SaveComposerDraftRequest, SaveNewSessionDraftRequest, SessionCodexAccountPinRequest, SessionControlRequest, SessionHumanInputRequest, SessionInboxMute, SessionMessageSearchRequest, SessionRetryRequest, SessionScopeSubjectId, SessionStatus, SessionVisibility, SetMemberAllowanceRequest, SetSessionModelAccountChoiceRequest, SetSessionUsageLimitRequest, SetWorkspaceAllowanceRequest, SetWorkspaceArtifactStatusRequest, SetWorkspaceDefaultRigRequest, SiteDataCollectionDefinitionRequest, SiteDataImportRequest, SiteDataQueryRequest, SiteDataWriteRequest, SiteLimitProfile, SitePublishWarningFix, SiteSqlExportFormat, SiteSqlImportRequest, SiteSqlMigrationRequest, SiteSqlQueryDefinitionRequest, SiteSqlRunRequest, SiteSqlSettingsRequest, SiteSqlStatementRequest, SiteTakedownRequest, SlackUserLinkAccessMutationRequest, SocialOAuthStartRequest, StartAuthRunRequest, StartOrganizationRecoveryOperationRequest, SteerSessionQueueItemRequest, SubmitComposerDraftRequest, SubscriptionAccountRenameRequest, SubscriptionAccountToggleRequest, SubscriptionConnectPollRequest, SubscriptionRotationSettingsRequest, SupergrokConnectStartRequest, SupersedePreferenceRegistryRequest, SwapActiveSandboxRequest, SyncSessionRealtimeLedgerRequest, TerminalExecRequest, TriggerAutomationManuallyRequest, UninstallApiIntegrationRequest, UninstallPluginRequest, UninstallSkillRequest, UpdateAutomationSourceRequest, UpdateAutomationTriggerRequest, UpdateBrowserIdentityRequest, UpdateChannelRequest, UpdateCompanyProfileAgentPolicyRequest, UpdateCompanyProfileRequest, UpdateConnectionRequest, UpdateConnectorToolPermissionsRequest, UpdateGitHubActionPolicyRequest, UpdateMachineOperationPolicyRequest, UpdateMemorySlackPublicationConfigurationRequest, UpdateModelAccountPreferencesRequest, UpdateNetworkRouteRequest, UpdateOpenGeniSlackBotOrganizationAccess, UpdateOrganizationAgentAdminAccessRequest, UpdateOrganizationApiKeyRequest, UpdateOrganizationIntegrationPolicyRequest, UpdateOrganizationMcpConnectionRequest, UpdateOrganizationMemberRequest, UpdateOrganizationModelAccountSettingsRequest, UpdateOrganizationModelDefaultsRequest, UpdateOrganizationNameRequest, UpdateOrganizationPrivacySettingsRequest, UpdateOrganizationPrivateSessionSettingsRequest, UpdateOrganizationRetentionPolicyRequest, UpdateOrganizationServiceAccountRequest, UpdateOrganizationWebhookRequest, UpdateOrganizationWorkspaceRequest, UpdatePrReviewAppRegistrationRequest, UpdatePrReviewRepositoryBindingRequest, UpdateRigRequest, UpdateScheduledTaskRequest, UpdateSessionAgentRequest, UpdateSessionArchiveRequest, UpdateSessionAttentionRequest, UpdateSessionChannelRequest, UpdateSessionGoalRequest, UpdateSessionMcpApprovalPolicyRequest, UpdateSessionMcpToolPermissionsRequest, UpdateSessionPinRequest, UpdateSessionRequest, UpdateSessionRetentionRequest, UpdateSessionSkillsRequest, UpdateSessionToolPolicyRequest, UpdateSessionVisibilityRequest, UpdateSiteAuthConnectionRequest, UpdateSlackChannelRoutesRequest, UpdateVideoGenerationPolicyRequest, UpdateWorkspaceArtifactVisibilityRequest, UpdateWorkspaceMemberRequest, UpdateWorkspaceModelAccountSettingsRequest, UpdateWorkspaceModelPolicyRequest, UpdateWorkspaceRequest, UpdateWorkspaceSettingsRequest, UpdateWorkspaceWebhookRequest, UpsertIntegrationFacetRequest, UpsertOrganizationModelProviderConnectionRequest, UpsertSitePublicationRequest, VerifyAuthRunRequest, ViewerHeartbeatRequest, WorkClaimSubjectType, WorkspaceInstructionPolicyDiffRequest, WorkspacePauseTimerRequest } from "@opengeni/contracts";
+import { AcceptOrganizationInvitationRequest, AcceptOrganizationRecoveryCustodyRequest, AcknowledgeStreamRequest, ActivateCodexRealtimeConnectionRequest, ActivateCompanyProfileRevisionRequest, ActivatePreferenceRegistryRevisionRequest, ActivateWorkspaceInstructionPolicyRequest, AddDocumentRequest, AddWorkspaceMemberRequest, AgentInstructionReviewRequest, AgentLearningContext, ApiIntegrationOAuthStartRequest, AppendArchivedSessionEventsRequest, ApplySessionGoalRevisionRequest, ApproveSlackUserLinkAccessRequest, ArtifactCatalogKind, AtlassianLifecycleActionRequest, AttachViewerRequest, BeginSessionRealtimeRequest, BrowserActionRequest, BrowserDomReadRequest, BrowserDownloadSaveRequest, BrowserOpenTargetRequest, BrowserSessionAttachmentRequest, BrowserSessionLifecycleRequest, BrowserWorkingCopyAdoptionRequest, CancelBillingSubscriptionRequest, ChangeBillingSubscriptionRequest, ChangeMachineAudienceRequest, ChangePreferenceRegistryScopeRequest, ClaudeSubscriptionOAuthCompleteRequest, ClaudeSubscriptionOAuthStartRequest, ClaudeSubscriptionSetupTokenRequest, ClearWorkspaceAllowanceRequest, CodexAppsDesignationRequest, CodexRealtimeWebrtcRequest, CodexSourceRequest, CompanyProfileDiffRequest, ComputerActionRequest, ComputerNativeCallRequest, ComputerSessionAttachmentRequest, ComputerSessionLifecycleRequest, ConfigureOrganizationRecoveryPolicyRequest, CorrectPreferenceRegistryRequest, CreateAdditionalOrganizationRequest, CreateApiKeyRequest, CreateAutomationSourceRequest, CreateAutomationTriggerRequest, CreateBillingPortalRequest, CreateBrowserIdentityRequest, CreateBrowserSessionRequest, CreateCapabilityCatalogItemRequest, CreateChannelRequest, CreateCheckoutRequest, CreateComputerSessionRequest, CreateConnectionRequest, CreateDocumentBaseRequest, CreateFeedbackRequest, CreateFileUploadRequest, CreateInteractionInterventionRequest, CreateKnowledgeDropRequest, CreateNetworkRouteRequest, CreateOrganizationApiKeyRequest, CreateOrganizationInvitationRequest, CreateOrganizationProviderCustomModelRequest, CreateOrganizationRequest, CreateOrganizationServiceAccountRequest, CreateOrganizationWebhookRequest, CreateOrganizationWorkspaceRequest, CreatePersonalApiKeyRequest, CreatePrReviewAppRegistrationRequest, CreatePrReviewRepositoryBindingRequest, CreatePreferenceRegistryProposalRequest, CreateRigRequest, CreateScheduledTaskRequest, CreateSessionRequest, CreateSiteAuthConnectionRequest, CreateSubscriptionCheckoutRequest, CreateWorkspaceArtifactRequest, CreateWorkspaceGatewayCustomModelRequest, CreateWorkspaceInstructionPolicyDraftRequest, CreateWorkspaceInstructionPolicyOnboardingProposalRequest, CreateWorkspaceOpenRouterCustomModelRequest, CreateWorkspaceOpperCustomModelRequest, CreateWorkspaceRequest, CreateWorkspaceWebhookRequest, DeactivatePreferenceRegistryRequest, DeleteOrganizationProviderCustomModelRequest, DeleteSessionQueueItemRequest, DeleteWorkspaceGatewayCustomModelRequest, DeleteWorkspaceOpenRouterCustomModelRequest, DeleteWorkspaceOpperCustomModelRequest, DeviceEnrollmentApproveRequest, DisableOrganizationRecoveryPolicyRequest, EditSessionQueueItemRequest, EnableCapabilityRequest, EndSessionRealtimeRequest, EnsureWorkspaceRequest, ExternalAuthInteractiveRequest, ExternalAuthRunRequest, FikenInstallRequest, FikenOAuthStartRequest, FileListRequest, ForkSessionRequest, FsDeleteRequest, FsListBatchRequest, FsListRequest, FsMkdirRequest, FsMoveRequest, FsReadRequest, FsWriteRequest, GatewayRealtimeConnectRequest, GetMyUsageRequest, GetUsageRequest, GitDiffRequest, GitLogRequest, GitReadBatchRequest, GitShowRequest, GitStatusRequest, GrantSessionAdminAccessRequest, GrantWorkspaceCreditsRequest, ImportArchivedSessionRequest, ImportLegacyWorkspaceInstructionPolicyDraftRequest, InboxItem, InboxSettings, InsightsRange, InstallApiIntegrationRequest, InstallLibrarySkillRequest, InstallPluginRequest, InstallSkillRequest, InstallVaultProviderRequest, IssueUserResourceGrantRequest, KnowledgeEntryBatchReviewRequest, KnowledgeEntryListRequest, KnowledgeEntryRestoreRequest, KnowledgeEntryReviewRequest, KnowledgeEntrySaveRequest, KnowledgeReviewBatchListRequest, KnowledgeSavePreparationRequest, MachineAudiencePreviewRequest, McpConnectionDecision, MemberNotificationsSetting, MemorySlackPublicationActionRequest, MintEnrollTokenRequest, ModelConnectionAccessPolicy, MoveDocumentRequest, MoveSessionQueueItemRequest, MutateIntegrationFacetRequest, OAuthStartRequest, OpenGeniSlackBotInstallRequest, OpenMachinePrivacySettingsRequest, OrganizationModelProviderKind, OrganizationRecoveryOperationCommandRequest, OrganizationUsagePeriod, PrepareSlackUserLinkAccessRequest, PreviewApiIntegrationRequest, PreviewPluginRequest, PreviewSkillImportRequest, ProposeRigChangeRequest, PtyCloseRequest, PtyOpenRequest, PtyResizeRequest, PtyWriteRequest, PublishBrowserRevisionRequest, PublishSandboxFileArtifactRequest, PublishWorkspaceArtifactVersionRequest, PutOrganizationCredentialProviderRequest, PutOrganizationWorkspaceMemberRequest, PutWorkspaceCredentialProviderRequest, ReclassifyDocumentAuthorityRequest, RefreshScheduledTaskAccessRequest, RejectPreferenceRegistryProposalRequest, RejectSessionGoalRevisionRequest, RemoveEnrollmentRequest, RenewSessionRealtimeRequest, ReorderChannelsRequest, ReplaceVaultProviderCredentialsRequest, ReportAuthRunRequest, ResolveInteractionInterventionRequest, RetryOrganizationUserSetupDeliveryRequest, RevokeOrganizationInvitationRequest, RevokeOrganizationModelProviderConnectionRequest, RevokeOrganizationWorkspaceMemberRequest, RollbackCompanyProfileRequest, RollbackSessionGoalRevisionRequest, RollbackWorkspaceArtifactRequest, RollbackWorkspaceInstructionPolicyRequest, RotateSessionMcpCredentialsRequest, RunDocumentDefaultCollectionBackfillRequest, SandboxRecoveryRequest, SaveAtlassianSourcesRequest, SaveComposerDraftRequest, SaveNewSessionDraftRequest, SessionCodexAccountPinRequest, SessionControlRequest, SessionHumanInputRequest, SessionInboxMute, SessionMessageSearchRequest, SessionRetryRequest, SessionScopeSubjectId, SessionStatus, SessionVisibility, SetMemberAllowanceRequest, SetSessionModelAccountChoiceRequest, SetSessionUsageLimitRequest, SetWorkspaceAllowanceRequest, SetWorkspaceArtifactStatusRequest, SetWorkspaceDefaultRigRequest, SiteDataCollectionDefinitionRequest, SiteDataImportRequest, SiteDataQueryRequest, SiteDataWriteRequest, SiteLimitProfile, SitePublishWarningFix, SiteSqlExportFormat, SiteSqlImportRequest, SiteSqlMigrationRequest, SiteSqlQueryDefinitionRequest, SiteSqlRunRequest, SiteSqlSettingsRequest, SiteSqlStatementRequest, SiteTakedownRequest, SlackUserLinkAccessMutationRequest, SocialOAuthStartRequest, StartAuthRunRequest, StartOrganizationRecoveryOperationRequest, SteerSessionQueueItemRequest, SubmitComposerDraftRequest, SubscriptionAccountRenameRequest, SubscriptionAccountToggleRequest, SubscriptionConnectPollRequest, SubscriptionRotationSettingsRequest, SupergrokConnectStartRequest, SupersedePreferenceRegistryRequest, SwapActiveSandboxRequest, SyncSessionRealtimeLedgerRequest, TerminalExecRequest, TriggerAutomationManuallyRequest, UninstallApiIntegrationRequest, UninstallPluginRequest, UninstallSkillRequest, UpdateAutomationSourceRequest, UpdateAutomationTriggerRequest, UpdateBrowserIdentityRequest, UpdateChannelRequest, UpdateCompanyProfileAgentPolicyRequest, UpdateCompanyProfileRequest, UpdateConnectionRequest, UpdateConnectorToolPermissionsRequest, UpdateGitHubActionPolicyRequest, UpdateMachineOperationPolicyRequest, UpdateMemorySlackPublicationConfigurationRequest, UpdateModelAccountPreferencesRequest, UpdateNetworkRouteRequest, UpdateOpenGeniSlackBotOrganizationAccess, UpdateOrganizationAgentAdminAccessRequest, UpdateOrganizationApiKeyRequest, UpdateOrganizationIntegrationPolicyRequest, UpdateOrganizationMcpConnectionRequest, UpdateOrganizationMemberRequest, UpdateOrganizationModelAccountSettingsRequest, UpdateOrganizationModelDefaultsRequest, UpdateOrganizationNameRequest, UpdateOrganizationPrivacySettingsRequest, UpdateOrganizationPrivateSessionSettingsRequest, UpdateOrganizationRetentionPolicyRequest, UpdateOrganizationServiceAccountRequest, UpdateOrganizationWebhookRequest, UpdateOrganizationWorkspaceRequest, UpdatePrReviewAppRegistrationRequest, UpdatePrReviewRepositoryBindingRequest, UpdateRigRequest, UpdateScheduledTaskRequest, UpdateSessionAgentRequest, UpdateSessionArchiveRequest, UpdateSessionAttentionRequest, UpdateSessionChannelRequest, UpdateSessionGoalRequest, UpdateSessionMcpApprovalPolicyRequest, UpdateSessionMcpToolPermissionsRequest, UpdateSessionPinRequest, UpdateSessionRequest, UpdateSessionRetentionRequest, UpdateSessionSkillsRequest, UpdateSessionToolPolicyRequest, UpdateSessionVisibilityRequest, UpdateSiteAuthConnectionRequest, UpdateSlackChannelRoutesRequest, UpdateVideoGenerationPolicyRequest, UpdateWorkspaceArtifactVisibilityRequest, UpdateWorkspaceMemberRequest, UpdateWorkspaceModelAccountSettingsRequest, UpdateWorkspaceModelPolicyRequest, UpdateWorkspaceRequest, UpdateWorkspaceSettingsRequest, UpdateWorkspaceWebhookRequest, UpsertIntegrationFacetRequest, UpsertOrganizationModelProviderConnectionRequest, UpsertSitePublicationRequest, VerifyAuthRunRequest, ViewerHeartbeatRequest, WorkClaimSubjectType, WorkspaceInstructionPolicyDiffRequest, WorkspacePauseTimerRequest } from "@opengeni/contracts";
 
 export const ACTION_REQUEST_SCHEMAS: Readonly<Record<string, unknown>> = {
   AcceptOrganizationInvitationRequest,
@@ -28,6 +28,9 @@ export const ACTION_REQUEST_SCHEMAS: Readonly<Record<string, unknown>> = {
   BrowserOpenTargetRequest,
   BrowserSessionAttachmentRequest,
   BrowserSessionLifecycleRequest,
+  BrowserWorkingCopyAdoptionRequest,
+  CancelBillingSubscriptionRequest,
+  ChangeBillingSubscriptionRequest,
   ChangeMachineAudienceRequest,
   ChangePreferenceRegistryScopeRequest,
   ClaudeSubscriptionOAuthCompleteRequest,
@@ -77,6 +80,7 @@ export const ACTION_REQUEST_SCHEMAS: Readonly<Record<string, unknown>> = {
   CreateScheduledTaskRequest,
   CreateSessionRequest,
   CreateSiteAuthConnectionRequest,
+  CreateSubscriptionCheckoutRequest,
   CreateWorkspaceArtifactRequest,
   CreateWorkspaceGatewayCustomModelRequest,
   CreateWorkspaceInstructionPolicyDraftRequest,

package/src/mcp/server.ts

@@ -976,6 +976,34 @@ export function slackBotFileContentResult(
   };
 }
 
+/**
+ * The first-party server as seen by MCP protocol messages that touch no tool:
+ * `initialize`, `ping` and notifications. It advertises exactly what the full
+ * server does (the same name, version and tools capability) without the
+ * workspace, catalog, Memory and admin reads that registering tools needs.
+ * Never route `tools/*` here: it lists no tools.
+ */
+export function buildOpenGeniMcpProtocolServer(grant: AccessGrant): McpServer {
+  const sessionId =
+    typeof grant.metadata?.["sessionId"] === "string"
+      ? (grant.metadata["sessionId"] as string)
+      : null;
+  const server = new PolicyMcpServer(grant, sessionId, new Set());
+  server.ensureToolsListHandler();
+  return server;
+}
+
+/** JSON-RPC methods {@link buildOpenGeniMcpProtocolServer} answers like the full server. */
+export function isOpenGeniMcpProtocolOnlyMessage(message: unknown): boolean {
+  if (!message || typeof message !== "object" || Array.isArray(message)) return false;
+  const method = (message as { method?: unknown }).method;
+  if (typeof method !== "string") return false;
+  if (method === "initialize" || method === "ping") return true;
+  // Notifications carry no id and get no response. The stateless transport
+  // holds no in-flight request a cancellation could reach.
+  return method.startsWith("notifications/") && !("id" in message);
+}
+
 export function buildOpenGeniMcpServer(
   deps: ApiRouteDeps,
   grant: AccessGrant,

package/src/routes/billing.ts

@@ -1,5 +1,11 @@
 import {
   BillingCheckoutStatus,
+  BillingSubscriptionCatalog,
+  BillingSubscriptionChange,
+  CancelBillingSubscriptionRequest,
+  ChangeBillingSubscriptionRequest,
+  CreateSubscriptionCheckoutRequest,
+  CreateSubscriptionCheckoutResponse,
   CreateBillingPortalRequest,
   CreateBillingPortalResponse,
   CreateCheckoutRequest,
@@ -33,14 +39,19 @@ import {
   recordStripeWebhookEvent,
   upsertBillingCustomer,
 } from "@opengeni/db";
-import type { Hono } from "hono";
+import type { Context, Hono } from "hono";
 import { HTTPException } from "hono/http-exception";
 import Stripe from "stripe";
+import { sql } from "drizzle-orm";
 import { requireAccessContext } from "@opengeni/core";
 import type { ApiRouteDeps } from "@opengeni/core";
 import { withAccessGrantSessionRlsContext } from "../access-grant-rls";
+import { subscriptionStore } from "../billing-subscription-store";
+import { StripeSubscriptions, subscriptionWebhookEvent } from "../billing-subscriptions";
+import { serializedStripeCustomer } from "../billing-stripe-customer";
 
 export function registerBillingRoutes(app: Hono, deps: ApiRouteDeps): void {
+  registerSubscriptionRoutes(app, deps);
   app.get("/v1/billing", async (c) => {
     const context = await requireAccessContext(c, deps);
     const accountId = requireSelectedAccount(context, c.req.query("accountId"), "billing:read");
@@ -342,6 +353,11 @@ export function registerBillingRoutes(app: Hono, deps: ApiRouteDeps): void {
         return c.json({ received: true, duplicate: true });
       }
     }
+    // Retain disabled subscription deliveries, but leave them unprocessed so
+    // an operator can replay them after activation. Top-up events remain live.
+    if (subscriptionWebhookEvent(event) && !deps.settings.subscriptionPlansEnabled) {
+      return c.json({ received: true, ignored: true });
+    }
     try {
       await handleStripeWebhookEvent(deps, stripeClient(deps), event);
       await markStripeWebhookProcessed(deps.db, event.id);
@@ -354,6 +370,120 @@ export function registerBillingRoutes(app: Hono, deps: ApiRouteDeps): void {
   });
 }
 
+function requireSubscriptionsEnabled(deps: ApiRouteDeps): void {
+  if (!deps.settings.subscriptionPlansEnabled || deps.settings.billingMode !== "stripe") {
+    throw new HTTPException(404, { message: "subscription plans are not enabled" });
+  }
+}
+
+function subscriptions(deps: ApiRouteDeps, stripe = stripeClient(deps)) {
+  return new StripeSubscriptions(
+    stripe,
+    subscriptionStore(deps.db),
+    deps.settings.subscriptionPlansEnabled,
+    stripeCustomerProvider(deps),
+  );
+}
+
+function registerSubscriptionRoutes(app: Hono, deps: ApiRouteDeps): void {
+  app.get("/v1/billing/subscription/plans", async (c) => {
+    requireSubscriptionsEnabled(deps);
+    const context = await requireAccessContext(c, deps);
+    const accountId = requireSelectedAccount(context, c.req.query("accountId"), "billing:read");
+    return c.json(BillingSubscriptionCatalog.parse(await subscriptions(deps).catalog(accountId)));
+  });
+  app.post("/v1/billing/subscription/checkout", async (c) => {
+    requireSubscriptionsEnabled(deps);
+    const context = await requireAccessContext(c, deps);
+    const parsed = CreateSubscriptionCheckoutRequest.safeParse(await c.req.json());
+    if (!parsed.success)
+      throw new HTTPException(400, {
+        message: parsed.error.issues[0]?.message ?? "invalid subscription checkout request",
+      });
+    const accountId = requireSelectedAccount(context, parsed.data.accountId, "billing:manage");
+    const stripe = stripeClient(deps);
+    const customerId = await getOrCreateStripeCustomer(deps, stripe, context, accountId);
+    return c.json(
+      CreateSubscriptionCheckoutResponse.parse(
+        await subscriptions(deps, stripe).checkout({
+          ...parsed.data,
+          accountId,
+          customerId,
+          successUrl: checkoutReturnUrl(
+            deps.settings.publicBaseUrl,
+            deps.settings.webBaseUrl,
+            parsed.data.successUrl,
+            "/billing?subscription=success",
+            "successUrl",
+          ),
+          cancelUrl: checkoutReturnUrl(
+            deps.settings.publicBaseUrl,
+            deps.settings.webBaseUrl,
+            parsed.data.cancelUrl,
+            "/billing?subscription=cancelled",
+            "cancelUrl",
+          ),
+        }),
+      ),
+    );
+  });
+  const changeSubscription = (action: "upgrade" | "change") => async (c: Context) => {
+    requireSubscriptionsEnabled(deps);
+    const context = await requireAccessContext(c, deps);
+    const parsed = ChangeBillingSubscriptionRequest.safeParse(await c.req.json());
+    if (!parsed.success)
+      throw new HTTPException(400, {
+        message: parsed.error.issues[0]?.message ?? "invalid subscription change request",
+      });
+    const accountId = requireSelectedAccount(context, parsed.data.accountId, "billing:manage");
+    return c.json(
+      BillingSubscriptionChange.parse(
+        await subscriptions(deps)[action]({ ...parsed.data, accountId }),
+      ),
+    );
+  };
+  app.post("/v1/billing/subscription/upgrade", changeSubscription("upgrade"));
+  app.post("/v1/billing/subscription/change", changeSubscription("change"));
+  app.post("/v1/billing/subscription/cancel", async (c) => {
+    requireSubscriptionsEnabled(deps);
+    const context = await requireAccessContext(c, deps);
+    const parsed = CancelBillingSubscriptionRequest.safeParse(await c.req.json());
+    if (!parsed.success)
+      throw new HTTPException(400, {
+        message: parsed.error.issues[0]?.message ?? "invalid subscription cancellation request",
+      });
+    const accountId = requireSelectedAccount(context, parsed.data.accountId, "billing:manage");
+    return c.json(
+      BillingSubscriptionChange.parse(
+        await subscriptions(deps).cancel({ ...parsed.data, accountId }),
+      ),
+    );
+  });
+  app.post("/v1/billing/subscription/portal", async (c) => {
+    requireSubscriptionsEnabled(deps);
+    const context = await requireAccessContext(c, deps);
+    const parsed = CreateBillingPortalRequest.safeParse(await c.req.json());
+    if (!parsed.success)
+      throw new HTTPException(400, {
+        message: parsed.error.issues[0]?.message ?? "invalid billing portal request",
+      });
+    const accountId = requireSelectedAccount(context, parsed.data.accountId, "billing:manage");
+    const stripe = stripeClient(deps);
+    const customerId = await getOrCreateStripeCustomer(deps, stripe, context, accountId);
+    const session = await stripe.billingPortal.sessions.create(
+      stripeBillingPortalSessionCreateParams({
+        customerId,
+        publicBaseUrl: deps.settings.publicBaseUrl,
+        webBaseUrl: deps.settings.webBaseUrl,
+        returnUrl: parsed.data.returnUrl,
+      }),
+    );
+    return c.json(
+      CreateBillingPortalResponse.parse({ portalSessionId: session.id, url: session.url }),
+    );
+  });
+}
+
 export function stripeCheckoutSessionCreateParams(input: {
   accountId: string;
   customerId: string;
@@ -508,6 +638,10 @@ async function handleStripeWebhookEvent(
   stripe: Stripe,
   event: Stripe.Event,
 ): Promise<void> {
+  if (subscriptionWebhookEvent(event)) {
+    await subscriptions(deps, stripe).handleEvent(event);
+    return;
+  }
   switch (event.type) {
     case "checkout.session.completed":
     case "checkout.session.async_payment_succeeded":
@@ -1059,28 +1193,34 @@ async function getOrCreateStripeCustomer(
   accountId: string,
 ): Promise<string> {
   const provider = stripeCustomerProvider(deps);
-  const existing = await getBillingCustomer(deps.db, accountId, provider);
-  if (existing) {
-    return existing.providerCustomerId;
-  }
-  const account = await getManagedAccount(deps.db, accountId);
-  if (!account) {
-    throw new HTTPException(404, { message: "account not found" });
-  }
-  const customer = await stripe.customers.create({
-    name: account.name,
-    ...(looksLikeEmail(context.subjectLabel) ? { email: context.subjectLabel } : {}),
-    metadata: {
-      opengeni_account_id: accountId,
-    },
-  });
-  await upsertBillingCustomer(deps.db, {
-    accountId,
+  return await serializedStripeCustomer({
+    stripe,
     provider,
-    providerCustomerId: customer.id,
-    email: customer.email,
+    accountId,
+    ...(looksLikeEmail(context.subjectLabel) ? { email: context.subjectLabel } : {}),
+    locked: (run) =>
+      withRlsContext(deps.db, { accountId, workspaceId: null }, async (tx) => {
+        // Same account lock as credit writers. All top-up/portal/subscription
+        // callers share transactional read/create/persist under this one fence.
+        await tx.execute(sql`select pg_advisory_xact_lock(hashtext(${accountId}))`);
+        return await run({
+          read: async () =>
+            (await getBillingCustomer(tx, accountId, provider))?.providerCustomerId ?? null,
+          account: async () => {
+            const account = await getManagedAccount(tx, accountId);
+            if (!account) throw new HTTPException(404, { message: "account not found" });
+            return account;
+          },
+          save: (customer) =>
+            upsertBillingCustomer(tx, {
+              accountId,
+              provider,
+              providerCustomerId: customer.id,
+              email: customer.email,
+            }),
+        });
+      }),
   });
-  return customer.id;
 }
 
 export function stripeCustomerProvider(