diff --git a/README.md b/README.md
index a7b71a2f..fd59a43a 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ $ npm install -g @ably/cli
 $ ably COMMAND
 running command...
 $ ably (--version)
-@ably/cli/0.16.0 darwin-arm64 node-v22.14.0
+@ably/cli/0.15.0 darwin-arm64 node-v22.14.0
 $ ably --help [COMMAND]
 USAGE
   $ ably COMMAND
@@ -75,7 +75,6 @@ $ ably-interactive
 * [`ably accounts list`](#ably-accounts-list)
 * [`ably accounts login [TOKEN]`](#ably-accounts-login-token)
 * [`ably accounts logout [ALIAS]`](#ably-accounts-logout-alias)
-* [`ably accounts stats`](#ably-accounts-stats)
 * [`ably accounts switch [ALIAS]`](#ably-accounts-switch-alias)
 * [`ably apps`](#ably-apps)
 * [`ably apps channel-rules`](#ably-apps-channel-rules)
@@ -88,7 +87,6 @@ $ ably-interactive
 * [`ably apps delete [APPID]`](#ably-apps-delete-appid)
 * [`ably apps list`](#ably-apps-list)
 * [`ably apps set-apns-p12 ID`](#ably-apps-set-apns-p12-id)
-* [`ably apps stats [ID]`](#ably-apps-stats-id)
 * [`ably apps switch [APPID]`](#ably-apps-switch-appid)
 * [`ably apps update ID`](#ably-apps-update-id)
 * [`ably auth`](#ably-auth)
@@ -123,7 +121,6 @@ $ ably-interactive
 * [`ably config path`](#ably-config-path)
 * [`ably config show`](#ably-config-show)
 * [`ably connections`](#ably-connections)
-* [`ably connections stats`](#ably-connections-stats)
 * [`ably connections test`](#ably-connections-test)
 * [`ably help [COMMANDS]`](#ably-help-commands)
 * [`ably integrations`](#ably-integrations)
@@ -144,6 +141,8 @@ $ ably-interactive
 * [`ably logs push history`](#ably-logs-push-history)
 * [`ably logs push subscribe`](#ably-logs-push-subscribe)
 * [`ably logs subscribe`](#ably-logs-subscribe)
+* [`ably mcp`](#ably-mcp)
+* [`ably mcp start-server`](#ably-mcp-start-server)
 * [`ably queues`](#ably-queues)
 * [`ably queues create`](#ably-queues-create)
 * [`ably queues delete QUEUEID`](#ably-queues-delete-queueid)
@@ -188,6 +187,9 @@ $ ably-interactive
 * [`ably spaces members`](#ably-spaces-members)
 * [`ably spaces members enter SPACE`](#ably-spaces-members-enter-space)
 * [`ably spaces members subscribe SPACE`](#ably-spaces-members-subscribe-space)
+* [`ably stats`](#ably-stats)
+* [`ably stats account`](#ably-stats-account)
+* [`ably stats app [ID]`](#ably-stats-app-id)
 * [`ably status`](#ably-status)
 * [`ably support`](#ably-support)
 * [`ably support ask QUESTION`](#ably-support-ask-question)
@@ -215,18 +217,15 @@ EXAMPLES
 
   $ ably accounts switch my-account
 
-  $ ably accounts stats
-
 COMMANDS
   ably accounts current         Show the current Ably account
   ably accounts list            List locally configured Ably accounts
   ably accounts login           Log in to your Ably account
   ably accounts logout          Log out from an Ably account
-  ably accounts stats           Get account stats with optional live updates
   ably accounts switch          Switch to a different Ably account
 ```
 
-_See code: [src/commands/accounts/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/accounts/index.ts)_
+_See code: [src/commands/accounts/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/accounts/index.ts)_
 
 ## `ably accounts current`
 
@@ -261,7 +260,7 @@ EXAMPLES
   $ ably accounts current --pretty-json
 ```
 
-_See code: [src/commands/accounts/current.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/accounts/current.ts)_
+_See code: [src/commands/accounts/current.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/accounts/current.ts)_
 
 ## `ably accounts list`
 
@@ -296,7 +295,7 @@ EXAMPLES
   $ ably accounts list --pretty-json
 ```
 
-_See code: [src/commands/accounts/list.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/accounts/list.ts)_
+_See code: [src/commands/accounts/list.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/accounts/list.ts)_
 
 ## `ably accounts login [TOKEN]`
 
@@ -338,7 +337,7 @@ EXAMPLES
   $ ably accounts login --pretty-json
 ```
 
-_See code: [src/commands/accounts/login.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/accounts/login.ts)_
+_See code: [src/commands/accounts/login.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/accounts/login.ts)_
 
 ## `ably accounts logout [ALIAS]`
 
@@ -379,61 +378,7 @@ EXAMPLES
   $ ably accounts logout --pretty-json
 ```
 
-_See code: [src/commands/accounts/logout.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/accounts/logout.ts)_
-
-## `ably accounts stats`
-
-Get account stats with optional live updates
-
-```
-USAGE
-  $ ably accounts stats [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
-    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [--debug] [--end <value>]
-    [--interval <value>] [--limit <value>] [--live] [--start <value>] [--unit minute|hour|day|month]
-
-FLAGS
-  -v, --verbose               Output verbose logs
-      --access-token=<value>  Overrides any configured access token used for the Control API
-      --api-key=<value>       Overrides any configured API key used for the product APIs
-      --client-id=<value>     Overrides any default client ID when using API authentication. Use "none" to explicitly
-                              set no client ID. Not applicable when using token authentication.
-      --debug                 Show debug information for live stats polling
-      --end=<value>           End time in milliseconds since epoch
-      --endpoint=<value>      Override the endpoint for all product API calls
-      --env=<value>           Override the environment for all product API calls
-      --host=<value>          Override the host endpoint for all product API calls
-      --interval=<value>      [default: 6] Polling interval in seconds (only used with --live)
-      --json                  Output in JSON format
-      --limit=<value>         [default: 10] Maximum number of stats records to return
-      --live                  Subscribe to live stats updates (uses minute interval)
-      --pretty-json           Output in colorized JSON format
-      --start=<value>         Start time in milliseconds since epoch
-      --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
-      --unit=<option>         [default: minute] Time unit for stats
-                              <options: minute|hour|day|month>
-
-DESCRIPTION
-  Get account stats with optional live updates
-
-EXAMPLES
-  $ ably accounts stats
-
-  $ ably accounts stats --unit hour
-
-  $ ably accounts stats --start 1618005600000 --end 1618091999999
-
-  $ ably accounts stats --limit 10
-
-  $ ably accounts stats --json
-
-  $ ably accounts stats --pretty-json
-
-  $ ably accounts stats --live
-
-  $ ably accounts stats --live --interval 15
-```
-
-_See code: [src/commands/accounts/stats/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/accounts/stats/index.ts)_
+_See code: [src/commands/accounts/logout.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/accounts/logout.ts)_
 
 ## `ably accounts switch [ALIAS]`
 
@@ -473,7 +418,7 @@ EXAMPLES
   $ ably accounts switch --pretty-json
 ```
 
-_See code: [src/commands/accounts/switch.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/accounts/switch.ts)_
+_See code: [src/commands/accounts/switch.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/accounts/switch.ts)_
 
 ## `ably apps`
 
@@ -497,8 +442,6 @@ EXAMPLES
 
   $ ably apps set-apns-p12
 
-  $ ably apps stats
-
   $ ably apps channel-rules list
 
   $ ably apps switch my-app
@@ -510,12 +453,11 @@ COMMANDS
   ably apps delete              Delete an app
   ably apps list                List all apps in the current account
   ably apps set-apns-p12        Upload Apple Push Notification Service P12 certificate for an app
-  ably apps stats               Get app stats with optional live updates
   ably apps switch              Switch to a different Ably app
   ably apps update              Update an app
 ```
 
-_See code: [src/commands/apps/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/apps/index.ts)_
+_See code: [src/commands/apps/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/apps/index.ts)_
 
 ## `ably apps channel-rules`
 
@@ -538,7 +480,7 @@ EXAMPLES
   $ ably apps channel-rules delete chat
 ```
 
-_See code: [src/commands/apps/channel-rules/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/apps/channel-rules/index.ts)_
+_See code: [src/commands/apps/channel-rules/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/apps/channel-rules/index.ts)_
 
 ## `ably apps channel-rules create`
 
@@ -590,7 +532,7 @@ EXAMPLES
   $ ably apps channel-rules create --name "notifications" --persisted --push-enabled --app "My App"
 ```
 
-_See code: [src/commands/apps/channel-rules/create.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/apps/channel-rules/create.ts)_
+_See code: [src/commands/apps/channel-rules/create.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/apps/channel-rules/create.ts)_
 
 ## `ably apps channel-rules delete NAMEORID`
 
@@ -634,7 +576,7 @@ EXAMPLES
   $ ably apps channel-rules delete chat --pretty-json
 ```
 
-_See code: [src/commands/apps/channel-rules/delete.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/apps/channel-rules/delete.ts)_
+_See code: [src/commands/apps/channel-rules/delete.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/apps/channel-rules/delete.ts)_
 
 ## `ably apps channel-rules list`
 
@@ -657,7 +599,7 @@ EXAMPLES
   $ ably apps:channel-rules:list --pretty-json
 ```
 
-_See code: [src/commands/apps/channel-rules/list.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/apps/channel-rules/list.ts)_
+_See code: [src/commands/apps/channel-rules/list.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/apps/channel-rules/list.ts)_
 
 ## `ably apps channel-rules update NAMEORID`
 
@@ -711,7 +653,7 @@ EXAMPLES
   $ ably apps channel-rules update notifications --persisted --push-enabled --app "My App"
 ```
 
-_See code: [src/commands/apps/channel-rules/update.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/apps/channel-rules/update.ts)_
+_See code: [src/commands/apps/channel-rules/update.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/apps/channel-rules/update.ts)_
 
 ## `ably apps create`
 
@@ -748,7 +690,7 @@ EXAMPLES
   $ ably apps create --name "My New App" --access-token "YOUR_ACCESS_TOKEN"
 ```
 
-_See code: [src/commands/apps/create.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/apps/create.ts)_
+_See code: [src/commands/apps/create.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/apps/create.ts)_
 
 ## `ably apps current`
 
@@ -783,7 +725,7 @@ EXAMPLES
   $ ably apps current --pretty-json
 ```
 
-_See code: [src/commands/apps/current.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/apps/current.ts)_
+_See code: [src/commands/apps/current.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/apps/current.ts)_
 
 ## `ably apps delete [APPID]`
 
@@ -831,7 +773,7 @@ EXAMPLES
   $ ably apps delete app-id --pretty-json
 ```
 
-_See code: [src/commands/apps/delete.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/apps/delete.ts)_
+_See code: [src/commands/apps/delete.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/apps/delete.ts)_
 
 ## `ably apps list`
 
@@ -866,7 +808,7 @@ EXAMPLES
   $ ably apps list --pretty-json
 ```
 
-_See code: [src/commands/apps/list.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/apps/list.ts)_
+_See code: [src/commands/apps/list.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/apps/list.ts)_
 
 ## `ably apps set-apns-p12 ID`
 
@@ -908,70 +850,7 @@ EXAMPLES
   $ ably apps set-apns-p12 app-id --certificate /path/to/certificate.p12 --use-for-sandbox
 ```
 
-_See code: [src/commands/apps/set-apns-p12.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/apps/set-apns-p12.ts)_
-
-## `ably apps stats [ID]`
-
-Get app stats with optional live updates
-
-```
-USAGE
-  $ ably apps stats [ID] [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
-    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [--debug] [--end <value>]
-    [--interval <value>] [--limit <value>] [--live] [--start <value>] [--unit minute|hour|day|month]
-
-ARGUMENTS
-  ID  App ID to get stats for (uses default app if not provided)
-
-FLAGS
-  -v, --verbose               Output verbose logs
-      --access-token=<value>  Overrides any configured access token used for the Control API
-      --api-key=<value>       Overrides any configured API key used for the product APIs
-      --client-id=<value>     Overrides any default client ID when using API authentication. Use "none" to explicitly
-                              set no client ID. Not applicable when using token authentication.
-      --debug                 Show debug information for live stats polling
-      --end=<value>           End time in milliseconds since epoch
-      --endpoint=<value>      Override the endpoint for all product API calls
-      --env=<value>           Override the environment for all product API calls
-      --host=<value>          Override the host endpoint for all product API calls
-      --interval=<value>      [default: 6] Polling interval in seconds (only used with --live)
-      --json                  Output in JSON format
-      --limit=<value>         [default: 10] Maximum number of stats records to return
-      --live                  Subscribe to live stats updates (uses minute interval)
-      --pretty-json           Output in colorized JSON format
-      --start=<value>         Start time in milliseconds since epoch
-      --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
-      --unit=<option>         [default: minute] Time unit for stats
-                              <options: minute|hour|day|month>
-
-DESCRIPTION
-  Get app stats with optional live updates
-
-EXAMPLES
-  $ ably apps stats
-
-  $ ably apps stats app-id
-
-  $ ably apps stats --unit hour
-
-  $ ably apps stats app-id --unit hour
-
-  $ ably apps stats app-id --start 1618005600000 --end 1618091999999
-
-  $ ably apps stats app-id --limit 10
-
-  $ ably apps stats app-id --json
-
-  $ ably apps stats app-id --pretty-json
-
-  $ ably apps stats --live
-
-  $ ably apps stats app-id --live
-
-  $ ably apps stats --live --interval 15
-```
-
-_See code: [src/commands/apps/stats/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/apps/stats/index.ts)_
+_See code: [src/commands/apps/set-apns-p12.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/apps/set-apns-p12.ts)_
 
 ## `ably apps switch [APPID]`
 
@@ -1007,7 +886,7 @@ EXAMPLES
   $ ably apps switch
 ```
 
-_See code: [src/commands/apps/switch.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/apps/switch.ts)_
+_See code: [src/commands/apps/switch.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/apps/switch.ts)_
 
 ## `ably apps update ID`
 
@@ -1049,7 +928,7 @@ EXAMPLES
   $ ably apps update app-id --name "Updated App Name" --access-token "YOUR_ACCESS_TOKEN"
 ```
 
-_See code: [src/commands/apps/update.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/apps/update.ts)_
+_See code: [src/commands/apps/update.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/apps/update.ts)_
 
 ## `ably auth`
 
@@ -1076,7 +955,7 @@ COMMANDS
   ably auth revoke-token        Revokes the token provided
 ```
 
-_See code: [src/commands/auth/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/auth/index.ts)_
+_See code: [src/commands/auth/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/auth/index.ts)_
 
 ## `ably auth issue-ably-token`
 
@@ -1128,7 +1007,7 @@ EXAMPLES
   $ ably channels publish --token "$(ably auth issue-ably-token --token-only)" my-channel "Hello"
 ```
 
-_See code: [src/commands/auth/issue-ably-token.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/auth/issue-ably-token.ts)_
+_See code: [src/commands/auth/issue-ably-token.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/auth/issue-ably-token.ts)_
 
 ## `ably auth issue-jwt-token`
 
@@ -1178,7 +1057,7 @@ EXAMPLES
   $ ably channels publish --token "$(ably auth issue-jwt-token --token-only)" my-channel "Hello"
 ```
 
-_See code: [src/commands/auth/issue-jwt-token.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/auth/issue-jwt-token.ts)_
+_See code: [src/commands/auth/issue-jwt-token.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/auth/issue-jwt-token.ts)_
 
 ## `ably auth keys`
 
@@ -1205,7 +1084,7 @@ EXAMPLES
   $ ably auth keys switch KEY_ID
 ```
 
-_See code: [src/commands/auth/keys/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/auth/keys/index.ts)_
+_See code: [src/commands/auth/keys/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/auth/keys/index.ts)_
 
 ## `ably auth keys create`
 
@@ -1257,7 +1136,7 @@ EXAMPLES
   $ ably auth keys create --name "My New Key" --capabilities '{"channel1":["publish","subscribe"],"channel2":["history"]}'
 ```
 
-_See code: [src/commands/auth/keys/create.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/auth/keys/create.ts)_
+_See code: [src/commands/auth/keys/create.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/auth/keys/create.ts)_
 
 ## `ably auth keys current`
 
@@ -1295,7 +1174,7 @@ EXAMPLES
   $ ably auth keys current --pretty-json
 ```
 
-_See code: [src/commands/auth/keys/current.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/auth/keys/current.ts)_
+_See code: [src/commands/auth/keys/current.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/auth/keys/current.ts)_
 
 ## `ably auth keys get KEYNAMEORVALUE`
 
@@ -1336,7 +1215,7 @@ EXAMPLES
   $ ably auth keys get APP_ID.KEY_ID --pretty-json
 ```
 
-_See code: [src/commands/auth/keys/get.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/auth/keys/get.ts)_
+_See code: [src/commands/auth/keys/get.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/auth/keys/get.ts)_
 
 ## `ably auth keys list`
 
@@ -1374,7 +1253,7 @@ EXAMPLES
   $ ably auth keys list --pretty-json
 ```
 
-_See code: [src/commands/auth/keys/list.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/auth/keys/list.ts)_
+_See code: [src/commands/auth/keys/list.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/auth/keys/list.ts)_
 
 ## `ably auth keys revoke KEYNAME`
 
@@ -1418,7 +1297,7 @@ EXAMPLES
   $ ably auth keys revoke APP_ID.KEY_ID --pretty-json
 ```
 
-_See code: [src/commands/auth/keys/revoke.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/auth/keys/revoke.ts)_
+_See code: [src/commands/auth/keys/revoke.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/auth/keys/revoke.ts)_
 
 ## `ably auth keys switch [KEYNAMEORVALUE]`
 
@@ -1457,7 +1336,7 @@ EXAMPLES
   $ ably auth keys switch KEY_ID --app APP_ID
 ```
 
-_See code: [src/commands/auth/keys/switch.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/auth/keys/switch.ts)_
+_See code: [src/commands/auth/keys/switch.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/auth/keys/switch.ts)_
 
 ## `ably auth keys update KEYNAME`
 
@@ -1499,7 +1378,7 @@ EXAMPLES
   $ ably auth keys update APP_ID.KEY_ID --name "New Name" --capabilities "publish,subscribe"
 ```
 
-_See code: [src/commands/auth/keys/update.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/auth/keys/update.ts)_
+_See code: [src/commands/auth/keys/update.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/auth/keys/update.ts)_
 
 ## `ably auth revoke-token TOKEN`
 
@@ -1540,7 +1419,7 @@ EXAMPLES
   $ ably auth revoke-token TOKEN --pretty-json
 ```
 
-_See code: [src/commands/auth/revoke-token.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/auth/revoke-token.ts)_
+_See code: [src/commands/auth/revoke-token.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/auth/revoke-token.ts)_
 
 ## `ably autocomplete [SHELL]`
 
@@ -1594,7 +1473,7 @@ COMMANDS
   ably bench subscriber         Run a subscriber benchmark test
 ```
 
-_See code: [src/commands/bench/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/bench/index.ts)_
+_See code: [src/commands/bench/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/bench/index.ts)_
 
 ## `ably bench publisher CHANNEL`
 
@@ -1639,7 +1518,7 @@ EXAMPLES
   $ ably bench publisher --transport realtime my-channel
 ```
 
-_See code: [src/commands/bench/publisher.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/bench/publisher.ts)_
+_See code: [src/commands/bench/publisher.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/bench/publisher.ts)_
 
 ## `ably bench subscriber CHANNEL`
 
@@ -1674,7 +1553,7 @@ EXAMPLES
   $ ably bench subscriber my-channel
 ```
 
-_See code: [src/commands/bench/subscriber.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/bench/subscriber.ts)_
+_See code: [src/commands/bench/subscriber.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/bench/subscriber.ts)_
 
 ## `ably channels`
 
@@ -1704,7 +1583,7 @@ COMMANDS
   ably channels subscribe       Subscribe to messages published on one or more Ably channels
 ```
 
-_See code: [src/commands/channels/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/channels/index.ts)_
+_See code: [src/commands/channels/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/channels/index.ts)_
 
 ## `ably channels batch-publish [MESSAGE]`
 
@@ -1758,7 +1637,7 @@ EXAMPLES
   $ ably channels batch-publish --channels channel1,channel2 '{"data":"Message"}' --pretty-json
 ```
 
-_See code: [src/commands/channels/batch-publish.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/channels/batch-publish.ts)_
+_See code: [src/commands/channels/batch-publish.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/channels/batch-publish.ts)_
 
 ## `ably channels history CHANNEL`
 
@@ -1809,7 +1688,7 @@ EXAMPLES
   $ ably channels history my-channel --direction forward
 ```
 
-_See code: [src/commands/channels/history.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/channels/history.ts)_
+_See code: [src/commands/channels/history.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/channels/history.ts)_
 
 ## `ably channels list`
 
@@ -1850,7 +1729,7 @@ EXAMPLES
   $ ably channels list --pretty-json
 ```
 
-_See code: [src/commands/channels/list.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/channels/list.ts)_
+_See code: [src/commands/channels/list.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/channels/list.ts)_
 
 ## `ably channels occupancy`
 
@@ -1869,7 +1748,7 @@ EXAMPLES
   $ ably channels occupancy subscribe my-channel
 ```
 
-_See code: [src/commands/channels/occupancy.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/channels/occupancy.ts)_
+_See code: [src/commands/channels/occupancy.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/channels/occupancy.ts)_
 
 ## `ably channels occupancy get CHANNEL`
 
@@ -1909,7 +1788,7 @@ EXAMPLES
   $ ably channels occupancy get my-channel --pretty-json
 ```
 
-_See code: [src/commands/channels/occupancy/get.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/channels/occupancy/get.ts)_
+_See code: [src/commands/channels/occupancy/get.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/channels/occupancy/get.ts)_
 
 ## `ably channels occupancy subscribe CHANNEL`
 
@@ -1954,7 +1833,7 @@ EXAMPLES
   $ ably channels occupancy subscribe my-channel --duration 30
 ```
 
-_See code: [src/commands/channels/occupancy/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/channels/occupancy/subscribe.ts)_
+_See code: [src/commands/channels/occupancy/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/channels/occupancy/subscribe.ts)_
 
 ## `ably channels presence`
 
@@ -1973,7 +1852,7 @@ EXAMPLES
   $ ably channels presence subscribe my-channel
 ```
 
-_See code: [src/commands/channels/presence.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/channels/presence.ts)_
+_See code: [src/commands/channels/presence.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/channels/presence.ts)_
 
 ## `ably channels presence enter CHANNEL`
 
@@ -2026,7 +1905,7 @@ EXAMPLES
   $ ably channels presence enter my-channel --duration 30
 ```
 
-_See code: [src/commands/channels/presence/enter.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/channels/presence/enter.ts)_
+_See code: [src/commands/channels/presence/enter.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/channels/presence/enter.ts)_
 
 ## `ably channels presence subscribe CHANNEL`
 
@@ -2073,7 +1952,7 @@ EXAMPLES
   $ ably channels presence subscribe my-channel --duration 30
 ```
 
-_See code: [src/commands/channels/presence/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/channels/presence/subscribe.ts)_
+_See code: [src/commands/channels/presence/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/channels/presence/subscribe.ts)_
 
 ## `ably channels publish CHANNEL MESSAGE`
 
@@ -2135,7 +2014,7 @@ EXAMPLES
   $ ably channels publish my-channel "Hello World" --pretty-json
 ```
 
-_See code: [src/commands/channels/publish.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/channels/publish.ts)_
+_See code: [src/commands/channels/publish.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/channels/publish.ts)_
 
 ## `ably channels subscribe CHANNELS`
 
@@ -2197,7 +2076,7 @@ EXAMPLES
   $ ably channels subscribe my-channel --duration 30
 ```
 
-_See code: [src/commands/channels/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/channels/subscribe.ts)_
+_See code: [src/commands/channels/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/channels/subscribe.ts)_
 
 ## `ably config`
 
@@ -2234,7 +2113,7 @@ COMMANDS
   ably config show              Display the contents of the Ably CLI config file
 ```
 
-_See code: [src/commands/config/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/config/index.ts)_
+_See code: [src/commands/config/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/config/index.ts)_
 
 ## `ably config path`
 
@@ -2271,7 +2150,7 @@ EXAMPLES
   vim $(ably config path)
 ```
 
-_See code: [src/commands/config/path.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/config/path.ts)_
+_See code: [src/commands/config/path.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/config/path.ts)_
 
 ## `ably config show`
 
@@ -2304,7 +2183,7 @@ EXAMPLES
   $ ably config show --json
 ```
 
-_See code: [src/commands/config/show.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/config/show.ts)_
+_See code: [src/commands/config/show.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/config/show.ts)_
 
 ## `ably connections`
 
@@ -2318,70 +2197,15 @@ DESCRIPTION
   Interact with Ably Pub/Sub connections
 
 EXAMPLES
-  $ ably connections stats
-
   $ ably connections logs connections-lifecycle
 
   $ ably connections test
 
 COMMANDS
-  ably connections stats        View connection statistics for an Ably app
   ably connections test         Test connection to Ably
 ```
 
-_See code: [src/commands/connections/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/connections/index.ts)_
-
-## `ably connections stats`
-
-View connection statistics for an Ably app
-
-```
-USAGE
-  $ ably connections stats [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
-    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [--debug] [--end <value>]
-    [--interval <value>] [--limit <value>] [--live] [--start <value>] [--unit minute|hour|day|month]
-
-FLAGS
-  -v, --verbose               Output verbose logs
-      --access-token=<value>  Overrides any configured access token used for the Control API
-      --api-key=<value>       Overrides any configured API key used for the product APIs
-      --client-id=<value>     Overrides any default client ID when using API authentication. Use "none" to explicitly
-                              set no client ID. Not applicable when using token authentication.
-      --debug                 Show debug information for live stats polling
-      --end=<value>           End time in milliseconds since epoch
-      --endpoint=<value>      Override the endpoint for all product API calls
-      --env=<value>           Override the environment for all product API calls
-      --host=<value>          Override the host endpoint for all product API calls
-      --interval=<value>      [default: 6] Polling interval in seconds (only used with --live)
-      --json                  Output in JSON format
-      --limit=<value>         [default: 10] Maximum number of stats records to return
-      --live                  Subscribe to live stats updates (uses minute interval)
-      --pretty-json           Output in colorized JSON format
-      --start=<value>         Start time in milliseconds since epoch
-      --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
-      --unit=<option>         [default: minute] Time unit for stats
-                              <options: minute|hour|day|month>
-
-DESCRIPTION
-  View connection statistics for an Ably app
-
-EXAMPLES
-  $ ably connections stats
-
-  $ ably connections stats --unit hour
-
-  $ ably connections stats --start 1618005600000 --end 1618091999999
-
-  $ ably connections stats --limit 10
-
-  $ ably connections stats --json
-
-  $ ably connections stats --pretty-json
-
-  $ ably connections stats --live
-```
-
-_See code: [src/commands/connections/stats.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/connections/stats.ts)_
+_See code: [src/commands/connections/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/connections/index.ts)_
 
 ## `ably connections test`
 
@@ -2418,7 +2242,7 @@ EXAMPLES
   $ ably connections test --transport xhr
 ```
 
-_See code: [src/commands/connections/test.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/connections/test.ts)_
+_See code: [src/commands/connections/test.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/connections/test.ts)_
 
 ## `ably help [COMMANDS]`
 
@@ -2442,7 +2266,7 @@ EXAMPLES
   $ ably help channels publish
 ```
 
-_See code: [src/commands/help.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/help.ts)_
+_See code: [src/commands/help.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/help.ts)_
 
 ## `ably integrations`
 
@@ -2470,7 +2294,7 @@ COMMANDS
   ably integrations update      Update an integration rule
 ```
 
-_See code: [src/commands/integrations/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/integrations/index.ts)_
+_See code: [src/commands/integrations/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/integrations/index.ts)_
 
 ## `ably integrations create`
 
@@ -2517,7 +2341,7 @@ EXAMPLES
   $ ably integrations create --rule-type "amqp" --source-type "channel.message" --channel-filter "chat:*"
 ```
 
-_See code: [src/commands/integrations/create.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/integrations/create.ts)_
+_See code: [src/commands/integrations/create.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/integrations/create.ts)_
 
 ## `ably integrations delete INTEGRATIONID`
 
@@ -2557,7 +2381,7 @@ EXAMPLES
   $ ably integrations delete integration123 --force
 ```
 
-_See code: [src/commands/integrations/delete.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/integrations/delete.ts)_
+_See code: [src/commands/integrations/delete.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/integrations/delete.ts)_
 
 ## `ably integrations get RULEID`
 
@@ -2596,7 +2420,7 @@ EXAMPLES
   $ ably integrations get rule123 --app "My App" --pretty-json
 ```
 
-_See code: [src/commands/integrations/get.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/integrations/get.ts)_
+_See code: [src/commands/integrations/get.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/integrations/get.ts)_
 
 ## `ably integrations list`
 
@@ -2632,7 +2456,7 @@ EXAMPLES
   $ ably integrations list --app "My App" --pretty-json
 ```
 
-_See code: [src/commands/integrations/list.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/integrations/list.ts)_
+_See code: [src/commands/integrations/list.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/integrations/list.ts)_
 
 ## `ably integrations update RULEID`
 
@@ -2680,7 +2504,7 @@ EXAMPLES
   $ ably integrations update rule123 --target-url "https://new-example.com/webhook"
 ```
 
-_See code: [src/commands/integrations/update.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/integrations/update.ts)_
+_See code: [src/commands/integrations/update.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/integrations/update.ts)_
 
 ## `ably login [TOKEN]`
 
@@ -2718,7 +2542,7 @@ EXAMPLES
   $ ably login --alias mycompany
 ```
 
-_See code: [src/commands/login.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/login.ts)_
+_See code: [src/commands/login.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/login.ts)_
 
 ## `ably logs`
 
@@ -2746,7 +2570,7 @@ COMMANDS
   ably logs subscribe           Subscribe to live app logs
 ```
 
-_See code: [src/commands/logs/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/logs/index.ts)_
+_See code: [src/commands/logs/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/logs/index.ts)_
 
 ## `ably logs channel-lifecycle`
 
@@ -2765,7 +2589,7 @@ EXAMPLES
   $ ably logs channel-lifecycle subscribe --rewind 10
 ```
 
-_See code: [src/commands/logs/channel-lifecycle/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/logs/channel-lifecycle/index.ts)_
+_See code: [src/commands/logs/channel-lifecycle/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/logs/channel-lifecycle/index.ts)_
 
 ## `ably logs channel-lifecycle subscribe`
 
@@ -2799,7 +2623,7 @@ EXAMPLES
   $ ably logs channel-lifecycle subscribe --rewind 10
 ```
 
-_See code: [src/commands/logs/channel-lifecycle/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/logs/channel-lifecycle/subscribe.ts)_
+_See code: [src/commands/logs/channel-lifecycle/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/logs/channel-lifecycle/subscribe.ts)_
 
 ## `ably logs connection-lifecycle`
 
@@ -2818,7 +2642,7 @@ EXAMPLES
   $ ably logs connection-lifecycle subscribe --rewind 10
 ```
 
-_See code: [src/commands/logs/connection-lifecycle/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/logs/connection-lifecycle/index.ts)_
+_See code: [src/commands/logs/connection-lifecycle/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/logs/connection-lifecycle/index.ts)_
 
 ## `ably logs connection-lifecycle history`
 
@@ -2861,7 +2685,7 @@ EXAMPLES
   $ ably logs connection-lifecycle history --pretty-json
 ```
 
-_See code: [src/commands/logs/connection-lifecycle/history.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/logs/connection-lifecycle/history.ts)_
+_See code: [src/commands/logs/connection-lifecycle/history.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/logs/connection-lifecycle/history.ts)_
 
 ## `ably logs connection-lifecycle subscribe`
 
@@ -2901,7 +2725,7 @@ EXAMPLES
   $ ably logs connection-lifecycle subscribe --duration 30
 ```
 
-_See code: [src/commands/logs/connection-lifecycle/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/logs/connection-lifecycle/subscribe.ts)_
+_See code: [src/commands/logs/connection-lifecycle/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/logs/connection-lifecycle/subscribe.ts)_
 
 ## `ably logs history`
 
@@ -2944,7 +2768,7 @@ EXAMPLES
   $ ably logs history --pretty-json
 ```
 
-_See code: [src/commands/logs/history.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/logs/history.ts)_
+_See code: [src/commands/logs/history.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/logs/history.ts)_
 
 ## `ably logs push`
 
@@ -2965,7 +2789,7 @@ EXAMPLES
   $ ably logs push history
 ```
 
-_See code: [src/commands/logs/push/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/logs/push/index.ts)_
+_See code: [src/commands/logs/push/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/logs/push/index.ts)_
 
 ## `ably logs push history`
 
@@ -3008,7 +2832,7 @@ EXAMPLES
   $ ably logs push history --pretty-json
 ```
 
-_See code: [src/commands/logs/push/history.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/logs/push/history.ts)_
+_See code: [src/commands/logs/push/history.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/logs/push/history.ts)_
 
 ## `ably logs push subscribe`
 
@@ -3042,7 +2866,7 @@ EXAMPLES
   $ ably logs push subscribe --rewind 10
 ```
 
-_See code: [src/commands/logs/push/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/logs/push/subscribe.ts)_
+_See code: [src/commands/logs/push/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/logs/push/subscribe.ts)_
 
 ## `ably logs subscribe`
 
@@ -3089,7 +2913,44 @@ EXAMPLES
   $ ably logs subscribe --duration 30
 ```
 
-_See code: [src/commands/logs/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/logs/subscribe.ts)_
+_See code: [src/commands/logs/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/logs/subscribe.ts)_
+
+## `ably mcp`
+
+Experimental Model Context Protocol (MCP) commands for AI tools to interact with Ably
+
+```
+USAGE
+  $ ably mcp
+
+DESCRIPTION
+  Experimental Model Context Protocol (MCP) commands for AI tools to interact with Ably
+
+EXAMPLES
+  $ ably mcp start-server
+
+COMMANDS
+  ably mcp start-server         Start an MCP server for AI tools to interact with Ably (currently experimental)
+```
+
+_See code: [src/commands/mcp/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/mcp/index.ts)_
+
+## `ably mcp start-server`
+
+Start an MCP server for AI tools to interact with Ably (currently experimental)
+
+```
+USAGE
+  $ ably mcp start-server
+
+DESCRIPTION
+  Start an MCP server for AI tools to interact with Ably (currently experimental)
+
+EXAMPLES
+  $ ably mcp start-server
+```
+
+_See code: [src/commands/mcp/start-server.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/mcp/start-server.ts)_
 
 ## `ably queues`
 
@@ -3115,7 +2976,7 @@ COMMANDS
   ably queues list              List all queues
 ```
 
-_See code: [src/commands/queues/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/queues/index.ts)_
+_See code: [src/commands/queues/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/queues/index.ts)_
 
 ## `ably queues create`
 
@@ -3156,7 +3017,7 @@ EXAMPLES
   $ ably queues create --name "my-queue" --region "eu-west-1-a" --app "My App"
 ```
 
-_See code: [src/commands/queues/create.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/queues/create.ts)_
+_See code: [src/commands/queues/create.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/queues/create.ts)_
 
 ## `ably queues delete QUEUEID`
 
@@ -3196,7 +3057,7 @@ EXAMPLES
   $ ably queues delete appAbc:us-east-1-a:foo --force
 ```
 
-_See code: [src/commands/queues/delete.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/queues/delete.ts)_
+_See code: [src/commands/queues/delete.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/queues/delete.ts)_
 
 ## `ably queues list`
 
@@ -3232,7 +3093,7 @@ EXAMPLES
   $ ably queues list --app "My App" --pretty-json
 ```
 
-_See code: [src/commands/queues/list.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/queues/list.ts)_
+_See code: [src/commands/queues/list.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/queues/list.ts)_
 
 ## `ably rooms`
 
@@ -3261,7 +3122,7 @@ COMMANDS
   ably rooms typing             Commands for working with typing indicators in chat rooms
 ```
 
-_See code: [src/commands/rooms/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/rooms/index.ts)_
+_See code: [src/commands/rooms/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/rooms/index.ts)_
 
 ## `ably rooms list`
 
@@ -3302,7 +3163,7 @@ EXAMPLES
   $ ably rooms list --pretty-json
 ```
 
-_See code: [src/commands/rooms/list.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/rooms/list.ts)_
+_See code: [src/commands/rooms/list.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/rooms/list.ts)_
 
 ## `ably rooms messages`
 
@@ -3325,7 +3186,7 @@ EXAMPLES
   $ ably rooms messages reactions add my-room "message-id" "👍"
 ```
 
-_See code: [src/commands/rooms/messages/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/rooms/messages/index.ts)_
+_See code: [src/commands/rooms/messages/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/rooms/messages/index.ts)_
 
 ## `ably rooms messages history ROOM`
 
@@ -3382,7 +3243,7 @@ EXAMPLES
   $ ably rooms messages history my-room --pretty-json
 ```
 
-_See code: [src/commands/rooms/messages/history.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/rooms/messages/history.ts)_
+_See code: [src/commands/rooms/messages/history.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/rooms/messages/history.ts)_
 
 ## `ably rooms messages reactions`
 
@@ -3403,7 +3264,7 @@ EXAMPLES
   $ ably rooms messages reactions remove my-room "message-id" "👍"
 ```
 
-_See code: [src/commands/rooms/messages/reactions/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/rooms/messages/reactions/index.ts)_
+_See code: [src/commands/rooms/messages/reactions/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/rooms/messages/reactions/index.ts)_
 
 ## `ably rooms messages reactions remove ROOM MESSAGESERIAL REACTION`
 
@@ -3448,7 +3309,7 @@ EXAMPLES
   $ ably rooms messages reactions remove my-room message-serial 👍 --json
 ```
 
-_See code: [src/commands/rooms/messages/reactions/remove.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/rooms/messages/reactions/remove.ts)_
+_See code: [src/commands/rooms/messages/reactions/remove.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/rooms/messages/reactions/remove.ts)_
 
 ## `ably rooms messages reactions send ROOM MESSAGESERIAL REACTION`
 
@@ -3496,7 +3357,7 @@ EXAMPLES
   $ ably rooms messages reactions send my-room message-serial 👍 --json
 ```
 
-_See code: [src/commands/rooms/messages/reactions/send.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/rooms/messages/reactions/send.ts)_
+_See code: [src/commands/rooms/messages/reactions/send.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/rooms/messages/reactions/send.ts)_
 
 ## `ably rooms messages reactions subscribe ROOM`
 
@@ -3538,7 +3399,7 @@ EXAMPLES
   $ ably rooms messages reactions subscribe my-room --pretty-json
 ```
 
-_See code: [src/commands/rooms/messages/reactions/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/rooms/messages/reactions/subscribe.ts)_
+_See code: [src/commands/rooms/messages/reactions/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/rooms/messages/reactions/subscribe.ts)_
 
 ## `ably rooms messages send ROOM TEXT`
 
@@ -3589,7 +3450,7 @@ EXAMPLES
   $ ably rooms messages send my-room "Hello World!" --pretty-json
 ```
 
-_See code: [src/commands/rooms/messages/send.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/rooms/messages/send.ts)_
+_See code: [src/commands/rooms/messages/send.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/rooms/messages/send.ts)_
 
 ## `ably rooms messages subscribe ROOMS`
 
@@ -3639,7 +3500,7 @@ EXAMPLES
   $ ably rooms messages subscribe my-room --pretty-json
 ```
 
-_See code: [src/commands/rooms/messages/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/rooms/messages/subscribe.ts)_
+_See code: [src/commands/rooms/messages/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/rooms/messages/subscribe.ts)_
 
 ## `ably rooms occupancy`
 
@@ -3658,7 +3519,7 @@ EXAMPLES
   $ ably rooms occupancy subscribe my-room
 ```
 
-_See code: [src/commands/rooms/occupancy/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/rooms/occupancy/index.ts)_
+_See code: [src/commands/rooms/occupancy/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/rooms/occupancy/index.ts)_
 
 ## `ably rooms occupancy get ROOM`
 
@@ -3698,7 +3559,7 @@ EXAMPLES
   $ ably rooms occupancy get my-room --pretty-json
 ```
 
-_See code: [src/commands/rooms/occupancy/get.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/rooms/occupancy/get.ts)_
+_See code: [src/commands/rooms/occupancy/get.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/rooms/occupancy/get.ts)_
 
 ## `ably rooms occupancy subscribe ROOM`
 
@@ -3737,7 +3598,7 @@ EXAMPLES
   $ ably rooms occupancy subscribe --pretty-json my-room
 ```
 
-_See code: [src/commands/rooms/occupancy/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/rooms/occupancy/subscribe.ts)_
+_See code: [src/commands/rooms/occupancy/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/rooms/occupancy/subscribe.ts)_
 
 ## `ably rooms presence`
 
@@ -3756,7 +3617,7 @@ EXAMPLES
   $ ably rooms presence subscribe my-room
 ```
 
-_See code: [src/commands/rooms/presence/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/rooms/presence/index.ts)_
+_See code: [src/commands/rooms/presence/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/rooms/presence/index.ts)_
 
 ## `ably rooms presence enter ROOM`
 
@@ -3801,7 +3662,7 @@ EXAMPLES
   $ ably rooms presence enter my-room --duration 30
 ```
 
-_See code: [src/commands/rooms/presence/enter.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/rooms/presence/enter.ts)_
+_See code: [src/commands/rooms/presence/enter.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/rooms/presence/enter.ts)_
 
 ## `ably rooms presence subscribe ROOM`
 
@@ -3840,7 +3701,7 @@ EXAMPLES
   $ ably rooms presence subscribe my-room --pretty-json
 ```
 
-_See code: [src/commands/rooms/presence/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/rooms/presence/subscribe.ts)_
+_See code: [src/commands/rooms/presence/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/rooms/presence/subscribe.ts)_
 
 ## `ably rooms reactions`
 
@@ -3859,7 +3720,7 @@ EXAMPLES
   $ ably rooms reactions subscribe my-room
 ```
 
-_See code: [src/commands/rooms/reactions/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/rooms/reactions/index.ts)_
+_See code: [src/commands/rooms/reactions/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/rooms/reactions/index.ts)_
 
 ## `ably rooms reactions send ROOM EMOJI`
 
@@ -3901,7 +3762,7 @@ EXAMPLES
   $ ably rooms reactions send my-room 😂 --pretty-json
 ```
 
-_See code: [src/commands/rooms/reactions/send.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/rooms/reactions/send.ts)_
+_See code: [src/commands/rooms/reactions/send.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/rooms/reactions/send.ts)_
 
 ## `ably rooms reactions subscribe ROOM`
 
@@ -3940,7 +3801,7 @@ EXAMPLES
   $ ably rooms reactions subscribe my-room --pretty-json
 ```
 
-_See code: [src/commands/rooms/reactions/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/rooms/reactions/subscribe.ts)_
+_See code: [src/commands/rooms/reactions/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/rooms/reactions/subscribe.ts)_
 
 ## `ably rooms typing`
 
@@ -3959,7 +3820,7 @@ EXAMPLES
   $ ably rooms typing keystroke my-room
 ```
 
-_See code: [src/commands/rooms/typing/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/rooms/typing/index.ts)_
+_See code: [src/commands/rooms/typing/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/rooms/typing/index.ts)_
 
 ## `ably rooms typing keystroke ROOM`
 
@@ -4002,7 +3863,7 @@ EXAMPLES
   $ ably rooms typing keystroke my-room --pretty-json
 ```
 
-_See code: [src/commands/rooms/typing/keystroke.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/rooms/typing/keystroke.ts)_
+_See code: [src/commands/rooms/typing/keystroke.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/rooms/typing/keystroke.ts)_
 
 ## `ably rooms typing subscribe ROOM`
 
@@ -4043,7 +3904,7 @@ EXAMPLES
   $ ably rooms typing subscribe my-room --pretty-json
 ```
 
-_See code: [src/commands/rooms/typing/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/rooms/typing/subscribe.ts)_
+_See code: [src/commands/rooms/typing/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/rooms/typing/subscribe.ts)_
 
 ## `ably spaces`
 
@@ -4071,7 +3932,7 @@ COMMANDS
   ably spaces members           Commands for managing members in Ably Spaces
 ```
 
-_See code: [src/commands/spaces/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/spaces/index.ts)_
+_See code: [src/commands/spaces/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/spaces/index.ts)_
 
 ## `ably spaces cursors`
 
@@ -4088,14 +3949,14 @@ DESCRIPTION
   Commands for interacting with Cursors in Ably Spaces
 
 EXAMPLES
-  $ ably spaces cursors set my-space --x 100 --y 200 --data '{"color": "red"}'
+  $ ably spaces cursors set my-space --position '{"x": 100, "y": 200}' --data '{"color": "red"}'
 
   $ ably spaces cursors subscribe my-space
 
   $ ably spaces cursors get-all my-space
 ```
 
-_See code: [src/commands/spaces/cursors/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/spaces/cursors/index.ts)_
+_See code: [src/commands/spaces/cursors/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/spaces/cursors/index.ts)_
 
 ## `ably spaces cursors get-all SPACE`
 
@@ -4133,7 +3994,7 @@ EXAMPLES
   $ ably spaces cursors get-all my-space --pretty-json
 ```
 
-_See code: [src/commands/spaces/cursors/get-all.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/spaces/cursors/get-all.ts)_
+_See code: [src/commands/spaces/cursors/get-all.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/spaces/cursors/get-all.ts)_
 
 ## `ably spaces cursors set SPACE`
 
@@ -4190,7 +4051,7 @@ EXAMPLES
   $ ably spaces cursors set my-space --x 100 --y 200 --pretty-json
 ```
 
-_See code: [src/commands/spaces/cursors/set.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/spaces/cursors/set.ts)_
+_See code: [src/commands/spaces/cursors/set.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/spaces/cursors/set.ts)_
 
 ## `ably spaces cursors subscribe SPACE`
 
@@ -4231,7 +4092,7 @@ EXAMPLES
   $ ably spaces cursors subscribe my-space --duration 30
 ```
 
-_See code: [src/commands/spaces/cursors/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/spaces/cursors/subscribe.ts)_
+_See code: [src/commands/spaces/cursors/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/spaces/cursors/subscribe.ts)_
 
 ## `ably spaces list`
 
@@ -4272,7 +4133,7 @@ EXAMPLES
   $ ably spaces list --pretty-json
 ```
 
-_See code: [src/commands/spaces/list.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/spaces/list.ts)_
+_See code: [src/commands/spaces/list.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/spaces/list.ts)_
 
 ## `ably spaces locations`
 
@@ -4300,7 +4161,7 @@ DESCRIPTION
   Spaces Locations API commands (Ably Spaces client-to-client location sharing)
 ```
 
-_See code: [src/commands/spaces/locations/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/spaces/locations/index.ts)_
+_See code: [src/commands/spaces/locations/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/spaces/locations/index.ts)_
 
 ## `ably spaces locations get-all SPACE`
 
@@ -4340,7 +4201,7 @@ EXAMPLES
   $ ably spaces locations get-all my-space --pretty-json
 ```
 
-_See code: [src/commands/spaces/locations/get-all.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/spaces/locations/get-all.ts)_
+_See code: [src/commands/spaces/locations/get-all.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/spaces/locations/get-all.ts)_
 
 ## `ably spaces locations set SPACE`
 
@@ -4379,7 +4240,7 @@ EXAMPLES
   $ ably spaces locations set my-space --location '{"sectionId":"section1"}'
 ```
 
-_See code: [src/commands/spaces/locations/set.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/spaces/locations/set.ts)_
+_See code: [src/commands/spaces/locations/set.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/spaces/locations/set.ts)_
 
 ## `ably spaces locations subscribe SPACE`
 
@@ -4420,7 +4281,7 @@ EXAMPLES
   $ ably spaces locations subscribe my-space --duration 30
 ```
 
-_See code: [src/commands/spaces/locations/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/spaces/locations/subscribe.ts)_
+_See code: [src/commands/spaces/locations/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/spaces/locations/subscribe.ts)_
 
 ## `ably spaces locks`
 
@@ -4443,7 +4304,7 @@ EXAMPLES
   $ ably spaces locks get-all my-space
 ```
 
-_See code: [src/commands/spaces/locks/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/spaces/locks/index.ts)_
+_See code: [src/commands/spaces/locks/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/spaces/locks/index.ts)_
 
 ## `ably spaces locks acquire SPACE LOCKID`
 
@@ -4481,7 +4342,7 @@ EXAMPLES
   $ ably spaces locks acquire my-space my-lock-id --data '{"type":"editor"}'
 ```
 
-_See code: [src/commands/spaces/locks/acquire.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/spaces/locks/acquire.ts)_
+_See code: [src/commands/spaces/locks/acquire.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/spaces/locks/acquire.ts)_
 
 ## `ably spaces locks get SPACE LOCKID`
 
@@ -4520,7 +4381,7 @@ EXAMPLES
   $ ably spaces locks get my-space my-lock --pretty-json
 ```
 
-_See code: [src/commands/spaces/locks/get.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/spaces/locks/get.ts)_
+_See code: [src/commands/spaces/locks/get.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/spaces/locks/get.ts)_
 
 ## `ably spaces locks get-all SPACE`
 
@@ -4558,7 +4419,7 @@ EXAMPLES
   $ ably spaces locks get-all my-space --pretty-json
 ```
 
-_See code: [src/commands/spaces/locks/get-all.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/spaces/locks/get-all.ts)_
+_See code: [src/commands/spaces/locks/get-all.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/spaces/locks/get-all.ts)_
 
 ## `ably spaces locks subscribe SPACE`
 
@@ -4599,7 +4460,7 @@ EXAMPLES
   $ ably spaces locks subscribe my-space --duration 30
 ```
 
-_See code: [src/commands/spaces/locks/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/spaces/locks/subscribe.ts)_
+_See code: [src/commands/spaces/locks/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/spaces/locks/subscribe.ts)_
 
 ## `ably spaces members`
 
@@ -4618,7 +4479,7 @@ EXAMPLES
   $ ably spaces members enter my-space
 ```
 
-_See code: [src/commands/spaces/members/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/spaces/members/index.ts)_
+_See code: [src/commands/spaces/members/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/spaces/members/index.ts)_
 
 ## `ably spaces members enter SPACE`
 
@@ -4659,7 +4520,7 @@ EXAMPLES
   $ ably spaces members enter my-space --duration 30
 ```
 
-_See code: [src/commands/spaces/members/enter.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/spaces/members/enter.ts)_
+_See code: [src/commands/spaces/members/enter.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/spaces/members/enter.ts)_
 
 ## `ably spaces members subscribe SPACE`
 
@@ -4700,7 +4561,155 @@ EXAMPLES
   $ ably spaces members subscribe my-space --duration 30
 ```
 
-_See code: [src/commands/spaces/members/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/spaces/members/subscribe.ts)_
+_See code: [src/commands/spaces/members/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/spaces/members/subscribe.ts)_
+
+## `ably stats`
+
+View statistics for your Ably account or apps
+
+```
+USAGE
+  $ ably stats
+
+DESCRIPTION
+  View statistics for your Ably account or apps
+
+EXAMPLES
+  $ ably stats account
+
+  $ ably stats account --unit hour
+
+  $ ably stats account --live
+
+  $ ably stats app
+
+  $ ably stats app my-app-id
+
+  $ ably stats app --live
+
+COMMANDS
+  ably stats account            Get account stats with optional live updates
+  ably stats app                Get app stats with optional live updates
+```
+
+_See code: [src/commands/stats/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/stats/index.ts)_
+
+## `ably stats account`
+
+Get account stats with optional live updates
+
+```
+USAGE
+  $ ably stats account [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
+    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [--debug] [--end <value>]
+    [--interval <value>] [--limit <value>] [--live] [--start <value>] [--unit minute|hour|day|month]
+
+FLAGS
+  -v, --verbose               Output verbose logs
+      --access-token=<value>  Overrides any configured access token used for the Control API
+      --api-key=<value>       Overrides any configured API key used for the product APIs
+      --client-id=<value>     Overrides any default client ID when using API authentication. Use "none" to explicitly
+                              set no client ID. Not applicable when using token authentication.
+      --debug                 Show debug information for live stats polling
+      --end=<value>           End time in milliseconds since epoch
+      --endpoint=<value>      Override the endpoint for all product API calls
+      --env=<value>           Override the environment for all product API calls
+      --host=<value>          Override the host endpoint for all product API calls
+      --interval=<value>      [default: 6] Polling interval in seconds (only used with --live)
+      --json                  Output in JSON format
+      --limit=<value>         [default: 10] Maximum number of stats records to return
+      --live                  Subscribe to live stats updates (uses minute interval)
+      --pretty-json           Output in colorized JSON format
+      --start=<value>         Start time in milliseconds since epoch
+      --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
+      --unit=<option>         [default: minute] Time unit for stats
+                              <options: minute|hour|day|month>
+
+DESCRIPTION
+  Get account stats with optional live updates
+
+EXAMPLES
+  $ ably stats account
+
+  $ ably stats account --unit hour
+
+  $ ably stats account --start 1618005600000 --end 1618091999999
+
+  $ ably stats account --limit 10
+
+  $ ably stats account --json
+
+  $ ably stats account --pretty-json
+
+  $ ably stats account --live
+
+  $ ably stats account --live --interval 15
+```
+
+_See code: [src/commands/stats/account.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/stats/account.ts)_
+
+## `ably stats app [ID]`
+
+Get app stats with optional live updates
+
+```
+USAGE
+  $ ably stats app [ID] [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
+    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [--debug] [--end <value>]
+    [--interval <value>] [--limit <value>] [--live] [--start <value>] [--unit minute|hour|day|month]
+
+ARGUMENTS
+  ID  App ID to get stats for (uses default app if not provided)
+
+FLAGS
+  -v, --verbose               Output verbose logs
+      --access-token=<value>  Overrides any configured access token used for the Control API
+      --api-key=<value>       Overrides any configured API key used for the product APIs
+      --client-id=<value>     Overrides any default client ID when using API authentication. Use "none" to explicitly
+                              set no client ID. Not applicable when using token authentication.
+      --debug                 Show debug information for live stats polling
+      --end=<value>           End time in milliseconds since epoch
+      --endpoint=<value>      Override the endpoint for all product API calls
+      --env=<value>           Override the environment for all product API calls
+      --host=<value>          Override the host endpoint for all product API calls
+      --interval=<value>      [default: 6] Polling interval in seconds (only used with --live)
+      --json                  Output in JSON format
+      --limit=<value>         [default: 10] Maximum number of stats records to return
+      --live                  Subscribe to live stats updates (uses minute interval)
+      --pretty-json           Output in colorized JSON format
+      --start=<value>         Start time in milliseconds since epoch
+      --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
+      --unit=<option>         [default: minute] Time unit for stats
+                              <options: minute|hour|day|month>
+
+DESCRIPTION
+  Get app stats with optional live updates
+
+EXAMPLES
+  $ ably stats app
+
+  $ ably stats app app-id
+
+  $ ably stats app --unit hour
+
+  $ ably stats app app-id --unit hour
+
+  $ ably stats app app-id --start 1618005600000 --end 1618091999999
+
+  $ ably stats app app-id --limit 10
+
+  $ ably stats app app-id --json
+
+  $ ably stats app app-id --pretty-json
+
+  $ ably stats app --live
+
+  $ ably stats app app-id --live
+
+  $ ably stats app --live --interval 15
+```
+
+_See code: [src/commands/stats/app.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/stats/app.ts)_
 
 ## `ably status`
 
@@ -4721,7 +4730,7 @@ EXAMPLES
   $ ably status
 ```
 
-_See code: [src/commands/status.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/status.ts)_
+_See code: [src/commands/status.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/status.ts)_
 
 ## `ably support`
 
@@ -4746,7 +4755,7 @@ COMMANDS
   ably support contact          Contact Ably for assistance
 ```
 
-_See code: [src/commands/support/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/support/index.ts)_
+_See code: [src/commands/support/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/support/index.ts)_
 
 ## `ably support ask QUESTION`
 
@@ -4786,7 +4795,7 @@ EXAMPLES
   $ ably support ask --continue "Can you explain more about token capabilities?"
 ```
 
-_See code: [src/commands/support/ask.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/support/ask.ts)_
+_See code: [src/commands/support/ask.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/support/ask.ts)_
 
 ## `ably support contact`
 
@@ -4806,7 +4815,7 @@ EXAMPLES
   $ ably support contact
 ```
 
-_See code: [src/commands/support/contact.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/support/contact.ts)_
+_See code: [src/commands/support/contact.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/support/contact.ts)_
 <!-- commandsstop -->
 
 # Contributing
@@ -4823,9 +4832,7 @@ If you are an AI assistant, start with [`AI-Assistance.mdc`](.cursor/rules/AI-As
 Before submitting any changes, run our automated validation script to ensure your code meets all requirements:
 
 ```bash
-pnpm validate
-# or
-./scripts/pre-push-validation.sh
+pnpm validate  # or: ./scripts/pre-push-validation.sh
 ```
 
 This script automatically runs all mandatory steps including build, linting, and testing. See [`.cursor/rules/Workflow.mdc`](.cursor/rules/Workflow.mdc) for detailed information about each step.
diff --git a/src/base-command.ts b/src/base-command.ts
index 398c325b..de970dd1 100644
--- a/src/base-command.ts
+++ b/src/base-command.ts
@@ -21,7 +21,7 @@ import isWebCliMode from "./utils/web-mode.js";
 // List of commands not allowed in web CLI mode - EXPORTED
 export const WEB_CLI_RESTRICTED_COMMANDS = [
   // All account login/management commands are not valid in a web env where auth is handled by the website
-  // note accounts:stats is supported
+  // note stats:account and stats:app are restricted via WEB_CLI_ANONYMOUS_RESTRICTED_COMMANDS
   "accounts:current",
   "accounts:list",
   "accounts:login",
@@ -64,6 +64,9 @@ export const WEB_CLI_ANONYMOUS_RESTRICTED_COMMANDS = [
   // Integrations and queues are not available to anonymous users
   "integrations*",
   "queues*",
+
+  // Stats commands expose account/app usage data
+  "stats*",
 ];
 
 /* Commands not suitable for interactive mode */
@@ -308,6 +311,8 @@ export abstract class AblyBaseCommand extends InteractiveBaseCommand {
           errorMessage = `Integration management requires you to be logged in. Please log in at https://ably.com/login.`;
         } else if (commandId.startsWith("queues")) {
           errorMessage = `Queue management requires you to be logged in. Please log in at https://ably.com/login.`;
+        } else if (commandId.startsWith("stats")) {
+          errorMessage = `Stats commands are only available when logged in. Please log in at https://ably.com/login.`;
         } else {
           errorMessage = `This command is not available in anonymous mode. Please log in at https://ably.com/login.`;
         }
diff --git a/src/commands/accounts/index.ts b/src/commands/accounts/index.ts
index 299ad74c..b33d1525 100644
--- a/src/commands/accounts/index.ts
+++ b/src/commands/accounts/index.ts
@@ -12,6 +12,5 @@ export default class AccountsCommand extends BaseTopicCommand {
     "$ ably accounts current",
     "$ ably accounts logout",
     "$ ably accounts switch my-account",
-    "$ ably accounts stats",
   ];
 }
diff --git a/src/commands/accounts/stats/README.md b/src/commands/accounts/stats/README.md
deleted file mode 100644
index 2d75eef3..00000000
--- a/src/commands/accounts/stats/README.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# Account Stats Command
-
-The `accounts stats` command allows you to view statistics for your Ably account, including metrics such as peak rates for messages, API requests, token requests, opened connections, and opened channels.
-
-## Usage
-
-```
-ably accounts stats
-```
-
-## Options
-
-- `--start`: Start time in milliseconds since epoch
-- `--end`: End time in milliseconds since epoch
-- `--unit`: Time unit for stats (minute, hour, day, month). Default: minute
-- `--limit`: Maximum number of stats records to return. Default: 10
-- `--format`: Output format (json, pretty). Default: pretty
-- `--live`: Subscribe to live stats updates. Default: false
-- `--interval`: Polling interval in seconds (only used with --live). Default: 6
-
-## Examples
-
-Basic usage (shows last 24 hours of stats):
-
-```
-ably accounts stats
-```
-
-Get stats with specific time unit:
-
-```
-ably accounts stats --unit hour
-```
-
-Get stats for a specific period:
-
-```
-ably accounts stats --start 1618005600000 --end 1618091999999
-```
-
-Limit the number of returned records:
-
-```
-ably accounts stats --limit 10
-```
-
-Get stats in JSON format:
-
-```
-ably accounts stats --format json
-```
-
-Subscribe to live stats updates:
-
-```
-ably accounts stats --live
-```
-
-Subscribe to live stats with custom polling interval:
-
-```
-ably accounts stats --live --interval 15
-```
-
-## Metrics Shown
-
-The command displays the following metrics:
-
-- **Messages**: Published and delivered count, data volume, and peak message rate (per second)
-- **Connections**: Peak, mean, opened count, and peak connection rate (per second)
-- **Channels**: Peak, mean, opened count, and peak channel rate (per second) if available
-- **API Requests**: Succeeded, failed, refused count, and peak API request rate (per second) if available
-- **Token Requests**: Succeeded, failed, refused count, and peak token request rate (per second)
-- **Integrations**: Peak rates for various integration types (HTTP Events, AMQP, External Queue, Webhook) if available
-- **Push Notifications**: Messages sent, delivery status, and peak push request rate (per second) if available
-
-Peak rates are reported per second and values between 0 and 1 are displayed with one decimal place for clarity.
diff --git a/src/commands/apps/index.ts b/src/commands/apps/index.ts
index 651d74ed..4427ffc4 100644
--- a/src/commands/apps/index.ts
+++ b/src/commands/apps/index.ts
@@ -12,7 +12,6 @@ export default class AppsCommand extends BaseTopicCommand {
     "$ ably apps update",
     "$ ably apps delete",
     "$ ably apps set-apns-p12",
-    "$ ably apps stats",
     "$ ably apps channel-rules list",
     "$ ably apps switch my-app",
   ];
diff --git a/src/commands/connections/index.ts b/src/commands/connections/index.ts
index 00357851..e1f6f418 100644
--- a/src/commands/connections/index.ts
+++ b/src/commands/connections/index.ts
@@ -7,7 +7,6 @@ export default class Connections extends BaseTopicCommand {
   static override description = "Interact with Ably Pub/Sub connections";
 
   static override examples = [
-    "<%= config.bin %> <%= command.id %> stats",
     "<%= config.bin %> <%= command.id %> logs connections-lifecycle",
     "<%= config.bin %> <%= command.id %> test",
   ];
diff --git a/src/commands/connections/stats.ts b/src/commands/connections/stats.ts
deleted file mode 100644
index 02f2fa8b..00000000
--- a/src/commands/connections/stats.ts
+++ /dev/null
@@ -1,428 +0,0 @@
-import { Flags } from "@oclif/core";
-import * as Ably from "ably";
-import chalk from "chalk";
-
-import { AblyBaseCommand } from "../../base-command.js";
-import { BaseFlags } from "../../types/cli.js";
-import { StatsDisplay } from "../../services/stats-display.js";
-import { StatsDisplayData } from "../../services/stats-display.js";
-
-export default class ConnectionsStats extends AblyBaseCommand {
-  static override description = "View connection statistics for an Ably app";
-
-  static override examples = [
-    "$ ably connections stats",
-    "$ ably connections stats --unit hour",
-    "$ ably connections stats --start 1618005600000 --end 1618091999999",
-    "$ ably connections stats --limit 10",
-    "$ ably connections stats --json",
-    "$ ably connections stats --pretty-json",
-    "$ ably connections stats --live",
-  ];
-
-  static override flags = {
-    ...AblyBaseCommand.globalFlags,
-    debug: Flags.boolean({
-      default: false,
-      description: "Show debug information for live stats polling",
-    }),
-    end: Flags.integer({
-      description: "End time in milliseconds since epoch",
-    }),
-    interval: Flags.integer({
-      default: 6,
-      description: "Polling interval in seconds (only used with --live)",
-    }),
-    limit: Flags.integer({
-      default: 10,
-      description: "Maximum number of stats records to return",
-    }),
-
-    live: Flags.boolean({
-      default: false,
-      description: "Subscribe to live stats updates (uses minute interval)",
-    }),
-    start: Flags.integer({
-      description: "Start time in milliseconds since epoch",
-    }),
-    unit: Flags.string({
-      default: "minute",
-      description: "Time unit for stats",
-      options: ["minute", "hour", "day", "month"],
-    }),
-  };
-
-  private client: Ably.Rest | null = null;
-  private isPolling = false;
-  private pollInterval: NodeJS.Timeout | undefined = undefined; // Use NodeJS.Timeout
-  private statsDisplay: StatsDisplay | null = null; // Track when we're already fetching stats
-
-  // Override finally to ensure resources are cleaned up
-  async finally(err: Error | undefined): Promise<void> {
-    if (this.pollInterval) {
-      clearInterval(this.pollInterval);
-      this.pollInterval = undefined;
-    }
-
-    // No need to close REST client explicitly
-    return super.finally(err);
-  }
-
-  async run(): Promise<void> {
-    const { flags } = await this.parse(ConnectionsStats);
-
-    // For live stats, enforce minute interval
-    if (flags.live && flags.unit !== "minute") {
-      this.logCliEvent(
-        flags,
-        "stats",
-        "liveIntervalOverride",
-        "Live stats only support minute intervals. Using minute interval.",
-      );
-      this.warn(
-        "Live stats only support minute intervals. Using minute interval.",
-      );
-      flags.unit = "minute";
-    }
-
-    // Get API key from flags or config
-    const apiKey = flags["api-key"] || (await this.configManager.getApiKey());
-    if (!apiKey) {
-      this.error(
-        'No API key found. Please set an API key using "ably keys add" or set the ABLY_API_KEY environment variable.',
-      );
-      return;
-    }
-
-    // Create stats display
-    this.statsDisplay = new StatsDisplay({
-      intervalSeconds: flags.interval,
-      isConnectionStats: true,
-      json: this.shouldOutputJson(flags),
-      live: flags.live,
-      startTime: flags.live ? new Date() : undefined,
-      unit: flags.unit as "day" | "hour" | "minute" | "month",
-    });
-
-    await (flags.live ? this.runLiveStats(flags) : this.runOneTimeStats(flags));
-  }
-
-  async runLiveStats(flags: Record<string, unknown>): Promise<void> {
-    try {
-      const client = await this.createAblyRestClient(flags as BaseFlags);
-      if (!client) {
-        return;
-      }
-
-      this.logCliEvent(
-        flags,
-        "stats",
-        "liveSubscribeStarting",
-        "Subscribing to live connection stats...",
-      );
-      if (!this.shouldOutputJson(flags)) {
-        this.log("Subscribing to live connection stats...");
-      }
-
-      // Setup graceful shutdown
-      const cleanup = () => {
-        this.logCliEvent(
-          flags,
-          "stats",
-          "liveCleanupInitiated",
-          "Cleanup initiated for live stats",
-        );
-        if (this.pollInterval) {
-          clearInterval(this.pollInterval);
-          this.pollInterval = undefined;
-        }
-
-        if (!this.shouldOutputJson(flags)) {
-          this.log("\nUnsubscribed from live stats");
-        }
-      };
-
-      process.on("SIGINT", cleanup);
-      process.on("SIGTERM", cleanup);
-
-      // Show stats immediately before starting polling
-      await this.fetchAndDisplayStats(flags, client);
-
-      // Poll for stats at the specified interval
-      this.pollInterval = setInterval(
-        () => {
-          if (!this.isPolling) {
-            this.pollStats(flags, client!);
-          } else if (flags.debug) {
-            this.logCliEvent(
-              flags,
-              "stats",
-              "pollSkipped",
-              "Skipping poll - previous request still in progress",
-            );
-            // Only show this message if debug flag is enabled
-            console.log(
-              chalk.yellow(
-                "Skipping poll - previous request still in progress",
-              ),
-            );
-          }
-        },
-        ((flags.interval as number) || 6) * 1000,
-      );
-
-      this.logCliEvent(
-        flags,
-        "stats",
-        "liveListening",
-        "Now listening for live stats updates",
-      );
-      // Keep the process running
-      await new Promise<void>(() => {
-        // This promise is intentionally never resolved
-        // The process will exit via the SIGINT/SIGTERM handlers
-      });
-    } catch (error) {
-      const errorMsg = error instanceof Error ? error.message : String(error);
-      this.logCliEvent(
-        flags,
-        "stats",
-        "liveSetupError",
-        `Error setting up live stats: ${errorMsg}`,
-        { error: errorMsg },
-      );
-      this.error(`Error setting up live stats: ${errorMsg}`);
-      if (this.pollInterval) {
-        clearInterval(this.pollInterval);
-      }
-    }
-  }
-
-  async runOneTimeStats(flags: Record<string, unknown>): Promise<void> {
-    // Calculate time range based on the unit
-    const now = new Date();
-    let startTime = new Date();
-
-    switch (flags.unit) {
-      case "minute": {
-        startTime = new Date(now.getTime() - 60 * 60 * 1000); // 1 hour ago for minutes
-
-        break;
-      }
-
-      case "hour": {
-        startTime = new Date(now.getTime() - 24 * 60 * 60 * 1000); // 24 hours ago for hours
-
-        break;
-      }
-
-      case "day": {
-        startTime = new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000); // 7 days ago for days
-
-        break;
-      }
-
-      default: {
-        startTime = new Date(now.getTime() - 30 * 24 * 60 * 60 * 1000); // 30 days ago for months
-      }
-    }
-
-    // Prepare query parameters
-    const params = {
-      direction: "backwards" as "backwards" | "forwards",
-      end: (flags.end as number | undefined) ?? now.getTime(),
-      limit: flags.limit as number,
-      start: (flags.start as number | undefined) ?? startTime.getTime(),
-      unit: flags.unit as "day" | "hour" | "minute" | "month",
-    };
-    this.logCliEvent(
-      flags,
-      "stats",
-      "oneTimeFetchRequest",
-      "Fetching one-time stats with parameters",
-      { params },
-    );
-
-    try {
-      const client = await this.createAblyRestClient(flags as BaseFlags);
-      if (!client) {
-        return;
-      }
-
-      // Get stats
-      const statsPage = await client.stats(params);
-      const stats = statsPage.items;
-      this.logCliEvent(
-        flags,
-        "stats",
-        "oneTimeFetchResponse",
-        `Received ${stats.length} stats records`,
-        { count: stats.length, stats },
-      );
-
-      if (stats.length === 0) {
-        this.logCliEvent(
-          flags,
-          "stats",
-          "noStatsAvailable",
-          "No connection stats available for the requested period",
-        );
-        if (!this.shouldOutputJson(flags)) {
-          this.log("No connection stats available.");
-        }
-
-        return;
-      }
-
-      // Display stats using the StatsDisplay class
-      this.statsDisplay!.display(stats[0] as StatsDisplayData); // Display only the latest/first record for simplicity
-      // If you need to display all records for one-time stats, you'll need to adjust StatsDisplay or loop here.
-    } catch (error) {
-      const errorMsg = error instanceof Error ? error.message : String(error);
-      this.logCliEvent(
-        flags,
-        "stats",
-        "oneTimeFetchError",
-        `Failed to fetch one-time stats: ${errorMsg}`,
-        { error: errorMsg },
-      );
-      this.error(`Failed to fetch stats: ${errorMsg}`);
-    }
-  }
-
-  private async fetchAndDisplayStats(
-    flags: Record<string, unknown>,
-    client: Ably.Rest,
-  ): Promise<void> {
-    try {
-      // Calculate time range based on the unit
-      const now = new Date();
-      let startTime = new Date();
-
-      switch (flags.unit) {
-        case "minute": {
-          startTime = new Date(now.getTime() - 60 * 60 * 1000); // 1 hour ago for minutes
-
-          break;
-        }
-
-        case "hour": {
-          startTime = new Date(now.getTime() - 24 * 60 * 60 * 1000); // 24 hours ago for hours
-
-          break;
-        }
-
-        case "day": {
-          startTime = new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000); // 7 days ago for days
-
-          break;
-        }
-
-        default: {
-          startTime = new Date(now.getTime() - 30 * 24 * 60 * 60 * 1000); // 30 days ago for months
-        }
-      }
-
-      // Prepare query parameters
-      const params = {
-        direction: "backwards" as "backwards" | "forwards",
-        end: now.getTime(),
-        limit: flags.live ? 1 : (flags.limit as number),
-        start: startTime.getTime(),
-        unit: flags.unit as "day" | "hour" | "minute" | "month",
-      };
-      this.logCliEvent(
-        flags,
-        "stats",
-        "fetchRequest",
-        "Fetching stats with parameters",
-        { params },
-      );
-
-      // Get stats
-      const statsPage = await client.stats(params);
-      const stats = statsPage.items;
-      this.logCliEvent(
-        flags,
-        "stats",
-        "fetchResponse",
-        `Received ${stats.length} stats records`,
-        { count: stats.length, stats },
-      );
-
-      if (stats.length === 0) {
-        this.logCliEvent(
-          flags,
-          "stats",
-          "noStatsAvailable",
-          "No connection stats available for the requested period",
-        );
-        if (!flags.live && !this.shouldOutputJson(flags)) {
-          this.log("No connection stats available.");
-        }
-
-        return;
-      }
-
-      // Display stats using the StatsDisplay class
-      this.statsDisplay!.display(stats[0] as StatsDisplayData);
-
-      // Display each stat interval
-      for (const stat of stats) {
-        this.statsDisplay!.display(stat as StatsDisplayData);
-      }
-    } catch (error) {
-      const errorMsg = error instanceof Error ? error.message : String(error);
-      this.logCliEvent(
-        flags,
-        "stats",
-        "fetchError",
-        `Failed to fetch stats: ${errorMsg}`,
-        { error: errorMsg },
-      );
-      this.error(`Failed to fetch stats: ${errorMsg}`);
-    }
-  }
-
-  private async pollStats(
-    flags: Record<string, unknown>,
-    client: Ably.Rest,
-  ): Promise<void> {
-    try {
-      this.isPolling = true;
-      this.logCliEvent(
-        flags,
-        "stats",
-        "pollStarting",
-        "Polling for new stats...",
-      );
-      if (flags.debug) {
-        console.log(
-          chalk.dim(`[${new Date().toISOString()}] Polling for new stats...`),
-        );
-      }
-
-      await this.fetchAndDisplayStats(flags, client);
-      this.logCliEvent(
-        flags,
-        "stats",
-        "pollSuccess",
-        "Successfully polled and displayed stats",
-      );
-    } catch (error) {
-      const errorMsg = error instanceof Error ? error.message : String(error);
-      this.logCliEvent(
-        flags,
-        "stats",
-        "pollError",
-        `Error during stats polling: ${errorMsg}`,
-        { error: errorMsg },
-      );
-      if (flags.debug) {
-        console.error(chalk.red(`Error during stats polling: ${errorMsg}`));
-      }
-    } finally {
-      this.isPolling = false;
-    }
-  }
-}
diff --git a/src/commands/accounts/stats/index.ts b/src/commands/stats/account.ts
similarity index 88%
rename from src/commands/accounts/stats/index.ts
rename to src/commands/stats/account.ts
index a4ca55dd..601be79f 100644
--- a/src/commands/accounts/stats/index.ts
+++ b/src/commands/stats/account.ts
@@ -1,23 +1,23 @@
 import { Flags } from "@oclif/core";
 import chalk from "chalk";
 
-import { ControlBaseCommand } from "../../../control-base-command.js";
-import { StatsDisplay } from "../../../services/stats-display.js";
-import type { BaseFlags } from "../../../types/cli.js";
-import type { ControlApi } from "../../../services/control-api.js";
+import { ControlBaseCommand } from "../../control-base-command.js";
+import { StatsDisplay } from "../../services/stats-display.js";
+import type { BaseFlags } from "../../types/cli.js";
+import type { ControlApi } from "../../services/control-api.js";
 
-export default class AccountsStatsCommand extends ControlBaseCommand {
+export default class StatsAccountCommand extends ControlBaseCommand {
   static description = "Get account stats with optional live updates";
 
   static examples = [
-    "$ ably accounts stats",
-    "$ ably accounts stats --unit hour",
-    "$ ably accounts stats --start 1618005600000 --end 1618091999999",
-    "$ ably accounts stats --limit 10",
-    "$ ably accounts stats --json",
-    "$ ably accounts stats --pretty-json",
-    "$ ably accounts stats --live",
-    "$ ably accounts stats --live --interval 15",
+    "$ ably stats account",
+    "$ ably stats account --unit hour",
+    "$ ably stats account --start 1618005600000 --end 1618091999999",
+    "$ ably stats account --limit 10",
+    "$ ably stats account --json",
+    "$ ably stats account --pretty-json",
+    "$ ably stats account --live",
+    "$ ably stats account --live --interval 15",
   ];
 
   static flags = {
@@ -57,7 +57,7 @@ export default class AccountsStatsCommand extends ControlBaseCommand {
   private statsDisplay: StatsDisplay | null = null; // Track when we're already fetching stats
 
   async run(): Promise<void> {
-    const { flags } = await this.parse(AccountsStatsCommand);
+    const { flags } = await this.parse(StatsAccountCommand);
 
     // For live stats, enforce minute interval
     if (flags.live && flags.unit !== "minute") {
@@ -203,6 +203,9 @@ export default class AccountsStatsCommand extends ControlBaseCommand {
     controlApi: ControlApi,
   ): Promise<void> {
     try {
+      const { account } = await controlApi.getMe();
+      this.log(`Fetching stats for account ${account.name} (${account.id})...`);
+
       // If no start/end time provided, use the last 24 hours
       if (!flags.start && !flags.end) {
         const now = new Date();
diff --git a/src/commands/apps/stats/index.ts b/src/commands/stats/app.ts
similarity index 88%
rename from src/commands/apps/stats/index.ts
rename to src/commands/stats/app.ts
index 031b16a2..c67fbe1d 100644
--- a/src/commands/apps/stats/index.ts
+++ b/src/commands/stats/app.ts
@@ -1,11 +1,12 @@
 import { Args, Flags } from "@oclif/core";
 import chalk from "chalk";
-import { StatsDisplay } from "../../../services/stats-display.js";
-import { ControlBaseCommand } from "../../../control-base-command.js";
-import type { BaseFlags } from "../../../types/cli.js";
-import type { ControlApi } from "../../../services/control-api.js";
 
-export default class AppsStatsCommand extends ControlBaseCommand {
+import { ControlBaseCommand } from "../../control-base-command.js";
+import { StatsDisplay } from "../../services/stats-display.js";
+import type { BaseFlags } from "../../types/cli.js";
+import type { ControlApi } from "../../services/control-api.js";
+
+export default class StatsAppCommand extends ControlBaseCommand {
   static args = {
     id: Args.string({
       description: "App ID to get stats for (uses default app if not provided)",
@@ -16,17 +17,17 @@ export default class AppsStatsCommand extends ControlBaseCommand {
   static description = "Get app stats with optional live updates";
 
   static examples = [
-    "$ ably apps stats",
-    "$ ably apps stats app-id",
-    "$ ably apps stats --unit hour",
-    "$ ably apps stats app-id --unit hour",
-    "$ ably apps stats app-id --start 1618005600000 --end 1618091999999",
-    "$ ably apps stats app-id --limit 10",
-    "$ ably apps stats app-id --json",
-    "$ ably apps stats app-id --pretty-json",
-    "$ ably apps stats --live",
-    "$ ably apps stats app-id --live",
-    "$ ably apps stats --live --interval 15",
+    "$ ably stats app",
+    "$ ably stats app app-id",
+    "$ ably stats app --unit hour",
+    "$ ably stats app app-id --unit hour",
+    "$ ably stats app app-id --start 1618005600000 --end 1618091999999",
+    "$ ably stats app app-id --limit 10",
+    "$ ably stats app app-id --json",
+    "$ ably stats app app-id --pretty-json",
+    "$ ably stats app --live",
+    "$ ably stats app app-id --live",
+    "$ ably stats app --live --interval 15",
   ];
 
   static flags = {
@@ -66,7 +67,7 @@ export default class AppsStatsCommand extends ControlBaseCommand {
   private statsDisplay: StatsDisplay | null = null; // Track when we're already fetching stats
 
   async run(): Promise<void> {
-    const { args, flags } = await this.parse(AppsStatsCommand);
+    const { args, flags } = await this.parse(StatsAppCommand);
 
     // Use provided app ID or fall back to default app ID
     const appId = args.id || this.configManager.getCurrentAppId();
diff --git a/src/commands/stats/index.ts b/src/commands/stats/index.ts
new file mode 100644
index 00000000..271a0e48
--- /dev/null
+++ b/src/commands/stats/index.ts
@@ -0,0 +1,17 @@
+import { BaseTopicCommand } from "../../base-topic-command.js";
+
+export default class StatsCommand extends BaseTopicCommand {
+  protected topicName = "stats";
+  protected commandGroup = "stats";
+
+  static description = "View statistics for your Ably account or apps";
+
+  static examples = [
+    "$ ably stats account",
+    "$ ably stats account --unit hour",
+    "$ ably stats account --live",
+    "$ ably stats app",
+    "$ ably stats app my-app-id",
+    "$ ably stats app --live",
+  ];
+}
diff --git a/src/hooks/init/alias-command.ts b/src/hooks/init/alias-command.ts
index a4d5de16..c9c3b563 100644
--- a/src/hooks/init/alias-command.ts
+++ b/src/hooks/init/alias-command.ts
@@ -16,7 +16,7 @@ const singularToPluralMap: Record<string, string> = {
 
 /**
  * This hook intercepts command execution and redirects singular command forms to their plural equivalents
- * This allows commands like 'ably account stats' to work as an alias for 'ably accounts stats'
+ * This allows commands like 'ably account list' to work as an alias for 'ably accounts list'
  * without requiring separate alias files for each command
  */
 const hook: Hook<"init"> = async function () {
diff --git a/test/e2e/connections/connections.test.ts b/test/e2e/connections/connections.test.ts
index e1718e1f..189a970e 100644
--- a/test/e2e/connections/connections.test.ts
+++ b/test/e2e/connections/connections.test.ts
@@ -39,133 +39,6 @@ describe("Connections E2E Tests", () => {
     await cleanupTrackedResources();
   });
 
-  describe("Connection Stats E2E", () => {
-    it(
-      "should retrieve real connection stats successfully",
-      { timeout: 60000 },
-      async () => {
-        setupTestFailureHandler(
-          "should retrieve real connection stats successfully",
-        );
-
-        const result = await runCommand(
-          ["connections", "stats", "--limit", "5"],
-          {
-            timeoutMs: 30000,
-            env: { ABLY_CLI_TEST_MODE: "false" },
-          },
-        );
-
-        expect(result.exitCode).toBe(0);
-        expect(result.stdout).toContain("Connections:");
-        expect(result.stdout).toContain("Channels:");
-        expect(result.stdout).toContain("Messages:");
-      },
-    );
-
-    it(
-      "should output connection stats in JSON format",
-      { timeout: 60000 },
-      async () => {
-        setupTestFailureHandler(
-          "should output connection stats in JSON format",
-        );
-
-        const result = await runCommand(
-          ["connections", "stats", "--json", "--limit", "3"],
-          {
-            timeoutMs: 30000,
-            env: { ABLY_CLI_TEST_MODE: "false" },
-          },
-        );
-
-        expect(result.exitCode).toBe(0);
-
-        // Verify it's valid JSON
-        let jsonOutput;
-        try {
-          jsonOutput = JSON.parse(result.stdout);
-        } catch {
-          throw new Error(`Invalid JSON output: ${result.stdout}`);
-        }
-
-        // Check for expected stats structure
-        expect(jsonOutput).toHaveProperty("intervalId");
-      },
-    );
-
-    it(
-      "should handle different time units correctly",
-      { timeout: 60000 },
-      async () => {
-        setupTestFailureHandler("should handle different time units correctly");
-
-        const result = await runCommand(
-          ["connections", "stats", "--unit", "hour", "--limit", "2"],
-          {
-            timeoutMs: 30000,
-            env: { ABLY_CLI_TEST_MODE: "false" },
-          },
-        );
-
-        expect(result.exitCode).toBe(0);
-        expect(result.stdout).toContain("Stats for");
-      },
-    );
-
-    it("should handle custom time ranges", { timeout: 60000 }, async () => {
-      setupTestFailureHandler("should handle custom time ranges");
-
-      const endTime = Date.now();
-      const startTime = endTime - 60 * 60 * 1000; // 1 hour ago
-
-      const result = await runCommand(
-        [
-          "connections",
-          "stats",
-          "--start",
-          startTime.toString(),
-          "--end",
-          endTime.toString(),
-          "--limit",
-          "2",
-        ],
-        {
-          timeoutMs: 30000,
-          env: { ABLY_CLI_TEST_MODE: "false" },
-        },
-      );
-
-      expect(result.exitCode).toBe(0);
-    });
-
-    it("should handle empty stats gracefully", { timeout: 60000 }, async () => {
-      setupTestFailureHandler("should handle empty stats gracefully");
-
-      // Use a very recent time range that's unlikely to have stats
-      const endTime = Date.now();
-      const startTime = endTime - 1000; // 1 second ago
-
-      const result = await runCommand(
-        [
-          "connections",
-          "stats",
-          "--start",
-          startTime.toString(),
-          "--end",
-          endTime.toString(),
-        ],
-        {
-          timeoutMs: 30000,
-          env: { ABLY_CLI_TEST_MODE: "false" },
-        },
-      );
-
-      // Should exit successfully even with no stats
-      expect(result.exitCode).toBe(0);
-    });
-  });
-
   describe("Connection Test E2E", () => {
     it(
       "should test WebSocket connection successfully",
@@ -257,25 +130,6 @@ describe("Connections E2E Tests", () => {
   });
 
   describe("Error Handling E2E", () => {
-    it(
-      "should handle invalid time units gracefully",
-      { timeout: 30000 },
-      async () => {
-        setupTestFailureHandler("should handle invalid time units gracefully");
-
-        const result = await runCommand(
-          ["connections", "stats", "--unit", "invalid"],
-          {
-            timeoutMs: 30000,
-            env: { ABLY_CLI_TEST_MODE: "false" },
-          },
-        );
-
-        expect(result.exitCode).not.toBe(0);
-        expect(result.stderr).toContain("Expected --unit=");
-      },
-    );
-
     it(
       "should handle invalid transport types gracefully",
       { timeout: 30000 },
@@ -296,114 +150,6 @@ describe("Connections E2E Tests", () => {
         expect(result.stderr).toContain("Expected --transport=");
       },
     );
-
-    it(
-      "should handle invalid timestamp formats gracefully",
-      { timeout: 30000 },
-      async () => {
-        setupTestFailureHandler(
-          "should handle invalid timestamp formats gracefully",
-        );
-
-        const result = await runCommand(
-          ["connections", "stats", "--start", "not-a-timestamp"],
-          {
-            timeoutMs: 30000,
-            env: { ABLY_CLI_TEST_MODE: "false" },
-          },
-        );
-
-        expect(result.exitCode).not.toBe(0);
-      },
-    );
-  });
-
-  describe("Performance and Reliability E2E", () => {
-    it(
-      "should complete stats retrieval within reasonable time",
-      { timeout: 45000 },
-      async () => {
-        setupTestFailureHandler(
-          "should complete stats retrieval within reasonable time",
-        );
-
-        const startTime = Date.now();
-        const result = await runCommand(
-          ["connections", "stats", "--limit", "10"],
-          {
-            timeoutMs: 45000,
-            env: { ABLY_CLI_TEST_MODE: "false" },
-          },
-        );
-        const endTime = Date.now();
-
-        expect(result.exitCode).toBe(0);
-        expect(endTime - startTime).toBeLessThan(30000); // Should complete within 30 seconds
-      },
-    );
-
-    it(
-      "should handle multiple consecutive stats requests",
-      { timeout: 120000 },
-      async () => {
-        setupTestFailureHandler(
-          "should handle multiple consecutive stats requests",
-        );
-
-        // Run multiple stats requests in sequence
-        for (let i = 0; i < 3; i++) {
-          const result = await runCommand(
-            ["connections", "stats", "--limit", "2"],
-            {
-              timeoutMs: 30000,
-              env: { ABLY_CLI_TEST_MODE: "false" },
-            },
-          );
-          expect(result.exitCode).toBe(0);
-        }
-      },
-    );
-
-    it(
-      "should maintain consistent output format across requests",
-      { timeout: 90000 },
-      async () => {
-        setupTestFailureHandler(
-          "should maintain consistent output format across requests",
-        );
-
-        // Run the same command twice and verify consistent output structure
-        const result1 = await runCommand(
-          ["connections", "stats", "--json", "--limit", "2"],
-          {
-            timeoutMs: 45000,
-            env: { ABLY_CLI_TEST_MODE: "false" },
-          },
-        );
-        const result2 = await runCommand(
-          ["connections", "stats", "--json", "--limit", "2"],
-          {
-            timeoutMs: 45000,
-            env: { ABLY_CLI_TEST_MODE: "false" },
-          },
-        );
-
-        expect(result1.exitCode).toBe(0);
-        expect(result2.exitCode).toBe(0);
-
-        // Both should be valid JSON with similar structure
-        let json1, json2;
-        try {
-          json1 = JSON.parse(result1.stdout);
-          json2 = JSON.parse(result2.stdout);
-        } catch {
-          throw new Error("Invalid JSON output in consecutive requests");
-        }
-
-        // Both should have the same structure
-        expect(Object.keys(json1)).toEqual(Object.keys(json2));
-      },
-    );
   });
 
   describe("Live Connection Monitoring E2E", () => {
diff --git a/test/e2e/stats/stats.test.ts b/test/e2e/stats/stats.test.ts
new file mode 100644
index 00000000..4f37399d
--- /dev/null
+++ b/test/e2e/stats/stats.test.ts
@@ -0,0 +1,832 @@
+import {
+  describe,
+  it,
+  beforeEach,
+  afterEach,
+  beforeAll,
+  afterAll,
+  expect,
+} from "vitest";
+import {
+  E2E_API_KEY,
+  SHOULD_SKIP_E2E,
+  forceExit,
+  cleanupTrackedResources,
+  testOutputFiles,
+  testCommands,
+  setupTestFailureHandler,
+  resetTestTracking,
+} from "../../helpers/e2e-test-helper.js";
+import { runCommand } from "../../helpers/command-helpers.js";
+import { spawn } from "node:child_process";
+import { join } from "node:path";
+
+const E2E_ACCESS_TOKEN = process.env.E2E_ABLY_ACCESS_TOKEN;
+
+// Stats tests require an access token for account-level stats
+const SKIP_ACCOUNT_STATS = !E2E_ACCESS_TOKEN;
+
+// Helper function to parse JSON lines from command output
+function parseJsonLines(stdout: string): Record<string, unknown>[] {
+  const lines = stdout.trim().split("\n");
+  const jsonLines = lines.filter((line) => line.trim().startsWith("{"));
+  return jsonLines.map(
+    (line) => JSON.parse(line.trim()) as Record<string, unknown>,
+  );
+}
+
+describe.skipIf(SHOULD_SKIP_E2E || SKIP_ACCOUNT_STATS)(
+  "Stats E2E Tests",
+  () => {
+    beforeAll(() => {
+      process.on("SIGINT", forceExit);
+    });
+
+    afterAll(() => {
+      process.removeListener("SIGINT", forceExit);
+    });
+
+    beforeEach(() => {
+      resetTestTracking();
+      testOutputFiles.clear();
+      testCommands.length = 0;
+    });
+
+    afterEach(async () => {
+      await cleanupTrackedResources();
+    });
+
+    describe("stats account", () => {
+      it(
+        "should fetch account stats with default settings",
+        { timeout: 60000 },
+        async () => {
+          setupTestFailureHandler(
+            "should fetch account stats with default settings",
+          );
+
+          const result = await runCommand(
+            ["stats", "account", "--access-token", E2E_ACCESS_TOKEN!],
+            {
+              timeoutMs: 60000,
+            },
+          );
+
+          expect(result.exitCode).toBe(0);
+          // Output should contain some stats information or "No stats found"
+          expect(
+            result.stdout.includes("Stats") ||
+              result.stdout.includes("Messages") ||
+              result.stdout.includes("Connections") ||
+              result.stdout.includes("No stats found"),
+          ).toBe(true);
+        },
+      );
+
+      it(
+        "should fetch account stats with hour unit",
+        { timeout: 60000 },
+        async () => {
+          setupTestFailureHandler("should fetch account stats with hour unit");
+
+          const result = await runCommand(
+            [
+              "stats",
+              "account",
+              "--unit",
+              "hour",
+              "--access-token",
+              E2E_ACCESS_TOKEN!,
+            ],
+            {
+              timeoutMs: 60000,
+            },
+          );
+
+          expect(result.exitCode).toBe(0);
+        },
+      );
+
+      it(
+        "should fetch account stats with day unit",
+        { timeout: 60000 },
+        async () => {
+          setupTestFailureHandler("should fetch account stats with day unit");
+
+          const result = await runCommand(
+            [
+              "stats",
+              "account",
+              "--unit",
+              "day",
+              "--access-token",
+              E2E_ACCESS_TOKEN!,
+            ],
+            {
+              timeoutMs: 60000,
+            },
+          );
+
+          expect(result.exitCode).toBe(0);
+        },
+      );
+
+      it(
+        "should fetch account stats with limit",
+        { timeout: 60000 },
+        async () => {
+          setupTestFailureHandler("should fetch account stats with limit");
+
+          const result = await runCommand(
+            [
+              "stats",
+              "account",
+              "--limit",
+              "5",
+              "--access-token",
+              E2E_ACCESS_TOKEN!,
+            ],
+            {
+              timeoutMs: 60000,
+            },
+          );
+
+          expect(result.exitCode).toBe(0);
+        },
+      );
+
+      it(
+        "should output account stats in JSON format",
+        { timeout: 60000 },
+        async () => {
+          setupTestFailureHandler("should output account stats in JSON format");
+
+          const result = await runCommand(
+            [
+              "stats",
+              "account",
+              "--json",
+              "--limit",
+              "1",
+              "--access-token",
+              E2E_ACCESS_TOKEN!,
+            ],
+            {
+              timeoutMs: 60000,
+            },
+          );
+
+          expect(result.exitCode).toBe(0);
+
+          const hasNoStats = result.stdout.includes("No stats found");
+          if (hasNoStats) {
+            return;
+          }
+
+          // Must have at least one valid JSON line
+          const lines = result.stdout.trim().split("\n");
+          const jsonLines = lines.filter((line) => line.trim().startsWith("{"));
+          expect(jsonLines.length).toBeGreaterThan(0);
+
+          for (const line of jsonLines) {
+            expect(() => JSON.parse(line.trim())).not.toThrow();
+          }
+        },
+      );
+
+      it(
+        "should output account stats in pretty JSON format",
+        { timeout: 60000 },
+        async () => {
+          setupTestFailureHandler(
+            "should output account stats in pretty JSON format",
+          );
+
+          const result = await runCommand(
+            [
+              "stats",
+              "account",
+              "--pretty-json",
+              "--limit",
+              "1",
+              "--access-token",
+              E2E_ACCESS_TOKEN!,
+            ],
+            {
+              timeoutMs: 60000,
+            },
+          );
+
+          expect(result.exitCode).toBe(0);
+        },
+      );
+
+      it(
+        "should handle live stats subscription briefly",
+        { timeout: 30000 },
+        async () => {
+          setupTestFailureHandler(
+            "should handle live stats subscription briefly",
+          );
+
+          const cliPath = join(process.cwd(), "bin", "run.js");
+
+          // Start live stats subscription
+          const statsMonitor = spawn(
+            "node",
+            [
+              cliPath,
+              "stats",
+              "account",
+              "--live",
+              "--interval",
+              "2",
+              "--access-token",
+              E2E_ACCESS_TOKEN!,
+            ],
+            {
+              env: {
+                ...process.env,
+              },
+            },
+          );
+
+          let output = "";
+          statsMonitor.stdout?.on("data", (data) => {
+            output += data.toString();
+          });
+          statsMonitor.stderr?.on("data", (data) => {
+            output += data.toString();
+          });
+
+          // Wait for some output
+          await new Promise((resolve) => setTimeout(resolve, 8000));
+
+          // Gracefully terminate
+          statsMonitor.kill("SIGTERM");
+
+          await new Promise<void>((resolve) => {
+            statsMonitor.on("exit", () => resolve());
+            setTimeout(resolve, 5000); // Fallback timeout
+          });
+
+          // Verify it started subscription
+          expect(output).toContain("Subscribing to live stats");
+        },
+      );
+    });
+
+    describe("stats app", () => {
+      it(
+        "should fetch app stats with default settings using access token",
+        { timeout: 60000 },
+        async () => {
+          setupTestFailureHandler(
+            "should fetch app stats with default settings using access token",
+          );
+
+          const result = await runCommand(
+            ["stats", "app", "--access-token", E2E_ACCESS_TOKEN!],
+            {
+              timeoutMs: 60000,
+            },
+          );
+
+          // Either success or an error about no app ID selected (which is expected without config)
+          expect(
+            result.exitCode === 0 ||
+              result.stderr.includes("No app ID provided"),
+          ).toBe(true);
+        },
+      );
+
+      it(
+        "should fetch app stats using access token",
+        { timeout: 60000 },
+        async () => {
+          setupTestFailureHandler("should fetch app stats using access token");
+
+          // Verify API key is available (for extracting app ID)
+          if (!E2E_API_KEY) {
+            throw new Error("E2E_API_KEY is not available for testing");
+          }
+
+          // Extract app ID from API key
+          const appId = E2E_API_KEY.split(".")[0];
+
+          const result = await runCommand(["stats", "app", appId], {
+            timeoutMs: 60000,
+            env: { ABLY_ACCESS_TOKEN: E2E_ACCESS_TOKEN },
+          });
+
+          expect(result.exitCode).toBe(0);
+          expect(
+            result.stdout.includes("Fetching stats for app") ||
+              result.stdout.includes("Stats") ||
+              result.stdout.includes("Messages") ||
+              result.stdout.includes("Connections") ||
+              result.stdout.includes("No stats found"),
+          ).toBe(true);
+        },
+      );
+
+      it(
+        "should fetch app stats with hour unit",
+        { timeout: 60000 },
+        async () => {
+          setupTestFailureHandler("should fetch app stats with hour unit");
+
+          if (!E2E_API_KEY) {
+            throw new Error("E2E_API_KEY is not available for testing");
+          }
+
+          const appId = E2E_API_KEY.split(".")[0];
+
+          const result = await runCommand(
+            ["stats", "app", appId, "--unit", "hour"],
+            {
+              timeoutMs: 60000,
+              env: { ABLY_ACCESS_TOKEN: E2E_ACCESS_TOKEN },
+            },
+          );
+
+          expect(result.exitCode).toBe(0);
+        },
+      );
+
+      it(
+        "should fetch app stats with day unit",
+        { timeout: 60000 },
+        async () => {
+          setupTestFailureHandler("should fetch app stats with day unit");
+
+          if (!E2E_API_KEY) {
+            throw new Error("E2E_API_KEY is not available for testing");
+          }
+
+          const appId = E2E_API_KEY.split(".")[0];
+
+          const result = await runCommand(
+            ["stats", "app", appId, "--unit", "day"],
+            {
+              timeoutMs: 60000,
+              env: { ABLY_ACCESS_TOKEN: E2E_ACCESS_TOKEN },
+            },
+          );
+
+          expect(result.exitCode).toBe(0);
+        },
+      );
+
+      it("should fetch app stats with limit", { timeout: 60000 }, async () => {
+        setupTestFailureHandler("should fetch app stats with limit");
+
+        if (!E2E_API_KEY) {
+          throw new Error("E2E_API_KEY is not available for testing");
+        }
+
+        const appId = E2E_API_KEY.split(".")[0];
+
+        const result = await runCommand(
+          ["stats", "app", appId, "--limit", "5"],
+          {
+            timeoutMs: 60000,
+            env: { ABLY_ACCESS_TOKEN: E2E_ACCESS_TOKEN },
+          },
+        );
+
+        expect(result.exitCode).toBe(0);
+      });
+
+      it(
+        "should output app stats in JSON format",
+        { timeout: 60000 },
+        async () => {
+          setupTestFailureHandler("should output app stats in JSON format");
+
+          if (!E2E_API_KEY) {
+            throw new Error("E2E_API_KEY is not available for testing");
+          }
+
+          const appId = E2E_API_KEY.split(".")[0];
+
+          const result = await runCommand(
+            ["stats", "app", appId, "--json", "--limit", "1"],
+            {
+              timeoutMs: 60000,
+              env: { ABLY_ACCESS_TOKEN: E2E_ACCESS_TOKEN },
+            },
+          );
+
+          expect(result.exitCode).toBe(0);
+
+          const hasNoStats = result.stdout.includes("No stats found");
+          if (hasNoStats) {
+            return;
+          }
+
+          // Must have at least one valid JSON line
+          const lines = result.stdout.trim().split("\n");
+          const jsonLines = lines.filter((line) => line.trim().startsWith("{"));
+          expect(jsonLines.length).toBeGreaterThan(0);
+
+          for (const line of jsonLines) {
+            expect(() => JSON.parse(line.trim())).not.toThrow();
+          }
+        },
+      );
+
+      it(
+        "should output app stats in pretty JSON format",
+        { timeout: 60000 },
+        async () => {
+          setupTestFailureHandler(
+            "should output app stats in pretty JSON format",
+          );
+
+          if (!E2E_API_KEY) {
+            throw new Error("E2E_API_KEY is not available for testing");
+          }
+
+          const appId = E2E_API_KEY.split(".")[0];
+
+          const result = await runCommand(
+            ["stats", "app", appId, "--pretty-json", "--limit", "1"],
+            {
+              timeoutMs: 60000,
+              env: { ABLY_ACCESS_TOKEN: E2E_ACCESS_TOKEN },
+            },
+          );
+
+          expect(result.exitCode).toBe(0);
+        },
+      );
+
+      it(
+        "should handle live app stats subscription briefly",
+        { timeout: 30000 },
+        async () => {
+          setupTestFailureHandler(
+            "should handle live app stats subscription briefly",
+          );
+
+          if (!E2E_API_KEY) {
+            throw new Error("E2E_API_KEY is not available for testing");
+          }
+
+          const cliPath = join(process.cwd(), "bin", "run.js");
+          const appId = E2E_API_KEY.split(".")[0];
+
+          // Start live stats subscription
+          const statsMonitor = spawn(
+            "node",
+            [cliPath, "stats", "app", appId, "--live", "--interval", "2"],
+            {
+              env: {
+                ...process.env,
+                ABLY_ACCESS_TOKEN: E2E_ACCESS_TOKEN,
+              },
+            },
+          );
+
+          let output = "";
+          statsMonitor.stdout?.on("data", (data) => {
+            output += data.toString();
+          });
+          statsMonitor.stderr?.on("data", (data) => {
+            output += data.toString();
+          });
+
+          // Wait for some output
+          await new Promise((resolve) => setTimeout(resolve, 8000));
+
+          // Gracefully terminate
+          statsMonitor.kill("SIGTERM");
+
+          await new Promise<void>((resolve) => {
+            statsMonitor.on("exit", () => resolve());
+            setTimeout(resolve, 5000); // Fallback timeout
+          });
+
+          // Verify it started subscription
+          expect(output).toContain("Subscribing to live stats");
+        },
+      );
+    });
+
+    describe("Error Handling", () => {
+      it(
+        "should handle invalid unit option gracefully",
+        { timeout: 30000 },
+        async () => {
+          setupTestFailureHandler(
+            "should handle invalid unit option gracefully",
+          );
+
+          const result = await runCommand(
+            [
+              "stats",
+              "account",
+              "--unit",
+              "invalid",
+              "--access-token",
+              E2E_ACCESS_TOKEN!,
+            ],
+            {
+              timeoutMs: 30000,
+            },
+          );
+
+          expect(result.exitCode).not.toBe(0);
+          expect(result.stderr).toContain("Expected --unit=");
+        },
+      );
+
+      it(
+        "should handle invalid timestamp formats gracefully",
+        { timeout: 30000 },
+        async () => {
+          setupTestFailureHandler(
+            "should handle invalid timestamp formats gracefully",
+          );
+
+          const result = await runCommand(
+            [
+              "stats",
+              "account",
+              "--start",
+              "not-a-timestamp",
+              "--access-token",
+              E2E_ACCESS_TOKEN!,
+            ],
+            {
+              timeoutMs: 30000,
+            },
+          );
+
+          expect(result.exitCode).not.toBe(0);
+        },
+      );
+
+      it(
+        "should handle non-existent app ID gracefully",
+        { timeout: 30000 },
+        async () => {
+          setupTestFailureHandler(
+            "should handle non-existent app ID gracefully",
+          );
+
+          const result = await runCommand(
+            ["stats", "app", "non-existent-app-id"],
+            {
+              timeoutMs: 30000,
+              env: { ABLY_ACCESS_TOKEN: E2E_ACCESS_TOKEN },
+            },
+          );
+
+          // Should fail with an error about app not found or unauthorized
+          expect(result.exitCode).not.toBe(0);
+        },
+      );
+
+      it(
+        "should reject invalid authentication",
+        { timeout: 30000 },
+        async () => {
+          setupTestFailureHandler("should reject invalid authentication");
+
+          const result = await runCommand(
+            ["stats", "account", "--access-token", "invalid-token"],
+            {
+              timeoutMs: 30000,
+            },
+          );
+
+          expect(result.exitCode).not.toBe(0);
+          // Should contain an authentication error
+          expect(
+            result.stderr.includes("401") ||
+              result.stderr.includes("authentication") ||
+              result.stderr.includes("unauthorized") ||
+              result.stderr.includes("Unauthorized") ||
+              result.stderr.includes("Error"),
+          ).toBe(true);
+        },
+      );
+    });
+
+    describe("Time Range Filtering", () => {
+      it(
+        "should fetch account stats with custom time range",
+        { timeout: 60000 },
+        async () => {
+          setupTestFailureHandler(
+            "should fetch account stats with custom time range",
+          );
+
+          const now = Date.now();
+          const oneHourAgo = now - 60 * 60 * 1000;
+
+          const result = await runCommand(
+            [
+              "stats",
+              "account",
+              "--start",
+              oneHourAgo.toString(),
+              "--end",
+              now.toString(),
+              "--access-token",
+              E2E_ACCESS_TOKEN!,
+            ],
+            {
+              timeoutMs: 60000,
+            },
+          );
+
+          expect(result.exitCode).toBe(0);
+        },
+      );
+
+      it(
+        "should fetch app stats with custom time range",
+        { timeout: 60000 },
+        async () => {
+          setupTestFailureHandler(
+            "should fetch app stats with custom time range",
+          );
+
+          if (!E2E_API_KEY) {
+            throw new Error("E2E_API_KEY is not available for testing");
+          }
+
+          const appId = E2E_API_KEY.split(".")[0];
+          const now = Date.now();
+          const oneHourAgo = now - 60 * 60 * 1000;
+
+          const result = await runCommand(
+            [
+              "stats",
+              "app",
+              appId,
+              "--start",
+              oneHourAgo.toString(),
+              "--end",
+              now.toString(),
+            ],
+            {
+              timeoutMs: 60000,
+              env: { ABLY_ACCESS_TOKEN: E2E_ACCESS_TOKEN },
+            },
+          );
+
+          expect(result.exitCode).toBe(0);
+        },
+      );
+
+      it(
+        "should handle empty stats gracefully for narrow time range",
+        { timeout: 60000 },
+        async () => {
+          setupTestFailureHandler(
+            "should handle empty stats gracefully for narrow time range",
+          );
+
+          // Use a very recent time range that's unlikely to have stats
+          const endTime = Date.now();
+          const startTime = endTime - 1000; // 1 second ago
+
+          const result = await runCommand(
+            [
+              "stats",
+              "account",
+              "--start",
+              startTime.toString(),
+              "--end",
+              endTime.toString(),
+              "--access-token",
+              E2E_ACCESS_TOKEN!,
+            ],
+            {
+              timeoutMs: 60000,
+            },
+          );
+
+          // Should exit successfully even with no stats
+          expect(result.exitCode).toBe(0);
+        },
+      );
+    });
+
+    describe("Performance and Reliability", () => {
+      it(
+        "should complete stats retrieval within reasonable time",
+        { timeout: 45000 },
+        async () => {
+          setupTestFailureHandler(
+            "should complete stats retrieval within reasonable time",
+          );
+
+          const startTime = Date.now();
+          const result = await runCommand(
+            [
+              "stats",
+              "account",
+              "--limit",
+              "10",
+              "--access-token",
+              E2E_ACCESS_TOKEN!,
+            ],
+            {
+              timeoutMs: 45000,
+            },
+          );
+          const endTime = Date.now();
+
+          expect(result.exitCode).toBe(0);
+          expect(endTime - startTime).toBeLessThan(30000); // Should complete within 30 seconds
+        },
+      );
+
+      it(
+        "should handle multiple consecutive stats requests",
+        { timeout: 120000 },
+        async () => {
+          setupTestFailureHandler(
+            "should handle multiple consecutive stats requests",
+          );
+
+          // Run multiple stats requests in sequence
+          for (let i = 0; i < 3; i++) {
+            const result = await runCommand(
+              [
+                "stats",
+                "account",
+                "--limit",
+                "2",
+                "--access-token",
+                E2E_ACCESS_TOKEN!,
+              ],
+              {
+                timeoutMs: 30000,
+              },
+            );
+            expect(result.exitCode).toBe(0);
+          }
+        },
+      );
+
+      it(
+        "should maintain consistent output format across requests",
+        { timeout: 90000 },
+        async () => {
+          setupTestFailureHandler(
+            "should maintain consistent output format across requests",
+          );
+
+          // Run the same command twice and verify consistent output structure
+          const result1 = await runCommand(
+            [
+              "stats",
+              "account",
+              "--json",
+              "--limit",
+              "2",
+              "--access-token",
+              E2E_ACCESS_TOKEN!,
+            ],
+            {
+              timeoutMs: 45000,
+            },
+          );
+          const result2 = await runCommand(
+            [
+              "stats",
+              "account",
+              "--json",
+              "--limit",
+              "2",
+              "--access-token",
+              E2E_ACCESS_TOKEN!,
+            ],
+            {
+              timeoutMs: 45000,
+            },
+          );
+
+          expect(result1.exitCode).toBe(0);
+          expect(result2.exitCode).toBe(0);
+
+          // Parse JSON lines from both outputs
+          const json1 = parseJsonLines(result1.stdout);
+          const json2 = parseJsonLines(result2.stdout);
+
+          // Both should have the same number of JSON objects (or both empty)
+          // Verify that both have consistent structure (either both empty or both have same keys)
+          const keys1 = json1.length > 0 ? Object.keys(json1[0]).sort() : [];
+          const keys2 = json2.length > 0 ? Object.keys(json2[0]).sort() : [];
+          expect(keys1).toEqual(keys2);
+        },
+      );
+    });
+  },
+);
diff --git a/test/unit/base/base-command.test.ts b/test/unit/base/base-command.test.ts
index 880f2e31..06c98b3b 100644
--- a/test/unit/base/base-command.test.ts
+++ b/test/unit/base/base-command.test.ts
@@ -215,7 +215,7 @@ describe("AblyBaseCommand", function () {
       // Test various anonymous-restricted commands
       const testCases = [
         {
-          id: "accounts:stats",
+          id: "accounts:current",
           expectedError:
             /Account management commands are only available when logged in/,
         },
@@ -249,6 +249,14 @@ describe("AblyBaseCommand", function () {
           id: "queues:list",
           expectedError: /Queue management requires you to be logged in/,
         },
+        {
+          id: "stats:account",
+          expectedError: /Stats commands are only available when logged in/,
+        },
+        {
+          id: "stats:app",
+          expectedError: /Stats commands are only available when logged in/,
+        },
         {
           id: "logs:tail",
           expectedError: /not available in anonymous mode for privacy reasons/,
diff --git a/test/unit/commands/connections/stats.test.ts b/test/unit/commands/connections/stats.test.ts
deleted file mode 100644
index 84030a4d..00000000
--- a/test/unit/commands/connections/stats.test.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-import { describe, it, expect, beforeEach } from "vitest";
-import { runCommand } from "@oclif/test";
-import { getMockAblyRest } from "../../../helpers/mock-ably-rest.js";
-
-describe("ConnectionsStats", function () {
-  beforeEach(function () {
-    const mock = getMockAblyRest();
-
-    // Set up default mock response for stats
-    mock.stats.mockResolvedValue({
-      items: [
-        {
-          intervalId: Date.now().toString(),
-          entries: {
-            "connections.all.peak": 10,
-            "connections.all.min": 5,
-            "connections.all.mean": 7.5,
-            "connections.all.opened": 15,
-            "connections.all.refused": 2,
-            "connections.all.count": 8,
-            "channels.peak": 25,
-            "channels.min": 10,
-            "channels.mean": 18,
-            "channels.opened": 30,
-            "channels.refused": 1,
-            "channels.count": 20,
-            "messages.inbound.all.messages.count": 100,
-            "messages.outbound.all.messages.count": 90,
-            "messages.all.all.count": 190,
-            "messages.all.all.data": 5000,
-            "apiRequests.all.succeeded": 50,
-            "apiRequests.all.failed": 3,
-            "apiRequests.all.refused": 1,
-            "apiRequests.tokenRequests.succeeded": 10,
-            "apiRequests.tokenRequests.failed": 0,
-            "apiRequests.tokenRequests.refused": 0,
-          },
-        },
-      ],
-    });
-  });
-
-  it("should retrieve and display connection stats successfully", async function () {
-    const mock = getMockAblyRest();
-
-    const { stdout } = await runCommand(["connections:stats"], import.meta.url);
-
-    expect(mock.stats).toHaveBeenCalledOnce();
-
-    // Verify the stats method was called with correct parameters
-    const callArgs = mock.stats.mock.calls[0][0];
-    expect(callArgs).toHaveProperty("unit", "minute");
-    expect(callArgs).toHaveProperty("limit", 10);
-    expect(callArgs).toHaveProperty("direction", "backwards");
-
-    // Check that stats were displayed
-    expect(stdout).toContain("Connections:");
-    expect(stdout).toContain("Channels:");
-    expect(stdout).toContain("Messages:");
-  });
-
-  it("should handle different time units", async function () {
-    const mock = getMockAblyRest();
-
-    await runCommand(
-      ["connections:stats", "--unit", "hour", "--limit", "24"],
-      import.meta.url,
-    );
-
-    expect(mock.stats).toHaveBeenCalledOnce();
-
-    const callArgs = mock.stats.mock.calls[0][0];
-    expect(callArgs).toHaveProperty("unit", "hour");
-    expect(callArgs).toHaveProperty("limit", 24);
-  });
-
-  it("should handle custom time range with start and end", async function () {
-    const mock = getMockAblyRest();
-    const startTime = 1618005600000;
-    const endTime = 1618091999999;
-
-    await runCommand(
-      [
-        "connections:stats",
-        "--start",
-        startTime.toString(),
-        "--end",
-        endTime.toString(),
-      ],
-      import.meta.url,
-    );
-
-    expect(mock.stats).toHaveBeenCalledOnce();
-
-    const callArgs = mock.stats.mock.calls[0][0];
-    expect(callArgs).toHaveProperty("start", startTime);
-    expect(callArgs).toHaveProperty("end", endTime);
-  });
-
-  it("should handle empty stats response", async function () {
-    const mock = getMockAblyRest();
-    mock.stats.mockResolvedValue({ items: [] });
-
-    const { stdout } = await runCommand(["connections:stats"], import.meta.url);
-
-    expect(mock.stats).toHaveBeenCalledOnce();
-    expect(stdout).toContain("No connection stats available");
-  });
-
-  it("should handle API errors", async function () {
-    const mock = getMockAblyRest();
-    mock.stats.mockRejectedValue(new Error("API request failed"));
-
-    const { error } = await runCommand(["connections:stats"], import.meta.url);
-
-    expect(error).toBeDefined();
-    expect(error?.message).toContain("Failed to fetch stats");
-  });
-
-  it("should output JSON when requested", async function () {
-    const mock = getMockAblyRest();
-
-    const { stdout } = await runCommand(
-      ["connections:stats", "--json"],
-      import.meta.url,
-    );
-
-    expect(mock.stats).toHaveBeenCalledOnce();
-
-    // Check for JSON output - should contain entries
-    const jsonOutput = stdout.split("\n").find((line) => {
-      try {
-        const parsed = JSON.parse(line);
-        return parsed.entries && typeof parsed.entries === "object";
-      } catch {
-        return false;
-      }
-    });
-    expect(jsonOutput).toBeDefined();
-  });
-
-  // Note: Live mode tests are omitted because the command runs indefinitely
-  // and is difficult to test reliably with runCommand. The live mode functionality
-  // is tested manually or through integration tests.
-});
diff --git a/test/unit/commands/help-consistency.test.ts b/test/unit/commands/help-consistency.test.ts
index d3d95082..b3457cdc 100644
--- a/test/unit/commands/help-consistency.test.ts
+++ b/test/unit/commands/help-consistency.test.ts
@@ -141,14 +141,7 @@ describe("Help Output Consistency", () => {
         });
 
         // Both should list the same commands (ignoring the ably prefix)
-        const commands = [
-          "current",
-          "list",
-          "login",
-          "logout",
-          "stats",
-          "switch",
-        ];
+        const commands = ["current", "list", "login", "logout", "switch"];
 
         commands.forEach((cmd) => {
           expect(nonInteractive).toContain(`accounts ${cmd}`);
diff --git a/test/unit/commands/interactive-autocomplete.test.ts b/test/unit/commands/interactive-autocomplete.test.ts
index 28dc712b..334c115b 100644
--- a/test/unit/commands/interactive-autocomplete.test.ts
+++ b/test/unit/commands/interactive-autocomplete.test.ts
@@ -243,7 +243,7 @@ describe("Interactive Mode - Autocomplete & Command Filtering", () => {
           { id: "accounts:logout", hidden: false },
           { id: "accounts:switch", hidden: false },
           { id: "accounts:current", hidden: false },
-          { id: "accounts:stats", hidden: false },
+          { id: "stats", hidden: false },
           { id: "auth", hidden: false },
           { id: "auth:keys", hidden: false },
           { id: "auth:keys:switch", hidden: false },
diff --git a/test/unit/help/interactive-help.test.ts b/test/unit/help/interactive-help.test.ts
index dd4a2bf3..511c30f3 100644
--- a/test/unit/help/interactive-help.test.ts
+++ b/test/unit/help/interactive-help.test.ts
@@ -221,7 +221,7 @@ ably> channels publish test "msg2"
 
       // Test wildcard patterns
       expect(help.shouldDisplay({ id: "accounts" } as any)).toBe(false); // matches accounts*
-      expect(help.shouldDisplay({ id: "accounts:stats" } as any)).toBe(false); // matches accounts*
+      expect(help.shouldDisplay({ id: "accounts:current" } as any)).toBe(false); // matches accounts*
       expect(help.shouldDisplay({ id: "apps" } as any)).toBe(false); // matches apps*
       expect(help.shouldDisplay({ id: "apps:current" } as any)).toBe(false); // matches apps*
       expect(help.shouldDisplay({ id: "bench" } as any)).toBe(false); // matches bench*