feat: multi repo projects #1516
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
There was a problem hiding this comment.
Pull request overview
This pull request implements comprehensive multi-repository project support, transforming the application from single-repository to multi-repository architecture. Projects can now contain multiple Git repositories, with scripts and configurations managed per-repository rather than per-project. The implementation includes database migrations, workspace management for multi-repo worktrees, and extensive UI changes to support repository selection and management.
Key Changes:
- Introduced
Repo,ProjectRepo, andAttemptRepodatabase models to support many-to-many relationships between projects and repositories - Migrated from single worktree per attempt to workspace-based architecture containing multiple repository worktrees
- Moved repository-specific scripts (setup, cleanup, copy_files) from Project to ProjectRepo level
- Updated all Git operations (push, merge, rebase, PR creation) to be repository-specific
Reviewed changes
Copilot reviewed 101 out of 163 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| shared/types.ts | Added multi-repo types (Repo, ProjectRepo, AttemptRepo, etc.) and updated existing types to remove single-repo fields |
| package.json | Updated pnpm version to 10.23.0 |
| frontend/src/pages/settings/ProjectSettings.tsx | Complete rewrite to manage multiple repositories with separate scripts per repo |
| frontend/src/pages/ProjectTasks.tsx | Updated to handle multi-repo branch status and repository selection |
| frontend/src/lib/api.ts | Added repository management APIs and updated Git operation APIs to require repo_id |
| frontend/src/hooks/* | Multiple hooks updated/created for multi-repo support (useAttemptRepo, useRepoBranchSelection, etc.) |
| frontend/src/components/tasks/* | Updated task components to support repository selection and per-repo operations |
| frontend/src/components/dialogs/* | Added RepoPickerDialog and updated existing dialogs for multi-repo workflows |
| crates/services/src/services/worktree_manager.rs | Enhanced to find worktree names dynamically and support worktree migration |
| crates/services/src/services/workspace_manager.rs | New service for managing multi-repo workspaces |
| crates/services/src/services/project.rs | New service extracting project logic with multi-repo support |
| crates/services/src/services/repo.rs | New service for repository registration and initialization |
| crates/services/src/services/container.rs | Updated to create workspaces, handle per-repo scripts, and backfill repo names |
| crates/services/src/services/diff_stream.rs | Added path prefixing for multi-repo diffs |
| crates/server/src/routes/tasks.rs | Updated task creation/deletion for multi-repo workspaces |
| crates/server/src/routes/task_attempts/* | Extensive updates for per-repo Git operations |
| crates/server/src/routes/repo.rs | New routes for repository registration and initialization |
| crates/db/src/models/* | New models for attempt_repo, project_repo, repo, and execution_process_repo_state |
The implementation appears well-structured with proper separation of concerns, comprehensive error handling, and backwards compatibility through migration logic. The changes enable powerful multi-repository workflows while maintaining the existing user experience for single-repository projects.
Files not reviewed (59)
- crates/db/.sqlx/query-04520564f1eaac8491598976ff58b540443f2f1dc35b5a186f243b297089e34b.json: Language not supported
- crates/db/.sqlx/query-066723f137b290d5863918c976100b674ce2f08c75cf53705ddc2259b9e64093.json: Language not supported
- crates/db/.sqlx/query-08e34e1618c0fa396fcb4d98b27c87810b1d1281d52463981910160257f60948.json: Language not supported
- crates/db/.sqlx/query-0b8f4a030c51a0910ac0b6c79965ec94a957a5d680d004aed4e56302c90f22a0.json: Language not supported
- crates/db/.sqlx/query-0c9ee0273c78ae47634deb65dba5c052d7d21810b34bcd0bd498e4fc3de0b259.json: Language not supported
- crates/db/.sqlx/query-0cc11bb9acffabc6f173cdbaac3be4c84fb1f2802364ac996285b611cb83c3bf.json: Language not supported
- crates/db/.sqlx/query-1163d3dcc69f930d52dbf8175689aa16b4419b7c1bead43eedef4c82e8a5c442.json: Language not supported
- crates/db/.sqlx/query-1394d6317296aa95af82b78e038e40a929ad163d4986208bfebb243ed7372199.json: Language not supported
- crates/db/.sqlx/query-196a97c709d226c23b957cc258c57f0d6cd35b1a6aeef879c7f6dfa89fc85539.json: Language not supported
- crates/db/.sqlx/query-1c513f6c9d9025fa5dda8133a1be2d620301068c177d13b12a776c8c88104e2b.json: Language not supported
- crates/db/.sqlx/query-1c652bb5d039cdcef8e5cc64e283771b6e49fdf3abea89652d2bc57dafd2c63d.json: Language not supported
- crates/db/.sqlx/query-1d1e6e666a1bebda4a5bed5ba09ec2c596ca614bc41c88d5bd571513190d9210.json: Language not supported
- crates/db/.sqlx/query-1d1fccd2d177a09d3e1d091ca90349f2fc5a5a77e36bec46765f98cd4ee9c837.json: Language not supported
- crates/db/.sqlx/query-216193a63f7b0fb788566b63f56d83ee3d344a5c85e1a5999247b6a44f3ae390.json: Language not supported
- crates/db/.sqlx/query-256f9e937384933464e6d4d00ee977bbb2915ef80930c8b5c0b0525367a5264d.json: Language not supported
- crates/db/.sqlx/query-2c9c27d9781af4e7c1b5a6f15530c420255fcf6844fdc708422da887760c2693.json: Language not supported
- crates/db/.sqlx/query-3893e8aa7f30ac45d817eb19bbea6c4afc9ab8ad001039593350b658ea970f3f.json: Language not supported
- crates/db/.sqlx/query-417a8b1ff4e51de82aea0159a3b97932224dc325b23476cb84153d690227fd8b.json: Language not supported
- crates/db/.sqlx/query-46139a0b9debe5889e7d35b3cf9b20edec27573bb555a66fbb27cd78161392af.json: Language not supported
- crates/db/.sqlx/query-48c556a5317e6ea77595a8fdc410d30df50c8405adf38b371fdf0a1bde8c0083.json: Language not supported
- crates/db/.sqlx/query-48d739a2a08eb133819d2e20252ccf10c739b6f55adb5453b683a4f19f653abe.json: Language not supported
- crates/db/.sqlx/query-4c94c98354b370bf16a74ef172bfb6bdfae114ecb8ad06ec8f02a0c84a42518a.json: Language not supported
- crates/db/.sqlx/query-4d84b308a2cc7677da65111d080bf02e5e35c052048360d3dbea656bbbcd3edb.json: Language not supported
- crates/db/.sqlx/query-4e7ef1b4c55cd0651e3c1f0535dbc29ad857c3fc7ec80d0ce5cb9bf097ea6490.json: Language not supported
- crates/db/.sqlx/query-4e9e0acca10277c51bb132d71946e3da50286e7873807cc0e96a3243e3c18449.json: Language not supported
- crates/db/.sqlx/query-522e135173280ab71f7ba25b35efccb3eaeb7dc5fe778595887f70f62aae8df7.json: Language not supported
- crates/db/.sqlx/query-531221cc4af491b49341e7da7667d2044248eae2fec185b5047160351d897633.json: Language not supported
- crates/db/.sqlx/query-59f5b5a5d4ec2a614c039fb84ecf5081e7ec23ef0fef7cfe2b60ec9fc9d69d18.json: Language not supported
- crates/db/.sqlx/query-5ab2baf9bee3fb408b31e8ce408220b741ca5e6fac93e71f93a14fb345c6c704.json: Language not supported
- crates/db/.sqlx/query-5ae74dcee62a835018743862b2beceb7231696a0775ba2f144a0b1ecc8bfd56d.json: Language not supported
- crates/db/.sqlx/query-5ee85b756876291353e65af979c25041b25e55abdd3bc87e322b096cd3045c41.json: Language not supported
- crates/db/.sqlx/query-646b154264a385be5151883b2609afff05f90215e0ba73c358c43f7dcec077d8.json: Language not supported
- crates/db/.sqlx/query-75dbab0c6b6c0d565d9b71f76a19ed5123453236e0db157ee26ed1429be0cd9f.json: Language not supported
- crates/db/.sqlx/query-79e1e11b83c786c6d5a985ab045b6bd122d5efa920225dadc9fedb6592c6e0a3.json: Language not supported
- crates/db/.sqlx/query-7b2ab5f95df4b4044595b99352f94aff0fb372fd14d9a24f3e826300d662c33c.json: Language not supported
- crates/db/.sqlx/query-7e319778faa593b7a88ad15e68ef86bf4e3ebc46e6cd0bc23238b8fc289a1ab3.json: Language not supported
- crates/db/.sqlx/query-89456999655b359d8cf6c25af09f1f7060f2cfc12affde63ec14fedad527e4d0.json: Language not supported
- crates/db/.sqlx/query-921d5710f2e19167d69b60da029246dfce714f1fc57d6625dd752b7aa644b497.json: Language not supported
- crates/db/.sqlx/query-929cd77c5aa8015af36aa70ef830d030788b96aaddcef73aed4e8c7d7d5dee46.json: Language not supported
- crates/db/.sqlx/query-92cb5228802d105bcfe9e36083f314c7c38039711bb50a21fc1dbbae84d80426.json: Language not supported
- crates/db/.sqlx/query-93490c773692b5cb8cc89e49312fe01c217e5b2cf21be971d729f3413331f139.json: Language not supported
- crates/db/.sqlx/query-95a70bd9af6b3d056397caea73668ced06790fa7c897a108760499b6bdf4416a.json: Language not supported
- crates/db/.sqlx/query-9f8ab7d7c2660321412117bfb55e3b2b9ccd7b9ed2679fb8ccca0a36996e6e21.json: Language not supported
- crates/db/.sqlx/query-a225b1f2538d56812ca241b30a2dbd7d836da8b58567ef6a7ba44e77920cfd37.json: Language not supported
- crates/db/.sqlx/query-a235097176aa925424bf705f8a08dfb2e2b118324b9bee1b711a79a916b53810.json: Language not supported
- crates/db/.sqlx/query-ad871ca6b249e1f106e6688ab0b8032484912df3b4e83285c1b2d8787536f999.json: Language not supported
- crates/db/.sqlx/query-b3d74b3d2989032414d957f21cb6cc73ed9556e2cb806ef0ac4a6341fb5bea43.json: Language not supported
- crates/db/.sqlx/query-b7cd4296a045471797d67d28e441b70dda908cf5106748f67ff21296f45f09a0.json: Language not supported
- crates/db/.sqlx/query-bbc3a97f21c9b6c60a64cd747843837c3af677ab5d7a1167550ab1393ac07ea9.json: Language not supported
- crates/db/.sqlx/query-c00f47bc6ad969ae325c15a5ade865489b8b90309f68101b7ed39a517cf473cb.json: Language not supported
- crates/db/.sqlx/query-c6ca04f8ad0f3f918e83a3960b78f1f5215066f9bb46917fc8e50afe86a6da73.json: Language not supported
- crates/db/.sqlx/query-c72348c44cbae9a9605c6d069b97e1391a7fb3600290df9521cf2d8841a3f2b2.json: Language not supported
- crates/db/.sqlx/query-ca9bf02f45ee9f0bedd06cac3b24a107ba25d8f70f202521383e585158df303e.json: Language not supported
- crates/db/.sqlx/query-cff3d8c29c20cb7ddf3c9ba4c7f8a1191a60dacd760f5c711a947b3454735945.json: Language not supported
- crates/db/.sqlx/query-d5bb6b9584940367852c3ea74613da570956307d063f4d432ab4e9127e863091.json: Language not supported
- crates/db/.sqlx/query-e82f7fc1672ff56df544cc59fec2dba6d739d11567965be2cf3a1ca99beccae2.json: Language not supported
- crates/db/.sqlx/query-eeb190cd03af76eb61174d8b27812f2f3a7b6f4bdafdb298b46aedea19ca5623.json: Language not supported
- crates/db/.sqlx/query-ef18fdc450d20f2b5ef9db8d85419ba465bf0b6de99423e8416602168af0bdaa.json: Language not supported
- crates/db/.sqlx/query-fa9dcb3084ec7e943d974f7725986e4ae05a3a46a6e503b5e3f0787ebd5e9a96.json: Language not supported
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
* Inline ensure_worktree_path in task_attempts * Inline ensure_worktree_path in images and setups, remove ensure_worktree_path
* use find_repos_for_attempt rather than find_repos_for_project where possible * remove Repo::find_by_attempt_id
* Rename branches * Update crates/services/src/services/git.rs Co-authored-by: Alex Netsch <alex@bloop.ai> --------- Co-authored-by: Alex Netsch <alex@bloop.ai>
* cleanup create PR * Merge for multi repo projects
* All tasks completed successfully. Here's a summary of the changes made: ## Summary Added multi-repo support for rebase, following the same pattern as merge (commit 483060e). ### Files Modified **Backend:** 1. `crates/server/src/routes/task_attempts.rs`: - Added `repo_id: Uuid` field to `RebaseTaskAttemptRequest` struct (line 92) - Updated `rebase_task_attempt` function to: - Fetch specific `AttemptRepo` using `find_by_attempt_and_repo_id()` - Fetch the `Repo` using `Repo::find_by_id()` - Build `worktree_path` as `workspace_path.join(&repo.name)` - Use the specific repo's target branch - Update only that repo's target branch via `AttemptRepo::update_target_branch()` instead of `update_all_target_branches()` - Pass `worktree_path` to `rebase_branch()` instead of `workspace_path` **Frontend:** 2. `frontend/src/hooks/useRebase.ts`: - Added `repoId: string` to `RebaseMutationArgs` type - Pass `repo_id` in the request data 3. `frontend/src/components/tasks/Toolbar/GitOperations.tsx`: - Updated `handleRebaseWithNewBranchAndUpstream` to get `repoId` via `getSelectedRepoId()` and pass it to the rebase action **Auto-generated:** 4. `shared/types.ts` - Regenerated with `repo_id: string` in `RebaseTaskAttemptRequest` * All done. Both review comments have been addressed: 1. **Inlined `current_target_branch`** - Replaced the separate variable with `unwrap_or_else(|| attempt_repo.target_branch.clone())` calls directly 2. **Removed `update_all_target_branches`** - Deleted the unused function from `crates/db/src/models/attempt_repo.rs` since it's no longer needed after the multi-repo changes All checks pass.
) * All checks pass. Let me provide a summary of the changes made: I've added multi-repo support for the conflict handling (auto fix rebase) functionality. Here's what was changed: 1. Added `AbortConflictsRequest` struct with `repo_id: Uuid` field 2. Updated `abort_conflicts_task_attempt()` handler to: - Accept `repo_id` in the request body - Look up the specific repo by ID - Build the correct worktree path: `workspace_path.join(&repo.name)` - Pass the repo-specific worktree path to `abort_conflicts()` - Added `AbortConflictsRequest` to the list of exported types 1. **`frontend/src/lib/api.ts`**: - Updated `abortConflicts()` to accept `repoId` parameter and send it in the request body - Fixed `getBranchStatus()` return type from `BranchStatus[]` to `RepoBranchStatus[]` - Added `RepoBranchStatus` import, removed unused `BranchStatus` import 2. **`frontend/src/hooks/useAttemptConflicts.ts`**: - Added `repoId` parameter to the hook - Pass `repoId` to the API call 3. **`frontend/src/lib/conflicts.ts`**: - Added optional `repoName` parameter to `buildResolveConflictsInstructions()` - Added `repoName` parameter to `formatConflictHeader()` - Conflict resolution prompts now include repo context (e.g., "Rebase conflicts while rebasing 'branch' onto 'main' in repository 'my-repo'.") 4. **`frontend/src/components/tasks/follow-up/FollowUpConflictSection.tsx`**: - Updated `branchStatus` prop type from `BranchStatus[]` to `RepoBranchStatus[]` - Extract `repo_id` from first repo status and pass to `useAttemptConflicts()` 5. **`frontend/src/components/tasks/TaskFollowUpSection.tsx`**: - Pass `repo_name` to `buildResolveConflictsInstructions()` for multi-repo context in AI prompts Cleanup script changes for task attempt b833fb22-7a04-4c56-b82d-1afaa1074e78 * The type check passes. Now the `abortConflicts` API uses the generated `AbortConflictsRequest` type, which will catch any type mismatches if the backend type changes. * Done. Both components now find the first repo that actually has conflicts instead of just using the first repo in the array. The type check passes. * Done. Removed both comments as requested.
* I've successfully implemented multi-repo support for restoring commits. Here's a summary of the changes made: 1. **`crates/server/src/routes/execution_processes.rs`** - Added import for `ExecutionProcessRepoState` - Added new endpoint `get_execution_process_repo_states` that returns the per-repo commit states for an execution process - Added route `/repo-states` to the router 2. **`crates/server/src/bin/generate_types.rs`** - Added `ExecutionProcessRepoState::decl()` to export the type to TypeScript 3. **`frontend/src/lib/api.ts`** - Added import for `ExecutionProcessRepoState` - Added `getRepoStates` method to `executionProcessesApi` 4. **`frontend/src/components/dialogs/tasks/RestoreLogsDialog.tsx`** - Updated the `useEffect` hook to fetch repo states via the new API instead of trying to access `before_head_commit` directly from the execution process - Uses the first repo's `before_head_commit` for display (consistent with how merge handles multi-repo) 5. **`shared/types.ts`** - Auto-generated to include `ExecutionProcessRepoState` type The implementation follows the same pattern used for merge in commit 483060e, where the first repo is selected for operations that need a single repo (like displaying commit information in the restore dialog). Cleanup script changes for task attempt fefd6bd6-25e3-4775-b6af-c11ad3c06715 Let me provide a summary of the changes made: I've implemented multi-repo support for the restore dialog. Here are the changes: 1. **`frontend/src/lib/api.ts`** - Changed `getBranchStatus` return type from `BranchStatus[]` to `RepoBranchStatus[]` (which includes `repo_id` and `repo_name` fields) - Removed unused `BranchStatus` import 2. **`frontend/src/hooks/useRetryProcess.ts`** - Changed `branchStatus` type in `RetryProcessParams` from `BranchStatus | undefined` to `RepoBranchStatus[] | undefined` - Updated caller to not pass `attemptId` (no longer needed) 3. **`frontend/src/components/NormalizedConversation/RetryEditorInline.tsx`** - Changed `branchStatus: branchStatus?.[0]` to `branchStatus: branchStatus` to pass the full array instead of just the first element 4. **`frontend/src/components/dialogs/tasks/RestoreLogsDialog.tsx`** - Changed `branchStatus` prop type from `BranchStatus | undefined` to `RepoBranchStatus[] | undefined` - Removed `attemptId` from props (no longer used) - Changed state from single `targetSha` to array `repoStates: ExecutionProcessRepoState[]` - Added `repoInfo` useMemo that joins repo states with branch status to get repo names - Added aggregated values: `anyDirty`, `totalUncommitted`, `totalUntracked`, `anyNeedsReset`, `repoCount` - Updated UI to display: - Title shows "(X repos)" when multiple repos - Lists each repo with its name and target commit SHA - Aggregated uncommitted/untracked counts across all repos - For single-repo projects: Works exactly as before, shows one commit SHA - For multi-repo projects: Shows all repos being restored with their respective target commits, e.g.: ``` Reset worktree (2 repos) Your worktrees will be restored to these commits. 🔀 repo-a: abc1234 🔀 repo-b: def5678 ``` - Uncommitted changes warnings aggregate across all repos Revert "Let me provide a summary of the changes made:" This reverts commit 14eea8717b422bdd913c9ef54def44e6297d2efe. * I've completed all the changes. The rebase conflict is resolved and the multi-repo support is implemented. Here's a summary: - Changed `getBranchStatus` return type from `BranchStatus[]` to `RepoBranchStatus[]` - Changed import from `BranchStatus` to `RepoBranchStatus` - Changed `branchStatus` in `RetryProcessParams` from `BranchStatus | undefined` to `RepoBranchStatus[] | undefined` - Removed `attemptId` from the dialog call - Changed `branchStatus: branchStatus?.[0]` to `branchStatus: branchStatus` to pass the full array - Changed `branchStatus` prop from `BranchStatus | undefined` to `RepoBranchStatus[] | undefined` - Removed `attemptId` from props (no longer needed) - Changed state from single `targetSha` to array `repoStates: ExecutionProcessRepoState[]` - Added `repoInfo` useMemo to join repo states with branch status by `repo_id` - Added aggregated values: `anyDirty`, `totalUncommitted`, `totalUntracked`, `repoCount` - Updated UI to show all repos with their target commits when `repoCount > 1` The TypeScript check couldn't run in this worktree due to the pnpm workspace setup, but the implementation follows the same pattern that was working before. The main change is that the dialog now shows all repos being restored instead of just the first one. * The frontend type check passes. All rebase conflicts have been resolved: 1. **`frontend/src/lib/api.ts`** - Resolved: Kept `AbortConflictsRequest` import and typed `abortConflicts` function; removed unused `BranchStatus` import 2. **`frontend/src/hooks/useAttemptConflicts.ts`** - Resolved: Uses `{ repo_id: repoId }` object parameter 3. **`frontend/src/components/tasks/TaskFollowUpSection.tsx`** - Resolved: Removed comment conflict marker, kept HEAD code 4. **`frontend/src/components/tasks/follow-up/FollowUpConflictSection.tsx`** - Resolved: Removed comment conflict marker, kept HEAD code The rebase completed successfully and the frontend type check passes.
…ort for push and force push: (#1491) 1. **`crates/server/src/routes/task_attempts.rs`**: - Added `PushTaskAttemptRequest` struct with `repo_id: Uuid` field - Updated `push_task_attempt_branch` to accept `Json<PushTaskAttemptRequest>` and use the repo's worktree path - Updated `force_push_task_attempt_branch` to accept `Json<PushTaskAttemptRequest>` and use the repo's worktree path 2. **`crates/server/src/bin/generate_types.rs`**: - Added `PushTaskAttemptRequest::decl()` to export the type to TypeScript 3. **`frontend/src/lib/api.ts`**: - Updated `push()` and `forcePush()` to accept `PushTaskAttemptRequest` with `repo_id` 4. **`frontend/src/hooks/usePush.ts`**: - Added `PushParams` type with `repoId: string` - Updated mutation to accept params and pass `repo_id` to API - Added params to error callback for use in ForcePushDialog 5. **`frontend/src/hooks/useForcePush.ts`**: - Added `ForcePushParams` type with `repoId: string` - Updated mutation to accept params and pass `repo_id` to API 6. **`frontend/src/components/dialogs/git/ForcePushDialog.tsx`**: - Added `repoId` to props - Passes `repoId` to `forcePush.mutateAsync()` 7. **`frontend/src/hooks/useGitOperations.ts`**: - Updated push error handler to pass `repoId` to `ForcePushDialog.show()` 8. **`frontend/src/components/tasks/Toolbar/GitOperations.tsx`**: - Updated `handlePushClick` to get `repoId` and pass it to `git.actions.push()` Cleanup script changes for task attempt 7fea7193-f072-4b7d-8650-e85ef88f0e9f
* All tasks are complete. Here's a summary of the changes made:
**`crates/server/src/routes/task_attempts/pr.rs`:**
- Added import for `Query` from axum
- Added new type `GetPrCommentsQuery { repo_id: Uuid }`
- Modified `get_pr_comments` function to:
- Accept `Query(query): Query<GetPrCommentsQuery>` parameter
- Use `AttemptRepo::find_by_attempt_and_repo_id()` to look up the specific repo
- Use `Repo::find_by_id()` to get the repo path
- Use `repo.path` instead of `get_first_repo_path()`
**`crates/server/src/bin/generate_types.rs`:**
- Added `GetPrCommentsQuery::decl()` to export the type to TypeScript
**`frontend/src/lib/api.ts`:**
- Updated `getPrComments` to accept `repoId: string` parameter
- Added query string `?repo_id=${encodeURIComponent(repoId)}`
**`frontend/src/hooks/usePrComments.ts`:**
- Added `repoId` parameter to hook and query key
- Updated enabled condition to require both `attemptId` and `repoId`
**`frontend/src/components/dialogs/tasks/GitHubCommentsDialog.tsx`:**
- Added `repoId: string` to `GitHubCommentsDialogProps`
- Pass `repoId` to `usePrComments` hook
**`frontend/src/components/tasks/TaskFollowUpSection.tsx`:**
- Extract `repoId` from `branchStatus?.[0]?.repo_id`
- Pass `repoId` to `GitHubCommentsDialog.show()`
- Added `branchStatus` to useCallback dependencies
Cleanup script changes for task attempt 1fc865dd-4297-4eb6-9265-09f102b92252
* Extend merges to handel repo ID (vibe-kanban 3dd2880f)
Incrates/db/src/models/merge.rs make sure mergerow and related structs have a repo\_id field to support multi repo projects. This is needed to support e.g. fetching PR comments correctly, see last few commits
* The backend compiles successfully. The fix is complete.
## Summary
Fixed the review comment by changing `get_pr_comments` to use `Merge::find_by_task_attempt_and_repo_id()` instead of `Merge::find_latest_by_task_attempt_id()`. This ensures the PR comments are fetched for the specific repo, not just the latest merge across all repos.
* All done. Here's a summary of the changes:
1. **`crates/server/src/routes/task_attempts.rs`** - Updated `rename_branch` to check ALL repos for open PRs using `find_by_task_attempt_id` instead of just the latest merge
2. **`crates/db/src/models/merge.rs`** - Removed the `find_latest_by_task_attempt_id` function entirely
* All done. The frontend now uses `useAttemptRepo` hook with `repos[0]?.id` for repo selection, matching the pattern used by merge, rebase, push, and other git operations in `GitOperations.tsx`.
* Done. The changes:
1. Removed `firstRepoStatus = branchStatus?.[0]` (line 82)
2. Updated the merged PR check to iterate over ALL repos using `branchStatus?.some()`
3. Updated the useMemo dependency from `firstRepoStatus?.merges` to `branchStatus`
* Done. Added the `getSelectedRepoId` helper function to `TaskFollowUpSection.tsx`, matching the pattern used in `GitOperations.tsx`. This makes it easier to add repo selection in the future - when that feature is added, only the helper function needs to be updated.
* Done. The lint errors are fixed. Both the frontend and backend linting pass now. The `getSelectedRepoId` helper function is now wrapped in `useCallback` with `[repos]` as its dependency, matching the pattern used in `GitOperations.tsx`.
* override repos at a task_attempt level * simplify mcp * refer to repoIds on frontend; separate api call to register a repo obj * consolidate ProjectFormDialog
…anban) (#1505) * Conflicts are resolved in both files. I’m going to `git add` them and continue the rebase using a non‑interactive editor (`GIT_EDITOR=true`) so it won’t hang. * **Rebase Complete** - Resolved conflicts in `frontend/src/hooks/useAttemptRepo.ts` by keeping the new repo‑selection API (`repos`, `selectedRepoId`, `setSelectedRepoId`) and typing the query as `RepoWithTargetBranch[]`. - Resolved conflicts in `frontend/src/lib/api.ts` by keeping both `RepoWithTargetBranch` and `RepositoryBranches` imports (no conflict markers left). - Continued the rebase non‑interactively with `GIT_EDITOR=true`; rebase finished successfully. - Ran `pnpm -C frontend run check`; fixed a post‑rebase TS error by re‑adding the missing `GitBranch` import used by `repoApi.getBranches` in `frontend/src/lib/api.ts`. - Typecheck now passes and `git status` is clean. If you want, I can run `pnpm -C frontend run lint` or a workspace test sweep next. * Done. I made three small UI tweaks to improve readability. **What Changed** - Removed the dropdown caret/arrow in the repo selector button: - `frontend/src/components/tasks/RepoSelector.tsx` - Dropped the `ArrowDown` icon and its import so the selector is just folder icon + repo name. - Removed the arrow separator that came right after the repo chip in the toolbar: - `frontend/src/components/tasks/Toolbar/GitOperations.tsx` - Deleted the first `ArrowRight` that was between the repo chip and task-branch chip. - Replaced the gear icon with a clearer “switch” icon, and added spacing before branches: - `frontend/src/components/tasks/Toolbar/GitOperations.tsx` - Swapped `Settings` → `ArrowLeftRight` for both repo-change and target-branch-change buttons. - Added `ml-2` to the task branch chip so there’s visible separation from the repo selector area. **Checks** - `pnpm -C frontend run check` passes. If you want a different icon (e.g., `ChevronsUpDown`, `Pencil`, `Repeat`), tell me which lucide icon you prefer and I’ll swap it. * Cleanup script changes for task attempt 24ce3817-354c-48f7-a66c-3fb9e6fd019a * That behavior lines up with a create‑loop in the project creation dialog. I found a likely culprit and patched it. **Root Cause** - `frontend/src/components/dialogs/projects/ProjectFormDialog.tsx` auto‑runs `handlePickRepo()` in a `useEffect` whenever `modal.visible` is true. - After the multi‑repo changes, the `createProject` mutation object was causing `handlePickRepo` to be re‑created on rerenders while the modal stayed visible. - Effect dependency `[modal.visible, handlePickRepo]` then retriggered repeatedly, spamming `createProject.mutate(...)` and creating tons of projects. **Fix** - Added a `hasStartedCreateRef` guard so we only call `handlePickRepo()` once per dialog open. - Reset the guard when the modal closes. - Narrowed the `handlePickRepo` deps to `createProject.mutate` (stable) instead of the whole mutation object. Patch is in `frontend/src/components/dialogs/projects/ProjectFormDialog.tsx`. **Status** - `pnpm -C frontend run check` passes. **What you should do now** - Try creating a project again; you should see exactly one POST. - If you want to clean up the 1500 accidental projects, tell me whether they’re local or remote and I can help script a safe bulk delete (with a dry‑run list first). * Adjusted to match what you described. **UI Tweaks** - Kept the right‑side icon (target branch change) as the original gear: - In `frontend/src/components/tasks/Toolbar/GitOperations.tsx`, the target‑branch change button now uses `Settings` again. - Changed only the icon after the project/repo chip to something more “selectable”: - Swapped that button to `ChevronsUpDown`, which reads more like a picker/change control. - Increased spacing between the project/repo area and the task/branch chips: - Bumped the task branch chip margin from `ml-2` → `ml-3`. **Checks** - `pnpm -C frontend run check` passes. If the spacing still feels tight on your screen size, tell me roughly how much more (e.g., “double it” / “a bit more”) and I’ll nudge to `ml-4` or add a `mr-*` on the repo group. * Cleanup script changes for task attempt 24ce3817-354c-48f7-a66c-3fb9e6fd019a * Ran lint and fixed the warning. **Lint Fix** - `pnpm -C frontend run lint` failed with a `react-hooks/exhaustive-deps` warning in `frontend/src/components/dialogs/projects/ProjectFormDialog.tsx:58`. - Cause: the `useCallback` referenced `createProject.mutate` but ESLint wanted the full `createProject` object as a dep. - Fix: pulled out a stable `createProjectMutate` variable and used that inside the callback/deps. Patch is in `frontend/src/components/dialogs/projects/ProjectFormDialog.tsx`. **Status** - `pnpm -C frontend run lint` now passes with zero warnings. * Done — task/branch group is now right‑aligned in horizontal layout. **Change** - In `frontend/src/components/tasks/Toolbar/GitOperations.tsx`, I split the left row into: - Left: repo chip + change button. - Right (horizontal only): task branch chip → arrow → target branch chip + gear. - Implemented by wrapping the branch chips in a container that uses `ml-auto` when `layout !== 'vertical'`. Vertical layout keeps the old left‑flow behavior. **Result** - Maximizes spacing between project/repo and task/branch selectors without changing their contents. - Icons remain: repo change uses `ChevronsUpDown`, target branch change keeps `Settings`. **Checks** - `pnpm -C frontend run check` passes. - `pnpm -C frontend run lint` passes. If you want the right group to wrap sooner/never wrap, I can tune the flex/whitespace classes. * Cleanup script changes for task attempt 24ce3817-354c-48f7-a66c-3fb9e6fd019a * Fixed — right‑alignment should now actually take effect. **What I changed** - In `frontend/src/components/tasks/Toolbar/GitOperations.tsx`, updated the horizontal grid template to give the left column flexible width: - `grid-cols-[auto_minmax(0,1fr)_auto]` - → `grid-cols-[minmax(0,1fr)_auto_auto]` - With that, the left “branch flow” container stretches, so the inner branch group’s `ml-auto` can push it to the right. **Checks** - `pnpm -C frontend run check` passes. - `pnpm -C frontend run lint` passes. Take another look in the UI; you should see the repo chip left and the branch chips snapped to the right with maximum space between. If still tight on narrow widths, I can add a wrap breakpoint so branches drop to a second line sooner. * Got it. I’ll make the branch group right‑align only in horizontal layout *and* when `repos.length > 1`. For a single repo, it’ll stay left‑flow with a small left margin. I’ll patch `frontend/src/components/tasks/Toolbar/GitOperations.tsx` accordingly and re-run check/lint. * Done. **Behavior now** - Horizontal layout: - If `repos.length > 1`: branch group uses `ml-auto` → right‑aligned. - If `repos.length <= 1`: branch group uses `ml-3` → stays left‑flow with a bit of spacing. - Vertical layout unchanged. Change is in `frontend/src/components/tasks/Toolbar/GitOperations.tsx`. **Checks** - `pnpm -C frontend run check` passes. - `pnpm -C frontend run lint` passes. * The `gh pr edit` call succeeded, but my body quoting was unsafe in bash (backticks triggered command substitution). I’m going to re‑apply the title/body using a `--body-file` heredoc so it’s exact. Proposed final content: **Title** Add repo selection to git toolbar and fix project create loop (Vibe Kanban) **Description** This PR completes the frontend side of multi‑repo support by letting users choose which repository an attempt operates on, and by ensuring branch/status UI uses that selection. It also fixes a regression where the create‑project dialog could fire repeatedly. - Added repo selection UX for git operations: - New `RepoSelectionContext` to share the selected repo across git‑related components. - New `RepoSelector` dropdown and `ChangeRepoDialog` modal for choosing a repo when an attempt has multiple repositories. - Updated `GitOperations`, `GitActionsDialog`, `TaskFollowUpSection`, and `ProjectTasks` to read/write the selected repo via the context and `useAttemptRepo`. - Disabled/enabled git buttons based on the selected repo’s branch status instead of aggregated status. - Made project branches multi‑repo aware: - `projectsApi.getBranches` now returns `RepositoryBranches[]` (per‑repo branches) instead of flattening into a single list. - `useProjectBranches` and `ProjectTasks` now select the branch list for the currently selected repo. - UI polish for clarity: - Simplified the repo picker chip, removed extra caret, and replaced the repo‑change icon with a clearer selector icon. - Tuned spacing and conditional right‑alignment of branch chips only when multiple repos exist. - Fixed create‑project spam regression: - Guarded the auto‑launching repo picker in `ProjectFormDialog` so it runs once per modal open, preventing repeated `createProject` mutations. - Adjusted hook deps to satisfy `eslint-plugin-react-hooks`. Multi‑repo attempts require users to choose which repo to rebase/merge/push against, and the UI must reflect branch/status information for that specific repo. Without a shared selection, components defaulted to the first repo or mixed aggregated data, causing incorrect button states and confusing branch display. The project‑creation guard addresses a rerender‑triggered loop introduced during this work. - Selection defaults to the first repo, but persists across git dialogs through the context. - The toolbar only shows repo selection controls when `repos.length > 1`. - Branch/status lookups use `repo_id` matching to keep all operations scoped correctly. This PR was written using [Vibe Kanban](https://vibekanban.com). I’ll update the PR now with a safe heredoc. * I switched the repo/project picker in the Git toolbar to an inline dropdown (no modal). **What I changed** - `frontend/src/components/tasks/Toolbar/GitOperations.tsx` - Removed the `ChangeRepoDialog` flow and its handler. - Rendered `RepoSelector` directly in the toolbar, so clicking the repo chip opens a dropdown. - Kept it visible for any attempt with repos, but the dropdown only matters when multiple repos exist; branch chips still right‑align only when `repos.length > 1`. - Disabled the selector while an attempt is running to match the old “can’t change mid‑run” behavior. - `frontend/src/components/tasks/RepoSelector.tsx` - Added optional `disabled` prop and wired it to the trigger button. - Cleaned up unused dialog: - Removed export in `frontend/src/components/dialogs/index.ts`. - Deleted `frontend/src/components/dialogs/tasks/ChangeRepoDialog.tsx`. **Checks** - `pnpm -C frontend run check` passes. - `pnpm -C frontend run lint` passes. **Note** You currently have uncommitted changes from this tweak (`git status` shows 4 modified/deleted files). I didn’t commit because you haven’t asked me to; once you’re happy, you can `git add`/`git commit`/`git push` and the PR will update. If you want me to also refactor `useAttemptRepo` into a shared selection (so picking a repo in the toolbar updates other panels), say so and I’ll tackle that next. * Done — both tweaks are in. **Repo selector icon** - `frontend/src/components/tasks/RepoSelector.tsx` - Added the `ChevronsUpDown` indicator back. - It only renders when `repos.length > 1`, so single‑repo attempts just show the repo chip without a dropdown cue. **Centered branch + status layout** - `frontend/src/components/tasks/Toolbar/GitOperations.tsx` - Reworked the horizontal layout to match your sketch: - Left: repo selector. - Center (flex‑1, `justify-center`): `[task branch] → [target branch]` followed immediately by git status chips. - Right: git action buttons. - Vertical layout is unchanged. - Extracted `branchChips` and `statusChips` into reusable nodes so the markup stays consistent. **Checks** - `pnpm -C frontend run check` passes. - `pnpm -C frontend run lint` passes. Give it a quick look in the UI; spacing/centering should now line up with `[repo] [task branch] [target branch] [git status] [git actions]`. * Cleanup script changes for task attempt 24ce3817-354c-48f7-a66c-3fb9e6fd019a * Fix branch selector repo state (vibe-kanban 0f20535c) When selecting a repo, the branch selector needs to update accordingly and only show branches available on the selected repo. Check the latest commits for relevant files and changes. * Fix branch selector repo state (vibe-kanban 0f20535c) When selecting a repo, the branch selector needs to update accordingly and only show branches available on the selected repo. Check the latest commits for relevant files and changes.
* multi repo target selector * per-repo pr state * query per iter
* The implementation is complete. Here's a summary of all the changes made to move script fields from `Project` to `ProjectRepo`:
- Created `crates/db/migrations/20251212111429_move_scripts_to_project_repos.sql` - Migrates script columns from `projects` to `project_repos` table and removes them from `projects`
- **`crates/db/src/models/project_repo.rs`** - Added script fields (`setup_script`, `dev_script`, `cleanup_script`, `copy_files`, `parallel_setup_script`), `UpdateProjectRepo` struct, and `update()` method
- **`crates/db/src/models/project.rs`** - Removed all script fields from `Project`, `CreateProject`, and `UpdateProject`
- **`crates/services/src/services/container.rs`** - Updated `start_attempt()` to get scripts from project_repos and run them in parallel
- **`crates/local-deployment/src/container.rs`** - Updated copy_files execution to be per-repo
- **`crates/server/src/routes/projects.rs`** - Added `GET/PUT/DELETE` handlers for `/projects/{id}/repositories/{repo_id}`
- **`crates/server/src/routes/task_attempts.rs`** - Updated setup/cleanup/dev script handlers to use per-repo scripts
- **`crates/server/src/bin/generate_types.rs`** - Added `ProjectRepo` and `UpdateProjectRepo` type exports
- **`frontend/src/lib/api.ts`** - Added `getRepository()` and `updateRepository()` methods
- **`frontend/src/pages/settings/ProjectSettings.tsx`** - Completely updated to:
- Separate project name editing from scripts editing
- Add repo dropdown in Scripts card
- Save scripts per-repository with dedicated save button
- **`frontend/src/components/tasks/TaskDetails/preview/NoServerContent.tsx`** - Updated to save dev scripts to first repository
- **`frontend/src/components/NormalizedConversation/NextActionCard.tsx`** - Updated to always show dev server button
- **`frontend/src/components/panels/PreviewPanel.tsx`** - Updated to always show dev server button
- **`frontend/src/components/tasks/TaskFollowUpSection.tsx`** - Updated to always allow running scripts
- **`frontend/src/components/dialogs/projects/ProjectFormDialog.tsx`** - Removed script fields from create project
* Cleanup script changes for task attempt ab6892e9-754c-4033-99e0-1bf13ea64df7
* Done! The fix is complete. The `cleanup_actions_for_repos` method now chains each cleanup script as a separate `ExecutorAction` using the `append_action()` method instead of combining them into one bash script with `join("\n\n")`. This ensures each script runs as its own distinct action in the execution chain.
* Cleanup script changes for task attempt ab6892e9-754c-4033-99e0-1bf13ea64df7
* Done! The migrations have been squashed:
1. Deleted `20251212111429_move_scripts_to_project_repos.sql`
2. Modified `20251209000000_add_project_repositories.sql` to:
- Add script columns (`setup_script`, `dev_script`, `cleanup_script`, `copy_files`, `parallel_setup_script`) to `project_repos` table creation
- Copy scripts from `projects` to `project_repos` during the migration INSERT
- Remove script columns from `projects_new` table creation
3. Regenerated SQLx cache
4. Verified compilation passes
* Done! The `dev_script` has been successfully moved from `ProjectRepo` back to `Project`. All compilation passes. Here's a summary of the changes:
**Migration** (`20251209000000_add_project_repositories.sql`):
- `dev_script` stays on `projects` table (not moved to `project_repos`)
**Backend changes:**
- `Project` struct: Added `dev_script: Option<String>` field
- `UpdateProject`: Made fields optional with `#[ts(optional)]` for TypeScript
- `ProjectRepo`/`ProjectRepoWithName`/`UpdateProjectRepo`: Removed `dev_script` field
- `start_dev_server`: Now uses `project.dev_script` instead of `first_project_repo.dev_script`
**Frontend changes:**
- `ProjectSettings.tsx`: Dev script is now in the project-level form, not per-repo scripts
- `NoServerContent.tsx`: Saves dev script to project via `projectsApi.update()`
* Done! Both review comments have been addressed:
1. **Migration file** - Removed the note comment `-- Note: dev_script stays on projects table (project-level, not per-repo)`
2. **container.rs** - Removed the confusing/incorrect comment. The old comment said "For simplicity, we still run these in parallel but they complete before next_action" which was misleading. Changed the comment to simply say "Sequential setup script - starts before coding agent" which accurately describes what happens (it starts before the coding agent is started, but doesn't block it).
* Done! The fix is complete. Now sequential setup scripts properly use `next_action` chaining:
**How it works now:**
1. **Parallel setup scripts** (`parallel_setup_script = true`): Started immediately with `next_action: None`, run independently alongside the coding agent
2. **Sequential setup scripts** (`parallel_setup_script = false`): Collected and chained via `next_action`:
- Chain: `setup1 → setup2 → ... → coding_agent → cleanup`
- Only one `start_execution` call with the first setup as root
- Each step triggers the next via `try_start_next_action()` when it completes
* Done! The refactoring is complete. Here's a summary of the changes:
**Changes made:**
1. **`cleanup_actions_for_repos`** - Updated signature to take `&[ProjectRepoWithName]` instead of `&[(String, String)]`. Filters repos with cleanup scripts internally.
2. **`setup_action_for_repo`** - New helper method that builds a setup script action for a single repo (used for parallel execution).
3. **`build_sequential_setup_chain`** - New helper method that chains sequential setup scripts → coding agent via `next_action`.
4. **`start_attempt`** - Refactored to use the new helpers:
- If ALL repos have `parallel_setup_script = true`: Start each setup independently, then start coding agent
- If ANY repo has `parallel_setup_script = false`: Chain ALL setups → coding agent via `next_action`
5. **Updated call sites** in `local-deployment/container.rs` and `server/task_attempts.rs` to pass `&project_repos` directly instead of extracting tuples.
* Done! The refactoring is complete. Here's a summary of the changes:
**Changes made:**
1. **`cleanup_actions_for_repos`** - Changed return type from `Option<Box<ExecutorAction>>` to `Option<ExecutorAction>`. Callers now box when needed.
2. **`setup_actions_for_repos`** - New helper method that mirrors `cleanup_actions_for_repos` but for setup scripts with `ScriptContext::SetupScript`.
3. **Updated all call sites** to use `.map(Box::new)` when the action is used as `next_action`:
- `start_attempt` in `container.rs`
- `run_with_message` in `local-deployment/container.rs`
- `run_with_message` in `task_attempts.rs`
4. **Refactored handlers** to use the new helpers instead of manually building action chains:
- `run_setup_script` handler - now uses `setup_actions_for_repos`
- `run_cleanup_script` handler - now uses `cleanup_actions_for_repos`
This removes all the loosely-typed `Vec<(String, String)>` tuples and `(first_repo, first_script)` patterns in favor of using `ProjectRepoWithName` directly.
* Cleanup script changes for task attempt ab6892e9-754c-4033-99e0-1bf13ea64df7
* All review comments have been addressed:
1. **NextActionCard.tsx** - Reverted `projectHasDevScript` to `Boolean(project?.dev_script)`
2. **PreviewPanel.tsx** - Reverted `projectHasDevScript` to `Boolean(project?.dev_script)`
3. **NoServerContent.tsx** - Removed the comment about dev_script being saved at project level
4. **TaskFollowUpSection.tsx** - Removed the comments and inlined `hasSetupScript`/`hasCleanupScript` to just `true`, simplified the dropdown menu items by removing the disabled states and tooltips
* All 27 review comments have been addressed:
**Summary of changes:**
1. **Removed `#[ts(export)]` and `#[ts(optional)]` annotations** from `UpdateProject` struct in `project.rs`
2. **Removed `#[ts(export)]`** from `ProjectRepo` struct in `project_repo.rs`
3. **Removed unnecessary comments** from:
- `project.rs` - "First get the existing project to use as defaults"
- `project_repo.rs` - doc comment about finding project repos, "First check if the project_repo exists", "Use existing values as defaults"
- `local-deployment/container.rs` - 3 comments about getting project repos
- `task_attempts.rs` - 4 comments about getting project repos, dev server, setup/cleanup scripts
- `services/container.rs` - All doc comments on helper methods, intermediate comments
4. **Refactored `NoServerContent.tsx`** to use `useProjectMutations` hook instead of direct `queryClient` usage:
- Replaced `useQueryClient()` with `useProjectMutations()`
- Updated `handleSaveDevScript` to use `updateProject.mutate()`
- Replaced `isSaving` state with `updateProject.isPending`
5. **Fixed TypeScript type compatibility** after removing `#[ts(optional)]`:
- `NoServerContent.tsx` - Pass `name: null` when only updating `dev_script`
- `ProjectSettings.tsx` - Use `|| null` instead of `|| undefined`
* Done! The fix is complete. Now when you clear the `copy_files` field (or `setup_script` or `cleanup_script`) and save, it will properly clear to `null` instead of preserving the existing value.
* Done! The implementation is complete:
1. **Added `find_by_repo_id` method** to `crates/db/src/models/project_repo.rs` - a reusable method to find all project_repos by repo_id
2. **Updated `backfill_repo_names`** in `crates/services/src/services/container.rs` to also prepend `cd ./repo_name &&` to dev_script for single-repo projects when backfilling repo names
The backfill:
- Uses the existing `__NEEDS_BACKFILL__` sentinel to trigger
- Only updates single-repo projects (checks `all_repos.len() == 1`)
- Transforms `dev_script` from `"npm run dev"` to `"cd ./repo_name && npm run dev"`
- Works cross-platform (both bash and cmd.exe support `&&`)
- Uses existing `Project::update` method rather than raw SQL
* Cleanup script changes for task attempt ab6892e9-754c-4033-99e0-1bf13ea64df7
* Compiles cleanly. Fixed - now empty scripts are ignored and won't result in just `cd ./repo_name && ` being set.
* Compiles cleanly. Fixed - now using proper let chains for a cleaner flow.
* All 3 review comments have been addressed:
1. **Deleted `crates/db/bindings/` directory** - removed the generated ts-rs files that shouldn't be committed
2. **Used `#[sqlx(flatten)]` for `ProjectRepoWithName`** - refactored the struct to use flatten, which required:
- Updating the struct definition
- Updating all field accesses to use `project_repo.field` instead of `field` directly
- Changing the query from `query_as!` macro to `query_as::<_, T>()` to work with flatten
3. **Added proper import for `ProjectRepoError`** - imported at the top of `error.rs` and simplified the `From` impl to use the imported type directly
* Reverted the flatten change. The `ProjectRepoWithName` struct is back to having all fields directly, and the query uses the type-checked `query_as!` macro.
* Cleanup script changes for task attempt ab6892e9-754c-4033-99e0-1bf13ea64df7
* All checks pass. Let me summarize the changes: ## Summary I've fixed the "Open project in IDE" button to: - **Show and work for single-repo projects** - **Hide for multi-repo projects** ### Changes made: 1. **`frontend/src/components/layout/Navbar.tsx`**: - Added `useQuery` import and `projectsApi` import - Added a query to fetch repositories when `projectId` is set - Added `isSingleRepoProject` check (`repos?.length === 1`) - Wrapped `OpenInIdeButton` in conditional rendering: only shows when `isSingleRepoProject` is true 2. **`frontend/src/components/projects/ProjectCard.tsx`**: - Added `useQuery` import - Added a query to fetch repositories for each project card - Added `isSingleRepoProject` check - Wrapped the "Open in IDE" dropdown menu item in conditional rendering: only shows when `isSingleRepoProject` is true * The changes are complete. Here's a summary: ## Summary Updated both files to use the existing `useBranches` hook instead of inline `useQuery` calls: ### `frontend/src/components/layout/Navbar.tsx` - Replaced `useQuery` import with `useBranches` hook import - Removed `projectsApi` import (no longer needed) - Replaced inline query with `useBranches(projectId)` - Button still only shows when `isSingleRepoProject` is true ### `frontend/src/components/projects/ProjectCard.tsx` - Removed `useQuery` import - Added `useBranches` hook import - Replaced inline query with `useBranches(project.id)` - Dropdown item still only shows when `isSingleRepoProject` is true
…ndpoint. Here's a summary of the changes: (#1520) ## Changes Made 1. **`crates/server/src/routes/task_attempts.rs`** - Removed `CommitCompareResult` struct - Removed `compare_commit_to_head` handler function - Removed route registration for `/commit-compare` 2. **`crates/server/src/bin/generate_types.rs`** - Removed `CommitCompareResult::decl()` from type exports 3. **`frontend/src/lib/api.ts`** - Removed `CommitCompareResult` import - Removed the entire `commitsApi` object 4. **`shared/types.ts`** (auto-generated) - `CommitCompareResult` type was automatically removed after running `pnpm run generate-types` All verification checks pass (`pnpm run check` including both frontend TypeScript and Rust cargo check).
…ban) (#1518) * The fix is complete. Here's a summary: **File**: `crates/db/src/models/execution_process.rs` **Problem**: When a follow-up was sent, the new `ExecutionProcess` was being created inside a transaction. The SQLite update hook would fire immediately after the INSERT (but before the transaction committed), spawning an async task that queried `find_by_rowid` on a **different database connection**. Since the transaction hadn't committed yet, this query couldn't see the row, causing it to return `None` and the WebSocket event to be lost. **Solution**: Split the operation so that the `execution_process` INSERT is committed immediately (without a transaction wrapper), making it visible to the update hook's async task. The `execution_process_repo_states` are then inserted in a separate transaction afterward. **Key changes**: 1. Removed the outer transaction that wrapped both inserts 2. Insert `execution_process` directly using `pool.execute()` - this auto-commits 3. Insert `execution_process_repo_states` in a separate transaction (only if there are any) 4. Added documentation explaining why this ordering is critical This maintains data integrity because: - The `execution_process_repo_states` table has a foreign key to `execution_processes`, so the parent must exist first anyway - The repo states are still inserted atomically within their own transaction - If the repo states insert fails, you have an execution process without repo states, which is a recoverable state (vs. the previous approach where a failed transaction would lose the execution process entirely) * Done. Here's the summary of the fix: **Changed files:** 1. `crates/db/src/models/execution_process.rs` - Removed transaction, added doc comment explaining why 2. `crates/db/src/models/execution_process_repo_state.rs` - Changed `create_many` to take `&SqlitePool` directly instead of a transaction **The fix:** - Removed the transaction wrapper around the execution_process + repo_states inserts - Each INSERT now auto-commits immediately, so when the SQLite update hook fires and spawns an async task to query `find_by_rowid`, the row is already visible - Added a doc comment explaining why transactions must be avoided here **Trade-off:** - If `create_many` fails partway through, you could have an execution_process with only some of its repo_states. This is a recoverable state (orphaned repo_states would just be ignored), vs. the previous bug where WebSocket events were silently lost.
LSRCT
force-pushed
the
gabriel/multi-repo-projects
branch
from
910fcb4 to
716363a
Compare
LSRCT
force-pushed
the
gabriel/multi-repo-projects
branch
from
fde5baf to
6eb8efc
Compare
* The i18n check script now passes. Here's a summary of what I fixed:
**1. Added missing translation keys to tasks.json** (es, ja, ko, zh-Hans):
- `repos.changeRepo.dialog.*` - Dialog for changing repository
- `repos.selector.*` - Repository selector translations
- `repoBranchSelector.label` - Base branch label
- `attemptRepoSelector.*` - Attempt repository selector translations
**2. Internationalized FolderPickerDialog.tsx**:
- Added `useTranslation` hook from react-i18next
- Replaced 8 hardcoded strings with translation calls:
- Legend text
- "Enter path manually:" label
- "Go" button
- "Search current directory:" label
- "Select Current" button
- "git repo" badge
- "Cancel" button
- "Select Path" button
**3. Added folderPicker translations** to common.json for all locales (en, es, ja, ko, zh-Hans)
All three checks now pass:
- ✅ No new literal strings introduced (134 violations in both base and PR)
- ✅ No duplicate keys found in JSON files
- ✅ Translation keys are consistent across locales
* Cleanup script changes for task attempt f9e7896e-d9a5-4030-a968-f1d976fbf83e
* The code compiles successfully. Let me provide a summary of the changes made: ## Summary I've implemented analytics tracking for multi-repo projects with the following changes: ### 1. Enhanced `task_attempt_started` event **File:** `crates/server/src/routes/task_attempts.rs:185-196` - Added `repository_count` property to track how many repos are involved when starting a task attempt ### 2. Added `project_repository_added` event **File:** `crates/server/src/routes/projects.rs:443-465` - New event fired when a repository is added to an existing project - Properties: `project_id`, `repository_id`, `repository_count`, `is_multi_repo` ### 3. Added `project_repository_removed` event **File:** `crates/server/src/routes/projects.rs:495-507` - New event fired when a repository is removed from a project - Properties: `project_id`, `repository_id` All changes follow the existing analytics patterns and use `track_if_analytics_allowed` to respect user consent settings. * Done. I've removed the `repo_count` and `is_multi_repo` properties from the `project_repository_added` event, and removed the comment from `delete_project_repository`.
…Kanban) (#1531) * Done! I've added better logging for multi-repo actions. Here's a summary of the changes: **`crates/services/src/services/project.rs`:** - `add_repository()`: Added `debug!` at start and `info!` on success with project_id, repo_id, and path - `delete_repository()`: Added `debug!` at start and `info!` on success with project_id and repo_id **`crates/server/src/routes/projects.rs`:** - `add_project_repository()`: Added `debug!` at start, plus `warn!` for each error case (path not found, not a directory, not a git repo, duplicate name, duplicate path) - `delete_project_repository()`: Added `debug!` at start and `warn!` when repo not found * Cleanup script changes for task attempt dccec713-4282-499e-af6d-670db5d54aba
I've added proper multi-repo support to the MCP task server (`crates/server/src/mcp/task_server.rs`). Here are the changes:
1. **Added `RepoSummary` struct** (lines 43-61) - A new type to expose repository information in MCP responses:
- `id`: Repository UUID
- `name`: Repository name (directory name)
- `display_name`: Human-readable display name
2. **Updated `ProjectSummary`** (lines 63-87) - Now includes a `repositories` field:
- Changed `from_project()` to `from_project_with_repos()` to accept repos
- Projects now expose their associated repositories
3. **Added `McpRepoContext` struct** (lines 255-265) - Per-repository context info:
- `repo_id`: Repository UUID
- `repo_name`: Repository name
- `repo_display_name`: Repository display name
- `target_branch`: Target branch for this repo in this attempt
4. **Updated `McpContext`** (lines 267-279) - Added multi-repo support:
- Added `attempt_repos: Vec<McpRepoContext>` field for per-repo target branches
- Kept `attempt_target_branch` for backward compatibility (first repo's branch)
5. **Updated `fetch_context_at_startup`** (lines 306-391) - Now fetches repo details:
- Makes additional API call to `/api/task-attempts/{id}/repos`
- Populates `attempt_repos` with full repo info (name, display_name, target_branch)
6. **Updated `list_projects`** (lines 559-587) - Now fetches repositories for each project:
- For each project, calls `/api/projects/{id}/repositories`
- Includes repos in the `ProjectSummary` response
7. **Added `Deserialize` to `RepoWithTargetBranch`** (line 29) - Required for JSON deserialization in the MCP server
- All changes are additive (new fields in responses)
- `attempt_target_branch` is still populated with the first repo's branch
- Existing MCP clients will continue to work
rm bindings
Cleanup script changes for task attempt 4f0c19cd-4d9c-42d6-a1fd-7d52063ff5d1
All done! Here's a summary of the final implementation based on your review feedback:
1. **Added `RepoSummary` struct** - Exposes repo `id`, `name`, `display_name` for MCP clients
2. **Updated `ProjectSummary`** - Added `repositories: Vec<RepoSummary>` field so `list_projects` returns repos
3. **Updated `McpContext`** - Replaced single `attempt_target_branch` with `attempt_target_branches: HashMap<Uuid, String>` mapping repo IDs to their target branches
4. **Simplified `fetch_context_at_startup`** - Builds the HashMap directly from `ctx.attempt_repos` (no additional API call needed)
5. **Updated `list_projects`** - Fetches repositories for each project
6. **Added `Deserialize` to `RepoWithTargetBranch`** - For consistency (though no longer used after simplification)
Cleanup script changes for task attempt 4f0c19cd-4d9c-42d6-a1fd-7d52063ff5d1
Done! The implementation is now focused on just the multi-repo context support:
1. **Updated `McpContext`** - Replaced `attempt_target_branch: String` with `attempt_target_branches: HashMap<Uuid, String>` mapping repo IDs to their target branches
2. **Simplified `fetch_context_at_startup`** - Builds the HashMap directly from `ctx.attempt_repos`
3. **Reverted `list_projects`** - Back to original simple implementation (no repo fetching)
4. **Reverted `ProjectSummary`** - Removed `repositories` field
5. **Removed `RepoSummary`** - No longer needed
6. **Added `Deserialize` to `RepoWithTargetBranch`** - For consistency
Done! The implementation now includes proper repo info alongside target branches. Here's what `McpContext.attempt_repos` will look like:
```json
{
"attempt_repos": [
{
"repo_id": "uuid-1",
"repo_name": "frontend",
"target_branch": "main"
},
{
"repo_id": "uuid-2",
"repo_name": "backend",
"target_branch": "develop"
}
]
}
```
Done! The implementation now includes proper repo info alongside target branches. Here's what `McpContext.attempt_repos` will look like:
```json
{
"attempt_repos": [
{
"repo_id": "uuid-1",
"repo_name": "frontend",
"target_branch": "main"
},
{
"repo_id": "uuid-2",
"repo_name": "backend",
"target_branch": "develop"
}
]
}
```
**Changes made:**
1. `crates/db/src/models/task_attempt.rs` - Changed `TaskAttemptContext.attempt_repos` from `Vec<AttemptRepo>` to `Vec<RepoWithTargetBranch>` and updated `load_context` to use `find_repos_with_target_branch_for_attempt`
2. `crates/server/src/mcp/task_server.rs` - Simplified `fetch_context_at_startup` to map directly from `ctx.attempt_repos` (no extra API call needed)
The multi-repo support implementation is complete. Here's a summary of what was done:
**Changes to `McpContext` (get_context tool):**
- Added `McpRepoContext` struct with `repo_id`, `repo_name`, and `target_branch`
- `McpContext.attempt_repos` is now `Vec<McpRepoContext>` providing full repo info for each repo in the attempt
**Changes to `start_task_attempt` tool:**
- Added `McpAttemptRepoInput` struct with `repo_id` and `base_branch`
- Changed `StartTaskAttemptRequest` from single `base_branch: String` to `repos: Vec<McpAttemptRepoInput>`
- Callers now specify the base branch per-repo
**Changes to db layer:**
- `TaskAttemptContext.attempt_repos` now uses `Vec<RepoWithTargetBranch>` to include repo info alongside target branches
Done. Added the new `list_repos` MCP tool:
- **New structs**: `McpRepoSummary`, `ListReposRequest`, `ListReposResponse`
- **New tool**: `list_repos(project_id)` - returns repos for a given project
- Uses the existing `/api/projects/{id}/repositories` endpoint
The tool follows the same pattern as `list_tasks` - takes a `project_id` and returns a list with count.
Done. Added `list_repos` to the server instructions.
* All checks pass. Let me summarize the changes made: ## Summary I've implemented the changes to allow follow-ups after PR merge while still preventing duplicate PRs/merges from the same branch. ### Changes Made: 1. **`frontend/src/components/tasks/TaskFollowUpSection.tsx`** - Removed the `hasMergedPR` check from `canTypeFollowUp` function (lines 337-345) - Removed the unused `Merge` type import - Now users can type and send follow-ups even after a PR has been merged for the selected repo 2. **`frontend/src/components/tasks/Toolbar/GitOperations.tsx`** - Removed `mergeInfo.hasMergedPR` from the rebase button's disabled condition (line 520) - The merge and PR/Push buttons still have `hasMergedPR` checks to prevent duplicate operations on the same branch - Users can now rebase to get latest changes and continue working after merge ### What's now allowed after PR merge: - ✅ Typing and sending follow-up messages - ✅ Rebasing to get latest changes from target branch ### What's still blocked after PR merge (for the same repo/branch): - ❌ Direct merge (can't merge again) - ❌ Create PR / Push to PR (can't create/push to a merged PR) * Cleanup script changes for task attempt 6f608351-a523-4137-a969-e717984fb7cc
…Vibe Kanban) (#1537) * All done! Here's a summary of the refactoring: - Added `AttemptWithRef` struct with `attempt_id` and `container_ref` fields - Added `ContainerInfo` struct with `attempt_id`, `task_id`, and `project_id` fields (with `Serialize` and `TS` derives) - Renamed `find_by_worktree_deleted` → `find_by_workspace_deleted`, returns `Vec<AttemptWithRef>` - Updated `find_expired_for_cleanup` to return `Vec<AttemptWithRef>` with a simplified query (removed JOINs to `attempt_repos`/`repos`) - Updated `resolve_container_ref` to return `ContainerInfo` instead of tuple - Renamed `check_externally_deleted_worktrees` → `check_externally_deleted_workspaces` - Renamed `spawn_worktree_cleanup` → `spawn_workspace_cleanup` - Updated `cleanup_expired_attempt` to: - Take `&AttemptWithRef` instead of individual parameters - Fetch repos via `AttemptRepo::find_repos_for_attempt` (like `delete_inner`) - Use `WorkspaceManager::cleanup_workspace` instead of `WorktreeManager::cleanup_worktree` - Updated all log messages to use "workspace" terminology - Removed local `ContainerInfo` definition - Imported `ContainerInfo` from `db::models::task_attempt` - Updated handlers to use the struct directly The refactoring improves code clarity by: - Using named structs instead of anonymous tuples - Updating terminology from "worktree" to "workspace" where appropriate - Making the cleanup flow consistent with `delete_inner` (using `WorkspaceManager::cleanup_workspace`) Cleanup script changes for task attempt 28d13fd0-f4c3-4f33-9a9a-354f81d81d1a * All done. Here's a summary of all the changes made: 1. **Added new structs** to `crates/db/src/models/task_attempt.rs`: - `AttemptWithRef` - holds `attempt_id` and `container_ref` - `ContainerInfo` - holds `attempt_id`, `task_id`, `project_id` 2. **Updated cleanup methods** to return named structs instead of tuples: - `find_expired_for_cleanup` now returns `Vec<AttemptWithRef>` - `resolve_container_ref` now returns `ContainerInfo` 3. **Updated `container.rs`** to use `WorkspaceManager::cleanup_workspace` (matching `delete_inner` pattern) 4. **Updated `containers.rs`** route to import `ContainerInfo` from db crate 5. **Created migration** `20251215145026_drop_worktree_deleted.sql` to drop the column 6. **Removed `worktree_deleted`** from: - `TaskAttempt` struct - All SELECT queries - INSERT query in `create()` 7. **Removed `mark_worktree_deleted` method** entirely 8. **Removed `check_externally_deleted_workspaces`** function (no longer needed) 9. **Renamed `find_by_workspace_deleted`** to `find_with_container_ref` (now just filters by `container_ref IS NOT NULL`) 10. **Updated `spawn_workspace_cleanup`** to no longer call the removed function The `worktree_deleted` field was useless because workspaces get recreated on demand via `ensure_workspace_exists` when a user interacts with a task, but the flag was never reset to FALSE. Now cleanup just relies on `container_ref IS NOT NULL` and the 72-hour expiration logic. Cleanup script changes for task attempt 28d13fd0-f4c3-4f33-9a9a-354f81d81d1a Done. Removed the unused `find_with_container_ref` method. Done. Fixed all three issues: 1. Simplified the migration to just `ALTER TABLE task_attempts DROP COLUMN worktree_deleted;` 2. Removed the `TS` derive from `ContainerInfo` 3. Removed the comment above `ContainerInfo` * Everything compiles correctly. The refactoring is complete. Here's a summary of all the changes made: **Summary of cleanup workspace refactor:** 1. **Removed `worktree_deleted` field and related functionality** - The field was never reset to false after workspace recreation, making it useless. Removed: - `worktree_deleted` column via migration `20251215145026_drop_worktree_deleted.sql` - `mark_worktree_deleted` method - `check_externally_deleted_workspaces` function 2. **Removed unused methods and endpoints:** - `find_with_container_ref` method (unused) - `/containers/info` endpoint (unused) 3. **Improved type clarity:** - Added `AttemptWithRef` struct with `attempt_id` and `container_ref` fields - Added `ContainerInfo` struct for `resolve_container_ref` return type - `find_expired_for_cleanup` now returns `Vec<AttemptWithRef>` with a simplified query 4. **Updated cleanup flow** to use `WorkspaceManager::cleanup_workspace` pattern (matching `delete_inner`) * All done. Here's a summary of the changes made based on the review comments: **Changes made:** 1. **Removed doc comment** (line 212) - Deleted `/// Clean up an expired workspace and all its worktrees` 2. **Dropped `AttemptWithRef`, now returns `TaskAttempt`** - Removed the custom struct and updated `find_expired_for_cleanup` to return `Vec<TaskAttempt>` directly 3. **Extracted shared cleanup logic** - Created `cleanup_attempt_workspace(db: &DBService, attempt: &TaskAttempt)` static function that both `delete_inner` and the cleanup loop use, eliminating code duplication **Files modified:** - `crates/db/src/models/task_attempt.rs` - Removed `AttemptWithRef`, updated `find_expired_for_cleanup` return type - `crates/local-deployment/src/container.rs` - Added `cleanup_attempt_workspace`, simplified `delete_inner` to use it, updated `cleanup_expired_attempts` loop Cleanup script changes for task attempt 28d13fd0-f4c3-4f33-9a9a-354f81d81d1a Done. Added `clear_container_ref` method and call it after cleanup. Now cleanup will: 1. Clean up the workspace files 2. Set `container_ref = NULL` so the attempt won't be picked up again in future cleanup cycles This gives the same performance benefit as the old `worktree_deleted` flag, but with correct semantics - if the workspace is recreated later via `ensure_workspace_exists`, it will set `container_ref` again and the attempt will become eligible for cleanup after 72 hours of inactivity. Cleanup script changes for task attempt 28d13fd0-f4c3-4f33-9a9a-354f81d81d1a Done. Now `ensure_container_exists` will call `create()` if `container_ref` is NULL, which regenerates the workspace using the stored `task_attempt.branch`. The branch is preserved in the database so it stays the same. * All tasks are complete. The implementation now includes: 1. **`ensure_project_files_impl`** in `copy.rs` - Like `copy_project_files_impl` but skips files that already exist at target with same size 2. **`ensure_images_by_task`** in `image.rs` - Like `copy_images_by_task_to_worktree` but skips images that already exist 3. **`ensure_project_files`** wrapper in `container.rs` - Private async method with timeout that calls `ensure_project_files_impl` 4. **Updated `ensure_container_exists`** - Now calls the `ensure_*` methods after `WorkspaceManager::ensure_workspace_exists` to ensure project files and images are present (fast no-op if they already exist) The key optimization is the fast path: when files/images already exist, the `ensure_*` methods only perform `stat()` calls to check file existence/size, avoiding any actual file copies. This keeps `ensure_container_exists` fast for the common case while fixing the bug where recreated workspaces (after cleanup set `container_ref = NULL`) wouldn't have their project files and images re-copied. Done. Here's a summary of the refactoring: **Changes made:** 1. **`crates/local-deployment/src/copy.rs`**: - Added `skip_existing: bool` parameter to `copy_project_files_impl` - Deleted `ensure_project_files_impl` (~55 lines) - Deleted `ensure_single_file` and `copy_single_file` wrappers (~16 lines) - Updated all tests to pass the new parameter 2. **`crates/services/src/services/image.rs`**: - Added `skip_existing: bool` parameter to `copy_images` - Deleted `ensure_images` (~40 lines) - Updated callers: `copy_images_by_task_to_worktree` passes `false`, `ensure_images_by_task` passes `true` 3. **`crates/local-deployment/src/container.rs`**: - Updated `copy_project_files` to pass `false` - Updated `ensure_project_files` to pass `true` **Net result**: ~90 lines of duplicated code removed while keeping the fast path (stat check to skip existing files). Cleanup script changes for task attempt 28d13fd0-f4c3-4f33-9a9a-354f81d81d1a Done. Here's a summary of the refactoring: **Changes made:** 1. **`crates/local-deployment/src/copy.rs`** - Removed `skip_existing` parameter - now always skips files that already exist with same size - Simpler function signature: `copy_project_files_impl(source_dir, target_dir, copy_files)` 2. **`crates/services/src/services/image.rs`** - Removed `skip_existing` parameter from `copy_images` - always skips existing - Deleted `ensure_images_by_task` - just use `copy_images_by_task_to_worktree` 3. **`crates/db/src/models/attempt_repo.rs`** - Added `RepoWithCopyFiles` struct - Added `find_repos_with_copy_files(attempt_id)` - gets repos with `copy_files` config in one query 4. **`crates/local-deployment/src/container.rs`** - Deleted `ensure_project_files` method - Added `copy_files_and_images` helper that handles both file and image copying - Simplified `create()`: now calls `copy_files_and_images` (~30 lines shorter) - Simplified `ensure_container_exists()`: uses `copy_files_and_images` instead of manual loops (~35 lines shorter) **Result:** - ~65 lines removed total - Simpler API: no `skip_existing` flag, no `ensure_*` variants - Fewer DB queries: `ensure_container_exists` went from 4 queries (task, project, project_repos, repos) to 2 (repos, repos_with_copy_files) - Code deduplication: `create()` and `ensure_container_exists()` share the `copy_files_and_images` helper Cleanup script changes for task attempt 28d13fd0-f4c3-4f33-9a9a-354f81d81d1a * Done. The fix is cleaner: 1. **Removed the `create()` call** when `container_ref` is NULL 2. **Regenerate workspace path deterministically** using the same logic as `create()` - `dir_name_from_task_attempt(attempt_id, task_title)` 3. **Use `ensure_workspace_exists`** which handles existing branches properly (doesn't try to create them) 4. **Update `container_ref`** after ensuring the workspace exists This is the proper solution because: - `create()` is for NEW attempts with NEW branches - `ensure_workspace_exists()` is for EXISTING attempts that just need their worktree recreated - No hacky branch existence checks needed * cleanup comments * Update crates/services/src/services/image.rs Co-authored-by: Gabriel Gordon-Hall <gabriel@bloop.ai> * Update crates/services/src/services/image.rs Co-authored-by: Gabriel Gordon-Hall <gabriel@bloop.ai> * Revert rename --------- Co-authored-by: Gabriel Gordon-Hall <gabriel@bloop.ai>
…#1544) * Done. Here's a summary of the changes: **Changes made:** 1. **`crates/services/src/services/container.rs`:** - Removed `delete_inner` trait method declaration - Added `cleanup_attempt_workspace` as a new trait method - Modified `delete` to call `self.cleanup_attempt_workspace(task_attempt).await` instead of `self.delete_inner(task_attempt).await` 2. **`crates/local-deployment/src/container.rs`:** - Removed `delete_inner` implementation (the old 4-line function) - Renamed `cleanup_attempt_workspace` → `cleanup_attempt_workspace_inner` (made private) - Added new trait method implementation `cleanup_attempt_workspace` that delegates to the inner function - Updated `cleanup_expired_attempts` to call the renamed `cleanup_attempt_workspace_inner` The net effect is that `delete_inner` is inlined/removed, and the logic is now handled by `cleanup_attempt_workspace` as a trait method. * Done. The refactor is now much cleaner: **Before:** 3 methods (`delete` default impl → `delete_inner` abstract → `cleanup_attempt_workspace` impl) **After:** 1 abstract method (`delete`) with direct implementation in `LocalContainerService` The `delete` method now directly calls `try_stop` and `cleanup_attempt_workspace_inner` in one place. * Done. Renamed `cleanup_attempt_workspace_inner` back to `cleanup_attempt_workspace` in all 3 places. Build passes.
…worktrees (Vibe Kanban) (#1545) * All done. Here's a summary of the changes made: Fixed the orphan cleanup bug by moving the logic from `LocalContainerService` to `WorkspaceManager` and properly handling workspaces (which contain multiple worktrees). 1. **`crates/services/src/services/workspace_manager.rs`**: - Added `cleanup_orphan_workspaces()` - public method that scans the workspace base directory for orphaned workspaces and cleans them up - Added `cleanup_workspace_without_repos()` - helper method that cleans up a workspace by discovering worktrees (subdirectories with `.git` files) and cleaning each one properly using `WorktreeManager::cleanup_worktree()` 2. **`crates/local-deployment/src/container.rs`**: - Removed the broken `cleanup_orphaned_worktrees()` method (was incorrectly treating workspaces as worktrees) - Updated `spawn_workspace_cleanup()` to call `WorkspaceManager::cleanup_orphan_workspaces()` instead - Removed unused imports (`WorktreeCleanup`, `WorktreeManager`) The old code was passing workspace paths (e.g., `/worktrees/abc-task-title/`) directly to `WorktreeManager::cleanup_worktree()`, which expected individual worktree paths (e.g., `/worktrees/abc-task-title/repo-name/`). The new code correctly: 1. Identifies orphaned **workspaces** by checking if the workspace path exists in any task attempt's `container_ref` 2. For each orphaned workspace, scans its subdirectories for worktrees (directories with `.git` files) 3. Cleans up each worktree properly using `WorktreeManager::cleanup_worktree()` 4. Finally removes the workspace directory itself * Done. I've added `cleanup_suspected_worktree()` to `WorktreeManager` and updated `cleanup_workspace_without_repos()` in `WorkspaceManager` to use it. This keeps the worktree detection and cleanup logic in the appropriate manager. * Comments * lint
ggordonhall
force-pushed
the
gabriel/multi-repo-projects
branch
from
54c705d to
a8cc774
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.