diff --git a/docs/modules/kobiton-cli/pages/cli-commands.adoc b/docs/modules/kobiton-cli/pages/cli-commands.adoc
index 4d357276..0a42678f 100644
--- a/docs/modules/kobiton-cli/pages/cli-commands.adoc
+++ b/docs/modules/kobiton-cli/pages/cli-commands.adoc
@@ -1,7 +1,14 @@
 = Kobiton Command Line Interface commands
 :navtitle: Kobiton CLI commands
 
-These are the commands you can use with the Kobiton Command Line Interface (CLI) tool.
+Commands that operate on an active CLI session require session context.
+
+Provide session context using one of the following:
+
+* Pass the session token with the command: `--session-token <SESSION_TOKEN>` (or `-a <SESSION_TOKEN>`)
+* Set the `KOBITON_SESSION_TOKEN` environment variable
+
+The `<SESSION_TOKEN>` value is returned when you create a CLI session. For details, see xref:use-the-cli.adoc[Start using Kobiton CLI].
 
 == `app run`
 
diff --git a/docs/modules/kobiton-cli/pages/use-the-cli.adoc b/docs/modules/kobiton-cli/pages/use-the-cli.adoc
index e83b99e7..fdc8882b 100644
--- a/docs/modules/kobiton-cli/pages/use-the-cli.adoc
+++ b/docs/modules/kobiton-cli/pages/use-the-cli.adoc
@@ -3,7 +3,7 @@
 
 Learn how to use Kobiton Command Line Interface to control and operate your private device lab.
 
-== Before you start
+== Before you begin
 
 * xref:set-up-cli.adoc[Set up] Kobiton CLI.
 
@@ -62,22 +62,38 @@ set KOBITON_SESSION_TOKEN=<SESSION_TOKEN>
 --
 ====
 
-Most CLI commands require either `SESSION_ID` or `KOBITON_SESSION_TOKEN`. See xref:cli-commands.adoc[this page,window=read-later] for the list of commands and their basic usage.
+== Use session context consistently
+
+After creating a CLI session, you receive both a `<SESSION_ID>` and a `<SESSION_TOKEN>`.
 
 [NOTE]
 ====
+The *session ID* identifies the session record. The *session token* authorizes and scopes CLI commands to that session.
+====
 
-* For CLI sessions:
+Many commands that operate on an active CLI session require session context. Provide session context using one of the following methods:
 
-** No Session Explorer available.
+* Pass the session token explicitly: `--session-token <SESSION_TOKEN>` (or `-a <SESSION_TOKEN>`)
+* Set the `KOBITON_SESSION_TOKEN` environment variable
 
-** Session video and logs are not available in Session Overview.
+The session token ensures each command is applied to the intended active session.
 
-** Mixed sessions between manual and CLI are not supported.
+If you are running multiple sessions concurrently, always provide the session context explicitly. This prevents commands from being applied to the wrong session when more than one session is active.
 
-** CLI sessions time out after 10 minutes by default and can be configured for up to 2 hours. You can reset the timeout using the `kobiton session ping` command.
+For interactive use, set `KOBITON_SESSION_TOKEN` once per terminal session.
 
-====
+For scripts or isolated commands, pass `--session-token` explicitly with each command.
+
+
+== Known limitations
+
+* Session Explorer is not available when using Kobiton CLI.
+
+* Session video and logs are not available in Session Overview.
+
+* Mixed sessions between manual testing and CLI testing are not supported.
+
+* By default, CLI sessions time out after 10 minutes. You can configure the timeout up to 2 hours using the `kobiton session ping` command.
 
 [#_troubleshooting]
 == Troubleshooting