Skip to content

feat: enhance repair command to recreate core agents and default workspace#327

Open
buggtb wants to merge 2 commits intodlorenc:mainfrom
spiculedata:multiclaude/happy-tiger
Open

feat: enhance repair command to recreate core agents and default workspace#327
buggtb wants to merge 2 commits intodlorenc:mainfrom
spiculedata:multiclaude/happy-tiger

Conversation

@buggtb
Copy link
Copy Markdown

@buggtb buggtb commented Jan 27, 2026

Summary

This PR enhances the repair command with the ability to recreate core agents and default workspace. It builds on PR #324 with a lint fix.

  • Enhances repair command to recreate missing core agents (supervisor, merge-queue/pr-shepherd)
  • Adds ability to recreate default workspace if missing
  • Fixes gofmt alignment issue in daemon.go

Note: This supersedes PR #324 (from aronchick's fork) with an additional lint fix. Original PR had a gofmt failure that I couldn't push to directly.

Test plan

  • Run golangci-lint run ./... - should pass with 0 issues
  • Run go test ./... - all tests should pass
  • Test repair command manually with missing agents

🤖 Generated with Claude Code

aronchick and others added 2 commits January 27, 2026 00:27
…space

Improve the repair command to be more comprehensive by ensuring core
agents and a default workspace exist after cleanup. This enhancement
aligns with ROADMAP.md P1 "Agent restart" by making repair more robust
and reducing the need for manual intervention.

Changes:
- CLI: Add ensureCoreAgents() and ensureDefaultWorkspace() helpers
- CLI: Update localRepair() to recreate missing core agents
- CLI: Create default workspace "my-default-2" if none exist
- Daemon: Add ensureCoreAgents() and ensureDefaultWorkspace() methods
- Daemon: Update handleRepairState() to recreate missing agents
- Both: Improve output to show what was removed and what was created
- Tests: Add comprehensive tests for all scenarios

Key Features:
1. Recreates missing supervisor agent if absent
2. Recreates missing merge-queue (non-fork) or pr-shepherd (fork)
3. Creates default workspace if no workspaces exist
4. Does not duplicate existing agents/workspaces
5. Provides detailed output showing:
   - Removed: dead agents
   - Cleaned: orphaned resources
   - Created: core agents and workspaces

Test Coverage:
- TestRepairEnsuringCoreAgents: Verifies core agents are created
- TestRepairEnsuringPRShepherdInForkMode: Fork mode verification
- TestRepairDoesNotDuplicateAgents: Prevents duplicates

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
Adjust map literal key alignment to satisfy gofmt.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
@aronchick
Copy link
Copy Markdown
Contributor

Closing as superseded by #333 which resolves the merge conflicts and has CI passing.

@aronchick
Copy link
Copy Markdown
Contributor

Superseded by #333

@aronchick
Copy link
Copy Markdown
Contributor

Merge Queue Status: Blocked on merge conflicts + workflow approval needed for fork PR. A maintainer needs to approve the workflow run and fix conflicts before CI can run.

@aronchick
Copy link
Copy Markdown
Contributor

Closing: Superseded by PR #333 which resolves merge conflicts and has passing CI.

@aronchick
Copy link
Copy Markdown
Contributor

Closing: source branch multiclaude/happy-tiger no longer exists in remote. Appears to have been abandoned or cleaned up.

@aronchick
Copy link
Copy Markdown
Contributor

Closing: Superseded by #333 which has passing CI and resolves merge conflicts. Source branch multiclaude/happy-tiger no longer exists in remote.

@aronchick
Copy link
Copy Markdown
Contributor

Merge Queue Assessment: This PR should be closed - superseded by #333 which has passing CI and resolves merge conflicts. Source branch multiclaude/happy-tiger no longer exists in remote.

@aronchick
Copy link
Copy Markdown
Contributor

Closing: Superseded by #333. Source branch multiclaude/happy-tiger no longer exists in remote.

@aronchick
Copy link
Copy Markdown
Contributor

Merge Queue Agent: This PR should be closed - superseded by #333 and source branch no longer exists. Awaiting maintainer action.

@aronchick
Copy link
Copy Markdown
Contributor

Closing: Superseded by #333, source branch no longer exists.

@colek42
Copy link
Copy Markdown

colek42 commented Feb 19, 2026

Closing as superseded by #333 which has green CI and is mergeable.

@whitmo
Copy link
Copy Markdown

whitmo commented Mar 1, 2026

Closing: superseded by #333, source branch deleted, and has merge conflicts.

@whitmo
Copy link
Copy Markdown

whitmo commented Mar 1, 2026

This PR appears stale — superseded by #333, source branch deleted, and has merge conflicts. Recommending close.

@whitmo
Copy link
Copy Markdown

whitmo commented Mar 2, 2026

Closing: Superseded by #333 which has green CI and is mergeable. Source branch deleted, this PR has merge conflicts.

@whitmo
Copy link
Copy Markdown

whitmo commented Mar 3, 2026

Closing: Superseded by #333. Source branch deleted and PR has merge conflicts.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

multiclaude PRs created by multiclaude workers

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants