diff --git a/.claude/CLAUDE.md b/.claude/CLAUDE.md
index b0e3bfe7..d75cf666 100644
--- a/.claude/CLAUDE.md
+++ b/.claude/CLAUDE.md
@@ -50,6 +50,7 @@ cat .cursor/rules/AI-Assistance.mdc
 5. **Remove tests without asking** - Always get permission first
 6. **NODE_ENV** - To check if the CLI is in test mode, use the `isTestMode()` helper function.
 7. **`process.exit`** - When creating a command, use `this.exit()` for consistent test mode handling.
+8. **`console.log` / `console.error`** - In commands, always use `this.log()` (stdout) and `this.logToStderr()` (stderr). `console.*` bypasses oclif and can't be captured by tests.
 
 ## ✅ Correct Practices
 
@@ -204,6 +205,46 @@ If this is part of a workspace, there may be:
 
 But focus on THIS project unless specifically asked about others.
 
+## CLI Output & Flag Conventions
+
+### Output patterns (use helpers from src/utils/output.ts)
+- **Progress**: `progress("Attaching to channel: " + resource(name))` — no color on action text, `progress()` appends `...` automatically. Never manually write `"Doing something..."` — always use `progress("Doing something")`.
+- **Success**: `success("Message published to channel " + resource(name) + ".")` — green ✓, **must** end with `.` (not `!`). Never use `chalk.green("✓ ...")` directly — always use the `success()` helper.
+- **Listening**: `listening("Listening for messages.")` — dim, includes "Press Ctrl+C to exit." Don't combine listening text inside a `success()` call — use a separate `listening()` call.
+- **Resource names**: Always `resource(name)` (cyan), never quoted — including in `logCliEvent` messages.
+- **Timestamps**: `formatTimestamp(ts)` — dim `[timestamp]` for event streams. Exported as `formatTimestamp` to avoid clashing with local `timestamp` variables.
+- **JSON guard**: All human-readable output (progress, success, listening messages) must be wrapped in `if (!this.shouldOutputJson(flags))` so it doesn't pollute `--json` output. Only JSON payloads should be emitted when `--json` is active.
+
+### Additional output patterns (direct chalk, not helpers)
+- **Secondary labels**: `chalk.dim("Label:")` — for field names in structured output (e.g., `${chalk.dim("Profile:")} ${value}`)
+- **Client IDs**: `chalk.blue(clientId)` — for user/client identifiers in events
+- **Event types**: `chalk.yellow(eventType)` — for action/event type labels
+- **Warnings**: `chalk.yellow("Warning: ...")` — for non-fatal warnings
+- **Errors**: Use `this.error()` (oclif standard) for fatal errors, not `this.log(chalk.red(...))`
+- **No app error**: `'No app specified. Use --app flag or select an app with "ably apps switch"'`
+
+### Help output theme
+Help colors are configured via `package.json > oclif.theme` (oclif's built-in theme system). The custom help class in `src/help.ts` also applies colors to COMMANDS sections it builds manually. Color scheme:
+- **Commands/bin/topics**: cyan — primary actionable items
+- **Flags/args**: whiteBright — bright but secondary to commands
+- **Section headers**: bold — USAGE, FLAGS, COMMANDS, etc.
+- **Command summaries**: whiteBright — descriptions in command listings
+- **Defaults/options**: yellow — `[default: N]`, `<options: ...>`
+- **Required flags**: red — `(required)` marker
+- **`$` prompt**: green — shell prompt in examples/usage
+- **Flag separator**: dim — comma between `-c, --count`
+
+When adding COMMANDS sections in `src/help.ts`, use `chalk.bold()` for headers, `chalk.cyan()` for command names, and `chalk.whiteBright()` for descriptions to stay consistent.
+
+### Flag conventions
+- All flags kebab-case: `--my-flag` (never camelCase)
+- `--app`: `"The app ID or name (defaults to current app)"` (for commands with `resolveAppId`), `"The app ID (defaults to current app)"` (for commands without)
+- `--limit`: `"Maximum number of results to return (default: N)"`
+- `--duration`: `"Automatically exit after N seconds (0 = run indefinitely)"`, alias `-D`
+- `--rewind`: `"Number of messages to rewind when subscribing (default: 0)"`
+- Channels use "publish", Rooms use "send" (matches SDK terminology)
+- Command descriptions: imperative mood, sentence case, no trailing period (e.g., `"Subscribe to presence events on a channel"`)
+
 ## ✓ Before Marking Complete
 
 - [ ] `pnpm prepare` succeeds
diff --git a/.cursor/rules/AI-Assistance.mdc b/.cursor/rules/AI-Assistance.mdc
index 7b71bbc7..846ad710 100644
--- a/.cursor/rules/AI-Assistance.mdc
+++ b/.cursor/rules/AI-Assistance.mdc
@@ -109,6 +109,32 @@ This document provides guidance for AI assistants working with the Ably CLI code
    const url = `https://${controlHost}/v1/apps`
    ```
 
+## CLI Output & Flag Conventions
+
+### Output patterns (use helpers from src/utils/output.ts)
+- **Progress**: `progress("Attaching to channel: " + resource(name))` — no color on action text, ends with `...`
+- **Success**: `success("Message published to channel " + resource(name) + ".")` — green ✓, ends with `.`
+- **Listening**: `listening("Listening for messages.")` — dim, includes "Press Ctrl+C to exit."
+- **Resource names**: Always `resource(name)` (cyan), never quoted
+- **Timestamps**: `formatTimestamp(ts)` — dim `[timestamp]` for event streams. Import as `formatTimestamp` to avoid clashing with local `timestamp` variables.
+
+### Additional output patterns (direct chalk, not helpers)
+- **Secondary labels**: `chalk.dim("Label:")` — for field names in structured output (e.g., `${chalk.dim("Profile:")} ${value}`)
+- **Client IDs**: `chalk.blue(clientId)` — for user/client identifiers in events
+- **Event types**: `chalk.yellow(eventType)` — for action/event type labels
+- **Warnings**: `chalk.yellow("Warning: ...")` — for non-fatal warnings
+- **Errors**: Use `this.error()` (oclif standard) for fatal errors, not `this.log(chalk.red(...))`
+- **No app error**: `'No app specified. Use --app flag or select an app with "ably apps switch"'`
+
+### Flag conventions
+- All flags kebab-case: `--my-flag` (never camelCase)
+- `--app`: `"The app ID or name (defaults to current app)"` (for commands with `resolveAppId`), `"The app ID (defaults to current app)"` (for commands without)
+- `--limit`: `"Maximum number of results to return (default: N)"`
+- `--duration`: `"Automatically exit after N seconds (0 = run indefinitely)"`, alias `-D`
+- `--rewind`: `"Number of messages to rewind when subscribing (default: 0)"`
+- Channels use "publish", Rooms use "send" (matches SDK terminology)
+- Command descriptions: imperative mood, sentence case, no trailing period (e.g., `"Subscribe to presence events on a channel"`)
+
 ## Effective Testing
 
 1. **Mocking Ably SDK Example**:
diff --git a/README.md b/README.md
index 252f88e0..c253aa4e 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,6 @@
 * [CLI Usage](#cli-usage)
 * [Commands](#commands)
 * [Contributing](#contributing)
-* [or](#or)
 <!-- tocstop -->
 
 # CLI Usage
@@ -218,11 +217,11 @@ EXAMPLES
   $ ably accounts switch my-account
 
 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 switch          Switch to a different Ably account
+  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 switch   Switch to a different Ably account
 ```
 
 _See code: [src/commands/accounts/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/accounts/index.ts)_
@@ -402,14 +401,14 @@ EXAMPLES
   $ ably apps switch my-app
 
 COMMANDS
-  ably apps channel-rules       Manage Ably channel rules (namespaces)
-  ably apps create              Create a new app
-  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 set-apns-p12        Upload Apple Push Notification Service P12 certificate for an app
-  ably apps switch              Switch to a different Ably app
-  ably apps update              Update an app
+  ably apps channel-rules  Manage Ably channel rules (namespaces)
+  ably apps create         Create a new app
+  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 set-apns-p12   Upload Apple Push Notification Service P12 certificate for an app
+  ably apps switch         Switch to a different Ably app
+  ably apps update         Update an app
 ```
 
 _See code: [src/commands/apps/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/apps/index.ts)_
@@ -450,7 +449,7 @@ USAGE
 
 FLAGS
   -v, --verbose                      Output verbose logs
-      --app=<value>                  App ID or name to create the channel rule in
+      --app=<value>                  The app ID or name (defaults to current app)
       --authenticated                Whether channels matching this rule require clients to be authenticated
       --batching-enabled             Whether to enable batching for messages on channels matching this rule
       --batching-interval=<value>    The batching interval for messages on channels matching this rule
@@ -494,7 +493,7 @@ ARGUMENTS
 FLAGS
   -f, --force        Force deletion without confirmation
   -v, --verbose      Output verbose logs
-      --app=<value>  App ID or name to delete the channel rule from
+      --app=<value>  The app ID or name (defaults to current app)
       --json         Output in JSON format
       --pretty-json  Output in colorized JSON format
 
@@ -521,7 +520,10 @@ List channel rules for an app
 
 ```
 USAGE
-  $ ably apps channel-rules list
+  $ ably apps channel-rules list [--app <value>]
+
+FLAGS
+  --app=<value>  The app ID or name (defaults to current app)
 
 DESCRIPTION
   List channel rules for an app
@@ -529,7 +531,7 @@ DESCRIPTION
 EXAMPLES
   $ ably apps:channel-rules:list
 
-  $ ably apps:channel-rules:list --app-id my-app-id
+  $ ably apps:channel-rules:list --app my-app-id
 
   $ ably apps:channel-rules:list --json
 
@@ -554,7 +556,7 @@ ARGUMENTS
 
 FLAGS
   -v, --verbose                         Output verbose logs
-      --app=<value>                     App ID or name to update the channel rule in
+      --app=<value>                     The app ID or name (defaults to current app)
       --[no-]authenticated              Whether channels matching this rule require clients to be authenticated
       --[no-]batching-enabled           Whether to enable batching for messages on channels matching this rule
       --batching-interval=<value>       The batching interval for messages on channels matching this rule
@@ -651,7 +653,7 @@ ARGUMENTS
 FLAGS
   -f, --force        Skip confirmation prompt
   -v, --verbose      Output verbose logs
-      --app=<value>  App ID to delete (overrides argument and current app)
+      --app=<value>  The app ID or name (defaults to current app)
       --json         Output in JSON format
       --pretty-json  Output in colorized JSON format
 
@@ -814,17 +816,17 @@ EXAMPLES
   $ ably auth issue-ably-token
 
 COMMANDS
-  ably auth issue-ably-token    Creates an Ably Token with capabilities
-  ably auth issue-jwt-token     Creates an Ably JWT token with capabilities
-  ably auth keys                Key management commands
-  ably auth revoke-token        Revokes the token provided
+  ably auth issue-ably-token  Create an Ably Token with capabilities
+  ably auth issue-jwt-token   Create an Ably JWT token with capabilities
+  ably auth keys              Key management commands
+  ably auth revoke-token      Revoke a token
 ```
 
 _See code: [src/commands/auth/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/auth/index.ts)_
 
 ## `ably auth issue-ably-token`
 
-Creates an Ably Token with capabilities
+Create an Ably Token with capabilities
 
 ```
 USAGE
@@ -833,7 +835,7 @@ USAGE
 
 FLAGS
   -v, --verbose             Output verbose logs
-      --app=<value>         App ID to use (uses current app if not specified)
+      --app=<value>         The app ID or name (defaults to current app)
       --capability=<value>  [default: {"*":["*"]}] Capabilities JSON string (e.g. {"channel":["publish","subscribe"]})
       --client-id=<value>   Client ID to associate with the token. Use "none" to explicitly issue a token with no client
                             ID, otherwise a default will be generated.
@@ -843,7 +845,7 @@ FLAGS
       --ttl=<value>         [default: 3600] Time to live in seconds (default: 3600, 1 hour)
 
 DESCRIPTION
-  Creates an Ably Token with capabilities
+  Create an Ably Token with capabilities
 
 EXAMPLES
   $ ably auth issue-ably-token
@@ -869,7 +871,7 @@ _See code: [src/commands/auth/issue-ably-token.ts](https://github.com/ably/ably-
 
 ## `ably auth issue-jwt-token`
 
-Creates an Ably JWT token with capabilities
+Create an Ably JWT token with capabilities
 
 ```
 USAGE
@@ -878,7 +880,7 @@ USAGE
 
 FLAGS
   -v, --verbose             Output verbose logs
-      --app=<value>         App ID to use (uses current app if not specified)
+      --app=<value>         The app ID or name (defaults to current app)
       --capability=<value>  [default: {"*":["*"]}] Capabilities JSON string (e.g. {"channel":["publish","subscribe"]})
       --client-id=<value>   Client ID to associate with the token. Use "none" to explicitly issue a token with no client
                             ID, otherwise a default will be generated.
@@ -888,7 +890,7 @@ FLAGS
       --ttl=<value>         [default: 3600] Time to live in seconds (default: 3600, 1 hour)
 
 DESCRIPTION
-  Creates an Ably JWT token with capabilities
+  Create an Ably JWT token with capabilities
 
 EXAMPLES
   $ ably auth issue-jwt-token
@@ -947,7 +949,7 @@ USAGE
 
 FLAGS
   -v, --verbose               Output verbose logs
-      --app=<value>           App ID the key belongs to (uses current app if not specified)
+      --app=<value>           The app ID or name (defaults to current app)
       --capabilities=<value>  [default: {"*":["*"]}] Capability object as a JSON string. Example:
                               '{"channel:*":["publish"]}'
       --json                  Output in JSON format
@@ -989,7 +991,7 @@ USAGE
 
 FLAGS
   -v, --verbose      Output verbose logs
-      --app=<value>  App ID to check key for (uses current app if not specified)
+      --app=<value>  The app ID (defaults to current app)
       --json         Output in JSON format
       --pretty-json  Output in colorized JSON format
 
@@ -1017,11 +1019,11 @@ USAGE
   $ ably auth keys get KEYNAMEORVALUE [-v] [--json | --pretty-json] [--app <value>]
 
 ARGUMENTS
-  KEYNAMEORVALUE  Key name (APP_ID.KEY_ID) or full value of the key to get details for
+  KEYNAMEORVALUE  Key name (APP_ID.KEY_ID), key ID, key label (e.g. Root), or full key value to get details for
 
 FLAGS
   -v, --verbose      Output verbose logs
-      --app=<value>  App ID the key belongs to (uses current app if not specified)
+      --app=<value>  The app ID or name (defaults to current app)
       --json         Output in JSON format
       --pretty-json  Output in colorized JSON format
 
@@ -1031,11 +1033,11 @@ DESCRIPTION
 EXAMPLES
   $ ably auth keys get APP_ID.KEY_ID
 
+  $ ably auth keys get Root --app APP_ID
+
   $ ably auth keys get KEY_ID --app APP_ID
 
   $ ably auth keys get APP_ID.KEY_ID --json
-
-  $ ably auth keys get APP_ID.KEY_ID --pretty-json
 ```
 
 _See code: [src/commands/auth/keys/get.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/auth/keys/get.ts)_
@@ -1050,7 +1052,7 @@ USAGE
 
 FLAGS
   -v, --verbose      Output verbose logs
-      --app=<value>  App ID to list keys for (uses current app if not specified)
+      --app=<value>  The app ID (defaults to current app)
       --json         Output in JSON format
       --pretty-json  Output in colorized JSON format
 
@@ -1082,7 +1084,7 @@ ARGUMENTS
 
 FLAGS
   -v, --verbose      Output verbose logs
-      --app=<value>  App ID the key belongs to (uses current app if not specified)
+      --app=<value>  The app ID (defaults to current app)
       --force        Skip confirmation prompt
       --json         Output in JSON format
       --pretty-json  Output in colorized JSON format
@@ -1117,7 +1119,7 @@ ARGUMENTS
 
 FLAGS
   -v, --verbose      Output verbose logs
-      --app=<value>  App ID to switch keys for (uses current app if not specified)
+      --app=<value>  The app ID or name (defaults to current app)
       --json         Output in JSON format
       --pretty-json  Output in colorized JSON format
 
@@ -1148,7 +1150,7 @@ ARGUMENTS
 
 FLAGS
   -v, --verbose               Output verbose logs
-      --app=<value>           App ID the key belongs to (uses current app if not specified)
+      --app=<value>           The app ID (defaults to current app)
       --capabilities=<value>  New capabilities for the key (comma-separated list)
       --json                  Output in JSON format
       --name=<value>          New name for the key
@@ -1169,7 +1171,7 @@ _See code: [src/commands/auth/keys/update.ts](https://github.com/ably/ably-cli/b
 
 ## `ably auth revoke-token TOKEN`
 
-Revokes the token provided
+Revoke a token
 
 ```
 USAGE
@@ -1181,13 +1183,13 @@ ARGUMENTS
 FLAGS
   -c, --client-id=<value>  Client ID to revoke tokens for
   -v, --verbose            Output verbose logs
-      --app=<value>        App ID to use (uses current app if not specified)
+      --app=<value>        The app ID or name (defaults to current app)
       --debug              Show debug information
       --json               Output in JSON format
       --pretty-json        Output in colorized JSON format
 
 DESCRIPTION
-  Revokes the token provided
+  Revoke a token
 
 EXAMPLES
   $ ably auth revoke-token TOKEN
@@ -1249,8 +1251,8 @@ EXAMPLES
   $ ably bench subscriber my-channel
 
 COMMANDS
-  ably bench publisher          Run a publisher benchmark test
-  ably bench subscriber         Run a subscriber benchmark test
+  ably bench publisher   Run a publisher benchmark test
+  ably bench subscriber  Run a subscriber benchmark test
 ```
 
 _See code: [src/commands/bench/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/bench/index.ts)_
@@ -1297,13 +1299,13 @@ Run a subscriber benchmark test
 
 ```
 USAGE
-  $ ably bench subscriber CHANNEL [-v] [--json | --pretty-json] [-d <value>]
+  $ ably bench subscriber CHANNEL [-v] [--json | --pretty-json] [-D <value>]
 
 ARGUMENTS
   CHANNEL  The channel name to subscribe to
 
 FLAGS
-  -d, --duration=<value>  Duration to subscribe for in seconds (default: indefinite until Ctrl+C)
+  -D, --duration=<value>  Automatically exit after N seconds (0 = run indefinitely)
   -v, --verbose           Output verbose logs
       --json              Output in JSON format
       --pretty-json       Output in colorized JSON format
@@ -1336,14 +1338,14 @@ EXAMPLES
   $ ably channels list
 
 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 inspect         Open the Ably dashboard to inspect a specific channel
-  ably channels list            List active channels using the channel enumeration API
-  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
-  ably channels subscribe       Subscribe to messages published on one or more Ably channels
+  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 inspect        Open the Ably dashboard to inspect a specific channel
+  ably channels list           List active channels using the channel enumeration API
+  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
+  ably channels subscribe      Subscribe to messages published on one or more Ably channels
 ```
 
 _See code: [src/commands/channels/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/channels/index.ts)_
@@ -1412,7 +1414,7 @@ FLAGS
                             <options: backwards|forwards>
       --end=<value>         End time for the history query (ISO 8601 format)
       --json                Output in JSON format
-      --limit=<value>       [default: 50] Maximum number of messages to retrieve (default: 50)
+      --limit=<value>       [default: 50] Maximum number of results to return (default: 50)
       --pretty-json         Output in colorized JSON format
       --start=<value>       Start time for the history query (ISO 8601 format)
 
@@ -1448,7 +1450,7 @@ ARGUMENTS
 
 FLAGS
   -v, --verbose      Output verbose logs
-      --app=<value>  App ID to use (uses current app if not specified)
+      --app=<value>  The app ID or name (defaults to current app)
       --json         Output in JSON format
       --pretty-json  Output in colorized JSON format
 
@@ -1473,7 +1475,7 @@ FLAGS
   -p, --prefix=<value>  Filter channels by prefix
   -v, --verbose         Output verbose logs
       --json            Output in JSON format
-      --limit=<value>   [default: 100] Maximum number of channels to return (default: 100)
+      --limit=<value>   [default: 100] Maximum number of results to return (default: 100)
       --pretty-json     Output in colorized JSON format
 
 DESCRIPTION
@@ -1555,7 +1557,7 @@ ARGUMENTS
   CHANNEL  Channel name to subscribe to occupancy events
 
 FLAGS
-  -D, --duration=<value>  Automatically exit after the given number of seconds (0 = run indefinitely)
+  -D, --duration=<value>  Automatically exit after N seconds (0 = run indefinitely)
   -v, --verbose           Output verbose logs
       --json              Output in JSON format
       --pretty-json       Output in colorized JSON format
@@ -1609,7 +1611,7 @@ ARGUMENTS
   CHANNEL  Channel to enter presence on
 
 FLAGS
-  -D, --duration=<value>   Automatically exit after the given number of seconds (0 = run indefinitely)
+  -D, --duration=<value>   Automatically exit after N seconds (0 = run indefinitely)
   -v, --verbose            Output verbose logs
       --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.
@@ -1652,7 +1654,7 @@ ARGUMENTS
   CHANNEL  Channel name to subscribe to presence events
 
 FLAGS
-  -D, --duration=<value>   Automatically exit after the given number of seconds (0 = run indefinitely)
+  -D, --duration=<value>   Automatically exit after N seconds (0 = run indefinitely)
   -v, --verbose            Output verbose logs
       --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.
@@ -1747,7 +1749,7 @@ ARGUMENTS
   CHANNELS...  Channel name(s) to subscribe to
 
 FLAGS
-  -D, --duration=<value>           Automatically exit after the given number of seconds (0 = run indefinitely)
+  -D, --duration=<value>           Automatically exit after N seconds (0 = run indefinitely)
   -v, --verbose                    Output verbose logs
       --cipher-algorithm=<value>   [default: aes] Encryption algorithm to use (default: aes)
       --cipher-key=<value>         Encryption key for decrypting messages (hex-encoded)
@@ -1808,8 +1810,8 @@ EXAMPLES
   $ ably config show
 
 COMMANDS
-  ably config path              Print the path to the Ably CLI config file
-  ably config show              Display the contents of the Ably CLI config file
+  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/config/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/config/index.ts)_
@@ -1883,7 +1885,7 @@ EXAMPLES
   $ ably connections test
 
 COMMANDS
-  ably connections test         Test connection to Ably
+  ably connections test  Test connection to Ably
 ```
 
 _See code: [src/commands/connections/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/connections/index.ts)_
@@ -1961,11 +1963,11 @@ EXAMPLES
   $ ably integrations create
 
 COMMANDS
-  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 integrations
-  ably integrations update      Update 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 integrations
+  ably integrations update  Update an integration rule
 ```
 
 _See code: [src/commands/integrations/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/integrations/index.ts)_
@@ -1983,7 +1985,7 @@ USAGE
 
 FLAGS
   -v, --verbose                 Output verbose logs
-      --app=<value>             App ID or name to create the integration in
+      --app=<value>             The app ID or name (defaults to current app)
       --channel-filter=<value>  Channel filter pattern
       --json                    Output in JSON format
       --pretty-json             Output in colorized JSON format
@@ -2022,7 +2024,7 @@ ARGUMENTS
 FLAGS
   -f, --force        Force deletion without confirmation
   -v, --verbose      Output verbose logs
-      --app=<value>  App ID or name to delete the integration from
+      --app=<value>  The app ID or name (defaults to current app)
       --json         Output in JSON format
       --pretty-json  Output in colorized JSON format
 
@@ -2052,7 +2054,7 @@ ARGUMENTS
 
 FLAGS
   -v, --verbose      Output verbose logs
-      --app=<value>  App ID or name to get the integration rule from
+      --app=<value>  The app ID or name (defaults to current app)
       --json         Output in JSON format
       --pretty-json  Output in colorized JSON format
 
@@ -2079,7 +2081,7 @@ USAGE
 
 FLAGS
   -v, --verbose      Output verbose logs
-      --app=<value>  App ID or name to list integrations for
+      --app=<value>  The app ID or name (defaults to current app)
       --json         Output in JSON format
       --pretty-json  Output in colorized JSON format
 
@@ -2110,7 +2112,7 @@ ARGUMENTS
 
 FLAGS
   -v, --verbose                 Output verbose logs
-      --app=<value>             App ID or name of the app containing the integration rule
+      --app=<value>             The app ID or name (defaults to current app)
       --channel-filter=<value>  Channel filter pattern
       --json                    Output in JSON format
       --pretty-json             Output in colorized JSON format
@@ -2182,11 +2184,11 @@ EXAMPLES
   $ ably logs channel-lifecycle subscribe
 
 COMMANDS
-  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
+  ably logs channel-lifecycle     Stream logs from [meta]channel.lifecycle meta channel
+  ably logs connection-lifecycle  Stream 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.16.0/src/commands/logs/index.ts)_
@@ -2216,13 +2218,13 @@ Stream logs from [meta]channel.lifecycle meta channel
 
 ```
 USAGE
-  $ ably logs channel-lifecycle subscribe [-v] [--pretty-json | --json] [--rewind <value>]
+  $ ably logs channel-lifecycle subscribe [-v] [--json | --pretty-json] [--rewind <value>]
 
 FLAGS
   -v, --verbose         Output verbose logs
-      --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
+      --rewind=<value>  Number of messages to rewind when subscribing (default: 0)
 
 DESCRIPTION
   Stream logs from [meta]channel.lifecycle meta channel
@@ -2268,7 +2270,7 @@ FLAGS
       --direction=<option>  [default: backwards] Direction of log retrieval
                             <options: backwards|forwards>
       --json                Output in JSON format
-      --limit=<value>       [default: 100] Maximum number of logs to retrieve
+      --limit=<value>       [default: 100] Maximum number of results to return (default: 100)
       --pretty-json         Output in colorized JSON format
 
 DESCRIPTION
@@ -2297,7 +2299,7 @@ USAGE
   $ ably logs connection-lifecycle subscribe [-v] [--json | --pretty-json] [-D <value>] [--rewind <value>]
 
 FLAGS
-  -D, --duration=<value>  Automatically exit after the given number of seconds (0 = run indefinitely)
+  -D, --duration=<value>  Automatically exit after N seconds (0 = run indefinitely)
   -v, --verbose           Output verbose logs
       --json              Output in JSON format
       --pretty-json       Output in colorized JSON format
@@ -2331,7 +2333,7 @@ FLAGS
       --direction=<option>  [default: backwards] Direction of log retrieval
                             <options: backwards|forwards>
       --json                Output in JSON format
-      --limit=<value>       [default: 100] Maximum number of logs to retrieve
+      --limit=<value>       [default: 100] Maximum number of results to return (default: 100)
       --pretty-json         Output in colorized JSON format
 
 DESCRIPTION
@@ -2385,7 +2387,7 @@ FLAGS
       --direction=<option>  [default: backwards] Direction of log retrieval
                             <options: backwards|forwards>
       --json                Output in JSON format
-      --limit=<value>       [default: 100] Maximum number of logs to retrieve
+      --limit=<value>       [default: 100] Maximum number of results to return (default: 100)
       --pretty-json         Output in colorized JSON format
 
 DESCRIPTION
@@ -2411,13 +2413,13 @@ Stream logs from the push notifications meta channel [meta]log:push
 
 ```
 USAGE
-  $ ably logs push subscribe [-v] [--pretty-json | --json] [--rewind <value>]
+  $ ably logs push subscribe [-v] [--json | --pretty-json] [--rewind <value>]
 
 FLAGS
   -v, --verbose         Output verbose logs
-      --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
+      --rewind=<value>  Number of messages to rewind when subscribing (default: 0)
 
 DESCRIPTION
   Stream logs from the push notifications meta channel [meta]log:push
@@ -2440,11 +2442,11 @@ USAGE
     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)
+  -D, --duration=<value>  Automatically exit after N seconds (0 = run indefinitely)
   -v, --verbose           Output verbose logs
       --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)
       --type=<option>     Filter by log type
                           <options:
                           channel.lifecycle|channel.occupancy|channel.presence|connection.lifecycle|push.publish>
@@ -2487,9 +2489,9 @@ EXAMPLES
   $ ably queues delete my-queue
 
 COMMANDS
-  ably queues create            Create a queue
-  ably queues delete            Delete a queue
-  ably queues list              List all queues
+  ably queues create  Create a queue
+  ably queues delete  Delete a queue
+  ably queues list    List all queues
 ```
 
 _See code: [src/commands/queues/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/queues/index.ts)_
@@ -2505,7 +2507,7 @@ USAGE
 
 FLAGS
   -v, --verbose             Output verbose logs
-      --app=<value>         App ID or name to create the queue in
+      --app=<value>         The app ID or name (defaults to current app)
       --json                Output in JSON format
       --max-length=<value>  [default: 10000] Maximum number of messages in the queue (default: 10000)
       --name=<value>        (required) Name of the queue
@@ -2540,7 +2542,7 @@ ARGUMENTS
 FLAGS
   -f, --force        Force deletion without confirmation
   -v, --verbose      Output verbose logs
-      --app=<value>  App ID or name to delete the queue from
+      --app=<value>  The app ID or name (defaults to current app)
       --json         Output in JSON format
       --pretty-json  Output in colorized JSON format
 
@@ -2567,7 +2569,7 @@ USAGE
 
 FLAGS
   -v, --verbose      Output verbose logs
-      --app=<value>  App ID or name to list queues for
+      --app=<value>  The app ID or name (defaults to current app)
       --json         Output in JSON format
       --pretty-json  Output in colorized JSON format
 
@@ -2603,12 +2605,12 @@ EXAMPLES
   $ ably rooms messages subscribe my-room
 
 COMMANDS
-  ably rooms list               List active chat rooms
-  ably rooms messages           Commands for working with chat messages in rooms
-  ably rooms occupancy          Commands for monitoring room occupancy
-  ably rooms presence           Manage presence on Ably chat rooms
-  ably rooms reactions          Manage reactions in Ably chat rooms
-  ably rooms typing             Commands for working with typing indicators in chat rooms
+  ably rooms list       List active chat rooms
+  ably rooms messages   Commands for working with chat messages in rooms
+  ably rooms occupancy  Commands for monitoring room occupancy
+  ably rooms presence   Manage presence on Ably chat rooms
+  ably rooms reactions  Manage reactions in Ably chat rooms
+  ably rooms typing     Commands for working with typing indicators in chat rooms
 ```
 
 _See code: [src/commands/rooms/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/rooms/index.ts)_
@@ -2625,7 +2627,7 @@ FLAGS
   -p, --prefix=<value>  Filter rooms by prefix
   -v, --verbose         Output verbose logs
       --json            Output in JSON format
-      --limit=<value>   [default: 100] Maximum number of rooms to return (default: 100)
+      --limit=<value>   [default: 100] Maximum number of results to return (default: 100)
       --pretty-json     Output in colorized JSON format
 
 DESCRIPTION
@@ -2681,7 +2683,7 @@ ARGUMENTS
   ROOM  The room to get message history from
 
 FLAGS
-  -l, --limit=<value>   [default: 50] Maximum number of messages to retrieve (default: 50)
+  -l, --limit=<value>   [default: 50] Maximum number of results to return (default: 50)
   -v, --verbose         Output verbose logs
       --end=<value>     End time for the history query (ISO 8601 format)
       --json            Output in JSON format
@@ -2824,7 +2826,7 @@ ARGUMENTS
   ROOM  Room to subscribe to message reactions in
 
 FLAGS
-  -D, --duration=<value>  Automatically exit after the given number of seconds (0 = run indefinitely)
+  -D, --duration=<value>  Automatically exit after N seconds (0 = run indefinitely)
   -v, --verbose           Output verbose logs
       --json              Output in JSON format
       --pretty-json       Output in colorized JSON format
@@ -2902,7 +2904,7 @@ ARGUMENTS
   ROOMS...  Room name(s) to subscribe to messages from
 
 FLAGS
-  -D, --duration=<value>   Automatically exit after the given number of seconds (0 = run indefinitely)
+  -D, --duration=<value>   Automatically exit after N seconds (0 = run indefinitely)
   -v, --verbose            Output verbose logs
       --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.
@@ -2994,7 +2996,7 @@ ARGUMENTS
   ROOM  Room to subscribe to occupancy for
 
 FLAGS
-  -D, --duration=<value>  Automatically exit after the given number of seconds (0 = run indefinitely)
+  -D, --duration=<value>  Automatically exit after N seconds (0 = run indefinitely)
   -v, --verbose           Output verbose logs
       --json              Output in JSON format
       --pretty-json       Output in colorized JSON format
@@ -3044,7 +3046,7 @@ ARGUMENTS
   ROOM  Room to enter presence on
 
 FLAGS
-  -D, --duration=<value>   Automatically exit after the given number of seconds (0 = run indefinitely)
+  -D, --duration=<value>   Automatically exit after N seconds (0 = run indefinitely)
   -v, --verbose            Output verbose logs
       --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.
@@ -3081,7 +3083,7 @@ ARGUMENTS
   ROOM  Room to subscribe to presence for
 
 FLAGS
-  -D, --duration=<value>   Automatically exit after the given number of seconds (0 = run indefinitely)
+  -D, --duration=<value>   Automatically exit after N seconds (0 = run indefinitely)
   -v, --verbose            Output verbose logs
       --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.
@@ -3165,7 +3167,7 @@ ARGUMENTS
   ROOM  Room to subscribe to reactions in
 
 FLAGS
-  -D, --duration=<value>  Automatically exit after the given number of seconds (0 = run indefinitely)
+  -D, --duration=<value>  Automatically exit after N seconds (0 = run indefinitely)
   -v, --verbose           Output verbose logs
       --json              Output in JSON format
       --pretty-json       Output in colorized JSON format
@@ -3204,28 +3206,28 @@ _See code: [src/commands/rooms/typing/index.ts](https://github.com/ably/ably-cli
 
 ## `ably rooms typing keystroke ROOM`
 
-Send a typing indicator in an Ably Chat room (use --autoType to keep typing automatically until terminated)
+Send a typing indicator in an Ably Chat room (use --auto-type to keep typing automatically until terminated)
 
 ```
 USAGE
-  $ ably rooms typing keystroke ROOM [-v] [--json | --pretty-json] [--autoType]
+  $ ably rooms typing keystroke ROOM [-v] [--json | --pretty-json] [--auto-type]
 
 ARGUMENTS
   ROOM  The room to start typing in
 
 FLAGS
   -v, --verbose      Output verbose logs
-      --autoType     Automatically keep typing indicator active
+      --auto-type    Automatically keep typing indicator active
       --json         Output in JSON format
       --pretty-json  Output in colorized JSON format
 
 DESCRIPTION
-  Send a typing indicator in an Ably Chat room (use --autoType to keep typing automatically until terminated)
+  Send a typing indicator in an Ably Chat room (use --auto-type to keep typing automatically until terminated)
 
 EXAMPLES
   $ ably rooms typing keystroke my-room
 
-  $ ably rooms typing keystroke my-room --autoType
+  $ ably rooms typing keystroke my-room --auto-type
 
   $ ABLY_API_KEY="YOUR_API_KEY" ably rooms typing keystroke my-room
 
@@ -3248,7 +3250,7 @@ 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)
+  -D, --duration=<value>  Automatically exit after N seconds (0 = run indefinitely)
   -v, --verbose           Output verbose logs
       --json              Output in JSON format
       --pretty-json       Output in colorized JSON format
@@ -3287,11 +3289,11 @@ EXAMPLES
   $ ably spaces locations set my-space
 
 COMMANDS
-  ably spaces cursors           Commands for interacting with Cursors in Ably Spaces
-  ably spaces list              List active spaces
-  ably spaces locations         Spaces Locations API commands (Ably Spaces client-to-client location sharing)
-  ably spaces locks             Commands for component locking in Ably Spaces
-  ably spaces members           Commands for managing members in Ably Spaces
+  ably spaces cursors    Commands for interacting with Cursors in Ably Spaces
+  ably spaces list       List active spaces
+  ably spaces locations  Spaces Locations API commands (Ably Spaces client-to-client location sharing)
+  ably spaces locks      Commands for component locking in Ably Spaces
+  ably spaces members    Commands for managing members in Ably Spaces
 ```
 
 _See code: [src/commands/spaces/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/spaces/index.ts)_
@@ -3364,8 +3366,7 @@ ARGUMENTS
   SPACE  The space to set cursor in
 
 FLAGS
-  -D, --duration=<value>   Automatically exit after the given number of seconds (0 = exit immediately after setting the
-                           cursor)
+  -D, --duration=<value>   Automatically exit after N seconds (0 = set and exit immediately)
   -v, --verbose            Output verbose logs
       --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.
@@ -3413,7 +3414,7 @@ ARGUMENTS
   SPACE  Space to subscribe to cursors for
 
 FLAGS
-  -D, --duration=<value>   Automatically exit after the given number of seconds (0 = run indefinitely)
+  -D, --duration=<value>   Automatically exit after N seconds (0 = run indefinitely)
   -v, --verbose            Output verbose logs
       --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.
@@ -3447,7 +3448,7 @@ FLAGS
   -p, --prefix=<value>  Filter spaces by prefix
   -v, --verbose         Output verbose logs
       --json            Output in JSON format
-      --limit=<value>   [default: 100] Maximum number of spaces to return (default: 100)
+      --limit=<value>   [default: 100] Maximum number of results to return (default: 100)
       --pretty-json     Output in colorized JSON format
 
 DESCRIPTION
@@ -3529,8 +3530,7 @@ ARGUMENTS
   SPACE  Space to set location in
 
 FLAGS
-  -D, --duration=<value>   Automatically exit after the given number of seconds (0 = exit immediately after setting
-                           location)
+  -D, --duration=<value>   Automatically exit after N seconds (0 = set and exit immediately)
   -v, --verbose            Output verbose logs
       --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.
@@ -3561,7 +3561,7 @@ ARGUMENTS
   SPACE  Space to subscribe to locations for
 
 FLAGS
-  -D, --duration=<value>   Automatically exit after the given number of seconds (0 = run indefinitely)
+  -D, --duration=<value>   Automatically exit after N seconds (0 = run indefinitely)
   -v, --verbose            Output verbose logs
       --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.
@@ -3708,7 +3708,7 @@ ARGUMENTS
   SPACE  Space to subscribe to locks for
 
 FLAGS
-  -D, --duration=<value>   Automatically exit after the given number of seconds (0 = run indefinitely)
+  -D, --duration=<value>   Automatically exit after N seconds (0 = run indefinitely)
   -v, --verbose            Output verbose logs
       --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.
@@ -3761,7 +3761,7 @@ ARGUMENTS
   SPACE  Space to enter
 
 FLAGS
-  -D, --duration=<value>   Automatically exit after the given number of seconds (0 = run indefinitely)
+  -D, --duration=<value>   Automatically exit after N seconds (0 = run indefinitely)
   -v, --verbose            Output verbose logs
       --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.
@@ -3794,7 +3794,7 @@ ARGUMENTS
   SPACE  Space to subscribe to members for
 
 FLAGS
-  -D, --duration=<value>   Automatically exit after the given number of seconds (0 = run indefinitely)
+  -D, --duration=<value>   Automatically exit after N seconds (0 = run indefinitely)
   -v, --verbose            Output verbose logs
       --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.
@@ -3841,8 +3841,8 @@ EXAMPLES
   $ 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
+  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.16.0/src/commands/stats/index.ts)_
@@ -3862,7 +3862,7 @@ FLAGS
       --end=<value>       End time in milliseconds since epoch
       --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
+      --limit=<value>     [default: 10] Maximum number of results to return (default: 10)
       --live              Subscribe to live stats updates (uses minute interval)
       --pretty-json       Output in colorized JSON format
       --start=<value>     Start time in milliseconds since epoch
@@ -3910,7 +3910,7 @@ FLAGS
       --end=<value>       End time in milliseconds since epoch
       --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
+      --limit=<value>     [default: 10] Maximum number of results to return (default: 10)
       --live              Subscribe to live stats updates (uses minute interval)
       --pretty-json       Output in colorized JSON format
       --start=<value>     Start time in milliseconds since epoch
@@ -3986,8 +3986,8 @@ EXAMPLES
   $ ably support info
 
 COMMANDS
-  ably support ask              Ask a question to the Ably AI agent for help
-  ably support contact          Contact Ably for assistance
+  ably support ask      Ask a question to the Ably AI agent for help
+  ably support contact  Contact Ably for assistance
 ```
 
 _See code: [src/commands/support/index.ts](https://github.com/ably/ably-cli/blob/v0.16.0/src/commands/support/index.ts)_
@@ -4076,9 +4076,7 @@ If you are an AI assistant, start with [`AI-Assistance.mdc`](.cursor/rules/AI-As
 Before submitting any changes, run our automated validation script to ensure your code meets all requirements:
 
 ```bash
-pnpm validate
-# or
-./scripts/pre-push-validation.sh
+pnpm validate  # or: ./scripts/pre-push-validation.sh
 ```
 
 This script automatically runs all mandatory steps including build, linting, and testing. See [`.cursor/rules/Workflow.mdc`](.cursor/rules/Workflow.mdc) for detailed information about each step.
diff --git a/align-cli.md b/align-cli.md
new file mode 100644
index 00000000..bc6aba4a
--- /dev/null
+++ b/align-cli.md
@@ -0,0 +1,254 @@
+# Plan: CLI Consistency — Output Format (DX-791) + Flags/Args (DX-787)
+
+## Context
+
+The CLI has grown organically across product areas (Channels, Rooms, Spaces, Control API), resulting in significant inconsistencies in both user-facing output messages and flag/argument naming. This makes the CLI feel disjointed — e.g., `channels publish` shows `✓ Message published successfully to channel "foo".` while `rooms messages send` shows just `Message sent successfully.` (no checkmark, no resource name). Flag descriptions for the same concept (`--app`, `--limit`, `--duration`) vary across commands. This effort standardizes both dimensions together and documents the conventions in CLAUDE.md so future development stays consistent.
+
+---
+
+## Part 1: Define the Standards
+
+### Output Message Standards
+
+**Progress messages** (operation starting/in-progress):
+```
+<Action> <resource-type>: <chalk.cyan(name)>...
+```
+- No color on the action text (green on progress is wrong — it implies success)
+- Always end with `...`
+- Examples: `Attaching to channel: my-channel...`, `Creating app: My App...`
+
+**Success messages** (one-shot operation completed):
+```
+<chalk.green("✓")> <Past-tense action> <resource> <chalk.cyan(name)>.
+```
+- Always start with green `✓`
+- Always end with `.`
+- Resource names in `chalk.cyan()`, never in quotes
+- Examples: `✓ Message published to channel my-channel.`, `✓ Message sent to room my-room.`, `✓ App created: My App (app-id).`
+
+**Listening/waiting hints** (long-running command is ready):
+```
+chalk.dim("Listening for <what>. Press Ctrl+C to exit.")
+```
+- Always `chalk.dim()`
+- Always ends with `.`
+- Consistent wording: `Press Ctrl+C to exit.`
+- First clause varies by context: `Listening for messages.`, `Staying present.`, `Holding lock.`
+
+**Subscribe confirmation** (long-running command connected successfully):
+```
+<chalk.green("✓")> Subscribed to <resource-type>: <chalk.cyan(name)>.
+chalk.dim("Listening for <what>. Press Ctrl+C to exit.")
+```
+
+**Resource name formatting**: Always `chalk.cyan()`. Never quoted in human output.
+
+**Terminology**: Keep product-specific verbs matching each SDK — Channels uses "publish" (`channel.publish()`), Rooms uses "send" (`room.messages.send()`). Don't force unification here.
+
+### Flag/Argument Standards
+
+**Naming**: All flags kebab-case (`--my-flag`). No camelCase.
+
+**Standard descriptions for common flags**:
+
+| Flag | Standard Description |
+|------|---------------------|
+| `--app` | `"The app ID or name (defaults to current app)"` |
+| `--limit` | `"Maximum number of results to return (default: N)"` |
+| `--duration` | `"Automatically exit after N seconds (0 = run indefinitely)"` |
+| `--prefix` | `"Filter results by name prefix"` |
+| `--count` | `"Number of messages to send (default: 1)"` |
+| `--delay` | `"Delay between messages in milliseconds (default: 40)"` |
+| `--rewind` | `"Number of historical messages to retrieve on attach (default: 0)"` |
+
+**Single-letter aliases** — keep existing, no new ones needed. Fix the `-d` collision: `--duration` uses `-D` (uppercase) everywhere.
+
+---
+
+## Part 2: Implementation
+
+### Step 1: Create output helper utility (NEW file)
+
+**File**: `src/utils/output.ts`
+
+Thin exported functions (not a class) that enforce the patterns:
+
+```typescript
+import chalk from "chalk";
+
+export function progress(message: string): string {
+  return `${message}...`;
+}
+
+export function success(message: string): string {
+  return `${chalk.green("✓")} ${message}`;
+}
+
+export function listening(description: string): string {
+  return chalk.dim(`${description} Press Ctrl+C to exit.`);
+}
+
+export function resource(name: string): string {
+  return chalk.cyan(name);
+}
+```
+
+Commands import and use these to stay consistent. Lightweight — just enforces checkmark color, dim hints, cyan names.
+
+### Step 2: Fix flag issues (DX-787)
+
+1. **Rename `autoType` to `auto-type`** in `src/commands/rooms/typing/keystroke.ts`
+   - CLI is Public Preview, direct rename is fine
+
+2. **Remove duplicate `json` flag** from:
+   - `src/commands/logs/push/subscribe.ts`
+   - `src/commands/logs/channel-lifecycle/subscribe.ts`
+   - These shadow the global `--json` flag from the base command
+
+3. **Standardize `--app` flag descriptions** across all ~24 files that define it:
+   - `src/commands/auth/keys/*.ts`
+   - `src/commands/integrations/*.ts`
+   - `src/commands/queues/*.ts`
+   - `src/commands/apps/channel-rules/*.ts`
+   - `src/commands/channels/inspect.ts`
+   - `src/commands/auth/issue-ably-token.ts`, `issue-jwt-token.ts`, `revoke-token.ts`
+   - All get: `"The app ID or name (defaults to current app)"`
+
+4. **Standardize `--limit` descriptions** across ~11 files
+
+5. **Standardize `--duration` descriptions** across subscribe/enter commands
+   - Fix `bench/subscriber.ts` alias from `-d` to `-D` (matches all other duration flags)
+
+### Step 3: Fix output messages — Channels commands (DX-791)
+
+| File | Change |
+|------|--------|
+| `channels/publish.ts:172` | `"Message published successfully to channel \"${channel}\""` → `success(\`Message published to channel ${resource(channel)}.\`)` |
+| `channels/publish.ts:168` | Multi-msg summary: add `success()` wrapper |
+| `channels/publish.ts:292` | Per-msg: same pattern |
+| `channels/subscribe.ts:178` | Already close — just import `resource()` for cyan |
+| `channels/subscribe.ts:263` | Use `success()` + `listening()` |
+| `channels/presence/subscribe.ts:75` | Remove `chalk.green()` from progress text (green ≠ progress) |
+| `channels/presence/subscribe.ts:130` | Wrap in `chalk.dim()` |
+| `channels/presence/enter.ts:196-207` | Standardize hint with `listening()` |
+| `channels/occupancy/subscribe.ts:80-82` | Remove `chalk.green()` from progress |
+| `channels/occupancy/subscribe.ts:127` | Wrap in `chalk.dim()` |
+
+### Step 4: Fix output messages — Rooms commands
+
+| File | Change |
+|------|--------|
+| `rooms/messages/send.ts:390` | `"Message sent successfully."` → `success(\`Message sent to room ${resource(room)}.\`)` |
+| `rooms/messages/send.ts:349` | Multi-msg summary: add `success()` wrapper |
+| `rooms/messages/subscribe.ts:191-195` | Standardize subscribe confirmation |
+| `rooms/presence/enter.ts:229-237` | Use `chalk.green("✓")` consistently |
+| `rooms/presence/subscribe.ts:60` | Split progress and listening hint |
+| `rooms/occupancy/subscribe.ts:168` | Wrap in `chalk.dim()` |
+| `rooms/reactions/subscribe.ts:112` | Standardize format |
+| `rooms/typing/subscribe.ts:99` | Already uses `chalk.dim()` — verify format |
+
+### Step 5: Fix output messages — Spaces commands
+
+| File | Change |
+|------|--------|
+| `spaces/members/enter.ts:147` | `chalk.green("Successfully entered space:")` → `success(\`Entered space: ${resource(name)}.\`)` |
+| `spaces/members/subscribe.ts:52` | Add `...` suffix to progress msg |
+| `spaces/locks/acquire.ts:168` | `chalk.green("Successfully acquired lock:")` → `success(...)` |
+| `spaces/locations/set.ts:163,238` | Add checkmark |
+| `spaces/cursors/get-all.ts:109` | Add checkmark |
+
+### Step 6: Fix output messages — Logs + Control Plane commands
+
+| File | Change |
+|------|--------|
+| `logs/subscribe.ts:114-116` | Remove `chalk.green()` from progress |
+| `logs/subscribe.ts:165` | Wrap in `chalk.dim()` |
+| `logs/push/subscribe.ts` | Fix Ctrl+C hint (add period, use `chalk.dim()`) |
+| `logs/channel-lifecycle/subscribe.ts` | Same |
+| `logs/connection-lifecycle/subscribe.ts:120` | Wrap in `chalk.dim()` |
+| `apps/create.ts:62` | `"✓ App created successfully!"` → `success(\`App created: ${resource(name)} (${id}).\`)` |
+| `queues/create.ts:75` | Same pattern |
+| `auth/keys/create.ts:110` | Same pattern |
+| `integrations/create.ts:158` | Same pattern |
+| `integrations/delete.ts` | Same pattern |
+
+### Cross-cutting: Standardize logCliEvent() strings
+
+In every command file being touched (Steps 3-7), also update `logCliEvent()` message strings to use consistent terminology:
+- Use same verbs as user-facing output: "published" for channels, "sent" for rooms
+- Use consistent phrasing: `"Message published to channel foo"` not `"Message published successfully to channel \"foo\""`
+- Remove unnecessary "successfully" from event messages — the event type (`singlePublishComplete`, `sentSuccess`) already conveys success
+- Keep event type identifiers (`"singlePublishComplete"`, `"multiSendComplete"`, etc.) unchanged — only the human-readable message string changes
+
+### Step 7: Fix output messages — Bench commands
+
+| File | Change |
+|------|--------|
+| `bench/publisher.ts` | Standardize progress/success messages to use `success()`, `resource()` |
+| `bench/subscriber.ts` | Same + fix `--duration` alias from `-d` to `-D` |
+
+### Step 8: Update tests
+
+Update string assertions in:
+- `test/unit/commands/channels/publish.test.ts`
+- `test/unit/commands/rooms/messages.test.ts` (or similar)
+- `test/unit/commands/apps/create.test.ts`
+- `test/unit/commands/queues/create.test.ts`
+- `test/e2e/channels/channels-e2e.test.ts` (line 239)
+- `test/e2e/channels/channel-subscribe-e2e.test.ts` (line 77)
+- `test/e2e/rooms/rooms-e2e.test.ts` (lines 266, 294, 296, 334)
+- Any other tests that assert on exact output strings
+
+### Step 9: Document conventions in CLAUDE.md
+
+Add a section to `.claude/CLAUDE.md`:
+
+```markdown
+## CLI Output & Flag Conventions
+
+### Output patterns (use helpers from src/utils/output.ts)
+- **Progress**: `"Attaching to channel: ${resource(name)}..."` — no color on action text
+- **Success**: `success("Message published to channel ${resource(name)}.")` — green ✓, ends with `.`
+- **Listening**: `listening("Listening for messages.")` — dim, includes "Press Ctrl+C to exit."
+- **Resource names**: Always `resource(name)` (cyan), never quoted
+
+### Flag conventions
+- All flags kebab-case: `--my-flag` (never camelCase)
+- `--app`: `"The app ID or name (defaults to current app)"`
+- `--limit`: `"Maximum number of results to return (default: N)"`
+- `--duration`: `"Automatically exit after N seconds (0 = run indefinitely)"`, alias `-D`
+- Channels use "publish", Rooms use "send" (matches SDK terminology)
+```
+
+Also update `.cursor/rules/AI-Assistance.mdc` with the same patterns.
+
+---
+
+## Verification
+
+After implementation:
+1. `pnpm prepare` — build succeeds
+2. `pnpm exec eslint .` — 0 errors
+3. `pnpm test:unit` — all unit tests pass
+4. Manual smoke test key commands:
+   - `ably channels publish test-ch "hello"` — verify `✓ Message published to channel test-ch.`
+   - `ably rooms messages send test-room "hello"` — verify `✓ Message sent to room test-room.`
+   - `ably channels subscribe test-ch` — verify progress + listening hint format
+   - `ably apps create --name test-app` — verify `✓ App created: test-app (id).`
+
+---
+
+## Decisions
+
+- **Single PR** — all changes in one cohesive changeset
+- **Skip "Using:" line** — doesn't exist in codebase, separate concern for later
+- **Standalone functions** in `src/utils/output.ts` (not base command methods)
+- **Include logCliEvent() strings** — standardize internal event messages too for full consistency
+- **Include bench commands** — apply same output conventions to `bench/publisher.ts` and `bench/subscriber.ts`
+- **JSON output unchanged** — `--json` / `--pretty-json` output is NOT affected, only human-readable output
+
+## Risks
+
+- **E2E test ready signals**: Some E2E tests use output strings (e.g., `"Successfully attached to channel"`) as synchronization signals to detect when a command is ready. Must update these carefully to avoid flaky tests.
+- **Scope**: ~50+ files but changes are mechanical string replacements. Low risk of logic bugs.
diff --git a/package.json b/package.json
index 0bd30d29..9a9cf0ef 100644
--- a/package.json
+++ b/package.json
@@ -85,6 +85,21 @@
       "aliases"
     ],
     "helpClass": "./dist/src/help.js",
+    "theme": {
+      "alias": "cyan",
+      "bin": "cyan",
+      "command": "cyan",
+      "commandSummary": "whiteBright",
+      "dollarSign": "green",
+      "flag": "whiteBright",
+      "flagDefaultValue": "yellow",
+      "flagOptions": "yellow",
+      "flagRequired": "red",
+      "flagSeparator": "dim",
+      "sectionHeader": "bold",
+      "topic": "cyan",
+      "version": "green"
+    },
     "warn-if-update-available": {
       "timeoutInDays": 7,
       "message": "📦 Update available: <%= config.name %> <%= chalk.yellow(config.version) %> → <%= chalk.greenBright(latest) %>\nRun <%= chalk.cyan('npm install -g @ably/cli') %> to update.",
diff --git a/src/base-command.ts b/src/base-command.ts
index a57bb9e4..3b0d7144 100644
--- a/src/base-command.ts
+++ b/src/base-command.ts
@@ -852,8 +852,8 @@ export abstract class AblyBaseCommand extends InteractiveBaseCommand {
       options.port = flags.port;
     }
 
-    if (flags.tlsPort) {
-      options.tlsPort = flags.tlsPort;
+    if (flags["tls-port"]) {
+      options.tlsPort = flags["tls-port"];
     }
 
     if (flags.tls) {
diff --git a/src/commands/accounts/login.ts b/src/commands/accounts/login.ts
index 6f73da2b..512a9da8 100644
--- a/src/commands/accounts/login.ts
+++ b/src/commands/accounts/login.ts
@@ -7,6 +7,7 @@ import { ControlBaseCommand } from "../../control-base-command.js";
 import { endpointFlag } from "../../flags.js";
 import { ControlApi } from "../../services/control-api.js";
 import { displayLogo } from "../../utils/logo.js";
+import { resource, success } from "../../utils/output.js";
 import { promptForConfirmation } from "../../utils/prompt-confirmation.js";
 
 // Moved function definition outside the class
@@ -240,7 +241,7 @@ export default class AccountsLogin extends ControlBaseCommand {
               this.configManager.setCurrentApp(app.id);
               this.configManager.storeAppInfo(app.id, { appName: app.name });
 
-              this.log(`${chalk.green("✓")} App created successfully!`);
+              this.log(success("App created successfully."));
             } catch (createError) {
               this.warn(
                 `Failed to create app: ${createError instanceof Error ? createError.message : String(createError)}`,
@@ -349,25 +350,33 @@ export default class AccountsLogin extends ControlBaseCommand {
         this.log(this.formatJsonOutput(response, flags));
       } else {
         this.log(
-          `Successfully logged in to ${chalk.cyan(account.name)} (account ID: ${chalk.greenBright(account.id)})`,
+          `Successfully logged in to ${resource(account.name)} (account ID: ${chalk.greenBright(account.id)})`,
         );
         if (alias !== "default") {
           this.log(`Account stored with alias: ${alias}`);
         }
 
-        this.log(`Account ${chalk.cyan(alias)} is now the current account`);
+        this.log(`Account ${resource(alias)} is now the current account`);
 
         if (selectedApp) {
           const message = isAutoSelected
-            ? `${chalk.green("✓")} Automatically selected app: ${chalk.cyan(selectedApp.name)} (${selectedApp.id})`
-            : `${chalk.green("✓")} Selected app: ${chalk.cyan(selectedApp.name)} (${selectedApp.id})`;
+            ? success(
+                `Automatically selected app: ${resource(selectedApp.name)} (${selectedApp.id})`,
+              )
+            : success(
+                `Selected app: ${resource(selectedApp.name)} (${selectedApp.id})`,
+              );
           this.log(message);
         }
 
         if (selectedKey) {
           const keyMessage = isKeyAutoSelected
-            ? `${chalk.green("✓")} Automatically selected API key: ${chalk.cyan(selectedKey.name || "Unnamed key")} (${selectedKey.id})`
-            : `${chalk.green("✓")} Selected API key: ${chalk.cyan(selectedKey.name || "Unnamed key")} (${selectedKey.id})`;
+            ? success(
+                `Automatically selected API key: ${resource(selectedKey.name || "Unnamed key")} (${selectedKey.id})`,
+              )
+            : success(
+                `Selected API key: ${resource(selectedKey.name || "Unnamed key")} (${selectedKey.id})`,
+              );
           this.log(keyMessage);
         }
       }
diff --git a/src/commands/apps/channel-rules/create.ts b/src/commands/apps/channel-rules/create.ts
index 16d9228b..5421b1a2 100644
--- a/src/commands/apps/channel-rules/create.ts
+++ b/src/commands/apps/channel-rules/create.ts
@@ -2,6 +2,7 @@ import { Flags } from "@oclif/core";
 import chalk from "chalk";
 
 import { ControlBaseCommand } from "../../../control-base-command.js";
+import { success } from "../../../utils/output.js";
 
 export default class ChannelRulesCreateCommand extends ControlBaseCommand {
   static description = "Create a channel rule";
@@ -15,7 +16,7 @@ export default class ChannelRulesCreateCommand extends ControlBaseCommand {
   static flags = {
     ...ControlBaseCommand.globalFlags,
     app: Flags.string({
-      description: "App ID or name to create the channel rule in",
+      description: "The app ID or name (defaults to current app)",
       required: false,
     }),
     authenticated: Flags.boolean({
@@ -168,7 +169,7 @@ export default class ChannelRulesCreateCommand extends ControlBaseCommand {
           ),
         );
       } else {
-        this.log(chalk.green("✓ Channel rule created successfully!"));
+        this.log(success("Channel rule created."));
         this.log(`ID: ${createdNamespace.id}`);
         this.log(
           `Persisted: ${createdNamespace.persisted ? chalk.green("Yes") : "No"}`,
diff --git a/src/commands/apps/channel-rules/delete.ts b/src/commands/apps/channel-rules/delete.ts
index 26ed61d2..5ec1f4b4 100644
--- a/src/commands/apps/channel-rules/delete.ts
+++ b/src/commands/apps/channel-rules/delete.ts
@@ -25,7 +25,7 @@ export default class ChannelRulesDeleteCommand extends ControlBaseCommand {
   static flags = {
     ...ControlBaseCommand.globalFlags,
     app: Flags.string({
-      description: "App ID or name to delete the channel rule from",
+      description: "The app ID or name (defaults to current app)",
       required: false,
     }),
     force: Flags.boolean({
diff --git a/src/commands/apps/channel-rules/list.ts b/src/commands/apps/channel-rules/list.ts
index 93be9921..699574b4 100644
--- a/src/commands/apps/channel-rules/list.ts
+++ b/src/commands/apps/channel-rules/list.ts
@@ -1,3 +1,4 @@
+import { Flags } from "@oclif/core";
 import chalk from "chalk";
 
 import type { Namespace } from "../../../services/control-api.js";
@@ -27,13 +28,17 @@ export default class ChannelRulesListCommand extends ControlBaseCommand {
 
   static examples = [
     "$ ably apps:channel-rules:list",
-    "$ ably apps:channel-rules:list --app-id my-app-id",
+    "$ ably apps:channel-rules:list --app my-app-id",
     "$ ably apps:channel-rules:list --json",
     "$ ably apps:channel-rules:list --pretty-json",
   ];
 
   static flags = {
     ...ControlBaseCommand.flags,
+    app: Flags.string({
+      description: "The app ID or name (defaults to current app)",
+      required: false,
+    }),
   };
 
   async run(): Promise<void> {
@@ -45,7 +50,7 @@ export default class ChannelRulesListCommand extends ControlBaseCommand {
         this.jsonError(
           {
             error:
-              'No app specified. Use --app-id flag or select an app with "ably apps switch"',
+              'No app specified. Use --app flag or select an app with "ably apps switch"',
             status: "error",
             success: false,
           },
@@ -53,7 +58,7 @@ export default class ChannelRulesListCommand extends ControlBaseCommand {
         );
       } else {
         this.error(
-          'No app specified. Use --app-id flag or select an app with "ably apps switch"',
+          'No app specified. Use --app flag or select an app with "ably apps switch"',
         );
       }
 
diff --git a/src/commands/apps/channel-rules/update.ts b/src/commands/apps/channel-rules/update.ts
index 58f8f20f..e9fa1bb6 100644
--- a/src/commands/apps/channel-rules/update.ts
+++ b/src/commands/apps/channel-rules/update.ts
@@ -22,7 +22,7 @@ export default class ChannelRulesUpdateCommand extends ControlBaseCommand {
   static flags = {
     ...ControlBaseCommand.globalFlags,
     app: Flags.string({
-      description: "App ID or name to update the channel rule in",
+      description: "The app ID or name (defaults to current app)",
       required: false,
     }),
     authenticated: Flags.boolean({
diff --git a/src/commands/apps/create.ts b/src/commands/apps/create.ts
index 60c95b71..dd5e9b2d 100644
--- a/src/commands/apps/create.ts
+++ b/src/commands/apps/create.ts
@@ -1,7 +1,7 @@
 import { Flags } from "@oclif/core";
-import chalk from "chalk";
 
 import { ControlBaseCommand } from "../../control-base-command.js";
+import { resource, success } from "../../utils/output.js";
 
 export default class AppsCreateCommand extends ControlBaseCommand {
   static description = "Create a new app";
@@ -59,7 +59,7 @@ export default class AppsCreateCommand extends ControlBaseCommand {
           ),
         );
       } else {
-        this.log(chalk.green("✓ App created successfully!"));
+        this.log(success(`App created: ${resource(app.name)} (${app.id}).`));
         this.log(`App ID: ${app.id}`);
         this.log(`Name: ${app.name}`);
         this.log(`Status: ${app.status}`);
diff --git a/src/commands/apps/delete.ts b/src/commands/apps/delete.ts
index 5e1edc21..eba370a0 100644
--- a/src/commands/apps/delete.ts
+++ b/src/commands/apps/delete.ts
@@ -33,7 +33,7 @@ export default class AppsDeleteCommand extends ControlBaseCommand {
       description: "Skip confirmation prompt",
     }),
     app: Flags.string({
-      description: "App ID to delete (overrides argument and current app)",
+      description: "The app ID or name (defaults to current app)",
       env: "ABLY_APP_ID",
     }),
   };
diff --git a/src/commands/auth/issue-ably-token.ts b/src/commands/auth/issue-ably-token.ts
index 37946850..67c58549 100644
--- a/src/commands/auth/issue-ably-token.ts
+++ b/src/commands/auth/issue-ably-token.ts
@@ -6,7 +6,7 @@ import { AblyBaseCommand } from "../../base-command.js";
 import { productApiFlags } from "../../flags.js";
 
 export default class IssueAblyTokenCommand extends AblyBaseCommand {
-  static description = "Creates an Ably Token with capabilities";
+  static description = "Create an Ably Token with capabilities";
 
   static examples = [
     "$ ably auth issue-ably-token",
@@ -23,7 +23,7 @@ export default class IssueAblyTokenCommand extends AblyBaseCommand {
   static flags = {
     ...productApiFlags,
     app: Flags.string({
-      description: "App ID to use (uses current app if not specified)",
+      description: "The app ID or name (defaults to current app)",
       env: "ABLY_APP_ID",
     }),
     capability: Flags.string({
diff --git a/src/commands/auth/issue-jwt-token.ts b/src/commands/auth/issue-jwt-token.ts
index 409f2eca..00116625 100644
--- a/src/commands/auth/issue-jwt-token.ts
+++ b/src/commands/auth/issue-jwt-token.ts
@@ -15,7 +15,7 @@ interface JwtPayload {
 }
 
 export default class IssueJwtTokenCommand extends AblyBaseCommand {
-  static description = "Creates an Ably JWT token with capabilities";
+  static description = "Create an Ably JWT token with capabilities";
 
   static examples = [
     "$ ably auth issue-jwt-token",
@@ -31,7 +31,7 @@ export default class IssueJwtTokenCommand extends AblyBaseCommand {
   static flags = {
     ...productApiFlags,
     app: Flags.string({
-      description: "App ID to use (uses current app if not specified)",
+      description: "The app ID or name (defaults to current app)",
       env: "ABLY_APP_ID",
     }),
     capability: Flags.string({
diff --git a/src/commands/auth/keys/create.ts b/src/commands/auth/keys/create.ts
index 635a7405..57a8e405 100644
--- a/src/commands/auth/keys/create.ts
+++ b/src/commands/auth/keys/create.ts
@@ -1,7 +1,7 @@
 import { Flags } from "@oclif/core";
-import chalk from "chalk";
 
 import { ControlBaseCommand } from "../../../control-base-command.js";
+import { resource, success } from "../../../utils/output.js";
 
 export default class KeysCreateCommand extends ControlBaseCommand {
   static description = "Create a new API key for an app";
@@ -21,8 +21,7 @@ export default class KeysCreateCommand extends ControlBaseCommand {
   static flags = {
     ...ControlBaseCommand.globalFlags,
     app: Flags.string({
-      description:
-        "App ID the key belongs to (uses current app if not specified)",
+      description: "The app ID or name (defaults to current app)",
       env: "ABLY_APP_ID",
     }),
     capabilities: Flags.string({
@@ -107,9 +106,8 @@ export default class KeysCreateCommand extends ControlBaseCommand {
           ),
         );
       } else {
-        this.log(chalk.green("✓ Key created successfully!"));
-
         const keyName = `${key.appId}.${key.id}`;
+        this.log(success(`Key created: ${resource(keyName)}.`));
         this.log(`Key Name: ${keyName}`);
         this.log(`Key Label: ${key.name || "Unnamed key"}`);
 
diff --git a/src/commands/auth/keys/current.ts b/src/commands/auth/keys/current.ts
index 8a425fb7..01f9b03b 100644
--- a/src/commands/auth/keys/current.ts
+++ b/src/commands/auth/keys/current.ts
@@ -16,8 +16,7 @@ export default class KeysCurrentCommand extends ControlBaseCommand {
   static flags = {
     ...ControlBaseCommand.globalFlags,
     app: Flags.string({
-      description:
-        "App ID to check key for (uses current app if not specified)",
+      description: "The app ID (defaults to current app)",
       env: "ABLY_APP_ID",
     }),
   };
diff --git a/src/commands/auth/keys/get.ts b/src/commands/auth/keys/get.ts
index 523a626b..c0157b43 100644
--- a/src/commands/auth/keys/get.ts
+++ b/src/commands/auth/keys/get.ts
@@ -23,8 +23,7 @@ export default class KeysGetCommand extends ControlBaseCommand {
   static flags = {
     ...ControlBaseCommand.globalFlags,
     app: Flags.string({
-      description:
-        "App ID the key belongs to (uses current app if not specified)",
+      description: "The app ID or name (defaults to current app)",
       env: "ABLY_APP_ID",
     }),
   };
diff --git a/src/commands/auth/keys/list.ts b/src/commands/auth/keys/list.ts
index c4eb906f..6f42c42a 100644
--- a/src/commands/auth/keys/list.ts
+++ b/src/commands/auth/keys/list.ts
@@ -16,8 +16,7 @@ export default class KeysListCommand extends ControlBaseCommand {
   static flags = {
     ...ControlBaseCommand.globalFlags,
     app: Flags.string({
-      description:
-        "App ID to list keys for (uses current app if not specified)",
+      description: "The app ID (defaults to current app)",
       env: "ABLY_APP_ID",
     }),
   };
diff --git a/src/commands/auth/keys/revoke.ts b/src/commands/auth/keys/revoke.ts
index 73672cd0..5b1ae96e 100644
--- a/src/commands/auth/keys/revoke.ts
+++ b/src/commands/auth/keys/revoke.ts
@@ -23,8 +23,7 @@ export default class KeysRevokeCommand extends ControlBaseCommand {
   static flags = {
     ...ControlBaseCommand.globalFlags,
     app: Flags.string({
-      description:
-        "App ID the key belongs to (uses current app if not specified)",
+      description: "The app ID (defaults to current app)",
       env: "ABLY_APP_ID",
     }),
     force: Flags.boolean({
diff --git a/src/commands/auth/keys/switch.ts b/src/commands/auth/keys/switch.ts
index ae0302ee..fc3691e8 100644
--- a/src/commands/auth/keys/switch.ts
+++ b/src/commands/auth/keys/switch.ts
@@ -23,8 +23,7 @@ export default class KeysSwitchCommand extends ControlBaseCommand {
   static flags = {
     ...ControlBaseCommand.globalFlags,
     app: Flags.string({
-      description:
-        "App ID to switch keys for (uses current app if not specified)",
+      description: "The app ID or name (defaults to current app)",
       env: "ABLY_APP_ID",
     }),
   };
diff --git a/src/commands/auth/keys/update.ts b/src/commands/auth/keys/update.ts
index 2417b598..d8c0755a 100644
--- a/src/commands/auth/keys/update.ts
+++ b/src/commands/auth/keys/update.ts
@@ -21,8 +21,7 @@ export default class KeysUpdateCommand extends ControlBaseCommand {
   static flags = {
     ...ControlBaseCommand.globalFlags,
     app: Flags.string({
-      description:
-        "App ID the key belongs to (uses current app if not specified)",
+      description: "The app ID (defaults to current app)",
       env: "ABLY_APP_ID",
     }),
     capabilities: Flags.string({
diff --git a/src/commands/auth/revoke-token.ts b/src/commands/auth/revoke-token.ts
index a59d5abf..8d18ab2c 100644
--- a/src/commands/auth/revoke-token.ts
+++ b/src/commands/auth/revoke-token.ts
@@ -14,7 +14,7 @@ export default class RevokeTokenCommand extends AblyBaseCommand {
     }),
   };
 
-  static description = "Revokes the token provided";
+  static description = "Revoke a token";
 
   static examples = [
     "$ ably auth revoke-token TOKEN",
@@ -26,7 +26,7 @@ export default class RevokeTokenCommand extends AblyBaseCommand {
   static flags = {
     ...productApiFlags,
     app: Flags.string({
-      description: "App ID to use (uses current app if not specified)",
+      description: "The app ID or name (defaults to current app)",
       env: "ABLY_APP_ID",
     }),
 
diff --git a/src/commands/bench/publisher.ts b/src/commands/bench/publisher.ts
index 629fc3bc..323c1607 100644
--- a/src/commands/bench/publisher.ts
+++ b/src/commands/bench/publisher.ts
@@ -5,6 +5,7 @@ import Table from "cli-table3";
 
 import { AblyBaseCommand } from "../../base-command.js";
 import { productApiFlags } from "../../flags.js";
+import { success } from "../../utils/output.js";
 
 interface TestMetrics {
   batchCount: number;
@@ -528,7 +529,7 @@ export default class BenchPublisher extends AblyBaseCommand {
         process.stdout.write("\u001B[2J\u001B[0f");
       }
 
-      this.log("\n\n" + chalk.green("Benchmark Complete") + "\n");
+      this.log("\n\n" + success("Benchmark complete.") + "\n");
       const summaryTable = new Table({
         head: [chalk.white("Metric"), chalk.white("Value")],
         style: { border: [], head: [] },
diff --git a/src/commands/bench/subscriber.ts b/src/commands/bench/subscriber.ts
index 1f83ecea..25e58d70 100644
--- a/src/commands/bench/subscriber.ts
+++ b/src/commands/bench/subscriber.ts
@@ -6,6 +6,7 @@ import Table from "cli-table3";
 import { AblyBaseCommand } from "../../base-command.js";
 import { productApiFlags } from "../../flags.js";
 import { waitUntilInterruptedOrTimeout } from "../../utils/long-running.js";
+import { progress, resource, success } from "../../utils/output.js";
 
 interface TestMetrics {
   endToEndLatencies: number[]; // Publisher -> Subscriber
@@ -33,9 +34,8 @@ export default class BenchSubscriber extends AblyBaseCommand {
   static override flags = {
     ...productApiFlags,
     duration: Flags.integer({
-      char: "d",
-      description:
-        "Duration to subscribe for in seconds (default: indefinite until Ctrl+C)",
+      char: "D",
+      description: "Automatically exit after N seconds (0 = run indefinitely)",
     }),
   };
 
@@ -91,7 +91,7 @@ export default class BenchSubscriber extends AblyBaseCommand {
 
       // Show initial status
       if (!this.shouldOutputJson(flags)) {
-        this.log(`Attaching to channel: ${chalk.cyan(args.channel)}...`);
+        this.log(progress(`Attaching to channel: ${resource(args.channel)}`));
       }
 
       await this.handlePresence(channel, metrics, flags);
@@ -112,8 +112,8 @@ export default class BenchSubscriber extends AblyBaseCommand {
       // Show success message
       if (!this.shouldOutputJson(flags)) {
         this.log(
-          chalk.green(
-            `✓ Subscribed to channel: ${chalk.cyan(args.channel)}. Waiting for benchmark messages...`,
+          success(
+            `Subscribed to channel: ${resource(args.channel)}. Waiting for benchmark messages.`,
           ),
         );
       }
diff --git a/src/commands/channels/history.ts b/src/commands/channels/history.ts
index 05655bce..55dfa15a 100644
--- a/src/commands/channels/history.ts
+++ b/src/commands/channels/history.ts
@@ -5,6 +5,7 @@ import chalk from "chalk";
 import { AblyBaseCommand } from "../../base-command.js";
 import { productApiFlags } from "../../flags.js";
 import { formatJson, isJsonData } from "../../utils/json-formatter.js";
+import { resource } from "../../utils/output.js";
 
 export default class ChannelsHistory extends AblyBaseCommand {
   static override args = {
@@ -41,7 +42,7 @@ export default class ChannelsHistory extends AblyBaseCommand {
     }),
     limit: Flags.integer({
       default: 50,
-      description: "Maximum number of messages to retrieve (default: 50)",
+      description: "Maximum number of results to return (default: 50)",
     }),
     start: Flags.string({
       description: "Start time for the history query (ISO 8601 format)",
@@ -102,7 +103,7 @@ export default class ChannelsHistory extends AblyBaseCommand {
         }
 
         this.log(
-          `Found ${chalk.cyan(messages.length.toString())} messages in the history of channel ${chalk.green(channelName)}:`,
+          `Found ${chalk.cyan(messages.length.toString())} ${messages.length === 1 ? "message" : "messages"} in the history of channel: ${resource(channelName)}`,
         );
         this.log("");
 
@@ -112,13 +113,17 @@ export default class ChannelsHistory extends AblyBaseCommand {
             : "Unknown timestamp";
 
           this.log(chalk.dim(`[${index + 1}] ${timestamp}`));
-          this.log(`Event: ${chalk.yellow(message.name || "(none)")}`);
+          this.log(
+            `${chalk.dim("Event:")} ${chalk.yellow(message.name || "(none)")}`,
+          );
 
           if (message.clientId) {
-            this.log(`Client ID: ${chalk.blue(message.clientId)}`);
+            this.log(
+              `${chalk.dim("Client ID:")} ${chalk.blue(message.clientId)}`,
+            );
           }
 
-          this.log("Data:");
+          this.log(chalk.dim("Data:"));
           if (isJsonData(message.data)) {
             this.log(formatJson(message.data));
           } else {
diff --git a/src/commands/channels/inspect.ts b/src/commands/channels/inspect.ts
index 2f7322bd..e89c71fd 100644
--- a/src/commands/channels/inspect.ts
+++ b/src/commands/channels/inspect.ts
@@ -22,7 +22,7 @@ export default class ChannelsInspect extends AblyBaseCommand {
     ...productApiFlags,
     ...hiddenControlApiFlags,
     app: Flags.string({
-      description: "App ID to use (uses current app if not specified)",
+      description: "The app ID or name (defaults to current app)",
       env: "ABLY_APP_ID",
     }),
   };
diff --git a/src/commands/channels/list.ts b/src/commands/channels/list.ts
index 84b7caec..cf5e6bce 100644
--- a/src/commands/channels/list.ts
+++ b/src/commands/channels/list.ts
@@ -44,7 +44,7 @@ export default class ChannelsList extends AblyBaseCommand {
     ...productApiFlags,
     limit: Flags.integer({
       default: 100,
-      description: "Maximum number of channels to return (default: 100)",
+      description: "Maximum number of results to return (default: 100)",
     }),
     prefix: Flags.string({
       char: "p",
diff --git a/src/commands/channels/occupancy/subscribe.ts b/src/commands/channels/occupancy/subscribe.ts
index 66fdbcde..4b6ad568 100644
--- a/src/commands/channels/occupancy/subscribe.ts
+++ b/src/commands/channels/occupancy/subscribe.ts
@@ -5,6 +5,13 @@ import chalk from "chalk";
 import { AblyBaseCommand } from "../../../base-command.js";
 import { productApiFlags } from "../../../flags.js";
 import { waitUntilInterruptedOrTimeout } from "../../../utils/long-running.js";
+import {
+  listening,
+  progress,
+  resource,
+  success,
+  formatTimestamp,
+} from "../../../utils/output.js";
 
 export default class ChannelsOccupancySubscribe extends AblyBaseCommand {
   static override args = {
@@ -27,8 +34,7 @@ export default class ChannelsOccupancySubscribe extends AblyBaseCommand {
   static override flags = {
     ...productApiFlags,
     duration: Flags.integer({
-      description:
-        "Automatically exit after the given number of seconds (0 = run indefinitely)",
+      description: "Automatically exit after N seconds (0 = run indefinitely)",
       char: "D",
       required: false,
     }),
@@ -78,7 +84,9 @@ export default class ChannelsOccupancySubscribe extends AblyBaseCommand {
 
       if (!this.shouldOutputJson(flags)) {
         this.log(
-          `${chalk.green("Subscribing to occupancy events on channel:")} ${chalk.cyan(channelName)}`,
+          progress(
+            `Subscribing to occupancy events on channel: ${resource(channelName)}`,
+          ),
         );
       }
 
@@ -104,7 +112,7 @@ export default class ChannelsOccupancySubscribe extends AblyBaseCommand {
           this.log(this.formatJsonOutput(event, flags));
         } else {
           this.log(
-            `${chalk.gray(`[${timestamp}]`)} ${chalk.cyan(`Channel: ${channelName}`)} | ${chalk.yellow("Occupancy Update")}`,
+            `${formatTimestamp(timestamp)} ${chalk.cyan(`Channel: ${channelName}`)} | ${chalk.yellow("Occupancy Update")}`,
           );
 
           if (message.data !== null && message.data !== undefined) {
@@ -117,15 +125,21 @@ export default class ChannelsOccupancySubscribe extends AblyBaseCommand {
         }
       });
 
+      if (!this.shouldOutputJson(flags)) {
+        this.log(
+          success(
+            `Subscribed to occupancy on channel: ${resource(channelName)}.`,
+          ),
+        );
+        this.log(listening("Listening for occupancy events."));
+      }
+
       this.logCliEvent(
         flags,
         "occupancy",
         "listening",
         "Listening for occupancy events. Press Ctrl+C to exit.",
       );
-      if (!this.shouldOutputJson(flags)) {
-        this.log("Listening for occupancy events. Press Ctrl+C to exit.");
-      }
 
       // Wait until the user interrupts or the optional duration elapses
       const exitReason = await waitUntilInterruptedOrTimeout(flags.duration);
diff --git a/src/commands/channels/presence/enter.ts b/src/commands/channels/presence/enter.ts
index 965f69e3..95dfe48f 100644
--- a/src/commands/channels/presence/enter.ts
+++ b/src/commands/channels/presence/enter.ts
@@ -6,6 +6,12 @@ import { AblyBaseCommand } from "../../../base-command.js";
 import { clientIdFlag, productApiFlags } from "../../../flags.js";
 import { isJsonData } from "../../../utils/json-formatter.js";
 import { waitUntilInterruptedOrTimeout } from "../../../utils/long-running.js";
+import {
+  listening,
+  resource,
+  success,
+  formatTimestamp,
+} from "../../../utils/output.js";
 
 export default class ChannelsPresenceEnter extends AblyBaseCommand {
   static override args = {
@@ -35,8 +41,7 @@ export default class ChannelsPresenceEnter extends AblyBaseCommand {
       description: "Optional JSON data to associate with the presence",
     }),
     duration: Flags.integer({
-      description:
-        "Automatically exit after the given number of seconds (0 = run indefinitely)",
+      description: "Automatically exit after N seconds (0 = run indefinitely)",
       char: "D",
       required: false,
     }),
@@ -144,7 +149,7 @@ export default class ChannelsPresenceEnter extends AblyBaseCommand {
               ? `${chalk.dim(`[${this.sequenceCounter}]`)}`
               : "";
             this.log(
-              `${chalk.gray(`[${timestamp}]`)}${sequencePrefix} ${chalk.cyan(`Channel: ${channelName}`)} | ${chalk.yellow(`Action: ${presenceMessage.action}`)} | ${chalk.blue(`Client: ${presenceMessage.clientId || "N/A"}`)}`,
+              `${formatTimestamp(timestamp)}${sequencePrefix} ${chalk.cyan(`Channel: ${channelName}`)} | ${chalk.yellow(`Action: ${presenceMessage.action}`)} | ${chalk.blue(`Client: ${presenceMessage.clientId || "N/A"}`)}`,
             );
 
             if (
@@ -186,7 +191,7 @@ export default class ChannelsPresenceEnter extends AblyBaseCommand {
         flags,
         "presence",
         "entered",
-        `Successfully entered presence on channel ${channelName}`,
+        `Entered presence on channel ${channelName}`,
         enterEvent,
       );
 
@@ -194,17 +199,13 @@ export default class ChannelsPresenceEnter extends AblyBaseCommand {
         this.log(this.formatJsonOutput(enterEvent, flags));
       } else {
         this.log(
-          `${chalk.green("✓")} Entered channel ${chalk.cyan(channelName)} as client ${chalk.blue(client.auth.clientId)}`,
+          success(`Entered presence on channel: ${resource(channelName)}.`),
         );
-      }
 
-      if (!this.shouldOutputJson(flags)) {
         if (flags["show-others"]) {
-          this.log(
-            "\nListening for presence events until terminated. Press Ctrl+C to exit.",
-          );
+          this.log(listening("Listening for presence events."));
         } else {
-          this.log("\nStaying present. Press Ctrl+C to exit.");
+          this.log(listening("Staying present."));
         }
       }
 
diff --git a/src/commands/channels/presence/subscribe.ts b/src/commands/channels/presence/subscribe.ts
index 010a3261..0e864afb 100644
--- a/src/commands/channels/presence/subscribe.ts
+++ b/src/commands/channels/presence/subscribe.ts
@@ -5,6 +5,13 @@ import chalk from "chalk";
 import { AblyBaseCommand } from "../../../base-command.js";
 import { clientIdFlag, productApiFlags } from "../../../flags.js";
 import { waitUntilInterruptedOrTimeout } from "../../../utils/long-running.js";
+import {
+  listening,
+  progress,
+  resource,
+  success,
+  formatTimestamp,
+} from "../../../utils/output.js";
 
 export default class ChannelsPresenceSubscribe extends AblyBaseCommand {
   static override args = {
@@ -29,8 +36,7 @@ export default class ChannelsPresenceSubscribe extends AblyBaseCommand {
     ...productApiFlags,
     ...clientIdFlag,
     duration: Flags.integer({
-      description:
-        "Automatically exit after the given number of seconds (0 = run indefinitely)",
+      description: "Automatically exit after N seconds (0 = run indefinitely)",
       char: "D",
       required: false,
     }),
@@ -73,7 +79,9 @@ export default class ChannelsPresenceSubscribe extends AblyBaseCommand {
 
       if (!this.shouldOutputJson(flags)) {
         this.log(
-          `${chalk.green("Subscribing to presence events on channel:")} ${chalk.cyan(channelName)}`,
+          progress(
+            `Subscribing to presence events on channel: ${resource(channelName)}`,
+          ),
         );
       }
 
@@ -105,7 +113,7 @@ export default class ChannelsPresenceSubscribe extends AblyBaseCommand {
           const clientId = presenceMessage.clientId || "Unknown";
 
           this.log(
-            `${chalk.gray(`[${timestamp}]`)} ${chalk.cyan(`Channel: ${channelName}`)} | ${chalk.yellow(`Action: ${action}`)} | ${chalk.blue(`Client: ${clientId}`)}`,
+            `${formatTimestamp(timestamp)} ${chalk.cyan(`Channel: ${channelName}`)} | ${chalk.yellow(`Action: ${action}`)} | ${chalk.blue(`Client: ${clientId}`)}`,
           );
 
           if (
@@ -121,15 +129,21 @@ export default class ChannelsPresenceSubscribe extends AblyBaseCommand {
         }
       });
 
+      if (!this.shouldOutputJson(flags)) {
+        this.log(
+          success(
+            `Subscribed to presence on channel: ${resource(channelName)}.`,
+          ),
+        );
+        this.log(listening("Listening for presence events."));
+      }
+
       this.logCliEvent(
         flags,
         "presence",
         "listening",
         "Listening for presence events. Press Ctrl+C to exit.",
       );
-      if (!this.shouldOutputJson(flags)) {
-        this.log("Listening for presence events. Press Ctrl+C to exit.");
-      }
 
       // Wait until the user interrupts or the optional duration elapses
       const exitReason = await waitUntilInterruptedOrTimeout(flags.duration);
diff --git a/src/commands/channels/publish.ts b/src/commands/channels/publish.ts
index 823189e9..d7389f5f 100644
--- a/src/commands/channels/publish.ts
+++ b/src/commands/channels/publish.ts
@@ -5,6 +5,7 @@ import chalk from "chalk";
 import { AblyBaseCommand } from "../../base-command.js";
 import { clientIdFlag, productApiFlags } from "../../flags.js";
 import { BaseFlags } from "../../types/cli.js";
+import { resource, success } from "../../utils/output.js";
 
 export default class ChannelsPublish extends AblyBaseCommand {
   static override args = {
@@ -158,8 +159,8 @@ export default class ChannelsPublish extends AblyBaseCommand {
       total > 1 ? "multiPublishComplete" : "singlePublishComplete";
     const eventMessage =
       total > 1
-        ? `Finished publishing ${total} messages`
-        : "Finished publishing message";
+        ? `Published ${total} messages to channel ${args.channel}`
+        : `Published message to channel ${args.channel}`;
     this.logCliEvent(flags, "publish", eventType, eventMessage, finalResult);
 
     if (!this.shouldSuppressOutput(flags)) {
@@ -167,11 +168,15 @@ export default class ChannelsPublish extends AblyBaseCommand {
         this.log(this.formatJsonOutput(finalResult, flags));
       } else if (total > 1) {
         this.log(
-          `${chalk.green("✓")} ${published}/${total} messages published successfully${errors > 0 ? ` (${chalk.red(errors)} errors)` : ""}.`,
+          success(
+            `${published}/${total} messages published to channel: ${resource(args.channel as string)}${errors > 0 ? ` (${chalk.red(errors)} errors)` : ""}.`,
+          ),
         );
       } else if (errors === 0) {
         this.log(
-          `${chalk.green("✓")} Message published successfully to channel "${args.channel}".`,
+          success(
+            `Message published to channel: ${resource(args.channel as string)}.`,
+          ),
         );
       } else {
         // Error message already logged by publishMessages loop or prepareMessage
@@ -293,7 +298,7 @@ export default class ChannelsPublish extends AblyBaseCommand {
           flags,
           "publish",
           "messagePublished",
-          `Message ${messageIndex} published successfully to channel "${args.channel}"`,
+          `Message ${messageIndex} published to channel ${args.channel}`,
           { index: messageIndex, message, channel: args.channel },
         );
         if (
@@ -302,7 +307,9 @@ export default class ChannelsPublish extends AblyBaseCommand {
           count > 1 // Only show individual success messages when publishing multiple messages
         ) {
           this.log(
-            `${chalk.green("✓")} Message ${messageIndex} published successfully to channel "${args.channel}".`,
+            success(
+              `Message ${messageIndex} published to channel: ${resource(args.channel as string)}.`,
+            ),
           );
         }
       } catch (error) {
diff --git a/src/commands/channels/subscribe.ts b/src/commands/channels/subscribe.ts
index ad850f38..e149c4a5 100644
--- a/src/commands/channels/subscribe.ts
+++ b/src/commands/channels/subscribe.ts
@@ -6,6 +6,13 @@ import { AblyBaseCommand } from "../../base-command.js";
 import { clientIdFlag, productApiFlags } from "../../flags.js";
 import { formatJson, isJsonData } from "../../utils/json-formatter.js";
 import { waitUntilInterruptedOrTimeout } from "../../utils/long-running.js";
+import {
+  listening,
+  progress,
+  resource,
+  success,
+  formatTimestamp,
+} from "../../utils/output.js";
 
 export default class ChannelsSubscribe extends AblyBaseCommand {
   static override args = {
@@ -54,8 +61,7 @@ export default class ChannelsSubscribe extends AblyBaseCommand {
       description: "Enable delta compression for messages",
     }),
     duration: Flags.integer({
-      description:
-        "Automatically exit after the given number of seconds (0 = run indefinitely)",
+      description: "Automatically exit after N seconds (0 = run indefinitely)",
       char: "D",
       required: false,
     }),
@@ -176,7 +182,7 @@ export default class ChannelsSubscribe extends AblyBaseCommand {
           { channel: channel.name },
         );
         if (!this.shouldOutputJson(flags)) {
-          this.log(`Attaching to channel: ${chalk.cyan(channel.name)}...`);
+          this.log(progress(`Attaching to channel: ${resource(channel.name)}`));
         }
 
         // Set up channel state logging
@@ -232,15 +238,15 @@ export default class ChannelsSubscribe extends AblyBaseCommand {
 
             // Message header with timestamp and channel info
             this.log(
-              `${chalk.gray(`[${timestamp}]`)}${sequencePrefix} ${chalk.cyan(`Channel: ${channel.name}`)} | ${chalk.yellow(`Event: ${name}`)}`,
+              `${formatTimestamp(timestamp)}${sequencePrefix} ${chalk.cyan(`Channel: ${channel.name}`)} | ${chalk.yellow(`Event: ${name}`)}`,
             );
 
             // Message data with consistent formatting
             if (isJsonData(message.data)) {
-              this.log(chalk.blue("Data:"));
+              this.log(chalk.dim("Data:"));
               this.log(formatJson(message.data));
             } else {
-              this.log(`${chalk.blue("Data:")} ${message.data}`);
+              this.log(`${chalk.dim("Data:")} ${message.data}`);
             }
 
             this.log(""); // Empty line for better readability
@@ -253,24 +259,20 @@ export default class ChannelsSubscribe extends AblyBaseCommand {
 
       // Log the ready signal for E2E tests
       if (channelNames.length === 1) {
-        this.log(`Successfully attached to channel ${channelNames[0]}`);
+        this.log(`Successfully attached to channel: ${channelNames[0]}`);
       }
 
       // Show success message once all channels are attached
       if (!this.shouldOutputJson(flags)) {
         if (channelNames.length === 1) {
           this.log(
-            chalk.green(
-              `✓ Subscribed to channel: ${chalk.cyan(channelNames[0])}. Listening for messages...`,
-            ),
+            success(`Subscribed to channel: ${resource(channelNames[0])}.`),
           );
         } else {
-          this.log(
-            chalk.green(
-              `✓ Subscribed to ${channelNames.length} channels. Listening for messages...`,
-            ),
-          );
+          this.log(success(`Subscribed to ${channelNames.length} channels.`));
         }
+
+        this.log(listening("Listening for messages."));
       }
 
       this.logCliEvent(
diff --git a/src/commands/connections/test.ts b/src/commands/connections/test.ts
index b61bb53f..6abc035a 100644
--- a/src/commands/connections/test.ts
+++ b/src/commands/connections/test.ts
@@ -4,6 +4,7 @@ import chalk from "chalk";
 
 import { AblyBaseCommand } from "../../base-command.js";
 import { clientIdFlag, productApiFlags } from "../../flags.js";
+import { progress, success as successMsg } from "../../utils/output.js";
 
 export default class ConnectionsTest extends AblyBaseCommand {
   static override description = "Test connection to Ably";
@@ -169,9 +170,7 @@ export default class ConnectionsTest extends AblyBaseCommand {
           const partialSuccess = wsSuccess || xhrSuccess;
 
           if (allSuccess) {
-            this.log(
-              `${chalk.green("✓")} All connection tests passed successfully`,
-            );
+            this.log(successMsg("All connection tests passed successfully."));
           } else if (partialSuccess) {
             this.log(
               `${chalk.yellow("!")} Some connection tests succeeded, but others failed`,
@@ -186,7 +185,7 @@ export default class ConnectionsTest extends AblyBaseCommand {
         case "ws": {
           if (wsSuccess) {
             this.log(
-              `${chalk.green("✓")} WebSocket connection test passed successfully`,
+              successMsg("WebSocket connection test passed successfully."),
             );
           } else {
             this.log(`${chalk.red("✗")} WebSocket connection test failed`);
@@ -197,9 +196,7 @@ export default class ConnectionsTest extends AblyBaseCommand {
 
         case "xhr": {
           if (xhrSuccess) {
-            this.log(
-              `${chalk.green("✓")} HTTP connection test passed successfully`,
-            );
+            this.log(successMsg("HTTP connection test passed successfully."));
           } else {
             this.log(`${chalk.red("✗")} HTTP connection test failed`);
           }
@@ -225,7 +222,7 @@ export default class ConnectionsTest extends AblyBaseCommand {
       "Testing WebSocket connection...",
     );
     if (!this.shouldOutputJson(flags)) {
-      this.log("Testing WebSocket connection to Ably...");
+      this.log(progress("Testing WebSocket connection to Ably"));
     }
 
     try {
@@ -273,7 +270,7 @@ export default class ConnectionsTest extends AblyBaseCommand {
             { connectionId: client.connection.id },
           );
           if (!this.shouldOutputJson(flags)) {
-            this.log(`${chalk.green("✓")} WebSocket connection successful`);
+            this.log(successMsg("WebSocket connection successful."));
             this.log(
               `  Connection ID: ${chalk.cyan(client.connection.id || "unknown")}`,
             );
@@ -335,7 +332,7 @@ export default class ConnectionsTest extends AblyBaseCommand {
       "Testing HTTP connection...",
     );
     if (!this.shouldOutputJson(flags)) {
-      this.log("Testing HTTP connection to Ably...");
+      this.log(progress("Testing HTTP connection to Ably"));
     }
 
     try {
@@ -382,7 +379,7 @@ export default class ConnectionsTest extends AblyBaseCommand {
             { connectionId: client.connection.id },
           );
           if (!this.shouldOutputJson(flags)) {
-            this.log(`${chalk.green("✓")} HTTP connection successful`);
+            this.log(successMsg("HTTP connection successful."));
             this.log(
               `  Connection ID: ${chalk.cyan(client.connection.id || "unknown")}`,
             );
diff --git a/src/commands/integrations/create.ts b/src/commands/integrations/create.ts
index a96d496b..3d952238 100644
--- a/src/commands/integrations/create.ts
+++ b/src/commands/integrations/create.ts
@@ -1,7 +1,7 @@
 import { Flags } from "@oclif/core";
-import chalk from "chalk";
 
 import { ControlBaseCommand } from "../../control-base-command.js";
+import { resource, success } from "../../utils/output.js";
 
 // Interface for basic integration data structure
 interface IntegrationData {
@@ -26,7 +26,7 @@ export default class IntegrationsCreateCommand extends ControlBaseCommand {
   static flags = {
     ...ControlBaseCommand.globalFlags,
     app: Flags.string({
-      description: "App ID or name to create the integration in",
+      description: "The app ID or name (defaults to current app)",
       required: false,
     }),
     "channel-filter": Flags.string({
@@ -155,7 +155,11 @@ export default class IntegrationsCreateCommand extends ControlBaseCommand {
           this.formatJsonOutput({ integration: createdIntegration }, flags),
         );
       } else {
-        this.log(chalk.green("✓ Integration created successfully!"));
+        this.log(
+          success(
+            `Integration rule created: ${resource(createdIntegration.id)}.`,
+          ),
+        );
         this.log(`ID: ${createdIntegration.id}`);
         this.log(`App ID: ${createdIntegration.appId}`);
         this.log(`Type: ${createdIntegration.ruleType}`);
diff --git a/src/commands/integrations/delete.ts b/src/commands/integrations/delete.ts
index c9d1cb5c..f6c0f530 100644
--- a/src/commands/integrations/delete.ts
+++ b/src/commands/integrations/delete.ts
@@ -1,7 +1,7 @@
 import { Args, Flags } from "@oclif/core";
-import chalk from "chalk";
 
 import { ControlBaseCommand } from "../../control-base-command.js";
+import { resource, success } from "../../utils/output.js";
 import { promptForConfirmation } from "../../utils/prompt-confirmation.js";
 
 export default class IntegrationsDeleteCommand extends ControlBaseCommand {
@@ -23,7 +23,7 @@ export default class IntegrationsDeleteCommand extends ControlBaseCommand {
   static flags = {
     ...ControlBaseCommand.globalFlags,
     app: Flags.string({
-      description: "App ID or name to delete the integration from",
+      description: "The app ID or name (defaults to current app)",
       required: false,
     }),
     force: Flags.boolean({
@@ -76,7 +76,9 @@ export default class IntegrationsDeleteCommand extends ControlBaseCommand {
 
       await controlApi.deleteRule(appId, args.integrationId);
 
-      this.log(chalk.green("✓ Integration deleted successfully!"));
+      this.log(
+        success(`Integration rule deleted: ${resource(integration.id)}.`),
+      );
       this.log(`ID: ${integration.id}`);
       this.log(`App ID: ${integration.appId}`);
       this.log(`Type: ${integration.ruleType}`);
diff --git a/src/commands/integrations/get.ts b/src/commands/integrations/get.ts
index e5c647b8..3fc2f53a 100644
--- a/src/commands/integrations/get.ts
+++ b/src/commands/integrations/get.ts
@@ -23,7 +23,7 @@ export default class IntegrationsGetCommand extends ControlBaseCommand {
     ...ControlBaseCommand.globalFlags,
 
     app: Flags.string({
-      description: "App ID or name to get the integration rule from",
+      description: "The app ID or name (defaults to current app)",
       required: false,
     }),
   };
diff --git a/src/commands/integrations/list.ts b/src/commands/integrations/list.ts
index c9979365..8b11dc21 100644
--- a/src/commands/integrations/list.ts
+++ b/src/commands/integrations/list.ts
@@ -16,7 +16,7 @@ export default class IntegrationsListCommand extends ControlBaseCommand {
     ...ControlBaseCommand.globalFlags,
 
     app: Flags.string({
-      description: "App ID or name to list integrations for",
+      description: "The app ID or name (defaults to current app)",
       required: false,
     }),
   };
diff --git a/src/commands/integrations/update.ts b/src/commands/integrations/update.ts
index 9f360064..c70a745d 100644
--- a/src/commands/integrations/update.ts
+++ b/src/commands/integrations/update.ts
@@ -34,7 +34,7 @@ export default class IntegrationsUpdateCommand extends ControlBaseCommand {
   static flags = {
     ...ControlBaseCommand.globalFlags,
     app: Flags.string({
-      description: "App ID or name of the app containing the integration rule",
+      description: "The app ID or name (defaults to current app)",
       required: false,
     }),
     "channel-filter": Flags.string({
diff --git a/src/commands/logs/channel-lifecycle/subscribe.ts b/src/commands/logs/channel-lifecycle/subscribe.ts
index f1f38f29..d2e17a7b 100644
--- a/src/commands/logs/channel-lifecycle/subscribe.ts
+++ b/src/commands/logs/channel-lifecycle/subscribe.ts
@@ -6,6 +6,12 @@ import { AblyBaseCommand } from "../../../base-command.js";
 import { productApiFlags } from "../../../flags.js";
 import { formatJson, isJsonData } from "../../../utils/json-formatter.js";
 import { waitUntilInterruptedOrTimeout } from "../../../utils/long-running.js";
+import {
+  listening,
+  resource,
+  success,
+  formatTimestamp,
+} from "../../../utils/output.js";
 
 export default class LogsChannelLifecycleSubscribe extends AblyBaseCommand {
   static override description =
@@ -18,13 +24,9 @@ export default class LogsChannelLifecycleSubscribe extends AblyBaseCommand {
 
   static override flags = {
     ...productApiFlags,
-    json: Flags.boolean({
-      default: false,
-      description: "Output results as JSON",
-    }),
     rewind: Flags.integer({
       default: 0,
-      description: "Number of messages to rewind when subscribing",
+      description: "Number of messages to rewind when subscribing (default: 0)",
     }),
   };
 
@@ -79,8 +81,8 @@ export default class LogsChannelLifecycleSubscribe extends AblyBaseCommand {
         `Subscribing to ${channelName}...`,
       );
       if (!this.shouldOutputJson(flags)) {
-        this.log(`Subscribing to ${chalk.cyan(channelName)}...`);
-        this.log("Press Ctrl+C to exit");
+        this.log(success(`Subscribed to ${resource(channelName)}.`));
+        this.log(listening("Listening for channel lifecycle logs."));
         this.log("");
       }
 
@@ -125,7 +127,7 @@ export default class LogsChannelLifecycleSubscribe extends AblyBaseCommand {
 
         // Format the log output with consistent styling
         this.log(
-          `${chalk.gray(`[${timestamp}]`)} ${chalk.cyan(`Channel: ${channelName}`)} | ${eventColor(`Event: ${event}`)}`,
+          `${formatTimestamp(timestamp)} ${chalk.cyan(`Channel: ${channelName}`)} | ${eventColor(`Event: ${event}`)}`,
         );
 
         if (message.data) {
@@ -143,7 +145,7 @@ export default class LogsChannelLifecycleSubscribe extends AblyBaseCommand {
         flags,
         "logs",
         "subscribed",
-        `Successfully subscribed to ${channelName}`,
+        `Subscribed to ${channelName}`,
       );
 
       this.logCliEvent(flags, "logs", "listening", "Listening for logs...");
diff --git a/src/commands/logs/connection-lifecycle/history.ts b/src/commands/logs/connection-lifecycle/history.ts
index 22574ba0..2574d412 100644
--- a/src/commands/logs/connection-lifecycle/history.ts
+++ b/src/commands/logs/connection-lifecycle/history.ts
@@ -26,7 +26,7 @@ export default class LogsConnectionLifecycleHistory extends AblyBaseCommand {
     }),
     limit: Flags.integer({
       default: 100,
-      description: "Maximum number of logs to retrieve",
+      description: "Maximum number of results to return (default: 100)",
     }),
   };
 
diff --git a/src/commands/logs/connection-lifecycle/subscribe.ts b/src/commands/logs/connection-lifecycle/subscribe.ts
index 198f8a3a..caa76368 100644
--- a/src/commands/logs/connection-lifecycle/subscribe.ts
+++ b/src/commands/logs/connection-lifecycle/subscribe.ts
@@ -5,6 +5,7 @@ import chalk from "chalk";
 import { AblyBaseCommand } from "../../../base-command.js";
 import { productApiFlags } from "../../../flags.js";
 import { waitUntilInterruptedOrTimeout } from "../../../utils/long-running.js";
+import { listening, success, formatTimestamp } from "../../../utils/output.js";
 
 export default class LogsConnectionLifecycleSubscribe extends AblyBaseCommand {
   static override description = "Subscribe to live connection lifecycle logs";
@@ -19,8 +20,7 @@ export default class LogsConnectionLifecycleSubscribe extends AblyBaseCommand {
   static override flags = {
     ...productApiFlags,
     duration: Flags.integer({
-      description:
-        "Automatically exit after the given number of seconds (0 = run indefinitely)",
+      description: "Automatically exit after N seconds (0 = run indefinitely)",
       char: "D",
       required: false,
     }),
@@ -75,7 +75,7 @@ export default class LogsConnectionLifecycleSubscribe extends AblyBaseCommand {
       );
 
       if (!this.shouldOutputJson(flags)) {
-        this.log(`${chalk.green("Subscribing to connection lifecycle logs")}`);
+        this.log(success("Subscribed to connection lifecycle logs."));
       }
 
       // Subscribe to connection lifecycle logs
@@ -101,7 +101,7 @@ export default class LogsConnectionLifecycleSubscribe extends AblyBaseCommand {
           this.log(this.formatJsonOutput(event, flags));
         } else {
           this.log(
-            `${chalk.gray(`[${timestamp}]`)} ${chalk.cyan(`Event: ${event.event}`)}`,
+            `${formatTimestamp(timestamp)} ${chalk.cyan(`Event: ${event.event}`)}`,
           );
 
           if (message.data !== null && message.data !== undefined) {
@@ -121,9 +121,7 @@ export default class LogsConnectionLifecycleSubscribe extends AblyBaseCommand {
         "Listening for connection lifecycle log events. Press Ctrl+C to exit.",
       );
       if (!this.shouldOutputJson(flags)) {
-        this.log(
-          "Listening for connection lifecycle log events. Press Ctrl+C to exit.",
-        );
+        this.log(listening("Listening for connection lifecycle log events."));
       }
 
       // Wait until the user interrupts or the optional duration elapses
diff --git a/src/commands/logs/history.ts b/src/commands/logs/history.ts
index 05b85597..a1a39f3d 100644
--- a/src/commands/logs/history.ts
+++ b/src/commands/logs/history.ts
@@ -26,7 +26,7 @@ export default class LogsHistory extends AblyBaseCommand {
     }),
     limit: Flags.integer({
       default: 100,
-      description: "Maximum number of logs to retrieve",
+      description: "Maximum number of results to return (default: 100)",
     }),
   };
 
diff --git a/src/commands/logs/push/history.ts b/src/commands/logs/push/history.ts
index abfc5eaf..37f200f1 100644
--- a/src/commands/logs/push/history.ts
+++ b/src/commands/logs/push/history.ts
@@ -4,6 +4,7 @@ import chalk from "chalk";
 import { AblyBaseCommand } from "../../../base-command.js";
 import { productApiFlags } from "../../../flags.js";
 import { formatJson, isJsonData } from "../../../utils/json-formatter.js";
+import { formatTimestamp } from "../../../utils/output.js";
 
 export default class LogsPushHistory extends AblyBaseCommand {
   static override description = "Retrieve push notification log history";
@@ -25,7 +26,7 @@ export default class LogsPushHistory extends AblyBaseCommand {
     }),
     limit: Flags.integer({
       default: 100,
-      description: "Maximum number of logs to retrieve",
+      description: "Maximum number of results to return (default: 100)",
     }),
   };
 
@@ -130,7 +131,7 @@ export default class LogsPushHistory extends AblyBaseCommand {
 
           // Format the log output
           this.log(
-            `${chalk.dim(`[${timestamp}]`)} Channel: ${chalk.cyan(channelName)} | Event: ${eventColor(event)}`,
+            `${formatTimestamp(timestamp)} Channel: ${chalk.cyan(channelName)} | Event: ${eventColor(event)}`,
           );
           if (message.data) {
             this.log("Data:");
diff --git a/src/commands/logs/push/subscribe.ts b/src/commands/logs/push/subscribe.ts
index d1da5a7b..b95f8945 100644
--- a/src/commands/logs/push/subscribe.ts
+++ b/src/commands/logs/push/subscribe.ts
@@ -5,6 +5,12 @@ import chalk from "chalk";
 import { AblyBaseCommand } from "../../../base-command.js";
 import { productApiFlags } from "../../../flags.js";
 import { formatJson, isJsonData } from "../../../utils/json-formatter.js";
+import {
+  listening,
+  resource,
+  success,
+  formatTimestamp,
+} from "../../../utils/output.js";
 
 export default class LogsPushSubscribe extends AblyBaseCommand {
   static override description =
@@ -17,13 +23,9 @@ export default class LogsPushSubscribe extends AblyBaseCommand {
 
   static override flags = {
     ...productApiFlags,
-    json: Flags.boolean({
-      default: false,
-      description: "Output results as JSON",
-    }),
     rewind: Flags.integer({
       default: 0,
-      description: "Number of messages to rewind when subscribing",
+      description: "Number of messages to rewind when subscribing (default: 0)",
     }),
   };
 
@@ -76,11 +78,6 @@ export default class LogsPushSubscribe extends AblyBaseCommand {
         "subscribing",
         `Subscribing to ${channelName}...`,
       );
-      if (!this.shouldOutputJson(flags)) {
-        this.log(`Subscribing to ${chalk.cyan(channelName)}...`);
-        this.log("Press Ctrl+C to exit");
-        this.log("");
-      }
 
       // Subscribe to the channel
       channel.subscribe((message) => {
@@ -147,7 +144,7 @@ export default class LogsPushSubscribe extends AblyBaseCommand {
 
         // Format the log output
         this.log(
-          `${chalk.dim(`[${timestamp}]`)} Channel: ${chalk.cyan(channelName)} | Event: ${eventColor(event)}`,
+          `${formatTimestamp(timestamp)} Channel: ${chalk.cyan(channelName)} | Event: ${eventColor(event)}`,
         );
         if (message.data) {
           if (isJsonData(message.data)) {
@@ -160,11 +157,18 @@ export default class LogsPushSubscribe extends AblyBaseCommand {
 
         this.log("");
       });
+
+      if (!this.shouldOutputJson(flags)) {
+        this.log(success(`Subscribed to ${resource(channelName)}.`));
+        this.log(listening("Listening for push logs."));
+        this.log("");
+      }
+
       this.logCliEvent(
         flags,
         "logs",
         "subscribed",
-        `Successfully subscribed to ${channelName}`,
+        `Subscribed to ${channelName}`,
       );
 
       // Set up cleanup for when the process is terminated
diff --git a/src/commands/logs/subscribe.ts b/src/commands/logs/subscribe.ts
index 2178a3c8..5a908b0b 100644
--- a/src/commands/logs/subscribe.ts
+++ b/src/commands/logs/subscribe.ts
@@ -5,6 +5,12 @@ import chalk from "chalk";
 import { AblyBaseCommand } from "../../base-command.js";
 import { productApiFlags } from "../../flags.js";
 import { waitUntilInterruptedOrTimeout } from "../../utils/long-running.js";
+import {
+  listening,
+  resource,
+  success,
+  formatTimestamp,
+} from "../../utils/output.js";
 
 export default class LogsSubscribe extends AblyBaseCommand {
   static override description = "Subscribe to live app logs";
@@ -21,14 +27,13 @@ export default class LogsSubscribe extends AblyBaseCommand {
   static override flags = {
     ...productApiFlags,
     duration: Flags.integer({
-      description:
-        "Automatically exit after the given number of seconds (0 = run indefinitely)",
+      description: "Automatically exit after N seconds (0 = run indefinitely)",
       char: "D",
       required: false,
     }),
     rewind: Flags.integer({
       default: 0,
-      description: "Number of messages to rewind when subscribing",
+      description: "Number of messages to rewind when subscribing (default: 0)",
     }),
     type: Flags.string({
       description: "Filter by log type",
@@ -113,7 +118,7 @@ export default class LogsSubscribe extends AblyBaseCommand {
 
       if (!this.shouldOutputJson(flags)) {
         this.log(
-          `${chalk.green("Subscribing to app logs:")} ${chalk.cyan(logTypes.join(", "))}`,
+          success(`Subscribed to app logs: ${resource(logTypes.join(", "))}.`),
         );
       }
 
@@ -141,7 +146,7 @@ export default class LogsSubscribe extends AblyBaseCommand {
             this.log(this.formatJsonOutput(event, flags));
           } else {
             this.log(
-              `${chalk.gray(`[${timestamp}]`)} ${chalk.cyan(`Type: ${logType}`)}`,
+              `${formatTimestamp(timestamp)} ${chalk.cyan(`Type: ${logType}`)}`,
             );
 
             if (message.data !== null && message.data !== undefined) {
@@ -163,7 +168,7 @@ export default class LogsSubscribe extends AblyBaseCommand {
         "Listening for log events. Press Ctrl+C to exit.",
       );
       if (!this.shouldOutputJson(flags)) {
-        this.log("Listening for log events. Press Ctrl+C to exit.");
+        this.log(listening("Listening for log events."));
       }
 
       // Wait until the user interrupts or the optional duration elapses
diff --git a/src/commands/queues/create.ts b/src/commands/queues/create.ts
index 6209c388..ff908d05 100644
--- a/src/commands/queues/create.ts
+++ b/src/commands/queues/create.ts
@@ -1,7 +1,7 @@
 import { Flags } from "@oclif/core";
-import chalk from "chalk";
 
 import { ControlBaseCommand } from "../../control-base-command.js";
+import { resource, success } from "../../utils/output.js";
 
 export default class QueuesCreateCommand extends ControlBaseCommand {
   static description = "Create a queue";
@@ -15,7 +15,7 @@ export default class QueuesCreateCommand extends ControlBaseCommand {
   static flags = {
     ...ControlBaseCommand.globalFlags,
     app: Flags.string({
-      description: "App ID or name to create the queue in",
+      description: "The app ID or name (defaults to current app)",
       required: false,
     }),
     "max-length": Flags.integer({
@@ -72,7 +72,7 @@ export default class QueuesCreateCommand extends ControlBaseCommand {
           ),
         );
       } else {
-        this.log(chalk.green("✓ Queue created successfully!"));
+        this.log(success(`Queue created: ${resource(createdQueue.name)}.`));
         this.log(`Queue ID: ${createdQueue.id}`);
         this.log(`Name: ${createdQueue.name}`);
         this.log(`Region: ${createdQueue.region}`);
diff --git a/src/commands/queues/delete.ts b/src/commands/queues/delete.ts
index 3e6aab94..3349b7a1 100644
--- a/src/commands/queues/delete.ts
+++ b/src/commands/queues/delete.ts
@@ -22,7 +22,7 @@ export default class QueuesDeleteCommand extends ControlBaseCommand {
   static flags = {
     ...ControlBaseCommand.globalFlags,
     app: Flags.string({
-      description: "App ID or name to delete the queue from",
+      description: "The app ID or name (defaults to current app)",
       required: false,
     }),
     force: Flags.boolean({
diff --git a/src/commands/queues/list.ts b/src/commands/queues/list.ts
index eb96127c..d01f7e30 100644
--- a/src/commands/queues/list.ts
+++ b/src/commands/queues/list.ts
@@ -54,7 +54,7 @@ export default class QueuesListCommand extends ControlBaseCommand {
     ...ControlBaseCommand.globalFlags,
 
     app: Flags.string({
-      description: "App ID or name to list queues for",
+      description: "The app ID or name (defaults to current app)",
       required: false,
     }),
   };
diff --git a/src/commands/rooms/list.ts b/src/commands/rooms/list.ts
index 7d7f105a..a87790ac 100644
--- a/src/commands/rooms/list.ts
+++ b/src/commands/rooms/list.ts
@@ -44,7 +44,7 @@ export default class RoomsList extends ChatBaseCommand {
     ...ChatBaseCommand.globalFlags,
     limit: Flags.integer({
       default: 100,
-      description: "Maximum number of rooms to return (default: 100)",
+      description: "Maximum number of results to return (default: 100)",
     }),
     prefix: Flags.string({
       char: "p",
diff --git a/src/commands/rooms/messages/history.ts b/src/commands/rooms/messages/history.ts
index 276fc618..fb415356 100644
--- a/src/commands/rooms/messages/history.ts
+++ b/src/commands/rooms/messages/history.ts
@@ -3,6 +3,7 @@ import { OrderBy } from "@ably/chat";
 import chalk from "chalk";
 
 import { ChatBaseCommand } from "../../../chat-base-command.js";
+import { formatTimestamp } from "../../../utils/output.js";
 
 export default class MessagesHistory extends ChatBaseCommand {
   static override args = {
@@ -35,7 +36,7 @@ export default class MessagesHistory extends ChatBaseCommand {
     limit: Flags.integer({
       char: "l",
       default: 50,
-      description: "Maximum number of messages to retrieve (default: 50)",
+      description: "Maximum number of results to return (default: 50)",
     }),
     order: Flags.string({
       default: "newestFirst",
@@ -154,7 +155,7 @@ export default class MessagesHistory extends ChatBaseCommand {
             const author = message.clientId || "Unknown";
 
             this.log(
-              `${chalk.gray(`[${timestamp}]`)} ${chalk.cyan(`${author}:`)} ${message.text}`,
+              `${formatTimestamp(timestamp)} ${chalk.cyan(`${author}:`)} ${message.text}`,
             );
 
             // Show metadata if enabled and available
diff --git a/src/commands/rooms/messages/reactions/remove.ts b/src/commands/rooms/messages/reactions/remove.ts
index 22bec436..711cbf08 100644
--- a/src/commands/rooms/messages/reactions/remove.ts
+++ b/src/commands/rooms/messages/reactions/remove.ts
@@ -8,6 +8,7 @@ import {
 import chalk from "chalk";
 
 import { ChatBaseCommand } from "../../../../chat-base-command.js";
+import { resource, success } from "../../../../utils/output.js";
 
 // Map CLI-friendly type names to SDK MessageReactionType values
 const REACTION_TYPE_MAP: Record<string, MessageReactionType> = {
@@ -183,7 +184,9 @@ export default class MessagesReactionsRemove extends ChatBaseCommand {
         this.log(this.formatJsonOutput(resultData, flags));
       } else {
         this.log(
-          `${chalk.green("✓")} Removed reaction ${chalk.yellow(reaction)} from message ${chalk.cyan(messageSerial)} in room ${chalk.cyan(room)}`,
+          success(
+            `Removed reaction ${chalk.yellow(reaction)} from message ${resource(messageSerial)} in room ${resource(room)}`,
+          ),
         );
       }
     } catch (error) {
diff --git a/src/commands/rooms/messages/reactions/send.ts b/src/commands/rooms/messages/reactions/send.ts
index 16caf278..63af3fa3 100644
--- a/src/commands/rooms/messages/reactions/send.ts
+++ b/src/commands/rooms/messages/reactions/send.ts
@@ -9,6 +9,7 @@ import {
 import chalk from "chalk";
 
 import { ChatBaseCommand } from "../../../../chat-base-command.js";
+import { resource, success } from "../../../../utils/output.js";
 
 // Map CLI-friendly type names to SDK MessageReactionType values
 const REACTION_TYPE_MAP: Record<string, MessageReactionType> = {
@@ -224,7 +225,9 @@ export default class MessagesReactionsSend extends ChatBaseCommand {
         this.log(this.formatJsonOutput(resultData, flags));
       } else {
         this.log(
-          `${chalk.green("✓")} Sent reaction ${chalk.yellow(reaction)} to message ${chalk.cyan(messageSerial)} in room ${chalk.cyan(room)}`,
+          success(
+            `Sent reaction ${chalk.yellow(reaction)} to message ${resource(messageSerial)} in room ${resource(room)}`,
+          ),
         );
       }
     } catch (error) {
diff --git a/src/commands/rooms/messages/reactions/subscribe.ts b/src/commands/rooms/messages/reactions/subscribe.ts
index beb75aee..7d77b4c0 100644
--- a/src/commands/rooms/messages/reactions/subscribe.ts
+++ b/src/commands/rooms/messages/reactions/subscribe.ts
@@ -10,6 +10,13 @@ import chalk from "chalk";
 
 import { ChatBaseCommand } from "../../../../chat-base-command.js";
 import { waitUntilInterruptedOrTimeout } from "../../../../utils/long-running.js";
+import {
+  listening,
+  progress,
+  resource,
+  success,
+  formatTimestamp,
+} from "../../../../utils/output.js";
 
 export default class MessagesReactionsSubscribe extends ChatBaseCommand {
   static override args = {
@@ -36,8 +43,7 @@ export default class MessagesReactionsSubscribe extends ChatBaseCommand {
       default: false,
     }),
     duration: Flags.integer({
-      description:
-        "Automatically exit after the given number of seconds (0 = run indefinitely)",
+      description: "Automatically exit after N seconds (0 = run indefinitely)",
       char: "D",
       required: false,
     }),
@@ -72,7 +78,9 @@ export default class MessagesReactionsSubscribe extends ChatBaseCommand {
       );
       if (!this.shouldOutputJson(flags)) {
         this.log(
-          `Connecting to Ably and subscribing to message reactions in room ${chalk.cyan(room)}...`,
+          progress(
+            `Connecting to Ably and subscribing to message reactions in room ${resource(room)}`,
+          ),
         );
       }
 
@@ -121,9 +129,11 @@ export default class MessagesReactionsSubscribe extends ChatBaseCommand {
         switch (statusChange.current) {
           case RoomStatus.Attached: {
             if (!this.shouldOutputJson(flags)) {
-              this.log(chalk.green("Successfully connected to Ably"));
+              this.log(success("Connected to Ably."));
               this.log(
-                `Listening for message reactions in room ${chalk.cyan(room)}. Press Ctrl+C to exit.`,
+                listening(
+                  `Listening for message reactions in room ${resource(room)}.`,
+                ),
               );
             }
 
@@ -195,7 +205,7 @@ export default class MessagesReactionsSubscribe extends ChatBaseCommand {
               );
             } else {
               this.log(
-                `[${chalk.dim(timestamp)}] ${chalk.green("⚡")} ${chalk.blue(event.reaction.clientId || "Unknown")} [${event.reaction.type}] ${event.type}: ${chalk.yellow(event.reaction.name || "unknown")} to message ${chalk.cyan(event.reaction.messageSerial)}`,
+                `${formatTimestamp(timestamp)} ${chalk.green("⚡")} ${chalk.blue(event.reaction.clientId || "Unknown")} [${event.reaction.type}] ${event.type}: ${chalk.yellow(event.reaction.name || "unknown")} to message ${chalk.cyan(event.reaction.messageSerial)}`,
               );
             }
           },
@@ -247,7 +257,7 @@ export default class MessagesReactionsSubscribe extends ChatBaseCommand {
               );
             } else {
               this.log(
-                `[${chalk.dim(timestamp)}] ${chalk.green("📊")} Reaction summary for message ${chalk.cyan(event.messageSerial)}:`,
+                `${formatTimestamp(timestamp)} ${chalk.green("📊")} Reaction summary for message ${chalk.cyan(event.messageSerial)}:`,
               );
 
               // Display the summaries by type if they exist
diff --git a/src/commands/rooms/messages/send.ts b/src/commands/rooms/messages/send.ts
index b543c04b..068595a6 100644
--- a/src/commands/rooms/messages/send.ts
+++ b/src/commands/rooms/messages/send.ts
@@ -3,6 +3,7 @@ import { ChatClient, ConnectionStatusChange, JsonObject } from "@ably/chat";
 
 import { clientIdFlag } from "../../../flags.js";
 import { ChatBaseCommand } from "../../../chat-base-command.js";
+import { success, resource } from "../../../utils/output.js";
 
 // Define interfaces for the message send command
 interface MessageToSend {
@@ -123,7 +124,7 @@ export default class MessagesSend extends ChatBaseCommand {
             flags,
             "message",
             "metadataParsed",
-            "Message metadata parsed successfully",
+            "Message metadata parsed",
             { metadata },
           );
         } catch (error) {
@@ -168,7 +169,7 @@ export default class MessagesSend extends ChatBaseCommand {
         flags,
         "room",
         "attached",
-        `Successfully attached to room ${args.room}`,
+        `Attached to room ${args.room}`,
       );
 
       // Validate count and delay
@@ -258,7 +259,7 @@ export default class MessagesSend extends ChatBaseCommand {
                 flags,
                 "message",
                 "sentSuccess",
-                `Message ${i + 1} sent successfully`,
+                `Message ${i + 1} sent`,
                 { index: i + 1 },
               );
 
@@ -349,7 +350,9 @@ export default class MessagesSend extends ChatBaseCommand {
               );
             }
             this.log(
-              `${sentCount}/${count} messages sent successfully (${errorCount} errors).`,
+              success(
+                `${sentCount}/${count} messages sent to room ${resource(args.room)} (${errorCount} errors).`,
+              ),
             );
           }
         }
@@ -381,7 +384,7 @@ export default class MessagesSend extends ChatBaseCommand {
             flags,
             "message",
             "singleSendComplete",
-            "Message sent successfully",
+            "Message sent",
             result,
           );
 
@@ -389,7 +392,7 @@ export default class MessagesSend extends ChatBaseCommand {
             if (this.shouldOutputJson(flags)) {
               this.log(this.formatJsonOutput(result, flags));
             } else {
-              this.log("Message sent successfully.");
+              this.log(success(`Message sent to room ${resource(args.room)}.`));
             }
           }
         } catch (error) {
diff --git a/src/commands/rooms/messages/subscribe.ts b/src/commands/rooms/messages/subscribe.ts
index f11ee7f0..605fbb8e 100644
--- a/src/commands/rooms/messages/subscribe.ts
+++ b/src/commands/rooms/messages/subscribe.ts
@@ -5,6 +5,12 @@ import chalk from "chalk";
 import { clientIdFlag } from "../../../flags.js";
 import { ChatBaseCommand } from "../../../chat-base-command.js";
 import { waitUntilInterruptedOrTimeout } from "../../../utils/long-running.js";
+import {
+  success,
+  listening,
+  resource,
+  formatTimestamp,
+} from "../../../utils/output.js";
 
 // Define message interface
 interface ChatMessage {
@@ -56,8 +62,7 @@ export default class MessagesSubscribe extends ChatBaseCommand {
       description: "Display message metadata if available",
     }),
     duration: Flags.integer({
-      description:
-        "Automatically exit after the given number of seconds (0 = run indefinitely)",
+      description: "Automatically exit after N seconds (0 = run indefinitely)",
       char: "D",
       required: false,
     }),
@@ -146,7 +151,7 @@ export default class MessagesSubscribe extends ChatBaseCommand {
 
         // Message content with consistent formatting
         this.log(
-          `${roomPrefix}${chalk.gray(`[${timestamp}]`)}${sequencePrefix} ${chalk.cyan(`${author}:`)} ${message.text}`,
+          `${roomPrefix}${formatTimestamp(timestamp)}${sequencePrefix} ${chalk.cyan(`${author}:`)} ${message.text}`,
         );
 
         // Show metadata if enabled and available
@@ -163,7 +168,7 @@ export default class MessagesSubscribe extends ChatBaseCommand {
       flags,
       "room",
       "subscribedToMessages",
-      `Successfully subscribed to messages in room ${roomName}`,
+      `Subscribed to messages in room ${roomName}`,
     );
 
     // Subscribe to room status changes
@@ -192,11 +197,8 @@ export default class MessagesSubscribe extends ChatBaseCommand {
         // Log the ready signal for E2E tests
         this.log(`Connected to room: ${roomName}`);
         if (!this.shouldOutputJson(flags)) {
-          this.log(
-            chalk.green(
-              `✓ Subscribed to room: ${chalk.cyan(roomName)}. Listening for messages...`,
-            ),
-          );
+          this.log(success(`Subscribed to room: ${resource(roomName)}.`));
+          this.log(listening("Listening for messages."));
         }
       } else if (change.current === "failed") {
         const errorMsg = room.error?.message || "Unknown error";
@@ -211,7 +213,7 @@ export default class MessagesSubscribe extends ChatBaseCommand {
       flags,
       "room",
       "subscribedToStatus",
-      `Successfully subscribed to status changes for room ${roomName}`,
+      `Subscribed to status changes for room ${roomName}`,
     );
 
     // Attach to the room
diff --git a/src/commands/rooms/occupancy/subscribe.ts b/src/commands/rooms/occupancy/subscribe.ts
index 0c631463..bd0157a7 100644
--- a/src/commands/rooms/occupancy/subscribe.ts
+++ b/src/commands/rooms/occupancy/subscribe.ts
@@ -9,6 +9,13 @@ import chalk from "chalk";
 
 import { ChatBaseCommand } from "../../../chat-base-command.js";
 import { waitUntilInterruptedOrTimeout } from "../../../utils/long-running.js";
+import {
+  success,
+  listening,
+  progress,
+  resource,
+  formatTimestamp,
+} from "../../../utils/output.js";
 
 export interface OccupancyMetrics {
   connections?: number;
@@ -34,8 +41,7 @@ export default class RoomsOccupancySubscribe extends ChatBaseCommand {
   static flags = {
     ...ChatBaseCommand.globalFlags,
     duration: Flags.integer({
-      description:
-        "Automatically exit after the given number of seconds (0 = run indefinitely)",
+      description: "Automatically exit after N seconds (0 = run indefinitely)",
       char: "D",
       required: false,
     }),
@@ -56,7 +62,7 @@ export default class RoomsOccupancySubscribe extends ChatBaseCommand {
         "Connecting to Ably...",
       );
       if (!this.shouldOutputJson(flags)) {
-        this.log("Connecting to Ably...");
+        this.log(progress("Connecting to Ably"));
       }
 
       // Create Chat client
@@ -114,9 +120,10 @@ export default class RoomsOccupancySubscribe extends ChatBaseCommand {
         switch (statusChange.current) {
           case RoomStatus.Attached: {
             if (!this.shouldOutputJson(flags)) {
-              this.log("Successfully connected to Ably");
               this.log(
-                `Subscribing to occupancy events for room '${this.roomName}'...`,
+                success(
+                  `Subscribed to occupancy in room: ${resource(this.roomName!)}.`,
+                ),
               );
             }
 
@@ -145,7 +152,7 @@ export default class RoomsOccupancySubscribe extends ChatBaseCommand {
         flags,
         "room",
         "subscribedToStatus",
-        "Successfully subscribed to room status changes",
+        "Subscribed to room status changes",
       );
 
       // Attach to the room
@@ -165,7 +172,7 @@ export default class RoomsOccupancySubscribe extends ChatBaseCommand {
         "Listening for occupancy updates...",
       );
       if (!this.shouldOutputJson(flags)) {
-        this.log("Listening for occupancy updates. Press Ctrl+C to exit.");
+        this.log(listening("Listening for occupancy updates."));
       }
 
       // Get the initial occupancy metrics
@@ -222,7 +229,7 @@ export default class RoomsOccupancySubscribe extends ChatBaseCommand {
         flags,
         "occupancy",
         "subscribed",
-        "Successfully subscribed to occupancy updates",
+        "Subscribed to occupancy updates",
       );
 
       // Wait until the user interrupts or the optional duration elapses
@@ -272,7 +279,9 @@ export default class RoomsOccupancySubscribe extends ChatBaseCommand {
       this.log(this.formatJsonOutput({ success: true, ...logData }, flags));
     } else {
       const prefix = isInitial ? "Initial occupancy" : "Occupancy update";
-      this.log(`[${timestamp}] ${prefix} for room '${roomName}'`);
+      this.log(
+        `${formatTimestamp(timestamp)} ${prefix} for room ${resource(roomName)}`,
+      );
       // Type guard to handle both OccupancyMetrics and OccupancyEvent
       const connections =
         "connections" in occupancyMetrics ? occupancyMetrics.connections : 0;
diff --git a/src/commands/rooms/presence/enter.ts b/src/commands/rooms/presence/enter.ts
index 55936b1c..f25b3208 100644
--- a/src/commands/rooms/presence/enter.ts
+++ b/src/commands/rooms/presence/enter.ts
@@ -12,6 +12,12 @@ import chalk from "chalk";
 import { clientIdFlag } from "../../../flags.js";
 import { ChatBaseCommand } from "../../../chat-base-command.js";
 import { waitUntilInterruptedOrTimeout } from "../../../utils/long-running.js";
+import {
+  success,
+  listening,
+  resource,
+  formatTimestamp,
+} from "../../../utils/output.js";
 
 export default class RoomsPresenceEnter extends ChatBaseCommand {
   static override args = {
@@ -38,8 +44,7 @@ export default class RoomsPresenceEnter extends ChatBaseCommand {
       description: "Show other presence events while present (default: false)",
     }),
     duration: Flags.integer({
-      description:
-        "Automatically exit after the given number of seconds (0 = run indefinitely)",
+      description: "Automatically exit after N seconds (0 = run indefinitely)",
       char: "D",
       required: false,
     }),
@@ -92,7 +97,7 @@ export default class RoomsPresenceEnter extends ChatBaseCommand {
     try {
       // Always show the readiness signal first, before attempting auth
       if (!this.shouldOutputJson(flags)) {
-        this.log(`${chalk.dim("Staying present. Press Ctrl+C to exit.")}`);
+        this.log(listening("Staying present."));
       }
 
       // Create clients
@@ -137,9 +142,7 @@ export default class RoomsPresenceEnter extends ChatBaseCommand {
             !this.shouldOutputJson(flags) &&
             this.roomName
           ) {
-            this.log(
-              `${chalk.green("Successfully connected to room:")} ${chalk.cyan(this.roomName)}`,
-            );
+            this.log(success(`Connected to room: ${resource(this.roomName)}.`));
           } else {
             this.logCliEvent(
               flags,
@@ -194,7 +197,7 @@ export default class RoomsPresenceEnter extends ChatBaseCommand {
                 ? `${chalk.dim(`[${this.sequenceCounter}]`)}`
                 : "";
               this.log(
-                `[${timestamp}]${sequencePrefix} ${actionColor(actionSymbol)} ${chalk.blue(member.clientId || "Unknown")} ${actionColor(event.type)}`,
+                `${formatTimestamp(timestamp)}${sequencePrefix} ${actionColor(actionSymbol)} ${chalk.blue(member.clientId || "Unknown")} ${actionColor(event.type)}`,
               );
               if (
                 member.data &&
@@ -219,24 +222,16 @@ export default class RoomsPresenceEnter extends ChatBaseCommand {
         data: this.data,
       });
       await currentRoom.presence.enter(this.data || {});
-      this.logCliEvent(
-        flags,
-        "presence",
-        "entered",
-        "Entered presence successfully",
-      );
+      this.logCliEvent(flags, "presence", "entered", "Entered presence");
 
       if (!this.shouldOutputJson(flags) && this.roomName) {
-        // Output the exact signal that E2E tests expect (without ANSI codes)
         this.log(
-          `✓ Entered room ${this.roomName} as ${this.chatClient?.clientId || "Unknown"}`,
+          success(`Entered presence in room: ${resource(this.roomName)}.`),
         );
         if (flags["show-others"]) {
-          this.log(
-            `\n${chalk.dim("Listening for presence events until terminated. Press Ctrl+C to exit.")}`,
-          );
+          this.log(`\n${listening("Listening for presence events.")}`);
         } else {
-          this.log(`\n${chalk.dim("Staying present. Press Ctrl+C to exit.")}`);
+          this.log(`\n${listening("Staying present.")}`);
         }
       }
 
diff --git a/src/commands/rooms/presence/subscribe.ts b/src/commands/rooms/presence/subscribe.ts
index 4a00aeaa..7cbb5eed 100644
--- a/src/commands/rooms/presence/subscribe.ts
+++ b/src/commands/rooms/presence/subscribe.ts
@@ -14,6 +14,13 @@ import chalk from "chalk";
 import { clientIdFlag } from "../../../flags.js";
 import { ChatBaseCommand } from "../../../chat-base-command.js";
 import { waitUntilInterruptedOrTimeout } from "../../../utils/long-running.js";
+import {
+  progress,
+  success,
+  listening,
+  resource,
+  formatTimestamp,
+} from "../../../utils/output.js";
 
 export default class RoomsPresenceSubscribe extends ChatBaseCommand {
   static override args = {
@@ -35,8 +42,7 @@ export default class RoomsPresenceSubscribe extends ChatBaseCommand {
     ...ChatBaseCommand.globalFlags,
     ...clientIdFlag,
     duration: Flags.integer({
-      description:
-        "Automatically exit after the given number of seconds (0 = run indefinitely)",
+      description: "Automatically exit after N seconds (0 = run indefinitely)",
       char: "D",
       required: false,
     }),
@@ -56,10 +62,13 @@ export default class RoomsPresenceSubscribe extends ChatBaseCommand {
     this.roomName = args.room;
 
     try {
-      // Always show the readiness signal first, before attempting auth
+      // Show a progress signal early so E2E harnesses know the command is running
       if (!this.shouldOutputJson(flags)) {
-        // Output the exact signal that E2E tests expect (without ANSI codes)
-        this.log("Subscribing to presence events. Press Ctrl+C to exit.");
+        this.log(
+          progress(
+            `Subscribing to presence in room: ${resource(this.roomName!)}`,
+          ),
+        );
       }
 
       // Try to create clients, but don't fail if auth fails
@@ -153,9 +162,7 @@ export default class RoomsPresenceSubscribe extends ChatBaseCommand {
           !this.shouldOutputJson(flags) &&
           this.roomName
         ) {
-          this.log(
-            `${chalk.green("Successfully connected to room:")} ${chalk.cyan(this.roomName)}`,
-          );
+          this.log(success(`Connected to room: ${resource(this.roomName)}.`));
         } else if (
           statusChange.current === RoomStatus.Failed &&
           !this.shouldOutputJson(flags)
@@ -168,7 +175,9 @@ export default class RoomsPresenceSubscribe extends ChatBaseCommand {
 
       if (!this.shouldOutputJson(flags) && this.roomName) {
         this.log(
-          `Fetching current presence members for room ${chalk.cyan(this.roomName)}...`,
+          progress(
+            `Fetching current presence members for room ${resource(this.roomName)}`,
+          ),
         );
         const members: PresenceMember[] = await currentRoom.presence.get();
         if (members.length === 0) {
@@ -240,7 +249,7 @@ export default class RoomsPresenceSubscribe extends ChatBaseCommand {
             actionColor = chalk.yellow;
           }
           this.log(
-            `[${timestamp}] ${actionColor(actionSymbol)} ${chalk.blue(member.clientId || "Unknown")} ${actionColor(event.type)}`,
+            `${formatTimestamp(timestamp)} ${actionColor(actionSymbol)} ${chalk.blue(member.clientId || "Unknown")} ${actionColor(event.type)}`,
           );
           if (
             member.data &&
@@ -261,14 +270,16 @@ export default class RoomsPresenceSubscribe extends ChatBaseCommand {
         flags,
         "presence",
         "subscribedToEvents",
-        "Successfully subscribed to presence events",
+        "Subscribed to presence events",
       );
 
       if (!this.shouldOutputJson(flags)) {
         this.log(
-          // Output the exact signal that E2E tests expect (without ANSI codes)
-          "Subscribing to presence events. Press Ctrl+C to exit.",
+          success(
+            `Subscribed to presence in room: ${resource(this.roomName!)}.`,
+          ),
         );
+        this.log(listening("Listening for presence events."));
       }
 
       // Wait until the user interrupts or the optional duration elapses
diff --git a/src/commands/rooms/reactions/send.ts b/src/commands/rooms/reactions/send.ts
index f73c800d..3e31c2c2 100644
--- a/src/commands/rooms/reactions/send.ts
+++ b/src/commands/rooms/reactions/send.ts
@@ -6,9 +6,9 @@ import {
   ConnectionStatusChange,
 } from "@ably/chat";
 import { Args, Flags } from "@oclif/core";
-import chalk from "chalk";
 
 import { ChatBaseCommand } from "../../../chat-base-command.js";
+import { resource, success } from "../../../utils/output.js";
 
 export default class RoomsReactionsSend extends ChatBaseCommand {
   static override args = {
@@ -198,7 +198,7 @@ export default class RoomsReactionsSend extends ChatBaseCommand {
         this.log(this.formatJsonOutput(resultData, flags));
       } else {
         this.log(
-          `${chalk.green("✓")} Sent reaction ${emoji} in room ${chalk.cyan(roomName)}`,
+          success(`Sent reaction ${emoji} in room ${resource(roomName)}.`),
         );
       }
     } catch (error) {
diff --git a/src/commands/rooms/reactions/subscribe.ts b/src/commands/rooms/reactions/subscribe.ts
index c1ceb3d1..5635c20d 100644
--- a/src/commands/rooms/reactions/subscribe.ts
+++ b/src/commands/rooms/reactions/subscribe.ts
@@ -4,6 +4,13 @@ import chalk from "chalk";
 
 import { ChatBaseCommand } from "../../../chat-base-command.js";
 import { waitUntilInterruptedOrTimeout } from "../../../utils/long-running.js";
+import {
+  progress,
+  success,
+  listening,
+  resource,
+  formatTimestamp,
+} from "../../../utils/output.js";
 
 export default class RoomsReactionsSubscribe extends ChatBaseCommand {
   static override args = {
@@ -24,8 +31,7 @@ export default class RoomsReactionsSubscribe extends ChatBaseCommand {
   static override flags = {
     ...ChatBaseCommand.globalFlags,
     duration: Flags.integer({
-      description:
-        "Automatically exit after the given number of seconds (0 = run indefinitely)",
+      description: "Automatically exit after N seconds (0 = run indefinitely)",
       char: "D",
       required: false,
     }),
@@ -63,7 +69,9 @@ export default class RoomsReactionsSubscribe extends ChatBaseCommand {
       );
       if (!this.shouldOutputJson(flags)) {
         this.log(
-          `Connecting to Ably and subscribing to reactions in room ${chalk.cyan(roomName)}...`,
+          progress(
+            `Connecting to Ably and subscribing to reactions in room ${resource(roomName)}`,
+          ),
         );
       }
 
@@ -107,10 +115,12 @@ export default class RoomsReactionsSubscribe extends ChatBaseCommand {
         switch (statusChange.current) {
           case RoomStatus.Attached: {
             if (!this.shouldOutputJson(flags)) {
-              this.log(chalk.green("Successfully connected to Ably"));
               this.log(
-                `Listening for reactions in room ${chalk.cyan(roomName)}. Press Ctrl+C to exit.`,
+                success(
+                  `Subscribed to reactions in room: ${resource(roomName)}.`,
+                ),
               );
+              this.log(listening("Listening for reactions."));
             }
 
             break;
@@ -140,7 +150,7 @@ export default class RoomsReactionsSubscribe extends ChatBaseCommand {
         flags,
         "room",
         "subscribedToStatus",
-        "Successfully subscribed to room status changes",
+        "Subscribed to room status changes",
       );
 
       // Attach to the room
@@ -184,7 +194,7 @@ export default class RoomsReactionsSubscribe extends ChatBaseCommand {
           );
         } else {
           this.log(
-            `[${chalk.dim(timestamp)}] ${chalk.green("⚡")} ${chalk.blue(reaction.clientId || "Unknown")} reacted with ${chalk.yellow(reaction.name || "unknown")}`,
+            `${formatTimestamp(timestamp)} ${chalk.green("⚡")} ${chalk.blue(reaction.clientId || "Unknown")} reacted with ${chalk.yellow(reaction.name || "unknown")}`,
           );
 
           // Show any additional metadata in the reaction
@@ -199,7 +209,7 @@ export default class RoomsReactionsSubscribe extends ChatBaseCommand {
         flags,
         "reactions",
         "subscribed",
-        "Successfully subscribed to reactions",
+        "Subscribed to reactions",
       );
 
       this.logCliEvent(
diff --git a/src/commands/rooms/typing/keystroke.ts b/src/commands/rooms/typing/keystroke.ts
index 86dac36b..1f8dce61 100644
--- a/src/commands/rooms/typing/keystroke.ts
+++ b/src/commands/rooms/typing/keystroke.ts
@@ -1,9 +1,9 @@
 import { RoomStatus, ChatClient, RoomStatusChange } from "@ably/chat";
 import { Args, Flags } from "@oclif/core";
-import chalk from "chalk";
 
 import { ChatBaseCommand } from "../../../chat-base-command.js";
 import { waitUntilInterruptedOrTimeout } from "../../../utils/long-running.js";
+import { listening, resource, success } from "../../../utils/output.js";
 
 // The heartbeats are throttled to one every 10 seconds. There's a 2 second
 // leeway to send a keystroke/heartbeat after the 10 second mark so the
@@ -23,11 +23,11 @@ export default class TypingKeystroke extends ChatBaseCommand {
   };
 
   static override description =
-    "Send a typing indicator in an Ably Chat room (use --autoType to keep typing automatically until terminated)";
+    "Send a typing indicator in an Ably Chat room (use --auto-type to keep typing automatically until terminated)";
 
   static override examples = [
     "$ ably rooms typing keystroke my-room",
-    "$ ably rooms typing keystroke my-room --autoType",
+    "$ ably rooms typing keystroke my-room --auto-type",
     '$ ABLY_API_KEY="YOUR_API_KEY" ably rooms typing keystroke my-room',
     "$ ably rooms typing keystroke my-room --json",
     "$ ably rooms typing keystroke my-room --pretty-json",
@@ -35,7 +35,7 @@ export default class TypingKeystroke extends ChatBaseCommand {
 
   static override flags = {
     ...ChatBaseCommand.globalFlags,
-    autoType: Flags.boolean({
+    "auto-type": Flags.boolean({
       description: "Automatically keep typing indicator active",
       default: false,
     }),
@@ -111,9 +111,7 @@ export default class TypingKeystroke extends ChatBaseCommand {
 
         if (statusChange.current === RoomStatus.Attached) {
           if (!this.shouldOutputJson(flags)) {
-            this.log(
-              `${chalk.green("Connected to room:")} ${chalk.bold(roomName)}`,
-            );
+            this.log(success(`Connected to room: ${resource(roomName)}.`));
           }
 
           // Start typing immediately
@@ -126,21 +124,22 @@ export default class TypingKeystroke extends ChatBaseCommand {
           room.typing
             .keystroke()
             .then(() => {
-              this.logCliEvent(
-                flags,
-                "typing",
-                "started",
-                "Successfully started typing",
-              );
+              this.logCliEvent(flags, "typing", "started", "Started typing");
               if (!this.shouldOutputJson(flags)) {
-                this.log(`${chalk.green("Started typing in room.")}`);
-                if (flags.autoType) {
+                this.log(
+                  success(`Started typing in room: ${resource(roomName)}.`),
+                );
+                if (flags["auto-type"]) {
                   this.log(
-                    `${chalk.dim("Will automatically remain typing until this command is terminated. Press Ctrl+C to exit.")}`,
+                    listening(
+                      "Will automatically remain typing until terminated.",
+                    ),
                   );
                 } else {
                   this.log(
-                    `${chalk.dim("Sent a single typing indicator. Use --autoType flag to keep typing automatically. Press Ctrl+C to exit.")}`,
+                    listening(
+                      "Sent a single typing indicator. Use --auto-type to keep typing automatically.",
+                    ),
                   );
                 }
               }
@@ -148,7 +147,7 @@ export default class TypingKeystroke extends ChatBaseCommand {
               // Keep typing active by calling keystroke() periodically if autoType is enabled
               if (this.typingIntervalId) clearInterval(this.typingIntervalId);
 
-              if (flags.autoType) {
+              if (flags["auto-type"]) {
                 this.typingIntervalId = setInterval(() => {
                   room.typing.keystroke().catch((error: Error) => {
                     this.logCliEvent(
@@ -187,7 +186,7 @@ export default class TypingKeystroke extends ChatBaseCommand {
         flags,
         "room",
         "subscribedToStatus",
-        "Successfully subscribed to room status changes",
+        "Subscribed to room status changes",
       );
 
       // Attach to the room
diff --git a/src/commands/rooms/typing/subscribe.ts b/src/commands/rooms/typing/subscribe.ts
index 61df30d1..5a3453fa 100644
--- a/src/commands/rooms/typing/subscribe.ts
+++ b/src/commands/rooms/typing/subscribe.ts
@@ -4,6 +4,7 @@ import chalk from "chalk";
 
 import { ChatBaseCommand } from "../../../chat-base-command.js";
 import { waitUntilInterruptedOrTimeout } from "../../../utils/long-running.js";
+import { success, listening, resource } from "../../../utils/output.js";
 
 export default class TypingSubscribe extends ChatBaseCommand {
   static override args = {
@@ -26,8 +27,7 @@ export default class TypingSubscribe extends ChatBaseCommand {
   static override flags = {
     ...ChatBaseCommand.globalFlags,
     duration: Flags.integer({
-      description:
-        "Automatically exit after the given number of seconds (0 = run indefinitely)",
+      description: "Automatically exit after N seconds (0 = run indefinitely)",
       char: "D",
       required: false,
     }),
@@ -93,11 +93,9 @@ export default class TypingSubscribe extends ChatBaseCommand {
         if (statusChange.current === RoomStatus.Attached) {
           if (!this.shouldOutputJson(flags)) {
             this.log(
-              `${chalk.green("Connected to room:")} ${chalk.bold(roomName)}`,
-            );
-            this.log(
-              `${chalk.dim("Listening for typing indicators. Press Ctrl+C to exit.")}`,
+              success(`Subscribed to typing in room: ${resource(roomName)}.`),
             );
+            this.log(listening("Listening for typing indicators."));
           }
         } else if (
           statusChange.current === RoomStatus.Failed &&
@@ -112,7 +110,7 @@ export default class TypingSubscribe extends ChatBaseCommand {
         flags,
         "room",
         "subscribedToStatus",
-        "Successfully subscribed to room status changes",
+        "Subscribed to room status changes",
       );
 
       // Set up typing indicators
@@ -175,7 +173,7 @@ export default class TypingSubscribe extends ChatBaseCommand {
         flags,
         "typing",
         "subscribed",
-        "Successfully subscribed to typing indicators",
+        "Subscribed to typing indicators",
       );
 
       // Attach to the room
diff --git a/src/commands/spaces/cursors/get-all.ts b/src/commands/spaces/cursors/get-all.ts
index 60054f2e..40082d5c 100644
--- a/src/commands/spaces/cursors/get-all.ts
+++ b/src/commands/spaces/cursors/get-all.ts
@@ -4,6 +4,7 @@ import chalk from "chalk";
 import { clientIdFlag } from "../../../flags.js";
 import { SpacesBaseCommand } from "../../../spaces-base-command.js";
 import isTestMode from "../../../utils/test-mode.js";
+import { progress, success, resource } from "../../../utils/output.js";
 
 interface CursorPosition {
   x: number;
@@ -76,7 +77,7 @@ export default class SpacesCursorsGetAll extends SpacesBaseCommand {
 
       // Get the space
       if (!this.shouldOutputJson(flags)) {
-        this.log(`Connecting to space: ${chalk.cyan(spaceName)}...`);
+        this.log(progress(`Connecting to space: ${resource(spaceName)}`));
       }
 
       // Enter the space
@@ -107,9 +108,7 @@ export default class SpacesCursorsGetAll extends SpacesBaseCommand {
                   ),
                 );
               } else {
-                this.log(
-                  `${chalk.green("Successfully entered space:")} ${chalk.cyan(spaceName)}`,
-                );
+                this.log(success(`Entered space: ${resource(spaceName)}.`));
               }
 
               resolve();
diff --git a/src/commands/spaces/cursors/set.ts b/src/commands/spaces/cursors/set.ts
index 75dabbea..411b9c7f 100644
--- a/src/commands/spaces/cursors/set.ts
+++ b/src/commands/spaces/cursors/set.ts
@@ -5,6 +5,12 @@ import chalk from "chalk";
 import { clientIdFlag } from "../../../flags.js";
 import { SpacesBaseCommand } from "../../../spaces-base-command.js";
 import { waitUntilInterruptedOrTimeout } from "../../../utils/long-running.js";
+import {
+  listening,
+  progress,
+  resource,
+  success,
+} from "../../../utils/output.js";
 
 // Define cursor types based on Ably documentation
 interface CursorPosition {
@@ -60,8 +66,7 @@ export default class SpacesCursorsSet extends SpacesBaseCommand {
       required: false,
     }),
     duration: Flags.integer({
-      description:
-        "Automatically exit after the given number of seconds (0 = exit immediately after setting the cursor)",
+      description: "Automatically exit after N seconds",
       char: "D",
       required: false,
     }),
@@ -210,7 +215,7 @@ export default class SpacesCursorsSet extends SpacesBaseCommand {
           stateChange.current === "attached" &&
           !this.shouldOutputJson(flags)
         ) {
-          this.log(`${chalk.green("Entered space:")} ${chalk.cyan(spaceName)}`);
+          this.log(success(`Entered space: ${resource(spaceName)}.`));
         }
       };
 
@@ -367,7 +372,9 @@ export default class SpacesCursorsSet extends SpacesBaseCommand {
         );
       } else {
         this.log(
-          `${chalk.green("✓")} Set cursor in space ${chalk.cyan(spaceName)} with data: ${chalk.blue(JSON.stringify(cursorForOutput))}`,
+          success(
+            `Set cursor in space ${resource(spaceName)} with data: ${chalk.blue(JSON.stringify(cursorForOutput))}`,
+          ),
         );
       }
 
@@ -391,7 +398,7 @@ export default class SpacesCursorsSet extends SpacesBaseCommand {
         );
 
         if (!this.shouldOutputJson(flags)) {
-          this.log("Starting cursor movement simulation every 250ms...");
+          this.log(progress("Starting cursor movement simulation every 250ms"));
         }
 
         this.simulationIntervalId = setInterval(async () => {
@@ -446,7 +453,7 @@ export default class SpacesCursorsSet extends SpacesBaseCommand {
         this.log(
           flags.duration
             ? `Waiting ${flags.duration}s before exiting… Press Ctrl+C to exit sooner.`
-            : `Cursor set. Press Ctrl+C to exit.`,
+            : listening("Cursor set."),
         );
       }
 
diff --git a/src/commands/spaces/cursors/subscribe.ts b/src/commands/spaces/cursors/subscribe.ts
index a54ead65..9847df1a 100644
--- a/src/commands/spaces/cursors/subscribe.ts
+++ b/src/commands/spaces/cursors/subscribe.ts
@@ -6,6 +6,12 @@ import chalk from "chalk";
 import { clientIdFlag } from "../../../flags.js";
 import { SpacesBaseCommand } from "../../../spaces-base-command.js";
 import { waitUntilInterruptedOrTimeout } from "../../../utils/long-running.js";
+import {
+  listening,
+  resource,
+  success,
+  formatTimestamp,
+} from "../../../utils/output.js";
 
 export default class SpacesCursorsSubscribe extends SpacesBaseCommand {
   static override args = {
@@ -28,8 +34,7 @@ export default class SpacesCursorsSubscribe extends SpacesBaseCommand {
     ...SpacesBaseCommand.globalFlags,
     ...clientIdFlag,
     duration: _Flags.integer({
-      description:
-        "Automatically exit after the given number of seconds (0 = run indefinitely)",
+      description: "Automatically exit after N seconds (0 = run indefinitely)",
       char: "D",
       required: false,
     }),
@@ -162,7 +167,7 @@ export default class SpacesCursorsSubscribe extends SpacesBaseCommand {
                 ? ` data: ${JSON.stringify(cursorUpdate.data)}`
                 : "";
               this.log(
-                `[${timestamp}] ${chalk.blue(cursorUpdate.clientId)} ${chalk.dim("position:")} ${JSON.stringify(cursorUpdate.position)}${dataString}`,
+                `${formatTimestamp(timestamp)} ${chalk.blue(cursorUpdate.clientId)} ${chalk.dim("position:")} ${JSON.stringify(cursorUpdate.position)}${dataString}`,
               );
             }
           } catch (error) {
@@ -333,11 +338,8 @@ export default class SpacesCursorsSubscribe extends SpacesBaseCommand {
 
       // Print success message
       if (!this.shouldOutputJson(flags)) {
-        this.log(
-          chalk.green(
-            `✓ Subscribed to space: ${chalk.cyan(spaceName)}. Listening for cursor movements...`,
-          ),
-        );
+        this.log(success(`Subscribed to space: ${resource(spaceName)}.`));
+        this.log(listening("Listening for cursor movements."));
       }
 
       // Wait until the user interrupts or the optional duration elapses
diff --git a/src/commands/spaces/list.ts b/src/commands/spaces/list.ts
index ecf51c75..7d5d644a 100644
--- a/src/commands/spaces/list.ts
+++ b/src/commands/spaces/list.ts
@@ -38,7 +38,7 @@ export default class SpacesList extends SpacesBaseCommand {
     ...SpacesBaseCommand.globalFlags,
     limit: Flags.integer({
       default: 100,
-      description: "Maximum number of spaces to return (default: 100)",
+      description: "Maximum number of results to return (default: 100)",
     }),
     prefix: Flags.string({
       char: "p",
diff --git a/src/commands/spaces/locations/get-all.ts b/src/commands/spaces/locations/get-all.ts
index 4cb852f0..de254671 100644
--- a/src/commands/spaces/locations/get-all.ts
+++ b/src/commands/spaces/locations/get-all.ts
@@ -2,6 +2,7 @@ import { Args, Flags } from "@oclif/core";
 import chalk from "chalk";
 
 import { SpacesBaseCommand } from "../../../spaces-base-command.js";
+import { progress, resource, success } from "../../../utils/output.js";
 
 interface LocationData {
   [key: string]: unknown;
@@ -93,7 +94,10 @@ export default class SpacesLocationsGetAll extends SpacesBaseCommand {
         checkConnection();
       });
 
-      this.log(`Connecting to space: ${chalk.cyan(spaceName)}...`);
+      if (!this.shouldOutputJson(flags)) {
+        this.log(progress(`Connecting to space: ${resource(spaceName)}`));
+      }
+
       await this.space.enter();
 
       await new Promise<void>((resolve, reject) => {
@@ -105,9 +109,12 @@ export default class SpacesLocationsGetAll extends SpacesBaseCommand {
           try {
             if (this.realtimeClient!.connection.state === "connected") {
               clearTimeout(timeout);
-              this.log(
-                `${chalk.green("Connected to space:")} ${chalk.cyan(spaceName)}`,
-              );
+              if (!this.shouldOutputJson(flags)) {
+                this.log(
+                  success(`Connected to space: ${resource(spaceName)}.`),
+                );
+              }
+
               resolve();
             } else if (
               this.realtimeClient!.connection.state === "failed" ||
@@ -133,7 +140,9 @@ export default class SpacesLocationsGetAll extends SpacesBaseCommand {
       });
 
       if (!this.shouldOutputJson(flags)) {
-        this.log(`Fetching locations for space ${chalk.cyan(spaceName)}...`);
+        this.log(
+          progress(`Fetching locations for space ${resource(spaceName)}`),
+        );
       }
 
       let locations: LocationItem[] = [];
diff --git a/src/commands/spaces/locations/set.ts b/src/commands/spaces/locations/set.ts
index f10cb151..b3bc703b 100644
--- a/src/commands/spaces/locations/set.ts
+++ b/src/commands/spaces/locations/set.ts
@@ -5,6 +5,12 @@ import { waitUntilInterruptedOrTimeout } from "../../../utils/long-running.js";
 
 import { clientIdFlag } from "../../../flags.js";
 import { SpacesBaseCommand } from "../../../spaces-base-command.js";
+import {
+  success,
+  listening,
+  resource,
+  formatTimestamp,
+} from "../../../utils/output.js";
 
 // Define the type for location subscription
 interface LocationSubscription {
@@ -34,8 +40,7 @@ export default class SpacesLocationsSet extends SpacesBaseCommand {
       required: true,
     }),
     duration: Flags.integer({
-      description:
-        "Automatically exit after the given number of seconds (0 = exit immediately after setting location)",
+      description: "Automatically exit after N seconds",
       char: "D",
       required: false,
     }),
@@ -136,22 +141,14 @@ export default class SpacesLocationsSet extends SpacesBaseCommand {
 
         // Enter the space and set location
         await this.space.enter();
-        this.logCliEvent(
-          flags,
-          "spaces",
-          "entered",
-          "Successfully entered space",
-          { clientId: this.realtimeClient.auth.clientId },
-        );
+        this.logCliEvent(flags, "spaces", "entered", "Entered space", {
+          clientId: this.realtimeClient.auth.clientId,
+        });
 
         await this.space.locations.set(location);
-        this.logCliEvent(
-          flags,
-          "location",
-          "setSuccess",
-          "Successfully set location",
-          { location },
-        );
+        this.logCliEvent(flags, "location", "setSuccess", "Set location", {
+          location,
+        });
 
         if (this.shouldOutputJson(flags)) {
           this.log(
@@ -161,9 +158,7 @@ export default class SpacesLocationsSet extends SpacesBaseCommand {
             ),
           );
         } else {
-          this.log(
-            `${chalk.green("Successfully set location:")} ${JSON.stringify(location, null, 2)}`,
-          );
+          this.log(success(`Location set in space: ${resource(spaceName)}.`));
         }
       } catch {
         // If an error occurs in E2E mode, just exit cleanly after showing what we can
@@ -209,36 +204,26 @@ export default class SpacesLocationsSet extends SpacesBaseCommand {
         flags,
         "spaces",
         "gotSpace",
-        `Successfully got space handle: ${spaceName}`,
+        `Got space handle: ${spaceName}`,
       );
 
       // Enter the space first
       this.logCliEvent(flags, "spaces", "entering", "Entering space...");
       await this.space.enter();
-      this.logCliEvent(
-        flags,
-        "spaces",
-        "entered",
-        "Successfully entered space",
-        { clientId: this.realtimeClient!.auth.clientId },
-      );
+      this.logCliEvent(flags, "spaces", "entered", "Entered space", {
+        clientId: this.realtimeClient!.auth.clientId,
+      });
 
       // Set the location
       this.logCliEvent(flags, "location", "setting", "Setting location", {
         location,
       });
       await this.space.locations.set(location);
-      this.logCliEvent(
-        flags,
-        "location",
-        "setSuccess",
-        "Successfully set location",
-        { location },
-      );
+      this.logCliEvent(flags, "location", "setSuccess", "Set location", {
+        location,
+      });
       if (!this.shouldOutputJson(flags)) {
-        this.log(
-          `${chalk.green("Successfully set location:")} ${JSON.stringify(location, null, 2)}`,
-        );
+        this.log(success(`Location set in space: ${resource(spaceName)}.`));
       }
 
       // Subscribe to location updates from other users
@@ -249,9 +234,7 @@ export default class SpacesLocationsSet extends SpacesBaseCommand {
         "Watching for other location changes...",
       );
       if (!this.shouldOutputJson(flags)) {
-        this.log(
-          `\n${chalk.dim("Watching for other location changes. Press Ctrl+C to exit.")}\n`,
-        );
+        this.log(`\n${listening("Watching for other location changes.")}\n`);
       }
 
       // Store subscription handlers
@@ -294,7 +277,7 @@ export default class SpacesLocationsSet extends SpacesBaseCommand {
           const action = "update";
 
           this.log(
-            `[${timestamp}] ${chalk.blue(member.clientId || "Unknown")} ${actionColor(action)}d location:`,
+            `${formatTimestamp(timestamp)} ${chalk.blue(member.clientId || "Unknown")} ${actionColor(action)}d location:`,
           );
           this.log(
             `  ${chalk.dim("Location:")} ${JSON.stringify(currentLocation, null, 2)}`,
@@ -317,7 +300,7 @@ export default class SpacesLocationsSet extends SpacesBaseCommand {
         flags,
         "location",
         "subscribed",
-        "Successfully subscribed to location updates",
+        "Subscribed to location updates",
       );
 
       this.logCliEvent(
diff --git a/src/commands/spaces/locations/subscribe.ts b/src/commands/spaces/locations/subscribe.ts
index 4ac7c2fd..c3b956fc 100644
--- a/src/commands/spaces/locations/subscribe.ts
+++ b/src/commands/spaces/locations/subscribe.ts
@@ -5,6 +5,12 @@ import chalk from "chalk";
 import { clientIdFlag } from "../../../flags.js";
 import { SpacesBaseCommand } from "../../../spaces-base-command.js";
 import { waitUntilInterruptedOrTimeout } from "../../../utils/long-running.js";
+import {
+  listening,
+  progress,
+  resource,
+  formatTimestamp,
+} from "../../../utils/output.js";
 
 // Define interfaces for location types
 interface SpaceMember {
@@ -47,8 +53,7 @@ export default class SpacesLocationsSubscribe extends SpacesBaseCommand {
     ...SpacesBaseCommand.globalFlags,
     ...clientIdFlag,
     duration: _Flags.integer({
-      description:
-        "Automatically exit after the given number of seconds (0 = run indefinitely)",
+      description: "Automatically exit after N seconds (0 = run indefinitely)",
       char: "D",
       required: false,
     }),
@@ -156,7 +161,7 @@ export default class SpacesLocationsSubscribe extends SpacesBaseCommand {
         `Getting space: ${spaceName}...`,
       );
       if (!this.shouldOutputJson(flags)) {
-        this.log(`Connecting to space: ${chalk.cyan(spaceName)}...`);
+        this.log(progress(`Connecting to space: ${resource(spaceName)}`));
       }
 
       this.logCliEvent(
@@ -186,7 +191,9 @@ export default class SpacesLocationsSubscribe extends SpacesBaseCommand {
       );
       if (!this.shouldOutputJson(flags)) {
         this.log(
-          `Fetching current locations for space ${chalk.cyan(spaceName)}...`,
+          progress(
+            `Fetching current locations for space ${resource(spaceName)}`,
+          ),
         );
       }
 
@@ -291,9 +298,7 @@ export default class SpacesLocationsSubscribe extends SpacesBaseCommand {
         "Subscribing to location updates",
       );
       if (!this.shouldOutputJson(flags)) {
-        this.log(
-          `\n${chalk.dim("Subscribing to location updates. Press Ctrl+C to exit.")}\n`,
-        );
+        this.log(listening("Subscribing to location updates."));
       }
       this.logCliEvent(
         flags,
@@ -339,7 +344,7 @@ export default class SpacesLocationsSubscribe extends SpacesBaseCommand {
               );
             } else {
               this.log(
-                `[${timestamp}] ${chalk.blue(update.member.clientId)} ${chalk.yellow("updated")} location:`,
+                `${formatTimestamp(timestamp)} ${chalk.blue(update.member.clientId)} ${chalk.yellow("updated")} location:`,
               );
               this.log(
                 `  ${chalk.dim("Current:")} ${JSON.stringify(update.currentLocation)}`,
diff --git a/src/commands/spaces/locks/acquire.ts b/src/commands/spaces/locks/acquire.ts
index fff61de4..5ee5333e 100644
--- a/src/commands/spaces/locks/acquire.ts
+++ b/src/commands/spaces/locks/acquire.ts
@@ -5,6 +5,7 @@ import chalk from "chalk";
 import { clientIdFlag } from "../../../flags.js";
 import { SpacesBaseCommand } from "../../../spaces-base-command.js";
 import { waitUntilInterruptedOrTimeout } from "../../../utils/long-running.js";
+import { success, listening, resource } from "../../../utils/output.js";
 
 export default class SpacesLocksAcquire extends SpacesBaseCommand {
   static override args = {
@@ -114,19 +115,15 @@ export default class SpacesLocksAcquire extends SpacesBaseCommand {
         flags,
         "spaces",
         "gotSpace",
-        `Successfully got space handle: ${spaceName}`,
+        `Got space handle: ${spaceName}`,
       );
 
       // Enter the space first
       this.logCliEvent(flags, "spaces", "entering", "Entering space...");
       await this.space.enter();
-      this.logCliEvent(
-        flags,
-        "spaces",
-        "entered",
-        "Successfully entered space",
-        { clientId: this.realtimeClient!.auth.clientId },
-      );
+      this.logCliEvent(flags, "spaces", "entered", "Entered space", {
+        clientId: this.realtimeClient!.auth.clientId,
+      });
 
       // Try to acquire the lock
       try {
@@ -157,7 +154,7 @@ export default class SpacesLocksAcquire extends SpacesBaseCommand {
           flags,
           "lock",
           "acquired",
-          `Successfully acquired lock: ${lockId}`,
+          `Lock acquired: ${lockId}`,
           lockDetails,
         );
 
@@ -166,15 +163,11 @@ export default class SpacesLocksAcquire extends SpacesBaseCommand {
             this.formatJsonOutput({ lock: lockDetails, success: true }, flags),
           );
         } else {
-          this.log(
-            `${chalk.green("Successfully acquired lock:")} ${chalk.cyan(lockId)}`,
-          );
+          this.log(success(`Lock acquired: ${resource(lockId)}.`));
           this.log(
             `${chalk.dim("Lock details:")} ${this.formatJsonOutput(lockDetails, { ...flags, "pretty-json": true })}`,
           );
-          this.log(
-            `\n${chalk.dim("Holding lock. Press Ctrl+C to release and exit.")}`,
-          );
+          this.log(`\n${listening("Holding lock.")}`);
         }
       } catch (error) {
         const errorMsg = `Failed to acquire lock: ${error instanceof Error ? error.message : String(error)}`;
diff --git a/src/commands/spaces/locks/get-all.ts b/src/commands/spaces/locks/get-all.ts
index c60b37b5..59a6b059 100644
--- a/src/commands/spaces/locks/get-all.ts
+++ b/src/commands/spaces/locks/get-all.ts
@@ -2,6 +2,7 @@ import { Args } from "@oclif/core";
 import chalk from "chalk";
 
 import { SpacesBaseCommand } from "../../../spaces-base-command.js";
+import { progress, resource, success } from "../../../utils/output.js";
 
 interface LockItem {
   attributes?: Record<string, unknown>;
@@ -69,7 +70,10 @@ export default class SpacesLocksGetAll extends SpacesBaseCommand {
       });
 
       // Get the space
-      this.log(`Connecting to space: ${chalk.cyan(spaceName)}...`);
+      if (!this.shouldOutputJson(flags)) {
+        this.log(progress(`Connecting to space: ${resource(spaceName)}`));
+      }
+
       await this.space.enter();
 
       // Wait for space to be properly entered before fetching locks
@@ -82,9 +86,12 @@ export default class SpacesLocksGetAll extends SpacesBaseCommand {
           try {
             if (this.realtimeClient!.connection.state === "connected") {
               clearTimeout(timeout);
-              this.log(
-                `${chalk.green("Connected to space:")} ${chalk.cyan(spaceName)}`,
-              );
+              if (!this.shouldOutputJson(flags)) {
+                this.log(
+                  success(`Connected to space: ${resource(spaceName)}.`),
+                );
+              }
+
               resolve();
             } else if (
               this.realtimeClient!.connection.state === "failed" ||
@@ -111,7 +118,7 @@ export default class SpacesLocksGetAll extends SpacesBaseCommand {
 
       // Get all locks
       if (!this.shouldOutputJson(flags)) {
-        this.log(`Fetching locks for space ${chalk.cyan(spaceName)}...`);
+        this.log(progress(`Fetching locks for space ${resource(spaceName)}`));
       }
 
       let locks: LockItem[] = [];
diff --git a/src/commands/spaces/locks/get.ts b/src/commands/spaces/locks/get.ts
index ddc69395..53eeaf9f 100644
--- a/src/commands/spaces/locks/get.ts
+++ b/src/commands/spaces/locks/get.ts
@@ -2,6 +2,7 @@ import { Args } from "@oclif/core";
 import chalk from "chalk";
 
 import { SpacesBaseCommand } from "../../../spaces-base-command.js";
+import { resource, success } from "../../../utils/output.js";
 
 // interface SpacesClients { // Remove interface
 //   realtimeClient: any;
@@ -62,9 +63,9 @@ export default class SpacesLocksGet extends SpacesBaseCommand {
       // Enter the space first
       // await space.enter() // Use this.space
       await this.space.enter();
-      this.log(
-        `${chalk.green("Successfully entered space:")} ${chalk.cyan(spaceName)}`,
-      );
+      if (!this.shouldOutputJson(flags)) {
+        this.log(success(`Entered space: ${resource(spaceName)}.`));
+      }
 
       // Try to get the lock
       try {
diff --git a/src/commands/spaces/locks/subscribe.ts b/src/commands/spaces/locks/subscribe.ts
index 782b3fcf..057dd51d 100644
--- a/src/commands/spaces/locks/subscribe.ts
+++ b/src/commands/spaces/locks/subscribe.ts
@@ -5,6 +5,12 @@ import chalk from "chalk";
 import { clientIdFlag } from "../../../flags.js";
 import { SpacesBaseCommand } from "../../../spaces-base-command.js";
 import { waitUntilInterruptedOrTimeout } from "../../../utils/long-running.js";
+import {
+  listening,
+  progress,
+  resource,
+  formatTimestamp,
+} from "../../../utils/output.js";
 
 export default class SpacesLocksSubscribe extends SpacesBaseCommand {
   static override args = {
@@ -27,8 +33,7 @@ export default class SpacesLocksSubscribe extends SpacesBaseCommand {
     ...SpacesBaseCommand.globalFlags,
     ...clientIdFlag,
     duration: _Flags.integer({
-      description:
-        "Automatically exit after the given number of seconds (0 = run indefinitely)",
+      description: "Automatically exit after N seconds (0 = run indefinitely)",
       char: "D",
       required: false,
     }),
@@ -155,7 +160,7 @@ export default class SpacesLocksSubscribe extends SpacesBaseCommand {
       );
 
       if (!this.shouldOutputJson(flags)) {
-        this.log(`Connecting to space: ${chalk.cyan(spaceName)}...`);
+        this.log(progress(`Connecting to space: ${resource(spaceName)}`));
       }
 
       // Get current locks
@@ -167,7 +172,7 @@ export default class SpacesLocksSubscribe extends SpacesBaseCommand {
       );
       if (!this.shouldOutputJson(flags)) {
         this.log(
-          `Fetching current locks for space ${chalk.cyan(spaceName)}...`,
+          progress(`Fetching current locks for space ${resource(spaceName)}`),
         );
       }
 
@@ -231,9 +236,7 @@ export default class SpacesLocksSubscribe extends SpacesBaseCommand {
         "Subscribing to lock events",
       );
       if (!this.shouldOutputJson(flags)) {
-        this.log(
-          `\n${chalk.dim("Subscribing to lock events. Press Ctrl+C to exit.")}\n`,
-        );
+        this.log(listening("Subscribing to lock events."));
       }
       this.logCliEvent(
         flags,
@@ -270,7 +273,9 @@ export default class SpacesLocksSubscribe extends SpacesBaseCommand {
             this.formatJsonOutput({ success: true, ...eventData }, flags),
           );
         } else {
-          this.log(`[${timestamp}] 🔒 Lock ${chalk.blue(lock.id)} updated`);
+          this.log(
+            `${formatTimestamp(timestamp)} 🔒 Lock ${chalk.blue(lock.id)} updated`,
+          );
           this.log(`  ${chalk.dim("Status:")} ${lock.status}`);
           this.log(
             `  ${chalk.dim("Member:")} ${lock.member?.clientId || "Unknown"}`,
diff --git a/src/commands/spaces/members/enter.ts b/src/commands/spaces/members/enter.ts
index 942e21a4..3f4f74d3 100644
--- a/src/commands/spaces/members/enter.ts
+++ b/src/commands/spaces/members/enter.ts
@@ -5,6 +5,12 @@ import chalk from "chalk";
 import { clientIdFlag } from "../../../flags.js";
 import { SpacesBaseCommand } from "../../../spaces-base-command.js";
 import { waitUntilInterruptedOrTimeout } from "../../../utils/long-running.js";
+import {
+  success,
+  listening,
+  resource,
+  formatTimestamp,
+} from "../../../utils/output.js";
 
 export default class SpacesMembersEnter extends SpacesBaseCommand {
   static override args = {
@@ -32,8 +38,7 @@ export default class SpacesMembersEnter extends SpacesBaseCommand {
       required: false,
     }),
     duration: Flags.integer({
-      description:
-        "Automatically exit after the given number of seconds (0 = run indefinitely)",
+      description: "Automatically exit after N seconds (0 = run indefinitely)",
       char: "D",
       required: false,
     }),
@@ -55,7 +60,7 @@ export default class SpacesMembersEnter extends SpacesBaseCommand {
     try {
       // Always show the readiness signal first, before attempting auth
       if (!this.shouldOutputJson(flags)) {
-        this.log(`${chalk.dim("Entering space. Press Ctrl+C to exit.")}`);
+        this.log(listening("Entering space."));
       }
 
       // Create Spaces client using setupSpacesClient
@@ -114,7 +119,7 @@ export default class SpacesMembersEnter extends SpacesBaseCommand {
         flags,
         "spaces",
         "gotSpace",
-        `Successfully got space handle: ${spaceName}`,
+        `Got space handle: ${spaceName}`,
       );
 
       // Enter the space with optional profile
@@ -136,7 +141,7 @@ export default class SpacesMembersEnter extends SpacesBaseCommand {
         flags,
         "member",
         "enteredSpace",
-        "Successfully entered space",
+        "Entered space",
         enteredEventData,
       );
 
@@ -145,9 +150,7 @@ export default class SpacesMembersEnter extends SpacesBaseCommand {
           this.formatJsonOutput({ success: true, ...enteredEventData }, flags),
         );
       } else {
-        this.log(
-          `${chalk.green("Successfully entered space:")} ${chalk.cyan(spaceName)}`,
-        );
+        this.log(success(`Entered space: ${resource(spaceName)}.`));
         if (profileData) {
           this.log(
             `${chalk.dim("Profile:")} ${JSON.stringify(profileData, null, 2)}`,
@@ -171,9 +174,7 @@ export default class SpacesMembersEnter extends SpacesBaseCommand {
         "Subscribing to member updates",
       );
       if (!this.shouldOutputJson(flags)) {
-        this.log(
-          `\n${chalk.dim("Watching for other members. Press Ctrl+C to exit.")}\n`,
-        );
+        this.log(`\n${listening("Watching for other members.")}\n`);
       }
 
       // Define the listener function
@@ -269,7 +270,7 @@ export default class SpacesMembersEnter extends SpacesBaseCommand {
           }
 
           this.log(
-            `[${timestamp}] ${actionColor(actionSymbol)} ${chalk.blue(clientId)} ${actionColor(action)}`,
+            `${formatTimestamp(timestamp)} ${actionColor(actionSymbol)} ${chalk.blue(clientId)} ${actionColor(action)}`,
           );
 
           const hasProfileData =
@@ -322,7 +323,7 @@ export default class SpacesMembersEnter extends SpacesBaseCommand {
         flags,
         "member",
         "subscribed",
-        "Successfully subscribed to member updates",
+        "Subscribed to member updates",
       );
 
       this.logCliEvent(
diff --git a/src/commands/spaces/members/subscribe.ts b/src/commands/spaces/members/subscribe.ts
index e0b8936b..92cdd793 100644
--- a/src/commands/spaces/members/subscribe.ts
+++ b/src/commands/spaces/members/subscribe.ts
@@ -5,6 +5,7 @@ import chalk from "chalk";
 import { clientIdFlag } from "../../../flags.js";
 import { SpacesBaseCommand } from "../../../spaces-base-command.js";
 import { waitUntilInterruptedOrTimeout } from "../../../utils/long-running.js";
+import { listening, progress, formatTimestamp } from "../../../utils/output.js";
 
 export default class SpacesMembersSubscribe extends SpacesBaseCommand {
   static override args = {
@@ -28,8 +29,7 @@ export default class SpacesMembersSubscribe extends SpacesBaseCommand {
     ...SpacesBaseCommand.globalFlags,
     ...clientIdFlag,
     duration: _Flags.integer({
-      description:
-        "Automatically exit after the given number of seconds (0 = run indefinitely)",
+      description: "Automatically exit after N seconds (0 = run indefinitely)",
       char: "D",
       required: false,
     }),
@@ -51,7 +51,7 @@ export default class SpacesMembersSubscribe extends SpacesBaseCommand {
     try {
       // Always show the readiness signal first, before attempting auth
       if (!this.shouldOutputJson(flags)) {
-        this.log("Subscribing to member updates");
+        this.log(progress("Subscribing to member updates"));
       }
 
       // Create Spaces client using setupSpacesClient
@@ -79,7 +79,7 @@ export default class SpacesMembersSubscribe extends SpacesBaseCommand {
         flags,
         "spaces",
         "gotSpace",
-        `Successfully got space handle: ${spaceName}`,
+        `Got space handle: ${spaceName}`,
       );
 
       // Enter the space to subscribe
@@ -89,13 +89,9 @@ export default class SpacesMembersSubscribe extends SpacesBaseCommand {
         return;
       }
       await this.space.enter();
-      this.logCliEvent(
-        flags,
-        "spaces",
-        "entered",
-        "Successfully entered space",
-        { clientId: this.realtimeClient!.auth.clientId },
-      );
+      this.logCliEvent(flags, "spaces", "entered", "Entered space", {
+        clientId: this.realtimeClient!.auth.clientId,
+      });
 
       // Get current members
       this.logCliEvent(
@@ -170,9 +166,7 @@ export default class SpacesMembersSubscribe extends SpacesBaseCommand {
       }
 
       if (!this.shouldOutputJson(flags)) {
-        this.log(
-          `\n${chalk.dim("Subscribing to member events. Press Ctrl+C to exit.")}\n`,
-        );
+        this.log(`\n${listening("Listening for member events.")}\n`);
       }
 
       // Subscribe to member presence events
@@ -279,7 +273,7 @@ export default class SpacesMembersSubscribe extends SpacesBaseCommand {
           }
 
           this.log(
-            `[${timestamp}] ${actionColor(actionSymbol)} ${chalk.blue(clientId)} ${actionColor(action)}`,
+            `${formatTimestamp(timestamp)} ${actionColor(actionSymbol)} ${chalk.blue(clientId)} ${actionColor(action)}`,
           );
 
           if (
@@ -308,7 +302,7 @@ export default class SpacesMembersSubscribe extends SpacesBaseCommand {
         flags,
         "member",
         "subscribed",
-        "Successfully subscribed to member updates",
+        "Subscribed to member updates",
       );
 
       this.logCliEvent(
diff --git a/src/commands/stats/account.ts b/src/commands/stats/account.ts
index 601be79f..f6e1d9a1 100644
--- a/src/commands/stats/account.ts
+++ b/src/commands/stats/account.ts
@@ -35,7 +35,7 @@ export default class StatsAccountCommand extends ControlBaseCommand {
     }),
     limit: Flags.integer({
       default: 10,
-      description: "Maximum number of stats records to return",
+      description: "Maximum number of results to return (default: 10)",
     }),
 
     live: Flags.boolean({
@@ -119,7 +119,7 @@ export default class StatsAccountCommand extends ControlBaseCommand {
     try {
       this.isPolling = true;
       if (flags.debug) {
-        console.log(
+        this.log(
           chalk.dim(`\n[${new Date().toISOString()}] Polling for new stats...`),
         );
       }
@@ -127,7 +127,7 @@ export default class StatsAccountCommand extends ControlBaseCommand {
       await this.fetchAndDisplayStats(flags, controlApi);
     } catch (error) {
       if (flags.debug) {
-        console.error(
+        this.logToStderr(
           chalk.red(
             `Error during stats polling: ${error instanceof Error ? error.message : String(error)}`,
           ),
@@ -173,7 +173,7 @@ export default class StatsAccountCommand extends ControlBaseCommand {
             this.pollStats(flags, controlApi);
           } else if (flags.debug) {
             // Only show this message if debug flag is enabled
-            console.log(
+            this.log(
               chalk.yellow(
                 "Skipping poll - previous request still in progress",
               ),
diff --git a/src/commands/stats/app.ts b/src/commands/stats/app.ts
index c67fbe1d..e95538b0 100644
--- a/src/commands/stats/app.ts
+++ b/src/commands/stats/app.ts
@@ -45,7 +45,7 @@ export default class StatsAppCommand extends ControlBaseCommand {
     }),
     limit: Flags.integer({
       default: 10,
-      description: "Maximum number of stats records to return",
+      description: "Maximum number of results to return (default: 10)",
     }),
 
     live: Flags.boolean({
@@ -140,7 +140,7 @@ export default class StatsAppCommand extends ControlBaseCommand {
     try {
       this.isPolling = true;
       if (flags.debug) {
-        console.log(
+        this.log(
           chalk.dim(`\n[${new Date().toISOString()}] Polling for new stats...`),
         );
       }
@@ -148,7 +148,7 @@ export default class StatsAppCommand extends ControlBaseCommand {
       await this.fetchAndDisplayStats(appId, flags, controlApi);
     } catch (error) {
       if (flags.debug) {
-        console.error(
+        this.logToStderr(
           chalk.red(
             `Error during stats polling: ${error instanceof Error ? error.message : String(error)}`,
           ),
@@ -191,7 +191,7 @@ export default class StatsAppCommand extends ControlBaseCommand {
             this.pollStats(appId, flags, controlApi);
           } else if (flags.debug) {
             // Only show this message if debug flag is enabled
-            console.log(
+            this.log(
               chalk.yellow(
                 "Skipping poll - previous request still in progress",
               ),
diff --git a/src/commands/status.ts b/src/commands/status.ts
index 7c10b8a8..b93b9ce4 100644
--- a/src/commands/status.ts
+++ b/src/commands/status.ts
@@ -2,8 +2,9 @@ import { Command, Flags } from "@oclif/core";
 import chalk from "chalk";
 import fetch from "node-fetch";
 import ora from "ora";
-import { getCliVersion } from "../utils/version.js";
 import openUrl from "../utils/open-url.js";
+import { progress, success } from "../utils/output.js";
+import { getCliVersion } from "../utils/version.js";
 
 interface StatusResponse {
   status: boolean;
@@ -31,7 +32,7 @@ export default class StatusCommand extends Command {
       ? null
       : ora("Checking Ably service status...").start();
     if (isInteractive) {
-      this.log("Checking Ably service status...");
+      this.log(progress("Checking Ably service status"));
     }
 
     try {
@@ -48,9 +49,7 @@ export default class StatusCommand extends Command {
           "Invalid response from status endpoint: status attribute is missing",
         );
       } else if (data.status) {
-        this.log(
-          `${chalk.green("✓")} Ably services are ${chalk.green("operational")}`,
-        );
+        this.log(success(`Ably services are ${chalk.green("operational")}.`));
         this.log("No incidents currently reported");
       } else {
         this.log(
diff --git a/src/flags.ts b/src/flags.ts
index 398ad557..09e6c602 100644
--- a/src/flags.ts
+++ b/src/flags.ts
@@ -25,14 +25,14 @@ export const coreGlobalFlags = {
 };
 
 /**
- * Hidden flags for product API (Ably SDK) commands — port, tls, tlsPort.
+ * Hidden flags for product API (Ably SDK) commands — port, tls, tls-port.
  */
 export const hiddenProductApiFlags = {
   port: Flags.integer({
     description: "Override the port for product API calls",
     hidden: process.env.ABLY_SHOW_DEV_FLAGS !== "true",
   }),
-  tlsPort: Flags.integer({
+  "tls-port": Flags.integer({
     description: "Override the TLS port for product API calls",
     hidden: process.env.ABLY_SHOW_DEV_FLAGS !== "true",
   }),
diff --git a/src/help.ts b/src/help.ts
index 5c977564..8af25a13 100644
--- a/src/help.ts
+++ b/src/help.ts
@@ -116,52 +116,7 @@ export default class CustomHelp extends Help {
     // For topic commands, we need to add the COMMANDS section manually
     const output = this.formatCommand(command);
     const cleanedOutput = this.removeTrailingWhitespace(output);
-    console.log(this.formatHelpOutput(cleanedOutput));
-
-    // Check if this is a topic command by looking for subcommands
-    const topicPrefix = `${command.id}:`;
-    const subcommands = this.config.commands.filter(
-      (cmd) =>
-        cmd.id.startsWith(topicPrefix) &&
-        !cmd.hidden &&
-        !cmd.id.slice(topicPrefix.length).includes(":"),
-    );
-
-    if (subcommands.length > 0 && !output.includes("COMMANDS")) {
-      // This is a topic command without a COMMANDS section, add it
-      console.log("\nCOMMANDS");
-
-      const commandsList = await Promise.all(
-        subcommands.map(async (cmd) => {
-          try {
-            const loaded = await cmd.load();
-            const formattedId = cmd.id.replaceAll(":", " ");
-            const binPrefix = this.interactiveMode ? "" : `${this.config.bin} `;
-            return {
-              name: `${binPrefix}${formattedId}`,
-              description: loaded.description || "",
-            };
-          } catch {
-            return null;
-          }
-        }),
-      );
-
-      const validCommands = commandsList.filter(
-        (cmd) => cmd !== null,
-      ) as Array<{ name: string; description: string }>;
-
-      if (validCommands.length > 0) {
-        const maxLength = Math.max(
-          ...validCommands.map((cmd) => cmd.name.length),
-        );
-
-        validCommands.forEach((cmd) => {
-          const paddedName = cmd.name.padEnd(maxLength + 2);
-          console.log(`  ${paddedName}${cmd.description}`);
-        });
-      }
-    }
+    this.log(this.formatHelpOutput(cleanedOutput));
 
     // Only exit if not in interactive mode
     if (process.env.ABLY_INTERACTIVE_MODE !== "true") {
@@ -191,7 +146,7 @@ export default class CustomHelp extends Help {
     const output = this.formatCommand(command);
     const cleanedOutput = this.removeTrailingWhitespace(output);
     // Apply stripAnsi when needed
-    console.log(this.formatHelpOutput(cleanedOutput));
+    this.log(this.formatHelpOutput(cleanedOutput));
 
     // Only exit if not in interactive mode
     if (process.env.ABLY_INTERACTIVE_MODE !== "true") {
@@ -205,7 +160,7 @@ export default class CustomHelp extends Help {
     const output = this.formatRoot();
     const cleanedOutput = this.removeTrailingWhitespace(output);
     // Apply stripAnsi when needed
-    console.log(this.formatHelpOutput(cleanedOutput));
+    this.log(this.formatHelpOutput(cleanedOutput));
 
     // Only exit if not in interactive mode
     if (process.env.ABLY_INTERACTIVE_MODE !== "true") {
@@ -267,7 +222,7 @@ export default class CustomHelp extends Help {
       formatReleaseStatus(config.version, true),
       "",
       `${chalk.bold("USAGE")}`,
-      `  ${this.interactiveMode ? "ably> " : "$ " + config.bin + " "}[COMMAND]`,
+      `  ${this.interactiveMode ? "ably> " : chalk.green("$") + " " + chalk.cyan(config.bin) + " "}[COMMAND]`,
       "",
       chalk.bold("COMMANDS"), // Use the desired single heading
     ];
@@ -314,7 +269,9 @@ export default class CustomHelp extends Help {
         combined.map((c) => {
           const description =
             c.description && this.render(c.description.split("\n")[0]);
-          const descString = description ? chalk.dim(description) : undefined;
+          const descString = description
+            ? chalk.whiteBright(description)
+            : undefined;
           return [chalk.cyan(c.id), descString];
         }),
         { indentation: 2, spacer: "\n" }, // Adjust spacing if needed
@@ -406,7 +363,7 @@ export default class CustomHelp extends Help {
     // Display commands with proper alignment
     commands.forEach(([cmd, desc]) => {
       const paddedCmd = cmd.padEnd(maxCmdLength + 2);
-      lines.push(`  ${chalk.cyan(paddedCmd)}${desc}`);
+      lines.push(`  ${chalk.cyan(paddedCmd)}${chalk.whiteBright(desc)}`);
     });
 
     // Always show help instruction
@@ -447,13 +404,24 @@ export default class CustomHelp extends Help {
 
     if (subcommands.length > 0 && !output.includes("COMMANDS")) {
       // Add COMMANDS section for topic commands
-      const commandsLines: string[] = ["\n\nCOMMANDS"];
+      const commandsLines: string[] = [`\n\n${chalk.bold("COMMANDS")}`];
 
-      subcommands.forEach((cmd) => {
+      const entries = subcommands.map((cmd) => {
         const formattedId = cmd.id.replaceAll(":", " ");
         const binPrefix = this.interactiveMode ? "" : `${this.config.bin} `;
-        const paddedId = `${binPrefix}${formattedId}`.padEnd(30);
-        commandsLines.push(`  ${paddedId}${cmd.description || ""}`);
+        return {
+          name: `${binPrefix}${formattedId}`,
+          description: cmd.description || "",
+        };
+      });
+
+      const maxLength = Math.max(...entries.map((e) => e.name.length));
+
+      entries.forEach((entry) => {
+        const paddedName = entry.name.padEnd(maxLength + 2);
+        commandsLines.push(
+          `  ${chalk.cyan(paddedName)}${chalk.whiteBright(entry.description)}`,
+        );
       });
 
       output += commandsLines.join("\n");
@@ -588,7 +556,7 @@ export default class CustomHelp extends Help {
             c.description && this.render(c.description.split("\n")[0]);
           return [
             chalk.cyan(c.id),
-            description ? chalk.dim(description) : undefined,
+            description ? chalk.whiteBright(description) : undefined,
           ];
         }),
         { indentation: 2 },
@@ -618,7 +586,7 @@ export default class CustomHelp extends Help {
             c.description && this.render(c.description.split("\n")[0]);
           return [
             chalk.cyan(c.name),
-            description ? chalk.dim(description) : undefined,
+            description ? chalk.whiteBright(description) : undefined,
           ];
         })
         .map(([left, right]) =>
diff --git a/src/types/cli.ts b/src/types/cli.ts
index 71e52e16..bbf7e60d 100644
--- a/src/types/cli.ts
+++ b/src/types/cli.ts
@@ -12,7 +12,7 @@ export interface BaseFlags {
   endpoint?: string;
   port?: number;
   tls?: string;
-  tlsPort?: number;
+  "tls-port"?: number;
   json?: boolean;
   "pretty-json"?: boolean;
   verbose?: boolean;
diff --git a/src/utils/output.ts b/src/utils/output.ts
new file mode 100644
index 00000000..f1b83f79
--- /dev/null
+++ b/src/utils/output.ts
@@ -0,0 +1,21 @@
+import chalk from "chalk";
+
+export function progress(message: string): string {
+  return `${message}...`;
+}
+
+export function success(message: string): string {
+  return `${chalk.green("✓")} ${message}`;
+}
+
+export function listening(description: string): string {
+  return chalk.dim(`${description} Press Ctrl+C to exit.`);
+}
+
+export function resource(name: string): string {
+  return chalk.cyan(name);
+}
+
+export function formatTimestamp(ts: string): string {
+  return chalk.dim(`[${ts}]`);
+}
diff --git a/test/e2e/channels/channel-history-e2e.test.ts b/test/e2e/channels/channel-history-e2e.test.ts
index 53b7a49c..d95ae65e 100644
--- a/test/e2e/channels/channel-history-e2e.test.ts
+++ b/test/e2e/channels/channel-history-e2e.test.ts
@@ -95,9 +95,8 @@ describe("Channel History E2E Tests", () => {
         );
       }
 
-      expect(publishResult.stdout).toContain(
-        `Message published successfully to channel "${historyChannel}"`,
-      );
+      expect(publishResult.stdout).toContain(`Message published to channel`);
+      expect(publishResult.stdout).toContain(historyChannel);
     }
 
     // Add a delay to ensure messages are stored
diff --git a/test/e2e/channels/channel-occupancy-e2e.test.ts b/test/e2e/channels/channel-occupancy-e2e.test.ts
index c456d01d..d26ed70a 100644
--- a/test/e2e/channels/channel-occupancy-e2e.test.ts
+++ b/test/e2e/channels/channel-occupancy-e2e.test.ts
@@ -71,7 +71,7 @@ describe("Channel Occupancy E2E Tests", () => {
         `bin/run.js channels subscribe ${occupancyChannel} --duration 20`,
         outputPath,
         {
-          readySignal: "Successfully attached to channel",
+          readySignal: "Subscribed to channel",
           timeoutMs: process.env.CI ? 20000 : 15000, // Increased timeout for CI
           retryCount: 2,
         },
@@ -155,7 +155,7 @@ describe("Channel Occupancy E2E Tests", () => {
         `bin/run.js channels subscribe ${occupancyChannel} --duration 20`,
         await createTempOutputFile(),
         {
-          readySignal: "Successfully attached to channel",
+          readySignal: "Subscribed to channel",
           timeoutMs: process.env.CI ? 20000 : 15000,
           retryCount: 2,
         },
diff --git a/test/e2e/channels/channel-presence-e2e.test.ts b/test/e2e/channels/channel-presence-e2e.test.ts
index d32972e2..9cda3954 100644
--- a/test/e2e/channels/channel-presence-e2e.test.ts
+++ b/test/e2e/channels/channel-presence-e2e.test.ts
@@ -84,7 +84,7 @@ describe("Channel Presence E2E Tests", () => {
 
     console.log(`Presence enter output: ${enterResult.stdout}`);
     expect(enterResult.exitCode).toBe(0);
-    expect(enterResult.stdout).toContain("Entered channel");
+    expect(enterResult.stdout).toContain("Entered presence on channel");
     expect(enterResult.stdout).toContain(
       "Duration elapsed – command finished cleanly",
     );
diff --git a/test/e2e/channels/channel-subscribe-e2e.test.ts b/test/e2e/channels/channel-subscribe-e2e.test.ts
index 0f17dace..a7b32636 100644
--- a/test/e2e/channels/channel-subscribe-e2e.test.ts
+++ b/test/e2e/channels/channel-subscribe-e2e.test.ts
@@ -74,7 +74,7 @@ describe("Channel Subscribe E2E Tests", () => {
       return;
     }
 
-    const readySignal = "Successfully attached to channel"; // Wait for channel to be fully attached
+    const readySignal = "Subscribed to channel"; // Wait for channel to be fully attached
 
     // Start the subscribe process, waiting for the ready signal
     subscribeProcessInfo = await runLongRunningBackgroundProcess(
diff --git a/test/e2e/channels/channels-e2e.test.ts b/test/e2e/channels/channels-e2e.test.ts
index 1bf27bf1..e5535938 100644
--- a/test/e2e/channels/channels-e2e.test.ts
+++ b/test/e2e/channels/channels-e2e.test.ts
@@ -235,9 +235,8 @@ describe("Channel E2E Tests", () => {
       );
     }
 
-    expect(publishResult.stdout).toContain(
-      `Message published successfully to channel "${uniqueChannel}"`,
-    );
+    expect(publishResult.stdout).toContain(`Message published to channel`);
+    expect(publishResult.stdout).toContain(uniqueChannel);
 
     // Add a delay to ensure message is stored and available in history
     await new Promise((resolve) => setTimeout(resolve, 2000));
@@ -480,17 +479,18 @@ describe("Channel E2E Tests", () => {
     }
 
     expect(countPublishResult.stdout).toContain(
-      "Message 1 published successfully",
+      "Message 1 published to channel",
     );
     expect(countPublishResult.stdout).toContain(
-      "Message 2 published successfully",
+      "Message 2 published to channel",
     );
     expect(countPublishResult.stdout).toContain(
-      "Message 3 published successfully",
+      "Message 3 published to channel",
     );
     expect(countPublishResult.stdout).toContain(
-      "3/3 messages published successfully",
+      "3/3 messages published to channel",
     );
+    expect(countPublishResult.stdout).toContain(countChannel);
 
     // Add a delay to ensure messages are stored and available in history
     await new Promise((resolve) => setTimeout(resolve, 2000));
diff --git a/test/e2e/rooms/rooms-e2e.test.ts b/test/e2e/rooms/rooms-e2e.test.ts
index 266fecea..1a582b54 100644
--- a/test/e2e/rooms/rooms-e2e.test.ts
+++ b/test/e2e/rooms/rooms-e2e.test.ts
@@ -84,7 +84,7 @@ describe("Rooms E2E Tests", () => {
               "--duration",
               "15",
             ],
-            /Entered room/,
+            /Entered presence in room/,
             { timeoutMs: process.env.CI ? 20000 : 15000 },
           );
 
@@ -167,7 +167,7 @@ describe("Rooms E2E Tests", () => {
               "--duration",
               "35",
             ],
-            /Subscribing to presence events/,
+            /Subscribed to presence in room/,
             { timeoutMs: process.env.CI ? 30000 : 20000 },
           );
 
@@ -189,7 +189,7 @@ describe("Rooms E2E Tests", () => {
               "--duration",
               "25",
             ],
-            /Entered room/,
+            /Entered presence in room/,
             { timeoutMs: process.env.CI ? 30000 : 20000 },
           );
 
@@ -291,9 +291,9 @@ describe("Rooms E2E Tests", () => {
           // Check for success - either exit code 0 or successful output (even if process was killed after success)
           const isSuccessful =
             sendResult.exitCode === 0 ||
-            sendResult.stdout.includes("Message sent successfully");
+            sendResult.stdout.includes("Message sent to room");
           expect(isSuccessful).toBe(true);
-          expect(sendResult.stdout).toContain("Message sent successfully");
+          expect(sendResult.stdout).toContain("Message sent to room");
 
           // Wait for the message to be received by the subscriber
           await waitForOutput(
@@ -331,7 +331,7 @@ describe("Rooms E2E Tests", () => {
           // Check for success - either exit code 0 or successful output (even if process was killed after success)
           const isSecondSuccessful =
             sendResult2.exitCode === 0 ||
-            sendResult2.stdout.includes("Message sent successfully");
+            sendResult2.stdout.includes("Message sent to room");
           expect(isSecondSuccessful).toBe(true);
 
           // Wait for the second message to be received
diff --git a/test/e2e/spaces/spaces-e2e.test.ts b/test/e2e/spaces/spaces-e2e.test.ts
index 3923c2c5..126cf4e3 100644
--- a/test/e2e/spaces/spaces-e2e.test.ts
+++ b/test/e2e/spaces/spaces-e2e.test.ts
@@ -97,7 +97,7 @@ describe("Spaces E2E Tests", () => {
             `bin/run.js spaces members enter ${testSpaceId} --profile '{"name":"Test User 2","role":"collaborator","department":"E2E Testing"}' --client-id ${client2Id} --duration 12`,
             client2OutputPath,
             {
-              readySignal: "Successfully entered space:",
+              readySignal: "Entered space:",
               timeoutMs: process.env.CI ? 20000 : 15000, // Increased local timeout
               retryCount: 2,
             },
@@ -164,7 +164,7 @@ describe("Spaces E2E Tests", () => {
             `bin/run.js spaces members enter ${testSpaceId} --profile '{"name":"Client 1"}' --client-id ${client1Id} --duration 20`,
             client1OutputPath,
             {
-              readySignal: "Successfully entered space:",
+              readySignal: "Entered space:",
               timeoutMs: process.env.CI ? 20000 : 15000,
               retryCount: 2,
             },
@@ -175,7 +175,7 @@ describe("Spaces E2E Tests", () => {
             `bin/run.js spaces members enter ${testSpaceId} --profile '{"name":"Client 2"}' --client-id ${client2Id} --duration 20`,
             client2OutputPath,
             {
-              readySignal: "Successfully entered space:",
+              readySignal: "Entered space:",
               timeoutMs: process.env.CI ? 20000 : 15000,
               retryCount: 2,
             },
@@ -219,11 +219,9 @@ describe("Spaces E2E Tests", () => {
           // Check for success - either exit code 0 or successful output (even if process was killed after success)
           const isLocationSetSuccessful =
             setLocationResult.exitCode === 0 ||
-            setLocationResult.stdout.includes("Successfully set location");
+            setLocationResult.stdout.includes("Location set in space:");
           expect(isLocationSetSuccessful).toBe(true);
-          expect(setLocationResult.stdout).toContain(
-            "Successfully set location",
-          );
+          expect(setLocationResult.stdout).toContain("Location set in space:");
 
           // Wait for location update to be received by client1
           let locationUpdateReceived = false;
@@ -261,7 +259,7 @@ describe("Spaces E2E Tests", () => {
           // Check for success - either exit code 0 or successful output (even if process was killed after success)
           const isSecondLocationSetSuccessful =
             updateLocationResult.exitCode === 0 ||
-            updateLocationResult.stdout.includes("Successfully set location");
+            updateLocationResult.stdout.includes("Location set in space:");
           expect(isSecondLocationSetSuccessful).toBe(true);
 
           // Wait for second location update
@@ -324,7 +322,7 @@ describe("Spaces E2E Tests", () => {
             `bin/run.js spaces members enter ${testSpaceId} --profile '{"name":"Client 1"}' --client-id ${client1Id} --duration 20`,
             client1OutputPath,
             {
-              readySignal: "Successfully entered space:",
+              readySignal: "Entered space:",
               timeoutMs: process.env.CI ? 20000 : 15000,
               retryCount: 2,
             },
@@ -335,7 +333,7 @@ describe("Spaces E2E Tests", () => {
             `bin/run.js spaces members enter ${testSpaceId} --profile '{"name":"Client 2"}' --client-id ${client2Id} --duration 20`,
             client2OutputPath,
             {
-              readySignal: "Successfully entered space:",
+              readySignal: "Entered space:",
               timeoutMs: process.env.CI ? 20000 : 15000,
               retryCount: 2,
             },
@@ -485,7 +483,7 @@ describe("Spaces E2E Tests", () => {
             `bin/run.js spaces members enter ${testSpaceId} --profile '{"name":"Client 1"}' --client-id ${client1Id} --duration 20`,
             client1OutputPath,
             {
-              readySignal: "Successfully entered space:",
+              readySignal: "Entered space:",
               timeoutMs: process.env.CI ? 20000 : 15000,
               retryCount: 2,
             },
@@ -496,7 +494,7 @@ describe("Spaces E2E Tests", () => {
             `bin/run.js spaces members enter ${testSpaceId} --profile '{"name":"Client 2"}' --client-id ${client2Id} --duration 20`,
             client2OutputPath,
             {
-              readySignal: "Successfully entered space:",
+              readySignal: "Entered space:",
               timeoutMs: process.env.CI ? 20000 : 15000,
               retryCount: 2,
             },
@@ -538,7 +536,7 @@ describe("Spaces E2E Tests", () => {
             `bin/run.js spaces locks acquire ${testSpaceId} ${lockId} --data '${JSON.stringify(lockAttributes)}' --client-id ${client2Id}`,
             lockOutputPath,
             {
-              readySignal: "Successfully acquired lock",
+              readySignal: "Lock acquired:",
               timeoutMs: process.env.CI ? 20000 : 15000,
               retryCount: 2,
             },
diff --git a/test/helpers/command-helpers.ts b/test/helpers/command-helpers.ts
index 16fc32f9..baba6ce4 100644
--- a/test/helpers/command-helpers.ts
+++ b/test/helpers/command-helpers.ts
@@ -46,7 +46,7 @@ export async function startSubscribeCommand(
 // Start a presence enter command and wait for ready
 export async function startPresenceCommand(
   argv: string[],
-  readyMatcher: RegExp | string = /Entered presence on/,
+  readyMatcher: RegExp | string = /Entered presence/,
   opts: Partial<RunnerOpts> = {},
 ): Promise<CliRunner> {
   const outfile = getOutputFile("-presence");
diff --git a/test/unit/commands/apps/channel-rules/create.test.ts b/test/unit/commands/apps/channel-rules/create.test.ts
index f9e885a9..15108191 100644
--- a/test/unit/commands/apps/channel-rules/create.test.ts
+++ b/test/unit/commands/apps/channel-rules/create.test.ts
@@ -29,7 +29,7 @@ describe("apps:channel-rules:create command", () => {
         import.meta.url,
       );
 
-      expect(stdout).toContain("Channel rule created successfully");
+      expect(stdout).toContain("Channel rule created.");
       expect(stdout).toContain(mockRuleId);
     });
 
@@ -59,7 +59,7 @@ describe("apps:channel-rules:create command", () => {
         import.meta.url,
       );
 
-      expect(stdout).toContain("Channel rule created successfully");
+      expect(stdout).toContain("Channel rule created.");
       expect(stdout).toContain("Persisted: Yes");
     });
 
@@ -89,7 +89,7 @@ describe("apps:channel-rules:create command", () => {
         import.meta.url,
       );
 
-      expect(stdout).toContain("Channel rule created successfully");
+      expect(stdout).toContain("Channel rule created.");
       expect(stdout).toContain("Push Enabled: Yes");
     });
 
diff --git a/test/unit/commands/apps/create.test.ts b/test/unit/commands/apps/create.test.ts
index a454bb94..aefdc888 100644
--- a/test/unit/commands/apps/create.test.ts
+++ b/test/unit/commands/apps/create.test.ts
@@ -53,7 +53,7 @@ describe("apps:create command", () => {
         `"${mockAppName}"`,
       ]);
 
-      expect(stdout).toContain("App created successfully");
+      expect(stdout).toContain("App created:");
       expect(stdout).toContain(newAppId);
       expect(stdout).toContain(mockAppName);
       expect(stdout).toContain("Automatically switched to app");
@@ -94,7 +94,7 @@ describe("apps:create command", () => {
         import.meta.url,
       );
 
-      expect(stdout).toContain("App created successfully");
+      expect(stdout).toContain("App created:");
       expect(stdout).toContain("TLS Only: Yes");
       expect(stdout).toContain("Automatically switched to app");
     });
@@ -183,7 +183,7 @@ describe("apps:create command", () => {
         import.meta.url,
       );
 
-      expect(stdout).toContain("App created successfully");
+      expect(stdout).toContain("App created:");
       expect(stdout).toContain("Automatically switched to app");
     });
 
@@ -219,7 +219,7 @@ describe("apps:create command", () => {
         import.meta.url,
       );
 
-      expect(stdout).toContain("App created successfully");
+      expect(stdout).toContain("App created:");
       expect(stdout).toContain(
         `Automatically switched to app: ${mockAppName} (${newAppId})`,
       );
diff --git a/test/unit/commands/auth/keys/create.test.ts b/test/unit/commands/auth/keys/create.test.ts
index 3db33725..f63085fa 100644
--- a/test/unit/commands/auth/keys/create.test.ts
+++ b/test/unit/commands/auth/keys/create.test.ts
@@ -46,7 +46,7 @@ describe("auth:keys:create command", () => {
         import.meta.url,
       );
 
-      expect(stdout).toContain("Key created successfully");
+      expect(stdout).toContain("Key created:");
       expect(stdout).toContain(mockKeyName);
       expect(stdout).toContain(mockKeyId);
     });
@@ -90,7 +90,7 @@ describe("auth:keys:create command", () => {
         import.meta.url,
       );
 
-      expect(stdout).toContain("Key created successfully");
+      expect(stdout).toContain("Key created:");
       expect(stdout).toContain("channel1");
       expect(stdout).toContain("publish");
       expect(stdout).toContain("subscribe");
@@ -165,7 +165,7 @@ describe("auth:keys:create command", () => {
         import.meta.url,
       );
 
-      expect(stdout).toContain("Key created successfully");
+      expect(stdout).toContain("Key created:");
     });
   });
 
@@ -369,7 +369,7 @@ describe("auth:keys:create command", () => {
         import.meta.url,
       );
 
-      expect(stdout).toContain("Key created successfully");
+      expect(stdout).toContain("Key created:");
       expect(stdout).toContain("publish");
     });
 
@@ -412,7 +412,7 @@ describe("auth:keys:create command", () => {
         import.meta.url,
       );
 
-      expect(stdout).toContain("Key created successfully");
+      expect(stdout).toContain("Key created:");
       expect(stdout).toContain("chat-*");
       expect(stdout).toContain("subscribe");
       expect(stdout).toContain("updates");
diff --git a/test/unit/commands/auth/revoke-token.test.ts b/test/unit/commands/auth/revoke-token.test.ts
index 8bc19a3c..0702d81f 100644
--- a/test/unit/commands/auth/revoke-token.test.ts
+++ b/test/unit/commands/auth/revoke-token.test.ts
@@ -25,7 +25,7 @@ describe("auth:revoke-token command", () => {
         import.meta.url,
       );
 
-      expect(stdout).toContain("Revokes the token provided");
+      expect(stdout).toContain("Revoke a token");
       expect(stdout).toContain("USAGE");
       expect(stdout).toContain("--client-id");
       expect(stdout).toContain("--debug");
diff --git a/test/unit/commands/channel-rule/create.test.ts b/test/unit/commands/channel-rule/create.test.ts
index a4cd54e1..2c64bca0 100644
--- a/test/unit/commands/channel-rule/create.test.ts
+++ b/test/unit/commands/channel-rule/create.test.ts
@@ -32,7 +32,7 @@ describe("channel-rule:create command (alias)", () => {
         import.meta.url,
       );
 
-      expect(stdout).toContain("Channel rule created successfully");
+      expect(stdout).toContain("Channel rule created.");
     });
 
     it("should require name flag", async () => {
diff --git a/test/unit/commands/channels/publish.test.ts b/test/unit/commands/channels/publish.test.ts
index d307bcd5..a9cf6540 100644
--- a/test/unit/commands/channels/publish.test.ts
+++ b/test/unit/commands/channels/publish.test.ts
@@ -28,7 +28,7 @@ describe("ChannelsPublish", function () {
     expect(restMock.channels.get).toHaveBeenCalledWith("test-channel");
     expect(channel.publish).toHaveBeenCalledOnce();
     expect(channel.publish.mock.calls[0][0]).toEqual({ data: "hello" });
-    expect(stdout).toContain("Message published successfully");
+    expect(stdout).toContain("Message published to channel");
   });
 
   it("should publish a message using Realtime successfully", async function () {
@@ -51,7 +51,7 @@ describe("ChannelsPublish", function () {
     expect(channel.publish.mock.calls[0][0]).toEqual({
       data: "realtime hello",
     });
-    expect(stdout).toContain("Message published successfully");
+    expect(stdout).toContain("Message published to channel");
   });
 
   it("should handle API errors during REST publish", async function () {
@@ -141,7 +141,7 @@ describe("ChannelsPublish", function () {
     );
 
     expect(channel.publish).toHaveBeenCalledTimes(3);
-    expect(stdout).toContain("messages published successfully");
+    expect(stdout).toContain("messages published to channel");
   });
 
   it("should output JSON when requested", async function () {
diff --git a/test/unit/commands/integrations/create.test.ts b/test/unit/commands/integrations/create.test.ts
index a3669585..af10bcfd 100644
--- a/test/unit/commands/integrations/create.test.ts
+++ b/test/unit/commands/integrations/create.test.ts
@@ -46,7 +46,7 @@ describe("integrations:create command", () => {
         import.meta.url,
       );
 
-      expect(stdout).toContain("Integration created successfully");
+      expect(stdout).toContain("Integration rule created:");
       expect(stdout).toContain(mockRuleId);
       expect(stdout).toContain("http");
     });
@@ -83,7 +83,7 @@ describe("integrations:create command", () => {
         import.meta.url,
       );
 
-      expect(stdout).toContain("Integration created successfully");
+      expect(stdout).toContain("Integration rule created:");
       expect(stdout).toContain("amqp");
     });
 
diff --git a/test/unit/commands/integrations/delete.test.ts b/test/unit/commands/integrations/delete.test.ts
index 39032cec..4cf2bae5 100644
--- a/test/unit/commands/integrations/delete.test.ts
+++ b/test/unit/commands/integrations/delete.test.ts
@@ -48,7 +48,7 @@ describe("integrations:delete command", () => {
         import.meta.url,
       );
 
-      expect(stdout).toContain("Integration deleted successfully");
+      expect(stdout).toContain("Integration rule deleted:");
       expect(stdout).toContain(mockRuleId);
     });
 
@@ -219,7 +219,7 @@ describe("integrations:delete command", () => {
         import.meta.url,
       );
 
-      expect(stdout).toContain("Integration deleted successfully");
+      expect(stdout).toContain("Integration rule deleted:");
     });
 
     it("should accept --app flag", async () => {
@@ -272,7 +272,7 @@ describe("integrations:delete command", () => {
         import.meta.url,
       );
 
-      expect(stdout).toContain("Integration deleted successfully");
+      expect(stdout).toContain("Integration rule deleted:");
     });
   });
 });
diff --git a/test/unit/commands/interactive-autocomplete.test.ts b/test/unit/commands/interactive-autocomplete.test.ts
index cf2e473d..24ea17cb 100644
--- a/test/unit/commands/interactive-autocomplete.test.ts
+++ b/test/unit/commands/interactive-autocomplete.test.ts
@@ -697,7 +697,7 @@ describe("Interactive Mode - Autocomplete & Command Filtering", () => {
 
       // Check for product API flags (hidden)
       expect(batchPublish.flags).toHaveProperty("port");
-      expect(batchPublish.flags).toHaveProperty("tlsPort");
+      expect(batchPublish.flags).toHaveProperty("tls-port");
       expect(batchPublish.flags).toHaveProperty("tls");
 
       // Verify removed global flags are no longer present
diff --git a/test/unit/commands/logs/channel-lifecycle/subscribe.test.ts b/test/unit/commands/logs/channel-lifecycle/subscribe.test.ts
index 19481be9..27a8ffd9 100644
--- a/test/unit/commands/logs/channel-lifecycle/subscribe.test.ts
+++ b/test/unit/commands/logs/channel-lifecycle/subscribe.test.ts
@@ -63,7 +63,7 @@ describe("logs:channel-lifecycle:subscribe command", () => {
         import.meta.url,
       );
 
-      expect(stdout).toContain("Subscribing to");
+      expect(stdout).toContain("Subscribed to");
       expect(stdout).toContain("[meta]channel.lifecycle");
       expect(stdout).toContain("Press Ctrl+C to exit");
     });
diff --git a/test/unit/commands/logs/connection-lifecycle/subscribe.test.ts b/test/unit/commands/logs/connection-lifecycle/subscribe.test.ts
index 9b35d775..6911b4f2 100644
--- a/test/unit/commands/logs/connection-lifecycle/subscribe.test.ts
+++ b/test/unit/commands/logs/connection-lifecycle/subscribe.test.ts
@@ -42,7 +42,7 @@ describe("LogsConnectionLifecycleSubscribe", function () {
       undefined,
     );
     expect(channel.subscribe).toHaveBeenCalled();
-    expect(stdout).toContain("Subscribing");
+    expect(stdout).toContain("Subscribed to connection lifecycle logs");
   });
 
   it("should handle rewind parameter", async function () {
diff --git a/test/unit/commands/logs/subscribe.test.ts b/test/unit/commands/logs/subscribe.test.ts
index ec535fae..055c4920 100644
--- a/test/unit/commands/logs/subscribe.test.ts
+++ b/test/unit/commands/logs/subscribe.test.ts
@@ -61,7 +61,7 @@ describe("logs:subscribe command", () => {
     it("should subscribe to log channel and show initial message", async () => {
       const { stdout } = await runCommand(["logs:subscribe"], import.meta.url);
 
-      expect(stdout).toContain("Subscribing to app logs");
+      expect(stdout).toContain("Subscribed to app logs");
       expect(stdout).toContain("Press Ctrl+C to exit");
     });
 
diff --git a/test/unit/commands/queues/create.test.ts b/test/unit/commands/queues/create.test.ts
index 98b53765..8c108037 100644
--- a/test/unit/commands/queues/create.test.ts
+++ b/test/unit/commands/queues/create.test.ts
@@ -76,7 +76,7 @@ describe("queues:create command", () => {
         import.meta.url,
       );
 
-      expect(stdout).toContain("Queue created successfully");
+      expect(stdout).toContain("Queue created:");
       expect(stdout).toContain(`Queue ID: ${mockQueueId}`);
       expect(stdout).toContain(`Name: ${mockQueueName}`);
       expect(stdout).toContain("Region: us-east-1-a");
@@ -127,7 +127,7 @@ describe("queues:create command", () => {
         import.meta.url,
       );
 
-      expect(stdout).toContain("Queue created successfully");
+      expect(stdout).toContain("Queue created:");
       expect(stdout).toContain("Region: eu-west-1-a");
       expect(stdout).toContain("TTL: 3600 seconds");
       expect(stdout).toContain("Max Length: 50000 messages");
@@ -187,7 +187,7 @@ describe("queues:create command", () => {
         import.meta.url,
       );
 
-      expect(stdout).toContain("Queue created successfully");
+      expect(stdout).toContain("Queue created:");
     });
 
     it("should use ABLY_ACCESS_TOKEN environment variable when provided", async () => {
@@ -226,7 +226,7 @@ describe("queues:create command", () => {
         import.meta.url,
       );
 
-      expect(stdout).toContain("Queue created successfully");
+      expect(stdout).toContain("Queue created:");
     });
   });
 
@@ -481,7 +481,7 @@ describe("queues:create command", () => {
         import.meta.url,
       );
 
-      expect(stdout).toContain("Queue created successfully");
+      expect(stdout).toContain("Queue created:");
       expect(stdout).toContain("TTL: 1 seconds");
       expect(stdout).toContain("Max Length: 1 messages");
     });
@@ -527,7 +527,7 @@ describe("queues:create command", () => {
         import.meta.url,
       );
 
-      expect(stdout).toContain("Queue created successfully");
+      expect(stdout).toContain("Queue created:");
       expect(stdout).toContain("Region: ap-southeast-2-a");
       expect(stdout).toContain("TTL: 86400 seconds");
       expect(stdout).toContain("Max Length: 1000000 messages");
diff --git a/test/unit/commands/rooms/features.test.ts b/test/unit/commands/rooms/features.test.ts
index bdee337e..327e548f 100644
--- a/test/unit/commands/rooms/features.test.ts
+++ b/test/unit/commands/rooms/features.test.ts
@@ -46,7 +46,7 @@ describe("rooms feature commands", function () {
 
       expect(room.attach).toHaveBeenCalled();
       expect(room.occupancy.subscribe).toHaveBeenCalled();
-      expect(stdout).toContain("Subscribing");
+      expect(stdout).toContain("Subscribed to occupancy");
     });
 
     it("should display occupancy updates when received", async function () {
diff --git a/test/unit/commands/rooms/messages.test.ts b/test/unit/commands/rooms/messages.test.ts
index edcd2824..354cdf15 100644
--- a/test/unit/commands/rooms/messages.test.ts
+++ b/test/unit/commands/rooms/messages.test.ts
@@ -26,7 +26,7 @@ describe("rooms messages commands", function () {
       expect(room.messages.send).toHaveBeenCalledWith({
         text: "HelloWorld",
       });
-      expect(stdout).toContain("Message sent successfully");
+      expect(stdout).toContain("Message sent to room test-room");
     });
 
     it("should send multiple messages with interpolation", async function () {
@@ -58,7 +58,7 @@ describe("rooms messages commands", function () {
       expect(sentTexts).toContain("Message1");
       expect(sentTexts).toContain("Message2");
       expect(sentTexts).toContain("Message3");
-      expect(stdout).toContain("3/3 messages sent successfully");
+      expect(stdout).toContain("3/3 messages sent to room test-room");
     });
 
     it("should handle metadata in messages", async function () {
diff --git a/test/unit/commands/spaces/spaces.test.ts b/test/unit/commands/spaces/spaces.test.ts
index 7cf0d93a..5949089a 100644
--- a/test/unit/commands/spaces/spaces.test.ts
+++ b/test/unit/commands/spaces/spaces.test.ts
@@ -173,7 +173,7 @@ describe("spaces commands", () => {
         import.meta.url,
       );
 
-      expect(stdout).toContain("Successfully set location");
+      expect(stdout).toContain("Location set in space:");
       expect(space.locations.set).toHaveBeenCalledWith({ x: 100, y: 200 });
     });
   });
@@ -206,7 +206,7 @@ describe("spaces commands", () => {
         import.meta.url,
       );
 
-      expect(stdout).toContain("Successfully acquired lock");
+      expect(stdout).toContain("Lock acquired:");
       expect(space.locks.acquire).toHaveBeenCalledWith("my-lock", {
         reason: "editing",
       });