refactor: Remove trpc/server dependency from @calcom/atoms by hbjORbj · Pull Request #26717 · calcom/cal.com

hbjORbj · 2026-01-11T10:53:58Z

What does this PR do?

Decouples the atoms package from trpc/server

Impact

Summary of Changes

Type Migrations:

Moved Slot type to @calcom/atoms/booker/types (removed from trpc/server)
Added GetAvailableSlotsResponse type with SlotInfo to booker/types.ts
Created local types in hooks/schedules/types.ts:
- Schedule (with userId for create/duplicate handlers)
- CreateScheduleHandlerReturn, DuplicateScheduleHandlerReturn, GetAvailabilityListHandlerReturn
- CreateScheduleInput

Import Updates:

Updated useAtomCreateSchedule, useAtomDuplicateSchedule, useAtomGetAllSchedules to use local types
Updated useAvailableSlots.ts to use local GetAvailableSlotsResponse

Config Changes:

Updated Biome rule to block ALL @calcom/trpc imports (not just @calcom/trpc/react)
Removed trpc paths from atoms tsconfig.json
Updated package.json exports

Updates since last revision

Fixed TypeScript operator precedence issue in GetAvailabilityListHandlerReturn type: wrapped intersection type in parentheses so [] creates an array of the intersection type rather than an intersection with an array type (addresses Cubic AI review feedback)

Mandatory Tasks (DO NOT REMOVE)

I have self-reviewed the code (A decent size PR without self-review might be rejected).
N/A - I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. If N/A, write N/A here and check the checkbox.
I confirm automated tests are in place that prove my fix is effective or that my feature works.

…pendency-from-atoms

cubic-dev-ai

No issues found across 10 files

- Create local types for schedule handlers (CreateScheduleHandlerReturn, DuplicateScheduleHandlerReturn, GetAvailabilityListHandlerReturn, CreateScheduleInput) - Create local GetAvailableSlotsResponse type for slots hook - Update imports in useAtomCreateSchedule, useAtomDuplicateSchedule, useAtomGetAllSchedules, and useAvailableSlots Co-Authored-By: benny@cal.com <sldisek783@gmail.com>

…pendency-from-atoms-2

…om-atoms-2' into refactor/move-trpc-dependency-from-atoms-2

hbjORbj · 2026-01-11T11:31:45Z

packages/platform/atoms/package.json

    },
    "./add-members-switch/AddMembersWithSwitchPlatformWrapper": "./add-members-switch/AddMembersWithSwitchPlatformWrapper.tsx",
    "./availability/AvailabilitySettings": "./availability/AvailabilitySettings.tsx",
-    "./booker": "./booker/index.ts",


index.ts file doesn't exist in /booker directory

- Schedule type now includes userId for create/duplicate handlers - Created ScheduleForList type for list handler (uses select without userId) Co-Authored-By: benny@cal.com <sldisek783@gmail.com>

…git-manager.devin.ai/proxy/github.com/calcom/cal.com into refactor/move-trpc-dependency-from-atoms-2

hbjORbj · 2026-01-11T19:13:39Z

packages/trpc/server/routers/viewer/slots/types.ts

    "Either slotUtcStartDate, slotUtcEndDate or eventTypeId should be filled in."
  );

-export type Slot = {


Moved to atoms/booker/types

…pendency-from-atoms-2

cubic-dev-ai

No issues found across 11 files

- fromUser: { id, displayName } (matches IFromUser) - toUser: { id, username, displayName } (matches IToUser) Co-Authored-By: benny@cal.com <sldisek783@gmail.com>

…git-manager.devin.ai/proxy/github.com/calcom/cal.com into refactor/move-trpc-dependency-from-atoms-2

github-actions · 2026-01-12T07:54:13Z

E2E results are ready!

Workflow #98422.1 latest results

cubic-dev-ai

1 issue found across 11 files

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="packages/platform/atoms/hooks/schedules/types.ts">

<violation number="1" location="packages/platform/atoms/hooks/schedules/types.ts:17">
P1: TypeScript operator precedence issue: `[]` binds tighter than `&`, so this creates an intersection of `Omit<Schedule, "userId">` with an array type, not an array of the intersection. Wrap the intersection in parentheses to get the intended array type.</violation>
</file>

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

packages/platform/atoms/hooks/schedules/types.ts

github-actions · 2026-01-12T08:01:48Z

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

…dlerReturn type Wrap intersection type in parentheses so that [] creates an array of the intersection type rather than an intersection with an array type. Addresses Cubic AI review feedback. Co-Authored-By: unknown <>

keithwillcode

Lovely!

) * mv useTeamMembersWithSegment * remove * fix ts error * remove * remove * remove * biome rule * wip * refactor: remove remaining @calcom/trpc/server imports from atoms - Create local types for schedule handlers (CreateScheduleHandlerReturn, DuplicateScheduleHandlerReturn, GetAvailabilityListHandlerReturn, CreateScheduleInput) - Create local GetAvailableSlotsResponse type for slots hook - Update imports in useAtomCreateSchedule, useAtomDuplicateSchedule, useAtomGetAllSchedules, and useAvailableSlots Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix * fix: add userId to Schedule type and create ScheduleForList type - Schedule type now includes userId for create/duplicate handlers - Created ScheduleForList type for list handler (uses select without userId) Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix * fix * fix * fix * fix: correct fromUser/toUser types in GetAvailableSlotsResponse - fromUser: { id, displayName } (matches IFromUser) - toUser: { id, username, displayName } (matches IToUser) Co-Authored-By: benny@cal.com <sldisek783@gmail.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

hbjORbj added 9 commits January 10, 2026 23:59

mv useTeamMembersWithSegment

5d7d4a3

remove

4d6ec0e

fix ts error

f3fe6a1

remove

9650398

remove

6aa695f

Merge remote-tracking branch 'origin/main' into refactor/move-trpc-de…

d3d7935

…pendency-from-atoms

remove

1d9c10d

biome rule

47f9518

wip

e5c524c

hbjORbj requested review from a team as code owners January 11, 2026 10:53

pull-request-size bot added the size/L label Jan 11, 2026

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

hbjORbj changed the title ~~refactor: move trpc dependency from atoms 2~~ refactor: Remove trpc/server dependency from @calcom/atoms Jan 11, 2026

hbjORbj marked this pull request as draft January 11, 2026 10:54

cubic-dev-ai bot reviewed Jan 11, 2026

View reviewed changes

devin-ai-integration bot and others added 4 commits January 11, 2026 11:07

Merge remote-tracking branch 'origin/main' into refactor/move-trpc-de…

cec974e

…pendency-from-atoms-2

Merge remote-tracking branch 'origin/refactor/move-trpc-dependency-fr…

e89867c

…om-atoms-2' into refactor/move-trpc-dependency-from-atoms-2

fix

2ac36ed

hbjORbj commented Jan 11, 2026

View reviewed changes

devin-ai-integration bot and others added 4 commits January 11, 2026 11:35

fix: add userId to Schedule type and create ScheduleForList type

18f35a2

- Schedule type now includes userId for create/duplicate handlers - Created ScheduleForList type for list handler (uses select without userId) Co-Authored-By: benny@cal.com <sldisek783@gmail.com>

Merge branch 'refactor/move-trpc-dependency-from-atoms-2' of https://…

140f868

…git-manager.devin.ai/proxy/github.com/calcom/cal.com into refactor/move-trpc-dependency-from-atoms-2

fix

8b206b3

fix

435f6a4

hbjORbj added the ready-for-e2e label Jan 11, 2026

hbjORbj commented Jan 11, 2026

View reviewed changes

hbjORbj added 2 commits January 12, 2026 04:17

fix

f0ba531

fix

66b6762

Merge remote-tracking branch 'origin/main' into refactor/move-trpc-de…

2ce6798

…pendency-from-atoms-2

hbjORbj requested a review from keithwillcode January 11, 2026 19:18

hbjORbj marked this pull request as ready for review January 11, 2026 19:18

hbjORbj enabled auto-merge (squash) January 11, 2026 19:19

hbjORbj removed the request for review from keithwillcode January 11, 2026 19:19

hbjORbj marked this pull request as draft January 11, 2026 19:19

auto-merge was automatically disabled January 11, 2026 19:19
Pull request was converted to draft

cubic-dev-ai bot reviewed Jan 11, 2026

View reviewed changes

devin-ai-integration bot and others added 2 commits January 12, 2026 07:44

fix: correct fromUser/toUser types in GetAvailableSlotsResponse

47255e1

- fromUser: { id, displayName } (matches IFromUser) - toUser: { id, username, displayName } (matches IToUser) Co-Authored-By: benny@cal.com <sldisek783@gmail.com>

Merge branch 'refactor/move-trpc-dependency-from-atoms-2' of https://…

1eaa663

…git-manager.devin.ai/proxy/github.com/calcom/cal.com into refactor/move-trpc-dependency-from-atoms-2

hbjORbj marked this pull request as ready for review January 12, 2026 07:57

hbjORbj requested a review from keithwillcode January 12, 2026 07:57

hbjORbj enabled auto-merge (squash) January 12, 2026 07:58

cubic-dev-ai bot reviewed Jan 12, 2026

View reviewed changes

packages/platform/atoms/hooks/schedules/types.ts Outdated Show resolved Hide resolved

keithwillcode approved these changes Jan 12, 2026

View reviewed changes

hbjORbj merged commit fc0a2b5 into main Jan 12, 2026
46 of 47 checks passed

hbjORbj deleted the refactor/move-trpc-dependency-from-atoms-2 branch January 12, 2026 10:06

vercel bot temporarily deployed to Preview – cal-companion January 13, 2026 08:36 Inactive

vercel bot temporarily deployed to Preview – dev January 13, 2026 08:36 Inactive

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: Remove trpc/server dependency from @calcom/atoms#26717

refactor: Remove trpc/server dependency from @calcom/atoms#26717
hbjORbj merged 23 commits intomainfrom
refactor/move-trpc-dependency-from-atoms-2

hbjORbj commented Jan 11, 2026 •

edited by devin-ai-integration bot

Loading

Uh oh!

cubic-dev-ai bot left a comment

Uh oh!

hbjORbj Jan 11, 2026

Uh oh!

hbjORbj Jan 11, 2026

Uh oh!

cubic-dev-ai bot left a comment

Uh oh!

github-actions bot commented Jan 12, 2026

Uh oh!

cubic-dev-ai bot left a comment

Uh oh!

Uh oh!

github-actions bot commented Jan 12, 2026

Uh oh!

keithwillcode left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

hbjORbj commented Jan 11, 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?

Impact

Summary of Changes

Updates since last revision

Mandatory Tasks (DO NOT REMOVE)

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

hbjORbj Jan 11, 2026

Choose a reason for hiding this comment

Uh oh!

hbjORbj Jan 11, 2026

Choose a reason for hiding this comment

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Jan 12, 2026

E2E results are ready!

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 12, 2026

Devin AI is addressing Cubic AI's review feedback

Uh oh!

keithwillcode left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

hbjORbj commented Jan 11, 2026 •

edited by devin-ai-integration bot

Loading