Skip to content

fix: add auto-repair for state inconsistencies in init and workspace add #322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dlorenc merged 1 commit into from
Jan 28, 2026
Merged

fix: add auto-repair for state inconsistencies in init and workspace add #322

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 41 additions & 14 deletions internal/cli/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,8 +1082,7 @@ func (c *CLI) initRepo(args []string) error {

// Check if daemon is running
client := socket.NewClient(c.paths.DaemonSock)
_, err := client.Send(socket.Request{Command: "ping"})
if err != nil {
if _, err := client.Send(socket.Request{Command: "ping"}); err != nil {
return errors.DaemonNotRunning()
}

Expand All @@ -1096,6 +1095,22 @@ func (c *CLI) initRepo(args []string) error {
return fmt.Errorf("repository '%s' is already initialized\nUse 'multiclaude repo rm %s' to remove it first, or choose a different name", repoName, repoName)
}

// Check if tmux session already exists (stale session from previous incomplete init)
tmuxSession := sanitizeTmuxSessionName(repoName)
if tmuxSession == "mc-" {
return fmt.Errorf("invalid tmux session name: repository name cannot be empty")
}
tmuxClient := tmux.NewClient()
if exists, err := tmuxClient.HasSession(context.Background(), tmuxSession); err == nil && exists {
fmt.Printf("Warning: Tmux session '%s' already exists\n", tmuxSession)
fmt.Printf("This may be from a previous incomplete initialization.\n")
fmt.Printf("Auto-repairing: killing existing tmux session...\n")
if err := tmuxClient.KillSession(context.Background(), tmuxSession); err != nil {
return fmt.Errorf("failed to clean up existing tmux session: %w\nPlease manually kill it with: tmux kill-session -t %s", err, tmuxSession)
}
fmt.Println("✓ Cleaned up stale tmux session")
}

// Check if repository directory already exists
repoPath := c.paths.RepoDir(repoName)
if _, err := os.Stat(repoPath); err == nil {
Expand Down Expand Up @@ -1154,18 +1169,7 @@ func (c *CLI) initRepo(args []string) error {
return fmt.Errorf("failed to copy agent templates: %w", err)
}

// Create tmux session
tmuxSession := sanitizeTmuxSessionName(repoName)
if tmuxSession == "mc-" {
return fmt.Errorf("invalid tmux session name: repository name cannot be empty")
}

// Check if tmux session already exists
checkCmd := exec.Command("tmux", "has-session", "-t", tmuxSession)
if checkCmd.Run() == nil {
return fmt.Errorf("tmux session '%s' already exists\nKill it with 'tmux kill-session -t %s' or use 'multiclaude repo rm %s'", tmuxSession, tmuxSession, repoName)
}

// Create tmux session (tmuxSession already defined and validated earlier)
fmt.Printf("Creating tmux session: %s\n", tmuxSession)

// Create session with supervisor window
Expand Down Expand Up @@ -2930,6 +2934,17 @@ func (c *CLI) addWorkspace(args []string) error {
wtPath := c.paths.AgentWorktree(repoName, workspaceName)
branchName := fmt.Sprintf("workspace/%s", workspaceName)

// Check if worktree path already exists (from previous incomplete workspace add)
if _, err := os.Stat(wtPath); err == nil {
fmt.Printf("Warning: Worktree path '%s' already exists\n", wtPath)
fmt.Printf("This may be from a previous incomplete workspace creation.\n")
fmt.Printf("Auto-repairing: removing existing worktree...\n")
if err := wt.Remove(wtPath, true); err != nil {
return fmt.Errorf("failed to clean up existing worktree: %w\nPlease manually remove it with: git worktree remove %s", err, wtPath)
}
fmt.Println("✓ Cleaned up stale worktree")
}

fmt.Printf("Creating worktree at: %s\n", wtPath)
if err := wt.CreateNewBranch(wtPath, branchName, startBranch); err != nil {
return errors.WorktreeCreationFailed(err)
Expand All @@ -2938,6 +2953,18 @@ func (c *CLI) addWorkspace(args []string) error {
// Get tmux session name
tmuxSession := sanitizeTmuxSessionName(repoName)

// Check if tmux window already exists (stale window from previous incomplete workspace add)
tmuxClient := tmux.NewClient()
if exists, err := tmuxClient.HasWindow(context.Background(), tmuxSession, workspaceName); err == nil && exists {
fmt.Printf("Warning: Tmux window '%s' already exists in session '%s'\n", workspaceName, tmuxSession)
fmt.Printf("This may be from a previous incomplete workspace creation.\n")
fmt.Printf("Auto-repairing: killing existing tmux window...\n")
if err := tmuxClient.KillWindow(context.Background(), tmuxSession, workspaceName); err != nil {
return fmt.Errorf("failed to clean up existing tmux window: %w\nPlease manually kill it with: tmux kill-window -t %s:%s", err, tmuxSession, workspaceName)
}
fmt.Println("✓ Cleaned up stale tmux window")
}

// Create tmux window for workspace (detached so it doesn't switch focus)
fmt.Printf("Creating tmux window: %s\n", workspaceName)
cmd := exec.Command("tmux", "new-window", "-d", "-t", tmuxSession, "-n", workspaceName, "-c", wtPath)
Expand Down