WIP¨

Improve workflow metrics with faillure reason
chore(deps): bump nodemailer from 7.0.11 to 7.0.13 (#18754 )
2026-03-20 15:25:35 +01:00 · 2026-03-19 15:30:54 +01:00 · 2026-03-19 09:22:17 +00:00 · 2026-03-19 09:11:58 +00:00 · 2026-03-19 09:10:58 +00:00 · 2026-03-19 10:10:47 +01:00
9901 changed files with 487900 additions and 229907 deletions
@@ -1,18 +0,0 @@
-{
-  "install": "curl -fsSL https://deb.nodesource.com/setup_24.x | sudo -E bash - && sudo apt-get install -y nodejs && node --version && yarn install && echo 'Setting up Docker Compose environment...' && cd packages/twenty-docker && cp -n docker-compose.yml docker-compose.dev.yml || true && echo 'Dependencies installed and docker-compose prepared'",
-  "start": "sudo service docker start && echo 'Docker service started' && cd packages/twenty-docker && echo 'Installing yq for YAML processing...' && sudo apt-get update -qq && sudo apt-get install -y wget && wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 && sudo chmod +x /usr/local/bin/yq && echo 'Patching docker-compose for local development...' && yq eval 'del(.services.server.image)' -i docker-compose.dev.yml && yq eval '.services.server.build.context = \"../../\"' -i docker-compose.dev.yml && yq eval '.services.server.build.dockerfile = \"./packages/twenty-docker/twenty/Dockerfile\"' -i docker-compose.dev.yml && yq eval 'del(.services.worker.image)' -i docker-compose.dev.yml && yq eval '.services.worker.build.context = \"../../\"' -i docker-compose.dev.yml && yq eval '.services.worker.build.dockerfile = \"./packages/twenty-docker/twenty/Dockerfile\"' -i docker-compose.dev.yml && echo 'Setting up .env file with database configuration...' && echo 'SERVER_URL=http://localhost:3000' > .env && echo 'APP_SECRET='$(openssl rand -base64 32) >> .env && echo 'PG_DATABASE_PASSWORD='$(openssl rand -hex 16) >> .env && echo 'PG_DATABASE_URL=postgres://postgres:password@localhost:5432/postgres' >> .env && echo 'SIGN_IN_PREFILLED=true' >> .env && echo 'Building and starting services...' && docker-compose -f docker-compose.dev.yml up -d --build && echo 'Waiting for services to initialize...' && sleep 30 && echo 'Checking service health...' && docker-compose -f docker-compose.dev.yml ps && echo 'Environment setup complete!'",
-  "terminals": [
-    {
-      "name": "Database Setup & Seed",
-      "command": "sleep 40 && cd packages/twenty-docker && echo 'Waiting for PostgreSQL to be ready...' && until docker-compose -f docker-compose.dev.yml exec -T db pg_isready -U postgres; do echo 'Waiting for PostgreSQL...'; sleep 5; done && echo 'PostgreSQL is ready!' && echo 'Waiting for Twenty server to be healthy...' && until docker-compose -f docker-compose.dev.yml exec -T server curl --fail http://localhost:3000/healthz 2>/dev/null; do echo 'Waiting for server...'; sleep 5; done && echo 'Server is healthy!' && echo 'Running database setup and seeding...' && docker-compose -f docker-compose.dev.yml exec -T server npx nx database:reset twenty-server && echo 'Database seeded successfully!' && bash"
-    },
-    {
-      "name": "Application Logs",
-      "command": "sleep 35 && cd packages/twenty-docker && echo 'Following application logs...' && docker-compose -f docker-compose.dev.yml logs -f server worker"
-    },
-    {
-      "name": "Service Monitor",
-      "command": "sleep 15 && cd packages/twenty-docker && echo '=== Service Status Monitor ===' && while true; do clear; echo '=== Service Status at $(date) ===' && docker-compose -f docker-compose.dev.yml ps && echo '\\n=== Health Status ===' && (docker-compose -f docker-compose.dev.yml exec -T server curl -s http://localhost:3000/healthz 2>/dev/null && echo '✅ Twenty Server: Healthy') || echo '❌ Twenty Server: Not Ready' && (docker-compose -f docker-compose.dev.yml exec -T db pg_isready -U postgres 2>/dev/null && echo '✅ PostgreSQL: Ready') || echo '❌ PostgreSQL: Not Ready' && echo '\\n=== Database Connection Test ===' && docker-compose -f docker-compose.dev.yml exec -T server node -e \"const { Client } = require('pg'); const client = new Client({connectionString: process.env.PG_DATABASE_URL}); client.connect().then(() => {console.log('✅ Database Connection: OK'); client.end();}).catch(e => console.log('❌ Database Connection: Failed -', e.message));\" || echo 'Connection test failed' && sleep 45; done"
-    }
-  ]
-} 
@@ -1,6 +1,6 @@
 {
  "install": "yarn install",
-  "start": "sudo service docker start && sleep 2 && (docker start twenty_pg 2>/dev/null || make -C packages/twenty-docker postgres-on-docker) && (docker start twenty_redis 2>/dev/null || make -C packages/twenty-docker redis-on-docker) && until docker exec twenty_pg pg_isready -U postgres -h localhost 2>/dev/null; do sleep 1; done && echo 'PostgreSQL ready' && until docker exec twenty_redis redis-cli ping 2>/dev/null | grep -q PONG; do sleep 1; done && echo 'Redis ready' && bash packages/twenty-utils/setup-dev-env.sh && npx nx database:reset twenty-server",
+  "start": "(sudo service docker start || service docker start || true) && bash packages/twenty-utils/setup-dev-env.sh && npx nx database:reset twenty-server",
  "terminals": [
    {
      "name": "Development Server",
@@ -22,7 +22,7 @@ This directory contains Twenty's development guidelines and best practices in th

 ### React Development
 - **react-general-guidelines.mdc** - Core React development principles (Auto-attached to React files)
- **react-state-management.mdc** - State management approaches with Recoil (Auto-attached to state files)
+- **react-state-management.mdc** - State management approaches with Jotai (Auto-attached to state files)

 ### Testing & Quality
 - **testing-guidelines.mdc** - Testing strategies and best practices (Auto-attached to test files)
@@ -7,7 +7,7 @@ alwaysApply: true
 # Twenty Architecture

 ## Tech Stack
- **Frontend**: React 18, TypeScript, Recoil, Styled Components, Vite
+- **Frontend**: React 18, TypeScript, Jotai, Styled Components, Vite
 - **Backend**: NestJS, TypeORM, PostgreSQL, Redis, GraphQL
 - **Monorepo**: Nx workspace with yarn

@@ -8,7 +8,7 @@ alwaysApply: true
 ## Formatting Standards
 - **Prettier**: 2-space indentation, single quotes, trailing commas, semicolons
 - **Print width**: 80 characters
- **ESLint**: No unused imports, consistent import ordering, prefer const over let
+- **Oxlint**: No unused imports, consistent import ordering, prefer const over let

 ## Naming Conventions
 ```typescript
@@ -4,16 +4,20 @@ alwaysApply: false
 ---
 # React State Management

-## Recoil Patterns
+## Jotai Patterns
 ```typescript
-// ✅ Atoms for primitive state
-export const currentUserState = atom<User | null>({
+// ✅ Atoms for primitive state (use createAtomState for keyed state with optional persistence)
+import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';
+
+export const currentUserState = createAtomState<User | null>({
  key: 'currentUserState',
-  default: null,
+  defaultValue: null,
 });

-// ✅ Selectors for derived state
-export const userDisplayNameSelector = selector({
+// ✅ Derived atoms for computed state (use createAtomSelector)
+import { createAtomSelector } from '@/ui/utilities/state/jotai/utils/createAtomSelector';
+
+export const userDisplayNameSelector = createAtomSelector({
  key: 'userDisplayNameSelector',
  get: ({ get }) => {
    const user = get(currentUserState);
@@ -21,13 +25,30 @@ export const userDisplayNameSelector = selector({
  },
 });

-// ✅ Atom families for dynamic atoms
-export const userByIdState = atomFamily<User | null, string>({
+// ✅ Atom factory pattern for dynamic atoms (use createAtomFamilyState)
+import { createAtomFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomFamilyState';
+
+export const userByIdState = createAtomFamilyState<User | null, string>({
  key: 'userByIdState',
-  default: null,
+  defaultValue: null,
 });
 ```

+## Jotai Hooks
+```typescript
+// useAtomState - read and write
+import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
+
+// useAtomStateValue - read only
+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
+
+// useSetAtomState - write only
+import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
+```
+
+## Provider
+Jotai works without a Provider by default. For scoped stores or testing, use `Provider` from `jotai`.
+
 ## Local State Guidelines
 ```typescript
 // ✅ Multiple useState for unrelated state
@@ -74,7 +95,7 @@ const increment = useCallback(() => {
 ```

 ## Performance Tips
- Use atom families for dynamic data collections
- Implement proper selector caching
- Avoid heavy computations in selectors
+- Use atom factory pattern (createAtomFamilyState) for dynamic data collections
+- Derived atoms (createAtomSelector) are automatically memoized by Jotai
+- Avoid heavy computations in derived atoms
 - Batch state updates when possible
@@ -0,0 +1,53 @@
+---
+description: ESM dependency guidelines for twenty-sdk and create-twenty-app packages
+globs: ["packages/twenty-sdk/**", "packages/create-twenty-app/**"]
+alwaysApply: false
+---
+
+# ESM Dependency Guidelines
+
+## Context
+
+`twenty-sdk` and `create-twenty-app` are published as dual-format npm packages (ESM `.mjs` + CJS `.cjs`). Dependencies listed in `dependencies` are **externalized** by the Vite/Rollup build — they are not bundled, and consumers resolve them from `node_modules` at runtime.
+
+This means **CJS-only dependencies break the ESM output**. When Rollup emits `import { foo } from 'cjs-package'`, Node.js ESM cannot resolve named exports from CommonJS modules, causing `SyntaxError: Named export 'foo' not found`.
+
+## Rules
+
+### Only add ESM-compatible dependencies
+
+Before adding a new dependency to `package.json`, verify it supports ESM:
+- Check for `"type": "module"` in its `package.json`
+- Or check for an `"exports"` map with ESM entries
+- Or check for a `"module"` field pointing to an ESM build
+
+### Use native `node:fs/promises` for standard fs operations
+
+```typescript
+// ✅ Import native fs functions directly
+import { readFile, writeFile, mkdir, rm, cp } from 'node:fs/promises';
+import { createWriteStream, existsSync } from 'node:fs';
+
+// ✅ Import only custom helpers from fs-utils (no native re-exports)
+import { pathExists, ensureDir, emptyDir, copy, move, remove, readJson, writeJson, ensureFile } from '@/cli/utilities/file/fs-utils';
+
+// ❌ Don't use fs-extra (CJS-only, breaks ESM bundle)
+import * as fs from 'fs-extra';
+
+// ❌ Don't use import * as fs from fs-utils (it doesn't re-export native fs)
+import * as fs from '@/cli/utilities/file/fs-utils';
+```
+
+### Use `@/cli/utilities/string/kebab-case` instead of lodash
+
+```typescript
+// ✅ Use internal utility
+import { kebabCase } from '@/cli/utilities/string/kebab-case';
+
+// ❌ Don't use lodash single-function packages (CJS-only, unmaintained)
+import kebabCase from 'lodash.kebabcase';
+```
+
+### When no ESM alternative exists
+
+If a CJS-only package has no ESM replacement (e.g. `archiver`), add it to the `cjsOnlyPackages` list in `vite.config.node.ts` so it gets inlined into the bundle instead of externalized.
@@ -1,5 +1,5 @@
 .git
 .env
-node_modules
+**/node_modules
 .nx/cache
 packages/twenty-server/.env
@@ -15,8 +15,22 @@ inputs:
 runs:
  using: "composite"
  steps:
+    - name: Fetch main branch for diff
+      shell: bash
+      run: git fetch origin main --depth=1
    - name: Get last successful commit
+      if: env.NX_BASE == ''
      uses: nrwl/nx-set-shas@v4
+    - name: Fallback to origin/main if no base found
+      if: env.NX_BASE == ''
+      shell: bash
+      run: echo "NX_BASE=$(git rev-parse origin/main)" >> $GITHUB_ENV
    - name: Run affected command
      shell: bash
-      run: npx nx affected --nxBail --configuration=${{ inputs.configuration }} -t=${{ inputs.tasks }} --parallel=${{ inputs.parallel }} --exclude='*,!tag:${{ inputs.tag }}' ${{ inputs.args }}
+      env:
+        NX_CONFIGURATION: ${{ inputs.configuration }}
+        NX_TASKS: ${{ inputs.tasks }}
+        NX_PARALLEL: ${{ inputs.parallel }}
+        NX_TAG: ${{ inputs.tag }}
+        NX_ARGS: ${{ inputs.args }}
+      run: npx nx affected --nxBail --configuration="$NX_CONFIGURATION" -t="$NX_TASKS" --parallel="$NX_PARALLEL" --exclude="*,!tag:$NX_TAG" $NX_ARGS
@@ -19,8 +19,11 @@ runs:
    - name: Cache primary key builder
      id: cache-primary-key-builder
      shell: bash
+      env:
+        CACHE_KEY: ${{ inputs.key }}
+        REF_NAME: ${{ github.ref_name }}
      run: |
-        echo "CACHE_PRIMARY_KEY_PREFIX=v4-${{ inputs.key }}-${{ github.ref_name }}" >> "${GITHUB_OUTPUT}"
+        echo "CACHE_PRIMARY_KEY_PREFIX=v4-${CACHE_KEY}-${REF_NAME}" >> "${GITHUB_OUTPUT}"
    - name: Restore cache
      uses: actions/cache/restore@v4
      id: restore-cache
@@ -0,0 +1,80 @@
+name: Spawn Twenty Docker Image
+description: >
+  Starts a full Twenty instance (server, worker, database, redis) using Docker
+  Compose. The server is available at http://localhost:3000 for subsequent steps
+  in the caller's job.
+  Pulls the specified semver image tag from Docker Hub.
+  Designed to be consumed from external repositories (e.g., twenty-app).
+
+inputs:
+  twenty-version:
+    description: 'Twenty Docker Hub image tag as semver (e.g., v0.40.0, v1.0.0).'
+    required: true
+  twenty-repository:
+    description: 'Twenty repository to checkout docker compose files from.'
+    required: false
+    default: 'twentyhq/twenty'
+  github-token:
+    description: 'GitHub token for cross-repo checkout. Required when calling from an external repository.'
+    required: false
+    default: ${{ github.token }}
+
+outputs:
+  server-url:
+    description: 'URL where the Twenty server can be reached'
+    value: http://localhost:3000
+  access-token:
+    description: 'Admin access token for the Twenty instance'
+    value: ${{ steps.admin-token.outputs.access-token }}
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Validate version
+      shell: bash
+      run: |
+        VERSION="${{ inputs.twenty-version }}"
+        if ! echo "$VERSION" | grep -qE '^v[0-9]+\.[0-9]+\.[0-9]+$'; then
+          echo "::error::twenty-version must be a semver tag (e.g., v0.40.0). Got: '$VERSION'"
+          exit 1
+        fi
+
+    - name: Checkout docker compose files
+      uses: actions/checkout@v4
+      with:
+        repository: ${{ inputs.twenty-repository }}
+        ref: ${{ inputs.twenty-version }}
+        token: ${{ inputs.github-token }}
+        sparse-checkout: |
+          packages/twenty-docker
+        sparse-checkout-cone-mode: false
+        path: .twenty-spawn
+
+    - name: Prepare environment
+      shell: bash
+      working-directory: ./.twenty-spawn/packages/twenty-docker
+      run: |
+        cp .env.example .env
+        echo "" >> .env
+        echo "TAG=${{ inputs.twenty-version }}" >> .env
+        echo "APP_SECRET=replace_me_with_a_random_string" >> .env
+        echo "SERVER_URL=http://localhost:3000" >> .env
+
+    - name: Start Twenty instance
+      shell: bash
+      working-directory: ./.twenty-spawn/packages/twenty-docker
+      run: |
+        docker compose up -d --wait || {
+          echo "::error::Docker compose failed to start or health checks timed out"
+          docker compose logs
+          exit 1
+        }
+        echo "Twenty instance is ready at http://localhost:3000"
+
+    - name: Set admin access token
+      id: admin-token
+      shell: bash
+      run: |
+        ACCESS_TOKEN="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIyMDIwMjAyMC1lNmI1LTQ2ODAtOGEzMi1iODIwOTczNzE1NmIiLCJ1c2VySWQiOiIyMDIwMjAyMC1lNmI1LTQ2ODAtOGEzMi1iODIwOTczNzE1NmIiLCJ3b3Jrc3BhY2VJZCI6IjIwMjAyMDIwLTFjMjUtNGQwMi1iZjI1LTZhZWNjZjdlYTQxOSIsIndvcmtzcGFjZU1lbWJlcklkIjoiMjAyMDIwMjAtNDYzZi00MzViLTgyOGMtMTA3ZTAwN2EyNzExIiwidXNlcldvcmtzcGFjZUlkIjoiMjAyMDIwMjAtMWU3Yy00M2Q5LWE1ZGItNjg1YjUwNjlkODE2IiwidHlwZSI6IkFDQ0VTUyIsImF1dGhQcm92aWRlciI6InBhc3N3b3JkIiwiaWF0IjoxNzUxMjgxNzA0LCJleHAiOjIwNjY4NTc3MDR9.HMGqCsVlOAPVUBhKSGlD1X86VoHKt4LIUtET3CGIdik"
+        echo "::add-mask::$ACCESS_TOKEN"
+        echo "access-token=$ACCESS_TOKEN" >> "$GITHUB_OUTPUT"
@@ -0,0 +1,19 @@
+storage: /tmp/verdaccio-storage
+auth:
+  htpasswd:
+    file: /tmp/verdaccio-htpasswd
+    max_users: 100
+uplinks:
+  npmjs:
+    url: https://registry.npmjs.org/
+packages:
+  'twenty-sdk':
+    access: $all
+    publish: $all
+  'create-twenty-app':
+    access: $all
+    publish: $all
+  '**':
+    access: $all
+    proxy: npmjs
+log: { type: stdout, format: pretty, level: warn }
@@ -23,7 +23,7 @@ jobs:
      - name: Fetch custom Github Actions and base branch history
        uses: actions/checkout@v4
        with:
-          fetch-depth: 0
+          fetch-depth: 10
      - name: Check for changed files
        id: changed-files
        uses: tj-actions/changed-files@v45
@@ -16,8 +16,6 @@ env:

 permissions:
  contents: read
-  pull-requests: write
-  checks: write

 jobs:
  changed-files-check:
@@ -72,7 +70,7 @@ jobs:
      - name: Checkout current branch
        uses: actions/checkout@v4
        with:
-          fetch-depth: 0
+          fetch-depth: 10

      - name: Try to merge main into current branch
        id: merge_attempt
@@ -584,182 +582,16 @@ jobs:
            echo "::warning::REST Metadata API analysis tool error - continuing workflow"
          fi

-      - name: Comment API Changes on PR
+      - name: Upload breaking changes report
        if: always()
-        uses: actions/github-script@v7
+        uses: actions/upload-artifact@v4
        with:
-          script: |
-            const fs = require('fs');
-            let hasChanges = false;
-            let comment = '';
-
-            try {
-              if (fs.existsSync('graphql-schema-diff.md')) {
-                const graphqlDiff = fs.readFileSync('graphql-schema-diff.md', 'utf8');
-                if (graphqlDiff.trim()) {
-                  if (!hasChanges) {
-                    comment = '## 📊 API Changes Report\n\n';
-                    hasChanges = true;
-                  }
-                  comment += '### GraphQL Schema Changes\n' + graphqlDiff + '\n\n';
-                }
-              }
-
-              if (fs.existsSync('graphql-metadata-diff.md')) {
-                const graphqlMetadataDiff = fs.readFileSync('graphql-metadata-diff.md', 'utf8');
-                if (graphqlMetadataDiff.trim()) {
-                  if (!hasChanges) {
-                    comment = '## 📊 API Changes Report\n\n';
-                    hasChanges = true;
-                  }
-                  comment += '### GraphQL Metadata Schema Changes\n' + graphqlMetadataDiff + '\n\n';
-                }
-              }
-
-              if (fs.existsSync('rest-api-diff.md')) {
-                const restDiff = fs.readFileSync('rest-api-diff.md', 'utf8');
-                if (restDiff.trim()) {
-                  if (!hasChanges) {
-                    comment = '## 📊 API Changes Report\n\n';
-                    hasChanges = true;
-                  }
-                  comment += restDiff + '\n\n';
-                }
-              }
-
-              if (fs.existsSync('rest-metadata-api-diff.md')) {
-                const metadataDiff = fs.readFileSync('rest-metadata-api-diff.md', 'utf8');
-                if (metadataDiff.trim()) {
-                  if (!hasChanges) {
-                    comment = '## 📊 API Changes Report\n\n';
-                    hasChanges = true;
-                  }
-                  comment += metadataDiff + '\n\n';
-                }
-              }
-
-              // Only post comment if there are changes
-              if (hasChanges) {
-                // Add branch state information only if there were conflicts
-                const branchState = process.env.BRANCH_STATE || 'unknown';
-                let branchStateNote = '';
-
-                if (branchState === 'conflicts') {
-                  branchStateNote = '\n\n⚠️ **Note**: Could not merge with `main` due to conflicts. This comparison shows changes between the current branch and `main` as separate states.\n';
-                }
-                // Check if there are any breaking changes detected
-                let hasBreakingChanges = false;
-                let breakingChangeNote = '';
-
-                // Check for breaking changes in any of the diff files
-                if (fs.existsSync('rest-api-diff.md')) {
-                  const restDiff = fs.readFileSync('rest-api-diff.md', 'utf8');
-                  if (restDiff.includes('Breaking Changes') || restDiff.includes('🚨') ||
-                      restDiff.includes('Removed Endpoints') || restDiff.includes('Changed Operations')) {
-                    hasBreakingChanges = true;
-                  }
-                }
-
-                if (fs.existsSync('rest-metadata-api-diff.md')) {
-                  const metadataDiff = fs.readFileSync('rest-metadata-api-diff.md', 'utf8');
-                  if (metadataDiff.includes('Breaking Changes') || metadataDiff.includes('🚨') ||
-                      metadataDiff.includes('Removed Endpoints') || metadataDiff.includes('Changed Operations')) {
-                    hasBreakingChanges = true;
-                  }
-                }
-
-                // Also check GraphQL changes for breaking changes indicators
-                if (fs.existsSync('graphql-schema-diff.md')) {
-                  const graphqlDiff = fs.readFileSync('graphql-schema-diff.md', 'utf8');
-                  if (graphqlDiff.includes('Breaking changes') || graphqlDiff.includes('BREAKING')) {
-                    hasBreakingChanges = true;
-                  }
-                }
-
-                if (fs.existsSync('graphql-metadata-diff.md')) {
-                  const graphqlMetadataDiff = fs.readFileSync('graphql-metadata-diff.md', 'utf8');
-                  if (graphqlMetadataDiff.includes('Breaking changes') || graphqlMetadataDiff.includes('BREAKING')) {
-                    hasBreakingChanges = true;
-                  }
-                }
-
-                // Check PR title for "breaking"
-                const prTitle = ${{ toJSON(github.event.pull_request.title) }};
-                const titleContainsBreaking = prTitle.toLowerCase().includes('breaking');
-
-                if (hasBreakingChanges) {
-                  if (titleContainsBreaking) {
-                    breakingChangeNote = '\n\n## ✅ Breaking Change Protocol\n\n' +
-                      '**This PR title contains "breaking" and breaking changes were detected - the CI will fail as expected.**\n\n' +
-                      '📝 **Action Required**: Please add `BREAKING CHANGE:` to your commit message to trigger a major version bump.\n\n' +
-                      'Example:\n```\nfeat: add new API endpoint\n\nBREAKING CHANGE: removed deprecated field from User schema\n```';
-                  } else {
-                    breakingChangeNote = '\n\n## ⚠️ Breaking Change Protocol\n\n' +
-                      '**Breaking changes detected but PR title does not contain "breaking" - CI will pass but action needed.**\n\n' +
-                      '🔄 **Options**:\n' +
-                      '1. **If this IS a breaking change**: Add "breaking" to your PR title and add `BREAKING CHANGE:` to your commit message\n' +
-                      '2. **If this is NOT a breaking change**: The API diff tool may have false positives - please review carefully\n\n' +
-                      'For breaking changes, add to commit message:\n```\nfeat: add new API endpoint\n\nBREAKING CHANGE: removed deprecated field from User schema\n```';
-                  }
-                }
-
-                const COMMENT_MARKER = '<!-- API_CHANGES_REPORT -->';
-                const commentBody = COMMENT_MARKER + '\n' + comment + branchStateNote + '\n⚠️ **Please review these API changes carefully before merging.**' + breakingChangeNote;
-
-                // Get all comments to find existing API changes comment
-                const {data: comments} = await github.rest.issues.listComments({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  issue_number: context.issue.number,
-                });
-
-                // Find our existing comment
-                const botComment = comments.find(comment => comment.body.includes(COMMENT_MARKER));
-
-                if (botComment) {
-                  // Update existing comment
-                  await github.rest.issues.updateComment({
-                    owner: context.repo.owner,
-                    repo: context.repo.repo,
-                    comment_id: botComment.id,
-                    body: commentBody
-                  });
-                  console.log('Updated existing API changes comment');
-                } else {
-                  // Create new comment
-                  await github.rest.issues.createComment({
-                    issue_number: context.issue.number,
-                    owner: context.repo.owner,
-                    repo: context.repo.repo,
-                    body: commentBody
-                  });
-                  console.log('Created new API changes comment');
-                }
-              } else {
-                console.log('No API changes detected - skipping PR comment');
-
-                // Check if there's an existing comment to remove
-                const {data: comments} = await github.rest.issues.listComments({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  issue_number: context.issue.number,
-                });
-
-                const COMMENT_MARKER = '<!-- API_CHANGES_REPORT -->';
-                const botComment = comments.find(comment => comment.body.includes(COMMENT_MARKER));
-
-                if (botComment) {
-                  await github.rest.issues.deleteComment({
-                    owner: context.repo.owner,
-                    repo: context.repo.repo,
-                    comment_id: botComment.id,
-                  });
-                  console.log('Deleted existing API changes comment (no changes detected)');
-                }
-              }
-            } catch (error) {
-              console.log('Could not post comment:', error);
-            }
+          name: breaking-changes-report
+          path: |
+            *-diff.md
+            *-diff.json
+          if-no-files-found: ignore
+          retention-days: 3

      - name: Cleanup servers
        if: always()
@@ -771,16 +603,4 @@ jobs:
            kill $(cat /tmp/main-server.pid) || true
          fi

-      - name: Upload API specifications and diffs
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: api-specifications-and-diffs
-          path: |
-            /tmp/main-server.log
-            /tmp/current-server.log
-            *-api.json
-            *-schema-introspection.json
-            *-diff.md
-            *-diff.json

@@ -0,0 +1,184 @@
+name: CI Create App E2E
+
+on:
+  push:
+    branches:
+      - main
+
+  pull_request:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
+jobs:
+  changed-files-check:
+    uses: ./.github/workflows/changed-files.yaml
+    with:
+      files: |
+        packages/create-twenty-app/**
+        packages/twenty-sdk/**
+        packages/twenty-shared/**
+        packages/twenty-server/**
+        !packages/create-twenty-app/package.json
+        !packages/twenty-sdk/package.json
+        !packages/twenty-shared/package.json
+        !packages/twenty-server/package.json
+  create-app-e2e:
+    needs: changed-files-check
+    if: needs.changed-files-check.outputs.any_changed == 'true'
+    timeout-minutes: 30
+    runs-on: ubuntu-latest-4-cores
+    services:
+      postgres:
+        image: twentycrm/twenty-postgres-spilo
+        env:
+          PGUSER_SUPERUSER: postgres
+          PGPASSWORD_SUPERUSER: postgres
+          ALLOW_NOSSL: 'true'
+          SPILO_PROVIDER: 'local'
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+      redis:
+        image: redis
+        ports:
+          - 6379:6379
+    steps:
+      - name: Fetch custom Github Actions and base branch history
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 10
+
+      - name: Install dependencies
+        uses: ./.github/actions/yarn-install
+
+      - name: Set CI version and prepare packages for publish
+        run: |
+          CI_VERSION="0.0.0-ci.$(date +%s)"
+          echo "CI_VERSION=$CI_VERSION" >> $GITHUB_ENV
+          npx nx run-many -t set-local-version -p twenty-sdk create-twenty-app --releaseVersion=$CI_VERSION
+
+      - name: Build packages
+        run: |
+          npx nx build twenty-sdk
+          npx nx build create-twenty-app
+
+      - name: Install and start Verdaccio
+        run: |
+          npx verdaccio --config .github/verdaccio-config.yaml &
+
+          for i in $(seq 1 30); do
+            if curl -s http://localhost:4873 > /dev/null 2>&1; then
+              echo "Verdaccio is ready"
+              break
+            fi
+            echo "Waiting for Verdaccio... ($i/30)"
+            sleep 1
+          done
+
+      - name: Publish packages to local registry
+        run: |
+          npm set //localhost:4873/:_authToken "ci-auth-token"
+
+          for pkg in twenty-sdk create-twenty-app; do
+            cd packages/$pkg
+            npm publish --registry http://localhost:4873 --tag ci
+            cd ../..
+          done
+
+      - name: Scaffold app using published create-twenty-app
+        run: |
+          npm install -g create-twenty-app@$CI_VERSION --registry http://localhost:4873
+          create-twenty-app --version
+          mkdir -p /tmp/e2e-test-workspace
+          cd /tmp/e2e-test-workspace
+          create-twenty-app test-app --exhaustive --display-name "Test App" --description "E2E test app" --skip-local-instance
+
+      - name: Install scaffolded app dependencies
+        run: |
+          cd /tmp/e2e-test-workspace/test-app
+          echo 'npmRegistryServer: "http://localhost:4873"' >> .yarnrc.yml
+          echo 'unsafeHttpWhitelist: ["localhost"]' >> .yarnrc.yml
+          YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install --no-immutable
+
+      - name: Verify installed app versions
+        run: |
+          cd /tmp/e2e-test-workspace/test-app
+          echo "--- Checking package.json references correct SDK version ---"
+          node -e "
+            const pkg = require('./package.json');
+            const sdkVersion = pkg.devDependencies['twenty-sdk'];
+            if (!sdkVersion.startsWith('0.0.0-ci.')) {
+              console.error('Expected twenty-sdk version to start with 0.0.0-ci., got:', sdkVersion);
+              process.exit(1);
+            }
+            console.log('SDK version in scaffolded app:', sdkVersion);
+          "
+
+      - name: Verify SDK CLI is available
+        run: |
+          cd /tmp/e2e-test-workspace/test-app
+          npx --no-install twenty --version
+
+      - name: Setup server environment
+        run: npx nx reset:env:e2e-testing-server twenty-server
+
+      - name: Build server
+        run: npx nx build twenty-server
+
+      - name: Create and setup database
+        run: |
+          PGPASSWORD=postgres psql -h localhost -p 5432 -U postgres -d postgres -c 'CREATE DATABASE "default";'
+          PGPASSWORD=postgres psql -h localhost -p 5432 -U postgres -d postgres -c 'CREATE DATABASE "test";'
+          npx nx run twenty-server:database:reset
+
+      - name: Start server
+        run: |
+          npx nx start twenty-server &
+          echo "Waiting for server to be ready..."
+          timeout 60 bash -c 'until curl -s http://localhost:3000/health; do sleep 2; done'
+
+      - name: Authenticate with twenty-server
+        env:
+          SEED_API_KEY: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIyMDIwMjAyMC1lNmI1LTQ2ODAtOGEzMi1iODIwOTczNzE1NmIiLCJ1c2VySWQiOiIyMDIwMjAyMC1lNmI1LTQ2ODAtOGEzMi1iODIwOTczNzE1NmIiLCJ3b3Jrc3BhY2VJZCI6IjIwMjAyMDIwLTFjMjUtNGQwMi1iZjI1LTZhZWNjZjdlYTQxOSIsIndvcmtzcGFjZU1lbWJlcklkIjoiMjAyMDIwMjAtNDYzZi00MzViLTgyOGMtMTA3ZTAwN2EyNzExIiwidXNlcldvcmtzcGFjZUlkIjoiMjAyMDIwMjAtMWU3Yy00M2Q5LWE1ZGItNjg1YjUwNjlkODE2IiwidHlwZSI6IkFDQ0VTUyIsImF1dGhQcm92aWRlciI6InBhc3N3b3JkIiwiaWF0IjoxNzUxMjgxNzA0LCJleHAiOjIwNjY4NTc3MDR9.HMGqCsVlOAPVUBhKSGlD1X86VoHKt4LIUtET3CGIdik'
+        run: |
+          cd /tmp/e2e-test-workspace/test-app
+          npx --no-install twenty remote add --token $SEED_API_KEY --url http://localhost:3000
+
+      - name: Build scaffolded app
+        run: |
+          cd /tmp/e2e-test-workspace/test-app
+          npx --no-install twenty build
+          test -d .twenty/output
+
+      - name: Execute hello-world logic function
+        run: |
+          cd /tmp/e2e-test-workspace/test-app
+          EXEC_OUTPUT=$(npx --no-install twenty exec --functionName hello-world-logic-function)
+          echo "$EXEC_OUTPUT"
+          echo "$EXEC_OUTPUT" | grep -q "Hello, World!"
+
+      - name: Run scaffolded app integration test
+        env:
+          TWENTY_API_URL: http://localhost:3000
+        run: |
+          cd /tmp/e2e-test-workspace/test-app
+          yarn test
+
+  ci-create-app-e2e-status-check:
+    if: always() && !cancelled()
+    timeout-minutes: 5
+    runs-on: ubuntu-latest
+    needs: [changed-files-check, create-app-e2e]
+    steps:
+      - name: Fail job if any needs failed
+        if: contains(needs.*.result, 'failure')
+        run: exit 1
@@ -37,7 +37,7 @@ jobs:
      - name: Fetch custom Github Actions and base branch history
        uses: actions/checkout@v4
        with:
-          fetch-depth: 0
+          fetch-depth: 10
      - name: Install dependencies
        uses: ./.github/actions/yarn-install
      - name: Build
@@ -21,7 +21,6 @@ jobs:
      files: |
        package.json
        packages/twenty-docs/**
-        eslint.config.mjs

  docs-lint:
    needs: changed-files-check
@@ -37,11 +36,11 @@ jobs:
      - name: Fetch local actions
        uses: actions/checkout@v4
        with:
-          fetch-depth: 0
+          fetch-depth: 10

      - name: Install dependencies
        uses: ./.github/actions/yarn-install

-      - name: Docs / Lint English MDX files
-        run: npx eslint "packages/twenty-docs/{developers,user-guide,twenty-ui,getting-started,snippets}/**/*.mdx" --max-warnings 0
+      - name: Docs / Lint
+        run: npx nx lint twenty-docs

@@ -25,12 +25,12 @@ jobs:
    needs: changed-files-check
    if: needs.changed-files-check.outputs.any_changed == 'true'
    timeout-minutes: 10
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-latest
    steps:
      - name: Fetch custom Github Actions and base branch history
        uses: actions/checkout@v4
        with:
-          fetch-depth: 0
+          fetch-depth: 10
      - name: Install dependencies
        uses: ./.github/actions/yarn-install
      - name: Build twenty-emails
@@ -1,8 +1,7 @@
-name: CI Front and E2E
+name: CI Front

 on:
  pull_request:
-
  merge_group:

 permissions:
@@ -19,6 +18,7 @@ env:

 jobs:
  changed-files-check:
+    if: github.event_name != 'merge_group'
    uses: ./.github/workflows/changed-files.yaml
    with:
      files: |
@@ -29,15 +29,6 @@ jobs:
        packages/twenty-shared/**
        packages/twenty-sdk/**
        !packages/twenty-sdk/package.json
-  changed-files-check-e2e:
-    uses: ./.github/workflows/changed-files.yaml
-    with:
-      files: |
-        packages/**
-        !packages/create-twenty-app/package.json
-        !packages/twenty-sdk/package.json
-        playwright.config.ts
-        .github/workflows/ci-front.yaml
  front-sb-build:
    needs: changed-files-check
    if: needs.changed-files-check.outputs.any_changed == 'true'
@@ -53,7 +44,7 @@ jobs:
      - name: Fetch local actions
        uses: actions/checkout@v4
        with:
-          fetch-depth: 0
+          fetch-depth: 10
      - name: Install dependencies
        uses: ./.github/actions/yarn-install
      - name: Diagnostic disk space issue
@@ -62,13 +53,19 @@ jobs:
        run: npx nx reset:env twenty-front
      - name: Front / Build storybook
        run: npx nx storybook:build twenty-front
+      - name: Upload storybook build
+        uses: actions/upload-artifact@v4
+        with:
+          name: storybook-static
+          path: packages/twenty-front/storybook-static
+          retention-days: 1
      - name: Save storybook build cache
        uses: ./.github/actions/save-cache
        with:
          key: ${{ env.STORYBOOK_BUILD_CACHE_KEY_FOR_SAVE_ACTION }}
  front-sb-test:
    timeout-minutes: 30
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-latest
    needs: front-sb-build
    strategy:
      fail-fast: false
@@ -78,99 +75,89 @@ jobs:
    env:
      SHARD_COUNTER: 4
      REACT_APP_SERVER_BASE_URL: http://localhost:3000
+      STORYBOOK_URL: http://localhost:6006
    steps:
      - name: Fetch local actions
        uses: actions/checkout@v4
        with:
-          fetch-depth: 0
-      - name: Install dependencies
-        uses: ./.github/actions/yarn-install
-      - name: Build dependencies
-        run: |
-          npx nx build twenty-shared
-          npx nx build twenty-ui
-          npx nx build twenty-sdk
-      - name: Install Playwright
-        run: |
-          cd packages/twenty-front
-          npx playwright install
-      - name: Front / Write .env
-        run: npx nx reset:env twenty-front
-      - name: Run storybook tests
-        run: npx nx storybook:test twenty-front --configuration=${{ matrix.storybook_scope }} --shard=${{ matrix.shard }}/${{ env.SHARD_COUNTER }}
-      - name: Rename coverage file
-        run: |
-          if [ -f "packages/twenty-front/coverage/storybook/coverage-final.json" ]; then
-            mv packages/twenty-front/coverage/storybook/coverage-final.json packages/twenty-front/coverage/storybook/coverage-shard-${{matrix.shard}}.json
-          else
-            echo "Error: coverage-final.json not found"
-            ls -la packages/twenty-front/coverage/storybook/ || echo "Coverage directory does not exist"
-            exit 1
-          fi
-      - name: Upload coverage artifact
-        uses: actions/upload-artifact@v4
-        with:
-          retention-days: 1
-          name: coverage-artifacts-${{ matrix.storybook_scope }}-${{ github.run_id }}-${{ matrix.shard }}
-          path: packages/twenty-front/coverage/storybook/coverage-shard-${{matrix.shard}}.json
-  merge-reports-and-check-coverage:
-    timeout-minutes: 30
-    runs-on: ubuntu-latest
-    needs: front-sb-test
-    env:
-      PATH_TO_COVERAGE: packages/twenty-front/coverage/storybook
-    strategy:
-      matrix:
-        storybook_scope: [modules, pages, performance]
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Install dependencies
-        uses: ./.github/actions/yarn-install
-      - uses: actions/download-artifact@v4
-        with:
-          pattern: coverage-artifacts-${{ matrix.storybook_scope }}-${{ github.run_id }}-*
-          merge-multiple: true
-          path: coverage-artifacts
-      - name: Merge coverage reports
-        run: |
-          mkdir -p ${{ env.PATH_TO_COVERAGE }}
-          npx nyc merge coverage-artifacts ${{ env.PATH_TO_COVERAGE }}/coverage-storybook.json
-      - name: Checking coverage
-        run: npx nx storybook:coverage twenty-front --checkCoverage=true --configuration=${{ matrix.storybook_scope }}
-  front-chromatic-deployment:
-    timeout-minutes: 30
-    if: false
-    needs: front-sb-build
-    runs-on: ubuntu-latest-8-cores
-    env:
-      REACT_APP_SERVER_BASE_URL: http://127.0.0.1:3000
-      CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
+          fetch-depth: 10
      - name: Install dependencies
        uses: ./.github/actions/yarn-install
      - name: Restore storybook build cache
        uses: ./.github/actions/restore-cache
        with:
          key: ${{ env.STORYBOOK_BUILD_CACHE_KEY_FOR_RESTORE_ACTION }}
-      - name: Front / Write .env
+      - name: Clean stale storybook vitest cache
+        run: rm -rf packages/twenty-front/node_modules/.cache/storybook
+      - name: Build dependencies
+        run: |
+          npx nx build twenty-shared
+          npx nx build twenty-ui
+          npx nx build twenty-sdk
+      - name: Download storybook build
+        uses: actions/download-artifact@v4
+        with:
+          name: storybook-static
+          path: packages/twenty-front/storybook-static
+      - name: Install Playwright
        run: |
          cd packages/twenty-front
-          touch .env
-          echo "" >> .env
-          echo "REACT_APP_SERVER_BASE_URL=$REACT_APP_SERVER_BASE_URL" >> .env
-      - name: Publish to Chromatic
-        run: npx nx run twenty-front:chromatic:ci
+          npx playwright install
+      - name: Front / Write .env
+        run: npx nx reset:env twenty-front
+      - name: Serve storybook & run tests
+        run: |
+          npx http-server packages/twenty-front/storybook-static --port 6006 --silent &
+          timeout 30 bash -c 'until curl -sf http://localhost:6006 > /dev/null 2>&1; do sleep 1; done'
+          npx nx storybook:test twenty-front --configuration=${{ matrix.storybook_scope }} --shard=${{ matrix.shard }}/${{ env.SHARD_COUNTER }}
+      # - name: Rename coverage file
+      #   run: |
+      #     if [ -f "packages/twenty-front/coverage/storybook/coverage-final.json" ]; then
+      #       mv packages/twenty-front/coverage/storybook/coverage-final.json packages/twenty-front/coverage/storybook/coverage-shard-${{matrix.shard}}.json
+      #     else
+      #       echo "Error: coverage-final.json not found"
+      #       ls -la packages/twenty-front/coverage/storybook/ || echo "Coverage directory does not exist"
+      #       exit 1
+      #     fi
+      # - name: Upload coverage artifact
+      #   uses: actions/upload-artifact@v4
+      #   with:
+      #     retention-days: 1
+      #     name: coverage-artifacts-${{ matrix.storybook_scope }}-${{ github.run_id }}-${{ matrix.shard }}
+      #     path: packages/twenty-front/coverage/storybook/coverage-shard-${{matrix.shard}}.json
+  # merge-reports-and-check-coverage:
+  #   timeout-minutes: 30
+  #   runs-on: ubuntu-latest
+  #   needs: front-sb-test
+  #   env:
+  #     PATH_TO_COVERAGE: packages/twenty-front/coverage/storybook
+  #   strategy:
+  #     matrix:
+  #       storybook_scope: [modules, pages, performance]
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #       with:
+  #         fetch-depth: 10
+  #     - name: Install dependencies
+  #       uses: ./.github/actions/yarn-install
+  #     - uses: actions/download-artifact@v4
+  #       with:
+  #         pattern: coverage-artifacts-${{ matrix.storybook_scope }}-${{ github.run_id }}-*
+  #         merge-multiple: true
+  #         path: coverage-artifacts
+  #     - name: Merge coverage reports
+  #       run: |
+  #         mkdir -p ${{ env.PATH_TO_COVERAGE }}
+  #         npx nyc merge coverage-artifacts ${{ env.PATH_TO_COVERAGE }}/coverage-storybook.json
+  #     - name: Checking coverage
+  #       run: npx nx storybook:coverage twenty-front --checkCoverage=true --configuration=${{ matrix.storybook_scope }}
  front-task:
    needs: changed-files-check
    if: needs.changed-files-check.outputs.any_changed == 'true'
    timeout-minutes: 30
    runs-on: ubuntu-latest
    env:
+      NODE_OPTIONS: '--max-old-space-size=4096'
      TASK_CACHE_KEY: front-task-${{ matrix.task }}
    strategy:
      matrix:
@@ -183,7 +170,7 @@ jobs:
      - name: Fetch custom Github Actions and base branch history
        uses: actions/checkout@v4
        with:
-          fetch-depth: 0
+          fetch-depth: 10
      - name: Install dependencies
        uses: ./.github/actions/yarn-install
      - name: Restore ${{ matrix.task }} cache
@@ -202,14 +189,6 @@ jobs:
        with:
          tag: scope:frontend
          tasks: ${{ matrix.task }}
-      - name: Check for coverage threshold failure
-        if: always() && steps.run-task.outcome == 'failure' && matrix.task == 'test'
-        shell: bash
-        run: |
-          echo "::error::The test task failed. If no individual test is failing, this is likely a coverage threshold not being met."
-          echo ""
-          echo "To debug locally, run: npx nx run twenty-front:test:ci"
-          exit 1
      - name: Save ${{ matrix.task }} cache
        uses: ./.github/actions/save-cache
        with:
@@ -221,6 +200,7 @@ jobs:
    runs-on: ubuntu-latest-8-cores
    env:
      NODE_OPTIONS: "--max-old-space-size=10240"
+      ANALYZE: "true"
    steps:
      - name: Cancel Previous Runs
        uses: styfle/cancel-workflow-action@0.11.0
@@ -229,127 +209,19 @@ jobs:
      - name: Fetch custom Github Actions and base branch history
        uses: actions/checkout@v4
        with:
-          fetch-depth: 0
+          fetch-depth: 10
      - name: Install dependencies
        uses: ./.github/actions/yarn-install
      - name: Front / Write .env
        run: npx nx reset:env twenty-front
      - name: Build frontend
        run: npx nx build twenty-front
-      - name: Upload frontend build artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: frontend-build
-          path: packages/twenty-front/build
-          retention-days: 1
-  e2e-test:
-    runs-on: ubuntu-latest
-    needs: [changed-files-check-e2e, front-build]
-    if: |
-      always() &&
-      needs.changed-files-check-e2e.outputs.any_changed == 'true' &&
-      (needs.front-build.result == 'success' || needs.front-build.result == 'skipped') &&
-      (github.event_name == 'push' || github.event_name == 'merge_group' || (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'run-e2e')))
-    timeout-minutes: 30
-    env:
-      NODE_OPTIONS: "--max-old-space-size=10240"
-    services:
-      postgres:
-        image: twentycrm/twenty-postgres-spilo
-        env:
-          PGUSER_SUPERUSER: postgres
-          PGPASSWORD_SUPERUSER: postgres
-          ALLOW_NOSSL: "true"
-          SPILO_PROVIDER: "local"
-        ports:
-          - 5432:5432
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-      redis:
-        image: redis
-        ports:
-          - 6379:6379
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-node@v4
-        with:
-          node-version: lts/*
-
-      - name: Check system resources
-        run: |
-          echo "Available memory:"
-          free -h
-          echo "Available disk space:"
-          df -h
-          echo "CPU info:"
-          lscpu
-
-      - name: Install dependencies
-        uses: ./.github/actions/yarn-install
-
-      - name: Build twenty-shared
-        run: npx nx build twenty-shared
-
-      - name: Install Playwright Browsers
-        run: npx nx setup twenty-e2e-testing
-
-      - name: Setup environment files
-        run: |
-          cp packages/twenty-front/.env.example packages/twenty-front/.env
-          npx nx reset:env:e2e-testing-server twenty-server
-
-      - name: Download frontend build artifact
-        if: needs.front-build.result == 'success'
-        uses: actions/download-artifact@v4
-        with:
-          name: frontend-build
-          path: packages/twenty-front/build
-
-      - name: Build frontend (if not available from front-build)
-        if: needs.front-build.result == 'skipped'
-        run: NODE_ENV=production NODE_OPTIONS="--max-old-space-size=10240" npx nx build twenty-front
-
-      - name: Build server
-        run: npx nx build twenty-server
-
-      - name: Create and setup database
-        run: |
-          PGPASSWORD=postgres psql -h localhost -p 5432 -U postgres -d postgres -c 'CREATE DATABASE "default";'
-          PGPASSWORD=postgres psql -h localhost -p 5432 -U postgres -d postgres -c 'CREATE DATABASE "test";'
-          npx nx run twenty-server:database:reset
-
-      - name: Start server
-        run: |
-          npx nx start twenty-server &
-          echo "Waiting for server to be ready..."
-          timeout 60 bash -c 'until curl -s http://localhost:3000/health; do sleep 2; done'
-
-      - name: Start frontend
-        run: |
-          npm_config_yes=true npx serve -s packages/twenty-front/build -l 3001 &
-          echo "Waiting for frontend to be ready..."
-          timeout 60 bash -c 'until curl -s http://localhost:3001; do sleep 2; done'
-
-      - name: Start worker
-        run: |
-          npx nx run twenty-server:worker &
-          echo "Worker started"
-
-      - name: Run Playwright tests
-        run: npx nx test twenty-e2e-testing
-
-      - uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: playwright-report
-          path: packages/twenty-e2e-testing/run_results/
-          retention-days: 30
-
+      # - name: Upload frontend build artifact
+      #   uses: actions/upload-artifact@v4
+      #   with:
+      #     name: frontend-build
+      #     path: packages/twenty-front/build
+      #     retention-days: 1
  ci-front-status-check:
    if: always() && !cancelled()
    timeout-minutes: 5
@@ -359,7 +231,7 @@ jobs:
        changed-files-check,
        front-task,
        front-build,
-        merge-reports-and-check-coverage,
+        # merge-reports-and-check-coverage,
        front-sb-test,
        front-sb-build,
      ]
@@ -367,12 +239,3 @@ jobs:
      - name: Fail job if any needs failed
        if: contains(needs.*.result, 'failure')
        run: exit 1
-  ci-e2e-status-check:
-    if: always() && !cancelled()
-    timeout-minutes: 5
-    runs-on: ubuntu-latest
-    needs: [changed-files-check-e2e, e2e-test]
-    steps:
-      - name: Fail job if any needs failed
-        if: contains(needs.*.result, 'failure')
-        run: exit 1
@@ -0,0 +1,140 @@
+name: CI Merge Queue
+
+on:
+  merge_group:
+
+  pull_request:
+    types: [labeled, synchronize, opened, reopened]
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
+jobs:
+  e2e-test:
+    if: >
+      github.event_name == 'merge_group' ||
+      (github.event_name == 'pull_request' &&
+       contains(github.event.pull_request.labels.*.name, 'run-merge-queue'))
+    runs-on: ubuntu-latest-8-cores
+    timeout-minutes: 30
+    env:
+      NODE_OPTIONS: "--max-old-space-size=10240"
+    services:
+      postgres:
+        image: twentycrm/twenty-postgres-spilo
+        env:
+          PGUSER_SUPERUSER: postgres
+          PGPASSWORD_SUPERUSER: postgres
+          ALLOW_NOSSL: "true"
+          SPILO_PROVIDER: "local"
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+      redis:
+        image: redis
+        ports:
+          - 6379:6379
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 10
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+
+      - name: Install dependencies
+        uses: ./.github/actions/yarn-install
+
+      - name: Restore Nx build cache
+        uses: actions/cache/restore@v4
+        with:
+          key: v4-e2e-build-${{ github.ref_name }}-${{ github.sha }}
+          restore-keys: |
+            v4-e2e-build-${{ github.ref_name }}-
+            v4-e2e-build-main-
+          path: |
+            .nx
+            node_modules/.cache
+            packages/*/node_modules/.cache
+
+      - name: Build twenty-shared
+        run: npx nx build twenty-shared
+
+      - name: Install Playwright Browsers
+        run: npx nx setup twenty-e2e-testing
+
+      - name: Setup environment files
+        run: |
+          cp packages/twenty-front/.env.example packages/twenty-front/.env
+          npx nx reset:env:e2e-testing-server twenty-server
+
+      - name: Build frontend
+        run: NODE_ENV=production npx nx build twenty-front
+
+      - name: Build server
+        run: npx nx build twenty-server
+
+      - name: Save Nx build cache
+        if: always()
+        uses: actions/cache/save@v4
+        with:
+          key: v4-e2e-build-${{ github.ref_name }}-${{ github.sha }}
+          path: |
+            .nx
+            node_modules/.cache
+            packages/*/node_modules/.cache
+
+      - name: Create and setup database
+        run: |
+          PGPASSWORD=postgres psql -h localhost -p 5432 -U postgres -d postgres -c 'CREATE DATABASE "default";'
+          PGPASSWORD=postgres psql -h localhost -p 5432 -U postgres -d postgres -c 'CREATE DATABASE "test";'
+          npx nx run twenty-server:database:reset
+
+      - name: Start server
+        run: |
+          npx nx start twenty-server &
+          echo "Waiting for server to be ready..."
+          timeout 60 bash -c 'until curl -s http://localhost:3000/health; do sleep 2; done'
+
+      - name: Start frontend
+        run: |
+          npm_config_yes=true npx serve -s packages/twenty-front/build -l 3001 &
+          echo "Waiting for frontend to be ready..."
+          timeout 60 bash -c 'until curl -s http://localhost:3001; do sleep 2; done'
+
+      - name: Start worker
+        run: |
+          npx nx run twenty-server:worker &
+          echo "Worker started"
+
+      - name: Run Playwright tests
+        run: npx nx test twenty-e2e-testing
+
+      - name: Upload Playwright results
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: playwright-results
+          path: |
+            packages/twenty-e2e-testing/run_results/
+            packages/twenty-e2e-testing/test-results/
+          retention-days: 7
+
+  ci-merge-queue-status-check:
+    if: always() && !cancelled()
+    timeout-minutes: 5
+    runs-on: ubuntu-latest
+    needs: [e2e-test]
+    steps:
+      - name: Fail job if any needs failed
+        if: contains(needs.*.result, 'failure')
+        run: exit 1
@@ -1,9 +1,8 @@
 name: CI SDK

 on:
-  merge_group:
-
  pull_request:
+  merge_group:

 permissions:
  contents: read
@@ -14,10 +13,12 @@ concurrency:

 jobs:
  changed-files-check:
+    if: github.event_name != 'merge_group'
    uses: ./.github/workflows/changed-files.yaml
    with:
      files: |
        packages/twenty-sdk/**
+        packages/twenty-server/**
        !packages/twenty-sdk/package.json
  sdk-test:
    needs: changed-files-check
@@ -35,7 +36,7 @@ jobs:
      - name: Fetch custom Github Actions and base branch history
        uses: actions/checkout@v4
        with:
-          fetch-depth: 0
+          fetch-depth: 10
      - name: Install dependencies
        uses: ./.github/actions/yarn-install
      - name: Build
@@ -50,7 +51,7 @@ jobs:
          tasks: ${{ matrix.task }}
  sdk-e2e-test:
    timeout-minutes: 30
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-latest
    needs: [changed-files-check, sdk-test]
    if: needs.changed-files-check.outputs.any_changed == 'true'
    services:
@@ -78,7 +79,7 @@ jobs:
      - name: Fetch custom Github Actions and base branch history
        uses: actions/checkout@v4
        with:
-          fetch-depth: 0
+          fetch-depth: 10
      - name: Install dependencies
        uses: ./.github/actions/yarn-install
      - name: Build
@@ -2,7 +2,6 @@ name: CI Server

 on:
  pull_request:
-
  merge_group:

 permissions:
@@ -13,10 +12,11 @@ concurrency:
  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

 env:
-  SERVER_SETUP_CACHE_KEY: server-setup
+  SERVER_BUILD_CACHE_KEY: server-build

 jobs:
  changed-files-check:
+    if: github.event_name != 'merge_group'
    uses: ./.github/workflows/changed-files.yaml
    with:
      files: |
@@ -25,13 +25,62 @@ jobs:
        packages/twenty-server/**
        packages/twenty-front/src/generated/**
        packages/twenty-front/src/generated-metadata/**
+        packages/twenty-sdk/src/clients/generated/metadata/**
        packages/twenty-emails/**
        packages/twenty-shared/**
-  server-setup:
+
+  server-build:
    needs: changed-files-check
    if: needs.changed-files-check.outputs.any_changed == 'true'
    timeout-minutes: 30
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-latest
+    steps:
+      - name: Fetch custom Github Actions and base branch history
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 10
+      - name: Install dependencies
+        uses: ./.github/actions/yarn-install
+      - name: Restore server build cache
+        id: restore-server-build-cache
+        uses: ./.github/actions/restore-cache
+        with:
+          key: ${{ env.SERVER_BUILD_CACHE_KEY }}
+      - name: Build twenty-shared
+        run: npx nx build twenty-shared
+      - name: Server / Write .env
+        run: npx nx reset:env twenty-server
+      - name: Server / Build
+        run: npx nx build twenty-server
+      - name: Save server build cache
+        uses: ./.github/actions/save-cache
+        with:
+          key: ${{ steps.restore-server-build-cache.outputs.cache-primary-key }}
+
+  server-lint-typecheck:
+    needs: changed-files-check
+    if: needs.changed-files-check.outputs.any_changed == 'true'
+    timeout-minutes: 30
+    runs-on: ubuntu-latest
+    steps:
+      - name: Fetch custom Github Actions and base branch history
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 10
+      - name: Install dependencies
+        uses: ./.github/actions/yarn-install
+      - name: Build twenty-shared
+        run: npx nx build twenty-shared
+      - name: Server / Run lint & typecheck
+        uses: ./.github/actions/nx-affected
+        with:
+          tag: scope:backend
+          tasks: lint,typecheck
+
+  server-validation:
+    needs: server-build
+    timeout-minutes: 30
+    runs-on: ubuntu-latest
    services:
      postgres:
        image: twentycrm/twenty-postgres-spilo
@@ -55,21 +104,15 @@ jobs:
      - name: Fetch custom Github Actions and base branch history
        uses: actions/checkout@v4
        with:
-          fetch-depth: 0
+          fetch-depth: 10
      - name: Install dependencies
        uses: ./.github/actions/yarn-install
-      - name: Restore server setup
-        id: restore-server-setup-cache
+      - name: Restore server build cache
        uses: ./.github/actions/restore-cache
        with:
-          key: ${{ env.SERVER_SETUP_CACHE_KEY }}
+          key: ${{ env.SERVER_BUILD_CACHE_KEY }}
      - name: Build twenty-shared
        run: npx nx build twenty-shared
-      - name: Server / Run lint & typecheck
-        uses: ./.github/actions/nx-affected
-        with:
-          tag: scope:backend
-          tasks: lint,typecheck
      - name: Server / Write .env
        run: npx nx reset:env twenty-server
      - name: Server / Build
@@ -84,10 +127,8 @@ jobs:
        run: |
          timeout 30s npx nx run twenty-server:worker || exit_code=$?
          if [ $exit_code -eq 124 ]; then
-            # If timeout was reached (exit code 124), consider it a success
            exit 0
          elif [ $exit_code -ne 0 ]; then
-            # If worker failed for other reasons, fail the build
            exit $exit_code
          fi
      - name: Server / Start
@@ -118,13 +159,13 @@ jobs:

            exit 1
          fi
-      - name: GraphQL / Check for Pending Generation
+      - name: Check for Pending Code Generation
        run: |
-          # Run GraphQL generation commands
+          HAS_ERRORS=false
+
          npx nx run twenty-front:graphql:generate
          npx nx run twenty-front:graphql:generate --configuration=metadata

-          # Check if GraphQL generated files were modified
          if ! git diff --quiet -- packages/twenty-front/src/generated packages/twenty-front/src/generated-metadata; then
            echo "::error::GraphQL schema changes detected. Please run 'npx nx run twenty-front:graphql:generate' and 'npx nx run twenty-front:graphql:generate --configuration=metadata' and commit the changes."
            echo ""
@@ -133,29 +174,42 @@ jobs:
            git diff -- packages/twenty-front/src/generated packages/twenty-front/src/generated-metadata
            echo "==================================================="
            echo ""
-            echo "Please run 'npx nx run twenty-front:graphql:generate' and 'npx nx run twenty-front:graphql:generate --configuration=metadata' and commit the changes."
+            HAS_ERRORS=true
+          fi
+
+          npx nx run twenty-sdk:generate-metadata-client
+
+          if ! git diff --quiet -- packages/twenty-sdk/src/clients/generated/metadata; then
+            echo "::error::SDK metadata client changes detected. Please run 'npx nx run twenty-sdk:generate-metadata-client' and commit the changes."
            echo ""
+            echo "The following SDK metadata client changes were detected:"
+            echo "==================================================="
+            git diff -- packages/twenty-sdk/src/clients/generated/metadata
+            echo "==================================================="
+            echo ""
+            HAS_ERRORS=true
+          fi
+
+          if [ "$HAS_ERRORS" = true ]; then
            exit 1
          fi
-      - name: Save server setup
-        uses: ./.github/actions/save-cache
-        with:
-          key: ${{ steps.restore-server-setup-cache.outputs.cache-primary-key }}
  server-test:
+    needs: server-build
    timeout-minutes: 30
-    runs-on: ubuntu-latest-8-cores
-    needs: server-setup
+    runs-on: ubuntu-latest
    steps:
      - name: Fetch custom Github Actions and base branch history
        uses: actions/checkout@v4
        with:
-          fetch-depth: 0
+          fetch-depth: 10
      - name: Install dependencies
        uses: ./.github/actions/yarn-install
-      - name: Restore server setup
+      - name: Restore server build cache
        uses: ./.github/actions/restore-cache
        with:
-          key: ${{ env.SERVER_SETUP_CACHE_KEY }}
+          key: ${{ env.SERVER_BUILD_CACHE_KEY }}
+      - name: Build twenty-shared
+        run: npx nx build twenty-shared
      - name: Server / Run Tests
        uses: ./.github/actions/nx-affected
        with:
@@ -164,12 +218,12 @@ jobs:

  server-integration-test:
    timeout-minutes: 30
-    runs-on: ubuntu-latest-8-cores
-    needs: server-setup
+    runs-on: ubuntu-latest
+    needs: server-build
    strategy:
      fail-fast: false
      matrix:
-        shard: [1, 2, 3, 4, 5, 6, 7, 8]
+        shard: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
    services:
      postgres:
        image: twentycrm/twenty-postgres-spilo
@@ -207,12 +261,12 @@ jobs:
      ANALYTICS_ENABLED: true
      CLICKHOUSE_URL: "http://default:clickhousePassword@localhost:8123/twenty"
      CLICKHOUSE_PASSWORD: clickhousePassword
-      SHARD_COUNTER: 8
+      SHARD_COUNTER: 10
    steps:
      - name: Fetch custom Github Actions and base branch history
        uses: actions/checkout@v4
        with:
-          fetch-depth: 0
+          fetch-depth: 10
      - name: Install dependencies
        uses: ./.github/actions/yarn-install
      - name: Update .env.test for integrations tests
@@ -223,10 +277,10 @@ jobs:
          echo "BILLING_STRIPE_BASE_PLAN_PRODUCT_ID=test-base-plan-product-id" >> .env.test
          echo "BILLING_STRIPE_WEBHOOK_SECRET=test-webhook-secret" >> .env.test
          echo "BILLING_PLAN_REQUIRED_LINK=http://localhost:3001/stripe-redirection" >> .env.test
-      - name: Restore server setup
+      - name: Restore server build cache
        uses: ./.github/actions/restore-cache
        with:
-          key: ${{ env.SERVER_SETUP_CACHE_KEY }}
+          key: ${{ env.SERVER_BUILD_CACHE_KEY }}
      - name: Server / Build
        run: npx nx build twenty-server
      - name: Build dependencies
@@ -247,11 +301,20 @@ jobs:
          tasks: 'test:integration'
          configuration: 'with-db-reset'
          args: --shard=${{ matrix.shard }}/${{ env.SHARD_COUNTER }}
+
  ci-server-status-check:
    if: always() && !cancelled()
    timeout-minutes: 5
    runs-on: ubuntu-latest
-    needs: [changed-files-check, server-setup, server-test, server-integration-test]
+    needs:
+      [
+        changed-files-check,
+        server-build,
+        server-lint-typecheck,
+        server-validation,
+        server-test,
+        server-integration-test,
+      ]
    steps:
      - name: Fail job if any needs failed
        if: contains(needs.*.result, 'failure')
@@ -1,9 +1,8 @@
 name: CI Shared

 on:
-  merge_group:
-
  pull_request:
+  merge_group:

 permissions:
  contents: read
@@ -14,6 +13,7 @@ concurrency:

 jobs:
  changed-files-check:
+    if: github.event_name != 'merge_group'
    uses: ./.github/workflows/changed-files.yaml
    with:
      files: |
@@ -23,6 +23,8 @@ jobs:
    if: needs.changed-files-check.outputs.any_changed == 'true'
    timeout-minutes: 30
    runs-on: ubuntu-latest
+    env:
+      NODE_OPTIONS: '--max-old-space-size=4096'
    strategy:
      matrix:
        task: [lint, typecheck, test]
@@ -34,13 +36,13 @@ jobs:
      - name: Fetch custom Github Actions and base branch history
        uses: actions/checkout@v4
        with:
-          fetch-depth: 0
+          fetch-depth: 10
      - name: Install dependencies
        uses: ./.github/actions/yarn-install
      - name: Run ${{ matrix.task }} task
        uses: ./.github/actions/nx-affected
        with:
-          tag: scope:frontend
+          tag: scope:shared
          tasks: ${{ matrix.task }}
  ci-shared-status-check:
    if: always() && !cancelled()
@@ -4,9 +4,8 @@ permissions:
  contents: read

 on:
-  merge_group:
-
  pull_request:
+  merge_group:

 concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
@@ -14,6 +13,7 @@ concurrency:

 jobs:
  changed-files-check:
+    if: github.event_name != 'merge_group'
    uses: ./.github/workflows/changed-files.yaml
    with:
      files: |
@@ -9,10 +9,7 @@ on:
    types: [opened, synchronize, reopened, closed]

 permissions:
-  actions: write
  checks: write
-  contents: write
-  issues: write
  pull-requests: write
  statuses: write

@@ -4,9 +4,8 @@ permissions:
  contents: read

 on:
-  merge_group:
-
  pull_request:
+  merge_group:

 concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
@@ -14,6 +13,7 @@ concurrency:

 jobs:
  changed-files-check:
+    if: github.event_name != 'merge_group'
    uses: ./.github/workflows/changed-files.yaml
    with:
      files: |
@@ -42,7 +42,7 @@ jobs:
    steps:
      - uses: actions/checkout@v4
        with:
-          fetch-depth: 0
+          fetch-depth: 10

      - name: Install dependencies
        uses: ./.github/actions/yarn-install
@@ -0,0 +1,126 @@
+name: CI Zapier
+
+on:
+  pull_request:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
+env:
+  SERVER_SETUP_CACHE_KEY: server-setup
+
+jobs:
+  changed-files-check:
+    uses: ./.github/workflows/changed-files.yaml
+    with:
+      files: |
+        packages/twenty-zapier/**
+        packages/twenty-server/**
+        !packages/twenty-zapier/package.json
+        !packages/twenty-zapier/CHANGELOG.md
+  server-setup:
+    needs: changed-files-check
+    if: needs.changed-files-check.outputs.any_changed == 'true'
+    timeout-minutes: 30
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: twentycrm/twenty-postgres-spilo
+        env:
+          PGUSER_SUPERUSER: postgres
+          PGPASSWORD_SUPERUSER: postgres
+          ALLOW_NOSSL: 'true'
+          SPILO_PROVIDER: 'local'
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+      redis:
+        image: redis
+        ports:
+          - 6379:6379
+    steps:
+      - name: Fetch custom Github Actions and base branch history
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 10
+      - name: Install dependencies
+        uses: ./.github/actions/yarn-install
+
+      - name: Build twenty-shared
+        run: npx nx build twenty-shared
+
+      - name: Server / Write .env
+        run: npx nx reset:env:e2e-testing-server twenty-server
+
+      - name: Server / Build
+        run: npx nx build twenty-server
+
+      - name: Create and setup database
+        run: |
+          PGPASSWORD=postgres psql -h localhost -p 5432 -U postgres -d postgres -c 'CREATE DATABASE "default";'
+          PGPASSWORD=postgres psql -h localhost -p 5432 -U postgres -d postgres -c 'CREATE DATABASE "test";'
+          npx nx run twenty-server:database:reset
+
+      - name: Server / Start
+        run: |
+          npx nx start twenty-server &
+          echo "Waiting for server to be ready..."
+          timeout 60 bash -c 'until curl -s http://localhost:3000/health; do sleep 2; done'
+
+      - name: Start worker
+        run: |
+          npx nx run twenty-server:worker &
+          echo "Worker started"
+
+      - name: Zapier / Build
+        run: npx nx build twenty-zapier
+
+      - name: Zapier / Run Tests
+        uses: ./.github/actions/nx-affected
+        with:
+          tag: scope:zapier
+          tasks: test
+
+  zapier-test:
+    needs: server-setup
+    if: needs.changed-files-check.outputs.any_changed == 'true'
+    timeout-minutes: 30
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        task: [lint, typecheck, validate]
+    steps:
+      - name: Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.11.0
+        with:
+          access_token: ${{ github.token }}
+      - name: Fetch custom Github Actions and base branch history
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 10
+      - name: Install dependencies
+        uses: ./.github/actions/yarn-install
+      - name: Build
+        run: npx nx build twenty-zapier
+      - name: Run ${{ matrix.task }} task
+        uses: ./.github/actions/nx-affected
+        with:
+          tag: scope:zapier
+          tasks: ${{ matrix.task }}
+  ci-zapier-status-check:
+    if: always() && !cancelled()
+    timeout-minutes: 5
+    runs-on: ubuntu-latest
+    needs: [changed-files-check, zapier-test]
+    steps:
+      - name: Fail job if any needs failed
+        if: contains(needs.*.result, 'failure')
+        run: exit 1
@@ -87,7 +87,7 @@ jobs:
            exit 0
          fi
          ISSUE_NUMBER="${{ github.event.issue.number || github.event.pull_request.number }}"
-          ENCODED_BRANCH=$(python3 -c "import urllib.parse; print(urllib.parse.quote('$BRANCH', safe=''))")
+          ENCODED_BRANCH=$(python3 -c "import urllib.parse, sys; print(urllib.parse.quote(sys.argv[1], safe=''))" "$BRANCH")
          PR_URL="https://github.com/${{ github.repository }}/compare/main...${ENCODED_BRANCH}?quick_pull=1"
          BODY="⚠️ Claude ran out of turns before creating a PR. Work has been pushed to [\`$BRANCH\`](https://github.com/${{ github.repository }}/tree/$ENCODED_BRANCH).\n\n[**Create PR →**]($PR_URL)"
          if [ -n "$ISSUE_NUMBER" ]; then
@@ -157,18 +157,11 @@ jobs:
                "PG_DATABASE_URL": "postgres://postgres:postgres@localhost:5432/default"
              }
            }
-      - name: Post response to source issue
+      - name: Dispatch response to ci-privileged
        if: always()
-        uses: actions/github-script@v7
+        uses: peter-evans/repository-dispatch@v2
        with:
-          github-token: ${{ secrets.TWENTY_DISPATCH_TOKEN }}
-          script: |
-            const [owner, repo] = '${{ steps.prompt.outputs.repo }}'.split('/');
-            const issueNumber = parseInt('${{ steps.prompt.outputs.issue_number }}', 10);
-
-            await github.rest.issues.createComment({
-              owner,
-              repo,
-              issue_number: issueNumber,
-              body: `Claude finished processing this request. [See workflow run](${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId})`
-            });
+          token: ${{ secrets.CI_PRIVILEGED_DISPATCH_TOKEN }}
+          repository: twentyhq/ci-privileged
+          event-type: claude-cross-repo-response
+          client-payload: '{"repo": ${{ toJSON(steps.prompt.outputs.repo) }}, "issue_number": ${{ toJSON(steps.prompt.outputs.issue_number) }}, "run_id": ${{ toJSON(github.run_id) }}, "run_url": "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"}'
@@ -40,7 +40,8 @@ jobs:
        uses: actions/checkout@v4
        with:
          token: ${{ github.token }}
-          ref: ${{ github.event_name == 'pull_request' && github.head_ref || github.ref }}
+          repository: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name || github.repository }}
+          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}

      - name: Install dependencies
        uses: ./.github/actions/yarn-install
@@ -111,7 +112,7 @@ jobs:
        run: yarn docs:generate-paths

      - name: Commit artifacts to pull request branch
-        if: github.event_name == 'pull_request'
+        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
        run: |
          git add packages/twenty-docs/docs.json packages/twenty-docs/navigation/navigation.template.json packages/twenty-shared/src/constants/DocumentationPaths.ts
          if git diff --staged --quiet --exit-code; then
@@ -149,4 +150,3 @@ jobs:
          fi
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
@@ -1,118 +0,0 @@
-# Weekly translation QA report using Crowdin's native QA checks
-
-name: 'Weekly Translation QA Report'
-
-permissions:
-  contents: write
-  pull-requests: write
-
-on:
-  schedule:
-    - cron: '0 9 * * 1' # Every Monday at 9am UTC
-  workflow_dispatch: # Allow manual trigger
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  qa_report:
-    name: Generate QA Report
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install dependencies
-        uses: ./.github/actions/yarn-install
-
-      - name: Build twenty-shared
-        run: npx nx build twenty-shared
-
-      - name: Generate QA report from Crowdin
-        id: generate_report
-        run: |
-          npx ts-node packages/twenty-utils/translation-qa-report.ts || true
-          if [ -f TRANSLATION_QA_REPORT.md ]; then
-            echo "report_generated=true" >> $GITHUB_OUTPUT
-            # Count critical issues (exclude spellcheck)
-            CRITICAL=$(grep -oP '⚠️\s+\K\d+' TRANSLATION_QA_REPORT.md 2>/dev/null || echo "0")
-            echo "critical_issues=$CRITICAL" >> $GITHUB_OUTPUT
-          else
-            echo "report_generated=false" >> $GITHUB_OUTPUT
-            echo "critical_issues=0" >> $GITHUB_OUTPUT
-          fi
-        env:
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
-
-      - name: Create QA branch and commit report
-        if: steps.generate_report.outputs.report_generated == 'true'
-        run: |
-          git config --global user.name 'github-actions'
-          git config --global user.email 'github-actions@twenty.com'
-
-          BRANCH_NAME="i18n-qa-report-$(date +%Y-%m-%d)"
-          git checkout -B $BRANCH_NAME
-
-          git add TRANSLATION_QA_REPORT.md
-          if ! git diff --staged --quiet --exit-code; then
-            git commit -m "docs: weekly translation QA report"
-            git push origin HEAD:$BRANCH_NAME --force
-            echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV
-          else
-            echo "No changes to commit"
-            echo "BRANCH_NAME=" >> $GITHUB_ENV
-          fi
-
-      - name: Create pull request
-        if: steps.generate_report.outputs.report_generated == 'true' && env.BRANCH_NAME != ''
-        run: |
-          CRITICAL="${{ steps.generate_report.outputs.critical_issues }}"
-
-          BODY=$(cat <<EOF
-          ## Weekly Translation QA Report
-
-          **Critical issues (excluding spellcheck): $CRITICAL**
-
-          📊 **View in Crowdin**: https://twenty.crowdin.com/u/projects/1/all?filter=qa-issue
-
-          ### For AI-Assisted Fixing
-
-          Open this PR in Cursor and say:
-
-          > "Fix the translation QA issues using the Crowdin API"
-
-          The AI can help fix:
-          - ✅ Variables mismatch (missing/wrong placeholders)
-          - ✅ Escaped Unicode sequences
-          - ⚠️ Tags mismatch
-          - ⚠️ Empty translations
-
-          ### Available Scripts
-
-          \`\`\`bash
-          # View QA report
-          CROWDIN_PERSONAL_TOKEN=xxx npx ts-node packages/twenty-utils/translation-qa-report.ts
-
-          # Fix encoding issues automatically
-          CROWDIN_PERSONAL_TOKEN=xxx npx ts-node packages/twenty-utils/fix-crowdin-translations.ts
-          \`\`\`
-
-          ---
-          *Close without merging after issues are addressed*
-          EOF
-          )
-
-          EXISTING_PR=$(gh pr list --head $BRANCH_NAME --json number --jq '.[0].number' 2>/dev/null || echo "")
-
-          if [ -n "$EXISTING_PR" ]; then
-            gh pr edit $EXISTING_PR --body "$BODY"
-          else
-            gh pr create \
-              --base main \
-              --head $BRANCH_NAME \
-              --title "i18n: Translation QA Report ($CRITICAL critical issues)" \
-              --body "$BODY" || true
-          fi
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -0,0 +1,71 @@
+name: Post CI Comments
+
+on:
+  workflow_run:
+    workflows: ['GraphQL and OpenAPI Breaking Changes Detection']
+    types: [completed]
+
+permissions:
+  actions: read
+
+jobs:
+  dispatch-breaking-changes:
+    if: github.event.workflow_run.conclusion == 'success'
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - name: Get PR number from workflow run
+        id: pr-info
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const runId = context.payload.workflow_run.id;
+            const headSha = context.payload.workflow_run.head_sha;
+            const headBranch = context.payload.workflow_run.head_branch;
+            const headRepo = context.payload.workflow_run.head_repository;
+
+            // workflow_run.pull_requests is empty for fork PRs,
+            // so fall back to searching by head SHA
+            let pullRequests = context.payload.workflow_run.pull_requests;
+            let prNumber;
+
+            if (pullRequests && pullRequests.length > 0) {
+              prNumber = pullRequests[0].number;
+            } else {
+              core.info(`pull_requests is empty (likely a fork PR), searching by SHA ${headSha}`);
+              const owner = context.repo.owner;
+              const repo = context.repo.repo;
+              const headLabel = `${headRepo.owner.login}:${headBranch}`;
+
+              const { data: prs } = await github.rest.pulls.list({
+                owner,
+                repo,
+                state: 'open',
+                head: headLabel,
+                per_page: 1,
+              });
+
+              if (prs.length > 0) {
+                prNumber = prs[0].number;
+              }
+            }
+
+            if (!prNumber) {
+              core.info('No pull request found for this workflow run');
+              core.setOutput('has_pr', 'false');
+              return;
+            }
+
+            core.setOutput('pr_number', prNumber);
+            core.setOutput('run_id', runId);
+            core.setOutput('has_pr', 'true');
+            core.info(`PR #${prNumber}, Run ID: ${runId}`);
+
+      - name: Dispatch to ci-privileged
+        if: steps.pr-info.outputs.has_pr == 'true'
+        uses: peter-evans/repository-dispatch@v2
+        with:
+          token: ${{ secrets.CI_PRIVILEGED_DISPATCH_TOKEN }}
+          repository: twentyhq/ci-privileged
+          event-type: breaking-changes-report
+          client-payload: '{"pr_number": ${{ toJSON(steps.pr-info.outputs.pr_number) }}, "run_id": ${{ toJSON(steps.pr-info.outputs.run_id) }}, "repo": ${{ toJSON(github.repository) }}, "branch_state": ${{ toJSON(github.event.workflow_run.head_branch) }}}'
@@ -2,13 +2,8 @@ name: 'Preview Environment Dispatch'

 permissions:
  contents: write
-  actions: write
-  pull-requests: read

 on:
-  # Using pull_request_target instead of pull_request to have access to secrets for external contributors
-  # Security note: This is safe because we're only using the repository-dispatch action with limited scope
-  # and not checking out or running any code from the external contributor's PR
  pull_request_target:
    types: [opened, synchronize, reopened, labeled]
    paths:
@@ -24,7 +19,19 @@ concurrency:

 jobs:
  trigger-preview:
-    if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.action == 'reopened' || (github.event.action == 'labeled' && github.event.label.name == 'preview-app')
+    if: |
+      (github.event.action == 'labeled' && github.event.label.name == 'preview-app') ||
+      (
+        (
+          github.event.pull_request.author_association == 'MEMBER' ||
+          github.event.pull_request.author_association == 'OWNER' ||
+          github.event.pull_request.author_association == 'COLLABORATOR'
+        ) && (
+          github.event.action == 'opened' ||
+          github.event.action == 'synchronize' ||
+          github.event.action == 'reopened'
+        )
+      )
    timeout-minutes: 5
    runs-on: ubuntu-latest
    steps:
@@ -35,3 +42,11 @@ jobs:
          repository: ${{ github.repository }}
          event-type: preview-environment
          client-payload: '{"pr_number": "${{ github.event.pull_request.number }}", "pr_head_sha": "${{ github.event.pull_request.head.sha }}", "repo_full_name": "${{ github.repository }}"}'
+
+      - name: Dispatch to ci-privileged for PR comment
+        uses: peter-evans/repository-dispatch@v2
+        with:
+          token: ${{ secrets.CI_PRIVILEGED_DISPATCH_TOKEN }}
+          repository: twentyhq/ci-privileged
+          event-type: preview-env-url
+          client-payload: '{"pr_number": ${{ toJSON(github.event.pull_request.number) }}, "keepalive_dispatch_time": ${{ toJSON(github.event.pull_request.updated_at) }}, "repo": ${{ toJSON(github.repository) }}}'
@@ -2,7 +2,6 @@ name: 'Preview Environment Keep Alive'

 permissions:
  contents: read
-  pull-requests: write

 on:
  repository_dispatch:
@@ -17,7 +16,7 @@ jobs:
        uses: actions/checkout@v4
        with:
          ref: ${{ github.event.client_payload.pr_head_sha }}
-      
+
      - name: Run compose setup
        run: |
          echo "Patching docker-compose.yml..."
@@ -25,17 +24,17 @@ jobs:
          yq eval 'del(.services.server.image)' -i packages/twenty-docker/docker-compose.yml
          yq eval '.services.server.build.context = "../../"' -i packages/twenty-docker/docker-compose.yml
          yq eval '.services.server.build.dockerfile = "./packages/twenty-docker/twenty/Dockerfile"' -i packages/twenty-docker/docker-compose.yml
-          
+
          yq eval 'del(.services.worker.image)' -i packages/twenty-docker/docker-compose.yml
          yq eval '.services.worker.build.context = "../../"' -i packages/twenty-docker/docker-compose.yml
          yq eval '.services.worker.build.dockerfile = "./packages/twenty-docker/twenty/Dockerfile"' -i packages/twenty-docker/docker-compose.yml
-          
+
          echo "Adding SIGN_IN_PREFILLED environment variable to server service..."
          yq eval '.services.server.environment.SIGN_IN_PREFILLED = "${SIGN_IN_PREFILLED}"' -i packages/twenty-docker/docker-compose.yml
-          
+
          echo "Setting up .env file..."
          cp packages/twenty-docker/.env.example packages/twenty-docker/.env
-          
+
          echo "Generating secrets..."
          echo "" >> packages/twenty-docker/.env
          echo "# === Randomly generated secrets ===" >> packages/twenty-docker/.env
@@ -46,24 +45,25 @@ jobs:
          cd packages/twenty-docker/
          docker compose build
        working-directory: ./
-      
+
      - name: Create Tunnel
        id: expose-tunnel
        uses: codetalkio/expose-tunnel@v1.5.0
        with:
          service: bore.pub
          port: 3000
-      
+
      - name: Start services with correct SERVER_URL
+        env:
+          TUNNEL_URL: ${{ steps.expose-tunnel.outputs.tunnel-url }}
        run: |
          cd packages/twenty-docker/
-          
-          # Update the SERVER_URL with the tunnel URL
-          echo "Setting SERVER_URL to ${{ steps.expose-tunnel.outputs.tunnel-url }}"
+
+          echo "Setting SERVER_URL to $TUNNEL_URL"
          sed -i '/SERVER_URL=/d' .env
          echo "" >> .env
-          echo "SERVER_URL=${{ steps.expose-tunnel.outputs.tunnel-url }}" >> .env
-          
+          echo "SERVER_URL=$TUNNEL_URL" >> .env
+
          # Start the services
          echo "Docker compose up..."
          docker compose up -d || {
@@ -71,7 +71,7 @@ jobs:
              docker compose logs
              exit 1
          }
-          
+
          echo "Waiting for services to be ready..."
          count=0
          while [ ! $(docker inspect --format='{{.State.Health.Status}}' twenty-db-1) = "healthy" ] || [ ! $(docker inspect --format='{{.State.Health.Status}}' twenty-server-1) = "healthy" ]; do
@@ -84,7 +84,7 @@ jobs:
              fi
              echo "Still waiting for services... ($count/60)"
          done
-          
+
          echo "All services are up and running!"
        working-directory: ./

@@ -99,61 +99,33 @@ jobs:
          fi
        working-directory: ./

-      - name: Output tunnel URL to logs
+      - name: Output tunnel URL
+        env:
+          TUNNEL_URL: ${{ steps.expose-tunnel.outputs.tunnel-url }}
        run: |
          echo "✅ Preview Environment Ready!"
-          echo "🔗 Preview URL: ${{ steps.expose-tunnel.outputs.tunnel-url }}"
+          echo "🔗 Preview URL: $TUNNEL_URL"
          echo "⏱️ This environment will be available for 5 hours"
-      
-      - name: Post comment on PR
-        uses: actions/github-script@v6
+          echo "## 🚀 Preview Environment Ready!" >> "$GITHUB_STEP_SUMMARY"
+          echo "" >> "$GITHUB_STEP_SUMMARY"
+          echo "Preview URL: $TUNNEL_URL" >> "$GITHUB_STEP_SUMMARY"
+          echo "" >> "$GITHUB_STEP_SUMMARY"
+          echo "This environment will automatically shut down after 5 hours." >> "$GITHUB_STEP_SUMMARY"
+          echo "$TUNNEL_URL" > tunnel-url.txt
+
+      - name: Upload tunnel URL artifact
+        uses: actions/upload-artifact@v4
        with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          script: |
-            const COMMENT_MARKER = '<!-- PR_PREVIEW_ENV -->';
-            const commentBody = `${COMMENT_MARKER}
-            🚀 **Preview Environment Ready!**
-            
-            Your preview environment is available at: ${{ steps.expose-tunnel.outputs.tunnel-url }}
-            
-            This environment will automatically shut down when the PR is closed or after 5 hours.`;
-            
-            // Get all comments
-            const {data: comments} = await github.rest.issues.listComments({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: ${{ github.event.client_payload.pr_number }},
-            });
-            
-            // Find our comment
-            const botComment = comments.find(comment => comment.body.includes(COMMENT_MARKER));
-            
-            if (botComment) {
-              // Update existing comment
-              await github.rest.issues.updateComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                comment_id: botComment.id,
-                body: commentBody
-              });
-              console.log('Updated existing comment');
-            } else {
-              // Create new comment
-              await github.rest.issues.createComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: ${{ github.event.client_payload.pr_number }},
-                body: commentBody
-              });
-              console.log('Created new comment');
-            }
-      
+          name: tunnel-url
+          path: tunnel-url.txt
+          retention-days: 1
+
      - name: Keep tunnel alive for 5 hours
        run: timeout 300m sleep 18000 # Stop on whichever we reach first (300m or 5hour sleep)
-      
+
      - name: Cleanup
        if: always()
        run: |
          cd packages/twenty-docker/
          docker compose down -v
-        working-directory: ./ 
+        working-directory: ./
@@ -28,7 +28,7 @@ coverage
 dist
 storybook-static
 *.tsbuildinfo
-.eslintcache
+.oxlintcache
 .nyc_output
 test-results/
 dump.rdb
@@ -1,7 +1,7 @@
 {
  "recommendations": [
    "arcanis.vscode-zipfs",
-    "dbaeumer.vscode-eslint",
+    "oxc.oxc-vscode",
    "esbenp.prettier-vscode",
    "figma.figma-vscode-extension",
    "firsttris.vscode-jest-runner",
@@ -4,25 +4,28 @@
  "files.insertFinalNewline": true,
  "files.trimTrailingWhitespace": true,
  "[typescript]": {
-    "editor.formatOnSave": false,
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
    "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": "explicit",
+      "source.fixAll.oxc": "explicit",
      "source.addMissingImports": "always",
      "source.organizeImports": "always"
    }
  },
  "[javascript]": {
-    "editor.formatOnSave": false,
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
    "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": "explicit",
+      "source.fixAll.oxc": "explicit",
      "source.addMissingImports": "always",
      "source.organizeImports": "always"
    }
  },
  "[typescriptreact]": {
-    "editor.formatOnSave": false,
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
    "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": "explicit",
+      "source.fixAll.oxc": "explicit",
      "source.addMissingImports": "always",
      "source.organizeImports": "always"
    }
@@ -48,7 +51,7 @@
  "search.exclude": {
    "**/.yarn": true
  },
-  "eslint.debug": true,
+  "oxc.lint.enable": true,
  "files.associations": {
    ".cursorrules": "markdown"
  },
@@ -37,8 +37,8 @@
      "path": "../packages/twenty-zapier"
    },
    {
-      "name": "tools/eslint-rules",
-      "path": "../tools/eslint-rules"
+      "name": "packages/twenty-oxlint-rules",
+      "path": "../packages/twenty-oxlint-rules"
    },
    {
      "name": "packages/twenty-e2e-testing",
@@ -49,23 +49,26 @@
    "editor.formatOnSave": false,
    "files.eol": "auto",
    "[typescript]": {
-      "editor.formatOnSave": false,
+      "editor.formatOnSave": true,
+      "editor.defaultFormatter": "esbenp.prettier-vscode",
      "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": "explicit",
+        "source.fixAll.oxc": "explicit",
        "source.addMissingImports": "always"
      }
    },
    "[javascript]": {
-      "editor.formatOnSave": false,
+      "editor.formatOnSave": true,
+      "editor.defaultFormatter": "esbenp.prettier-vscode",
      "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": "explicit",
+        "source.fixAll.oxc": "explicit",
        "source.addMissingImports": "always"
      }
    },
    "[typescriptreact]": {
-      "editor.formatOnSave": false,
+      "editor.formatOnSave": true,
+      "editor.defaultFormatter": "esbenp.prettier-vscode",
      "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": "explicit",
+        "source.fixAll.oxc": "explicit",
        "source.addMissingImports": "always"
      }
    },
@@ -88,7 +91,7 @@
    "typescript.preferences.importModuleSpecifier": "non-relative",
    "[javascript][typescript][typescriptreact]": {
      "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": "explicit",
+        "source.fixAll.oxc": "explicit",
        "source.addMissingImports": "always"
      }
    },
@@ -98,6 +101,7 @@
    "files.exclude": {
      "packages/": true
    },
+    "oxc.lint.enable": true,
    "jest.runMode": "on-demand",
    "jest.disabledWorkspaceFolders": [
      "ROOT",
@@ -0,0 +1,58 @@
+diff --git a/esm/cache.js b/esm/cache.js
+index 07cf6d7dd99effb9c3464b620ba67a7f445224f5..248bb527923499a6be8065ee7a3613b55819c58c 100644
+--- a/esm/cache.js
+++ b/esm/cache.js
+@@ -69,17 +69,20 @@ export class TransformCacheCollection {
+       this.invalidate(cacheName, filename);
+     });
+   }
+-  invalidateIfChanged(filename, content) {
+  invalidateIfChanged(filename, content, _visited) {
+    const visited = _visited || new Set();
+    if (visited.has(filename)) {
+      return false;
+    }
+    visited.add(filename);
+     const fileEntrypoint = this.get('entrypoints', filename);
+ 
+-    // We need to check all dependencies of the file
+-    // because they might have changed as well.
+     if (fileEntrypoint) {
+       for (const [, dependency] of fileEntrypoint.dependencies) {
+         const dependencyFilename = dependency.resolved;
+         if (dependencyFilename) {
+           const dependencyContent = fs.readFileSync(dependencyFilename, 'utf8');
+-          this.invalidateIfChanged(dependencyFilename, dependencyContent);
+          this.invalidateIfChanged(dependencyFilename, dependencyContent, visited);
+         }
+       }
+     }
+diff --git a/lib/cache.js b/lib/cache.js
+index 0762ed7d3c39b31000f7aa7d8156da15403c8e64..6955410cd3c9ec53cf7a01c8346abc4c47fff791 100644
+--- a/lib/cache.js
+++ b/lib/cache.js
+@@ -77,17 +77,20 @@ class TransformCacheCollection {
+       this.invalidate(cacheName, filename);
+     });
+   }
+-  invalidateIfChanged(filename, content) {
+  invalidateIfChanged(filename, content, _visited) {
+    const visited = _visited || new Set();
+    if (visited.has(filename)) {
+      return false;
+    }
+    visited.add(filename);
+     const fileEntrypoint = this.get('entrypoints', filename);
+ 
+-    // We need to check all dependencies of the file
+-    // because they might have changed as well.
+     if (fileEntrypoint) {
+       for (const [, dependency] of fileEntrypoint.dependencies) {
+         const dependencyFilename = dependency.resolved;
+         if (dependencyFilename) {
+           const dependencyContent = _nodeFs.default.readFileSync(dependencyFilename, 'utf8');
+-          this.invalidateIfChanged(dependencyFilename, dependencyContent);
+          this.invalidateIfChanged(dependencyFilename, dependencyContent, visited);
+         }
+       }
+     }
@@ -28,6 +28,8 @@ npx jest path/to/test.test.ts --config=packages/PROJECT/jest.config.mjs
 npx nx test twenty-front      # Frontend unit tests
 npx nx test twenty-server     # Backend unit tests
 npx nx run twenty-server:test:integration:with-db-reset  # Integration tests with DB reset
+# To run an indivual test or a pattern of tests, use the following command:
+cd packages/{workspace} && npx jest "pattern or filename"

 # Storybook
 npx nx storybook:build twenty-front
@@ -88,7 +90,7 @@ npx nx run twenty-front:graphql:generate --configuration=metadata
 ## Architecture Overview

 ### Tech Stack
- **Frontend**: React 18, TypeScript, Recoil (state management), Emotion (styling), Vite
+- **Frontend**: React 18, TypeScript, Jotai (state management), Linaria (styling), Vite
 - **Backend**: NestJS, TypeORM, PostgreSQL, Redis, GraphQL (with GraphQL Yoga)
 - **Monorepo**: Nx workspace managed with Yarn 4

@@ -136,7 +138,7 @@ packages/
 - Multi-line comments use multiple `//` lines, not `/** */`

 ### State Management
- **Recoil** for global state: atoms for primitive state, selectors for derived state, atom families for dynamic collections
+- **Jotai** for global state: atoms for primitive state, selectors for derived state, atom families for dynamic collections
 - Component-specific state with React hooks (`useState`, `useReducer` for complex logic)
 - GraphQL cache managed by Apollo Client
 - Use functional state updates: `setState(prev => prev + 1)`
@@ -173,7 +175,7 @@ IMPORTANT: Use Context7 for code generation, setup or configuration steps, or li
 5. Run `graphql:generate` after any GraphQL schema changes

 ### Code Style Notes
- Use **Emotion** for styling with styled-components pattern
+- Use **Linaria** for styling with zero-runtime CSS-in-JS (styled-components pattern)
 - Follow **Nx** workspace conventions for imports
 - Use **Lingui** for internationalization
 - Apply security first, then formatting (sanitize before format)
@@ -186,13 +188,22 @@ IMPORTANT: Use Context7 for code generation, setup or configuration steps, or li
 - Descriptive test names: "should [behavior] when [condition]"
 - Clear mocks between tests with `jest.clearAllMocks()`

-## CI Environment (GitHub Actions)
+## Dev Environment Setup

-When running in CI, the dev environment is **not** pre-configured. Dependencies are installed but builds, env files, and databases are not set up.
+All dev environments (Claude Code web, Cursor, local) use one script:

- **Before running tests, builds, lint, type checks, or DB operations**, run: `bash packages/twenty-utils/setup-dev-env.sh`
+```bash
+bash packages/twenty-utils/setup-dev-env.sh
+```
+
+This handles everything: starts Postgres + Redis (auto-detects local services vs Docker), creates databases, and copies `.env` files. Idempotent — safe to run multiple times.
+
+- `--docker` — force Docker mode (uses `packages/twenty-docker/docker-compose.dev.yml`)
+- `--down` — stop services
+- `--reset` — wipe data and restart fresh
 - **Skip the setup script** for tasks that only read code — architecture questions, code review, documentation, etc.
- The script is idempotent and safe to run multiple times.
+
+**Note:** CI workflows (GitHub Actions) manage services via Actions service containers and run setup steps individually — they don't use this script.

 ## Important Files
 - `nx.json` - Nx workspace configuration with task definitions
@@ -25,10 +25,10 @@
 # Installation

 See:
-🚀 [Self-hosting](https://docs.twenty.com/developers/self-hosting/docker-compose)
-🖥️ [Local Setup](https://docs.twenty.com/developers/local-setup)
+🚀 [Self-hosting](https://docs.twenty.com/developers/self-host/capabilities/docker-compose)
+🖥️ [Local Setup](https://docs.twenty.com/developers/contribute/capabilities/local-setup)

-# Does the world need another CRM?
+# Why Twenty

 We built Twenty for three reasons:

@@ -36,7 +36,7 @@ We built Twenty for three reasons:

 **A fresh start is required to build a better experience.** We can learn from past mistakes and craft a cohesive experience inspired by new UX patterns from tools like Notion, Airtable or Linear.

-**We believe in Open-source and community.** Hundreds of developers are already building Twenty together. Once we have plugin capabilities, a whole ecosystem will grow around it.
+**We believe in open-source and community.** Hundreds of developers are already building Twenty together. Once we have plugin capabilities, a whole ecosystem will grow around it.

 <br />

@@ -109,7 +109,7 @@ Below are a few features we have implemented to date:
 - [TypeScript](https://www.typescriptlang.org/)
 - [Nx](https://nx.dev/)
 - [NestJS](https://nestjs.com/), with [BullMQ](https://bullmq.io/), [PostgreSQL](https://www.postgresql.org/), [Redis](https://redis.io/)
- [React](https://reactjs.org/), with [Recoil](https://recoiljs.org/), [Emotion](https://emotion.sh/) and [Lingui](https://lingui.dev/)
+- [React](https://reactjs.org/), with [Jotai](https://jotai.org/), [Linaria](https://linaria.dev/) and [Lingui](https://lingui.dev/)



@@ -120,6 +120,7 @@ Below are a few features we have implemented to date:
  <a href="https://greptile.com"><img src="./packages/twenty-website/public/images/readme/greptile.png" height="30" alt="Greptile" /></a>
  <a href="https://sentry.io/"><img src="./packages/twenty-website/public/images/readme/sentry.png" height="30" alt="Sentry" /></a>
  <a href="https://crowdin.com/"><img src="./packages/twenty-website/public/images/readme/crowdin.png" height="30" alt="Crowdin" /></a>
+  <a href="https://e2b.dev/"><img src="./packages/twenty-website/public/images/readme/e2b.svg" height="30" alt="E2B" /></a>
 </p>

  Thanks to these amazing services that we use and recommend for UI testing (Chromatic), code review (Greptile), catching bugs (Sentry) and translating (Crowdin).
@@ -1,222 +0,0 @@
-import js from '@eslint/js';
-import nxPlugin from '@nx/eslint-plugin';
-import typescriptEslint from '@typescript-eslint/eslint-plugin';
-import typescriptParser from '@typescript-eslint/parser';
-import importPlugin from 'eslint-plugin-import';
-import linguiPlugin from 'eslint-plugin-lingui';
-import * as mdxPlugin from 'eslint-plugin-mdx';
-import preferArrowPlugin from 'eslint-plugin-prefer-arrow';
-import prettierPlugin from 'eslint-plugin-prettier';
-import unicornPlugin from 'eslint-plugin-unicorn';
-import unusedImportsPlugin from 'eslint-plugin-unused-imports';
-import jsoncParser from 'jsonc-eslint-parser';
-
-const twentyRules = await nxPlugin.loadWorkspaceRules(
-  'packages/twenty-eslint-rules',
-);
-
-export default [
-  // Base JavaScript configuration
-  js.configs.recommended,
-
-  // Lingui recommended rules
-  linguiPlugin.configs['flat/recommended'],
-
-  // Global ignores
-  {
-    ignores: ['**/node_modules/**'],
-  },
-
-  // Base configuration for all files
-  {
-    files: ['**/*.{js,jsx,ts,tsx}'],
-    plugins: {
-      prettier: prettierPlugin,
-      lingui: linguiPlugin,
-      '@nx': nxPlugin,
-      'prefer-arrow': preferArrowPlugin,
-      import: importPlugin,
-      'unused-imports': unusedImportsPlugin,
-      unicorn: unicornPlugin,
-    },
-    rules: {
-      // General rules
-      'func-style': ['error', 'declaration', { allowArrowFunctions: true }],
-      'no-console': [
-        'warn',
-        { allow: ['group', 'groupCollapsed', 'groupEnd'] },
-      ],
-      'no-control-regex': 0,
-      'no-debugger': 'error',
-      'no-duplicate-imports': 'error',
-      'no-undef': 'off',
-      'no-unused-vars': 'off',
-
-      // Nx rules
-      '@nx/enforce-module-boundaries': [
-        'error',
-        {
-          enforceBuildableLibDependency: true,
-          allow: [],
-          depConstraints: [
-            {
-              sourceTag: 'scope:apps',
-              onlyDependOnLibsWithTags: ['scope:apps', 'scope:sdk'],
-            },
-            {
-              sourceTag: 'scope:sdk',
-              onlyDependOnLibsWithTags: ['scope:sdk', 'scope:shared'],
-            },
-            {
-              sourceTag: 'scope:create-app',
-              onlyDependOnLibsWithTags: ['scope:create-app', 'scope:shared'],
-            },
-            {
-              sourceTag: 'scope:shared',
-              onlyDependOnLibsWithTags: ['scope:shared'],
-            },
-            {
-              sourceTag: 'scope:backend',
-              onlyDependOnLibsWithTags: ['scope:shared', 'scope:backend'],
-            },
-            {
-              sourceTag: 'scope:frontend',
-              onlyDependOnLibsWithTags: ['scope:shared', 'scope:frontend'],
-            },
-          ],
-        },
-      ],
-
-      // Import rules
-      'import/no-relative-packages': 'error',
-      'import/no-useless-path-segments': 'error',
-      'import/no-duplicates': ['error', { considerQueryString: true }],
-
-      // Prefer arrow functions
-      'prefer-arrow/prefer-arrow-functions': [
-        'error',
-        {
-          disallowPrototype: true,
-          singleReturnOnly: false,
-          classPropertiesAllowed: false,
-        },
-      ],
-
-      // Unused imports
-      'unused-imports/no-unused-imports': 'warn',
-      'unused-imports/no-unused-vars': [
-        'warn',
-        {
-          vars: 'all',
-          varsIgnorePattern: '^_',
-          args: 'after-used',
-          argsIgnorePattern: '^_',
-        },
-      ],
-    },
-  },
-
-  // TypeScript specific configuration
-  {
-    files: ['**/*.{ts,tsx}'],
-    languageOptions: {
-      parser: typescriptParser,
-      parserOptions: {
-        ecmaFeatures: {
-          jsx: true,
-        },
-      },
-    },
-    plugins: {
-      '@typescript-eslint': typescriptEslint,
-    },
-    rules: {
-      // TypeScript rules
-      'no-redeclare': 'off', // Turn off base rule for TypeScript
-      '@typescript-eslint/no-redeclare': 'error', // Use TypeScript-aware version
-      '@typescript-eslint/ban-ts-comment': 'error',
-      '@typescript-eslint/consistent-type-imports': [
-        'error',
-        {
-          prefer: 'type-imports',
-          fixStyle: 'inline-type-imports',
-        },
-      ],
-      '@typescript-eslint/explicit-function-return-type': 'off',
-      '@typescript-eslint/explicit-module-boundary-types': 'off',
-      '@typescript-eslint/interface-name-prefix': 'off',
-      '@typescript-eslint/no-empty-object-type': [
-        'error',
-        {
-          allowInterfaces: 'with-single-extends',
-        },
-      ],
-      '@typescript-eslint/no-explicit-any': 'off',
-      '@typescript-eslint/no-empty-function': 'off',
-      '@typescript-eslint/no-unused-vars': 'off',
-    },
-  },
-
-  // JavaScript specific configuration
-  {
-    files: ['*.{js,jsx}'],
-    rules: {
-      // JavaScript-specific rules if needed
-    },
-  },
-
-  // Test files
-  {
-    files: [
-      '*.spec.@(ts|tsx|js|jsx)',
-      '*.integration-spec.@(ts|tsx|js|jsx)',
-      '*.test.@(ts|tsx|js|jsx)',
-    ],
-    languageOptions: {
-      globals: {
-        jest: true,
-        describe: true,
-        it: true,
-        expect: true,
-        beforeEach: true,
-        afterEach: true,
-        beforeAll: true,
-        afterAll: true,
-      },
-    },
-    rules: {
-      '@typescript-eslint/no-non-null-assertion': 'off',
-    },
-  },
-
-  // JSON files
-  {
-    files: ['**/*.json'],
-    languageOptions: {
-      parser: jsoncParser,
-    },
-  },
-
-  // MDX files
-  {
-    ...mdxPlugin.flat,
-    plugins: {
-      ...mdxPlugin.flat.plugins,
-      '@nx': nxPlugin,
-      twenty: { rules: twentyRules },
-    },
-  },
-  mdxPlugin.flatCodeBlocks,
-  {
-    files: ['**/*.mdx'],
-    rules: {
-      'no-unused-vars': 'off',
-      'unused-imports/no-unused-imports': 'off',
-      'unused-imports/no-unused-vars': 'off',
-      // Enforce JSX tags on separate lines to prevent Crowdin translation issues
-      'twenty/mdx-component-newlines': 'error',
-      // Disallow angle bracket placeholders to prevent Crowdin translation errors
-      'twenty/no-angle-bracket-placeholders': 'error',
-    },
-  },
-];
@@ -40,34 +40,30 @@
      "dependsOn": ["^build"]
    },
    "lint": {
-      "executor": "@nx/eslint:lint",
+      "executor": "nx:run-commands",
      "cache": true,
-      "outputs": ["{options.outputFile}"],
      "options": {
-        "eslintConfig": "{projectRoot}/eslint.config.mjs",
-        "cache": true,
-        "cacheLocation": "{workspaceRoot}/.cache/eslint"
+        "cwd": "{projectRoot}",
+        "command": "npx oxlint -c .oxlintrc.json . && (prettier . --check --cache --cache-location ../../.cache/prettier/{projectRoot} --cache-strategy metadata || (echo 'ERROR: Prettier formatting check failed! Fix with: npx nx lint --configuration=fix' && false))"
      },
      "configurations": {
-        "ci": {
-          "cacheStrategy": "content"
-        },
+        "ci": {},
        "fix": {
-          "fix": true
+          "command": "npx oxlint --fix -c .oxlintrc.json . && prettier . --write --cache --cache-location ../../.cache/prettier/{projectRoot} --cache-strategy metadata"
        }
      },
-      "dependsOn": ["^build"]
+      "dependsOn": ["^build", "twenty-oxlint-rules:build"]
    },
    "lint:diff-with-main": {
      "executor": "nx:run-commands",
      "cache": false,
      "options": {
-        "command": "git diff --name-only --diff-filter=d main | grep -E '{args.pattern}' | grep '^{projectRoot}/' | xargs sh -c 'if [ $# -gt 0 ]; then npx eslint --config {projectRoot}/eslint.config.mjs \"$@\"; fi' _",
+        "command": "FILES=$(git diff --name-only --diff-filter=d main -- {projectRoot}/ | grep -E '{args.pattern}'); [ -z \"$FILES\" ] && echo 'No changed files.' || (npx oxlint -c {projectRoot}/.oxlintrc.json $FILES && (prettier --check $FILES || (echo 'ERROR: Prettier formatting check failed! Fix with: npx nx lint:diff-with-main --configuration=fix' && false)))",
        "pattern": "\\.(ts|tsx|js|jsx)$"
      },
      "configurations": {
        "fix": {
-          "command": "git diff --name-only --diff-filter=d main | grep -E '{args.pattern}' | grep '^{projectRoot}/' | xargs sh -c 'if [ $# -gt 0 ]; then npx eslint --config {projectRoot}/eslint.config.mjs --fix \"$@\"; fi' _"
+          "command": "FILES=$(git diff --name-only --diff-filter=d main -- {projectRoot}/ | grep -E '{args.pattern}'); [ -z \"$FILES\" ] && echo 'No changed files.' || (npx oxlint --fix -c {projectRoot}/.oxlintrc.json $FILES && prettier --write $FILES)"
        }
      }
    },
@@ -126,7 +122,7 @@
      "configurations": {
        "ci": {
          "ci": true,
-          "maxWorkers": 3
+          "maxWorkers": 1
        },
        "coverage": {
          "coverageReporters": ["lcov", "text"]
@@ -140,6 +136,14 @@
      "cache": true,
      "dependsOn": ["^build"]
    },
+    "set-local-version": {
+      "executor": "nx:run-commands",
+      "cache": false,
+      "options": {
+        "cwd": "{projectRoot}",
+        "command": "npm pkg set version={args.releaseVersion}"
+      }
+    },
    "storybook:build": {
      "executor": "nx:run-commands",
      "cache": true,
@@ -147,7 +151,7 @@
      "outputs": ["{projectRoot}/{options.output-dir}"],
      "options": {
        "cwd": "{projectRoot}",
-        "command": "NODE_OPTIONS='--max-old-space-size=10240' VITE_DISABLE_TYPESCRIPT_CHECKER=true storybook build --test",
+        "command": "NODE_OPTIONS='--max-old-space-size=10240' storybook build --test",
        "output-dir": "storybook-static",
        "config-dir": ".storybook"
      },
@@ -255,14 +259,6 @@
        }
      }
    },
-    "@nx/eslint:lint": {
-      "cache": true,
-      "inputs": [
-        "default",
-        "{workspaceRoot}/eslint.config.mjs",
-        "{workspaceRoot}/packages/twenty-eslint-rules/**/*"
-      ]
-    },
    "@nx/vite:build": {
      "cache": true,
      "dependsOn": ["^build"],
@@ -276,23 +272,21 @@
  "generators": {
    "@nx/react": {
      "application": {
-        "style": "@emotion/styled",
-        "linter": "eslint",
+        "style": "@linaria/react",
        "bundler": "vite",
        "compiler": "swc",
        "unitTestRunner": "jest",
        "projectNameAndRootFormat": "derived"
      },
      "library": {
-        "style": "@emotion/styled",
-        "linter": "eslint",
+        "style": "@linaria/react",
        "bundler": "vite",
        "compiler": "swc",
        "unitTestRunner": "jest",
        "projectNameAndRootFormat": "derived"
      },
      "component": {
-        "style": "@emotion/styled"
+        "style": "@linaria/react"
      }
    }
  },
@@ -1,15 +1,14 @@
 {
  "private": true,
  "dependencies": {
-    "@apollo/client": "^3.7.17",
-    "@emotion/react": "^11.11.1",
-    "@emotion/styled": "^11.11.0",
+    "@apollo/client": "^4.0.0",
    "@floating-ui/react": "^0.24.3",
    "@linaria/core": "^6.2.0",
    "@linaria/react": "^6.2.1",
    "@radix-ui/colors": "^3.0.0",
    "@sniptt/guards": "^0.2.0",
    "@tabler/icons-react": "^3.31.0",
+    "@wyw-in-js/babel-preset": "^1.0.6",
    "@wyw-in-js/vite": "^0.7.0",
    "archiver": "^7.0.1",
    "danger-plugin-todos": "^1.3.1",
@@ -41,15 +40,15 @@
    "lodash.snakecase": "^4.1.1",
    "lodash.upperfirst": "^4.3.1",
    "microdiff": "^1.3.2",
+    "next-with-linaria": "^1.3.0",
    "planer": "^1.2.0",
    "pluralize": "^8.0.0",
    "react": "^18.2.0",
    "react-dom": "^18.2.0",
    "react-responsive": "^9.0.2",
-    "react-router-dom": "^6.4.4",
+    "react-router-dom": "^6.30.3",
    "react-tooltip": "^5.13.1",
-    "recoil": "^0.7.7",
-    "remark-gfm": "^3.0.1",
+    "remark-gfm": "^4.0.1",
    "rxjs": "^7.2.0",
    "semver": "^7.5.4",
    "slash": "^5.1.0",
@@ -73,28 +72,26 @@
    "@graphql-codegen/typescript": "^3.0.4",
    "@graphql-codegen/typescript-operations": "^3.0.4",
    "@graphql-codegen/typescript-react-apollo": "^3.3.7",
-    "@nx/eslint": "22.3.3",
-    "@nx/eslint-plugin": "22.3.3",
-    "@nx/jest": "22.3.3",
-    "@nx/js": "22.3.3",
-    "@nx/react": "22.3.3",
-    "@nx/storybook": "22.3.3",
-    "@nx/vite": "22.3.3",
-    "@nx/web": "22.3.3",
+    "@nx/jest": "22.5.4",
+    "@nx/js": "22.5.4",
+    "@nx/react": "22.5.4",
+    "@nx/storybook": "22.5.4",
+    "@nx/vite": "22.5.4",
+    "@nx/web": "22.5.4",
+    "@oxlint/plugins": "^1.51.0",
    "@sentry/types": "^8",
    "@storybook-community/storybook-addon-cookie": "^5.0.0",
    "@storybook/addon-coverage": "^3.0.0",
-    "@storybook/addon-docs": "^10.1.11",
-    "@storybook/addon-links": "^10.1.11",
-    "@storybook/addon-vitest": "^10.1.11",
+    "@storybook/addon-docs": "^10.2.13",
+    "@storybook/addon-links": "^10.2.13",
+    "@storybook/addon-vitest": "^10.2.13",
    "@storybook/icons": "^2.0.1",
-    "@storybook/react-vite": "^10.1.11",
+    "@storybook/react-vite": "^10.2.13",
    "@storybook/test-runner": "^0.24.2",
-    "@stylistic/eslint-plugin": "^1.5.0",
-    "@swc-node/register": "1.8.0",
-    "@swc/cli": "^0.3.12",
-    "@swc/core": "1.13.3",
-    "@swc/helpers": "~0.5.2",
+    "@swc-node/register": "^1.11.1",
+    "@swc/cli": "^0.7.10",
+    "@swc/core": "^1.15.11",
+    "@swc/helpers": "~0.5.19",
    "@swc/jest": "^0.2.39",
    "@testing-library/dom": "^10.4.0",
    "@testing-library/jest-dom": "^6.6.3",
@@ -133,11 +130,8 @@
    "@types/react-dom": "^18.2.15",
    "@types/supertest": "^2.0.11",
    "@types/uuid": "^9.0.2",
-    "@typescript-eslint/eslint-plugin": "^8.39.0",
-    "@typescript-eslint/parser": "^8.39.0",
-    "@typescript-eslint/utils": "^8.39.0",
    "@typescript/native-preview": "^7.0.0-dev.20260116.1",
-    "@vitejs/plugin-react-swc": "3.11.0",
+    "@vitejs/plugin-react-swc": "4.2.3",
    "@vitest/browser-playwright": "^4.0.18",
    "@vitest/coverage-istanbul": "^4.0.18",
    "@vitest/coverage-v8": "^4.0.18",
@@ -147,22 +141,6 @@
    "danger": "^13.0.4",
    "dotenv-cli": "^7.4.4",
    "esbuild": "^0.25.10",
-    "eslint": "^9.32.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-jsx-a11y": "^6.10.2",
-    "eslint-plugin-lingui": "^0.9.0",
-    "eslint-plugin-mdx": "^3.6.2",
-    "eslint-plugin-prefer-arrow": "^1.2.3",
-    "eslint-plugin-prettier": "^5.1.2",
-    "eslint-plugin-project-structure": "^3.9.1",
-    "eslint-plugin-react": "^7.37.2",
-    "eslint-plugin-react-hooks": "^5.0.0",
-    "eslint-plugin-react-refresh": "^0.4.4",
-    "eslint-plugin-simple-import-sort": "^10.0.0",
-    "eslint-plugin-storybook": "^10.1.11",
-    "eslint-plugin-unicorn": "^56.0.1",
-    "eslint-plugin-unused-imports": "^3.0.0",
    "http-server": "^14.1.1",
    "jest": "29.7.0",
    "jest-environment-jsdom": "30.0.0-beta.3",
@@ -171,14 +149,14 @@
    "jsdom": "~22.1.0",
    "msw": "^2.12.7",
    "msw-storybook-addon": "^2.0.6",
-    "nx": "22.3.3",
+    "nx": "22.5.4",
    "prettier": "^3.1.1",
    "raw-loader": "^4.0.2",
    "rimraf": "^5.0.5",
    "source-map-support": "^0.5.20",
-    "storybook": "^10.1.11",
+    "storybook": "^10.2.13",
    "storybook-addon-mock-date": "2.0.0",
-    "storybook-addon-pseudo-states": "^10.1.11",
+    "storybook-addon-pseudo-states": "^10.2.13",
    "supertest": "^6.1.3",
    "ts-jest": "^29.1.1",
    "ts-loader": "^9.2.3",
@@ -186,6 +164,7 @@
    "tsc-alias": "^1.8.16",
    "tsconfig-paths": "^4.2.0",
    "tsx": "^4.17.0",
+    "verdaccio": "^6.3.1",
    "vite": "^7.0.0",
    "vitest": "^4.0.18"
  },
@@ -202,10 +181,10 @@
    "type-fest": "4.10.1",
    "typescript": "5.9.2",
    "graphql-redis-subscriptions/ioredis": "^5.6.0",
-    "prosemirror-view": "1.40.0",
-    "prosemirror-transform": "1.10.4",
    "@lingui/core": "5.1.2",
-    "@types/qs": "6.9.16"
+    "@types/qs": "6.9.16",
+    "@wyw-in-js/transform@npm:0.6.0": "patch:@wyw-in-js/transform@npm%3A0.7.0#~/.yarn/patches/@wyw-in-js-transform-npm-0.7.0-ba641dc99f.patch",
+    "@wyw-in-js/transform@npm:0.7.0": "patch:@wyw-in-js/transform@npm%3A0.7.0#~/.yarn/patches/@wyw-in-js-transform-npm-0.7.0-ba641dc99f.patch"
  },
  "version": "0.2.1",
  "nx": {},
@@ -231,7 +210,7 @@
      "packages/twenty-apps",
      "packages/twenty-cli",
      "packages/create-twenty-app",
-      "packages/twenty-eslint-rules"
+      "packages/twenty-oxlint-rules"
    ]
  },
  "prettier": {
@@ -0,0 +1,47 @@
+{
+  "$schema": "./node_modules/oxlint/configuration_schema.json",
+  "plugins": ["typescript", "import", "unicorn"],
+  "categories": {
+    "correctness": "off"
+  },
+  "ignorePatterns": ["node_modules", "dist"],
+  "rules": {
+    "func-style": ["error", "declaration", { "allowArrowFunctions": true }],
+    "no-console": "off",
+    "no-control-regex": "off",
+    "no-debugger": "error",
+    "no-duplicate-imports": "error",
+    "no-undef": "off",
+    "no-unused-vars": "off",
+    "no-redeclare": "off",
+    "import/no-duplicates": "error",
+    "typescript/no-redeclare": "error",
+    "typescript/ban-ts-comment": "error",
+    "typescript/consistent-type-imports": [
+      "error",
+      {
+        "prefer": "type-imports",
+        "fixStyle": "inline-type-imports"
+      }
+    ],
+    "typescript/explicit-function-return-type": "off",
+    "typescript/explicit-module-boundary-types": "off",
+    "typescript/no-empty-object-type": [
+      "error",
+      {
+        "allowInterfaces": "with-single-extends"
+      }
+    ],
+    "typescript/no-empty-function": "off",
+    "typescript/no-explicit-any": "off",
+    "typescript/no-unused-vars": [
+      "warn",
+      {
+        "vars": "all",
+        "varsIgnorePattern": "^_",
+        "args": "after-used",
+        "argsIgnorePattern": "^_"
+      }
+    ]
+  }
+}
@@ -0,0 +1 @@
+dist
@@ -19,57 +19,63 @@ Create Twenty App is the official scaffolding CLI for building apps on top of [T
 - Strong TypeScript support and typed client generation

 ## Documentation
+
 See Twenty application documentation https://docs.twenty.com/developers/extend/capabilities/apps

 ## Prerequisites
+
 - Node.js 24+ (recommended) and Yarn 4
- A Twenty workspace and an API key (create one at https://app.twenty.com/settings/api-webhooks)
+- Docker (for the local Twenty dev server)

 ## Quick start

 ```bash
+# Scaffold a new app — the CLI will offer to start a local Twenty server
 npx create-twenty-app@latest my-twenty-app
 cd my-twenty-app

-# If you don't use yarn@4
-corepack enable
-yarn install
+# The scaffolder can automatically:
+# 1. Start a local Twenty server (Docker)
+# 2. Open the browser to log in (tim@apple.dev / tim@apple.dev)
+# 3. Authenticate your app via OAuth

-# Get help and list all available commands
-yarn twenty help
-
-# Authenticate using your API key (you'll be prompted)
-yarn twenty auth:login
-
-# Add a new entity to your application (guided)
-yarn twenty entity:add
+# Or do it manually:
+yarn twenty server start          # Start local Twenty server
+yarn twenty remote add --local    # Authenticate via OAuth

 # Start dev mode: watches, builds, and syncs local changes to your workspace
-# (also auto-generates a typed API client in node_modules/twenty-sdk/generated)
-yarn twenty app:dev
+yarn twenty dev

 # Watch your application's function logs
-yarn twenty function:logs
+yarn twenty logs

 # Execute a function with a JSON payload
-yarn twenty function:execute -n my-function -p '{"key": "value"}'
+yarn twenty exec -n my-function -p '{"key": "value"}'
+
+# Execute the pre-install function
+yarn twenty exec --preInstall

 # Execute the post-install function
-yarn twenty function:execute --postInstall
+yarn twenty exec --postInstall
+
+# Build the app for distribution
+yarn twenty build
+
+# Publish the app to npm or directly to a Twenty server
+yarn twenty publish

 # Uninstall the application from the current workspace
-yarn twenty app:uninstall
+yarn twenty uninstall
 ```

 ## Scaffolding modes

 Control which example files are included when creating a new app:

-| Flag | Behavior |
-|------|----------|
-| `-e, --exhaustive` | **(default)** Creates all example files without prompting |
-| `-m, --minimal` | Creates only core files (`application-config.ts` and `default-role.ts`) |
-| `-i, --interactive` | Prompts you to select which examples to include |
+| Flag               | Behavior                                                                |
+| ------------------ | ----------------------------------------------------------------------- |
+| `-e, --exhaustive` | **(default)** Creates all example files                                 |
+| `-m, --minimal`    | Creates only core files (`application-config.ts` and `default-role.ts`) |

 ```bash
 # Default: all examples included
@@ -77,72 +83,95 @@ npx create-twenty-app@latest my-app

 # Minimal: only core files
 npx create-twenty-app@latest my-app -m
-
-# Interactive: choose which examples to include
-npx create-twenty-app@latest my-app -i
 ```

-In interactive mode, you can pick from:
- **Example object** — a custom CRM object definition (`objects/example-object.ts`)
- **Example field** — a custom field on the example object (`fields/example-field.ts`)
- **Example logic function** — a server-side handler with HTTP trigger (`logic-functions/hello-world.ts`)
- **Example front component** — a React UI component (`front-components/hello-world.tsx`)
- **Example view** — a saved view for the example object (`views/example-view.ts`)
- **Example navigation menu item** — a sidebar link (`navigation-menu-items/example-navigation-menu-item.ts`)
-
 ## What gets scaffolded

 **Core files (always created):**
+
 - `application-config.ts` — Application metadata configuration
 - `roles/default-role.ts` — Default role for logic functions
+- `logic-functions/pre-install.ts` — Pre-install logic function (runs before app installation)
 - `logic-functions/post-install.ts` — Post-install logic function (runs after app installation)
- TypeScript configuration, ESLint, package.json, .gitignore
+- TypeScript configuration, Oxlint, package.json, .gitignore
 - A prewired `twenty` script that delegates to the `twenty` CLI from twenty-sdk

 **Example files (controlled by scaffolding mode):**
+
 - `objects/example-object.ts` — Example custom object with a text field
 - `fields/example-field.ts` — Example standalone field extending the example object
 - `logic-functions/hello-world.ts` — Example logic function with HTTP trigger
 - `front-components/hello-world.tsx` — Example front component
 - `views/example-view.ts` — Example saved view for the example object
 - `navigation-menu-items/example-navigation-menu-item.ts` — Example sidebar navigation link
+- `skills/example-skill.ts` — Example AI agent skill definition
+- `__tests__/app-install.integration-test.ts` — Integration test that builds, installs, and verifies the app (includes `vitest.config.ts`, `tsconfig.spec.json`, and a setup file)

-## Next steps
- Run `yarn twenty help` to see all available commands.
- Use `yarn twenty auth:login` to authenticate with your Twenty workspace.
- Explore the generated project and add your first entity with `yarn twenty entity:add` (logic functions, front components, objects, roles, views, navigation menu items).
- Use `yarn twenty app:dev` while you iterate — it watches, builds, and syncs changes to your workspace in real time.
- Types are auto‑generated by `yarn twenty app:dev` and stored in `node_modules/twenty-sdk/generated`.
+## Local server

+The scaffolder can start a local Twenty dev server for you (all-in-one Docker image with PostgreSQL, Redis, server, and worker). You can also manage it manually:

-## Publish your application
-Applications are currently stored in `twenty/packages/twenty-apps`.
+```bash
+yarn twenty server start     # Start (pulls image if needed)
+yarn twenty server status    # Check if it's healthy
+yarn twenty server logs      # Stream logs
+yarn twenty server stop      # Stop (data is preserved)
+yarn twenty server reset     # Wipe all data and start fresh
+```

-You can share your application with all Twenty users:
+The server is pre-seeded with a workspace and user (`tim@apple.dev` / `tim@apple.dev`).
+
+## Next steps
+
+- Run `yarn twenty help` to see all available commands.
+- Use `yarn twenty remote add --local` to authenticate with your Twenty workspace via OAuth.
+- Explore the generated project and add your first entity with `yarn twenty add` (logic functions, front components, objects, roles, views, navigation menu items, skills).
+- Use `yarn twenty dev` while you iterate — it watches, builds, and syncs changes to your workspace in real time.
+- `CoreApiClient` (for workspace data via `/graphql`) is auto-generated by `yarn twenty dev`. `MetadataApiClient` (for workspace configuration and file uploads via `/metadata`) ships pre-built with the SDK. Both are available via `import { CoreApiClient, MetadataApiClient } from 'twenty-sdk/clients'`.
+
+## Build and publish your application
+
+Once your app is ready, build and publish it using the CLI:
+
+```bash
+# Build the app (output goes to .twenty/output/)
+yarn twenty build
+
+# Build and create a tarball (.tgz) for distribution
+yarn twenty build --tarball
+
+# Publish to npm (requires npm login)
+yarn twenty publish
+
+# Publish with a dist-tag (e.g. beta, next)
+yarn twenty publish --tag beta
+
+# Deploy directly to a Twenty server (builds, uploads, and installs in one step)
+yarn twenty deploy
+```
+
+### Publish to the Twenty marketplace
+
+You can also contribute your application to the curated marketplace:

 ```bash
-# pull the Twenty project
 git clone https://github.com/twentyhq/twenty.git
 cd twenty
-
-# create a new branch
 git checkout -b feature/my-awesome-app
 ```

 - Copy your app folder into `twenty/packages/twenty-apps`.
 - Commit your changes and open a pull request on https://github.com/twentyhq/twenty

-```bash
-git commit -m "Add new application"
-git push
-```
-
 Our team reviews contributions for quality, security, and reusability before merging.

 ## Troubleshooting
- Auth prompts not appearing: run `yarn twenty auth:login` again and verify the API key permissions.
- Types not generated: ensure `yarn twenty app:dev` is running — it auto‑generates the typed client.
+
+- Server not starting: check Docker is running (`docker info`), then try `yarn twenty server logs`.
+- Auth not working: make sure you're logged in to Twenty in the browser first, then run `yarn twenty remote add --local`.
+- Types not generated: ensure `yarn twenty dev` is running — it auto-generates the typed client.

 ## Contributing
+
 - See our [GitHub](https://github.com/twentyhq/twenty)
 - Join our [Discord](https://discord.gg/cx5n4Jzs57)
@@ -1,20 +0,0 @@
-import baseConfig from '../../eslint.config.mjs';
-
-export default [
-  ...baseConfig,
-  {
-    ignores: ['**/dist/**'],
-  },
-  {
-    files: ['**/*.{js,jsx,ts,tsx}'],
-    rules: {
-      'prettier/prettier': 'error',
-    },
-  },
-  {
-    rules: {
-      'no-console': 'off',
-    },
-    ignores: ['src/**/*.ts', '!src/cli/**/*.ts'],
-  },
-];
@@ -1,5 +1,5 @@
 const jestConfig = {
-  displayName: 'twenty-cli',
+  displayName: 'create-twenty-app',
  preset: '../../jest.preset.js',
  testEnvironment: 'node',
  transformIgnorePatterns: ['../../node_modules/'],
@@ -15,6 +15,7 @@ const jestConfig = {
  },
  moduleNameMapper: {
    '^@/(.*)$': '<rootDir>/src/$1',
+    '^package.json$': '<rootDir>/package.json',
  },
  moduleFileExtensions: ['ts', 'js'],
  extensionsToTreatAsEsm: ['.ts'],
@@ -1,6 +1,6 @@
 {
  "name": "create-twenty-app",
-  "version": "0.6.0",
+  "version": "0.8.0-canary.1",
  "description": "Command-line interface to create Twenty application",
  "main": "dist/cli.cjs",
  "bin": "dist/cli.cjs",
@@ -24,20 +24,9 @@
        "command": "node dist/cli.cjs"
      }
    },
+    "set-local-version": {},
    "typecheck": {},
-    "lint": {
-      "options": {
-        "lintFilePatterns": ["{projectRoot}/src/**/*.{ts,json}"],
-        "maxWarnings": 0
-      },
-      "configurations": {
-        "ci": {
-          "lintFilePatterns": ["{projectRoot}/src/**/*.{ts,json}"],
-          "maxWarnings": 0
-        },
-        "fix": {}
-      }
-    },
+    "lint": {},
    "test": {
      "executor": "@nx/jest:jest",
      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
@@ -18,9 +18,18 @@ const program = new Command(packageJson.name)
    '-m, --minimal',
    'Create only core entities (application-config and default-role)',
  )
+  .option('-n, --name <name>', 'Application name (skips prompt)')
  .option(
-    '-i, --interactive',
-    'Interactively choose which entity examples to include',
+    '-d, --display-name <displayName>',
+    'Application display name (skips prompt)',
+  )
+  .option(
+    '--description <description>',
+    'Application description (skips prompt)',
+  )
+  .option(
+    '--skip-local-instance',
+    'Skip the local Twenty instance setup prompt',
  )
  .helpOption('-h, --help', 'Display this help message.')
  .action(
@@ -29,19 +38,18 @@ const program = new Command(packageJson.name)
      options?: {
        exhaustive?: boolean;
        minimal?: boolean;
-        interactive?: boolean;
+        name?: string;
+        displayName?: string;
+        description?: string;
+        skipLocalInstance?: boolean;
      },
    ) => {
-      const modeFlags = [
-        options?.exhaustive,
-        options?.minimal,
-        options?.interactive,
-      ].filter(Boolean);
+      const modeFlags = [options?.exhaustive, options?.minimal].filter(Boolean);

      if (modeFlags.length > 1) {
        console.error(
          chalk.red(
-            'Error: --exhaustive, --minimal, and --interactive are mutually exclusive.',
+            'Error: --exhaustive and --minimal are mutually exclusive.',
          ),
        );
        process.exit(1);
@@ -56,13 +64,21 @@ const program = new Command(packageJson.name)
        process.exit(1);
      }

-      const mode: ScaffoldingMode = options?.minimal
-        ? 'minimal'
-        : options?.interactive
-          ? 'interactive'
-          : 'exhaustive';
+      if (options?.name !== undefined && options.name.trim().length === 0) {
+        console.error(chalk.red('Error: --name cannot be empty.'));
+        process.exit(1);
+      }

-      await new CreateAppCommand().execute(directory, mode);
+      const mode: ScaffoldingMode = options?.minimal ? 'minimal' : 'exhaustive';
+
+      await new CreateAppCommand().execute({
+        directory,
+        mode,
+        name: options?.name,
+        displayName: options?.displayName,
+        description: options?.description,
+        skipLocalInstance: options?.skipLocalInstance,
+      });
    },
  );

@@ -0,0 +1,19 @@
+{
+  "$schema": "./node_modules/oxlint/configuration_schema.json",
+  "plugins": ["typescript"],
+  "categories": {
+    "correctness": "off"
+  },
+  "ignorePatterns": ["node_modules", "dist"],
+  "rules": {
+    "no-unused-vars": "off",
+
+    "typescript/no-unused-vars": [
+      "warn",
+      {
+        "argsIgnorePattern": "^_"
+      }
+    ],
+    "typescript/no-explicit-any": "off"
+  }
+}
@@ -0,0 +1,14 @@
+## Base documentation
+
+- Documentation: https://docs.twenty.com/developers/extend/capabilities/apps
+- Rich app example: https://github.com/twentyhq/twenty/tree/main/packages/twenty-sdk/src/app-seeds/rich-app
+
+## UUID requirement
+
+- All generated UUIDs must be valid UUID v4.
+
+## Common Pitfalls
+
+- Creating an object without an index view associated. Unless this is a technical object, user will need to visualize it.
+- Creating a view without a navigationMenuItem associated. This will make the view available on the left sidebar.
+- Creating a front-end component that has a scroll instead of being responsive to its fixed widget height and width, unless it is specifically meant to be used in a canvas tab.
@@ -1,47 +1,11 @@
-This is a [Twenty](https://twenty.com) application project bootstrapped with [`create-twenty-app`](https://www.npmjs.com/package/create-twenty-app).
+This is a [Twenty](https://twenty.com) application bootstrapped with [`create-twenty-app`](https://www.npmjs.com/package/create-twenty-app).

 ## Getting Started

-First, authenticate to your workspace:
-
-```bash
-yarn twenty auth:login
-```
-
-Then, start development mode to sync your app and watch for changes:
-
-```bash
-yarn twenty app:dev
-```
-
-Open your Twenty instance and go to `/settings/applications` section to see the result.
-
-## Available Commands
-
-Run `yarn twenty help` to list all available commands. Common commands:
-
-```bash
-# Authentication
-yarn twenty auth:login     # Authenticate with Twenty
-yarn twenty auth:logout    # Remove credentials
-yarn twenty auth:status    # Check auth status
-yarn twenty auth:switch    # Switch default workspace
-yarn twenty auth:list      # List all configured workspaces
-
-# Application
-yarn twenty app:dev        # Start dev mode (watch, build, sync, and auto-generate typed client)
-yarn twenty entity:add     # Add a new entity (object, field, function, front-component, role, view, navigation-menu-item)
-yarn twenty function:logs  # Stream function logs
-yarn twenty function:execute  # Execute a function with JSON payload
-yarn twenty app:uninstall  # Uninstall app from workspace
-```
+Run `yarn twenty help` to list all available commands.

 ## Learn More

-To learn more about Twenty applications, take a look at the following resources:
-
- [twenty-sdk](https://www.npmjs.com/package/twenty-sdk) - learn about `twenty-sdk` tool.
- [Twenty doc](https://docs.twenty.com/) - Twenty's documentation.
- Join our [Discord](https://discord.gg/cx5n4Jzs57)
-
-You can check out [the Twenty GitHub repository](https://github.com/twentyhq/twenty) - your feedback and contributions are welcome!
+- [Twenty Apps documentation](https://docs.twenty.com/developers/extend/capabilities/apps)
+- [twenty-sdk CLI reference](https://www.npmjs.com/package/twenty-sdk)
+- [Discord](https://discord.gg/cx5n4Jzs57)
@@ -1,29 +0,0 @@
-import js from '@eslint/js';
-import tseslint from 'typescript-eslint';
-
-export default [
-  // Base JS recommended rules
-  js.configs.recommended,
-
-  // TypeScript recommended rules
-  ...tseslint.configs.recommended,
-
-  {
-    files: ['**/*.ts', '**/*.tsx'],
-    languageOptions: {
-      parserOptions: {
-        project: true,
-        tsconfigRootDir: import.meta.dirname,
-      },
-    },
-    rules: {
-      // Common TypeScript-friendly tweaks
-      '@typescript-eslint/no-unused-vars': [
-        'warn',
-        { argsIgnorePattern: '^_' },
-      ],
-      '@typescript-eslint/no-explicit-any': 'off',
-      'no-unused-vars': 'off', // handled by TS rule
-    },
-  },
-];
@@ -27,5 +27,11 @@
      "~/*": ["./*"]
    }
  },
-  "exclude": ["node_modules", "dist", "**/*.test.ts", "**/*.spec.ts"]
+  "exclude": [
+    "node_modules",
+    "dist",
+    "**/*.test.ts",
+    "**/*.spec.ts",
+    "**/*.integration-test.ts"
+  ]
 }
@@ -1,12 +1,18 @@
 import { copyBaseApplicationProject } from '@/utils/app-template';
 import { convertToLabel } from '@/utils/convert-to-label';
 import { install } from '@/utils/install';
+import {
+  type LocalInstanceResult,
+  setupLocalInstance,
+} from '@/utils/setup-local-instance';
 import { tryGitInit } from '@/utils/try-git-init';
 import chalk from 'chalk';
 import * as fs from 'fs-extra';
 import inquirer from 'inquirer';
 import kebabCase from 'lodash.kebabcase';
+import { execSync } from 'node:child_process';
 import * as path from 'path';
+import { isDefined } from 'twenty-shared/utils';

 import {
  type ExampleOptions,
@@ -15,16 +21,24 @@ import {

 const CURRENT_EXECUTION_DIRECTORY = process.env.INIT_CWD || process.cwd();

+type CreateAppOptions = {
+  directory?: string;
+  mode?: ScaffoldingMode;
+  name?: string;
+  displayName?: string;
+  description?: string;
+  skipLocalInstance?: boolean;
+};
+
 export class CreateAppCommand {
-  async execute(
-    directory?: string,
-    mode: ScaffoldingMode = 'exhaustive',
-  ): Promise<void> {
+  async execute(options: CreateAppOptions = {}): Promise<void> {
    try {
      const { appName, appDisplayName, appDirectory, appDescription } =
-        await this.getAppInfos(directory);
+        await this.getAppInfos(options);

-      const exampleOptions = await this.resolveExampleOptions(mode);
+      const exampleOptions = this.resolveExampleOptions(
+        options.mode ?? 'exhaustive',
+      );

      await this.validateDirectory(appDirectory);

@@ -32,6 +46,7 @@ export class CreateAppCommand {

      await fs.ensureDir(appDirectory);

+      console.log(chalk.gray('  Scaffolding project files...'));
      await copyBaseApplicationProject({
        appName,
        appDisplayName,
@@ -40,11 +55,24 @@ export class CreateAppCommand {
        exampleOptions,
      });

+      console.log(chalk.gray('  Installing dependencies...'));
      await install(appDirectory);

+      console.log(chalk.gray('  Initializing git repository...'));
      await tryGitInit(appDirectory);

-      this.logSuccess(appDirectory);
+      let localResult: LocalInstanceResult = { running: false };
+
+      if (!options.skipLocalInstance) {
+        // Auto-detect a running server first
+        localResult = await setupLocalInstance(appDirectory);
+
+        if (localResult.running && localResult.serverUrl) {
+          await this.connectToLocal(appDirectory, localResult.serverUrl);
+        }
+      }
+
+      this.logSuccess(appDirectory, localResult);
    } catch (error) {
      console.error(
        chalk.red('Initialization failed:'),
@@ -54,19 +82,25 @@ export class CreateAppCommand {
    }
  }

-  private async getAppInfos(directory?: string): Promise<{
+  private async getAppInfos(options: CreateAppOptions): Promise<{
    appName: string;
    appDisplayName: string;
    appDescription: string;
    appDirectory: string;
  }> {
+    const { directory } = options;
+
+    const hasName = isDefined(options.name) || isDefined(directory);
+    const hasDisplayName = isDefined(options.displayName);
+    const hasDescription = isDefined(options.description);
+
    const { name, displayName, description } = await inquirer.prompt([
      {
        type: 'input',
        name: 'name',
        message: 'Application name:',
-        when: () => !directory,
-        default: 'my-awesome-app',
+        when: () => !hasName,
+        default: 'my-twenty-app',
        validate: (input) => {
          if (input.length === 0) return 'Application name is required';
          return true;
@@ -76,25 +110,33 @@ export class CreateAppCommand {
        type: 'input',
        name: 'displayName',
        message: 'Application display name:',
-        default: (answers: any) => {
-          return convertToLabel(answers?.name ?? directory);
+        when: () => !hasDisplayName,
+        default: (answers: { name?: string }) => {
+          return convertToLabel(
+            answers?.name ?? options.name ?? directory ?? '',
+          );
        },
      },
      {
        type: 'input',
        name: 'description',
        message: 'Application description (optional):',
+        when: () => !hasDescription,
        default: '',
      },
    ]);

-    const computedName = name ?? directory;
+    const appName = (
+      options.name ??
+      name ??
+      directory ??
+      'my-twenty-app'
+    ).trim();

-    const appName = computedName.trim();
+    const appDisplayName =
+      (options.displayName ?? displayName)?.trim() || convertToLabel(appName);

-    const appDisplayName = displayName.trim();
-
-    const appDescription = description.trim();
+    const appDescription = (options.description ?? description ?? '').trim();

    const appDirectory = directory
      ? path.join(CURRENT_EXECUTION_DIRECTORY, directory)
@@ -103,9 +145,7 @@ export class CreateAppCommand {
    return { appName, appDisplayName, appDirectory, appDescription };
  }

-  private async resolveExampleOptions(
-    mode: ScaffoldingMode,
-  ): Promise<ExampleOptions> {
+  private resolveExampleOptions(mode: ScaffoldingMode): ExampleOptions {
    if (mode === 'minimal') {
      return {
        includeExampleObject: false,
@@ -114,81 +154,22 @@ export class CreateAppCommand {
        includeExampleFrontComponent: false,
        includeExampleView: false,
        includeExampleNavigationMenuItem: false,
+        includeExampleSkill: false,
+        includeExampleAgent: false,
+        includeExampleIntegrationTest: false,
      };
    }

-    if (mode === 'exhaustive') {
-      return {
-        includeExampleObject: true,
-        includeExampleField: true,
-        includeExampleLogicFunction: true,
-        includeExampleFrontComponent: true,
-        includeExampleView: true,
-        includeExampleNavigationMenuItem: true,
-      };
-    }
-
-    const { selectedExamples } = await inquirer.prompt([
-      {
-        type: 'checkbox',
-        name: 'selectedExamples',
-        message: 'Select which example files to include:',
-        choices: [
-          {
-            name: 'Example object (custom object definition)',
-            value: 'object',
-            checked: true,
-          },
-          {
-            name: 'Example field (custom field on the example object)',
-            value: 'field',
-            checked: true,
-          },
-          {
-            name: 'Example logic function (server-side handler)',
-            value: 'logicFunction',
-            checked: true,
-          },
-          {
-            name: 'Example front component (React UI component)',
-            value: 'frontComponent',
-            checked: true,
-          },
-          {
-            name: 'Example view (saved view for the example object)',
-            value: 'view',
-            checked: true,
-          },
-          {
-            name: 'Example navigation menu item (sidebar link)',
-            value: 'navigationMenuItem',
-            checked: true,
-          },
-        ],
-      },
-    ]);
-
-    const includeField = selectedExamples.includes('field');
-    const includeView = selectedExamples.includes('view');
-    const includeObject =
-      selectedExamples.includes('object') || includeField || includeView;
-
-    if ((includeField || includeView) && !selectedExamples.includes('object')) {
-      console.log(
-        chalk.yellow(
-          'Note: Example object auto-included because example field/view depends on it.',
-        ),
-      );
-    }
-
    return {
-      includeExampleObject: includeObject,
-      includeExampleField: includeField,
-      includeExampleLogicFunction: selectedExamples.includes('logicFunction'),
-      includeExampleFrontComponent: selectedExamples.includes('frontComponent'),
-      includeExampleView: includeView,
-      includeExampleNavigationMenuItem:
-        selectedExamples.includes('navigationMenuItem'),
+      includeExampleObject: true,
+      includeExampleField: true,
+      includeExampleLogicFunction: true,
+      includeExampleFrontComponent: true,
+      includeExampleView: true,
+      includeExampleNavigationMenuItem: true,
+      includeExampleSkill: true,
+      includeExampleIntegrationTest: true,
+      includeExampleAgent: true,
    };
  }

@@ -212,22 +193,55 @@ export class CreateAppCommand {
    appDirectory: string;
    appName: string;
  }): void {
-    console.log(chalk.blue('🎯 Creating Twenty Application'));
-    console.log(chalk.gray(`📁 Directory: ${appDirectory}`));
-    console.log(chalk.gray(`📝 Name: ${appName}`));
+    console.log(chalk.blue('Creating Twenty Application'));
+    console.log(chalk.gray(`  Directory: ${appDirectory}`));
+    console.log(chalk.gray(`  Name: ${appName}`));
    console.log('');
  }

-  private logSuccess(appDirectory: string): void {
+  private async connectToLocal(
+    appDirectory: string,
+    serverUrl: string,
+  ): Promise<void> {
+    try {
+      execSync(
+        `npx nx run twenty-sdk:start -- remote add ${serverUrl} --as local`,
+        {
+          cwd: appDirectory,
+          stdio: 'inherit',
+        },
+      );
+      console.log(chalk.green('Authenticated with local Twenty instance.'));
+    } catch {
+      console.log(
+        chalk.yellow(
+          'Authentication skipped. Run `npx nx run twenty-sdk:start -- remote add --local` manually.',
+        ),
+      );
+    }
+  }
+
+  private logSuccess(
+    appDirectory: string,
+    localResult: LocalInstanceResult,
+  ): void {
    const dirName = appDirectory.split('/').reverse()[0] ?? '';

-    console.log(chalk.green('✅ Application created!'));
+    console.log(chalk.green('Application created!'));
    console.log('');
    console.log(chalk.blue('Next steps:'));
    console.log(chalk.gray(`  cd ${dirName}`));
-    console.log(chalk.gray(`  corepack enable  # if you don't use yarn@4`));
-    console.log(chalk.gray(`  yarn install     # if you don't use yarn@4`));
-    console.log(chalk.gray('  yarn auth:login  # Authenticate with Twenty'));
-    console.log(chalk.gray('  yarn app:dev     # Start dev mode'));
+
+    if (!localResult.running) {
+      console.log(
+        chalk.gray(
+          '  yarn twenty remote add --local  # Authenticate with Twenty',
+        ),
+      );
+    }
+
+    console.log(
+      chalk.gray('  yarn twenty dev                  # Start dev mode'),
+    );
  }
 }
@@ -1,4 +1,4 @@
-export type ScaffoldingMode = 'exhaustive' | 'minimal' | 'interactive';
+export type ScaffoldingMode = 'exhaustive' | 'minimal';

 export type ExampleOptions = {
  includeExampleObject: boolean;
@@ -7,4 +7,7 @@ export type ExampleOptions = {
  includeExampleFrontComponent: boolean;
  includeExampleView: boolean;
  includeExampleNavigationMenuItem: boolean;
+  includeExampleSkill: boolean;
+  includeExampleAgent: boolean;
+  includeExampleIntegrationTest: boolean;
 };
@@ -1,10 +1,11 @@
-import * as fs from 'fs-extra';
-import { join } from 'path';
-import { tmpdir } from 'os';
-import { copyBaseApplicationProject } from '@/utils/app-template';
 import { type ExampleOptions } from '@/types/scaffolding-options';
+import { copyBaseApplicationProject } from '@/utils/app-template';
+import * as fs from 'fs-extra';
+import { tmpdir } from 'os';
+import createTwentyAppPackageJson from 'package.json';
+import { join } from 'path';
+import { GENERATED_DIR } from 'twenty-shared/application';

-// Mock fs-extra's copy function to skip copying base template (not available during tests)
 jest.mock('fs-extra', () => {
  const actual = jest.requireActual('fs-extra');
  return {
@@ -23,32 +24,46 @@ const ALL_EXAMPLES: ExampleOptions = {
  includeExampleFrontComponent: true,
  includeExampleView: true,
  includeExampleNavigationMenuItem: true,
+  includeExampleSkill: true,
+  includeExampleAgent: true,
+  includeExampleIntegrationTest: true,
+};
+
+const SEED_TSCONFIG = {
+  compilerOptions: { paths: { 'src/*': ['./src/*'] } },
+  exclude: ['node_modules', 'dist', '**/*.integration-test.ts'],
+};
+
+const seedTsconfig = async (directory: string) => {
+  await fs.writeJson(join(directory, 'tsconfig.json'), SEED_TSCONFIG);
 };

 const NO_EXAMPLES: ExampleOptions = {
  includeExampleObject: false,
  includeExampleField: false,
+  includeExampleSkill: false,
+  includeExampleAgent: false,
  includeExampleLogicFunction: false,
  includeExampleFrontComponent: false,
  includeExampleView: false,
  includeExampleNavigationMenuItem: false,
+  includeExampleIntegrationTest: false,
 };

 describe('copyBaseApplicationProject', () => {
  let testAppDirectory: string;

  beforeEach(async () => {
-    // Create a unique temp directory for each test
    testAppDirectory = join(
      tmpdir(),
      `test-twenty-app-${Date.now()}-${Math.random().toString(36).slice(2)}`,
    );
    await fs.ensureDir(testAppDirectory);
+    await seedTsconfig(testAppDirectory);
    jest.clearAllMocks();
  });

  afterEach(async () => {
-    // Clean up temp directory after each test
    if (testAppDirectory && (await fs.pathExists(testAppDirectory))) {
      await fs.remove(testAppDirectory);
    }
@@ -63,15 +78,12 @@ describe('copyBaseApplicationProject', () => {
      exampleOptions: ALL_EXAMPLES,
    });

-    // Verify src/ folder exists
    const srcAppPath = join(testAppDirectory, 'src');
    expect(await fs.pathExists(srcAppPath)).toBe(true);

-    // Verify application-config.ts exists in src/
    const appConfigPath = join(srcAppPath, APPLICATION_FILE_NAME);
    expect(await fs.pathExists(appConfigPath)).toBe(true);

-    // Verify default-role.ts exists in src/
    const roleConfigPath = join(srcAppPath, 'roles', DEFAULT_ROLE_FILE_NAME);
    expect(await fs.pathExists(roleConfigPath)).toBe(true);
  });
@@ -91,7 +103,9 @@ describe('copyBaseApplicationProject', () => {
    const packageJson = await fs.readJson(packageJsonPath);
    expect(packageJson.name).toBe('my-test-app');
    expect(packageJson.version).toBe('0.1.0');
-    expect(packageJson.dependencies['twenty-sdk']).toBe('latest');
+    expect(packageJson.devDependencies['twenty-sdk']).toBe(
+      createTwentyAppPackageJson.version,
+    );
    expect(packageJson.scripts['twenty']).toBe('twenty');
  });

@@ -109,7 +123,7 @@ describe('copyBaseApplicationProject', () => {

    const gitignoreContent = await fs.readFile(gitignorePath, 'utf8');
    expect(gitignoreContent).toContain('/node_modules');
-    expect(gitignoreContent).toContain('generated');
+    expect(gitignoreContent).toContain(GENERATED_DIR);
  });

  it('should create yarn.lock file', async () => {
@@ -140,27 +154,29 @@ describe('copyBaseApplicationProject', () => {
    const appConfigPath = join(testAppDirectory, 'src', APPLICATION_FILE_NAME);
    const appConfigContent = await fs.readFile(appConfigPath, 'utf8');

-    // Verify it uses defineApplication
    expect(appConfigContent).toContain(
      "import { defineApplication } from 'twenty-sdk'",
    );
    expect(appConfigContent).toContain('export default defineApplication({');

-    // Verify it imports the role identifier
    expect(appConfigContent).toContain(
      "import { DEFAULT_ROLE_UNIVERSAL_IDENTIFIER } from 'src/roles/default-role'",
    );

-    // Verify display name and description
+    expect(appConfigContent).toContain(
+      'export const APPLICATION_UNIVERSAL_IDENTIFIER',
+    );
+    expect(appConfigContent).toContain(
+      'universalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER',
+    );
+
    expect(appConfigContent).toContain("displayName: 'My Test App'");
    expect(appConfigContent).toContain("description: 'A test application'");

-    // Verify it has a universalIdentifier (UUID format)
    expect(appConfigContent).toMatch(
-      /universalIdentifier: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'/,
+      /APPLICATION_UNIVERSAL_IDENTIFIER =\s*'[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'/,
    );

-    // Verify it references the role
    expect(appConfigContent).toContain(
      'defaultRoleUniversalIdentifier: DEFAULT_ROLE_UNIVERSAL_IDENTIFIER',
    );
@@ -183,29 +199,24 @@ describe('copyBaseApplicationProject', () => {
    );
    const roleConfigContent = await fs.readFile(roleConfigPath, 'utf8');

-    // Verify it uses defineRole
    expect(roleConfigContent).toContain(
      "import { defineRole } from 'twenty-sdk'",
    );
    expect(roleConfigContent).toContain('export default defineRole({');

-    // Verify it exports the universal identifier constant
    expect(roleConfigContent).toContain(
      'export const DEFAULT_ROLE_UNIVERSAL_IDENTIFIER',
    );

-    // Verify role label includes app name
    expect(roleConfigContent).toContain(
      "label: 'My Test App default function role'",
    );

-    // Verify default permissions
    expect(roleConfigContent).toContain('canReadAllObjectRecords: true');
    expect(roleConfigContent).toContain('canUpdateAllObjectRecords: true');
    expect(roleConfigContent).toContain('canSoftDeleteAllObjectRecords: true');
    expect(roleConfigContent).toContain('canDestroyAllObjectRecords: false');

-    // Verify it has a universalIdentifier (UUID format)
    expect(roleConfigContent).toMatch(
      /universalIdentifier: DEFAULT_ROLE_UNIVERSAL_IDENTIFIER/,
    );
@@ -220,7 +231,6 @@ describe('copyBaseApplicationProject', () => {
      exampleOptions: ALL_EXAMPLES,
    });

-    // Verify fs.copy was called with correct destination
    expect(fs.copy).toHaveBeenCalledTimes(1);
    expect(fs.copy).toHaveBeenCalledWith(
      expect.stringContaining('base-application'),
@@ -244,9 +254,9 @@ describe('copyBaseApplicationProject', () => {
  });

  it('should generate unique UUIDs for each application', async () => {
-    // Create first app
    const firstAppDir = join(testAppDirectory, 'app1');
    await fs.ensureDir(firstAppDir);
+    await seedTsconfig(firstAppDir);
    await copyBaseApplicationProject({
      appName: 'app-one',
      appDisplayName: 'App One',
@@ -255,9 +265,9 @@ describe('copyBaseApplicationProject', () => {
      exampleOptions: ALL_EXAMPLES,
    });

-    // Create second app
    const secondAppDir = join(testAppDirectory, 'app2');
    await fs.ensureDir(secondAppDir);
+    await seedTsconfig(secondAppDir);
    await copyBaseApplicationProject({
      appName: 'app-two',
      appDisplayName: 'App Two',
@@ -266,7 +276,6 @@ describe('copyBaseApplicationProject', () => {
      exampleOptions: ALL_EXAMPLES,
    });

-    // Read both app configs
    const firstAppConfig = await fs.readFile(
      join(firstAppDir, 'src', APPLICATION_FILE_NAME),
      'utf8',
@@ -276,9 +285,8 @@ describe('copyBaseApplicationProject', () => {
      'utf8',
    );

-    // Extract UUIDs using regex
    const uuidRegex =
-      /universalIdentifier: '([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})'/;
+      /APPLICATION_UNIVERSAL_IDENTIFIER =\s*'([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})'/;
    const firstUuid = firstAppConfig.match(uuidRegex)?.[1];
    const secondUuid = secondAppConfig.match(uuidRegex)?.[1];

@@ -288,9 +296,9 @@ describe('copyBaseApplicationProject', () => {
  });

  it('should generate unique role UUIDs for each application', async () => {
-    // Create first app
    const firstAppDir = join(testAppDirectory, 'app1');
    await fs.ensureDir(firstAppDir);
+    await seedTsconfig(firstAppDir);
    await copyBaseApplicationProject({
      appName: 'app-one',
      appDisplayName: 'App One',
@@ -299,9 +307,9 @@ describe('copyBaseApplicationProject', () => {
      exampleOptions: ALL_EXAMPLES,
    });

-    // Create second app
    const secondAppDir = join(testAppDirectory, 'app2');
    await fs.ensureDir(secondAppDir);
+    await seedTsconfig(secondAppDir);
    await copyBaseApplicationProject({
      appName: 'app-two',
      appDisplayName: 'App Two',
@@ -320,7 +328,6 @@ describe('copyBaseApplicationProject', () => {
      'utf8',
    );

-    // Extract UUIDs using regex
    const uuidRegex =
      /DEFAULT_ROLE_UNIVERSAL_IDENTIFIER =\s*'([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})'/;
    const firstUuid = firstRoleConfig.match(uuidRegex)?.[1];
@@ -372,6 +379,30 @@ describe('copyBaseApplicationProject', () => {
            ),
          ),
        ).toBe(true);
+
+        expect(
+          await fs.pathExists(
+            join(srcPath, '__tests__', 'app-install.integration-test.ts'),
+          ),
+        ).toBe(true);
+
+        expect(
+          await fs.pathExists(
+            join(testAppDirectory, '.github', 'workflows', 'ci.yml'),
+          ),
+        ).toBe(true);
+
+        // Install functions should always exist
+        expect(
+          await fs.pathExists(
+            join(srcPath, 'logic-functions', 'pre-install.ts'),
+          ),
+        ).toBe(true);
+        expect(
+          await fs.pathExists(
+            join(srcPath, 'logic-functions', 'post-install.ts'),
+          ),
+        ).toBe(true);
      });
    });

@@ -387,7 +418,6 @@ describe('copyBaseApplicationProject', () => {

        const srcPath = join(testAppDirectory, 'src');

-        // Core files should exist
        expect(await fs.pathExists(join(srcPath, APPLICATION_FILE_NAME))).toBe(
          true,
        );
@@ -395,7 +425,18 @@ describe('copyBaseApplicationProject', () => {
          await fs.pathExists(join(srcPath, 'roles', DEFAULT_ROLE_FILE_NAME)),
        ).toBe(true);

-        // Example files should not exist
+        // Install functions should always exist (not gated by exampleOptions)
+        expect(
+          await fs.pathExists(
+            join(srcPath, 'logic-functions', 'pre-install.ts'),
+          ),
+        ).toBe(true);
+        expect(
+          await fs.pathExists(
+            join(srcPath, 'logic-functions', 'post-install.ts'),
+          ),
+        ).toBe(true);
+
        expect(
          await fs.pathExists(join(srcPath, 'objects', 'example-object.ts')),
        ).toBe(false);
@@ -424,6 +465,17 @@ describe('copyBaseApplicationProject', () => {
            ),
          ),
        ).toBe(false);
+        expect(
+          await fs.pathExists(
+            join(srcPath, '__tests__', 'app-install.integration-test.ts'),
+          ),
+        ).toBe(false);
+
+        expect(
+          await fs.pathExists(
+            join(testAppDirectory, '.github', 'workflows', 'ci.yml'),
+          ),
+        ).toBe(false);
      });
    });

@@ -437,10 +489,13 @@ describe('copyBaseApplicationProject', () => {
          exampleOptions: {
            includeExampleObject: false,
            includeExampleField: false,
+            includeExampleSkill: false,
+            includeExampleAgent: false,
            includeExampleLogicFunction: false,
            includeExampleFrontComponent: true,
            includeExampleView: false,
            includeExampleNavigationMenuItem: false,
+            includeExampleIntegrationTest: false,
          },
        });

@@ -472,11 +527,14 @@ describe('copyBaseApplicationProject', () => {
          appDirectory: testAppDirectory,
          exampleOptions: {
            includeExampleObject: false,
+            includeExampleSkill: false,
+            includeExampleAgent: false,
            includeExampleField: false,
            includeExampleLogicFunction: true,
            includeExampleFrontComponent: false,
            includeExampleView: false,
            includeExampleNavigationMenuItem: false,
+            includeExampleIntegrationTest: false,
          },
        });

@@ -534,6 +592,7 @@ describe('copyBaseApplicationProject', () => {
    it('should generate unique UUIDs for example objects across apps', async () => {
      const firstAppDir = join(testAppDirectory, 'app1');
      await fs.ensureDir(firstAppDir);
+      await seedTsconfig(firstAppDir);
      await copyBaseApplicationProject({
        appName: 'app-one',
        appDisplayName: 'App One',
@@ -544,6 +603,7 @@ describe('copyBaseApplicationProject', () => {

      const secondAppDir = join(testAppDirectory, 'app2');
      await fs.ensureDir(secondAppDir);
+      await seedTsconfig(secondAppDir);
      await copyBaseApplicationProject({
        appName: 'app-two',
        appDisplayName: 'App Two',
@@ -629,15 +689,24 @@ describe('copyBaseApplicationProject', () => {

      const content = await fs.readFile(viewPath, 'utf8');

-      expect(content).toContain("import { defineView } from 'twenty-sdk'");
      expect(content).toContain(
-        "import { EXAMPLE_OBJECT_UNIVERSAL_IDENTIFIER } from 'src/objects/example-object'",
+        "import { defineView, ViewKey } from 'twenty-sdk'",
+      );
+      expect(content).toContain(
+        "import { EXAMPLE_OBJECT_UNIVERSAL_IDENTIFIER, NAME_FIELD_UNIVERSAL_IDENTIFIER } from 'src/objects/example-object'",
      );
      expect(content).toContain('export default defineView({');
      expect(content).toContain(
        'objectUniversalIdentifier: EXAMPLE_OBJECT_UNIVERSAL_IDENTIFIER',
      );
-      expect(content).toContain("name: 'example-view'");
+      expect(content).toContain("name: 'All example items'");
+      expect(content).toContain('fields: [');
+      expect(content).toContain(
+        'fieldMetadataUniversalIdentifier: NAME_FIELD_UNIVERSAL_IDENTIFIER',
+      );
+      expect(content).toContain('isVisible: true');
+      expect(content).toContain('key: ViewKey.INDEX');
+      expect(content).toContain('size: 200');
    });
  });

@@ -668,7 +737,166 @@ describe('copyBaseApplicationProject', () => {
      expect(content).toContain('export default defineNavigationMenuItem({');
      expect(content).toContain("name: 'example-navigation-menu-item'");
      expect(content).toContain("icon: 'IconList'");
+      expect(content).toContain("color: 'blue'");
      expect(content).toContain('position: 0');
    });
  });
+
+  describe('pre-install logic function', () => {
+    it('should create pre-install.ts with definePreInstallLogicFunction and typed payload', async () => {
+      await copyBaseApplicationProject({
+        appName: 'my-test-app',
+        appDisplayName: 'My Test App',
+        appDescription: 'A test application',
+        appDirectory: testAppDirectory,
+        exampleOptions: NO_EXAMPLES,
+      });
+
+      const preInstallPath = join(
+        testAppDirectory,
+        'src',
+        'logic-functions',
+        'pre-install.ts',
+      );
+
+      expect(await fs.pathExists(preInstallPath)).toBe(true);
+
+      const content = await fs.readFile(preInstallPath, 'utf8');
+
+      expect(content).toContain(
+        "import { definePreInstallLogicFunction, type InstallLogicFunctionPayload } from 'twenty-sdk'",
+      );
+      expect(content).toContain(
+        'export default definePreInstallLogicFunction({',
+      );
+      expect(content).toContain("name: 'pre-install'");
+      expect(content).toContain('timeoutSeconds: 300');
+      expect(content).toContain(
+        'const handler = async (payload: InstallLogicFunctionPayload): Promise<void>',
+      );
+      expect(content).toContain('payload.previousVersion');
+
+      // Verify it has a universalIdentifier (UUID format)
+      expect(content).toMatch(
+        /universalIdentifier: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'/,
+      );
+    });
+
+    it('should always create pre-install.ts regardless of example options', async () => {
+      await copyBaseApplicationProject({
+        appName: 'my-test-app',
+        appDisplayName: 'My Test App',
+        appDescription: 'A test application',
+        appDirectory: testAppDirectory,
+        exampleOptions: NO_EXAMPLES,
+      });
+
+      const preInstallPath = join(
+        testAppDirectory,
+        'src',
+        'logic-functions',
+        'pre-install.ts',
+      );
+
+      expect(await fs.pathExists(preInstallPath)).toBe(true);
+    });
+  });
+
+  describe('integration test', () => {
+    it('should include vitest and test scripts in package.json when enabled', async () => {
+      await copyBaseApplicationProject({
+        appName: 'my-test-app',
+        appDisplayName: 'My Test App',
+        appDescription: 'A test application',
+        appDirectory: testAppDirectory,
+        exampleOptions: ALL_EXAMPLES,
+      });
+
+      const packageJson = await fs.readJson(
+        join(testAppDirectory, 'package.json'),
+      );
+
+      expect(packageJson.scripts.test).toBe('vitest run');
+      expect(packageJson.scripts['test:watch']).toBe('vitest');
+      expect(packageJson.devDependencies.vitest).toBeDefined();
+    });
+
+    it('should not include vitest or test scripts when disabled', async () => {
+      await copyBaseApplicationProject({
+        appName: 'my-test-app',
+        appDisplayName: 'My Test App',
+        appDescription: 'A test application',
+        appDirectory: testAppDirectory,
+        exampleOptions: NO_EXAMPLES,
+      });
+
+      const packageJson = await fs.readJson(
+        join(testAppDirectory, 'package.json'),
+      );
+
+      expect(packageJson.scripts.test).toBeUndefined();
+      expect(packageJson.scripts['test:watch']).toBeUndefined();
+      expect(packageJson.devDependencies.vitest).toBeUndefined();
+    });
+  });
+
+  describe('post-install logic function', () => {
+    it('should create post-install.ts with definePostInstallLogicFunction and typed payload', async () => {
+      await copyBaseApplicationProject({
+        appName: 'my-test-app',
+        appDisplayName: 'My Test App',
+        appDescription: 'A test application',
+        appDirectory: testAppDirectory,
+        exampleOptions: NO_EXAMPLES,
+      });
+
+      const postInstallPath = join(
+        testAppDirectory,
+        'src',
+        'logic-functions',
+        'post-install.ts',
+      );
+
+      expect(await fs.pathExists(postInstallPath)).toBe(true);
+
+      const content = await fs.readFile(postInstallPath, 'utf8');
+
+      expect(content).toContain(
+        "import { definePostInstallLogicFunction, type InstallLogicFunctionPayload } from 'twenty-sdk'",
+      );
+      expect(content).toContain(
+        'export default definePostInstallLogicFunction({',
+      );
+      expect(content).toContain("name: 'post-install'");
+      expect(content).toContain('timeoutSeconds: 300');
+      expect(content).toContain(
+        'const handler = async (payload: InstallLogicFunctionPayload): Promise<void>',
+      );
+      expect(content).toContain('payload.previousVersion');
+
+      // Verify it has a universalIdentifier (UUID format)
+      expect(content).toMatch(
+        /universalIdentifier: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'/,
+      );
+    });
+
+    it('should always create post-install.ts regardless of example options', async () => {
+      await copyBaseApplicationProject({
+        appName: 'my-test-app',
+        appDisplayName: 'My Test App',
+        appDescription: 'A test application',
+        appDirectory: testAppDirectory,
+        exampleOptions: NO_EXAMPLES,
+      });
+
+      const postInstallPath = join(
+        testAppDirectory,
+        'src',
+        'logic-functions',
+        'post-install.ts',
+      );
+
+      expect(await fs.pathExists(postInstallPath)).toBe(true);
+    });
+  });
 });
@@ -0,0 +1,175 @@
+import { scaffoldIntegrationTest } from '@/utils/test-template';
+import * as fs from 'fs-extra';
+import { tmpdir } from 'os';
+import { join } from 'path';
+
+describe('scaffoldIntegrationTest', () => {
+  let testAppDirectory: string;
+  let sourceFolderPath: string;
+
+  beforeEach(async () => {
+    testAppDirectory = join(
+      tmpdir(),
+      `test-twenty-app-${Date.now()}-${Math.random().toString(36).slice(2)}`,
+    );
+    sourceFolderPath = join(testAppDirectory, 'src');
+    await fs.ensureDir(sourceFolderPath);
+
+    await fs.writeJson(join(testAppDirectory, 'tsconfig.json'), {
+      compilerOptions: {
+        paths: { 'src/*': ['./src/*'] },
+      },
+      exclude: ['node_modules', 'dist', '**/*.integration-test.ts'],
+    });
+  });
+
+  afterEach(async () => {
+    if (testAppDirectory && (await fs.pathExists(testAppDirectory))) {
+      await fs.remove(testAppDirectory);
+    }
+  });
+
+  describe('integration test file', () => {
+    it('should create app-install.integration-test.ts with correct structure', async () => {
+      await scaffoldIntegrationTest({
+        appDirectory: testAppDirectory,
+        sourceFolderPath,
+      });
+
+      const testPath = join(
+        sourceFolderPath,
+        '__tests__',
+        'app-install.integration-test.ts',
+      );
+
+      expect(await fs.pathExists(testPath)).toBe(true);
+
+      const content = await fs.readFile(testPath, 'utf8');
+
+      expect(content).toContain(
+        "import { appBuild, appUninstall } from 'twenty-sdk/cli'",
+      );
+      expect(content).toContain(
+        "import { MetadataApiClient } from 'twenty-sdk/clients'",
+      );
+      expect(content).toContain(
+        "import { APPLICATION_UNIVERSAL_IDENTIFIER } from 'src/application-config'",
+      );
+      expect(content).toContain('appBuild');
+      expect(content).toContain('appUninstall');
+      expect(content).toContain('new MetadataApiClient()');
+      expect(content).toContain('findManyApplications');
+      expect(content).toContain('APPLICATION_UNIVERSAL_IDENTIFIER');
+    });
+  });
+
+  describe('setup-test file', () => {
+    it('should create setup-test.ts with SDK config bootstrap', async () => {
+      await scaffoldIntegrationTest({
+        appDirectory: testAppDirectory,
+        sourceFolderPath,
+      });
+
+      const setupTestPath = join(
+        sourceFolderPath,
+        '__tests__',
+        'setup-test.ts',
+      );
+
+      expect(await fs.pathExists(setupTestPath)).toBe(true);
+
+      const content = await fs.readFile(setupTestPath, 'utf8');
+
+      expect(content).toContain('.twenty-sdk-test');
+      expect(content).toContain('config.json');
+      expect(content).toContain('process.env.TWENTY_API_URL');
+      expect(content).toContain('process.env.TWENTY_API_KEY');
+      expect(content).toContain('assertServerIsReachable');
+    });
+  });
+
+  describe('vitest config', () => {
+    it('should create vitest.config.ts with env vars and setup file', async () => {
+      await scaffoldIntegrationTest({
+        appDirectory: testAppDirectory,
+        sourceFolderPath,
+      });
+
+      const vitestConfigPath = join(testAppDirectory, 'vitest.config.ts');
+
+      expect(await fs.pathExists(vitestConfigPath)).toBe(true);
+
+      const content = await fs.readFile(vitestConfigPath, 'utf8');
+
+      expect(content).toContain('TWENTY_API_KEY');
+      expect(content).not.toContain('TWENTY_TEST_API_KEY');
+      expect(content).toContain('setup-test.ts');
+      expect(content).toContain('tsconfig.spec.json');
+      expect(content).toContain('integration-test.ts');
+    });
+  });
+
+  describe('github workflow', () => {
+    it('should create .github/workflows/ci.yml with correct structure', async () => {
+      await scaffoldIntegrationTest({
+        appDirectory: testAppDirectory,
+        sourceFolderPath,
+      });
+
+      const workflowPath = join(
+        testAppDirectory,
+        '.github',
+        'workflows',
+        'ci.yml',
+      );
+
+      expect(await fs.pathExists(workflowPath)).toBe(true);
+
+      const content = await fs.readFile(workflowPath, 'utf8');
+
+      expect(content).toContain('name: CI');
+      expect(content).toContain('TWENTY_VERSION: latest');
+      expect(content).toContain('twenty-version: ${{ env.TWENTY_VERSION }}');
+      expect(content).toContain('actions/checkout@v4');
+      expect(content).toContain('spawn-twenty-docker-image@main');
+      expect(content).toContain('actions/setup-node@v4');
+      expect(content).toContain('yarn install --immutable');
+      expect(content).toContain('yarn test');
+      expect(content).toContain('TWENTY_API_URL');
+      expect(content).toContain('TWENTY_TEST_API_KEY');
+    });
+  });
+
+  describe('tsconfig.spec.json', () => {
+    it('should create tsconfig.spec.json extending the base tsconfig', async () => {
+      await scaffoldIntegrationTest({
+        appDirectory: testAppDirectory,
+        sourceFolderPath,
+      });
+
+      const tsconfigSpecPath = join(testAppDirectory, 'tsconfig.spec.json');
+
+      expect(await fs.pathExists(tsconfigSpecPath)).toBe(true);
+
+      const tsconfigSpec = await fs.readJson(tsconfigSpecPath);
+
+      expect(tsconfigSpec.extends).toBe('./tsconfig.json');
+      expect(tsconfigSpec.compilerOptions.composite).toBe(true);
+      expect(tsconfigSpec.include).toContain('src/**/*.ts');
+      expect(tsconfigSpec.exclude).not.toContain('**/*.integration-test.ts');
+    });
+
+    it('should add a reference to tsconfig.spec.json in tsconfig.json', async () => {
+      await scaffoldIntegrationTest({
+        appDirectory: testAppDirectory,
+        sourceFolderPath,
+      });
+
+      const tsconfig = await fs.readJson(
+        join(testAppDirectory, 'tsconfig.json'),
+      );
+
+      expect(tsconfig.references).toEqual([{ path: './tsconfig.spec.json' }]);
+    });
+  });
+});
@@ -1,9 +1,11 @@
 import * as fs from 'fs-extra';
 import { join } from 'path';
-import { v4 } from 'uuid';
 import { ASSETS_DIR } from 'twenty-shared/application';
+import { v4 } from 'uuid';

 import { type ExampleOptions } from '@/types/scaffolding-options';
+import { scaffoldIntegrationTest } from '@/utils/test-template';
+import createTwentyAppPackageJson from 'package.json';

 const SRC_FOLDER = 'src';

@@ -22,14 +24,18 @@ export const copyBaseApplicationProject = async ({
 }) => {
  await fs.copy(join(__dirname, './constants/base-application'), appDirectory);

-  await createPackageJson({ appName, appDirectory });
+  await createPackageJson({
+    appName,
+    appDirectory,
+    includeExampleIntegrationTest: exampleOptions.includeExampleIntegrationTest,
+  });
+
+  await createYarnLock(appDirectory);

  await createGitignore(appDirectory);

  await createPublicAssetDirectory(appDirectory);

-  await createYarnLock(appDirectory);
-
  const sourceFolderPath = join(appDirectory, SRC_FOLDER);

  await fs.ensureDir(sourceFolderPath);
@@ -89,6 +95,35 @@ export const copyBaseApplicationProject = async ({
    });
  }

+  if (exampleOptions.includeExampleSkill) {
+    await createExampleSkill({
+      appDirectory: sourceFolderPath,
+      fileFolder: 'skills',
+      fileName: 'example-skill.ts',
+    });
+  }
+
+  if (exampleOptions.includeExampleAgent) {
+    await createExampleAgent({
+      appDirectory: sourceFolderPath,
+      fileFolder: 'agents',
+      fileName: 'example-agent.ts',
+    });
+  }
+
+  if (exampleOptions.includeExampleIntegrationTest) {
+    await scaffoldIntegrationTest({
+      appDirectory,
+      sourceFolderPath,
+    });
+  }
+
+  await createDefaultPreInstallFunction({
+    appDirectory: sourceFolderPath,
+    fileFolder: 'logic-functions',
+    fileName: 'pre-install.ts',
+  });
+
  await createDefaultPostInstallFunction({
    appDirectory: sourceFolderPath,
    fileFolder: 'logic-functions',
@@ -107,13 +142,6 @@ const createPublicAssetDirectory = async (appDirectory: string) => {
  await fs.ensureDir(join(appDirectory, ASSETS_DIR));
 };

-const createYarnLock = async (appDirectory: string) => {
-  const yarnLockContent = `# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-`;
-
-  await fs.writeFile(join(appDirectory, 'yarn.lock'), yarnLockContent);
-};
 const createGitignore = async (appDirectory: string) => {
  const gitignoreContent = `# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

@@ -132,8 +160,7 @@ generated
 # dev
 /dist/

-.twenty/*
-!.twenty/output/
+.twenty

 # production
 /build
@@ -153,6 +180,7 @@ yarn-error.log*

 # typescript
 *.tsbuildinfo
+*.d.ts
 `;

  await fs.writeFile(join(appDirectory, '.gitignore'), gitignoreContent);
@@ -260,6 +288,36 @@ export default defineLogicFunction({
  await fs.writeFile(join(appDirectory, fileFolder ?? '', fileName), content);
 };

+const createDefaultPreInstallFunction = async ({
+  appDirectory,
+  fileFolder,
+  fileName,
+}: {
+  appDirectory: string;
+  fileFolder?: string;
+  fileName: string;
+}) => {
+  const universalIdentifier = v4();
+
+  const content = `import { definePreInstallLogicFunction, type InstallLogicFunctionPayload } from 'twenty-sdk';
+
+const handler = async (payload: InstallLogicFunctionPayload): Promise<void> => {
+  console.log('Pre install logic function executed successfully!', payload.previousVersion);
+};
+
+export default definePreInstallLogicFunction({
+  universalIdentifier: '${universalIdentifier}',
+  name: 'pre-install',
+  description: 'Runs before installation to prepare the application.',
+  timeoutSeconds: 300,
+  handler,
+});
+`;
+
+  await fs.ensureDir(join(appDirectory, fileFolder ?? ''));
+  await fs.writeFile(join(appDirectory, fileFolder ?? '', fileName), content);
+};
+
 const createDefaultPostInstallFunction = async ({
  appDirectory,
  fileFolder,
@@ -271,16 +329,14 @@ const createDefaultPostInstallFunction = async ({
 }) => {
  const universalIdentifier = v4();

-  const content = `import { defineLogicFunction } from 'twenty-sdk';
+  const content = `import { definePostInstallLogicFunction, type InstallLogicFunctionPayload } from 'twenty-sdk';

-export const POST_INSTALL_UNIVERSAL_IDENTIFIER = '${universalIdentifier}';
-
-const handler = async (): Promise<void> => {
-  console.log('Post install logic function executed successfully!');
+const handler = async (payload: InstallLogicFunctionPayload): Promise<void> => {
+  console.log('Post install logic function executed successfully!', payload.previousVersion);
 };

-export default defineLogicFunction({
-  universalIdentifier: POST_INSTALL_UNIVERSAL_IDENTIFIER,
+export default definePostInstallLogicFunction({
+  universalIdentifier: '${universalIdentifier}',
  name: 'post-install',
  description: 'Runs after installation to set up the application.',
  timeoutSeconds: 300,
@@ -376,16 +432,29 @@ const createExampleView = async ({
  fileName: string;
 }) => {
  const universalIdentifier = v4();
+  const viewFieldUniversalIdentifier = v4();

-  const content = `import { defineView } from 'twenty-sdk';
-import { EXAMPLE_OBJECT_UNIVERSAL_IDENTIFIER } from 'src/objects/example-object';
+  const content = `import { defineView, ViewKey } from 'twenty-sdk';
+import { EXAMPLE_OBJECT_UNIVERSAL_IDENTIFIER, NAME_FIELD_UNIVERSAL_IDENTIFIER } from 'src/objects/example-object';
+
+export const EXAMPLE_VIEW_UNIVERSAL_IDENTIFIER = '${universalIdentifier}';

 export default defineView({
-  universalIdentifier: '${universalIdentifier}',
-  name: 'example-view',
+  universalIdentifier: EXAMPLE_VIEW_UNIVERSAL_IDENTIFIER,
+  name: 'All example items',
  objectUniversalIdentifier: EXAMPLE_OBJECT_UNIVERSAL_IDENTIFIER,
  icon: 'IconList',
+  key: ViewKey.INDEX,
  position: 0,
+  fields: [
+    {
+      universalIdentifier: '${viewFieldUniversalIdentifier}',
+      fieldMetadataUniversalIdentifier: NAME_FIELD_UNIVERSAL_IDENTIFIER,
+      position: 0,
+      isVisible: true,
+      size: 200,
+    },
+  ],
 });
 `;

@@ -405,18 +474,76 @@ const createExampleNavigationMenuItem = async ({
  const universalIdentifier = v4();

  const content = `import { defineNavigationMenuItem } from 'twenty-sdk';
+import { EXAMPLE_VIEW_UNIVERSAL_IDENTIFIER } from 'src/views/example-view';

 export default defineNavigationMenuItem({
  universalIdentifier: '${universalIdentifier}',
  name: 'example-navigation-menu-item',
  icon: 'IconList',
+  color: 'blue',
  position: 0,
-  // Link to a view:
-  // viewUniversalIdentifier: '...',
-  // Or link to an object:
-  // targetObjectUniversalIdentifier: '...',
-  // Or link to an external URL:
-  // link: 'https://example.com',
+  type: 'VIEW',
+  viewUniversalIdentifier: EXAMPLE_VIEW_UNIVERSAL_IDENTIFIER,
+});
+`;
+
+  await fs.ensureDir(join(appDirectory, fileFolder ?? ''));
+  await fs.writeFile(join(appDirectory, fileFolder ?? '', fileName), content);
+};
+
+const createExampleSkill = async ({
+  appDirectory,
+  fileFolder,
+  fileName,
+}: {
+  appDirectory: string;
+  fileFolder?: string;
+  fileName: string;
+}) => {
+  const universalIdentifier = v4();
+
+  const content = `import { defineSkill } from 'twenty-sdk';
+
+export const EXAMPLE_SKILL_UNIVERSAL_IDENTIFIER =
+  '${universalIdentifier}';
+
+export default defineSkill({
+  universalIdentifier: EXAMPLE_SKILL_UNIVERSAL_IDENTIFIER,
+  name: 'example-skill',
+  label: 'Example Skill',
+  description: 'A sample skill for your application',
+  icon: 'IconBrain',
+  content: 'Add your skill instructions here. Skills provide context and capabilities to AI agents.',
+});
+`;
+
+  await fs.ensureDir(join(appDirectory, fileFolder ?? ''));
+  await fs.writeFile(join(appDirectory, fileFolder ?? '', fileName), content);
+};
+
+const createExampleAgent = async ({
+  appDirectory,
+  fileFolder,
+  fileName,
+}: {
+  appDirectory: string;
+  fileFolder?: string;
+  fileName: string;
+}) => {
+  const universalIdentifier = v4();
+
+  const content = `import { defineAgent } from 'twenty-sdk';
+
+export const EXAMPLE_AGENT_UNIVERSAL_IDENTIFIER =
+  '${universalIdentifier}';
+
+export default defineAgent({
+  universalIdentifier: EXAMPLE_AGENT_UNIVERSAL_IDENTIFIER,
+  name: 'example-agent',
+  label: 'Example Agent',
+  description: 'A sample AI agent for your application',
+  icon: 'IconRobot',
+  prompt: 'You are a helpful assistant. Help users with their questions and tasks.',
 });
 `;

@@ -437,16 +564,19 @@ const createApplicationConfig = async ({
  fileFolder?: string;
  fileName: string;
 }) => {
+  const universalIdentifier = v4();
+
  const content = `import { defineApplication } from 'twenty-sdk';
 import { DEFAULT_ROLE_UNIVERSAL_IDENTIFIER } from 'src/roles/default-role';
-import { POST_INSTALL_UNIVERSAL_IDENTIFIER } from 'src/logic-functions/post-install';
+
+export const APPLICATION_UNIVERSAL_IDENTIFIER =
+  '${universalIdentifier}';

 export default defineApplication({
-  universalIdentifier: '${v4()}',
+  universalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,
  displayName: '${displayName}',
  description: '${description ?? ''}',
  defaultRoleUniversalIdentifier: DEFAULT_ROLE_UNIVERSAL_IDENTIFIER,
-  postInstallLogicFunctionUniversalIdentifier: POST_INSTALL_UNIVERSAL_IDENTIFIER,
 });
 `;

@@ -454,13 +584,46 @@ export default defineApplication({
  await fs.writeFile(join(appDirectory, fileFolder ?? '', fileName), content);
 };

+const createYarnLock = async (appDirectory: string) => {
+  const yarnLockContent = `# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+`;
+
+  await fs.writeFile(join(appDirectory, 'yarn.lock'), yarnLockContent);
+};
+
 const createPackageJson = async ({
  appName,
  appDirectory,
+  includeExampleIntegrationTest,
 }: {
  appName: string;
  appDirectory: string;
+  includeExampleIntegrationTest: boolean;
 }) => {
+  const scripts: Record<string, string> = {
+    twenty: 'twenty',
+    lint: 'oxlint -c .oxlintrc.json .',
+    'lint:fix': 'oxlint --fix -c .oxlintrc.json .',
+  };
+
+  const devDependencies: Record<string, string> = {
+    typescript: '^5.9.3',
+    '@types/node': '^24.7.2',
+    '@types/react': '^19.0.0',
+    react: '^19.0.0',
+    'react-dom': '^19.0.0',
+    oxlint: '^0.16.0',
+    'twenty-sdk': createTwentyAppPackageJson.version,
+  };
+
+  if (includeExampleIntegrationTest) {
+    scripts.test = 'vitest run';
+    scripts['test:watch'] = 'vitest';
+    devDependencies.vitest = '^3.1.1';
+    devDependencies['vite-tsconfig-paths'] = '^4.2.1';
+  }
+
  const packageJson = {
    name: appName,
    version: '0.1.0',
@@ -471,22 +634,8 @@ const createPackageJson = async ({
      yarn: '>=4.0.2',
    },
    packageManager: 'yarn@4.9.2',
-    scripts: {
-      twenty: 'twenty',
-      lint: 'eslint',
-      'lint:fix': 'eslint --fix',
-    },
-    dependencies: {
-      'twenty-sdk': 'latest',
-    },
-    devDependencies: {
-      typescript: '^5.9.3',
-      '@types/node': '^24.7.2',
-      '@types/react': '^18.2.0',
-      react: '^18.2.0',
-      eslint: '^9.32.0',
-      'typescript-eslint': '^8.50.0',
-    },
+    scripts,
+    devDependencies,
  };

  await fs.writeFile(
@@ -6,7 +6,13 @@ const execPromise = promisify(exec);

 export const install = async (root: string) => {
  try {
-    await execPromise('yarn', { cwd: root });
+    await execPromise('corepack enable', { cwd: root });
+  } catch (error: any) {
+    console.warn(chalk.yellow('corepack enabled failed:'), error.stderr);
+  }
+
+  try {
+    await execPromise('yarn install', { cwd: root });
  } catch (error: any) {
    console.error(chalk.red('yarn install failed:'), error.stdout);
  }
@@ -0,0 +1,101 @@
+import chalk from 'chalk';
+import { execSync } from 'node:child_process';
+import { platform } from 'node:os';
+
+const DEFAULT_PORT = 2020;
+
+// Minimal health check — the full implementation lives in twenty-sdk
+const isServerReady = async (port: number): Promise<boolean> => {
+  const controller = new AbortController();
+  const timeoutId = setTimeout(() => controller.abort(), 3000);
+
+  try {
+    const response = await fetch(`http://localhost:${port}/healthz`, {
+      signal: controller.signal,
+    });
+
+    const body = await response.json();
+
+    return body.status === 'ok';
+  } catch {
+    return false;
+  } finally {
+    clearTimeout(timeoutId);
+  }
+};
+
+export type LocalInstanceResult = {
+  running: boolean;
+  serverUrl?: string;
+};
+
+export const setupLocalInstance = async (
+  appDirectory: string,
+): Promise<LocalInstanceResult> => {
+  console.log('');
+  console.log(chalk.blue('Setting up local Twenty instance...'));
+
+  if (await isServerReady(DEFAULT_PORT)) {
+    const serverUrl = `http://localhost:${DEFAULT_PORT}`;
+
+    console.log(chalk.green(`Twenty server detected on ${serverUrl}.`));
+
+    return { running: true, serverUrl };
+  }
+
+  // Delegate to `twenty server start` from the scaffolded app
+  console.log(chalk.gray('Starting local Twenty server...'));
+
+  try {
+    execSync('yarn twenty server start', {
+      cwd: appDirectory,
+      stdio: 'inherit',
+    });
+  } catch {
+    console.log(
+      chalk.yellow(
+        'Failed to start Twenty server. Run `yarn twenty server start` manually.',
+      ),
+    );
+
+    return { running: false };
+  }
+
+  console.log(chalk.gray('Waiting for Twenty to be ready...'));
+
+  const startTime = Date.now();
+  const timeoutMs = 180 * 1000;
+
+  while (Date.now() - startTime < timeoutMs) {
+    if (await isServerReady(DEFAULT_PORT)) {
+      const serverUrl = `http://localhost:${DEFAULT_PORT}`;
+
+      console.log(chalk.green(`Twenty server is running on ${serverUrl}.`));
+      console.log(
+        chalk.gray(
+          'Workspace ready — login with tim@apple.dev / tim@apple.dev',
+        ),
+      );
+
+      const openCommand = platform() === 'darwin' ? 'open' : 'xdg-open';
+
+      try {
+        execSync(`${openCommand} ${serverUrl}`, { stdio: 'ignore' });
+      } catch {
+        // Ignore if browser can't be opened
+      }
+
+      return { running: true, serverUrl };
+    }
+
+    await new Promise((resolve) => setTimeout(resolve, 2000));
+  }
+
+  console.log(
+    chalk.yellow(
+      'Twenty server did not become healthy in time. Check: yarn twenty server logs',
+    ),
+  );
+
+  return { running: false };
+};
@@ -0,0 +1,267 @@
+import * as fs from 'fs-extra';
+import { join } from 'path';
+
+const SEED_API_KEY =
+  'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIyMDIwMjAyMC1lNmI1LTQ2ODAtOGEzMi1iODIwOTczNzE1NmIiLCJ1c2VySWQiOiIyMDIwMjAyMC1lNmI1LTQ2ODAtOGEzMi1iODIwOTczNzE1NmIiLCJ3b3Jrc3BhY2VJZCI6IjIwMjAyMDIwLTFjMjUtNGQwMi1iZjI1LTZhZWNjZjdlYTQxOSIsIndvcmtzcGFjZU1lbWJlcklkIjoiMjAyMDIwMjAtNDYzZi00MzViLTgyOGMtMTA3ZTAwN2EyNzExIiwidXNlcldvcmtzcGFjZUlkIjoiMjAyMDIwMjAtMWU3Yy00M2Q5LWE1ZGItNjg1YjUwNjlkODE2IiwidHlwZSI6IkFDQ0VTUyIsImF1dGhQcm92aWRlciI6InBhc3N3b3JkIiwiaWF0IjoxNzUxMjgxNzA0LCJleHAiOjIwNjY4NTc3MDR9.HMGqCsVlOAPVUBhKSGlD1X86VoHKt4LIUtET3CGIdik';
+
+export const scaffoldIntegrationTest = async ({
+  appDirectory,
+  sourceFolderPath,
+}: {
+  appDirectory: string;
+  sourceFolderPath: string;
+}) => {
+  await createIntegrationTest({
+    appDirectory: sourceFolderPath,
+    fileFolder: '__tests__',
+    fileName: 'app-install.integration-test.ts',
+  });
+
+  await createSetupTest({
+    appDirectory: sourceFolderPath,
+    fileFolder: '__tests__',
+    fileName: 'setup-test.ts',
+  });
+
+  await createVitestConfig(appDirectory);
+  await createTsconfigSpec(appDirectory);
+  await createGithubWorkflow(appDirectory);
+};
+
+const createVitestConfig = async (appDirectory: string) => {
+  const content = `import tsconfigPaths from 'vite-tsconfig-paths';
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({
+  plugins: [
+    tsconfigPaths({
+      projects: ['tsconfig.spec.json'],
+      ignoreConfigErrors: true,
+    }),
+  ],
+  test: {
+    testTimeout: 120_000,
+    hookTimeout: 120_000,
+    include: ['src/**/*.integration-test.ts'],
+    setupFiles: ['src/__tests__/setup-test.ts'],
+    env: {
+      TWENTY_API_KEY:
+        '${SEED_API_KEY}',
+    },
+  },
+});
+`;
+
+  await fs.writeFile(join(appDirectory, 'vitest.config.ts'), content);
+};
+
+const createTsconfigSpec = async (appDirectory: string) => {
+  const tsconfigSpec = {
+    extends: './tsconfig.json',
+    compilerOptions: {
+      composite: true,
+      types: ['vitest/globals'],
+    },
+    include: ['src/**/*.ts', 'src/**/*.tsx'],
+    exclude: ['node_modules', 'dist'],
+  };
+
+  await fs.writeFile(
+    join(appDirectory, 'tsconfig.spec.json'),
+    JSON.stringify(tsconfigSpec, null, 2),
+  );
+
+  const tsconfigPath = join(appDirectory, 'tsconfig.json');
+  const tsconfig = await fs.readJson(tsconfigPath);
+
+  tsconfig.references = [{ path: './tsconfig.spec.json' }];
+
+  await fs.writeFile(tsconfigPath, JSON.stringify(tsconfig, null, 2));
+};
+
+const createSetupTest = async ({
+  appDirectory,
+  fileFolder,
+  fileName,
+}: {
+  appDirectory: string;
+  fileFolder?: string;
+  fileName: string;
+}) => {
+  const content = `import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { beforeAll } from 'vitest';
+
+const TWENTY_API_URL = process.env.TWENTY_API_URL ?? 'http://localhost:2020';
+const TEST_CONFIG_DIR = path.join(os.tmpdir(), '.twenty-sdk-test');
+
+const assertServerIsReachable = async () => {
+  let response: Response;
+
+  try {
+    response = await fetch(\`\${TWENTY_API_URL}/healthz\`);
+  } catch {
+    throw new Error(
+      \`Twenty server is not reachable at \${TWENTY_API_URL}. \` +
+        'Make sure the server is running before executing integration tests.',
+    );
+  }
+
+  if (!response.ok) {
+    throw new Error(\`Server at \${TWENTY_API_URL} returned \${response.status}\`);
+  }
+};
+
+beforeAll(async () => {
+  await assertServerIsReachable();
+
+  fs.mkdirSync(TEST_CONFIG_DIR, { recursive: true });
+
+  const configFile = {
+    remotes: {
+      local: {
+        apiUrl: process.env.TWENTY_API_URL,
+        apiKey: process.env.TWENTY_API_KEY,
+      },
+    },
+    defaultRemote: 'local',
+  };
+
+  fs.writeFileSync(
+    path.join(TEST_CONFIG_DIR, 'config.json'),
+    JSON.stringify(configFile, null, 2),
+  );
+});
+`;
+
+  await fs.ensureDir(join(appDirectory, fileFolder ?? ''));
+  await fs.writeFile(join(appDirectory, fileFolder ?? '', fileName), content);
+};
+
+const createIntegrationTest = async ({
+  appDirectory,
+  fileFolder,
+  fileName,
+}: {
+  appDirectory: string;
+  fileFolder?: string;
+  fileName: string;
+}) => {
+  const content = `import { APPLICATION_UNIVERSAL_IDENTIFIER } from 'src/application-config';
+import { appBuild, appUninstall } from 'twenty-sdk/cli';
+import { MetadataApiClient } from 'twenty-sdk/clients';
+import { afterAll, beforeAll, describe, expect, it } from 'vitest';
+
+const APP_PATH = process.cwd();
+
+describe('App installation', () => {
+  let appInstalled = false;
+
+  beforeAll(async () => {
+    const buildResult = await appBuild({
+      appPath: APP_PATH,
+      onProgress: (message: string) => console.log(\`[build] \${message}\`),
+    });
+
+    if (!buildResult.success) {
+      throw new Error(
+        \`Build failed: \${buildResult.error?.message ?? 'Unknown error'}\`,
+      );
+    }
+
+    appInstalled = true;
+  });
+
+  afterAll(async () => {
+    if (!appInstalled) {
+      return;
+    }
+
+    const uninstallResult = await appUninstall({ appPath: APP_PATH });
+
+    if (!uninstallResult.success) {
+      console.warn(
+        \`App uninstall failed: \${uninstallResult.error?.message ?? 'Unknown error'}\`,
+      );
+    }
+  });
+
+  it('should find the installed app in the applications list', async () => {
+    const metadataClient = new MetadataApiClient();
+
+    const result = await metadataClient.query({
+      findManyApplications: {
+        id: true,
+        name: true,
+        universalIdentifier: true,
+      },
+    });
+
+    const installedApp = result.findManyApplications.find(
+      (application: { universalIdentifier: string }) =>
+        application.universalIdentifier ===
+        APPLICATION_UNIVERSAL_IDENTIFIER,
+    );
+
+    expect(installedApp).toBeDefined();
+  });
+});
+`;
+
+  await fs.ensureDir(join(appDirectory, fileFolder ?? ''));
+  await fs.writeFile(join(appDirectory, fileFolder ?? '', fileName), content);
+};
+
+const DEFAULT_TWENTY_VERSION = 'latest';
+
+const createGithubWorkflow = async (appDirectory: string) => {
+  const content = `name: CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request: {}
+
+env:
+  TWENTY_VERSION: ${DEFAULT_TWENTY_VERSION}
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Spawn Twenty instance
+        id: twenty
+        uses: twentyhq/twenty/.github/actions/spawn-twenty-docker-image@main
+        with:
+          twenty-version: \${{ env.TWENTY_VERSION }}
+          github-token: \${{ secrets.GITHUB_TOKEN }}
+
+      - name: Enable Corepack
+        run: corepack enable
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'yarn'
+
+      - name: Install dependencies
+        run: yarn install --immutable
+
+      - name: Run integration tests
+        run: yarn test
+        env:
+          TWENTY_API_URL: \${{ steps.twenty.outputs.server-url }}
+          TWENTY_TEST_API_KEY: \${{ steps.twenty.outputs.access-token }}
+`;
+
+  const workflowDir = join(appDirectory, '.github', 'workflows');
+
+  await fs.ensureDir(workflowDir);
+  await fs.writeFile(join(workflowDir, 'ci.yml'), content);
+};
@@ -11,7 +11,8 @@
    "noEmit": true,
    "types": ["jest", "node"],
    "paths": {
-      "@/*": ["./src/*"]
+      "@/*": ["./src/*"],
+      "package.json": ["./package.json"]
    },
    "jsx": "react"
  },
@@ -22,5 +23,6 @@
    "**/__mocks__/**/*",
    "vite.config.ts",
    "jest.config.mjs"
-  ]
+  ],
+  "exclude": ["src/constants/base-application/vitest.config.ts"]
 }
@@ -1,2 +1,3 @@
 generated
+.twenty

@@ -30,7 +30,7 @@ type AnalysisResult = {
  commitments: Commitment[];
 };

-type RichTextV2Data = {
+type RichTextData = {
  markdown: string;
  blocknote: null;
 };
@@ -123,7 +123,7 @@ const createNoteInTwenty = async (
    bodyV2: {
      markdown: noteBodyMarkdown,
      blocknote: null,
-    } satisfies RichTextV2Data,
+    } satisfies RichTextData,
  };

  try {
@@ -159,7 +159,7 @@ const createTaskInTwenty = async (

  const taskData: {
    title: string;
-    bodyV2: RichTextV2Data;
+    bodyV2: RichTextData;
    dueAt?: string;
  } = {
    title: actionItem.title,
@@ -0,0 +1,38 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.*
+.yarn
+
+# codegen
+generated
+
+# testing
+/coverage
+
+# dev
+/dist/
+
+.twenty/*
+!.twenty/output/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.pnpm-debug.log*
+
+# env files (can opt-in for committing if needed)
+.env*
+
+# typescript
+*.tsbuildinfo
@@ -0,0 +1 @@
+24.5.0
@@ -0,0 +1,38 @@
+{
+  "$schema": "./node_modules/oxlint/configuration_schema.json",
+  "plugins": ["typescript", "import", "unicorn"],
+  "categories": {
+    "correctness": "off"
+  },
+  "ignorePatterns": ["node_modules"],
+  "rules": {
+    "func-style": ["error", "declaration", { "allowArrowFunctions": true }],
+    "no-console": ["warn", { "allow": ["group", "groupCollapsed", "groupEnd"] }],
+    "no-control-regex": "off",
+    "no-debugger": "error",
+    "no-duplicate-imports": "error",
+    "no-undef": "off",
+    "no-unused-vars": "off",
+    "no-redeclare": "off",
+    "import/no-duplicates": "error",
+    "typescript/no-redeclare": "error",
+    "typescript/ban-ts-comment": "error",
+    "typescript/consistent-type-imports": ["error", {
+      "prefer": "type-imports",
+      "fixStyle": "inline-type-imports"
+    }],
+    "typescript/explicit-function-return-type": "off",
+    "typescript/explicit-module-boundary-types": "off",
+    "typescript/no-empty-object-type": ["error", {
+      "allowInterfaces": "with-single-extends"
+    }],
+    "typescript/no-empty-function": "off",
+    "typescript/no-explicit-any": "off",
+    "typescript/no-unused-vars": ["warn", {
+      "vars": "all",
+      "varsIgnorePattern": "^_",
+      "args": "after-used",
+      "argsIgnorePattern": "^_"
+    }]
+  }
+}
@@ -0,0 +1 @@
+nodeLinker: node-modules
@@ -0,0 +1,13 @@
+## Base documentation
+
+- Documentation: https://docs.twenty.com/developers/extend/capabilities/apps
+- Rich app example: https://github.com/twentyhq/twenty/tree/main/packages/twenty-sdk/src/app-seeds/rich-app
+
+## UUID requirement
+- All generated UUIDs must be valid UUID v4.
+
+## Common Pitfalls
+
+- Creating an object without an index view associated. Unless this is a technical object, user will need to visualize it.
+- Creating a view without a navigationMenuItem associated. This will make the view available on the left sidebar.
+- Creating a front-end component that has a scroll instead of being responsive to its fixed widget height and width, unless it is specifically meant to be used in a canvas tab.
@@ -0,0 +1,51 @@
+This is a [Twenty](https://twenty.com) application project bootstrapped with [`create-twenty-app`](https://www.npmjs.com/package/create-twenty-app).
+
+## Getting Started
+
+First, authenticate to your workspace:
+
+```bash
+yarn twenty remote add --local
+```
+
+Then, start development mode to sync your app and watch for changes:
+
+```bash
+yarn twenty dev
+```
+
+Open your Twenty instance and go to `/settings/applications` section to see the result.
+
+## Available Commands
+
+Run `yarn twenty help` to list all available commands. Common commands:
+
+```bash
+# Remotes & Authentication
+yarn twenty remote add --local     # Authenticate with Twenty
+yarn twenty remote status         # Check auth status
+yarn twenty remote switch         # Switch default remote
+yarn twenty remote list           # List all configured remotes
+yarn twenty remote remove <name>  # Remove a remote
+
+# Application
+yarn twenty dev        # Start dev mode (watch, build, sync, and auto-generate typed client)
+yarn twenty add     # Add a new entity (object, field, function, front-component, role, view, navigation-menu-item)
+yarn twenty logs  # Stream function logs
+yarn twenty exec  # Execute a function with JSON payload
+yarn twenty uninstall  # Uninstall app from workspace
+```
+
+## LLMs instructions
+
+Main docs and pitfalls are available in LLMS.md file.
+
+## Learn More
+
+To learn more about Twenty applications, take a look at the following resources:
+
+- [twenty-sdk](https://www.npmjs.com/package/twenty-sdk) - learn about `twenty-sdk` tool.
+- [Twenty doc](https://docs.twenty.com/) - Twenty's documentation.
+- Join our [Discord](https://discord.gg/cx5n4Jzs57)
+
+You can check out [the Twenty GitHub repository](https://github.com/twentyhq/twenty) - your feedback and contributions are welcome!
@@ -0,0 +1,26 @@
+{
+  "name": "apollo-enrich",
+  "version": "0.1.0",
+  "license": "MIT",
+  "engines": {
+    "node": "^24.5.0",
+    "npm": "please-use-yarn",
+    "yarn": ">=4.0.2"
+  },
+  "packageManager": "yarn@4.9.2",
+  "scripts": {
+    "twenty": "twenty",
+    "lint": "oxlint -c .oxlintrc.json .",
+    "lint:fix": "oxlint --fix -c .oxlintrc.json ."
+  },
+  "dependencies": {
+    "twenty-sdk": "latest"
+  },
+  "devDependencies": {
+    "@types/node": "^24.7.2",
+    "@types/react": "^18.2.0",
+    "oxlint": "^0.16.0",
+    "react": "^18.2.0",
+    "typescript": "^5.9.3"
+  }
+}
@@ -0,0 +1,54 @@
+import { DEFAULT_ROLE_UNIVERSAL_IDENTIFIER } from 'src/roles/default-role';
+import { defineApplication } from 'twenty-sdk';
+
+export default defineApplication({
+  universalIdentifier: 'ac1d2ed1-8835-4bd4-9043-28b46fdda465',
+  displayName: 'Apollo enrichment',
+  description: 'Data enrichment with Apollo to keep your data accurate',
+  defaultRoleUniversalIdentifier: DEFAULT_ROLE_UNIVERSAL_IDENTIFIER,
+  settingsCustomTabFrontComponentUniversalIdentifier: '50d59f7c-eada-4731-aacd-8e45371e1040',
+  applicationVariables: {
+    APOLLO_CLIENT_ID: {
+      universalIdentifier: '5852219e-7757-463e-9e7c-80980203794c',
+      isSecret: true,
+      value: '',
+      description: 'Apollo Client ID',
+    },
+    APOLLO_CLIENT_SECRET: {
+      universalIdentifier: 'a032349d-9458-4381-8505-82547276434a',
+      isSecret: true,
+      value: '',
+      description: 'Apollo Client Secret',
+    },
+    APOLLO_OAUTH_URL: {
+      universalIdentifier: '1d42411c-5809-4093-873a-8121b1302475',
+      isSecret: false,
+      value: '',
+      description: 'Apollo OAuth URL',
+    },
+    APOLLO_REDIRECT_URI: {
+      universalIdentifier: 'c8d9e0f1-2a3b-4c5d-6e7f-8a9b0c1d2e3f',
+      isSecret: false,
+      value: '',
+      description: 'Apollo OAuth redirect URI',
+    },
+    APOLLO_REGISTERED_URL: {
+      universalIdentifier: '672a6fce-5565-43bc-9a3b-7f2c33620770',
+      isSecret: false,
+      value: '',
+      description: 'Apollo registered URL',
+    },
+    APOLLO_ACCESS_TOKEN: {
+      universalIdentifier: '672a6fce-5565-43bc-9a3b-7f2c33620771',
+      isSecret: true,
+      value: '',
+      description: 'Apollo access token',
+    },
+    APOLLO_REFRESH_TOKEN: {
+      universalIdentifier: '672a6fce-5565-43bc-9a3b-7f2c33620772',
+      isSecret: true,
+      value: '',
+      description: 'Apollo refresh token',
+    },
+  },
+});
@@ -0,0 +1,16 @@
+import {
+  defineField,
+  FieldType,
+  STANDARD_OBJECT_UNIVERSAL_IDENTIFIERS,
+} from 'twenty-sdk';
+
+export default defineField({
+  universalIdentifier: 'da15cfc6-3657-457d-8757-4ba11b5bb6e1',
+  objectUniversalIdentifier:
+    STANDARD_OBJECT_UNIVERSAL_IDENTIFIERS.company.universalIdentifier,
+  type: FieldType.NUMBER,
+  name: 'apolloFoundedYear',
+  label: 'Founded Year',
+  description: 'Year the company was founded, from Apollo enrichment',
+  icon: 'IconCalendar',
+});
@@ -0,0 +1,16 @@
+import {
+  defineField,
+  FieldType,
+  STANDARD_OBJECT_UNIVERSAL_IDENTIFIERS,
+} from 'twenty-sdk';
+
+export default defineField({
+  universalIdentifier: '505532f5-1fc5-4a58-8074-ba9b48650dbc',
+  objectUniversalIdentifier:
+    STANDARD_OBJECT_UNIVERSAL_IDENTIFIERS.company.universalIdentifier,
+  type: FieldType.TEXT,
+  name: 'apolloIndustry',
+  label: 'Apollo Industry',
+  description: 'Industry classification from Apollo enrichment',
+  icon: 'IconBuildingFactory',
+});
@@ -0,0 +1,16 @@
+import {
+  defineField,
+  FieldType,
+  STANDARD_OBJECT_UNIVERSAL_IDENTIFIERS,
+} from 'twenty-sdk';
+
+export default defineField({
+  universalIdentifier: 'be15e062-b065-48b4-979c-65b9a50e0cb1',
+  objectUniversalIdentifier:
+    STANDARD_OBJECT_UNIVERSAL_IDENTIFIERS.company.universalIdentifier,
+  type: FieldType.TEXT,
+  name: 'apolloShortDescription',
+  label: 'Apollo Description',
+  description: 'Short company description from Apollo enrichment',
+  icon: 'IconFileDescription',
+});
@@ -0,0 +1,16 @@
+import {
+  defineField,
+  FieldType,
+  STANDARD_OBJECT_UNIVERSAL_IDENTIFIERS,
+} from 'twenty-sdk';
+
+export default defineField({
+  universalIdentifier: 'c90ae72d-4ddf-4f22-882f-eef98c91e40e',
+  objectUniversalIdentifier:
+    STANDARD_OBJECT_UNIVERSAL_IDENTIFIERS.company.universalIdentifier,
+  type: FieldType.CURRENCY,
+  name: 'apolloTotalFunding',
+  label: 'Total Funding',
+  description: 'Total funding raised by the company, from Apollo enrichment',
+  icon: 'IconCash',
+});
@@ -0,0 +1,220 @@
+import styled from '@emotion/styled';
+import { useEffect, useState } from 'react';
+import { OAuthApplicationVariables } from 'src/logic-functions/get-oauth-application-variables';
+import { VERIFY_PAGE_PATH } from 'src/logic-functions/get-verify-page';
+import { defineFrontComponent } from 'twenty-sdk';
+
+const StyledContainer = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  width: 100%;
+`;
+
+const StyledSectionTitle = styled.h3`
+  color: #333;
+  font-family: 'Inter', sans-serif;
+  font-size: 15px;
+  font-weight: 600;
+  margin: 0 0 4px 0;
+`;
+
+const StyledSectionSubtitle = styled.p`
+  color: #818181;
+  font-family: 'Inter', sans-serif;
+  font-size: 13px;
+  font-weight: 400;
+  margin: 0 0 12px 0;
+`;
+
+const StyledCard = styled.div`
+  align-items: center;
+  background: #fff;
+  border: 1px solid #ebebeb;
+  border-radius: 8px;
+  display: flex;
+  gap: 12px;
+  padding: 16px;
+`;
+
+const StyledIconContainer = styled.div`
+  align-items: center;
+  background: #f5f5f5;
+  border-radius: 8px;
+  color: #666;
+  display: flex;
+  flex-shrink: 0;
+  height: 40px;
+  justify-content: center;
+  width: 40px;
+`;
+
+const StyledTextContainer = styled.div`
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  gap: 2px;
+  min-width: 0;
+`;
+
+const StyledTitle = styled.span`
+  color: #333;
+  font-family: 'Inter', sans-serif;
+  font-size: 14px;
+  font-weight: 500;
+`;
+
+const StyledDescription = styled.span`
+  color: #818181;
+  font-family: 'Inter', sans-serif;
+  font-size: 13px;
+`;
+
+const StyledLink = styled.a`
+  align-items: center;
+  background: #5e5adb;
+  border: 1px solid rgba(0, 0, 0, 0.04);
+  border-radius: 4px;
+  box-sizing: border-box;
+  color: #fafafa;
+  cursor: pointer;
+  display: inline-flex;
+  flex-shrink: 0;
+  font-family: 'Inter', sans-serif;
+  font-size: 13px;
+  font-weight: 500;
+  gap: 4px;
+  height: 32px;
+  justify-content: center;
+  padding: 0 12px;
+  text-decoration: none;
+  transition: background 0.1s ease;
+  white-space: nowrap;
+
+  &:hover {
+    background: #4b47b8;
+  }
+
+  &:active {
+    background: #3c3996;
+  }
+
+  &:focus {
+    outline: none;
+  }
+`;
+
+const StyledConnectedStatus = styled.span`
+  align-items: center;
+  background: #10b981;
+  border-radius: 4px;
+  color: #fff;
+  display: inline-flex;
+  flex-shrink: 0;
+  font-family: 'Inter', sans-serif;
+  font-size: 13px;
+  font-weight: 500;
+  gap: 6px;
+  height: 32px;
+  padding: 0 12px;
+  white-space: nowrap;
+`;
+
+const StyledIcon = styled.img`
+  height: 24px;
+  width: 24px;
+`;
+
+const APOLLO_ICON_URL = 'https://twenty-icons.com/apollo.io';
+
+const fetchOAuthApplicationVariables = async (): Promise<OAuthApplicationVariables> => {
+  const backEndUrl = `${process.env.TWENTY_API_URL}/s/oauth/application-variables`;
+  const response = await fetch(backEndUrl, {
+    method: 'GET',
+  });
+  const data = await response.json();
+
+  return data;
+};
+
+const buildOAuthUrl = (oauthApplicationVariables: OAuthApplicationVariables): string => {
+  const { apolloOAuthUrl, apolloClientId, apolloRegisteredUrl } = oauthApplicationVariables;
+  const redirectUri = `${apolloRegisteredUrl}auth/oauth-propagator/callback`;
+  const state = encodeURIComponent(`${process.env.TWENTY_API_URL}/s${VERIFY_PAGE_PATH}`);
+  return `${apolloOAuthUrl}?client_id=${apolloClientId}&redirect_uri=${redirectUri}&state=${state}&response_type=code`;
+};
+
+const ApolloOAuthCta = () => {
+  const [oauthApplicationVariables, setOAuthApplicationVariables] =
+    useState<OAuthApplicationVariables | null>(null);
+  const [isLoading, setIsLoading] = useState(true);
+  const [error, setError] = useState<Error | null>(null);
+
+  useEffect(() => {
+    fetchOAuthApplicationVariables()
+      .then(setOAuthApplicationVariables)
+      .catch(setError)
+      .finally(() => setIsLoading(false));
+  }, []);
+
+  if (isLoading) {
+    return (
+      <StyledContainer>
+        <StyledSectionTitle>Connect to Apollo</StyledSectionTitle>
+        <StyledSectionSubtitle>Enrich your contacts with Apollo data</StyledSectionSubtitle>
+        <StyledCard>
+          <StyledIconContainer>
+            <StyledIcon src={APOLLO_ICON_URL} alt="Apollo" />
+          </StyledIconContainer>
+          <StyledTextContainer>
+            <StyledTitle>Apollo OAuth</StyledTitle>
+            <StyledDescription>Loading...</StyledDescription>
+          </StyledTextContainer>
+        </StyledCard>
+      </StyledContainer>
+    );
+  }
+
+  if (error || !oauthApplicationVariables) {
+    return null;
+  }
+
+  const isConnected = Boolean(oauthApplicationVariables.apolloAccessToken);
+  const oauthUrl = buildOAuthUrl(oauthApplicationVariables);
+
+  return (
+    <StyledContainer>
+      <StyledSectionTitle>Connect to Apollo</StyledSectionTitle>
+      <StyledSectionSubtitle>Enrich your contacts with Apollo data</StyledSectionSubtitle>
+      <StyledCard>
+        <StyledIconContainer>
+          <StyledIcon src={APOLLO_ICON_URL} alt="Apollo" />
+        </StyledIconContainer>
+        <StyledTextContainer>
+          <StyledTitle>Apollo OAuth</StyledTitle>
+          <StyledDescription>
+            {isConnected
+              ? 'Your Apollo account is connected'
+              : 'Connect your Apollo account to enrich contacts'}
+          </StyledDescription>
+        </StyledTextContainer>
+        {isConnected ? (
+          <StyledConnectedStatus>
+            ✓ Connected
+          </StyledConnectedStatus>
+        ) : (
+          <StyledLink href={oauthUrl} rel="noopener noreferrer">
+            Connect
+          </StyledLink>
+        )}
+      </StyledCard>
+    </StyledContainer>
+  );
+};
+
+export default defineFrontComponent({
+  universalIdentifier: '50d59f7c-eada-4731-aacd-8e45371e1040',
+  name: 'apollo-oauth-cta',
+  description: 'CTA button to connect to Apollo Enrichment via OAuth',
+  component: ApolloOAuthCta,
+});
@@ -0,0 +1,96 @@
+import { defineLogicFunction, RoutePayload } from "twenty-sdk";
+import { MetadataApiClient } from 'twenty-sdk/clients';
+
+export const OAUTH_TOKEN_PAIRS_PATH = '/oauth/token-pairs';
+
+type ApolloTokenResponse = {
+  access_token: string;
+  token_type: string;
+  expires_in: number;
+  refresh_token: string;
+  scope: string;
+  created_at: number;
+};
+
+const getAuthenticationTokenPairs = async (
+  code: string,
+  clientId: string,
+  clientSecret: string,
+): Promise<ApolloTokenResponse> => {
+  const formData = new URLSearchParams({
+    grant_type: 'authorization_code',
+    client_id: clientId,
+    client_secret: clientSecret,
+    code: code,
+    redirect_uri: 'https://hjsm0q38-3000.uks1.devtunnels.ms/auth/oauth-propagator/callback',
+  });
+
+  const response = await fetch('https://app.apollo.io/api/v1/oauth/token', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded',
+    },
+    body: formData.toString(),
+  });
+
+  if (!response.ok) {
+    const errorText = await response.text();
+    throw new Error(`Failed to exchange code for tokens: ${response.status} - ${errorText}`);
+  }
+
+  return response.json();
+};
+
+const handler = async (event: RoutePayload): Promise<any> => {
+  const { queryStringParameters: { code } } = event;
+
+  if (!code) {
+    throw new Error('Code is required');
+  }
+
+  const apolloClientId = process.env.APOLLO_CLIENT_ID ?? '';
+  const apolloClientSecret = process.env.APOLLO_CLIENT_SECRET ?? '';
+  const applicationId = process.env.APPLICATION_ID ?? '';
+
+  const metadataClient = new MetadataApiClient({});
+
+  const tokenPairs = await getAuthenticationTokenPairs(
+    code,
+    apolloClientId,
+    apolloClientSecret,
+  );
+
+  await metadataClient.mutation({
+    updateOneApplicationVariable: {
+      __args: {
+          key: 'APOLLO_ACCESS_TOKEN',
+          value: tokenPairs.access_token,
+          applicationId,
+        },
+    },
+  });
+
+   await metadataClient.mutation({
+    updateOneApplicationVariable: {
+      __args: {
+          key: 'APOLLO_REFRESH_TOKEN',
+          value: tokenPairs.refresh_token,
+          applicationId,
+        },
+    },
+  });
+  return {tokenPairs};
+};
+
+export default defineLogicFunction({
+  universalIdentifier: '7ccc63a7-ece1-44c0-adbe-805a1baea03a',
+  name: 'get-authentication-token-pairs',
+  description: 'Returns the Apollo authentication token pairs',
+  timeoutSeconds: 10,
+  handler,
+  httpRouteTriggerSettings: {
+    path: OAUTH_TOKEN_PAIRS_PATH,
+    httpMethod: 'GET',
+    isAuthRequired: false,
+  },
+});
@@ -0,0 +1,32 @@
+import { defineLogicFunction } from 'twenty-sdk';
+
+export type OAuthApplicationVariables = {
+  apolloClientId: string;
+  apolloRegisteredUrl: string;
+  apolloOAuthUrl: string;
+  apolloAccessToken: string;
+  apolloRefreshToken: string;
+};
+
+const handler = async (): Promise<OAuthApplicationVariables> => {
+  const apolloClientId = process.env.APOLLO_CLIENT_ID ?? '';
+  const apolloRegisteredUrl = process.env.APOLLO_REGISTERED_URL ?? '';
+  const apolloOAuthUrl = process.env.APOLLO_OAUTH_URL ?? '';
+  const apolloAccessToken = process.env.APOLLO_ACCESS_TOKEN ?? '';
+  const apolloRefreshToken = process.env.APOLLO_REFRESH_TOKEN ?? '';
+
+  return { apolloClientId, apolloRegisteredUrl, apolloOAuthUrl, apolloAccessToken, apolloRefreshToken };
+};
+
+export default defineLogicFunction({
+  universalIdentifier: 'b7c3e8f1-9d4a-4e2b-8f6c-1a5d3e7b9c2f',
+  name: 'get-oauth-application-variables',
+  description: 'Returns the Apollo OAuth authorization URL',
+  timeoutSeconds: 10,
+  handler,
+  httpRouteTriggerSettings: {
+    path: '/oauth/application-variables',
+    httpMethod: 'GET',
+    isAuthRequired: false,
+  },
+});
@@ -0,0 +1,90 @@
+import { defineLogicFunction } from "twenty-sdk";
+
+export const VERIFY_PAGE_PATH = '/oauth/verify';
+
+const buildVerifyPageHtml = (applicationId: string): string => `<!DOCTYPE html>
+<html>
+<head>
+  <title>Apollo OAuth - Verifying...</title>
+  <style>
+    body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; max-width: 600px; margin: 50px auto; padding: 20px; text-align: center; }
+    .loading { color: #6b7280; }
+    .success { color: #10b981; }
+    .error { color: #ef4444; }
+    .spinner { border: 3px solid #f3f4f6; border-top: 3px solid #3b82f6; border-radius: 50%; width: 40px; height: 40px; animation: spin 1s linear infinite; margin: 20px auto; }
+    @keyframes spin { 0% { transform: rotate(0deg); } 100% { transform: rotate(360deg); } }
+  </style>
+  <script>
+    (async function() {
+      const applicationId = ${JSON.stringify(applicationId)};
+      const urlParams = new URLSearchParams(window.location.search);
+      const code = urlParams.get('code');
+      const baseUrl = window.location.origin;
+
+      function showError(message) {
+        document.addEventListener('DOMContentLoaded', function() {
+          document.getElementById('spinner').style.display = 'none';
+          document.getElementById('title').textContent = '✗ Connection Failed';
+          document.getElementById('title').className = 'error';
+          document.getElementById('status').textContent = message;
+        });
+
+        if (window.opener) {
+          window.opener.postMessage({ type: 'APOLLO_OAUTH_ERROR', error: message }, '*');
+        }
+      }
+
+      if (!code) {
+        showError('Authorization code is missing. Please try connecting again.');
+        return;
+      }
+
+      try {
+        const response = await fetch(
+          baseUrl + '/s/oauth/token-pairs?code=' + encodeURIComponent(code),
+          {
+            method: 'GET',
+            headers: { 'Content-Type': 'application/json' }
+          }
+        );
+
+        if (!response.ok) {
+          const errorText = await response.text();
+          throw new Error('Failed to get tokens: ' + response.status + ' - ' + errorText);
+        }
+
+        const tokens = await response.json();
+
+        window.location.href = 'http://apple.localhost:3001/settings/applications/' + applicationId + '#custom';
+
+      } catch (error) {
+        showError(error.message);
+      }
+    })();
+  </script>
+</head>
+<body>
+  <div class="spinner" id="spinner"></div>
+  <h1 class="loading" id="title">Connecting to Apollo...</h1>
+  <p id="status">Please wait while we complete the connection.</p>
+</body>
+</html>`;
+
+const handler = async (): Promise<string> => {
+  const applicationId = process.env.APPLICATION_ID ?? '';
+
+  return buildVerifyPageHtml(applicationId);
+};
+
+export default defineLogicFunction({
+  universalIdentifier: '4d74950a-d9c1-4c66-a799-89c1aea4e6b0',
+  name: 'get-verify-page',
+  description: 'Returns the Apollo OAuth verify page',
+  timeoutSeconds: 10,
+  handler,
+  httpRouteTriggerSettings: {
+    path: VERIFY_PAGE_PATH,
+    httpMethod: 'GET',
+    isAuthRequired: false,
+  },
+});
@@ -0,0 +1,227 @@
+import {
+  defineLogicFunction,
+  type DatabaseEventPayload,
+  type ObjectRecordUpdateEvent,
+} from 'twenty-sdk';
+import { CoreApiClient } from 'twenty-sdk/clients';
+
+type CompanyRecord = {
+  id: string;
+  name?: string;
+  domainName?: {
+    primaryLinkUrl?: string;
+    primaryLinkLabel?: string;
+  };
+};
+
+type ApolloOrganization = {
+  name?: string;
+  website_url?: string;
+  linkedin_url?: string;
+  twitter_url?: string;
+  estimated_num_employees?: number;
+  annual_revenue?: number;
+  total_funding?: number;
+  street_address?: string;
+  city?: string;
+  state?: string;
+  postal_code?: string;
+  country?: string;
+  short_description?: string;
+  industry?: string;
+  founded_year?: number;
+};
+
+type ApolloEnrichResponse = {
+  organization?: ApolloOrganization;
+};
+
+const extractDomain = (
+  domainName?: CompanyRecord['domainName'],
+): string | undefined => {
+  const url = domainName?.primaryLinkUrl;
+
+  if (!url) {
+    return undefined;
+  }
+
+  try {
+    const hostname = new URL(
+      url.startsWith('http') ? url : `https://${url}`,
+    ).hostname;
+
+    return hostname.replace(/^www\./, '');
+  } catch {
+    return url.replace(/^(https?:\/\/)?(www\.)?/, '').split('/')[0];
+  }
+};
+
+const fetchApolloEnrichment = async (
+  domain: string,
+): Promise<ApolloOrganization | undefined> => {
+  const response = await fetch(
+    `https://api.apollo.io/api/v1/organizations/enrich?domain=${encodeURIComponent(domain)}`,
+    {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+        Authorization: `Bearer ${process.env.APOLLO_ACCESS_TOKEN ?? ''}`,
+      },
+    },
+  );
+
+  const data: ApolloEnrichResponse = await response.json();
+
+  return data.organization;
+};
+
+const buildCompanyUpdateData = (
+  apolloOrganization: ApolloOrganization,
+): Record<string, unknown> => {
+  const updateData: Record<string, unknown> = {};
+
+  if (apolloOrganization.name) {
+    updateData.name = apolloOrganization.name;
+  }
+
+  if (apolloOrganization.estimated_num_employees) {
+    updateData.employees = apolloOrganization.estimated_num_employees;
+  }
+
+  if (apolloOrganization.linkedin_url) {
+    updateData.linkedinLink = {
+      primaryLinkUrl: apolloOrganization.linkedin_url,
+      primaryLinkLabel: 'LinkedIn',
+    };
+  }
+
+  if (apolloOrganization.twitter_url) {
+    updateData.xLink = {
+      primaryLinkUrl: apolloOrganization.twitter_url,
+      primaryLinkLabel: 'X',
+    };
+  }
+
+  if (apolloOrganization.annual_revenue) {
+    updateData.annualRecurringRevenue = {
+      amountMicros: apolloOrganization.annual_revenue * 1_000_000,
+      currencyCode: 'USD',
+    };
+  }
+
+  const hasAddress =
+    apolloOrganization.street_address ||
+    apolloOrganization.city ||
+    apolloOrganization.state ||
+    apolloOrganization.country;
+
+  if (hasAddress) {
+    updateData.address = {
+      addressStreet1: apolloOrganization.street_address ?? '',
+      addressCity: apolloOrganization.city ?? '',
+      addressState: apolloOrganization.state ?? '',
+      addressPostcode: apolloOrganization.postal_code ?? '',
+      addressCountry: apolloOrganization.country ?? '',
+    };
+  }
+
+  if (apolloOrganization.industry) {
+    updateData.apolloIndustry = apolloOrganization.industry;
+  }
+
+  if (apolloOrganization.short_description) {
+    updateData.apolloShortDescription = apolloOrganization.short_description;
+  }
+
+  if (apolloOrganization.founded_year) {
+    updateData.apolloFoundedYear = apolloOrganization.founded_year;
+  }
+
+  if (apolloOrganization.total_funding) {
+    updateData.apolloTotalFunding = {
+      amountMicros: apolloOrganization.total_funding * 1_000_000,
+      currencyCode: 'USD',
+    };
+  }
+
+  return updateData;
+};
+
+const updateCompanyInTwenty = async (
+  companyId: string,
+  updateData: Record<string, unknown>,
+): Promise<void> => {
+  const client = new CoreApiClient();
+
+  const result = await client.mutation({
+    updateCompany: {
+      __args: {
+        id: companyId,
+        data: updateData,
+      },
+      id: true,
+    },
+  });
+
+  if (!result.updateCompany) {
+    throw new Error(`Failed to update company ${companyId}: no result`);
+  }
+};
+
+type CompanyUpdateEvent = DatabaseEventPayload<
+  ObjectRecordUpdateEvent<CompanyRecord>
+>;
+
+const handler = async (
+  event: CompanyUpdateEvent,
+): Promise<object | undefined> => {
+
+    const { recordId, properties } = event;
+    const { after: companyAfter } = properties;
+
+    const domain = extractDomain(companyAfter?.domainName);
+
+    if (!domain) {
+      return { skipped: true, reason: 'no domain found on company' };
+    }
+
+    const apolloOrganization = await fetchApolloEnrichment(domain);
+
+    if (!apolloOrganization) {
+      return {
+        skipped: true,
+        reason: `no Apollo data found for ${domain}`,
+      };
+    }
+
+    const updateData = buildCompanyUpdateData(apolloOrganization);
+
+    if (Object.keys(updateData).length === 0) {
+      return { skipped: true, reason: 'no enrichment data to apply' };
+    }
+
+    await updateCompanyInTwenty(recordId, updateData);
+
+    const result = {
+      enriched: true,
+      companyId: recordId,
+      domain,
+      updatedFields: Object.keys(updateData),
+    };
+
+    return result;
+
+};
+
+export default defineLogicFunction({
+  universalIdentifier: '6248b3fe-a8af-404a-8e38-19df98f73d81',
+  name: 'on-company-updated',
+  description:
+    'Enriches company data from Apollo when the company domain is updated',
+  timeoutSeconds: 30,
+  handler,
+  databaseEventTriggerSettings: {
+    eventName: 'company.updated',
+    updatedFields: ['domainName'],
+  },
+});
@@ -0,0 +1,13 @@
+import { definePostInstallLogicFunction, type InstallLogicFunctionPayload } from 'twenty-sdk';
+
+const handler = async (payload: InstallLogicFunctionPayload): Promise<void> => {
+  console.log('Post install logic function executed successfully!', payload.previousVersion);
+};
+
+export default definePostInstallLogicFunction({
+  universalIdentifier: '08292efc-d7ba-4ec3-ab95-e7c33bd3a3bc',
+  name: 'post-install',
+  description: 'Runs after installation to set up the application.',
+  timeoutSeconds: 300,
+  handler,
+});
@@ -0,0 +1,13 @@
+import { definePreInstallLogicFunction, type InstallLogicFunctionPayload } from 'twenty-sdk';
+
+const handler = async (payload: InstallLogicFunctionPayload): Promise<void> => {
+  console.log('Pre install logic function executed successfully!', payload.previousVersion);
+};
+
+export default definePreInstallLogicFunction({
+  universalIdentifier: 'af7cd86e-149e-466a-8d60-312b6e46d604',
+  name: 'pre-install',
+  description: 'Runs before installation to prepare the application.',
+  timeoutSeconds: 300,
+  handler,
+});
@@ -0,0 +1,15 @@
+import { defineRole } from 'twenty-sdk';
+
+export const DEFAULT_ROLE_UNIVERSAL_IDENTIFIER =
+  'b8faae3f-e174-43fa-ab94-715712ae26cb';
+
+export default defineRole({
+  universalIdentifier: DEFAULT_ROLE_UNIVERSAL_IDENTIFIER,
+  label: 'Apollo enrich default function role',
+  description: 'Apollo enrich default function role',
+  canReadAllObjectRecords: true,
+  canUpdateAllObjectRecords: true,
+  canSoftDeleteAllObjectRecords: true,
+  canDestroyAllObjectRecords: false,
+  canUpdateAllSettings: true,
+});
@@ -0,0 +1,31 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "sourceMap": true,
+    "declaration": true,
+    "outDir": "./dist",
+    "rootDir": ".",
+    "jsx": "react-jsx",
+    "moduleResolution": "node",
+    "allowSyntheticDefaultImports": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "importHelpers": true,
+    "allowUnreachableCode": false,
+    "strict": true,
+    "alwaysStrict": true,
+    "noImplicitAny": true,
+    "strictBindCallApply": false,
+    "target": "es2018",
+    "module": "esnext",
+    "lib": ["es2020", "dom"],
+    "skipLibCheck": true,
+    "skipDefaultLibCheck": true,
+    "resolveJsonModule": true,
+    "paths": {
+      "src/*": ["./src/*"],
+      "~/*": ["./*"]
+    }
+  },
+  "exclude": ["node_modules", "dist", "**/*.test.ts", "**/*.spec.ts"]
+}
@@ -0,0 +1,40 @@
+{
+  "$schema": "./node_modules/oxlint/configuration_schema.json",
+  "plugins": ["typescript", "import", "unicorn"],
+  "categories": {
+    "correctness": "off"
+  },
+  "ignorePatterns": ["node_modules"],
+  "rules": {
+    "func-style": ["error", "declaration", { "allowArrowFunctions": true }],
+    "no-console": ["warn", { "allow": ["group", "groupCollapsed", "groupEnd"] }],
+    "no-control-regex": "off",
+    "no-debugger": "error",
+    "no-duplicate-imports": "error",
+    "no-undef": "off",
+    "no-unused-vars": "off",
+    "no-redeclare": "off",
+
+    "import/no-duplicates": "error",
+
+    "typescript/no-redeclare": "error",
+    "typescript/ban-ts-comment": "error",
+    "typescript/consistent-type-imports": ["error", {
+      "prefer": "type-imports",
+      "fixStyle": "inline-type-imports"
+    }],
+    "typescript/explicit-function-return-type": "off",
+    "typescript/explicit-module-boundary-types": "off",
+    "typescript/no-empty-object-type": ["error", {
+      "allowInterfaces": "with-single-extends"
+    }],
+    "typescript/no-empty-function": "off",
+    "typescript/no-explicit-any": "off",
+    "typescript/no-unused-vars": ["warn", {
+      "vars": "all",
+      "varsIgnorePattern": "^_",
+      "args": "after-used",
+      "argsIgnorePattern": "^_"
+    }]
+  }
+}
@@ -26,21 +26,6 @@
    "typecheck": {
      "dependsOn": ["^build"]
    },
-    "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": [
-        "{options.outputFile}"
-      ],
-      "options": {
-        "lintFilePatterns": [
-          "packages/twenty-apps/community/fireflies/**/*.{ts,tsx,js,jsx}"
-        ]
-      },
-      "configurations": {
-        "fix": {
-          "fix": true
-        }
-      }
-    }
+    "lint": {}
  }
 }
@@ -5,7 +5,7 @@
 * Usage: yarn setup:fields
 */

-/* eslint-disable no-console */
+/* oxlint-disable no-console */

 import * as dotenv from 'dotenv';
 import * as path from 'path';
@@ -1,4 +1,4 @@
-/* eslint-disable no-console */
+/* oxlint-disable no-console */
 import * as dotenv from 'dotenv';
 import * as path from 'path';
 import { fileURLToPath } from 'url';
@@ -1,4 +1,4 @@
-/* eslint-disable no-console */
+/* oxlint-disable no-console */
 import * as dotenv from 'dotenv';
 import * as path from 'path';
 import { fileURLToPath } from 'url';
@@ -1,4 +1,4 @@
-/* eslint-disable no-console */
+/* oxlint-disable no-console */
 /**
 * Fetch historical Fireflies meetings and insert into Twenty.
 *
@@ -219,4 +219,3 @@ main().catch((error) => {
  process.exit(1);
 });

-
@@ -1,4 +1,4 @@
-/* eslint-disable no-console */
+/* oxlint-disable no-console */
 /**
 * Fetch a Fireflies meeting by ID and insert it into Twenty using the same path
 * as the webhook handler.
@@ -1,4 +1,4 @@
-/* eslint-disable no-console */
+/* oxlint-disable no-console */
 /**
 * Test script for Fireflies webhook against local Twenty instance
 *
@@ -81,4 +81,3 @@ describe('HistoricalImporter', () => {
  });
 });

-
@@ -158,4 +158,3 @@ export class HistoricalImporter {
  }
 }

-
@@ -72,7 +72,7 @@ export class AppLogger {
  debug(message: string, ...args: unknown[]): void {
    this.captureLog('debug', message, ...args);
    if (this.shouldLog('debug')) {
-      // eslint-disable-next-line no-console
+      // oxlint-disable-next-line no-console
      console.log(`[${this.context}] ${message}`, ...args);
    }
  }
@@ -80,7 +80,7 @@ export class AppLogger {
  info(message: string, ...args: unknown[]): void {
    this.captureLog('info', message, ...args);
    if (this.shouldLog('info')) {
-      // eslint-disable-next-line no-console
+      // oxlint-disable-next-line no-console
      console.log(`[${this.context}] ${message}`, ...args);
    }
  }
@@ -88,7 +88,7 @@ export class AppLogger {
  warn(message: string, ...args: unknown[]): void {
    this.captureLog('warn', message, ...args);
    if (this.shouldLog('warn')) {
-      // eslint-disable-next-line no-console
+      // oxlint-disable-next-line no-console
      console.warn(`[${this.context}] ${message}`, ...args);
    }
  }
@@ -96,7 +96,7 @@ export class AppLogger {
  error(message: string, ...args: unknown[]): void {
    this.captureLog('error', message, ...args);
    if (this.shouldLog('error')) {
-      // eslint-disable-next-line no-console
+      // oxlint-disable-next-line no-console
      console.error(`[${this.context}] ${message}`, ...args);
    }
  }
@@ -104,7 +104,7 @@ export class AppLogger {
  // For fatal errors, security issues, or data corruption - always visible
  critical(message: string, ...args: unknown[]): void {
    this.captureLog('error', `CRITICAL: ${message}`, ...args);
-    // eslint-disable-next-line no-console
+    // oxlint-disable-next-line no-console
    console.error(`[${this.context}] CRITICAL: ${message}`, ...args);
  }

--- a/Show More
+++ b/Show More