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

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

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

@@ -117,6 +117,7 @@ class AltimateCodeAdapter(ToolAdapter):
                             role=current_role,
                             content=content,
                             timestamp=current_ts,
+                            token_count=_count_tokens(content),
                         )
                     )
             current_role = None
@@ -157,7 +158,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.2}/contextforge/adapters/claude_code.py

@@ -333,6 +333,7 @@ class ClaudeCodeAdapter(ToolAdapter):
                         role="user" if role == "user" else "assistant",
                         content=content,
                         timestamp=ts,
+                        token_count=_count_tokens(content),
                     )
                 )
 
@@ -340,35 +341,11 @@ class ClaudeCodeAdapter(ToolAdapter):
 
     def _count_session_tokens(self, jsonl_path: Path) -> int:
         """Count total tokens in a session JSONL file."""
+        session_id = jsonl_path.stem
+        messages = self.load_messages(session_id)
         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", "")
-
-                    # 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
+        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.2}/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.2}/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.2}/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.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "context-forge-cli"
-version = "0.2.1"
+version = "0.2.2"
 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.2}/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" },