diff --git a/README.md b/README.md
index 6943ed8d..158da1dc 100644
--- a/README.md
+++ b/README.md
@@ -65,9 +65,9 @@ Log events may also contain a `type`, `subtype`, icon (`ti`), and additional fie
 | type | subtype | ti | fields | purpose |
 | --- | --- | --- | --- | --- |
 | None | None | None | message | A simple status message or update and its log level. These messages may change at any time and must not be relied upon for automation. |
-| Action | Start | 🟢 | session_id; queue_id; job_id; action_id; message | A SessionAction has started running. |
-| Action | Cancel/Interrupt | 🟨 | session_id; queue_id; job_id; action_id; message | A cancel/interrupt of a SessionAction has been initiated. |
-| Action | End | 🟣 | session_id; queue_id; job_id; action_id; status; message | A SessionAction has completed running. |
+| Action | Start | 🟢 | session_id; queue_id; job_id; action_id; kind; message | A SessionAction has started running. |
+| Action | Cancel/Interrupt | 🟨 | session_id; queue_id; job_id; action_id; kind; message | A cancel/interrupt of a SessionAction has been initiated. |
+| Action | End | 🟣 | session_id; queue_id; job_id; action_id; kind; status; message | A SessionAction has completed running. |
 | AgentInfo | None | None | platform; python[interpreter,version]; agent[version,installedAt,runningAs]; depenencies | Information about the running Agent software. |
 | API | Req | 📤 | operation; request_url; params; resource (optional) | A request to an AWS API. Only requests to AWS Deadline Cloud APIs contain a resource field. |
 | API | Resp | 📥 | operation; params; status_code, request_id; error (optional) | A response from an AWS API request. |
@@ -77,7 +77,7 @@ Log events may also contain a `type`, `subtype`, icon (`ti`), and additional fie
 | AWSCreds | Refresh | 🔑 | resource; message; role_arn (optional); expiry (optional); scheduled_time (optional) | Related to an operation for AWS Credentials. |
 | Metrics | System | 📊 | many | System metrics. |
 | Session | Starting/Failed/AWSCreds/Complete/Info | 🔷 | queue_id; job_id; session_id | An update or information related to a Session. |
-| Session | Add/Remove | 🔷 | queue_id; job_id; session_id; action_ids | Adding or removing SessionActions in a Session. |
+| Session | Add/Remove | 🔷 | queue_id; job_id; session_id; action_ids; queued_actions | Adding or removing SessionActions in a Session. |
 | Session | Logs | 🔷 | queue_id; job_id; session_id; log_dest | Information regarding where the Session logs are located. |
 | Session | User | 🔷 | queue_id; job_id; session_id; user | The user that a Session is running Actions as. |
 | Worker | Create/Load/ID/Status/Delete | 💻 | farm_id; fleet_id; worker_id (optional); message | A notification related to a Worker resource within AWS Deadline Cloud. |
diff --git a/src/deadline_worker_agent/log_messages.py b/src/deadline_worker_agent/log_messages.py
index b51f27a6..14a9a38e 100644
--- a/src/deadline_worker_agent/log_messages.py
+++ b/src/deadline_worker_agent/log_messages.py
@@ -396,6 +396,7 @@ class SessionLogEvent(BaseLogEvent):
     user: Optional[str]
     action_ids: Optional[list[str]]  # for Add/Cancel
     log_dest: Optional[str]
+    queued_action_count: Optional[int]
 
     def __init__(
         self,
@@ -408,6 +409,7 @@ def __init__(
         message: str,
         action_ids: Optional[list[str]] = None,
         log_dest: Optional[str] = None,
+        queued_action_count: Optional[int] = None,
     ) -> None:
         self.subtype = subtype.value
         self.session_id = session_id
@@ -417,19 +419,17 @@ def __init__(
         self.msg = message
         self.action_ids = action_ids
         self.log_dest = log_dest
+        self.queued_action_count = queued_action_count
 
     def getMessage(self) -> str:
         dd = self.asdict()
-        # TODO - Rearrange. Put (%(queue_id)s/%(job_id)s) after the message
         if self.subtype == SessionLogEventSubtype.USER.value and self.user is not None:
             fmt_str = "[%(session_id)s] %(message)s (User: %(user)s) [%(queue_id)s/%(job_id)s]"
-        elif (
-            self.subtype in (SessionLogEventSubtype.ADD.value, SessionLogEventSubtype.REMOVE.value)
-            and self.action_ids is not None
+        elif self.subtype in (
+            SessionLogEventSubtype.ADD.value,
+            SessionLogEventSubtype.REMOVE.value,
         ):
-            fmt_str = (
-                "[%(session_id)s] %(message)s (ActionIds: %(action_ids)s) [%(queue_id)s/%(job_id)s]"
-            )
+            fmt_str = "[%(session_id)s] %(message)s (ActionIds: %(action_ids)s) (QueuedActionCount: %(queued_action_count)s) [%(queue_id)s/%(job_id)s]"
         elif self.subtype == SessionLogEventSubtype.LOGS.value and self.log_dest is not None:
             fmt_str = "[%(session_id)s] %(message)s (LogDestination: %(log_dest)s) [%(queue_id)s/%(job_id)s]"
         else:
@@ -446,6 +446,8 @@ def asdict(self) -> dict[str, Any]:
             dd.update(user=self.user)
         if self.action_ids is not None:
             dd.update(action_ids=self.action_ids)
+        if self.queued_action_count is not None:
+            dd.update(queued_action_count=self.queued_action_count)
         if self.log_dest is not None:
             dd.update(log_dest=self.log_dest)
         dd.update(queue_id=self.queue_id, job_id=self.job_id)
@@ -459,12 +461,20 @@ class SessionActionLogEventSubtype(str, Enum):
     END = "End"  # will have a status key
 
 
+class SessionActionLogKind(str, Enum):
+    ENV_ENTER = "EnvEnter"
+    ENV_EXIT = "EnvExit"
+    TASK_RUN = "TaskRun"
+    JA_SYNC = "JobAttachSyncInput"
+
+
 class SessionActionLogEvent(BaseLogEvent):
     type = "Action"
 
     queue_id: str
     job_id: str
     session_id: str
+    kind: SessionActionLogKind
     action_id: str
     status: Optional[str]
     msg: str
@@ -476,6 +486,7 @@ def __init__(
         queue_id: str,
         job_id: str,
         session_id: str,
+        action_log_kind: SessionActionLogKind,
         action_id: str,
         message: str,
         status: Optional[str] = None,
@@ -491,6 +502,7 @@ def __init__(
             self.ti = "🟣"
         self.subtype = subtype.value
         self.session_id = session_id
+        self.kind = action_log_kind
         self.queue_id = queue_id
         self.job_id = job_id
         self.action_id = action_id
@@ -501,9 +513,9 @@ def getMessage(self) -> str:
         dd = self.asdict()
         # TODO - Rearrange. Put (%(queue_id)s/%(job_id)s) after the message
         if self.subtype == SessionActionLogEventSubtype.END.value and self.status is not None:
-            fmt_str = "[%(session_id)s](%(action_id)s) %(message)s (Status: %(status)s) [%(queue_id)s/%(job_id)s]"
+            fmt_str = "[%(session_id)s](%(action_id)s) %(message)s (Status: %(status)s) (Kind: %(kind)s) [%(queue_id)s/%(job_id)s]"
         else:
-            fmt_str = "[%(session_id)s](%(action_id)s) %(message)s [%(queue_id)s/%(job_id)s]"
+            fmt_str = "[%(session_id)s](%(action_id)s) %(message)s (Kind: %(kind)s) [%(queue_id)s/%(job_id)s]"
         return self.add_exception_to_message(fmt_str % dd)
 
     def asdict(self) -> dict[str, Any]:
@@ -512,6 +524,7 @@ def asdict(self) -> dict[str, Any]:
         dd.update(
             session_id=self.session_id,
             action_id=self.action_id,
+            kind=self.kind.value,
             message=self.msg,
         )
         if self.subtype == SessionActionLogEventSubtype.END.value and self.status is not None:
diff --git a/src/deadline_worker_agent/scheduler/session_queue.py b/src/deadline_worker_agent/scheduler/session_queue.py
index 92a22224..6736e3fa 100644
--- a/src/deadline_worker_agent/scheduler/session_queue.py
+++ b/src/deadline_worker_agent/scheduler/session_queue.py
@@ -38,7 +38,7 @@
     StepDetailsError,
 )
 from ..sessions.job_entities.job_details import parameters_from_api_response
-from ..log_messages import SessionLogEvent, SessionLogEventSubtype
+from ..log_messages import SessionLogEvent, SessionLogEventSubtype, SessionActionLogKind
 
 if TYPE_CHECKING:
     from ..sessions.job_entities import JobEntities
@@ -261,6 +261,7 @@ def cancel_all(
                     job_id=self._job_id,
                     session_id=self._session_id,
                     action_ids=action_ids,
+                    queued_action_count=len(self._actions),
                     message="Removed SessionActions.",
                 )
             )
@@ -333,6 +334,7 @@ def replace(
                     job_id=self._job_id,
                     session_id=self._session_id,
                     action_ids=action_ids_added,
+                    queued_action_count=len(self._actions),
                     message="Appended new SessionActions.",
                 )
             )
@@ -375,9 +377,23 @@ def dequeue(self) -> SessionActionDefinition | None:
                         environment_id=environment_id
                     )
                 except UnsupportedSchema as e:
-                    raise JobEntityUnsupportedSchemaError(action_id, e._version)
+                    if action_type == "ENV_ENTER":
+                        raise JobEntityUnsupportedSchemaError(
+                            action_id, SessionActionLogKind.ENV_ENTER, e._version
+                        )
+                    else:
+                        raise JobEntityUnsupportedSchemaError(
+                            action_id, SessionActionLogKind.ENV_EXIT, e._version
+                        )
                 except (ValueError, RuntimeError) as e:
-                    raise EnvironmentDetailsError(action_id, str(e)) from e
+                    if action_type == "ENV_ENTER":
+                        raise EnvironmentDetailsError(
+                            action_id, SessionActionLogKind.ENV_ENTER, str(e)
+                        ) from e
+                    else:
+                        raise EnvironmentDetailsError(
+                            action_id, SessionActionLogKind.ENV_EXIT, str(e)
+                        ) from e
                 if action_type == "ENV_ENTER":
                     next_action = EnterEnvironmentAction(
                         id=action_id,
@@ -398,9 +414,11 @@ def dequeue(self) -> SessionActionDefinition | None:
                 try:
                     step_details = self._job_entities.step_details(step_id=step_id)
                 except UnsupportedSchema as e:
-                    raise JobEntityUnsupportedSchemaError(action_id, e._version) from e
+                    raise JobEntityUnsupportedSchemaError(
+                        action_id, SessionActionLogKind.TASK_RUN, e._version
+                    ) from e
                 except (ValueError, RuntimeError) as e:
-                    raise StepDetailsError(action_id, str(e)) from e
+                    raise StepDetailsError(action_id, SessionActionLogKind.TASK_RUN, str(e)) from e
                 task_parameters_data: dict = action_definition.get("parameters", {})
                 task_parameters = parameters_from_api_response(task_parameters_data)
 
@@ -419,9 +437,13 @@ def dequeue(self) -> SessionActionDefinition | None:
                     try:
                         job_attachment_details = self._job_entities.job_attachment_details()
                     except UnsupportedSchema as e:
-                        raise JobEntityUnsupportedSchemaError(action_id, e._version) from e
+                        raise JobEntityUnsupportedSchemaError(
+                            action_id, SessionActionLogKind.JA_SYNC, e._version
+                        ) from e
                     except ValueError as e:
-                        raise JobAttachmentDetailsError(action_id, str(e)) from e
+                        raise JobAttachmentDetailsError(
+                            action_id, SessionActionLogKind.JA_SYNC, str(e)
+                        ) from e
                     next_action = SyncInputJobAttachmentsAction(
                         id=action_id,
                         session_id=self._session_id,
@@ -437,9 +459,13 @@ def dequeue(self) -> SessionActionDefinition | None:
                             step_id=action_definition["stepId"],
                         )
                     except UnsupportedSchema as e:
-                        raise JobEntityUnsupportedSchemaError(action_id, e._version) from e
+                        raise JobEntityUnsupportedSchemaError(
+                            action_id, SessionActionLogKind.JA_SYNC, e._version
+                        ) from e
                     except ValueError as e:
-                        raise StepDetailsError(action_id, str(e)) from e
+                        raise StepDetailsError(
+                            action_id, SessionActionLogKind.JA_SYNC, str(e)
+                        ) from e
                     next_action = SyncInputJobAttachmentsAction(
                         id=action_id,
                         session_id=self._session_id,
diff --git a/src/deadline_worker_agent/sessions/actions/action_definition.py b/src/deadline_worker_agent/sessions/actions/action_definition.py
index b0658801..ea1cf28a 100644
--- a/src/deadline_worker_agent/sessions/actions/action_definition.py
+++ b/src/deadline_worker_agent/sessions/actions/action_definition.py
@@ -7,6 +7,7 @@
 from abc import ABC, abstractmethod
 
 from ..session import Session
+from ...log_messages import SessionActionLogKind
 
 
 class SessionActionDefinition(ABC):
@@ -20,19 +21,21 @@ class SessionActionDefinition(ABC):
     """
 
     _id: str
+    _action_log_kind: SessionActionLogKind
 
-    def __init__(
-        self,
-        *,
-        id: str,
-    ) -> None:
+    def __init__(self, *, id: str, action_log_kind: SessionActionLogKind) -> None:
         self._id = id
+        self._action_log_kind = action_log_kind
 
     @property
     def id(self) -> str:
         """The unique identifier of the SessionAction"""
         return self._id
 
+    @property
+    def action_log_kind(self) -> SessionActionLogKind:
+        return self._action_log_kind
+
     @abstractmethod
     def start(
         self,
diff --git a/src/deadline_worker_agent/sessions/actions/enter_env.py b/src/deadline_worker_agent/sessions/actions/enter_env.py
index 3503eccd..b0c55197 100644
--- a/src/deadline_worker_agent/sessions/actions/enter_env.py
+++ b/src/deadline_worker_agent/sessions/actions/enter_env.py
@@ -7,6 +7,7 @@
 from openjd.sessions import EnvironmentIdentifier
 
 from ..job_entities import EnvironmentDetails
+from ...log_messages import SessionActionLogKind
 from .openjd_action import OpenjdAction
 
 if TYPE_CHECKING:
@@ -40,7 +41,7 @@ def __init__(
         details: EnvironmentDetails,
     ) -> None:
         super(EnterEnvironmentAction, self).__init__(
-            id=id,
+            id=id, action_log_kind=SessionActionLogKind.ENV_ENTER
         )
         self._job_env_id = job_env_id
         self._details = details
diff --git a/src/deadline_worker_agent/sessions/actions/exit_env.py b/src/deadline_worker_agent/sessions/actions/exit_env.py
index bd8db348..9c6ccb38 100644
--- a/src/deadline_worker_agent/sessions/actions/exit_env.py
+++ b/src/deadline_worker_agent/sessions/actions/exit_env.py
@@ -4,6 +4,7 @@
 from concurrent.futures import Executor
 from typing import TYPE_CHECKING, Any
 
+from ...log_messages import SessionActionLogKind
 from .openjd_action import OpenjdAction
 
 if TYPE_CHECKING:
@@ -30,7 +31,7 @@ def __init__(
         environment_id: str,
     ) -> None:
         super(ExitEnvironmentAction, self).__init__(
-            id=id,
+            id=id, action_log_kind=SessionActionLogKind.ENV_EXIT
         )
         self._environment_id = environment_id
 
diff --git a/src/deadline_worker_agent/sessions/actions/run_step_task.py b/src/deadline_worker_agent/sessions/actions/run_step_task.py
index d75e5957..06fc0675 100644
--- a/src/deadline_worker_agent/sessions/actions/run_step_task.py
+++ b/src/deadline_worker_agent/sessions/actions/run_step_task.py
@@ -6,6 +6,7 @@
 
 from openjd.model import TaskParameterSet
 
+from ...log_messages import SessionActionLogKind
 from .openjd_action import OpenjdAction
 
 if TYPE_CHECKING:
@@ -45,7 +46,7 @@ def __init__(
         task_parameter_values: TaskParameterSet,
     ) -> None:
         super(RunStepTaskAction, self).__init__(
-            id=id,
+            id=id, action_log_kind=SessionActionLogKind.TASK_RUN
         )
         self._details = details
         self.step_id = step_id
diff --git a/src/deadline_worker_agent/sessions/actions/sync_input_job_attachments.py b/src/deadline_worker_agent/sessions/actions/sync_input_job_attachments.py
index 8e6af274..f3dcbeca 100644
--- a/src/deadline_worker_agent/sessions/actions/sync_input_job_attachments.py
+++ b/src/deadline_worker_agent/sessions/actions/sync_input_job_attachments.py
@@ -16,6 +16,7 @@
 from openjd.sessions import ActionState, ActionStatus, LOG as OPENJD_LOG
 
 from ..session import Session
+from ...log_messages import SessionActionLogKind
 
 from .action_definition import SessionActionDefinition
 
@@ -57,7 +58,7 @@ def __init__(
         step_details: Optional[StepDetails] = None,
     ) -> None:
         super(SyncInputJobAttachmentsAction, self).__init__(
-            id=id,
+            id=id, action_log_kind=SessionActionLogKind.JA_SYNC
         )
         self._cancel = Event()
         self._job_attachment_details = job_attachment_details
diff --git a/src/deadline_worker_agent/sessions/errors.py b/src/deadline_worker_agent/sessions/errors.py
index 3678f102..7c1ff1c0 100644
--- a/src/deadline_worker_agent/sessions/errors.py
+++ b/src/deadline_worker_agent/sessions/errors.py
@@ -4,6 +4,8 @@
 
 from .._version import version
 
+from ..log_messages import SessionActionLogKind
+
 
 class CancelationError(Exception):
     """Raised when there was an error trying to cancel a session action"""
@@ -15,9 +17,10 @@ class SessionActionError(Exception):
     """Captures the action_id of an action that failed"""
 
     action_id: str
+    action_log_kind: SessionActionLogKind
     message: str
 
-    def __init__(self, action_id: str, message: str):
+    def __init__(self, action_id: str, action_log_kind: SessionActionLogKind, message: str):
         super().__init__()
         self.action_id = action_id
         self.message = message
@@ -50,10 +53,10 @@ class JobEntityUnsupportedSchemaError(SessionActionError):
 
     schema_version: str
 
-    def __init__(self, action_id: str, schema_version: str):
+    def __init__(self, action_id: str, action_log_kind: SessionActionLogKind, schema_version: str):
         self.schema_version = schema_version
         self.message = (
             f"Worker Agent: {version} does not support Open Job Description Schema Version {self.schema_version}. "
             f"Consider upgrading to a newer Worker Agent."
         )
-        super().__init__(action_id=action_id, message=self.message)
+        super().__init__(action_id=action_id, action_log_kind=action_log_kind, message=self.message)
diff --git a/src/deadline_worker_agent/sessions/session.py b/src/deadline_worker_agent/sessions/session.py
index 97a31252..8dcdb77d 100644
--- a/src/deadline_worker_agent/sessions/session.py
+++ b/src/deadline_worker_agent/sessions/session.py
@@ -557,6 +557,7 @@ def _start_canceling_current_action(self, *, time_limit: timedelta | None = None
                 queue_id=self._queue_id,
                 job_id=self._job_id,
                 session_id=self.id,
+                action_log_kind=current_action.definition.action_log_kind,
                 action_id=current_action.definition.id,
                 message="Canceling Action.",
             )
@@ -587,6 +588,7 @@ def _start_action(self) -> None:
                     queue_id=self._queue_id,
                     job_id=self._job_id,
                     session_id=self.id,
+                    action_log_kind=e.action_log_kind,
                     action_id=e.action_id,
                     message="Failed to dequeue next Action: %s" % str(e),
                     status="FAILED",
@@ -608,6 +610,7 @@ def _start_action(self) -> None:
                 job_id=self._job_id,
                 session_id=self.id,
                 action_id=action_definition.id,
+                action_log_kind=action_definition.action_log_kind,
                 message="Action started.",
             )
         )
@@ -629,6 +632,7 @@ def _start_action(self) -> None:
                     job_id=self._job_id,
                     session_id=self.id,
                     action_id=action_definition.id,
+                    action_log_kind=action_definition.action_log_kind,
                     message="Action failed to start: %s" % str(e),
                     status="FAILED",
                 )
@@ -1155,6 +1159,7 @@ def _handle_action_update(
                     queue_id=self._queue_id,
                     job_id=self._job_id,
                     session_id=self.id,
+                    action_log_kind=current_action.definition.action_log_kind,
                     action_id=current_action.definition.id,
                     message="Action complete.",
                     status=completed_status,
diff --git a/src/deadline_worker_agent/startup/entrypoint.py b/src/deadline_worker_agent/startup/entrypoint.py
index 94af3275..37648cd0 100644
--- a/src/deadline_worker_agent/startup/entrypoint.py
+++ b/src/deadline_worker_agent/startup/entrypoint.py
@@ -139,6 +139,15 @@ def filter(self, record: logging.LogRecord) -> bool:
 
             agent_cw_log_handler.addFilter(LogSyncFilter())
 
+            if not config.structured_logs:
+                _logger.warning(
+                    "The content and formatting of unstructured logs may change at any time and without warning. We recommend structured logs for programmatic log queries."
+                )
+            # Always print this one because structured logs always go to cloudwatch
+            _logger.warning(
+                "The content and formatting of structured log records that do not have a 'type' field may change at any time and without warning and must not be relied upon for programmatic log queries."
+            )
+
             # Re-send the agent info to the log so that it also appears in the
             # logs that we forward to CloudWatch.
             _log_agent_info()
diff --git a/test/unit/sessions/actions/test_ojio_action.py b/test/unit/sessions/actions/test_openjd_action.py
similarity index 95%
rename from test/unit/sessions/actions/test_ojio_action.py
rename to test/unit/sessions/actions/test_openjd_action.py
index 623e8630..112c5e15 100644
--- a/test/unit/sessions/actions/test_ojio_action.py
+++ b/test/unit/sessions/actions/test_openjd_action.py
@@ -12,11 +12,12 @@
 
 from deadline_worker_agent.sessions.actions.openjd_action import OpenjdAction
 from deadline_worker_agent.sessions.errors import CancelationError
+from deadline_worker_agent.log_messages import SessionActionLogKind
 
 
 class DerivedOpenjdAction(OpenjdAction):
     def __init__(self, *, id: str) -> None:
-        super().__init__(id=id)
+        super().__init__(id=id, action_log_kind=SessionActionLogKind.TASK_RUN)
         self.start_mock = Mock()
 
     def start(self, *, session: Session, executor: Executor) -> None:
diff --git a/test/unit/test_log_messages.py b/test/unit/test_log_messages.py
index d3037506..e0d15b4c 100644
--- a/test/unit/test_log_messages.py
+++ b/test/unit/test_log_messages.py
@@ -21,6 +21,7 @@
     SessionLogEventSubtype,
     SessionActionLogEvent,
     SessionActionLogEventSubtype,
+    SessionActionLogKind,
     WorkerLogEvent,
     WorkerLogEventOp,
     LogRecordStringTranslationFilter,
@@ -297,6 +298,7 @@
             session_id="session-1234",
             message="A message",
             action_ids=["sessionaction-1234", "sessionaction-abcd"],
+            queued_action_count=12,
         ),
         {
             "ti": "🔷",
@@ -305,11 +307,12 @@
             "session_id": "session-1234",
             "message": "A message",
             "action_ids": ["sessionaction-1234", "sessionaction-abcd"],
+            "queued_action_count": 12,
             "queue_id": "queue-1234",
             "job_id": "job-1234",
         },
         "🔷 Session.Add 🔷 ",
-        "[session-1234] A message (ActionIds: ['sessionaction-1234', 'sessionaction-abcd']) [queue-1234/job-1234]",
+        "[session-1234] A message (ActionIds: ['sessionaction-1234', 'sessionaction-abcd']) (QueuedActionCount: 12) [queue-1234/job-1234]",
         id="Session Add",
     ),
     pytest.param(
@@ -320,6 +323,7 @@
             session_id="session-1234",
             message="A message",
             action_ids=["sessionaction-1234", "sessionaction-abcd"],
+            queued_action_count=2,
         ),
         {
             "ti": "🔷",
@@ -328,11 +332,12 @@
             "session_id": "session-1234",
             "message": "A message",
             "action_ids": ["sessionaction-1234", "sessionaction-abcd"],
+            "queued_action_count": 2,
             "queue_id": "queue-1234",
             "job_id": "job-1234",
         },
         "🔷 Session.Remove 🔷 ",
-        "[session-1234] A message (ActionIds: ['sessionaction-1234', 'sessionaction-abcd']) [queue-1234/job-1234]",
+        "[session-1234] A message (ActionIds: ['sessionaction-1234', 'sessionaction-abcd']) (QueuedActionCount: 2) [queue-1234/job-1234]",
         id="Session Remove",
     ),
     pytest.param(
@@ -366,6 +371,7 @@
             queue_id="queue-1234",
             job_id="job-1234",
             session_id="session-1234",
+            action_log_kind=SessionActionLogKind.TASK_RUN,
             action_id="sessionaction-1234",
             message="A message",
         ),
@@ -375,12 +381,13 @@
             "subtype": "Start",
             "session_id": "session-1234",
             "action_id": "sessionaction-1234",
+            "kind": "TaskRun",
             "message": "A message",
             "queue_id": "queue-1234",
             "job_id": "job-1234",
         },
         "🟢 Action.Start 🟢 ",
-        "[session-1234](sessionaction-1234) A message [queue-1234/job-1234]",
+        "[session-1234](sessionaction-1234) A message (Kind: TaskRun) [queue-1234/job-1234]",
         id="SessionAction Start",
     ),
     pytest.param(
@@ -389,6 +396,7 @@
             queue_id="queue-1234",
             job_id="job-1234",
             session_id="session-1234",
+            action_log_kind=SessionActionLogKind.ENV_ENTER,
             action_id="sessionaction-1234",
             message="A message",
         ),
@@ -398,12 +406,13 @@
             "subtype": "Cancel",
             "session_id": "session-1234",
             "action_id": "sessionaction-1234",
+            "kind": "EnvEnter",
             "message": "A message",
             "queue_id": "queue-1234",
             "job_id": "job-1234",
         },
         "🟨 Action.Cancel 🟨 ",
-        "[session-1234](sessionaction-1234) A message [queue-1234/job-1234]",
+        "[session-1234](sessionaction-1234) A message (Kind: EnvEnter) [queue-1234/job-1234]",
         id="SessionAction Cancel",
     ),
     pytest.param(
@@ -412,6 +421,7 @@
             queue_id="queue-1234",
             job_id="job-1234",
             session_id="session-1234",
+            action_log_kind=SessionActionLogKind.ENV_EXIT,
             action_id="sessionaction-1234",
             message="A message",
         ),
@@ -421,12 +431,13 @@
             "subtype": "Interrupt",
             "session_id": "session-1234",
             "action_id": "sessionaction-1234",
+            "kind": "EnvExit",
             "message": "A message",
             "queue_id": "queue-1234",
             "job_id": "job-1234",
         },
         "🟨 Action.Interrupt 🟨 ",
-        "[session-1234](sessionaction-1234) A message [queue-1234/job-1234]",
+        "[session-1234](sessionaction-1234) A message (Kind: EnvExit) [queue-1234/job-1234]",
         id="SessionAction Interrupt",
     ),
     pytest.param(
@@ -435,6 +446,7 @@
             queue_id="queue-1234",
             job_id="job-1234",
             session_id="session-1234",
+            action_log_kind=SessionActionLogKind.TASK_RUN,
             action_id="sessionaction-1234",
             message="A message",
             status="SUCCESS",
@@ -445,13 +457,14 @@
             "subtype": "End",
             "session_id": "session-1234",
             "action_id": "sessionaction-1234",
+            "kind": "TaskRun",
             "message": "A message",
             "status": "SUCCESS",
             "queue_id": "queue-1234",
             "job_id": "job-1234",
         },
         "🟣 Action.End 🟣 ",
-        "[session-1234](sessionaction-1234) A message (Status: SUCCESS) [queue-1234/job-1234]",
+        "[session-1234](sessionaction-1234) A message (Status: SUCCESS) (Kind: TaskRun) [queue-1234/job-1234]",
         id="SessionAction End",
     ),
     #