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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: context-forge-cli
-Version: 0.4.13
+Version: 0.4.14
 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

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

@@ -8,6 +8,7 @@ from typing import Annotated, Optional
 
 import typer
 from rich.console import Console
+from rich.markup import escape
 from rich.panel import Panel
 
 from contextforge.core import db as db_module
@@ -16,7 +17,13 @@ from contextforge.core.injector import build_inject_command, execute_transfer
 from contextforge.core.scanner import scan
 from contextforge.core.summarizer import batch_summarize, summarize_session
 from contextforge.models.config import ForgeConfig
-from contextforge.utils.display import console, err_console, sessions_table
+from contextforge.utils.display import (
+    console,
+    display_safe,
+    err_console,
+    row_tags as display_row_tags,
+    sessions_table,
+)
 
 def _version_callback(value: bool) -> None:
     if value:
@@ -167,12 +174,13 @@ def show(
 
     summary = row.get("summary") or "[dim]No summary yet — run [bold]cf summarize[/bold][/dim]"
     panel = Panel(
-        f"[bold]{row.get('title') or '(no title)'}[/bold]\n\n"
-        f"Tool:     {row.get('tool')}\n"
-        f"CWD:      {row.get('cwd') or '?'}\n"
-        f"Tokens:   {row.get('token_count') or '?'}\n"
-        f"Status:   {row.get('status')}\n\n"
-        f"[bold]Summary:[/bold]\n{summary}",
+        f"[bold]{display_safe(row.get('title') or '(no title)')}[/bold]\n\n"
+        f"Tool:     {display_safe(row.get('tool'))}\n"
+        f"CWD:      {display_safe(row.get('cwd') or '?')}\n"
+        f"Tokens:   {display_safe(row.get('token_count'))}\n"
+        f"Status:   {display_safe(row.get('status'))}\n\n"
+        f"[bold]Tags:[/bold]     {display_safe(', '.join(display_row_tags(row)) or '—')}\n\n"
+        f"[bold]Summary:[/bold]\n{display_safe(summary) if row.get('summary') else summary}",
         title=f"Session {session_id[:16]}",
     )
     console.print(panel)

{context_forge_cli-0.4.13 → context_forge_cli-0.4.14}/contextforge/core/db.py

@@ -84,6 +84,10 @@ def upsert_session(db: sqlite_utils.Database, session: Session) -> None:
         if existing_updated >= new_updated:
             return
 
+    # Cap the title: some adapters derive it from the first message, which can
+    # be arbitrarily large (an entire system prompt). Titles are display text.
+    title = session.title[:300] if session.title else None
+
     first_msg = ""
     if session.messages:
         for m in session.messages:
@@ -95,7 +99,7 @@ def upsert_session(db: sqlite_utils.Database, session: Session) -> None:
         {
             "id": session.id,
             "tool": session.tool,
-            "title": session.title,
+            "title": title,
             "cwd": session.cwd,
             "created_at": int(session.created_at.timestamp() * 1000),
             "updated_at": int(session.updated_at.timestamp() * 1000),

{context_forge_cli-0.4.13 → context_forge_cli-0.4.14}/contextforge/tui/widgets/session_detail.py

@@ -7,9 +7,12 @@ from pathlib import Path
 
 from textual.app import ComposeResult
 from textual.containers import Vertical
+from rich.markup import escape
 from textual.widget import Widget
 from textual.widgets import Markdown, Static, TextArea
 
+from contextforge.utils.display import _clean_title, display_safe
+
 TOOL_COLORS = {
     "claude_code":    "cyan",
     "codex":          "green",
@@ -18,6 +21,8 @@ TOOL_COLORS = {
     "gemini":         "blue",
     "antigravity":    "white",
     "cursor":         "bright_white",
+    "pi":             "bright_cyan",
+    "datatzis":       "orange1",
 }
 TOOL_LABELS = {
     "claude_code":    "◆ Claude Code",
@@ -27,6 +32,8 @@ TOOL_LABELS = {
     "gemini":         "✦ Gemini",
     "antigravity":    "◉ Antigravity",
     "cursor":         "▲ Cursor",
+    "pi":             "∏ Pi",
+    "datatzis":       "✎ Datatzis",
 }
 
 
@@ -130,6 +137,7 @@ class SessionDetail(Widget):
             yield Static("", id="detail-created")
             yield Static("", id="detail-updated")
             yield Static("", id="detail-status")
+            yield Static("", id="detail-parent")
             yield Static("", id="detail-tags")
             yield TextArea("", id="detail-id", read_only=True)
         yield Static("✎ Summary", id="detail-summary-label")
@@ -164,9 +172,15 @@ class SessionDetail(Widget):
         status = row.get("status") or "?"
         tags_raw = row.get("tags") or "[]"
         try:
-            tags = ", ".join(json.loads(tags_raw)) or "—"
+            tags_list = [str(t) for t in json.loads(tags_raw)]
         except Exception:
-            tags = "—"
+            tags_list = []
+        tags = ", ".join(tags_list) or "—"
+
+        parent = next(
+            (t.split(":", 1)[1] for t in tags_list if t.startswith(("parent:", "workspace:"))),
+            None,
+        )
 
         created_str = _fmt_ts(row.get("created_at"))
         updated_str = _fmt_ts(row.get("updated_at"))
@@ -189,14 +203,21 @@ class SessionDetail(Widget):
         self.query_one("#detail-meta-block").display = True
         self.query_one("#detail-summary-label").display = True
 
-        self.query_one("#detail-title", Static).update(f"[bold]{title}[/bold]")
+        self.query_one("#detail-title", Static).update(f"[bold]{display_safe(_clean_title(title, max_len=200))}[/bold]")
         self.query_one("#detail-tool", Static).update(_meta_line("Tool", tool_markup))
         self.query_one("#detail-cwd", TextArea).load_text("Project   " + cwd)
         self.query_one("#detail-tokens", Static).update(_meta_line("Tokens", tok_markup))
         self.query_one("#detail-created", Static).update(_meta_line("Created", f"[dim]{created_str}[/dim]"))
         self.query_one("#detail-updated", Static).update(_meta_line("Updated", f"[dim]{updated_str}[/dim]"))
-        self.query_one("#detail-status", Static).update(_meta_line("Status", f"[dim]{status}[/dim]"))
-        self.query_one("#detail-tags", Static).update(_meta_line("Tags", f"[dim]{tags}[/dim]"))
+        self.query_one("#detail-status", Static).update(_meta_line("Status", f"[dim]{display_safe(status)}[/dim]"))
+        self.query_one("#detail-tags", Static).update(_meta_line("Tags", f"[dim]{display_safe(tags)}[/dim]"))
+        parent_widget = self.query_one("#detail-parent", Static)
+        if parent:
+            parent_widget.update(_meta_line("Parent", f"[dim]↳ {display_safe(parent)}[/dim]"))
+            parent_widget.display = True
+        else:
+            parent_widget.update("")
+            parent_widget.display = False
         self.query_one("#detail-id", TextArea).load_text("ID         " + session_id)
 
         md = self.query_one("#detail-summary-md", Markdown)
@@ -209,4 +230,5 @@ class SessionDetail(Widget):
         self.query_one("#detail-meta-block").display = False
         self.query_one("#detail-summary-label").display = False
         self.query_one("#detail-title", Static).update("")
+        self.query_one("#detail-parent").display = False
         self.app.call_later(self.query_one("#detail-summary-md", Markdown).update, "")

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

@@ -4,6 +4,7 @@ from __future__ import annotations
 from datetime import datetime, timezone
 from pathlib import Path
 
+from rich.markup import escape
 from textual.app import ComposeResult
 from textual.containers import Horizontal, Vertical
 from textual.events import Key
@@ -21,6 +22,8 @@ TOOL_ICON = {
     "gemini":         "✦",   # Google Gemini — four-pointed star
     "antigravity":    "◉",   # Antigravity — circle
     "cursor":         "▲",   # Cursor — triangle
+    "pi":             "∏",   # Pi — product symbol
+    "datatzis":       "✎",   # writing harness — pencil
 }
 
 TOOL_MARKUP = {
@@ -31,6 +34,8 @@ TOOL_MARKUP = {
     "gemini":         "[blue]✦ Gemini[/blue]",
     "antigravity":    "[white]◉ Agy[/white]",
     "cursor":         "[bright_white]▲ Cursor[/bright_white]",
+    "pi":             "[bright_cyan]∏ Pi[/bright_cyan]",
+    "datatzis":       "[orange1]✎ Datz[/orange1]",
 }
 
 TOOL_DISPLAY = {
@@ -41,6 +46,8 @@ TOOL_DISPLAY = {
     "gemini":         "✦ Gemini",
     "antigravity":    "◉ Agy",
     "cursor":         "▲ Cursor",
+    "pi":             "∏ Pi",
+    "datatzis":       "✎ Datz",
 }
 
 _FTOOL_MAP = {
@@ -51,6 +58,8 @@ _FTOOL_MAP = {
     "ftool-alt":   "altimate_code",
     "ftool-agy":   "antigravity",
     "ftool-cur":   "cursor",
+    "ftool-pi":    "pi",
+    "ftool-datz":  "datatzis",
 }
 
 
@@ -169,6 +178,8 @@ class SessionTable(Widget):
                 yield Button("⚡ Alt",   id="ftool-alt",    classes="filter-tool-btn")
                 yield Button("◉ Agy",   id="ftool-agy",    classes="filter-tool-btn")
                 yield Button("▲ Cursor", id="ftool-cur",    classes="filter-tool-btn")
+                yield Button("∏ Pi",    id="ftool-pi",     classes="filter-tool-btn")
+                yield Button("✎ Datz",  id="ftool-datz",   classes="filter-tool-btn")
             yield DataTable(cursor_type="row", zebra_stripes=True, id="sessions-datatable")
 
     def on_mount(self) -> None:
@@ -227,8 +238,11 @@ class SessionTable(Widget):
             tool = row.get("tool", "")
             tool_label = TOOL_MARKUP.get(tool, f"⚪ {tool}")
 
-            from contextforge.utils.display import _clean_title
+            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}"
+            title = display_safe(title)
 
             updated_ms = row.get("updated_at") or 0
             try:

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

@@ -1,10 +1,12 @@
 """Rich console helpers."""
 from __future__ import annotations
 
+import json
 import re
 from datetime import datetime, timezone
 
 from rich.console import Console
+from rich.markup import escape
 from rich.table import Table
 
 console = Console()
@@ -14,6 +16,9 @@ TOOL_COLORS = {
     "claude_code": "cyan",
     "codex": "green",
     "altimate_code": "magenta",
+    "gemini": "blue",
+    "pi": "bright_cyan",
+    "datatzis": "orange1",
 }
 
 TOOL_SHORT = {
@@ -27,6 +32,25 @@ def tool_color(tool: str) -> str:
     return TOOL_COLORS.get(tool, "white")
 
 
+_BRACKETS = str.maketrans({"[": "❰", "]": "❱"})
+
+
+def display_safe(text) -> str:
+    """Sanitize untrusted display text for Rich/Textual markup rendering.
+
+    ``rich.markup.escape`` alone is NOT sufficient: it only escapes bracket
+    spans it recognises as valid tags, leaving unmatched sequences such as
+    ``[/ηλικίας/... ]`` intact — which Rich/Textual parsers still consume as
+    markup (MarkupError).  Transliterating brackets to lookalikes first
+    removes the entire problem class while keeping the text readable.
+    """
+    if text is None:
+        return ""
+    if not isinstance(text, str):
+        text = str(text)
+    return escape(text.translate(_BRACKETS))
+
+
 def _clean_title(raw: str, max_len: int = 42) -> str:
     """Return a single-line, truncated title from raw session display text."""
     # Take only the first non-empty line
@@ -38,6 +62,28 @@ def _clean_title(raw: str, max_len: int = 42) -> str:
     return first_line
 
 
+def row_tags(row: dict) -> list[str]:
+    """Parse a DB row's JSON-encoded tags into a plain list."""
+    try:
+        tags = json.loads(row.get("tags") or "[]")
+        return [str(t) for t in tags] if isinstance(tags, list) else []
+    except Exception:
+        return []
+
+
+def is_subagent(row: dict) -> bool:
+    """True when the row is a sub-agent (child) session."""
+    return "subagent" in row_tags(row)
+
+
+def parent_id_of(row: dict) -> str | None:
+    """Session id of the parent, when the row is a sub-agent session."""
+    for tag in row_tags(row):
+        if tag.startswith("parent:") or tag.startswith("workspace:"):
+            return tag.split(":", 1)[1]
+    return None
+
+
 def _project_name(cwd: str) -> str:
     """Return just the last two path components of a CWD."""
     if not cwd:
@@ -70,6 +116,9 @@ def sessions_table(rows: list[dict]) -> Table:
 
         session_id = str(row.get("id", ""))[:13]
         title = _clean_title(row.get("title") or "")
+        if is_subagent(row):
+            title = f"↳ {title}"
+        title = display_safe(title)
         project = _project_name(row.get("cwd") or "")
 
         raw_tokens = row.get("token_count")
@@ -90,7 +139,7 @@ def sessions_table(rows: list[dict]) -> Table:
             updated = "?"
 
         summary_raw = row.get("summary") or ""
-        summary = _clean_title(summary_raw, max_len=45)
+        summary = display_safe(_clean_title(summary_raw, max_len=45))
 
         table.add_row(
             session_id,

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

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

{context_forge_cli-0.4.13 → context_forge_cli-0.4.14}/tests/core/test_db.py

@@ -54,6 +54,20 @@ def test_get_sessions_filter_by_tool():
         assert cc[0]["id"] == "s1"
 
 
+def test_title_capped_at_ingest():
+    """Adapters may derive the title from an arbitrarily large first message
+    (a whole system prompt); storage caps it so display surfaces stay safe."""
+    with tempfile.TemporaryDirectory() as tmpdir:
+        db = get_db(Path(tmpdir) / "test.db")
+        session = make_session("big-title")
+        session = session.model_copy(update={"title": "Η" * 10_000})
+        upsert_session(db, session)
+
+        row = get_session(db, "big-title")
+        assert len(row["title"]) == 300
+        assert row["title"].startswith("ΗΗΗ")
+
+
 def test_schema_idempotent():
     with tempfile.TemporaryDirectory() as tmpdir:
         path = Path(tmpdir) / "test.db"

context_forge_cli-0.4.14/tests/core/test_display.py

@@ -0,0 +1,81 @@
+"""Tests for utils/display.py — escaping, title cleaning, sub-agent helpers."""
+from __future__ import annotations
+
+import json
+
+from rich.console import Console
+from rich.markup import escape as _escape  # noqa: F401  (import sanity)
+
+from contextforge.utils.display import (
+    _clean_title,
+    is_subagent,
+    parent_id_of,
+    row_tags,
+    sessions_table,
+)
+
+# The exact crash payload class from the codex session: bracket sequences that
+# Rich would otherwise parse as markup ([/ηλικίας/...] closed a fictional tag).
+HOSTILE_TITLE = (
+    "Είσαι [/ηλικίας/γεωγραφίας. [bold]ερέυνα[/bold] και άμεσες[/ηλικίας] εργασίες."
+)
+
+
+def test_clean_title_first_line_and_truncation() -> None:
+    multi = "first line\nsecond [bold] line\nthird"
+    out = _clean_title(multi, max_len=20)
+    assert out == "first line"
+    assert "[" not in out  # brackets from later lines are cut, not interpreted
+    long = "x" * 100
+    assert _clean_title(long, max_len=10) == "x" * 9 + "…"
+
+
+def test_row_tags_parses_and_survives_corruption() -> None:
+    assert row_tags({"tags": json.dumps(["subagent", "parent:a1"])}) == ["subagent", "parent:a1"]
+    assert row_tags({"tags": "not json at all"}) == []
+    assert row_tags({}) == []
+    assert row_tags({"tags": json.dumps("scalar")}) == []
+
+
+def test_is_subagent_and_parent_id() -> None:
+    sub = {"tags": json.dumps(["subagent", "parent:01a11552-b234"])}
+    task = {"tags": json.dumps(["subagent", "workspace:111111111111"])}
+    main = {"tags": json.dumps([])}
+    assert is_subagent(sub) and is_subagent(task)
+    assert not is_subagent(main)
+    assert parent_id_of(sub) == "01a11552-b234"
+    assert parent_id_of(task) == "111111111111"
+    assert parent_id_of(main) is None
+
+
+def test_sessions_table_escapes_hostile_titles() -> None:
+    """Rendering a table with markup-like titles must not raise MarkupError."""
+    rows = [
+        {"id": "s1" * 8, "tool": "pi", "title": HOSTILE_TITLE, "cwd": "/proj",
+         "token_count": 10, "updated_at": "2026-01-15T12:30:00+00:00",
+         "tags": "[]", "summary": "Says [bold]hi[/bold] with [/weird/brackets."},
+    ]
+    table = sessions_table(rows)
+    console = Console(record=True, width=200)
+    console.print(table)  # must not raise MarkupError
+    exported = console.export_text()
+    assert "❰/ηλικίας" in exported  # brackets transliterated, shown literally
+    assert "Says ❰bold❱hi❰/bold❱ with ❰/weird/brackets." in exported
+
+
+def test_sessions_table_marks_subagent_rows() -> None:
+    rows = [
+        {"id": "a" * 32, "tool": "pi", "title": "Child run", "cwd": "/proj",
+         "token_count": 5, "updated_at": "2026-01-15T12:31:00+00:00",
+         "tags": json.dumps(["subagent", "parent:01a11552"]), "summary": ""},
+        {"id": "b" * 32, "tool": "pi", "title": "Parent chat", "cwd": "/proj",
+         "token_count": 9, "updated_at": "2026-01-15T12:30:00+00:00",
+         "tags": "[]", "summary": ""},
+    ]
+    table = sessions_table(rows)
+    console = Console(record=True, width=200)
+    console.print(table)
+    exported = console.export_text()
+    assert "↳ Child run" in exported
+    assert "Parent chat" in exported
+    assert "↳ Parent chat" not in exported  # parent rows unmarked

context_forge_cli-0.4.14/tests/test_tui_detail.py

@@ -0,0 +1,117 @@
+"""Regression tests for the TUI session-detail rendering.
+
+Covers the MarkupError crash when a session title (untrusted content, e.g. a
+codex session whose title is a whole raw JSON payload) contains Rich-style
+bracket sequences.  Uses Textual's pilot harness against a real DB.
+"""
+from __future__ import annotations
+
+import asyncio
+import tempfile
+from datetime import datetime, timezone
+from pathlib import Path
+
+from textual.app import App, ComposeResult
+from textual.widgets import Static
+
+from contextforge.core.db import get_db, upsert_session
+from contextforge.models.session import Message, Session
+from contextforge.tui.widgets.session_detail import SessionDetail
+
+HOSTILE_TITLE = (
+    "Είσαι ο βοηθός [/ηλικίας/γεωγραφίας. Περιλαμβάνει [bold]πρόθεση[/bold], "
+    "[dim]εκτίμηση[/] με εύρη, εύρος και συσπειρώσεις."
+)
+
+SUBAGENT_ID = "0" * 32
+PARENT_ID = "1" * 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="codex",
+            title=HOSTILE_TITLE,
+            cwd="/home/mver/Documents/Github/datatzis",
+            created_at=now,
+            updated_at=now,
+            messages=[Message(role="user", content="hello")],
+            status="unknown",
+        ),
+    )
+    upsert_session(
+        db,
+        Session(
+            id=SUBAGENT_ID,
+            tool="pi",
+            title="↳-safe plain child title",
+            cwd="/home/mver/Documents/Github/datatzis",
+            created_at=now,
+            updated_at=now,
+            messages=[Message(role="user", content="child")],
+            status="unknown",
+            tags=["subagent", f"parent:{PARENT_ID}"],
+        ),
+    )
+
+
+class _HarnessApp(App):
+    def __init__(self, db_path: Path) -> None:
+        super().__init__()
+        self.db_path = db_path  # SessionDetail.load passes this to get_db()
+
+    def compose(self) -> ComposeResult:
+        yield SessionDetail(id="session-detail")
+
+
+def _run(fn) -> None:
+    asyncio.run(fn())
+
+
+def test_detail_load_hostile_title_does_not_crash():
+    """The exact codex-session case: markup-like title must render escaped."""
+
+    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:
+                detail = app.query_one(SessionDetail)
+                detail.load(PARENT_ID)
+                await pilot.pause()
+                title_widget = detail.query_one("#detail-title", Static)
+                plain = title_widget.render().plain  # visible text after sanitizing
+                # Brackets transliterated; markup engine has nothing to consume.
+                assert "❰/ηλικίας" in plain
+                assert "❰bold❱πρόθεση❰/bold❱" in plain
+                detail.load(SUBAGENT_ID)
+                await pilot.pause()
+                parent_widget = detail.query_one("#detail-parent", Static)
+                assert parent_widget.display is True
+                assert PARENT_ID in parent_widget.render().plain
+
+    _run(scenario)
+
+
+def test_detail_parent_hidden_for_main_sessions():
+    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:
+                detail = app.query_one(SessionDetail)
+                detail.load(PARENT_ID)  # main codex session — no subagent tags
+                await pilot.pause()
+                parent_widget = detail.query_one("#detail-parent", Static)
+                assert parent_widget.display is False
+                detail.clear()
+                await pilot.pause()
+                assert parent_widget.display is False
+
+    _run(scenario)

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

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