c861de8b2958c3097b119b6235d192bd70884d08
265 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
GitHub Action
|
c861de8b29 | chore: bump version to 0.0.152 | ||
William Reed
|
4a48233cff |
perf: fix database query performance bottlenecks (#1982)
* perf: fix database query performance bottlenecks - Add composite index on workspace_repos(workspace_id, repo_id) to optimize lookup queries that were taking up to 5 seconds - Add composite index on merges(merge_type, pr_status) to optimize status filtering queries that were taking 2+ seconds - Fix N+1 query pattern in workspace_repos.create_many by wrapping inserts in a transaction - Fix N+1 query pattern in get_task_attempt_branch_status by batch fetching all merges upfront instead of querying per repo These changes address significant performance bottlenecks identified in production logs where simple lookup queries were experiencing multi-second latencies. * cargo fmt * run sqlx prepare --------- Co-authored-by: Solomon <abcpro11051@disroot.org> |
||
|
GitHub Action
|
d17c41a73d | chore: bump version to 0.0.151 | ||
Gabriel Gordon-Hall
|
8244308835 | fix compile error (#2019) | ||
Alex Netsch
|
08a466c1d4 |
Fix VSCode extension by restoring /containers/info endpoint (Vibe Kanban) (#1884)
* The code compiles. The fix is complete. Here's a summary of what was changed:
**File: `crates/server/src/routes/containers.rs`**
1. Added `use uuid::Uuid;` import
2. Added `ContainerInfo` struct with `project_id`, `task_id`, and `attempt_id` fields
3. Added `get_container_info` handler that resolves the container reference and maps `workspace_id` → `attempt_id` for VSCode extension compatibility
4. Registered the `/containers/info` route
The VSCode extension can now call `GET /api/containers/info?ref={folder_path}` to auto-detect workspaces when opening a folder.
* Moved the doc comment to the route registration where it's more visible.
* Everything compiles. Let me summarize the logic:
**How the fix works:**
| Scenario | `container_ref` in DB | Path VSCode opens | Lookup method |
|----------|----------------------|-------------------|---------------|
| Multi-repo | `/workspaces/abc123` | `/workspaces/abc123` | Exact match ✓ |
| Single-repo | `/workspaces/abc123` | `/workspaces/abc123/my-repo` | Prefix match ✓ |
The `resolve_container_ref_by_prefix` method:
1. First tries exact match (handles multi-repo case)
2. Falls back to prefix match using SQLite GLOB: `path GLOB container_ref || '/*'` (handles single-repo case where path is a subfolder)
This should handle both cases correctly. The confidence is higher now because we've accounted for how "Open in IDE" behaves differently based on repo count.
* Everything compiles. Now the query handles both:
- Unix paths: `/workspaces/abc123/repo-name` matches `/workspaces/abc123` via `/*`
- Windows paths: `C:\workspaces\abc123\repo-name` matches `C:\workspaces\abc123` via `\*`
* Use std::path for cross-platform parent directory lookup
Instead of doing path prefix matching in SQL (which doesn't handle
Windows backslashes), we now:
1. Try exact match on the path
2. If not found, try the parent directory (handles single-repo case)
This uses std::path::Path::parent() which handles path separators
correctly on all platforms.
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
|
||
|
Gabriel Gordon-Hall
|
7bc8ece068 | workspace file search (#2002) | ||
Louis Knight-Webb
|
82a4e0fccf |
Workspace onboarding (#2013)
* cleanup navbar * re-enable dev server from command bar * Add the ability to open the command bar from the `NavbarContainer.tsx` : (vibe-kanban 58189151) - dots-three-outline icon - position next to settings `vibe-kanban/frontend/src/components/ui-new/containers/NavbarContainer.tsx` * `NavbarContainer.tsx` button to go back to old UI should navigate back to task rather than attempt (vibe-kanban 2b6f4c76) `index.ts` `vibe-kanban/frontend/src/components/ui-new/containers/NavbarContainer.tsx` `vibe-kanban/frontend/src/components/ui-new/actions/index.ts` * Add new setting: beta\_workspaces, and beta\_workspaces\_invitation\_sent (vibe-kanban e2e73cb9) - Stored in the `mod.rs` - This defaults to 'false' - If a user is considered an active user (they have created more than 50 task attempts), they should be proactively invited to join the beta of workspaces - The invite will be displayed as dialog in the old UI, triggered when the user opens the `TaskAttemptPanel.tsx` - The setting can be changed later in the `GeneralSettings.tsx` , right at the bottom in a section for beta features - When the user has beta\_workspaces set to true: - Previously when they open a task in the `TaskKanbanBoard.tsx` it would open a task attempt or task, now it will always open a task - And when clicking on a task attempt in the `TaskPanel.tsx` it will open in the new workspaces view (/workspaces/[WORKSPACE\_ID]) `vibe-kanban/frontend/src/components/panels/TaskAttemptPanel.tsx` `vibe-kanban/frontend/src/pages/settings/GeneralSettings.tsx` `vibe-kanban/crates/services/src/services/config/mod.rs` `vibe-kanban/frontend/src/components/tasks/TaskKanbanBoard.tsx` `vibe-kanban/frontend/src/components/panels/TaskPanel.tsx` * Introduce a way to give feedback (vibe-kanban 463fbf1d) - Icon in `NavbarContainer.tsx` next to settings - Also triggerable from command bar - Using posthog client, already installed `vibe-kanban/frontend/src/components/ui-new/containers/NavbarContainer.tsx` * Create a new dialog that shows when users use workspaces (ui-new) for the first time. It should (vibe-kanban b0e8344a) explain the features of workspaces. The component will consist of a popup with topics in a sidebar on the left and content (text and images) in a main section to the right. It does not use the existing Dialog component. It is accessible by clicking a help icon in the `NavbarContainer.tsx` and from the command bar via `pages.ts` Create the component and some seed content that I will edit: 1. Welcome to workspaces, here are some tips to get started 2. Use the command bar to navigate 3. Create workspaces in the sidebar, also view all your workspaces and the status of each here 4. Workspaces can be created with multiple repos 5. You can create multiple sessions for each workspace 6. Preview changes 7. View diffs, comment on them 8. If any any point you want to go back to the old UI, you can turn off workspaces in settings `vibe-kanban/frontend/src/components/ui-new/containers/NavbarContainer.tsx` `vibe-kanban/frontend/src/components/ui-new/actions/pages.ts` * Update `WorkspacesGuideDialog.tsx` : (vibe-kanban b4c5d731) - Make 600px height - Add new section: Context Bar > The context bar lets you switch between panes quickly. Drag it wherever works best for you. `vibe-kanban/frontend/src/components/ui-new/dialogs/WorkspacesGuideDialog.tsx`  * The `WorkspacesGuideDialog.tsx` appears every time I reload the page, it doesn't seem that we're (vibe-kanban 7fd9e0c8) saving that the user has already seen it once and it should no longer be auto shown `vibe-kanban/frontend/src/components/ui-new/dialogs/WorkspacesGuideDialog.tsx` * Please run `check-i18n.sh` and fix the issue (vibe-kanban d3323397) `vibe-kanban/scripts/check-i18n.sh` |
||
|
Gabriel Gordon-Hall
|
cdfb081cf8 |
feat: copy-file autocomplete (#2004)
* add repo file search endpoint and use for copy-file autocomplete * address feedback and fix i18n errors * remove unused i18n |
||
|
Louis Knight-Webb
|
33419c95f7 |
Improve the preview functionality (vibe-kanban) (#2010)
* preview styles
* All tasks are complete. Let me provide a summary of the changes made:
## Summary
I've implemented the preview functionality improvements as requested:
### Changes Made
**1. Rust Types (`crates/db/src/models/scratch.rs`)**
- Renamed `PreviewUrlOverrideData` → `PreviewSettingsData`
- Added new fields: `screen_size`, `responsive_width`, `responsive_height`
- Updated `ScratchPayload` and `ScratchType` enum to use `PreviewSettings`
**2. New Hook (`frontend/src/hooks/usePreviewSettings.ts`)**
- Created new `usePreviewSettings` hook (replaced `usePreviewUrlOverride`)
- Manages both URL override and screen size settings
- Persists screen size via the scratch system (per-workspace)
- Exports `ScreenSize` and `ResponsiveDimensions` types
**3. PreviewBrowserContainer (`frontend/src/components/ui-new/containers/PreviewBrowserContainer.tsx`)**
- Added URL controls (input, copy, open in new tab, refresh, clear override)
- Added stop button and related handlers
- Added screen size state management
- Added responsive dimensions resize handlers
**4. PreviewBrowser View (`frontend/src/components/ui-new/views/PreviewBrowser.tsx`)**
- Added floating toolbar above the iframe with:
- URL input with action buttons
- Screen size toggle (Desktop/Mobile/Responsive icons)
- Dimensions display for responsive mode
- Stop button
- Implemented three screen modes:
- **Desktop**: Full width/height (current behavior)
- **Mobile**: 390×844px centered with shadow
- **Responsive**: Draggable resize handles on right, bottom, and corner edges
**5. PreviewControls View (`frontend/src/components/ui-new/views/PreviewControls.tsx`)**
- Simplified to show only logs
- Removed URL input row and all control buttons
- Renamed section header to "Dev Server Logs"
**6. PreviewControlsContainer (`frontend/src/components/ui-new/containers/PreviewControlsContainer.tsx`)**
- Removed all URL-related state and handlers
- Now only manages logs display and process tab switching
All type checks pass. The screen size preference is persisted per-workspace using the existing scratch system.
* Cleanup script changes for workspace dd65dbe3-2e31-4897-8aa4-b2f8f7971ab7
* All ESLint and TypeScript checks pass. The implementation is complete.
## Summary of Changes
**Files Modified:**
1. **`crates/db/src/models/scratch.rs`** - Renamed `PreviewUrlOverrideData` → `PreviewSettingsData` with new fields for screen size persistence
2. **`crates/server/src/bin/generate_types.rs`** - Updated type export to use new name
3. **`shared/types.ts`** - Regenerated with new types (`PreviewSettingsData`, `ScratchType.PREVIEW_SETTINGS`)
4. **`frontend/src/hooks/usePreviewSettings.ts`** (new) - Replaces `usePreviewUrlOverride.ts`, adds screen size management
5. **`frontend/src/hooks/usePreviewUrlOverride.ts`** - Deleted
6. **`frontend/src/components/ui-new/containers/PreviewBrowserContainer.tsx`** - Added URL controls, stop button, and resize state management
7. **`frontend/src/components/ui-new/views/PreviewBrowser.tsx`** - Added floating toolbar with:
- URL input with copy/open/refresh/clear buttons
- Screen size toggle (Desktop/Mobile/Responsive icons)
- Responsive resize handles
- Stop button
8. **`frontend/src/components/ui-new/containers/PreviewControlsContainer.tsx`** - Simplified to logs only
9. **`frontend/src/components/ui-new/views/PreviewControls.tsx`** - Simplified to logs only
* Cleanup script changes for workspace dd65dbe3-2e31-4897-8aa4-b2f8f7971ab7
* All checks pass. Here's a summary of the changes made:
## Summary of Changes
### 1. Fixed infinite loop bug (`usePreviewSettings.ts`)
- Added `useMemo` to stabilize the `responsiveDimensions` object reference
- This prevents the useEffect in the container from re-triggering on every render
### 2. Updated toolbar to always show with floating style (`PreviewBrowser.tsx`)
- Toolbar is now always visible (not conditional on `isServerRunning && hasUrl`)
- Changed styling from `border-b border-border` to `rounded-md shadow-md m-base` for a floating appearance
- URL input and action buttons are disabled (with `opacity-50 cursor-not-allowed`) when no URL is available
- Start/Stop button in toolbar changes based on server state:
- Shows "Start" button when server is not running
- Shows "Stop" button when server is running
- Simplified the empty state content area to just show a message pointing to the toolbar's Start button
* All checks pass. The fix:
1. **Changed from state to refs** for `isResizing` and `resizeDirection` - these now don't trigger re-renders when they change
2. **Added `localDimensionsRef`** to capture the current dimensions for the `handleEnd` callback without adding it to the effect's dependency array
3. **Effect now only depends on `setResponsiveDimensions`** (a stable callback), so event listeners are registered once on mount and cleaned up on unmount
4. **No more race conditions** - the same event handlers persist throughout the entire drag operation
The resize should now:
- Stop immediately when you release the mouse
- Be smooth without choppiness (no effect re-runs during drag)
* The responsive resize fix is complete. Here's a summary of the changes made:
**In `PreviewBrowserContainer.tsx`:**
1. Added `isResizing` state to track when resizing is active (for UI purposes)
2. Added `setResponsiveDimensionsRef` to store the callback in a ref, preventing the resize effect from re-running when the callback identity changes
3. Changed the resize effect to use an empty dependency array (`[]`) since all external values are now accessed via refs
4. Updated `handleResizeStart` to set `isResizing(true)`
5. Updated `handleEnd` to set `isResizing(false)` and use `setResponsiveDimensionsRef.current`
6. Passed `isResizing` prop to the `PreviewBrowser` view
**In `PreviewBrowser.tsx`:**
1. Added `isResizing` prop to the interface and destructured it
2. Applied `pointer-events-none` class to the iframe when `isResizing` is true - this prevents the iframe from capturing mouse events during resize, ensuring smooth dragging
These changes fix both issues:
- **Resize not stopping**: The effect no longer re-registers listeners when `setResponsiveDimensions` changes
- **Choppy dragging**: The iframe no longer captures mouse events during resize
* All checks pass. The fix is complete. The resize now uses delta-based calculation:
1. **`startPosRef`**: Captures the mouse position when resize starts
2. **`startDimensionsRef`**: Captures the iframe dimensions when resize starts
3. **`handleMove`**: Calculates delta (current position - start position) and applies it to the starting dimensions
4. **`handleEnd`**: Clears both refs when resize ends
This approach works regardless of where the iframe is positioned in the container, fixing both:
- The mouse jump offset (no longer tries to position based on container edge)
- The 50% distance issue (delta is 1:1 with mouse movement)
* Cleanup script changes for workspace dd65dbe3-2e31-4897-8aa4-b2f8f7971ab7
* Done. The resize should now move at 1:1 with the cursor. Since the centered element grows on both sides equally, doubling the delta ensures the edge under the cursor moves the full distance you drag.
* Done! I've added a minimal dark phone frame around the iframe when in mobile mode. The changes:
- **Mobile mode** now wraps the iframe in a phone skeleton with:
- Dark bezel (`bg-gray-900`)
- Rounded outer corners (`rounded-[3rem]`)
- Padding for bezel width (`p-3`)
- Shadow (`shadow-xl`)
- Rounded inner screen area (`rounded-[2.5rem]`)
- **Desktop and responsive modes** remain unchanged
You can test it by running `pnpm run dev:qa` and switching to mobile view in the preview browser.
* styles
* I've completed the implementation. Here's a summary of the changes:
## Summary
Created two new reusable button components and updated PreviewBrowser.tsx to standardize button styles:
### New Components
1. **`IconButton.tsx`** (`frontend/src/components/ui-new/primitives/IconButton.tsx`)
- Standalone icon button with consistent styling
- Supports `default` and `tertiary` variants
- Includes proper hover states (`bg-secondary/50`), disabled states, and transitions
2. **`IconButtonGroup.tsx`** (`frontend/src/components/ui-new/primitives/IconButtonGroup.tsx`)
- Container component for grouped icon buttons with shared border
- `IconButtonGroupItem` for individual buttons with `active` state support
- Consistent styling with border, padding, and hover/active states
### Updated PreviewBrowser.tsx
- **URL action buttons** (Clear, Copy, Open in new tab, Refresh): Now use `IconButton` component with consistent hover backgrounds
- **Screen size toggle** (Desktop, Mobile, Responsive): Now uses `IconButtonGroup` and `IconButtonGroupItem` with proper active state styling
- **Start/Stop button**: Kept using `PrimaryButton` (already consistent)
### Visual Consistency Achieved
All toolbar buttons now share:
- Consistent padding (`p-half`)
- Consistent hover states (`bg-secondary/50` background)
- Consistent active states (`bg-secondary` background) for toggles
- Consistent disabled states (`opacity-40 cursor-not-allowed`)
- Consistent icon sizing (`size-icon-sm`) with `weight="bold"`
- Consistent border radius (`rounded-sm`)
* Done. The URL action buttons (Copy, Open in new tab, Refresh) are now grouped in an `IconButtonGroup` with a shared border, matching the visual style of the screen size toggle group.
The toolbar now has three visually consistent button groups:
1. **URL input** with optional clear override button
2. **URL actions group** (Copy, Open in new tab, Refresh) - bordered group
3. **Screen size toggle group** (Desktop, Mobile, Responsive) - bordered group
4. **Start/Stop button** (PrimaryButton)
* Done. All changes have been implemented:
1. **Added `iconClassName` prop to `IconButtonGroupItem`** - Supports passing custom classes to the icon (e.g., `animate-spin` for the spinner)
2. **Moved Clear button into URL Actions group** - The Clear Override button (X icon) is now inside the `IconButtonGroup` with Copy, Open, and Refresh buttons
3. **Replaced Pause button with `IconButtonGroupItem`** - The stop/pause button now uses the same `IconButtonGroup` styling as the other toolbar buttons, with spinner animation support when stopping
The toolbar now has consistent visual styling with three button groups:
- **URL Actions**: Clear (conditional), Copy, Open in new tab, Refresh
- **Screen Size Toggle**: Desktop, Mobile, Responsive
- **Stop button**: Pause icon (when server is running)
- **Start button**: Kept as `PrimaryButton` since it has a text label
* Cleanup script changes for workspace dd65dbe3-2e31-4897-8aa4-b2f8f7971ab7
* Done. The Start/Stop button is now a single `IconButtonGroup` with one `IconButtonGroupItem` that:
- Shows Play icon when server is stopped, Pause icon when running
- Shows Spinner icon with animation when starting or stopping
- Has the same size as all other toolbar button groups
* Cleanup script changes for workspace dd65dbe3-2e31-4897-8aa4-b2f8f7971ab7
* Done. Fixed the spinning Play icon bug by making the `iconClassName` logic match the icon selection logic exactly. Now `animate-spin` is only applied when actually showing the `SpinnerIcon`.
* Done. The entire toolbar (URL input, URL actions, screen size toggle) is now disabled when the dev server isn't running. Only the Play/Start button remains enabled so users can start the server.
* The changes compile correctly. Here's a summary of what was fixed:
## Summary
Fixed the "Fix Script" button showing at the wrong time in `PreviewBrowser.tsx`.
**Changes made:**
1. **`PreviewBrowser.tsx`** - Added `hasFailedDevServer?: boolean` prop and updated the condition on line 345 from `{handleFixDevScript && (` to `{hasFailedDevServer && handleFixDevScript && (`
2. **`PreviewBrowserContainer.tsx`** - Added failed dev server detection logic (lines 45-51) that checks for processes with `status === 'failed'` or `status === 'completed'` with non-zero exit code, and passed the `hasFailedDevServer` prop to the view
The "Fix Script" button will now only appear when the last dev server process actually failed, not when it was successful or killed.
* update styles
* All tasks completed. Here's a summary of the changes made:
## Summary
### 1. `IconButtonGroup.tsx` (lines 3, 50-65)
- Added import for `Tooltip` component
- Modified `IconButtonGroupItem` to wrap buttons with `<Tooltip>` when `title` prop is provided
- Removed native `title` attribute from button (tooltip handles it now)
### 2. `en/tasks.json` (lines 125-134)
Added new i18n keys under `preview.toolbar`:
- `clearUrlOverride`: "Clear URL override"
- `desktopView`: "Desktop view"
- `mobileView`: "Mobile view (390x844)"
- `responsiveView`: "Responsive view (resizable)"
- `startDevServer`: "Start dev server"
Added new `preview.loading` section:
- `startingServer`: "Starting dev server..."
- `waitingForServer`: "Waiting for server..."
### 3. `PreviewBrowser.tsx` (lines 160-254, 342-344)
Replaced all hardcoded strings with i18n translations using `t()`:
- URL action buttons (clear override, copy, open in tab, refresh)
- Screen size toggle buttons (desktop, mobile, responsive)
- Start/stop server button
- Loading state messages
All icon buttons now have proper accessible tooltips via the `Tooltip` component instead of native browser `title` attributes, and all strings are internationalized.
* style
* All i18n issues have been fixed. Here's a summary of the changes made:
**1. Added missing translation keys to all non-English locales (es, ja, ko, zh-Hans, zh-Hant):**
- `preview.loading.startingServer`
- `preview.loading.waitingForServer`
- `preview.toolbar.clearUrlOverride`
- `preview.toolbar.desktopView`
- `preview.toolbar.mobileView`
- `preview.toolbar.responsiveView`
- `preview.toolbar.startDevServer`
**2. Fixed hardcoded strings in `PreviewBrowser.tsx`:**
- Replaced dimension separator `x` with HTML entity `×`
- Internationalized the "no dev script" setup message with 3 new i18n keys:
- `preview.noServer.setupTitle`
- `preview.noServer.editDevScript`
- `preview.noServer.learnMore`
**3. Added the 3 new keys to all locale files (en, es, ja, ko, zh-Hans, zh-Hant)**
The `check-i18n.sh` script now passes with:
- 128 violations (down from 131 on main - a net improvement!)
- No duplicate keys
- Translation keys consistent across all locales
|
||
|
Louis Knight-Webb
|
c7cf72a57f |
Allow manual URL override in dev server preview (Vibe Kanban) (#1989)
* The implementation is complete and tested. Here's a summary of the changes made: I've implemented an editable URL bar in the Preview Controls that allows users to override the auto-detected dev server URL on a per-workspace basis. | File | Changes | |------|---------| | `crates/db/src/models/scratch.rs` | Added `PreviewUrlOverrideData` struct and `PreviewUrlOverride` variant to `ScratchPayload` enum | | `crates/server/src/bin/generate_types.rs` | Registered `PreviewUrlOverrideData::decl()` for TypeScript type generation | | `shared/types.ts` | Auto-generated with new `PreviewUrlOverrideData` type and updated `ScratchPayload` union | | `frontend/src/hooks/usePreviewUrlOverride.ts` | **New file** - Custom hook for managing URL override persistence via scratch system | | `frontend/src/components/ui-new/containers/PreviewControlsContainer.tsx` | Added URL override hook integration, merged auto-detected with override URL | | `frontend/src/components/ui-new/views/PreviewControls.tsx` | Replaced static `<span>` with editable `<input>`, added clear override button (X icon) | - **Editable URL bar**: Users can type a custom URL to override the auto-detected one - **Per-workspace persistence**: Override URL saved in the scratch system using workspace ID - **Debounced saves**: Changes are debounced (300ms) before saving to avoid excessive API calls - **Clear override button**: X button appears when override is active, allowing revert to auto-detected URL - **Visual distinction**: Override URLs show in normal text color, auto-detected in dim text * Cleanup script changes for workspace 3f3c315d-5cc2-43b0-9043-117c857f38b4 * The URL input fix is complete. Here's a summary of what was implemented: **Feature: Editable URL bar with per-workspace persistence** 1. **New scratch type** - Added `PreviewUrlOverride` to the Rust scratch system for persisting URL overrides per workspace 2. **New hook** - Created `usePreviewUrlOverride.ts` that wraps the scratch system with debounced saves (300ms delay) 3. **Container integration** - Updated `PreviewControlsContainer.tsx` to use the override URL when set, falling back to auto-detected URL 4. **View updates** - Updated `PreviewControls.tsx` with: - Editable input field instead of read-only display - Clear button (X icon) to revert to auto-detected URL - Local state management to prevent WebSocket updates from disrupting typing **Bug fix for typing issue:** - Added local state (`localValue`) and ref (`inputRef`) to track input value locally - The effect only syncs from server when input is not focused, preventing cursor jumping and character loss during typing * ESLint and Clippy both pass now. The fix moved the state management from the presentational view component (`PreviewControls.tsx`) to the container component (`PreviewControlsContainer.tsx`), which aligns with the codebase's architecture pattern of keeping views stateless. * I can see projects now. Let me click on the first project to access a workspace where I can test the URL override feature: * TypeScript check passes now. The fix was changing `RefObject<HTMLInputElement | null>` to `RefObject<HTMLInputElement>` in the props interface - the `null` is already implied in how React refs work. |
||
|
GitHub Action
|
6d5c8ac486 | chore: bump version to 0.0.150 | ||
|
Alex Netsch
|
20b99300fe |
Add session-level review endpoint with StartReviewDialog (Vibe Kanban) (#1849)
* All checks pass. Let me provide a summary of what was implemented:
I've implemented the review endpoint as planned. Here's what was created:
1. **`crates/executors/src/actions/review.rs`** - New action type with:
- `RepoReviewContext` struct (repo_id + commit_hashes)
- `ReviewRequest` struct (executor_profile_id, context, additional_prompt, working_dir)
- `Executable` trait impl that calls `executor.spawn_review()`
2. **`crates/server/src/routes/task_attempts/review.rs`** - Endpoint handler with:
- `StartReviewRequest` for the API
- `RepoReviewContext` (endpoint-specific copy)
- `ReviewError::ProcessAlreadyRunning`
- `start_review` handler that:
- Verifies no running processes on workspace
- Creates fresh session
- Builds ReviewRequest action
- Starts execution with `ExecutionProcessRunReason::CodingAgent`
1. **`crates/executors/src/executors/mod.rs`**:
- Added `spawn_review()` to `StandardCodingAgentExecutor` trait with default prompt-based implementation
- Added `build_review_prompt()` helper function
2. **`crates/executors/src/actions/mod.rs`**:
- Added `pub mod review;`
- Added `ReviewRequest` to `ExecutorActionType` enum
- Updated `base_executor()` match
3. **`crates/services/src/services/container.rs`**:
- Updated match in `try_start_next_action` to handle `ReviewRequest`
4. **`crates/server/src/routes/task_attempts.rs`**:
- Added `pub mod review;`
- Added `.route("/review", post(review::start_review))`
5. **`crates/server/src/bin/generate_types.rs`**:
- Added new types to export list
**`POST /task-attempts/{id}/review`**
Request:
```json
{
"executor_profile_id": { "executor": "CLAUDE_CODE", "variant": null },
"context": [{ "repo_id": "uuid", "commit_hashes": ["abc123"] }],
"additional_prompt": "Focus on security issues"
}
```
Response: `ExecutionProcess` on success, `ReviewError` on failure.
To add native review for an executor (e.g., Codex), just override `spawn_review()` in that executor's `StandardCodingAgentExecutor` impl. No changes needed to action or endpoint.
Cleanup script changes for workspace 38f8b607-9fdc-43dc-afa3-16e8f5e9cbd3
All checks pass now. The duplicate type issue is fixed - we're using a single `RepoReviewContext` type from the executors crate.
All checks pass now. Both frontend lint (ESLint) and backend lint (Clippy) are passing.
Found and fixed the real issue. The problem was in `crates/services/src/services/container.rs` - the log normalization was only set up for `CodingAgentInitialRequest` and `CodingAgentFollowUpRequest`. `ReviewRequest` was falling through to the default case and returning `None`, so no normalizer was started for review processes.
Fixed in two places:
1. **Line 787-791**: Added `ReviewRequest` handling in `stream_normalized_logs` (for historic logs)
2. **Line 1149-1151**: Added `ReviewRequest` handling in `start_execution` (for live logs)
Cleanup script changes for workspace 38f8b607-9fdc-43dc-afa3-16e8f5e9cbd3
* Backend changes for the `use_all_workspace_commits` flag are complete. Here's what was implemented:
Added `use_all_workspace_commits` flag to `StartReviewRequest` for automatically populating review context.
1. **`crates/db/src/models/execution_process_repo_state.rs`**
- Added `find_initial_commits_for_workspace()` - query to get the earliest `before_head_commit` for each repo in a workspace
2. **`crates/server/src/routes/task_attempts/review.rs`**
- Added `use_all_workspace_commits: bool` field to `StartReviewRequest` (defaults to `false`)
- When flag is `true` and `context` is `None`, auto-populates context with initial commits from workspace execution processes
3. **`crates/executors/src/executors/mod.rs`**
- Updated `build_review_prompt()` to detect single-commit context (indicating initial commit)
- When single commit per repo, prompts agent to "Review all changes made since the following base commit(s)" with git diff hint
4. **`crates/services/src/services/git.rs`**
- Added `get_commits_since_branch()` method (may be useful for future use)
5. **`shared/types.ts`**
- Generated TypeScript type includes `use_all_workspace_commits: boolean`
When frontend calls `POST /task-attempts/{id}/review` with:
```json
{
"executor_profile_id": { "executor": "CLAUDE_CODE", "variant": null },
"use_all_workspace_commits": true
}
```
The backend will:
1. Find the earliest execution process for the workspace
2. Get the `before_head_commit` for each repo (the commit before agents started making changes)
3. Pass that to the prompt builder which tells the agent to review all changes since that commit
Cleanup script changes for workspace 38f8b607-9fdc-43dc-afa3-16e8f5e9cbd3
* Frontend UI implementation is complete. Here's a summary of what was added:
Added simple frontend UI to test the review endpoint.
1. **`frontend/src/lib/api.ts`**
- Added `startReview` method to `attemptsApi`
- Imports `StartReviewRequest`, `ReviewError` types
2. **`frontend/src/hooks/useStartReview.ts`** (NEW)
- Hook that calls `attemptsApi.startReview` with `use_all_workspace_commits: true`
- Invalidates `processes` and `branchStatus` queries on success
3. **`frontend/src/hooks/index.ts`**
- Exports `useStartReview`
4. **`frontend/src/components/ui/actions-dropdown.tsx`**
- Added "Start Review" menu item in the attempt actions section
- Uses the user's default executor profile from config
- Shows loading state while starting review
5. **`frontend/src/i18n/locales/en/tasks.json`**
- Added translation keys: `startReview`, `startingReview`
From the workspace actions dropdown (three dots menu), click "Start Review" to start a code review session using all workspace commits as context.
Done! The fix has been implemented. The review endpoint now uses `Session::find_latest_by_workspace_id` to find an existing session for the workspace, and only creates a new session if none exists. This means review logs will now appear in the same conversation view as other coding agent runs.
**Change summary:**
- Modified `crates/server/src/routes/task_attempts/review.rs` (lines 79-93)
- Instead of always creating a new session, it now checks for an existing session first using `Session::find_latest_by_workspace_id`
- This matches the pattern used by dev server, setup scripts, and other similar endpoints
Done! The fix is now in place. The change adds `ReviewRequest` to the action type filter in `useConversationHistory.ts` so review processes are included in the conversation view, and handles the content extraction appropriately (using `additional_prompt` for reviews instead of `prompt`).
**Change summary:**
- Modified `frontend/src/hooks/useConversationHistory.ts` (lines 226-244)
- Added `ReviewRequest` to the action type filter
- Used conditional to extract content from `additional_prompt` for reviews (with fallback "Review the code changes") vs `prompt` for coding agent requests
Cleanup script changes for workspace 38f8b607-9fdc-43dc-afa3-16e8f5e9cbd3
Done! All fixes are now in place:
1. **`useConversationHistory.ts` - `flattenEntries()`** (line 177-184): Added `ReviewRequest` to the filter so review processes are included in the flattened entries
2. **`useConversationHistory.ts` - `flattenEntriesForEmit()`** (line 226-244): Already fixed earlier - handles `ReviewRequest` and extracts `additional_prompt` for user message content
3. **`ProcessesTab.tsx`** (line 223-228): Added `ReviewRequest` to the ProfileVariantBadge conditional so the agent badge shows for review processes
* Done. Changes made:
1. **`crates/executors/src/actions/review.rs`**: Added `prompt: String` field to `ReviewRequest`
2. **`crates/server/src/routes/task_attempts/review.rs`**:
- Import `build_review_prompt`
- Build the full prompt from context and additional_prompt before creating the action
3. **`frontend/src/hooks/useConversationHistory.ts`**: Simplified content extraction to just use `actionType.prompt` for all action types (since `ReviewRequest` now has a prompt field too)
4. **Regenerated TypeScript types** - `ReviewRequest` in `shared/types.ts` now includes the `prompt` field
Cleanup script changes for workspace 38f8b607-9fdc-43dc-afa3-16e8f5e9cbd3
* Done. Here's a summary of the changes:
**Backend:**
1. **`crates/executors/src/actions/review.rs`**:
- Added `CommitRange` enum with three variants: `FromBase`, `Specific`, and `Range`
- Updated `RepoReviewContext` to use `repo_name: String` and `commits: CommitRange` instead of `commit_hashes`
2. **`crates/executors/src/executors/mod.rs`**:
- Updated `build_review_prompt` to format output with repo names and handle all `CommitRange` variants
3. **`crates/server/src/routes/task_attempts/review.rs`**:
- Simplified `StartReviewRequest` (removed `context` field, kept `use_all_workspace_commits`)
- Updated handler to look up repo names via `Repo::find_by_ids` and use `CommitRange::FromBase`
4. **`crates/server/src/bin/generate_types.rs`**: Added `CommitRange` to exported types
**Frontend:**
- **`frontend/src/hooks/useStartReview.ts`**: Removed `context: null` since that field no longer exists
The prompt will now look like:
```
Please review the code changes.
Repository: vibe-kanban
Review all changes from base commit abc123 to HEAD.
Use `git diff abc123..HEAD` to see the changes.
```
Cleanup script changes for workspace 38f8b607-9fdc-43dc-afa3-16e8f5e9cbd3
* Codex review support (vibe-kanban e7996a18)
## Context
We've added a review endpoint (\`POST /task-attempts/{id}/review\`) that starts a code review session. Currently it uses a default prompt-based implementation via \`spawn\_review()\` on \`StandardCodingAgentExecutor\`, which builds a prompt and delegates to \`spawn()\`.
## Goal
Implement native Codex review support by overriding \`spawn\_review()\` in the Codex executor to use Codex's native review mechanism instead of the prompt-based approach.
## Current Implementation
### Backend Types
\*\*\`CommitRange\` enum\*\* (\`crates/executors/src/actions/review.rs\`):
\`\`\`rust
pub enum CommitRange {
FromBase { commit: String },
Specific { commits: Vec<String> },
Range { from: String, to: String },
}
\`\`\`
\*\*\`RepoReviewContext\`\*\*:
\`\`\`rust
pub struct RepoReviewContext {
pub repo\_id: Uuid,
pub repo\_name: String,
pub commits: CommitRange,
}
\`\`\`
### Trait Method
\*\*\`spawn\_review()\`\*\* in \`StandardCodingAgentExecutor\` trait (\`crates/executors/src/executors/mod.rs\`):
\`\`\`rust
async fn spawn\_review(
&self,
current\_dir: &Path,
context: Option<&[RepoReviewContext]>,
additional\_prompt: Option<&str>,
env: &ExecutionEnv,
) -> Result<SpawnedChild, ExecutorError> {
// Default: build prompt and delegate to spawn()
let prompt = build\_review\_prompt(context, additional\_prompt);
self.spawn(current\_dir, &prompt, env).await
}
\`\`\`
## Tasks
1. Research Codex's native review API/mechanism (if it has one)
2. Override \`spawn\_review()\` in \`CodexExecutor\` to use native review if available
3. Fall back to prompt-based approach if native review isn't supported
* Done. Here's a summary of the changes:
1. **Removed dead code** from `crates/executors/src/executors/codex/review.rs`:
- Deleted the `map_to_review_target()` function (was ~120 lines)
- Removed unused imports (`CommitRange`, `RepoReviewContext`)
2. **Codex now uses `ReviewTarget::Custom`** with the pre-built prompt, which ensures the displayed prompt matches what Codex actually receives.
The build passes and TypeScript types have been regenerated.
* Use custom review target for codex
* Done. Here's a summary of the changes:
## Summary
Moved the review endpoint from workspace-level to session-level:
### Changes
1. **Created `crates/server/src/routes/sessions/review.rs`**
- New review endpoint at `POST /sessions/{id}/review`
- Takes `Extension<Session>` instead of `Extension<Workspace>`
- Looks up `agent_session_id` from previous executions using `find_latest_coding_agent_turn_session_id()`
- Passes `agent_session_id` to `ReviewAction` for session resumption
2. **Updated `crates/server/src/routes/sessions/mod.rs`**
- Added `pub mod review;`
- Added route `.route("/review", post(review::start_review))`
3. **Updated `crates/server/src/routes/task_attempts.rs`**
- Removed `pub mod review;`
- Removed `.route("/review", post(review::start_review))`
4. **Deleted `crates/server/src/routes/task_attempts/review.rs`**
5. **Updated `crates/server/src/bin/generate_types.rs`**
- Changed path from `task_attempts::review` to `sessions::review`
### API Change
- **Old**: `POST /api/task-attempts/{workspace_id}/review`
- **New**: `POST /api/sessions/{session_id}/review`
This ensures vk sessions and agent sessions are 1:1:
- Existing session → resumes agent session if available
- New session → fresh agent session
* Done! Here's a summary of all the frontend changes:
- Added `startReview` to `sessionsApi` using new endpoint `POST /api/sessions/${sessionId}/review`
- Removed `startReview` from `attemptsApi`
- Changed parameter from `attemptId` to `sessionId` and added optional `workspaceId` for query invalidation
- Changed API call from `attemptsApi.startReview` to `sessionsApi.startReview`
- Added `MagnifyingGlassIcon` import
- Added `onStartReview` and `isReviewStarting` to `SessionProps` interface
- Added "Start Review" menu item in the session dropdown
- Added `useStartReview` hook import and usage
- Added `handleStartReview` callback function
- Passed `onStartReview` and `isReviewStarting` to `SessionChatBox`
- Removed `useStartReview` import
- Removed `useUserSystem` import (now unused)
- Removed `startReview` hook usage
- Removed `handleStartReview` function
- Removed "Start Review" menu item from the dropdown
* Done. The fix adds the `ReviewRequest` case to `latest_executor_profile_for_session()` in `crates/db/src/models/execution_process.rs:688-690`.
The backend check passes. Follow-ups after reviews should now work correctly since the executor profile can be extracted from `ReviewRequest` just like from the other request types.
* Done. Removed `CommitRange` enum entirely. Changes:
1. **`crates/executors/src/actions/review.rs`** - Deleted `CommitRange` enum, changed `RepoReviewContext.commits` to `RepoReviewContext.base_commit: String`
2. **`crates/server/src/routes/sessions/review.rs`** - Updated construction to use `base_commit: initial_commit` instead of `commits: CommitRange::FromBase { commit: initial_commit }`
3. **`crates/executors/src/executors/mod.rs`** - Simplified `build_review_prompt()` to directly use `repo.base_commit` instead of matching on the enum
4. **`crates/server/src/bin/generate_types.rs`** - Removed `CommitRange::decl()` from type exports
5. **`shared/types.ts`** - Regenerated, `CommitRange` type is now gone
Cleanup script changes for workspace 38f8b607-9fdc-43dc-afa3-16e8f5e9cbd3
* Done. Simplified the review context building:
**Changes:**
1. **`crates/db/src/models/execution_process_repo_state.rs`** - Replaced `find_initial_commits_for_workspace` with `find_initial_commit_for_repo` that takes a specific repo_id and uses ORDER BY + LIMIT 1 instead of GROUP BY/HAVING.
2. **`crates/server/src/routes/sessions/review.rs`** - Simplified the context building:
- Get workspace repos first (has repo names via `display_name`)
- For each repo, get initial commit
- Build context directly - no more HashMap joining, no more separate `Repo::find_by_ids` call
The new code is much easier to follow: get repos → for each, get initial commit → build context.
* Done. Addressed all 23 review comments:
1. Removed comment from `SessionChatBoxContainer.tsx` (line 161)
2. Removed doc comments from `RepoReviewContext` and `ReviewRequest` structs in `review.rs`
3. Removed module doc comment from `codex/review.rs`
4. Removed comment from `codex.rs` about Custom review target
5. Removed doc comments from `spawn_review` trait method in `mod.rs`
6. Removed doc comment from `build_review_prompt` function
7. Removed all comments from `sessions/review.rs` (doc comments and inline comments)
8. Removed unused `get_commits_since_branch` function from `git.rs` (~45 lines of dead code)
* Done. Added the review toggle button:
**Changes:**
1. **`SessionChatBox.tsx`**
- Added `ReviewModeProps` interface with `isActive`, `onToggle`, `isSubmitting`
- Added `reviewMode` prop to `SessionChatBoxProps`
- Added toggle button next to attach button (MagnifyingGlassIcon) - highlighted when active
- Updated placeholder to show "Enter review instructions..." when in review mode
- Removed old `onStartReview` and `isReviewStarting` from SessionProps
- Removed "Start Review" dropdown menu item
2. **`SessionChatBoxContainer.tsx`**
- Added `useState` for `isReviewMode`
- Updated `handleSend` to call `startReviewMutation` with `additionalPrompt` when in review mode
- Reset review mode after successful review start
- Pass `reviewMode` props to SessionChatBox
- Removed old `handleStartReview` callback
Now the user can:
1. Click the magnifying glass toggle next to attach
2. Enter review instructions in the text area
3. Click send → starts review with the prompt
Cleanup script changes for workspace 38f8b607-9fdc-43dc-afa3-16e8f5e9cbd3
TypeScript and Rust both compile. The changes are:
1. Button shows "Review" when review mode is active
2. Toggle icon uses `!text-accent-foreground` to force override the `text-low` class from the base component, along with `bg-accent rounded-sm` for the background highlight
Done. Changed `!text-accent-foreground` to `!text-normal` which uses the design system's proper text color for active/selected states. The `!` prefix forces the override of the base `text-low` class. Both TypeScript and Rust compile successfully.
Cleanup script changes for workspace 38f8b607-9fdc-43dc-afa3-16e8f5e9cbd3
All done. TypeScript and Rust compile successfully. Here's a summary of the changes:
**Created:**
- `frontend/src/components/dialogs/tasks/StartReviewDialog.tsx` - New dialog with:
- Agent/variant selection (using ExecutorProfileSelector)
- Review comments preview (if any)
- Additional instructions textarea
- Start Review / Cancel buttons
**Modified:**
- `frontend/src/components/dialogs/index.ts` - Added export for StartReviewDialog
- `frontend/src/components/ui-new/primitives/SessionChatBox.tsx`:
- Changed `ReviewModeProps` from toggle state to simple callback (`onReviewClick`, `isDisabled`)
- Removed toggle styling and review mode button text
- Button now just opens the dialog
- `frontend/src/components/ui-new/containers/SessionChatBoxContainer.tsx`:
- Removed `isReviewMode` state and `startReviewMutation`
- Added `handleReviewClick` callback that opens `StartReviewDialog`
- Disabled review button when in new session mode or no session exists
Cleanup script changes for workspace 38f8b607-9fdc-43dc-afa3-16e8f5e9cbd3
Done. TypeScript and Rust compile successfully. Summary of changes:
**`StartReviewDialog.tsx`:**
- Added "New Session" toggle (defaults ON when no session exists, disabled when no session to toggle from)
- Added conditional `AgentSelector` - only shown when creating a new session
- Always shows `ConfigSelector` for variant selection
- Handles session creation inline when toggle is on or no session exists
- Updated `onSuccess` callback to return new session ID when created
**`SessionChatBox.tsx`:**
- Removed `isDisabled` from `ReviewModeProps` interface
- Removed `reviewMode.isDisabled` from button disabled logic
**`SessionChatBoxContainer.tsx`:**
- Updated `handleReviewClick` to allow opening dialog without sessionId
- Updated `onSuccess` callback to select the new session if one was created
- Removed `isDisabled` from reviewMode prop
Cleanup script changes for workspace 38f8b607-9fdc-43dc-afa3-16e8f5e9cbd3
Done. Made `reviewMode` required and removed the conditional - the review button is now always shown.
Done. Now the StartReviewDialog:
- Shows `ExecutorProfileSelector` (Agent + Configuration side by side, like CreateAttemptDialog) when "New Session" toggle is ON
- Shows just `ConfigSelector` (variant only) when "New Session" toggle is OFF
TypeScript and Rust compile successfully. The Switch layout has been fixed to match the TaskFormDialog pattern:
- Switch is now on the LEFT of the label
- Uses `gap-2` instead of `justify-between`
- Has proper dark mode styling with `data-[state=checked]:bg-gray-900 dark:data-[state=checked]:bg-gray-100`
- Label has `cursor-pointer` for better UX
Cleanup script changes for workspace 38f8b607-9fdc-43dc-afa3-16e8f5e9cbd3
Done. The Switch is now moved to the footer (bottom of the dialog), matching the TaskFormDialog pattern:
- Switch on the left side of the footer
- Cancel and Start Review buttons on the right side
- Added `disabled:opacity-50` for better visibility when disabled in dark mode
Done. All changes complete:
1. **Removed header** - No more "Start Review" title or description
2. **Removed labels from selectors** - `showLabel={false}` for both `ExecutorProfileSelector` and `ConfigSelector`
3. **Fixed footer layout** - Cancel button on left, Switch + "New Session" + "Start Review" button grouped on right (matching TaskFormDialog)
4. **TypeScript compiles** - Both frontend and backend checks pass
Done. Changes made:
1. **Moved selector to bottom** - Now the order is: Additional Instructions textarea → Review comments preview → Error → Profile/Config selector → Footer
2. **Fixed Switch visibility** - Changed from `data-[state=checked]:bg-gray-900 dark:data-[state=checked]:bg-gray-100` to `bg-muted-foreground/30 data-[state=checked]:bg-foreground` using semantic colors
3. **TypeScript compiles** - Both frontend and backend checks pass
Done. The Switch className now uses `!` important modifiers to override the component's hardcoded background colors:
- `!bg-muted-foreground/30` - visible gray background when unchecked (overrides `bg-input`)
- `data-[state=checked]:!bg-foreground` - foreground color when checked (overrides `bg-foreground`)
Done. Changed the Switch className to use `!bg-muted` which should provide better contrast against the dialog's `bg-primary` background.
Done. Changed the Switch className to use `!bg-border` which should provide some contrast against the dialog's `bg-primary` background (25% lightness vs 18% lightness).
* Fix duplicate routes
* I've analyzed the problem. Here's my understanding:
**The issue:** After rebasing, stored commit SHAs (`after_head_commit`) become invalid because rebasing rewrites history with new SHAs.
**Your suggestion (`git diff A^..B`):** This still has the same problem - after rebase, commit `A` doesn't exist with that SHA anymore. `A^` requires resolving commit `A` first.
**My recommended fix:** Instead of using stored commit SHAs, use the **branch name** as the base:
- `git diff {target_branch}..HEAD` instead of `git diff {commit_sha}..HEAD`
- This is always valid regardless of rebasing
- Matches user intent: "show all changes on this workspace branch vs base"
This would require changes to:
1. `review.rs` - use `workspace.target_branch` instead of querying `find_first_commit_for_repo`
2. `build_review_prompt` - update to use branch name
3. `RepoReviewContext` - change `base_commit` to `base_branch`
**Questions:**
1. Is using `target_branch` the right base? Or do you need something more granular like "changes since session X"?
2. Should we keep `before_head_commit`/`after_head_commit` for per-execution tracking, or simplify?
* Done. Here's a summary of the changes:
## Changes Made
### 1. `crates/services/src/services/git/cli.rs`
- Made `merge_base` method public (was `fn`, now `pub fn`)
### 2. `crates/services/src/services/git.rs`
- Added new public method `get_fork_point()` that wraps the CLI `merge_base` function
- This method uses `git merge-base --fork-point` which survives rebasing by consulting the reflog
### 3. `crates/server/src/routes/sessions/review.rs`
- Removed import of `ExecutionProcessRepoState` (no longer needed)
- Added `PathBuf` import
- Changed from querying stored `after_head_commit` SHAs to computing fork-point dynamically
- Now uses `WorkspaceRepo::find_repos_with_target_branch_for_workspace` to get per-repo target branches
- Computes `get_fork_point(repo_path, target_branch, workspace.branch)` for each repo
## How It Works Now
Instead of storing commit SHAs that become invalid after rebasing:
```rust
// Old (broken after rebase):
let base_commit = ExecutionProcessRepoState::find_first_commit_for_repo(...)
```
We now compute the fork-point dynamically:
```rust
// New (survives rebasing):
let base_commit = deployment.git().get_fork_point(
&repo_path,
&repo.target_branch, // e.g., "main"
&workspace.branch, // e.g., "vk/task-123"
)
```
This uses `git merge-base --fork-point` which consults the reflog to find where the branch originally diverged, regardless of subsequent rebases.
* Cleanup script changes for workspace 38f8b607-9fdc-43dc-afa3-16e8f5e9cbd3
* Removed the unused `find_first_commit_for_repo` function. Everything still compiles.
* All comments removed and code still compiles.
* Fixed. The changes:
1. Added `effective_dir` method to `ReviewRequest` in `crates/executors/src/actions/review.rs`
2. Updated `container.rs` to use `request.effective_dir(&workspace_root)` instead of `workspace_root.clone()` for `ReviewRequest`
Now the log normalization for reviews will use the correct working directory, matching how the agent is actually spawned.
* Fixed. Now the workspace is re-fetched after `ensure_container_exists` to get the updated `container_ref`.
* Fixed. Now using the `container_ref` returned directly from `ensure_container_exists` instead of re-fetching the workspace.
* Fixed the naming:
- `workspace_path` - the container_ref path containing all repos
- `worktree_path` - the path to a specific repo's worktree within the workspace
* Cleanup script changes for workspace 38f8b607-9fdc-43dc-afa3-16e8f5e9cbd3
* Done. I've added an "Include git context" checkbox to the StartReviewDialog:
- Added state `includeGitContext` defaulting to `true`
- Added a checkbox UI with label "Include git context"
- The checkbox value is passed to the API as `use_all_workspace_commits`
The checkbox appears after the error message area and before the executor profile selector. Users will see it checked by default, making it clear that git context is being included without needing to add it themselves in the prompt.
* I've completed the i18n task. Here's a summary of what was done:
1. **Added i18n support to `StartReviewDialog.tsx`**:
- Imported `useTranslation` from `react-i18next`
- Replaced all hardcoded strings with translation keys:
- "Additional Instructions (optional)" → `t('startReviewDialog.additionalInstructions')`
- "Review Comments (...)" → `t('startReviewDialog.reviewComments', { count: ... })`
- "Include git context" → `t('startReviewDialog.includeGitContext')`
- "New Session" → `t('startReviewDialog.newSession')`
- "Cancel" → `t('common:buttons.cancel')`
- "Starting..." / "Start Review" → `t('actionsMenu.startingReview')` / `t('actionsMenu.startReview')`
2. **Added translations to all locale files** (`en`, `es`, `ja`, `ko`, `zh-Hans`, `zh-Hant`):
- Added `startReviewDialog` object with `additionalInstructions`, `reviewComments`, `includeGitContext`, and `newSession` keys
- Added `actionsMenu.startReview` and `actionsMenu.startingReview` to all non-English locales
3. **Verified with i18n check script**: All checks pass - no new literal strings introduced, no duplicate keys, and translation keys are consistent across all locales.
* Cleanup script changes for workspace 38f8b607-9fdc-43dc-afa3-16e8f5e9cbd3
* All checks pass. I've added a description below the "Include git context" checkbox:
**English:** "Tells the agent how to view all changes made on this branch"
The description appears as smaller muted text below the checkbox, explaining to users what the option does - it instructs the agent how to see all the changes on this branch (via the git diff command we inject). This helps users understand they don't need to manually ask the agent about branch changes.
* Done. Here's a summary of the changes:
1. **Replaced conditional rendering** with always showing both `AgentSelector` and `ConfigSelector`
2. **Agent selector is disabled** when `createNewSession` is false (locked to the session's executor)
3. **Fixed the variant retention bug** by adding `handleNewSessionChange` that resets `selectedProfile` to `defaultProfile` when toggling "New Session" off - this ensures the variant matches the locked executor
* Types
* Removed the unused `useStartReview` hook and its export from `hooks/index.ts`.
* All checks pass. Here's a summary of the changes made:
**`frontend/src/components/ui-new/actions/index.ts`:**
1. Added `HighlighterIcon` to the Phosphor icons import (line 33)
2. Added `StartReviewDialog` import (line 49)
3. Added `StartReview` action definition (lines 293-304) with:
- `id: 'start-review'`
- `label: 'Start Review'`
- `icon: HighlighterIcon`
- `requiresTarget: true`
- Visibility when workspace exists
- Execute function that opens `StartReviewDialog`
**`frontend/src/components/ui-new/actions/pages.ts`:**
1. Added `{ type: 'action', action: Actions.StartReview }` as the first item in the `workspaceActions` page group (line 105)
The "Start Review" action with the highlighter icon will now appear in the workspace actions menu (accessed via CMD+K or the three-dots menu on a workspace).
* All checks pass. Done. Here's a summary of the additional change:
**`frontend/src/components/ui-new/primitives/SessionChatBox.tsx`:**
- Changed `MagnifyingGlassIcon` to `HighlighterIcon` in the import (line 12)
- Updated the `ToolbarIconButton` to use `HighlighterIcon` instead of `MagnifyingGlassIcon` (line 635)
The review button in the text input now shows the highlighter icon instead of the magnifying glass.
* All checks pass. Here's a summary of the changes:
**`frontend/src/components/ui-new/primitives/Toolbar.tsx`:**
- Added proper disabled styling to `ToolbarIconButton` (`opacity-40 cursor-not-allowed`)
**`frontend/src/components/ui-new/primitives/SessionChatBox.tsx`:**
- Removed `HighlighterIcon` import (no longer hardcoded)
- Added `Icon` type import
- Replaced `ReviewModeProps` with generic `ToolbarActionProps` interface (`icon`, `label`, `onClick`)
- Changed `reviewMode` prop to `toolbarActions?: ToolbarActionProps[]`
- Updated footer to render toolbar actions dynamically from the array
**`frontend/src/components/ui-new/containers/SessionChatBoxContainer.tsx`:**
- Added `HighlighterIcon` import
- Changed `reviewMode` prop to `toolbarActions` array with the review action
The button is now:
1. Generic - accepts any action with icon/label/onClick
2. Shows proper disabled state (opacity + cursor)
3. Extensible - you can add more toolbar actions by adding to the array
* All checks pass. Now toolbar actions work identically to navbar actions:
**Summary of changes:**
1. **`SessionChatBox.tsx`**:
- Changed `toolbarActions` prop from simple `{icon, label, onClick}[]` to `{actions, context, onExecuteAction}` structure
- Uses `ActionDefinition[]` from the actions system
- Uses `isActionEnabled()` to derive disabled state from action context
- Uses `isSpecialIcon()` to filter out non-standard icons
- Handles `label` being either a string or function
2. **`SessionChatBoxContainer.tsx`**:
- Added `useActions()` and `useActionVisibilityContext()` hooks
- Created `handleToolbarAction` callback that routes actions through `executeAction`
- Created `toolbarActionsList` array containing `Actions.StartReview`
- Passes the full action context to `SessionChatBox`
Now adding a new action to the conversation input works the same as navbar:
```typescript
// Just add to the array
const toolbarActionsList = useMemo(
() => [Actions.StartReview, Actions.SomeOtherAction],
[]
);
```
The action's `isVisible`, `isEnabled`, icon, label, and execute logic all come from the central `Actions` definition in `index.ts`.
* Cleanup script changes for workspace 38f8b607-9fdc-43dc-afa3-16e8f5e9cbd3
* Done. The "Start Review" action with the highlighter icon now appears in both the navbar (left side) and the chat input toolbar.
* Cleanup script changes for workspace 38f8b607-9fdc-43dc-afa3-16e8f5e9cbd3
* Done. Removed `StartReview` from the navbar and added `ToggleChangesMode` to the conversation input toolbar alongside `StartReview`.
* Done.
* Removed the review-specific branch so the handler is generic, matching other containers. The toolbar action now just respects `requiresTarget`.
Details and context:
- Simplified the action handler in `frontend/src/components/ui-new/containers/SessionChatBoxContainer.tsx:444` to rely solely on the generic `action.requiresTarget` path.
- This aligns with `frontend/src/components/ui-new/containers/NavbarContainer.tsx:66`, where all actions flow through the same generic logic.
Next steps:
1) If you want, I can run a quick lint/typecheck on the frontend (`pnpm run check`) to confirm.
* Aligned the chatbox to use the shared visibility system, like the navbar, so action availability is handled by the same logic and execution stays generic.
Details and context:
- Filtered `toolbarActionsList` through `isActionVisible` with the shared `actionCtx` so Start Review only appears when it’s supposed to.
- Kept the execution handler generic so it just respects `requiresTarget`.
Files:
- `frontend/src/components/ui-new/containers/SessionChatBoxContainer.tsx`
Next steps:
1) If you want me to run a quick frontend typecheck (`pnpm run check`), say the word.
* Cleanup script changes for workspace 38f8b607-9fdc-43dc-afa3-16e8f5e9cbd3
* Updated the Start Review dialog so it derives the active session and a default executor profile from workspace context + config, which restores preselection and enables the “new session” toggle when a session exists. This keeps the chatbox action generic while fixing the dialog behavior.
Details and context:
- Added workspace context awareness and default profile derivation (mirrors Create Attempt’s logic).
- Uses the resolved session id to enable/disable the toggle and to decide whether a new session is required.
- Keeps user selection override behavior intact.
File:
- `frontend/src/components/dialogs/tasks/StartReviewDialog.tsx`
If you want, I can also add a quick regression check or walk through the UI flow with you.
* Fixed the lint issue and clippy qa-mode compile warning, then reran the requested commands. The Start Review dialog now uses `resolvedSessionId` consistently in its callback, and review log normalization handles qa-mode without unused vars.
Files updated:
- `frontend/src/components/dialogs/tasks/StartReviewDialog.tsx`
- `crates/services/src/services/container.rs`
Commands run:
- `npm run lint`
- `npm run format`
- `npm run check`
* Renamed the match binding to `_request` so we don’t need the no-op line, and removed the comment you flagged.
Notes:
- The `let _ = request;` was only there to silence an unused-var warning under the `qa-mode` cfg. Using `_request` is the standard way to mark it intentionally unused.
Files:
- `crates/services/src/services/container.rs`
- `frontend/src/components/ui-new/containers/SessionChatBoxContainer.tsx`
Want me to rerun `npm run lint` since this touched the linted files?
* Split the `ReviewRequest` arm by cfg so qa-mode uses `_request` and non-qa uses `request` normally—no dummy line needed.
File:
- `crates/services/src/services/container.rs`
* Done. The fix adds `ReviewRequest` to the match statement that creates `CodingAgentTurn` records. Now when a review is started, a `coding_agent_turn` row will be created with the review prompt, and the `agent_session_id` will be stored when Codex reports it. Subsequent follow-ups will find this session ID and correctly use `CodingAgentFollowUpRequest` instead of starting a fresh session.
* Done. Now if a new `ExecutorActionType` variant is added, the compiler will error on this match and force the developer to decide whether it should create a `CodingAgentTurn` record.
* Adjusted `sessionsApi.startReview` to return the unwrapped payload like other session calls, and aligned the `handleApiResponse` generic so callers get an `ExecutionProcess` instead of a misleading `ApiResponse`. This fixes the runtime mismatch and keeps the API consistent.
Updated `frontend/src/lib/api.ts`.
If you want, I can:
1) run `pnpm run check` to validate types, or
2) scan for any other session APIs with inconsistent `handleApiResponse` generics.
* All checks pass. Summary of changes:
1. **Removed tooltip from dialog button** - Dialog buttons don't use tooltips in this codebase
2. **Added `getTooltip` to the `StartReview` action definition** in `actions/index.ts` - This is the pattern used for action tooltips ("Ask the agent to review your changes")
3. **Removed `submitTooltip` from all locale files** since it's no longer used
4. **Added missing `title` and `description` to zh-Hant locale**
* Done. Now when a new session is created, the dialog will call `selectSession(targetSessionId)` to switch to the newly created session before closing.
|
||
|
GitHub Action
|
2c474d689c | chore: bump version to 0.0.149 | ||
|
Gabriel Gordon-Hall
|
8fa5b9d098 |
feat: remove agent_working_dir from settings (#1874)
* remove configurable agent_working_dir (cherry picked from commit 285b3e04abceeb8e4a4ee1be16e3de97a8f32299) * calculate agent_working_dir on create and start task * i18n |
||
|
Louis Knight-Webb
|
7de87e9b3a |
Add QA mode for automated testing with mock executor and hardcoded repos (Vibe Kanban) (#1940)
* The QA mode implementation is complete. Here's a summary of what was implemented:
## Summary
I've successfully implemented the QA mode feature for the vibe-kanban application. Here's what was created/modified:
### New Files
1. **`crates/services/src/services/qa_repos.rs`** - QA repos module that:
- Defines two hardcoded QA repo URLs (`internal-qa-1` and `internal-qa-2`)
- Clones repos to a persistent temp directory on first access using `git2`
- Returns `DirectoryEntry` compatible with existing API
2. **`crates/executors/src/executors/qa_mock.rs`** - Mock executor that:
- Implements `StandardCodingAgentExecutor` trait
- Performs random file operations (create, delete, modify)
- Streams 10 mock log entries in ClaudeJson format over 10 seconds
- Reuses Claude's log processor for normalization
### Modified Files
1. **Cargo.toml files** - Added `qa-mode` feature flags to:
- `crates/executors/Cargo.toml`
- `crates/services/Cargo.toml`
- `crates/server/Cargo.toml`
2. **`crates/executors/src/executors/mod.rs`** - Added:
- Conditional `qa_mock` module export
- `QaMock` variant to `CodingAgent` enum
- Updated `capabilities()` match arm
3. **`crates/executors/src/mcp_config.rs`** - Added `QaMock` handling
4. **`crates/services/src/services/filesystem.rs`** - Override `list_git_repos` and `list_common_git_repos` in QA mode
5. **`crates/services/src/services/container.rs`** - Override `normalize_logs` executor lookup in QA mode
6. **`crates/executors/src/actions/coding_agent_initial.rs`** - Override spawn in QA mode
7. **`crates/executors/src/actions/coding_agent_follow_up.rs`** - Override spawn in QA mode
8. **`vibe-kanban/package.json`** - Added QA build scripts:
- `backend:dev:qa`
- `backend:dev:watch:qa`
- `dev:qa`
### Usage
```bash
# Run backend in QA mode
cargo run --features qa-mode
# Or with pnpm
pnpm run dev:qa
```
When QA mode is enabled:
- `GitPanelCreate` will show only `internal-qa-1` and `internal-qa-2` as recent repos
- Starting any task will perform mock file operations and stream 10 logs over 10 seconds
- Logs follow the ClaudeJson format for compatibility with the existing log processor
* Cleanup script changes for workspace 15499061-ec87-4c1c-81b9-994e84d0e75b
* The TLS error fix is complete. I've replaced the `git2::Repository::clone` call with the `git` CLI approach in `qa_repos.rs`:
**Changes made:**
- Updated `clone_qa_repos_if_needed` function to use `Command::new("git")` with `["clone", "--depth", "1", url, path]` arguments instead of `git2::Repository::clone`
- Added `--depth 1` for shallow cloning (faster)
- Updated error handling to capture stderr output from the git command
The fix uses the git CLI which has reliable TLS support, avoiding the TLS configuration issues that git2 can have on some systems. This matches patterns used elsewhere in the codebase (e.g., `crates/remote/src/github_app/service.rs`).
You can now run `pnpm run backend:dev:qa` or `pnpm run dev:qa` and the QA repos should clone successfully.
* Cleanup script changes for workspace 15499061-ec87-4c1c-81b9-994e84d0e75b
* Done! I've made the mock logs strongly typed by:
1. **Added imports** for `ClaudeJson`, `ClaudeMessage`, `ClaudeContentItem`, and `ClaudeToolData` from the Claude executor
2. **Replaced `generate_mock_logs()`** to use strongly-typed structs:
- Each log entry is now a proper `ClaudeJson` enum variant
- Uses `ClaudeMessage` with proper fields (`id`, `message_type`, `role`, `model`, `content`, `stop_reason`)
- Uses `ClaudeContentItem` variants (`Thinking`, `ToolUse`, `ToolResult`, `Text`)
- Uses `ClaudeToolData` variants (`Read`, `Write`, `Bash`)
- Serializes to JSON using `serde_json::to_string()` for correct escaping
3. **Updated tests** to verify the logs deserialize back to `ClaudeJson` types
This ensures:
- All fields match what `ClaudeLogProcessor::process_logs()` expects
- No manual JSON escaping needed (serde handles it)
- Compile-time type checking prevents malformed logs
- Session IDs are consistent across all entries
* Cleanup script changes for workspace 15499061-ec87-4c1c-81b9-994e84d0e75b
* Done! I've fixed the log display issue by replacing the shell echo approach with a temp file approach:
**Changes made to `crates/executors/src/executors/qa_mock.rs`:**
1. **Write logs to a temp file** instead of embedding them in a shell script:
- Creates a temp file at `$TMPDIR/qa_mock_logs_{uuid}.jsonl`
- Writes all logs as newline-delimited JSON
2. **Use `IFS= read -r` to read the file** - this preserves exact content:
- `IFS=` prevents word splitting
- `-r` prevents backslash interpretation
- `echo "$line"` outputs the exact line content
3. **Clean up the temp file** after reading with `rm -f`
**Benefits:**
- No shell escaping needed - file contents are read verbatim
- Each line is output exactly as serialized by serde_json
- Avoids issues with single quotes, backslashes, and escape sequences
- Temp file is automatically cleaned up after use
This should fix the issue where logs were appearing as raw JSON or with corrupted content due to shell escaping issues.
* fix formatting
* Build succeeds. I've applied the same fix to the two remaining locations that had newlines in their content:
1. **Line 234** - README tool result: Changed `\n\n` to `\\n\\n`
2. **Line 302** - Bash tool result: Changed `\n` to `\\n`
This matches the pattern the user established in the assistant final message (line 318) where `\\n` is used instead of `\n` to ensure newlines are properly preserved through the serialization and display pipeline.
* Cleanup script changes for workspace 15499061-ec87-4c1c-81b9-994e84d0e75b
* simplify scripts
* update agents.md
|
||
|
Gabriel Gordon-Hall
|
c5554610a9 |
feat: Repo level management (#1828)
* move dev server scripts onto project repos * wip: move scripts onto Repo structs * wip: repo settings page * i18n and fixes * fix refresh * i18n * nits * clickable repo cards * view logs for all dev servers * updates to workspaces * Let's make some changes to the way applications are tested: (vibe-kanban 4592de6c) - When the user starts a dev server, we should automatically open the `PreviewPanel.tsx` - In the preview panel, if no dev server script is set for any of the repos in the workspace show a message along these lines: Vibe Kanban can run dev servers to help you test your changes. You can set this up in the repo settings area. You can learn more about testing applications here: https://www.vibekanban.com/docs/core-features/testing-your-application - We should also not show the `PreviewControlsContainer.tsx` if none of the repos have a dev server script `vibe-kanban/frontend/src/components/panels/PreviewPanel.tsx` `vibe-kanban/frontend/src/components/ui-new/actions/index.ts` `vibe-kanban/frontend/src/components/ui-new/containers/PreviewControlsContainer.tsx` --------- Co-authored-by: Louis Knight-Webb <louis@bloop.ai> |
||
|
GitHub Action
|
bd09ba8bd0 | chore: bump version to 0.0.148 | ||
|
Alex Netsch
|
29595c1929 |
Add Azure DevOps repository support for PR operations (Vibe Kanban) (#1808)
* All tasks are complete. Let me summarize what was implemented:
I've successfully implemented Azure DevOps repos support alongside the existing GitHub integration. Here's what was done:
- **`mod.rs`** - Defines the `GitHostService` trait and factory functions for creating services
- **`types.rs`** - Unified types: `GitHostProvider`, `RepoInfo`, `GitHostError`, `CreatePrRequest`, `UnifiedPrComment`
- **`detection.rs`** - URL pattern matching for auto-detecting GitHub (including Enterprise) and Azure DevOps
- **`github/mod.rs`** - `GitHubHostService` implementing the trait
- **`github/cli.rs`** - `GhCli` wrapper (moved from old location)
- **`azure/mod.rs`** - `AzureHostService` implementing the trait
- **`azure/cli.rs`** - `AzCli` wrapper for Azure DevOps CLI commands
1. **Auto-detection**: The system detects the provider from the git remote URL:
- `github.com` → GitHub
- `github.*.com` → GitHub Enterprise
- `dev.azure.com`, `*.visualstudio.com`, or URLs with `/_git/` → Azure DevOps
2. **Unified trait interface**: Both providers implement `GitHostService` with methods for:
- `get_repo_info()` - Get repository identification
- `check_auth()` - Verify CLI authentication
- `create_pr()` - Create pull requests
- `get_pr_status()` - Get PR status by URL
- `list_prs_for_branch()` - List PRs for a branch
- `get_pr_comments()` - Get PR comments
3. **Azure CLI commands supported**:
- `az repos pr create` - Create PRs
- `az repos pr show` - View PR details
- `az repos pr list` - List PRs
- `az repos pr list-threads` - Get PR comments
- `az account show` - Auth check
- `pr.rs` - Uses auto-detection for PR creation
- `pr_monitor.rs` - Uses provider detection from PR URL
- `task_attempts.rs` - Uses git_host for push auth checking
- `error.rs` - Updated `GitHost` error variant
- `share.rs` - Updated `GitHost` error variant
- `generate_types.rs` - Updated type exports
- Old `crates/services/src/services/github.rs` module and directory (replaced by git_host)
Cleanup script changes for workspace 28eb9564-f95a-42e0-8cf2-5228c2ffc0bf
All tests pass, including the new URL decoding tests. The fix is complete - the URL-encoded components (like `Vibe%20Kanban%20Test`) will now be properly decoded to `Vibe Kanban Test` before being passed to the Azure CLI.
Cleanup script changes for workspace 28eb9564-f95a-42e0-8cf2-5228c2ffc0bf
All done! Here's a summary of the changes:
Updated `get_repo_info()` to use the Azure CLI's `az repos show --detect true` command instead of manual URL parsing, similar to how GitHub uses `gh repo view --json owner,name`.
1. **Added `extract_repo_name_from_url()`** - A simple helper that extracts just the repository name from Azure DevOps URLs (looks for `/_git/{repo}` pattern). This is still needed because `az repos show` requires the `--repository` parameter.
2. **Updated `get_repo_info()`** - Now uses `az repos show --repository {name} --detect true --output json` which:
- Auto-detects organization and project from git config
- Returns canonical names (properly decoded)
- Validates the repo exists
3. **Added `extract_org_from_response()`** - Extracts the organization from the `remoteUrl` field in the CLI response, with fallback to URL parsing.
4. **Fixed `run()` method** - Now properly passes the `dir` parameter to `Command::current_dir()` so the `--detect` flag works correctly.
5. **Kept `parse_azure_remote_url()`** - Still used as a fallback for organization extraction and for PR URL parsing.
6. **Added tests** - New tests for `extract_repo_name_from_url()` covering various URL formats.
Cleanup script changes for workspace 28eb9564-f95a-42e0-8cf2-5228c2ffc0bf
Done! The cleanup is complete. Here's what was removed:
Removed the brittle `parse_azure_remote_url()` function and related code:
1. **Removed `AzureRepoInfo` struct** - No longer needed
2. **Removed `parse_azure_remote_url()` function** - The ~90-line function that manually parsed various Azure DevOps URL formats
3. **Updated `get_repo_info()`** - Changed from fallback (`unwrap_or_else`) to error (`ok_or_else`) when organization can't be extracted from the CLI response
4. **Removed 4 tests** - `test_parse_azure_remote_url_https`, `test_parse_azure_remote_url_visualstudio`, `test_parse_azure_remote_url_ssh`, `test_parse_azure_remote_url_with_spaces`
The code now relies entirely on:
- `extract_repo_name_from_url()` - Simple helper to get repo name from URL (for passing to `az repos show`)
- `az repos show --detect true` - Azure CLI command that auto-detects org/project from git config
- `extract_org_from_response()` - Extracts org from the CLI's `remoteUrl` JSON field
The implementation is complete. Here's a summary of the changes:
Simplified the Azure DevOps integration by using the CLI's `--detect` flag instead of parsing URLs to extract org/project/repo.
1. **`types.rs`** - Changed `RepoInfo::AzureDevOps` to store just `repo_path: PathBuf` instead of `organization`, `project`, and `repo_name`. Removed the unused `repo_name()` method.
2. **`cli.rs`** - Major simplification:
- Removed URL parsing helpers: `decode_url_component()`, `extract_repo_name_from_url()`, `extract_org_from_response()`
- `get_repo_info()` now just verifies it's a valid Azure repo via `az repos show --detect true` and returns the path
- `create_pr()` now takes `repo_path` and uses `--detect true` instead of explicit org/project/repo
- `list_prs_for_branch()` now takes `repo_path` and uses `--detect true`
- `get_pr_threads()` now takes `repo_path` and uses `--detect true`
- `view_pr()` now takes the full PR URL and parses org + PR ID internally
- `parse_pr_url()` simplified to return just `(org, pr_id)` instead of 4 values
- Parsing functions simplified to extract URLs from response's `repository.webUrl` field
- Updated tests for the new API
3. **`mod.rs`** - Updated `AzureHostService` to:
- Extract `repo_path` from `RepoInfo::AzureDevOps`
- Pass `repo_path` to CLI methods that need it
- Pass the PR URL directly to `view_pr()` for `get_pr_status()`
- URL parsing reduced to minimal extraction of org + PR ID from PR URLs (only needed for `get_pr_status()`)
- Repo-based operations don't parse URLs at all - CLI auto-detects via git config
- Much cleaner, less brittle code
Cleanup script changes for workspace 28eb9564-f95a-42e0-8cf2-5228c2ffc0bf
All done. The implementation is complete:
**Summary of changes:**
1. **`types.rs`**: Updated `RepoInfo::AzureDevOps` to store `organization_url`, `project`, `repo_name` instead of `repo_path`
2. **`cli.rs`**:
- `get_repo_info()` now parses the JSON response from `az repos show --detect true` to extract repo name, project name, and organization URL
- Added `extract_org_url()` helper to extract the base org URL from the API URL
- Updated `create_pr()`, `list_prs_for_branch()`, `get_pr_threads()` to take explicit `organization_url`, `project`, `repo_name` params
3. **`mod.rs`** (`AzureHostService`):
- `create_pr()`, `list_prs_for_branch()`, `get_pr_comments()` all now extract org/project/repo from `RepoInfo` and pass them to the CLI methods
The key insight was that the `url` field from `az repos show` (e.g., `https://dev.azure.com/{org}/.../_apis/...`) can be truncated to `https://dev.azure.com/{org}` and used directly with the `--organization` flag — minimal URL parsing needed.
Cleanup script changes for workspace 28eb9564-f95a-42e0-8cf2-5228c2ffc0bf
* Done. Refactored all 4 `serde_json::Value` parsing sites to use typed structs:
**Changes to `cli.rs`:**
1. **Added typed response structs** with `#[derive(Deserialize)]`:
- `AzRepoShowResponse`, `AzProject` - for `az repos show`
- `AzPrResponse`, `AzRepository`, `AzCommit` - for PR responses
- `AzThread`, `AzThreadContext`, `AzFilePosition`, `AzThreadComment`, `AzAuthor` - for thread comments
2. **Updated parsing functions**:
- `get_repo_info()` - now deserializes into `AzRepoShowResponse`
- `parse_pr_response()` - now deserializes into `AzPrResponse`
- `parse_pr_list_response()` - now deserializes into `Vec<AzPrResponse>`
- `parse_pr_threads()` - now deserializes into `Vec<AzThread>`
3. **Replaced `extract_pr_info()`** with `az_pr_to_info()` that takes the typed struct directly
4. **Removed `serde_json::Value` import** - no longer needed
The code is now cleaner with no `.get().and_then().as_str()` chains, and serde provides better error messages on parse failures.
* Done. Added the missing `--repository` parameter to `get_pr_threads()`:
1. **`cli.rs`**: Added `repo_name: &str` parameter and `--repository` flag to the CLI command
2. **`mod.rs`**: Updated `get_pr_comments()` to extract both `organization_url` and `repo_name` from `RepoInfo` and pass them to the CLI
Done. Here's a summary of the changes:
**Changes made to `crates/services/src/services/git_host/azure/cli.rs`:**
1. **Removed git2 dependency** - No longer imports `git2::Repository`
2. **Added new typed structs** for `az repos list` response:
- `AzRepoListItem` - with `name`, `project`, and `remote_url` fields
- `AzRepoProject` - with `name` field
3. **Rewrote `get_repo_info()`** to use `az repos list --detect true`:
- Runs CLI command from the repo directory to auto-detect org/project
- Takes the first repo from the list (assuming single repo per directory)
- Extracts org from `remoteUrl` field
4. **Replaced `parse_azure_remote_url()`** with simpler `extract_org_from_remote_url()`:
- Only extracts the organization name from the URL
- Handles both `dev.azure.com` and `visualstudio.com` formats
- Much simpler than the previous 3-tuple URL parser
5. **Updated tests** - Replaced the old URL parsing tests with new `extract_org_from_remote_url` tests
The key improvement is that `az repos list --detect true` uses the Azure CLI's built-in detection (from git config) to find the org and project, then returns all repo info including project name. This avoids git2 library usage and complex URL parsing entirely.
Done. Here's a summary of all changes:
**Summary of Changes**
1. **`crates/services/src/services/git_host/types.rs`**:
- Added `project_id` and `repo_id` fields to `RepoInfo::AzureDevOps` enum variant
2. **`crates/services/src/services/git_host/azure/cli.rs`**:
- Added `id` field to `AzRepoListItem` struct
- Added `id` field to `AzRepoProject` struct
- Added `AzThreadsResponse` struct to wrap the `{ "value": [...] }` REST API response
- Updated `get_repo_info()` to return `project_id` and `repo_id` from `az repos list` output
- Updated `get_pr_threads()` to:
- Accept `project_id` and `repo_id` instead of names
- Use `az rest` with REST API URL instead of non-existent `az repos pr list-threads`
- Updated `parse_pr_threads()` to unwrap the `value` field from REST API response
3. **`crates/services/src/services/git_host/azure/mod.rs`**:
- Updated `create_pr` and `list_prs_for_branch` to use `..` pattern for new fields
- Updated `get_pr_comments()` to extract and pass `project_id` and `repo_id` to CLI
**Key Improvements**:
- Uses UUIDs (`project_id`, `repo_id`) instead of names for REST API calls, avoiding URL encoding issues with names containing spaces like "Vibe Kanban Test"
- Fixed `get_pr_threads()` to use `az rest` since `az repos pr list-threads` doesn't exist as an Azure CLI command
- All unit tests pass
Cleanup script changes for workspace 28eb9564-f95a-42e0-8cf2-5228c2ffc0bf
Done. The fix adds `--resource 499b84ac-1321-427f-aa17-267ca6975798` to the `az rest` command, which tells it to request an Azure DevOps token instead of a generic Azure token. This should now properly authenticate to the Azure DevOps REST API.
Done. The fix replaces `az rest` with `az devops invoke --area git --resource pullRequestThreads`. This uses the same authentication as other `az repos pr` commands, so it should work without requiring the separate "identity materialization" step.
Done. The fix replaces the single combined string for `--route-parameters` with individual arguments for each `key=value` pair. This matches how the Azure CLI expects the parameters to be passed - each route parameter should be a separate shell argument after the `--route-parameters` flag.
Done. Removed all the requested comments from:
- `crates/server/src/routes/task_attempts.rs` (lines 451, 490)
- `crates/server/src/routes/task_attempts/pr.rs` (lines 283, 516)
- `crates/services/src/services/git_host/azure/cli.rs` (section header comment, doc comments on structs and methods)
* Done. Removed the module-level doc comment and all the method doc comments from the `GitHostService` trait and public functions in `mod.rs`.
Done. Removed the obvious/redundant comments from `types.rs`.
Done. Removed the unnecessary `Arc` usage from all three functions in `mod.rs`. The strings are already cloned when extracted from `RepoInfo`, so we can just clone them directly in the retry closure.
* All tests pass. Fixed the `npm run check` and `npm run lint` issues by:
1. Regenerated TypeScript types from Rust
2. Updated `frontend/src/lib/api.ts` to use `CreatePrApiRequest` instead of `CreateGitHubPrRequest`
3. Updated `CreatePRDialog.tsx` to handle the new error types (`cli_not_installed`/`cli_not_logged_in` with a `provider` field instead of `github_cli_not_installed`/`github_cli_not_logged_in`)
4. Fixed clippy warnings about collapsible if statements in `parse_pr_url()`
* Done. I've made `url`, `diff_hunk`, and `author_association` optional in the `UnifiedPrComment` type:
**Changes made:**
1. **`crates/services/src/services/git_host/types.rs`** - Changed the `UnifiedPrComment` enum:
- `url: String` → `url: Option<String>`
- `diff_hunk: String` → `diff_hunk: Option<String>`
- `author_association: String` → `author_association: Option<String>`
2. **`crates/services/src/services/git_host/azure/cli.rs`** - Updated Azure comment creation to use `None` instead of empty strings
3. **`crates/services/src/services/git_host/github/mod.rs`** - Wrapped GitHub values in `Some()`
4. **`frontend/src/components/ui/github-comment-card.tsx`** - Updated interface to allow `url?: string | null` and `diffHunk?: string | null`
5. **`frontend/src/components/ui/wysiwyg/nodes/github-comment-node.tsx`**:
- Updated `NormalizedComment` interface
- Fixed click handler to check `if (data.url)` before opening
- Removed `data.url` from validation (only `id`, `comment_type`, `author`, `body` required)
All checks pass (`pnpm run check`, `pnpm run lint`, `cargo test --workspace`).
* Done. All three changes are complete:
1. **Removed unnecessary temp file** in `azure/cli.rs:create_pr()` - was writing body to temp file then immediately reading it back. Now just passes `body` directly to `OsString`.
2. **Added structs for JSON parsing** in `github/cli.rs:parse_pr_comments()` - replaced manual `item.get("field")...` parsing with `GhCommentsWrapper` and `GhCommentResponse` structs using serde.
3. **Added structs for JSON parsing** in `github/cli.rs:parse_pr_review_comments()` - replaced manual parsing with `GhReviewCommentResponse` struct.
All checks pass (`pnpm run check`, `pnpm run lint`, `cargo test --workspace`).
Cleanup script changes for workspace 28eb9564-f95a-42e0-8cf2-5228c2ffc0bf
Done. Both changes are complete:
1. **Inlined single-field structs** - Consolidated `GhCommentAuthor` and `GhReviewCommentUser` into a single `GhUserLogin` struct that's reused by both `GhCommentResponse` and `GhReviewCommentResponse`.
2. **Converted `extract_pr_info` to struct parsing** - Added `GhPrResponse` and `GhMergeCommit` structs. Replaced the manual `Value::get()` parsing with serde deserialization. The new `pr_response_to_info()` helper converts the parsed struct to `PullRequestInfo`. Also removed the now-unused `serde_json::Value` import.
All checks pass (`pnpm run check`, `pnpm run lint`, `cargo test --workspace`).
Cleanup script changes for workspace 28eb9564-f95a-42e0-8cf2-5228c2ffc0bf
* Done. I've updated `detection.rs` to use `GitCli` instead of `git2`:
1. **Added `get_remote_url` method to `GitCli`** (`git/cli.rs`) - Uses `git remote get-url <remote>` to get the URL
2. **Updated `detect_provider`** (`git_host/detection.rs`) - Now uses `GitCli::get_remote_url()` instead of `git2::Repository`
This keeps the codebase consistent with the pattern of using `GitCli` for git operations rather than mixing `git2` directly in various modules.
All checks pass (`pnpm run check`, `pnpm run lint`, `cargo test --workspace`).
Cleanup script changes for workspace 28eb9564-f95a-42e0-8cf2-5228c2ffc0bf
* Done! The refactor is complete. Here's a summary of the changes:
**New Architecture:**
1. **`ProviderKind` enum** (was `GitHostProvider`) - The discriminant for provider types (GitHub, AzureDevOps, Unknown)
2. **`GitHostProvider` trait** (was `GitHostService`) - The interface that provider implementations must satisfy
3. **`GitHubProvider` struct** (was `GitHubHostService`) - GitHub implementation
4. **`AzureDevOpsProvider` struct** (was `AzureHostService`) - Azure DevOps implementation
5. **`GitHostService` struct** (new) - Main entry point that:
- Holds repo context (`repo_path`, `GitCli`)
- Provides `provider_for_remote(remote_name)` to get a provider for a specific remote
- Provides `provider_from_url(url)` for URL-based detection (e.g., PR URLs)
- Provides `provider_for_kind(kind)` for direct provider construction
**Benefits:**
- Provider detection is now contextual - callers specify which remote they want
- The service struct encapsulates provider detection logic
- Cleaner separation: `GitHostService` is the facade, `GitHostProvider` trait is the contract
- Ready for multi-remote support (different providers for different remotes)
All checks pass (`pnpm run check`, `pnpm run lint`, `cargo test --workspace`).
Cleanup script changes for workspace 28eb9564-f95a-42e0-8cf2-5228c2ffc0bf
All the call sites have been updated to use the new cleaner `GitHostService` facade API. Here's a summary of the changes:
**Changes made:**
1. **`pr.rs:414-418` (`attach_existing_pr`)**: Simplified from:
```rust
let git_host = git_host::GitHostService::new(&repo.path);
let git_host_provider = git_host.provider_for_remote("origin")?;
let repo_info = git_host_provider.get_repo_info(&repo.path).await?;
let prs = git_host_provider.list_prs_for_branch(&repo_info, &workspace.branch).await?;
```
To:
```rust
let git_host = git_host::GitHostService::new(&repo.path);
let prs = git_host.list_prs_for_branch(&workspace.branch).await?;
```
2. **`pr.rs:511-525` (`get_pr_comments`)**: Simplified from provider-based pattern to:
```rust
let git_host = git_host::GitHostService::new(&repo.path);
let provider = git_host.provider_kind()?;
match git_host.get_pr_comments(pr_info.number).await { ... }
```
3. **`task_attempts.rs:451-453` (`push_task_attempt_branch`)**: Removed explicit `check_auth()` call since auth is now checked during the actual operation. Just verify provider is supported:
```rust
let git_host = git_host::GitHostService::new(&worktree_path);
git_host.provider_kind()?;
```
4. **`task_attempts.rs:490-492` (`force_push_task_attempt_branch`)**: Same simplification.
The new API is much cleaner - call sites just create a `GitHostService::new(path)` and call methods directly without dealing with providers, repo info, or explicit auth checks.
Cleanup script changes for workspace 28eb9564-f95a-42e0-8cf2-5228c2ffc0bf
The refactoring is complete. Here's a summary of what was done:
**Changes made:**
1. **`crates/services/Cargo.toml`** - Added `enum_dispatch` dependency
2. **`crates/services/src/services/git_host/mod.rs`** - Completely rewritten:
- `GitHostProvider` is now a public trait with `#[enum_dispatch(GitHostService)]`
- `GitHostService` is now an enum with `GitHub` and `AzureDevOps` variants
- Constructors: `from_pr_url(url)` and `from_remote_url(url)` - no `new()` method
- Methods now take `repo_path` as a parameter where needed
3. **`crates/services/src/services/git_host/github/mod.rs`** - Updated to match new trait signature (methods take `repo_path`, `check_auth` called inside `create_pr`)
4. **`crates/services/src/services/git_host/azure/mod.rs`** - Updated similarly
5. **`crates/services/src/services/git.rs`** - Added `get_remote_url()` method to `GitService`
6. **Call site updates:**
- `pr_monitor.rs` - Uses `from_pr_url`
- `pr.rs` - Uses `get_remote_name_from_branch_name` + `get_remote_url` + `from_remote_url`
- `task_attempts.rs` - Same pattern for push functions
**New API usage:**
```rust
// From a PR URL (e.g., for checking PR status)
let git_host = GitHostService::from_pr_url(&pr_url)?;
let status = git_host.get_pr_status(&pr_url).await?;
// From a remote URL (e.g., for creating PRs)
let remote_name = git_service.get_remote_name_from_branch_name(&repo_path, &branch)?;
let remote_url = git_service.get_remote_url(&repo_path, &remote_name)?;
let git_host = GitHostService::from_remote_url(&remote_url)?;
let pr_info = git_host.create_pr(&repo_path, &pr_request).await?;
// Get provider kind (infallible since already constructed)
let provider = git_host.provider_kind();
```
Cleanup script changes for workspace 28eb9564-f95a-42e0-8cf2-5228c2ffc0bf
All cleaned up. Here's the final architecture:
**`git_host/mod.rs`:**
```rust
pub trait GitHostProvider: Send + Sync {
async fn create_pr(&self, repo_path: &Path, request: &CreatePrRequest) -> Result<PullRequestInfo, GitHostError>;
async fn get_pr_status(&self, pr_url: &str) -> Result<PullRequestInfo, GitHostError>;
async fn list_prs_for_branch(&self, repo_path: &Path, branch_name: &str) -> Result<Vec<PullRequestInfo>, GitHostError>;
async fn get_pr_comments(&self, repo_path: &Path, pr_number: i64) -> Result<Vec<UnifiedPrComment>, GitHostError>;
fn provider_kind(&self) -> ProviderKind;
}
pub enum GitHostService {
GitHub(GitHubProvider),
AzureDevOps(AzureDevOpsProvider),
}
impl GitHostService {
pub fn from_url(url: &str) -> Result<Self, GitHostError>
}
```
**Changes made:**
1. Removed `check_auth` and `get_repo_info` from the public trait - they're now private methods on each provider
2. Consolidated `from_pr_url` and `from_remote_url` into a single `from_url` constructor
3. The trait now has exactly 5 methods - the minimal public API needed by call sites
**Call site usage is clean:**
```rust
// From any URL (PR URL or remote URL)
let git_host = GitHostService::from_url(&url)?;
// Use the trait methods
let pr_info = git_host.create_pr(&repo_path, &request).await?;
let status = git_host.get_pr_status(&pr_url).await?;
let prs = git_host.list_prs_for_branch(&repo_path, &branch).await?;
let comments = git_host.get_pr_comments(&repo_path, pr_number).await?;
let kind = git_host.provider_kind();
```
Cleanup script changes for workspace 28eb9564-f95a-42e0-8cf2-5228c2ffc0bf
Done. The refactoring is complete:
1. **Created `GitHubRepoInfo`** in `git_host/github/cli.rs` - a simple struct with `owner` and `repo_name`
2. **Created `AzureRepoInfo`** in `git_host/azure/cli.rs` - a struct with `organization_url`, `project`, `project_id`, `repo_name`, `repo_id`
3. **Updated both providers** to use their respective provider-specific structs directly, removing all the match arms and error cases for "wrong variant" that could never happen
4. **Removed the shared `RepoInfo` enum** from `types.rs` and the public exports
The code is cleaner now - each provider has its own internal representation of repo info, and there's no shared enum that requires impossible error handling paths.
Cleanup script changes for workspace 28eb9564-f95a-42e0-8cf2-5228c2ffc0bf
The fix compiles. The issue was that `get_remote_name_from_branch_name` was calling `get_remote_from_branch_ref` which uses `repo.branch_remote_name()` - this git2 function requires the branch to have upstream tracking configured. For local branches that haven't been pushed yet (or don't have tracking set), this fails with the error you saw.
The fix changes the behavior to fall back to the default remote (typically "origin") when the branch doesn't have upstream tracking configured. This makes sense because:
1. Most repos only have one remote anyway
2. When creating a PR for a local branch, we need to push to *some* remote - the default is the sensible choice
3. The original code computed `default_remote` but never actually used it as a fallback
Done. Added `get_remote_url_from_branch_or_default` to `GitService` and updated all 4 call sites. The pattern is now:
```rust
let remote_url = deployment
.git()
.get_remote_url_from_branch_or_default(&repo_path, &branch)?;
let git_host = git_host::GitHostService::from_url(&remote_url)?;
```
Two lines instead of four, and the function name makes the fallback behavior explicit.
Done. Removed the unnecessary provider detection checks from both `push_task_attempt_branch` and `force_push_task_attempt_branch`. The push operations now just push directly - git push works with any remote regardless of whether we support it as a PR provider. Auth errors from git push itself (SSH keys, HTTPS credentials) still come through `GitServiceError::GitCLI(...)` and propagate to the frontend the same way.
* All done. Removed the low-value comments:
- "Create git host from the PR URL"
- "Fetch comments"
- "Get the URL for a remote (e.g., "origin")."
- "Azure DevOps-specific repository information"
- "GitHub-specific repository information"
- "Get the remote URL for the branch to detect the provider" (2 places)
- "Get repository info from the GitHub CLI"
- "Get repository info from the Azure CLI"
- "Check authentication status" (2 places)
Kept comments that provide actual value like the fallback behavior explanation on `get_remote_url_from_branch_or_default`.
All done. Removed the low-value comments:
- "Create git host from the PR URL"
- "Fetch comments"
- "Get the URL for a remote (e.g., "origin")."
- "Azure DevOps-specific repository information"
- "GitHub-specific repository information"
- "Get the remote URL for the branch to detect the provider" (2 places)
- "Get repository info from the GitHub CLI"
- "Get repository info from the Azure CLI"
- "Check authentication status" (2 places)
- "Get PR status from URL (auto-detects provider)"
- "High-level errors originating from the Azure CLI."
- "High-level errors originating from the GitHub CLI."
- "Azure DevOps hosting provider implementation"
- "GitHub hosting provider implementation"
- "Newtype wrapper for invoking the `gh` command."
- "Newtype wrapper for invoking the `az` command."
- "Trait for git hosting provider operations (GitHub, Azure DevOps, etc.)"
- All the trait method doc comments (Create a pull request, Get PR status, etc.)
- "Git hosting service - dispatches to the appropriate provider."
- "Create a GitHostService by detecting the provider from a URL."
- Simplified the Azure DevOps pattern comments in detection.rs
* Done. Here's a summary of the fix:
**Problem**: `get_repo_info` used `az repos list --detect true` which returns ALL repos in the Azure DevOps project, then just took the first one. This was wrong for multi-repo projects.
**Solution**:
1. `AzureDevOpsProvider` now stores the remote URL passed to `from_url()`
2. `get_repo_info` now takes the remote URL and filters the repo list to find the matching repo using `remote_urls_match()`
3. Added `remote_urls_match()` helper that normalizes URLs (lowercase, strips trailing `/` and `.git`) for comparison
4. Added `extract_organization_url()` to get the Azure organization URL from a remote URL (supports both `dev.azure.com` and legacy `visualstudio.com` formats)
5. Removed the now-unused `extract_org_from_remote_url()` function
The flow is now:
- Call site gets remote URL via `get_remote_url_from_branch_or_default()`
- Creates `GitHostService::from_url(&remote_url)` which stores the URL on `AzureDevOpsProvider`
- When `get_repo_info` is called, it lists all repos in the project and finds the one matching the stored remote URL
Cleanup script changes for workspace 28eb9564-f95a-42e0-8cf2-5228c2ffc0bf
* Done. Summary of changes:
1. **`pr.rs:get_pr_comments`** - Now gets the remote URL from `workspace_repo.target_branch` instead of using the PR URL to create the `GitHostService`
2. **`azure/cli.rs`**:
- Added `ssh_url` field to `AzRepoListItem`
- Updated `get_repo_info` to detect if the input URL is SSH (`starts_with("git@")`) and compare against the appropriate field (`ssh_url` vs `remote_url`)
- Renamed `remote_urls_match` to `urls_match` since it now handles both HTTPS and SSH URLs
- Added SSH URL test case
* Build passes. The simple fix handles both SSH formats without adding a dependency.
* Build passes. Now `ssh_url` is optional - if it's not in the response and the user has an SSH remote configured, they'll get a clear error message ("No repo found matching remote URL: ...").
* Done. The `urls_match` function now normalizes `ssh://` prefix to scp-style before comparing.
* Done. Summary of changes:
1. **Removed `remote_url` field from `AzureDevOpsProvider`** - no longer stored on the struct
2. **Updated `GitHostProvider` trait** - added `remote_url: &str` parameter to:
- `create_pr`
- `list_prs_for_branch`
- `get_pr_comments`
3. **Updated `AzureDevOpsProvider`** - methods now accept `remote_url` and pass it to `get_repo_info`
4. **Updated `GitHubProvider`** - methods accept `_remote_url` (unused, since gh CLI auto-detects)
5. **Updated call sites in `pr.rs`** - all three methods now pass `remote_url`:
- `create_pr` passes `&remote_url`
- `list_prs_for_branch` passes `&remote_url`
- `get_pr_comments` passes `&remote_url`
6. **Fixed `attach_existing_pr`** - now uses `workspace_repo.target_branch` instead of `workspace.branch` when getting the remote URL (consistent with other call sites)
* Cleanup script changes for workspace 28eb9564-f95a-42e0-8cf2-5228c2ffc0bf
* Update frontend remote copy (vibe-kanban a7bf13b6)
We added azure support but in the frontend many things have github specific wording. Please fix!
* Done. I've addressed the PR comment by:
1. **Renamed `CreatePrError` to `PrError`** - A more generic name that works for both `create_pr` and `attach_existing_pr`
2. **Updated `attach_existing_pr`** to mirror the error handling from `create_pr`:
- Changed return type from `ApiResponse<AttachPrResponse>` to `ApiResponse<AttachPrResponse, PrError>`
- Added error handling for `GitHostService::from_url()` - handles `UnsupportedProvider` and `CliNotInstalled`
- Added error handling for `list_prs_for_branch()` - handles `CliNotInstalled` and `AuthFailed`
3. **Updated `generate_types.rs`** to use the renamed `PrError`
4. **Updated `frontend/src/lib/api.ts`** to use `PrError` instead of `CreatePrError`
5. **Regenerated TypeScript types** and verified all checks pass
|
||
|
GitHub Action
|
3ad03a0a99 | chore: bump version to 0.0.147 | ||
|
Louis Knight-Webb
|
af70dd9239 |
The implementation is complete. Here's a summary of the changes made: (#1871)
## Summary
I've implemented the GitHub PR status display on `WorkspaceSummary.tsx`. The changes include:
### Backend Changes
1. **`crates/db/src/models/merge.rs`** - Added a new method `get_latest_pr_status_for_workspaces()` that efficiently queries the latest PR status for all workspaces grouped by archived status.
2. **`crates/server/src/routes/task_attempts/workspace_summary.rs`** - Added `pr_status: Option<MergeStatus>` field to the `WorkspaceSummary` struct and included the PR status query in the summary endpoint.
### Frontend Changes
3. **`frontend/src/components/ui-new/hooks/useWorkspaces.ts`** - Added `prStatus` to the `SidebarWorkspace` interface and mapped it in `toSidebarWorkspace()`.
4. **`frontend/src/components/ui-new/primitives/WorkspaceSummary.tsx`** - Added:
- Import for `GitPullRequestIcon`
- `prStatus` prop to the component
- Display logic showing:
- **PR open**: `GitPullRequestIcon` with `text-brand` (orange) color
- **PR merged**: `GitPullRequestIcon` with `text-success` (green) color
- **No PR/closed/unknown**: No icon displayed
5. **`frontend/src/components/ui-new/views/WorkspacesSidebar.tsx`** - Passed the `prStatus` prop to both active and archived workspace summaries.
### Generated Types
6. **`shared/types.ts`** - Auto-generated to include the new `pr_status` field in `WorkspaceSummary`.
|
||
|
Louis Knight-Webb
|
527febdc52 | Workspaces FE (#1733) | ||
|
GitHub Action
|
fe2215ba85 | chore: bump version to 0.0.146 | ||
|
GitHub Action
|
ae852b297f | chore: bump version to 0.0.145 | ||
lif
|
dcaa8b8769 |
fix: copy images to agent_working_dir when set (#1752)
* fix: copy images to agent_working_dir when set When agent_working_dir is configured, copy images to <workspace>/<agent_working_dir>/.vibe-images/ instead of <workspace>/.vibe-images/ so that relative paths work correctly for the AI agent. Closes #1727 Signed-off-by: majiayu000 <1835304752@qq.com> * optionally append agent working directory in other image routes --------- Signed-off-by: majiayu000 <1835304752@qq.com> Co-authored-by: Gabriel Gordon-Hall <ggordonhall@gmail.com> |
||
Solomon
|
0f3ee560f3 | Speedup pre-release CI runs (#1804) | ||
|
GitHub Action
|
edef39c3fb | chore: bump version to 0.0.144 | ||
|
Alex Netsch
|
0478ce06fc |
Reset workspace cleanup timer at diff view and IDE open (#1654)
* Add workspace.touch to reset cleanup timer at diff view and ide open * Touch at ensure_container_exists, rm comments |
||
|
Alex Netsch
|
147c4fd53d |
Support GitHub Enterprise and SSH aliases via gh CLI (Vibe Kanban) (#1783)
* All changes have been implemented and tested. Here's a summary of what was done:
Updated the PR URL parsing logic to support GitHub Enterprise hostnames by using the `url` crate instead of searching for `"github.com"` as a string token.
1. **`crates/review/Cargo.toml`** - Added `url = "2.5"` dependency
2. **`crates/review/src/github.rs`** - Rewrote `parse_pr_url` function to use `Url::parse()` and `path_segments()` instead of string splitting. Added two new test cases:
- `test_parse_pr_url_github_enterprise` - Tests GitHub Enterprise URLs
- `test_parse_pr_url_any_host` - Tests that any host with the `/pull/` pattern works
3. **`crates/remote/src/routes/github_app.rs`** - Applied the same pattern to the duplicate `parse_pr_url` function
The new implementation:
- Parses the URL with `Url::parse()`
- Extracts path segments directly (e.g., `["owner", "repo", "pull", "123"]`)
- No longer requires `github.com` as a specific hostname
- Works with any hostname including `github.mycompany.com`, `github.enterprise.corp`, etc.
Cleanup script changes for workspace e22082a4-ca31-4754-9c1c-2dc5b6991338
All done! Here's a summary of what was implemented:
This PR adds support for GitHub Enterprise hostnames and SSH hostname aliases by delegating to the `gh` CLI instead of parsing URLs with hardcoded `github.com` patterns.
**1. `crates/services/src/services/github/cli.rs`**
- Added `run_in_dir()` helper method to run `gh` commands in a specific directory
- Added `get_repo_info(repo_path)` - uses `gh repo view --json owner,name` to get repo info from a directory
- Added `view_pr_by_url(pr_url)` - uses `gh pr view <url>` to get PR info directly from a URL
**2. `crates/services/src/services/github.rs`**
- Exported `GhCli` and `GhCliError` for use by other modules
- Added `update_pr_status_by_url(pr_url)` method to `GitHubService`
- Replaced regex-based `from_remote_url()` with hostname-agnostic URL parsing using the `url` crate (kept for backward compatibility)
**3. `crates/services/src/services/git.rs`**
- Updated `get_github_repo_info()` to use `GhCli::get_repo_info()` instead of parsing URLs
**4. `crates/services/src/services/pr_monitor.rs`**
- Updated `check_pr_status()` to use `update_pr_status_by_url()` instead of parsing the PR URL
**5. Tests** (`crates/services/tests/git_workflow.rs`)
- Updated existing tests for hostname-agnostic parsing
- Added new tests for GitHub Enterprise and SSH alias URLs
**6. `crates/review/src/github.rs`** (previously done)
- Already updated to use hostname-agnostic URL parsing
**7. `crates/remote/src/routes/github_app.rs`** (previously done)
- Already updated to use hostname-agnostic URL parsing
- **SSH hostname aliases** (e.g., `github-xxx` in `~/.ssh/config`) now work
- **GitHub Enterprise** instances (e.g., `github.mycompany.com`) now work
- **No regex** - removed regex dependency from `github.rs`, using simple URL parsing and `gh` CLI
- **Robust** - `gh` CLI handles all the complexity of authentication and hostname resolution
Cleanup script changes for workspace e22082a4-ca31-4754-9c1c-2dc5b6991338
Done! I've simplified the API by:
1. **Removed** the old `update_pr_status(&repo_info, pr_number)` method that took repo info and PR number separately
2. **Renamed** `update_pr_status_by_url(pr_url)` → `update_pr_status(pr_url)` for a cleaner API
Now there's just one method that takes the PR URL directly, and the `gh` CLI handles all the complexity of hostname resolution, SSH aliases, and GitHub Enterprise automatically.
All tests pass. The fix is complete - I renamed the test from `test_parse_pr_url_any_host` to `test_parse_pr_url_custom_github_host` and changed the URL from a misleading GitLab example to a realistic GitHub Enterprise URL (`github.acme.com`).
Done! I've removed `from_remote_url()` entirely:
1. **Removed** `GitHubRepoInfo::from_remote_url()` method from `crates/services/src/services/github.rs`
2. **Removed** the `use url::Url;` import from that file (since it's no longer needed there)
3. **Removed** both tests that exercised the now-deleted function from `crates/services/tests/git_workflow.rs`
4. **Updated** the import to remove `GitHubRepoInfo` and `GitHubServiceError` which are no longer used in tests
All tests pass and the workspace compiles cleanly. The `url` crate is still used elsewhere in the services crate, so I left it in Cargo.toml.
Cleanup script changes for workspace e22082a4-ca31-4754-9c1c-2dc5b6991338
Done! I've made both cleanups:
1. **Consolidated `run()` and `run_in_dir()`** - Now there's a single `run()` method with an optional `dir: Option<&Path>` parameter. All callers pass `None` for global commands and `Some(path)` when running in a specific directory.
2. **Renamed `view_pr_by_url()` to `view_pr()`** - Removed the old `view_pr(owner, repo, pr_number)` method and renamed `view_pr_by_url(pr_url)` to just `view_pr(pr_url)` for a cleaner API.
All tests pass and the workspace compiles cleanly.
Cleanup script changes for workspace e22082a4-ca31-4754-9c1c-2dc5b6991338
Done! I've reverted the test change in `crates/review/src/github.rs` back to the original `test_parse_pr_url_any_host` with the GitLab URL. The `crates/remote/src/routes/github_app.rs` file had no changes from my work to revert.
All tests pass and the workspace compiles. The changes in this PR are now scoped to just the `services` crate:
- `cli.rs` - consolidated `run()`, renamed `view_pr()`
- `github.rs` - removed `from_remote_url()` and `url` import
- `git.rs` - uses `GhCli::get_repo_info()`
- `git_workflow.rs` - removed tests for `from_remote_url()`
Done. I've reset the review and remote crate files to `origin/main`. The changes to those crates are now reverted and can be submitted in a separate PR. All tests pass and the workspace compiles.
This PR now only contains the services crate changes:
- `cli.rs` - consolidated `run()`, renamed `view_pr()`
- `github.rs` - removed `from_remote_url()` and `url` import
- `git.rs` - uses `GhCli::get_repo_info()`
- `git_workflow.rs` - removed tests for `from_remote_url()`
All done. All three review comments addressed:
1. Removed comment "Optionally runs in a specific directory..." from `cli.rs`
2. Removed doc comment from `update_pr_status` in `github.rs`
3. Replaced helper structs with `serde_json::Value` parsing (matches existing pattern in the file)
Cleanup script changes for workspace e22082a4-ca31-4754-9c1c-2dc5b6991338
Done. Reverted to the helper structs.
All done. Summary of changes:
1. **Removed 3 comments** as requested:
- `git.rs:1599` - removed "Uses `gh repo view` which handles SSH aliases, GitHub Enterprise, etc."
- `cli.rs:202` - removed "This handles GitHub Enterprise and custom hostnames automatically via the `gh` CLI."
- `pr_monitor.rs:101` - removed "Use the URL directly - gh CLI handles all hostname/SSH alias complexity"
2. **Clone question in `github.rs:210`** - Added a comment explaining why the clone is needed (spawn_blocking requires owned values, each retry needs fresh copies)
3. **Fixed `--head {owner}:{branch}` bug** - Changed to `--head branch` only, since the `{owner}:{branch}` syntax is not supported per gh docs
4. **Added 2 unit tests** for `get_repo_info()` JSON parsing:
- `test_parse_repo_info_valid` - tests successful parsing
- `test_parse_repo_info_invalid` - tests error handling
* Done. Addressed the review comment by:
1. Removed `GitService.get_github_repo_info()` facade from `git.rs`
2. Updated 3 callers in `pr.rs` to use `GhCli::new().get_repo_info()` directly
3. Added `GhCliError` to `ApiError` in `error.rs` for proper error handling
4. Removed unused import in `git.rs`
* Done. Now the architecture is cleaner:
- `GhCli` is an internal implementation detail of `GitHubService`
- Callers use `GitHubService.get_repo_info(&path)` instead of touching `GhCli` directly
- Later, a `GitLabService` could have the same `get_repo_info` interface
- Removed `GhCliError` from `ApiError` since errors are now converted to `GitHubServiceError`
* Done.
* Done. `get_repo_info` is now async with `spawn_blocking`, matching the pattern used by other methods like `check_token`.
* Cleanup script changes for workspace e22082a4-ca31-4754-9c1c-2dc5b6991338
* Done. `GhCli` and `GhCliError` are now private to the `github` module.
* Cleanup script changes for workspace e22082a4-ca31-4754-9c1c-2dc5b6991338
|
||
|
Alex Netsch
|
c0dadac9bd |
Build succeeded with git2 v0.19.0. The fix is complete. (#1774)
**Summary:** - Bumped `git2` from `0.18` to `0.19` in 4 Cargo.toml files - This brings in libgit2 1.8.1 which supports `index.skipHash` - Build compiles successfully |
||
|
GitHub Action
|
f99d2f06f2 | chore: bump version to 0.0.143 | ||
|
Alex Netsch
|
3c35b92a97 |
Use session IDs for scratches and queued messages (Vibe Kanban) (#1613)
* All changes have been completed. Here's a summary of what was done: ## Summary Changed both scratches and queued messages to use session IDs instead of workspace IDs: ### Files Modified 1. **`frontend/src/components/tasks/TaskFollowUpSection.tsx`** - Changed `useScratch(ScratchType.DRAFT_FOLLOW_UP, workspaceId ?? '')` → `useScratch(ScratchType.DRAFT_FOLLOW_UP, sessionId ?? '')` 2. **`crates/server/src/routes/sessions/queue.rs`** - Changed `session.workspace_id` → `session.id` in all three queue operations (queue, cancel, get status) 3. **`crates/services/src/services/queued_message.rs`** - Renamed `task_attempt_id` → `session_id` in `QueuedMessage` struct - Updated all method parameters and comments 4. **`crates/local-deployment/src/container.rs`** - Changed `ctx.workspace.id` → `ctx.session.id` for queue lookups and scratch deletion - Updated log messages to reference "session" instead of "workspace" 5. **`shared/types.ts`** (auto-generated) - `QueuedMessage.task_attempt_id` → `QueuedMessage.session_id` * Cleanup script changes for task attempt 4df90bcd-f261-41ca-bac3-8f7c2fc576c5 * Build passes. The fix has been applied. Found and fixed one missed instance in `sessions/mod.rs` where `Scratch::delete` was using `workspace.id` instead of `session.id`. |
||
|
GitHub Action
|
033ae2f1c6 | chore: bump version to 0.0.142 | ||
|
GitHub Action
|
bcbe7aca69 | chore: bump version to 0.0.141 | ||
|
GitHub Action
|
ca2b578231 | chore: bump version to 0.0.140 | ||
|
Alex Netsch
|
2f5cef2dff |
Add agent working directory setting to run coding agents from repo directory (Vibe Kanban) (#1617)
* Done! The migration has been updated to copy `dev_script_working_dir` values to `agent_working_dir` for existing projects. The change: **`vibe-kanban/crates/db/migrations/20251219000000_add_agent_working_dir_to_projects.sql`**: ```sql -- Add column with empty default first ALTER TABLE projects ADD COLUMN agent_working_dir TEXT DEFAULT ''; -- Copy existing dev_script_working_dir values to agent_working_dir UPDATE projects SET agent_working_dir = dev_script_working_dir WHERE dev_script_working_dir IS NOT NULL AND dev_script_working_dir != ''; ``` This ensures that when the migration runs, existing projects will have their `agent_working_dir` automatically populated from their existing `dev_script_working_dir` setting. * Done! The migration has been updated to only copy `dev_script_working_dir` to `agent_working_dir` for single-repo projects. Multi-repo projects will keep `agent_working_dir` empty (None). The key change in the migration: ```sql UPDATE projects SET agent_working_dir = dev_script_working_dir WHERE dev_script_working_dir IS NOT NULL AND dev_script_working_dir != '' AND (SELECT COUNT(*) FROM project_repos WHERE project_repos.project_id = projects.id) = 1; ``` The subquery `(SELECT COUNT(*) FROM project_repos WHERE project_repos.project_id = projects.id) = 1` ensures only projects with exactly one repository get the default value copied. * Done! All tasks completed: 1. **Resolved the rebase conflict** in `task_attempts.rs` - removed the duplicate `follow_up` function since it was moved to `sessions/mod.rs` on main 2. **Updated `sessions/mod.rs`** with the `working_dir` changes - added the code to get `agent_working_dir` from project settings and pass it to both `CodingAgentFollowUpRequest` and `CodingAgentInitialRequest` 3. **Ran `npm run prepare-db`** - successfully prepared the database and updated sqlx cache 4. **Verified compilation** - all crates compile successfully The migration now only copies `dev_script_working_dir` to `agent_working_dir` for single-repo projects (projects with exactly 1 repo in `project_repos` table). Multi-repo projects will keep `agent_working_dir` empty. * Done. Removed all 6 comments as requested. * Done! The implementation is now complete: 1. **Database migration** - Copies `dev_script_working_dir` to `agent_working_dir` for single-repo projects at migration time 2. **Runtime backfill** - `backfill_repo_names()` in `container.rs` sets `agent_working_dir` for existing single-repo projects where it's still empty 3. **Project creation** - New single-repo projects automatically get `agent_working_dir` set to the repo name All three scenarios are now covered for setting `agent_working_dir` on single-repo projects. * Done! The frontend UI for `agent_working_dir` has been added: 1. Added `agent_working_dir: string` to `ProjectFormState` interface 2. Added `agent_working_dir` to `projectToFormState` function 3. Added `agent_working_dir` to the `handleSave` payload 4. Added the input field after the dev server working directory input * All tasks are complete. The implementation is finished: **Summary of changes:** 1. **Project model**: Renamed `agent_working_dir` to `default_agent_working_dir` - this is now a default value for new workspaces 2. **Workspace model**: Added `agent_working_dir` field - this captures the project's default at workspace creation time 3. **Workspace creation**: Updated `create_task_attempt` to fetch the project's `default_agent_working_dir` and pass it to the workspace 4. **Execution sites**: Updated all 4 locations to use `workspace.agent_working_dir` instead of `project.default_agent_working_dir`: - `container.rs` (start_workspace) - `container.rs` (start_queued_follow_up) - `sessions/mod.rs` (follow_up) - `task_attempts/pr.rs` (trigger_pr_description_follow_up) 5. **Frontend**: Updated `ProjectSettings.tsx` to use `default_agent_working_dir` 6. **Migrations**: Two migrations added - one to rename the project column and one to add the workspace column * Cleanup script changes for workspace a87cad74-ed7c-402b-b3f3-413a939a13a9 * Done. The migrations have been squashed into a single migration file `20251219000000_add_agent_working_dir_to_projects.sql` which now handles both the project and workspace table changes. The separate workspace migration file has been deleted and `npm run prepare-db` completes successfully. * Done. The i18n check passes with all checks passing: - No new literal strings introduced - No duplicate keys found in JSON files - Translation keys are consistent across locales (en, es, ja, ko, zh-Hans) * All checks pass: - `npm run check` ✅ (frontend TypeScript and backend Rust) - `npm run prepare-db` ✅ (migrations and sqlx query cache) * `npm run lint` passes now. * Done. I've added the logic to `crates/services/src/services/project.rs` in the `add_repository()` function. When a second repository is added to a project (repo count becomes exactly 2), the `default_agent_working_dir` field is automatically cleared by setting it to an empty string. * Cleanup script changes for workspace a87cad74-ed7c-402b-b3f3-413a939a13a9 * Both checks pass. The fix now correctly: 1. Counts repos **before** adding the new one 2. Only clears `default_agent_working_dir` if the previous count was exactly 1 (meaning we're going from 1 to 2 repos) * Done. The fix now: 1. Added a dedicated `Project::clear_default_agent_working_dir()` method in `crates/db/src/models/project.rs` that only updates the `default_agent_working_dir` field without touching other fields 2. Updated `add_repository()` in `crates/services/src/services/project.rs` to use this new method when the repo count goes from 1 to 2 |
||
|
Alex Netsch
|
6a129d0fa8 |
Add session-scoped routes for follow-up and queue operations (Vibe Kanban) (#1606)
* Yup, I'll hold off and do nothing for now. Let me know when you're ready to proceed with the session routes task, and I'll start exploring the codebase and planning the implementation. All cherry-pick conflicts resolved: 1. **`sessions/queue.rs`** - Fixed analytics to use `session.id` and `session.workspace_id` (2 locations) 2. **`task_attempts.rs`** - Removed the old `follow_up()` function that was already moved to `sessions/mod.rs` No remaining conflict markers in the routes directory. All fixes complete: 1. **`sessions/queue.rs`** ✓ - Fixed analytics to use `session.id` and `session.workspace_id` 2. **`task_attempts.rs`** ✓ - Removed old `follow_up` function (moved to sessions) 3. **`sessions/mod.rs`** ✓ - Fixed to use `find_latest_coding_agent_turn_session_id(pool, session.id)` instead of non-existent method The session-based `follow_up` now correctly scopes the agent_session_id lookup to the current session rather than across all workspace sessions. * All done: 1. ✓ `container.rs` - Changed to `find_latest_coding_agent_turn_session_id(pool, ctx.session.id)` 2. ✓ `pr.rs` - Changed to `find_latest_coding_agent_turn_session_id(pool, session.id)` 3. ✓ Deleted `find_latest_agent_session_id_by_workspace` from `execution_process.rs` All workspace-scoped `agent_session_id` lookups have been converted to session-scoped lookups and the unused method has been removed. Cleanup script changes for task attempt afc116fb-e639-4150-a299-b05c1f14f61e Done. Removed the unnecessary `Session::create` call and now using `&ctx.session` directly. Lint, db * Done. Simplified the validation: - Removed the extra `Session::find_by_id` DB call - Now directly checks `process.session_id != session.id` - Updated error message to "Process does not belong to this session" |
||
|
GitHub Action
|
84ea4b71ee | chore: bump version to 0.0.139 | ||
|
Gabriel Gordon-Hall
|
41151bd172 | fix for single file (#1610) | ||
|
Gabriel Gordon-Hall
|
fbffcdc0d2 | special case single repo projects for open IDE operation (#1609) | ||
|
Alex Netsch
|
4188adc2a9 |
Refactor task_attempts to workspaces and sessions (Vibe Kanban) (#1569)
* All tasks are complete. Here's a summary of the refactoring that was done:
The `task_attempts` table has been refactored into `workspaces` and `sessions`:
- Created new migration `20251216142123_refactor_task_attempts_to_workspaces_sessions.sql`
- Renamed `task_attempts` table to `workspaces` (removed `executor` column)
- Created new `sessions` table with `(id, workspace_id, executor, created_at, updated_at)`
- Renamed `executor_sessions` to `coding_agent_turns` (dropped redundant `task_attempt_id`)
- Changed `execution_processes.task_attempt_id` to `session_id`
- Changed `merges.task_attempt_id` to `workspace_id`
- Changed `tasks.parent_task_attempt` to `parent_workspace_id`
- Renamed `crates/db/src/models/task_attempt.rs` → `workspace.rs`
- Created new `crates/db/src/models/session.rs`
- Renamed `executor_session.rs` → `coding_agent_turn.rs`
- Updated `execution_process.rs`:
- Changed `task_attempt_id` field to `session_id`
- Added workspace-level query methods (`find_latest_by_workspace_and_run_reason`, `latest_executor_profile_for_workspace`, `find_latest_external_session_id_by_workspace`, `find_running_dev_servers_by_workspace`, `has_running_non_dev_server_processes_for_workspace`)
- Updated `merge.rs`: Changed `task_attempt_id` to `workspace_id`
- Updated `task.rs`: Changed `parent_task_attempt` to `parent_workspace_id`
- Updated `container.rs`: Changed `start_execution` to take 4 parameters (workspace, session, action, reason)
- Updated `events/`: Changed event types from `TaskAttempt` to `Workspace`
- Updated `pr_monitor.rs`: Changed to use `Workspace` instead of `TaskAttempt`
- Updated `workspace_manager.rs`: Added support for `DbWorkspace` alias
- Updated `task_attempts.rs`: All handlers now create/use sessions for execution processes
- Updated `tasks.rs`: Removed `executor` from `CreateWorkspace`, fixed error type
- Updated setup helpers (codex, cursor, gh_cli) to create sessions
- Updated `error.rs`: Added `SessionError` handling
Cleanup script changes for task attempt 2f672d73-cb46-4515-b1c7-3da8f4402858
Done. All 3 `sqlx::query_scalar()` function calls have been converted to `sqlx::query_scalar!()` macros:
1. `has_running_non_dev_server_processes()` - lines 332-341
2. `has_running_non_dev_server_processes_for_workspace()` - lines 350-361
3. `find_prev_after_head_commit()` - lines 619-634
Key changes:
- Converted `?` placeholders to `$1, $2, $3` positional parameters (sqlx macro style)
- Added `as "count!: i64"` type annotation for COUNT queries
- Used `.flatten()` for the nullable `after_head_commit` column to avoid `Option<Option<String>>`
The one in `crates/remote/src/db/mod.rs` uses dynamic SQL for PostgreSQL's `ALTER ROLE` and cannot be converted to a macro.
Done. Removed the 4 unused functions from `execution_process.rs`:
- `find_running_dev_servers_by_session`
- `has_running_non_dev_server_processes` (the per-session version)
- `delete_by_session_id`
- `latest_executor_profile_for_session`
The workspace-level versions (`has_running_non_dev_server_processes_for_workspace`, `find_running_dev_servers_by_workspace`, `latest_executor_profile_for_workspace`) are still available. Everything builds successfully.
Rewbase
Revert event rename
* All done. Here's a summary of the changes:
Created a `TaskAttempt` helper struct in the backend that maintains backwards compatibility with the frontend:
1. **`crates/db/src/models/workspace.rs`**
- Added `TaskAttempt` struct that combines `Workspace` fields + `executor` from the latest `Session`
- Added `TaskAttempt::from_workspace()` to convert a `Workspace` by fetching its latest session's executor
- Added `TaskAttempt::fetch_all()` for API responses
2. **`crates/db/src/models/task.rs`**
- Changed `TaskRelationships.current_workspace` → `current_attempt: TaskAttempt`
3. **`crates/server/src/routes/task_attempts.rs`**
- Updated `get_task_attempts` to return `Vec<TaskAttempt>`
- Updated `get_task_attempt` to return `TaskAttempt`
- Updated `create_task_attempt` to return `TaskAttempt`
4. **`crates/server/src/bin/generate_types.rs`**
- Added `TaskAttempt::decl()` to the type generation list
Fixed references from `parent_task_attempt` to `parent_workspace_id` in:
- `TaskCard.tsx`
- `NoServerContent.tsx`
- `TaskPanel.tsx`
- `TaskFormDialog.tsx`
- `CreateAttemptDialog.tsx`
- `useTaskMutations.ts`
- `ProjectTasks.tsx`
- Frontend now gets `TaskAttempt` type with the `executor` field
- The `TaskRelationships.current_attempt` field provides `TaskAttempt` with executor
- Backend still uses `Workspace` + `Session` internally
- All type checks pass
Fixed. The issue was that the frontend was sending `task_attempt_id` as the query parameter, but the backend expected `workspace_id`. Now the execution processes WebSocket stream should work correctly and the "Loading History" should resolve.
* All done. Here's a summary of the changes:
1. **Added sessions endpoint** (`GET /api/sessions?workspace_id={uuid}`)
- Created `crates/server/src/routes/sessions.rs`
- Registered in `crates/server/src/routes/mod.rs`
- Added `Session::decl()` to `generate_types.rs`
2. **Removed TaskAttempt from backend**
- Removed `TaskAttempt` struct and methods from `crates/db/src/models/workspace.rs`
- Changed `TaskRelationships.current_attempt` back to `current_workspace: Workspace` in `task.rs`
- Updated route handlers to return `Workspace` instead of `TaskAttempt`
1. **Created `TaskAttempt` type** in `frontend/src/types/attempt.ts`
- Defines `TaskAttempt = Workspace & { executor: string }`
- Exports `createTaskAttempt()` helper function
2. **Updated `api.ts`**
- Added `sessionsApi` for fetching sessions
- Added `workspaceToTaskAttempt()` helper that fetches sessions and constructs TaskAttempt
- Updated `attemptsApi.getAll()`, `get()`, and `create()` to internally convert Workspace → TaskAttempt
3. **Updated 20+ frontend files** to import `TaskAttempt` from `@/types/attempt` instead of `shared/types`
- Backend returns `Workspace` directly (no executor field)
- Backend has new `/api/sessions` endpoint to fetch sessions by workspace
- Frontend constructs `TaskAttempt` by combining `Workspace` + latest `Session.executor`
- All type checks pass
* The refactoring is complete. Here's a summary of what was done:
- `TaskAttempt` is now just a type alias for `Workspace` (no executor needed for most uses)
- Added `WorkspaceWithSession = Workspace & { executor: string }` for components that need executor
- Added `createWorkspaceWithSession()` helper function
- `attemptsApi.get()`, `getAll()`, `create()` now return `Workspace` directly (as `TaskAttempt`)
- Added `attemptsApi.getWithSession()` - fetches workspace + session to get executor
- Added `sessionsApi.getByWorkspace()` for fetching sessions
- Added `useTaskAttemptWithSession()` - for single attempt with executor
- Added `useTaskAttemptsWithSessions()` - for list of attempts with executor
Files that access `.executor` now use `WorkspaceWithSession`:
- `TaskPanel.tsx` - Uses `useTaskAttemptsWithSessions` and `useTaskAttemptWithSession`
- `NextActionCard.tsx` - Uses `attemptsApi.getWithSession()`
- `UserMessage.tsx` - Receives `WorkspaceWithSession` prop
- `RetryEditorInline.tsx` - Receives `WorkspaceWithSession` prop
- `DisplayConversationEntry.tsx` - Passes `WorkspaceWithSession` to children
- `VirtualizedList.tsx` - Receives `WorkspaceWithSession` prop
- `TaskAttemptPanel.tsx` - Receives `WorkspaceWithSession` prop
- `ProjectTasks.tsx` - Uses `useTaskAttemptWithSession`
- `FullAttemptLogs.tsx` - Uses `useTaskAttemptWithSession`
- `CreateAttemptDialog.tsx` - Uses `useTaskAttemptsWithSessions`
The 32 other files that only use Workspace fields continue to use `TaskAttempt` (which is just `Workspace`) without any changes needed.
Done! I've simplified the migration from 191 lines down to 106 lines by:
1. **Removed workspaces table rebuild** → simple `ALTER TABLE workspaces DROP COLUMN executor`
2. **Removed merges table rebuild** → simple `ALTER TABLE merges RENAME COLUMN task_attempt_id TO workspace_id`
3. **Removed tasks table rebuild** → simple `ALTER TABLE tasks RENAME COLUMN parent_task_attempt TO parent_workspace_id`
4. **Removed attempt_repos rebuild entirely** → FK auto-updates when `task_attempts` is renamed to `workspaces`
The only table rebuilds remaining are for:
- `execution_processes` - because the FK target changes from workspaces to sessions
- `executor_sessions` → `coding_agent_turns` - because we're dropping the `task_attempt_id` column
All done:
- **npm run lint** - passed (fixed 4 unused import errors)
- **cargo build** - passed
- **npm run build** - passed
- **tsc --noEmit** - passed
Prep db
* Done. I've renamed `TaskAttempt` to `Workspace` in all places where it was used as a type annotation. Here's the summary:
- `types/attempt.ts` - Removed `export type TaskAttempt = Workspace;`
**API Layer:**
- `lib/api.ts` - Changed return types from `TaskAttempt` to `Workspace`
**Hooks:**
- `hooks/useTaskAttempts.ts` - `TaskAttempt[]` → `Workspace[]`
- `hooks/useAttemptCreation.ts` - `TaskAttempt` → `Workspace`
- `hooks/useConversationHistory.ts` - `TaskAttempt` → `Workspace`
- `hooks/useAttempt.ts` - `TaskAttempt` → `Workspace`
**Components:**
- `contexts/ClickedElementsProvider.tsx`
- `components/DiffCard.tsx`
- `components/panels/AttemptHeaderActions.tsx`
- `components/panels/DiffsPanel.tsx`
- `components/tasks/Toolbar/GitOperations.tsx`
- `components/dialogs/tasks/GitActionsDialog.tsx`
- `components/dialogs/tasks/ViewRelatedTasksDialog.tsx`
- `components/dialogs/tasks/CreatePRDialog.tsx`
- `components/ui/actions-dropdown.tsx`
**Type Definitions:**
- `types/modal-args.d.ts`
- `types/modals.ts`
**Pages:**
- `pages/ProjectTasks.tsx`
TypeScript check passes with no errors.
Cleanup script changes for task attempt 2f672d73-cb46-4515-b1c7-3da8f4402858
* The Session type now has `executor: string | null`, which is correct. All changes are complete:
1. **Migration**: `executor TEXT` (no `NOT NULL`)
2. **Rust model**: `executor: Option<String>`
3. **sqlx queries**: Using just `executor` without type annotation (sqlx infers nullable correctly)
4. **All usages**: Wrapped string values in `Some()` where executor is set
5. **TypeScript types**: `executor: string | null`
Everything builds and lints successfully.
Done. Removed `Session::parent_workspace` and its unused `Workspace` import.
* Done. The migration has been updated with the sqlx workaround:
1. Added `COMMIT TRANSACTION;` after `PRAGMA foreign_keys = OFF;` to end sqlx's auto-transaction
2. Added `BEGIN TRANSACTION;` to start our own controlled transaction
3. Added `PRAGMA foreign_key_check;` before committing to verify FK integrity
4. Added `COMMIT;` to commit our transaction
5. Added final `BEGIN TRANSACTION;` for sqlx to close gracefully
This ensures the `PRAGMA foreign_keys = OFF` actually takes effect, preventing potential cascade deletes of `execution_process_logs` when `DROP TABLE execution_processes` runs on existing databases with data.
Fixed. The migration now has the correct order:
1. `COMMIT TRANSACTION;` - ends sqlx's auto-transaction
2. `PRAGMA foreign_keys = OFF;` - now takes effect (outside transaction)
3. `BEGIN TRANSACTION;` - starts our controlled transaction
This ensures foreign keys are actually disabled before the table operations, preventing potential cascade deletes of `execution_process_logs` when `DROP TABLE execution_processes` runs.
Done. The migration now only disables foreign keys for the section that needs it (steps 7-8, the table rebuilds with DROP TABLE). Steps 1-6 run in sqlx's normal auto-transaction with FK enforcement on.
Fix slow statement (vibe-kanban b695d0ad)
i think we are missing an index on something, seeing these logs:
2025-12-17T15:23:25.297852Z WARN sqlx::query: slow statement: execution time exceeded alert threshold *summary*="SELECT t.id AS \\"id!: …" *db.statement*="\\n\\nSELECT\\n t.id AS \\"id!: Uuid\\",\\n t.project\_id AS \\"project\_id!: Uuid\\",\\n t.title,\\n t.description,\\n t.status AS \\"status!: TaskStatus\\",\\n t.parent\_workspace\_id AS \\"parent\_workspace\_id: Uuid\\",\\n t.shared\_task\_id AS \\"shared\_task\_id: Uuid\\",\\n t.created\_at AS \\"created\_at!: DateTime<Utc>\\",\\n t.updated\_at AS \\"updated\_at!: DateTime<Utc>\\",\\n\\n CASE WHEN EXISTS (\\n SELECT 1\\n FROM workspaces w\\n JOIN sessions s ON s.workspace\_id = w.id\\n JOIN execution\_processes ep ON ep.session\_id = s.id\\n WHERE w.task\_id = t.id\\n AND ep.status = 'running'\\n AND ep.run\_reason IN ('setupscript','cleanupscript','codingagent')\\n LIMIT 1\\n ) THEN 1 ELSE 0 END AS \\"has\_in\_progress\_attempt!: i64\\",\\n\\n CASE WHEN (\\n SELECT ep.status\\n FROM workspaces w\\n JOIN sessions s ON s.workspace\_id = w.id\\n JOIN execution\_processes ep ON ep.session\_id = s.id\\n WHERE w.task\_id = t.id\\n AND ep.run\_reason IN ('setupscript','cleanupscript','codingagent')\\n ORDER BY ep.created\_at DESC\\n LIMIT 1\\n ) IN ('failed','killed') THEN 1 ELSE 0 END\\n AS \\"last\_attempt\_failed!: i64\\",\\n\\n ( SELECT s.executor\\n FROM workspaces w\\n JOIN sessions s ON s.workspace\_id = w.id\\n WHERE w.task\_id = t.id\\n ORDER BY s.created\_at DESC\\n LIMIT 1\\n ) AS \\"executor!: String\\"\\n\\nFROM tasks t\\nWHERE t.project\_id = $1\\nORDER BY t.created\_at DESC\\n" *rows\_affected*=0 *rows\_returned*=202 *elapsed*=1.281210542s *elapsed\_secs*=1.281210542 *slow\_threshold*=1s
2025-12-17T15:23:25.350788Z WARN sqlx::query: slow statement: execution time exceeded alert threshold *summary*="SELECT t.id AS \\"id!: …" *db.statement*="\\n\\nSELECT\\n t.id AS \\"id!: Uuid\\",\\n t.project\_id AS \\"project\_id!: Uuid\\",\\n t.title,\\n t.description,\\n t.status AS \\"status!: TaskStatus\\",\\n t.parent\_workspace\_id AS \\"parent\_workspace\_id: Uuid\\",\\n t.shared\_task\_id AS \\"shared\_task\_id: Uuid\\",\\n t.created\_at AS \\"created\_at!: DateTime<Utc>\\",\\n t.updated\_at AS \\"updated\_at!: DateTime<Utc>\\",\\n\\n CASE WHEN EXISTS (\\n SELECT 1\\n FROM workspaces w\\n JOIN sessions s ON s.workspace\_id = w.id\\n JOIN execution\_processes ep ON ep.session\_id = s.id\\n WHERE w.task\_id = t.id\\n AND ep.status = 'running'\\n AND ep.run\_reason IN ('setupscript','cleanupscript','codingagent')\\n LIMIT 1\\n ) THEN 1 ELSE 0 END AS \\"has\_in\_progress\_attempt!: i64\\",\\n\\n CASE WHEN (\\n SELECT ep.status\\n FROM workspaces w\\n JOIN sessions s ON s.workspace\_id = w.id\\n JOIN execution\_processes ep ON ep.session\_id = s.id\\n WHERE w.task\_id = t.id\\n AND ep.run\_reason IN ('setupscript','cleanupscript','codingagent')\\n ORDER BY ep.created\_at DESC\\n LIMIT 1\\n ) IN ('failed','killed') THEN 1 ELSE 0 END\\n AS \\"last\_attempt\_failed!: i64\\",\\n\\n ( SELECT s.executor\\n FROM workspaces w\\n JOIN sessions s ON s.workspace\_id = w.id\\n WHERE w.task\_id = t.id\\n ORDER BY s.created\_at DESC\\n LIMIT 1\\n ) AS \\"executor!: String\\"\\n\\nFROM tasks t\\nWHERE t.project\_id = $1\\nORDER BY t.created\_at DESC\\n" *rows\_affected*=0 *rows\_returned*=202 *elapsed*=1.333812833s *elapsed\_secs*=1.333812833 *slow\_threshold*=1s
2025-12-17T15:23:25.401326Z WARN sqlx::query: slow statement: execution time exceeded alert threshold *summary*="INSERT INTO execution\_processes ( …" *db.statement*="\\n\\nINSERT INTO execution\_processes (\\n id, session\_id, run\_reason, executor\_action,\\n status, exit\_code, started\_at, completed\_at, created\_at, updated\_at\\n ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)\\n" *rows\_affected*=1 *rows\_returned*=0 *elapsed*=1.383690208s *elapsed\_secs*=1.383690208 *slow\_threshold*=1s
* Address feedback (vibe-kanban 81d8dbfa)
A PR opened by your colleague (https://github.com/BloopAI/vibe-kanban/pull/1569)
got some feedback, let's address it.
```gh-comment
{
"id": "2627479232",
"comment_type": "review",
"author": "ggordonhall",
"body": "```suggestion\r\n-- 3. Migrate data: create one session per workspace\r\nINSERT INTO sessions (id, workspace_id, executor, created_at, updated_at)\r\nSELECT gen_random_uuid(), id, executor, created_at, updated_at FROM workspaces;\r\n```\r\n",
"created_at": "2025-12-17T15:17:50Z",
"url": "https://github.com/BloopAI/vibe-kanban/pull/1569#discussion_r2627479232",
"path": "crates/db/migrations/20251216142123_refactor_task_attempts_to_workspaces_sessions.sql",
"line": 26,
"diff_hunk": "@@ -0,0 +1,121 @@\n+-- Refactor task_attempts into workspaces and sessions\n+-- - Rename task_attempts -> workspaces (keeps workspace-related fields)\n+-- - Create sessions table (executor moves here)\n+-- - Update execution_processes.task_attempt_id -> session_id\n+-- - Rename executor_sessions -> coding_agent_turns (drop redundant task_attempt_id)\n+-- - Rename merges.task_attempt_id -> workspace_id\n+-- - Rename tasks.parent_task_attempt -> parent_workspace_id\n+\n+-- 1. Rename task_attempts to workspaces (FK refs auto-update in schema)\n+ALTER TABLE task_attempts RENAME TO workspaces;\n+\n+-- 2. Create sessions table\n+CREATE TABLE sessions (\n+ id BLOB PRIMARY KEY,\n+ workspace_id BLOB NOT NULL,\n+ executor TEXT,\n+ created_at TEXT NOT NULL DEFAULT (datetime('now', 'subsec')),\n+ updated_at TEXT NOT NULL DEFAULT (datetime('now', 'subsec')),\n+ FOREIGN KEY (workspace_id) REFERENCES workspaces(id) ON DELETE CASCADE\n+);\n+\n+CREATE INDEX idx_sessions_workspace_id ON sessions(workspace_id);\n+\n+-- 3. Migrate data: create one session per workspace (using workspace.id as session.id for simplicity)\n+INSERT INTO sessions (id, workspace_id, executor, created_at, updated_at)\n+SELECT id, id, executor, created_at, updated_at FROM workspaces;"
}
```
```gh-comment
{
"id": "2627515578",
"comment_type": "review",
"author": "ggordonhall",
"body": "Why not rename `attempt_repos` to `workspace_repos` here now that `attempt` is a legacy concept?",
"created_at": "2025-12-17T15:27:21Z",
"url": "https://github.com/BloopAI/vibe-kanban/pull/1569#discussion_r2627515578",
"path": "crates/db/migrations/20251216142123_refactor_task_attempts_to_workspaces_sessions.sql",
"line": 118,
"diff_hunk": "@@ -0,0 +1,121 @@\n+-- Refactor task_attempts into workspaces and sessions\n+-- - Rename task_attempts -> workspaces (keeps workspace-related fields)\n+-- - Create sessions table (executor moves here)\n+-- - Update execution_processes.task_attempt_id -> session_id\n+-- - Rename executor_sessions -> coding_agent_turns (drop redundant task_attempt_id)\n+-- - Rename merges.task_attempt_id -> workspace_id\n+-- - Rename tasks.parent_task_attempt -> parent_workspace_id\n+\n+-- 1. Rename task_attempts to workspaces (FK refs auto-update in schema)\n+ALTER TABLE task_attempts RENAME TO workspaces;\n+\n+-- 2. Create sessions table\n+CREATE TABLE sessions (\n+ id BLOB PRIMARY KEY,\n+ workspace_id BLOB NOT NULL,\n+ executor TEXT,\n+ created_at TEXT NOT NULL DEFAULT (datetime('now', 'subsec')),\n+ updated_at TEXT NOT NULL DEFAULT (datetime('now', 'subsec')),\n+ FOREIGN KEY (workspace_id) REFERENCES workspaces(id) ON DELETE CASCADE\n+);\n+\n+CREATE INDEX idx_sessions_workspace_id ON sessions(workspace_id);\n+\n+-- 3. Migrate data: create one session per workspace (using workspace.id as session.id for simplicity)\n+INSERT INTO sessions (id, workspace_id, executor, created_at, updated_at)\n+SELECT id, id, executor, created_at, updated_at FROM workspaces;\n+\n+-- 4. Drop executor column from workspaces\n+ALTER TABLE workspaces DROP COLUMN executor;\n+\n+-- 5. Rename merges.task_attempt_id to workspace_id\n+DROP INDEX idx_merges_task_attempt_id;\n+DROP INDEX idx_merges_open_pr;\n+ALTER TABLE merges RENAME COLUMN task_attempt_id TO workspace_id;\n+CREATE INDEX idx_merges_workspace_id ON merges(workspace_id);\n+CREATE INDEX idx_merges_open_pr ON merges(workspace_id, pr_status)\n+WHERE merge_type = 'pr' AND pr_status = 'open';\n+\n+-- 6. Rename tasks.parent_task_attempt to parent_workspace_id\n+DROP INDEX IF EXISTS idx_tasks_parent_task_attempt;\n+ALTER TABLE tasks RENAME COLUMN parent_task_attempt TO parent_workspace_id;\n+CREATE INDEX idx_tasks_parent_workspace_id ON tasks(parent_workspace_id);\n+\n+-- Steps 7-8 need FK disabled to avoid cascade deletes during DROP TABLE\n+-- sqlx workaround: end auto-transaction to allow PRAGMA to take effect\n+-- https://github.com/launchbadge/sqlx/issues/2085#issuecomment-1499859906\n+COMMIT;\n+\n+PRAGMA foreign_keys = OFF;\n+\n+BEGIN TRANSACTION;\n+\n+-- 7. Update execution_processes to reference session_id instead of task_attempt_id\n+-- (needs rebuild because FK target changes from workspaces to sessions)\n+DROP INDEX IF EXISTS idx_execution_processes_task_attempt_created_at;\n+DROP INDEX IF EXISTS idx_execution_processes_task_attempt_type_created;\n+\n+CREATE TABLE execution_processes_new (\n+ id BLOB PRIMARY KEY,\n+ session_id BLOB NOT NULL,\n+ run_reason TEXT NOT NULL DEFAULT 'setupscript'\n+ CHECK (run_reason IN ('setupscript','codingagent','devserver','cleanupscript')),\n+ executor_action TEXT NOT NULL DEFAULT '{}',\n+ status TEXT NOT NULL DEFAULT 'running'\n+ CHECK (status IN ('running','completed','failed','killed')),\n+ exit_code INTEGER,\n+ dropped INTEGER NOT NULL DEFAULT 0,\n+ started_at TEXT NOT NULL DEFAULT (datetime('now', 'subsec')),\n+ completed_at TEXT,\n+ created_at TEXT NOT NULL DEFAULT (datetime('now', 'subsec')),\n+ updated_at TEXT NOT NULL DEFAULT (datetime('now', 'subsec')),\n+ FOREIGN KEY (session_id) REFERENCES sessions(id) ON DELETE CASCADE\n+);\n+\n+-- Since we used workspace.id as session.id, the task_attempt_id values map directly\n+INSERT INTO execution_processes_new (id, session_id, run_reason, executor_action, status, exit_code, dropped, started_at, completed_at, created_at, updated_at)\n+SELECT id, task_attempt_id, run_reason, executor_action, status, exit_code, dropped, started_at, completed_at, created_at, updated_at\n+FROM execution_processes;\n+\n+DROP TABLE execution_processes;\n+ALTER TABLE execution_processes_new RENAME TO execution_processes;\n+\n+-- Recreate execution_processes indexes\n+CREATE INDEX idx_execution_processes_session_id ON execution_processes(session_id);\n+CREATE INDEX idx_execution_processes_status ON execution_processes(status);\n+CREATE INDEX idx_execution_processes_run_reason ON execution_processes(run_reason);\n+\n+-- 8. Rename executor_sessions to coding_agent_turns and drop task_attempt_id\n+-- (needs rebuild to drop the redundant task_attempt_id column)\n+CREATE TABLE coding_agent_turns (\n+ id BLOB PRIMARY KEY,\n+ execution_process_id BLOB NOT NULL,\n+ session_id TEXT,\n+ prompt TEXT,\n+ summary TEXT,\n+ created_at TEXT NOT NULL DEFAULT (datetime('now', 'subsec')),\n+ updated_at TEXT NOT NULL DEFAULT (datetime('now', 'subsec')),\n+ FOREIGN KEY (execution_process_id) REFERENCES execution_processes(id) ON DELETE CASCADE\n+);\n+\n+INSERT INTO coding_agent_turns (id, execution_process_id, session_id, prompt, summary, created_at, updated_at)\n+SELECT id, execution_process_id, session_id, prompt, summary, created_at, updated_at\n+FROM executor_sessions;\n+\n+DROP TABLE executor_sessions;\n+\n+-- Recreate coding_agent_turns indexes\n+CREATE INDEX idx_coding_agent_turns_execution_process_id ON coding_agent_turns(execution_process_id);\n+CREATE INDEX idx_coding_agent_turns_session_id ON coding_agent_turns(session_id);\n+\n+-- 9. attempt_repos: no changes needed - FK auto-updated when task_attempts renamed to workspaces"
}
```
```gh-comment
{
"id": "2627694792",
"comment_type": "review",
"author": "ggordonhall",
"body": "Maybe there's a better name than `external_session_id` here? `agent_session_id`? ",
"created_at": "2025-12-17T16:16:24Z",
"url": "https://github.com/BloopAI/vibe-kanban/pull/1569#discussion_r2627694792",
"path": "crates/db/src/models/execution_process.rs",
"line": 685,
"diff_hunk": "@@ -618,4 +680,34 @@ impl ExecutionProcess {\n )),\n }\n }\n+\n+ /// Find latest coding_agent_turn session_id by workspace (across all sessions)\n+ pub async fn find_latest_external_session_id_by_workspace("
}
```
```gh-comment
{
"id": "2627707446",
"comment_type": "review",
"author": "ggordonhall",
"body": "```suggestion\r\n pub async fn cleanup_workspace(db: &DBService, workspace: &Workspace) {\r\n```",
"created_at": "2025-12-17T16:19:31Z",
"url": "https://github.com/BloopAI/vibe-kanban/pull/1569#discussion_r2627707446",
"path": "crates/local-deployment/src/container.rs",
"line": 146,
"diff_hunk": "@@ -142,20 +143,20 @@ impl LocalContainerService {\n map.remove(id)\n }\n \n- pub async fn cleanup_attempt_workspace(db: &DBService, attempt: &TaskAttempt) {\n- let Some(container_ref) = &attempt.container_ref else {\n+ pub async fn cleanup_workspace_container(db: &DBService, workspace: &Workspace) {"
}
```
```gh-comment
{
"id": "2627756192",
"comment_type": "review",
"author": "ggordonhall",
"body": "Update `mcp` nomenclature",
"created_at": "2025-12-17T16:31:49Z",
"url": "https://github.com/BloopAI/vibe-kanban/pull/1569#discussion_r2627756192",
"path": "crates/server/src/mcp/task_server.rs",
"line": 352,
"diff_hunk": "@@ -350,10 +349,9 @@ impl TaskServer {\n project_id: ctx.project.id,\n task_id: ctx.task.id,\n task_title: ctx.task.title,\n- attempt_id: ctx.task_attempt.id,\n- attempt_branch: ctx.task_attempt.branch,\n+ attempt_id: ctx.workspace.id,"
}
```
```gh-comment
{
"id": "2628161769",
"comment_type": "review",
"author": "ggordonhall",
"body": "update, and similar in other events",
"created_at": "2025-12-17T18:27:47Z",
"url": "https://github.com/BloopAI/vibe-kanban/pull/1569#discussion_r2628161769",
"path": "crates/server/src/routes/task_attempts.rs",
"line": 1335,
"diff_hunk": "@@ -1295,7 +1332,7 @@ pub async fn start_dev_server(\n serde_json::json!({\n \"task_id\": task.id.to_string(),\n \"project_id\": project.id.to_string(),\n- \"attempt_id\": task_attempt.id.to_string(),\n+ \"attempt_id\": workspace.id.to_string(),"
}
```
```gh-comment
{
"id": "2628194289",
"comment_type": "review",
"author": "ggordonhall",
"body": "Ugly, but we should rename this struct to avoid confusion with the more general concept of a workspace. Ideas...\r\n\r\n- `WorktreeContainer`\r\n...\r\n...\r\n\r\nChatGPT?",
"created_at": "2025-12-17T18:36:30Z",
"url": "https://github.com/BloopAI/vibe-kanban/pull/1569#discussion_r2628194289",
"path": "crates/services/src/services/workspace_manager.rs",
"line": 3,
"diff_hunk": "@@ -1,6 +1,6 @@\n use std::path::{Path, PathBuf};\n \n-use db::models::{repo::Repo, task_attempt::TaskAttempt};\n+use db::models::{repo::Repo, workspace::Workspace as DbWorkspace};"
}
```
```gh-comment
{
"id": "2628198036",
"comment_type": "review",
"author": "ggordonhall",
"body": "We could add a BE route for this, and similar hooks where we're aggregating this information on the fly",
"created_at": "2025-12-17T18:37:46Z",
"url": "https://github.com/BloopAI/vibe-kanban/pull/1569#discussion_r2628198036",
"path": "frontend/src/hooks/useTaskAttempts.ts",
"line": 43,
"diff_hunk": "@@ -16,10 +20,36 @@ export function useTaskAttempts(taskId?: string, opts?: Options) {\n const enabled = (opts?.enabled ?? true) && !!taskId;\n const refetchInterval = opts?.refetchInterval ?? 5000;\n \n- return useQuery<TaskAttempt[]>({\n+ return useQuery<Workspace[]>({\n queryKey: taskAttemptKeys.byTask(taskId),\n queryFn: () => attemptsApi.getAll(taskId!),\n enabled,\n refetchInterval,\n });\n }\n+\n+/**\n+ * Hook for components that need executor field for all attempts.\n+ * Fetches all attempts and their sessions in parallel.\n+ */\n+export function useTaskAttemptsWithSessions(taskId?: string, opts?: Options) {\n+ const enabled = (opts?.enabled ?? true) && !!taskId;\n+ const refetchInterval = opts?.refetchInterval ?? 5000;\n+\n+ return useQuery<WorkspaceWithSession[]>({\n+ queryKey: taskAttemptKeys.byTaskWithSessions(taskId),\n+ queryFn: async () => {\n+ const attempts = await attemptsApi.getAll(taskId!);\n+ // Fetch sessions for all attempts in parallel"
}
```
* Address feedback (vibe-kanban 81d8dbfa)
A PR opened by your colleague (https://github.com/BloopAI/vibe-kanban/pull/1569)
got some feedback, let's address it.
```gh-comment
{
"id": "2627479232",
"comment_type": "review",
"author": "ggordonhall",
"body": "```suggestion\r\n-- 3. Migrate data: create one session per workspace\r\nINSERT INTO sessions (id, workspace_id, executor, created_at, updated_at)\r\nSELECT gen_random_uuid(), id, executor, created_at, updated_at FROM workspaces;\r\n```\r\n",
"created_at": "2025-12-17T15:17:50Z",
"url": "https://github.com/BloopAI/vibe-kanban/pull/1569#discussion_r2627479232",
"path": "crates/db/migrations/20251216142123_refactor_task_attempts_to_workspaces_sessions.sql",
"line": 26,
"diff_hunk": "@@ -0,0 +1,121 @@\n+-- Refactor task_attempts into workspaces and sessions\n+-- - Rename task_attempts -> workspaces (keeps workspace-related fields)\n+-- - Create sessions table (executor moves here)\n+-- - Update execution_processes.task_attempt_id -> session_id\n+-- - Rename executor_sessions -> coding_agent_turns (drop redundant task_attempt_id)\n+-- - Rename merges.task_attempt_id -> workspace_id\n+-- - Rename tasks.parent_task_attempt -> parent_workspace_id\n+\n+-- 1. Rename task_attempts to workspaces (FK refs auto-update in schema)\n+ALTER TABLE task_attempts RENAME TO workspaces;\n+\n+-- 2. Create sessions table\n+CREATE TABLE sessions (\n+ id BLOB PRIMARY KEY,\n+ workspace_id BLOB NOT NULL,\n+ executor TEXT,\n+ created_at TEXT NOT NULL DEFAULT (datetime('now', 'subsec')),\n+ updated_at TEXT NOT NULL DEFAULT (datetime('now', 'subsec')),\n+ FOREIGN KEY (workspace_id) REFERENCES workspaces(id) ON DELETE CASCADE\n+);\n+\n+CREATE INDEX idx_sessions_workspace_id ON sessions(workspace_id);\n+\n+-- 3. Migrate data: create one session per workspace (using workspace.id as session.id for simplicity)\n+INSERT INTO sessions (id, workspace_id, executor, created_at, updated_at)\n+SELECT id, id, executor, created_at, updated_at FROM workspaces;"
}
```
```gh-comment
{
"id": "2627515578",
"comment_type": "review",
"author": "ggordonhall",
"body": "Why not rename `attempt_repos` to `workspace_repos` here now that `attempt` is a legacy concept?",
"created_at": "2025-12-17T15:27:21Z",
"url": "https://github.com/BloopAI/vibe-kanban/pull/1569#discussion_r2627515578",
"path": "crates/db/migrations/20251216142123_refactor_task_attempts_to_workspaces_sessions.sql",
"line": 118,
"diff_hunk": "@@ -0,0 +1,121 @@\n+-- Refactor task_attempts into workspaces and sessions\n+-- - Rename task_attempts -> workspaces (keeps workspace-related fields)\n+-- - Create sessions table (executor moves here)\n+-- - Update execution_processes.task_attempt_id -> session_id\n+-- - Rename executor_sessions -> coding_agent_turns (drop redundant task_attempt_id)\n+-- - Rename merges.task_attempt_id -> workspace_id\n+-- - Rename tasks.parent_task_attempt -> parent_workspace_id\n+\n+-- 1. Rename task_attempts to workspaces (FK refs auto-update in schema)\n+ALTER TABLE task_attempts RENAME TO workspaces;\n+\n+-- 2. Create sessions table\n+CREATE TABLE sessions (\n+ id BLOB PRIMARY KEY,\n+ workspace_id BLOB NOT NULL,\n+ executor TEXT,\n+ created_at TEXT NOT NULL DEFAULT (datetime('now', 'subsec')),\n+ updated_at TEXT NOT NULL DEFAULT (datetime('now', 'subsec')),\n+ FOREIGN KEY (workspace_id) REFERENCES workspaces(id) ON DELETE CASCADE\n+);\n+\n+CREATE INDEX idx_sessions_workspace_id ON sessions(workspace_id);\n+\n+-- 3. Migrate data: create one session per workspace (using workspace.id as session.id for simplicity)\n+INSERT INTO sessions (id, workspace_id, executor, created_at, updated_at)\n+SELECT id, id, executor, created_at, updated_at FROM workspaces;\n+\n+-- 4. Drop executor column from workspaces\n+ALTER TABLE workspaces DROP COLUMN executor;\n+\n+-- 5. Rename merges.task_attempt_id to workspace_id\n+DROP INDEX idx_merges_task_attempt_id;\n+DROP INDEX idx_merges_open_pr;\n+ALTER TABLE merges RENAME COLUMN task_attempt_id TO workspace_id;\n+CREATE INDEX idx_merges_workspace_id ON merges(workspace_id);\n+CREATE INDEX idx_merges_open_pr ON merges(workspace_id, pr_status)\n+WHERE merge_type = 'pr' AND pr_status = 'open';\n+\n+-- 6. Rename tasks.parent_task_attempt to parent_workspace_id\n+DROP INDEX IF EXISTS idx_tasks_parent_task_attempt;\n+ALTER TABLE tasks RENAME COLUMN parent_task_attempt TO parent_workspace_id;\n+CREATE INDEX idx_tasks_parent_workspace_id ON tasks(parent_workspace_id);\n+\n+-- Steps 7-8 need FK disabled to avoid cascade deletes during DROP TABLE\n+-- sqlx workaround: end auto-transaction to allow PRAGMA to take effect\n+-- https://github.com/launchbadge/sqlx/issues/2085#issuecomment-1499859906\n+COMMIT;\n+\n+PRAGMA foreign_keys = OFF;\n+\n+BEGIN TRANSACTION;\n+\n+-- 7. Update execution_processes to reference session_id instead of task_attempt_id\n+-- (needs rebuild because FK target changes from workspaces to sessions)\n+DROP INDEX IF EXISTS idx_execution_processes_task_attempt_created_at;\n+DROP INDEX IF EXISTS idx_execution_processes_task_attempt_type_created;\n+\n+CREATE TABLE execution_processes_new (\n+ id BLOB PRIMARY KEY,\n+ session_id BLOB NOT NULL,\n+ run_reason TEXT NOT NULL DEFAULT 'setupscript'\n+ CHECK (run_reason IN ('setupscript','codingagent','devserver','cleanupscript')),\n+ executor_action TEXT NOT NULL DEFAULT '{}',\n+ status TEXT NOT NULL DEFAULT 'running'\n+ CHECK (status IN ('running','completed','failed','killed')),\n+ exit_code INTEGER,\n+ dropped INTEGER NOT NULL DEFAULT 0,\n+ started_at TEXT NOT NULL DEFAULT (datetime('now', 'subsec')),\n+ completed_at TEXT,\n+ created_at TEXT NOT NULL DEFAULT (datetime('now', 'subsec')),\n+ updated_at TEXT NOT NULL DEFAULT (datetime('now', 'subsec')),\n+ FOREIGN KEY (session_id) REFERENCES sessions(id) ON DELETE CASCADE\n+);\n+\n+-- Since we used workspace.id as session.id, the task_attempt_id values map directly\n+INSERT INTO execution_processes_new (id, session_id, run_reason, executor_action, status, exit_code, dropped, started_at, completed_at, created_at, updated_at)\n+SELECT id, task_attempt_id, run_reason, executor_action, status, exit_code, dropped, started_at, completed_at, created_at, updated_at\n+FROM execution_processes;\n+\n+DROP TABLE execution_processes;\n+ALTER TABLE execution_processes_new RENAME TO execution_processes;\n+\n+-- Recreate execution_processes indexes\n+CREATE INDEX idx_execution_processes_session_id ON execution_processes(session_id);\n+CREATE INDEX idx_execution_processes_status ON execution_processes(status);\n+CREATE INDEX idx_execution_processes_run_reason ON execution_processes(run_reason);\n+\n+-- 8. Rename executor_sessions to coding_agent_turns and drop task_attempt_id\n+-- (needs rebuild to drop the redundant task_attempt_id column)\n+CREATE TABLE coding_agent_turns (\n+ id BLOB PRIMARY KEY,\n+ execution_process_id BLOB NOT NULL,\n+ session_id TEXT,\n+ prompt TEXT,\n+ summary TEXT,\n+ created_at TEXT NOT NULL DEFAULT (datetime('now', 'subsec')),\n+ updated_at TEXT NOT NULL DEFAULT (datetime('now', 'subsec')),\n+ FOREIGN KEY (execution_process_id) REFERENCES execution_processes(id) ON DELETE CASCADE\n+);\n+\n+INSERT INTO coding_agent_turns (id, execution_process_id, session_id, prompt, summary, created_at, updated_at)\n+SELECT id, execution_process_id, session_id, prompt, summary, created_at, updated_at\n+FROM executor_sessions;\n+\n+DROP TABLE executor_sessions;\n+\n+-- Recreate coding_agent_turns indexes\n+CREATE INDEX idx_coding_agent_turns_execution_process_id ON coding_agent_turns(execution_process_id);\n+CREATE INDEX idx_coding_agent_turns_session_id ON coding_agent_turns(session_id);\n+\n+-- 9. attempt_repos: no changes needed - FK auto-updated when task_attempts renamed to workspaces"
}
```
```gh-comment
{
"id": "2627694792",
"comment_type": "review",
"author": "ggordonhall",
"body": "Maybe there's a better name than `external_session_id` here? `agent_session_id`? ",
"created_at": "2025-12-17T16:16:24Z",
"url": "https://github.com/BloopAI/vibe-kanban/pull/1569#discussion_r2627694792",
"path": "crates/db/src/models/execution_process.rs",
"line": 685,
"diff_hunk": "@@ -618,4 +680,34 @@ impl ExecutionProcess {\n )),\n }\n }\n+\n+ /// Find latest coding_agent_turn session_id by workspace (across all sessions)\n+ pub async fn find_latest_external_session_id_by_workspace("
}
```
```gh-comment
{
"id": "2627707446",
"comment_type": "review",
"author": "ggordonhall",
"body": "```suggestion\r\n pub async fn cleanup_workspace(db: &DBService, workspace: &Workspace) {\r\n```",
"created_at": "2025-12-17T16:19:31Z",
"url": "https://github.com/BloopAI/vibe-kanban/pull/1569#discussion_r2627707446",
"path": "crates/local-deployment/src/container.rs",
"line": 146,
"diff_hunk": "@@ -142,20 +143,20 @@ impl LocalContainerService {\n map.remove(id)\n }\n \n- pub async fn cleanup_attempt_workspace(db: &DBService, attempt: &TaskAttempt) {\n- let Some(container_ref) = &attempt.container_ref else {\n+ pub async fn cleanup_workspace_container(db: &DBService, workspace: &Workspace) {"
}
```
```gh-comment
{
"id": "2627756192",
"comment_type": "review",
"author": "ggordonhall",
"body": "Update `mcp` nomenclature",
"created_at": "2025-12-17T16:31:49Z",
"url": "https://github.com/BloopAI/vibe-kanban/pull/1569#discussion_r2627756192",
"path": "crates/server/src/mcp/task_server.rs",
"line": 352,
"diff_hunk": "@@ -350,10 +349,9 @@ impl TaskServer {\n project_id: ctx.project.id,\n task_id: ctx.task.id,\n task_title: ctx.task.title,\n- attempt_id: ctx.task_attempt.id,\n- attempt_branch: ctx.task_attempt.branch,\n+ attempt_id: ctx.workspace.id,"
}
```
```gh-comment
{
"id": "2628161769",
"comment_type": "review",
"author": "ggordonhall",
"body": "update, and similar in other events",
"created_at": "2025-12-17T18:27:47Z",
"url": "https://github.com/BloopAI/vibe-kanban/pull/1569#discussion_r2628161769",
"path": "crates/server/src/routes/task_attempts.rs",
"line": 1335,
"diff_hunk": "@@ -1295,7 +1332,7 @@ pub async fn start_dev_server(\n serde_json::json!({\n \"task_id\": task.id.to_string(),\n \"project_id\": project.id.to_string(),\n- \"attempt_id\": task_attempt.id.to_string(),\n+ \"attempt_id\": workspace.id.to_string(),"
}
```
```gh-comment
{
"id": "2628194289",
"comment_type": "review",
"author": "ggordonhall",
"body": "Ugly, but we should rename this struct to avoid confusion with the more general concept of a workspace. Ideas...\r\n\r\n- `WorktreeContainer`\r\n...\r\n...\r\n\r\nChatGPT?",
"created_at": "2025-12-17T18:36:30Z",
"url": "https://github.com/BloopAI/vibe-kanban/pull/1569#discussion_r2628194289",
"path": "crates/services/src/services/workspace_manager.rs",
"line": 3,
"diff_hunk": "@@ -1,6 +1,6 @@\n use std::path::{Path, PathBuf};\n \n-use db::models::{repo::Repo, task_attempt::TaskAttempt};\n+use db::models::{repo::Repo, workspace::Workspace as DbWorkspace};"
}
```
```gh-comment
{
"id": "2628198036",
"comment_type": "review",
"author": "ggordonhall",
"body": "We could add a BE route for this, and similar hooks where we're aggregating this information on the fly",
"created_at": "2025-12-17T18:37:46Z",
"url": "https://github.com/BloopAI/vibe-kanban/pull/1569#discussion_r2628198036",
"path": "frontend/src/hooks/useTaskAttempts.ts",
"line": 43,
"diff_hunk": "@@ -16,10 +20,36 @@ export function useTaskAttempts(taskId?: string, opts?: Options) {\n const enabled = (opts?.enabled ?? true) && !!taskId;\n const refetchInterval = opts?.refetchInterval ?? 5000;\n \n- return useQuery<TaskAttempt[]>({\n+ return useQuery<Workspace[]>({\n queryKey: taskAttemptKeys.byTask(taskId),\n queryFn: () => attemptsApi.getAll(taskId!),\n enabled,\n refetchInterval,\n });\n }\n+\n+/**\n+ * Hook for components that need executor field for all attempts.\n+ * Fetches all attempts and their sessions in parallel.\n+ */\n+export function useTaskAttemptsWithSessions(taskId?: string, opts?: Options) {\n+ const enabled = (opts?.enabled ?? true) && !!taskId;\n+ const refetchInterval = opts?.refetchInterval ?? 5000;\n+\n+ return useQuery<WorkspaceWithSession[]>({\n+ queryKey: taskAttemptKeys.byTaskWithSessions(taskId),\n+ queryFn: async () => {\n+ const attempts = await attemptsApi.getAll(taskId!);\n+ // Fetch sessions for all attempts in parallel"
}
```
|
||
|
Solomon
|
a282bbdae4 |
Real-time sync for Projects (#1512)
* Real-time sync for Projects * Do not create project in a transaction Update hooks trigger before the transaction is commited, which causes insert events to be dismissed because the row is isn't found |
||
|
GitHub Action
|
fd210419cd | chore: bump version to 0.0.138 | ||
|
GitHub Action
|
37af711712 | chore: bump version to 0.0.137 | ||
|
Alex Netsch
|
f989b47470 |
Refactor branch fetching to use repo IDs instead of project IDs (Vibe Kanban) (#1560)
* All tasks are complete. Here's a summary of the changes made:
## Summary
Successfully refactored the project branches API to fetch branches using repo IDs instead of project IDs.
### Files Created
- `frontend/src/hooks/useRepoBranches.ts` - New hook that fetches branches for a single repository using `repoApi.getBranches(repoId)`
### Files Modified
1. **`frontend/src/hooks/index.ts`** - Added export for `useRepoBranches`
2. **`frontend/src/components/dialogs/tasks/GitActionsDialog.tsx`**
- Removed `useState` for `repoBranches` and `loadingBranches`
- Removed `useEffect` that called `projectsApi.getBranches(effectiveProjectId)`
- Removed `useMemo` that filtered branches by `selectedRepoId`
- Now uses `useRepoBranches(selectedRepoId)` to fetch branches directly for the selected repo from the task attempt
3. **`frontend/src/components/dialogs/tasks/CreatePRDialog.tsx`**
- Removed `projectId` from props interface and component destructuring
- Removed `useState` for `branches` and `branchesLoading`
- Removed branch-fetching logic from useEffect
- Now uses `useRepoBranches(repoId)` to fetch branches directly for the specified repo
- Split useEffect into two: one for form initialization, one for setting default base branch
4. **`frontend/src/components/tasks/Toolbar/GitOperations.tsx`**
- Removed `projectId` from `CreatePRDialog.show()` call
### Benefits
- More efficient - fetches only branches for the specific repo needed instead of all project repos
- Better caching - React Query caches branches per repo for efficient reuse
- Cleaner code - removed manual filtering logic from components
- Type safety - hooks return `GitBranch[]` directly instead of `RepositoryBranches[]`
* All tasks complete. Here's a summary of the changes made:
## Summary
Successfully decoupled the branches API from project IDs.
### Changes Made
**1. `frontend/src/hooks/useBranches.ts`** - Refactored to accept `repos: Array<{ id: string; name: string }>` instead of `projectId`
- Now uses `useQueries` to fetch branches for multiple repos in parallel
- Reuses the same query keys as `useRepoBranches` for cache consistency
**2. `frontend/src/hooks/useRepoBranchSelection.ts`** - Refactored to accept `repos: Repo[]` instead of `projectId`
- Removed internal fetch of project repos (caller now provides them)
- Removed `projectRepos` from return value
- Uses refactored `useBranches(repos)`
**3. `frontend/src/components/dialogs/tasks/CreateAttemptDialog.tsx`**
- Added `useQuery` to fetch project repos separately
- Passes `repos` to `useRepoBranchSelection`
**4. `frontend/src/components/dialogs/tasks/TaskFormDialog.tsx`**
- Already fetched `projectRepos`
- Updated to pass `projectRepos` to refactored `useBranches`
**5. `frontend/src/components/layout/Navbar.tsx`**
- Replaced `useBranches(projectId)` with `useQuery` for `projectsApi.getRepositories`
- Only needed repo count, not branches
**6. `frontend/src/components/projects/ProjectCard.tsx`**
- Replaced `useBranches(project.id)` with `useQuery` for `projectsApi.getRepositories`
- Only needed repo count, not branches
### Benefits
- Branch hooks no longer require a project ID
- Repos can come from any source (project, attempt, or future sources without projects)
- Better separation of concerns
- Enables future task attempts without projects attached
* Cleanup script changes for task attempt 6b5b9208-565d-4620-9fe3-20791db77d7a
* The fix is already applied. Type checks pass with `Repo[]` instead of the loose `Array<{ id: string; name: string }>` type.
This makes it explicit that `useBranches` expects actual `Repo` objects (with `Repo.id` being the repository's UUID), not project-repo junction records.
* All done. The refactor is complete:
**Summary of changes:**
1. **Created `useProjectRepos` hook** (`frontend/src/hooks/useProjectRepos.ts`) - A reusable hook that fetches project repositories with proper query key management
2. **Updated 5 files** to use the new hook instead of duplicating the `useQuery` pattern:
- `CreateAttemptDialog.tsx`
- `TaskFormDialog.tsx`
- `Navbar.tsx`
- `ProjectCard.tsx`
- `NoServerContent.tsx`
3. **Earlier refactors** (from before the summary):
- `useBranches.ts` - Now accepts `repos: Repo[]` instead of `projectId`
- `useRepoBranchSelection.ts` - Now accepts `repos: Repo[]` instead of `projectId`
This enables future task attempts without projects attached, as branch fetching is now decoupled from project IDs.
* No more usages. The branches in `ProjectTasks.tsx` are used for the diffs panel - showing available branches for git operations when viewing an attempt's diffs.
* Cleanup script changes for task attempt 6b5b9208-565d-4620-9fe3-20791db77d7a
* All done. The refactor is complete:
**Summary of changes:**
`GitOperations` now fetches its own branches using `useRepoBranches(selectedRepoId)` instead of receiving them as a prop. This:
1. Removes prop drilling through `ProjectTasks` → `DiffsPanelContainer` → `DiffsPanel` → `GitOperations`
2. Removes the need for `ProjectTasks` to fetch all project repos just to get branches for the selected repo
3. Makes `GitOperations` self-contained - it already has `selectedRepoId` from `useAttemptRepo`, so it can fetch its own branches
4. Simplifies `GitActionsDialog` which no longer needs to fetch branches either
* All done. Here's a summary of the changes:
**Removed `projectId` from GitOperations flow:**
1. **`useRebase.ts`** - Changed param from `projectId` to `repoId`, updated invalidation to use `repoBranchKeys.byRepo(repoId)`
2. **`useChangeTargetBranch.ts`** - Changed param from `projectId` to `repoId`, updated invalidation to use `repoBranchKeys.byRepo(repoId)`
3. **`useMerge.ts`** - Updated invalidation to use `repoBranchKeys.all` instead of `['projectBranches']`
4. **`useGitOperations.ts`** - Changed param from `projectId` to `repoId`
5. **`GitOperations.tsx`** - Removed `projectId` prop, now passes `selectedRepoId` to `useGitOperations`
6. **`GitActionsDialog.tsx`** - Removed `projectId` from props and internal logic
7. **`DiffsPanelContainer`** (in ProjectTasks.tsx) - Removed `projectId` prop
8. **Callers of `GitActionsDialog.show`** - Removed `projectId` from `NextActionCard.tsx` and `actions-dropdown.tsx`
* The cleanup is complete. Here's a summary of what was done:
**Removed dead project branches code:**
1. **Backend** (`crates/server/src/routes/projects.rs`):
- Removed `get_project_branches` handler and route
- Removed `RepositoryBranches` and `ProjectBranchesResponse` structs
- Fixed unused `Serialize` import warning
2. **Type Generation** (`crates/server/src/bin/generate_types.rs`):
- Removed exports for `ProjectBranchesResponse` and `RepositoryBranches`
3. **Frontend Hooks** (`frontend/src/hooks/useBranches.ts`):
- Defined local `RepositoryBranches` type instead of importing from shared/types
4. **Frontend API** (`frontend/src/lib/api.ts`):
- Removed `projectsApi.getBranches` method
- Removed `RepositoryBranches` and `ProjectBranchesResponse` imports
Both TypeScript and Rust compilation pass without errors.
* Done. Removed the `RepositoryBranches` type and simplified `useBranches` to return `Map<string, GitBranch[]>`. Changes:
1. **`useBranches.ts`** - Returns `Map<string, GitBranch[]>` instead of `RepositoryBranches[]`
2. **`useRepoBranchSelection.ts`** - Uses `branchMap.get(repo.id) ?? []` instead of `.find()`
3. **`TaskFormDialog.tsx`** - Uses `branchMap.get(repo.id) ?? []` instead of `.find()`
Type checks pass.
* Done. Deleted `useBranches` entirely and consolidated everything into `useRepoBranchSelection`. Summary:
1. **Deleted** `frontend/src/hooks/useBranches.ts`
2. **Updated** `useRepoBranchSelection.ts` - inlined the `useQueries` logic directly
3. **Updated** `hooks/index.ts` - removed `useBranches` export
4. **Updated** `TaskFormDialog.tsx` - now uses `useRepoBranchSelection` instead of duplicating the config-building logic
Type checks pass.
* types
|
||
|
Alex Netsch
|
ec8666da74 |
Add configurable working directory for dev server scripts (Vibe Kanban) (#1559)
* The implementation is complete. Here's a summary of all the changes made: ## Summary Added the ability for users to specify a working directory for dev server scripts: ### Files Changed: 1. **Database migration** - `crates/db/migrations/20251216000000_add_dev_script_working_dir_to_projects.sql` - Added `dev_script_working_dir TEXT DEFAULT ''` column 2. **Rust model** - `crates/db/src/models/project.rs` - Added `dev_script_working_dir` field to `Project` and `UpdateProject` structs - Updated all SQL queries 3. **Dev server execution** - `crates/server/src/routes/task_attempts.rs` - `start_dev_server` now passes `project.dev_script_working_dir` to the script executor 4. **Backfill logic** - `crates/services/src/services/container.rs` - Changed `backfill_repo_names` to set `dev_script_working_dir` instead of prepending `cd ./repo &&` 5. **Frontend UI** - `frontend/src/pages/settings/ProjectSettings.tsx` - Added input field for "Dev Server Working Directory" 6. **Translations** - `frontend/src/i18n/locales/en/settings.json` - Added `devWorkingDir` label, placeholder, and helper text 7. **TypeScript types** - `shared/types.ts` - Regenerated with `dev_script_working_dir` field * Cleanup script changes for task attempt 83423e2d-0d45-47fb-a6e4-dd91a2140f91 * Both packages compile successfully. The fix is complete: 1. **`project.rs`**: Removed `.or()` fallback for `dev_script` and `dev_script_working_dir` so `None` now clears the field 2. **`container.rs`**: Updated backfill to explicitly pass the existing project name instead of `None` * Done. I've completed both review tasks: 1. Removed the comment from `container.rs` line 384 2. Added `devWorkingDir` translations to all four language files (es, ja, ko, zh-Hans) with: - `label`: The field label - `placeholder`: Example placeholder text - `helper`: Description of what the field does I also updated the `dev.helper` text in each language to reference the new working directory option instead of suggesting users manually `cd` into the repo directory. * Done. Removed both comments: 1. Removed the comment from the migration file 2. Removed the comment from `task_attempts.rs` line 1267 * Fixed. The TypeScript error in `NoServerContent.tsx` has been resolved by adding `dev_script_working_dir: null` to the `UpdateProject` data. All checks pass: - ✅ `npm run format` - completed - ✅ `npm run lint` - passed (frontend and backend) - ✅ `npx tsc --noEmit` - passed * The Korean and Chinese translations already had the updated copy without the `cd` reference. The Spanish and Japanese were updated. All the translations now have the proper helper text that references the working directory field instead of telling users to manually `cd` into the repo. * Done. I've removed the `cd my_website` line from both the Windows and Unix script placeholder examples in `scriptPlaceholders.ts`. Now the placeholder examples just show `npm run dev` without the `cd` command, since users can specify the working directory separately. |
||
|
Gabriel Gordon-Hall
|
22ff27d8fd |
feat: multi repo projects (#1516)
* configure multiple repositories per project * Move repo selection to frontend for create PR (#1436) * Inline ensure worktree path (#1440) * Inline ensure_worktree_path in task_attempts * Inline ensure_worktree_path in images and setups, remove ensure_worktree_path * chore: use `find_repos_for_attempt` where possible (#1442) * use find_repos_for_attempt rather than find_repos_for_project where possible * remove Repo::find_by_attempt_id * change target branch backend (#1454) * feat: multi repo branch rename (#1456) * 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> * Fix project display name being used as path (#1464) * Multi repo merge (#1470) * cleanup create PR * Merge for multi repo projects * Multi repo support for rebase (vibe-kanban) (#1472) * 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 483060e92). ### 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. * Fix worktree name (#1483) * Add multi-repo support for rebase conflict handling (Vibe Kanban) (#1487) * 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. * Multi-repo support for restoring commits (Vibe Kanban) (#1490) * 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 483060e92, 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. * All done! Here's a summary of the changes made to add multi-repo support 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 * Add multi-repo support for PR comments (Vibe Kanban) (#1500) * 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`. * feat: override `ProjectRepos` (#1475) * override repos at a task_attempt level * simplify mcp * refer to repoIds on frontend; separate api call to register a repo obj * consolidate ProjectFormDialog * Move repo path migration to rust backend (#1507) * Add repo selection to git toolbar and fix project create loop (Vibe Kanban) (#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 (#1513) * feat: per repo git state (#1514) * multi repo target selector * per-repo pr state * query per iter * Move per-repo scripts from Project to ProjectRepo (Vibe Kanban) (#1515) * 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 * Hide Open in IDE button for multi-repo projects (Vibe Kanban) (#1517) * 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 * Done! I've successfully removed the unused `compare_commit_to_head` endpoint. 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). * Fix WebSocket events lost when creating execution processes (Vibe Kanban) (#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. * remove junk files (#1528) * format, lint * Version back to 10.13.0 * Fix i18n check script failures (Vibe Kanban) (#1530) * 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 * Add analytics events for multi-repo projects (Vibe Kanban) (#1532) * 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`. * Add comprehensive logging for multi-repo add/remove operations (Vibe 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 * Let me provide a summary of the changes made: (#1529) 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. * Allow follow-ups after PR merge (Vibe Kanban) (#1534) * 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 * use git worktree move to move to temp dir; cleanup temp after successful migration (#1541) * Refactor workspace cleanup and remove unused worktree_deleted field (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> * Inline delete_inner into ContainerService delete method (Vibe Kanban) (#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. * update copy for scripts (#1535) * Fix orphan cleanup to properly handle workspaces containing multiple 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 * invalidate project queries on add or delete repo (#1557) --------- Co-authored-by: Alex Netsch <alex@bloop.ai> |
||
|
Louis Knight-Webb
|
7f9f1433af |
Store binaries in Cloudflare R2 instead of bundling in npm package (Vibe Kanban) (#1554)
* All changes are complete. Let me provide a summary of what was implemented:
## Summary
I've implemented the Cloudflare R2 binary storage feature. Here are the changes:
### Files Created
- **`npx-cli/bin/download.js`** - New module that handles downloading binaries from R2 with:
- SHA-256 checksum verification
- Progress reporting
- Redirect handling
- Local caching in `~/.vibe-kanban/bin/{version}/{platform}/`
### Files Modified
1. **`npx-cli/bin/cli.js`**
- Converted to async for on-demand downloads
- Downloads binaries from R2 instead of using bundled files
- Non-blocking update check shows notice if newer version available
- Caches binaries locally per version/platform
2. **`npx-cli/package.json`**
- Removed `"dist"` from `files` array (package now ~15KB instead of ~150MB)
3. **`.github/workflows/pre-release.yml`**
- Added new `upload-to-r2` job that:
- Downloads all platform packages from artifacts
- Generates manifest.json with SHA-256 checksums for each binary
- Uploads binaries to R2 at `binaries/v{version}/{platform}/{binary}.zip`
- Updates global manifest with latest version
- Modified `create-prerelease` job to:
- Depend on `upload-to-r2` instead of `package-npx-cli`
- Inject R2 public URL into download.js via `sed`
- No longer download/bundle binaries in the npm package
### Required GitHub Secrets
You'll need to add these secrets to your repository:
- `R2_BINARIES_ACCESS_KEY_ID`
- `R2_BINARIES_SECRET_ACCESS_KEY`
- `R2_BINARIES_ENDPOINT` (e.g., `https://<account_id>.r2.cloudflarestorage.com`)
- `R2_BINARIES_BUCKET`
- `R2_BINARIES_PUBLIC_URL` (the public URL for your R2 bucket, e.g., custom domain or public R2 URL)
### R2 Bucket Structure
```
binaries/
manifest.json # {"latest": "0.0.135"}
v0.0.135/
manifest.json # Per-version manifest with checksums
linux-x64/
vibe-kanban.zip
vibe-kanban-mcp.zip
vibe-kanban-review.zip
...
```
* Done! I've updated the implementation to use full tags (with timestamps) instead of just version numbers. Here's a summary of what changed:
## Changes Made
1. **`npx-cli/bin/download.js`**:
- Added `BINARY_TAG` constant (placeholder `__BINARY_TAG__`)
- Changed `ensureBinary()` to use `BINARY_TAG` instead of accepting version as parameter
- Cache paths now use the tag: `~/.vibe-kanban/bin/{tag}/{platform}/`
2. **`npx-cli/bin/cli.js`**:
- Updated to import `BINARY_TAG` from download.js
- Cache directory now uses `BINARY_TAG` instead of `CLI_VERSION`
- Updated `ensureBinary()` call to not pass version
3. **`.github/workflows/pre-release.yml`**:
- `upload-to-r2` job now uses `new_tag` instead of `new_version` for R2 paths
- Binaries are stored at `binaries/{tag}/{platform}/{binary}.zip`
- Global manifest stores the full tag: `{"latest": "v0.0.135-20251215122030"}`
- `create-prerelease` job now injects both `__R2_PUBLIC_URL__` and `__BINARY_TAG__`
This allows multiple pre-releases to coexist in R2 (e.g., `v0.0.135-20251215122030` and `v0.0.135-20251215100000`), making rollbacks easy.
* chore: bump version to 0.0.136
---------
Co-authored-by: GitHub Action <action@github.com>
|
||
|
Louis Knight-Webb
|
e16602cc0f | Downgrade version | ||
|
Louis Knight-Webb
|
8a623ee924 |
Larger runner (#1552)
* Use a larger ubuntu runner * chore: bump version to 0.0.136 --------- Co-authored-by: Solomon <abcpro11051@disroot.org> Co-authored-by: GitHub Action <action@github.com> |
||
|
GitHub Action
|
5710cc3371 | chore: bump version to 0.0.135 |