fix(tui): adapt the shared coding TUI to the merged session foundation

The TUI branch predates the review rewrite of #82, so it was written
against a session module that no longer looks the same:

* Sessions moved from `nooa.sessions` to `nooa_cli.sessions`.
* `SessionStore.create()` renamed its `host` argument to `origin`, so
  the TUI now records `origin="tui"` alongside the ACP host's
  `origin="acp"`.
* `SessionResumed` and `SessionCleared` were dropped from the module
  when it was descoped, and are restored here. Both are transient
  `EventBase` types, so they stay out of `SESSION_EVENT_TYPES`, which
  is the set persisted with the session.

`turn_count` also changed meaning: it now counts user turns only, which
is what the live `record_user` path always did. The old summary query
counted agent messages too, so the two disagreed. The test asserting the
previous value is updated rather than the merged behavior.

One unrelated fix: the bang-shell cwd assertion compared an unresolved
temp path, which fails on macOS through the /var symlink.

Signed-off-by: Paul Furgale <pfurgale@nvidia.com>

Author: furgalep

packages/nooa-cli/src/nooa_cli/sessions/__init__.py

@@ -4,6 +4,8 @@
 
 from nooa_cli.sessions.events import (
     SESSION_EVENT_TYPES,
+    SessionCleared,
+    SessionResumed,
     SessionStarted,
     SessionTitleUpdated,
     SessionUserMessage,
@@ -20,9 +22,11 @@
 __all__ = [
     "InvalidSessionIdError",
     "SESSION_EVENT_TYPES",
+    "SessionCleared",
     "SessionHandle",
     "SessionInfo",
     "SessionNotFoundError",
+    "SessionResumed",
     "SessionStarted",
     "SessionStore",
     "SessionTitleUpdated",

packages/nooa-cli/src/nooa_cli/sessions/events.py

@@ -1,10 +1,12 @@
 # SPDX-FileCopyrightText: Copyright (c) 2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
-"""Durable metadata for interactive coding-agent sessions."""
+"""Durable metadata and transient lifecycle events for coding-agent sessions."""
 
-from typing import ClassVar
+from typing import Annotated, ClassVar
 
-from nooa.context_blocks import Metadata
+from pydantic import Field
+
+from nooa.context_blocks import EventBase, Metadata
 from nooa.context_blocks.roles import Role
 
 
@@ -36,6 +38,33 @@ class SessionUserMessage(Metadata):
     content: str = ""
 
 
+class SessionResumed(EventBase):  # type: ignore[misc]
+    """An interactive agent has been restored or initialized for a session."""
+
+    _role: ClassVar[Role] = Role.RUNTIME_EVENT
+    handler_aliases: ClassVar[tuple[str, ...]] = ("TuiSessionResumed",)
+
+    session_id: Annotated[str, Field(description="The resumed or started session ID")]
+    restored: Annotated[
+        bool,
+        Field(description="Whether a snapshot was restored into the agent"),
+    ]
+
+
+class SessionCleared(EventBase):  # type: ignore[misc]
+    """An interactive agent's working state has been reset."""
+
+    _role: ClassVar[Role] = Role.RUNTIME_EVENT
+    handler_aliases: ClassVar[tuple[str, ...]] = ("TuiSessionCleared",)
+
+    session_id: Annotated[
+        str | None,
+        Field(default=None, description="The new post-clear session ID, when known"),
+    ]
+
+
+# Transient lifecycle events are deliberately absent here: this tuple is the
+# set persisted with the session, and those two are runtime-only.
 SESSION_EVENT_TYPES: tuple[type[Metadata], ...] = (
     SessionStarted,
     SessionTitleUpdated,

packages/nooa-cli/src/nooa_cli/tui/bootstrap.py

@@ -10,7 +10,7 @@
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from nooa.sessions import SessionResumed
+from nooa_cli.sessions import SessionResumed
 
 from .output import Output, TextOutput
 

packages/nooa-cli/src/nooa_cli/tui/commands.py

@@ -342,7 +342,7 @@ async def _reset_agent_working_state(agent: "Agent") -> None:
     em = getattr(agent, "event_manager", None)
     if em is not None:
         try:
-            from nooa.sessions import SessionCleared
+            from nooa_cli.sessions import SessionCleared
 
             em.register_event_type(SessionCleared)
             sid = None
@@ -1407,7 +1407,7 @@ async def execute(self, args: list[str]) -> "CommandResult":
                 async def _restore_and_emit() -> list[Output]:
                     restored = new_sm._storage.restore_latest_snapshot(self.agent)
                     try:
-                        from nooa.sessions import SessionResumed
+                        from nooa_cli.sessions import SessionResumed
 
                         self.agent.event_manager.register_event_type(SessionResumed)
                         self.agent.event_manager.add(

packages/nooa-cli/src/nooa_cli/tui/session_manager.py

@@ -12,8 +12,8 @@
 from typing import Literal
 
 from nooa.paths import get_project_dir
-from nooa.sessions import SessionHandle, SessionInfo, SessionStore
 from nooa.storage.sqlite import delete_sqlite_database
+from nooa_cli.sessions import SessionHandle, SessionInfo, SessionStore
 
 SESSIONS_DIR = get_project_dir("sessions")
 
@@ -60,7 +60,7 @@ class Turn:
 
 
 class SessionManager:
-    """TUI-facing view of one :class:`nooa.sessions.SessionHandle`.
+    """TUI-facing view of one :class:`nooa_cli.sessions.SessionHandle`.
 
     The adapter deliberately contains no persistence implementation. Both the
     native TUI and protocol hosts read and write the same session event schema.
@@ -84,7 +84,7 @@ def create(
             model=model,
             agent=agent_cls,
             working_directory=working_dir,
-            host="tui",
+            origin="tui",
             session_id=session_id,
             check_same_thread=False,
         )

packages/nooa-cli/tests/test_tui_mcp_config.py

@@ -65,9 +65,7 @@ async def test_mcp_add_rejects_unsafe_name_before_persisting(monkeypatch, tmp_pa
     path = _project_settings(monkeypatch, tmp_path)
     registry = MCPRegistry(approval_path=tmp_path / "approvals.json")
 
-    result = await _command(registry).execute(
-        ["add", "evil\x1b[2J", "https://docs.example/mcp"]
-    )
+    result = await _command(registry).execute(["add", "evil\x1b[2J", "https://docs.example/mcp"])
 
     assert result.success is False
     assert not path.exists()

packages/nooa-cli/tests/tui/test_completer.py

@@ -582,12 +582,8 @@ def test_mcp_remove_offers_configured_servers():
 def test_mcp_approve_and_revoke_complete_configured_servers():
     reg = _mcp_registry(["maas-jira"])
     completer = Completer(registry=reg)
-    assert [item.text for item in completer.complete("/mcp approve ")] == [
-        "/mcp approve maas-jira"
-    ]
-    assert [item.text for item in completer.complete("/mcp revoke ")] == [
-        "/mcp revoke maas-jira"
-    ]
+    assert [item.text for item in completer.complete("/mcp approve ")] == ["/mcp approve maas-jira"]
+    assert [item.text for item in completer.complete("/mcp revoke ")] == ["/mcp revoke maas-jira"]
 
 
 def test_mcp_completion_marks_approved_server():

packages/nooa-cli/tests/tui/test_event_explorer.py

@@ -70,7 +70,7 @@ def test_event_explorer_renders_shared_session_events() -> None:
                     "2",
                     _FakeEvent(
                         "SessionStarted",
-                        host="tui",
+                        origin="tui",
                         model="test-model",
                         agent="CodingAgent",
                         working_directory="/work/repo",

packages/nooa-cli/tests/tui/test_loud_handler_diagnostics.py

@@ -511,7 +511,9 @@ async def test_get_bang_shell_syncs_cwd(self):
         session.agent.shell.cwd = Path(tempfile.gettempdir())
 
         shell = await session._get_bang_shell()
-        assert str(shell.cwd) == tempfile.gettempdir()
+        # Resolve both sides: on macOS the temp dir is reached through the
+        # /var -> /private/var symlink, and the shell reports the real path.
+        assert Path(shell.cwd).resolve() == Path(tempfile.gettempdir()).resolve()
 
         # Simulate agent changing directory to a real path
         session.agent.shell.cwd = Path("/")

packages/nooa-cli/tests/tui/test_resume_emit_order.py

@@ -9,8 +9,7 @@
 """
 
 import pytest
-
-from nooa.sessions import SessionResumed
+from nooa_cli.sessions import SessionResumed
 
 
 @pytest.mark.asyncio