zwarm 3.4.0__tar.gz → 3.7.0__tar.gz

{zwarm-3.4.0 → zwarm-3.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zwarm
-Version: 3.4.0
+Version: 3.7.0
 Summary: Multi-Agent CLI Orchestration Research Platform
 Requires-Python: <3.14,>=3.13
 Requires-Dist: prompt-toolkit>=3.0.52
@@ -13,26 +13,30 @@ Description-Content-Type: text/markdown
 
 # zwarm
 
-Multi-agent CLI for orchestrating coding agents. Spawn, manage, and converse with multiple Codex sessions in parallel.
+Multi-agent CLI for orchestrating coding agents. Spawn, manage, and converse with multiple coding agent sessions in parallel.
+
+**Supports both [Codex CLI](https://github.com/openai/codex) and [Claude Code CLI](https://claude.com/claude-code).**
 
 ## Installation
 
 ```bash
-# From the workspace
-cd /path/to/labs
-uv sync
+# From PyPI
+pip install zwarm
 
-# Or install directly
-uv pip install -e ./zwarm
+# Or with uv
+uv pip install zwarm
 ```
 
 **Requirements:**
 - Python 3.13+
-- `codex` CLI installed and authenticated
+- At least one of:
+  - `codex` CLI installed and authenticated (OpenAI)
+  - `claude` CLI installed and authenticated (Anthropic)
 
 **Environment:**
 ```bash
 export OPENAI_API_KEY="sk-..."        # Required for Codex
+export ANTHROPIC_API_KEY="sk-..."     # Required for Claude
 export WEAVE_PROJECT="entity/zwarm"   # Optional: Weave tracing
 ```
 
@@ -78,6 +82,19 @@ zwarm interactive
 
 ---
 
+## Multi-Adapter Support
+
+zwarm supports multiple executor backends:
+
+| Adapter | CLI | Models | Config |
+|---------|-----|--------|--------|
+| **Codex** | `codex` | gpt-5.1-codex-mini, etc. | `.zwarm/codex.toml` |
+| **Claude** | `claude` | sonnet, opus, haiku | `.zwarm/claude.toml` |
+
+You can mix adapters in the same session - for example, use Claude Opus for complex reasoning tasks and Codex Mini for quick edits.
+
+---
+
 ## Pilot Mode
 
 **You chat with an LLM that delegates to coding agents.** Best of both worlds - LLM intelligence with human oversight.
@@ -85,12 +102,14 @@ zwarm interactive
 ```bash
 zwarm pilot
 zwarm pilot --task "Add user authentication"
+zwarm pilot --resume  # Resume previous session
 ```
 
 ### Features
 
 - **Conversational**: Chat naturally, the LLM handles delegation
 - **Checkpoints**: Every turn is saved, time-travel with `:goto`
+- **Resume**: Continue where you left off with `--resume`
 - **Multiline input**: Use `"""` for pasting large prompts
 - **Status bar**: See token usage, cost estimates, context window
 
@@ -103,7 +122,8 @@ zwarm pilot --task "Add user authentication"
 | `:history` | Show turn checkpoints |
 | `:goto T3` | Jump back to turn 3 |
 | `:sessions` | List executor sessions |
-| `:quit` | Exit |
+| `:save` | Save current state |
+| `:quit` | Exit (auto-saves) |
 
 ### Example
 
@@ -162,7 +182,7 @@ zwarm interactive
 | Command | Description |
 |---------|-------------|
 | `spawn "task" [--search]` | Start a new session (--search enables web) |
-| `ls` | Dashboard of all sessions (with costs) |
+| `ls` | Dashboard of all sessions (with costs, models) |
 | `? ID` / `peek ID` | Quick status check |
 | `show ID` | Full session details |
 | `traj ID` | Show trajectory (steps taken) |
@@ -170,6 +190,7 @@ zwarm interactive
 | `c ID "msg"` | Continue conversation |
 | `kill ID \| all` | Stop session(s) |
 | `rm ID \| all` | Delete session(s) |
+| `!command` | Run shell command (e.g., `!git status`) |
 | `help` | Show all commands |
 | `quit` | Exit |
 
@@ -188,9 +209,9 @@ $ zwarm interactive
 > ls
 ⟳ 2 running
 
-ID       │    │ Task                          │ Tokens  │ Cost
-abc123   │ ⟳  │ Add tests for the auth...     │ 5,234   │ $0.052
-def456   │ ⟳  │ Fix type errors in utils...   │ 2,100   │ $0.021
+ID       │    │ Task                          │ Model        │ Tokens  │ Cost
+abc123   │ ⟳  │ Add tests for the auth...     │ codex-mini   │ 5,234   │ $0.052
+def456   │ ⟳  │ Fix type errors in utils...   │ codex-mini   │ 2,100   │ $0.021
 
 > watch abc123
 Watching abc123... (Ctrl+C to stop)
@@ -201,6 +222,11 @@ Watching abc123... (Ctrl+C to stop)
 > c abc123 "Also add edge case tests"
 ✓ Injected message, session running
 
+> !git status
+On branch main
+Changes not staged for commit:
+  ...
+
 > kill all
   ✓ Killed abc123
   ✓ Killed def456
@@ -225,7 +251,7 @@ The orchestrator LLM has access to:
 
 | Tool | Description |
 |------|-------------|
-| `delegate(task, web_search=False)` | Start a new coding session |
+| `delegate(task, adapter="codex")` | Start a new coding session |
 | `converse(id, msg)` | Continue a session |
 | `check_session(id)` | Get full session details |
 | `peek_session(id)` | Quick status check |
@@ -235,7 +261,9 @@ The orchestrator LLM has access to:
 
 **Async-first**: All sessions run in the background. The orchestrator uses `sleep()` to wait, then checks on progress.
 
-**Web Search**: Pass `web_search=True` to `delegate()` for tasks needing current info (API docs, latest releases, etc.).
+**Multi-adapter**: Pass `adapter="claude"` or `adapter="codex"` to `delegate()` to choose the backend.
+
+**Web Search**: Enable `web_search=True` in config for tasks needing current info (API docs, latest releases, etc.).
 
 ### Watchers
 
@@ -285,9 +313,9 @@ spawn → running → completed/failed/killed
 
 ```
 .zwarm/sessions/<uuid>/
-├── meta.json           # Status, task, model, tokens, cost
+├── meta.json           # Status, task, model, adapter, tokens, cost
 └── turns/
-    ├── turn_1.jsonl    # Raw codex output for turn 1
+    ├── turn_1.jsonl    # Raw executor output for turn 1
     ├── turn_2.jsonl    # Output after continue
     └── ...
 ```
@@ -305,6 +333,7 @@ zwarm init
 This creates:
 - `.zwarm/config.toml` - Runtime settings (Weave, watchers)
 - `.zwarm/codex.toml` - Codex CLI settings (model, reasoning)
+- `.zwarm/claude.toml` - Claude CLI settings (model, permissions)
 - `zwarm.yaml` - Project context (optional, with `--with-project`)
 
 ### Config Files
@@ -318,9 +347,11 @@ project = "your-entity/zwarm"
 max_steps = 50
 
 [executor]
-adapter = "codex_mcp"
 web_search = false  # Enable web search for all delegated sessions
 
+[pilot]
+max_steps_per_turn = 25
+
 [watchers]
 enabled = ["progress", "budget", "delegation", "delegation_reminder"]
 ```
@@ -329,6 +360,13 @@ enabled = ["progress", "budget", "delegation", "delegation_reminder"]
 ```toml
 model = "gpt-5.1-codex-mini"
 model_reasoning_effort = "high"  # low | medium | high
+full_auto = true
+```
+
+**`.zwarm/claude.toml`** - Controls the Claude Code CLI:
+```toml
+model = "sonnet"  # sonnet | opus | haiku
+full_danger = true  # Skip permission prompts
 ```
 
 **`zwarm.yaml`** - Project-specific context:
@@ -355,6 +393,7 @@ zwarm init --yes        # Quick setup with defaults
 
 # Interfaces
 zwarm pilot             # Conversational LLM guidance (recommended)
+zwarm pilot --resume    # Resume previous session
 zwarm interactive       # Direct session control REPL
 zwarm orchestrate       # Fully autonomous LLM
 
@@ -377,13 +416,15 @@ zwarm reset             # Reset .zwarm/ state
 zwarm/
 ├── src/zwarm/
 │   ├── sessions/           # Session substrate
-│   │   └── manager.py      # CodexSessionManager (ground truth)
+│   │   ├── base.py         # BaseSessionManager (ABC)
+│   │   ├── manager.py      # CodexSessionManager
+│   │   └── claude.py       # ClaudeSessionManager
 │   ├── cli/
 │   │   ├── main.py         # CLI commands
 │   │   ├── pilot.py        # Pilot REPL
 │   │   └── interactive.py  # Interactive REPL
 │   ├── tools/
-│   │   └── delegation.py   # Orchestrator tools
+│   │   └── delegation.py   # Orchestrator tools (multi-adapter)
 │   ├── core/
 │   │   ├── config.py       # Configuration
 │   │   ├── checkpoints.py  # Time-travel primitives
@@ -392,5 +433,13 @@ zwarm/
 │   ├── watchers/           # Trajectory alignment
 │   ├── prompts/            # System prompts
 │   └── orchestrator.py     # Orchestrator agent
-└── STATE.md                # Current project state
+└── docs/
+    ├── CONCEPTS.md         # Architecture diagrams
+    └── INTERNALS.md        # Developer documentation
 ```
+
+---
+
+## License
+
+MIT

{zwarm-3.4.0 → zwarm-3.7.0}/README.md

@@ -1,25 +1,29 @@
 # zwarm
 
-Multi-agent CLI for orchestrating coding agents. Spawn, manage, and converse with multiple Codex sessions in parallel.
+Multi-agent CLI for orchestrating coding agents. Spawn, manage, and converse with multiple coding agent sessions in parallel.
+
+**Supports both [Codex CLI](https://github.com/openai/codex) and [Claude Code CLI](https://claude.com/claude-code).**
 
 ## Installation
 
 ```bash
-# From the workspace
-cd /path/to/labs
-uv sync
+# From PyPI
+pip install zwarm
 
-# Or install directly
-uv pip install -e ./zwarm
+# Or with uv
+uv pip install zwarm
 ```
 
 **Requirements:**
 - Python 3.13+
-- `codex` CLI installed and authenticated
+- At least one of:
+  - `codex` CLI installed and authenticated (OpenAI)
+  - `claude` CLI installed and authenticated (Anthropic)
 
 **Environment:**
 ```bash
 export OPENAI_API_KEY="sk-..."        # Required for Codex
+export ANTHROPIC_API_KEY="sk-..."     # Required for Claude
 export WEAVE_PROJECT="entity/zwarm"   # Optional: Weave tracing
 ```
 
@@ -65,6 +69,19 @@ zwarm interactive
 
 ---
 
+## Multi-Adapter Support
+
+zwarm supports multiple executor backends:
+
+| Adapter | CLI | Models | Config |
+|---------|-----|--------|--------|
+| **Codex** | `codex` | gpt-5.1-codex-mini, etc. | `.zwarm/codex.toml` |
+| **Claude** | `claude` | sonnet, opus, haiku | `.zwarm/claude.toml` |
+
+You can mix adapters in the same session - for example, use Claude Opus for complex reasoning tasks and Codex Mini for quick edits.
+
+---
+
 ## Pilot Mode
 
 **You chat with an LLM that delegates to coding agents.** Best of both worlds - LLM intelligence with human oversight.
@@ -72,12 +89,14 @@ zwarm interactive
 ```bash
 zwarm pilot
 zwarm pilot --task "Add user authentication"
+zwarm pilot --resume  # Resume previous session
 ```
 
 ### Features
 
 - **Conversational**: Chat naturally, the LLM handles delegation
 - **Checkpoints**: Every turn is saved, time-travel with `:goto`
+- **Resume**: Continue where you left off with `--resume`
 - **Multiline input**: Use `"""` for pasting large prompts
 - **Status bar**: See token usage, cost estimates, context window
 
@@ -90,7 +109,8 @@ zwarm pilot --task "Add user authentication"
 | `:history` | Show turn checkpoints |
 | `:goto T3` | Jump back to turn 3 |
 | `:sessions` | List executor sessions |
-| `:quit` | Exit |
+| `:save` | Save current state |
+| `:quit` | Exit (auto-saves) |
 
 ### Example
 
@@ -149,7 +169,7 @@ zwarm interactive
 | Command | Description |
 |---------|-------------|
 | `spawn "task" [--search]` | Start a new session (--search enables web) |
-| `ls` | Dashboard of all sessions (with costs) |
+| `ls` | Dashboard of all sessions (with costs, models) |
 | `? ID` / `peek ID` | Quick status check |
 | `show ID` | Full session details |
 | `traj ID` | Show trajectory (steps taken) |
@@ -157,6 +177,7 @@ zwarm interactive
 | `c ID "msg"` | Continue conversation |
 | `kill ID \| all` | Stop session(s) |
 | `rm ID \| all` | Delete session(s) |
+| `!command` | Run shell command (e.g., `!git status`) |
 | `help` | Show all commands |
 | `quit` | Exit |
 
@@ -175,9 +196,9 @@ $ zwarm interactive
 > ls
 ⟳ 2 running
 
-ID       │    │ Task                          │ Tokens  │ Cost
-abc123   │ ⟳  │ Add tests for the auth...     │ 5,234   │ $0.052
-def456   │ ⟳  │ Fix type errors in utils...   │ 2,100   │ $0.021
+ID       │    │ Task                          │ Model        │ Tokens  │ Cost
+abc123   │ ⟳  │ Add tests for the auth...     │ codex-mini   │ 5,234   │ $0.052
+def456   │ ⟳  │ Fix type errors in utils...   │ codex-mini   │ 2,100   │ $0.021
 
 > watch abc123
 Watching abc123... (Ctrl+C to stop)
@@ -188,6 +209,11 @@ Watching abc123... (Ctrl+C to stop)
 > c abc123 "Also add edge case tests"
 ✓ Injected message, session running
 
+> !git status
+On branch main
+Changes not staged for commit:
+  ...
+
 > kill all
   ✓ Killed abc123
   ✓ Killed def456
@@ -212,7 +238,7 @@ The orchestrator LLM has access to:
 
 | Tool | Description |
 |------|-------------|
-| `delegate(task, web_search=False)` | Start a new coding session |
+| `delegate(task, adapter="codex")` | Start a new coding session |
 | `converse(id, msg)` | Continue a session |
 | `check_session(id)` | Get full session details |
 | `peek_session(id)` | Quick status check |
@@ -222,7 +248,9 @@ The orchestrator LLM has access to:
 
 **Async-first**: All sessions run in the background. The orchestrator uses `sleep()` to wait, then checks on progress.
 
-**Web Search**: Pass `web_search=True` to `delegate()` for tasks needing current info (API docs, latest releases, etc.).
+**Multi-adapter**: Pass `adapter="claude"` or `adapter="codex"` to `delegate()` to choose the backend.
+
+**Web Search**: Enable `web_search=True` in config for tasks needing current info (API docs, latest releases, etc.).
 
 ### Watchers
 
@@ -272,9 +300,9 @@ spawn → running → completed/failed/killed
 
 ```
 .zwarm/sessions/<uuid>/
-├── meta.json           # Status, task, model, tokens, cost
+├── meta.json           # Status, task, model, adapter, tokens, cost
 └── turns/
-    ├── turn_1.jsonl    # Raw codex output for turn 1
+    ├── turn_1.jsonl    # Raw executor output for turn 1
     ├── turn_2.jsonl    # Output after continue
     └── ...
 ```
@@ -292,6 +320,7 @@ zwarm init
 This creates:
 - `.zwarm/config.toml` - Runtime settings (Weave, watchers)
 - `.zwarm/codex.toml` - Codex CLI settings (model, reasoning)
+- `.zwarm/claude.toml` - Claude CLI settings (model, permissions)
 - `zwarm.yaml` - Project context (optional, with `--with-project`)
 
 ### Config Files
@@ -305,9 +334,11 @@ project = "your-entity/zwarm"
 max_steps = 50
 
 [executor]
-adapter = "codex_mcp"
 web_search = false  # Enable web search for all delegated sessions
 
+[pilot]
+max_steps_per_turn = 25
+
 [watchers]
 enabled = ["progress", "budget", "delegation", "delegation_reminder"]
 ```
@@ -316,6 +347,13 @@ enabled = ["progress", "budget", "delegation", "delegation_reminder"]
 ```toml
 model = "gpt-5.1-codex-mini"
 model_reasoning_effort = "high"  # low | medium | high
+full_auto = true
+```
+
+**`.zwarm/claude.toml`** - Controls the Claude Code CLI:
+```toml
+model = "sonnet"  # sonnet | opus | haiku
+full_danger = true  # Skip permission prompts
 ```
 
 **`zwarm.yaml`** - Project-specific context:
@@ -342,6 +380,7 @@ zwarm init --yes        # Quick setup with defaults
 
 # Interfaces
 zwarm pilot             # Conversational LLM guidance (recommended)
+zwarm pilot --resume    # Resume previous session
 zwarm interactive       # Direct session control REPL
 zwarm orchestrate       # Fully autonomous LLM
 
@@ -364,13 +403,15 @@ zwarm reset             # Reset .zwarm/ state
 zwarm/
 ├── src/zwarm/
 │   ├── sessions/           # Session substrate
-│   │   └── manager.py      # CodexSessionManager (ground truth)
+│   │   ├── base.py         # BaseSessionManager (ABC)
+│   │   ├── manager.py      # CodexSessionManager
+│   │   └── claude.py       # ClaudeSessionManager
 │   ├── cli/
 │   │   ├── main.py         # CLI commands
 │   │   ├── pilot.py        # Pilot REPL
 │   │   └── interactive.py  # Interactive REPL
 │   ├── tools/
-│   │   └── delegation.py   # Orchestrator tools
+│   │   └── delegation.py   # Orchestrator tools (multi-adapter)
 │   ├── core/
 │   │   ├── config.py       # Configuration
 │   │   ├── checkpoints.py  # Time-travel primitives
@@ -379,5 +420,13 @@ zwarm/
 │   ├── watchers/           # Trajectory alignment
 │   ├── prompts/            # System prompts
 │   └── orchestrator.py     # Orchestrator agent
-└── STATE.md                # Current project state
+└── docs/
+    ├── CONCEPTS.md         # Architecture diagrams
+    └── INTERNALS.md        # Developer documentation
 ```
+
+---
+
+## License
+
+MIT

{zwarm-3.4.0 → zwarm-3.7.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "zwarm"
-version = "3.4.0"
+version = "3.7.0"
 description = "Multi-Agent CLI Orchestration Research Platform"
 readme = "README.md"
 requires-python = ">=3.13,<3.14"
@@ -41,3 +41,14 @@ dev = [
     "pytest>=8.0.0",
     "pytest-asyncio>=1.3.0",
 ]
+
+[tool.coverage.run]
+branch = true
+source = ["zwarm"]
+omit = [
+    "src/zwarm/__init__.py",
+]
+
+[tool.coverage.report]
+show_missing = true
+fail_under = 80