zwarm 2.0.1__py3-none-any.whl → 2.3__py3-none-any.whl

zwarm/cli/main.py

@@ -1375,7 +1375,7 @@ def interactive(
 
     def do_spawn(args: list[str]):
         """Spawn a new coding agent session using CodexSessionManager (same as orchestrator)."""
-        from zwarm.sessions import CodexSessionManager
+        from zwarm.sessions import CodexSessionManager, SessionStatus as SessStatus
         import time
 
         parsed = parse_spawn_args(args)
@@ -1431,15 +1431,18 @@ def interactive(
                         break
                     time.sleep(1.0)
 
-                # Get the response
+                # Get all assistant responses
                 messages = manager.get_messages(session.id)
-                for msg in messages:
-                    if msg.role == "assistant":
-                        response_preview = msg.content[:300]
+                assistant_msgs = [m for m in messages if m.role == "assistant"]
+                if assistant_msgs:
+                    console.print(f"\n[bold]Response ({len(assistant_msgs)} message{'s' if len(assistant_msgs) > 1 else ''}):[/]")
+                    for msg in assistant_msgs:
+                        preview = msg.content[:300]
                         if len(msg.content) > 300:
-                            response_preview += "..."
-                        console.print(f"\n[bold]Response:[/]\n{response_preview}")
-                        break
+                            preview += "..."
+                        console.print(preview)
+                        if len(assistant_msgs) > 1:
+                            console.print()  # Blank line between multiple messages
 
             console.print(f"\n[dim]Use 'show {session.short_id}' to see full details[/]")
             console.print(f"[dim]Use 'c {session.short_id} \"message\"' to continue[/]")
@@ -1580,6 +1583,10 @@ def interactive(
         console.print(f"[dim]Source:[/] {session.source_display}  [dim]│[/]  [dim]Runtime:[/] {session.runtime}")
         if session.pid:
             console.print(f"[dim]PID:[/] {session.pid}")
+
+        # Show log file path
+        log_path = default_dir / ".zwarm" / "sessions" / session.id / "turns" / f"turn_{session.turn}.jsonl"
+        console.print(f"[dim]Log:[/] {log_path}")
         console.print()
 
         # Get messages from manager

zwarm/sessions/manager.py

@@ -301,9 +301,18 @@ class CodexSessionManager:
             session.messages = messages
             session.token_usage = usage
 
-            if error:
+            # Check if we got actual assistant responses
+            has_response = any(m.role == "assistant" for m in messages)
+
+            if error and not has_response:
+                # Only mark as failed if we have an error AND no response
                 session.status = SessionStatus.FAILED
                 session.error = error
+            elif error and has_response:
+                # Got response but also an error (e.g., network disconnect at end)
+                # Treat as completed but note the error
+                session.status = SessionStatus.COMPLETED
+                session.error = f"Completed with error: {error}"
             else:
                 session.status = SessionStatus.COMPLETED
         else:
@@ -634,6 +643,9 @@ Continue from where you left off, addressing the user's new message."""
                 turn_usage = event.get("usage", {})
                 for key, value in turn_usage.items():
                     usage[key] = usage.get(key, 0) + value
+                # Compute total_tokens if not present
+                if "total_tokens" not in usage:
+                    usage["total_tokens"] = usage.get("input_tokens", 0) + usage.get("output_tokens", 0)
 
             elif event_type == "error":
                 error = event.get("message", str(event))

zwarm/tools/delegation.py

@@ -83,6 +83,14 @@ def _format_session_header(session) -> str:
     return f"[{session.short_id}] codex ({session.status.value})"
 
 
+def _get_total_tokens(session) -> int:
+    """Get total tokens, computing from input+output if not present."""
+    usage = session.token_usage
+    if "total_tokens" in usage:
+        return usage["total_tokens"]
+    return usage.get("input_tokens", 0) + usage.get("output_tokens", 0)
+
+
 def _validate_working_dir(
     requested_dir: Path | str | None,
     default_dir: Path,
@@ -238,6 +246,25 @@ def delegate(
                 response_text = msg.content
                 break  # Take first assistant message
 
+        # Build log path for debugging
+        log_path = str(manager._output_path(session.id, session.turn))
+
+        # Check if session failed
+        from zwarm.sessions import SessionStatus
+        if session.status == SessionStatus.FAILED:
+            return {
+                "success": False,
+                "session": _format_session_header(session),
+                "session_id": session.id,
+                "status": "failed",
+                "task": _truncate(task, 100),
+                "error": session.error or "Unknown error",
+                "response": response_text or "(no response captured)",
+                "tokens": _get_total_tokens(session),
+                "log_file": log_path,
+                "hint": "Check log_file for raw codex output. Use bash('cat <log_file>') to inspect.",
+            }
+
         return {
             "success": True,
             "session": _format_session_header(session),
@@ -245,7 +272,8 @@ def delegate(
             "status": session.status.value,
             "task": _truncate(task, 100),
             "response": response_text or "(no response captured)",
-            "tokens": session.token_usage.get("total_tokens", 0),
+            "tokens": _get_total_tokens(session),
+            "log_file": log_path,
             "hint": "Use converse(session_id, message) to send follow-up messages",
         }
     else:
@@ -382,7 +410,7 @@ def converse(
         "turn": session.turn,
         "you_said": _truncate(message, 100),
         "response": response_text or "(no response captured)",
-        "tokens": session.token_usage.get("total_tokens", 0),
+        "tokens": _get_total_tokens(session),
     }
 
 
@@ -423,7 +451,10 @@ def check_session(
             response_text = msg.content
             break
 
-    return {
+    # Build log path
+    log_path = str(manager._output_path(session.id, session.turn))
+
+    result = {
         "success": True,
         "session": _format_session_header(session),
         "session_id": session_id,
@@ -433,10 +464,19 @@ def check_session(
         "message_count": len(messages),
         "task": _truncate(session.task, 80),
         "response": _truncate(response_text, 500) if response_text else "(no response yet)",
-        "tokens": session.token_usage.get("total_tokens", 0),
+        "tokens": _get_total_tokens(session),
         "runtime": session.runtime,
+        "log_file": log_path,
     }
 
+    # Add error info if failed
+    from zwarm.sessions import SessionStatus
+    if session.status == SessionStatus.FAILED:
+        result["success"] = False
+        result["error"] = session.error or "Unknown error"
+
+    return result
+
 
 @weaveTool
 def peek_session(
@@ -539,7 +579,7 @@ def end_session(
         "status": session.status.value,
         "reason": reason or "ended by orchestrator",
         "turn": session.turn,
-        "tokens": session.token_usage.get("total_tokens", 0),
+        "tokens": _get_total_tokens(session),
     }
 
 
@@ -646,7 +686,7 @@ def list_sessions(
             "updated_secs": int(updated_secs),
             "last_message": _truncate(last_message, 100) if last_message else "(no response yet)",
             "needs_attention": needs_attention,
-            "tokens": s.token_usage.get("total_tokens", 0),
+            "tokens": _get_total_tokens(s),
         })
 
     # Summary counts

{zwarm-2.0.1.dist-info → zwarm-2.3.dist-info}/METADATA

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

{zwarm-2.0.1.dist-info → zwarm-2.3.dist-info}/RECORD

@@ -9,7 +9,7 @@ zwarm/adapters/registry.py,sha256=EdyHECaNA5Kv1od64pYFBJyA_r_6I1r_eJTNP1XYLr4,17
 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=FmJIYt6qocsZkk3WjsrszY5IDNIM5WrBM1AeHPgc68E,88179
+zwarm/cli/main.py,sha256=fQT9oP03zsru1_80WfVBdX48kdpLIVfEgS8eJQxRxUM,88668
 zwarm/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zwarm/core/compact.py,sha256=Y8C7Gs-5-WOU43WRvQ863Qzd5xtuEqR6Aw3r2p8_-i8,10907
 zwarm/core/config.py,sha256=331i4io9uEnloFwUMjTPJ5_lQFKJR1nhTpA4SPfSpiI,11748
@@ -22,16 +22,16 @@ zwarm/core/test_models.py,sha256=sWTIhMZvuLP5AooGR6y8OR2EyWydqVfhmGrE7NPBBnk,845
 zwarm/prompts/__init__.py,sha256=FiaIOniLrIyfD3_osxT6I7FfyKjtctbf8jNs5QTPs_s,213
 zwarm/prompts/orchestrator.py,sha256=-VZ3B5t-2ALOTpdZyNZGSjjzaHiTufAuLzrTLgwg70M,15442
 zwarm/sessions/__init__.py,sha256=jRibY8IfmNcnkgNmrgK2T81oa1w71wP_KQp9A1hPL7Q,568
-zwarm/sessions/manager.py,sha256=slCDE0n9-pw6iZ08YZMjxZRwH0aoEi6MAAChLlAsuPw,22212
+zwarm/sessions/manager.py,sha256=XDwXXZKJwxgBXOl4Mf61_BCdYoKU7lpJHxE_7Lyzuy4,22946
 zwarm/tools/__init__.py,sha256=FpqxwXJA6-fQ7C-oLj30jjK_0qqcE7MbI0dQuaB56kU,290
-zwarm/tools/delegation.py,sha256=2NI9J2VArVUbqOTZJY8Vgz5Rd5nI7BdZ8GNaYVIR_JU,20886
+zwarm/tools/delegation.py,sha256=FFfZvDnppbbqsTeoYUned6gjqwE9m1gkJ09jSkiiWps,22307
 zwarm/watchers/__init__.py,sha256=yYGTbhuImQLESUdtfrYbHYBJNvCNX3B-Ei-vY5BizX8,760
 zwarm/watchers/base.py,sha256=r1GoPlj06nOT2xp4fghfSjxbRyFFFQUB6HpZbEyO2OY,3834
 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-2.0.1.dist-info/METADATA,sha256=DdMCZK1-t2KcZkKvAvrZmSSZD_N1YB1RbiO9ZqvVsR0,7680
-zwarm-2.0.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-zwarm-2.0.1.dist-info/entry_points.txt,sha256=u0OXq4q8d3yJ3EkUXwZfkS-Y8Lcy0F8cWrcQfoRxM6Q,46
-zwarm-2.0.1.dist-info/RECORD,,
+zwarm-2.3.dist-info/METADATA,sha256=fBqubqwFUeool8DcYfqk66WQsG42plPI27JLbrTpg3Q,7678
+zwarm-2.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+zwarm-2.3.dist-info/entry_points.txt,sha256=u0OXq4q8d3yJ3EkUXwZfkS-Y8Lcy0F8cWrcQfoRxM6Q,46
+zwarm-2.3.dist-info/RECORD,,