zwarm 1.3.9__py3-none-any.whl → 1.3.11__py3-none-any.whl

zwarm/adapters/codex_mcp.py

@@ -443,9 +443,55 @@ class MCPClient:
                     if text:
                         agent_messages.append(text)
 
+                elif msg_type == "agent_message":
+                    # Agent message output (common in newer codex versions)
+                    text = msg.get("text", "") or msg.get("content", "") or msg.get("message", "")
+                    if text:
+                        agent_messages.append(text)
+
+                elif msg_type == "output":
+                    # Direct output event
+                    text = msg.get("output", "") or msg.get("text", "") or msg.get("content", "")
+                    if text:
+                        agent_messages.append(text)
+
+                elif msg_type in ("item.completed", "response.completed"):
+                    # Completion events may contain the final response
+                    item = msg.get("item", {})
+                    if item.get("type") == "agent_message":
+                        text = item.get("text", "")
+                        if text:
+                            agent_messages.append(text)
+                    elif "text" in msg:
+                        agent_messages.append(msg["text"])
+                    elif "content" in msg:
+                        content = msg["content"]
+                        if isinstance(content, str):
+                            agent_messages.append(content)
+                        elif isinstance(content, list):
+                            for block in content:
+                                if isinstance(block, dict) and block.get("text"):
+                                    agent_messages.append(block["text"])
+
                 else:
-                    # Log unknown event types at debug level to help diagnose
-                    if msg_type and msg_type not in ("session_started", "thinking", "tool_call", "function_call"):
+                    # Try to extract text from unknown event types as fallback
+                    extracted = None
+                    for key in ("text", "content", "message", "output", "response"):
+                        if key in msg:
+                            val = msg[key]
+                            if isinstance(val, str) and val.strip():
+                                extracted = val
+                                break
+                            elif isinstance(val, list):
+                                texts = [b.get("text", "") if isinstance(b, dict) else str(b) for b in val]
+                                if any(texts):
+                                    extracted = "\n".join(t for t in texts if t)
+                                    break
+
+                    if extracted:
+                        agent_messages.append(extracted)
+                        logger.debug(f"Extracted text from event type '{msg_type}': {len(extracted)} chars")
+                    elif msg_type and msg_type not in ("session_started", "thinking", "tool_call", "function_call", "reasoning", "function_call_output"):
                         logger.debug(f"Unhandled MCP event type: {msg_type}, msg keys: {list(msg.keys())}")
 
         # Merge streaming text into messages if we got any

zwarm/cli/main.py

@@ -2023,6 +2023,15 @@ def session_clean(
 # Main callback and entry point
 # =============================================================================
 
+def _get_version() -> str:
+    """Get version from package metadata."""
+    try:
+        from importlib.metadata import version as get_pkg_version
+        return get_pkg_version("zwarm")
+    except Exception:
+        return "0.0.0"
+
+
 @app.callback(invoke_without_command=True)
 def main_callback(
     ctx: typer.Context,
@@ -2030,7 +2039,7 @@ def main_callback(
 ):
     """Main callback for version flag."""
     if version:
-        console.print("[bold cyan]zwarm[/] version [green]0.1.0[/]")
+        console.print(f"[bold cyan]zwarm[/] version [green]{_get_version()}[/]")
         raise typer.Exit()
 
 

zwarm/watchers/builtin.py

@@ -7,10 +7,99 @@ from __future__ import annotations
 import re
 from typing import Any
 
+from wbal.helper import TOOL_CALL_TYPE, TOOL_RESULT_TYPE
 from zwarm.watchers.base import Watcher, WatcherContext, WatcherResult, WatcherAction
 from zwarm.watchers.registry import register_watcher
 
 
+def _get_field(item: Any, name: str, default: Any = None) -> Any:
+    if isinstance(item, dict):
+        return item.get(name, default)
+    return getattr(item, name, default)
+
+
+def _content_to_text(content: Any) -> str:
+    if content is None:
+        return ""
+    if isinstance(content, str):
+        return content
+    if isinstance(content, list):
+        parts = []
+        for part in content:
+            text = _content_to_text(part)
+            if text:
+                parts.append(text)
+        return "\n".join(parts)
+    if isinstance(content, dict):
+        text = content.get("text") or content.get("content") or content.get("refusal")
+        return str(text) if text is not None else ""
+    text = getattr(content, "text", None)
+    if text is None:
+        text = getattr(content, "refusal", None)
+    return str(text) if text is not None else ""
+
+
+def _normalize_tool_call(tool_call: Any) -> dict[str, Any]:
+    if isinstance(tool_call, dict):
+        if isinstance(tool_call.get("function"), dict):
+            return tool_call
+        name = tool_call.get("name", "")
+        arguments = tool_call.get("arguments", "")
+        call_id = tool_call.get("call_id")
+    else:
+        name = getattr(tool_call, "name", "")
+        arguments = getattr(tool_call, "arguments", "")
+        call_id = getattr(tool_call, "call_id", None)
+
+    normalized = {
+        "type": "function",
+        "function": {"name": name, "arguments": arguments},
+    }
+    if call_id:
+        normalized["call_id"] = call_id
+    return normalized
+
+
+def _normalize_messages(messages: list[Any]) -> list[dict[str, Any]]:
+    normalized: list[dict[str, Any]] = []
+    for item in messages:
+        item_type = _get_field(item, "type")
+        role = _get_field(item, "role")
+        content = ""
+        tool_calls: list[dict[str, Any]] = []
+
+        if item_type in (TOOL_CALL_TYPE, "function_call"):
+            tool_calls = [_normalize_tool_call(item)]
+            role = role or "assistant"
+        else:
+            raw_tool_calls = _get_field(item, "tool_calls") or []
+            if raw_tool_calls and not isinstance(raw_tool_calls, list):
+                raw_tool_calls = [raw_tool_calls]
+            if raw_tool_calls:
+                tool_calls = [
+                    _normalize_tool_call(tc) for tc in raw_tool_calls
+                ]
+
+            if role or item_type == "message" or item_type is None:
+                content = _content_to_text(_get_field(item, "content"))
+
+            if item_type == TOOL_RESULT_TYPE and not content:
+                content = _content_to_text(_get_field(item, "output"))
+                role = role or "tool"
+
+        if not role and not content and not tool_calls:
+            continue
+
+        normalized.append(
+            {
+                "role": role,
+                "content": content or "",
+                "tool_calls": tool_calls,
+            }
+        )
+    return normalized
+
+
 @register_watcher("progress")
 class ProgressWatcher(Watcher):
     """
@@ -26,14 +115,15 @@ class ProgressWatcher(Watcher):
     description = "Detects when agent is stuck or spinning"
 
     async def observe(self, ctx: WatcherContext) -> WatcherResult:
+        messages = _normalize_messages(ctx.messages)
         config = self.config
         max_same_calls = config.get("max_same_calls", 3)
         min_progress_steps = config.get("min_progress_steps", 5)
 
         # Check for repeated tool calls
-        if len(ctx.messages) >= max_same_calls * 2:
+        if len(messages) >= max_same_calls * 2:
             recent_assistant = [
-                m for m in ctx.messages[-max_same_calls * 2 :]
+                m for m in messages[-max_same_calls * 2 :]
                 if m.get("role") == "assistant"
             ]
             if len(recent_assistant) >= max_same_calls:
@@ -144,9 +234,10 @@ class ScopeWatcher(Watcher):
 
         # Check last few messages for avoid keywords
         if avoid_keywords:
+            messages = _normalize_messages(ctx.messages)
             recent_content = " ".join(
                 m.get("content", "") or ""
-                for m in ctx.messages[-max_tangent_steps * 2:]
+                for m in messages[-max_tangent_steps * 2:]
             ).lower()
 
             for keyword in avoid_keywords:
@@ -174,6 +265,7 @@ class PatternWatcher(Watcher):
     description = "Watches for configurable patterns in output"
 
     async def observe(self, ctx: WatcherContext) -> WatcherResult:
+        messages = _normalize_messages(ctx.messages)
         config = self.config
         patterns = config.get("patterns", [])
 
@@ -189,7 +281,7 @@ class PatternWatcher(Watcher):
                 continue
 
             # Check recent messages
-            for msg in ctx.messages[-10:]:
+            for msg in messages[-10:]:
                 content = msg.get("content", "") or ""
                 if compiled.search(content):
                     action = pattern_config.get("action", "nudge")
@@ -236,11 +328,12 @@ class DelegationWatcher(Watcher):
     ]
 
     async def observe(self, ctx: WatcherContext) -> WatcherResult:
+        messages = _normalize_messages(ctx.messages)
         config = self.config
         strict = config.get("strict", True)  # If True, nudge. If False, just warn.
 
         # Check recent messages for bash tool calls
-        for msg in ctx.messages[-10:]:
+        for msg in messages[-10:]:
             if msg.get("role") != "assistant":
                 continue
 
@@ -370,6 +463,7 @@ class DelegationReminderWatcher(Watcher):
     }
 
     async def observe(self, ctx: WatcherContext) -> WatcherResult:
+        messages = _normalize_messages(ctx.messages)
         config = self.config
         threshold = config.get("threshold", 10)  # Max consecutive non-delegation calls
         lookback = config.get("lookback", 30)  # How many messages to check
@@ -378,7 +472,7 @@ class DelegationReminderWatcher(Watcher):
         consecutive_non_delegation = 0
 
         # Look through recent messages in reverse order
-        for msg in reversed(ctx.messages[-lookback:]):
+        for msg in reversed(messages[-lookback:]):
             if msg.get("role") != "assistant":
                 continue
 

{zwarm-1.3.9.dist-info → zwarm-1.3.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zwarm
-Version: 1.3.9
+Version: 1.3.11
 Summary: Multi-Agent CLI Orchestration Research Platform
 Requires-Python: <3.14,>=3.13
 Requires-Dist: python-dotenv>=1.0.0

{zwarm-1.3.9.dist-info → zwarm-1.3.11.dist-info}/RECORD

@@ -4,12 +4,12 @@ zwarm/test_orchestrator_watchers.py,sha256=QpoaehPU7ekT4XshbTOWnJ2H0wRveV3QOZjxb
 zwarm/adapters/__init__.py,sha256=O0b-SfZpb6txeNqFkXZ2aaf34yLFYreznyrAV25jF_Q,656
 zwarm/adapters/base.py,sha256=fZlQviTgVvOcwnxduTla6WuM6FzQJ_yoHMW5SxwVgQg,2527
 zwarm/adapters/claude_code.py,sha256=vAjsjD-_JjARmC4_FBSILQZmQCBrk_oNHo18a9ubuqk,11481
-zwarm/adapters/codex_mcp.py,sha256=qX6blFC_rZwl3JaS9TLIG1yxIvWhgX42Goq2DdcJjbU,38474
+zwarm/adapters/codex_mcp.py,sha256=MSv01sz_ECdyafZRCMkw-2U62yCGJmxq3YaWog5S4lU,40939
 zwarm/adapters/registry.py,sha256=EdyHECaNA5Kv1od64pYFBJyA_r_6I1r_eJTNP1XYLr4,1781
 zwarm/adapters/test_codex_mcp.py,sha256=0qhVzxn_KF-XUS30gXSJKwMdR3kWGsDY9iPk1Ihqn3w,10698
 zwarm/adapters/test_registry.py,sha256=otxcVDONwFCMisyANToF3iy7Y8dSbCL8bTmZNhxNuF4,2383
 zwarm/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zwarm/cli/main.py,sha256=kGrwxAHkpJqF6YCki1DLJpOzjkk05P-1AXGzPBuUOnw,73266
+zwarm/cli/main.py,sha256=NKTq-PxIu6cy9MaPzNPr3T7T62BL7cZdGWU7lT9FNvg,73512
 zwarm/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zwarm/core/compact.py,sha256=Y8C7Gs-5-WOU43WRvQ863Qzd5xtuEqR6Aw3r2p8_-i8,10907
 zwarm/core/config.py,sha256=7mzxrWvHmTjwiUWAoE4NYS_1yWj85-vWkpT6X6kiMIg,11579
@@ -27,11 +27,11 @@ zwarm/tools/__init__.py,sha256=FpqxwXJA6-fQ7C-oLj30jjK_0qqcE7MbI0dQuaB56kU,290
 zwarm/tools/delegation.py,sha256=dV-fDoxA01RqjW90SLCLhBFQ2kVn8-68JdL0ssYYg_k,19583
 zwarm/watchers/__init__.py,sha256=yYGTbhuImQLESUdtfrYbHYBJNvCNX3B-Ei-vY5BizX8,760
 zwarm/watchers/base.py,sha256=r1GoPlj06nOT2xp4fghfSjxbRyFFFQUB6HpZbEyO2OY,3834
-zwarm/watchers/builtin.py,sha256=k1pCnQBEmLHeuCo8t6UXoenJUpfWY7AuGt_aEk8syew,15828
+zwarm/watchers/builtin.py,sha256=IL5QwwKOIqWEfJ_uQWb321Px4i5OLtI_vnWQMudqKoA,19064
 zwarm/watchers/manager.py,sha256=XZjBVeHjgCUlkTUeHqdvBvHoBC862U1ik0fG6nlRGog,5587
 zwarm/watchers/registry.py,sha256=A9iBIVIFNtO7KPX0kLpUaP8dAK7ozqWLA44ocJGnOw4,1219
 zwarm/watchers/test_watchers.py,sha256=zOsxumBqKfR5ZVGxrNlxz6KcWjkcdp0QhW9WB0_20zM,7855
-zwarm-1.3.9.dist-info/METADATA,sha256=ZU-UJO9Mj_oUeG__0m9uYChVRYfQgtjSOXZapT5pk4Y,16114
-zwarm-1.3.9.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-zwarm-1.3.9.dist-info/entry_points.txt,sha256=u0OXq4q8d3yJ3EkUXwZfkS-Y8Lcy0F8cWrcQfoRxM6Q,46
-zwarm-1.3.9.dist-info/RECORD,,
+zwarm-1.3.11.dist-info/METADATA,sha256=y7GW-bz4u9LPfPXqsHf1BnifTQGEN-ceEioy-UdK0MQ,16115
+zwarm-1.3.11.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+zwarm-1.3.11.dist-info/entry_points.txt,sha256=u0OXq4q8d3yJ3EkUXwZfkS-Y8Lcy0F8cWrcQfoRxM6Q,46
+zwarm-1.3.11.dist-info/RECORD,,