zwarm 2.0.0__py3-none-any.whl → 2.0.2__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)
@@ -1425,20 +1425,24 @@ def interactive(
                 timeout = 300.0
                 start = time.time()
                 while time.time() - start < timeout:
+                    # get_session() auto-updates status based on output completion
                     session = manager.get_session(session.id)
-                    if not session.is_running:
+                    if session.status != SessStatus.RUNNING:
                         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[/]")
@@ -1579,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
@@ -1663,8 +1671,9 @@ def interactive(
                 timeout = 300.0
                 start = time.time()
                 while time.time() - start < timeout:
+                    # get_session() auto-updates status based on output completion
                     session = manager.get_session(session.id)
-                    if not session.is_running:
+                    if session.status != SessStatus.RUNNING:
                         break
                     time.sleep(1.0)
 

zwarm/orchestrator.py

@@ -20,6 +20,8 @@ import weave
 from pydantic import Field, PrivateAttr
 from wbal.agents.yaml_agent import YamlAgent
 from wbal.helper import TOOL_CALL_TYPE, format_openai_tool_response
+from wbal.lm import LM as wbalLMGeneric
+from wbal.lm import GPT5LargeVerbose
 
 from zwarm.adapters import ExecutorAdapter, get_adapter
 from zwarm.core.compact import compact_messages, should_compact
@@ -29,9 +31,9 @@ from zwarm.core.models import ConversationSession
 from zwarm.core.state import StateManager
 from zwarm.prompts import get_orchestrator_prompt
 from zwarm.watchers import (
-    WatcherManager,
-    WatcherContext,
     WatcherAction,
+    WatcherContext,
+    WatcherManager,
     build_watcher_manager,
 )
 
@@ -48,6 +50,9 @@ class Orchestrator(YamlAgent):
     - Weave integration
     """
 
+    # LM definition override:
+    lm: wbalLMGeneric = Field(default_factory=GPT5LargeVerbose)
+
     # Configuration
     config: ZwarmConfig = Field(default_factory=ZwarmConfig)
     working_dir: Path = Field(default_factory=Path.cwd)
@@ -71,11 +76,13 @@ class Orchestrator(YamlAgent):
     _watcher_manager: WatcherManager | None = PrivateAttr(default=None)
     _resumed: bool = PrivateAttr(default=False)
     _total_tokens: int = PrivateAttr(default=0)  # Cumulative orchestrator tokens
-    _executor_usage: dict[str, int] = PrivateAttr(default_factory=lambda: {
-        "input_tokens": 0,
-        "output_tokens": 0,
-        "total_tokens": 0,
-    })
+    _executor_usage: dict[str, int] = PrivateAttr(
+        default_factory=lambda: {
+            "input_tokens": 0,
+            "output_tokens": 0,
+            "total_tokens": 0,
+        }
+    )
 
     def model_post_init(self, __context: Any) -> None:
         """Initialize state and adapters after model creation."""
@@ -93,6 +100,7 @@ class Orchestrator(YamlAgent):
         # Register instance if using instance isolation
         if self.instance_id:
             from zwarm.core.state import register_instance
+
             register_instance(
                 instance_id=self.instance_id,
                 name=self.instance_name,
@@ -149,7 +157,9 @@ class Orchestrator(YamlAgent):
             if not config_path.exists():
                 config_path = None  # Fallback to adapter defaults
 
-            self._adapters[name] = get_adapter(name, model=model, config_path=config_path)
+            self._adapters[name] = get_adapter(
+                name, model=model, config_path=config_path
+            )
         return self._adapters[name]
 
     def get_executor_usage(self) -> dict[str, int]:
@@ -253,15 +263,18 @@ class Orchestrator(YamlAgent):
 
             # Log compaction event
             from zwarm.core.models import Event
-            self._state.log_event(Event(
-                kind="context_compacted",
-                payload={
-                    "step": self._step_count,
-                    "original_count": result.original_count,
-                    "new_count": len(result.messages),
-                    "removed_count": result.removed_count,
-                },
-            ))
+
+            self._state.log_event(
+                Event(
+                    kind="context_compacted",
+                    payload={
+                        "step": self._step_count,
+                        "original_count": result.original_count,
+                        "new_count": len(result.messages),
+                        "removed_count": result.removed_count,
+                    },
+                )
+            )
 
             return True
 
@@ -377,17 +390,20 @@ Review what was accomplished in the previous session and delegate new tasks as n
 
         # Log watcher execution to events
         from zwarm.core.models import Event
+
         watcher_names = [w.name for w in self.config.watchers.watchers if w.enabled]
-        self.state.log_event(Event(
-            kind="watchers_run",
-            payload={
-                "step": self._step_count,
-                "watchers": watcher_names,
-                "action": result.action.value,
-                "triggered_by": result.metadata.get("triggered_by"),
-                "reason": result.metadata.get("reason"),
-            },
-        ))
+        self.state.log_event(
+            Event(
+                kind="watchers_run",
+                payload={
+                    "step": self._step_count,
+                    "watchers": watcher_names,
+                    "action": result.action.value,
+                    "triggered_by": result.metadata.get("triggered_by"),
+                    "reason": result.metadata.get("reason"),
+                },
+            )
+        )
 
         # Handle watcher result
         if result.action == WatcherAction.NUDGE and result.guidance:

zwarm/tools/delegation.py

@@ -53,14 +53,17 @@ def _wait_for_completion(manager, session_id: str, timeout: float = 300.0, poll_
     Returns:
         True if completed, False if timed out
     """
+    from zwarm.sessions import SessionStatus
+
     start = time.time()
     while time.time() - start < timeout:
+        # get_session() auto-updates status based on output completion markers
         session = manager.get_session(session_id)
         if not session:
             return False
 
-        # Check if process is still running
-        if not session.is_running:
+        # Check status (not is_running - PID check is unreliable due to reuse)
+        if session.status in (SessionStatus.COMPLETED, SessionStatus.FAILED, SessionStatus.KILLED):
             return True
 
         time.sleep(poll_interval)

{zwarm-2.0.0.dist-info → zwarm-2.0.2.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: zwarm
-Version: 2.0.0
+Version: 2.0.2
 Summary: Multi-Agent CLI Orchestration Research Platform
 Requires-Python: <3.14,>=3.13
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: typer>=0.9.0
-Requires-Dist: wbal>=0.4.0
+Requires-Dist: wbal>=0.5.8
 Description-Content-Type: text/markdown
 
 # zwarm

{zwarm-2.0.0.dist-info → zwarm-2.0.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 zwarm/__init__.py,sha256=3i3LMjHwIzE-LFIS2aUrwv3EZmpkvVMe-xj1h97rcSM,837
-zwarm/orchestrator.py,sha256=FGr-_MpG_UGUFAa19oenh7MVifE6frK6URS8ii0x0IA,22952
+zwarm/orchestrator.py,sha256=IdOd7xNH6IKfvpajh6pOKh2nwTjopS2nQ8GYrj7OsSc,23307
 zwarm/test_orchestrator_watchers.py,sha256=QpoaehPU7ekT4XshbTOWnJ2H0wRveV3QOZjxbgyJJLY,807
 zwarm/adapters/__init__.py,sha256=O0b-SfZpb6txeNqFkXZ2aaf34yLFYreznyrAV25jF_Q,656
 zwarm/adapters/base.py,sha256=fZlQviTgVvOcwnxduTla6WuM6FzQJ_yoHMW5SxwVgQg,2527
@@ -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=-kxDul3cPv9vqLLS9ePTjSf1TXo8E3TCuS6p-t4u4hQ,87985
+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
@@ -24,14 +24,14 @@ zwarm/prompts/orchestrator.py,sha256=-VZ3B5t-2ALOTpdZyNZGSjjzaHiTufAuLzrTLgwg70M
 zwarm/sessions/__init__.py,sha256=jRibY8IfmNcnkgNmrgK2T81oa1w71wP_KQp9A1hPL7Q,568
 zwarm/sessions/manager.py,sha256=slCDE0n9-pw6iZ08YZMjxZRwH0aoEi6MAAChLlAsuPw,22212
 zwarm/tools/__init__.py,sha256=FpqxwXJA6-fQ7C-oLj30jjK_0qqcE7MbI0dQuaB56kU,290
-zwarm/tools/delegation.py,sha256=axGuDROdJM9xYDG8IscfyQpNGrkDQSFPi9_ElfL0Fzw,20661
+zwarm/tools/delegation.py,sha256=2NI9J2VArVUbqOTZJY8Vgz5Rd5nI7BdZ8GNaYVIR_JU,20886
 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.0.dist-info/METADATA,sha256=v94KN8eICvONW3-UvteIdL0suEu6Pu3ur3FMxGd9lS0,7680
-zwarm-2.0.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-zwarm-2.0.0.dist-info/entry_points.txt,sha256=u0OXq4q8d3yJ3EkUXwZfkS-Y8Lcy0F8cWrcQfoRxM6Q,46
-zwarm-2.0.0.dist-info/RECORD,,
+zwarm-2.0.2.dist-info/METADATA,sha256=1V6Ceu1nSd_HK9mDD2saHTqF3efZ8bV4Ip06X1lHoqw,7680
+zwarm-2.0.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+zwarm-2.0.2.dist-info/entry_points.txt,sha256=u0OXq4q8d3yJ3EkUXwZfkS-Y8Lcy0F8cWrcQfoRxM6Q,46
+zwarm-2.0.2.dist-info/RECORD,,