context-forge-cli 0.4.5__tar.gz → 0.4.6__tar.gz

{context_forge_cli-0.4.5 → context_forge_cli-0.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: context-forge-cli
-Version: 0.4.5
+Version: 0.4.6
 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.5 → context_forge_cli-0.4.6}/contextforge/tui/widgets/stats_panel.py

@@ -12,7 +12,7 @@ from textual.widgets import Static
 
 # ── Unicode rendering helpers ─────────────────────────────────────────────────
 
-_BLOCKS = " ▏▎▍▌▋▊▉█"   # 9 levels: 0/8 → 8/8 of a cell
+_EIGHTHS = " ▏▎▍▌▋▊▉█"   # 9 levels for smooth bars
 _SPARK = "▁▂▃▄▅▆▇█"      # 8 vertical height levels
 
 TOOL_COLORS = {
@@ -30,24 +30,27 @@ TOOL_LABELS = {
     "gemini":         "✦ Gemini",
 }
 
+_TOOL_ORDER = ["claude_code", "codex", "gemini", "altimate_code", "claude_desktop"]
+
 WINDOW_LABELS = {
-    "7d": "7 days",
+    "7d":  "7 days",
     "30d": "30 days",
-    "6m": "6 months",
-    "1y": "1 year",
+    "6m":  "6 months",
+    "1y":  "1 year",
 }
 
 
-def _unicode_bar(fraction: float, width: int = 32) -> str:
+def _unicode_bar(fraction: float, width: int = 30) -> str:
     if fraction <= 0:
-        return " " * width
+        return "░" * width
+    fraction = min(fraction, 1.0)
     total_eighths = round(fraction * width * 8)
     full_cells = min(total_eighths // 8, width)
     remainder = total_eighths % 8
     bar = "█" * full_cells
     if full_cells < width and remainder > 0:
-        bar += _BLOCKS[remainder]
-    return bar.ljust(width)
+        bar += _EIGHTHS[remainder]
+    return bar.ljust(width, "░")
 
 
 def _render_bar_line(
@@ -55,13 +58,17 @@ def _render_bar_line(
     value: int,
     max_value: int,
     color: str = "cyan",
-    label_width: int = 14,
-    bar_width: int = 32,
+    label_width: int = 16,
+    bar_width: int = 30,
 ) -> str:
     fraction = value / max_value if max_value else 0
     bar = _unicode_bar(fraction, bar_width)
     val_str = _fmt_tokens(value) if value >= 1000 else str(value)
-    return f"[dim]{label:<{label_width}}[/dim][{color}]{bar}[/{color}] [bold]{val_str}[/bold]"
+    return (
+        f"  [dim]{label:<{label_width}}[/dim]"
+        f"[{color}]{bar}[/{color}]"
+        f"  [bold]{val_str}[/bold]"
+    )
 
 
 def _fmt_tokens(n: int) -> str:
@@ -112,38 +119,35 @@ def _render_sparkline(buckets: list, width: int = 52) -> str:
         else:
             bar_chars.append(f"[dim]{ch}[/dim]")
 
-    spark_line = "".join(bar_chars)
+    spark_line = "  " + "".join(bar_chars)
 
     # Build sparse date label row (first, middle, last)
     n = len(buckets)
     label_line = [" "] * n
     if n > 0:
-        first_lbl = buckets[0].label[-5:]   # last 5 chars e.g. "04-12" or "W15"
-        last_lbl = buckets[-1].label[-5:]
-        mid_lbl = buckets[n // 2].label[-5:]
-
-        # Place labels without overlap
-        label_line[0] = first_lbl[0]
+        first_lbl = buckets[0].label[-5:]
+        last_lbl  = buckets[-1].label[-5:]
+        mid_lbl   = buckets[n // 2].label[-5:]
         for i, ch in enumerate(first_lbl):
             if i < n:
                 label_line[i] = ch
-
         mid_start = n // 2
         for i, ch in enumerate(mid_lbl):
-            pos = mid_start + i
-            if pos < n:
-                label_line[pos] = ch
-
+            if mid_start + i < n:
+                label_line[mid_start + i] = ch
         last_start = max(n - len(last_lbl), 0)
         for i, ch in enumerate(last_lbl):
-            pos = last_start + i
-            if pos < n:
-                label_line[pos] = ch
+            if last_start + i < n:
+                label_line[last_start + i] = ch
 
-    date_line = f"[dim]{''.join(label_line)}[/dim]"
+    date_line = "  [dim]" + "".join(label_line) + "[/dim]"
     return spark_line + "\n" + date_line
 
 
+def _section(title: str, icon: str = "▤") -> str:
+    return f"[bold]{icon} {title}[/bold]"
+
+
 # ── Modal screen ──────────────────────────────────────────────────────────────
 
 
@@ -152,10 +156,10 @@ class StatsPanel(ModalScreen):
 
     BINDINGS = [
         Binding("escape,q", "dismiss(None)", "Close"),
-        Binding("w", "set_window_7d", "7d"),
+        Binding("w", "set_window_7d",  "7d"),
         Binding("m", "set_window_30d", "30d"),
-        Binding("h", "set_window_6m", "6m"),
-        Binding("y", "set_window_1y", "1y"),
+        Binding("h", "set_window_6m",  "6m"),
+        Binding("y", "set_window_1y",  "1y"),
     ]
 
     DEFAULT_CSS = """
@@ -163,10 +167,10 @@ class StatsPanel(ModalScreen):
         align: center middle;
     }
     StatsPanel > Vertical {
-        width: 82%;
-        max-width: 110;
-        height: 88%;
-        border: thick $primary;
+        width: 84%;
+        max-width: 114;
+        height: 90%;
+        border: thick $accent;
         background: $surface;
         padding: 1 2;
         overflow-y: auto;
@@ -175,17 +179,22 @@ class StatsPanel(ModalScreen):
         text-style: bold;
         color: $accent;
         margin-bottom: 1;
+        padding-bottom: 1;
+        border-bottom: solid $primary-background-lighten-1;
     }
     StatsPanel #stats-overview {
-        color: $text-muted;
         margin-bottom: 1;
+    }
+    StatsPanel #stats-insights {
+        margin-bottom: 1;
+        padding: 0 0 1 0;
         border-bottom: solid $primary-background-lighten-1;
-        padding-bottom: 1;
     }
-    StatsPanel .chart-title {
+    StatsPanel .chart-section {
         text-style: bold;
-        color: $text;
+        color: $accent;
         margin-top: 1;
+        margin-bottom: 0;
     }
     StatsPanel #bar-sessions {
         margin-bottom: 1;
@@ -217,16 +226,17 @@ class StatsPanel(ModalScreen):
         with Vertical():
             yield Static("", id="stats-title")
             yield Static("", id="stats-overview")
-            yield Static("Sessions by tool", classes="chart-title")
+            yield Static("", id="stats-insights")
+            yield Static(_section("Sessions by tool", "▤"), classes="chart-section")
             yield Static("", id="bar-sessions")
-            yield Static("Token usage by tool", classes="chart-title")
+            yield Static(_section("Token usage by tool", "◈"), classes="chart-section")
             yield Static("", id="bar-tokens")
-            yield Static("Activity over time", classes="chart-title")
+            yield Static(_section("Activity over time", "⌁"), classes="chart-section")
             yield Static("", id="sparkline")
-            yield Static("Top projects", classes="chart-title")
+            yield Static(_section("Top projects", "⌂"), classes="chart-section")
             yield Static("", id="projects")
             yield Static(
-                "ESC/q — close  │  W=7d  M=30d  H=6m  Y=1y",
+                "  [dim]ESC/q[/dim] close   [dim]W[/dim] 7d   [dim]M[/dim] 30d   [dim]H[/dim] 6m   [dim]Y[/dim] 1y",
                 id="stats-footer",
             )
 
@@ -238,17 +248,10 @@ class StatsPanel(ModalScreen):
 
     # ── Window actions ────────────────────────────────────────────────────────
 
-    def action_set_window_7d(self) -> None:
-        self.window = "7d"
-
-    def action_set_window_30d(self) -> None:
-        self.window = "30d"
-
-    def action_set_window_6m(self) -> None:
-        self.window = "6m"
-
-    def action_set_window_1y(self) -> None:
-        self.window = "1y"
+    def action_set_window_7d(self)  -> None: self.window = "7d"
+    def action_set_window_30d(self) -> None: self.window = "30d"
+    def action_set_window_6m(self)  -> None: self.window = "6m"
+    def action_set_window_1y(self)  -> None: self.window = "1y"
 
     # ── Data loading ──────────────────────────────────────────────────────────
 
@@ -262,81 +265,154 @@ class StatsPanel(ModalScreen):
         from contextforge.core.db import get_db
 
         db = get_db(db_path)
-        overview = analytics.get_overview(db, self.window)
-        activity = analytics.get_activity_over_time(db, self.window)
-        projects = analytics.get_top_projects(db, self.window)
-
-        self._render_all(overview, activity, projects)
-
-    def _render_all(self, overview, activity: list, projects: list) -> None:
-        w = self.window
+        overview  = analytics.get_overview(db, self.window)
+        activity  = analytics.get_activity_over_time(db, self.window)
+        projects  = analytics.get_top_projects(db, self.window)
+
+        # Extra: heavy session count (>100k tokens)
+        from contextforge.core import analytics as _a
+        start_ms = _a._window_start_ms(self.window)
+        try:
+            heavy_count = db.execute(
+                "SELECT COUNT(*) FROM sessions WHERE updated_at >= ? AND token_count > 100000",
+                [start_ms],
+            ).fetchone()[0]
+        except Exception:
+            heavy_count = 0
+
+        self._render_all(overview, activity, projects, heavy_count)
+
+    def _render_all(self, overview, activity: list, projects: list, heavy_count: int) -> None:
+        w     = self.window
         label = WINDOW_LABELS.get(w, w)
 
-        # ── Title ──────────────────────────────────────────────────────────
-        window_indicators = "  ".join(
-            f"[bold cyan]▶ {k}[/bold cyan]" if k == w else f"[dim]{k.upper()[0]}[/dim]"
-            for k in ("7d", "30d", "6m", "1y")
+        # ── Title / window selector ───────────────────────────────────────
+        windows = ["7d", "30d", "6m", "1y"]
+        keys    = ["W", "M", "H", "Y"]
+        pills = "  ".join(
+            f"[bold reverse] {k}={ww} [/bold reverse]" if ww == w
+            else f"[dim] {k}={ww} [/dim]"
+            for ww, k in zip(windows, keys)
         )
         self.query_one("#stats-title", Static).update(
-            f"[bold]Analytics[/bold]  {window_indicators}  [dim]— last {label}[/dim]"
+            f"[bold]▤ Analytics[/bold]   {pills}   [dim]last {label}[/dim]"
         )
 
-        # ── Overview ───────────────────────────────────────────────────────
+        # ── Overview card ─────────────────────────────────────────────────
         total_tok_str = _fmt_tokens(overview.total_tokens)
+        avg_tok = overview.total_tokens // overview.total_sessions if overview.total_sessions else 0
+        avg_str = _fmt_tokens(avg_tok) if avg_tok else "—"
+
         date_str = ""
         if overview.date_range:
             earliest, latest = overview.date_range
-            date_str = (
-                f"  │  {earliest.strftime('%b %d')} → {latest.strftime('%b %d, %Y')}"
-            )
-        tools_str = ", ".join(
-            TOOL_LABELS.get(t, t) for t in sorted(overview.active_tools)
-        ) or "—"
+            date_str = f"  [dim]{earliest.strftime('%b %d')} → {latest.strftime('%b %d, %Y')}[/dim]"
+
         self.query_one("#stats-overview", Static).update(
-            f"[bold]{overview.total_sessions:,}[/bold] sessions  │  "
-            f"[bold]{total_tok_str}[/bold] tokens  │  "
-            f"Tools: [dim]{tools_str}[/dim]"
+            f"  [bold]{overview.total_sessions:,}[/bold] sessions   "
+            f"[bold]{total_tok_str}[/bold] tokens   "
+            f"[dim]avg {avg_str}/session[/dim]"
             f"{date_str}"
         )
 
-        # ── Sessions bar chart ─────────────────────────────────────────────
-        tool_order = ["claude_code", "codex", "altimate_code", "claude_desktop"]
+        # ── Insights ──────────────────────────────────────────────────────
+        insight_lines: list[str] = []
+
+        # Dominant tool
+        if overview.session_count_by_tool:
+            dominant = max(overview.session_count_by_tool, key=lambda t: overview.session_count_by_tool[t])
+            dom_pct = int(
+                overview.session_count_by_tool[dominant] / overview.total_sessions * 100
+            ) if overview.total_sessions else 0
+            dom_label = TOOL_LABELS.get(dominant, dominant)
+            dom_color = TOOL_COLORS.get(dominant, "white")
+            insight_lines.append(
+                f"  [dim]Dominant tool  [/dim][{dom_color}]{dom_label}[/{dom_color}]"
+                f"  [dim]{dom_pct}% of sessions[/dim]"
+            )
+
+        # Heavy sessions
+        if heavy_count:
+            heavy_pct = int(heavy_count / overview.total_sessions * 100) if overview.total_sessions else 0
+            insight_lines.append(
+                f"  [dim]Context pressure[/dim]  "
+                f"[yellow]{heavy_count}[/yellow] [dim]sessions >100k tokens ({heavy_pct}%)[/dim]"
+            )
+        else:
+            insight_lines.append(
+                f"  [dim]Context pressure[/dim]  [green]none[/green] [dim](no sessions >100k)[/dim]"
+            )
+
+        # Activity trend (compare first vs last third of buckets)
+        trend_str = ""
+        if len(activity) >= 6:
+            third = max(len(activity) // 3, 1)
+            first_avg = sum(b.count for b in activity[:third]) / third
+            last_avg  = sum(b.count for b in activity[-third:]) / third
+            if first_avg > 0:
+                ratio = last_avg / first_avg
+                if ratio >= 1.2:
+                    trend_str = f"[green]↗ growing[/green]  [dim](+{int((ratio-1)*100)}%)[/dim]"
+                elif ratio <= 0.8:
+                    trend_str = f"[red]↘ declining[/red]  [dim]({int((ratio-1)*100)}%)[/dim]"
+                else:
+                    trend_str = "[dim]→ stable[/dim]"
+            else:
+                trend_str = "[dim]→ stable[/dim]" if last_avg > 0 else "[dim]— no prior activity[/dim]"
+            insight_lines.append(f"  [dim]Trend          [/dim]{trend_str}")
+
+        # Peak activity bucket
+        if activity:
+            peak = max(activity, key=lambda b: b.count)
+            if peak.count > 0:
+                insight_lines.append(
+                    f"  [dim]Peak period    [/dim][bold]{peak.label}[/bold]"
+                    f"  [dim]{peak.count} session{'s' if peak.count != 1 else ''}[/dim]"
+                )
+
+        self.query_one("#stats-insights", Static).update("\n".join(insight_lines))
+
+        # ── Sessions bar chart ────────────────────────────────────────────
         max_sess = max(overview.session_count_by_tool.values(), default=1)
         sess_lines: list[str] = []
-        for tool in tool_order:
+        for tool in _TOOL_ORDER:
             cnt = overview.session_count_by_tool.get(tool, 0)
             if cnt == 0:
                 continue
-            color = TOOL_COLORS.get(tool, "white")
+            color     = TOOL_COLORS.get(tool, "white")
             label_str = TOOL_LABELS.get(tool, tool)
             sess_lines.append(_render_bar_line(label_str, cnt, max_sess, color))
         self.query_one("#bar-sessions", Static).update(
-            "\n".join(sess_lines) if sess_lines else "[dim](no data)[/dim]"
+            "\n".join(sess_lines) if sess_lines else "[dim]  (no data)[/dim]"
         )
 
-        # ── Token bar chart ────────────────────────────────────────────────
+        # ── Token bar chart ───────────────────────────────────────────────
         max_tok = max(overview.token_sum_by_tool.values(), default=1)
         tok_lines: list[str] = []
-        for tool in tool_order:
+        for tool in _TOOL_ORDER:
             tok = overview.token_sum_by_tool.get(tool, 0)
             if tok == 0:
                 continue
-            color = TOOL_COLORS.get(tool, "white")
+            color     = TOOL_COLORS.get(tool, "white")
             label_str = TOOL_LABELS.get(tool, tool)
             tok_lines.append(_render_bar_line(label_str, tok, max_tok, color))
         self.query_one("#bar-tokens", Static).update(
-            "\n".join(tok_lines) if tok_lines else "[dim](no data)[/dim]"
+            "\n".join(tok_lines) if tok_lines else "[dim]  (no data)[/dim]"
         )
 
-        # ── Sparkline ──────────────────────────────────────────────────────
+        # ── Sparkline ─────────────────────────────────────────────────────
         self.query_one("#sparkline", Static).update(_render_sparkline(activity))
 
-        # ── Top projects ───────────────────────────────────────────────────
+        # ── Top projects ──────────────────────────────────────────────────
         if projects:
-            proj_lines = [
-                f"[dim]{i + 1}.[/dim] [bold]{p.project}[/bold] [dim]({p.count})[/dim]"
-                for i, p in enumerate(projects)
-            ]
+            max_proj = max(p.count for p in projects)
+            proj_lines: list[str] = []
+            for i, p in enumerate(projects):
+                bar = _unicode_bar(p.count / max_proj, 20)
+                proj_lines.append(
+                    f"  [dim]{i + 1:>2}.[/dim]  [bold]{p.project}[/bold]"
+                    f"  [cyan]{bar}[/cyan]  [dim]{p.count}[/dim]"
+                )
             self.query_one("#projects", Static).update("\n".join(proj_lines))
         else:
-            self.query_one("#projects", Static).update("[dim](no data)[/dim]")
+            self.query_one("#projects", Static).update("[dim]  (no data)[/dim]")

context_forge_cli-0.4.6/contextforge/tui/widgets/tokens_panel.py

@@ -0,0 +1,372 @@
+"""TokensPanel — modal screen showing per-turn token analysis for a session."""
+from __future__ import annotations
+
+import json
+from pathlib import Path
+
+from rich.text import Text
+from textual.app import ComposeResult
+from textual.binding import Binding
+from textual.containers import ScrollableContainer, Vertical
+from textual.screen import ModalScreen
+from textual.widgets import DataTable, Static
+
+from contextforge.models.session import Message
+
+# ── Constants ─────────────────────────────────────────────────────────────────
+
+_CONTEXT_WINDOW = 200_000   # reference context window (Claude Sonnet)
+_EIGHTHS = " ▏▎▍▌▋▊▉█"
+
+_TOOL_LABELS = {
+    "claude_code":    "◆ Claude Code",
+    "codex":          "⬡ Codex",
+    "altimate_code":  "⚡ Altimate",
+    "claude_desktop": "◇ Claude Desktop",
+    "gemini":         "✦ Gemini",
+}
+
+
+def _frac_bar(fraction: float, width: int = 22) -> str:
+    """Smooth fractional progress bar using Unicode block elements."""
+    fraction = max(0.0, min(1.0, fraction))
+    total_eighths = round(fraction * width * 8)
+    full = min(total_eighths // 8, width)
+    remainder = total_eighths % 8
+    bar = "█" * full
+    if full < width and remainder:
+        bar += _EIGHTHS[remainder]
+    return bar.ljust(width, "░")
+
+
+def _fmt(n: int) -> str:
+    if n >= 1_000_000:
+        return f"{n / 1_000_000:.1f}M"
+    if n >= 1_000:
+        return f"{n // 1_000}k"
+    return str(n)
+
+
+# ── TurnDetailPanel ───────────────────────────────────────────────────────────
+
+
+class TurnDetailPanel(ModalScreen):
+    """Modal showing the full content of a single turn."""
+
+    BINDINGS = [
+        Binding("escape,q", "dismiss(None)", "Close"),
+    ]
+
+    DEFAULT_CSS = """
+    TurnDetailPanel {
+        align: center middle;
+    }
+    TurnDetailPanel > Vertical {
+        width: 92%;
+        height: 88%;
+        border: thick $accent;
+        background: $surface;
+        padding: 0 1;
+    }
+    TurnDetailPanel #turn-header {
+        height: auto;
+        padding: 1 1 0 1;
+        border-bottom: solid $primary-background-lighten-1;
+        margin-bottom: 1;
+    }
+    TurnDetailPanel ScrollableContainer {
+        height: 1fr;
+        padding: 0 1;
+    }
+    TurnDetailPanel #turn-footer {
+        height: 1;
+        color: $text-disabled;
+        text-align: center;
+    }
+    """
+
+    def __init__(self, turn_num: int, msg: Message) -> None:
+        super().__init__()
+        self._turn_num = turn_num
+        self._msg = msg
+
+    def compose(self) -> ComposeResult:
+        with Vertical():
+            yield Static("", id="turn-header")
+            with ScrollableContainer():
+                yield Static("", id="turn-body")
+            yield Static("[dim]ESC / q — close[/dim]", id="turn-footer")
+
+    def on_mount(self) -> None:
+        msg = self._msg
+        role_color = "cyan" if msg.role == "user" else "green"
+        role_icon  = "👤" if msg.role == "user" else "🤖"
+
+        # Context pressure for this single turn
+        pct = int((msg.token_count or 0) / _CONTEXT_WINDOW * 100)
+        pressure_color = "red" if pct >= 80 else ("yellow" if pct >= 40 else "green")
+
+        self.query_one("#turn-header", Static).update(
+            f"[bold]Turn #{self._turn_num}[/bold]  "
+            f"[{role_color}]{role_icon} {msg.role}[/{role_color}]  "
+            f"[bold]{(msg.token_count or 0):,}[/bold] [dim]tokens[/dim]  "
+            f"[{pressure_color}]{pct}% of context[/{pressure_color}]"
+            + (f"   [yellow]⚙ {len(msg.tool_calls)} call{'s' if len(msg.tool_calls) != 1 else ''}[/yellow]"
+               if msg.tool_calls else "")
+            + (f"  [magenta]⇥ {len(msg.tool_results)} result{'s' if len(msg.tool_results) != 1 else ''}[/magenta]"
+               if msg.tool_results else "")
+        )
+
+        body = Text()
+
+        if msg.content:
+            body.append("── Content ──\n", style="bold dim")
+            body.append(msg.content + "\n")
+
+        if msg.tool_calls:
+            body.append("\n── Tool Calls ──\n", style="bold dim")
+            for i, tc in enumerate(msg.tool_calls, 1):
+                name = tc.get("name", "?")
+                raw_input = tc.get("input", "")
+                try:
+                    formatted = json.dumps(json.loads(raw_input), indent=2)
+                except (json.JSONDecodeError, TypeError):
+                    formatted = raw_input if isinstance(raw_input, str) else str(raw_input)
+                body.append(f"⚙ {i}. {name}\n", style="bold yellow")
+                body.append(formatted + "\n", style="dim")
+
+        if msg.tool_results:
+            body.append("\n── Tool Results ──\n", style="bold dim")
+            for i, tr in enumerate(msg.tool_results, 1):
+                output = tr.get("output", "")
+                if not isinstance(output, str):
+                    output = str(output)
+                body.append(f"⇥ Result {i}\n", style="bold green")
+                body.append(output + "\n", style="dim")
+
+        self.query_one("#turn-body", Static).update(body)
+
+
+# ── TokensPanel ───────────────────────────────────────────────────────────────
+
+
+class TokensPanel(ModalScreen):
+    """Full-screen modal showing token breakdown for a session."""
+
+    BINDINGS = [
+        Binding("escape,q", "dismiss(None)", "Close"),
+    ]
+
+    DEFAULT_CSS = """
+    TokensPanel {
+        align: center middle;
+    }
+    TokensPanel > Vertical {
+        width: 92%;
+        height: 88%;
+        border: thick $accent;
+        background: $surface;
+        padding: 0 1;
+    }
+    TokensPanel #tokens-header {
+        height: auto;
+        padding: 1 1 0 1;
+        color: $text;
+        border-bottom: solid $primary-background-lighten-1;
+        margin-bottom: 1;
+    }
+    TokensPanel #tokens-summary {
+        height: auto;
+        padding: 0 1;
+        color: $text-muted;
+        margin-bottom: 0;
+    }
+    TokensPanel #tokens-insights {
+        height: auto;
+        padding: 0 1 1 1;
+        margin-bottom: 1;
+        border-bottom: solid $primary-background-lighten-1;
+    }
+    TokensPanel DataTable {
+        height: 1fr;
+    }
+    TokensPanel #tokens-footer {
+        height: 1;
+        color: $text-disabled;
+        text-align: center;
+        padding: 0 1;
+    }
+    """
+
+    _BAR_WIDTH = 20
+
+    def __init__(self, session_id: str, db_path: Path) -> None:
+        super().__init__()
+        self._session_id = session_id
+        self._db_path = db_path
+        self._messages: list[Message] = []
+
+    def compose(self) -> ComposeResult:
+        with Vertical():
+            yield Static("", id="tokens-header")
+            yield Static("", id="tokens-summary")
+            yield Static("", id="tokens-insights")
+            yield DataTable(id="tokens-table", show_cursor=True, zebra_stripes=True, cursor_type="row")
+            yield Static("[dim]ESC/q[/dim] close   [dim]Enter[/dim] view turn", id="tokens-footer")
+
+    def on_mount(self) -> None:
+        self._load()
+
+    def on_data_table_row_selected(self, event: DataTable.RowSelected) -> None:
+        row_idx = event.cursor_row
+        if 0 <= row_idx < len(self._messages):
+            self.app.push_screen(TurnDetailPanel(row_idx + 1, self._messages[row_idx]))
+
+    def _load(self) -> None:
+        from contextforge.adapters.registry import get_adapter
+        from contextforge.core.db import get_db, get_session
+        from contextforge.core.token_analyzer import analyze_tokens
+
+        db      = get_db(self._db_path)
+        report  = analyze_tokens(db, self._session_id)
+
+        row = get_session(db, self._session_id)
+        if row is not None:
+            try:
+                adapter = get_adapter(row["tool"])
+                self._messages = adapter.load_messages(self._session_id)
+            except Exception:
+                self._messages = []
+
+        header   = self.query_one("#tokens-header",   Static)
+        summary  = self.query_one("#tokens-summary",  Static)
+        insights = self.query_one("#tokens-insights", Static)
+        table    = self.query_one("#tokens-table",    DataTable)
+
+        if report is None or not report.turns:
+            header.update("[bold red]No token data available.[/bold red]")
+            return
+
+        # ── Header ────────────────────────────────────────────────────────
+        tool_label = _TOOL_LABELS.get(report.tool, report.tool)
+        header.update(
+            f"[bold]# Token Analysis[/bold]   "
+            f"[dim]{report.title[:55]}[/dim]   "
+            f"[dim]{tool_label}[/dim]"
+        )
+
+        # ── Summary ───────────────────────────────────────────────────────
+        max_t = report.max_turn
+        line1 = (
+            f"  [bold]{report.total:,}[/bold] total   "
+            f"[cyan]{report.user_total:,}[/cyan] user (avg [cyan]{report.avg_user:,.0f}[/cyan])   "
+            f"[green]{report.assistant_total:,}[/green] asst (avg [green]{report.avg_assistant:,.0f}[/green])   "
+            f"[dim]{report.turn_count} turns[/dim]"
+        )
+        line2_parts = []
+        if report.has_tool_data:
+            line2_parts.append(
+                f"  [yellow]⚙ calls {report.tool_call_total:,}[/yellow]   "
+                f"[magenta]⇥ results {report.tool_result_total:,}[/magenta]"
+            )
+        if max_t:
+            line2_parts.append(
+                f"   [dim]heaviest: turn [/dim][bold]#{max_t.turn}[/bold]"
+                f"[dim] ({max_t.tokens:,} tok, {max_t.role})[/dim]"
+            )
+        summary.update(line1 + ("\n" + "".join(line2_parts) if line2_parts else ""))
+
+        # ── Insights ──────────────────────────────────────────────────────
+        insight_lines: list[str] = []
+
+        # Context pressure gauge
+        ctx_pct  = report.total / _CONTEXT_WINDOW
+        ctx_bar  = _frac_bar(ctx_pct, 22)
+        ctx_val  = int(ctx_pct * 100)
+        ctx_col  = "red" if ctx_val >= 80 else ("yellow" if ctx_val >= 40 else "green")
+        insight_lines.append(
+            f"  [dim]Context   [/dim][{ctx_col}]{ctx_bar}[/{ctx_col}]"
+            f"  [{ctx_col}]{ctx_val}%[/{ctx_col}]  [dim]of ~200k window[/dim]"
+        )
+
+        # User / Assistant split bar
+        if report.total > 0:
+            u_frac   = report.user_total / report.total
+            a_frac   = 1.0 - u_frac
+            u_chars  = round(u_frac * 22)
+            a_chars  = 22 - u_chars
+            split_bar = f"[cyan]{'█' * u_chars}[/cyan][green]{'█' * a_chars}[/green]"
+            insight_lines.append(
+                f"  [dim]U/A split [/dim]{split_bar}"
+                f"  [cyan]{int(u_frac * 100)}% user[/cyan]  "
+                f"[green]{int(a_frac * 100)}% asst[/green]"
+            )
+
+        # Tool overhead
+        if report.has_tool_data and report.total > 0:
+            tool_total = report.tool_call_total + report.tool_result_total
+            t_frac = tool_total / report.total
+            t_bar  = _frac_bar(t_frac, 22)
+            t_col  = "yellow" if t_frac >= 0.5 else "dim"
+            insight_lines.append(
+                f"  [dim]Tool load [/dim][{t_col}]{t_bar}[/{t_col}]"
+                f"  [{t_col}]{int(t_frac * 100)}%[/{t_col}]  [dim]of tokens in tool calls/results[/dim]"
+            )
+
+        # Conversation shape: are later turns heavier than earlier?
+        if len(report.turns) >= 4:
+            half = len(report.turns) // 2
+            first_avg = sum(t.tokens for t in report.turns[:half]) / half
+            last_avg  = sum(t.tokens for t in report.turns[half:]) / half
+            if first_avg > 0:
+                ratio = last_avg / first_avg
+                if ratio >= 1.3:
+                    shape = "[yellow]↗ growing[/yellow]  [dim](context is building up)[/dim]"
+                elif ratio <= 0.7:
+                    shape = "[green]↘ tapering[/green]  [dim](turns getting shorter)[/dim]"
+                else:
+                    shape = "[dim]→ uniform  (turns are evenly sized)[/dim]"
+                insight_lines.append(f"  [dim]Shape     [/dim]{shape}")
+
+        insights.update("\n".join(insight_lines))
+
+        # ── Table ─────────────────────────────────────────────────────────
+        if report.has_tool_data:
+            table.add_columns("#", "Role", "Tokens", "Text", "Calls", "Results", "Cumul.", "Bar", "Preview")
+        else:
+            table.add_columns("#", "Role", "Tokens", "Cumul.", "Bar", "Preview")
+
+        max_tokens = max(t.tokens for t in report.turns)
+
+        for t in report.turns:
+            bar_str = _frac_bar(t.tokens / max_tokens if max_tokens else 0, self._BAR_WIDTH)
+
+            if t.role == "user":
+                role_str = "[cyan]👤 user[/cyan]"
+                bar_str  = f"[cyan]{bar_str}[/cyan]"
+            elif t.role == "assistant":
+                role_str = "[green]🤖 asst[/green]"
+                bar_str  = f"[green]{bar_str}[/green]"
+            else:
+                role_str = f"[dim]{t.role}[/dim]"
+                bar_str  = f"[dim]{bar_str}[/dim]"
+
+            tok_str = f"[bold]{t.tokens:,}[/bold]" if max_tokens and t.tokens == max_tokens else f"{t.tokens:,}"
+
+            if report.has_tool_data:
+                calls_str   = f"[yellow]{t.tool_call_tokens:,}[/yellow]"   if t.tool_call_tokens   else "[dim]—[/dim]"
+                results_str = f"[magenta]{t.tool_result_tokens:,}[/magenta]" if t.tool_result_tokens else "[dim]—[/dim]"
+                table.add_row(
+                    str(t.turn), role_str, tok_str,
+                    f"{t.text_tokens:,}", calls_str, results_str,
+                    f"{t.cumulative:,}", bar_str, t.content_preview,
+                )
+            else:
+                table.add_row(
+                    str(t.turn), role_str, tok_str,
+                    f"{t.cumulative:,}", bar_str, t.content_preview,
+                )
+
+        if max_t:
+            table.move_cursor(row=max_t.turn - 1)
+        table.focus()

{context_forge_cli-0.4.5 → context_forge_cli-0.4.6}/pyproject.toml

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

context_forge_cli-0.4.5/contextforge/tui/widgets/tokens_panel.py

@@ -1,293 +0,0 @@
-"""TokensPanel — modal screen showing per-turn token analysis for a session."""
-from __future__ import annotations
-
-import json
-from pathlib import Path
-
-from rich.text import Text
-from textual.app import ComposeResult
-from textual.binding import Binding
-from textual.containers import ScrollableContainer, Vertical
-from textual.screen import ModalScreen
-from textual.widgets import DataTable, Static
-
-from contextforge.models.session import Message
-
-
-class TurnDetailPanel(ModalScreen):
-    """Modal showing the full content of a single turn."""
-
-    BINDINGS = [
-        Binding("escape,q", "dismiss(None)", "Close"),
-    ]
-
-    DEFAULT_CSS = """
-    TurnDetailPanel {
-        align: center middle;
-    }
-    TurnDetailPanel > Vertical {
-        width: 92%;
-        height: 88%;
-        border: thick $accent;
-        background: $surface;
-        padding: 0 1;
-    }
-    TurnDetailPanel #turn-header {
-        height: auto;
-        padding: 1 1 0 1;
-        border-bottom: solid $primary-background-lighten-1;
-        margin-bottom: 1;
-    }
-    TurnDetailPanel ScrollableContainer {
-        height: 1fr;
-        padding: 0 1;
-    }
-    TurnDetailPanel .section-label {
-        color: $text-muted;
-        text-style: bold;
-        margin-top: 1;
-    }
-    TurnDetailPanel .content-block {
-        color: $text;
-        margin-bottom: 1;
-    }
-    TurnDetailPanel .tool-name {
-        color: $warning;
-        text-style: bold;
-    }
-    TurnDetailPanel .tool-input {
-        color: $text-muted;
-        margin-left: 2;
-    }
-    TurnDetailPanel .tool-output {
-        color: $success;
-        margin-left: 2;
-    }
-    TurnDetailPanel #turn-footer {
-        height: 1;
-        color: $text-disabled;
-        text-align: center;
-    }
-    """
-
-    def __init__(self, turn_num: int, msg: Message) -> None:
-        super().__init__()
-        self._turn_num = turn_num
-        self._msg = msg
-
-    def compose(self) -> ComposeResult:
-        with Vertical():
-            yield Static("", id="turn-header")
-            with ScrollableContainer():
-                yield Static("", id="turn-body")
-            yield Static("ESC / q — close", id="turn-footer")
-
-    def on_mount(self) -> None:
-        msg = self._msg
-        role_color = "cyan" if msg.role == "user" else "green"
-
-        self.query_one("#turn-header", Static).update(
-            f"[bold]Turn #{self._turn_num}[/bold]  "
-            f"[{role_color}]{msg.role}[/{role_color}]  "
-            f"[dim]{(msg.token_count or 0):,} tokens[/dim]"
-            + (f"  [yellow]{len(msg.tool_calls)} call(s)[/yellow]" if msg.tool_calls else "")
-            + (f"  [magenta]{len(msg.tool_results)} result(s)[/magenta]" if msg.tool_results else "")
-        )
-
-        body = Text()
-
-        # ── Text content ────────────────────────────────────────────────────
-        if msg.content:
-            body.append("── Content ──\n", style="bold dim")
-            body.append(msg.content + "\n")
-
-        # ── Tool calls ──────────────────────────────────────────────────────
-        if msg.tool_calls:
-            body.append("\n── Tool Calls ──\n", style="bold dim")
-            for i, tc in enumerate(msg.tool_calls, 1):
-                name = tc.get("name", "?")
-                raw_input = tc.get("input", "")
-                try:
-                    formatted = json.dumps(json.loads(raw_input), indent=2)
-                except (json.JSONDecodeError, TypeError):
-                    formatted = raw_input if isinstance(raw_input, str) else str(raw_input)
-                body.append(f"{i}. {name}\n", style="bold yellow")
-                body.append(formatted + "\n", style="dim")
-
-        # ── Tool results ────────────────────────────────────────────────────
-        if msg.tool_results:
-            body.append("\n── Tool Results ──\n", style="bold dim")
-            for i, tr in enumerate(msg.tool_results, 1):
-                output = tr.get("output", "")
-                if not isinstance(output, str):
-                    output = str(output)
-                body.append(f"Result {i}\n", style="bold green")
-                body.append(output + "\n", style="dim")
-
-        self.query_one("#turn-body", Static).update(body)
-
-
-class TokensPanel(ModalScreen):
-    """Full-screen modal showing token breakdown for a session."""
-
-    BINDINGS = [
-        Binding("escape,q", "dismiss(None)", "Close"),
-    ]
-
-    DEFAULT_CSS = """
-    TokensPanel {
-        align: center middle;
-    }
-    TokensPanel > Vertical {
-        width: 90%;
-        height: 85%;
-        border: thick $primary;
-        background: $surface;
-        padding: 0 1;
-    }
-    TokensPanel #tokens-header {
-        height: auto;
-        padding: 1 1 0 1;
-        color: $text;
-    }
-    TokensPanel #tokens-stats {
-        height: auto;
-        padding: 0 1 1 1;
-        color: $text-muted;
-        border-bottom: solid $primary-background-lighten-1;
-        margin-bottom: 1;
-    }
-    TokensPanel DataTable {
-        height: 1fr;
-    }
-    TokensPanel #tokens-footer {
-        height: 1;
-        color: $text-disabled;
-        text-align: center;
-        padding: 0 1;
-    }
-    """
-
-    _BAR_MAX = 24
-
-    def __init__(self, session_id: str, db_path: Path) -> None:
-        super().__init__()
-        self._session_id = session_id
-        self._db_path = db_path
-        self._messages: list[Message] = []
-
-    def compose(self) -> ComposeResult:
-        with Vertical():
-            yield Static("", id="tokens-header")
-            yield Static("", id="tokens-stats")
-            yield DataTable(id="tokens-table", show_cursor=True, zebra_stripes=True, cursor_type="row")
-            yield Static("ESC / q — close  │  Enter — view turn", id="tokens-footer")
-
-    def on_mount(self) -> None:
-        self._load()
-
-    def on_data_table_row_selected(self, event: DataTable.RowSelected) -> None:
-        row_idx = event.cursor_row
-        if 0 <= row_idx < len(self._messages):
-            self.app.push_screen(TurnDetailPanel(row_idx + 1, self._messages[row_idx]))
-
-    def _load(self) -> None:
-        from contextforge.adapters.registry import get_adapter
-        from contextforge.core.db import get_db, get_session
-        from contextforge.core.token_analyzer import analyze_tokens
-
-        db = get_db(self._db_path)
-        report = analyze_tokens(db, self._session_id)
-
-        # Load messages so TurnDetailPanel can show full content
-        row = get_session(db, self._session_id)
-        if row is not None:
-            try:
-                adapter = get_adapter(row["tool"])
-                self._messages = adapter.load_messages(self._session_id)
-            except Exception:
-                self._messages = []
-
-        header = self.query_one("#tokens-header", Static)
-        stats = self.query_one("#tokens-stats", Static)
-        table = self.query_one("#tokens-table", DataTable)
-
-        if report is None or not report.turns:
-            header.update("[bold red]No token data available.[/bold red]")
-            return
-
-        # ── Header ──────────────────────────────────────────────────────────
-        header.update(
-            f"[bold accent]Token Analysis[/bold accent]  "
-            f"[dim]{report.title[:60]}[/dim]  "
-            f"[dim]{report.tool}[/dim]"
-        )
-
-        # ── Stats bar ───────────────────────────────────────────────────────
-        max_t = report.max_turn
-        tool_summary = ""
-        if report.has_tool_data:
-            tool_summary = (
-                f"  │  [yellow]Calls {report.tool_call_total:,}[/yellow]"
-                f"  [magenta]Results {report.tool_result_total:,}[/magenta]"
-            )
-        stats.update(
-            f"Total [bold]{report.total:,}[/bold] tokens  │  "
-            f"[cyan]User {report.user_total:,}[/cyan] (avg {report.avg_user:,.0f})  │  "
-            f"[green]Asst {report.assistant_total:,}[/green] (avg {report.avg_assistant:,.0f})  │  "
-            f"{report.turn_count} turns"
-            + tool_summary
-            + (f"  │  Heaviest: turn #{max_t.turn} "
-               f"[bold]{max_t.tokens:,}[/bold] tok [{max_t.role}]"
-               if max_t else "")
-        )
-
-        # ── Table ────────────────────────────────────────────────────────────
-        if report.has_tool_data:
-            table.add_columns("#", "Role", "Tokens", "Text", "Calls", "Results", "Cumul.", "Bar", "Preview")
-        else:
-            table.add_columns("#", "Role", "Tokens", "Cumul.", "Bar", "Preview")
-
-        max_tokens = max(t.tokens for t in report.turns)
-
-        for t in report.turns:
-            bar_len = max(1, int(t.tokens / max_tokens * self._BAR_MAX))
-
-            if t.role == "user":
-                role_str = "[cyan]user[/cyan]"
-                bar_str = f"[cyan]{'█' * bar_len}[/cyan]"
-            elif t.role == "assistant":
-                role_str = "[green]asst[/green]"
-                bar_str = f"[green]{'█' * bar_len}[/green]"
-            else:
-                role_str = f"[dim]{t.role}[/dim]"
-                bar_str = f"[dim]{'█' * bar_len}[/dim]"
-
-            if report.has_tool_data:
-                calls_str = f"[yellow]{t.tool_call_tokens:,}[/yellow]" if t.tool_call_tokens else "[dim]—[/dim]"
-                results_str = f"[magenta]{t.tool_result_tokens:,}[/magenta]" if t.tool_result_tokens else "[dim]—[/dim]"
-                table.add_row(
-                    str(t.turn),
-                    role_str,
-                    f"{t.tokens:,}",
-                    f"{t.text_tokens:,}",
-                    calls_str,
-                    results_str,
-                    f"{t.cumulative:,}",
-                    bar_str,
-                    t.content_preview,
-                )
-            else:
-                table.add_row(
-                    str(t.turn),
-                    role_str,
-                    f"{t.tokens:,}",
-                    f"{t.cumulative:,}",
-                    bar_str,
-                    t.content_preview,
-                )
-
-        # Highlight the heaviest row and ensure the table has focus
-        if max_t:
-            table.move_cursor(row=max_t.turn - 1)
-        table.focus()