context-forge-cli 0.2.1__tar.gz → 0.2.3__tar.gz

{context_forge_cli-0.2.1 → context_forge_cli-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: context-forge-cli
-Version: 0.2.1
+Version: 0.2.3
 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.2.1 → context_forge_cli-0.2.3}/contextforge/adapters/altimate_code.py

@@ -87,13 +87,19 @@ class AltimateCodeAdapter(ToolAdapter):
             conn.row_factory = sqlite3.Row
             cur = conn.cursor()
             # Join message + part to get full content
+            # Note: altimate-code stores data as JSON in 'data' column
             cur.execute(
                 """
-                SELECT m.role, p.type as part_type, p.content, m.time as ts
+                SELECT
+                    m.id,
+                    json_extract(m.data, '$.role') as role,
+                    m.time_created as ts,
+                    json_extract(p.data, '$.type') as part_type,
+                    json_extract(p.data, '$.text') as content
                 FROM message m
                 LEFT JOIN part p ON p.message_id = m.id
                 WHERE m.session_id = ?
-                ORDER BY m.time ASC, p.id ASC
+                ORDER BY m.time_created ASC, p.id ASC
                 """,
                 (session_id,),
             )
@@ -103,12 +109,13 @@ class AltimateCodeAdapter(ToolAdapter):
             return []
 
         messages: list[Message] = []
+        current_msg_id: str | None = None
         current_role: str | None = None
         current_parts: list[str] = []
         current_ts: datetime | None = None
 
         def flush():
-            nonlocal current_role, current_parts, current_ts
+            nonlocal current_msg_id, current_role, current_parts, current_ts
             if current_role and current_parts:
                 content = "\n".join(p for p in current_parts if p)
                 if content:
@@ -117,19 +124,24 @@ class AltimateCodeAdapter(ToolAdapter):
                             role=current_role,
                             content=content,
                             timestamp=current_ts,
+                            token_count=_count_tokens(content),
                         )
                     )
+            current_msg_id = None
             current_role = None
             current_parts = []
             current_ts = None
 
         for row in rows:
+            msg_id = row["id"]
             role = row["role"]
             if role not in ("user", "assistant"):
                 continue
 
-            if role != current_role:
+            # Flush when message ID changes (new message in the message table)
+            if msg_id != current_msg_id:
                 flush()
+                current_msg_id = msg_id
                 current_role = role
                 try:
                     current_ts = datetime.fromtimestamp(row["ts"] / 1000, tz=timezone.utc)
@@ -157,7 +169,7 @@ class AltimateCodeAdapter(ToolAdapter):
         messages = self.load_messages(session_id)
         total = 0
         for msg in messages:
-            total += _count_tokens(msg.content)
+            total += msg.token_count or _count_tokens(msg.content)
         return total
 
     def build_inject_command(

{context_forge_cli-0.2.1 → context_forge_cli-0.2.3}/contextforge/adapters/base.py

@@ -5,6 +5,7 @@ from abc import ABC, abstractmethod
 from pathlib import Path
 
 from contextforge.models.session import Message, Session
+from contextforge.utils.tokens import count_tokens
 
 
 class ToolAdapter(ABC):
@@ -42,3 +43,17 @@ class ToolAdapter(ABC):
     def is_available(self) -> bool:
         """Return True if this tool is installed and its data paths exist."""
         return any(p.exists() for p in self.default_paths)
+
+    def _count_session_tokens(self, session_id: str | Path) -> int:
+        """Count total tokens in a session by loading and summing message tokens.
+
+        This is the default implementation that all adapters can use.
+        Adapters may override this with more efficient implementations.
+        """
+        if isinstance(session_id, Path):
+            session_id = session_id.stem
+        messages = self.load_messages(str(session_id))
+        total = 0
+        for msg in messages:
+            total += msg.token_count or count_tokens(msg.content)
+        return total

{context_forge_cli-0.2.1 → context_forge_cli-0.2.3}/contextforge/adapters/claude_code.py

@@ -333,42 +333,26 @@ class ClaudeCodeAdapter(ToolAdapter):
                         role="user" if role == "user" else "assistant",
                         content=content,
                         timestamp=ts,
+                        token_count=_count_tokens(content),
                     )
                 )
 
         return messages
 
-    def _count_session_tokens(self, jsonl_path: Path) -> int:
-        """Count total tokens in a session JSONL file."""
-        total = 0
-        try:
-            with jsonl_path.open() as f:
-                for line in f:
-                    line = line.strip()
-                    if not line:
-                        continue
-                    try:
-                        entry = json.loads(line)
-                    except json.JSONDecodeError:
-                        continue
-
-                    entry_type = entry.get("type", "")
-                    if entry_type not in ("user", "assistant"):
-                        continue
-
-                    msg_data = entry.get("message", {})
-                    content_raw = msg_data.get("content", "")
+    def _count_session_tokens(self, jsonl_path: Path | str) -> int:
+        """Count total tokens in a session JSONL file or session ID.
 
-                    # Skip tool-result-only arrays (not actual user/assistant content)
-                    if isinstance(content_raw, list):
-                        if not any(block.get("type") == "text" for block in content_raw if isinstance(block, dict)):
-                            continue
-
-                    content = _parse_content(content_raw)
-                    if content:
-                        total += _count_tokens(content)
-        except Exception:
-            pass
+        Args:
+            jsonl_path: Either a Path to the JSONL file or a session ID string.
+        """
+        if isinstance(jsonl_path, str):
+            session_id = jsonl_path
+        else:
+            session_id = jsonl_path.stem
+        messages = self.load_messages(session_id)
+        total = 0
+        for msg in messages:
+            total += msg.token_count or _count_tokens(msg.content)
         return total
 
     def build_inject_command(

{context_forge_cli-0.2.1 → context_forge_cli-0.2.3}/contextforge/adapters/claude_desktop.py

@@ -240,8 +240,12 @@ class ClaudeDesktopAdapter(ToolAdapter):
                         pass
 
                 messages.append(
-                    Message(role="user" if role == "user" else "assistant",
-                            content=content, timestamp=ts)
+                    Message(
+                        role="user" if role == "user" else "assistant",
+                        content=content,
+                        timestamp=ts,
+                        token_count=_count_tokens(content),
+                    )
                 )
         return messages
 
@@ -279,7 +283,12 @@ class ClaudeDesktopAdapter(ToolAdapter):
                     except (ValueError, AttributeError):
                         pass
 
-                messages.append(Message(role=role, content=content, timestamp=ts))
+                messages.append(Message(
+                    role=role,
+                    content=content,
+                    timestamp=ts,
+                    token_count=_count_tokens(content),
+                ))
         return messages
 
     def _count_session_tokens(self, session_id: str) -> int:
@@ -287,7 +296,7 @@ class ClaudeDesktopAdapter(ToolAdapter):
         messages = self.load_messages(session_id)
         total = 0
         for msg in messages:
-            total += _count_tokens(msg.content)
+            total += msg.token_count or _count_tokens(msg.content)
         return total
 
     def build_inject_command(

{context_forge_cli-0.2.1 → context_forge_cli-0.2.3}/contextforge/adapters/codex.py

@@ -7,6 +7,8 @@ import sqlite3
 from datetime import datetime, timezone
 from pathlib import Path
 
+import tiktoken
+
 from contextforge.adapters.base import ToolAdapter
 from contextforge.models.session import Message, Session
 
@@ -29,6 +31,16 @@ _CODEX_SESSIONS_DIR = Path.home() / ".codex" / "sessions"
 _SESSION_INDEX = Path.home() / ".codex" / "session_index.jsonl"
 
 
+def _count_tokens(text: str) -> int:
+    """Count tokens in text using tiktoken for Claude models."""
+    try:
+        enc = tiktoken.encoding_for_model("claude-3-5-sonnet-20241022")
+        return len(enc.encode(text))
+    except Exception:
+        # Fallback: rough estimate (~4 chars per token)
+        return len(text) // 4
+
+
 class CodexAdapter(ToolAdapter):
     tool_name = "codex"
     default_paths = [_CODEX_DB, _CODEX_SESSIONS_DIR]
@@ -193,11 +205,21 @@ class CodexAdapter(ToolAdapter):
                     if msg_type == "user_message":
                         text = payload.get("message", "")
                         if text:
-                            messages.append(Message(role="user", content=str(text)))
+                            text_str = str(text)
+                            messages.append(Message(
+                                role="user",
+                                content=text_str,
+                                token_count=_count_tokens(text_str),
+                            ))
                     elif msg_type == "agent_message":
                         text = payload.get("message", "")
                         if text:
-                            messages.append(Message(role="assistant", content=str(text)))
+                            text_str = str(text)
+                            messages.append(Message(
+                                role="assistant",
+                                content=text_str,
+                                token_count=_count_tokens(text_str),
+                            ))
 
         return messages
 

{context_forge_cli-0.2.1 → context_forge_cli-0.2.3}/contextforge/adapters/gemini.py

@@ -6,12 +6,24 @@ import shlex
 from datetime import datetime, timezone
 from pathlib import Path
 
+import tiktoken
+
 from contextforge.adapters.base import ToolAdapter
 from contextforge.models.session import Message, Session
 
 _GEMINI_TMP_BASE = Path.home() / ".gemini" / "tmp"
 
 
+def _count_tokens(text: str) -> int:
+    """Count tokens in text using tiktoken for Claude models."""
+    try:
+        enc = tiktoken.encoding_for_model("claude-3-5-sonnet-20241022")
+        return len(enc.encode(text))
+    except Exception:
+        # Fallback: rough estimate (~4 chars per token)
+        return len(text) // 4
+
+
 class GeminiAdapter(ToolAdapter):
     tool_name = "gemini"
     default_paths = [_GEMINI_TMP_BASE]
@@ -163,6 +175,7 @@ class GeminiAdapter(ToolAdapter):
                     role="user" if msg_type == "user" else "assistant",
                     content=content,
                     timestamp=ts,
+                    token_count=_count_tokens(content),
                 )
             )
 

{context_forge_cli-0.2.1 → context_forge_cli-0.2.3}/contextforge/cli.py

@@ -505,6 +505,79 @@ def config_set(key: str, value: str):
     console.print(f"Would set [bold]{key}[/bold] = [bold]{value}[/bold]")
 
 
+# ---------------------------------------------------------------------------
+# cf refresh
+# ---------------------------------------------------------------------------
+
+@app.command()
+def refresh(
+    quiet: Annotated[bool, typer.Option("--quiet", "-q")] = False,
+):
+    """Refresh token counts and metadata for all sessions.
+
+    Recalculates token_count for every session from source data.
+    Useful after adapter updates or schema changes.
+    """
+    cfg = _get_config()
+    database = _get_db(cfg)
+
+    from contextforge.adapters.registry import get_adapter
+
+    # Get all sessions grouped by tool
+    sessions_by_tool = {}
+    for row in database.execute("SELECT DISTINCT tool FROM sessions ORDER BY tool").fetchall():
+        tool = row[0]
+        sessions_by_tool[tool] = []
+        for s in database.execute("SELECT id, title FROM sessions WHERE tool = ? ORDER BY id", [tool]).fetchall():
+            sessions_by_tool[tool].append((s[0], s[1]))
+
+    from rich.progress import Progress, SpinnerColumn, TextColumn
+
+    total_sessions = sum(len(sessions) for sessions in sessions_by_tool.values())
+    updated_count = 0
+    error_count = 0
+
+    with Progress(
+        SpinnerColumn(),
+        TextColumn("[progress.description]{task.description}"),
+        disable=quiet,
+    ) as progress:
+        task = progress.add_task("Refreshing...", total=total_sessions)
+
+        for tool, sessions in sessions_by_tool.items():
+            if not sessions:
+                continue
+
+            try:
+                adapter = get_adapter(tool)
+            except Exception as e:
+                if not quiet:
+                    err_console.print(f"[yellow]Warning:[/yellow] Skipping {tool}: {e}")
+                error_count += len(sessions)
+                progress.advance(task, len(sessions))
+                continue
+
+            for session_id, title in sessions:
+                try:
+                    token_count = adapter._count_session_tokens(session_id)
+                    database["sessions"].update(session_id, {"token_count": token_count})
+                    updated_count += 1
+                    if not quiet:
+                        progress.update(task, description=f"Refreshed {session_id[:12]} ({token_count:,} tokens)")
+                except Exception as e:
+                    error_count += 1
+                    if not quiet:
+                        err_console.print(f"[yellow]Warning:[/yellow] {session_id}: {e}")
+                finally:
+                    progress.advance(task)
+
+    if not quiet:
+        console.print(
+            f"[green]Refresh complete:[/green] "
+            f"{updated_count} updated" + (f", {error_count} errors" if error_count else "")
+        )
+
+
 # ---------------------------------------------------------------------------
 # cf dashboard
 # ---------------------------------------------------------------------------

{context_forge_cli-0.2.1 → context_forge_cli-0.2.3}/pyproject.toml

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

{context_forge_cli-0.2.1 → context_forge_cli-0.2.3}/uv.lock

@@ -151,8 +151,8 @@ wheels = [
 ]
 
 [[package]]
-name = "context-forge"
-version = "0.1.0"
+name = "context-forge-cli"
+version = "0.2.1"
 source = { editable = "." }
 dependencies = [
     { name = "anthropic" },