diff --git a/README.md b/README.md
index d97885b3..5be789b5 100644
--- a/README.md
+++ b/README.md
@@ -93,7 +93,6 @@ See [MCP Server section](#mcp-server) for more details on how to use the MCP Ser
 * [`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)
@@ -103,13 +102,9 @@ See [MCP Server section](#mcp-server) for more details on how to use the MCP Ser
 * [`ably apps channel-rules update NAMEORID`](#ably-apps-channel-rules-update-nameorid)
 * [`ably apps create`](#ably-apps-create)
 * [`ably apps current`](#ably-apps-current)
-* [`ably apps delete [ID]`](#ably-apps-delete-id)
+* [`ably apps delete [APPID]`](#ably-apps-delete-appid)
 * [`ably apps list`](#ably-apps-list)
-* [`ably apps logs`](#ably-apps-logs)
-* [`ably apps logs history`](#ably-apps-logs-history)
-* [`ably apps logs subscribe`](#ably-apps-logs-subscribe)
 * [`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)
@@ -132,7 +127,6 @@ See [MCP Server section](#mcp-server) for more details on how to use the MCP Ser
 * [`ably channels batch-publish [MESSAGE]`](#ably-channels-batch-publish-message)
 * [`ably channels history CHANNEL`](#ably-channels-history-channel)
 * [`ably channels list`](#ably-channels-list)
-* [`ably channels logs [TOPIC]`](#ably-channels-logs-topic)
 * [`ably channels occupancy`](#ably-channels-occupancy)
 * [`ably channels occupancy get CHANNEL`](#ably-channels-occupancy-get-channel)
 * [`ably channels occupancy subscribe CHANNEL`](#ably-channels-occupancy-subscribe-channel)
@@ -142,36 +136,34 @@ See [MCP Server section](#mcp-server) for more details on how to use the MCP Ser
 * [`ably channels publish CHANNEL MESSAGE`](#ably-channels-publish-channel-message)
 * [`ably channels subscribe CHANNELS`](#ably-channels-subscribe-channels)
 * [`ably config`](#ably-config)
+* [`ably config path`](#ably-config-path)
+* [`ably config show`](#ably-config-show)
 * [`ably connections`](#ably-connections)
-* [`ably connections logs [TOPIC]`](#ably-connections-logs-topic)
-* [`ably connections stats`](#ably-connections-stats)
 * [`ably connections test`](#ably-connections-test)
 * [`ably help [COMMANDS]`](#ably-help-commands)
 * [`ably integrations`](#ably-integrations)
 * [`ably integrations create`](#ably-integrations-create)
-* [`ably integrations delete RULEID`](#ably-integrations-delete-ruleid)
+* [`ably integrations delete INTEGRATIONID`](#ably-integrations-delete-integrationid)
 * [`ably integrations get RULEID`](#ably-integrations-get-ruleid)
 * [`ably integrations list`](#ably-integrations-list)
 * [`ably integrations update RULEID`](#ably-integrations-update-ruleid)
 * [`ably login [TOKEN]`](#ably-login-token)
 * [`ably logs`](#ably-logs)
-* [`ably logs app`](#ably-logs-app)
-* [`ably logs app history`](#ably-logs-app-history)
-* [`ably logs app subscribe`](#ably-logs-app-subscribe)
 * [`ably logs channel-lifecycle`](#ably-logs-channel-lifecycle)
 * [`ably logs channel-lifecycle subscribe`](#ably-logs-channel-lifecycle-subscribe)
 * [`ably logs connection-lifecycle`](#ably-logs-connection-lifecycle)
 * [`ably logs connection-lifecycle history`](#ably-logs-connection-lifecycle-history)
 * [`ably logs connection-lifecycle subscribe`](#ably-logs-connection-lifecycle-subscribe)
-* [`ably logs connection subscribe`](#ably-logs-connection-subscribe)
+* [`ably logs history`](#ably-logs-history)
 * [`ably logs push`](#ably-logs-push)
 * [`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 QUEUENAME`](#ably-queues-delete-queuename)
+* [`ably queues delete QUEUEID`](#ably-queues-delete-queueid)
 * [`ably queues list`](#ably-queues-list)
 * [`ably rooms`](#ably-rooms)
 * [`ably rooms list`](#ably-rooms-list)
@@ -182,7 +174,7 @@ See [MCP Server section](#mcp-server) for more details on how to use the MCP Ser
 * [`ably rooms messages reactions send ROOM MESSAGESERIAL REACTION`](#ably-rooms-messages-reactions-send-room-messageserial-reaction)
 * [`ably rooms messages reactions subscribe ROOM`](#ably-rooms-messages-reactions-subscribe-room)
 * [`ably rooms messages send ROOM TEXT`](#ably-rooms-messages-send-room-text)
-* [`ably rooms messages subscribe ROOM`](#ably-rooms-messages-subscribe-room)
+* [`ably rooms messages subscribe ROOMS`](#ably-rooms-messages-subscribe-rooms)
 * [`ably rooms occupancy`](#ably-rooms-occupancy)
 * [`ably rooms occupancy get ROOM`](#ably-rooms-occupancy-get-room)
 * [`ably rooms occupancy subscribe ROOM`](#ably-rooms-occupancy-subscribe-room)
@@ -213,6 +205,9 @@ See [MCP Server section](#mcp-server) for more details on how to use the MCP Ser
 * [`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)
@@ -240,14 +235,11 @@ 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
 ```
 
@@ -406,60 +398,6 @@ EXAMPLES
 
 _See code: [src/commands/accounts/logout.ts](https://github.com/ably/ably-cli/blob/v0.15.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.15.0/src/commands/accounts/stats/index.ts)_
-
 ## `ably accounts switch [ALIAS]`
 
 Switch to a different Ably account
@@ -522,8 +460,6 @@ EXAMPLES
 
   $ ably apps set-apns-p12
 
-  $ ably apps stats
-
   $ ably apps channel-rules list
 
   $ ably apps switch my-app
@@ -534,9 +470,7 @@ COMMANDS
   ably apps current             Show the currently selected app
   ably apps delete              Delete an app
   ably apps list                List all apps in the current account
-  ably apps logs                Stream or retrieve app logs
   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
 ```
@@ -811,17 +745,17 @@ EXAMPLES
 
 _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 [ID]`
+## `ably apps delete [APPID]`
 
 Delete an app
 
 ```
 USAGE
-  $ ably apps delete [ID] [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
+  $ ably apps delete [APPID] [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
     [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [-f] [--app <value>]
 
 ARGUMENTS
-  ID  App ID to delete (uses current app if not specified)
+  APPID  App ID to delete (uses current app if not specified)
 
 FLAGS
   -f, --force                 Skip confirmation prompt
@@ -894,104 +828,6 @@ EXAMPLES
 
 _See code: [src/commands/apps/list.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/apps/list.ts)_
 
-## `ably apps logs`
-
-Stream or retrieve app logs
-
-```
-USAGE
-  $ ably apps logs
-
-DESCRIPTION
-  Stream or retrieve app logs
-
-EXAMPLES
-  $ ably apps logs subscribe
-
-  $ ably apps logs subscribe --rewind 10
-
-  $ ably apps logs history
-```
-
-_See code: [src/commands/apps/logs/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/apps/logs/index.ts)_
-
-## `ably apps logs history`
-
-Alias for `ably logs app history`
-
-```
-USAGE
-  $ ably apps logs history [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
-    [--endpoint <value>] [--host <value>] [--pretty-json | --json] [--token <value>] [-v] [--direction
-    backwards|forwards] [--limit <value>]
-
-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.
-      --direction=<option>    [default: backwards] Direction of message retrieval
-                              <options: backwards|forwards>
-      --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
-      --json                  Output results in JSON format
-      --limit=<value>         [default: 100] Maximum number of messages to retrieve
-      --pretty-json           Output in colorized JSON format
-      --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
-
-DESCRIPTION
-  Alias for `ably logs app history`
-
-EXAMPLES
-  $ ably apps logs history
-
-  $ ably apps logs history --limit 20
-
-  $ ably apps logs history --direction forwards
-
-  $ ably apps logs history --json
-
-  $ ably apps logs history --pretty-json
-```
-
-_See code: [src/commands/apps/logs/history.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/apps/logs/history.ts)_
-
-## `ably apps logs subscribe`
-
-Alias for ably logs app subscribe
-
-```
-USAGE
-  $ ably apps logs subscribe [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
-    [--endpoint <value>] [--host <value>] [--pretty-json | --json] [--token <value>] [-v] [--rewind <value>]
-
-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.
-      --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
-      --json                  Output results as JSON
-      --pretty-json           Output in colorized JSON format
-      --rewind=<value>        Number of messages to rewind when subscribing
-      --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
-
-DESCRIPTION
-  Alias for ably logs app subscribe
-
-EXAMPLES
-  $ ably apps logs subscribe
-
-  $ ably apps logs subscribe --rewind 10
-```
-
-_See code: [src/commands/apps/logs/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/apps/logs/subscribe.ts)_
-
 ## `ably apps set-apns-p12 ID`
 
 Upload Apple Push Notification Service P12 certificate for an app
@@ -1034,69 +870,6 @@ EXAMPLES
 
 _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 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.15.0/src/commands/apps/stats/index.ts)_
-
 ## `ably apps switch [APPID]`
 
 Switch to a different Ably app
@@ -1227,7 +1000,7 @@ FLAGS
       --pretty-json           Output in colorized JSON format
       --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
       --token-only            Output only the token string without any formatting or additional information
-      --ttl=<value>           [default: 3600] Time to live in seconds
+      --ttl=<value>           [default: 3600] Time to live in seconds (default: 3600, 1 hour)
 
 DESCRIPTION
   Creates an Ably Token with capabilities
@@ -1279,7 +1052,7 @@ FLAGS
       --pretty-json           Output in colorized JSON format
       --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
       --token-only            Output only the token string without any formatting or additional information
-      --ttl=<value>           [default: 3600] Time to live in seconds
+      --ttl=<value>           [default: 3600] Time to live in seconds (default: 3600, 1 hour)
 
 DESCRIPTION
   Creates an Ably JWT token with capabilities
@@ -1772,7 +1545,7 @@ Run a subscriber benchmark test
 ```
 USAGE
   $ ably bench subscriber CHANNEL [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
-    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v]
+    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [-d <value>]
 
 ARGUMENTS
   CHANNEL  The channel name to subscribe to
@@ -1822,7 +1595,6 @@ COMMANDS
   ably channels batch-publish   Publish messages to multiple Ably channels with a single request
   ably channels history         Retrieve message history for a channel
   ably channels list            List active channels using the channel enumeration API
-  ably channels logs            Alias for ably logs channel-lifecycle subscribe
   ably channels occupancy       Get occupancy metrics for a channel
   ably channels presence        Manage presence on Ably channels
   ably channels publish         Publish a message to an Ably channel
@@ -1845,13 +1617,14 @@ ARGUMENTS
   MESSAGE  The message to publish (JSON format or plain text, not needed if using --spec)
 
 FLAGS
-  -e, --encoding=<value>       The encoding for the message
-  -n, --name=<value>           The event name (if not specified in the message JSON)
+  -e, --encoding=<value>       The encoding for the message (not used with --spec)
+  -n, --name=<value>           The event name (if not specified in the message JSON, not used with --spec)
   -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
-      --channels=<value>       Comma-separated list of channel names to publish to
-      --channels-json=<value>  JSON array of channel names to publish to
+      --channels=<value>       Comma-separated list of channel names to publish to (mutually exclusive with
+                               --channels-json and --spec)
+      --channels-json=<value>  JSON array of channel names to publish to (mutually exclusive with --channels and --spec)
       --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.
       --endpoint=<value>       Override the endpoint for all product API calls
@@ -1860,7 +1633,7 @@ FLAGS
       --json                   Output in JSON format
       --pretty-json            Output in colorized JSON format
       --spec=<value>           Complete batch spec JSON (either a single BatchSpec object or an array of BatchSpec
-                               objects)
+                               objects). When used, --channels, --channels-json, --name, and --encoding are ignored
       --token=<value>          Authenticate using an Ably Token or JWT Token instead of an API key
 
 DESCRIPTION
@@ -1904,14 +1677,14 @@ FLAGS
       --cipher=<value>        Decryption key for encrypted messages (AES-128)
       --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.
-      --direction=<option>    [default: backwards] Direction of message retrieval
+      --direction=<option>    [default: backwards] Direction of message retrieval (default: backwards)
                               <options: backwards|forwards>
       --end=<value>           End time for the history query (ISO 8601 format)
       --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
       --json                  Output in JSON format
-      --limit=<value>         [default: 50] Maximum number of messages to retrieve
+      --limit=<value>         [default: 50] Maximum number of messages to retrieve (default: 50)
       --pretty-json           Output in colorized JSON format
       --start=<value>         Start time for the history query (ISO 8601 format)
       --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
@@ -1955,7 +1728,7 @@ FLAGS
       --env=<value>           Override the environment for all product API calls
       --host=<value>          Override the host endpoint for all product API calls
       --json                  Output in JSON format
-      --limit=<value>         [default: 100] Maximum number of channels to return
+      --limit=<value>         [default: 100] Maximum number of channels to return (default: 100)
       --pretty-json           Output in colorized JSON format
       --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
 
@@ -1976,43 +1749,6 @@ EXAMPLES
 
 _See code: [src/commands/channels/list.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/channels/list.ts)_
 
-## `ably channels logs [TOPIC]`
-
-Alias for ably logs channel-lifecycle subscribe
-
-```
-USAGE
-  $ ably channels logs [TOPIC] [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
-    [--endpoint <value>] [--host <value>] [--pretty-json | --json] [--token <value>] [-v] [--rewind <value>]
-
-ARGUMENTS
-  TOPIC  [default: channel-lifecycle] Log topic to subscribe to (currently only channel-lifecycle is supported)
-
-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.
-      --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
-      --json                  Output results as JSON
-      --pretty-json           Output in colorized JSON format
-      --rewind=<value>        Number of messages to rewind when subscribing
-      --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
-
-DESCRIPTION
-  Alias for ably logs channel-lifecycle subscribe
-
-EXAMPLES
-  $ ably channels logs channel-lifecycle
-
-  $ ably channels logs channel-lifecycle --rewind 10
-```
-
-_See code: [src/commands/channels/logs.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/channels/logs.ts)_
-
 ## `ably channels occupancy`
 
 Get occupancy metrics for a channel
@@ -2143,7 +1879,8 @@ Enter presence on a channel and listen for presence events
 ```
 USAGE
   $ ably channels presence enter CHANNEL [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
-    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [-D <value>] [--data <value>]
+    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [--data <value>] [-D <value>]
+    [--show-others] [--sequence-numbers]
 
 ARGUMENTS
   CHANNEL  Channel to enter presence on
@@ -2161,6 +1898,8 @@ FLAGS
       --host=<value>          Override the host endpoint for all product API calls
       --json                  Output in JSON format
       --pretty-json           Output in colorized JSON format
+      --sequence-numbers      Include sequence numbers in output
+      --show-others           Show other presence events while present (default: false)
       --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
 
 DESCRIPTION
@@ -2175,6 +1914,8 @@ EXAMPLES
 
   $ ably channels presence enter my-channel --token "YOUR_ABLY_TOKEN"
 
+  $ ably channels presence enter my-channel --show-others
+
   $ ably channels presence enter my-channel --json
 
   $ ably channels presence enter my-channel --pretty-json
@@ -2246,7 +1987,7 @@ ARGUMENTS
   MESSAGE  The message to publish (JSON format or plain text)
 
 FLAGS
-  -c, --count=<value>         [default: 1] Number of messages to publish
+  -c, --count=<value>         [default: 1] Number of messages to publish (default: 1)
   -d, --delay=<value>         [default: 40] Delay between messages in milliseconds (default: 40ms, max 25 msgs/sec)
   -e, --encoding=<value>      The encoding for the message
   -n, --name=<value>          The event name (if not specified in the message JSON)
@@ -2302,7 +2043,7 @@ USAGE
   $ ably channels subscribe CHANNELS... [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env
     <value>] [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [--cipher-algorithm
     <value>] [--cipher-key <value>] [--cipher-key-length <value>] [--cipher-mode <value>] [--delta] [-D <value>]
-    [--rewind <value>]
+    [--rewind <value>] [--sequence-numbers]
 
 ARGUMENTS
   CHANNELS...  Channel name(s) to subscribe to
@@ -2312,10 +2053,10 @@ 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
-      --cipher-algorithm=<value>   [default: aes] Encryption algorithm to use
+      --cipher-algorithm=<value>   [default: aes] Encryption algorithm to use (default: aes)
       --cipher-key=<value>         Encryption key for decrypting messages (hex-encoded)
-      --cipher-key-length=<value>  [default: 256] Length of encryption key in bits
-      --cipher-mode=<value>        [default: cbc] Cipher mode to use
+      --cipher-key-length=<value>  [default: 256] Length of encryption key in bits (default: 256)
+      --cipher-mode=<value>        [default: cbc] Cipher mode to use (default: cbc)
       --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.
       --delta                      Enable delta compression for messages
@@ -2324,7 +2065,8 @@ FLAGS
       --host=<value>               Override the host endpoint for all product API calls
       --json                       Output in JSON format
       --pretty-json                Output in colorized JSON format
-      --rewind=<value>             Number of messages to rewind when subscribing
+      --rewind=<value>             Number of messages to rewind when subscribing (default: 0)
+      --sequence-numbers           Include sequence numbers in output
       --token=<value>              Authenticate using an Ably Token or JWT Token instead of an API key
 
 DESCRIPTION
@@ -2356,15 +2098,14 @@ _See code: [src/commands/channels/subscribe.ts](https://github.com/ably/ably-cli
 
 ## `ably config`
 
-Open the Ably config file in the default text editor
+Manage Ably CLI configuration
 
 ```
 USAGE
   $ ably config [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
-    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [-e <value>]
+    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v]
 
 FLAGS
-  -e, --editor=<value>        Text editor to use (defaults to $EDITOR environment variable)
   -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
@@ -2378,51 +2119,28 @@ FLAGS
       --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
 
 DESCRIPTION
-  Open the Ably config file in the default text editor
-
-EXAMPLES
-  $ ably config edit
-```
-
-_See code: [src/commands/config.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/config.ts)_
-
-## `ably connections`
-
-Interact with Ably Pub/Sub connections
-
-```
-USAGE
-  $ ably connections
-
-DESCRIPTION
-  Interact with Ably Pub/Sub connections
+  Manage Ably CLI configuration
 
 EXAMPLES
-  $ ably connections stats
-
-  $ ably connections logs connections-lifecycle
+  $ ably config path
 
-  $ ably connections test
+  $ ably config show
 
 COMMANDS
-  ably connections logs         Alias for ably logs connection-lifecycle subscribe
-  ably connections stats        View connection statistics for an Ably app
-  ably connections test         Test connection to Ably
+  ably config path              Print the path to the Ably CLI config file
+  ably config show              Display the contents of the Ably CLI config file
 ```
 
-_See code: [src/commands/connections/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/connections/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 connections logs [TOPIC]`
+## `ably config path`
 
-Alias for ably logs connection-lifecycle subscribe
+Print the path to the Ably CLI config file
 
 ```
 USAGE
-  $ ably connections logs [TOPIC] [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
-    [--endpoint <value>] [--host <value>] [--pretty-json | --json] [--token <value>] [-v] [--rewind <value>]
-
-ARGUMENTS
-  TOPIC  [default: connections-lifecycle] Log topic to subscribe to (currently only connections-lifecycle is supported)
+  $ ably config path [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
+    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v]
 
 FLAGS
   -v, --verbose               Output verbose logs
@@ -2433,31 +2151,33 @@ FLAGS
       --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
-      --json                  Output results as JSON
+      --json                  Output in JSON format
       --pretty-json           Output in colorized JSON format
-      --rewind=<value>        Number of messages to rewind when subscribing
       --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
 
 DESCRIPTION
-  Alias for ably logs connection-lifecycle subscribe
+  Print the path to the Ably CLI config file
 
 EXAMPLES
-  $ ably connections logs connections-lifecycle
+  $ ably config path
+
+  # Open in your preferred editor:
 
-  $ ably connections logs connections-lifecycle --rewind 10
+  code $(ably config path)
+
+  vim $(ably config path)
 ```
 
-_See code: [src/commands/connections/logs.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/connections/logs.ts)_
+_See code: [src/commands/config/path.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/config/path.ts)_
 
-## `ably connections stats`
+## `ably config show`
 
-View connection statistics for an Ably app
+Display the contents of the Ably CLI config file
 
 ```
 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]
+  $ ably config show [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
+    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v]
 
 FLAGS
   -v, --verbose               Output verbose logs
@@ -2465,41 +2185,45 @@ FLAGS
       --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
+  Display the contents of the Ably CLI config file
 
 EXAMPLES
-  $ ably connections stats
+  $ ably config show
+
+  $ ably config show --json
+```
+
+_See code: [src/commands/config/show.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/config/show.ts)_
+
+## `ably connections`
 
-  $ ably connections stats --unit hour
+Interact with Ably Pub/Sub connections
 
-  $ ably connections stats --start 1618005600000 --end 1618091999999
+```
+USAGE
+  $ ably connections
 
-  $ ably connections stats --limit 10
+DESCRIPTION
+  Interact with Ably Pub/Sub connections
 
-  $ ably connections stats --json
+EXAMPLES
+  $ ably connections logs connections-lifecycle
 
-  $ ably connections stats --pretty-json
+  $ ably connections test
 
-  $ ably connections stats --live
+COMMANDS
+  ably connections test         Test connection to Ably
 ```
 
-_See code: [src/commands/connections/stats.ts](https://github.com/ably/ably-cli/blob/v0.15.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`
 
@@ -2581,10 +2305,10 @@ EXAMPLES
   $ ably integrations create
 
 COMMANDS
-  ably integrations create      Create an integration rule
-  ably integrations delete      Delete an integration rule
+  ably integrations create      Create an integration
+  ably integrations delete      Delete an integration
   ably integrations get         Get an integration rule by ID
-  ably integrations list        List all integration rules
+  ably integrations list        List all integrations
   ably integrations update      Update an integration rule
 ```
 
@@ -2592,7 +2316,7 @@ _See code: [src/commands/integrations/index.ts](https://github.com/ably/ably-cli
 
 ## `ably integrations create`
 
-Create an integration rule
+Create an integration
 
 ```
 USAGE
@@ -2606,7 +2330,7 @@ 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
-      --app=<value>             App ID or name to create the integration rule in
+      --app=<value>             App ID or name to create the integration in
       --channel-filter=<value>  Channel filter pattern
       --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.
@@ -2615,19 +2339,19 @@ FLAGS
       --host=<value>            Override the host endpoint for all product API calls
       --json                    Output in JSON format
       --pretty-json             Output in colorized JSON format
-      --request-mode=<option>   [default: single] Request mode for the rule
+      --request-mode=<option>   [default: single] Request mode for the integration (default: single)
                                 <options: single|batch>
-      --rule-type=<option>      (required) Type of integration rule (http, amqp, etc.)
+      --rule-type=<option>      (required) Type of integration (http, amqp, etc.)
                                 <options: http|amqp|kinesis|firehose|pulsar|kafka|azure|azure-functions|mqtt|cloudmqtt>
       --source-type=<option>    (required) The event source type
                                 <options: channel.message|channel.presence|channel.lifecycle|presence.message>
-      --status=<option>         [default: enabled] Initial status of the rule
+      --status=<option>         [default: enabled] Initial status of the integration (default: enabled)
                                 <options: enabled|disabled>
-      --target-url=<value>      Target URL for HTTP rules
+      --target-url=<value>      Target URL for HTTP integrations
       --token=<value>           Authenticate using an Ably Token or JWT Token instead of an API key
 
 DESCRIPTION
-  Create an integration rule
+  Create an integration
 
 EXAMPLES
   $ ably integrations create --rule-type "http" --source-type "channel.message" --target-url "https://example.com/webhook"
@@ -2637,24 +2361,24 @@ EXAMPLES
 
 _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 RULEID`
+## `ably integrations delete INTEGRATIONID`
 
-Delete an integration rule
+Delete an integration
 
 ```
 USAGE
-  $ ably integrations delete RULEID [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
-    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [--app <value>] [-f]
+  $ ably integrations delete INTEGRATIONID [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env
+    <value>] [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [--app <value>] [-f]
 
 ARGUMENTS
-  RULEID  The rule ID to delete
+  INTEGRATIONID  The integration ID to delete
 
 FLAGS
   -f, --force                 Force deletion without confirmation
   -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
-      --app=<value>           App ID or name to delete the integration rule from
+      --app=<value>           App ID or name to delete the integration from
       --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.
       --endpoint=<value>      Override the endpoint for all product API calls
@@ -2665,14 +2389,14 @@ FLAGS
       --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
 
 DESCRIPTION
-  Delete an integration rule
+  Delete an integration
 
 EXAMPLES
-  $ ably integrations delete rule123
+  $ ably integrations delete integration123
 
-  $ ably integrations delete rule123 --app "My App"
+  $ ably integrations delete integration123 --app "My App"
 
-  $ ably integrations delete rule123 --force
+  $ ably integrations delete integration123 --force
 ```
 
 _See code: [src/commands/integrations/delete.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/integrations/delete.ts)_
@@ -2718,7 +2442,7 @@ _See code: [src/commands/integrations/get.ts](https://github.com/ably/ably-cli/b
 
 ## `ably integrations list`
 
-List all integration rules
+List all integrations
 
 ```
 USAGE
@@ -2729,7 +2453,7 @@ 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
-      --app=<value>           App ID or name to list integration rules for
+      --app=<value>           App ID or name to list integrations for
       --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.
       --endpoint=<value>      Override the endpoint for all product API calls
@@ -2740,7 +2464,7 @@ FLAGS
       --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
 
 DESCRIPTION
-  List all integration rules
+  List all integrations
 
 EXAMPLES
   $ ably integrations list
@@ -2850,154 +2574,29 @@ DESCRIPTION
   Streaming and retrieving logs from Ably
 
 EXAMPLES
-  $ ably logs app subscribe
+  $ ably logs subscribe
 
-  $ ably logs app history
+  $ ably logs history
 
   $ ably logs channel-lifecycle subscribe
 
 COMMANDS
-  ably logs app                 Stream or retrieve logs from the app-wide meta channel [meta]log
   ably logs channel-lifecycle   Stream logs from [meta]channel.lifecycle meta channel
   ably logs connection-lifecycleStream logs from [meta]connection.lifecycle meta channel
+  ably logs history             Retrieve application log history
   ably logs push                Stream or retrieve push notification logs from [meta]log:push
+  ably logs subscribe           Subscribe to live app logs
 ```
 
 _See code: [src/commands/logs/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/logs/index.ts)_
 
-## `ably logs app`
-
-Stream or retrieve logs from the app-wide meta channel [meta]log
-
-```
-USAGE
-  $ ably logs app
-
-DESCRIPTION
-  Stream or retrieve logs from the app-wide meta channel [meta]log
-
-EXAMPLES
-  $ ably logs app subscribe
-
-  $ ably logs app subscribe --rewind 10
-
-  $ ably logs app history
-```
-
-_See code: [src/commands/logs/app/index.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/logs/app/index.ts)_
-
-## `ably logs app history`
-
-Retrieve application log history
-
-```
-USAGE
-  $ ably logs app history [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
-    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [--direction
-    backwards|forwards] [--limit <value>]
-
-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.
-      --direction=<option>    [default: backwards] Direction of log retrieval
-                              <options: backwards|forwards>
-      --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
-      --json                  Output in JSON format
-      --limit=<value>         [default: 100] Maximum number of logs to retrieve
-      --pretty-json           Output in colorized JSON format
-      --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
-
-DESCRIPTION
-  Retrieve application log history
-
-EXAMPLES
-  $ ably logs app history
-
-  $ ably logs app history --limit 20
-
-  $ ably logs app history --direction forwards
-
-  $ ably logs app history --json
-
-  $ ably logs app history --pretty-json
-```
-
-_See code: [src/commands/logs/app/history.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/logs/app/history.ts)_
-
-## `ably logs app subscribe`
-
-Subscribe to live app logs
-
-```
-USAGE
-  $ ably logs app subscribe [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
-    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [-D <value>] [--rewind
-    <value>] [--type channel.lifecycle|channel.occupancy|channel.presence|connection.lifecycle|push.publish]
-
-FLAGS
-  -D, --duration=<value>      Automatically exit after the given number of seconds (0 = run indefinitely)
-  -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.
-      --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
-      --json                  Output in JSON format
-      --pretty-json           Output in colorized JSON format
-      --rewind=<value>        Number of messages to rewind when subscribing
-      --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
-      --type=<option>         Filter by log type
-                              <options:
-                              channel.lifecycle|channel.occupancy|channel.presence|connection.lifecycle|push.publish>
-
-DESCRIPTION
-  Subscribe to live app logs
-
-EXAMPLES
-  $ ably logs app subscribe
-
-  $ ably logs app subscribe --rewind 10
-
-  $ ably logs app subscribe --type channel.lifecycle
-
-  $ ably logs app subscribe --json
-
-  $ ably logs app subscribe --pretty-json
-
-  $ ably logs app subscribe --duration 30
-```
-
-_See code: [src/commands/logs/app/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/logs/app/subscribe.ts)_
-
-## `ably logs channel-lifecycle`
+## `ably logs channel-lifecycle`
 
 Stream logs from [meta]channel.lifecycle meta channel
 
 ```
 USAGE
-  $ ably logs channel-lifecycle [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
-    [--endpoint <value>] [--host <value>] [--pretty-json | --json] [--token <value>] [-v] [--rewind <value>]
-
-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.
-      --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
-      --json                  Output results as JSON
-      --pretty-json           Output in colorized JSON format
-      --rewind=<value>        Number of messages to rewind when subscribing
-      --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
+  $ ably logs channel-lifecycle
 
 DESCRIPTION
   Stream logs from [meta]channel.lifecycle meta channel
@@ -3146,43 +2745,48 @@ EXAMPLES
 
 _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 connection subscribe`
+## `ably logs history`
 
-Subscribe to live connection logs
+Retrieve application log history
 
 ```
 USAGE
-  $ ably logs connection subscribe [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
-    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [-D <value>]
+  $ ably logs history [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
+    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [--direction
+    backwards|forwards] [--limit <value>]
 
 FLAGS
-  -D, --duration=<value>      Automatically exit after the given number of seconds (0 = run indefinitely)
   -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.
+      --direction=<option>    [default: backwards] Direction of log retrieval
+                              <options: backwards|forwards>
       --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
       --json                  Output in JSON format
+      --limit=<value>         [default: 100] Maximum number of logs to retrieve
       --pretty-json           Output in colorized JSON format
       --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
 
 DESCRIPTION
-  Subscribe to live connection logs
+  Retrieve application log history
 
 EXAMPLES
-  $ ably logs connection subscribe
+  $ ably logs history
+
+  $ ably logs history --limit 20
 
-  $ ably logs connection subscribe --json
+  $ ably logs history --direction forwards
 
-  $ ably logs connection subscribe --pretty-json
+  $ ably logs history --json
 
-  $ ably logs connection subscribe --duration 30
+  $ ably logs history --pretty-json
 ```
 
-_See code: [src/commands/logs/connection/subscribe.ts](https://github.com/ably/ably-cli/blob/v0.15.0/src/commands/logs/connection/subscribe.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`
 
@@ -3282,6 +2886,53 @@ EXAMPLES
 
 _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`
+
+Subscribe to live app logs
+
+```
+USAGE
+  $ ably logs subscribe [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
+    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [-D <value>] [--rewind
+    <value>] [--type channel.lifecycle|channel.occupancy|channel.presence|connection.lifecycle|push.publish]
+
+FLAGS
+  -D, --duration=<value>      Automatically exit after the given number of seconds (0 = run indefinitely)
+  -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.
+      --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
+      --json                  Output in JSON format
+      --pretty-json           Output in colorized JSON format
+      --rewind=<value>        Number of messages to rewind when subscribing
+      --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
+      --type=<option>         Filter by log type
+                              <options:
+                              channel.lifecycle|channel.occupancy|channel.presence|connection.lifecycle|push.publish>
+
+DESCRIPTION
+  Subscribe to live app logs
+
+EXAMPLES
+  $ ably logs subscribe
+
+  $ ably logs subscribe --rewind 10
+
+  $ ably logs subscribe --type channel.lifecycle
+
+  $ ably logs subscribe --json
+
+  $ ably logs subscribe --pretty-json
+
+  $ ably logs subscribe --duration 30
+```
+
+_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
@@ -3366,12 +3017,12 @@ FLAGS
       --env=<value>           Override the environment for all product API calls
       --host=<value>          Override the host endpoint for all product API calls
       --json                  Output in JSON format
-      --max-length=<value>    [default: 10000] Maximum number of messages in the queue
+      --max-length=<value>    [default: 10000] Maximum number of messages in the queue (default: 10000)
       --name=<value>          (required) Name of the queue
       --pretty-json           Output in colorized JSON format
-      --region=<value>        [default: us-east-1-a] Region for the queue
+      --region=<value>        [default: us-east-1-a] Region for the queue (default: us-east-1-a)
       --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
-      --ttl=<value>           [default: 60] Time to live for messages in seconds
+      --ttl=<value>           [default: 60] Time to live for messages in seconds (default: 60)
 
 DESCRIPTION
   Create a queue
@@ -3386,17 +3037,17 @@ EXAMPLES
 
 _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 QUEUENAME`
+## `ably queues delete QUEUEID`
 
 Delete a queue
 
 ```
 USAGE
-  $ ably queues delete QUEUENAME [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
+  $ ably queues delete QUEUEID [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
     [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [--app <value>] [-f]
 
 ARGUMENTS
-  QUEUENAME  Name of the queue to delete
+  QUEUEID  ID of the queue to delete
 
 FLAGS
   -f, --force                 Force deletion without confirmation
@@ -3417,11 +3068,11 @@ DESCRIPTION
   Delete a queue
 
 EXAMPLES
-  $ ably queues delete my-queue
+  $ ably queues delete appAbc:us-east-1-a:foo
 
-  $ ably queues delete my-queue --app "My App"
+  $ ably queues delete appAbc:us-east-1-a:foo --app "My App"
 
-  $ ably queues delete my-queue --force
+  $ 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.15.0/src/commands/queues/delete.ts)_
@@ -3511,7 +3162,7 @@ FLAGS
       --env=<value>           Override the environment for all product API calls
       --host=<value>          Override the host endpoint for all product API calls
       --json                  Output in JSON format
-      --limit=<value>         [default: 100] Maximum number of rooms to return
+      --limit=<value>         [default: 100] Maximum number of rooms to return (default: 100)
       --pretty-json           Output in colorized JSON format
       --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
 
@@ -3562,24 +3213,29 @@ Get historical messages from an Ably Chat room
 ```
 USAGE
   $ ably rooms messages history ROOM [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
-    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [-l <value>] [--show-metadata]
+    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [--end <value>] [-l <value>]
+    [--order oldestFirst|newestFirst] [--show-metadata] [--start <value>]
 
 ARGUMENTS
   ROOM  The room to get message history from
 
 FLAGS
-  -l, --limit=<value>         [default: 20] Maximum number of messages to retrieve
+  -l, --limit=<value>         [default: 50] Maximum number of messages to retrieve (default: 50)
   -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.
+      --end=<value>           End time for the history query (ISO 8601 format)
       --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
       --json                  Output in JSON format
+      --order=<option>        [default: newestFirst] Query direction: oldestFirst or newestFirst (default: newestFirst)
+                              <options: oldestFirst|newestFirst>
       --pretty-json           Output in colorized JSON format
       --show-metadata         Display message metadata if available
+      --start=<value>         Start time for the history query (ISO 8601 format)
       --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
 
 DESCRIPTION
@@ -3594,6 +3250,12 @@ EXAMPLES
 
   $ ably rooms messages history --show-metadata my-room
 
+  $ ably rooms messages history my-room --start "2025-01-01T00:00:00Z"
+
+  $ ably rooms messages history my-room --start "2025-01-01T00:00:00Z" --end "2025-01-02T00:00:00Z"
+
+  $ ably rooms messages history my-room --order newestFirst
+
   $ ably rooms messages history my-room --json
 
   $ ably rooms messages history my-room --pretty-json
@@ -3722,12 +3384,13 @@ Subscribe to message reactions in a chat room
 ```
 USAGE
   $ ably rooms messages reactions subscribe ROOM [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
-    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [--raw]
+    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [--raw] [-D <value>]
 
 ARGUMENTS
   ROOM  Room to subscribe to message reactions in
 
 FLAGS
+  -D, --duration=<value>      Automatically exit after the given number of seconds (0 = run indefinitely)
   -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
@@ -3771,7 +3434,7 @@ ARGUMENTS
   TEXT  The message text to send
 
 FLAGS
-  -c, --count=<value>         [default: 1] Number of messages to send
+  -c, --count=<value>         [default: 1] Number of messages to send (default: 1)
   -d, --delay=<value>         [default: 40] Delay between messages in milliseconds (default: 40ms, max 25 msgs/sec)
   -v, --verbose               Output verbose logs
       --access-token=<value>  Overrides any configured access token used for the Control API
@@ -3807,17 +3470,18 @@ EXAMPLES
 
 _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 ROOM`
+## `ably rooms messages subscribe ROOMS`
 
-Subscribe to messages in an Ably Chat room
+Subscribe to messages in one or more Ably Chat rooms
 
 ```
 USAGE
-  $ ably rooms messages subscribe ROOM [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
+  $ ably rooms messages subscribe ROOMS... [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
     [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [--show-metadata] [-D <value>]
+    [--sequence-numbers]
 
 ARGUMENTS
-  ROOM  The room to subscribe to messages from
+  ROOMS...  Room name(s) to subscribe to messages from
 
 FLAGS
   -D, --duration=<value>      Automatically exit after the given number of seconds (0 = run indefinitely)
@@ -3831,15 +3495,18 @@ FLAGS
       --host=<value>          Override the host endpoint for all product API calls
       --json                  Output in JSON format
       --pretty-json           Output in colorized JSON format
+      --sequence-numbers      Include sequence numbers in output
       --show-metadata         Display message metadata if available
       --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
 
 DESCRIPTION
-  Subscribe to messages in an Ably Chat room
+  Subscribe to messages in one or more Ably Chat rooms
 
 EXAMPLES
   $ ably rooms messages subscribe my-room
 
+  $ ably rooms messages subscribe room1 room2 room3
+
   $ ably rooms messages subscribe --api-key "YOUR_API_KEY" my-room
 
   $ ably rooms messages subscribe --show-metadata my-room
@@ -3919,12 +3586,13 @@ Subscribe to real-time occupancy metrics for a room
 ```
 USAGE
   $ ably rooms occupancy subscribe ROOM [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
-    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v]
+    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [-D <value>]
 
 ARGUMENTS
   ROOM  Room to subscribe to occupancy for
 
 FLAGS
+  -D, --duration=<value>      Automatically exit after the given number of seconds (0 = run indefinitely)
   -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
@@ -3977,7 +3645,7 @@ Enter presence in a chat room and remain present until terminated
 USAGE
   $ ably rooms presence enter ROOM [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
     [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [--show-others] [-D <value>]
-    [--data <value>]
+    [--data <value>] [--sequence-numbers]
 
 ARGUMENTS
   ROOM  Room to enter presence on
@@ -3995,7 +3663,8 @@ FLAGS
       --host=<value>          Override the host endpoint for all product API calls
       --json                  Output in JSON format
       --pretty-json           Output in colorized JSON format
-      --show-others           Show other presence events while present
+      --sequence-numbers      Include sequence numbers in output
+      --show-others           Show other presence events while present (default: false)
       --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
 
 DESCRIPTION
@@ -4006,6 +3675,8 @@ EXAMPLES
 
   $ ably rooms presence enter my-room --data '{"name":"User","status":"active"}'
 
+  $ ably rooms presence enter my-room --show-others
+
   $ ably rooms presence enter my-room --duration 30
 ```
 
@@ -4118,12 +3789,13 @@ Subscribe to reactions in a chat room
 ```
 USAGE
   $ ably rooms reactions subscribe ROOM [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
-    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v]
+    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [-D <value>]
 
 ARGUMENTS
   ROOM  Room to subscribe to reactions in
 
 FLAGS
+  -D, --duration=<value>      Automatically exit after the given number of seconds (0 = run indefinitely)
   -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
@@ -4218,12 +3890,13 @@ Subscribe to typing indicators in an Ably Chat room
 ```
 USAGE
   $ ably rooms typing subscribe ROOM [--access-token <value>] [--api-key <value>] [--client-id <value>] [--env <value>]
-    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v]
+    [--endpoint <value>] [--host <value>] [--json | --pretty-json] [--token <value>] [-v] [-D <value>]
 
 ARGUMENTS
   ROOM  The room to subscribe to typing indicators from
 
 FLAGS
+  -D, --duration=<value>      Automatically exit after the given number of seconds (0 = run indefinitely)
   -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
@@ -4459,7 +4132,7 @@ FLAGS
       --env=<value>           Override the environment for all product API calls
       --host=<value>          Override the host endpoint for all product API calls
       --json                  Output in JSON format
-      --limit=<value>         [default: 100] Maximum number of spaces to return
+      --limit=<value>         [default: 100] Maximum number of spaces to return (default: 100)
       --pretty-json           Output in colorized JSON format
       --token=<value>         Authenticate using an Ably Token or JWT Token instead of an API key
 
@@ -4908,6 +4581,154 @@ EXAMPLES
 
 _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`
 
 Check the status of the Ably service
diff --git a/docs/Product-Requirements.md b/docs/Product-Requirements.md
index 98130793..ffc0a9bb 100644
--- a/docs/Product-Requirements.md
+++ b/docs/Product-Requirements.md
@@ -34,7 +34,6 @@ The CLI uses topics (space-separated) to group related commands logically.
 - `$ ably accounts list`: Lists locally configured accounts (aliases, token details, user info, account details).
 - `$ ably accounts logout [ALIAS]`: Removes the access token and associated data for the specified (or default) account after warning.
 - `$ ably accounts current`: Shows the currently selected account (alias or `default`) and verifies the token against the Control API `/me` endpoint.
-- `$ ably accounts stats`: Views account stats. Supports `--live` for polling key metrics (peak connections, channels, message throughput, etc.).
 - `$ ably accounts switch [ALIAS]`: Switches the active account configuration to the specified alias or prompts for selection.
 
 **App Management (`ably apps`)**
@@ -45,7 +44,6 @@ The CLI uses topics (space-separated) to group related commands logically.
 - `$ ably apps update ID`: Updates the app specified by `ID`. Supports `--name`, `--tls-only`.
 - `$ ably apps delete [ID]`: Deletes the specified (or current) app after confirmation. Supports `--force`.
 - `$ ably apps set-apns-p12 ID`: Uploads an APNS P12 certificate for the specified app `ID`. Requires `--certificate`. Supports `--password`, `--use-for-sandbox`.
-- `$ ably apps stats [ID]`: Views app stats for the specified (or current) app. Supports `--live` polling, `--unit`, `--start`, `--end`, `--limit`.
 - `$ ably apps switch [APPID]`: Switches the active app configuration to the specified App ID or prompts for selection.
 - `$ ably apps current`: Shows the currently selected app configuration.
 
@@ -92,7 +90,6 @@ The CLI uses topics (space-separated) to group related commands logically.
 **Connections (`ably connections`)**
 *(Interact with Pub/Sub connections)*
 
-- `$ ably connections stats`: Shows connection stats (similar to `ably apps stats` but connection-focused). Supports `--live`.
 - `$ ably connections test`: Performs a simple connection test. Supports transport options.
 - `$ ably connections logs [TOPIC]`: Alias for `ably logs connection-lifecycle subscribe`. (Currently only supports `connection-lifecycle`).
 
@@ -157,6 +154,12 @@ The CLI uses topics (space-separated) to group related commands logically.
 - `$ ably queues create`: Creates a queue. Requires various flags.
 - `$ ably queues delete QUEUENAME`: Deletes a queue after confirmation. Supports `--force`.
 
+**Statistics (`ably stats`)**
+*(View usage statistics for accounts and apps)*
+
+- `$ ably stats account`: Views account stats. Supports `--live` for polling key metrics (peak connections, channels, message throughput, etc.), `--unit`, `--start`, `--end`, `--limit`.
+- `$ ably stats app [ID]`: Views app stats for the specified (or current) app. Supports `--live` polling, `--unit`, `--start`, `--end`, `--limit`.
+
 **Benchmarking (`ably bench`)**
 *(Run benchmark tests)*
 
@@ -315,7 +318,7 @@ The `AblyCliTerminal` React component can optionally support a split-screen mode
     - Uses a distinct client ID prefix (`ably-mcp-`).
 - **Available MCP Commands (Subset of CLI)**:
     - `ably apps list`
-    - `ably apps stats`
+    - `ably stats app`
     - `ably auth keys list`
     - `ably channels history`
     - `ably channels publish`
diff --git a/docs/TODO.md b/docs/TODO.md
index 086d9c5b..98043896 100644
--- a/docs/TODO.md
+++ b/docs/TODO.md
@@ -72,7 +72,11 @@
     - [ ] Test app update with partial data
     - [ ] Test P12 certificate file upload handling
     - [ ] Test failure scenarios: duplicate app names, API error mapping
-  - [ ] `apps stats`: Mock Control API calls, flag handling, output formats.
+- [ ] **Stats:**
+  - [ ] `stats account`: Mock Control API calls, flag handling, output formats.
+    - [ ] Test stats parsing and formatting for different time ranges
+    - [ ] Test --live polling functionality with mocked responses
+  - [ ] `stats app`: Mock Control API calls, flag handling, output formats.
     - [ ] Test stats parsing and formatting for different time ranges
     - [ ] Test --live polling functionality with mocked responses
   - [ ] `apps logs history/subscribe`: Mock Control API/SDK, flag handling, output formats, SIGINT handling.
@@ -107,9 +111,6 @@
 - [ ] **Channel Rules (Legacy):**
   - [ ] `channel-rule create/list/update/delete`: Mock Control API calls, flag handling, output formats. (Verify necessity).
 - [ ] **Connections:**
-  - [ ] `connections stats`: Mock REST API call, flag handling, output formats.
-    - [ ] Test different stat aggregation periods
-    - [ ] Test connection types filtering
   - [ ] `connections test`: Mock SDK connection attempts, flag handling, output formats.
     - [ ] Test different transport options (WebSockets, HTTP)
     - [ ] Test environment selection
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 89%
rename from src/commands/accounts/stats/index.ts
rename to src/commands/stats/account.ts
index a4ca55dd..73c6007f 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") {
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/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..a1fdb9e5
--- /dev/null
+++ b/test/e2e/stats/stats.test.ts
@@ -0,0 +1,969 @@
+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",
+          );
+
+          if (SKIP_ACCOUNT_STATS) return;
+
+          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");
+
+          if (SKIP_ACCOUNT_STATS) return;
+
+          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");
+
+          if (SKIP_ACCOUNT_STATS) return;
+
+          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");
+
+          if (SKIP_ACCOUNT_STATS) return;
+
+          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");
+
+          if (SKIP_ACCOUNT_STATS) return;
+
+          const result = await runCommand(
+            [
+              "stats",
+              "account",
+              "--json",
+              "--limit",
+              "1",
+              "--access-token",
+              E2E_ACCESS_TOKEN!,
+            ],
+            {
+              timeoutMs: 60000,
+            },
+          );
+
+          expect(result.exitCode).toBe(0);
+
+          // Verify output is valid JSON or contains "No stats found"
+          const hasNoStats = result.stdout.includes("No stats found");
+          const hasValidJson = result.stdout.trim().length > 0;
+          expect(hasNoStats || hasValidJson).toBe(true);
+
+          // If there's JSON output, verify it's parseable
+          const lines = result.stdout.trim().split("\n");
+          const jsonLines = lines.filter((line) => line.trim().startsWith("{"));
+          // Verify all JSON lines are valid
+          expect(
+            jsonLines.every((line) => {
+              try {
+                JSON.parse(line.trim());
+                return true;
+              } catch {
+                return false;
+              }
+            }),
+          ).toBe(true);
+        },
+      );
+
+      it(
+        "should output account stats in pretty JSON format",
+        { timeout: 60000 },
+        async () => {
+          setupTestFailureHandler(
+            "should output account stats in pretty JSON format",
+          );
+
+          if (SKIP_ACCOUNT_STATS) return;
+
+          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",
+          );
+
+          if (SKIP_ACCOUNT_STATS) return;
+
+          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",
+          );
+
+          if (SKIP_ACCOUNT_STATS) return;
+
+          // Get an app ID first if we have 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");
+
+          if (SHOULD_SKIP_E2E) return;
+
+          // stats app command uses Control API which requires an access token
+          if (!E2E_ACCESS_TOKEN) {
+            console.log(
+              "Skipping app stats test: E2E_ABLY_ACCESS_TOKEN not available",
+            );
+            return;
+          }
+
+          // 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 (SHOULD_SKIP_E2E) return;
+
+          // stats app command uses Control API which requires an access token
+          if (!E2E_ACCESS_TOKEN) {
+            console.log(
+              "Skipping app stats test: E2E_ABLY_ACCESS_TOKEN not available",
+            );
+            return;
+          }
+
+          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 (SHOULD_SKIP_E2E) return;
+
+          // stats app command uses Control API which requires an access token
+          if (!E2E_ACCESS_TOKEN) {
+            console.log(
+              "Skipping app stats test: E2E_ABLY_ACCESS_TOKEN not available",
+            );
+            return;
+          }
+
+          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 (SHOULD_SKIP_E2E) return;
+
+        // stats app command uses Control API which requires an access token
+        if (!E2E_ACCESS_TOKEN) {
+          console.log(
+            "Skipping app stats test: E2E_ABLY_ACCESS_TOKEN not available",
+          );
+          return;
+        }
+
+        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 (SHOULD_SKIP_E2E) return;
+
+          // stats app command uses Control API which requires an access token
+          if (!E2E_ACCESS_TOKEN) {
+            console.log(
+              "Skipping app stats test: E2E_ABLY_ACCESS_TOKEN not available",
+            );
+            return;
+          }
+
+          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);
+
+          // Verify output is valid JSON or contains "No stats found"
+          const hasNoStats = result.stdout.includes("No stats found");
+          const hasValidJson = result.stdout.trim().length > 0;
+          expect(hasNoStats || hasValidJson).toBe(true);
+
+          // If there's JSON output, verify it's parseable
+          const lines = result.stdout.trim().split("\n");
+          const jsonLines = lines.filter((line) => line.trim().startsWith("{"));
+          // Verify all JSON lines are valid
+          expect(
+            jsonLines.every((line) => {
+              try {
+                JSON.parse(line.trim());
+                return true;
+              } catch {
+                return false;
+              }
+            }),
+          ).toBe(true);
+        },
+      );
+
+      it(
+        "should output app stats in pretty JSON format",
+        { timeout: 60000 },
+        async () => {
+          setupTestFailureHandler(
+            "should output app stats in pretty JSON format",
+          );
+
+          if (SHOULD_SKIP_E2E) return;
+
+          // stats app command uses Control API which requires an access token
+          if (!E2E_ACCESS_TOKEN) {
+            console.log(
+              "Skipping app stats test: E2E_ABLY_ACCESS_TOKEN not available",
+            );
+            return;
+          }
+
+          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 (SHOULD_SKIP_E2E) return;
+
+          // stats app command uses Control API which requires an access token
+          if (!E2E_ACCESS_TOKEN) {
+            console.log(
+              "Skipping live stats test: E2E_ABLY_ACCESS_TOKEN not available",
+            );
+            return;
+          }
+
+          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",
+          );
+
+          if (SHOULD_SKIP_E2E || SKIP_ACCOUNT_STATS) return;
+
+          // stats account uses Control API which requires an access token
+          const authArgs = E2E_ACCESS_TOKEN
+            ? ["--access-token", E2E_ACCESS_TOKEN]
+            : [];
+          const envOpts = E2E_ACCESS_TOKEN
+            ? { ABLY_ACCESS_TOKEN: E2E_ACCESS_TOKEN }
+            : {};
+
+          const result = await runCommand(
+            ["stats", "account", "--unit", "invalid", ...authArgs],
+            {
+              timeoutMs: 30000,
+              env: envOpts,
+            },
+          );
+
+          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",
+          );
+
+          if (SHOULD_SKIP_E2E || SKIP_ACCOUNT_STATS) return;
+
+          // stats account uses Control API which requires an access token
+          const authArgs = E2E_ACCESS_TOKEN
+            ? ["--access-token", E2E_ACCESS_TOKEN]
+            : [];
+          const envOpts = E2E_ACCESS_TOKEN
+            ? { ABLY_ACCESS_TOKEN: E2E_ACCESS_TOKEN }
+            : {};
+
+          const result = await runCommand(
+            ["stats", "account", "--start", "not-a-timestamp", ...authArgs],
+            {
+              timeoutMs: 30000,
+              env: envOpts,
+            },
+          );
+
+          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",
+          );
+
+          if (SHOULD_SKIP_E2E) return;
+
+          // stats app command uses Control API which requires an access token
+          if (!E2E_ACCESS_TOKEN) {
+            console.log(
+              "Skipping app stats test: E2E_ABLY_ACCESS_TOKEN not available",
+            );
+            return;
+          }
+
+          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",
+          );
+
+          if (SKIP_ACCOUNT_STATS) return;
+
+          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 (SHOULD_SKIP_E2E) return;
+
+          // stats app command uses Control API which requires an access token
+          if (!E2E_ACCESS_TOKEN) {
+            console.log(
+              "Skipping app stats test: E2E_ABLY_ACCESS_TOKEN not available",
+            );
+            return;
+          }
+
+          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",
+          );
+
+          if (SKIP_ACCOUNT_STATS) return;
+
+          // 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",
+          );
+
+          if (SKIP_ACCOUNT_STATS) return;
+
+          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",
+          );
+
+          if (SKIP_ACCOUNT_STATS) return;
+
+          // 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",
+          );
+
+          if (SKIP_ACCOUNT_STATS) return;
+
+          // 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/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}`);