@contember/cli 2.1.0-rc.3 → 2.2.0-alpha.10

package/src/dic.ts

@@ -12,66 +12,119 @@ import {
 	ModificationHandlerFactory,
 	SchemaDiffer,
 	SchemaMigrator,
+	SchemaStateManager,
 	SchemaVersionBuilder,
+	SnapshotManager,
 	VERSION_LATEST,
 } from '@contember/migrations-client'
-import { JsCodeRunner } from './lib/js/JsCodeRunner'
-import { EsBuildBuilder } from './lib/js/EsBuildBuilder'
-import { EvalExecutor } from './lib/js/EvalExecutor'
-import { AdminDeployer } from './lib/admin/AdminDeployer'
-import { RemoteProjectResolver } from './lib/project/RemoteProjectResolver'
-import { CliEnv } from './lib/env'
-import { AdminClient } from './lib/admin/AdminClient'
-import { FileSystem } from './lib/fs/FileSystem'
-import { WorkspaceResolver } from './lib/workspace/WorkspaceResolver'
-import { YamlHandler } from './lib/fs/YamlHandler'
+import { JsCodeRunner } from './lib/js/JsCodeRunner.js'
+import { EsBuildBuilder } from './lib/js/EsBuildBuilder.js'
+import { EvalExecutor } from './lib/js/EvalExecutor.js'
+import { AdminDeployer } from './lib/admin/AdminDeployer.js'
+import { RemoteProjectResolver } from './lib/project/RemoteProjectResolver.js'
+import { CliEnv } from './lib/env.js'
+import { AdminClient } from './lib/admin/AdminClient.js'
+import { FileSystem } from './lib/fs/FileSystem.js'
+import { WorkspaceResolver } from './lib/workspace/WorkspaceResolver.js'
+import { YamlHandler } from './lib/fs/YamlHandler.js'
 import {
+	CommandsCommand,
 	DeployCommand,
 	MigrationAmendCommand,
 	MigrationBlankCommand,
 	MigrationDescribeCommand,
 	MigrationDiffCommand,
 	MigrationExecuteCommand,
+	MigrationInitStateCommand,
 	MigrationRebaseCommand,
+	MigrationSnapshotCommand,
 	MigrationStatusCommand,
+	MigrationVerifySnapshotCommand,
 	ProjectGenerateDocumentationCommand,
 	ProjectPrintSchemaCommand,
 	ProjectValidateCommand,
 	VersionCommand,
 	WorkspaceUpdateApiCommand,
-} from './commands'
-import { MigrationExecutionFacade } from './lib/migrations/MigrationExecutionFacade'
-import { MigrationPrinter } from './lib/migrations/MigrationPrinter'
-import { MigrationsStatusFacade } from './lib/migrations/MigrationsStatusFacade'
-import { ImportSchemaLoader, SchemaLoader, TranspilingSchemaLoader } from './lib/schema/SchemaLoader'
-import { MigrationsValidator } from './lib/migrations/MigrationsValidator'
-import { MigrationRebaseFacade } from './lib/migrations/MigrationRebaseFacade'
-import { DataTransferClient } from './lib/transfer/DataTransferClient'
-import { ExportCommand, ImportCommand, TransferCommand } from './commands/transfer'
+} from './commands/index.js'
+import { MigrationExecutionFacade } from './lib/migrations/MigrationExecutionFacade.js'
+import { MigrationPrinter } from './lib/migrations/MigrationPrinter.js'
+import { MigrationSnapshotFacade } from './lib/migrations/MigrationSnapshotFacade.js'
+import { MigrationsStatusFacade } from './lib/migrations/MigrationsStatusFacade.js'
+import { ImportSchemaLoader, SchemaLoader, TranspilingSchemaLoader } from './lib/schema/SchemaLoader.js'
+import { MigrationsValidator } from './lib/migrations/MigrationsValidator.js'
+import { MigrationRebaseFacade } from './lib/migrations/MigrationRebaseFacade.js'
+import { DataTransferClient } from './lib/transfer/DataTransferClient.js'
+import { ExportCommand, ImportCommand, TransferCommand } from './commands/transfer/index.js'
 import {
 	Application,
 	Bun,
+	CommandFactory,
 	CommandFactoryList,
 	CommandManager,
 	CommandRunner,
 	Npm,
+	Output,
 	PackageWorkspaceResolver,
 	Pnpm,
 	Yarn,
 	YarnClassic,
 } from '@contember/cli-common'
-import { VersionChecker } from './lib/VersionChecker'
-import { DockerComposeManager } from './lib/fs/DockerComposeManager'
-import { RemoteProjectProvider } from './lib/project/RemoteProjectProvider'
-import { SystemClientProvider } from './lib/SystemClientProvider'
-import { TenantClientProvider } from './lib/TenantClientProvider'
-import { Workspace } from './lib/workspace/Workspace'
-import { ActionsListVariablesCommand } from './commands/actions/ActionsListVariablesCommand'
-import { ActionsSetVariablesCommand } from './commands/actions/ActionsSetVariablesCommand'
-import { ActionsListFailedEventsCommand } from './commands/actions/ActionsListFailedEventsCommand'
-import { ActionsRetryEventCommand } from './commands/actions/ActionsRetryEventCommand'
-import { ActionsGetEventCommand } from './commands/actions/ActionsGetEventCommand'
-import { ActionsStopEventCommand } from './commands/actions/ActionsStopEventCommand'
+import { VersionChecker } from './lib/VersionChecker.js'
+import { DockerComposeManager } from './lib/fs/DockerComposeManager.js'
+import { RemoteProjectProvider } from './lib/project/RemoteProjectProvider.js'
+import { SystemClientProvider } from './lib/SystemClientProvider.js'
+import { TenantClientProvider } from './lib/TenantClientProvider.js'
+import { Workspace } from './lib/workspace/Workspace.js'
+import { ActionsListVariablesCommand } from './commands/actions/ActionsListVariablesCommand.js'
+import { ActionsSetVariablesCommand } from './commands/actions/ActionsSetVariablesCommand.js'
+import { ActionsListFailedEventsCommand } from './commands/actions/ActionsListFailedEventsCommand.js'
+import { ActionsRetryEventCommand } from './commands/actions/ActionsRetryEventCommand.js'
+import { ActionsGetEventCommand } from './commands/actions/ActionsGetEventCommand.js'
+import { ActionsStopEventCommand } from './commands/actions/ActionsStopEventCommand.js'
+import {
+	TenantApiKeyCreateCommand,
+	TenantApiKeyDisableCommand,
+	TenantApiKeyListCommand,
+	TenantApplyCommand,
+	TenantAuthLogCommand,
+	TenantConfigShowCommand,
+	TenantIdentityRoleAddCommand,
+	TenantIdentityRoleRemoveCommand,
+	TenantIdpListCommand,
+	TenantMailTemplateAddCommand,
+	TenantMailTemplateListCommand,
+	TenantMailTemplateRemoveCommand,
+	TenantMemberAddCommand,
+	TenantMemberInviteCommand,
+	TenantMemberInviteUnmanagedCommand,
+	TenantMemberListCommand,
+	TenantMemberRemoveCommand,
+	TenantMemberUpdateCommand,
+	TenantPersonCreateCommand,
+	TenantPersonDisableCommand,
+	TenantPersonListCommand,
+	TenantPersonResetMfaCommand,
+	TenantPersonResetPasswordRequestCommand,
+	TenantPersonSetPasswordCommand,
+	TenantPersonShowCommand,
+	TenantPersonSignOutCommand,
+	TenantPersonUpdateCommand,
+	TenantPolicyCreateCommand,
+	TenantPolicyDeleteCommand,
+	TenantPolicyListCommand,
+	TenantPolicyUpdateCommand,
+	TenantProjectCreateCommand,
+	TenantProjectListCommand,
+	TenantProjectSecretSetCommand,
+	TenantProjectShowCommand,
+	TenantProjectUpdateCommand,
+	TenantSessionCreateCommand,
+	TenantWhoAmICommand,
+} from './commands/tenant/index.js'
+import { ImportTenantConfigLoader, TranspilingTenantConfigLoader } from './lib/tenant/TenantConfigLoader.js'
+import { TenantConfigApplier } from './lib/tenant/TenantConfigApplier.js'
+import { TenantConnectionProvider } from './lib/tenant/TenantConnectionProvider.js'
+import { TenantConnectionResolver } from './lib/tenant/TenantConnectionResolver.js'
 
 const jsSample = `
 export const query = \`\`
@@ -84,17 +137,19 @@ export const variables = {}
 // export default async () => ({ queries: [] })
 `
 
-export const createContainer = ({ env, version, runtime, workspace }: {
+export const createContainer = ({ env, version, runtime, workspace, output }: {
 	workspace: Workspace
 	env: CliEnv
 	version: string
 	runtime: 'node' | 'bun'
+	output: Output
 }) => {
 	return new Builder({})
 		.addService('env', () => env)
 		.addService('version', () => version)
 		.addService('runtime', () => runtime)
 		.addService('workspace', () => workspace)
+		.addService('output', () => output)
 		.addService('fs', () => new FileSystem())
 		.addService('yamlHandler', ({ fs }) => new YamlHandler(fs))
 		.addService('jsExecutor', () => new EvalExecutor())
@@ -102,6 +157,8 @@ export const createContainer = ({ env, version, runtime, workspace }: {
 		.addService('jsCodeRunner', ({ jsExecutor, jsBuilder }) => new JsCodeRunner(jsBuilder, jsExecutor))
 		.addService('workspaceResolver', ({ yamlHandler }) => new WorkspaceResolver(yamlHandler))
 		.addService('remoteProjectResolver', ({ env }) => new RemoteProjectResolver(env))
+		.addService('tenantConnectionResolver', ({ env }) => new TenantConnectionResolver(env))
+		.addService('tenantConnectionProvider', ({ tenantConnectionResolver }) => new TenantConnectionProvider(tenantConnectionResolver))
 		.addService('remoteProjectProvider', ({ remoteProjectResolver }) => {
 			const provider = new RemoteProjectProvider()
 			const remoteProject = remoteProjectResolver.resolve()
@@ -111,7 +168,8 @@ export const createContainer = ({ env, version, runtime, workspace }: {
 			return provider
 		})
 		.addService('systemClientProvider', ({ remoteProjectProvider }) => new SystemClientProvider(remoteProjectProvider))
-		.addService('tenantClientProvider', ({ remoteProjectProvider }) => new TenantClientProvider(remoteProjectProvider))
+		.addService('tenantClientProvider', ({ tenantConnectionProvider }) => new TenantClientProvider(tenantConnectionProvider))
+		.addService('migrationTenantClientProvider', ({ remoteProjectProvider }) => new TenantClientProvider(remoteProjectProvider))
 		.addService('adminClient', ({ remoteProjectProvider }) => new AdminClient(remoteProjectProvider))
 		.addService('migrationFilesManager', ({ jsCodeRunner, workspace }) => {
 			const runJs = runtime === 'bun' ? (file: string) => import(file) : jsCodeRunner.run
@@ -121,8 +179,8 @@ export const createContainer = ({ env, version, runtime, workspace }: {
 				js: new JsLoader(new MigrationParser(), runJs),
 			})
 		})
-		.addService('packageWorkspaceResolver', ({ workspace, fs }) => {
-			const commandRunner = new CommandRunner()
+		.addService('packageWorkspaceResolver', ({ workspace, fs, output }) => {
+			const commandRunner = new CommandRunner(output)
 			return new PackageWorkspaceResolver(workspace.baseDir, fs, [
 				new Yarn(fs, commandRunner),
 				new YarnClassic(fs, commandRunner),
@@ -138,7 +196,12 @@ export const createContainer = ({ env, version, runtime, workspace }: {
 		.addService('modificationHandlerFactory', () => new ModificationHandlerFactory(ModificationHandlerFactory.defaultFactoryMap))
 		.addService('schemaMigrator', ({ modificationHandlerFactory }) => new SchemaMigrator(modificationHandlerFactory))
 		.addService('migrationsResolver', ({ migrationFilesManager }) => new MigrationsResolver(migrationFilesManager))
-		.addService('schemaVersionBuilder', ({ migrationsResolver, schemaMigrator }) => new SchemaVersionBuilder(migrationsResolver, schemaMigrator))
+		.addService('schemaStateManager', ({ workspace }) => new SchemaStateManager(workspace.migrationsDir + '/state'))
+		.addService('snapshotManager', ({ workspace }) => new SnapshotManager(workspace.migrationsDir + '/snapshot.json'))
+		.addService(
+			'schemaVersionBuilder',
+			({ migrationsResolver, schemaMigrator, schemaStateManager }) => new SchemaVersionBuilder(migrationsResolver, schemaMigrator, schemaStateManager),
+		)
 		.addService('schemaDiffer', ({ schemaMigrator }) =>
 			new SchemaDiffer(schemaMigrator, {
 				maxPatchSize: env.migrationsOptions?.maxPatchSize,
@@ -150,47 +213,72 @@ export const createContainer = ({ env, version, runtime, workspace }: {
 				js: jsSample,
 			}))
 		.addService('migrationDescriber', ({ modificationHandlerFactory }) => new MigrationDescriber(modificationHandlerFactory))
-		.addService('migrationPrinter', ({ migrationDescriber }) => new MigrationPrinter(migrationDescriber))
+		.addService('migrationPrinter', ({ migrationDescriber, output }) => new MigrationPrinter(migrationDescriber, output))
 		.addService('migrationsExecutor', () => new MigrationExecutor())
 		.addService('migrationsStatusResolver', () => new MigrationsStatusResolver())
+		.addService(
+			'migrationSnapshotFacade',
+			({ migrationsResolver, schemaVersionBuilder, schemaDiffer, schemaMigrator, schemaStateManager, snapshotManager, output }) =>
+				new MigrationSnapshotFacade(
+					migrationsResolver,
+					schemaVersionBuilder,
+					schemaDiffer,
+					schemaMigrator,
+					schemaStateManager,
+					snapshotManager,
+					output,
+				),
+		)
 		.addService(
 			'migrationsStatusFacade',
-			({ systemClientProvider, migrationsResolver, migrationsStatusResolver, migrationPrinter }) =>
-				new MigrationsStatusFacade(systemClientProvider, migrationsResolver, migrationsStatusResolver, migrationPrinter),
+			({ systemClientProvider, migrationsResolver, migrationsStatusResolver, migrationPrinter, output }) =>
+				new MigrationsStatusFacade(systemClientProvider, migrationsResolver, migrationsStatusResolver, migrationPrinter, output),
 		)
 		.addService(
 			'migrationExecutionFacade',
 			({
 				systemClientProvider,
-				tenantClientProvider,
+				migrationTenantClientProvider,
 				remoteProjectProvider,
 				schemaVersionBuilder,
 				migrationPrinter,
 				migrationsExecutor,
 				migrationsStatusFacade,
+				schemaStateManager,
+				migrationSnapshotFacade,
+				output,
 			}) =>
 				new MigrationExecutionFacade(
 					systemClientProvider,
-					tenantClientProvider,
+					migrationTenantClientProvider,
 					remoteProjectProvider,
 					schemaVersionBuilder,
 					migrationPrinter,
 					migrationsExecutor,
 					migrationsStatusFacade,
+					schemaStateManager,
+					migrationSnapshotFacade,
+					output,
 				),
 		)
-		.addService('migrationsValidator', ({ migrationDescriber, schemaMigrator }) => new MigrationsValidator(migrationDescriber, schemaMigrator))
+		.addService(
+			'migrationsValidator',
+			({ migrationDescriber, schemaMigrator, output }) => new MigrationsValidator(migrationDescriber, schemaMigrator, output),
+		)
 		.addService(
 			'migrationRebaseFacade',
-			({ schemaVersionBuilder, migrationsValidator, systemClientProvider, migrationFilesManager }) =>
-				new MigrationRebaseFacade(schemaVersionBuilder, migrationsValidator, systemClientProvider, migrationFilesManager),
+			({ schemaVersionBuilder, migrationsValidator, systemClientProvider, migrationFilesManager, schemaStateManager }) =>
+				new MigrationRebaseFacade(schemaVersionBuilder, migrationsValidator, systemClientProvider, migrationFilesManager, schemaStateManager),
 		)
 		.addService(
 			'schemaLoader',
 			({ workspace, jsCodeRunner, runtime }) =>
 				runtime === 'bun' ? new ImportSchemaLoader(workspace) : new TranspilingSchemaLoader(workspace, jsCodeRunner),
 		)
-		.addService('adminDeployer', ({ remoteProjectProvider, adminClient, fs }) => new AdminDeployer(remoteProjectProvider, adminClient, fs))
+		.addService(
+			'adminDeployer',
+			({ remoteProjectProvider, adminClient, fs, output }) => new AdminDeployer(remoteProjectProvider, adminClient, fs, output),
+		)
 		.addService('dataTransferClient', () => new DataTransferClient())
 		.addService(
 			'deployCommand',
@@ -209,6 +297,7 @@ export const createContainer = ({ env, version, runtime, workspace }: {
 				migrationsValidator,
 				migrationPrinter,
 				schemaMigrator,
+				schemaStateManager,
 			}) =>
 				new MigrationAmendCommand(
 					migrationsResolver,
@@ -220,6 +309,7 @@ export const createContainer = ({ env, version, runtime, workspace }: {
 					migrationsValidator,
 					migrationPrinter,
 					schemaMigrator,
+					schemaStateManager,
 				),
 		)
 		.addService('migrationBlankCommand', ({ migrationCreator }) => new MigrationBlankCommand(migrationCreator))
@@ -230,14 +320,31 @@ export const createContainer = ({ env, version, runtime, workspace }: {
 		)
 		.addService(
 			'migrationDiffCommand',
-			({ schemaLoader, schemaVersionBuilder, migrationCreator, migrationPrinter, migrationExecutionFacade }) =>
-				new MigrationDiffCommand(schemaLoader, schemaVersionBuilder, migrationCreator, migrationPrinter, migrationExecutionFacade),
+			({ schemaLoader, schemaVersionBuilder, migrationCreator, migrationPrinter, migrationExecutionFacade, schemaStateManager, migrationsResolver }) =>
+				new MigrationDiffCommand(
+					schemaLoader,
+					schemaVersionBuilder,
+					migrationCreator,
+					migrationPrinter,
+					migrationExecutionFacade,
+					schemaStateManager,
+					migrationsResolver,
+				),
 		)
 		.addService('migrationExecuteCommand', ({ migrationExecutionFacade }) => new MigrationExecuteCommand(migrationExecutionFacade))
+		.addService(
+			'migrationInitStateCommand',
+			({ schemaLoader, schemaStateManager }) => new MigrationInitStateCommand(schemaLoader, schemaStateManager),
+		)
 		.addService(
 			'migrationRebaseCommand',
 			({ migrationsResolver, migrationRebaseFacade }) => new MigrationRebaseCommand(migrationsResolver, migrationRebaseFacade),
 		)
+		.addService('migrationSnapshotCommand', ({ migrationSnapshotFacade }) => new MigrationSnapshotCommand(migrationSnapshotFacade))
+		.addService(
+			'migrationVerifySnapshotCommand',
+			({ migrationSnapshotFacade }) => new MigrationVerifySnapshotCommand(migrationSnapshotFacade),
+		)
 		.addService(
 			'migrationStatusCommand',
 			({ migrationsStatusFacade, migrationFilesManager, systemClientProvider, migrationPrinter }) =>
@@ -270,46 +377,156 @@ export const createContainer = ({ env, version, runtime, workspace }: {
 		.addService('actionsRetryEvent', ({ remoteProjectResolver }) => new ActionsRetryEventCommand(remoteProjectResolver))
 		.addService('actionsGetEvent', ({ remoteProjectResolver }) => new ActionsGetEventCommand(remoteProjectResolver))
 		.addService('actionsStopEvent', ({ remoteProjectResolver }) => new ActionsStopEventCommand(remoteProjectResolver))
+		.addService(
+			'tenantConfigLoader',
+			({ jsCodeRunner }) => runtime === 'bun' ? new ImportTenantConfigLoader() : new TranspilingTenantConfigLoader(jsCodeRunner),
+		)
+		.addService('tenantConfigApplier', ({ output }) => new TenantConfigApplier(output))
+		.addService(
+			'tenantApplyCommand',
+			({ remoteProjectResolver, tenantConfigLoader, tenantConfigApplier }) =>
+				new TenantApplyCommand(remoteProjectResolver, tenantConfigLoader, tenantConfigApplier),
+		)
+		.addService('tenantProjectListCommand', ({ tenantClientProvider }) => new TenantProjectListCommand(tenantClientProvider))
+		.addService('tenantProjectShowCommand', ({ tenantClientProvider }) => new TenantProjectShowCommand(tenantClientProvider))
+		.addService('tenantProjectCreateCommand', ({ tenantClientProvider }) => new TenantProjectCreateCommand(tenantClientProvider))
+		.addService('tenantProjectUpdateCommand', ({ tenantClientProvider }) => new TenantProjectUpdateCommand(tenantClientProvider))
+		.addService('tenantProjectSecretSetCommand', ({ tenantClientProvider }) => new TenantProjectSecretSetCommand(tenantClientProvider))
+		.addService('tenantConfigShowCommand', ({ tenantClientProvider }) => new TenantConfigShowCommand(tenantClientProvider))
+		.addService('tenantIdpListCommand', ({ tenantClientProvider }) => new TenantIdpListCommand(tenantClientProvider))
+		.addService('tenantWhoAmICommand', ({ tenantClientProvider }) => new TenantWhoAmICommand(tenantClientProvider))
+		.addService('tenantPersonListCommand', ({ tenantClientProvider }) => new TenantPersonListCommand(tenantClientProvider))
+		.addService('tenantPersonShowCommand', ({ tenantClientProvider }) => new TenantPersonShowCommand(tenantClientProvider))
+		.addService('tenantPersonCreateCommand', ({ tenantClientProvider }) => new TenantPersonCreateCommand(tenantClientProvider))
+		.addService('tenantPersonUpdateCommand', ({ tenantClientProvider }) => new TenantPersonUpdateCommand(tenantClientProvider))
+		.addService('tenantPersonSetPasswordCommand', ({ tenantClientProvider }) => new TenantPersonSetPasswordCommand(tenantClientProvider))
+		.addService('tenantPersonDisableCommand', ({ tenantClientProvider }) => new TenantPersonDisableCommand(tenantClientProvider))
+		.addService('tenantPersonSignOutCommand', ({ tenantClientProvider }) => new TenantPersonSignOutCommand(tenantClientProvider))
+		.addService('tenantPersonResetMfaCommand', ({ tenantClientProvider }) => new TenantPersonResetMfaCommand(tenantClientProvider))
+		.addService(
+			'tenantPersonResetPasswordRequestCommand',
+			({ tenantClientProvider }) => new TenantPersonResetPasswordRequestCommand(tenantClientProvider),
+		)
+		.addService('tenantSessionCreateCommand', ({ tenantClientProvider }) => new TenantSessionCreateCommand(tenantClientProvider))
+		.addService('tenantIdentityRoleAddCommand', ({ tenantClientProvider }) => new TenantIdentityRoleAddCommand(tenantClientProvider))
+		.addService('tenantIdentityRoleRemoveCommand', ({ tenantClientProvider }) => new TenantIdentityRoleRemoveCommand(tenantClientProvider))
+		.addService('tenantMemberListCommand', ({ tenantClientProvider }) => new TenantMemberListCommand(tenantClientProvider))
+		.addService('tenantMemberAddCommand', ({ tenantClientProvider }) => new TenantMemberAddCommand(tenantClientProvider))
+		.addService('tenantMemberUpdateCommand', ({ tenantClientProvider }) => new TenantMemberUpdateCommand(tenantClientProvider))
+		.addService('tenantMemberRemoveCommand', ({ tenantClientProvider }) => new TenantMemberRemoveCommand(tenantClientProvider))
+		.addService('tenantMemberInviteCommand', ({ tenantClientProvider }) => new TenantMemberInviteCommand(tenantClientProvider))
+		.addService(
+			'tenantMemberInviteUnmanagedCommand',
+			({ tenantClientProvider }) => new TenantMemberInviteUnmanagedCommand(tenantClientProvider),
+		)
+		.addService('tenantApiKeyListCommand', ({ tenantClientProvider }) => new TenantApiKeyListCommand(tenantClientProvider))
+		.addService('tenantApiKeyCreateCommand', ({ tenantClientProvider }) => new TenantApiKeyCreateCommand(tenantClientProvider))
+		.addService('tenantApiKeyDisableCommand', ({ tenantClientProvider }) => new TenantApiKeyDisableCommand(tenantClientProvider))
+		.addService('tenantPolicyListCommand', ({ tenantClientProvider }) => new TenantPolicyListCommand(tenantClientProvider))
+		.addService('tenantPolicyCreateCommand', ({ tenantClientProvider }) => new TenantPolicyCreateCommand(tenantClientProvider))
+		.addService('tenantPolicyUpdateCommand', ({ tenantClientProvider }) => new TenantPolicyUpdateCommand(tenantClientProvider))
+		.addService('tenantPolicyDeleteCommand', ({ tenantClientProvider }) => new TenantPolicyDeleteCommand(tenantClientProvider))
+		.addService('tenantMailTemplateListCommand', ({ tenantClientProvider }) => new TenantMailTemplateListCommand(tenantClientProvider))
+		.addService('tenantMailTemplateAddCommand', ({ tenantClientProvider }) => new TenantMailTemplateAddCommand(tenantClientProvider))
+		.addService('tenantMailTemplateRemoveCommand', ({ tenantClientProvider }) => new TenantMailTemplateRemoveCommand(tenantClientProvider))
+		.addService('tenantAuthLogCommand', ({ tenantClientProvider }) => new TenantAuthLogCommand(tenantClientProvider))
+		.addService('commandsCommand', () => new CommandsCommand())
 		.addService('commandList', dic => {
-			const commands: CommandFactoryList = {
-				['deploy']: () => dic.deployCommand,
-				['version']: () => dic.versionCommand,
-				['data:export']: () => dic.exportCommand,
-				['data:import']: () => dic.importCommand,
-				['data:transfer']: () => dic.transferCommand,
-				['migrations:diff']: () => dic.migrationDiffCommand,
-				['migrations:amend']: () => dic.migrationAmendCommand,
-				['migrations:blank']: () => dic.migrationBlankCommand,
-				['migrations:describe']: () => dic.migrationDescribeCommand,
-				['migrations:execute']: () => dic.migrationExecuteCommand,
-				['migrations:rebase']: () => dic.migrationRebaseCommand,
-				['migrations:status']: () => dic.migrationStatusCommand,
-				['workspace:update:api']: () => dic.workspaceUpdateCommand,
-				['project:validate']: () => dic.projectValidateCommand,
-				['project:print-schema']: () => dic.projectPrintSchemaCommand,
-				['project:generate-doc']: () => dic.projectGenerateDocumentationCommand,
-				['actions:list-variables']: () => dic.actionsListVariables,
-				['actions:set-variables']: () => dic.actionsSetVariables,
-				['actions:failed-events']: () => dic.actionsListFailedEvents,
-				['actions:retry-event']: () => dic.actionsRetryEvent,
-				['actions:get-event']: () => dic.actionsGetEvent,
-				['actions:stop-event']: () => dic.actionsStopEvent,
+			const commands: CommandFactoryList = {}
+			// Canonical multi-token names always retain their silent colon compatibility alias.
+			const register = (name: string, factory: CommandFactory) => {
+				commands[name] = factory
+				const colonAlias = name.includes(' ') ? name.split(' ').join(':') : undefined
+				if (colonAlias !== undefined) {
+					commands[colonAlias] = factory
+				}
 			}
+			register('deploy', () => dic.deployCommand)
+			register('version', () => dic.versionCommand)
+			register('commands', () => dic.commandsCommand)
+			register('data export', () => dic.exportCommand)
+			register('data import', () => dic.importCommand)
+			register('data transfer', () => dic.transferCommand)
+			register('migrations diff', () => dic.migrationDiffCommand)
+			register('migrations amend', () => dic.migrationAmendCommand)
+			register('migrations blank', () => dic.migrationBlankCommand)
+			register('migrations init-state', () => dic.migrationInitStateCommand)
+			register('migrations describe', () => dic.migrationDescribeCommand)
+			register('migrations execute', () => dic.migrationExecuteCommand)
+			register('migrations rebase', () => dic.migrationRebaseCommand)
+			register('migrations snapshot', () => dic.migrationSnapshotCommand)
+			register('migrations verify-snapshot', () => dic.migrationVerifySnapshotCommand)
+			register('migrations status', () => dic.migrationStatusCommand)
+			register('workspace update api', () => dic.workspaceUpdateCommand)
+			register('project validate', () => dic.projectValidateCommand)
+			register('project print-schema', () => dic.projectPrintSchemaCommand)
+			register('project generate-doc', () => dic.projectGenerateDocumentationCommand)
+			register('actions list-variables', () => dic.actionsListVariables)
+			register('actions set-variables', () => dic.actionsSetVariables)
+			register('actions failed-events', () => dic.actionsListFailedEvents)
+			register('actions retry-event', () => dic.actionsRetryEvent)
+			register('actions get-event', () => dic.actionsGetEvent)
+			register('actions stop-event', () => dic.actionsStopEvent)
+			register('tenant apply', () => dic.tenantApplyCommand)
+			register('tenant whoami', () => dic.tenantWhoAmICommand)
+			register('tenant auth-log', () => dic.tenantAuthLogCommand)
+			register('tenant config show', () => dic.tenantConfigShowCommand)
+			register('tenant idp list', () => dic.tenantIdpListCommand)
+			register('tenant project list', () => dic.tenantProjectListCommand)
+			register('tenant project show', () => dic.tenantProjectShowCommand)
+			register('tenant project create', () => dic.tenantProjectCreateCommand)
+			register('tenant project update', () => dic.tenantProjectUpdateCommand)
+			register('tenant project secret set', () => dic.tenantProjectSecretSetCommand)
+			register('tenant person list', () => dic.tenantPersonListCommand)
+			register('tenant person show', () => dic.tenantPersonShowCommand)
+			register('tenant person create', () => dic.tenantPersonCreateCommand)
+			register('tenant person update', () => dic.tenantPersonUpdateCommand)
+			register('tenant person set-password', () => dic.tenantPersonSetPasswordCommand)
+			register('tenant person disable', () => dic.tenantPersonDisableCommand)
+			register('tenant person sign-out', () => dic.tenantPersonSignOutCommand)
+			register('tenant person reset-mfa', () => dic.tenantPersonResetMfaCommand)
+			register('tenant person reset-password-request', () => dic.tenantPersonResetPasswordRequestCommand)
+			register('tenant session create', () => dic.tenantSessionCreateCommand)
+			register('tenant identity role add', () => dic.tenantIdentityRoleAddCommand)
+			register('tenant identity role remove', () => dic.tenantIdentityRoleRemoveCommand)
+			register('tenant member list', () => dic.tenantMemberListCommand)
+			register('tenant member add', () => dic.tenantMemberAddCommand)
+			register('tenant member update', () => dic.tenantMemberUpdateCommand)
+			register('tenant member remove', () => dic.tenantMemberRemoveCommand)
+			register('tenant member invite', () => dic.tenantMemberInviteCommand)
+			register('tenant member invite-unmanaged', () => dic.tenantMemberInviteUnmanagedCommand)
+			register('tenant api-key list', () => dic.tenantApiKeyListCommand)
+			register('tenant api-key create', () => dic.tenantApiKeyCreateCommand)
+			register('tenant api-key disable', () => dic.tenantApiKeyDisableCommand)
+			register('tenant policy list', () => dic.tenantPolicyListCommand)
+			register('tenant policy create', () => dic.tenantPolicyCreateCommand)
+			register('tenant policy update', () => dic.tenantPolicyUpdateCommand)
+			register('tenant policy delete', () => dic.tenantPolicyDeleteCommand)
+			register('tenant mail-template list', () => dic.tenantMailTemplateListCommand)
+			register('tenant mail-template add', () => dic.tenantMailTemplateAddCommand)
+			register('tenant mail-template remove', () => dic.tenantMailTemplateRemoveCommand)
 			return commands
 		})
-		.addService('commandManager', ({ commandList }) => new CommandManager(commandList))
+		.addService('commandManager', ({ commandList, commandsCommand }) => {
+			const commandManager = new CommandManager(commandList)
+			commandsCommand.setCommandManager(commandManager)
+			return commandManager
+		})
 		.addService(
 			'versionChecker',
 			({ version, workspace, packageWorkspaceResolver, dockerComposeManager }) =>
 				new VersionChecker(version, workspace.baseDir, packageWorkspaceResolver, dockerComposeManager),
 		)
-		.addService('application', ({ commandManager, versionChecker }) => {
+		.addService('application', ({ commandManager, versionChecker, output }) => {
 			const app = new Application(
 				commandManager,
 				`Contember CLI version ${version}`,
+				output,
 				{
 					beforeRun: async ({ name }) => {
-						if (!process.env.CONTEMBER_SKIP_VERSION_CHECK && !['deploy', 'version', 'data:export', 'data:import', 'data:transfer'].includes(name)) {
+						// the tenant commands only talk to a remote API — they must run outside a Contember workspace too
+						const skipped = ['deploy', 'version', 'commands', 'data export', 'data import', 'data transfer']
+						if (!process.env.CONTEMBER_SKIP_VERSION_CHECK && !skipped.includes(name) && !name.startsWith('tenant ')) {
 							await versionChecker.checkVersions()
 						}
 					},

package/src/index.ts

@@ -0,0 +1 @@
+export * from './lib/tenant/tenantConfig.js'

package/src/lib/SystemClientProvider.ts

@@ -1,14 +1,88 @@
-import { RemoteProjectProvider } from './project/RemoteProjectProvider'
+import { RemoteProjectProvider } from './project/RemoteProjectProvider.js'
 import { SystemClient } from '@contember/migrations-client'
+import { GraphQlClient, GraphQlClientError } from '@contember/graphql-client'
+import { toTransportError, TransportErrorContext } from './errors/TransportError.js'
+
+type SystemClientFactory = (baseUrl: string, projectName: string, apiToken: string) => SystemClient
 
 export class SystemClientProvider {
 	constructor(
 		private readonly remoteProjectProvider: RemoteProjectProvider,
+		private readonly systemClientFactory: SystemClientFactory = SystemClient.create,
 	) {
 	}
 
 	public get(): SystemClient {
 		const project = this.remoteProjectProvider.get()
-		return SystemClient.create(project.endpoint, project.name, project.token)
+		return new TransportSystemClient(
+			this.systemClientFactory(project.endpoint, project.name, project.token),
+			createSystemApiUrl(project.endpoint, project.name),
+		)
+	}
+}
+
+class TransportSystemClient extends SystemClient {
+	private readonly context: TransportErrorContext
+
+	constructor(
+		private readonly inner: SystemClient,
+		apiUrl: string,
+	) {
+		super(new GraphQlClient({ url: apiUrl }))
+		this.context = {
+			service: 'System API',
+			codePrefix: 'SYSTEM_API',
+			url: apiUrl,
+		}
+	}
+
+	public override migrate(...args: Parameters<SystemClient['migrate']>): ReturnType<SystemClient['migrate']> {
+		return this.execute(() => this.inner.migrate(...args))
 	}
+
+	public override migrateFromSnapshot(
+		...args: Parameters<SystemClient['migrateFromSnapshot']>
+	): ReturnType<SystemClient['migrateFromSnapshot']> {
+		return this.execute(() => this.inner.migrateFromSnapshot(...args))
+	}
+
+	public override migrationDelete(
+		...args: Parameters<SystemClient['migrationDelete']>
+	): ReturnType<SystemClient['migrationDelete']> {
+		return this.execute(() => this.inner.migrationDelete(...args))
+	}
+
+	public override migrationModify(
+		...args: Parameters<SystemClient['migrationModify']>
+	): ReturnType<SystemClient['migrationModify']> {
+		return this.execute(() => this.inner.migrationModify(...args))
+	}
+
+	public override listExecutedMigrations(
+		...args: Parameters<SystemClient['listExecutedMigrations']>
+	): ReturnType<SystemClient['listExecutedMigrations']> {
+		return this.execute(() => this.inner.listExecutedMigrations(...args))
+	}
+
+	public override getExecutedMigration(
+		...args: Parameters<SystemClient['getExecutedMigration']>
+	): ReturnType<SystemClient['getExecutedMigration']> {
+		return this.execute(() => this.inner.getExecutedMigration(...args))
+	}
+
+	private async execute<T>(request: () => Promise<T>): Promise<T> {
+		try {
+			return await request()
+		} catch (error) {
+			if (error instanceof GraphQlClientError) {
+				throw toTransportError(error, this.context)
+			}
+			throw error
+		}
+	}
+}
+
+const createSystemApiUrl = (baseUrl: string, projectName: string): string => {
+	const normalizedBaseUrl = baseUrl.endsWith('/') ? baseUrl.slice(0, -1) : baseUrl
+	return `${normalizedBaseUrl}/system/${projectName}`
 }