zwarm 1.3.5__py3-none-any.whl → 1.3.8__py3-none-any.whl

zwarm/tools/delegation.py

@@ -6,11 +6,15 @@ These are the core tools that orchestrators use to delegate work to executors:
 - converse: Continue a sync conversation
 - check_session: Check status of an async session
 - end_session: End a session
+
+Sessions are also registered with CodexSessionManager for unified visibility
+in `zwarm interactive`.
 """
 
 from __future__ import annotations
 
 import asyncio
+from datetime import datetime
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Literal
 
@@ -20,6 +24,106 @@ if TYPE_CHECKING:
     from zwarm.orchestrator import Orchestrator
 
 
+def _get_session_manager(orchestrator: "Orchestrator"):
+    """Get or create the CodexSessionManager for unified session tracking."""
+    if not hasattr(orchestrator, "_session_manager"):
+        from zwarm.sessions import CodexSessionManager
+        orchestrator._session_manager = CodexSessionManager(orchestrator.working_dir / ".zwarm")
+    return orchestrator._session_manager
+
+
+def _register_session_for_visibility(
+    orchestrator: "Orchestrator",
+    session_id: str,
+    task: str,
+    adapter: str,
+    model: str,
+    working_dir: Path,
+    status: str = "running",
+    pid: int | None = None,
+):
+    """
+    Register an orchestrator session with CodexSessionManager for visibility.
+
+    This allows `zwarm interactive` to show orchestrator-delegated sessions
+    in its unified dashboard.
+    """
+    from zwarm.sessions import CodexSession, SessionStatus, SessionMessage
+
+    manager = _get_session_manager(orchestrator)
+    now = datetime.now().isoformat()
+
+    # Map status
+    status_map = {
+        "running": SessionStatus.RUNNING,
+        "active": SessionStatus.RUNNING,
+        "completed": SessionStatus.COMPLETED,
+        "failed": SessionStatus.FAILED,
+    }
+
+    session = CodexSession(
+        id=session_id,
+        task=task,
+        status=status_map.get(status, SessionStatus.RUNNING),
+        working_dir=working_dir,
+        created_at=now,
+        updated_at=now,
+        model=model or "unknown",
+        pid=pid,
+        source=f"orchestrator:{orchestrator.instance_id or 'unknown'}",
+        adapter=adapter,
+        messages=[SessionMessage(role="user", content=task, timestamp=now)],
+    )
+
+    # Save to disk
+    manager._save_session(session)
+    return session
+
+
+def _update_session_visibility(
+    orchestrator: "Orchestrator",
+    session_id: str,
+    status: str | None = None,
+    messages: list | None = None,
+    token_usage: dict | None = None,
+    error: str | None = None,
+):
+    """Update a session's visibility record."""
+    manager = _get_session_manager(orchestrator)
+    session = manager._load_session(session_id)
+
+    if not session:
+        return
+
+    from zwarm.sessions import SessionStatus, SessionMessage
+
+    if status:
+        status_map = {
+            "running": SessionStatus.RUNNING,
+            "active": SessionStatus.RUNNING,
+            "completed": SessionStatus.COMPLETED,
+            "failed": SessionStatus.FAILED,
+        }
+        session.status = status_map.get(status, session.status)
+
+    if messages:
+        for msg in messages:
+            if hasattr(msg, "role") and hasattr(msg, "content"):
+                session.messages.append(SessionMessage(
+                    role=msg.role,
+                    content=msg.content,
+                    timestamp=datetime.now().isoformat(),
+                ))
+
+    if token_usage:
+        session.token_usage = token_usage
+
+    if error:
+        session.error = error
+
+    manager._save_session(session)
+
+
 def _truncate(text: str, max_len: int = 200) -> str:
     """Truncate text with ellipsis."""
     if len(text) <= max_len:
@@ -161,6 +265,18 @@ def delegate(
     self._sessions[session.id] = session
     self.state.add_session(session)
 
+    # Register for unified visibility in zwarm interactive
+    _register_session_for_visibility(
+        orchestrator=self,
+        session_id=session.id,
+        task=task,
+        adapter=adapter_name,
+        model=model or self.config.executor.model,
+        working_dir=effective_dir,
+        status="running" if mode == "async" else "active",
+        pid=getattr(session, "process", None) and session.process.pid,
+    )
+
     # Log events
     from zwarm.core.models import event_session_started, event_message_sent, Message
     self.state.log_event(event_session_started(session))
@@ -299,8 +415,17 @@ def converse(
     # Update state
     self.state.update_session(session)
 
+    # Update visibility record
+    from zwarm.core.models import Message
+    _update_session_visibility(
+        orchestrator=self,
+        session_id=session_id,
+        messages=[Message(role="user", content=message), Message(role="assistant", content=response)],
+        token_usage=session.token_usage,
+    )
+
     # Log both messages
-    from zwarm.core.models import event_message_sent, Message
+    from zwarm.core.models import event_message_sent
     self.state.log_event(event_message_sent(session, Message(role="user", content=message)))
     self.state.log_event(event_message_sent(session, Message(role="assistant", content=response)))
 
@@ -367,6 +492,14 @@ def check_session(
     # Update state if status changed
     self.state.update_session(session)
 
+    # Sync visibility record
+    _update_session_visibility(
+        orchestrator=self,
+        session_id=session_id,
+        status=session.status.value,
+        token_usage=session.token_usage,
+    )
+
     header = _format_session_header(session.id, session.adapter, session.mode.value)
 
     return {
@@ -426,6 +559,15 @@ def end_session(
     # Update state
     self.state.update_session(session)
 
+    # Update visibility record
+    _update_session_visibility(
+        orchestrator=self,
+        session_id=session_id,
+        status=verdict,
+        token_usage=session.token_usage,
+        error=summary if verdict == "failed" else None,
+    )
+
     # Log event
     from zwarm.core.models import event_session_completed
     self.state.log_event(event_session_completed(session))

{zwarm-1.3.5.dist-info → zwarm-1.3.8.dist-info}/METADATA

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

{zwarm-1.3.5.dist-info → zwarm-1.3.8.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=GstswIKfmwD1thNBfP0vOzKHaOq3PjRuu3PYe5rLVnc,59082
+zwarm/cli/main.py,sha256=kGrwxAHkpJqF6YCki1DLJpOzjkk05P-1AXGzPBuUOnw,73266
 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
@@ -21,15 +21,17 @@ zwarm/core/test_config.py,sha256=26ozyiFOdjFF2c9Q-HDfFM6GOLfgw_5FZ55nTDMNYA8,488
 zwarm/core/test_models.py,sha256=sWTIhMZvuLP5AooGR6y8OR2EyWydqVfhmGrE7NPBBnk,8450
 zwarm/prompts/__init__.py,sha256=FiaIOniLrIyfD3_osxT6I7FfyKjtctbf8jNs5QTPs_s,213
 zwarm/prompts/orchestrator.py,sha256=af5547L2g6HwGz-PxlKCAXJzqXEdjcwSAIdVH7_4LSk,15412
+zwarm/sessions/__init__.py,sha256=NOOkyspJ2lpr5LwlZw2e9wvJPdRgSCQRkULgayrio5U,526
+zwarm/sessions/manager.py,sha256=0CrexNwMKiaKYESlWM_oDePj7xL8BRk-9XY5NS2ONlc,19391
 zwarm/tools/__init__.py,sha256=FpqxwXJA6-fQ7C-oLj30jjK_0qqcE7MbI0dQuaB56kU,290
-zwarm/tools/delegation.py,sha256=PeB0W7x2TcGCZ9rGBYDlIIFr7AT1TOdc1SLe7BKCUoM,15332
+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/manager.py,sha256=XZjBVeHjgCUlkTUeHqdvBvHoBC862U1ik0fG6nlRGog,5587
 zwarm/watchers/registry.py,sha256=A9iBIVIFNtO7KPX0kLpUaP8dAK7ozqWLA44ocJGnOw4,1219
 zwarm/watchers/test_watchers.py,sha256=zOsxumBqKfR5ZVGxrNlxz6KcWjkcdp0QhW9WB0_20zM,7855
-zwarm-1.3.5.dist-info/METADATA,sha256=9boM7ysJGr-hfN_0YrNZfWD_Lwi8B9iF-BJWorrmNXs,16114
-zwarm-1.3.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-zwarm-1.3.5.dist-info/entry_points.txt,sha256=u0OXq4q8d3yJ3EkUXwZfkS-Y8Lcy0F8cWrcQfoRxM6Q,46
-zwarm-1.3.5.dist-info/RECORD,,
+zwarm-1.3.8.dist-info/METADATA,sha256=rRucfiwEyCky2bDJNY_SwxiKLHKaqQiHERGBuulBSUM,16114
+zwarm-1.3.8.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+zwarm-1.3.8.dist-info/entry_points.txt,sha256=u0OXq4q8d3yJ3EkUXwZfkS-Y8Lcy0F8cWrcQfoRxM6Q,46
+zwarm-1.3.8.dist-info/RECORD,,