token-tracker 0.2.3__tar.gz → 0.2.4__tar.gz

{token_tracker-0.2.3 → token_tracker-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: token-tracker
-Version: 0.2.3
+Version: 0.2.4
 Summary: Track token usage across local AI agents (Claude Code, Codex)
 Requires-Python: >=3.11
 Requires-Dist: rich>=13.7

{token_tracker-0.2.3 → token_tracker-0.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "token-tracker"
-version = "0.2.3"
+version = "0.2.4"
 description = "Track token usage across local AI agents (Claude Code, Codex)"
 requires-python = ">=3.11"
 dependencies = [

{token_tracker-0.2.3 → token_tracker-0.2.4}/src/cli.py

@@ -64,48 +64,96 @@ def _build_agent_data(agent_id: str, agent_name: str) -> dict | None:
     )
 
 
+def _initial_agent_index(agents) -> int:
+    import os
+
+    preferred = None
+    if os.environ.get("CODEX_THREAD_ID") or os.environ.get("CODEX_SANDBOX"):
+        preferred = "codex"
+    elif os.environ.get("CLAUDE_CONFIG_DIR") or os.environ.get("CLAUDECODE"):
+        preferred = "claude-code"
+
+    if preferred:
+        for i, agent in enumerate(agents):
+            if agent.id == preferred:
+                return i
+    return 0
+
+
+def _fit_screen(text: str, height: int, scroll_offset: int) -> tuple[str, int]:
+    lines = text.splitlines()
+    if not lines:
+        return "", 0
+    max_body = max(1, height - 1)
+    max_scroll = max(0, len(lines) - max_body)
+    scroll_offset = max(0, min(scroll_offset, max_scroll))
+    visible = lines[:1] + lines[1 + scroll_offset:1 + scroll_offset + max_body - 1]
+    return "\n".join(visible), max_scroll
+
+
 def _show_interactive_dashboard(agents):
     import tty
     import termios
+    import shutil
     from io import StringIO
     from rich.console import Console as RichConsole
     import src.ui.tables as _tables
 
     agent_names = [a.name for a in agents]
-    current = 0
+    current = _initial_agent_index(agents)
+    scroll_offset = 0
     orig = _tables.console
 
-    sys.stdout.write("\033[?1049h\033[?25l")
-    sys.stdout.write("\033[H\033[J\033[2m加载数据...\033[0m")
-    sys.stdout.flush()
-    cache = {a.id: _build_agent_data(a.id, a.name) for a in agents}
+    sys.stdout.write("\033[?1049h\033[?7l\033[2J\033[3J\033[H\033[?25l")
+    cache = {}
 
     try:
         while True:
+            agent = agents[current]
+            if agent.id not in cache:
+                sys.stdout.write("\033[2J\033[3J\033[H\033[2m加载数据...\033[0m")
+                sys.stdout.flush()
+                cache[agent.id] = _build_agent_data(agent.id, agent.name)
+
+            size = shutil.get_terminal_size((80, 24))
+            width = size.columns
+            height = size.lines
+
             buf = StringIO()
             _tables.console = RichConsole(
-                file=buf, width=orig.width, force_terminal=True,
+                file=buf, width=width, force_terminal=True,
             )
             render_tab_bar(agent_names, current)
-            data = cache[agents[current].id]
+            data = cache[agent.id]
             if data:
-                render_dashboard(**data)
+                render_dashboard(**data, session_limit=10, top_margin=False)
             else:
                 _tables.console.print(f"[yellow]暂无数据[/yellow]")
             _tables.console = orig
 
-            sys.stdout.write("\033[H\033[J" + buf.getvalue())
+            screen, max_scroll = _fit_screen(buf.getvalue(), height, scroll_offset)
+            sys.stdout.write("\033[2J\033[3J\033[H" + screen)
             sys.stdout.flush()
 
             key = _read_key(tty, termios)
             if key == "left":
                 current = (current - 1) % len(agents)
+                scroll_offset = 0
             elif key == "right":
                 current = (current + 1) % len(agents)
+                scroll_offset = 0
+            elif key == "up":
+                scroll_offset = max(0, scroll_offset - 1)
+            elif key == "down":
+                scroll_offset = min(max_scroll, scroll_offset + 1)
+            elif key == "page_up":
+                scroll_offset = max(0, scroll_offset - max(1, height - 3))
+            elif key == "page_down":
+                scroll_offset = min(max_scroll, scroll_offset + max(1, height - 3))
             elif key == "quit":
                 break
     finally:
-        sys.stdout.write("\033[?25h\033[?1049l")
+        sys.stdout.write("\033[?7h\033[?25h\033[?1049l")
         sys.stdout.flush()
         _tables.console = orig
 
@@ -128,11 +176,27 @@ def _read_key(tty, termios):
                     return "left"
                 if ch3 == b"C":
                     return "right"
+                if ch3 == b"A":
+                    return "up"
+                if ch3 == b"B":
+                    return "down"
+                if ch3 in (b"5", b"6"):
+                    if select.select([fd], [], [], 0.05)[0]:
+                        _os.read(fd, 1)
+                    return "page_up" if ch3 == b"5" else "page_down"
             return "other"
-        if ch in (b"h", b"k"):
+        if ch == b"h":
             return "left"
-        if ch in (b"l", b"j"):
+        if ch == b"l":
             return "right"
+        if ch == b"k":
+            return "up"
+        if ch == b"j":
+            return "down"
+        if ch == b"b":
+            return "page_up"
+        if ch == b"f":
+            return "page_down"
         if ch in (b"q", b"Q", b"\x03"):
             return "quit"
         return "other"
@@ -166,7 +230,8 @@ def main():
 
     agent_ids = {a.id for a in agents}
 
-    console.print(f"[dim]检测到: {', '.join(a.name + ' ✓' for a in agents)}[/dim]")
+    if command != "dashboard":
+        console.print(f"[dim]检测到: {', '.join(a.name + ' ✓' for a in agents)}[/dim]")
 
     if not is_setup():
         setup(auto=True)

{token_tracker-0.2.3 → token_tracker-0.2.4}/src/ui/tables.py

@@ -184,14 +184,21 @@ def _render_week_section(lines: Text, week: WeeklyStats,
 def render_tab_bar(agent_names: list[str], current: int) -> None:
     line = Text()
     line.append("  ")
+    compact = console.width < 72
     for i, name in enumerate(agent_names):
         if i > 0:
             line.append(" │ ", style=_S.dim)
+        label = AGENT_SHORT.get("claude-code" if name == "Claude Code" else name.lower(), name)
+        if compact and name == "Claude Code":
+            label = "CC"
+        elif compact:
+            label = name[:8]
         if i == current:
-            line.append(f" {name} ", style="bold reverse")
+            line.append(f" {label} ", style="bold reverse")
         else:
-            line.append(f" {name} ", style=_S.dim)
-    line.append("          ← → 切换  q / ESC 退出", style=_S.dim)
+            line.append(f" {label} ", style=_S.dim)
+    help_text = "  ←→ jk q/ESC退出" if compact else "  ← → 切换  ↑ ↓ 滚动  q / ESC 退出"
+    line.append(help_text, style=_S.dim)
     console.print(line)
 
 
@@ -200,9 +207,11 @@ def _project_short(project: str) -> str:
 
 
 def _render_header(agents: list[str], total_tokens: int, total_cost: float,
-                   total_sessions: int, total_messages: int, days: int) -> None:
+                   total_sessions: int, total_messages: int, days: int,
+                   top_margin: bool = True) -> None:
     agent_text = " ".join(f"[{_S.good}]●[/{_S.good}] {a}" for a in agents)
-    console.print()
+    if top_margin:
+        console.print()
     console.print(Panel(
         f"[bold]Token Tracker[/bold]  {agent_text}",
         border_style="blue",
@@ -262,6 +271,8 @@ def render_dashboard(
     rate_limits: RateLimits | None = None,
     p90: P90Limits | None = None,
     agents: list[str] | None = None,
+    session_limit: int = 10,
+    top_margin: bool = True,
 ) -> None:
     if not daily_stats:
         console.print(f"[{_S.warn}]暂无数据[/{_S.warn}]")
@@ -272,7 +283,15 @@ def render_dashboard(
     total_msgs = sum(s.message_count for s in daily_stats)
     total_sessions = sum(s.session_count for s in daily_stats)
 
-    _render_header(agents or ["Claude Code"], total_tokens, total_cost, total_sessions, total_msgs, len(daily_stats))
+    _render_header(
+        agents or ["Claude Code"],
+        total_tokens,
+        total_cost,
+        total_sessions,
+        total_msgs,
+        len(daily_stats),
+        top_margin=top_margin,
+    )
 
     # --- 本月概览 ---
     if monthly_stats:
@@ -300,8 +319,8 @@ def render_dashboard(
             _render_idle_panel(rate_limits, cur_week, last_week)
 
     # --- 最近十条会话 ---
-    if sessions:
-        _render_recent_sessions(sessions[:10])
+    if sessions and session_limit > 0:
+        _render_recent_sessions(sessions[:session_limit])
 
     console.print()
 

{token_tracker-0.2.3 → token_tracker-0.2.4}/token_tracker.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: token-tracker
-Version: 0.2.3
+Version: 0.2.4
 Summary: Track token usage across local AI agents (Claude Code, Codex)
 Requires-Python: >=3.11
 Requires-Dist: rich>=13.7