zwarm 1.0.1__py3-none-any.whl → 1.2.1__py3-none-any.whl

zwarm/core/config.py

@@ -62,6 +62,12 @@ class OrchestratorConfig:
     sync_first: bool = True  # prefer sync mode by default
     compaction: CompactionConfig = field(default_factory=CompactionConfig)
 
+    # Directory restrictions for agent delegations
+    # None = only working_dir allowed (most restrictive, default)
+    # ["*"] = any directory allowed (dangerous)
+    # ["/path/a", "/path/b"] = only these directories allowed
+    allowed_dirs: list[str] | None = None
+
 
 @dataclass
 class WatcherConfigItem:
@@ -188,9 +194,24 @@ def load_env(path: Path | None = None) -> None:
 
 
 def load_toml_config(path: Path | None = None) -> dict[str, Any]:
-    """Load config.toml file."""
+    """
+    Load config.toml file.
+
+    Search order:
+    1. Explicit path (if provided)
+    2. .zwarm/config.toml (new standard location)
+    3. config.toml (legacy location for backwards compat)
+    """
     if path is None:
-        path = Path.cwd() / "config.toml"
+        # Try new location first
+        new_path = Path.cwd() / ".zwarm" / "config.toml"
+        legacy_path = Path.cwd() / "config.toml"
+        if new_path.exists():
+            path = new_path
+        elif legacy_path.exists():
+            path = legacy_path
+        else:
+            return {}
     if not path.exists():
         return {}
     with open(path, "rb") as f:

zwarm/orchestrator.py

@@ -21,9 +21,7 @@ from pydantic import Field, PrivateAttr
 from wbal.agents.yaml_agent import YamlAgent
 from wbal.helper import TOOL_CALL_TYPE, format_openai_tool_response
 
-from zwarm.adapters.base import ExecutorAdapter
-from zwarm.adapters.claude_code import ClaudeCodeAdapter
-from zwarm.adapters.codex_mcp import CodexMCPAdapter
+from zwarm.adapters import ExecutorAdapter, get_adapter
 from zwarm.core.compact import compact_messages, should_compact
 from zwarm.core.config import ZwarmConfig, load_config
 from zwarm.core.environment import OrchestratorEnv
@@ -123,16 +121,11 @@ class Orchestrator(YamlAgent):
         return self._state
 
     def _get_adapter(self, name: str) -> ExecutorAdapter:
-        """Get or create an adapter by name."""
+        """Get or create an adapter by name using the adapter registry."""
         if name not in self._adapters:
             # Get model from config (adapters have their own defaults if None)
             model = self.config.executor.model
-            if name == "codex_mcp":
-                self._adapters[name] = CodexMCPAdapter(model=model)
-            elif name == "claude_code":
-                self._adapters[name] = ClaudeCodeAdapter(model=model)
-            else:
-                raise ValueError(f"Unknown adapter: {name}")
+            self._adapters[name] = get_adapter(name, model=model)
         return self._adapters[name]
 
     def get_executor_usage(self) -> dict[str, int]:

zwarm/tools/delegation.py

@@ -11,6 +11,7 @@ These are the core tools that orchestrators use to delegate work to executors:
 from __future__ import annotations
 
 import asyncio
+from pathlib import Path
 from typing import TYPE_CHECKING, Any, Literal
 
 from wbal.helper import weaveTool
@@ -31,6 +32,65 @@ def _format_session_header(session_id: str, adapter: str, mode: str) -> str:
     return f"[{session_id[:8]}] {adapter} ({mode})"
 
 
+def _validate_working_dir(
+    requested_dir: Path | str | None,
+    default_dir: Path,
+    allowed_dirs: list[str] | None,
+) -> tuple[Path, str | None]:
+    """
+    Validate requested working directory against allowed_dirs config.
+
+    Args:
+        requested_dir: Directory requested by the agent (or None for default)
+        default_dir: The orchestrator's working directory
+        allowed_dirs: Config setting - None means only default allowed,
+                     ["*"] means any, or list of allowed paths
+
+    Returns:
+        (validated_path, error_message) - error is None if valid
+    """
+    if requested_dir is None:
+        return default_dir, None
+
+    requested = Path(requested_dir).resolve()
+
+    # Check if directory exists
+    if not requested.exists():
+        return default_dir, f"Directory does not exist: {requested}"
+
+    if not requested.is_dir():
+        return default_dir, f"Not a directory: {requested}"
+
+    # If allowed_dirs is None, only default is allowed
+    if allowed_dirs is None:
+        if requested == default_dir.resolve():
+            return requested, None
+        return default_dir, (
+            f"Directory not allowed: {requested}. "
+            f"Agent can only delegate to working directory ({default_dir}). "
+            "Set orchestrator.allowed_dirs in config to allow other directories."
+        )
+
+    # If ["*"], any directory is allowed
+    if allowed_dirs == ["*"]:
+        return requested, None
+
+    # Check against allowed list
+    for allowed in allowed_dirs:
+        allowed_path = Path(allowed).resolve()
+        # Allow if requested is the allowed path or a subdirectory of it
+        try:
+            requested.relative_to(allowed_path)
+            return requested, None
+        except ValueError:
+            continue
+
+    return default_dir, (
+        f"Directory not allowed: {requested}. "
+        f"Allowed directories: {allowed_dirs}"
+    )
+
+
 @weaveTool
 def delegate(
     self: "Orchestrator",
@@ -38,6 +98,7 @@ def delegate(
     mode: Literal["sync", "async"] = "sync",
     adapter: str | None = None,
     model: str | None = None,
+    working_dir: str | None = None,
 ) -> dict[str, Any]:
     """
     Delegate work to an executor agent.
@@ -57,6 +118,8 @@ def delegate(
         mode: "sync" for conversational, "async" for fire-and-forget.
         adapter: Which executor adapter to use (default: config setting).
         model: Model override for the executor.
+        working_dir: Directory for the executor to work in (default: orchestrator's dir).
+                    NOTE: May be restricted by orchestrator.allowed_dirs config.
 
     Returns:
         {session_id, status, response (if sync)}
@@ -65,6 +128,20 @@ def delegate(
         delegate(task="Add a logout button to the navbar", mode="sync")
         # Then use converse() to refine: "Also add a confirmation dialog"
     """
+    # Validate working directory against allowed_dirs config
+    effective_dir, dir_error = _validate_working_dir(
+        working_dir,
+        self.working_dir,
+        self.config.orchestrator.allowed_dirs,
+    )
+
+    if dir_error:
+        return {
+            "success": False,
+            "error": dir_error,
+            "hint": "Use the default working directory or ask user to update allowed_dirs config",
+        }
+
     # Get adapter (use default from config if not specified)
     adapter_name = adapter or self.config.executor.adapter
     executor = self._get_adapter(adapter_name)
@@ -73,7 +150,7 @@ def delegate(
     session = asyncio.run(
         executor.start_session(
             task=task,
-            working_dir=self.working_dir,
+            working_dir=effective_dir,
             mode=mode,
             model=model or self.config.executor.model,
             sandbox=self.config.executor.sandbox,

{zwarm-1.0.1.dist-info → zwarm-1.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zwarm
-Version: 1.0.1
+Version: 1.2.1
 Summary: Multi-Agent CLI Orchestration Research Platform
 Requires-Python: <3.14,>=3.13
 Requires-Dist: python-dotenv>=1.0.0
@@ -76,10 +76,11 @@ echo "Fix the bug in auth.py" | zwarm orchestrate
 
 zwarm looks for configuration in this order:
 1. `--config` flag (YAML file)
-2. `config.toml` in working directory
-3. Default settings
+2. `.zwarm/config.toml` (created by `zwarm init`)
+3. `config.toml` in working directory (legacy, for backwards compat)
+4. Default settings
 
-### Minimal config.toml
+### Minimal .zwarm/config.toml
 
 ```toml
 [weave]
@@ -430,10 +431,11 @@ zwarm clean --events
 
 ### State Management
 
-All state is stored in flat files under `.zwarm/`:
+All state and config is stored in flat files under `.zwarm/`:
 
 ```
 .zwarm/
+├── config.toml             # Runtime settings (weave, adapter, watchers)
 ├── state.json              # Current state
 ├── events.jsonl            # Append-only event log
 ├── sessions/

{zwarm-1.0.1.dist-info → zwarm-1.2.1.dist-info}/RECORD

@@ -1,16 +1,18 @@
 zwarm/__init__.py,sha256=3i3LMjHwIzE-LFIS2aUrwv3EZmpkvVMe-xj1h97rcSM,837
-zwarm/orchestrator.py,sha256=O3HGjMenQE-HF5xo0WQNMAHRS_vLsUrFfVp6oI_WpKU,19732
+zwarm/orchestrator.py,sha256=3Ix07GCnt7GHoBg2TwFmDaH9TAk6dT5BhuCaLiQQFCw,19430
 zwarm/test_orchestrator_watchers.py,sha256=QpoaehPU7ekT4XshbTOWnJ2H0wRveV3QOZjxbgyJJLY,807
-zwarm/adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+zwarm/adapters/__init__.py,sha256=O0b-SfZpb6txeNqFkXZ2aaf34yLFYreznyrAV25jF_Q,656
 zwarm/adapters/base.py,sha256=fZlQviTgVvOcwnxduTla6WuM6FzQJ_yoHMW5SxwVgQg,2527
-zwarm/adapters/claude_code.py,sha256=Z6f_jydiIUuZiR8fNipvvlcv16rP4BK6jNtkUaH3M4c,11368
-zwarm/adapters/codex_mcp.py,sha256=Wp4PExZlhqfLV5CHxBqmIBOm-pH7k8cJy93fyxRbCgw,27495
-zwarm/adapters/test_codex_mcp.py,sha256=vodQF5VUrM_F1GygUADtXYrA0kvAc7dWpT_Ff-Uoo0A,8383
+zwarm/adapters/claude_code.py,sha256=vAjsjD-_JjARmC4_FBSILQZmQCBrk_oNHo18a9ubuqk,11481
+zwarm/adapters/codex_mcp.py,sha256=f6ScDWWryA6AVWxBNMuvw3FO0a3WAJbeTq4Ij0AR50k,30694
+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=dU_8XLIYzcxikl_MgT6BmChNbqYq94dJ4Ra5STzm_KI,33109
+zwarm/cli/main.py,sha256=TE4qIWu11sEKqt2Npy3bNmB0F7IgsSylpupkrP_OoRI,55291
 zwarm/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zwarm/core/compact.py,sha256=Y8C7Gs-5-WOU43WRvQ863Qzd5xtuEqR6Aw3r2p8_-i8,10907
-zwarm/core/config.py,sha256=H8XFsWeEehZnUsMf7nsM_YqjljFYaC43DLs8Xw4sOuQ,10360
+zwarm/core/config.py,sha256=J-TAwIQFLY4x_G9qdvP_16DAYndqg_zhakCW5TLEMN4,11059
 zwarm/core/environment.py,sha256=HVDpDZEpDSfyh9-wHZMzMKVUPKvioBkPVWeiME2JmFo,5435
 zwarm/core/models.py,sha256=PrC3okRBVJxISUa1Fax4KkagqLT6Xub-kTxC9drN0sY,10083
 zwarm/core/state.py,sha256=wMryIvXP-VDLh2b76A5taeL_9dm5k4jk4HnvHWgLqGE,7658
@@ -20,14 +22,14 @@ zwarm/core/test_models.py,sha256=sWTIhMZvuLP5AooGR6y8OR2EyWydqVfhmGrE7NPBBnk,845
 zwarm/prompts/__init__.py,sha256=FiaIOniLrIyfD3_osxT6I7FfyKjtctbf8jNs5QTPs_s,213
 zwarm/prompts/orchestrator.py,sha256=R-ym3nlspYNspf085Qwwfi96Yh3K6-Csb6vfBg29K2c,14228
 zwarm/tools/__init__.py,sha256=FpqxwXJA6-fQ7C-oLj30jjK_0qqcE7MbI0dQuaB56kU,290
-zwarm/tools/delegation.py,sha256=wf43jxmGvEy_c8jVx301YQvslIS2F80Qnq4Py2feVvg,11435
+zwarm/tools/delegation.py,sha256=eoImpOcTpPcI8wZTP57PinQ5FzvnYM-qWBEc_xyuUU4,14006
 zwarm/watchers/__init__.py,sha256=yYGTbhuImQLESUdtfrYbHYBJNvCNX3B-Ei-vY5BizX8,760
 zwarm/watchers/base.py,sha256=r1GoPlj06nOT2xp4fghfSjxbRyFFFQUB6HpZbEyO2OY,3834
 zwarm/watchers/builtin.py,sha256=52hyRREYYDsSuG-YKElXViSTyMmGySZaFreHc0pz-A4,12482
 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.0.1.dist-info/METADATA,sha256=Th-qgFSOQNlTs2nJ_eWEtIPoE0kC_aaqvqDOShzgbGU,14995
-zwarm-1.0.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-zwarm-1.0.1.dist-info/entry_points.txt,sha256=u0OXq4q8d3yJ3EkUXwZfkS-Y8Lcy0F8cWrcQfoRxM6Q,46
-zwarm-1.0.1.dist-info/RECORD,,
+zwarm-1.2.1.dist-info/METADATA,sha256=G8rZQVHQOPXt7_bOUdL9wEtp6xyXqpzYoCQLx82ay24,15174
+zwarm-1.2.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+zwarm-1.2.1.dist-info/entry_points.txt,sha256=u0OXq4q8d3yJ3EkUXwZfkS-Y8Lcy0F8cWrcQfoRxM6Q,46
+zwarm-1.2.1.dist-info/RECORD,,