context-forge-cli 0.4.0__tar.gz → 0.4.1__tar.gz

{context_forge_cli-0.4.0 → context_forge_cli-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: context-forge-cli
-Version: 0.4.0
+Version: 0.4.1
 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.0 → context_forge_cli-0.4.1}/contextforge/adapters/codex.py

@@ -50,19 +50,39 @@ def _compute_message_tokens(msg: Message) -> int:
     return total
 
 
-def _extract_function_output(raw_output: str) -> str:
+def _extract_function_output(raw_output) -> str:
     """Extract the human-readable output from a Codex function_call_output payload.
 
-    The `output` field is a JSON string: {"output": "...", "metadata": {...}}.
-    Returns the inner "output" string, or the raw string on parse failure.
+    The `output` field may be:
+    - A JSON string: {"output": "...", "metadata": {...}}
+    - An already-parsed list of content blocks (e.g. input_text/input_image)
+    - An already-parsed dict
+    Returns a plain string suitable for token counting.
     """
+    if isinstance(raw_output, list):
+        # Content-block array — extract text parts, skip images
+        parts = [
+            block.get("text", "")
+            for block in raw_output
+            if isinstance(block, dict) and block.get("type") in ("text", "input_text")
+        ]
+        return "\n".join(p for p in parts if p)
+    if isinstance(raw_output, dict):
+        return str(raw_output.get("output", ""))
     try:
         parsed = json.loads(raw_output)
         if isinstance(parsed, dict):
             return str(parsed.get("output", raw_output))
+        if isinstance(parsed, list):
+            parts = [
+                block.get("text", "")
+                for block in parsed
+                if isinstance(block, dict) and block.get("type") in ("text", "input_text")
+            ]
+            return "\n".join(p for p in parts if p)
     except (json.JSONDecodeError, TypeError):
         pass
-    return raw_output
+    return str(raw_output) if raw_output is not None else ""
 
 
 class CodexAdapter(ToolAdapter):

{context_forge_cli-0.4.0 → context_forge_cli-0.4.1}/contextforge/utils/tokens.py

@@ -13,7 +13,16 @@ def _get_encoding() -> tiktoken.Encoding:
     return _ENCODING
 
 
-def count_tokens(text: str) -> int:
+def count_tokens(text) -> int:
+    if not isinstance(text, str):
+        if isinstance(text, list):
+            text = " ".join(
+                block.get("text", "")
+                for block in text
+                if isinstance(block, dict) and block.get("type") in ("text", "input_text")
+            )
+        else:
+            text = str(text) if text is not None else ""
     return len(_get_encoding().encode(text))
 
 

{context_forge_cli-0.4.0 → context_forge_cli-0.4.1}/pyproject.toml

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