feat: reuse existing Devin session for Cubic AI review feedback by keithwillcode · Pull Request #26632 · calcom/cal.com

keithwillcode · 2026-01-09T18:40:54Z

What does this PR do?

Modifies the Cubic AI to Devin review workflow to reuse the same Devin session across all feedback loops for a PR, instead of creating a new session for each Cubic AI review.

Previously, as seen in #26624, each Cubic AI review submission would create a brand new Devin session, resulting in multiple sessions for the same PR.

How it works now:

When Cubic AI submits a review, the workflow searches PR comments for an existing Devin session link
If a session link is found, it extracts the session ID and checks if the session is still active via the Devin API
If the session is active (status: working, blocked, or resumed), it sends a message to that session with the new feedback
If no session link is found or the session is no longer active, it creates a new session
The PR comment indicates whether a new session was created or feedback was sent to an existing session

Updates since last revision

Added error handling for the message send API call: The workflow now checks the HTTP status code when sending a message to an existing Devin session. If the API call fails (non-2xx response), the step fails with an informative error message, preventing a misleading comment from being posted.

Mandatory Tasks (DO NOT REMOVE)

I have self-reviewed the code (A decent size PR without self-review might be rejected).
I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. N/A - workflow only.
I confirm automated tests are in place that prove my fix is effective or that my feature works. N/A - GitHub Actions workflow, can be tested via manual trigger.

How should this be tested?

Setup required: Ensure DEVIN_API_KEY secret is configured in the repository
Test scenario 1 (new session): Trigger a Cubic AI review on a PR that has no existing Devin session - should create a new session
Test scenario 2 (existing session): Trigger another Cubic AI review on the same PR while the first session is still active - should send a message to the existing session instead of creating a new one
Test scenario 3 (expired session): Trigger a Cubic AI review on a PR where the previous session has finished - should create a new session
Test scenario 4 (message send failure): If the Devin API returns an error when sending a message, the workflow should fail and not post a misleading comment
Verify PR comments: Check that the comment text correctly indicates whether a new session was created or feedback was sent to an existing session

Human Review Checklist

Verify the session ID regex pattern (/app\.devin\.ai\/sessions\/([a-f0-9-]+)/) matches actual Devin session ID format
Verify the comment parsing correctly finds the most recent session (reverses comments and breaks on first match)
Verify the session status filtering (working, blocked, resumed) covers all active session states
~~Consider if error handling should be added for the message send step~~ - Implemented: now checks HTTP status code and fails on non-2xx responses

Link to Devin run: https://app.devin.ai/sessions/467d0a82e7cb4153bb5631816eddf818
Requested by: @keithwillcode

Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

devin-ai-integration · 2026-01-09T18:40:57Z

🤖 Devin AI Engineer

I'll be helping with this pull request! Here's what you should know:

✅ I will automatically:

Address comments on this PR that start with 'DevinAI' or '@devin'.
Look at CI failures and help fix them

Note: I can only respond to comments from users who have write access to this repository.

⚙️ Control Options:

Disable automatic comment and CI monitoring

.github/workflows/cubic-devin-review.yml

Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

vercel · 2026-01-09T18:46:10Z

The latest updates on your projects. Learn more about Vercel for GitHub.

4 Skipped Deployments

Project	Deployment	Review	Updated (UTC)
api-v2	Ignored	Preview	Jan 12, 2026 10:15pm
cal	Ignored		Jan 12, 2026 10:15pm
cal-companion	Ignored	Preview	Jan 12, 2026 10:15pm
cal-eu	Ignored		Jan 12, 2026 10:15pm

cubic-dev-ai

1 issue found across 1 file

Prompt for AI agents (all issues)


Check if these issues are valid — if so, understand the root cause of each and fix them.


<file name=".github/workflows/cubic-devin-review.yml">

<violation number="1" location=".github/workflows/cubic-devin-review.yml:128">
P2: Missing error handling for the message send API call. If the POST request fails, the workflow continues and posts a misleading comment claiming feedback was sent successfully. Consider checking the response status and failing the step if the message wasn't delivered.</violation>
</file>

_{Reply with feedback, questions, or to request a fix. Tag @cubic-dev-ai to re-run a review.}

.github/workflows/cubic-devin-review.yml

github-actions · 2026-01-09T18:53:15Z

Devin AI is addressing Cubic AI's review feedback

A Devin session has been created to address the issues identified by Cubic AI.

View Devin Session

…flow Addresses Cubic AI review feedback: The POST request to send a message to an existing Devin session now checks the HTTP status code and fails the step if the message wasn't delivered successfully. This prevents posting a misleading comment claiming feedback was sent when the API call actually failed. Co-Authored-By: unknown <>

* fix: skip stale run-ci label check on workflow re-runs (#26590) * fix: trust community PRs when maintainer pushes to the branch When a maintainer merges main into a community PR branch, the new SHA invalidates the run-ci label timing check because the label was added before the new push. This fix adds a check to trust the PR if the person who pushed the latest commit has write access. This handles the case where a maintainer: - Merges main into a community PR to resolve conflicts - Pushes any changes to help the contributor The security model is maintained because: - Only users with write access can trigger this trust - The maintainer has reviewed the code by pushing to it Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> * fix: skip stale label check on workflow re-runs Instead of implicitly trusting maintainer pushes (which could be just a sync action without code review), use github.run_attempt to detect re-runs. If run_attempt > 1, it means the workflow was explicitly re-triggered (via run-ci.yml or manual re-run), so we skip the stale label check. This avoids the need to remove and re-add the 'run-ci' label after syncing a community PR with main, while keeping the explicit approval flow intact. Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> * Simplify comment about re-runs in PR workflow --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Keith Williams <keithwillcode@gmail.com> * fix: Text cursor barely visible in calendar event name field (#26563) * fix: cursor visibility in input fields * fix: cursor visibility in input fields with suffix addons * fix: text cursor visibility in input fields --------- Co-authored-by: Keith Williams <keithwillcode@gmail.com> * fix: PayPal setup page inconsistent spacing and button styling (#26612) * chore: api v2 generate swagger only in dev (#26617) * feat: add BUILD_FROM_BRANCH option to release-docker workflow (#26615) * feat: add BUILD_FROM_BRANCH option to release-docker workflow Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: sanitize branch names with slashes for valid Docker tags Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * refactor: extract common logic into prepare job to avoid duplication Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * feat: add Cubic AI to Devin review integration workflow (#26618) * feat: add Cubic AI to Devin review integration workflow Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: update permissions to allow posting PR comments Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: remove sensitive API response logging from CI workflow Address Cubic AI review feedback: Remove the debug log that outputs the full Devin API response, which could expose sensitive session tokens or authentication data in CI logs. The session URL is still logged when successfully extracted. Co-Authored-By: unknown <> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * chore: enable/disable slots workers via env (#26621) * chore: enable/disable slots workers via env * fix: address Cubic AI review feedback - Fix incorrect JSDoc comment for getSerializableContext method - Remove debug console.log statement from slots controller - Fix port suffix condition to preserve original behavior Co-Authored-By: unknown <> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * chore: USE_POOL env var for api v2 prisma pooling * fix list numbering in Manual setup section of README (#26620) * Revert "chore: USE_POOL env var for api v2 prisma pooling" This reverts commit a970926. * feat: limit badges to 2 with hover/click popover in UserListTable (#26556) * feat: limit badges to 2 with hover tooltip in UserListTable Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: reuse LimitedBadges component with clickable popover for mobile Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: move LimitedBadges to components/ui with hover+click support Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: fix Biome lint issues in LimitedBadges and UserListTable - Refactor LimitedBadges to concrete component with BadgeItem type - Move exports to end of files to comply with useExportsLast rule - Add explicit types to callback parameters for useExplicitType rule - Convert nested ternary to if-else for filterType calculation - Remove unused imports (Row, Table types) - Update ResponseValueCell and UserListTable to use new LimitedBadges API Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * fix: add proper types for filterType and getFacetedUniqueValues - Add FilterType import from @calcom/types/data-table - Add FacetedValue import from @calcom/features/data-table - Type filterType as FilterType to allow reassignment to different ColumnFilterType values - Type getFacetedUniqueValues return as Map<FacetedValue, number> Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * add vertical gap * fix: address code review feedback for LimitedBadges - Add index to id for unique keys in ResponseValueCell.tsx - Restore orange variant for group options in UserListTable.tsx - Fix useMemo dependency array (add t, remove dispatch) - Fix import ordering with biome - Convert ternary operators to if-else statements for biome compliance Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: remove id from BadgeItem type, use label as key - Remove id field from BadgeItem type in LimitedBadges - Use label as React key instead of id - Remove unused rowId parameter from ResponseValueCell - Update all consumers to not pass id field Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: use index for key instead of label in LimitedBadges Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * Revert "refactor: use index for key instead of label in LimitedBadges" This reverts commit 1daaac4. --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * chore: add database-backed feature flag for sidebar tips section (#26516) * chore: remove tips section from sidebar Co-Authored-By: amit@cal.com <samit91848@gmail.com> * chore: add feature flag for sidebar tips section Co-Authored-By: amit@cal.com <samit91848@gmail.com> * chore: use database-backed feature flag for sidebar tips section Co-Authored-By: amit@cal.com <samit91848@gmail.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * feat: add automated stale PR completion workflow with Devin API (#26627) * feat: add stale PR completion workflow with Devin API Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> * feat: only trigger for community PRs (non-calcom org members) Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> * refactor: use author_association pattern from pr.yml for community check Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> * refactor: simplify workflow - use community label check and let Devin gather PR details Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * feat: add Devin PR conflict resolver workflow (#26624) * feat: add Devin PR conflict resolver workflow Adds a GitHub Actions workflow that automatically detects PRs with merge conflicts and spins up Devin sessions to resolve them. How it works: 1. Triggers on push to main branch (when main updates could cause conflicts) 2. Also supports manual trigger via workflow_dispatch 3. Lists all open PRs and checks their mergeable status 4. For PRs with conflicts (mergeable=false, mergeable_state=dirty): - Checks if a Devin session was already created (avoids duplicates) - Creates a new Devin session with instructions to resolve conflicts - Posts a comment on the PR with the Devin session link The workflow follows the same pattern as cubic-devin-review.yml for consistency. Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix: skip draft PRs in conflict detection workflow Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * refactor: use GitHub Search API to filter draft PRs at API level Instead of filtering draft PRs in the loop, use the GitHub Search API with 'draft:false' filter which is more efficient as it filters at the API level rather than fetching all PRs and filtering locally. Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * style: remove explanatory comments from workflow Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * style: remove all unnecessary explanatory comments Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * refactor: use GraphQL for batched PR fetching and labels for tracking Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * feat: add support for resolving conflicts on fork PRs Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix: check response.ok before parsing Devin API response Address Cubic AI review feedback: Add response.ok check before parsing the response body to explicitly handle HTTP error status codes from the Devin API. This distinguishes API failures (authentication errors, server errors) from successful responses that might be missing expected fields. Co-Authored-By: unknown <> * fix: improve Devin API error logging with PR number Co-Authored-By: unknown <> * feat: add pr_number input for manual fork PR conflict resolution Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * feat: add maximum 15 PRs safety net limit Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * feat: make stale PR workflow fork-aware with workflow_dispatch support (#26633) * feat: make stale PR workflow fork-aware with workflow_dispatch support Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix: add null check for pr.head.repo in stale PR workflow When a fork is deleted after a PR is created, pr.head.repo can be null (documented GitHub API behavior). This would cause a TypeError when accessing properties like fork, full_name, or clone_url. Added a null check that fails gracefully with a clear error message when the source repository has been deleted. Co-Authored-By: unknown <> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * feat: reuse existing Devin session for Cubic AI review feedback (#26632) * feat: reuse existing Devin session for Cubic AI review feedback Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * refactor: parse session ID from PR comments instead of API search Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix: add error handling for message send API call in Cubic-Devin workflow Addresses Cubic AI review feedback: The POST request to send a message to an existing Devin session now checks the HTTP status code and fails the step if the message wasn't delivered successfully. This prevents posting a misleading comment claiming feedback was sent when the API call actually failed. Co-Authored-By: unknown <> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * chore: Remove stale label when work is completed (#26638) * chore: Remove stale label when work is completed * Mark as ready for review too * feat: add retry mechanism for UNKNOWN mergeable status PRs (#26635) * feat: add retry mechanism for UNKNOWN mergeable status PRs Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix: remove redundant filtering logic for unknown mergeable status PRs Address Cubic AI review feedback by: - Having processPR return isTargetPR in the unknown case (like the conflict case) - Simplifying the main loop to just push PRs to unknownPRs without re-checking draft status and devin label (already checked in processPR) Co-Authored-By: unknown <> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * chore: Add sentry http integration (#26634) * chore: ignore fork PRs in devin-conflict-resolver workflow (#26640) Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * limits and advanced tabs * availability tab * basics tab * black toggles!! * new recurring, others tab and update basics * version 1 --------- Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Keith Williams <keithwillcode@gmail.com> Co-authored-by: Anshumancanrock <109489361+Anshumancanrock@users.noreply.github.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Co-authored-by: cal.com <morgan@cal.com> Co-authored-by: Anas Najam <129951478+anzz14@users.noreply.github.com> Co-authored-by: Eunjae Lee <hey@eunjae.dev> Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com> Co-authored-by: Volnei Munhoz <volnei@cal.com>

* feat: companion alert system for browser extension * feat: implement cross-platform alert system for browser extension - Add ToastContext.tsx with global toast provider for managing toast state - Add GlobalToast.tsx centered toast component for web/browser extension - Modify alerts.ts to be platform-aware (native Alert on iOS/Android, toast on web) - Add showInfoAlert function for informational alerts - Update _layout.tsx to wrap app with ToastProvider and GlobalToast - Export new toast context and alert functions from index files * style: update toast to white/black design system - Use white background with gray border - Use black icons and text colors - Match companion app design system * open the toast at the center * refactor: migrate event-types/index.tsx to unified alert system - Remove inline toast state (showToast, toastMessage) and showToastMessage function - Remove inline toast UI component at the end of the file - Migrate all platform-specific Alert.alert calls to showSuccessAlert/showErrorAlert - Simplifies code by using cross-platform alert utilities * refactor: migrate useBookingActions.ts to unified alert system - Add showSuccessAlert import alongside showErrorAlert - Migrate all Alert.alert('Success', ...) calls to showSuccessAlert - Affected handlers: handleSubmitReschedule, handleRescheduleWithValues, handleSubmitCancel, handleCancelBooking, handleConfirmBooking, handleRejectBooking, handleSubmitReject, handleInlineConfirm * refactor: migrate useBookingActionModals.ts to unified alert system - Add showSuccessAlert import alongside showErrorAlert - Migrate all Alert.alert('Success', ...) calls to showSuccessAlert - Affected handlers: handleAddGuests, handleUpdateLocation, handleMarkNoShow * refactor: migrate medium-priority screens to unified alert system - AvailabilityDetailScreen.ios.tsx: 4 Alert.alert calls migrated - RescheduleScreen.tsx/ios/android: 3 Alert.alert calls each migrated - EditLocationScreen.tsx/ios: 4 Alert.alert calls each migrated - Removed unused Alert imports * refactor: migrate remaining medium-priority screens to unified alert system - BookingDetailScreen.tsx: 2 Alert.alert calls migrated - AvailabilityListScreen.tsx: 1 Alert.alert call migrated - AddGuestsScreen.tsx: 6 Alert.alert calls migrated - MarkNoShowScreen.tsx: 2 Alert.alert calls migrated - EditAvailabilityOverrideScreen.tsx: 4 Alert.alert calls migrated - EditAvailabilityOverrideScreen.ios.tsx: 2 Alert.alert calls migrated - Removed unused Alert imports * refactor: migrate medium-priority app routes to unified alert system Migrated 24 app route files from direct Alert.alert() calls to unified alert utilities (showErrorAlert, showSuccessAlert, showInfoAlert): - reschedule.tsx, reschedule.ios.tsx - edit-location.tsx, edit-location.ios.tsx - add-guests.tsx, add-guests.ios.tsx - mark-no-show.tsx, mark-no-show.ios.tsx - view-recordings.tsx, view-recordings.ios.tsx - meeting-session-details.tsx, meeting-session-details.ios.tsx - profile-sheet.tsx, profile-sheet.ios.tsx - edit-availability-hours.tsx, edit-availability-hours.ios.tsx - edit-availability-day.tsx, edit-availability-day.ios.tsx - edit-availability-name.tsx, edit-availability-name.ios.tsx - edit-availability-override.tsx, edit-availability-override.ios.tsx - booking-detail.tsx, booking-detail.ios.tsx This enables cross-platform alert support where native Alert.alert() is used on iOS/Android and toast notifications on web (browser extension). * refactor: migrate lower-priority components to unified alert system Migrated Alert.alert calls to showSuccessAlert/showErrorAlert/showInfoAlert in: - event-types/index.ios.tsx (copy link, delete, duplicate success alerts) - event-type-detail.tsx (copy link, create/update success, validation errors, info alerts) - deep-links.ts (error alerts for link failures) - LogoutButton.tsx (error alert) - BookingModals.tsx and .ios.tsx (report booking info alerts) - AdvancedTab.tsx (info alert for unsaved event type) - BookingListScreen.tsx (success/error/info alerts for bulk actions) Confirmation dialogs with buttons remain as Alert.alert (out of scope). * fix: restore Alert import for confirmation dialogs, migrate remaining info alert - AdvancedTab.tsx: Added back Alert import for timezone selector confirmation dialog (out of scope), migrated private links info alert to showInfoAlert - deep-links.ts: Added back Alert import for request reschedule confirmation dialog (out of scope) * some ui dialoes were missing * fixed multi hours ui issues on Availability detail page for android and web * fix: add __DEV__ check for web platform in showErrorAlert The showErrorAlert function was showing error toasts to production users on web platform, bypassing the __DEV__ check that exists for native platforms. This fix ensures consistent behavior across all platforms - error alerts are only shown in development mode, while production errors are logged to console. Co-Authored-By: unknown <> * fix: address dual dialogs on web and onSuccess timing issues - BookingDetailScreen.tsx: Add Platform.OS === 'android' guard to AlertDialog to prevent dual dialogs rendering on web (FullScreenModal + AlertDialog) - RescheduleScreen.android.tsx: Restore original Alert.alert with callback to ensure onSuccess() is called after user dismisses the alert Co-Authored-By: unknown <> * fix: restore Alert.alert with callback for native platforms - AddGuestsScreen.tsx: Use platform-specific handling - Alert.alert with callback on iOS/Android, showSuccessAlert on web - EditAvailabilityOverrideScreen.tsx: Same pattern - wait for user acknowledgment on native platforms before calling onSuccess() Co-Authored-By: unknown <> * fix: RescheduleScreen timing and GlobalToast useState pattern - RescheduleScreen.tsx: Use platform-specific handling - Alert.alert with callback on iOS/Android, showSuccessAlert on web - GlobalToast.tsx: Replace useMemo with useState for Animated.Value to guarantee instance preservation across renders Co-Authored-By: unknown <> * fix: restore Alert.alert with callback for iOS delete success AvailabilityDetailScreen.ios.tsx: Use Alert.alert with callback to ensure router.back() is called after user dismisses the success alert Co-Authored-By: unknown <> * feat(companion): new event type detail page (#26678) * fix: skip stale run-ci label check on workflow re-runs (#26590) * fix: trust community PRs when maintainer pushes to the branch When a maintainer merges main into a community PR branch, the new SHA invalidates the run-ci label timing check because the label was added before the new push. This fix adds a check to trust the PR if the person who pushed the latest commit has write access. This handles the case where a maintainer: - Merges main into a community PR to resolve conflicts - Pushes any changes to help the contributor The security model is maintained because: - Only users with write access can trigger this trust - The maintainer has reviewed the code by pushing to it Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> * fix: skip stale label check on workflow re-runs Instead of implicitly trusting maintainer pushes (which could be just a sync action without code review), use github.run_attempt to detect re-runs. If run_attempt > 1, it means the workflow was explicitly re-triggered (via run-ci.yml or manual re-run), so we skip the stale label check. This avoids the need to remove and re-add the 'run-ci' label after syncing a community PR with main, while keeping the explicit approval flow intact. Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> * Simplify comment about re-runs in PR workflow --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Keith Williams <keithwillcode@gmail.com> * fix: Text cursor barely visible in calendar event name field (#26563) * fix: cursor visibility in input fields * fix: cursor visibility in input fields with suffix addons * fix: text cursor visibility in input fields --------- Co-authored-by: Keith Williams <keithwillcode@gmail.com> * fix: PayPal setup page inconsistent spacing and button styling (#26612) * chore: api v2 generate swagger only in dev (#26617) * feat: add BUILD_FROM_BRANCH option to release-docker workflow (#26615) * feat: add BUILD_FROM_BRANCH option to release-docker workflow Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: sanitize branch names with slashes for valid Docker tags Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * refactor: extract common logic into prepare job to avoid duplication Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * feat: add Cubic AI to Devin review integration workflow (#26618) * feat: add Cubic AI to Devin review integration workflow Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: update permissions to allow posting PR comments Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: remove sensitive API response logging from CI workflow Address Cubic AI review feedback: Remove the debug log that outputs the full Devin API response, which could expose sensitive session tokens or authentication data in CI logs. The session URL is still logged when successfully extracted. Co-Authored-By: unknown <> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * chore: enable/disable slots workers via env (#26621) * chore: enable/disable slots workers via env * fix: address Cubic AI review feedback - Fix incorrect JSDoc comment for getSerializableContext method - Remove debug console.log statement from slots controller - Fix port suffix condition to preserve original behavior Co-Authored-By: unknown <> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * chore: USE_POOL env var for api v2 prisma pooling * fix list numbering in Manual setup section of README (#26620) * Revert "chore: USE_POOL env var for api v2 prisma pooling" This reverts commit a970926. * feat: limit badges to 2 with hover/click popover in UserListTable (#26556) * feat: limit badges to 2 with hover tooltip in UserListTable Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: reuse LimitedBadges component with clickable popover for mobile Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: move LimitedBadges to components/ui with hover+click support Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: fix Biome lint issues in LimitedBadges and UserListTable - Refactor LimitedBadges to concrete component with BadgeItem type - Move exports to end of files to comply with useExportsLast rule - Add explicit types to callback parameters for useExplicitType rule - Convert nested ternary to if-else for filterType calculation - Remove unused imports (Row, Table types) - Update ResponseValueCell and UserListTable to use new LimitedBadges API Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * fix: add proper types for filterType and getFacetedUniqueValues - Add FilterType import from @calcom/types/data-table - Add FacetedValue import from @calcom/features/data-table - Type filterType as FilterType to allow reassignment to different ColumnFilterType values - Type getFacetedUniqueValues return as Map<FacetedValue, number> Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * add vertical gap * fix: address code review feedback for LimitedBadges - Add index to id for unique keys in ResponseValueCell.tsx - Restore orange variant for group options in UserListTable.tsx - Fix useMemo dependency array (add t, remove dispatch) - Fix import ordering with biome - Convert ternary operators to if-else statements for biome compliance Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: remove id from BadgeItem type, use label as key - Remove id field from BadgeItem type in LimitedBadges - Use label as React key instead of id - Remove unused rowId parameter from ResponseValueCell - Update all consumers to not pass id field Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: use index for key instead of label in LimitedBadges Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * Revert "refactor: use index for key instead of label in LimitedBadges" This reverts commit 1daaac4. --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * chore: add database-backed feature flag for sidebar tips section (#26516) * chore: remove tips section from sidebar Co-Authored-By: amit@cal.com <samit91848@gmail.com> * chore: add feature flag for sidebar tips section Co-Authored-By: amit@cal.com <samit91848@gmail.com> * chore: use database-backed feature flag for sidebar tips section Co-Authored-By: amit@cal.com <samit91848@gmail.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * feat: add automated stale PR completion workflow with Devin API (#26627) * feat: add stale PR completion workflow with Devin API Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> * feat: only trigger for community PRs (non-calcom org members) Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> * refactor: use author_association pattern from pr.yml for community check Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> * refactor: simplify workflow - use community label check and let Devin gather PR details Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * feat: add Devin PR conflict resolver workflow (#26624) * feat: add Devin PR conflict resolver workflow Adds a GitHub Actions workflow that automatically detects PRs with merge conflicts and spins up Devin sessions to resolve them. How it works: 1. Triggers on push to main branch (when main updates could cause conflicts) 2. Also supports manual trigger via workflow_dispatch 3. Lists all open PRs and checks their mergeable status 4. For PRs with conflicts (mergeable=false, mergeable_state=dirty): - Checks if a Devin session was already created (avoids duplicates) - Creates a new Devin session with instructions to resolve conflicts - Posts a comment on the PR with the Devin session link The workflow follows the same pattern as cubic-devin-review.yml for consistency. Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix: skip draft PRs in conflict detection workflow Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * refactor: use GitHub Search API to filter draft PRs at API level Instead of filtering draft PRs in the loop, use the GitHub Search API with 'draft:false' filter which is more efficient as it filters at the API level rather than fetching all PRs and filtering locally. Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * style: remove explanatory comments from workflow Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * style: remove all unnecessary explanatory comments Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * refactor: use GraphQL for batched PR fetching and labels for tracking Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * feat: add support for resolving conflicts on fork PRs Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix: check response.ok before parsing Devin API response Address Cubic AI review feedback: Add response.ok check before parsing the response body to explicitly handle HTTP error status codes from the Devin API. This distinguishes API failures (authentication errors, server errors) from successful responses that might be missing expected fields. Co-Authored-By: unknown <> * fix: improve Devin API error logging with PR number Co-Authored-By: unknown <> * feat: add pr_number input for manual fork PR conflict resolution Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * feat: add maximum 15 PRs safety net limit Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * feat: make stale PR workflow fork-aware with workflow_dispatch support (#26633) * feat: make stale PR workflow fork-aware with workflow_dispatch support Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix: add null check for pr.head.repo in stale PR workflow When a fork is deleted after a PR is created, pr.head.repo can be null (documented GitHub API behavior). This would cause a TypeError when accessing properties like fork, full_name, or clone_url. Added a null check that fails gracefully with a clear error message when the source repository has been deleted. Co-Authored-By: unknown <> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * feat: reuse existing Devin session for Cubic AI review feedback (#26632) * feat: reuse existing Devin session for Cubic AI review feedback Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * refactor: parse session ID from PR comments instead of API search Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix: add error handling for message send API call in Cubic-Devin workflow Addresses Cubic AI review feedback: The POST request to send a message to an existing Devin session now checks the HTTP status code and fails the step if the message wasn't delivered successfully. This prevents posting a misleading comment claiming feedback was sent when the API call actually failed. Co-Authored-By: unknown <> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * chore: Remove stale label when work is completed (#26638) * chore: Remove stale label when work is completed * Mark as ready for review too * feat: add retry mechanism for UNKNOWN mergeable status PRs (#26635) * feat: add retry mechanism for UNKNOWN mergeable status PRs Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix: remove redundant filtering logic for unknown mergeable status PRs Address Cubic AI review feedback by: - Having processPR return isTargetPR in the unknown case (like the conflict case) - Simplifying the main loop to just push PRs to unknownPRs without re-checking draft status and devin label (already checked in processPR) Co-Authored-By: unknown <> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * chore: Add sentry http integration (#26634) * chore: ignore fork PRs in devin-conflict-resolver workflow (#26640) Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * limits and advanced tabs * availability tab * basics tab * black toggles!! * new recurring, others tab and update basics * version 1 --------- Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Keith Williams <keithwillcode@gmail.com> Co-authored-by: Anshumancanrock <109489361+Anshumancanrock@users.noreply.github.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Co-authored-by: cal.com <morgan@cal.com> Co-authored-by: Anas Najam <129951478+anzz14@users.noreply.github.com> Co-authored-by: Eunjae Lee <hey@eunjae.dev> Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com> Co-authored-by: Volnei Munhoz <volnei@cal.com> * fix: address Cubic AI review feedback - Add HTTP error handling for Devin API session creation in cubic-devin-review.yml - Localize aria-label in LimitedBadges.tsx using t() function - Improve Docker tag sanitization in release-docker.yaml to handle all invalid characters - Avoid logging raw error objects and sensitive API response data in devin-conflict-resolver.yml - Fix selectedSchedule dependency array issue in event-type-detail.tsx using ref pattern Co-Authored-By: unknown <> * chore: add translation key for show_x_more_items aria-label Co-Authored-By: unknown <> * fix: reset schedule ref on id change and add i18n pluralization - Reset hasAutoSelectedScheduleRef when event type id changes to handle component reuse - Add proper i18next pluralization variants (_one/_other) for show_x_more_items Co-Authored-By: unknown <> * revert: remove i18n changes from LimitedBadges and common.json Per user request - i18n not needed in companion for now Co-Authored-By: unknown <> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Co-authored-by: Keith Williams <keithwillcode@gmail.com> Co-authored-by: Anshumancanrock <109489361+Anshumancanrock@users.noreply.github.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Co-authored-by: cal.com <morgan@cal.com> Co-authored-by: Anas Najam <129951478+anzz14@users.noreply.github.com> Co-authored-by: Eunjae Lee <hey@eunjae.dev> Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com> Co-authored-by: Volnei Munhoz <volnei@cal.com>

…om#26632) * feat: reuse existing Devin session for Cubic AI review feedback Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * refactor: parse session ID from PR comments instead of API search Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix: add error handling for message send API call in Cubic-Devin workflow Addresses Cubic AI review feedback: The POST request to send a message to an existing Devin session now checks the HTTP status code and fails the step if the message wasn't delivered successfully. This prevents posting a misleading comment claiming feedback was sent when the API call actually failed. Co-Authored-By: unknown <> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

* feat: companion alert system for browser extension * feat: implement cross-platform alert system for browser extension - Add ToastContext.tsx with global toast provider for managing toast state - Add GlobalToast.tsx centered toast component for web/browser extension - Modify alerts.ts to be platform-aware (native Alert on iOS/Android, toast on web) - Add showInfoAlert function for informational alerts - Update _layout.tsx to wrap app with ToastProvider and GlobalToast - Export new toast context and alert functions from index files * style: update toast to white/black design system - Use white background with gray border - Use black icons and text colors - Match companion app design system * open the toast at the center * refactor: migrate event-types/index.tsx to unified alert system - Remove inline toast state (showToast, toastMessage) and showToastMessage function - Remove inline toast UI component at the end of the file - Migrate all platform-specific Alert.alert calls to showSuccessAlert/showErrorAlert - Simplifies code by using cross-platform alert utilities * refactor: migrate useBookingActions.ts to unified alert system - Add showSuccessAlert import alongside showErrorAlert - Migrate all Alert.alert('Success', ...) calls to showSuccessAlert - Affected handlers: handleSubmitReschedule, handleRescheduleWithValues, handleSubmitCancel, handleCancelBooking, handleConfirmBooking, handleRejectBooking, handleSubmitReject, handleInlineConfirm * refactor: migrate useBookingActionModals.ts to unified alert system - Add showSuccessAlert import alongside showErrorAlert - Migrate all Alert.alert('Success', ...) calls to showSuccessAlert - Affected handlers: handleAddGuests, handleUpdateLocation, handleMarkNoShow * refactor: migrate medium-priority screens to unified alert system - AvailabilityDetailScreen.ios.tsx: 4 Alert.alert calls migrated - RescheduleScreen.tsx/ios/android: 3 Alert.alert calls each migrated - EditLocationScreen.tsx/ios: 4 Alert.alert calls each migrated - Removed unused Alert imports * refactor: migrate remaining medium-priority screens to unified alert system - BookingDetailScreen.tsx: 2 Alert.alert calls migrated - AvailabilityListScreen.tsx: 1 Alert.alert call migrated - AddGuestsScreen.tsx: 6 Alert.alert calls migrated - MarkNoShowScreen.tsx: 2 Alert.alert calls migrated - EditAvailabilityOverrideScreen.tsx: 4 Alert.alert calls migrated - EditAvailabilityOverrideScreen.ios.tsx: 2 Alert.alert calls migrated - Removed unused Alert imports * refactor: migrate medium-priority app routes to unified alert system Migrated 24 app route files from direct Alert.alert() calls to unified alert utilities (showErrorAlert, showSuccessAlert, showInfoAlert): - reschedule.tsx, reschedule.ios.tsx - edit-location.tsx, edit-location.ios.tsx - add-guests.tsx, add-guests.ios.tsx - mark-no-show.tsx, mark-no-show.ios.tsx - view-recordings.tsx, view-recordings.ios.tsx - meeting-session-details.tsx, meeting-session-details.ios.tsx - profile-sheet.tsx, profile-sheet.ios.tsx - edit-availability-hours.tsx, edit-availability-hours.ios.tsx - edit-availability-day.tsx, edit-availability-day.ios.tsx - edit-availability-name.tsx, edit-availability-name.ios.tsx - edit-availability-override.tsx, edit-availability-override.ios.tsx - booking-detail.tsx, booking-detail.ios.tsx This enables cross-platform alert support where native Alert.alert() is used on iOS/Android and toast notifications on web (browser extension). * refactor: migrate lower-priority components to unified alert system Migrated Alert.alert calls to showSuccessAlert/showErrorAlert/showInfoAlert in: - event-types/index.ios.tsx (copy link, delete, duplicate success alerts) - event-type-detail.tsx (copy link, create/update success, validation errors, info alerts) - deep-links.ts (error alerts for link failures) - LogoutButton.tsx (error alert) - BookingModals.tsx and .ios.tsx (report booking info alerts) - AdvancedTab.tsx (info alert for unsaved event type) - BookingListScreen.tsx (success/error/info alerts for bulk actions) Confirmation dialogs with buttons remain as Alert.alert (out of scope). * fix: restore Alert import for confirmation dialogs, migrate remaining info alert - AdvancedTab.tsx: Added back Alert import for timezone selector confirmation dialog (out of scope), migrated private links info alert to showInfoAlert - deep-links.ts: Added back Alert import for request reschedule confirmation dialog (out of scope) * some ui dialoes were missing * fixed multi hours ui issues on Availability detail page for android and web * fix: add __DEV__ check for web platform in showErrorAlert The showErrorAlert function was showing error toasts to production users on web platform, bypassing the __DEV__ check that exists for native platforms. This fix ensures consistent behavior across all platforms - error alerts are only shown in development mode, while production errors are logged to console. Co-Authored-By: unknown <> * fix: address dual dialogs on web and onSuccess timing issues - BookingDetailScreen.tsx: Add Platform.OS === 'android' guard to AlertDialog to prevent dual dialogs rendering on web (FullScreenModal + AlertDialog) - RescheduleScreen.android.tsx: Restore original Alert.alert with callback to ensure onSuccess() is called after user dismisses the alert Co-Authored-By: unknown <> * fix: restore Alert.alert with callback for native platforms - AddGuestsScreen.tsx: Use platform-specific handling - Alert.alert with callback on iOS/Android, showSuccessAlert on web - EditAvailabilityOverrideScreen.tsx: Same pattern - wait for user acknowledgment on native platforms before calling onSuccess() Co-Authored-By: unknown <> * fix: RescheduleScreen timing and GlobalToast useState pattern - RescheduleScreen.tsx: Use platform-specific handling - Alert.alert with callback on iOS/Android, showSuccessAlert on web - GlobalToast.tsx: Replace useMemo with useState for Animated.Value to guarantee instance preservation across renders Co-Authored-By: unknown <> * fix: restore Alert.alert with callback for iOS delete success AvailabilityDetailScreen.ios.tsx: Use Alert.alert with callback to ensure router.back() is called after user dismisses the success alert Co-Authored-By: unknown <> * feat(companion): new event type detail page (calcom#26678) * fix: skip stale run-ci label check on workflow re-runs (calcom#26590) * fix: trust community PRs when maintainer pushes to the branch When a maintainer merges main into a community PR branch, the new SHA invalidates the run-ci label timing check because the label was added before the new push. This fix adds a check to trust the PR if the person who pushed the latest commit has write access. This handles the case where a maintainer: - Merges main into a community PR to resolve conflicts - Pushes any changes to help the contributor The security model is maintained because: - Only users with write access can trigger this trust - The maintainer has reviewed the code by pushing to it Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> * fix: skip stale label check on workflow re-runs Instead of implicitly trusting maintainer pushes (which could be just a sync action without code review), use github.run_attempt to detect re-runs. If run_attempt > 1, it means the workflow was explicitly re-triggered (via run-ci.yml or manual re-run), so we skip the stale label check. This avoids the need to remove and re-add the 'run-ci' label after syncing a community PR with main, while keeping the explicit approval flow intact. Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> * Simplify comment about re-runs in PR workflow --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Keith Williams <keithwillcode@gmail.com> * fix: Text cursor barely visible in calendar event name field (calcom#26563) * fix: cursor visibility in input fields * fix: cursor visibility in input fields with suffix addons * fix: text cursor visibility in input fields --------- Co-authored-by: Keith Williams <keithwillcode@gmail.com> * fix: PayPal setup page inconsistent spacing and button styling (calcom#26612) * chore: api v2 generate swagger only in dev (calcom#26617) * feat: add BUILD_FROM_BRANCH option to release-docker workflow (calcom#26615) * feat: add BUILD_FROM_BRANCH option to release-docker workflow Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: sanitize branch names with slashes for valid Docker tags Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * refactor: extract common logic into prepare job to avoid duplication Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * feat: add Cubic AI to Devin review integration workflow (calcom#26618) * feat: add Cubic AI to Devin review integration workflow Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: update permissions to allow posting PR comments Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: remove sensitive API response logging from CI workflow Address Cubic AI review feedback: Remove the debug log that outputs the full Devin API response, which could expose sensitive session tokens or authentication data in CI logs. The session URL is still logged when successfully extracted. Co-Authored-By: unknown <> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * chore: enable/disable slots workers via env (calcom#26621) * chore: enable/disable slots workers via env * fix: address Cubic AI review feedback - Fix incorrect JSDoc comment for getSerializableContext method - Remove debug console.log statement from slots controller - Fix port suffix condition to preserve original behavior Co-Authored-By: unknown <> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * chore: USE_POOL env var for api v2 prisma pooling * fix list numbering in Manual setup section of README (calcom#26620) * Revert "chore: USE_POOL env var for api v2 prisma pooling" This reverts commit a970926. * feat: limit badges to 2 with hover/click popover in UserListTable (calcom#26556) * feat: limit badges to 2 with hover tooltip in UserListTable Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: reuse LimitedBadges component with clickable popover for mobile Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: move LimitedBadges to components/ui with hover+click support Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: fix Biome lint issues in LimitedBadges and UserListTable - Refactor LimitedBadges to concrete component with BadgeItem type - Move exports to end of files to comply with useExportsLast rule - Add explicit types to callback parameters for useExplicitType rule - Convert nested ternary to if-else for filterType calculation - Remove unused imports (Row, Table types) - Update ResponseValueCell and UserListTable to use new LimitedBadges API Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * fix: add proper types for filterType and getFacetedUniqueValues - Add FilterType import from @calcom/types/data-table - Add FacetedValue import from @calcom/features/data-table - Type filterType as FilterType to allow reassignment to different ColumnFilterType values - Type getFacetedUniqueValues return as Map<FacetedValue, number> Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * add vertical gap * fix: address code review feedback for LimitedBadges - Add index to id for unique keys in ResponseValueCell.tsx - Restore orange variant for group options in UserListTable.tsx - Fix useMemo dependency array (add t, remove dispatch) - Fix import ordering with biome - Convert ternary operators to if-else statements for biome compliance Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: remove id from BadgeItem type, use label as key - Remove id field from BadgeItem type in LimitedBadges - Use label as React key instead of id - Remove unused rowId parameter from ResponseValueCell - Update all consumers to not pass id field Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: use index for key instead of label in LimitedBadges Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * Revert "refactor: use index for key instead of label in LimitedBadges" This reverts commit 1daaac4. --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * chore: add database-backed feature flag for sidebar tips section (calcom#26516) * chore: remove tips section from sidebar Co-Authored-By: amit@cal.com <samit91848@gmail.com> * chore: add feature flag for sidebar tips section Co-Authored-By: amit@cal.com <samit91848@gmail.com> * chore: use database-backed feature flag for sidebar tips section Co-Authored-By: amit@cal.com <samit91848@gmail.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * feat: add automated stale PR completion workflow with Devin API (calcom#26627) * feat: add stale PR completion workflow with Devin API Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> * feat: only trigger for community PRs (non-calcom org members) Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> * refactor: use author_association pattern from pr.yml for community check Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> * refactor: simplify workflow - use community label check and let Devin gather PR details Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * feat: add Devin PR conflict resolver workflow (calcom#26624) * feat: add Devin PR conflict resolver workflow Adds a GitHub Actions workflow that automatically detects PRs with merge conflicts and spins up Devin sessions to resolve them. How it works: 1. Triggers on push to main branch (when main updates could cause conflicts) 2. Also supports manual trigger via workflow_dispatch 3. Lists all open PRs and checks their mergeable status 4. For PRs with conflicts (mergeable=false, mergeable_state=dirty): - Checks if a Devin session was already created (avoids duplicates) - Creates a new Devin session with instructions to resolve conflicts - Posts a comment on the PR with the Devin session link The workflow follows the same pattern as cubic-devin-review.yml for consistency. Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix: skip draft PRs in conflict detection workflow Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * refactor: use GitHub Search API to filter draft PRs at API level Instead of filtering draft PRs in the loop, use the GitHub Search API with 'draft:false' filter which is more efficient as it filters at the API level rather than fetching all PRs and filtering locally. Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * style: remove explanatory comments from workflow Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * style: remove all unnecessary explanatory comments Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * refactor: use GraphQL for batched PR fetching and labels for tracking Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * feat: add support for resolving conflicts on fork PRs Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix: check response.ok before parsing Devin API response Address Cubic AI review feedback: Add response.ok check before parsing the response body to explicitly handle HTTP error status codes from the Devin API. This distinguishes API failures (authentication errors, server errors) from successful responses that might be missing expected fields. Co-Authored-By: unknown <> * fix: improve Devin API error logging with PR number Co-Authored-By: unknown <> * feat: add pr_number input for manual fork PR conflict resolution Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * feat: add maximum 15 PRs safety net limit Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * feat: make stale PR workflow fork-aware with workflow_dispatch support (calcom#26633) * feat: make stale PR workflow fork-aware with workflow_dispatch support Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix: add null check for pr.head.repo in stale PR workflow When a fork is deleted after a PR is created, pr.head.repo can be null (documented GitHub API behavior). This would cause a TypeError when accessing properties like fork, full_name, or clone_url. Added a null check that fails gracefully with a clear error message when the source repository has been deleted. Co-Authored-By: unknown <> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * feat: reuse existing Devin session for Cubic AI review feedback (calcom#26632) * feat: reuse existing Devin session for Cubic AI review feedback Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * refactor: parse session ID from PR comments instead of API search Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix: add error handling for message send API call in Cubic-Devin workflow Addresses Cubic AI review feedback: The POST request to send a message to an existing Devin session now checks the HTTP status code and fails the step if the message wasn't delivered successfully. This prevents posting a misleading comment claiming feedback was sent when the API call actually failed. Co-Authored-By: unknown <> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * chore: Remove stale label when work is completed (calcom#26638) * chore: Remove stale label when work is completed * Mark as ready for review too * feat: add retry mechanism for UNKNOWN mergeable status PRs (calcom#26635) * feat: add retry mechanism for UNKNOWN mergeable status PRs Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix: remove redundant filtering logic for unknown mergeable status PRs Address Cubic AI review feedback by: - Having processPR return isTargetPR in the unknown case (like the conflict case) - Simplifying the main loop to just push PRs to unknownPRs without re-checking draft status and devin label (already checked in processPR) Co-Authored-By: unknown <> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * chore: Add sentry http integration (calcom#26634) * chore: ignore fork PRs in devin-conflict-resolver workflow (calcom#26640) Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * limits and advanced tabs * availability tab * basics tab * black toggles!! * new recurring, others tab and update basics * version 1 --------- Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Keith Williams <keithwillcode@gmail.com> Co-authored-by: Anshumancanrock <109489361+Anshumancanrock@users.noreply.github.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Co-authored-by: cal.com <morgan@cal.com> Co-authored-by: Anas Najam <129951478+anzz14@users.noreply.github.com> Co-authored-by: Eunjae Lee <hey@eunjae.dev> Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com> Co-authored-by: Volnei Munhoz <volnei@cal.com> * fix: address Cubic AI review feedback - Add HTTP error handling for Devin API session creation in cubic-devin-review.yml - Localize aria-label in LimitedBadges.tsx using t() function - Improve Docker tag sanitization in release-docker.yaml to handle all invalid characters - Avoid logging raw error objects and sensitive API response data in devin-conflict-resolver.yml - Fix selectedSchedule dependency array issue in event-type-detail.tsx using ref pattern Co-Authored-By: unknown <> * chore: add translation key for show_x_more_items aria-label Co-Authored-By: unknown <> * fix: reset schedule ref on id change and add i18n pluralization - Reset hasAutoSelectedScheduleRef when event type id changes to handle component reuse - Add proper i18next pluralization variants (_one/_other) for show_x_more_items Co-Authored-By: unknown <> * revert: remove i18n changes from LimitedBadges and common.json Per user request - i18n not needed in companion for now Co-Authored-By: unknown <> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Co-authored-by: Keith Williams <keithwillcode@gmail.com> Co-authored-by: Anshumancanrock <109489361+Anshumancanrock@users.noreply.github.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Co-authored-by: cal.com <morgan@cal.com> Co-authored-by: Anas Najam <129951478+anzz14@users.noreply.github.com> Co-authored-by: Eunjae Lee <hey@eunjae.dev> Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com> Co-authored-by: Volnei Munhoz <volnei@cal.com>

feat: reuse existing Devin session for Cubic AI review feedback

8d1d4b7

Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

pull-request-size bot added the size/M label Jan 9, 2026

keithwillcode self-assigned this Jan 9, 2026

keithwillcode added this to the v6.1 milestone Jan 9, 2026

keithwillcode commented Jan 9, 2026

View reviewed changes

.github/workflows/cubic-devin-review.yml Outdated Show resolved Hide resolved

devin-ai-integration bot reviewed Jan 9, 2026

View reviewed changes

.github/workflows/cubic-devin-review.yml Outdated Show resolved Hide resolved

refactor: parse session ID from PR comments instead of API search

fe0aa42

Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

keithwillcode marked this pull request as ready for review January 9, 2026 18:50

keithwillcode requested a review from a team as a code owner January 9, 2026 18:50

graphite-app bot added core area: core, team members only foundation labels Jan 9, 2026

cubic-dev-ai bot reviewed Jan 9, 2026

View reviewed changes

.github/workflows/cubic-devin-review.yml Outdated Show resolved Hide resolved

pull-request-size bot added size/L and removed size/M labels Jan 9, 2026

keithwillcode enabled auto-merge (squash) January 9, 2026 18:58

anikdhabal approved these changes Jan 9, 2026

View reviewed changes

volnei approved these changes Jan 9, 2026

View reviewed changes

graphite-app bot added the ready-for-e2e label Jan 9, 2026

keithwillcode merged commit d0e942b into main Jan 9, 2026
125 of 132 checks passed

keithwillcode deleted the devin/1767983937-cubic-devin-session-reuse branch January 9, 2026 19:41

vercel bot had a problem deploying to Preview – dev January 12, 2026 23:01 Failure

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: reuse existing Devin session for Cubic AI review feedback#26632

feat: reuse existing Devin session for Cubic AI review feedback#26632
keithwillcode merged 3 commits intomainfrom
devin/1767983937-cubic-devin-session-reuse

keithwillcode commented Jan 9, 2026 •

edited by devin-ai-integration bot

Loading

Uh oh!

devin-ai-integration bot commented Jan 9, 2026

Uh oh!

Uh oh!

Uh oh!

vercel bot commented Jan 9, 2026 •

edited

Loading

Uh oh!

cubic-dev-ai bot left a comment

Uh oh!

Uh oh!

github-actions bot commented Jan 9, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

keithwillcode commented Jan 9, 2026 • edited by devin-ai-integration bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Updates since last revision

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

Human Review Checklist

Uh oh!

devin-ai-integration bot commented Jan 9, 2026

🤖 Devin AI Engineer

Uh oh!

Uh oh!

Uh oh!

vercel bot commented Jan 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Jan 9, 2026

Devin AI is addressing Cubic AI's review feedback

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

keithwillcode commented Jan 9, 2026 •

edited by devin-ai-integration bot

Loading

vercel bot commented Jan 9, 2026 •

edited

Loading