zwarm 2.0.0__tar.gz → 2.0.1__tar.gz

{zwarm-2.0.0 → zwarm-2.0.1}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: zwarm
-Version: 2.0.0
+Version: 2.0.1
 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 → zwarm-2.0.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "zwarm"
-version = "2.0.0"
+version = "2.0.1"
 description = "Multi-Agent CLI Orchestration Research Platform"
 readme = "README.md"
 requires-python = ">=3.13,<3.14"
@@ -9,7 +9,7 @@ dependencies = [
     "rich>=13.0.0",
     "python-dotenv>=1.0.0",
     "pyyaml>=6.0",
-    "wbal>=0.4.0",
+    "wbal>=0.5.8",
 ]
 
 [project.scripts]

{zwarm-2.0.0 → zwarm-2.0.1}/src/zwarm/cli/main.py

@@ -1425,8 +1425,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)
 
@@ -1663,8 +1664,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-2.0.0 → zwarm-2.0.1}/src/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-2.0.0 → zwarm-2.0.1}/src/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)