fix: restore @ts-expect-error for CacheProvider type mismatch (#30171)

* fix: restore @ts-expect-error for CacheProvider type mismatch

PR #30140 removed these comments assuming they were stale now that
the repo is on TypeScript 5. The comments were about the compiler
version, but the actual incompatibility is between react-inlinesvg/provider's
CacheProvider (typed to return a bare ReactNode) and this repo's pinned
@types/react@18.0.26, which requires JSX components to return Element | null.
ReactNode includes undefined, so the JSX usage fails type-checking.

Verified yarn build completes successfully with this restored.

Fixes #30170

* docs: explain the actual @ts-expect-error compatibility condition

Per @coderabbitai review on #30171: the old wording ("remove when
upgrading typescript to v5") was itself stale/misleading, since the
incompatibility is with the pinned @types/react version, not the
TypeScript compiler version. Documents the real condition instead.

.changeset/config.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://unpkg.com/@changesets/config@2.3.0/schema.json",
-  "changelog": ["@changesets/changelog-github", { "repo": "calcom/cal.com" }],
+  "changelog": ["@changesets/changelog-github", { "repo": "calcom/cal.diy" }],
   "commit": false,
   "fixed": [],
   "linked": [],

.claude/rules

@@ -0,0 +1 @@
+../agents/rules

.claude/settings.json

@@ -0,0 +1,5 @@
+{
+  "env": {
+    "CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS": "1"
+  }
+}

.claude/skills

@@ -0,0 +1 @@
+../agents/skills

.cursor/rules

@@ -0,0 +1 @@
+../agents/rules

.cursor/rules/review.mdc

@@ -1,36 +0,0 @@
-# Review Instructions
-
-## File Naming Conventions
-
-- **Repository Files**: Must include `Repository` suffix, prefix with technology if applicable (e.g., `PrismaAppRepository.ts`), use PascalCase matching exported class
-- **Service Files**: Must include `Service` suffix, use PascalCase matching exported class, avoid generic names (e.g., `MembershipService.ts`)
-- **New files**: Avoid dot-suffixes like `.service.ts` or `.repository.ts`; reserve `.test.ts`, `.spec.ts`, `.types.ts` for their specific purposes
-
-## Code Quality
-
-- Prefer early returns. It is recommended to throw/return early so we can ensure null-checks and prevent further nesting.
-- Prefer Composition over Prop Drilling. Instead of relying on prop drilling, let's try to take advantage of react children feature.
-- For Prisma queries:
-  - Only select data you need
-    1) Increased performance overhead: When you select all columns from a table, Prisma retrieves all the data associated with each row, which can result in a significant performance impact. This includes reading unnecessary columns and transferring a large volume of data between your application and the database.
-    2) Unnecessary data exposure: Selecting all columns exposes sensitive data that might not be required by your application. This can pose security risks, especially if the table contains sensitive user information or proprietary data. (In our case app credentials and booking information)
-  - TLDR: Never use Includes - use select
-  - Select selects only the fields you specify explicitly
-  - Include selects the relationship AND all the fields of the table the relationship belongs to
-  - Make sure the credential.key field is never returned back from tRPC endpoints or APIs
-- Always use t() for text localization in frontend code; direct text embedding should trigger a warning.
-- Check if there's any O(n^2) logic in backend code; we should aim for O(n log n) or O(n) ideally.
-- Check if there are circular references introduced. We should never allow these.
-- Flag excessive Day.js use in performance-critical code. Functions like `.add`, `.diff`, `.isBefore`, and `.isAfter` are slow, especially in timezone mode. Prefer `.utc()` for better performance. Where possible, replace with native Date and direct `.valueOf()` comparisons for faster execution. Recommend using native methods or Day.js `.utc()` consistently in hot paths like loops.
-- When docs changes are made in /docs/api-reference/v2/openapi.json, ensure the following
-  - "summary" fields are short and concise
-  - "summary" fields do not end with a period
-  - "summary" fields are written in proper American english
-- When changes to API v2 or v1 are made, ensure there are no breaking changes on existing endpoints. Instead, there needs to be a newly versioned endpoint with the updated functionality but the old one must remain functional
-- For large pull requests (>500 lines changed or >10 files touched), advise splitting into smaller, focused PRs:
-  - Split by feature boundaries: separate different features or user stories
-  - Split by layer/component: frontend changes, backend changes, database migrations, and tests in separate PRs
-  - Split by dependency chain: create PRs that can be merged sequentially
-  - Split by file/module: group related file changes together
-  - Suggested pattern: Database migrations → Backend logic → Frontend components → Integration tests
-  - Benefits: easier review, faster feedback, reduced conflicts, easier rollback, better history

.cursor/skills

@@ -0,0 +1 @@
+../agents/skills

.cursor/skills/vercel-react-best-practices/SKILL.md

@@ -1,125 +0,0 @@
----
-name: vercel-react-best-practices
-description: React and Next.js performance optimization guidelines from Vercel Engineering. This skill should be used when writing, reviewing, or refactoring React/Next.js code to ensure optimal performance patterns. Triggers on tasks involving React components, Next.js pages, data fetching, bundle optimization, or performance improvements.
-license: MIT
-metadata:
-  author: vercel
-  version: "1.0.0"
----
-
-# Vercel React Best Practices
-
-Comprehensive performance optimization guide for React and Next.js applications, maintained by Vercel. Contains 45 rules across 8 categories, prioritized by impact to guide automated refactoring and code generation.
-
-## When to Apply
-
-Reference these guidelines when:
-- Writing new React components or Next.js pages
-- Implementing data fetching (client or server-side)
-- Reviewing code for performance issues
-- Refactoring existing React/Next.js code
-- Optimizing bundle size or load times
-
-## Rule Categories by Priority
-
-| Priority | Category | Impact | Prefix |
-|----------|----------|--------|--------|
-| 1 | Eliminating Waterfalls | CRITICAL | `async-` |
-| 2 | Bundle Size Optimization | CRITICAL | `bundle-` |
-| 3 | Server-Side Performance | HIGH | `server-` |
-| 4 | Client-Side Data Fetching | MEDIUM-HIGH | `client-` |
-| 5 | Re-render Optimization | MEDIUM | `rerender-` |
-| 6 | Rendering Performance | MEDIUM | `rendering-` |
-| 7 | JavaScript Performance | LOW-MEDIUM | `js-` |
-| 8 | Advanced Patterns | LOW | `advanced-` |
-
-## Quick Reference
-
-### 1. Eliminating Waterfalls (CRITICAL)
-
-- `async-defer-await` - Move await into branches where actually used
-- `async-parallel` - Use Promise.all() for independent operations
-- `async-dependencies` - Use better-all for partial dependencies
-- `async-api-routes` - Start promises early, await late in API routes
-- `async-suspense-boundaries` - Use Suspense to stream content
-
-### 2. Bundle Size Optimization (CRITICAL)
-
-- `bundle-barrel-imports` - Import directly, avoid barrel files
-- `bundle-dynamic-imports` - Use next/dynamic for heavy components
-- `bundle-defer-third-party` - Load analytics/logging after hydration
-- `bundle-conditional` - Load modules only when feature is activated
-- `bundle-preload` - Preload on hover/focus for perceived speed
-
-### 3. Server-Side Performance (HIGH)
-
-- `server-cache-react` - Use React.cache() for per-request deduplication
-- `server-cache-lru` - Use LRU cache for cross-request caching
-- `server-serialization` - Minimize data passed to client components
-- `server-parallel-fetching` - Restructure components to parallelize fetches
-- `server-after-nonblocking` - Use after() for non-blocking operations
-
-### 4. Client-Side Data Fetching (MEDIUM-HIGH)
-
-- `client-swr-dedup` - Use SWR for automatic request deduplication
-- `client-event-listeners` - Deduplicate global event listeners
-
-### 5. Re-render Optimization (MEDIUM)
-
-- `rerender-defer-reads` - Don't subscribe to state only used in callbacks
-- `rerender-memo` - Extract expensive work into memoized components
-- `rerender-dependencies` - Use primitive dependencies in effects
-- `rerender-derived-state` - Subscribe to derived booleans, not raw values
-- `rerender-functional-setstate` - Use functional setState for stable callbacks
-- `rerender-lazy-state-init` - Pass function to useState for expensive values
-- `rerender-transitions` - Use startTransition for non-urgent updates
-
-### 6. Rendering Performance (MEDIUM)
-
-- `rendering-animate-svg-wrapper` - Animate div wrapper, not SVG element
-- `rendering-content-visibility` - Use content-visibility for long lists
-- `rendering-hoist-jsx` - Extract static JSX outside components
-- `rendering-svg-precision` - Reduce SVG coordinate precision
-- `rendering-hydration-no-flicker` - Use inline script for client-only data
-- `rendering-activity` - Use Activity component for show/hide
-- `rendering-conditional-render` - Use ternary, not && for conditionals
-
-### 7. JavaScript Performance (LOW-MEDIUM)
-
-- `js-batch-dom-css` - Group CSS changes via classes or cssText
-- `js-index-maps` - Build Map for repeated lookups
-- `js-cache-property-access` - Cache object properties in loops
-- `js-cache-function-results` - Cache function results in module-level Map
-- `js-cache-storage` - Cache localStorage/sessionStorage reads
-- `js-combine-iterations` - Combine multiple filter/map into one loop
-- `js-length-check-first` - Check array length before expensive comparison
-- `js-early-exit` - Return early from functions
-- `js-hoist-regexp` - Hoist RegExp creation outside loops
-- `js-min-max-loop` - Use loop for min/max instead of sort
-- `js-set-map-lookups` - Use Set/Map for O(1) lookups
-- `js-tosorted-immutable` - Use toSorted() for immutability
-
-### 8. Advanced Patterns (LOW)
-
-- `advanced-event-handler-refs` - Store event handlers in refs
-- `advanced-use-latest` - useLatest for stable callback refs
-
-## How to Use
-
-Read individual rule files for detailed explanations and code examples:
-
-```
-rules/async-parallel.md
-rules/bundle-barrel-imports.md
-rules/_sections.md
-```
-
-Each rule file contains:
-- Brief explanation of why it matters
-- Incorrect code example with explanation
-- Correct code example with explanation
-- Additional context and references
-
-## Full Compiled Document
-
-For the complete guide with all rules expanded: `AGENTS.md`

.cursor/skills/vercel-react-best-practices/rules/advanced-event-handler-refs.md

@@ -1,55 +0,0 @@
----
-title: Store Event Handlers in Refs
-impact: LOW
-impactDescription: stable subscriptions
-tags: advanced, hooks, refs, event-handlers, optimization
----
-
-## Store Event Handlers in Refs
-
-Store callbacks in refs when used in effects that shouldn't re-subscribe on callback changes.
-
-**Incorrect (re-subscribes on every render):**
-
-```tsx
-function useWindowEvent(event: string, handler: (e: Event) => void) {
-  useEffect(() => {
-    window.addEventListener(event, handler)
-    return () => window.removeEventListener(event, handler)
-  }, [event, handler])
-}
-```
-
-**Correct (stable subscription):**
-
-```tsx
-function useWindowEvent(event: string, handler: (e: Event) => void) {
-  const handlerRef = useRef(handler)
-  useEffect(() => {
-    handlerRef.current = handler
-  }, [handler])
-
-  useEffect(() => {
-    const listener = (e: Event) => handlerRef.current(e)
-    window.addEventListener(event, listener)
-    return () => window.removeEventListener(event, listener)
-  }, [event])
-}
-```
-
-**Alternative: use `useEffectEvent` if you're on latest React:**
-
-```tsx
-import { useEffectEvent } from 'react'
-
-function useWindowEvent(event: string, handler: () => void) {
-  const onEvent = useEffectEvent(handler)
-
-  useEffect(() => {
-    window.addEventListener(event, onEvent)
-    return () => window.removeEventListener(event, onEvent)
-  }, [event])
-}
-```
-
-`useEffectEvent` provides a cleaner API for the same pattern: it creates a stable function reference that always calls the latest version of the handler.

.cursor/skills/vercel-react-best-practices/rules/advanced-use-latest.md

@@ -1,49 +0,0 @@
----
-title: useLatest for Stable Callback Refs
-impact: LOW
-impactDescription: prevents effect re-runs
-tags: advanced, hooks, useLatest, refs, optimization
----
-
-## useLatest for Stable Callback Refs
-
-Access latest values in callbacks without adding them to dependency arrays. Prevents effect re-runs while avoiding stale closures.
-
-**Implementation:**
-
-```typescript
-function useLatest<T>(value: T) {
-  const ref = useRef(value)
-  useEffect(() => {
-    ref.current = value
-  }, [value])
-  return ref
-}
-```
-
-**Incorrect (effect re-runs on every callback change):**
-
-```tsx
-function SearchInput({ onSearch }: { onSearch: (q: string) => void }) {
-  const [query, setQuery] = useState('')
-
-  useEffect(() => {
-    const timeout = setTimeout(() => onSearch(query), 300)
-    return () => clearTimeout(timeout)
-  }, [query, onSearch])
-}
-```
-
-**Correct (stable effect, fresh callback):**
-
-```tsx
-function SearchInput({ onSearch }: { onSearch: (q: string) => void }) {
-  const [query, setQuery] = useState('')
-  const onSearchRef = useLatest(onSearch)
-
-  useEffect(() => {
-    const timeout = setTimeout(() => onSearchRef.current(query), 300)
-    return () => clearTimeout(timeout)
-  }, [query])
-}
-```

.cursor/skills/vercel-react-best-practices/rules/async-api-routes.md

@@ -1,38 +0,0 @@
----
-title: Prevent Waterfall Chains in API Routes
-impact: CRITICAL
-impactDescription: 2-10× improvement
-tags: api-routes, server-actions, waterfalls, parallelization
----
-
-## Prevent Waterfall Chains in API Routes
-
-In API routes and Server Actions, start independent operations immediately, even if you don't await them yet.
-
-**Incorrect (config waits for auth, data waits for both):**
-
-```typescript
-export async function GET(request: Request) {
-  const session = await auth()
-  const config = await fetchConfig()
-  const data = await fetchData(session.user.id)
-  return Response.json({ data, config })
-}
-```
-
-**Correct (auth and config start immediately):**
-
-```typescript
-export async function GET(request: Request) {
-  const sessionPromise = auth()
-  const configPromise = fetchConfig()
-  const session = await sessionPromise
-  const [config, data] = await Promise.all([
-    configPromise,
-    fetchData(session.user.id)
-  ])
-  return Response.json({ data, config })
-}
-```
-
-For operations with more complex dependency chains, use `better-all` to automatically maximize parallelism (see Dependency-Based Parallelization).

.cursor/skills/vercel-react-best-practices/rules/async-defer-await.md

@@ -1,80 +0,0 @@
----
-title: Defer Await Until Needed
-impact: HIGH
-impactDescription: avoids blocking unused code paths
-tags: async, await, conditional, optimization
----
-
-## Defer Await Until Needed
-
-Move `await` operations into the branches where they're actually used to avoid blocking code paths that don't need them.
-
-**Incorrect (blocks both branches):**
-
-```typescript
-async function handleRequest(userId: string, skipProcessing: boolean) {
-  const userData = await fetchUserData(userId)
-  
-  if (skipProcessing) {
-    // Returns immediately but still waited for userData
-    return { skipped: true }
-  }
-  
-  // Only this branch uses userData
-  return processUserData(userData)
-}
-```
-
-**Correct (only blocks when needed):**
-
-```typescript
-async function handleRequest(userId: string, skipProcessing: boolean) {
-  if (skipProcessing) {
-    // Returns immediately without waiting
-    return { skipped: true }
-  }
-  
-  // Fetch only when needed
-  const userData = await fetchUserData(userId)
-  return processUserData(userData)
-}
-```
-
-**Another example (early return optimization):**
-
-```typescript
-// Incorrect: always fetches permissions
-async function updateResource(resourceId: string, userId: string) {
-  const permissions = await fetchPermissions(userId)
-  const resource = await getResource(resourceId)
-  
-  if (!resource) {
-    return { error: 'Not found' }
-  }
-  
-  if (!permissions.canEdit) {
-    return { error: 'Forbidden' }
-  }
-  
-  return await updateResourceData(resource, permissions)
-}
-
-// Correct: fetches only when needed
-async function updateResource(resourceId: string, userId: string) {
-  const resource = await getResource(resourceId)
-  
-  if (!resource) {
-    return { error: 'Not found' }
-  }
-  
-  const permissions = await fetchPermissions(userId)
-  
-  if (!permissions.canEdit) {
-    return { error: 'Forbidden' }
-  }
-  
-  return await updateResourceData(resource, permissions)
-}
-```
-
-This optimization is especially valuable when the skipped branch is frequently taken, or when the deferred operation is expensive.

.cursor/skills/vercel-react-best-practices/rules/async-dependencies.md

@@ -1,36 +0,0 @@
----
-title: Dependency-Based Parallelization
-impact: CRITICAL
-impactDescription: 2-10× improvement
-tags: async, parallelization, dependencies, better-all
----
-
-## Dependency-Based Parallelization
-
-For operations with partial dependencies, use `better-all` to maximize parallelism. It automatically starts each task at the earliest possible moment.
-
-**Incorrect (profile waits for config unnecessarily):**
-
-```typescript
-const [user, config] = await Promise.all([
-  fetchUser(),
-  fetchConfig()
-])
-const profile = await fetchProfile(user.id)
-```
-
-**Correct (config and profile run in parallel):**
-
-```typescript
-import { all } from 'better-all'
-
-const { user, config, profile } = await all({
-  async user() { return fetchUser() },
-  async config() { return fetchConfig() },
-  async profile() {
-    return fetchProfile((await this.$.user).id)
-  }
-})
-```
-
-Reference: [https://github.com/shuding/better-all](https://github.com/shuding/better-all)

.cursor/skills/vercel-react-best-practices/rules/async-parallel.md

@@ -1,28 +0,0 @@
----
-title: Promise.all() for Independent Operations
-impact: CRITICAL
-impactDescription: 2-10× improvement
-tags: async, parallelization, promises, waterfalls
----
-
-## Promise.all() for Independent Operations
-
-When async operations have no interdependencies, execute them concurrently using `Promise.all()`.
-
-**Incorrect (sequential execution, 3 round trips):**
-
-```typescript
-const user = await fetchUser()
-const posts = await fetchPosts()
-const comments = await fetchComments()
-```
-
-**Correct (parallel execution, 1 round trip):**
-
-```typescript
-const [user, posts, comments] = await Promise.all([
-  fetchUser(),
-  fetchPosts(),
-  fetchComments()
-])
-```

.cursor/skills/vercel-react-best-practices/rules/async-suspense-boundaries.md

@@ -1,99 +0,0 @@
----
-title: Strategic Suspense Boundaries
-impact: HIGH
-impactDescription: faster initial paint
-tags: async, suspense, streaming, layout-shift
----
-
-## Strategic Suspense Boundaries
-
-Instead of awaiting data in async components before returning JSX, use Suspense boundaries to show the wrapper UI faster while data loads.
-
-**Incorrect (wrapper blocked by data fetching):**
-
-```tsx
-async function Page() {
-  const data = await fetchData() // Blocks entire page
-  
-  return (
-    <div>
-      <div>Sidebar</div>
-      <div>Header</div>
-      <div>
-        <DataDisplay data={data} />
-      </div>
-      <div>Footer</div>
-    </div>
-  )
-}
-```
-
-The entire layout waits for data even though only the middle section needs it.
-
-**Correct (wrapper shows immediately, data streams in):**
-
-```tsx
-function Page() {
-  return (
-    <div>
-      <div>Sidebar</div>
-      <div>Header</div>
-      <div>
-        <Suspense fallback={<Skeleton />}>
-          <DataDisplay />
-        </Suspense>
-      </div>
-      <div>Footer</div>
-    </div>
-  )
-}
-
-async function DataDisplay() {
-  const data = await fetchData() // Only blocks this component
-  return <div>{data.content}</div>
-}
-```
-
-Sidebar, Header, and Footer render immediately. Only DataDisplay waits for data.
-
-**Alternative (share promise across components):**
-
-```tsx
-function Page() {
-  // Start fetch immediately, but don't await
-  const dataPromise = fetchData()
-  
-  return (
-    <div>
-      <div>Sidebar</div>
-      <div>Header</div>
-      <Suspense fallback={<Skeleton />}>
-        <DataDisplay dataPromise={dataPromise} />
-        <DataSummary dataPromise={dataPromise} />
-      </Suspense>
-      <div>Footer</div>
-    </div>
-  )
-}
-
-function DataDisplay({ dataPromise }: { dataPromise: Promise<Data> }) {
-  const data = use(dataPromise) // Unwraps the promise
-  return <div>{data.content}</div>
-}
-
-function DataSummary({ dataPromise }: { dataPromise: Promise<Data> }) {
-  const data = use(dataPromise) // Reuses the same promise
-  return <div>{data.summary}</div>
-}
-```
-
-Both components share the same promise, so only one fetch occurs. Layout renders immediately while both components wait together.
-
-**When NOT to use this pattern:**
-
-- Critical data needed for layout decisions (affects positioning)
-- SEO-critical content above the fold
-- Small, fast queries where suspense overhead isn't worth it
-- When you want to avoid layout shift (loading → content jump)
-
-**Trade-off:** Faster initial paint vs potential layout shift. Choose based on your UX priorities.

.cursor/skills/vercel-react-best-practices/rules/bundle-barrel-imports.md

@@ -1,59 +0,0 @@
----
-title: Avoid Barrel File Imports
-impact: CRITICAL
-impactDescription: 200-800ms import cost, slow builds
-tags: bundle, imports, tree-shaking, barrel-files, performance
----
-
-## Avoid Barrel File Imports
-
-Import directly from source files instead of barrel files to avoid loading thousands of unused modules. **Barrel files** are entry points that re-export multiple modules (e.g., `index.js` that does `export * from './module'`).
-
-Popular icon and component libraries can have **up to 10,000 re-exports** in their entry file. For many React packages, **it takes 200-800ms just to import them**, affecting both development speed and production cold starts.
-
-**Why tree-shaking doesn't help:** When a library is marked as external (not bundled), the bundler can't optimize it. If you bundle it to enable tree-shaking, builds become substantially slower analyzing the entire module graph.
-
-**Incorrect (imports entire library):**
-
-```tsx
-import { Check, X, Menu } from 'lucide-react'
-// Loads 1,583 modules, takes ~2.8s extra in dev
-// Runtime cost: 200-800ms on every cold start
-
-import { Button, TextField } from '@mui/material'
-// Loads 2,225 modules, takes ~4.2s extra in dev
-```
-
-**Correct (imports only what you need):**
-
-```tsx
-import Check from 'lucide-react/dist/esm/icons/check'
-import X from 'lucide-react/dist/esm/icons/x'
-import Menu from 'lucide-react/dist/esm/icons/menu'
-// Loads only 3 modules (~2KB vs ~1MB)
-
-import Button from '@mui/material/Button'
-import TextField from '@mui/material/TextField'
-// Loads only what you use
-```
-
-**Alternative (Next.js 13.5+):**
-
-```js
-// next.config.js - use optimizePackageImports
-module.exports = {
-  experimental: {
-    optimizePackageImports: ['lucide-react', '@mui/material']
-  }
-}
-
-// Then you can keep the ergonomic barrel imports:
-import { Check, X, Menu } from 'lucide-react'
-// Automatically transformed to direct imports at build time
-```
-
-Direct imports provide 15-70% faster dev boot, 28% faster builds, 40% faster cold starts, and significantly faster HMR.
-
-Libraries commonly affected: `lucide-react`, `@mui/material`, `@mui/icons-material`, `@tabler/icons-react`, `react-icons`, `@headlessui/react`, `@radix-ui/react-*`, `lodash`, `ramda`, `date-fns`, `rxjs`, `react-use`.
-
-Reference: [How we optimized package imports in Next.js](https://vercel.com/blog/how-we-optimized-package-imports-in-next-js)

.cursor/skills/vercel-react-best-practices/rules/bundle-conditional.md

@@ -1,33 +0,0 @@
----
-title: Conditional Module Loading
-impact: HIGH
-impactDescription: loads large data only when needed
-tags: bundle, conditional-loading, lazy-loading
----
-
-## Conditional Module Loading
-
-Load large data or modules only when a feature is activated.
-
-**Example (lazy-load animation frames):**
-
-```tsx
-function AnimationPlayer({ enabled }: { enabled: boolean }) {
-  const [frames, setFrames] = useState<Frame[] | null>(null)
-  const [loadError, setLoadError] = useState(false)
-
-  useEffect(() => {
-    if (enabled && !frames && !loadError && typeof window !== 'undefined') {
-      import('./animation-frames.js')
-        .then(mod => setFrames(mod.frames))
-        .catch(() => setLoadError(true))
-    }
-  }, [enabled, frames, loadError])
-
-  if (loadError) return <ErrorMessage />
-  if (!frames) return <Skeleton />
-  return <Canvas frames={frames} />
-}
-```
-
-The `typeof window !== 'undefined'` check prevents bundling this module for SSR, optimizing server bundle size and build speed.

.cursor/skills/vercel-react-best-practices/rules/bundle-defer-third-party.md

@@ -1,49 +0,0 @@
----
-title: Defer Non-Critical Third-Party Libraries
-impact: MEDIUM
-impactDescription: loads after hydration
-tags: bundle, third-party, analytics, defer
----
-
-## Defer Non-Critical Third-Party Libraries
-
-Analytics, logging, and error tracking don't block user interaction. Load them after hydration.
-
-**Incorrect (blocks initial bundle):**
-
-```tsx
-import { Analytics } from '@vercel/analytics/react'
-
-export default function RootLayout({ children }) {
-  return (
-    <html>
-      <body>
-        {children}
-        <Analytics />
-      </body>
-    </html>
-  )
-}
-```
-
-**Correct (loads after hydration):**
-
-```tsx
-import dynamic from 'next/dynamic'
-
-const Analytics = dynamic(
-  () => import('@vercel/analytics/react').then(m => m.Analytics),
-  { ssr: false }
-)
-
-export default function RootLayout({ children }) {
-  return (
-    <html>
-      <body>
-        {children}
-        <Analytics />
-      </body>
-    </html>
-  )
-}
-```

.cursor/skills/vercel-react-best-practices/rules/bundle-dynamic-imports.md

@@ -1,35 +0,0 @@
----
-title: Dynamic Imports for Heavy Components
-impact: CRITICAL
-impactDescription: directly affects TTI and LCP
-tags: bundle, dynamic-import, code-splitting, next-dynamic
----
-
-## Dynamic Imports for Heavy Components
-
-Use `next/dynamic` to lazy-load large components not needed on initial render.
-
-**Incorrect (Monaco bundles with main chunk ~300KB):**
-
-```tsx
-import { MonacoEditor } from './monaco-editor'
-
-function CodePanel({ code }: { code: string }) {
-  return <MonacoEditor value={code} />
-}
-```
-
-**Correct (Monaco loads on demand):**
-
-```tsx
-import dynamic from 'next/dynamic'
-
-const MonacoEditor = dynamic(
-  () => import('./monaco-editor').then(m => m.MonacoEditor),
-  { ssr: false }
-)
-
-function CodePanel({ code }: { code: string }) {
-  return <MonacoEditor value={code} />
-}
-```

.cursor/skills/vercel-react-best-practices/rules/bundle-preload.md

@@ -1,50 +0,0 @@
----
-title: Preload Based on User Intent
-impact: MEDIUM
-impactDescription: reduces perceived latency
-tags: bundle, preload, user-intent, hover
----
-
-## Preload Based on User Intent
-
-Preload heavy bundles before they're needed to reduce perceived latency.
-
-**Example (preload on hover/focus):**
-
-```tsx
-function EditorButton({ onClick }: { onClick: () => void }) {
-  const preload = () => {
-    if (typeof window !== 'undefined') {
-      void import('./monaco-editor')
-    }
-  }
-
-  return (
-    <button
-      onMouseEnter={preload}
-      onFocus={preload}
-      onClick={onClick}
-    >
-      Open Editor
-    </button>
-  )
-}
-```
-
-**Example (preload when feature flag is enabled):**
-
-```tsx
-function FlagsProvider({ children, flags }: Props) {
-  useEffect(() => {
-    if (flags.editorEnabled && typeof window !== 'undefined') {
-      void import('./monaco-editor').then(mod => mod.init())
-    }
-  }, [flags.editorEnabled])
-
-  return <FlagsContext.Provider value={flags}>
-    {children}
-  </FlagsContext.Provider>
-}
-```
-
-The `typeof window !== 'undefined'` check prevents bundling preloaded modules for SSR, optimizing server bundle size and build speed.

.cursor/skills/vercel-react-best-practices/rules/client-event-listeners.md

@@ -1,74 +0,0 @@
----
-title: Deduplicate Global Event Listeners
-impact: LOW
-impactDescription: single listener for N components
-tags: client, swr, event-listeners, subscription
----
-
-## Deduplicate Global Event Listeners
-
-Use `useSWRSubscription()` to share global event listeners across component instances.
-
-**Incorrect (N instances = N listeners):**
-
-```tsx
-function useKeyboardShortcut(key: string, callback: () => void) {
-  useEffect(() => {
-    const handler = (e: KeyboardEvent) => {
-      if (e.metaKey && e.key === key) {
-        callback()
-      }
-    }
-    window.addEventListener('keydown', handler)
-    return () => window.removeEventListener('keydown', handler)
-  }, [key, callback])
-}
-```
-
-When using the `useKeyboardShortcut` hook multiple times, each instance will register a new listener.
-
-**Correct (N instances = 1 listener):**
-
-```tsx
-import useSWRSubscription from 'swr/subscription'
-
-// Module-level Map to track callbacks per key
-const keyCallbacks = new Map<string, Set<() => void>>()
-
-function useKeyboardShortcut(key: string, callback: () => void) {
-  // Register this callback in the Map
-  useEffect(() => {
-    if (!keyCallbacks.has(key)) {
-      keyCallbacks.set(key, new Set())
-    }
-    keyCallbacks.get(key)!.add(callback)
-
-    return () => {
-      const set = keyCallbacks.get(key)
-      if (set) {
-        set.delete(callback)
-        if (set.size === 0) {
-          keyCallbacks.delete(key)
-        }
-      }
-    }
-  }, [key, callback])
-
-  useSWRSubscription('global-keydown', () => {
-    const handler = (e: KeyboardEvent) => {
-      if (e.metaKey && keyCallbacks.has(e.key)) {
-        keyCallbacks.get(e.key)!.forEach(cb => cb())
-      }
-    }
-    window.addEventListener('keydown', handler)
-    return () => window.removeEventListener('keydown', handler)
-  })
-}
-
-function Profile() {
-  // Multiple shortcuts will share the same listener
-  useKeyboardShortcut('p', () => { /* ... */ }) 
-  useKeyboardShortcut('k', () => { /* ... */ })
-  // ...
-}
-```

.cursor/skills/vercel-react-best-practices/rules/client-swr-dedup.md

@@ -1,56 +0,0 @@
----
-title: Use SWR for Automatic Deduplication
-impact: MEDIUM-HIGH
-impactDescription: automatic deduplication
-tags: client, swr, deduplication, data-fetching
----
-
-## Use SWR for Automatic Deduplication
-
-SWR enables request deduplication, caching, and revalidation across component instances.
-
-**Incorrect (no deduplication, each instance fetches):**
-
-```tsx
-function UserList() {
-  const [users, setUsers] = useState([])
-  useEffect(() => {
-    fetch('/api/users')
-      .then(r => r.json())
-      .then(setUsers)
-  }, [])
-}
-```
-
-**Correct (multiple instances share one request):**
-
-```tsx
-import useSWR from 'swr'
-
-function UserList() {
-  const { data: users } = useSWR('/api/users', fetcher)
-}
-```
-
-**For immutable data:**
-
-```tsx
-import { useImmutableSWR } from '@/lib/swr'
-
-function StaticContent() {
-  const { data } = useImmutableSWR('/api/config', fetcher)
-}
-```
-
-**For mutations:**
-
-```tsx
-import { useSWRMutation } from 'swr/mutation'
-
-function UpdateButton() {
-  const { trigger } = useSWRMutation('/api/user', updateUser)
-  return <button onClick={() => trigger()}>Update</button>
-}
-```
-
-Reference: [https://swr.vercel.app](https://swr.vercel.app)

.cursor/skills/vercel-react-best-practices/rules/js-batch-dom-css.md

@@ -1,82 +0,0 @@
----
-title: Batch DOM CSS Changes
-impact: MEDIUM
-impactDescription: reduces reflows/repaints
-tags: javascript, dom, css, performance, reflow
----
-
-## Batch DOM CSS Changes
-
-Avoid changing styles one property at a time. Group multiple CSS changes together via classes or `cssText` to minimize browser reflows.
-
-**Incorrect (multiple reflows):**
-
-```typescript
-function updateElementStyles(element: HTMLElement) {
-  // Each line triggers a reflow
-  element.style.width = '100px'
-  element.style.height = '200px'
-  element.style.backgroundColor = 'blue'
-  element.style.border = '1px solid black'
-}
-```
-
-**Correct (add class - single reflow):**
-
-```typescript
-// CSS file
-.highlighted-box {
-  width: 100px;
-  height: 200px;
-  background-color: blue;
-  border: 1px solid black;
-}
-
-// JavaScript
-function updateElementStyles(element: HTMLElement) {
-  element.classList.add('highlighted-box')
-}
-```
-
-**Correct (change cssText - single reflow):**
-
-```typescript
-function updateElementStyles(element: HTMLElement) {
-  element.style.cssText = `
-    width: 100px;
-    height: 200px;
-    background-color: blue;
-    border: 1px solid black;
-  `
-}
-```
-
-**React example:**
-
-```tsx
-// Incorrect: changing styles one by one
-function Box({ isHighlighted }: { isHighlighted: boolean }) {
-  const ref = useRef<HTMLDivElement>(null)
-  
-  useEffect(() => {
-    if (ref.current && isHighlighted) {
-      ref.current.style.width = '100px'
-      ref.current.style.height = '200px'
-      ref.current.style.backgroundColor = 'blue'
-    }
-  }, [isHighlighted])
-  
-  return <div ref={ref}>Content</div>
-}
-
-// Correct: toggle class
-function Box({ isHighlighted }: { isHighlighted: boolean }) {
-  return (
-    <div className={isHighlighted ? 'highlighted-box' : ''}>
-      Content
-    </div>
-  )
-}
-```
-
-Prefer CSS classes over inline styles when possible. Classes are cached by the browser and provide better separation of concerns.

.cursor/skills/vercel-react-best-practices/rules/js-cache-function-results.md

@@ -1,80 +0,0 @@
----
-title: Cache Repeated Function Calls
-impact: MEDIUM
-impactDescription: avoid redundant computation
-tags: javascript, cache, memoization, performance
----
-
-## Cache Repeated Function Calls
-
-Use a module-level Map to cache function results when the same function is called repeatedly with the same inputs during render.
-
-**Incorrect (redundant computation):**
-
-```typescript
-function ProjectList({ projects }: { projects: Project[] }) {
-  return (
-    <div>
-      {projects.map(project => {
-        // slugify() called 100+ times for same project names
-        const slug = slugify(project.name)
-        
-        return <ProjectCard key={project.id} slug={slug} />
-      })}
-    </div>
-  )
-}
-```
-
-**Correct (cached results):**
-
-```typescript
-// Module-level cache
-const slugifyCache = new Map<string, string>()
-
-function cachedSlugify(text: string): string {
-  if (slugifyCache.has(text)) {
-    return slugifyCache.get(text)!
-  }
-  const result = slugify(text)
-  slugifyCache.set(text, result)
-  return result
-}
-
-function ProjectList({ projects }: { projects: Project[] }) {
-  return (
-    <div>
-      {projects.map(project => {
-        // Computed only once per unique project name
-        const slug = cachedSlugify(project.name)
-        
-        return <ProjectCard key={project.id} slug={slug} />
-      })}
-    </div>
-  )
-}
-```
-
-**Simpler pattern for single-value functions:**
-
-```typescript
-let isLoggedInCache: boolean | null = null
-
-function isLoggedIn(): boolean {
-  if (isLoggedInCache !== null) {
-    return isLoggedInCache
-  }
-  
-  isLoggedInCache = document.cookie.includes('auth=')
-  return isLoggedInCache
-}
-
-// Clear cache when auth changes
-function onAuthChange() {
-  isLoggedInCache = null
-}
-```
-
-Use a Map (not a hook) so it works everywhere: utilities, event handlers, not just React components.
-
-Reference: [How we made the Vercel Dashboard twice as fast](https://vercel.com/blog/how-we-made-the-vercel-dashboard-twice-as-fast)

.cursor/skills/vercel-react-best-practices/rules/js-cache-property-access.md

@@ -1,28 +0,0 @@
----
-title: Cache Property Access in Loops
-impact: LOW-MEDIUM
-impactDescription: reduces lookups
-tags: javascript, loops, optimization, caching
----
-
-## Cache Property Access in Loops
-
-Cache object property lookups in hot paths.
-
-**Incorrect (3 lookups × N iterations):**
-
-```typescript
-for (let i = 0; i < arr.length; i++) {
-  process(obj.config.settings.value)
-}
-```
-
-**Correct (1 lookup total):**
-
-```typescript
-const value = obj.config.settings.value
-const len = arr.length
-for (let i = 0; i < len; i++) {
-  process(value)
-}
-```

.cursor/skills/vercel-react-best-practices/rules/js-cache-storage.md

@@ -1,70 +0,0 @@
----
-title: Cache Storage API Calls
-impact: LOW-MEDIUM
-impactDescription: reduces expensive I/O
-tags: javascript, localStorage, storage, caching, performance
----
-
-## Cache Storage API Calls
-
-`localStorage`, `sessionStorage`, and `document.cookie` are synchronous and expensive. Cache reads in memory.
-
-**Incorrect (reads storage on every call):**
-
-```typescript
-function getTheme() {
-  return localStorage.getItem('theme') ?? 'light'
-}
-// Called 10 times = 10 storage reads
-```
-
-**Correct (Map cache):**
-
-```typescript
-const storageCache = new Map<string, string | null>()
-
-function getLocalStorage(key: string) {
-  if (!storageCache.has(key)) {
-    storageCache.set(key, localStorage.getItem(key))
-  }
-  return storageCache.get(key)
-}
-
-function setLocalStorage(key: string, value: string) {
-  localStorage.setItem(key, value)
-  storageCache.set(key, value)  // keep cache in sync
-}
-```
-
-Use a Map (not a hook) so it works everywhere: utilities, event handlers, not just React components.
-
-**Cookie caching:**
-
-```typescript
-let cookieCache: Record<string, string> | null = null
-
-function getCookie(name: string) {
-  if (!cookieCache) {
-    cookieCache = Object.fromEntries(
-      document.cookie.split('; ').map(c => c.split('='))
-    )
-  }
-  return cookieCache[name]
-}
-```
-
-**Important (invalidate on external changes):**
-
-If storage can change externally (another tab, server-set cookies), invalidate cache:
-
-```typescript
-window.addEventListener('storage', (e) => {
-  if (e.key) storageCache.delete(e.key)
-})
-
-document.addEventListener('visibilitychange', () => {
-  if (document.visibilityState === 'visible') {
-    storageCache.clear()
-  }
-})
-```

.cursor/skills/vercel-react-best-practices/rules/js-combine-iterations.md

@@ -1,32 +0,0 @@
----
-title: Combine Multiple Array Iterations
-impact: LOW-MEDIUM
-impactDescription: reduces iterations
-tags: javascript, arrays, loops, performance
----
-
-## Combine Multiple Array Iterations
-
-Multiple `.filter()` or `.map()` calls iterate the array multiple times. Combine into one loop.
-
-**Incorrect (3 iterations):**
-
-```typescript
-const admins = users.filter(u => u.isAdmin)
-const testers = users.filter(u => u.isTester)
-const inactive = users.filter(u => !u.isActive)
-```
-
-**Correct (1 iteration):**
-
-```typescript
-const admins: User[] = []
-const testers: User[] = []
-const inactive: User[] = []
-
-for (const user of users) {
-  if (user.isAdmin) admins.push(user)
-  if (user.isTester) testers.push(user)
-  if (!user.isActive) inactive.push(user)
-}
-```

.cursor/skills/vercel-react-best-practices/rules/js-early-exit.md

@@ -1,50 +0,0 @@
----
-title: Early Return from Functions
-impact: LOW-MEDIUM
-impactDescription: avoids unnecessary computation
-tags: javascript, functions, optimization, early-return
----
-
-## Early Return from Functions
-
-Return early when result is determined to skip unnecessary processing.
-
-**Incorrect (processes all items even after finding answer):**
-
-```typescript
-function validateUsers(users: User[]) {
-  let hasError = false
-  let errorMessage = ''
-  
-  for (const user of users) {
-    if (!user.email) {
-      hasError = true
-      errorMessage = 'Email required'
-    }
-    if (!user.name) {
-      hasError = true
-      errorMessage = 'Name required'
-    }
-    // Continues checking all users even after error found
-  }
-  
-  return hasError ? { valid: false, error: errorMessage } : { valid: true }
-}
-```
-
-**Correct (returns immediately on first error):**
-
-```typescript
-function validateUsers(users: User[]) {
-  for (const user of users) {
-    if (!user.email) {
-      return { valid: false, error: 'Email required' }
-    }
-    if (!user.name) {
-      return { valid: false, error: 'Name required' }
-    }
-  }
-
-  return { valid: true }
-}
-```

.cursor/skills/vercel-react-best-practices/rules/js-hoist-regexp.md

@@ -1,45 +0,0 @@
----
-title: Hoist RegExp Creation
-impact: LOW-MEDIUM
-impactDescription: avoids recreation
-tags: javascript, regexp, optimization, memoization
----
-
-## Hoist RegExp Creation
-
-Don't create RegExp inside render. Hoist to module scope or memoize with `useMemo()`.
-
-**Incorrect (new RegExp every render):**
-
-```tsx
-function Highlighter({ text, query }: Props) {
-  const regex = new RegExp(`(${query})`, 'gi')
-  const parts = text.split(regex)
-  return <>{parts.map((part, i) => ...)}</>
-}
-```
-
-**Correct (memoize or hoist):**
-
-```tsx
-const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
-
-function Highlighter({ text, query }: Props) {
-  const regex = useMemo(
-    () => new RegExp(`(${escapeRegex(query)})`, 'gi'),
-    [query]
-  )
-  const parts = text.split(regex)
-  return <>{parts.map((part, i) => ...)}</>
-}
-```
-
-**Warning (global regex has mutable state):**
-
-Global regex (`/g`) has mutable `lastIndex` state:
-
-```typescript
-const regex = /foo/g
-regex.test('foo')  // true, lastIndex = 3
-regex.test('foo')  // false, lastIndex = 0
-```

.cursor/skills/vercel-react-best-practices/rules/js-index-maps.md

@@ -1,37 +0,0 @@
----
-title: Build Index Maps for Repeated Lookups
-impact: LOW-MEDIUM
-impactDescription: 1M ops to 2K ops
-tags: javascript, map, indexing, optimization, performance
----
-
-## Build Index Maps for Repeated Lookups
-
-Multiple `.find()` calls by the same key should use a Map.
-
-**Incorrect (O(n) per lookup):**
-
-```typescript
-function processOrders(orders: Order[], users: User[]) {
-  return orders.map(order => ({
-    ...order,
-    user: users.find(u => u.id === order.userId)
-  }))
-}
-```
-
-**Correct (O(1) per lookup):**
-
-```typescript
-function processOrders(orders: Order[], users: User[]) {
-  const userById = new Map(users.map(u => [u.id, u]))
-
-  return orders.map(order => ({
-    ...order,
-    user: userById.get(order.userId)
-  }))
-}
-```
-
-Build map once (O(n)), then all lookups are O(1).
-For 1000 orders × 1000 users: 1M ops → 2K ops.

.cursor/skills/vercel-react-best-practices/rules/js-length-check-first.md

@@ -1,49 +0,0 @@
----
-title: Early Length Check for Array Comparisons
-impact: MEDIUM-HIGH
-impactDescription: avoids expensive operations when lengths differ
-tags: javascript, arrays, performance, optimization, comparison
----
-
-## Early Length Check for Array Comparisons
-
-When comparing arrays with expensive operations (sorting, deep equality, serialization), check lengths first. If lengths differ, the arrays cannot be equal.
-
-In real-world applications, this optimization is especially valuable when the comparison runs in hot paths (event handlers, render loops).
-
-**Incorrect (always runs expensive comparison):**
-
-```typescript
-function hasChanges(current: string[], original: string[]) {
-  // Always sorts and joins, even when lengths differ
-  return current.sort().join() !== original.sort().join()
-}
-```
-
-Two O(n log n) sorts run even when `current.length` is 5 and `original.length` is 100. There is also overhead of joining the arrays and comparing the strings.
-
-**Correct (O(1) length check first):**
-
-```typescript
-function hasChanges(current: string[], original: string[]) {
-  // Early return if lengths differ
-  if (current.length !== original.length) {
-    return true
-  }
-  // Only sort/join when lengths match
-  const currentSorted = current.toSorted()
-  const originalSorted = original.toSorted()
-  for (let i = 0; i < currentSorted.length; i++) {
-    if (currentSorted[i] !== originalSorted[i]) {
-      return true
-    }
-  }
-  return false
-}
-```
-
-This new approach is more efficient because:
-- It avoids the overhead of sorting and joining the arrays when lengths differ
-- It avoids consuming memory for the joined strings (especially important for large arrays)
-- It avoids mutating the original arrays
-- It returns early when a difference is found

.cursor/skills/vercel-react-best-practices/rules/js-min-max-loop.md

@@ -1,82 +0,0 @@
----
-title: Use Loop for Min/Max Instead of Sort
-impact: LOW
-impactDescription: O(n) instead of O(n log n)
-tags: javascript, arrays, performance, sorting, algorithms
----
-
-## Use Loop for Min/Max Instead of Sort
-
-Finding the smallest or largest element only requires a single pass through the array. Sorting is wasteful and slower.
-
-**Incorrect (O(n log n) - sort to find latest):**
-
-```typescript
-interface Project {
-  id: string
-  name: string
-  updatedAt: number
-}
-
-function getLatestProject(projects: Project[]) {
-  const sorted = [...projects].sort((a, b) => b.updatedAt - a.updatedAt)
-  return sorted[0]
-}
-```
-
-Sorts the entire array just to find the maximum value.
-
-**Incorrect (O(n log n) - sort for oldest and newest):**
-
-```typescript
-function getOldestAndNewest(projects: Project[]) {
-  const sorted = [...projects].sort((a, b) => a.updatedAt - b.updatedAt)
-  return { oldest: sorted[0], newest: sorted[sorted.length - 1] }
-}
-```
-
-Still sorts unnecessarily when only min/max are needed.
-
-**Correct (O(n) - single loop):**
-
-```typescript
-function getLatestProject(projects: Project[]) {
-  if (projects.length === 0) return null
-  
-  let latest = projects[0]
-  
-  for (let i = 1; i < projects.length; i++) {
-    if (projects[i].updatedAt > latest.updatedAt) {
-      latest = projects[i]
-    }
-  }
-  
-  return latest
-}
-
-function getOldestAndNewest(projects: Project[]) {
-  if (projects.length === 0) return { oldest: null, newest: null }
-  
-  let oldest = projects[0]
-  let newest = projects[0]
-  
-  for (let i = 1; i < projects.length; i++) {
-    if (projects[i].updatedAt < oldest.updatedAt) oldest = projects[i]
-    if (projects[i].updatedAt > newest.updatedAt) newest = projects[i]
-  }
-  
-  return { oldest, newest }
-}
-```
-
-Single pass through the array, no copying, no sorting.
-
-**Alternative (Math.min/Math.max for small arrays):**
-
-```typescript
-const numbers = [5, 2, 8, 1, 9]
-const min = Math.min(...numbers)
-const max = Math.max(...numbers)
-```
-
-This works for small arrays but can be slower for very large arrays due to spread operator limitations. Use the loop approach for reliability.

.cursor/skills/vercel-react-best-practices/rules/js-set-map-lookups.md

@@ -1,24 +0,0 @@
----
-title: Use Set/Map for O(1) Lookups
-impact: LOW-MEDIUM
-impactDescription: O(n) to O(1)
-tags: javascript, set, map, data-structures, performance
----
-
-## Use Set/Map for O(1) Lookups
-
-Convert arrays to Set/Map for repeated membership checks.
-
-**Incorrect (O(n) per check):**
-
-```typescript
-const allowedIds = ['a', 'b', 'c', ...]
-items.filter(item => allowedIds.includes(item.id))
-```
-
-**Correct (O(1) per check):**
-
-```typescript
-const allowedIds = new Set(['a', 'b', 'c', ...])
-items.filter(item => allowedIds.has(item.id))
-```

.cursor/skills/vercel-react-best-practices/rules/js-tosorted-immutable.md

@@ -1,57 +0,0 @@
----
-title: Use toSorted() Instead of sort() for Immutability
-impact: MEDIUM-HIGH
-impactDescription: prevents mutation bugs in React state
-tags: javascript, arrays, immutability, react, state, mutation
----
-
-## Use toSorted() Instead of sort() for Immutability
-
-`.sort()` mutates the array in place, which can cause bugs with React state and props. Use `.toSorted()` to create a new sorted array without mutation.
-
-**Incorrect (mutates original array):**
-
-```typescript
-function UserList({ users }: { users: User[] }) {
-  // Mutates the users prop array!
-  const sorted = useMemo(
-    () => users.sort((a, b) => a.name.localeCompare(b.name)),
-    [users]
-  )
-  return <div>{sorted.map(renderUser)}</div>
-}
-```
-
-**Correct (creates new array):**
-
-```typescript
-function UserList({ users }: { users: User[] }) {
-  // Creates new sorted array, original unchanged
-  const sorted = useMemo(
-    () => users.toSorted((a, b) => a.name.localeCompare(b.name)),
-    [users]
-  )
-  return <div>{sorted.map(renderUser)}</div>
-}
-```
-
-**Why this matters in React:**
-
-1. Props/state mutations break React's immutability model - React expects props and state to be treated as read-only
-2. Causes stale closure bugs - Mutating arrays inside closures (callbacks, effects) can lead to unexpected behavior
-
-**Browser support (fallback for older browsers):**
-
-`.toSorted()` is available in all modern browsers (Chrome 110+, Safari 16+, Firefox 115+, Node.js 20+). For older environments, use spread operator:
-
-```typescript
-// Fallback for older browsers
-const sorted = [...items].sort((a, b) => a.value - b.value)
-```
-
-**Other immutable array methods:**
-
-- `.toSorted()` - immutable sort
-- `.toReversed()` - immutable reverse
-- `.toSpliced()` - immutable splice
-- `.with()` - immutable element replacement

.cursor/skills/vercel-react-best-practices/rules/rendering-activity.md

@@ -1,26 +0,0 @@
----
-title: Use Activity Component for Show/Hide
-impact: MEDIUM
-impactDescription: preserves state/DOM
-tags: rendering, activity, visibility, state-preservation
----
-
-## Use Activity Component for Show/Hide
-
-Use React's `<Activity>` to preserve state/DOM for expensive components that frequently toggle visibility.
-
-**Usage:**
-
-```tsx
-import { Activity } from 'react'
-
-function Dropdown({ isOpen }: Props) {
-  return (
-    <Activity mode={isOpen ? 'visible' : 'hidden'}>
-      <ExpensiveMenu />
-    </Activity>
-  )
-}
-```
-
-Avoids expensive re-renders and state loss.

.cursor/skills/vercel-react-best-practices/rules/rendering-animate-svg-wrapper.md

@@ -1,47 +0,0 @@
----
-title: Animate SVG Wrapper Instead of SVG Element
-impact: LOW
-impactDescription: enables hardware acceleration
-tags: rendering, svg, css, animation, performance
----
-
-## Animate SVG Wrapper Instead of SVG Element
-
-Many browsers don't have hardware acceleration for CSS3 animations on SVG elements. Wrap SVG in a `<div>` and animate the wrapper instead.
-
-**Incorrect (animating SVG directly - no hardware acceleration):**
-
-```tsx
-function LoadingSpinner() {
-  return (
-    <svg 
-      className="animate-spin"
-      width="24" 
-      height="24" 
-      viewBox="0 0 24 24"
-    >
-      <circle cx="12" cy="12" r="10" stroke="currentColor" />
-    </svg>
-  )
-}
-```
-
-**Correct (animating wrapper div - hardware accelerated):**
-
-```tsx
-function LoadingSpinner() {
-  return (
-    <div className="animate-spin">
-      <svg 
-        width="24" 
-        height="24" 
-        viewBox="0 0 24 24"
-      >
-        <circle cx="12" cy="12" r="10" stroke="currentColor" />
-      </svg>
-    </div>
-  )
-}
-```
-
-This applies to all CSS transforms and transitions (`transform`, `opacity`, `translate`, `scale`, `rotate`). The wrapper div allows browsers to use GPU acceleration for smoother animations.

.cursor/skills/vercel-react-best-practices/rules/rendering-conditional-render.md

@@ -1,40 +0,0 @@
----
-title: Use Explicit Conditional Rendering
-impact: LOW
-impactDescription: prevents rendering 0 or NaN
-tags: rendering, conditional, jsx, falsy-values
----
-
-## Use Explicit Conditional Rendering
-
-Use explicit ternary operators (`? :`) instead of `&&` for conditional rendering when the condition can be `0`, `NaN`, or other falsy values that render.
-
-**Incorrect (renders "0" when count is 0):**
-
-```tsx
-function Badge({ count }: { count: number }) {
-  return (
-    <div>
-      {count && <span className="badge">{count}</span>}
-    </div>
-  )
-}
-
-// When count = 0, renders: <div>0</div>
-// When count = 5, renders: <div><span class="badge">5</span></div>
-```
-
-**Correct (renders nothing when count is 0):**
-
-```tsx
-function Badge({ count }: { count: number }) {
-  return (
-    <div>
-      {count > 0 ? <span className="badge">{count}</span> : null}
-    </div>
-  )
-}
-
-// When count = 0, renders: <div></div>
-// When count = 5, renders: <div><span class="badge">5</span></div>
-```

.cursor/skills/vercel-react-best-practices/rules/rendering-content-visibility.md

@@ -1,38 +0,0 @@
----
-title: CSS content-visibility for Long Lists
-impact: HIGH
-impactDescription: faster initial render
-tags: rendering, css, content-visibility, long-lists
----
-
-## CSS content-visibility for Long Lists
-
-Apply `content-visibility: auto` to defer off-screen rendering.
-
-**CSS:**
-
-```css
-.message-item {
-  content-visibility: auto;
-  contain-intrinsic-size: 0 80px;
-}
-```
-
-**Example:**
-
-```tsx
-function MessageList({ messages }: { messages: Message[] }) {
-  return (
-    <div className="overflow-y-auto h-screen">
-      {messages.map(msg => (
-        <div key={msg.id} className="message-item">
-          <Avatar user={msg.author} />
-          <div>{msg.content}</div>
-        </div>
-      ))}
-    </div>
-  )
-}
-```
-
-For 1000 messages, browser skips layout/paint for ~990 off-screen items (10× faster initial render).

.cursor/skills/vercel-react-best-practices/rules/rendering-hoist-jsx.md

@@ -1,46 +0,0 @@
----
-title: Hoist Static JSX Elements
-impact: LOW
-impactDescription: avoids re-creation
-tags: rendering, jsx, static, optimization
----
-
-## Hoist Static JSX Elements
-
-Extract static JSX outside components to avoid re-creation.
-
-**Incorrect (recreates element every render):**
-
-```tsx
-function LoadingSkeleton() {
-  return <div className="animate-pulse h-20 bg-gray-200" />
-}
-
-function Container() {
-  return (
-    <div>
-      {loading && <LoadingSkeleton />}
-    </div>
-  )
-}
-```
-
-**Correct (reuses same element):**
-
-```tsx
-const loadingSkeleton = (
-  <div className="animate-pulse h-20 bg-gray-200" />
-)
-
-function Container() {
-  return (
-    <div>
-      {loading && loadingSkeleton}
-    </div>
-  )
-}
-```
-
-This is especially helpful for large and static SVG nodes, which can be expensive to recreate on every render.
-
-**Note:** If your project has [React Compiler](https://react.dev/learn/react-compiler) enabled, the compiler automatically hoists static JSX elements and optimizes component re-renders, making manual hoisting unnecessary.

.cursor/skills/vercel-react-best-practices/rules/rendering-hydration-no-flicker.md

@@ -1,82 +0,0 @@
----
-title: Prevent Hydration Mismatch Without Flickering
-impact: MEDIUM
-impactDescription: avoids visual flicker and hydration errors
-tags: rendering, ssr, hydration, localStorage, flicker
----
-
-## Prevent Hydration Mismatch Without Flickering
-
-When rendering content that depends on client-side storage (localStorage, cookies), avoid both SSR breakage and post-hydration flickering by injecting a synchronous script that updates the DOM before React hydrates.
-
-**Incorrect (breaks SSR):**
-
-```tsx
-function ThemeWrapper({ children }: { children: ReactNode }) {
-  // localStorage is not available on server - throws error
-  const theme = localStorage.getItem('theme') || 'light'
-  
-  return (
-    <div className={theme}>
-      {children}
-    </div>
-  )
-}
-```
-
-Server-side rendering will fail because `localStorage` is undefined.
-
-**Incorrect (visual flickering):**
-
-```tsx
-function ThemeWrapper({ children }: { children: ReactNode }) {
-  const [theme, setTheme] = useState('light')
-  
-  useEffect(() => {
-    // Runs after hydration - causes visible flash
-    const stored = localStorage.getItem('theme')
-    if (stored) {
-      setTheme(stored)
-    }
-  }, [])
-  
-  return (
-    <div className={theme}>
-      {children}
-    </div>
-  )
-}
-```
-
-Component first renders with default value (`light`), then updates after hydration, causing a visible flash of incorrect content.
-
-**Correct (no flicker, no hydration mismatch):**
-
-```tsx
-function ThemeWrapper({ children }: { children: ReactNode }) {
-  return (
-    <>
-      <div id="theme-wrapper">
-        {children}
-      </div>
-      <script
-        dangerouslySetInnerHTML={{
-          __html: `
-            (function() {
-              try {
-                var theme = localStorage.getItem('theme') || 'light';
-                var el = document.getElementById('theme-wrapper');
-                if (el) el.className = theme;
-              } catch (e) {}
-            })();
-          `,
-        }}
-      />
-    </>
-  )
-}
-```
-
-The inline script executes synchronously before showing the element, ensuring the DOM already has the correct value. No flickering, no hydration mismatch.
-
-This pattern is especially useful for theme toggles, user preferences, authentication states, and any client-only data that should render immediately without flashing default values.

.cursor/skills/vercel-react-best-practices/rules/rendering-svg-precision.md

@@ -1,28 +0,0 @@
----
-title: Optimize SVG Precision
-impact: LOW
-impactDescription: reduces file size
-tags: rendering, svg, optimization, svgo
----
-
-## Optimize SVG Precision
-
-Reduce SVG coordinate precision to decrease file size. The optimal precision depends on the viewBox size, but in general reducing precision should be considered.
-
-**Incorrect (excessive precision):**
-
-```svg
-<path d="M 10.293847 20.847362 L 30.938472 40.192837" />
-```
-
-**Correct (1 decimal place):**
-
-```svg
-<path d="M 10.3 20.8 L 30.9 40.2" />
-```
-
-**Automate with SVGO:**
-
-```bash
-npx svgo --precision=1 --multipass icon.svg
-```

.cursor/skills/vercel-react-best-practices/rules/rerender-defer-reads.md

@@ -1,39 +0,0 @@
----
-title: Defer State Reads to Usage Point
-impact: MEDIUM
-impactDescription: avoids unnecessary subscriptions
-tags: rerender, searchParams, localStorage, optimization
----
-
-## Defer State Reads to Usage Point
-
-Don't subscribe to dynamic state (searchParams, localStorage) if you only read it inside callbacks.
-
-**Incorrect (subscribes to all searchParams changes):**
-
-```tsx
-function ShareButton({ chatId }: { chatId: string }) {
-  const searchParams = useSearchParams()
-
-  const handleShare = () => {
-    const ref = searchParams.get('ref')
-    shareChat(chatId, { ref })
-  }
-
-  return <button onClick={handleShare}>Share</button>
-}
-```
-
-**Correct (reads on demand, no subscription):**
-
-```tsx
-function ShareButton({ chatId }: { chatId: string }) {
-  const handleShare = () => {
-    const params = new URLSearchParams(window.location.search)
-    const ref = params.get('ref')
-    shareChat(chatId, { ref })
-  }
-
-  return <button onClick={handleShare}>Share</button>
-}
-```

.cursor/skills/vercel-react-best-practices/rules/rerender-dependencies.md

@@ -1,45 +0,0 @@
----
-title: Narrow Effect Dependencies
-impact: LOW
-impactDescription: minimizes effect re-runs
-tags: rerender, useEffect, dependencies, optimization
----
-
-## Narrow Effect Dependencies
-
-Specify primitive dependencies instead of objects to minimize effect re-runs.
-
-**Incorrect (re-runs on any user field change):**
-
-```tsx
-useEffect(() => {
-  fetchUserDetails(user.id)
-}, [user])
-```
-
-**Correct (re-runs only when id changes):**
-
-```tsx
-useEffect(() => {
-  fetchUserDetails(user.id)
-}, [user.id])
-```
-
-**For derived state, compute outside effect:**
-
-```tsx
-// Incorrect: runs on width=767, 766, 765...
-useEffect(() => {
-  if (width < 768) {
-    enableMobileMode()
-  }
-}, [width])
-
-// Correct: runs only on boolean transition
-const isMobile = width < 768
-useEffect(() => {
-  if (isMobile) {
-    enableMobileMode()
-  }
-}, [isMobile])
-```

.cursor/skills/vercel-react-best-practices/rules/rerender-derived-state.md

@@ -1,29 +0,0 @@
----
-title: Subscribe to Derived State
-impact: MEDIUM
-impactDescription: reduces re-render frequency
-tags: rerender, derived-state, media-query, optimization
----
-
-## Subscribe to Derived State
-
-Subscribe to derived boolean state instead of continuous values to reduce re-render frequency.
-
-**Incorrect (re-renders on every pixel change):**
-
-```tsx
-function Sidebar() {
-  const width = useWindowWidth()  // updates continuously
-  const isMobile = width < 768
-  return <nav className={isMobile ? 'mobile' : 'desktop'}></nav>
-}
-```
-
-**Correct (re-renders only when boolean changes):**
-
-```tsx
-function Sidebar() {
-  const isMobile = useMediaQuery('(max-width: 767px)')
-  return <nav className={isMobile ? 'mobile' : 'desktop'}></nav>
-}
-```

.cursor/skills/vercel-react-best-practices/rules/rerender-functional-setstate.md

@@ -1,74 +0,0 @@
----
-title: Use Functional setState Updates
-impact: MEDIUM
-impactDescription: prevents stale closures and unnecessary callback recreations
-tags: react, hooks, useState, useCallback, callbacks, closures
----
-
-## Use Functional setState Updates
-
-When updating state based on the current state value, use the functional update form of setState instead of directly referencing the state variable. This prevents stale closures, eliminates unnecessary dependencies, and creates stable callback references.
-
-**Incorrect (requires state as dependency):**
-
-```tsx
-function TodoList() {
-  const [items, setItems] = useState(initialItems)
-  
-  // Callback must depend on items, recreated on every items change
-  const addItems = useCallback((newItems: Item[]) => {
-    setItems([...items, ...newItems])
-  }, [items])  // ❌ items dependency causes recreations
-  
-  // Risk of stale closure if dependency is forgotten
-  const removeItem = useCallback((id: string) => {
-    setItems(items.filter(item => item.id !== id))
-  }, [])  // ❌ Missing items dependency - will use stale items!
-  
-  return <ItemsEditor items={items} onAdd={addItems} onRemove={removeItem} />
-}
-```
-
-The first callback is recreated every time `items` changes, which can cause child components to re-render unnecessarily. The second callback has a stale closure bug—it will always reference the initial `items` value.
-
-**Correct (stable callbacks, no stale closures):**
-
-```tsx
-function TodoList() {
-  const [items, setItems] = useState(initialItems)
-  
-  // Stable callback, never recreated
-  const addItems = useCallback((newItems: Item[]) => {
-    setItems(curr => [...curr, ...newItems])
-  }, [])  // ✅ No dependencies needed
-  
-  // Always uses latest state, no stale closure risk
-  const removeItem = useCallback((id: string) => {
-    setItems(curr => curr.filter(item => item.id !== id))
-  }, [])  // ✅ Safe and stable
-  
-  return <ItemsEditor items={items} onAdd={addItems} onRemove={removeItem} />
-}
-```
-
-**Benefits:**
-
-1. **Stable callback references** - Callbacks don't need to be recreated when state changes
-2. **No stale closures** - Always operates on the latest state value
-3. **Fewer dependencies** - Simplifies dependency arrays and reduces memory leaks
-4. **Prevents bugs** - Eliminates the most common source of React closure bugs
-
-**When to use functional updates:**
-
-- Any setState that depends on the current state value
-- Inside useCallback/useMemo when state is needed
-- Event handlers that reference state
-- Async operations that update state
-
-**When direct updates are fine:**
-
-- Setting state to a static value: `setCount(0)`
-- Setting state from props/arguments only: `setName(newName)`
-- State doesn't depend on previous value
-
-**Note:** If your project has [React Compiler](https://react.dev/learn/react-compiler) enabled, the compiler can automatically optimize some cases, but functional updates are still recommended for correctness and to prevent stale closure bugs.

.cursor/skills/vercel-react-best-practices/rules/rerender-lazy-state-init.md

@@ -1,58 +0,0 @@
----
-title: Use Lazy State Initialization
-impact: MEDIUM
-impactDescription: wasted computation on every render
-tags: react, hooks, useState, performance, initialization
----
-
-## Use Lazy State Initialization
-
-Pass a function to `useState` for expensive initial values. Without the function form, the initializer runs on every render even though the value is only used once.
-
-**Incorrect (runs on every render):**
-
-```tsx
-function FilteredList({ items }: { items: Item[] }) {
-  // buildSearchIndex() runs on EVERY render, even after initialization
-  const [searchIndex, setSearchIndex] = useState(buildSearchIndex(items))
-  const [query, setQuery] = useState('')
-  
-  // When query changes, buildSearchIndex runs again unnecessarily
-  return <SearchResults index={searchIndex} query={query} />
-}
-
-function UserProfile() {
-  // JSON.parse runs on every render
-  const [settings, setSettings] = useState(
-    JSON.parse(localStorage.getItem('settings') || '{}')
-  )
-  
-  return <SettingsForm settings={settings} onChange={setSettings} />
-}
-```
-
-**Correct (runs only once):**
-
-```tsx
-function FilteredList({ items }: { items: Item[] }) {
-  // buildSearchIndex() runs ONLY on initial render
-  const [searchIndex, setSearchIndex] = useState(() => buildSearchIndex(items))
-  const [query, setQuery] = useState('')
-  
-  return <SearchResults index={searchIndex} query={query} />
-}
-
-function UserProfile() {
-  // JSON.parse runs only on initial render
-  const [settings, setSettings] = useState(() => {
-    const stored = localStorage.getItem('settings')
-    return stored ? JSON.parse(stored) : {}
-  })
-  
-  return <SettingsForm settings={settings} onChange={setSettings} />
-}
-```
-
-Use lazy initialization when computing initial values from localStorage/sessionStorage, building data structures (indexes, maps), reading from the DOM, or performing heavy transformations.
-
-For simple primitives (`useState(0)`), direct references (`useState(props.value)`), or cheap literals (`useState({})`), the function form is unnecessary.

.cursor/skills/vercel-react-best-practices/rules/rerender-memo.md

@@ -1,44 +0,0 @@
----
-title: Extract to Memoized Components
-impact: MEDIUM
-impactDescription: enables early returns
-tags: rerender, memo, useMemo, optimization
----
-
-## Extract to Memoized Components
-
-Extract expensive work into memoized components to enable early returns before computation.
-
-**Incorrect (computes avatar even when loading):**
-
-```tsx
-function Profile({ user, loading }: Props) {
-  const avatar = useMemo(() => {
-    const id = computeAvatarId(user)
-    return <Avatar id={id} />
-  }, [user])
-
-  if (loading) return <Skeleton />
-  return <div>{avatar}</div>
-}
-```
-
-**Correct (skips computation when loading):**
-
-```tsx
-const UserAvatar = memo(function UserAvatar({ user }: { user: User }) {
-  const id = useMemo(() => computeAvatarId(user), [user])
-  return <Avatar id={id} />
-})
-
-function Profile({ user, loading }: Props) {
-  if (loading) return <Skeleton />
-  return (
-    <div>
-      <UserAvatar user={user} />
-    </div>
-  )
-}
-```
-
-**Note:** If your project has [React Compiler](https://react.dev/learn/react-compiler) enabled, manual memoization with `memo()` and `useMemo()` is not necessary. The compiler automatically optimizes re-renders.

.cursor/skills/vercel-react-best-practices/rules/rerender-transitions.md

@@ -1,40 +0,0 @@
----
-title: Use Transitions for Non-Urgent Updates
-impact: MEDIUM
-impactDescription: maintains UI responsiveness
-tags: rerender, transitions, startTransition, performance
----
-
-## Use Transitions for Non-Urgent Updates
-
-Mark frequent, non-urgent state updates as transitions to maintain UI responsiveness.
-
-**Incorrect (blocks UI on every scroll):**
-
-```tsx
-function ScrollTracker() {
-  const [scrollY, setScrollY] = useState(0)
-  useEffect(() => {
-    const handler = () => setScrollY(window.scrollY)
-    window.addEventListener('scroll', handler, { passive: true })
-    return () => window.removeEventListener('scroll', handler)
-  }, [])
-}
-```
-
-**Correct (non-blocking updates):**
-
-```tsx
-import { startTransition } from 'react'
-
-function ScrollTracker() {
-  const [scrollY, setScrollY] = useState(0)
-  useEffect(() => {
-    const handler = () => {
-      startTransition(() => setScrollY(window.scrollY))
-    }
-    window.addEventListener('scroll', handler, { passive: true })
-    return () => window.removeEventListener('scroll', handler)
-  }, [])
-}
-```

.cursor/skills/vercel-react-best-practices/rules/server-after-nonblocking.md

@@ -1,72 +0,0 @@
----
-title: Use after() for Non-Blocking Operations
-impact: MEDIUM
-impactDescription: faster response times
-tags: server, async, logging, analytics, side-effects
----
-
-## Use after() for Non-Blocking Operations
-
-Use Next.js's `after()` to schedule work that should execute after a response is sent. This prevents logging, analytics, and other side effects from blocking the response.
-
-**Incorrect (blocks response):**
-
-```tsx
-import { logUserAction } from '@/app/utils'
-
-export async function POST(request: Request) {
-  // Perform mutation
-  await updateDatabase(request)
-  
-  // Logging blocks the response
-  const userAgent = request.headers.get('user-agent') || 'unknown'
-  await logUserAction({ userAgent })
-  
-  return new Response(JSON.stringify({ status: 'success' }), {
-    status: 200,
-    headers: { 'Content-Type': 'application/json' }
-  })
-}
-```
-
-**Correct (non-blocking):**
-
-```tsx
-import { after } from 'next/server'
-import { headers } from 'next/headers'
-import { logUserAction } from '@/app/utils'
-
-export async function POST(request: Request) {
-  // Perform mutation
-  await updateDatabase(request)
-  
-  // Log after response is sent
-  after(async () => {
-    const userAgent = (await headers()).get('user-agent') || 'unknown'
-    
-    await logUserAction({ userAgent })
-  })
-  
-  return new Response(JSON.stringify({ status: 'success' }), {
-    status: 200,
-    headers: { 'Content-Type': 'application/json' }
-  })
-}
-```
-
-The response is sent immediately while logging happens in the background.
-
-**Common use cases:**
-
-- Analytics tracking
-- Audit logging
-- Sending notifications
-- Cache invalidation
-- Cleanup tasks
-
-**Important notes:**
-
-- `after()` runs even if the response fails or redirects
-- Works in Server Actions, Route Handlers, and Server Components
-
-Reference: [https://nextjs.org/docs/app/api-reference/functions/after](https://nextjs.org/docs/app/api-reference/functions/after)

.cursor/skills/vercel-react-best-practices/rules/server-cache-lru.md

@@ -1,41 +0,0 @@
----
-title: Cross-Request LRU Caching
-impact: HIGH
-impactDescription: caches across requests
-tags: server, cache, lru, cross-request
----
-
-## Cross-Request LRU Caching
-
-`React.cache()` only works within one request. For data shared across sequential requests (user clicks button A then button B), use an LRU cache.
-
-**Implementation:**
-
-```typescript
-import { LRUCache } from 'lru-cache'
-
-const cache = new LRUCache<string, any>({
-  max: 1000,
-  ttl: 5 * 60 * 1000  // 5 minutes
-})
-
-export async function getUser(id: string) {
-  const cached = cache.get(id)
-  if (cached) return cached
-
-  const user = await db.user.findUnique({ where: { id } })
-  cache.set(id, user)
-  return user
-}
-
-// Request 1: DB query, result cached
-// Request 2: cache hit, no DB query
-```
-
-Use when sequential user actions hit multiple endpoints needing the same data within seconds.
-
-**With Vercel's [Fluid Compute](https://vercel.com/docs/fluid-compute):** LRU caching is especially effective because multiple concurrent requests can share the same function instance and cache. This means the cache persists across requests without needing external storage like Redis.
-
-**In traditional serverless:** Each invocation runs in isolation, so consider Redis for cross-process caching.
-
-Reference: [https://github.com/isaacs/node-lru-cache](https://github.com/isaacs/node-lru-cache)

.cursor/skills/vercel-react-best-practices/rules/server-cache-react.md

@@ -1,26 +0,0 @@
----
-title: Per-Request Deduplication with React.cache()
-impact: MEDIUM
-impactDescription: deduplicates within request
-tags: server, cache, react-cache, deduplication
----
-
-## Per-Request Deduplication with React.cache()
-
-Use `React.cache()` for server-side request deduplication. Authentication and database queries benefit most.
-
-**Usage:**
-
-```typescript
-import { cache } from 'react'
-
-export const getCurrentUser = cache(async () => {
-  const session = await auth()
-  if (!session?.user?.id) return null
-  return await db.user.findUnique({
-    where: { id: session.user.id }
-  })
-})
-```
-
-Within a single request, multiple calls to `getCurrentUser()` execute the query only once.

.cursor/skills/vercel-react-best-practices/rules/server-parallel-fetching.md

@@ -1,79 +0,0 @@
----
-title: Parallel Data Fetching with Component Composition
-impact: CRITICAL
-impactDescription: eliminates server-side waterfalls
-tags: server, rsc, parallel-fetching, composition
----
-
-## Parallel Data Fetching with Component Composition
-
-React Server Components execute sequentially within a tree. Restructure with composition to parallelize data fetching.
-
-**Incorrect (Sidebar waits for Page's fetch to complete):**
-
-```tsx
-export default async function Page() {
-  const header = await fetchHeader()
-  return (
-    <div>
-      <div>{header}</div>
-      <Sidebar />
-    </div>
-  )
-}
-
-async function Sidebar() {
-  const items = await fetchSidebarItems()
-  return <nav>{items.map(renderItem)}</nav>
-}
-```
-
-**Correct (both fetch simultaneously):**
-
-```tsx
-async function Header() {
-  const data = await fetchHeader()
-  return <div>{data}</div>
-}
-
-async function Sidebar() {
-  const items = await fetchSidebarItems()
-  return <nav>{items.map(renderItem)}</nav>
-}
-
-export default function Page() {
-  return (
-    <div>
-      <Header />
-      <Sidebar />
-    </div>
-  )
-}
-```
-
-**Alternative with children prop:**
-
-```tsx
-async function Layout({ children }: { children: ReactNode }) {
-  const header = await fetchHeader()
-  return (
-    <div>
-      <div>{header}</div>
-      {children}
-    </div>
-  )
-}
-
-async function Sidebar() {
-  const items = await fetchSidebarItems()
-  return <nav>{items.map(renderItem)}</nav>
-}
-
-export default function Page() {
-  return (
-    <Layout>
-      <Sidebar />
-    </Layout>
-  )
-}
-```

.cursor/skills/vercel-react-best-practices/rules/server-serialization.md

@@ -1,38 +0,0 @@
----
-title: Minimize Serialization at RSC Boundaries
-impact: HIGH
-impactDescription: reduces data transfer size
-tags: server, rsc, serialization, props
----
-
-## Minimize Serialization at RSC Boundaries
-
-The React Server/Client boundary serializes all object properties into strings and embeds them in the HTML response and subsequent RSC requests. This serialized data directly impacts page weight and load time, so **size matters a lot**. Only pass fields that the client actually uses.
-
-**Incorrect (serializes all 50 fields):**
-
-```tsx
-async function Page() {
-  const user = await fetchUser()  // 50 fields
-  return <Profile user={user} />
-}
-
-'use client'
-function Profile({ user }: { user: User }) {
-  return <div>{user.name}</div>  // uses 1 field
-}
-```
-
-**Correct (serializes only 1 field):**
-
-```tsx
-async function Page() {
-  const user = await fetchUser()
-  return <Profile name={user.name} />
-}
-
-'use client'
-function Profile({ name }: { name: string }) {
-  return <div>{name}</div>
-}
-```

.cursor/skills/web-design-guidelines/SKILL.md

@@ -1,39 +0,0 @@
----
-name: web-design-guidelines
-description: Review UI code for Web Interface Guidelines compliance. Use when asked to "review my UI", "check accessibility", "audit design", "review UX", or "check my site against best practices".
-argument-hint: <file-or-pattern>
-metadata:
-  author: vercel
-  version: "1.0.0"
----
-
-# Web Interface Guidelines
-
-Review files for compliance with Web Interface Guidelines.
-
-## How It Works
-
-1. Fetch the latest guidelines from the source URL below
-2. Read the specified files (or prompt user for files/pattern)
-3. Check against all rules in the fetched guidelines
-4. Output findings in the terse `file:line` format
-
-## Guidelines Source
-
-Fetch fresh guidelines before each review:
-
-```
-https://raw.githubusercontent.com/vercel-labs/web-interface-guidelines/main/command.md
-```
-
-Use WebFetch to retrieve the latest rules. The fetched content contains all the rules and output format instructions.
-
-## Usage
-
-When a user provides a file or pattern argument:
-1. Fetch guidelines from the source URL above
-2. Read the specified files
-3. Apply all rules from the fetched guidelines
-4. Output findings using the format specified in the guidelines
-
-If no files specified, ask the user which files to review.

.easignore

@@ -1,57 +0,0 @@
-# EAS Build ignore file for monorepo
-# Only upload the companion app folder
-
-# ===========================================
-# IGNORE EVERYTHING AT ROOT LEVEL
-# ===========================================
-/*
-
-# ===========================================
-# EXCEPT THE COMPANION APP
-# ===========================================
-!companion
-
-# ===========================================
-# BUT IGNORE THESE INSIDE COMPANION
-# ===========================================
-
-# Native folders - EAS generates these during builds (~2.1 GB)
-companion/ios
-companion/android
-
-# Dependencies - EAS installs these during builds (~1.6 GB)
-companion/node_modules
-
-# Expo build cache
-companion/.expo
-companion/dist
-companion/web-build
-
-# Metro
-companion/.metro-health-check*
-
-# WXT Chrome Extension outputs (not needed for mobile builds)
-companion/.output
-companion/.wxt
-companion/dev
-
-# Kotlin cache
-companion/.kotlin
-
-# Build artifacts
-companion/*.jks
-companion/*.p8
-companion/*.p12
-companion/*.key
-companion/*.mobileprovision
-
-# Debug logs
-companion/*.log
-
-# TypeScript build info
-companion/*.tsbuildinfo
-
-# Environment files
-companion/.env
-companion/.env.*
-!companion/.env.example

.env.appStore.example

@@ -24,8 +24,8 @@
 # ⚠️ ⚠️ ⚠️ THESE WILL BE MIGRATED TO THE DATABASE TO PREVENT AWS's 4KB ENV QUOTA ⚠️ ⚠️ ⚠️
 
 #   - BASECAMP
-# Used to enable Basecamp integration with Cal.com
-# @see https://github.com/calcom/cal.com#obtaining-basecamp-client-id-and-secret
+# Used to enable Basecamp integration with Cal.diy
+# @see https://github.com/calcom/cal.diy#obtaining-basecamp-client-id-and-secret
 BASECAMP3_CLIENT_ID=
 BASECAMP3_CLIENT_SECRET=
 BASECAMP3_USER_AGENT=
@@ -34,7 +34,7 @@ BASECAMP3_USER_AGENT=
 # Enables Cal Video. to get your key
 # 1. Visit our [Daily.co Partnership Form](https://go.cal.com/daily) and enter your information
 # 2. From within your dashboard, go to the [developers](https://dashboard.daily.co/developers) tab.
-# @see https://github.com/calcom/cal.com#obtaining-daily-api-credentials
+# @see https://github.com/calcom/cal.diy#obtaining-daily-api-credentials
 
 DAILY_API_KEY=
 DAILY_SCALE_PLAN=''
@@ -43,7 +43,7 @@ DAILY_MEETING_ENDED_WEBHOOK_SECRET=''
 
 #   - GOOGLE CALENDAR/MEET/LOGIN
 # Needed to enable Google Calendar integration and Login with Google
-# @see https://github.com/calcom/cal.com#obtaining-the-google-api-credentials
+# @see https://github.com/calcom/cal.diy#obtaining-the-google-api-credentials
 GOOGLE_API_CREDENTIALS=
 
 # To enable Login with Google you need to:
@@ -55,18 +55,18 @@ GOOGLE_LOGIN_ENABLED=false
 
 #   - HUBSPOT
 # Used for the HubSpot integration
-# @see https://github.com/calcom/cal.com/#obtaining-hubspot-client-id-and-secret
+# @see https://github.com/calcom/cal.diy/#obtaining-hubspot-client-id-and-secret
 HUBSPOT_CLIENT_ID=""
 HUBSPOT_CLIENT_SECRET=""
 
 #   - OFFICE 365
 # Used for the Office 365 / Outlook.com Calendar / MS Teams integration
-# @see https://github.com/calcom/cal.com/#Obtaining-Microsoft-Graph-Client-ID-and-Secret
+# @see https://github.com/calcom/cal.diy/#Obtaining-Microsoft-Graph-Client-ID-and-Secret
 MS_GRAPH_CLIENT_ID=
 MS_GRAPH_CLIENT_SECRET=
 
 #   - SLACK
-# @see https://github.com/calcom/cal.com/#obtaining-slack-client-id-and-secret-and-signing-secret
+# @see https://github.com/calcom/cal.diy/#obtaining-slack-client-id-and-secret-and-signing-secret
 SLACK_SIGNING_SECRET=
 SLACK_CLIENT_ID=
 SLACK_CLIENT_SECRET=
@@ -87,7 +87,7 @@ TANDEM_BASE_URL="https://tandem.chat"
 
 #   - ZOOM
 # Used for the Zoom integration
-# @see https://github.com/calcom/cal.com/#obtaining-zoom-client-id-and-secret
+# @see https://github.com/calcom/cal.diy/#obtaining-zoom-client-id-and-secret
 ZOOM_CLIENT_ID=
 ZOOM_CLIENT_SECRET=
 
@@ -98,7 +98,7 @@ GIPHY_API_KEY=
 
 #   - VITAL
 # Used for the vital integration
-# @see https://github.com/calcom/cal.com/#obtaining-vital-api-keys
+# @see https://github.com/calcom/cal.diy/#obtaining-vital-api-keys
 VITAL_API_KEY=
 VITAL_WEBHOOK_SECRET=
 # "sandbox" | "prod" | "production" | "development"
@@ -108,7 +108,7 @@ VITAL_REGION="us"
 
 #   - ZAPIER
 # Used for the Zapier integration
-# @see https://github.com/calcom/cal.com/blob/main/packages/app-store/zapier/README.md
+# @see https://github.com/calcom/cal.diy/blob/main/packages/app-store/zapier/README.md
 ZAPIER_INVITE_LINK=""
 
 #   - LARK

.env.example

@@ -1,29 +1,16 @@
 # ********** INDEX **********
 #
-# - LICENSE (DEPRECATED)
+# - LICENSE
 # - DATABASE
 # - SHARED
 #   - NEXTAUTH
 # - E-MAIL SETTINGS
 # - ORGANIZATIONS
 
-# - LICENSE (DEPRECATED) ************************************************************************************
-# https://github.com/calcom/cal.com/blob/main/LICENSE
-#
-# Summary of terms:
-# - The codebase has to stay open source, whether it was modified or not
-# - You can not repackage or sell the codebase
-# - Acquire a commercial license to remove these terms by visiting: cal.com/sales
-#
-
-# To enable enterprise-only features please add your environment variable to the .env file then make your way to /auth/setup to select your license and follow instructions.
-
-CALCOM_LICENSE_KEY=
-# Signature token for the Cal.com License API (used for self-hosted integrations)
-# We will give you a token when we provide you with a license key this ensure you and only you can communicate with the Cal.com License API for your license key
-CAL_SIGNATURE_TOKEN=
-# The route to the Cal.com License API
-CALCOM_PRIVATE_API_ROUTE="https://goblin.cal.com"
+# - LICENSE ************************************************************************************
+# This project is licensed under the MIT License.
+# @see https://github.com/calcom/cal.diy/blob/main/LICENSE
+# Cal.diy is fully open source — no license key is required.
 # ***********************************************************************************************************
 
 # - DATABASE ************************************************************************************************
@@ -33,12 +20,6 @@ DATABASE_URL="postgresql://postgres:@localhost:5450/calendso"
 DATABASE_DIRECT_URL="postgresql://postgres:@localhost:5450/calendso"
 INSIGHTS_DATABASE_URL=
 
-# Uncomment to enable a dedicated connection pool for Prisma using Prisma Data Proxy
-# Cold boots will be faster and you'll be able to scale your DB independently of your app.
-# @see https://www.prisma.io/docs/data-platform/data-proxy/use-data-proxy
-# PRISMA_GENERATE_DATAPROXY=true
-PRISMA_GENERATE_DATAPROXY=
-
 # ***********************************************************************************************************
 
 # - SHARED **************************************************************************************************
@@ -47,19 +28,16 @@ PRISMA_GENERATE_DATAPROXY=
 NEXT_PUBLIC_WEBAPP_URL='http://localhost:3000'
 # Change to 'http://localhost:3001' if running the website simultaneously
 NEXT_PUBLIC_WEBSITE_URL='http://localhost:3000'
-NEXT_PUBLIC_CONSOLE_URL='http://localhost:3004'
 NEXT_PUBLIC_EMBED_LIB_URL='http://localhost:3000/embed/embed.js'
 
 # To enable SAML login, set both these variables
-# @see https://github.com/calcom/cal.com/tree/main/packages/features/ee#setting-up-saml-login
+# @see https://github.com/calcom/cal.diy/tree/main/packages/features/ee#setting-up-saml-login
 # SAML_DATABASE_URL="postgresql://postgres:@localhost:5450/cal-saml"
 SAML_DATABASE_URL=
 # SAML_ADMINS='pro@example.com'
 SAML_ADMINS=
 # NEXT_PUBLIC_HOSTED_CAL_FEATURES=1
 NEXT_PUBLIC_HOSTED_CAL_FEATURES=
-# For additional security set to a random secret and use that value as the client_secret during the OAuth 2.0 flow.
-SAML_CLIENT_SECRET_VERIFIER=
 
 # If you use Heroku to deploy Postgres (or use self-signed certs for Postgres) then uncomment the follow line.
 # @see https://devcenter.heroku.com/articles/connecting-heroku-postgres#connecting-in-node-js
@@ -67,7 +45,7 @@ SAML_CLIENT_SECRET_VERIFIER=
 PGSSLMODE=
 
 # Define which hostnames are expected for the app to work on
-ALLOWED_HOSTNAMES='"cal.com","cal.dev","cal-staging.com","cal.community","cal.local:3000","localhost:3000"'
+ALLOWED_HOSTNAMES='"cal.local:3000","localhost:3000"'
 #  Reserved orgs subdomains for our own usage
 RESERVED_SUBDOMAINS='"app","auth","docs","design","console","go","status","api","saml","www","matrix","developer","cal","my","team","support","security","blog","learn","admin"'
 
@@ -116,6 +94,15 @@ NEXT_PUBLIC_POSTHOG_HOST=
 # Dub Config
 DUB_API_KEY=
 NEXT_PUBLIC_DUB_PROGRAM_ID=
+# Optional: Domain for SMS workflow shortened links
+DUB_SMS_DOMAIN=
+# Optional: Folder ID to organize SMS workflow shortened links in Dub
+DUB_SMS_FOLDER_ID=
+
+# Sink URL Shortener Config
+SINK_API_URL=
+# API key for Sink authentication
+SINK_API_KEY=
 
 # Zendesk Config
 NEXT_PUBLIC_ZENDESK_KEY=
@@ -127,6 +114,10 @@ NEXT_PUBLIC_HELPSCOUT_KEY=
 NEXT_PUBLIC_FRESHCHAT_TOKEN=
 NEXT_PUBLIC_FRESHCHAT_HOST=
 
+# Microsoft OAuth credentials
+OUTLOOK_LOGIN_ENABLED=false
+
+
 # For holiday feature:
 # Step-by-step: Get a Google Calendar API Key
 # 1. Go to Google Cloud Console: https://console.cloud.google.com/
@@ -134,7 +125,6 @@ NEXT_PUBLIC_FRESHCHAT_HOST=
 # 3. Enable Google Calendar API (APIs & Services → Library , Search for Google Calendar API)
 # 4. Create the API Key (APIs & Services → Credentials)
 GOOGLE_CALENDAR_API_KEY=
-
 # Google OAuth credentials
 # To enable Login with Google you need to:
 # 1. Set `GOOGLE_API_CREDENTIALS` below
@@ -145,7 +135,7 @@ GOOGLE_LOGIN_ENABLED=false
 
 #   - GOOGLE CALENDAR/MEET/LOGIN
 # Needed to enable Google Calendar integration and Login with Google
-# @see https://github.com/calcom/cal.com#obtaining-the-google-api-credentials
+# @see https://github.com/calcom/cal.diy#obtaining-the-google-api-credentials
 GOOGLE_API_CREDENTIALS=
 # Token to verify incoming webhooks from Google Calendar
 GOOGLE_WEBHOOK_TOKEN=
@@ -191,17 +181,6 @@ FORMBRICKS_FEEDBACK_SURVEY_ID=
 AVATARAPI_USERNAME=
 AVATARAPI_PASSWORD=
 
-# Twilio
-# Used to send SMS reminders in workflows
-TWILIO_SID=
-TWILIO_TOKEN=
-TWILIO_MESSAGING_SID=
-TWILIO_PHONE_NUMBER=
-TWILIO_WHATSAPP_PHONE_NUMBER=
-TWILIO_WHATSAPP_REMINDER_CONTENT_SID=
-TWILIO_WHATSAPP_CANCELLED_CONTENT_SID=
-TWILIO_WHATSAPP_RESCHEDULED_CONTENT_SID=
-TWILIO_WHATSAPP_COMPLETED_CONTENT_SID=
 # For NEXT_PUBLIC_SENDER_ID only letters, numbers and spaces are allowed (max. 11 characters)
 NEXT_PUBLIC_SENDER_ID=
 TWILIO_VERIFY_SID=
@@ -216,11 +195,13 @@ NEXT_PUBLIC_STRIPE_PREMIUM_PLAN_PRICE=
 NEXT_PUBLIC_IS_PREMIUM_NEW_PLAN=0
 NEXT_PUBLIC_STRIPE_PREMIUM_NEW_PLAN_PRICE=
 STRIPE_TEAM_MONTHLY_PRICE_ID=
+STRIPE_TEAM_ANNUAL_PRICE_ID=
 NEXT_PUBLIC_STRIPE_CREDITS_PRICE_ID=
 ORG_MONTHLY_CREDITS=
 STRIPE_TEAM_PRODUCT_ID=
 # It is a price ID in the product with id STRIPE_ORG_PRODUCT_ID
 STRIPE_ORG_MONTHLY_PRICE_ID=
+STRIPE_ORG_ANNUAL_PRICE_ID=
 STRIPE_ORG_PRODUCT_ID=
 # Used to pass trial days for orgs during the Stripe checkout session
 STRIPE_ORG_TRIAL_DAYS=
@@ -239,7 +220,7 @@ API_KEY_PREFIX=cal_
 # allow access to the nodemailer transports from the .env file. E-mail templates are accessible within lib/emails/
 # Configures the global From: header whilst sending emails.
 EMAIL_FROM='notifications@yourselfhostedcal.com'
-EMAIL_FROM_NAME='Cal.com'
+EMAIL_FROM_NAME='Cal.diy'
 
 # Configure SMTP settings (@see https://nodemailer.com/smtp/).
 # Configuration to receive emails locally (mailhog)
@@ -283,9 +264,6 @@ CLOUDFLARE_TURNSTILE_SECRET=
 # 0 = false, 1=true
 NEXT_PUBLIC_VERCEL_USE_BOTID_IN_BOOKER=
 
-# Set the following value to true if you wish to enable Team Impersonation
-NEXT_PUBLIC_TEAM_IMPERSONATION=false
-
 # Close.com internal CRM
 CLOSECOM_CLIENT_ID=
 CLOSECOM_CLIENT_SECRET=
@@ -294,8 +272,8 @@ CLOSECOM_CLIENT_SECRET=
 SENDGRID_SYNC_API_KEY=
 
 # Change your Brand
-NEXT_PUBLIC_APP_NAME="Cal.com"
-NEXT_PUBLIC_SUPPORT_MAIL_ADDRESS="help@cal.com"
+NEXT_PUBLIC_APP_NAME="Cal.diy"
+NEXT_PUBLIC_SUPPORT_MAIL_ADDRESS="help@cal.diy"
 NEXT_PUBLIC_COMPANY_NAME="Cal.com, Inc."
 # Set this to true in to disable new signups
 # NEXT_PUBLIC_DISABLE_SIGNUP=true
@@ -355,7 +333,7 @@ E2E_TEST_APPLE_CALENDAR_EMAIL=""
 E2E_TEST_APPLE_CALENDAR_PASSWORD=""
 
 # - CALCOM QA ACCOUNT
-# Used for E2E tests on Cal.com that require 3rd party integrations
+# Used for E2E tests on Cal.diy that require 3rd party integrations
 E2E_TEST_CALCOM_QA_EMAIL="qa@example.com"
 # Replace with your own password
 E2E_TEST_CALCOM_QA_PASSWORD="password"
@@ -363,7 +341,7 @@ E2E_TEST_CALCOM_QA_GCAL_CREDENTIALS=
 E2E_TEST_CALCOM_GCAL_KEYS=
 
 # - APP CREDENTIAL SYNC ***********************************************************************************
-# Used for self-hosters that are implementing Cal.com into their applications that already have certain integrations
+# Used for self-hosters that are implementing Cal.diy into their applications that already have certain integrations
 # Under settings/admin/apps ensure that all app secrets are set the same as the parent application
 # You can use: `openssl rand -base64 32` to generate one
 CALCOM_CREDENTIAL_SYNC_SECRET=""
@@ -371,24 +349,11 @@ CALCOM_CREDENTIAL_SYNC_SECRET=""
 CALCOM_CREDENTIAL_SYNC_HEADER_NAME="calcom-credential-sync-secret"
 # This the endpoint from which the token is fetched
 CALCOM_CREDENTIAL_SYNC_ENDPOINT=""
-# Key should match on Cal.com and your application
+# Key should match on Cal.diy and your application
 # must be 24 bytes for AES256 encryption algorithm
 # You can use: `openssl rand -base64 24` to generate one
 CALCOM_APP_CREDENTIAL_ENCRYPTION_KEY=""
 
-# - OIDC E2E TEST *******************************************************************************************
-
-# Ensure this ADMIN EMAIL is present in the SAML_ADMINS list
-E2E_TEST_SAML_ADMIN_EMAIL=
-E2E_TEST_SAML_ADMIN_PASSWORD=
-
-E2E_TEST_OIDC_CLIENT_ID=
-E2E_TEST_OIDC_CLIENT_SECRET=
-E2E_TEST_OIDC_PROVIDER_DOMAIN=
-
-E2E_TEST_OIDC_USER_EMAIL=
-E2E_TEST_OIDC_USER_PASSWORD=
-
 # ***********************************************************************************************************
 
 # api v2
@@ -461,7 +426,7 @@ LINGO_DOT_DEV_API_KEY=
 DIRECTORY_IDS_TO_LOG=
 
 
-# Set this when Cal.com is used to serve only one organization's booking pages
+# Set this when Cal.diy is used to serve only one organization's booking pages
 # Read more about it in the README.md
 NEXT_PUBLIC_SINGLE_ORG_SLUG=
 
@@ -504,6 +469,10 @@ TZ=UTC
 SEED_PLATFORM_OAUTH_CLIENT_ID=
 SEED_PLATFORM_OAUTH_CLIENT_SECRET=
 
+# test oauth2 client for `packages/platform/examples/base` (optional)
+SEED_OAUTH2_CLIENT_ID=
+SEED_OAUTH2_CLIENT_SECRET_HASHED=
+
 # Trigger.dev
 ENABLE_ASYNC_TASKER="false" # set to "true" to enable
 TRIGGER_SECRET_KEY=
@@ -512,10 +481,3 @@ TRIGGER_DEV_PROJECT_REF=
 
 GOOGLE_ADS_ENABLED=1      # To enable Google Ads tracking (gclid)
 LINKEDIN_ADS_ENABLED=1    # To enable LinkedIn Ads tracking (li_fat_id)
-
-# - BACKBLAZE B2 (Compliance Documents) *************************************************************************
-# Used for storing and serving compliance documents (SOC 2, ISO 27001, pentest reports)
-B2_APPLICATION_KEY_ID=
-B2_APPLICATION_KEY=
-B2_BUCKET_ID=
-B2_BUCKET_NAME=

.github/CODEOWNERS

@@ -1,38 +1 @@
-.github/actions/**/* @calcom/Foundation
-.github/workflows/**/* @calcom/Foundation
-/**/package.json @calcom/Foundation
-/apps/api/**/* @calcom/Foundation
-/apps/web/**/layout.tsx @calcom/Consumer @calcom/Foundation
-/apps/web/lib/csp.ts @calcom/Foundation
-/apps/web/lib/buildNonce.ts @calcom/Foundation
-/apps/web/lib/daily-webhook/**/* @calcom/Foundation
-/apps/web/lib/core/**/* @calcom/Foundation
-/apps/web/lib/booking.ts @calcom/Foundation
-/apps/web/lib/handleOrgRedirect.ts @calcom/Foundation
-/apps/web/proxy.ts @calcom/Foundation
-/deploy/**/* @calcom/Foundation
-/packages/app-store/applecalendar/**/* @calcom/Foundation
-/packages/app-store/caldavcalendar/**/* @calcom/Foundation
-/packages/app-store/exchange2013calendar/**/* @calcom/Foundation
-/packages/app-store/exchange2016calendar/**/* @calcom/Foundation
-/packages/app-store/exchangecalendar/**/* @calcom/Foundation
-/packages/app-store/feishucalendar/**/* @calcom/Foundation
-/packages/app-store/googlecalendar/**/* @calcom/Foundation
-/packages/app-store/ics-feedcalendar/**/* @calcom/Foundation
-/packages/app-store/larkcalendar/**/* @calcom/Foundation
-/packages/app-store/office365calendar/**/* @calcom/Foundation
-/packages/app-store/zohocalendar/**/* @calcom/Foundation
-/packages/embeds/**/* @calcom/Foundation
-/packages/features/auth/lib/next-auth-options.ts @calcom/Foundation
-/packages/features/bookings/lib/**/* @calcom/Foundation
-/packages/features/availability/lib/getAggregatedAvailability/getAggregatedAvailability.ts @calcom/Foundation
-/packages/features/availability/lib/getUserAvailability.ts @calcom/Foundation
-/packages/features/bookings/lib/getLuckyUser.ts @calcom/Foundation
-/packages/features/schedules/lib/slots.ts @calcom/Foundation
-/packages/platform/atoms/**/*WebWrapper.tsx @calcom/Consumer
-/packages/platform/**/* @calcom/Consumer @calcom/Foundation
-/packages/prisma/**/* @calcom/Foundation
-/packages/trpc/server/routers/viewer/bookings/confirm.handler.ts @calcom/Foundation
-/packages/trpc/server/routers/viewer/bookings/get.handler.ts @calcom/Foundation
-/packages/trpc/server/routers/viewer/slots/**/* @calcom/Foundation
-/packages/ui/**/* @calcom/Consumer @calcom/Foundation
+

.github/ISSUE_TEMPLATE/companion.md

@@ -1,120 +0,0 @@
----
-name: Companion (iOS/Android/Extension)
-about: Report bugs or request features for mobile apps and browser extension
-title: ""
-labels: ["companion", "🚨 needs approval"]
-assignees: ""
----
-
-### Issue Type
-
-<!--
-  Select one:
-  - Bug Report
-  - Feature Request
--->
-
-- [ ] 🐛 Bug Report
-- [ ] ✨ Feature Request
-
-### Platform
-
-<!--
-  Select all that apply:
--->
-
-- [ ] 📱 iOS App
-- [ ] 🤖 Android App
-- [ ] 🧩 Browser Extension
-
-### Platform Details
-
-<!--
-  Fill in the details for your selected platform(s).
-  Delete sections that don't apply.
--->
-
-#### iOS
-- **iOS Version**: (e.g., 17.2)
-- **Device Model**: (e.g., iPhone 15 Pro)
-- **App Version**: (e.g., 1.0.0)
-
-#### Android
-- **Android Version**: (e.g., 14)
-- **Device Model**: (e.g., Pixel 8)
-- **App Version**: (e.g., 1.0.0)
-
-#### Browser Extension
-- **Browser & Version**: (e.g., Chrome 120, Firefox 121)
-- **Extension Version**: (e.g., 1.0.0)
-
----
-
-### Description
-
-<!--
-  Provide a clear and concise description of the issue or feature.
--->
-
-(Write your description here.)
-
-### Steps to Reproduce (Bug Reports Only)
-
-<!--
-  If this is a bug report, provide steps to reproduce the issue.
-  Delete this section for feature requests.
--->
-
-1. Go to...
-2. Click on...
-3. See error...
-
-### Expected Behavior
-
-<!--
-  What did you expect to happen?
--->
-
-(Describe what you expected.)
-
-### Actual Behavior (Bug Reports Only)
-
-<!--
-  What actually happened? Delete this section for feature requests.
--->
-
-(Describe what actually happened.)
-
-### Proposed Solution (Feature Requests Only)
-
-<!--
-  If this is a feature request, describe your proposed solution.
-  Delete this section for bug reports.
--->
-
-(Describe your proposed solution.)
-
-### Screenshots / Evidence
-
-<!--
-  Add screenshots, screen recordings, or console logs if applicable.
-  You can use tools like Bird Eats Bug for recordings.
--->
-
-(Attach evidence here.)
-
-### Additional Context
-
-<!--
-  Any other information that might be helpful.
--->
-
-(Add any additional context here.)
-
----
-
-##### House rules
-
-- If this issue has a `🚨 needs approval` label, don't start coding yet. Wait until a core member approves the request by removing this label.
-- Your ideas are invaluable! However, they undergo review to ensure alignment with the product's direction.
-- Follow best practices in our [Contributor Docs](https://github.com/calcom/cal.com/blob/main/CONTRIBUTING.md)

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: Questions
-    url: https://github.com/calcom/cal.com/discussions
-    about: Need help selfhosting or ask a general question about the project? Open a discussion
+    url: https://github.com/calcom/cal.diy/discussions
+    about: Need help self-hosting or have a general question about Cal.diy? Open a discussion

.github/ISSUE_TEMPLATE/feature_request.md

@@ -55,4 +55,4 @@ assignees: ""
 - If this issue has a `🚨 needs approval` label, don't start coding yet. Wait until a core member approves feature request by removing this label, then you can start coding.
   - For clarity: Non-core member issues automatically get the `🚨 needs approval` label.
   - Your feature ideas are invaluable to us! However, they undergo review to ensure alignment with the product's direction.
-  - Follow Best Practices lined out in our [Contributor Docs](https://github.com/calcom/cal.com/blob/main/CONTRIBUTING.md)
+  - Follow Best Practices lined out in our [Contributor Docs](https://github.com/calcom/cal.diy/blob/main/CONTRIBUTING.md)

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,9 +1,10 @@
 ## What does this PR do?
 
-<!-- Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change. -->
+<!-- Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
+
+Note: Cal.diy is a community-maintained open-source project. Contributions here do NOT flow to Cal.com's production service. -->
 
 - Fixes #XXXX (GitHub issue number)
-- Fixes CAL-XXXX (Linear issue number - should be visible at the bottom of the GitHub issue description)
 
 ## Visual Demo (For contributors especially)
 
@@ -22,7 +23,7 @@ A visual demonstration is strongly recommended, for both the original and new ch
 ## 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](https://cal.com/docs). If N/A, write N/A here and check the checkbox.
+- [ ] I have updated the developer 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.
 
 ## How should this be tested?
@@ -38,7 +39,7 @@ A visual demonstration is strongly recommended, for both the original and new ch
 
 <!-- Remove bullet points below that don't apply to you -->
 
-- I haven't read the [contributing guide](https://github.com/calcom/cal.com/blob/main/CONTRIBUTING.md)
+- I haven't read the [contributing guide](https://github.com/calcom/cal.diy/blob/main/CONTRIBUTING.md)
 - My code doesn't follow the style guidelines of this project
 - I haven't commented my code, particularly in hard-to-understand areas
 - I haven't checked if my changes generate no new warnings

.github/actions/cache-db-key/action.yml

@@ -18,6 +18,6 @@ runs:
       env:
         CACHE_NAME: cache-db
         PATH_KEY: ${{ inputs.path }}
-        PRISMA_HASH: ${{ hashFiles('packages/prisma/schema.prisma', 'packages/prisma/migrations/**/**.sql', 'packages/prisma/*.ts') }}
+        PRISMA_HASH: ${{ hashFiles('packages/prisma/schema.prisma', 'packages/prisma/migrations/**/**.sql', 'packages/prisma/*.ts', 'scripts/seed*.ts') }}
       run: |
         echo "key=${CACHE_NAME}-${PATH_KEY}-${PRISMA_HASH}" >> $GITHUB_OUTPUT

.github/actions/cache-db/action.yml

@@ -32,14 +32,16 @@ runs:
       shell: bash
     - name: Postgres Dump Backup
       if: steps.cache-db.outputs.cache-hit != 'true'
-      uses: tj-actions/pg-dump@v2.3
-      with:
-        database_url: ${{ inputs.DATABASE_URL }}
-        path: ${{ inputs.path }}
-        options: "-O"
+      run: |
+        mkdir -p $(dirname "${{ inputs.path }}")
+        docker run --rm --network host \
+          -v ${{ github.workspace }}:${{ github.workspace }} -w ${{ github.workspace }} \
+          postgres:18 pg_dump "${{ inputs.DATABASE_URL }}" -O -f ${{ inputs.path }}
+      shell: bash
     - name: Postgres Backup Restore
       if: steps.cache-db.outputs.cache-hit == 'true'
-      uses: tj-actions/pg-restore@v4.5
-      with:
-        database_url: ${{ inputs.DATABASE_URL }}
-        backup_file: ${{ inputs.path }}
+      run: |
+        docker run --rm -i --network host \
+          -v ${{ github.workspace }}:${{ github.workspace }} -w ${{ github.workspace }} \
+          postgres:18 psql "${{ inputs.DATABASE_URL }}" -f ${{ inputs.path }}
+      shell: bash

.github/actions/devin-session/action.yml

@@ -1,124 +0,0 @@
-name: 'Devin Session Checker'
-description: 'Check for existing Devin sessions on a PR'
-
-inputs:
-  devin-api-key:
-    description: 'Devin API key'
-    required: true
-  github-token:
-    description: 'GitHub token for API calls'
-    required: true
-  pr-number:
-    description: 'PR number to check for existing sessions'
-    required: true
-
-outputs:
-  has-existing-session:
-    description: 'Whether an existing active session was found (true/false)'
-    value: ${{ steps.check-session.outputs.has-existing-session }}
-  session-id:
-    description: 'ID of the existing session (if found)'
-    value: ${{ steps.check-session.outputs.session-id }}
-  session-url:
-    description: 'URL of the existing session (if found)'
-    value: ${{ steps.check-session.outputs.session-url }}
-
-runs:
-  using: 'composite'
-  steps:
-    - name: Check for existing Devin session
-      id: check-session
-      uses: actions/github-script@v7
-      env:
-        DEVIN_API_KEY: ${{ inputs.devin-api-key }}
-        PR_NUMBER: ${{ inputs.pr-number }}
-      with:
-        github-token: ${{ inputs.github-token }}
-        script: |
-          const { owner, repo } = context.repo;
-          const prNumber = parseInt(process.env.PR_NUMBER, 10);
-          const SESSION_URL_REGEX = /app\.devin\.ai\/sessions\/([a-f0-9-]+)/;
-          const ACTIVE_STATUSES = ['working', 'blocked', 'resumed'];
-
-          async function checkSessionStatus(sessionId) {
-            const response = await fetch(`https://api.devin.ai/v1/sessions/${sessionId}`, {
-              headers: {
-                'Authorization': `Bearer ${process.env.DEVIN_API_KEY}`,
-                'Content-Type': 'application/json'
-              }
-            });
-
-            if (!response.ok) {
-              console.log(`Failed to fetch session ${sessionId}: ${response.status}`);
-              return null;
-            }
-
-            return await response.json();
-          }
-
-          const { data: pr } = await github.rest.pulls.get({
-            owner,
-            repo,
-            pull_number: prNumber
-          });
-
-          const prBody = pr.body || '';
-          const prSessionMatch = prBody.match(SESSION_URL_REGEX);
-
-          if (prSessionMatch) {
-            const sessionId = prSessionMatch[1];
-            console.log(`PR was created by Devin session: ${sessionId}`);
-            const session = await checkSessionStatus(sessionId);
-            if (session) {
-              console.log(`PR creator session status: ${session.status_enum}`);
-              if (ACTIVE_STATUSES.includes(session.status_enum)) {
-                core.setOutput('has-existing-session', 'true');
-                core.setOutput('session-id', sessionId);
-                core.setOutput('session-url', `https://app.devin.ai/sessions/${sessionId}`);
-                return;
-              } else {
-                console.log(`PR creator session ${sessionId} is not active, will check comments`);
-              }
-            }
-          }
-
-          const devinSessionPatterns = [
-            'Devin AI is completing this stale PR',
-            'Devin AI is addressing Cubic AI',
-            'Devin AI is resolving merge conflicts'
-          ];
-
-          const comments = await github.rest.issues.listComments({
-            owner,
-            repo,
-            issue_number: prNumber
-          });
-
-          for (const comment of comments.data.reverse()) {
-            const hasDevinSession = devinSessionPatterns.some(pattern => comment.body?.includes(pattern));
-            if (hasDevinSession) {
-              const match = comment.body?.match(SESSION_URL_REGEX);
-              if (match) {
-                const sessionId = match[1];
-                console.log(`Found existing Devin session from comment: ${sessionId}`);
-
-                  const session = await checkSessionStatus(sessionId);
-                  if (session) {
-                    if (ACTIVE_STATUSES.includes(session.status_enum)) {
-                    console.log(`Session ${sessionId} is active (status: ${session.status_enum})`);
-                    core.setOutput('has-existing-session', 'true');
-                    core.setOutput('session-id', sessionId);
-                    core.setOutput('session-url', `https://app.devin.ai/sessions/${sessionId}`);
-                    return;
-                  } else {
-                    console.log(`Session ${sessionId} is not active (status: ${session.status_enum})`);
-                  }
-                }
-              }
-            }
-          }
-
-          console.log('No existing active Devin session found');
-          core.setOutput('has-existing-session', 'false');
-          core.setOutput('session-id', '');
-          core.setOutput('session-url', '');

.github/actions/docker-build-and-test/action.yml

@@ -62,8 +62,8 @@ runs:
       with:
         images: |
           docker.io/calendso/calendso
-          docker.io/calcom/cal.com
-          ghcr.io/calcom/cal.com
+          docker.io/calcom/cal.diy
+          ghcr.io/calcom/cal.diy
         flavor: |
           latest=${{ !github.event.release.prerelease && inputs.use-as-latest == 'true' }}
           suffix=${{ inputs.platform-suffix }}
@@ -91,7 +91,7 @@ runs:
         docker compose logs database
 
     - name: Set up Docker Buildx
-      uses: useblacksmith/setup-docker-builder@v1
+      uses: docker/setup-buildx-action@v3
       with:
         driver-opts: |
           network=container:database
@@ -100,7 +100,7 @@ runs:
 
     - name: Build image
       id: docker_build
-      uses: useblacksmith/build-push-action@v2
+      uses: docker/build-push-action@v6
       with:
         context: ./
         file: ./Dockerfile
@@ -159,7 +159,7 @@ runs:
 
     - name: Push image
       id: docker_push
-      uses: useblacksmith/build-push-action@v2
+      uses: docker/build-push-action@v6
       if: ${{ inputs.push-image == 'true' && !github.event.release.prerelease }}
       with:
         context: ./

.github/workflows/all-checks.yml

@@ -29,11 +29,6 @@ jobs:
     uses: ./.github/workflows/api-v2-unit-tests.yml
     secrets: inherit
 
-  build-api-v1:
-    name: Production builds
-    uses: ./.github/workflows/api-v1-production-build.yml
-    secrets: inherit
-
   build-api-v2:
     name: Production builds
     uses: ./.github/workflows/api-v2-production-build.yml
@@ -51,38 +46,38 @@ jobs:
 
   integration-test:
     name: Tests
-    needs: [lint, build, build-api-v1, build-api-v2]
+    needs: [lint, build, build-api-v2]
     uses: ./.github/workflows/integration-tests.yml
     secrets: inherit
 
   e2e:
     name: Tests
-    needs: [lint, build, build-api-v1, build-api-v2]
+    needs: [lint, build, build-api-v2]
     uses: ./.github/workflows/e2e.yml
     secrets: inherit
 
   e2e-app-store:
     name: Tests
-    needs: [lint, build, build-api-v1, build-api-v2]
+    needs: [lint, build, build-api-v2]
     uses: ./.github/workflows/e2e-app-store.yml
     secrets: inherit
 
   e2e-embed:
     name: Tests
-    needs: [lint, build, build-api-v1, build-api-v2]
+    needs: [lint, build, build-api-v2]
     uses: ./.github/workflows/e2e-embed.yml
     secrets: inherit
 
   e2e-embed-react:
     name: Tests
-    needs: [lint, build, build-api-v1, build-api-v2]
+    needs: [lint, build, build-api-v2]
     uses: ./.github/workflows/e2e-embed-react.yml
     secrets: inherit
 
   required:
-    needs: [lint, type-check, unit-test, api-v2-unit-test, integration-test, build, build-api-v1, build-api-v2, e2e, e2e-embed, e2e-embed-react, e2e-app-store]
+    needs: [lint, type-check, unit-test, api-v2-unit-test, integration-test, build, build-api-v2, e2e, e2e-embed, e2e-embed-react, e2e-app-store]
     if: always()
-    runs-on: blacksmith-2vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - name: fail if conditional jobs failed
         if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') || contains(needs.*.result, 'cancelled')

.github/workflows/api-v1-production-build.yml

@@ -1,94 +0,0 @@
-name: Production Builds
-
-on:
-  workflow_call:
-
-permissions:
-  contents: read
-
-env:
-  ALLOWED_HOSTNAMES: ${{ vars.CI_ALLOWED_HOSTNAMES }}
-  CALENDSO_ENCRYPTION_KEY: ${{ secrets.CI_CALENDSO_ENCRYPTION_KEY }}
-  DATABASE_URL: ${{ secrets.CI_DATABASE_URL }}
-  DATABASE_DIRECT_URL: ${{ secrets.CI_DATABASE_URL }}
-  E2E_TEST_APPLE_CALENDAR_EMAIL: ${{ secrets.E2E_TEST_APPLE_CALENDAR_EMAIL }}
-  E2E_TEST_APPLE_CALENDAR_PASSWORD: ${{ secrets.E2E_TEST_APPLE_CALENDAR_PASSWORD }}
-  E2E_TEST_CALCOM_QA_EMAIL: ${{ secrets.E2E_TEST_CALCOM_QA_EMAIL }}
-  E2E_TEST_CALCOM_QA_PASSWORD: ${{ secrets.E2E_TEST_CALCOM_QA_PASSWORD }}
-  E2E_TEST_CALCOM_QA_GCAL_CREDENTIALS: ${{ secrets.E2E_TEST_CALCOM_QA_GCAL_CREDENTIALS }}
-  E2E_TEST_CALCOM_GCAL_KEYS: ${{ secrets.E2E_TEST_CALCOM_GCAL_KEYS }}
-  GOOGLE_API_CREDENTIALS: ${{ secrets.CI_GOOGLE_API_CREDENTIALS }}
-  GOOGLE_LOGIN_ENABLED: ${{ vars.CI_GOOGLE_LOGIN_ENABLED }}
-  NEXTAUTH_SECRET: ${{ secrets.CI_NEXTAUTH_SECRET }}
-  NEXTAUTH_URL: ${{ secrets.CI_NEXTAUTH_URL }}
-  NEXT_PUBLIC_API_V2_URL: ${{ secrets.CI_NEXT_PUBLIC_API_V2_URL }}
-  NEXT_PUBLIC_API_V2_ROOT_URL: ${{ secrets.CI_NEXT_PUBLIC_API_V2_ROOT_URL }}
-  NEXT_PUBLIC_IS_E2E: ${{ vars.CI_NEXT_PUBLIC_IS_E2E }}
-  NEXT_PUBLIC_ORG_SELF_SERVE_ENABLED: ${{ vars.CI_NEXT_PUBLIC_ORG_SELF_SERVE_ENABLED }}
-  NEXT_PUBLIC_STRIPE_PUBLIC_KEY: ${{ secrets.CI_NEXT_PUBLIC_STRIPE_PUBLIC_KEY }}
-  NEXT_PUBLIC_WEBAPP_URL: ${{ vars.CI_NEXT_PUBLIC_WEBAPP_URL }}
-  NEXT_PUBLIC_WEBSITE_URL: ${{ vars.CI_NEXT_PUBLIC_WEBSITE_URL }}
-  PAYMENT_FEE_FIXED: ${{ vars.CI_PAYMENT_FEE_FIXED }}
-  PAYMENT_FEE_PERCENTAGE: ${{ vars.CI_PAYMENT_FEE_PERCENTAGE }}
-  SAML_ADMINS: ${{ secrets.CI_SAML_ADMINS }}
-  SAML_DATABASE_URL: ${{ secrets.CI_SAML_DATABASE_URL }}
-  STRIPE_PRIVATE_KEY: ${{ secrets.CI_STRIPE_PRIVATE_KEY }}
-  STRIPE_CLIENT_ID: ${{ secrets.CI_STRIPE_CLIENT_ID }}
-  STRIPE_WEBHOOK_SECRET: ${{ secrets.CI_STRIPE_WEBHOOK_SECRET }}
-  SENDGRID_API_KEY: ${{ secrets.CI_SENDGRID_API_KEY }}
-  SENDGRID_EMAIL: ${{ secrets.CI_SENDGRID_EMAIL }}
-  TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
-  TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
-
-jobs:
-  build:
-    name: Build API v1
-    runs-on: blacksmith-4vcpu-ubuntu-2404
-    timeout-minutes: 30
-    services:
-      postgres:
-        image: postgres:13
-        credentials:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: calendso
-        options: >-
-          --health-cmd "pg_isready -h 127.0.0.1 -U postgres"
-          --health-interval 2s
-          --health-timeout 3s
-          --health-retries 15
-          --health-start-period 2s
-        ports:
-          - 5432:5432
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          sparse-checkout: .github
-      - uses: ./.github/actions/cache-checkout
-      - uses: ./.github/actions/yarn-install
-      - uses: ./.github/actions/cache-db
-      - name: Cache API v1 production build
-        uses: actions/cache@v4
-        id: cache-api-v1-build
-        env:
-          cache-name: api-v1-build
-          key-1: ${{ hashFiles('yarn.lock') }}
-          key-2: ${{ hashFiles('apps/api/v1/**.[jt]s', 'apps/api/v1/**.[jt]sx', '!**/node_modules') }}
-        with:
-          path: |
-            ${{ github.workspace }}/apps/api/v1/.next
-            **/.turbo/**
-            **/dist/**
-          key: ${{ env.cache-name }}-${{ env.key-1 }}-${{ env.key-2 }}
-      - name: Log Cache Hit
-        if: steps.cache-api-v1-build.outputs.cache-hit == 'true'
-        run: echo "Cache hit for API v1 build. Skipping build."
-      - name: Run build
-        if: steps.cache-api-v1-build.outputs.cache-hit != 'true'
-        run: |
-          export NODE_OPTIONS="--max_old_space_size=8192"
-          yarn turbo run build --filter=@calcom/api...
-        shell: bash

.github/workflows/api-v2-production-build.yml

@@ -14,11 +14,11 @@ jobs:
     name: Build API v2
     permissions:
       contents: read
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     timeout-minutes: 30
     services:
       postgres:
-        image: postgres:13
+        image: postgres:18
         credentials:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/api-v2-unit-tests.yml

@@ -9,7 +9,7 @@ jobs:
   test:
     name: API v2 Unit
     timeout-minutes: 20
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/atoms-production-build.yml

@@ -8,7 +8,7 @@ jobs:
     name: Build Atoms
     permissions:
       contents: read
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4

.github/workflows/cache-clean.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   cleanup:
-    runs-on: blacksmith-2vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - name: Check out code
         uses: actions/checkout@v4

.github/workflows/changesets.yml

@@ -13,7 +13,7 @@ permissions:
 
 jobs:
   release:
-    if: github.repository == 'calcom/cal.com' # prevent this action from running on forks
+    if: github.repository == 'calcom/cal.diy' # prevent this action from running on forks
     name: Release
     runs-on: ubuntu-latest
     steps:

.github/workflows/check-api-v2-breaking-changes.yml

@@ -1,67 +0,0 @@
-name: Check API v2 breaking changes
-
-on:
-  workflow_call:
-
-permissions:
-  contents: read
-
-env:
-  API_KEY_PREFIX: ${{ secrets.CI_API_KEY_PREFIX }}
-  API_PORT: ${{ vars.CI_API_V2_PORT }}
-  API_URL: "http://localhost"
-  CALCOM_LICENSE_KEY: ${{ secrets.CI_CALCOM_LICENSE_KEY }}
-  DATABASE_URL: ${{ secrets.CI_DATABASE_URL }}
-  DATABASE_READ_URL: ${{ secrets.CI_DATABASE_URL }}
-  DATABASE_WRITE_URL: ${{ secrets.CI_DATABASE_URL }}
-  JWT_SECRET: ${{ secrets.CI_JWT_SECRET }}
-  NEXTAUTH_SECRET: ${{ secrets.CI_NEXTAUTH_SECRET }}
-  NODE_ENV: ${{ vars.CI_NODE_ENV }}
-  NODE_OPTIONS: --max-old-space-size=4096
-  REDIS_URL: "redis://localhost:6379"
-  STRIPE_API_KEY: ${{ secrets.CI_STRIPE_PRIVATE_KEY }}
-  STRIPE_WEBHOOK_SECRET: ${{ secrets.CI_STRIPE_WEBHOOK_SECRET }}
-  WEB_APP_URL: "https://app.cal.com"
-
-jobs:
-  check-api-v2-breaking-changes:
-    name: Check API v2 breaking changes
-    timeout-minutes: 10
-    runs-on: blacksmith-2vcpu-ubuntu-2404
-    steps:
-      - uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - uses: actions/checkout@v4
-        with:
-          sparse-checkout: .github
-      - uses: ./.github/actions/cache-checkout
-      - uses: ./.github/actions/yarn-install
-
-      - name: Build platform packages
-        run: |
-          yarn turbo run build \
-            --filter=@calcom/platform-constants \
-            --filter=@calcom/platform-enums \
-            --filter=@calcom/platform-utils \
-            --filter=@calcom/platform-types \
-            --filter=@calcom/platform-libraries \
-            --filter=@calcom/trpc
-
-      - name: Generate Swagger
-        working-directory: apps/api/v2
-        run: |
-          yarn prisma generate
-          yarn generate-swagger
-
-      - name: Check API v2 breaking changes
-        run: |
-          docker run --rm \
-            -v "$PWD:/work" -w /work \
-            tufin/oasdiff:latest \
-            breaking \
-            https://raw.githubusercontent.com/calcom/cal.com/refs/heads/main/docs/api-reference/v2/openapi.json \
-            docs/api-reference/v2/openapi.json \
-            --fail-on ERR \
-            --err-ignore .github/oasdiff-err-ignore.txt

.github/workflows/check-prisma-migrations.yml

@@ -8,10 +8,10 @@ env:
 jobs:
   check-prisma-migrations:
     name: Check migrations match schema
-    runs-on: blacksmith-2vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     services:
       postgres:
-        image: postgres:13
+        image: postgres:18
         credentials:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/check-types.yml

@@ -9,7 +9,7 @@ permissions:
   contents: read
 jobs:
   check-types:
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/companion-build.yml

@@ -1,44 +0,0 @@
-name: Companion Builds
-
-on:
-  workflow_call:
-
-permissions:
-  contents: read
-
-env:
-  EXPO_PUBLIC_CAL_API_KEY: ${{ secrets.CI_EXPO_PUBLIC_CAL_API_KEY || vars.CI_EXPO_PUBLIC_CAL_API_KEY || vars.EXPO_PUBLIC_CAL_API_KEY }}
-
-jobs:
-  build:
-    name: Build Companion App & Extension
-    runs-on: blacksmith-4vcpu-ubuntu-2404
-    timeout-minutes: 30
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          sparse-checkout: .github
-      - uses: ./.github/actions/cache-checkout
-
-      - name: Setup Bun
-        uses: oven-sh/setup-bun@v1
-        with:
-          bun-version: 1.3.0
-          cache: true
-          cache-dependency-path: companion/bun.lock
-
-      - name: Install dependencies
-        working-directory: companion
-        run: bun install --frozen-lockfile
-
-      - name: Build Expo web app
-        working-directory: companion
-        env:
-          EXPO_NO_TELEMETRY: 1
-          CI: true
-        run: bunx expo export --platform web
-
-      - name: Build browser extension
-        working-directory: companion
-        run: bun run ext:build

.github/workflows/companion-lint.yml

@@ -1,33 +0,0 @@
-name: Companion Lint
-
-on:
-  workflow_call:
-
-permissions:
-  contents: read
-
-jobs:
-  lint:
-    name: Lint Companion App
-    runs-on: blacksmith-2vcpu-ubuntu-2404
-    timeout-minutes: 10
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          sparse-checkout: .github
-      - uses: ./.github/actions/cache-checkout
-
-      - name: Setup Bun
-        uses: oven-sh/setup-bun@v1
-        with:
-          bun-version: 1.3.0
-          cache: false
-
-      - name: Install dependencies
-        working-directory: companion
-        run: bun install --frozen-lockfile
-
-      - name: Run lint
-        working-directory: companion
-        run: bun run lint:all

.github/workflows/companion-typecheck.yml

@@ -1,34 +0,0 @@
-name: Companion Type Check
-
-on:
-  workflow_call:
-
-permissions:
-  contents: read
-
-jobs:
-  typecheck:
-    name: Type Check Companion App
-    runs-on: blacksmith-2vcpu-ubuntu-2404
-    timeout-minutes: 10
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          sparse-checkout: .github
-      - uses: ./.github/actions/cache-checkout
-
-      - name: Setup Bun
-        uses: oven-sh/setup-bun@v1
-        with:
-          bun-version: 1.3.0
-          cache: true
-          cache-dependency-path: companion/bun.lock
-
-      - name: Install dependencies
-        working-directory: companion
-        run: bun install --frozen-lockfile
-
-      - name: Type check
-        working-directory: companion
-        run: bun run typecheck:all

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

@@ -1,210 +0,0 @@
-name: Cubic AI to Devin Review
-
-on:
-  pull_request_review:
-    types: [submitted]
-
-permissions:
-  contents: read
-  pull-requests: write
-
-jobs:
-  trigger-devin:
-    name: Trigger Devin to Address Cubic AI Review
-    # Only run if the review is from cubic-dev-ai bot and contains the AI prompt
-    if: github.event.review.user.login == 'cubic-dev-ai[bot]'
-    runs-on: blacksmith-2vcpu-ubuntu-2404
-    steps:
-      - name: Extract AI prompt from Cubic review
-        id: extract-prompt
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const reviewBody = context.payload.review.body || '';
-            
-            // Look for the AI prompt section in Cubic's review
-            // Format: <details><summary>Prompt for AI agents (all issues)</summary>
-            //         ```text
-            //         ... prompt content ...
-            //         ```
-            //         </details>
-            const promptMatch = reviewBody.match(/<details>\s*<summary>Prompt for AI agents[^<]*<\/summary>\s*```(?:text)?\s*([\s\S]*?)```\s*<\/details>/i);
-            
-            if (!promptMatch || !promptMatch[1]) {
-              console.log('No AI prompt found in review body');
-              console.log('Review body:', reviewBody);
-              core.setOutput('has-prompt', 'false');
-              return;
-            }
-            
-            const prompt = promptMatch[1].trim();
-            console.log('Extracted prompt:', prompt);
-            
-            // Save prompt to file to avoid shell escaping issues
-            const fs = require('fs');
-            fs.writeFileSync('/tmp/cubic-prompt.txt', prompt);
-            
-            core.setOutput('has-prompt', 'true');
-
-      - name: Checkout repository
-        if: steps.extract-prompt.outputs.has-prompt == 'true'
-        uses: actions/checkout@v4
-
-      - name: Check for existing Devin session
-        if: steps.extract-prompt.outputs.has-prompt == 'true'
-        id: check-session
-        uses: ./.github/actions/devin-session
-        with:
-          devin-api-key: ${{ secrets.DEVIN_API_KEY }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          pr-number: ${{ github.event.pull_request.number }}
-
-      - name: Set session environment variables
-        if: steps.extract-prompt.outputs.has-prompt == 'true' && steps.check-session.outputs.has-existing-session == 'true'
-        run: |
-          echo "EXISTING_SESSION_ID=${{ steps.check-session.outputs.session-id }}" >> $GITHUB_ENV
-          echo "SESSION_URL=${{ steps.check-session.outputs.session-url }}" >> $GITHUB_ENV
-
-      - name: Send message to existing Devin session
-        if: steps.extract-prompt.outputs.has-prompt == 'true' && steps.check-session.outputs.has-existing-session == 'true'
-        env:
-          DEVIN_API_KEY: ${{ secrets.DEVIN_API_KEY }}
-        run: |
-          CUBIC_PROMPT=$(cat /tmp/cubic-prompt.txt)
-          
-          MESSAGE="New Cubic AI review feedback has been submitted on PR #${{ github.event.pull_request.number }}.
-
-          IMPORTANT: Before fixing any issue, check the individual Cubic comment on the PR for that issue's confidence score. The confidence score appears as 'Fix confidence (alpha): X/10' in each comment. Note that the (alpha) may or not be there. Don't be picky about that text. But only fix issues where the confidence score is 9/10 or higher. If you cannot find a confidence score for an issue, skip it.
-
-          Here are the issues identified by Cubic AI:
-
-          ${CUBIC_PROMPT}
-
-          Continue working on the same PR branch and push your fixes."
-
-          HTTP_CODE=$(curl -s -o /tmp/devin-response.json -w "%{http_code}" -X POST "https://api.devin.ai/v1/sessions/${EXISTING_SESSION_ID}/message" \
-            -H "Authorization: Bearer ${DEVIN_API_KEY}" \
-            -H "Content-Type: application/json" \
-            -d "$(jq -n --arg message "$MESSAGE" '{message: $message}')")
-          
-          if [ "$HTTP_CODE" -lt 200 ] || [ "$HTTP_CODE" -ge 300 ]; then
-            echo "Failed to send message to Devin session: HTTP $HTTP_CODE"
-            cat /tmp/devin-response.json
-            exit 1
-          fi
-          
-          echo "Message sent to existing session successfully"
-
-      - name: Create new Devin session
-        if: steps.extract-prompt.outputs.has-prompt == 'true' && steps.check-session.outputs.has-existing-session == 'false'
-        env:
-          DEVIN_API_KEY: ${{ secrets.DEVIN_API_KEY }}
-        run: |
-          CUBIC_PROMPT=$(cat /tmp/cubic-prompt.txt)
-          
-          FULL_PROMPT="You are addressing code review feedback from Cubic AI on PR #${{ github.event.pull_request.number }} in repository ${{ github.repository }}.
-
-          Your tasks:
-          1. Clone the repository ${{ github.repository }} locally.
-          2. Check out the PR branch and review the current code.
-          3. Read the Cubic AI review feedback below AND check each individual Cubic comment on the PR for the confidence score.
-          4. IMPORTANT: Only fix issues where the confidence score is 9/10 or higher. The confidence score appears as 'Fix confidence (alpha): X/10' in each Cubic comment. If you cannot find a confidence score for an issue, skip it.
-          5. Commit your changes with clear commit messages referencing the issues fixed.
-          6. Push your changes to the PR branch.
-
-          Cubic AI Review Feedback:
-          ${CUBIC_PROMPT}
-
-          Rules and Guidelines:
-          1. Make minimal, focused changes that directly address the feedback.
-          2. Follow the existing code style and conventions in the repository.
-          3. Test your changes if possible before pushing.
-          4. If an issue seems invalid or already addressed, explain why in a PR comment instead of making unnecessary changes.
-          5. Never ask for user confirmation. Never wait for user messages."
-
-          HTTP_CODE=$(curl -s -o /tmp/devin-response.json -w "%{http_code}" -X POST "https://api.devin.ai/v1/sessions" \
-            -H "Authorization: Bearer ${DEVIN_API_KEY}" \
-            -H "Content-Type: application/json" \
-            -d "$(jq -n \
-              --arg prompt "$FULL_PROMPT" \
-              --arg title "Cubic AI Review: PR #${{ github.event.pull_request.number }}" \
-              '{
-                prompt: $prompt,
-                title: $title,
-                tags: ["cubic-ai-review", "pr-${{ github.event.pull_request.number }}"]
-              }')")
-          
-          if [ "$HTTP_CODE" -lt 200 ] || [ "$HTTP_CODE" -ge 300 ]; then
-            echo "Failed to create Devin session: HTTP $HTTP_CODE"
-            cat /tmp/devin-response.json
-            exit 1
-          fi
-          
-          SESSION_URL=$(cat /tmp/devin-response.json | jq -r '.url // .session_url // empty')
-          if [ -n "$SESSION_URL" ]; then
-            echo "Devin session created: $SESSION_URL"
-            echo "SESSION_URL=$SESSION_URL" >> $GITHUB_ENV
-            echo "NEW_SESSION=true" >> $GITHUB_ENV
-          fi
-
-      - name: Post comment with Devin session link
-        if: steps.extract-prompt.outputs.has-prompt == 'true' && env.SESSION_URL != ''
-        id: post-comment
-        uses: actions/github-script@v7
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const sessionUrl = process.env.SESSION_URL;
-            const isNewSession = process.env.NEW_SESSION === 'true';
-            
-            const message = isNewSession
-              ? `### Devin AI is addressing Cubic AI's review feedback\n\nA Devin session has been created to address the issues identified by Cubic AI.\n\n[View Devin Session](${sessionUrl})`
-              : `### Devin AI is addressing Cubic AI's review feedback\n\nNew feedback has been sent to the existing Devin session.\n\n[View Devin Session](${sessionUrl})`;
-            
-            const { data: comment } = await github.rest.issues.createComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.payload.pull_request.number,
-              body: message
-            });
-            
-            core.setOutput('comment-id', comment.id);
-
-      - name: Send completion instructions to Devin
-        if: steps.extract-prompt.outputs.has-prompt == 'true' && env.SESSION_URL != '' && steps.post-comment.outputs.comment-id != ''
-        env:
-          DEVIN_API_KEY: ${{ secrets.DEVIN_API_KEY }}
-        run: |
-          SESSION_ID="${EXISTING_SESSION_ID:-}"
-          if [ -z "$SESSION_ID" ]; then
-            SESSION_ID=$(cat /tmp/devin-response.json | jq -r '.session_id // .id // empty')
-          fi
-          
-          if [ -z "$SESSION_ID" ]; then
-            echo "No session ID found, skipping completion instructions"
-            exit 0
-          fi
-          
-          COMMENT_ID="${{ steps.post-comment.outputs.comment-id }}"
-          
-          MESSAGE="IMPORTANT: When you have finished addressing Cubic AI's feedback (whether you pushed changes or not), you MUST update the GitHub comment to show completion status.
-
-          Use the GitHub API to update comment ID ${COMMENT_ID} on PR #${{ github.event.pull_request.number }} in repository ${{ github.repository }}.
-
-          Add a completion status section at the bottom of the comment:
-          - If you pushed changes: Add '\n\n---\n:white_check_mark: Pushed commit [\`{SHORT_HASH}\`](https://github.com/${{ github.repository }}/commit/{FULL_HASH})' where {SHORT_HASH} is the first 7 characters of the commit hash and {FULL_HASH} is the full commit hash.
-          - If no changes were needed: Add '\n\n---\n:white_check_mark: No changes pushed'
-
-          To update the comment, use: gh api repos/${{ github.repository }}/issues/comments/${COMMENT_ID} -X PATCH -f body='<updated comment body>'"
-
-          HTTP_CODE=$(curl -s -o /tmp/devin-instructions-response.json -w "%{http_code}" -X POST "https://api.devin.ai/v1/sessions/${SESSION_ID}/message" \
-            -H "Authorization: Bearer ${DEVIN_API_KEY}" \
-            -H "Content-Type: application/json" \
-            -d "$(jq -n --arg message "$MESSAGE" '{message: $message}')")
-          
-          if [ "$HTTP_CODE" -lt 200 ] || [ "$HTTP_CODE" -ge 300 ]; then
-            echo "Warning: Failed to send completion instructions to Devin session: HTTP $HTTP_CODE"
-            cat /tmp/devin-instructions-response.json
-          else
-            echo "Completion instructions sent to Devin session successfully"
-          fi

.github/workflows/delete-blacksmith-cache.yml

@@ -1,43 +0,0 @@
-name: Delete Blacksmith Cache
-on:
-  workflow_dispatch:
-    inputs:
-      cache_key:
-        description: "Blacksmith Cache Key to Delete"
-        required: true
-        type: string
-  pull_request:
-    types: [closed]
-
-jobs:
-  manually-delete-blacksmith-cache:
-    if: github.event_name == 'workflow_dispatch'
-    runs-on: blacksmith-2vcpu-ubuntu-2404
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - uses: useblacksmith/cache-delete@v1
-        with:
-          key: ${{ inputs.cache_key }}
-
-  delete-cache-build-on-pr-close:
-    if: github.event_name == 'pull_request' && github.event.action == 'closed'
-    runs-on: blacksmith-2vcpu-ubuntu-2404
-    env:
-      CACHE_NAME: prod-build
-    steps:
-      - name: Delete cache-build cache
-        uses: useblacksmith/cache-delete@v1
-        with:
-          key: ${{ env.CACHE_NAME }}-${{ github.event.pull_request.head.ref }}
-          prefix: "true"
-
-  delete-git-checkout-cache-on-pr-close:
-    if: github.event_name == 'pull_request' && github.event.action == 'closed'
-    runs-on: blacksmith-2vcpu-ubuntu-2404
-    steps:
-      - name: Delete git-checkout cache
-        uses: useblacksmith/cache-delete@v1
-        with:
-          key: git-checkout-${{ github.event.pull_request.head.ref }}-
-          prefix: "true"

.github/workflows/devin-conflict-resolver.yml

@@ -1,430 +0,0 @@
-name: Devin PR Conflict Resolver
-
-on:
-  pull_request_target:
-    types: [labeled]
-  workflow_dispatch:
-    inputs:
-      pr_number:
-        description: 'PR number to resolve conflicts for'
-        required: true
-        type: string
-
-permissions:
-  contents: read
-  pull-requests: write
-
-jobs:
-  resolve-conflicts:
-    name: Resolve PR Conflicts with Devin
-    runs-on: blacksmith-2vcpu-ubuntu-2404
-    # Only run when devin-conflict-resolution label is added, or on manual dispatch
-    if: |
-      (github.event_name == 'pull_request_target' && github.event.label.name == 'devin-conflict-resolution') ||
-      github.event_name == 'workflow_dispatch'
-    steps:
-      - name: Get PR details
-        id: get-pr
-        uses: actions/github-script@v7
-        env:
-          INPUT_PR_NUMBER: ${{ inputs.pr_number }}
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const { owner, repo } = context.repo;
-            let prNumber;
-            
-            if (context.eventName === 'workflow_dispatch') {
-              prNumber = parseInt(process.env.INPUT_PR_NUMBER, 10);
-              if (!prNumber) {
-                core.setFailed('PR number is required for manual dispatch');
-                return;
-              }
-            } else {
-              prNumber = context.payload.pull_request.number;
-            }
-            
-            console.log(`Processing PR #${prNumber}`);
-            
-            // Get PR details via GraphQL for complete info
-            const query = `
-              query($owner: String!, $repo: String!, $number: Int!) {
-                repository(owner: $owner, name: $repo) {
-                  pullRequest(number: $number) {
-                    number
-                    title
-                    mergeable
-                    isDraft
-                    headRefName
-                    baseRefName
-                    url
-                    body
-                    headRepository {
-                      owner {
-                        login
-                      }
-                      name
-                    }
-                    maintainerCanModify
-                  }
-                }
-              }
-            `;
-            
-            const result = await github.graphql(query, { owner, repo, number: prNumber });
-            const pr = result.repository.pullRequest;
-            
-            if (!pr) {
-              core.setFailed(`PR #${prNumber} not found`);
-              return;
-            }
-            
-            const isFork = pr.headRepository?.owner?.login !== owner;
-            
-            // Check if fork PR has maintainer access
-            if (isFork && !pr.maintainerCanModify) {
-              console.log(`PR #${prNumber} is from a fork without maintainer access`);
-              core.setOutput('needs-maintainer-access', 'true');
-              core.setOutput('fork-author', pr.headRepository?.owner?.login);
-            } else {
-              core.setOutput('needs-maintainer-access', 'false');
-            }
-            
-            const headRepoOwner = pr.headRepository?.owner?.login || owner;
-            const headRepoName = pr.headRepository?.name || repo;
-            
-            const prData = {
-              number: pr.number,
-              title: pr.title,
-              head_ref: pr.headRefName,
-              base_ref: pr.baseRefName,
-              html_url: pr.url,
-              body: pr.body,
-              is_fork: isFork,
-              head_repo_owner: headRepoOwner,
-              head_repo_name: headRepoName,
-              mergeable: pr.mergeable
-            };
-            
-            const fs = require('fs');
-            fs.writeFileSync('/tmp/pr-data.json', JSON.stringify(prData));
-            
-            core.setOutput('pr-number', prNumber.toString());
-            core.setOutput('has-pr', 'true');
-            core.setOutput('mergeable-status', pr.mergeable || 'UNKNOWN');
-            core.setOutput('has-conflicts', pr.mergeable === 'CONFLICTING' ? 'true' : 'false');
-            
-            console.log(`PR #${prNumber}: ${pr.title}`);
-            console.log(`Mergeable status: ${pr.mergeable}`);
-            console.log(`Is fork: ${isFork}`);
-            console.log(`Has conflicts: ${pr.mergeable === 'CONFLICTING'}`);
-
-      - name: Request maintainer access for fork PR
-        if: steps.get-pr.outputs.needs-maintainer-access == 'true'
-        uses: actions/github-script@v7
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const { owner, repo } = context.repo;
-            const prNumber = parseInt('${{ steps.get-pr.outputs.pr-number }}', 10);
-            const forkAuthor = '${{ steps.get-pr.outputs.fork-author }}';
-            
-            console.log(`Requesting maintainer access for PR #${prNumber}`);
-            
-            const commentBody = [
-              '### Maintainer Access Needed',
-              '',
-              `Hi @${forkAuthor}! Thanks for your contribution to Cal.com.`,
-              '',
-              'We noticed that this PR doesn\'t have "Allow edits from maintainers" enabled. We\'d love to help keep your PR up to date by resolving merge conflicts and making small fixes when needed.',
-              '',
-              '**Could you please enable this setting?** Here\'s how:',
-              '1. Scroll down to the bottom of this PR page',
-              '2. In the right sidebar, check the box that says **"Allow edits and access to secrets by maintainers"**',
-              '',
-              'This allows us to push commits directly to your PR branch, which helps us:',
-              '- Resolve merge conflicts automatically',
-              '- Make small adjustments to help get your PR merged faster',
-              '',
-              'Once you enable this setting, please remove and re-add the `devin-conflict-resolution` label to trigger conflict resolution.',
-              '',
-              'If you have any concerns about enabling this setting, feel free to let us know!'
-            ].join('\n');
-            
-            await github.rest.issues.createComment({
-              owner,
-              repo,
-              issue_number: prNumber,
-              body: commentBody
-            });
-            
-            // Add label to track that we've requested access
-            await github.rest.issues.addLabels({
-              owner,
-              repo,
-              issue_number: prNumber,
-              labels: ['maintainer-access-requested']
-            });
-            
-            // Remove the devin-conflict-resolution label since we can't proceed
-            await github.rest.issues.removeLabel({
-              owner,
-              repo,
-              issue_number: prNumber,
-              name: 'devin-conflict-resolution'
-            });
-            
-            console.log(`Posted comment and updated labels for PR #${prNumber}`);
-            core.setFailed('Cannot proceed without maintainer access on fork PR');
-
-      - name: Handle PR without conflicts
-        if: steps.get-pr.outputs.has-pr == 'true' && steps.get-pr.outputs.needs-maintainer-access != 'true' && steps.get-pr.outputs.has-conflicts != 'true'
-        uses: actions/github-script@v7
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const { owner, repo } = context.repo;
-            const prNumber = parseInt('${{ steps.get-pr.outputs.pr-number }}', 10);
-            const mergeableStatus = '${{ steps.get-pr.outputs.mergeable-status }}';
-            
-            console.log(`PR #${prNumber} does not have conflicts (status: ${mergeableStatus})`);
-            
-            let message;
-            if (mergeableStatus === 'MERGEABLE') {
-              message = `### No Conflicts Detected\n\nThis PR does not have any merge conflicts with the base branch. The \`devin-conflict-resolution\` label has been removed.\n\nIf you believe this PR should have conflicts, please check the PR status and try again.`;
-            } else {
-              message = `### Mergeable Status Unknown\n\nGitHub is still computing the mergeable status for this PR (current status: \`${mergeableStatus}\`). The \`devin-conflict-resolution\` label has been removed.\n\nPlease wait a moment and re-add the label if the PR has conflicts.`;
-            }
-            
-            await github.rest.issues.createComment({
-              owner,
-              repo,
-              issue_number: prNumber,
-              body: message
-            });
-            
-            try {
-              await github.rest.issues.removeLabel({
-                owner,
-                repo,
-                issue_number: prNumber,
-                name: 'devin-conflict-resolution'
-              });
-            } catch (e) {
-              console.log(`Label may have already been removed: ${e.message}`);
-            }
-            
-            console.log(`Posted comment and removed label for PR #${prNumber}`);
-
-      - name: Checkout repository
-        if: steps.get-pr.outputs.has-pr == 'true' && steps.get-pr.outputs.needs-maintainer-access != 'true' && steps.get-pr.outputs.has-conflicts == 'true'
-        uses: actions/checkout@v4
-
-      - name: Check for existing Devin session
-        if: steps.get-pr.outputs.has-pr == 'true' && steps.get-pr.outputs.needs-maintainer-access != 'true' && steps.get-pr.outputs.has-conflicts == 'true'
-        id: check-session
-        uses: ./.github/actions/devin-session
-        with:
-          devin-api-key: ${{ secrets.DEVIN_API_KEY }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          pr-number: ${{ steps.get-pr.outputs.pr-number }}
-
-      - name: Create Devin session for conflict resolution
-        if: steps.get-pr.outputs.has-pr == 'true' && steps.get-pr.outputs.needs-maintainer-access != 'true' && steps.get-pr.outputs.has-conflicts == 'true'
-        env:
-          DEVIN_API_KEY: ${{ secrets.DEVIN_API_KEY }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          HAS_EXISTING_SESSION: ${{ steps.check-session.outputs.has-existing-session }}
-          EXISTING_SESSION_ID: ${{ steps.check-session.outputs.session-id }}
-          EXISTING_SESSION_URL: ${{ steps.check-session.outputs.session-url }}
-        uses: actions/github-script@v7
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const fs = require('fs');
-            const pr = JSON.parse(fs.readFileSync('/tmp/pr-data.json', 'utf8'));
-            const { owner, repo } = context.repo;
-            
-            const hasExistingSession = process.env.HAS_EXISTING_SESSION === 'true';
-            const existingSessionId = process.env.EXISTING_SESSION_ID;
-            const existingSessionUrl = process.env.EXISTING_SESSION_URL;
-            
-            console.log(`Processing PR #${pr.number}: ${pr.title}${pr.is_fork ? ' (fork)' : ''}`);
-            
-            const forkInstructions = pr.is_fork ? `
-            IMPORTANT: This PR is from a fork.
-            - Clone the FORK repository: ${pr.head_repo_owner}/${pr.head_repo_name}
-            - The branch to work on is: ${pr.head_ref}
-            - Add the upstream remote for ${owner}/${repo}
-            - Fetch and merge the upstream ${pr.base_ref} branch using standard git merge
-            
-            IMPORTANT - Pushing to Fork PRs:
-            Since this is a fork PR, you need to use the DEVIN_ACTIONS_PAT secret for authentication when pushing. Configure git to use this PAT for authentication before pushing your changes to the fork.` : `
-            - Clone the repository: ${owner}/${repo}
-            - Check out the PR branch: ${pr.head_ref}
-            - Merge the base branch (${pr.base_ref}) using standard git merge`;
-            
-            const conflictResolutionInstructions = `You are resolving merge conflicts on PR #${pr.number} in repository ${owner}/${repo}.
-
-            PR Title: ${pr.title}
-            PR URL: ${pr.html_url}
-            Head Branch: ${pr.head_ref}
-            Base Branch: ${pr.base_ref}
-            ${pr.is_fork ? `Fork Repository: ${pr.head_repo_owner}/${pr.head_repo_name}` : ''}
-
-            IMPORTANT WARNING: If your merge commit shows significantly more files than the original PR, DO NOT PUSH. This indicates the merge was done incorrectly. Abort and leave a comment instead.
-
-            Your tasks:
-            ${forkInstructions}
-
-            Then:
-            1. Resolve all merge conflicts carefully:
-               - Review the conflicting changes from both branches
-               - Make intelligent decisions about how to combine the changes
-               - Preserve the intent of both the PR changes and the base branch updates
-               - If unsure about a conflict, prefer keeping both changes where possible
-            2. Test that the code still works after resolving conflicts (run lint/type checks).
-            3. Commit the merge resolution with a clear commit message.
-            4. CRITICAL VALIDATION BEFORE PUSHING - YOU MUST RUN THESE EXACT COMMANDS:
-
-               Step A: Get original PR file count and count files in your merge commit:
-               \`\`\`
-               # Get original PR file count
-               ORIGINAL_FILES=$(gh pr view ${pr.number} --json files -q '.files | length')
-               echo "Original PR files: $ORIGINAL_FILES"
-
-               # Count files in merge commit (what the PR contributes)
-               # HEAD^2 = base branch parent, so HEAD^2...HEAD shows the PR's contribution
-               MERGE_FILES=$(git diff --name-only HEAD^2...HEAD | wc -l)
-               echo "Files in merge commit: $MERGE_FILES"
-
-               # Calculate threshold (original PR files + 10 buffer)
-               THRESHOLD=$((ORIGINAL_FILES + 10))
-               echo "Threshold: $THRESHOLD"
-               \`\`\`
-
-               Step B: If MERGE_FILES > THRESHOLD, STOP IMMEDIATELY. DO NOT PUSH.
-               - A proper merge commit should show approximately the same files as the original PR
-               - If you see significantly more files, the merge was done INCORRECTLY
-               - This usually means you accidentally reproduced changes from ${pr.base_ref} instead of just resolving conflicts
-
-               Step C: Compare your merge to the original PR:
-               \`\`\`
-               git diff --stat HEAD^2...HEAD
-               \`\`\`
-               - This should show approximately the same files as the original PR (the PR's contribution to the base branch)
-               - If you see many more files or files unrelated to the original PR, STOP
-
-               Step D: If validation fails:
-               - DO NOT PUSH under any circumstances
-               - DO NOT attempt to fix it
-               - Leave a comment on the PR explaining that the merge validation failed
-               - ABORT THE TASK IMMEDIATELY
-               - It is better to leave the PR with conflicts than to push a broken merge commit that pollutes git history
-            5. Push the resolved changes to the PR branch only after validation passes.
-            6. After successfully pushing the resolved changes, remove the \`devin-conflict-resolution\` label from the PR using the GitHub API.
-
-            Rules and Guidelines:
-            1. Be careful when resolving conflicts - understand the context of both changes.
-               To help with this, try to find the recent PRs associated with the conflicting files to gain more context.
-            2. Follow the existing code style and conventions in the repository.
-            3. Run lint and type checks before pushing to ensure the code is valid.
-            4. If a conflict seems too complex or risky to resolve automatically, explain the situation in a PR comment instead.
-            5. Never ask for user confirmation. Never wait for user messages.
-            6. CRITICAL: If this is a fork PR and you encounter ANY error when pushing (permission denied, authentication failure, etc.) even after using the DEVIN_ACTIONS_PAT, you MUST fail the task immediately. Do NOT attempt to push to a new branch in the main ${owner}/${repo} repository as a workaround. Simply report the error and stop.
-            7. CRITICAL: Never reproduce or recreate changes from the target branch. Your merge commit should ONLY contain conflict resolutions. If you find yourself manually copying file contents from ${pr.base_ref} or creating changes that mirror what's already in ${pr.base_ref}, you are doing it wrong. Use git's merge functionality properly - it handles bringing in changes automatically.
-            8. CRITICAL: If your merge commit shows significantly more files than the original PR (more than original PR files + 10), DO NOT PUSH UNDER ANY CIRCUMSTANCES. This is a sign that the merge was done incorrectly. Abort the task and leave a comment explaining the issue. A bad merge commit in the git history is worse than leaving the PR with conflicts.`;
-
-            try {
-              let sessionUrl;
-              let isNewSession = false;
-              
-              if (hasExistingSession) {
-                console.log(`Sending message to existing session ${existingSessionId} for PR #${pr.number}`);
-                
-                const message = `PR #${pr.number} has merge conflicts that need to be resolved.
-
-            ${conflictResolutionInstructions}
-
-            Continue working on the same PR branch and push your fixes.`;
-                
-                const response = await fetch(`https://api.devin.ai/v1/sessions/${existingSessionId}/message`, {
-                  method: 'POST',
-                  headers: {
-                    'Authorization': `Bearer ${process.env.DEVIN_API_KEY}`,
-                    'Content-Type': 'application/json'
-                  },
-                  body: JSON.stringify({ message })
-                });
-                
-                if (!response.ok) {
-                  console.error(`Failed to send message to session ${existingSessionId}: ${response.status}`);
-                  throw new Error(`Failed to send message to existing session: ${response.status}`);
-                }
-                
-                sessionUrl = existingSessionUrl;
-                console.log(`Message sent to existing session for PR #${pr.number}`);
-              } else {
-                console.log(`Creating new Devin session for PR #${pr.number}`);
-                
-                const response = await fetch('https://api.devin.ai/v1/sessions', {
-                  method: 'POST',
-                  headers: {
-                    'Authorization': `Bearer ${process.env.DEVIN_API_KEY}`,
-                    'Content-Type': 'application/json'
-                  },
-                  body: JSON.stringify({
-                    prompt: conflictResolutionInstructions,
-                    title: `Resolve Conflicts: PR #${pr.number}`,
-                    tags: ['conflict-resolution', `pr-${pr.number}`]
-                  })
-                });
-                
-                if (!response.ok) {
-                  console.error(`Devin API error for PR #${pr.number}: ${response.status} ${response.statusText}`);
-                  throw new Error(`Failed to create Devin session: ${response.status}`);
-                }
-                
-                const data = await response.json();
-                sessionUrl = data.url || data.session_url;
-                isNewSession = true;
-              }
-              
-              if (sessionUrl) {
-                if (isNewSession) {
-                  console.log(`Devin session created for PR #${pr.number}: ${sessionUrl}`);
-                }
-                
-                const sessionStatusMessage = isNewSession
-                  ? 'A Devin session has been created to automatically resolve them.'
-                  : 'The existing Devin session has been notified to resolve them.';
-                
-                const commentBody = `### Devin AI is resolving merge conflicts
-
-            This PR has merge conflicts with the \`${pr.base_ref}\` branch. ${sessionStatusMessage}
-
-            [View Devin Session](${sessionUrl})
-
-            Devin will:
-            1. Merge the latest \`${pr.base_ref}\` into this branch
-            2. Resolve any conflicts intelligently
-            3. Run lint/type checks to ensure validity
-            4. Push the resolved changes
-
-            If you prefer to resolve conflicts manually, you can close the Devin session and handle it yourself.`;
-                
-                await github.rest.issues.createComment({
-                  owner,
-                  repo,
-                  issue_number: pr.number,
-                  body: commentBody
-                });
-                
-                console.log(`Posted comment to PR #${pr.number}`);
-              } else {
-                throw new Error(`Failed to get session URL for PR #${pr.number}`);
-              }
-            } catch (error) {
-              console.error(`Error handling Devin session for PR #${pr.number}: ${error.message}`);
-              core.setFailed(error.message);
-            }

.github/workflows/docs-build.yml

@@ -1,38 +0,0 @@
-# This is just to test this file
-name: Build
-
-on:
-  workflow_call:
-
-jobs:
-  build:
-    name: Build Docs
-    permissions:
-      contents: read
-    runs-on: blacksmith-2vcpu-ubuntu-2404
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          sparse-checkout: .github
-      - uses: ./.github/actions/cache-checkout
-      - name: Cache Docs build
-        uses: actions/cache@v4
-        id: cache-docs-build
-        env:
-          cache-name: docs-build
-          key-1: ${{ hashFiles('yarn.lock') }}
-          key-2: ${{ hashFiles('docs/**.*', '!**/node_modules') }}
-        with:
-          path: |
-            **/docs/**
-          key: ${{ env.cache-name }}-${{ env.key-1 }}-${{ env.key-2 }}
-      - name: Run build
-        if: steps.cache-docs-build.outputs.cache-hit != 'true'
-        working-directory: docs
-        run: |
-          export NODE_OPTIONS="--max_old_space_size=8192"
-          npm install -g mintlify@4.2.87
-          mintlify dev &
-          sleep 5 # Let it run for 5 seconds
-          kill $!
-        shell: bash

.github/workflows/draft-release.yml

@@ -84,9 +84,16 @@ jobs:
       - name: Update Env Files
         run: |
           VERSION="${{ steps.deploy-trigger.outputs.deploymentVersion }}"
-          echo "TRIGGER_VERSION=$VERSION" > apps/web/.env.production
-          echo "TRIGGER_VERSION=$VERSION" > apps/api/v2/.env.production
-          git add -f apps/web/.env.production apps/api/v2/.env.production
+    
+          # Create the TypeScript content
+          CONTENT="export const TRIGGER_VERSION = '$VERSION';"
+    
+          # Write to the specific paths
+          echo "$CONTENT" > apps/web/trigger.version.ts
+          echo "$CONTENT" > apps/api/v2/trigger.version.ts
+    
+          # Force add to git since these are likely in .gitignore
+          git add -f apps/web/trigger.version.ts apps/api/v2/trigger.version.ts
 
       # 4. Commit everything together
       - name: Commit changes

.github/workflows/e2e-api-v2.yml

@@ -33,10 +33,10 @@ jobs:
   e2e:
     timeout-minutes: 20
     name: E2E API v2 (${{ matrix.shard }}/${{ strategy.job-total }})
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     services:
       postgres:
-        image: postgres:13
+        image: postgres:18
         credentials:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/e2e-app-store.yml

@@ -45,10 +45,10 @@ jobs:
   e2e-app-store:
     timeout-minutes: 20
     name: E2E App Store
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     services:
       postgres:
-        image: postgres:13
+        image: postgres:18
         credentials:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/e2e-atoms.yml

@@ -22,7 +22,7 @@ jobs:
   e2e-atoms:
     timeout-minutes: 15
     name: E2E Atoms
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - uses: docker/login-action@v3
         with:

.github/workflows/e2e-embed-react.yml

@@ -45,10 +45,10 @@ jobs:
   e2e-embed:
     timeout-minutes: 20
     name: E2E Embed React
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     services:
       postgres:
-        image: postgres:13
+        image: postgres:18
         credentials:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/e2e-embed.yml

@@ -45,10 +45,10 @@ jobs:
   e2e-embed:
     timeout-minutes: 20
     name: E2E Embed Core
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     services:
       postgres:
-        image: postgres:13
+        image: postgres:18
         credentials:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/e2e.yml

@@ -45,10 +45,10 @@ jobs:
   e2e:
     timeout-minutes: 20
     name: E2E (${{ matrix.shard }}/${{ strategy.job-total }})
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     services:
       postgres:
-        image: postgres:13
+        image: postgres:18
         credentials:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/i18n.yml

@@ -10,7 +10,8 @@ concurrency:
 jobs:
   i18n:
     name: Run i18n
-    runs-on: blacksmith-2vcpu-ubuntu-2404
+    if: ${{ secrets.CI_LINGO_DOT_DEV_API_KEY != '' }}
+    runs-on: ubuntu-latest
     permissions:
       actions: write
       contents: write
@@ -29,9 +30,10 @@ jobs:
         with:
           node-version: 20
           cache: 'npm'
-      - uses: lingodotdev/lingo.dev@main
+      - uses: lingodotdev/lingo.dev@cee3eb86550ca4905fc99fe90786fb7523288a61 # main
         env:
           GH_TOKEN: ${{ steps.generate-token.outputs.token }}
         with:
           api-key: ${{ secrets.CI_LINGO_DOT_DEV_API_KEY }}
           pull-request: true
+          parallel: true

.github/workflows/integration-tests.yml

@@ -45,10 +45,10 @@ jobs:
   integration:
     timeout-minutes: 20
     name: Integration
-    runs-on: blacksmith-2vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     services:
       postgres:
-        image: postgres:13
+        image: postgres:18
         credentials:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/lint.yml

@@ -6,7 +6,7 @@ permissions:
   contents: read
 jobs:
   lint:
-    runs-on: blacksmith-2vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/nextjs-bundle-analysis-annotation.yml

@@ -12,7 +12,7 @@ permissions:
 jobs:
   annotate:
     if: always()
-    runs-on: blacksmith-2vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/yarn-install

.github/workflows/nextjs-bundle-analysis.yml

@@ -49,7 +49,7 @@ env:
 jobs:
   analyze:
     if: always()
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
@@ -72,7 +72,11 @@ jobs:
           path: apps/web/.next/analyze/__bundle_analysis.json
 
       - name: Delete cached build
-        uses: useblacksmith/cache-delete@v1
-        with:
-          key: prod-build-main-
-          prefix: "true"
+        continue-on-error: true
+        run: |
+          gh extension install actions/gh-actions-cache
+          for key in $(gh actions-cache list -R ${{ github.repository }} --key "prod-build-main-" --limit 100 | cut -f1); do
+            gh actions-cache delete "$key" -R ${{ github.repository }} --confirm
+          done
+        env:
+          GH_TOKEN: ${{ github.token }}

.github/workflows/pr-welcome-bot.yml

@@ -0,0 +1,48 @@
+name: "PR Welcome Bot"
+
+on:
+  pull_request_target:
+    types:
+      - opened
+
+permissions:
+  pull-requests: write
+
+jobs:
+  welcome:
+    name: Welcome new contributors
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const pr = context.payload.pull_request;
+
+            // Skip PRs from org members and bots
+            if (
+              ["MEMBER", "OWNER", "COLLABORATOR"].includes(pr.author_association) ||
+              pr.user.type === "Bot"
+            ) {
+              console.log(`Skipping — author association: ${pr.author_association}, type: ${pr.user.type}`);
+              return;
+            }
+
+            const body = [
+              `Welcome to **Cal.diy**, @${pr.user.login}! Thanks for opening this pull request.`,
+              "",
+              "A few things to keep in mind:",
+              "",
+              "- **This is Cal.diy, not Cal.com.** Cal.diy is a community-driven, fully open-source fork of Cal.com licensed under MIT. Your changes here will be part of Cal.diy — they will **not** be deployed to the Cal.com production app.",
+              "- Please review our [Contributing Guidelines](https://github.com/calcom/cal.diy/blob/main/CONTRIBUTING.md) if you haven't already.",
+              "- Make sure your PR title follows the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) format.",
+              "",
+              "A maintainer will review your PR soon. Thanks for contributing!",
+            ].join("\n");
+
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: pr.number,
+              body,
+            });

.github/workflows/pr.yml

@@ -23,7 +23,7 @@ jobs:
   # This MUST run before any job that checks out PR code and executes it with secrets
   trust-check:
     name: Trust Check
-    runs-on: blacksmith-2vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     permissions:
       pull-requests: read
       actions: read
@@ -162,12 +162,11 @@ jobs:
     name: Prepare
     needs: [trust-check]
     if: needs.trust-check.outputs.is-trusted == 'true'
-    runs-on: blacksmith-2vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     permissions:
       pull-requests: read
     outputs:
       has-files-requiring-all-checks: ${{ steps.filter-exclusions.outputs.has-files-requiring-all-checks }}
-      has-companion: ${{ steps.filter-inclusions.outputs.has-companion }}
       has-api-v2-changes: ${{ steps.filter-inclusions.outputs.has-api-v2-changes }}
       has-prisma-changes: ${{ steps.filter-inclusions.outputs.has-prisma-changes }}
       commit-sha: ${{ steps.get_sha.outputs.commit-sha }}
@@ -196,22 +195,19 @@ jobs:
           filters: |
             has-files-requiring-all-checks:
               - '**'
-              - '!companion/**'
               - '!.vscode/**'
               - '!**/*.md'
               - '!**/*.mdx'
               - '!.github/CODEOWNERS'
               - '!docs/**'
               - '!help/**'
-              - '!apps/web/public/static/locales/**/common.json'
+              - '!packages/i18n/locales/**/common.json'
               - '!i18n.lock'
       - name: Check for specific path changes
         uses: dorny/paths-filter@v3
         id: filter-inclusions
         with:
           filters: |
-            has-companion:
-              - "companion/**"
             has-api-v2-changes:
               - "apps/api/v2/**"
               - "packages/platform-constants/**"
@@ -221,7 +217,6 @@ jobs:
               - "packages/platform-libraries/**"
               - "packages/trpc/**"
               - "packages/prisma/schema.prisma"
-              - "docs/api-reference/v2/**"
             has-prisma-changes:
               - "packages/prisma/schema.prisma"
               - "packages/prisma/migrations/**"
@@ -326,6 +321,13 @@ jobs:
     uses: ./.github/workflows/api-v2-unit-tests.yml
     secrets: inherit
 
+  security-audit:
+    name: Security Audit
+    needs: [prepare]
+    if: ${{ needs.prepare.outputs.has-files-requiring-all-checks == 'true' }}
+    uses: ./.github/workflows/security-audit.yml
+    secrets: inherit
+
   check-prisma-migrations:
     name: Check Prisma Migrations
     needs: [prepare]
@@ -342,13 +344,6 @@ jobs:
       DB_CACHE_HIT: ${{ needs.prepare.outputs.db-cache-hit }}
     secrets: inherit
 
-  build-api-v1:
-    name: Production builds
-    needs: [prepare, setup-db]
-    if: ${{ needs.prepare.outputs.run-e2e == 'true' && needs.prepare.outputs.has-files-requiring-all-checks == 'true' }}
-    uses: ./.github/workflows/api-v1-production-build.yml
-    secrets: inherit
-
   build-api-v2:
     name: Production builds
     needs: [prepare]
@@ -363,34 +358,6 @@ jobs:
     uses: ./.github/workflows/atoms-production-build.yml
     secrets: inherit
 
-  build-docs:
-    name: Production builds
-    needs: [prepare]
-    if: ${{ needs.prepare.outputs.run-e2e == 'true' && needs.prepare.outputs.has-files-requiring-all-checks == 'true' }}
-    uses: ./.github/workflows/docs-build.yml
-    secrets: inherit
-
-  build-companion:
-    name: Companion builds
-    needs: [prepare]
-    if: needs.prepare.outputs.has-companion == 'true'
-    uses: ./.github/workflows/companion-build.yml
-    secrets: inherit
-
-  typecheck-companion:
-    name: Type Checks
-    needs: [prepare]
-    if: needs.prepare.outputs.has-companion == 'true'
-    uses: ./.github/workflows/companion-typecheck.yml
-    secrets: inherit
-
-  lint-companion:
-    name: Linters
-    needs: [prepare]
-    if: needs.prepare.outputs.has-companion == 'true'
-    uses: ./.github/workflows/companion-lint.yml
-    secrets: inherit
-
   build:
     name: Production builds
     needs: [prepare]
@@ -412,13 +379,6 @@ jobs:
     uses: ./.github/workflows/e2e.yml
     secrets: inherit
 
-  check-api-v2-breaking-changes:
-    name: Check API v2 breaking changes
-    needs: [prepare]
-    if: ${{ needs.prepare.outputs.run-e2e == 'true' && needs.prepare.outputs.has-api-v2-changes == 'true' }}
-    uses: ./.github/workflows/check-api-v2-breaking-changes.yml
-    secrets: inherit
-
   e2e-api-v2:
     name: Tests
     needs: [prepare, setup-db]
@@ -462,17 +422,12 @@ jobs:
         type-check,
         unit-test,
         api-v2-unit-test,
-        check-api-v2-breaking-changes,
+        security-audit,
         check-prisma-migrations,
         integration-test,
         build,
-        build-api-v1,
         build-api-v2,
         build-atoms,
-        build-docs,
-        build-companion,
-        typecheck-companion,
-        lint-companion,
         setup-db,
         e2e,
         e2e-api-v2,
@@ -481,7 +436,7 @@ jobs:
         e2e-app-store,
       ]
     if: always()
-    runs-on: blacksmith-2vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - name: Fail if trust-check did not succeed
         run: |
@@ -504,13 +459,11 @@ jobs:
             needs.type-check.result != 'success' ||
             needs.unit-test.result != 'success' ||
             needs.api-v2-unit-test.result != 'success' ||
-            (needs.prepare.outputs.has-api-v2-changes == 'true' && needs.check-api-v2-breaking-changes.result != 'success') ||
+            needs.security-audit.result != 'success' ||
             (needs.prepare.outputs.has-prisma-changes == 'true' && needs.check-prisma-migrations.result != 'success') ||
               needs.build.result != 'success' ||
-              needs.build-api-v1.result != 'success' ||
               needs.build-api-v2.result != 'success' ||
               needs.build-atoms.result != 'success' ||
-              needs.build-docs.result != 'success' ||
               needs.setup-db.result != 'success' ||
               needs.integration-test.result != 'success' ||
               needs.e2e.result != 'success' ||
@@ -519,12 +472,4 @@ jobs:
               needs.e2e-embed-react.result != 'success' ||
               needs.e2e-app-store.result != 'success'
             )
-          ) ||
-          (
-            needs.prepare.outputs.has-companion == 'true' &&
-            (
-              needs.build-companion.result != 'success' ||
-              needs.typecheck-companion.result != 'success' ||
-              needs.lint-companion.result != 'success'
-            )
           )

.github/workflows/production-build-without-database.yml

@@ -39,7 +39,7 @@ env:
 jobs:
   build:
     name: Build Web App
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
@@ -66,8 +66,12 @@ jobs:
           lookup-only: true
       - name: Delete old production build caches for this branch
         if: steps.cache-check.outputs.cache-hit != 'true'
-        uses: useblacksmith/cache-delete@v1
-        with:
-          key: prod-build-${{ github.head_ref || github.ref_name }}
-          prefix: "true"
+        continue-on-error: true
+        run: |
+          gh extension install actions/gh-actions-cache
+          for key in $(gh actions-cache list -R ${{ github.repository }} --key "prod-build-${{ github.head_ref || github.ref_name }}" --limit 100 | cut -f1); do
+            gh actions-cache delete "$key" -R ${{ github.repository }} --confirm
+          done
+        env:
+          GH_TOKEN: ${{ github.token }}
       - uses: ./.github/actions/cache-build