- {isInProgress ? (
- <>
-
-
Processing...
-
- ) : feature.passes ? (
- <>
-
-
Complete
-
- ) : (
- <>
-
-
Pending
-
+
+
+ {isInProgress ? (
+ <>
+
+ Processing...
+
+ ) : feature.passes ? (
+ <>
+
+ Complete
+
+ ) : (
+ <>
+
+ Pending
+
+ )}
+
+
+ {/* Agent badge */}
+ {feature.assigned_agent_id && (
+
+
+ {feature.assigned_agent_id.replace('agent-', '#')}
+
)}
diff --git a/ui/src/components/ParallelAgentControl.tsx b/ui/src/components/ParallelAgentControl.tsx
new file mode 100644
index 00000000..7691fcb0
--- /dev/null
+++ b/ui/src/components/ParallelAgentControl.tsx
@@ -0,0 +1,383 @@
+import { useState } from 'react'
+import {
+ Play,
+ Pause,
+ Square,
+ Loader2,
+ Zap,
+ Users,
+ Bot,
+ Trash2,
+ Minus,
+ Plus,
+} from 'lucide-react'
+import {
+ useParallelAgentsStatus,
+ useStartParallelAgents,
+ useStopParallelAgents,
+ usePauseParallelAgents,
+ useResumeParallelAgents,
+ useCleanupParallelAgents,
+} from '../hooks/useProjects'
+import type { ParallelAgentInfo } from '../lib/types'
+
+interface ParallelAgentControlProps {
+ projectName: string
+ onModeChange?: (isParallel: boolean) => void
+}
+
+// Agent colors matching FeatureCard.tsx
+const AGENT_COLORS = [
+ '#00b4d8', // cyan - agent-1
+ '#70e000', // green - agent-2
+ '#8338ec', // purple - agent-3
+ '#ff5400', // orange - agent-4
+ '#ff006e', // pink - agent-5
+ '#3a86ff', // blue - agent-6
+ '#ffd60a', // yellow - agent-7
+ '#06d6a0', // teal - agent-8
+ '#ef476f', // red - agent-9
+ '#118ab2', // dark cyan - agent-10
+]
+
+function getAgentColor(agentId: string): string {
+ const match = agentId.match(/\d+/)
+ if (match) {
+ const num = parseInt(match[0], 10) - 1
+ return AGENT_COLORS[num % AGENT_COLORS.length]
+ }
+ return AGENT_COLORS[0]
+}
+
+export function ParallelAgentControl({
+ projectName,
+ onModeChange,
+}: ParallelAgentControlProps) {
+ const [numAgents, setNumAgents] = useState(2)
+ const [yoloEnabled, setYoloEnabled] = useState(false)
+ const [isParallelMode, setIsParallelMode] = useState(false)
+
+ const { data: status, isLoading: statusLoading } = useParallelAgentsStatus(
+ isParallelMode ? projectName : null
+ )
+
+ const startAgents = useStartParallelAgents(projectName)
+ const stopAgents = useStopParallelAgents(projectName)
+ const pauseAgents = usePauseParallelAgents(projectName)
+ const resumeAgents = useResumeParallelAgents(projectName)
+ const cleanupAgents = useCleanupParallelAgents(projectName)
+
+ const isLoading =
+ startAgents.isPending ||
+ stopAgents.isPending ||
+ pauseAgents.isPending ||
+ resumeAgents.isPending ||
+ cleanupAgents.isPending
+
+ const runningCount = status?.agents.filter(a => a.status === 'running').length ?? 0
+ const pausedCount = status?.agents.filter(a => a.status === 'paused').length ?? 0
+ const hasAgents = (status?.agents.length ?? 0) > 0
+ const hasRunningAgents = runningCount > 0
+ const hasPausedAgents = pausedCount > 0
+ const allPaused = hasAgents && pausedCount === status?.agents.length
+ const allStopped = hasAgents && runningCount === 0 && pausedCount === 0
+
+ // Show start controls when no agents exist OR all agents are stopped
+ const showStartControls = !hasAgents || allStopped
+
+ const handleToggleMode = () => {
+ const newMode = !isParallelMode
+ setIsParallelMode(newMode)
+ onModeChange?.(newMode)
+ }
+
+ const handleStart = () => {
+ startAgents.mutate({ numAgents, yoloMode: yoloEnabled })
+ }
+
+ const handleStop = () => {
+ stopAgents.mutate()
+ }
+
+ const handlePause = () => {
+ pauseAgents.mutate()
+ }
+
+ const handleResume = () => {
+ resumeAgents.mutate()
+ }
+
+ const handleCleanup = () => {
+ cleanupAgents.mutate()
+ }
+
+ // Collapsed state - just show button
+ if (!isParallelMode) {
+ return (
+
+ )
+ }
+
+ // Expanded state
+ return (
+
+ {/* Header with Status */}
+
+
+
+
+ Parallel Agents
+
+
+ {/* Status Indicator */}
+ {hasAgents && (
+
+ )}
+
+ {/* YOLO Badge when running */}
+ {hasAgents && yoloEnabled && (
+
+
+ YOLO
+
+ )}
+
+
+
+
+
+ {/* Agent Status Grid */}
+ {status && status.agents.length > 0 && (
+
+ {status.agents.map((agent) => (
+
+ ))}
+
+ )}
+
+ {/* Controls */}
+ {showStartControls ? (
+ // No agents or all stopped - show start controls
+
+ {/* Agent Count Selector */}
+
+
Agents:
+
+
+
{numAgents}
+
+
+
+ {/* YOLO Toggle */}
+
+
+
+ {/* Start Button */}
+
+
+ ) : (
+ // Has agents - show control buttons
+
+ {/* Primary Action Buttons */}
+
+ {/* Pause/Resume Button */}
+ {hasRunningAgents && !allPaused ? (
+
+ ) : hasPausedAgents ? (
+
+ ) : null}
+
+ {/* Stop Button */}
+
+
+
+ {/* Secondary Action Button */}
+
+
+
+
+ )}
+
+ {/* Status Loading */}
+ {statusLoading && !status && (
+
+
+
+ )}
+
+ )
+}
+
+function StatusIndicator({
+ runningCount,
+ pausedCount,
+ totalCount
+}: {
+ runningCount: number
+ pausedCount: number
+ totalCount: number
+}) {
+ const stoppedCount = totalCount - runningCount - pausedCount
+
+ let color: string
+ let label: string
+ let pulse = false
+
+ if (runningCount > 0) {
+ color = 'var(--color-neo-done)'
+ label = `${runningCount} Running`
+ pulse = true
+ } else if (pausedCount > 0) {
+ color = 'var(--color-neo-pending)'
+ label = `${pausedCount} Paused`
+ } else {
+ color = 'var(--color-neo-text-secondary)'
+ label = `${stoppedCount} Stopped`
+ }
+
+ return (
+
+
+
+ {label}
+
+
+ )
+}
+
+function AgentStatusBadge({ agent }: { agent: ParallelAgentInfo }) {
+ const color = getAgentColor(agent.agent_id)
+ const statusColors: Record
= {
+ running: 'var(--color-neo-done)',
+ paused: 'var(--color-neo-pending)',
+ stopped: 'var(--color-neo-text-secondary)',
+ crashed: 'var(--color-neo-danger)',
+ unknown: 'var(--color-neo-text-secondary)',
+ }
+
+ const statusColor = statusColors[agent.status] || statusColors.unknown
+ const agentNum = agent.agent_id.replace('agent-', '#')
+
+ return (
+
+
+
+ {agentNum}
+
+
+
+ )
+}
diff --git a/ui/src/hooks/useProjects.ts b/ui/src/hooks/useProjects.ts
index 0cb61fa5..387d058b 100644
--- a/ui/src/hooks/useProjects.ts
+++ b/ui/src/hooks/useProjects.ts
@@ -151,6 +151,91 @@ export function useResumeAgent(projectName: string) {
})
}
+// ============================================================================
+// Parallel Agents
+// ============================================================================
+
+export function useParallelAgentsStatus(projectName: string | null) {
+ return useQuery({
+ queryKey: ['parallel-agents-status', projectName],
+ queryFn: () => api.getParallelAgentsStatus(projectName!),
+ enabled: !!projectName,
+ refetchInterval: 3000, // Poll every 3 seconds
+ })
+}
+
+export function useStartParallelAgents(projectName: string) {
+ const queryClient = useQueryClient()
+
+ return useMutation({
+ mutationFn: ({ numAgents, yoloMode }: { numAgents: number; yoloMode?: boolean }) =>
+ api.startParallelAgents(projectName, numAgents, yoloMode),
+ onSuccess: () => {
+ queryClient.invalidateQueries({ queryKey: ['parallel-agents-status', projectName] })
+ queryClient.invalidateQueries({ queryKey: ['agent-status', projectName] })
+ },
+ })
+}
+
+export function useStopParallelAgents(projectName: string) {
+ const queryClient = useQueryClient()
+
+ return useMutation({
+ mutationFn: () => api.stopParallelAgents(projectName),
+ onSuccess: () => {
+ queryClient.invalidateQueries({ queryKey: ['parallel-agents-status', projectName] })
+ queryClient.invalidateQueries({ queryKey: ['agent-status', projectName] })
+ },
+ })
+}
+
+export function usePauseParallelAgents(projectName: string) {
+ const queryClient = useQueryClient()
+
+ return useMutation({
+ mutationFn: () => api.pauseParallelAgents(projectName),
+ onSuccess: () => {
+ queryClient.invalidateQueries({ queryKey: ['parallel-agents-status', projectName] })
+ queryClient.invalidateQueries({ queryKey: ['agent-status', projectName] })
+ },
+ })
+}
+
+export function useResumeParallelAgents(projectName: string) {
+ const queryClient = useQueryClient()
+
+ return useMutation({
+ mutationFn: () => api.resumeParallelAgents(projectName),
+ onSuccess: () => {
+ queryClient.invalidateQueries({ queryKey: ['parallel-agents-status', projectName] })
+ queryClient.invalidateQueries({ queryKey: ['agent-status', projectName] })
+ },
+ })
+}
+
+export function useMergeParallelWorktrees(projectName: string) {
+ const queryClient = useQueryClient()
+
+ return useMutation({
+ mutationFn: () => api.mergeParallelWorktrees(projectName),
+ onSuccess: () => {
+ queryClient.invalidateQueries({ queryKey: ['parallel-agents-status', projectName] })
+ },
+ })
+}
+
+export function useCleanupParallelAgents(projectName: string) {
+ const queryClient = useQueryClient()
+
+ return useMutation({
+ mutationFn: () => api.cleanupParallelAgents(projectName),
+ onSuccess: () => {
+ queryClient.invalidateQueries({ queryKey: ['parallel-agents-status', projectName] })
+ queryClient.invalidateQueries({ queryKey: ['agent-status', projectName] })
+ },
+ })
+}
+
// ============================================================================
// Setup
// ============================================================================
diff --git a/ui/src/lib/api.ts b/ui/src/lib/api.ts
index bfee6cc9..725c4c2b 100644
--- a/ui/src/lib/api.ts
+++ b/ui/src/lib/api.ts
@@ -16,6 +16,8 @@ import type {
PathValidationResponse,
AssistantConversation,
AssistantConversationDetail,
+ ParallelAgentsStatus,
+ ParallelAgentActionResponse,
} from './types'
const API_BASE = '/api'
@@ -147,6 +149,67 @@ export async function resumeAgent(projectName: string): Promise {
+ return fetchJSON(`/projects/${encodeURIComponent(projectName)}/parallel-agents/status`)
+}
+
+export async function startParallelAgents(
+ projectName: string,
+ numAgents: number = 2,
+ yoloMode: boolean = false
+): Promise {
+ return fetchJSON(`/projects/${encodeURIComponent(projectName)}/parallel-agents/start`, {
+ method: 'POST',
+ body: JSON.stringify({ num_agents: numAgents, yolo_mode: yoloMode }),
+ })
+}
+
+export async function stopParallelAgents(
+ projectName: string
+): Promise {
+ return fetchJSON(`/projects/${encodeURIComponent(projectName)}/parallel-agents/stop`, {
+ method: 'POST',
+ })
+}
+
+export async function pauseParallelAgents(
+ projectName: string
+): Promise {
+ return fetchJSON(`/projects/${encodeURIComponent(projectName)}/parallel-agents/pause`, {
+ method: 'POST',
+ })
+}
+
+export async function resumeParallelAgents(
+ projectName: string
+): Promise {
+ return fetchJSON(`/projects/${encodeURIComponent(projectName)}/parallel-agents/resume`, {
+ method: 'POST',
+ })
+}
+
+export async function mergeParallelWorktrees(
+ projectName: string
+): Promise<{ success: boolean; agents: Record; message: string }> {
+ return fetchJSON(`/projects/${encodeURIComponent(projectName)}/parallel-agents/merge`, {
+ method: 'POST',
+ })
+}
+
+export async function cleanupParallelAgents(
+ projectName: string
+): Promise<{ success: boolean; message: string }> {
+ return fetchJSON(`/projects/${encodeURIComponent(projectName)}/parallel-agents/cleanup`, {
+ method: 'POST',
+ })
+}
+
// ============================================================================
// Spec Creation API
// ============================================================================
diff --git a/ui/src/lib/types.ts b/ui/src/lib/types.ts
index c5de1958..5e81179a 100644
--- a/ui/src/lib/types.ts
+++ b/ui/src/lib/types.ts
@@ -66,6 +66,7 @@ export interface Feature {
steps: string[]
passes: boolean
in_progress: boolean
+ assigned_agent_id: string | null // Agent working on this feature
}
export interface FeatureListResponse {
@@ -98,6 +99,27 @@ export interface AgentActionResponse {
message: string
}
+// Parallel agent types
+export interface ParallelAgentInfo {
+ agent_id: string
+ status: 'stopped' | 'running' | 'paused' | 'crashed' | 'unknown'
+ pid: number | null
+ started_at: string | null
+ worktree_path: string | null
+}
+
+export interface ParallelAgentsStatus {
+ agents: ParallelAgentInfo[]
+ total_running: number
+ max_agents: number
+}
+
+export interface ParallelAgentActionResponse {
+ success: boolean
+ agents: Record
+ message: string
+}
+
// Setup types
export interface SetupStatus {
claude_cli: boolean
diff --git a/ui/tsconfig.tsbuildinfo b/ui/tsconfig.tsbuildinfo
deleted file mode 100644
index 8bf9c84a..00000000
--- a/ui/tsconfig.tsbuildinfo
+++ /dev/null
@@ -1 +0,0 @@
-{"root":["./src/app.tsx","./src/main.tsx","./src/vite-env.d.ts","./src/components/addfeatureform.tsx","./src/components/agentcontrol.tsx","./src/components/agentthought.tsx","./src/components/assistantchat.tsx","./src/components/assistantfab.tsx","./src/components/assistantpanel.tsx","./src/components/chatmessage.tsx","./src/components/debuglogviewer.tsx","./src/components/featurecard.tsx","./src/components/featuremodal.tsx","./src/components/folderbrowser.tsx","./src/components/kanbanboard.tsx","./src/components/kanbancolumn.tsx","./src/components/newprojectmodal.tsx","./src/components/progressdashboard.tsx","./src/components/projectselector.tsx","./src/components/questionoptions.tsx","./src/components/setupwizard.tsx","./src/components/speccreationchat.tsx","./src/components/typingindicator.tsx","./src/hooks/useassistantchat.ts","./src/hooks/usecelebration.ts","./src/hooks/usefeaturesound.ts","./src/hooks/useprojects.ts","./src/hooks/usespecchat.ts","./src/hooks/usewebsocket.ts","./src/lib/api.ts","./src/lib/types.ts"],"version":"5.6.3"}
\ No newline at end of file
diff --git a/worktree.py b/worktree.py
new file mode 100644
index 00000000..bb1e53a9
--- /dev/null
+++ b/worktree.py
@@ -0,0 +1,340 @@
+"""
+Git Worktree Management
+=======================
+
+Manages git worktrees for parallel agent execution.
+Each agent gets its own isolated working directory while sharing
+the same git repository and feature database.
+"""
+
+import logging
+import subprocess
+from pathlib import Path
+from typing import Optional
+
+logger = logging.getLogger(__name__)
+
+
+class WorktreeManager:
+ """
+ Manages git worktrees for parallel agents.
+
+ Each worktree provides an isolated working directory where an agent
+ can make changes without conflicting with other agents.
+ """
+
+ def __init__(self, project_dir: Path):
+ """
+ Initialize the worktree manager.
+
+ Args:
+ project_dir: The main project directory (must be a git repo)
+ """
+ self.project_dir = project_dir.resolve()
+ self.worktrees_dir = self.project_dir.parent / f".{self.project_dir.name}_worktrees"
+
+ def _run_git(self, *args: str, cwd: Optional[Path] = None) -> subprocess.CompletedProcess:
+ """Run a git command and return the result."""
+ cmd = ["git"] + list(args)
+ return subprocess.run(
+ cmd,
+ cwd=cwd or self.project_dir,
+ capture_output=True,
+ text=True,
+ )
+
+ def is_git_repo(self) -> bool:
+ """Check if the project directory is a git repository."""
+ result = self._run_git("rev-parse", "--git-dir")
+ return result.returncode == 0
+
+ def ensure_git_repo(self) -> bool:
+ """
+ Ensure the project directory is a git repository.
+ Initializes one if it doesn't exist.
+
+ Returns:
+ True if repo exists or was created, False on error
+ """
+ if self.is_git_repo():
+ return True
+
+ logger.info(f"Initializing git repository in {self.project_dir}")
+ result = self._run_git("init")
+ if result.returncode != 0:
+ logger.error(f"Failed to initialize git repo: {result.stderr}")
+ return False
+
+ # Create initial commit so worktrees can branch from it
+ result = self._run_git("add", "-A")
+ if result.returncode != 0:
+ logger.error(f"Git add failed: {result.stderr}")
+ return False
+
+ result = self._run_git("commit", "-m", "Initial commit for parallel agents", "--allow-empty")
+ if result.returncode != 0:
+ logger.error(f"Git commit failed: {result.stderr}")
+ return False
+
+ return True
+
+ def get_worktree_path(self, agent_id: str) -> Path:
+ """Get the path for an agent's worktree."""
+ return self.worktrees_dir / f"agent_{agent_id}"
+
+ def create_worktree(self, agent_id: str, branch_name: Optional[str] = None) -> Optional[Path]:
+ """
+ Create a worktree for an agent.
+
+ Args:
+ agent_id: Unique identifier for the agent
+ branch_name: Optional branch name (defaults to agent-{agent_id})
+
+ Returns:
+ Path to the worktree, or None on failure
+ """
+ if not self.ensure_git_repo():
+ return None
+
+ worktree_path = self.get_worktree_path(agent_id)
+ branch = branch_name or f"agent-{agent_id}"
+
+ # Check if worktree already exists
+ if worktree_path.exists():
+ logger.info(f"Worktree already exists for agent {agent_id}")
+ return worktree_path
+
+ # Ensure worktrees directory exists
+ self.worktrees_dir.mkdir(parents=True, exist_ok=True)
+
+ # Get current branch/HEAD for base
+ result = self._run_git("rev-parse", "HEAD")
+ if result.returncode != 0:
+ # No commits yet, create one
+ commit_result = self._run_git("commit", "--allow-empty", "-m", "Initial commit")
+ if commit_result.returncode != 0:
+ logger.error(f"Failed to create initial commit: {commit_result.stderr}")
+ return None
+ result = self._run_git("rev-parse", "HEAD")
+ if result.returncode != 0:
+ logger.error(f"Failed to get HEAD ref after initial commit: {result.stderr}")
+ return None
+
+ base_ref = result.stdout.strip()
+
+ # Create the worktree with a new branch
+ result = self._run_git(
+ "worktree", "add",
+ "-b", branch,
+ str(worktree_path),
+ base_ref
+ )
+
+ if result.returncode != 0:
+ # Branch might already exist, try without -b
+ result = self._run_git(
+ "worktree", "add",
+ str(worktree_path),
+ branch
+ )
+
+ if result.returncode != 0:
+ logger.error(f"Failed to create worktree: {result.stderr}")
+ return None
+
+ logger.info(f"Created worktree for agent {agent_id} at {worktree_path}")
+
+ # Copy features.db to worktree (symlink would be better but cross-platform issues)
+ self._setup_shared_resources(worktree_path)
+
+ return worktree_path
+
+ def _setup_shared_resources(self, worktree_path: Path) -> None:
+ """
+ Set up shared resources in the worktree.
+
+ The features.db is shared across all worktrees via symlink.
+ This is critical for atomic feature claiming via feature_claim_next().
+
+ Raises:
+ RuntimeError: If features.db cannot be shared with the worktree.
+ """
+ # Create symlink to shared features.db
+ features_db = self.project_dir / "features.db"
+ worktree_db = worktree_path / "features.db"
+
+ if features_db.exists() and not worktree_db.exists():
+ try:
+ # Try symlink first (preferred)
+ worktree_db.symlink_to(features_db)
+ logger.debug(f"Created symlink to features.db in {worktree_path}")
+ except OSError as e:
+ # Symlink failed (common on Windows without admin privileges)
+ # This is OK because parallel_agent_runner.py sets PROJECT_DIR
+ # environment variable to the main project directory, and the
+ # MCP server uses that env var to locate features.db
+ logger.info(
+ f"Symlink creation failed ({e}), but this is OK - "
+ f"MCP server uses PROJECT_DIR env var to access {features_db}"
+ )
+ # Write a marker file for debugging purposes only
+ # (not read by MCP server, just useful for troubleshooting)
+ db_path_file = worktree_path / ".features_db_path"
+ db_path_file.write_text(str(features_db))
+ logger.debug(f"Wrote features.db path marker to {db_path_file}")
+
+ # Copy prompts directory if it exists
+ prompts_dir = self.project_dir / "prompts"
+ worktree_prompts = worktree_path / "prompts"
+ if prompts_dir.exists() and not worktree_prompts.exists():
+ try:
+ worktree_prompts.symlink_to(prompts_dir)
+ except OSError:
+ import shutil
+ shutil.copytree(prompts_dir, worktree_prompts)
+
+ def remove_worktree(self, agent_id: str) -> bool:
+ """
+ Remove a worktree for an agent.
+
+ Args:
+ agent_id: Unique identifier for the agent
+
+ Returns:
+ True if successful, False otherwise
+ """
+ worktree_path = self.get_worktree_path(agent_id)
+
+ if not worktree_path.exists():
+ return True
+
+ # Remove the worktree
+ result = self._run_git("worktree", "remove", str(worktree_path), "--force")
+
+ if result.returncode != 0:
+ logger.warning(f"Failed to remove worktree: {result.stderr}")
+ # Try manual removal
+ import shutil
+ try:
+ shutil.rmtree(worktree_path)
+ except Exception as e:
+ logger.error(f"Failed to manually remove worktree: {e}")
+ return False
+
+ # Prune worktree references
+ self._run_git("worktree", "prune")
+
+ logger.info(f"Removed worktree for agent {agent_id}")
+ return True
+
+ def list_worktrees(self) -> list[dict]:
+ """
+ List all active worktrees.
+
+ Returns:
+ List of dicts with worktree info (path, branch, head)
+ """
+ result = self._run_git("worktree", "list", "--porcelain")
+
+ if result.returncode != 0:
+ return []
+
+ worktrees = []
+ current = {}
+
+ for line in result.stdout.strip().split("\n"):
+ if not line:
+ if current:
+ worktrees.append(current)
+ current = {}
+ continue
+
+ if line.startswith("worktree "):
+ current["path"] = line[9:]
+ elif line.startswith("HEAD "):
+ current["head"] = line[5:]
+ elif line.startswith("branch "):
+ current["branch"] = line[7:]
+ elif line == "bare":
+ current["bare"] = True
+ elif line == "detached":
+ current["detached"] = True
+
+ if current:
+ worktrees.append(current)
+
+ return worktrees
+
+ def merge_worktree_changes(self, agent_id: str, commit_message: Optional[str] = None) -> bool:
+ """
+ Merge changes from an agent's worktree back to main branch.
+
+ Args:
+ agent_id: Unique identifier for the agent
+ commit_message: Optional commit message
+
+ Returns:
+ True if successful, False otherwise
+ """
+ worktree_path = self.get_worktree_path(agent_id)
+ branch = f"agent-{agent_id}"
+
+ if not worktree_path.exists():
+ logger.error(f"Worktree for agent {agent_id} does not exist")
+ return False
+
+ # Commit any uncommitted changes in the worktree
+ self._run_git("add", "-A", cwd=worktree_path)
+ msg = commit_message or f"Agent {agent_id} changes"
+ self._run_git("commit", "-m", msg, "--allow-empty", cwd=worktree_path)
+
+ # Get the target branch to merge into (default to "main")
+ result = self._run_git("branch", "--show-current")
+ target_branch = result.stdout.strip() or "main"
+
+ # Ensure we're on the target branch before merging
+ result = self._run_git("checkout", target_branch)
+ if result.returncode != 0:
+ logger.error(f"Failed to checkout {target_branch}: {result.stderr}")
+ return False
+
+ # Merge the agent branch into the target branch
+ result = self._run_git("merge", branch, "--no-edit")
+
+ if result.returncode != 0:
+ logger.warning(
+ f"Merge conflict for agent {agent_id}. "
+ f"Agent branch: {branch}. Error: {result.stderr}"
+ )
+ logger.warning(
+ f"Manual resolution required. Worktree at: {worktree_path}"
+ )
+ # Abort the merge to clean up
+ self._run_git("merge", "--abort")
+ return False
+
+ logger.info(f"Merged changes from agent {agent_id}")
+ return True
+
+ def cleanup_all_worktrees(self) -> None:
+ """Remove all worktrees and clean up."""
+ worktrees = self.list_worktrees()
+
+ for wt in worktrees:
+ path = Path(wt.get("path", ""))
+ # Use is_relative_to() for robust path matching instead of string matching
+ # This avoids false positives from substring matches
+ if path != self.project_dir and path.is_relative_to(self.worktrees_dir):
+ # Extract agent_id from path
+ agent_id = path.name.replace("agent_", "")
+ self.remove_worktree(agent_id)
+
+ # Clean up worktrees directory if empty
+ if self.worktrees_dir.exists():
+ try:
+ self.worktrees_dir.rmdir()
+ except OSError:
+ pass # Directory not empty
+
+ # Prune stale worktree references
+ self._run_git("worktree", "prune")