feat: add MCP server with 6 tools for AI agent orchestration

Author: rohansx

CLAUDE.md

@@ -0,0 +1,42 @@
+# workz MCP Integration
+
+workz exposes all its operations as MCP tools so AI agents can manage worktrees directly.
+
+## Setup
+
+```bash
+claude mcp add workz -- workz mcp
+```
+
+Or add manually to your Claude Code config (`~/.claude/settings.json`):
+
+```json
+{
+  "mcpServers": {
+    "workz": {
+      "command": "workz",
+      "args": ["mcp"]
+    }
+  }
+}
+```
+
+## Available Tools
+
+| Tool | Description |
+|------|-------------|
+| `workz_start` | Create a worktree with auto-synced deps and env |
+| `workz_list` | List all worktrees as JSON |
+| `workz_status` | Rich status: branch, dirty state, last commit |
+| `workz_sync` | Sync symlinks/env into an existing worktree |
+| `workz_done` | Remove a worktree (with optional force) |
+| `workz_conflicts` | Detect files modified in multiple worktrees |
+
+## Parallel Agent Workflow
+
+To run parallel agents on independent tasks:
+
+1. Use `workz_start` to create isolated worktrees for each task
+2. Each agent gets its own branch, deps, env — no interference
+3. Use `workz_conflicts` to check for overlapping file changes before merging
+4. Use `workz_done` to clean up when finished

Cargo.lock

@@ -12,6 +12,7 @@ categories = ["command-line-utilities", "development-tools"]
 clap = { version = "4", features = ["derive"] }
 anyhow = "1"
 serde = { version = "1", features = ["derive"] }
+serde_json = "1"
 toml = "0.8"
 glob = "0.3"
 skim = "0.10"

Cargo.toml

@@ -232,6 +232,42 @@ workz start feature/x --ai --ai-tool gemini          # launches Gemini CLI
 workz start feature/y --ai --ai-tool windsurf        # launches Windsurf
 ```
 
+## MCP Server
+
+workz ships a built-in MCP server so AI agents can manage worktrees themselves — no human needed.
+
+### Setup
+
+```bash
+claude mcp add workz -- workz mcp
+```
+
+Or add to `~/.claude/settings.json`:
+
+```json
+{
+  "mcpServers": {
+    "workz": {
+      "command": "workz",
+      "args": ["mcp"]
+    }
+  }
+}
+```
+
+### Tools exposed to agents
+
+| Tool | Description |
+|------|-------------|
+| `workz_start` | Create a worktree with auto-synced deps and env |
+| `workz_list` | List all worktrees as structured JSON |
+| `workz_status` | Rich status: branch, dirty state, last commit |
+| `workz_sync` | Sync symlinks/env into an existing worktree |
+| `workz_done` | Remove a worktree (with optional force) |
+| `workz_conflicts` | Detect files modified in multiple worktrees |
+
+Once configured, Claude Code and other MCP-compatible agents can create and manage worktrees autonomously without any manual setup.
+
 ## How It Compares
 
 | Feature | workz | worktrunk | gwq | fracture | branchlet |

README.md

@@ -82,6 +82,9 @@ pub enum Commands {
         base: Option<String>,
     },
 
+    /// Start an MCP server exposing workz tools to AI agents (stdio transport)
+    Mcp,
+
     /// Print shell integration script
     Init {
         /// Shell to generate integration for

src/cli.rs

@@ -205,3 +205,13 @@ pub fn merged_branches(base: &str) -> Result<Vec<String>> {
         .filter(|b| !b.is_empty() && b != base)
         .collect())
 }
+
+/// List files with uncommitted changes (staged or unstaged) in a worktree.
+pub fn modified_files(path: &Path) -> Result<Vec<String>> {
+    let output = git_in(path, &["status", "--porcelain"])?;
+    Ok(output
+        .lines()
+        .filter(|l| l.len() > 3)
+        .map(|l| l[3..].trim().to_string())
+        .collect())
+}

src/git.rs

@@ -1,6 +1,7 @@
 mod cli;
 mod config;
 mod git;
+mod mcp;
 mod sync;
 
 use anyhow::{bail, Result};
@@ -35,6 +36,7 @@ fn main() -> Result<()> {
         Commands::Sync => cmd_sync(),
         Commands::Status => cmd_status(),
         Commands::Clean { merged, base } => cmd_clean(merged, base.as_deref()),
+        Commands::Mcp => mcp::run(),
         Commands::Init { shell } => cmd_init(&shell),
     }
 }