context-forge-cli 0.4.14__tar.gz → 0.4.15__tar.gz

{context_forge_cli-0.4.14 → context_forge_cli-0.4.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: context-forge-cli
-Version: 0.4.14
+Version: 0.4.15
 Summary: Session manager and context bridge for agentic CLI tools
 Project-URL: Homepage, https://github.com/emmver/contextforge
 Project-URL: Repository, https://github.com/emmver/contextforge
@@ -180,7 +180,10 @@ Notes:
 - **Sub-agent tracking** — sessions spawned by sub-agents are tracked and cross-linked: Pi
   (`pi-subagents`) child transcripts get `subagent` + `parent:<session-id>` tags naming the
   parent session; the datatzis harness's orchestrator tasks (one per user prompt) get
-  `subagent` + `workspace:<session-id>` tags.
+  `subagent` + `workspace:<session-id>` tags. Surfaces are parent-first: `cf ls` shows only
+  main sessions unless `--all` is passed, and in the TUI dashboard sub-agents stay hidden
+  until you select their parent row, which nests them underneath as an indented `↳` list —
+  selecting the parent again collapses them.
 - **datatzis discovery** — per-repo storage: ContextForge scans repository roots for
   `*/.datatzis/workspaces/` (up to two levels deep). Configure roots via the
   `DATATZIS_SEARCH_ROOTS` environment variable (colon-separated; default `~/Documents/Github`).

{context_forge_cli-0.4.14 → context_forge_cli-0.4.15}/README.md

@@ -151,7 +151,10 @@ Notes:
 - **Sub-agent tracking** — sessions spawned by sub-agents are tracked and cross-linked: Pi
   (`pi-subagents`) child transcripts get `subagent` + `parent:<session-id>` tags naming the
   parent session; the datatzis harness's orchestrator tasks (one per user prompt) get
-  `subagent` + `workspace:<session-id>` tags.
+  `subagent` + `workspace:<session-id>` tags. Surfaces are parent-first: `cf ls` shows only
+  main sessions unless `--all` is passed, and in the TUI dashboard sub-agents stay hidden
+  until you select their parent row, which nests them underneath as an indented `↳` list —
+  selecting the parent again collapses them.
 - **datatzis discovery** — per-repo storage: ContextForge scans repository roots for
   `*/.datatzis/workspaces/` (up to two levels deep). Configure roots via the
   `DATATZIS_SEARCH_ROOTS` environment variable (colon-separated; default `~/Documents/Github`).

{context_forge_cli-0.4.14 → context_forge_cli-0.4.15}/contextforge/cli.py

@@ -21,6 +21,7 @@ from contextforge.utils.display import (
     console,
     display_safe,
     err_console,
+    is_subagent as display_is_subagent,
     row_tags as display_row_tags,
     sessions_table,
 )
@@ -130,9 +131,10 @@ def scan_cmd(
 def list_sessions(
     tool: Annotated[Optional[str], typer.Option("--tool", "-t")] = None,
     limit: Annotated[int, typer.Option("--limit", "-n")] = 50,
+    all_sessions: Annotated[bool, typer.Option("--all", "-a", help="Include sub-agent (child) sessions")] = False,
     fmt: Annotated[str, typer.Option("--format", "-f")] = "table",
 ):
-    """List sessions."""
+    """List sessions (parent sessions only, unless --all)."""
     cfg = _get_config()
     database = _get_db(cfg)
     rows = db_module.get_sessions(database, tool=tool, limit=limit)
@@ -145,9 +147,16 @@ def list_sessions(
         console.print("[dim]No sessions found. Run [bold]cf scan[/bold] first.[/dim]")
         return
 
-    table = sessions_table(rows)
+    hidden = sum(1 for r in rows if display_is_subagent(r))
+    table = sessions_table(rows, include_subagents=all_sessions)
     console.print(table)
-    console.print(f"[dim]{len(rows)} sessions[/dim]")
+    if all_sessions or not hidden:
+        console.print(f"[dim]{len(rows)} sessions[/dim]")
+    else:
+        console.print(
+            f"[dim]{len(rows) - hidden} sessions "
+            f"(+{hidden} sub-agent hidden — use --all to show)[/dim]"
+        )
 
 
 # ---------------------------------------------------------------------------

{context_forge_cli-0.4.14 → context_forge_cli-0.4.15}/contextforge/tui/widgets/session_table.py

@@ -163,6 +163,8 @@ class SessionTable(Widget):
         self._filter_text: str = ""
         self._filter_tool: str | None = None
         self._filter_visible: bool = False
+        self._expanded_parents: set[str] = set()
+        self._preserve_cursor_id: str | None = None
 
     # ── Compose ───────────────────────────────────────────────────────────────
 
@@ -183,7 +185,7 @@ class SessionTable(Widget):
             yield DataTable(cursor_type="row", zebra_stripes=True, id="sessions-datatable")
 
     def on_mount(self) -> None:
-        self.border_title = "◈ Sessions"
+        self.border_title = "◈ Sessions — select a parent to expand sub-agents"
         table = self.query_one(DataTable)
         table.add_columns("Tool", "Title", "Updated", "Tokens", "ID")
         self.reload()
@@ -223,8 +225,82 @@ class SessionTable(Widget):
         db = get_db(db_path)
         rows = get_sessions(db, tool=tool_filter, limit=500)
         self._rows = rows
-        self._display_rows = rows
-        self._render_rows(rows)
+        self._rerender()
+
+    # ── Hierarchy: parent sessions first, sub-agents under their parent ───────
+
+    @staticmethod
+    def _children_by_parent(rows: list[dict]) -> dict[str, list[dict]]:
+        from contextforge.utils.display import parent_id_of
+
+        children: dict[str, list[dict]] = {}
+        for row in rows:
+            parent = parent_id_of(row)
+            if parent:
+                children.setdefault(parent, []).append(row)
+        return children
+
+    @staticmethod
+    def _mains(rows: list[dict]) -> list[dict]:
+        from contextforge.utils.display import is_subagent
+        return [row for row in rows if not is_subagent(row)]
+
+    def _build_display_rows(self, mains: list[dict]) -> list[dict]:
+        """Main sessions in order, with children of expanded parents nested."""
+        children = self._children_by_parent(self._rows)
+        display: list[dict] = []
+        for main in mains:
+            display.append(main)
+            if main["id"] in self._expanded_parents:
+                for child in children.get(main["id"], []):
+                    row = dict(child)
+                    row["_is_child"] = True
+                    display.append(row)
+        return display
+
+    def _rerender(self) -> None:
+        """Recompute the display list (filter + expansion) and render."""
+        self._apply_filter_and_render()
+
+    def _apply_filter_and_render(self) -> None:
+        text = self._filter_text.lower()
+        tool = self._filter_tool
+
+        def _row_matches(row: dict) -> bool:
+            if tool and row.get("tool") != tool:
+                return False
+            if not text:
+                return True
+            return (
+                text in (row.get("title") or "").lower()
+                or text in (row.get("cwd") or "").lower()
+            )
+
+        children = self._children_by_parent(self._rows)
+
+        filtered: list[dict] = []
+        for main in self._mains(self._rows):
+            if _row_matches(main):
+                filtered.append(main)
+                continue
+            # A child's match keeps its parent (and its siblings) visible
+            for child in children.get(main["id"], []):
+                if _row_matches(child):
+                    filtered.append(main)
+                    break
+        self._render_rows(self._build_display_rows(filtered))
+        self.post_message(self.FilterChanged(self._filter_text, tool, len(self._display_rows)))
+
+    def toggle_expansion(self, parent_id: str | None) -> None:
+        """Expand (or collapse) a parent session's sub-agent rows in place."""
+        if not parent_id:
+            return
+        if parent_id in self._expanded_parents:
+            self._expanded_parents.discard(parent_id)
+        else:
+            self._expanded_parents.add(parent_id)
+        self._preserve_cursor_id = parent_id
+        self._rerender()
 
     # ── Internal rendering ────────────────────────────────────────────────────
 
@@ -232,16 +308,22 @@ class SessionTable(Widget):
         """Populate the DataTable from a list of session dicts."""
         self._display_rows = rows
         table = self.query_one(DataTable)
+        restore_id = self._preserve_cursor_id
+        restore_row_index: int | None = None
         table.clear()
 
-        for row in rows:
+        from contextforge.utils.display import _clean_title, display_safe, is_subagent
+
+        for idx, row in enumerate(rows):
             tool = row.get("tool", "")
+            is_child = bool(row.get("_is_child"))
             tool_label = TOOL_MARKUP.get(tool, f"⚪ {tool}")
 
-            from contextforge.utils.display import _clean_title, display_safe, is_subagent
             title = _clean_title(row.get("title") or "", max_len=40) or "(no title)"
             if is_subagent(row):
                 title = f"↳ {title}"
+                if is_child:
+                    title = f"  {title}"
             title = display_safe(title)
 
             updated_ms = row.get("updated_at") or 0
@@ -255,23 +337,17 @@ class SessionTable(Widget):
             session_id = str(row.get("id", ""))[:12]
 
             table.add_row(tool_label, title, updated, tokens, session_id)
+            if restore_id is not None and str(row.get("id", "")) == restore_id:
+                restore_row_index = idx
 
-    def _apply_filter(self) -> None:
-        """Filter self._rows in memory and re-render."""
-        text = self._filter_text.lower()
-        tool = self._filter_tool
+        if restore_row_index is not None:
+            table.move_cursor(row=restore_row_index)
+        self._preserve_cursor_id = None
 
-        filtered = [
-            row for row in self._rows
-            if (not tool or row.get("tool") == tool)
-            and (
-                not text
-                or text in (row.get("title") or "").lower()
-                or text in (row.get("cwd") or "").lower()
-            )
-        ]
-        self._render_rows(filtered)
-        self.post_message(self.FilterChanged(self._filter_text, tool, len(filtered)))
+    def _apply_filter(self) -> None:
+        """Filter in memory: parent rows match their own fields or any of
+        their children's; then re-render with the current expansion state."""
+        self._apply_filter_and_render()
 
     # ── Event handlers ────────────────────────────────────────────────────────
 
@@ -298,6 +374,17 @@ class SessionTable(Widget):
                 btn.remove_class("active")
         self._apply_filter()
 
+    def on_data_table_row_selected(self, event: DataTable.RowSelected) -> None:
+        """Enter/click on a parent row expands its sub-agent rows beneath it."""
+        idx = event.cursor_row
+        display = self._display_rows
+        if 0 <= idx < len(display):
+            row = display[idx]
+            from contextforge.utils.display import is_subagent
+            if not is_subagent(row):
+                self.toggle_expansion(str(row["id"]))
+                event.stop()
+
     def on_data_table_row_highlighted(self, event: DataTable.RowHighlighted) -> None:
         idx = event.cursor_row
         display = self._display_rows

{context_forge_cli-0.4.14 → context_forge_cli-0.4.15}/contextforge/utils/display.py

@@ -94,7 +94,17 @@ def _project_name(cwd: str) -> str:
     return parts[-1]
 
 
-def sessions_table(rows: list[dict]) -> Table:
+def sessions_table(
+    rows: list[dict],
+    include_subagents: bool = False,
+) -> Table:
+    """Build a table of sessions.
+
+    Sub-agent (child) sessions are hidden by default — surfaces show the
+    parent-first view and may opt in with ``include_subagents=True``; rows
+    then carry a ``↳`` prefix."""
+    if not include_subagents:
+        rows = [r for r in rows if not is_subagent(r)]
     table = Table(
         show_header=True,
         header_style="bold",

{context_forge_cli-0.4.14 → context_forge_cli-0.4.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "context-forge-cli"
-version = "0.4.14"
+version = "0.4.15"
 description = "Session manager and context bridge for agentic CLI tools"
 readme = "README.md"
 license = { text = "MIT" }

{context_forge_cli-0.4.14 → context_forge_cli-0.4.15}/tests/core/test_display.py

@@ -63,6 +63,29 @@ def test_sessions_table_escapes_hostile_titles() -> None:
     assert "Says ❰bold❱hi❰/bold❱ with ❰/weird/brackets." in exported
 
 
+def test_sessions_table_hides_subagents_by_default() -> None:
+    """Parent-first: `cf ls` shows main sessions unless --all is given."""
+    now = "2026-01-15T12:31:00+00:00"
+    rows = [
+        {"id": "b" * 32, "tool": "pi", "title": "Parent chat", "cwd": "/proj",
+         "token_count": 9, "updated_at": now, "tags": "[]", "summary": ""},
+        {"id": "a" * 32, "tool": "pi", "title": "Child run", "cwd": "/proj",
+         "token_count": 5, "updated_at": now,
+         "tags": json.dumps(["subagent", "parent:" + "b" * 32]), "summary": ""},
+    ]
+    console = Console(record=True, width=200)
+    console.print(sessions_table(rows))
+    exported = console.export_text()
+    assert "Parent chat" in exported
+    assert "Child run" not in exported
+
+    console = Console(record=True, width=200)
+    console.print(sessions_table(rows, include_subagents=True))
+    exported = console.export_text()
+    assert "↳ Child run" in exported
+    assert "Parent chat" in exported
+
+
 def test_sessions_table_marks_subagent_rows() -> None:
     rows = [
         {"id": "a" * 32, "tool": "pi", "title": "Child run", "cwd": "/proj",
@@ -72,7 +95,7 @@ def test_sessions_table_marks_subagent_rows() -> None:
          "token_count": 9, "updated_at": "2026-01-15T12:30:00+00:00",
          "tags": "[]", "summary": ""},
     ]
-    table = sessions_table(rows)
+    table = sessions_table(rows, include_subagents=True)
     console = Console(record=True, width=200)
     console.print(table)
     exported = console.export_text()

context_forge_cli-0.4.15/tests/test_tui_table.py

@@ -0,0 +1,128 @@
+"""Regression tests for the SessionTable hierarchy: parent sessions first,
+sub-agent rows nested under their expanded parent."""
+from __future__ import annotations
+
+import asyncio
+import json
+import tempfile
+from datetime import datetime, timezone
+from pathlib import Path
+
+from textual.app import App, ComposeResult
+from textual.widgets import DataTable
+
+from contextforge.core.db import get_db, upsert_session
+from contextforge.models.session import Message, Session
+from contextforge.tui.widgets.session_table import SessionTable
+
+PARENT_ID = "1" * 32
+CHILD_ID = "2" * 32
+OTHER_ID = "3" * 32
+
+
+def _seed(db_path: Path) -> None:
+    now = datetime(2026, 1, 15, 12, 30, tzinfo=timezone.utc)
+    db = get_db(db_path)
+    upsert_session(db, Session(
+        id=PARENT_ID, tool="pi", title="Parent chat", cwd="/proj",
+        created_at=now, updated_at=now,
+        messages=[Message(role="user", content="parent")],
+    ))
+    upsert_session(db, Session(
+        id=CHILD_ID, tool="pi", title="Child worker run", cwd="/proj",
+        created_at=now, updated_at=now,
+        messages=[Message(role="user", content="child")],
+        tags=["subagent", f"parent:{PARENT_ID}"],
+    ))
+    upsert_session(db, Session(
+        id=OTHER_ID, tool="codex", title="Another parent chat", cwd="/proj2",
+        created_at=now, updated_at=now,
+        messages=[Message(role="user", content="other")],
+    ))
+
+
+class _HarnessApp(App):
+    def __init__(self, db_path: Path) -> None:
+        super().__init__()
+        self.db_path = db_path
+
+    def compose(self) -> ComposeResult:
+        yield SessionTable()
+
+
+def test_session_table_parents_first_and_expandable():
+    async def scenario():
+        with tempfile.TemporaryDirectory() as tmpdir:
+            db_path = Path(tmpdir) / "test.db"
+            _seed(db_path)
+            app = _HarnessApp(db_path)
+            async with app.run_test() as pilot:
+                table = app.query_one(SessionTable)
+                await pilot.pause()
+                dt = table.query_one(DataTable)
+
+                # At first glance: parent sessions only, hidden children
+                assert len(table._display_rows) == 2
+                assert [r["id"][:1] for r in table._display_rows] == ["1", "3"]
+
+                # Selecting (entering) the parent expands its children in place
+                table.toggle_expansion(PARENT_ID)
+                await pilot.pause()
+                assert len(table._display_rows) == 3
+                assert table._display_rows[0]["id"] == PARENT_ID
+                assert table._display_rows[1]["id"] == CHILD_ID
+                assert table._display_rows[1]["_is_child"] is True
+                assert table._display_rows[2]["id"] == OTHER_ID
+
+                # Toggling again collapses
+                table.toggle_expansion(PARENT_ID)
+                await pilot.pause()
+                assert len(table._display_rows) == 2
+
+    asyncio.run(scenario())
+
+
+def test_session_table_child_match_surfaces_parent():
+    async def scenario():
+        with tempfile.TemporaryDirectory() as tmpdir:
+            db_path = Path(tmpdir) / "test.db"
+            _seed(db_path)
+            app = _HarnessApp(db_path)
+            async with app.run_test() as pilot:
+                table = app.query_one(SessionTable)
+                await pilot.pause()
+
+                # Text filter matching only the CHILD surfaces its parent
+                table._filter_text = "worker"
+                table._apply_filter()
+                await pilot.pause()
+                ids = [r["id"] for r in table._display_rows]
+                assert ids == [PARENT_ID]
+
+    asyncio.run(scenario())
+
+
+def test_session_table_expansion_survives_filter_toggle():
+    async def scenario():
+        with tempfile.TemporaryDirectory() as tmpdir:
+            db_path = Path(tmpdir) / "test.db"
+            _seed(db_path)
+            app = _HarnessApp(db_path)
+            async with app.run_test() as pilot:
+                table = app.query_one(SessionTable)
+                await pilot.pause()
+                table.toggle_expansion(PARENT_ID)
+                await pilot.pause()
+
+                table._filter_tool = "codex"
+                table._apply_filter()
+                await pilot.pause()
+                assert len(table._display_rows) == 1  # only the codex parent
+
+                table._filter_tool = None
+                table._apply_filter()
+                await pilot.pause()
+                # Expansion state persists across filter changes
+                assert len(table._display_rows) == 3
+
+    asyncio.run(scenario())

{context_forge_cli-0.4.14 → context_forge_cli-0.4.15}/uv.lock

@@ -206,7 +206,7 @@ wheels = [
 
 [[package]]
 name = "context-forge-cli"
-version = "0.4.14"
+version = "0.4.15"
 source = { editable = "." }
 dependencies = [
     { name = "anthropic" },