langfun 0.1.2.dev202412080804__py3-none-any.whl → 0.1.2.dev202412100804__py3-none-any.whl

langfun/core/agentic/action.py

@@ -15,7 +15,11 @@
 
 import abc
 import contextlib
-from typing import Annotated, Any, Iterable, Iterator, Optional, Type, Union
+import datetime
+import time
+
+import typing
+from typing import Annotated, Any, ContextManager, Iterable, Iterator, Optional, Type, Union
 import langfun.core as lf
 from langfun.core import structured as lf_structured
 import pyglove as pg
@@ -26,24 +30,420 @@ class Action(pg.Object):
 
   def _on_bound(self):
     super()._on_bound()
+    self._session = None
     self._result = None
+    self._result_metadata = {}
+
+  @property
+  def session(self) -> Optional['Session']:
+    """Returns the session started by this action."""
+    return self._session
 
   @property
   def result(self) -> Any:
     """Returns the result of the action."""
     return self._result
 
+  @property
+  def result_metadata(self) -> dict[str, Any] | None:
+    """Returns the metadata associated with the result from previous call."""
+    return self._result_metadata
+
   def __call__(
-      self, session: Optional['Session'] = None, **kwargs) -> Any:
+      self,
+      session: Optional['Session'] = None,
+      *,
+      show_progress: bool = True,
+      **kwargs) -> Any:
     """Executes the action."""
-    session = session or Session()
-    with session.track(self):
-      self._result = self.call(session=session, **kwargs)
+    new_session = session is None
+    if new_session:
+      session = Session()
+      if show_progress:
+        lf.console.display(pg.view(session, name='agent_session'))
+
+    with session.track_action(self):
+      result = self.call(session=session, **kwargs)
+      metadata = dict()
+      if (isinstance(result, tuple)
+          and len(result) == 2 and isinstance(result[1], dict)):
+        result, metadata = result
+
+      # For the top-level action, we store the session in the metadata.
+      if new_session:
+        self._session = session
+      self._result, self._result_metadata = result, metadata
       return self._result
 
   @abc.abstractmethod
-  def call(self, session: 'Session', **kwargs) -> Any:
-    """Subclasses to implement."""
+  def call(
+      self,
+      session: 'Session',
+      **kwargs
+  ) -> Union[Any, tuple[Any, dict[str, Any]]]:
+    """Calls the action.
+
+    Args:
+      session: The session to use for the action.
+      **kwargs: Additional keyword arguments to pass to the action.
+
+    Returns:
+      The result of the action or a tuple of (result, result_metadata).
+    """
+
+
+# Type definition for traced item during execution.
+TracedItem = Union[
+    lf_structured.QueryInvocation,
+    'ActionInvocation',
+    'ExecutionTrace',
+    # NOTE(daiyip): Consider remove log entry once we migrate existing agents.
+    lf.logging.LogEntry,
+]
+
+
+class ExecutionTrace(pg.Object, pg.views.html.HtmlTreeView.Extension):
+  """Trace of the execution of an action."""
+
+  name: Annotated[
+      str | None,
+      (
+          'The name of the execution trace. If None, the trace is unnamed, '
+          'which is the case for the top-level trace of an action. An '
+          'execution trace could have sub-traces, called phases, which are '
+          'created and named by `session.phase()` context manager.'
+      )
+  ] = None
+
+  start_time: Annotated[
+      float | None,
+      'The start time of the execution. If None, the execution is not started.'
+  ] = None
+
+  end_time: Annotated[
+      float | None,
+      'The end time of the execution. If None, the execution is not ended.'
+  ] = None
+
+  items: Annotated[
+      list[TracedItem],
+      'All tracked execution items in the sequence.'
+  ] = []
+
+  def _on_bound(self):
+    super()._on_bound()
+    self._usage_summary = lf.UsageSummary()
+    for item in self.items:
+      if hasattr(item, 'usage_summary'):
+        self._usage_summary.merge(item.usage_summary)
+
+    self._tab_control = None
+    self._time_badge = None
+
+  def start(self) -> None:
+    assert self.start_time is None, 'Execution already started.'
+    self.rebind(start_time=time.time(), skip_notification=True)
+    if self._time_badge is not None:
+      self._time_badge.update(
+          'Starting',
+          add_class=['running'],
+          remove_class=['not-started'],
+      )
+
+  def stop(self) -> None:
+    assert self.end_time is None, 'Execution already stopped.'
+    self.rebind(end_time=time.time(), skip_notification=True)
+    if self._time_badge is not None:
+      self._time_badge.update(
+          f'{int(self.elapse)} seconds',
+          add_class=['finished'],
+          remove_class=['running'],
+      )
+
+  @property
+  def has_started(self) -> bool:
+    return self.start_time is not None
+
+  @property
+  def has_stopped(self) -> bool:
+    return self.end_time is not None
+
+  @property
+  def elapse(self) -> float:
+    """Returns the elapsed time of the execution."""
+    if self.start_time is None:
+      return 0.0
+    if self.end_time is None:
+      return time.time() - self.start_time
+    return self.end_time - self.start_time
+
+  @property
+  def queries(self) -> list[lf_structured.QueryInvocation]:
+    """Returns queries from the sequence."""
+    return self._child_items(lf_structured.QueryInvocation)
+
+  @property
+  def actions(self) -> list['ActionInvocation']:
+    """Returns action invocations from the sequence."""
+    return self._child_items(ActionInvocation)
+
+  @property
+  def logs(self) -> list[lf.logging.LogEntry]:
+    """Returns logs from the sequence."""
+    return self._child_items(lf.logging.LogEntry)
+
+  @property
+  def all_queries(self) -> list[lf_structured.QueryInvocation]:
+    """Returns all queries from current trace and its child execution items."""
+    return self._all_child_items(lf_structured.QueryInvocation)
+
+  @property
+  def all_logs(self) -> list[lf.logging.LogEntry]:
+    """Returns all logs from current trace and its child execution items."""
+    return self._all_child_items(lf.logging.LogEntry)
+
+  def _child_items(self, item_cls: Type[Any]) -> list[Any]:
+    child_items = []
+    for item in self.items:
+      if isinstance(item, item_cls):
+        child_items.append(item)
+      elif isinstance(item, ExecutionTrace):
+        child_items.extend(item._child_items(item_cls))  # pylint: disable=protected-access
+    return child_items
+
+  def _all_child_items(self, item_cls: Type[Any]) -> list[Any]:
+    child_items = []
+    for item in self.items:
+      if isinstance(item, item_cls):
+        child_items.append(item)
+      elif isinstance(item, ActionInvocation):
+        child_items.extend(item.execution._all_child_items(item_cls))  # pylint: disable=protected-access
+      elif isinstance(item, ExecutionTrace):
+        child_items.extend(item._all_child_items(item_cls))  # pylint: disable=protected-access
+    return child_items
+
+  def append(self, item: TracedItem) -> None:
+    """Appends an item to the sequence."""
+    with pg.notify_on_change(False):
+      self.items.append(item)
+
+    if isinstance(item, lf_structured.QueryInvocation):
+      current_invocation = self
+      while current_invocation is not None:
+        current_invocation.usage_summary.merge(item.usage_summary)
+        current_invocation = typing.cast(
+            ExecutionTrace,
+            current_invocation.sym_ancestor(
+                lambda x: isinstance(x, ExecutionTrace)
+            )
+        )
+
+    if self._tab_control is not None:
+      self._tab_control.append(self._execution_item_tab(item))
+
+    if (self._time_badge is not None
+        and not isinstance(item, lf.logging.LogEntry)):
+      sub_task_label = self._execution_item_label(item)
+      self._time_badge.update(
+          pg.Html.element(
+              'span',
+              [
+                  'Running',
+                  pg.views.html.controls.Badge(
+                      sub_task_label.text,
+                      tooltip=sub_task_label.tooltip,
+                      css_classes=['task-in-progress']
+                  )
+              ]
+          ),
+          add_class=['running'],
+          remove_class=['not-started'],
+      )
+
+  def extend(self, items: Iterable[TracedItem]) -> None:
+    """Extends the sequence with a list of items."""
+    for item in items:
+      self.append(item)
+
+  @property
+  def usage_summary(self) -> lf.UsageSummary:
+    """Returns the usage summary of the action."""
+    return self._usage_summary
+
+  #
+  # HTML views.
+  #
+
+  def _html_tree_view_summary(
+      self,
+      *,
+      name: str | None = None,
+      extra_flags: dict[str, Any] | None = None,
+      view: pg.views.html.HtmlTreeView, **kwargs
+  ):
+    extra_flags = extra_flags or {}
+    interactive = extra_flags.get('interactive', True)
+    def time_badge():
+      if not self.has_started:
+        label = '(Not started)'
+        css_class = 'not-started'
+      elif not self.has_stopped:
+        label = 'Starting'
+        css_class = 'running'
+      else:
+        label = f'{int(self.elapse)} seconds'
+        css_class = 'finished'
+      return pg.views.html.controls.Badge(
+          label,
+          css_classes=['execution-time', css_class],
+          interactive=interactive,
+      )
+    time_badge = time_badge()
+    if interactive:
+      self._time_badge = time_badge
+    title = pg.Html.element(
+        'div',
+        [
+            'ExecutionTrace',
+            time_badge,
+        ],
+        css_classes=['execution-trace-title'],
+    )
+    kwargs.pop('title', None)
+    kwargs['enable_summary_tooltip'] = False
+    kwargs['enable_key_tooltip'] = False
+    return view.summary(
+        self,
+        name=name,
+        title=title,
+        extra_flags=extra_flags,
+        **kwargs
+    )
+
+  def _html_tree_view_content(self, **kwargs):
+    del kwargs
+    self._tab_control = pg.views.html.controls.TabControl(
+        [self._execution_item_tab(item) for item in self.items],
+        tab_position='left'
+    )
+    return pg.Html.element(
+        'div',
+        [
+            self._tab_control
+        ]
+    )
+
+  def _execution_item_tab(self, item: TracedItem) -> pg.views.html.controls.Tab:
+    if isinstance(item, ActionInvocation):
+      css_class = 'action'
+    elif isinstance(item, lf_structured.QueryInvocation):
+      css_class = 'query'
+    elif isinstance(item, lf.logging.LogEntry):
+      css_class = 'log'
+    elif isinstance(item, ExecutionTrace):
+      css_class = 'phase'
+    else:
+      raise ValueError(f'Unsupported item type: {type(item)}')
+
+    return pg.views.html.controls.Tab(
+        label=self._execution_item_label(item),
+        content=pg.view(item),
+        css_classes=[css_class]
+    )
+
+  def _execution_item_label(
+      self, item: TracedItem
+  ) -> pg.views.html.controls.Label:
+    if isinstance(item, ActionInvocation):
+      return pg.views.html.controls.Label(
+          item.action.__class__.__name__,
+          tooltip=pg.format(
+              item.action,
+              verbose=False,
+              hide_default_values=True,
+              max_str_len=80,
+              max_bytes_len=20,
+          ),
+      )
+    elif isinstance(item, lf_structured.QueryInvocation):
+      schema_title = 'str'
+      if item.schema:
+        schema_title = lf_structured.annotation(item.schema.spec)
+      return pg.views.html.controls.Label(
+          schema_title,
+          tooltip=(
+              pg.format(
+                  item.input,
+                  verbose=False,
+                  hide_default_values=True,
+                  max_str_len=80,
+                  max_bytes_len=20,
+              )
+          ),
+      )
+    elif isinstance(item, lf.logging.LogEntry):
+      return pg.views.html.controls.Label(
+          'Log',
+          tooltip=item.message,
+      )
+    elif isinstance(item, ExecutionTrace):
+      return pg.views.html.controls.Label(
+          item.name or 'Phase'
+      )
+    else:
+      raise ValueError(f'Unsupported item type: {type(item)}')
+
+  def _html_tree_view_css_styles(self) -> list[str]:
+    return super()._html_tree_view_css_styles() + [
+        """
+        .tab-button.action > ::before {
+          content: "A";
+          font-weight: bold;
+          color: red;
+          padding: 10px;
+        }
+        .tab-button.phase > ::before {
+          content: "P";
+          font-weight: bold;
+          color: purple;
+          padding: 10px;
+        }
+        .tab-button.query > ::before {
+          content: "Q";
+          font-weight: bold;
+          color: orange;
+          padding: 10px;
+        }
+        .tab-button.log > ::before {
+          content: "L";
+          font-weight: bold;
+          color: green;
+          padding: 10px;
+        }
+        .details.execution-trace, .details.action-invocation {
+          border: 1px solid #eee;
+        }
+        .execution-trace-title {
+          display: inline-block;
+        }
+        .badge.execution-time {
+          margin-left: 5px;
+        }
+        .execution-time.running {
+          background-color: lavender;
+          font-weight: normal;
+        }
+        .execution-time.finished {
+          background-color: aliceblue;
+          font-weight: bold;
+        }
+        .badge.task-in-progress {
+          margin-left: 5px;
+          background-color: azure;
+          font-weight: bold;
+        }
+       """
+    ]
 
 
 class ActionInvocation(pg.Object, pg.views.html.HtmlTreeView.Extension):
@@ -55,131 +455,246 @@ class ActionInvocation(pg.Object, pg.views.html.HtmlTreeView.Extension):
       'The result of the action.'
   ] = None
 
+  result_metadata: Annotated[
+      dict[str, Any],
+      'The metadata returned by the action.'
+  ] = {}
+
   execution: Annotated[
-      list[
-          Union[
-              lf_structured.QueryInvocation,
-              'ActionInvocation',
-              lf.logging.LogEntry
-          ]
-      ],
-      'Execution execution.'
-  ] = []
+      ExecutionTrace,
+      'The execution sequence of the action.'
+  ] = ExecutionTrace()
 
   # Allow symbolic assignment without `rebind`.
   allow_symbolic_assignment = True
 
+  def _on_bound(self):
+    super()._on_bound()
+    self._current_phase = self.execution
+    self._result_badge = None
+    self._result_metadata_badge = None
+
+  @property
+  def current_phase(self) -> ExecutionTrace:
+    """Returns the current execution phase."""
+    return self._current_phase
+
+  @contextlib.contextmanager
+  def phase(self, name: str) -> Iterator[ExecutionTrace]:
+    """Context manager for starting a new execution phase."""
+    phase = ExecutionTrace(name=name)
+    phase.start()
+    parent_phase = self._current_phase
+    self._current_phase.append(phase)
+    self._current_phase = phase
+    try:
+      yield phase
+    finally:
+      phase.stop()
+      self._current_phase = parent_phase
+
   @property
   def logs(self) -> list[lf.logging.LogEntry]:
-    """Returns logs from execution sequence."""
-    return [v for v in self.execution if isinstance(v, lf.logging.LogEntry)]
+    """Returns immediate child logs from execution sequence."""
+    return self.execution.logs
 
   @property
-  def child_invocations(self) -> list['ActionInvocation']:
-    """Returns child action invocations."""
-    return [v for v in self.execution if isinstance(v, ActionInvocation)]
+  def actions(self) -> list['ActionInvocation']:
+    """Returns immediate child action invocations."""
+    return self.execution.actions
 
-  def queries(
-      self,
-      include_children: bool = False
-  ) -> Iterable[lf_structured.QueryInvocation]:
-    """Iterates over queries from the current invocation."""
-    for v in self.execution:
-      if isinstance(v, lf_structured.QueryInvocation):
-        yield v
-      elif isinstance(v, ActionInvocation):
-        if include_children:
-          yield from v.queries(include_children=True)
+  @property
+  def queries(self) -> list[lf_structured.QueryInvocation]:
+    """Returns immediate queries made by the action."""
+    return self.execution.queries
+
+  @property
+  def all_queries(self) -> list[lf_structured.QueryInvocation]:
+    """Returns all queries made by the action and its child execution items."""
+    return self.execution.all_queries
+
+  @property
+  def all_logs(self) -> list[lf.logging.LogEntry]:
+    """Returns all logs made by the action and its child execution items."""
+    return self.execution.all_logs
+
+  @property
+  def usage_summary(self) -> lf.UsageSummary:
+    """Returns the usage summary of the action."""
+    return self.execution.usage_summary
+
+  def start(self) -> None:
+    """Starts the execution of the action."""
+    self.execution.start()
+
+  def end(self, result: Any, result_metadata: dict[str, Any]) -> None:
+    """Ends the execution of the action with result and metadata."""
+    self.execution.stop()
+    self.rebind(
+        result=result,
+        result_metadata=result_metadata,
+        skip_notification=True,
+        raise_on_no_change=False
+    )
+    if self._result_badge is not None:
+      self._result_badge.update(
+          self._result_badge_label(result),
+          tooltip=self._result_badge_tooltip(result),
+          add_class=['ready'],
+          remove_class=['not-ready'],
+      )
+    if self._result_metadata_badge is not None:
+      result_metadata = dict(result_metadata)
+      result_metadata.pop('session', None)
+      self._result_metadata_badge.update(
+          '{...}',
+          tooltip=self._result_metadata_badge_tooltip(result_metadata),
+          add_class=['ready'],
+          remove_class=['not-ready'],
+      )
+
+  #
+  # HTML views.
+  #
 
   def _html_tree_view_summary(
       self, *, view: pg.views.html.HtmlTreeView, **kwargs
   ):
-    if isinstance(self.action, RootAction):
-      return None
-    kwargs.pop('title')
-    return view.summary(
-        self,
-        title=view.render(
-            self.action, name='action', collapse_level=0,
-            css_classes='invocation-title',
-        ),
-        **kwargs
-    )
+    return None
 
   def _html_tree_view_content(
       self,
       *,
-      root_path: pg.KeyPath | None = None,
-      collapse_level: int | None = None,
       view: pg.views.html.HtmlTreeView,
+      extra_flags: dict[str, Any] | None = None,
       **kwargs
   ):
-    prepare_phase = []
-    current_phase = prepare_phase
-    action_phases = []
-    for item in self.execution:
-      if isinstance(item, ActionInvocation):
-        current_phase = []
-        action_phases.append(current_phase)
-      current_phase.append(item)
-
-    def _render_phase(
-        phase: list[ActionInvocation | lf.logging.LogEntry]
-    ) -> pg.Html.WritableTypes:
-      return pg.Html.element(
-          'div',
-          [
-              view.render(item) for item in phase
-          ]
+    extra_flags = extra_flags or {}
+    interactive = extra_flags.get('interactive', True)
+    if (isinstance(self.action, RootAction)
+        and self.execution.has_stopped
+        and len(self.execution.items) == 1):
+      return view.content(self.execution.items[0], extra_flags=extra_flags)
+
+    def _result_badge():
+      if not self.execution.has_stopped:
+        label = '(n/a)'
+        tooltip = 'Result is not available yet.'
+        css_class = 'not-ready'
+      else:
+        label = self._result_badge_label(self.result)
+        tooltip = self._result_badge_tooltip(self.result)
+        css_class = 'ready'
+      return pg.views.html.controls.Badge(
+          label,
+          tooltip=tooltip,
+          css_classes=['invocation-result', css_class],
+          interactive=interactive,
       )
 
-    def _render_action_phases(
-        phases: list[list[ActionInvocation | lf.logging.LogEntry]]
-    ) -> pg.Html.WritableTypes:
-      if len(phases) == 1:
-        return _render_phase(phases[0])
-      return pg.views.html.controls.TabControl(
-          [
-              pg.views.html.controls.Tab(
-                  label=f'Step {i + 1}',
-                  content=_render_phase(phase),
-              )
-              for i, phase in enumerate(phases)
-          ],
+    def _result_metadata_badge():
+      if not self.execution.has_stopped:
+        label = '(n/a)'
+        tooltip = 'Result metadata is not available yet.'
+        css_class = 'not-ready'
+      else:
+        label = '{...}' if self.result_metadata else '(empty)'
+        tooltip = self._result_metadata_badge_tooltip(self.result_metadata)
+        css_class = 'ready'
+      return pg.views.html.controls.Badge(
+          label,
+          tooltip=tooltip,
+          css_classes=['invocation-result-metadata', css_class],
+          interactive=interactive,
       )
 
-    result_name = 'final_result' if isinstance(
-        self.action, RootAction) else 'result'
+    result_badge = _result_badge()
+    result_metadata_badge = _result_metadata_badge()
+    if interactive:
+      self._result_badge = result_badge
+      self._result_metadata_badge = result_metadata_badge
+
     return pg.Html.element(
         'div',
         [
-            view.render(
-                self.result,
-                name=result_name,
-                css_classes=[
-                    f'invocation-{result_name}'.replace('_', '-')
-                ]
+            pg.Html.element(
+                'div',
+                [
+                    view.render(
+                        self.usage_summary, extra_flags=dict(as_badge=True)
+                    ),
+                    result_badge,
+                    result_metadata_badge,
+                ],
+                css_classes=['invocation-badge-container'],
             ),
-            _render_phase(prepare_phase) if prepare_phase else None,
-            _render_action_phases(action_phases)
+            view.render(  # pylint: disable=g-long-ternary
+                self.action,
+                name='action',
+                collapse_level=None,
+                root_path=self.action.sym_path,
+                css_classes='invocation-title',
+                enable_summary_tooltip=False,
+            ) if not isinstance(self.action, RootAction) else None,
+            view.render(self.execution, name='execution'),
         ]
     )
 
+  def _result_badge_label(self, result: Any) -> str:
+    label = pg.format(
+        result, python_format=True, verbose=False
+    )
+    if len(label) > 40:
+      if isinstance(result, str):
+        label = label[:40] + '...'
+      else:
+        label = f'{result.__class__.__name__}(...)'
+    return label
+
+  def _result_badge_tooltip(self, result: Any) -> pg.Html:
+    return typing.cast(
+        pg.Html,
+        pg.view(
+            result, name='result',
+            collapse_level=None,
+            enable_summary_tooltip=False,
+            enable_key_tooltip=False,
+        )
+    )
+
+  def _result_metadata_badge_tooltip(
+      self, result_metadata: dict[str, Any]
+  ) -> pg.Html:
+    return typing.cast(
+        pg.Html,
+        pg.view(
+            result_metadata,
+            name='result_metadata',
+            collapse_level=None,
+            enable_summary_tooltip=False,
+        )
+    )
+
   @classmethod
   def _html_tree_view_css_styles(cls) -> list[str]:
     return super()._html_tree_view_css_styles() + [
         """
-        details.invocation-title {
-          display: inline-block;
-          background-color: #b1f0ff;
-          border: 1px solid white;
+        .invocation-badge-container {
+          display: flex;
+          padding-bottom: 5px;
         }
-        details.invocation-result {
-          border: 1px solid #eee;
+        .invocation-badge-container > .label-container {
+          margin-right: 3px;
         }
-        details.invocation-final-result {
-          border: 1px solid #eee;
-          background-color: #fef78f;
+        .invocation-result.ready {
+          background-color: lightcyan;
+        }
+        .invocation-result-metadata.ready {
+          background-color: lightyellow;
+        }
+        details.pyglove.invocation-title {
+          background-color: aliceblue;
+          border: 0px solid white;
         }
         """
     ]
@@ -192,52 +707,75 @@ class RootAction(Action):
     raise NotImplementedError('Shall not be called.')
 
 
-class Session(pg.Object):
+class Session(pg.Object, pg.views.html.HtmlTreeView.Extension):
   """Session for performing an agentic task."""
 
-  root_invocation: ActionInvocation = ActionInvocation(RootAction())
+  root: ActionInvocation = ActionInvocation(RootAction())
 
   def _on_bound(self):
     super()._on_bound()
-    self._invocation_stack = [self.root_invocation]
+    self._current_action = self.root
 
   @property
   def final_result(self) -> Any:
     """Returns the final result of the session."""
-    return self.root_invocation.result
+    return self.root.result
 
   @property
-  def current_invocation(self) -> ActionInvocation:
+  def current_action(self) -> ActionInvocation:
     """Returns the current invocation."""
-    assert self._invocation_stack
-    return self._invocation_stack[-1]
+    return self._current_action
+
+  def phase(self, name: str) -> ContextManager[ExecutionTrace]:
+    """Context manager for starting a new execution phase."""
+    return self.current_action.phase(name)
 
   @contextlib.contextmanager
-  def track(self, action: Action) -> Iterator[ActionInvocation]:
+  def track_action(self, action: Action) -> Iterator[ActionInvocation]:
     """Track the execution of an action."""
-    new_invocation = ActionInvocation(pg.maybe_ref(action))
-    with pg.notify_on_change(False):
-      self.current_invocation.execution.append(new_invocation)
-    self._invocation_stack.append(new_invocation)
+    if not self.root.execution.has_started:
+      self.root.start()
+
+    invocation = ActionInvocation(pg.maybe_ref(action))
+    parent_action = self._current_action
+    parent_action.current_phase.append(invocation)
 
     try:
-      yield new_invocation
+      self._current_action = invocation
+      # Start the execution of the current action.
+      self._current_action.start()
+      yield invocation
     finally:
-      assert self._invocation_stack
-      invocation = self._invocation_stack.pop(-1)
-      invocation.rebind(
-          result=action.result, skip_notification=True, raise_on_no_change=False
-      )
-      assert invocation.action is action, (invocation.action, action)
-      assert self._invocation_stack, self._invocation_stack
-
-      if len(self._invocation_stack) == 1:
-        self.root_invocation.rebind(
-            result=invocation.result,
-            skip_notification=True,
-            raise_on_no_change=False
+      # Stop the execution of the current action.
+      self._current_action.end(action.result, action.result_metadata)
+      self._current_action = parent_action
+      if parent_action is self.root:
+        parent_action.end(
+            result=action.result, result_metadata=action.result_metadata,
         )
 
+  @contextlib.contextmanager
+  def track_queries(
+      self,
+      phase: str | None = None
+  ) -> Iterator[list[lf_structured.QueryInvocation]]:
+    """Tracks `lf.query` made within the context.
+
+    Args:
+      phase: The name of a new phase to track the queries in. If not provided,
+        the queries will be tracked in the parent phase.
+
+    Yields:
+      A list of `lf.QueryInvocation` objects, each for a single `lf.query`
+      call.
+    """
+    with self.phase(phase) if phase else contextlib.nullcontext():
+      with lf_structured.track_queries(include_child_scopes=False) as queries:
+        try:
+          yield queries
+        finally:
+          self._current_action.current_phase.extend(queries)
+
   def query(
       self,
       prompt: Union[str, lf.Template, Any],
@@ -250,9 +788,37 @@ class Session(pg.Object):
       examples: list[lf_structured.MappingExample] | None = None,
       **kwargs
       ) -> Any:
-    """Calls `lf.query` and associates it with the current invocation."""
-    with lf_structured.track_queries() as queries:
-      output = lf_structured.query(
+    """Calls `lf.query` and associates it with the current invocation.
+
+    The following code are equivalent:
+
+      Code 1:
+      ```
+      session.query(...)
+      ```
+
+      Code 2:
+      ```
+      with session.track_queries() as queries:
+        output = lf.query(...)
+      ```
+    The former is preferred when `lf.query` is directly called by the action.
+    If `lf.query` is called by a function that does not have access to the
+    session, the latter should be used.
+
+    Args:
+      prompt: The prompt to query.
+      schema: The schema to use for the query.
+      default: The default value to return if the query fails.
+      lm: The language model to use for the query.
+      examples: The examples to use for the query.
+      **kwargs: Additional keyword arguments to pass to `lf.query`.
+    
+    Returns:
+      The result of the query.
+    """
+    with self.track_queries():
+      return lf_structured.query(
           prompt,
           schema=schema,
           default=default,
@@ -260,17 +826,16 @@ class Session(pg.Object):
           examples=examples,
           **kwargs
       )
-    with pg.notify_on_change(False):
-      self.current_invocation.execution.extend(queries)
-    return output
 
   def _log(self, level: lf.logging.LogLevel, message: str, **kwargs):
-    with pg.notify_on_change(False):
-      self.current_invocation.execution.append(
-          lf.logging.log(
-              level, message, indent=len(self._invocation_stack) - 1, **kwargs
-          )
-      )
+    self._current_action.current_phase.append(
+        lf.logging.LogEntry(
+            level=level,
+            time=datetime.datetime.now(),
+            message=message,
+            metadata=kwargs,
+        )
+    )
 
   def debug(self, message: str, **kwargs):
     """Logs a debug message to the session."""
@@ -296,5 +861,26 @@ class Session(pg.Object):
     """Returns the session as a message."""
     return lf.AIMessage(
         'Agentic task session.',
-        result=self.root_invocation
+        result=self.root
+    )
+
+  #
+  # HTML views.
+  #
+
+  def _html_tree_view_content(
+      self,
+      *,
+      view: pg.views.html.HtmlTreeView,
+      **kwargs
+  ):
+    return view.content(self.root, **kwargs)
+
+  @classmethod
+  def _html_tree_view_config(cls):
+    config = super()._html_tree_view_config()
+    config.update(
+        enable_summary_tooltip=False,
+        enable_key_tooltip=False,
     )
+    return config