refactor

2026-03-23 10:20:05 +01:00
515 changed files with 6250 additions and 13745 deletions
@@ -27,8 +27,11 @@ jobs:
      - name: Build dependencies
        run: npx nx build twenty-shared

+      - name: Build twenty-server
+        run: npx nx build twenty-server
+
      - name: Run catalog sync
-        run: npx nx run twenty-server:ts-node-no-deps-transpile-only -- ./scripts/ai-sync-models-dev.ts
+        run: npx nx run twenty-server:command-no-deps ai:sync-models-dev

      - name: Check for changes
        id: changes
@@ -58,11 +61,3 @@ jobs:
          base: main
          labels: ai, automated
          delete-branch: true
-
-      - name: Trigger automerge
-        if: steps.changes.outputs.changed == 'true'
-        uses: peter-evans/repository-dispatch@v2
-        with:
-          token: ${{ secrets.TWENTY_INFRA_TOKEN }}
-          repository: twentyhq/twenty-infra
-          event-type: automated-pr-ready
@@ -151,40 +151,6 @@ jobs:
  #         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 }}
-  visual-regression-dispatch:
-    needs: front-sb-build
-    if: github.event_name == 'pull_request'
-    timeout-minutes: 5
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download storybook build
-        uses: actions/download-artifact@v4
-        with:
-          name: storybook-static
-          path: storybook-static
-      - name: Package storybook
-        run: tar -czf /tmp/storybook-twenty-front.tar.gz -C storybook-static .
-      - name: Upload storybook tarball
-        uses: actions/upload-artifact@v4
-        with:
-          name: storybook-twenty-front-tarball
-          path: /tmp/storybook-twenty-front.tar.gz
-          retention-days: 1
-      - name: Dispatch to ci-privileged
-        uses: peter-evans/repository-dispatch@v2
-        with:
-          token: ${{ secrets.CI_PRIVILEGED_DISPATCH_TOKEN }}
-          repository: twentyhq/ci-privileged
-          event-type: visual-regression
-          client-payload: >-
-            {
-              "pr_number": "${{ github.event.pull_request.number }}",
-              "run_id": "${{ github.run_id }}",
-              "repo": "${{ github.repository }}",
-              "project": "twenty-front",
-              "branch": "${{ github.head_ref }}",
-              "commit": "${{ github.event.pull_request.head.sha }}"
-            }
  front-task:
    needs: changed-files-check
    if: needs.changed-files-check.outputs.any_changed == 'true'
@@ -1,4 +1,4 @@
-name: CI Docker
+name: CI Docker Compose

 permissions:
  contents: read
@@ -19,7 +19,7 @@ jobs:
      files: |
        packages/twenty-docker/**
        docker-compose.yml
-  test-compose:
+  test:
    needs: changed-files-check
    if: needs.changed-files-check.outputs.any_changed == 'true'
    timeout-minutes: 30
@@ -30,10 +30,10 @@ jobs:
      - name: Run compose
        run: |
          echo "Patching docker-compose.yml..."
+          # change image to localbuild using yq
          yq eval 'del(.services.server.image)' -i docker-compose.yml
          yq eval '.services.server.build.context = "../../"' -i docker-compose.yml
          yq eval '.services.server.build.dockerfile = "./packages/twenty-docker/twenty/Dockerfile"' -i docker-compose.yml
-          yq eval '.services.server.build.target = "twenty"' -i docker-compose.yml
          yq eval '.services.server.restart = "no"' -i docker-compose.yml

          echo "Setting up .env file..."
@@ -89,64 +89,11 @@ jobs:
              echo "Still waiting for server... (${count}/300s)"
          done
        working-directory: ./packages/twenty-docker/
-  test-app-dev:
-    needs: changed-files-check
-    if: needs.changed-files-check.outputs.any_changed == 'true'
-    timeout-minutes: 30
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Create frontend placeholder
-        run: |
-          mkdir -p packages/twenty-front/build
-          echo '<html><body>CI placeholder</body></html>' > packages/twenty-front/build/index.html
-      - name: Build app-dev image
-        run: |
-          docker build \
-            --target twenty-app-dev \
-            -f packages/twenty-docker/twenty/Dockerfile \
-            -t twenty-app-dev-ci \
-            .
-      - name: Start container
-        run: |
-          docker run -d --name twenty-app-dev \
-            -p 3000:3000 \
-            twenty-app-dev-ci
-          docker logs twenty-app-dev -f &
-      - name: Wait for server health
-        run: |
-          echo "Waiting for twenty-app-dev to become healthy..."
-          count=0
-          while true; do
-            status=$(curl -s -o /dev/null -w '%{http_code}' http://localhost:3000/healthz 2>/dev/null || echo "000")
-            if [ "$status" = "200" ]; then
-              echo "Server is healthy!"
-              curl -s http://localhost:3000/healthz
-              break
-            fi
-
-            container_status=$(docker inspect --format='{{.State.Status}}' twenty-app-dev 2>/dev/null || echo "unknown")
-            if [ "$container_status" = "exited" ]; then
-              echo "Container exited unexpectedly"
-              docker logs twenty-app-dev
-              exit 1
-            fi
-
-            count=$((count+1))
-            if [ $count -gt 300 ]; then
-              echo "Server did not become healthy within 5 minutes"
-              docker logs twenty-app-dev
-              exit 1
-            fi
-            echo "Still waiting... (${count}/300s) [HTTP ${status}]"
-            sleep 1
-          done
-  ci-test-docker-status-check:
+  ci-test-docker-compose-status-check:
    if: always() && !cancelled()
    timeout-minutes: 5
    runs-on: ubuntu-latest
-    needs: [changed-files-check, test-compose, test-app-dev]
+    needs: [changed-files-check, test]
    steps:
      - name: Fail job if any needs failed
        if: contains(needs.*.result, 'failure')
@@ -1,146 +0,0 @@
-name: CI UI
-
-on:
-  pull_request:
-  merge_group:
-
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
-
-jobs:
-  changed-files-check:
-    if: github.event_name != 'merge_group'
-    uses: ./.github/workflows/changed-files.yaml
-    with:
-      files: |
-        package.json
-        yarn.lock
-        packages/twenty-ui/**
-        packages/twenty-shared/**
-  ui-task:
-    needs: changed-files-check
-    if: needs.changed-files-check.outputs.any_changed == 'true'
-    timeout-minutes: 30
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        task: [lint, typecheck, test]
-    steps:
-      - name: Cancel Previous Runs
-        uses: styfle/[email protected]
-        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: Run ${{ matrix.task }}
-        run: npx nx ${{ matrix.task }} twenty-ui
-  ui-sb-build:
-    needs: changed-files-check
-    if: needs.changed-files-check.outputs.any_changed == 'true'
-    timeout-minutes: 30
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cancel Previous Runs
-        uses: styfle/[email protected]
-        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 storybook
-        run: npx nx storybook:build twenty-ui
-      - name: Upload storybook build
-        uses: actions/upload-artifact@v4
-        with:
-          name: storybook-twenty-ui
-          path: packages/twenty-ui/storybook-static
-          retention-days: 1
-  ui-sb-test:
-    timeout-minutes: 30
-    runs-on: ubuntu-latest
-    needs: ui-sb-build
-    env:
-      STORYBOOK_URL: http://localhost:6007
-    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 dependencies
-        run: npx nx build twenty-shared
-      - name: Download storybook build
-        uses: actions/download-artifact@v4
-        with:
-          name: storybook-twenty-ui
-          path: packages/twenty-ui/storybook-static
-      - name: Install Playwright
-        run: |
-          cd packages/twenty-ui
-          npx playwright install
-      - name: Serve storybook & run tests
-        run: |
-          npx http-server packages/twenty-ui/storybook-static --port 6007 --silent &
-          timeout 30 bash -c 'until curl -sf http://localhost:6007 > /dev/null 2>&1; do sleep 1; done'
-          npx nx storybook:test twenty-ui
-  visual-regression-dispatch:
-    needs: ui-sb-build
-    if: github.event_name == 'pull_request'
-    timeout-minutes: 5
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download storybook build
-        uses: actions/download-artifact@v4
-        with:
-          name: storybook-twenty-ui
-          path: storybook-static
-      - name: Package storybook
-        run: tar -czf /tmp/storybook-twenty-ui.tar.gz -C storybook-static .
-      - name: Upload storybook tarball
-        uses: actions/upload-artifact@v4
-        with:
-          name: storybook-twenty-ui-tarball
-          path: /tmp/storybook-twenty-ui.tar.gz
-          retention-days: 1
-      - name: Dispatch to ci-privileged
-        uses: peter-evans/repository-dispatch@v2
-        with:
-          token: ${{ secrets.CI_PRIVILEGED_DISPATCH_TOKEN }}
-          repository: twentyhq/ci-privileged
-          event-type: visual-regression
-          client-payload: >-
-            {
-              "pr_number": "${{ github.event.pull_request.number }}",
-              "run_id": "${{ github.run_id }}",
-              "repo": "${{ github.repository }}",
-              "project": "twenty-ui",
-              "branch": "${{ github.head_ref }}",
-              "commit": "${{ github.event.pull_request.head.sha }}"
-            }
-  ci-ui-status-check:
-    if: always() && !cancelled()
-    timeout-minutes: 5
-    runs-on: ubuntu-latest
-    needs:
-      [
-        changed-files-check,
-        ui-task,
-        ui-sb-build,
-        ui-sb-test,
-      ]
-    steps:
-      - name: Fail job if any needs failed
-        if: contains(needs.*.result, 'failure')
-        run: exit 1
@@ -150,11 +150,3 @@ jobs:
          fi
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Trigger i18n automerge
-        if: github.event_name != 'pull_request' && steps.check_changes.outputs.changes_detected == 'true'
-        uses: peter-evans/repository-dispatch@v2
-        with:
-          token: ${{ secrets.TWENTY_INFRA_TOKEN }}
-          repository: twentyhq/twenty-infra
-          event-type: i18n-pr-ready
@@ -138,11 +138,3 @@ jobs:
          fi
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Trigger i18n automerge
-        if: steps.compile_translations.outputs.changes_detected == 'true'
-        uses: peter-evans/repository-dispatch@v2
-        with:
-          token: ${{ secrets.TWENTY_INFRA_TOKEN }}
-          repository: twentyhq/twenty-infra
-          event-type: i18n-pr-ready
@@ -102,11 +102,3 @@ jobs:
          fi
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Trigger i18n automerge
-        if: steps.check_extract_changes.outputs.changes_detected == 'true' || steps.check_compile_changes.outputs.changes_detected == 'true'
-        uses: peter-evans/repository-dispatch@v2
-        with:
-          token: ${{ secrets.TWENTY_INFRA_TOKEN }}
-          repository: twentyhq/twenty-infra
-          event-type: i18n-pr-ready
@@ -24,12 +24,10 @@ 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 '.services.server.build.target = "twenty"' -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
-          yq eval '.services.worker.build.target = "twenty"' -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
@@ -121,14 +121,6 @@ yarn twenty server reset     # Wipe all data and start fresh

 The server is pre-seeded with a workspace and user (`[email protected]` / `[email protected]`).

-### How to use a local Twenty instance
-
-If you're already running a local Twenty instance, you can connect to it instead of using Docker. Pass the port your local server is listening on (default: `3000`):
-
-```bash
-npx create-twenty-app@latest my-app --port 3000
-```
-
 ## Next steps

 - Run `yarn twenty help` to see all available commands.
@@ -1,6 +1,6 @@
 {
  "name": "create-twenty-app",
-  "version": "0.8.0-canary.2",
+  "version": "0.8.0-canary.1",
  "description": "Command-line interface to create Twenty application",
  "main": "dist/cli.cjs",
  "bin": "dist/cli.cjs",
@@ -31,10 +31,6 @@ const program = new Command(packageJson.name)
    '--skip-local-instance',
    'Skip the local Twenty instance setup prompt',
  )
-  .option(
-    '-p, --port <port>',
-    'Port of an existing Twenty server (skips Docker setup)',
-  )
  .helpOption('-h, --help', 'Display this help message.')
  .action(
    async (
@@ -46,7 +42,6 @@ const program = new Command(packageJson.name)
        displayName?: string;
        description?: string;
        skipLocalInstance?: boolean;
-        port?: string;
      },
    ) => {
      const modeFlags = [options?.exhaustive, options?.minimal].filter(Boolean);
@@ -76,8 +71,6 @@ const program = new Command(packageJson.name)

      const mode: ScaffoldingMode = options?.minimal ? 'minimal' : 'exhaustive';

-      const port = options?.port ? parseInt(options.port, 10) : undefined;
-
      await new CreateAppCommand().execute({
        directory,
        mode,
@@ -85,7 +78,6 @@ const program = new Command(packageJson.name)
        displayName: options?.displayName,
        description: options?.description,
        skipLocalInstance: options?.skipLocalInstance,
-        port,
      });
    },
  );
@@ -1,4 +1,3 @@
-import { basename } from 'path';
 import { copyBaseApplicationProject } from '@/utils/app-template';
 import { convertToLabel } from '@/utils/convert-to-label';
 import { install } from '@/utils/install';
@@ -29,15 +28,14 @@ type CreateAppOptions = {
  displayName?: string;
  description?: string;
  skipLocalInstance?: boolean;
-  port?: number;
 };

 export class CreateAppCommand {
  async execute(options: CreateAppOptions = {}): Promise<void> {
-    const { appName, appDisplayName, appDirectory, appDescription } =
-      await this.getAppInfos(options);
-
    try {
+      const { appName, appDisplayName, appDirectory, appDescription } =
+        await this.getAppInfos(options);
+
      const exampleOptions = this.resolveExampleOptions(
        options.mode ?? 'exhaustive',
      );
@@ -48,6 +46,7 @@ export class CreateAppCommand {

      await fs.ensureDir(appDirectory);

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

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

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

      let localResult: LocalInstanceResult = { running: false };

      if (!options.skipLocalInstance) {
-        localResult = await setupLocalInstance(appDirectory, options.port);
+        // Auto-detect a running server first
+        localResult = await setupLocalInstance(appDirectory);

        if (localResult.running && localResult.serverUrl) {
          await this.connectToLocal(appDirectory, localResult.serverUrl);
@@ -73,7 +75,7 @@ export class CreateAppCommand {
      this.logSuccess(appDirectory, localResult);
    } catch (error) {
      console.error(
-        chalk.red('\nCreate application failed:'),
+        chalk.red('Initialization failed:'),
        error instanceof Error ? error.message : error,
      );
      process.exit(1);
@@ -191,10 +193,10 @@ export class CreateAppCommand {
    appDirectory: string;
    appName: string;
  }): void {
-    console.log(
-      chalk.blue('\n', 'Creating Twenty Application\n'),
-      chalk.gray(`- Directory: ${appDirectory}\n`, `- Name: ${appName}\n`),
-    );
+    console.log(chalk.blue('Creating Twenty Application'));
+    console.log(chalk.gray(`  Directory: ${appDirectory}`));
+    console.log(chalk.gray(`  Name: ${appName}`));
+    console.log('');
  }

  private async connectToLocal(
@@ -202,14 +204,18 @@ export class CreateAppCommand {
    serverUrl: string,
  ): Promise<void> {
    try {
-      execSync(`yarn twenty remote add ${serverUrl} --as local`, {
-        cwd: appDirectory,
-        stdio: 'inherit',
-      });
+      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 `yarn twenty remote add --local` manually.',
+          'Authentication skipped. Run `npx nx run twenty-sdk:start -- remote add --local` manually.',
        ),
      );
    }
@@ -219,21 +225,23 @@ export class CreateAppCommand {
    appDirectory: string,
    localResult: LocalInstanceResult,
  ): void {
-    const dirName = basename(appDirectory);
+    const dirName = appDirectory.split('/').reverse()[0] ?? '';

-    console.log(chalk.blue('\nApplication created. Next steps:'));
-    console.log(chalk.gray(`- cd ${dirName}`));
+    console.log(chalk.green('Application created!'));
+    console.log('');
+    console.log(chalk.blue('Next steps:'));
+    console.log(chalk.gray(`  cd ${dirName}`));

    if (!localResult.running) {
      console.log(
        chalk.gray(
-          '- yarn twenty remote add --local  # Authenticate with Twenty',
+          '  yarn twenty remote add --local  # Authenticate with Twenty',
        ),
      );
    }

    console.log(
-      chalk.gray('- yarn twenty dev                  # Start dev mode'),
+      chalk.gray('  yarn twenty dev                  # Start dev mode'),
    );
  }
 }
@@ -5,7 +5,6 @@ import { exec } from 'child_process';
 const execPromise = promisify(exec);

 export const install = async (root: string) => {
-  console.log(chalk.gray('Installing yarn dependencies...'));
  try {
    await execPromise('corepack enable', { cwd: root });
  } catch (error: any) {
@@ -15,6 +14,6 @@ export const install = async (root: string) => {
  try {
    await execPromise('yarn install', { cwd: root });
  } catch (error: any) {
-    console.warn(chalk.yellow('yarn install failed:'), error.stdout);
+    console.error(chalk.red('yarn install failed:'), error.stdout);
  }
 };
@@ -1,7 +1,8 @@
 import chalk from 'chalk';
 import { execSync } from 'node:child_process';
+import { platform } from 'node:os';

-const LOCAL_PORTS = [2020, 3000];
+const DEFAULT_PORT = 2020;

 // Minimal health check — the full implementation lives in twenty-sdk
 const isServerReady = async (port: number): Promise<boolean> => {
@@ -23,20 +24,6 @@ const isServerReady = async (port: number): Promise<boolean> => {
  }
 };

-const detectRunningServer = async (
-  preferredPort?: number,
-): Promise<number | null> => {
-  const ports = preferredPort ? [preferredPort] : LOCAL_PORTS;
-
-  for (const port of ports) {
-    if (await isServerReady(port)) {
-      return port;
-    }
-  }
-
-  return null;
-};
-
 export type LocalInstanceResult = {
  running: boolean;
  serverUrl?: string;
@@ -44,30 +31,20 @@ export type LocalInstanceResult = {

 export const setupLocalInstance = async (
  appDirectory: string,
-  preferredPort?: number,
 ): Promise<LocalInstanceResult> => {
-  const detectedPort = await detectRunningServer(preferredPort);
+  console.log('');
+  console.log(chalk.blue('Setting up local Twenty instance...'));

-  if (detectedPort) {
-    const serverUrl = `http://localhost:${detectedPort}`;
+  if (await isServerReady(DEFAULT_PORT)) {
+    const serverUrl = `http://localhost:${DEFAULT_PORT}`;

-    console.log(chalk.green(`Twenty server detected on ${serverUrl}.\n`));
+    console.log(chalk.green(`Twenty server detected on ${serverUrl}.`));

    return { running: true, serverUrl };
  }

-  if (preferredPort) {
-    console.log(
-      chalk.yellow(
-        `No Twenty server found on port ${preferredPort}.\n` +
-          'Start your server and run `yarn twenty remote add --local` manually.\n',
-      ),
-    );
-
-    return { running: false };
-  }
-
-  console.log(chalk.blue('Setting up local Twenty instance...\n'));
+  // Delegate to `twenty server start` from the scaffolded app
+  console.log(chalk.gray('Starting local Twenty server...'));

  try {
    execSync('yarn twenty server start', {
@@ -75,19 +52,38 @@ export const setupLocalInstance = async (
      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...\n'));
+  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(LOCAL_PORTS[0])) {
-      const serverUrl = `http://localhost:${LOCAL_PORTS[0]}`;
+    if (await isServerReady(DEFAULT_PORT)) {
+      const serverUrl = `http://localhost:${DEFAULT_PORT}`;

-      console.log(chalk.green(`Server running on '${serverUrl}'\n`));
+      console.log(chalk.green(`Twenty server is running on ${serverUrl}.`));
+      console.log(
+        chalk.gray(
+          'Workspace ready — login with [email protected] / [email protected]',
+        ),
+      );
+
+      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 };
    }
@@ -97,8 +93,7 @@ export const setupLocalInstance = async (

  console.log(
    chalk.yellow(
-      'Twenty server did not become healthy in time.\n',
-      "Check: 'yarn twenty server logs'\n",
+      'Twenty server did not become healthy in time. Check: yarn twenty server logs',
    ),
  );

@@ -18,7 +18,7 @@ DOCKER_NETWORK=twenty_network
 # =============================================================================

 prod-build:
-	@cd ../.. && docker build --target twenty -f ./packages/twenty-docker/twenty/Dockerfile --platform $(PLATFORM) --tag twenty:$(TAG) . && cd -
+	@cd ../.. && docker build -f ./packages/twenty-docker/twenty/Dockerfile --platform $(PLATFORM) --tag twenty:$(TAG) . && cd -

 prod-run:
 	@docker run -d -p 3000:3000 --name twenty twenty:$(TAG)
@@ -0,0 +1,130 @@
+ARG APP_VERSION
+
+# === Stage 1: Common dependencies ===
+FROM node:22-alpine AS common-deps
+
+WORKDIR /app
+
+COPY ./package.json ./yarn.lock ./.yarnrc.yml ./tsconfig.base.json ./nx.json /app/
+COPY ./.yarn/releases /app/.yarn/releases
+COPY ./.yarn/patches /app/.yarn/patches
+
+COPY ./packages/twenty-emails/package.json /app/packages/twenty-emails/
+COPY ./packages/twenty-server/package.json /app/packages/twenty-server/
+COPY ./packages/twenty-server/patches /app/packages/twenty-server/patches
+COPY ./packages/twenty-ui/package.json /app/packages/twenty-ui/
+COPY ./packages/twenty-shared/package.json /app/packages/twenty-shared/
+COPY ./packages/twenty-front/package.json /app/packages/twenty-front/
+COPY ./packages/twenty-sdk/package.json /app/packages/twenty-sdk/
+
+RUN yarn && yarn cache clean && npx nx reset
+
+# === Stage 2: Build server from source ===
+FROM common-deps AS twenty-server-build
+
+COPY ./packages/twenty-emails /app/packages/twenty-emails
+COPY ./packages/twenty-shared /app/packages/twenty-shared
+COPY ./packages/twenty-ui /app/packages/twenty-ui
+COPY ./packages/twenty-sdk /app/packages/twenty-sdk
+COPY ./packages/twenty-server /app/packages/twenty-server
+
+RUN npx nx run twenty-server:build
+RUN yarn workspaces focus --production twenty-emails twenty-shared twenty-sdk twenty-server
+
+# === Stage 3: Build frontend from source ===
+# Requires ~10GB Docker memory. To skip, pre-build on host first:
+#   npx nx build twenty-front
+# The COPY below will pick up packages/twenty-front/build/ if it exists.
+FROM common-deps AS twenty-front-build
+COPY --from=twenty-server-build /app/package.json /tmp/.build-sentinel
+
+COPY ./packages/twenty-front /app/packages/twenty-front
+COPY ./packages/twenty-ui /app/packages/twenty-ui
+COPY ./packages/twenty-shared /app/packages/twenty-shared
+COPY ./packages/twenty-sdk /app/packages/twenty-sdk
+RUN if [ -d /app/packages/twenty-front/build ]; then \
+      echo "Using pre-built frontend from host"; \
+    else \
+      NODE_OPTIONS="--max-old-space-size=8192" npx nx build twenty-front; \
+    fi
+
+# === Stage 4: s6-overlay ===
+FROM alpine:3.20 AS s6-fetch
+ARG S6_OVERLAY_VERSION=3.2.0.2
+ARG TARGETARCH
+RUN if [ "$TARGETARCH" = "arm64" ]; then echo "aarch64" > /tmp/s6arch; \
+    else echo "x86_64" > /tmp/s6arch; fi
+RUN S6_ARCH=$(cat /tmp/s6arch) && \
+    wget -O /tmp/s6-overlay-noarch.tar.xz \
+      "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz" && \
+    wget -O /tmp/s6-overlay-noarch.tar.xz.sha256 \
+      "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz.sha256" && \
+    wget -O /tmp/s6-overlay-arch.tar.xz \
+      "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_ARCH}.tar.xz" && \
+    wget -O /tmp/s6-overlay-arch.tar.xz.sha256 \
+      "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_ARCH}.tar.xz.sha256" && \
+    cd /tmp && \
+    NOARCH_SUM=$(awk '{print $1}' s6-overlay-noarch.tar.xz.sha256) && \
+    ARCH_SUM=$(awk '{print $1}' s6-overlay-arch.tar.xz.sha256) && \
+    echo "$NOARCH_SUM  s6-overlay-noarch.tar.xz" | sha256sum -c - && \
+    echo "$ARCH_SUM  s6-overlay-arch.tar.xz" | sha256sum -c -
+
+# === Stage 5: Final all-in-one image ===
+FROM node:22-alpine
+
+# s6-overlay
+COPY --from=s6-fetch /tmp/s6-overlay-noarch.tar.xz /tmp/
+COPY --from=s6-fetch /tmp/s6-overlay-arch.tar.xz /tmp/
+RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz \
+ && tar -C / -Jxpf /tmp/s6-overlay-arch.tar.xz \
+ && rm /tmp/s6-overlay-*.tar.xz
+
+# Infrastructure: Postgres, Redis, and utilities
+RUN apk add --no-cache \
+    postgresql16 postgresql16-contrib \
+    redis \
+    curl jq su-exec
+
+# tsx for database setup scripts
+RUN npm install -g tsx
+
+# Twenty application (both server and frontend built from source)
+COPY --from=twenty-server-build /app /app
+COPY --from=twenty-front-build /app/packages/twenty-front/build /app/packages/twenty-server/dist/front
+
+# s6 service definitions
+COPY packages/twenty-docker/twenty-app-dev/rootfs/ /
+
+# Data directories
+RUN mkdir -p /data/postgres /data/redis /app/.local-storage \
+ && chown -R postgres:postgres /data/postgres \
+ && chown 1000:1000 /data/redis /app/.local-storage
+
+ARG REACT_APP_SERVER_BASE_URL
+ARG APP_VERSION=0.0.0
+
+# Tell s6-overlay to preserve container environment variables
+ENV S6_KEEP_ENV=1
+
+# Environment defaults
+ENV PG_DATABASE_URL=postgres://twenty:twenty@localhost:5432/default \
+    SERVER_URL=http://localhost:2020 \
+    REDIS_URL=redis://localhost:6379 \
+    STORAGE_TYPE=local \
+    APP_SECRET=twenty-app-dev-secret-not-for-production \
+    REACT_APP_SERVER_BASE_URL=$REACT_APP_SERVER_BASE_URL \
+    APP_VERSION=$APP_VERSION \
+    NODE_ENV=development \
+    NODE_PORT=3000 \
+    DISABLE_DB_MIGRATIONS=true \
+    DISABLE_CRON_JOBS_REGISTRATION=true \
+    IS_BILLING_ENABLED=false \
+    SIGN_IN_PREFILLED=true
+
+EXPOSE 3000
+VOLUME ["/data/postgres", "/app/.local-storage"]
+
+LABEL org.opencontainers.image.source=https://github.com/twentyhq/twenty
+LABEL org.opencontainers.image.description="All-in-one Twenty image for local development and SDK usage. Includes PostgreSQL, Redis, server, and worker."
+
+ENTRYPOINT ["/init"]
@@ -32,7 +32,7 @@ has_schema=$(PGPASSWORD=twenty psql -h localhost -U twenty -d default -tAc \

 if [ "$has_schema" = "f" ]; then
  echo "Database appears to be empty, running initial setup..."
-  NODE_OPTIONS="--max-old-space-size=1500" node ./dist/scripts/setup-db.js
+  NODE_OPTIONS="--max-old-space-size=1500" tsx ./scripts/setup-db.ts
 fi

 # Always run migrations (idempotent — skips already-applied ones)
@@ -1,11 +1,9 @@
-# ===========================================================================
-# Shared build stages (used by both targets)
-# ===========================================================================
-
+# Base image for common dependencies
 FROM node:24-alpine AS common-deps

 WORKDIR /app

+# Copy only the necessary files for dependency resolution
 COPY ./package.json ./yarn.lock ./.yarnrc.yml ./tsconfig.base.json ./nx.json /app/
 COPY ./.yarn/releases /app/.yarn/releases
 COPY ./.yarn/patches /app/.yarn/patches
@@ -18,38 +16,25 @@ COPY ./packages/twenty-shared/package.json /app/packages/twenty-shared/
 COPY ./packages/twenty-front/package.json /app/packages/twenty-front/
 COPY ./packages/twenty-sdk/package.json /app/packages/twenty-sdk/

+# Install all dependencies
 RUN yarn && yarn cache clean && npx nx reset


+# Build the back
 FROM common-deps AS twenty-server-build

+# Copy sourcecode after installing dependences to accelerate subsequents builds
 COPY ./packages/twenty-emails /app/packages/twenty-emails
 COPY ./packages/twenty-shared /app/packages/twenty-shared
 COPY ./packages/twenty-ui /app/packages/twenty-ui
 COPY ./packages/twenty-sdk /app/packages/twenty-sdk
 COPY ./packages/twenty-server /app/packages/twenty-server

-RUN npx nx run twenty-server:lingui:extract && \
-    npx nx run twenty-server:lingui:compile && \
-    npx nx run twenty-emails:lingui:extract && \
-    npx nx run twenty-emails:lingui:compile
-
 RUN npx nx run twenty-server:build

-# Bundle setup-db script into a standalone JS file so the final image
-# doesn't need tsx or the TypeScript source tree at runtime.
-RUN npx esbuild packages/twenty-server/scripts/setup-db.ts \
-      --bundle --platform=node --outfile=packages/twenty-server/dist/scripts/setup-db.js \
-      --external:typeorm --external:dotenv --external:pg
-
-# Clean server build output (type declarations and compiled tests are not needed at runtime;
-# source maps are kept because twenty-infra extracts them from the image for Sentry uploads)
-RUN find /app/packages/twenty-server/dist -name '*.d.ts' -delete \
- && rm -rf /app/packages/twenty-server/dist/packages/twenty-server/test
-
 RUN yarn workspaces focus --production twenty-emails twenty-shared twenty-sdk twenty-server

-
+# Build the front
 FROM common-deps AS twenty-front-build

 ARG REACT_APP_SERVER_BASE_URL
@@ -58,26 +43,18 @@ COPY ./packages/twenty-front /app/packages/twenty-front
 COPY ./packages/twenty-ui /app/packages/twenty-ui
 COPY ./packages/twenty-shared /app/packages/twenty-shared
 COPY ./packages/twenty-sdk /app/packages/twenty-sdk
-RUN npx nx run twenty-front:lingui:extract && \
-    npx nx run twenty-front:lingui:compile
-# To skip the memory-intensive frontend build, pre-build on the host:
-#   npx nx build twenty-front
-# The check below will use packages/twenty-front/build/ if it already exists.
-RUN if [ -d /app/packages/twenty-front/build ]; then \
-      echo "Using pre-built frontend from host"; \
-    else \
-      NODE_OPTIONS="--max-old-space-size=8192" npx nx build twenty-front; \
-    fi
+RUN npx nx build twenty-front


-# ===========================================================================
-# Target: twenty (production)
-#   docker build --target twenty -f packages/twenty-docker/twenty/Dockerfile .
-# ===========================================================================
-
+# Final stage: Run the application
 FROM node:24-alpine AS twenty

-RUN apk add --no-cache curl jq postgresql-client
+# Used to run healthcheck in docker
+RUN apk add --no-cache curl jq
+
+RUN npm install -g tsx
+
+RUN apk add --no-cache postgresql-client

 COPY ./packages/twenty-docker/twenty/entrypoint.sh /app/entrypoint.sh
 RUN chmod +x /app/entrypoint.sh
@@ -89,135 +66,20 @@ ENV REACT_APP_SERVER_BASE_URL=$REACT_APP_SERVER_BASE_URL
 ARG APP_VERSION
 ENV APP_VERSION=$APP_VERSION

-# Workspace root config
-COPY --chown=1000 --from=twenty-server-build /app/package.json /app/yarn.lock /app/.yarnrc.yml /app/
-COPY --chown=1000 --from=twenty-server-build /app/tsconfig.base.json /app/nx.json /app/
-COPY --chown=1000 --from=twenty-server-build /app/.yarn /app/.yarn
-COPY --chown=1000 --from=twenty-server-build /app/node_modules /app/node_modules
-
-# Server package (compiled dist + package.json only, no src/)
-COPY --chown=1000 --from=twenty-server-build /app/packages/twenty-server/package.json /app/packages/twenty-server/
-COPY --chown=1000 --from=twenty-server-build /app/packages/twenty-server/dist /app/packages/twenty-server/dist
-COPY --chown=1000 --from=twenty-server-build /app/packages/twenty-server/patches /app/packages/twenty-server/patches
-
-# Workspace packages (dist + package.json; node_modules symlinks resolve to these)
-COPY --chown=1000 --from=twenty-server-build /app/packages/twenty-shared/package.json /app/packages/twenty-shared/
-COPY --chown=1000 --from=twenty-server-build /app/packages/twenty-shared/dist /app/packages/twenty-shared/dist
-COPY --chown=1000 --from=twenty-server-build /app/packages/twenty-emails/package.json /app/packages/twenty-emails/
-COPY --chown=1000 --from=twenty-server-build /app/packages/twenty-emails/dist /app/packages/twenty-emails/dist
-COPY --chown=1000 --from=twenty-server-build /app/packages/twenty-sdk/package.json /app/packages/twenty-sdk/
-COPY --chown=1000 --from=twenty-server-build /app/packages/twenty-ui/package.json /app/packages/twenty-ui/
-COPY --chown=1000 --from=twenty-server-build /app/packages/twenty-front/package.json /app/packages/twenty-front/
-
-# Frontend static build
+# Copy built applications from previous stages
+COPY --chown=1000 --from=twenty-server-build /app /app
+COPY --chown=1000 --from=twenty-server-build /app/packages/twenty-server /app/packages/twenty-server
 COPY --chown=1000 --from=twenty-front-build /app/packages/twenty-front/build /app/packages/twenty-server/dist/front

+# Set metadata and labels
 LABEL org.opencontainers.image.source=https://github.com/twentyhq/twenty
-LABEL org.opencontainers.image.description="Production Twenty image with backend and frontend."
+LABEL org.opencontainers.image.description="This image provides a consistent and reproducible environment for the backend and frontend, ensuring it deploys faster and runs the same way regardless of the deployment environment."

 RUN mkdir -p /app/.local-storage /app/packages/twenty-server/.local-storage && \
-    chown 1000:1000 /app/.local-storage /app/packages/twenty-server/.local-storage
+    chown -R 1000:1000 /app

+# Use non root user with uid 1000
 USER 1000

 CMD ["node", "dist/main"]
 ENTRYPOINT ["/app/entrypoint.sh"]
-
-
-# ===========================================================================
-# Target: twenty-app-dev (all-in-one with Postgres + Redis)
-#   docker build --target twenty-app-dev -f packages/twenty-docker/twenty/Dockerfile .
-# ===========================================================================
-
-FROM alpine:3.20 AS s6-fetch
-ARG S6_OVERLAY_VERSION=3.2.0.2
-ARG TARGETARCH
-RUN if [ "$TARGETARCH" = "arm64" ]; then echo "aarch64" > /tmp/s6arch; \
-    else echo "x86_64" > /tmp/s6arch; fi
-RUN S6_ARCH=$(cat /tmp/s6arch) && \
-    wget -O /tmp/s6-overlay-noarch.tar.xz \
-      "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz" && \
-    wget -O /tmp/s6-overlay-noarch.tar.xz.sha256 \
-      "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz.sha256" && \
-    wget -O /tmp/s6-overlay-arch.tar.xz \
-      "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_ARCH}.tar.xz" && \
-    wget -O /tmp/s6-overlay-arch.tar.xz.sha256 \
-      "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_ARCH}.tar.xz.sha256" && \
-    cd /tmp && \
-    NOARCH_SUM=$(awk '{print $1}' s6-overlay-noarch.tar.xz.sha256) && \
-    ARCH_SUM=$(awk '{print $1}' s6-overlay-arch.tar.xz.sha256) && \
-    echo "$NOARCH_SUM  s6-overlay-noarch.tar.xz" | sha256sum -c - && \
-    echo "$ARCH_SUM  s6-overlay-arch.tar.xz" | sha256sum -c -
-
-FROM node:24-alpine AS twenty-app-dev
-
-# s6-overlay
-COPY --from=s6-fetch /tmp/s6-overlay-noarch.tar.xz /tmp/
-COPY --from=s6-fetch /tmp/s6-overlay-arch.tar.xz /tmp/
-RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz \
- && tar -C / -Jxpf /tmp/s6-overlay-arch.tar.xz \
- && rm /tmp/s6-overlay-*.tar.xz
-
-RUN apk add --no-cache \
-    postgresql16 postgresql16-contrib \
-    redis \
-    curl jq su-exec
-
-# Workspace root config
-COPY --from=twenty-server-build /app/package.json /app/yarn.lock /app/.yarnrc.yml /app/
-COPY --from=twenty-server-build /app/tsconfig.base.json /app/nx.json /app/
-COPY --from=twenty-server-build /app/.yarn /app/.yarn
-COPY --from=twenty-server-build /app/node_modules /app/node_modules
-
-# Server package (compiled dist + package.json only, no src/)
-COPY --from=twenty-server-build /app/packages/twenty-server/package.json /app/packages/twenty-server/
-COPY --from=twenty-server-build /app/packages/twenty-server/dist /app/packages/twenty-server/dist
-COPY --from=twenty-server-build /app/packages/twenty-server/patches /app/packages/twenty-server/patches
-
-# Workspace packages (dist + package.json; node_modules symlinks resolve to these)
-COPY --from=twenty-server-build /app/packages/twenty-shared/package.json /app/packages/twenty-shared/
-COPY --from=twenty-server-build /app/packages/twenty-shared/dist /app/packages/twenty-shared/dist
-COPY --from=twenty-server-build /app/packages/twenty-emails/package.json /app/packages/twenty-emails/
-COPY --from=twenty-server-build /app/packages/twenty-emails/dist /app/packages/twenty-emails/dist
-COPY --from=twenty-server-build /app/packages/twenty-sdk/package.json /app/packages/twenty-sdk/
-COPY --from=twenty-server-build /app/packages/twenty-ui/package.json /app/packages/twenty-ui/
-COPY --from=twenty-server-build /app/packages/twenty-front/package.json /app/packages/twenty-front/
-
-# Frontend static build
-COPY --from=twenty-front-build /app/packages/twenty-front/build /app/packages/twenty-server/dist/front
-
-# Source maps are not needed in the dev image (no Sentry)
-RUN find /app/packages/twenty-server/dist -name '*.js.map' -delete
-
-# s6 service definitions
-COPY packages/twenty-docker/twenty-app-dev/rootfs/ /
-
-RUN mkdir -p /data/postgres /data/redis /app/.local-storage \
- && chown -R postgres:postgres /data/postgres \
- && chown 1000:1000 /data/redis /app/.local-storage
-
-ARG REACT_APP_SERVER_BASE_URL
-ARG APP_VERSION=0.0.0
-
-ENV S6_KEEP_ENV=1
-ENV PG_DATABASE_URL=postgres://twenty:twenty@localhost:5432/default \
-    SERVER_URL=http://localhost:2020 \
-    REDIS_URL=redis://localhost:6379 \
-    STORAGE_TYPE=local \
-    APP_SECRET=twenty-app-dev-secret-not-for-production \
-    REACT_APP_SERVER_BASE_URL=$REACT_APP_SERVER_BASE_URL \
-    APP_VERSION=$APP_VERSION \
-    NODE_ENV=development \
-    NODE_PORT=3000 \
-    DISABLE_DB_MIGRATIONS=true \
-    DISABLE_CRON_JOBS_REGISTRATION=true \
-    IS_BILLING_ENABLED=false \
-    SIGN_IN_PREFILLED=true
-
-EXPOSE 3000
-VOLUME ["/data/postgres", "/app/.local-storage"]
-
-LABEL org.opencontainers.image.source=https://github.com/twentyhq/twenty
-LABEL org.opencontainers.image.description="All-in-one Twenty image for local development and SDK usage. Includes PostgreSQL, Redis, server, and worker."
-
-ENTRYPOINT ["/init"]
@@ -13,7 +13,7 @@ setup_and_migrate_db() {
    has_schema=$(psql -tAc "SELECT EXISTS (SELECT 1 FROM information_schema.schemata WHERE schema_name = 'core')" ${PG_DATABASE_URL})
    if [ "$has_schema" = "f" ]; then
        echo "Database appears to be empty, running migrations."
-        NODE_OPTIONS="--max-old-space-size=1500" node ./dist/scripts/setup-db.js
+        NODE_OPTIONS="--max-old-space-size=1500" tsx ./scripts/setup-db.ts
        yarn database:migrate:prod
    fi

@@ -19,7 +19,7 @@ Apps let you extend Twenty with custom objects, fields, logic functions, AI skil
 ## Prerequisites

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

 ## Getting Started

@@ -37,7 +37,7 @@ yarn twenty app:dev
 The scaffolder supports two modes for controlling which example files are included:

 ```bash filename="Terminal"
-# Default (exhaustive): all examples (object, field, logic function, front component, view, navigation menu item, skill, agent)
+# Default (exhaustive): all examples (object, field, logic function, front component, view, navigation menu item, skill)
 npx create-twenty-app@latest my-app

 # Minimal: only core files (application-config.ts and default-role.ts)
@@ -221,18 +221,6 @@ Then add a `twenty` script:

 Now you can run all commands via `yarn twenty <command>`, e.g. `yarn twenty app:dev`, `yarn twenty help`, etc.

-## How to use a local Twenty instance
-
-If you're already running a Twenty instance locally (e.g. via `npx nx start twenty-server`), you can connect to it instead of using Docker:
-
-```bash filename="Terminal"
-# During scaffolding — skip Docker, connect to your running instance
-npx create-twenty-app@latest my-app --port 3000
-
-# Or after scaffolding — add a remote pointing to your instance
-yarn twenty remote add --local --port 3000
-```
-
 ## Troubleshooting

 - Authentication errors: run `yarn twenty auth:login` and ensure your API key has the required permissions.
@@ -77,18 +77,6 @@ npx create-twenty-app@latest my-app
 npx create-twenty-app@latest my-app --minimal
 ```

-### How to use a local Twenty instance
-
-If you're already running a local Twenty instance, you can connect to it instead of using Docker. Pass the port your local server is listening on (default: `3000`):
-
-```bash filename="Terminal"
-# During scaffolding
-npx create-twenty-app@latest my-app --port 3000
-
-# Or after scaffolding
-yarn twenty remote add --local --port 3000
-```
-
 From here you can:

 ```bash filename="Terminal"
@@ -20,7 +20,7 @@ description: أنشئ أول تطبيق Twenty خلال دقائق.
 ## المتطلبات الأساسية

 * Node.js 24+ وYarn 4
-* Docker (لخادم تطوير Twenty المحلي)
+* مساحة عمل Twenty ومفتاح واجهة برمجة التطبيقات (أنشئ واحدًا على https://app.twenty.com/settings/api-webhooks)

 ## البدء

@@ -38,7 +38,7 @@ yarn twenty app:dev
 يدعم المُهيئ وضعين للتحكم في ملفات الأمثلة التي سيتم تضمينها:

 ```bash filename="Terminal"
-# Default (exhaustive): all examples (object, field, logic function, front component, view, navigation menu item, skill, agent)
+# Default (exhaustive): all examples (object, field, logic function, front component, view, navigation menu item, skill)
 npx create-twenty-app@latest my-app

 # Minimal: only core files (application-config.ts and default-role.ts)
@@ -223,18 +223,6 @@ yarn add -D twenty-sdk

 الآن يمكنك تشغيل جميع الأوامر عبر `yarn twenty <command>`، مثلًا: `yarn twenty app:dev`، `yarn twenty help`، إلخ.

-## كيفية استخدام مثيل محلي من Twenty
-
-إذا كنت تقوم بتشغيل مثيل محلي من Twenty بالفعل (على سبيل المثال عبر `npx nx start twenty-server`)، فيمكنك الاتصال به بدلًا من استخدام Docker:
-
-```bash filename="Terminal"
-# During scaffolding — skip Docker, connect to your running instance
-npx create-twenty-app@latest my-app --port 3000
-
-# Or after scaffolding — add a remote pointing to your instance
-yarn twenty remote add --local --port 3000
-```
-
 ## استكشاف الأخطاء وإصلاحها

 * أخطاء المصادقة: شغّل `yarn twenty auth:login` وتأكد من أن مفتاح واجهة برمجة التطبيقات لديك يمتلك الأذونات المطلوبة.
@@ -78,18 +78,6 @@ npx create-twenty-app@latest my-app
 npx create-twenty-app@latest my-app --minimal
 ```

-### كيفية استخدام مثيل محلي من Twenty
-
-إذا كنت تقوم بتشغيل مثيل محلي من Twenty بالفعل، فيمكنك الاتصال به بدلًا من استخدام Docker. مرِّر المنفذ الذي يستمع عليه الخادم المحلي لديك (القيمة الافتراضية: `3000`):
-
-```bash filename="Terminal"
-# During scaffolding
-npx create-twenty-app@latest my-app --port 3000
-
-# Or after scaffolding
-yarn twenty remote add --local --port 3000
-```
-
 من هنا يمكنك:

 ```bash filename="Terminal"
@@ -20,7 +20,7 @@ Apps ermöglichen es Ihnen, Twenty mit benutzerdefinierten Objekten, Feldern, Lo
 ## Voraussetzungen

 * Node.js 24+ und Yarn 4
-* Docker (für den lokalen Twenty-Dev-Server)
+* Ein Twenty-Workspace und ein API-Schlüssel (unter https://app.twenty.com/settings/api-webhooks erstellen)

 ## Erste Schritte

@@ -38,7 +38,7 @@ yarn twenty app:dev
 Das Scaffolding-Tool unterstützt zwei Modi, um zu steuern, welche Beispieldateien enthalten sind:

 ```bash filename="Terminal"
-# Default (exhaustive): all examples (object, field, logic function, front component, view, navigation menu item, skill, agent)
+# Default (exhaustive): all examples (object, field, logic function, front component, view, navigation menu item, skill)
 npx create-twenty-app@latest my-app

 # Minimal: only core files (application-config.ts and default-role.ts)
@@ -223,18 +223,6 @@ Fügen Sie dann ein `twenty`-Skript hinzu:

 Jetzt können Sie alle Befehle über `yarn twenty <command>` ausführen, z. B. `yarn twenty app:dev`, `yarn twenty help` usw.

-## So verwenden Sie eine lokale Twenty-Instanz
-
-Wenn Sie bereits lokal eine Twenty-Instanz ausführen (z. B. über `npx nx start twenty-server`), können Sie sich damit verbinden, anstatt Docker zu verwenden:
-
-```bash filename="Terminal"
-# During scaffolding — skip Docker, connect to your running instance
-npx create-twenty-app@latest my-app --port 3000
-
-# Or after scaffolding — add a remote pointing to your instance
-yarn twenty remote add --local --port 3000
-```
-
 ## Fehlerbehebung

 * Authentifizierungsfehler: Führen Sie `yarn twenty auth:login` aus und stellen Sie sicher, dass Ihr API-Schlüssel die erforderlichen Berechtigungen hat.
@@ -78,18 +78,6 @@ npx create-twenty-app@latest my-app
 npx create-twenty-app@latest my-app --minimal
 ```

-### So verwenden Sie eine lokale Twenty-Instanz
-
-Wenn Sie bereits eine lokale Twenty-Instanz ausführen, können Sie sich damit verbinden, anstatt Docker zu verwenden. Geben Sie den Port an, auf dem Ihr lokaler Server lauscht (Standard: `3000`):
-
-```bash filename="Terminal"
-# Während des Scaffoldings
-npx create-twenty-app@latest my-app --port 3000
-
-# Oder nach dem Scaffolding
-yarn twenty remote add --local --port 3000
-```
-
 Von hier aus können Sie:

 ```bash filename="Terminal"
@@ -20,7 +20,7 @@ Le app ti permettono di estendere Twenty con oggetti, campi, funzioni logiche, c
 ## Prerequisiti

 * Node.js 24+ e Yarn 4
-* Docker (per il server di sviluppo locale di Twenty)
+* Uno spazio di lavoro Twenty e una chiave API (creane una su https://app.twenty.com/settings/api-webhooks)

 ## Per iniziare

@@ -38,7 +38,7 @@ yarn twenty app:dev
 Lo strumento di scaffolding supporta due modalità per controllare quali file di esempio vengono inclusi:

 ```bash filename="Terminal"
-# Default (exhaustive): all examples (object, field, logic function, front component, view, navigation menu item, skill, agent)
+# Default (exhaustive): all examples (object, field, logic function, front component, view, navigation menu item, skill)
 npx create-twenty-app@latest my-app

 # Minimal: only core files (application-config.ts and default-role.ts)
@@ -223,18 +223,6 @@ Quindi aggiungi uno script `twenty`:

 Ora puoi eseguire tutti i comandi tramite `yarn twenty <command>`, ad es. `yarn twenty app:dev`, `yarn twenty help`, ecc.

-## Come utilizzare un'istanza locale di Twenty
-
-Se stai già eseguendo un'istanza di Twenty in locale (ad es. tramite `npx nx start twenty-server`), puoi connetterti ad essa invece di usare Docker:
-
-```bash filename="Terminal"
-# During scaffolding — skip Docker, connect to your running instance
-npx create-twenty-app@latest my-app --port 3000
-
-# Or after scaffolding — add a remote pointing to your instance
-yarn twenty remote add --local --port 3000
-```
-
 ## Risoluzione dei problemi

 * Errori di autenticazione: esegui `yarn twenty auth:login` e assicurati che la tua chiave API abbia i permessi richiesti.
@@ -78,18 +78,6 @@ npx create-twenty-app@latest my-app
 npx create-twenty-app@latest my-app --minimal
 ```

-### Come utilizzare un'istanza locale di Twenty
-
-Se stai già eseguendo un'istanza locale di Twenty, puoi connetterti ad essa invece di usare Docker. Indica la porta su cui il tuo server locale è in ascolto (predefinita: `3000`):
-
-```bash filename="Terminal"
-# Durante lo scaffolding
-npx create-twenty-app@latest my-app --port 3000
-
-# Oppure dopo lo scaffolding
-yarn twenty remote add --local --port 3000
-```
-
 Da qui puoi:

 ```bash filename="Terminal"
@@ -20,7 +20,7 @@ Os apps permitem que você estenda o Twenty com objetos, campos, funções de l
 ## Pré-requisitos

 * Node.js 24+ e Yarn 4
-* Docker (para o servidor de desenvolvimento local do Twenty)
+* Um espaço de trabalho do Twenty e uma chave de API (crie uma em https://app.twenty.com/settings/api-webhooks)

 ## Primeiros passos

@@ -38,7 +38,7 @@ yarn twenty app:dev
 O gerador de estrutura oferece suporte a dois modos para controlar quais arquivos de exemplo são incluídos:

 ```bash filename="Terminal"
-# Default (exhaustive): all examples (object, field, logic function, front component, view, navigation menu item, skill, agent)
+# Default (exhaustive): all examples (object, field, logic function, front component, view, navigation menu item, skill)
 npx create-twenty-app@latest my-app

 # Minimal: only core files (application-config.ts and default-role.ts)
@@ -223,18 +223,6 @@ Em seguida, adicione um script `twenty`:

 Agora você pode executar todos os comandos via `yarn twenty <command>`, por exemplo, `yarn twenty app:dev`, `yarn twenty help`, etc.

-## Como usar uma instância local do Twenty
-
-Se você já estiver executando uma instância do Twenty localmente (por exemplo, via `npx nx start twenty-server`), você pode conectar-se a ela em vez de usar o Docker:
-
-```bash filename="Terminal"
-# During scaffolding — skip Docker, connect to your running instance
-npx create-twenty-app@latest my-app --port 3000
-
-# Or after scaffolding — add a remote pointing to your instance
-yarn twenty remote add --local --port 3000
-```
-
 ## Resolução de Problemas

 * Erros de autenticação: execute `yarn twenty auth:login` e certifique-se de que sua chave de API tenha as permissões necessárias.
@@ -78,18 +78,6 @@ npx create-twenty-app@latest my-app
 npx create-twenty-app@latest my-app --minimal
 ```

-### How to use a local Twenty instance
-
-If you're already running a local Twenty instance, you can connect to it instead of using Docker. Pass the port your local server is listening on (default: `3000`):
-
-```bash filename="Terminal"
-# During scaffolding
-npx create-twenty-app@latest my-app --port 3000
-
-# Or after scaffolding
-yarn twenty remote add --local --port 3000
-```
-
 A partir daqui você pode:

 ```bash filename="Terminal"
@@ -20,7 +20,7 @@ Aplicațiile vă permit să extindeți Twenty cu obiecte personalizate, câmpuri
 ## Cerințe

 * Node.js 24+ și Yarn 4
-* Docker (pentru serverul local de dezvoltare Twenty)
+* Un spațiu de lucru Twenty și o cheie API (creați una la https://app.twenty.com/settings/api-webhooks)

 ## Începeți

@@ -38,7 +38,7 @@ yarn twenty app:dev
 Generatorul de schelet acceptă două moduri pentru a controla ce fișiere de exemplu sunt incluse:

 ```bash filename="Terminal"
-# Default (exhaustive): all examples (object, field, logic function, front component, view, navigation menu item, skill, agent)
+# Default (exhaustive): all examples (object, field, logic function, front component, view, navigation menu item, skill)
 npx create-twenty-app@latest my-app

 # Minimal: only core files (application-config.ts and default-role.ts)
@@ -223,18 +223,6 @@ Apoi adăugați un script `twenty`:

 Acum puteți rula toate comenzile prin `yarn twenty <command>`, de ex. `yarn twenty app:dev`, `yarn twenty help`, etc.

-## Cum să folosești o instanță Twenty locală
-
-Dacă rulezi deja local o instanță Twenty (de exemplu prin `npx nx start twenty-server`), te poți conecta la ea în loc să folosești Docker:
-
-```bash filename="Terminal"
-# During scaffolding — skip Docker, connect to your running instance
-npx create-twenty-app@latest my-app --port 3000
-
-# Or after scaffolding — add a remote pointing to your instance
-yarn twenty remote add --local --port 3000
-```
-
 ## Depanare

 * Erori de autentificare: rulați `yarn twenty auth:login` și asigurați-vă că cheia API are permisiunile necesare.
@@ -78,18 +78,6 @@ npx create-twenty-app@latest my-app
 npx create-twenty-app@latest my-app --minimal
 ```

-### How to use a local Twenty instance
-
-If you're already running a local Twenty instance, you can connect to it instead of using Docker. Pass the port your local server is listening on (default: `3000`):
-
-```bash filename="Terminal"
-# During scaffolding
-npx create-twenty-app@latest my-app --port 3000
-
-# Or after scaffolding
-yarn twenty remote add --local --port 3000
-```
-
 De aici puteți:

 ```bash filename="Terminal"
@@ -20,7 +20,7 @@ description: Создайте своё первое приложение Twenty
 ## Требования

 * Node.js 24+ и Yarn 4
-* Docker (для локального сервера разработки Twenty)
+* Рабочее пространство Twenty и ключ API (создайте его на https://app.twenty.com/settings/api-webhooks)

 ## Начало работы

@@ -38,7 +38,7 @@ yarn twenty app:dev
 Генератор каркаса поддерживает два режима для управления тем, какие файлы-примеры включаются:

 ```bash filename="Terminal"
-# Default (exhaustive): all examples (object, field, logic function, front component, view, navigation menu item, skill, agent)
+# Default (exhaustive): all examples (object, field, logic function, front component, view, navigation menu item, skill)
 npx create-twenty-app@latest my-app

 # Minimal: only core files (application-config.ts and default-role.ts)
@@ -223,18 +223,6 @@ yarn add -D twenty-sdk

 Теперь вы можете запускать все команды через `yarn twenty <command>`, например, `yarn twenty app:dev`, `yarn twenty help` и т. д.

-## Как использовать локальный экземпляр Twenty
-
-Если у вас уже запущен локально экземпляр Twenty (например, через `npx nx start twenty-server`), вы можете подключиться к нему вместо использования Docker:
-
-```bash filename="Terminal"
-# During scaffolding — skip Docker, connect to your running instance
-npx create-twenty-app@latest my-app --port 3000
-
-# Or after scaffolding — add a remote pointing to your instance
-yarn twenty remote add --local --port 3000
-```
-
 ## Устранение неполадок

 * Ошибки аутентификации: выполните `yarn twenty auth:login` и убедитесь, что у вашего ключа API есть необходимые права.
@@ -78,18 +78,6 @@ npx create-twenty-app@latest my-app
 npx create-twenty-app@latest my-app --minimal
 ```

-### How to use a local Twenty instance
-
-If you're already running a local Twenty instance, you can connect to it instead of using Docker. Pass the port your local server is listening on (default: `3000`):
-
-```bash filename="Terminal"
-# During scaffolding
-npx create-twenty-app@latest my-app --port 3000
-
-# Or after scaffolding
-yarn twenty remote add --local --port 3000
-```
-
 Отсюда вы можете:

 ```bash filename="Terminal"
@@ -20,7 +20,7 @@ Uygulamalar, Twenty'yi özel nesneler, alanlar, mantık işlevleri, Yapay Zeka y
 ## Ön Gereksinimler

 * Node.js 24+ ve Yarn 4
-* Docker (yerel Twenty geliştirme sunucusu için)
+* Bir Twenty çalışma alanı ve bir API anahtarı (https://app.twenty.com/settings/api-webhooks adresinde oluşturun)

 ## Başlarken

@@ -38,7 +38,7 @@ yarn twenty app:dev
 İskelet oluşturucu, hangi örnek dosyaların dahil edileceğini kontrol etmek için iki modu destekler:

 ```bash filename="Terminal"
-# Default (exhaustive): all examples (object, field, logic function, front component, view, navigation menu item, skill, agent)
+# Default (exhaustive): all examples (object, field, logic function, front component, view, navigation menu item, skill)
 npx create-twenty-app@latest my-app

 # Minimal: only core files (application-config.ts and default-role.ts)
@@ -223,18 +223,6 @@ Ardından bir `twenty` betiği ekleyin:

 Artık tüm komutları `yarn twenty <command>` üzerinden çalıştırabilirsiniz; örn. `yarn twenty app:dev`, `yarn twenty help` vb.

-## Yerel bir Twenty örneği nasıl kullanılır?
-
-Zaten yerel olarak bir Twenty örneği çalıştırıyorsanız (örneğin `npx nx start twenty-server` ile), Docker kullanmak yerine ona bağlanabilirsiniz:
-
-```bash filename="Terminal"
-# During scaffolding — skip Docker, connect to your running instance
-npx create-twenty-app@latest my-app --port 3000
-
-# Or after scaffolding — add a remote pointing to your instance
-yarn twenty remote add --local --port 3000
-```
-
 ## Sorun Giderme

 * Kimlik doğrulama hataları: `yarn twenty auth:login` çalıştırın ve API anahtarınızın gerekli izinlere sahip olduğundan emin olun.
@@ -78,18 +78,6 @@ npx create-twenty-app@latest my-app
 npx create-twenty-app@latest my-app --minimal
 ```

-### How to use a local Twenty instance
-
-If you're already running a local Twenty instance, you can connect to it instead of using Docker. Pass the port your local server is listening on (default: `3000`):
-
-```bash filename="Terminal"
-# During scaffolding
-npx create-twenty-app@latest my-app --port 3000
-
-# Or after scaffolding
-yarn twenty remote add --local --port 3000
-```
-
 Buradan şunları yapabilirsiniz:

 ```bash filename="Terminal"
@@ -20,7 +20,7 @@ description: 几分钟内创建你的第一个 Twenty 应用。
 ## 先决条件

 * Node.js 24+ 和 Yarn 4
-* Docker (用于本地 Twenty 开发服务器)
+* 一个 Twenty 工作空间和一个 API 密钥（在 https://app.twenty.com/settings/api-webhooks 创建）

 ## 开始使用

@@ -38,7 +38,7 @@ yarn twenty app:dev
 脚手架工具支持两种模式，用于控制包含哪些示例文件：

 ```bash filename="Terminal"
-# Default (exhaustive): all examples (object, field, logic function, front component, view, navigation menu item, skill, agent)
+# Default (exhaustive): all examples (object, field, logic function, front component, view, navigation menu item, skill)
 npx create-twenty-app@latest my-app

 # Minimal: only core files (application-config.ts and default-role.ts)
@@ -223,18 +223,6 @@ yarn add -D twenty-sdk

 现在你可以通过 `yarn twenty <command>` 运行所有命令，例如 `yarn twenty app:dev`、`yarn twenty help` 等。

-## 如何使用本地 Twenty 实例
-
-如果你已经在本地运行一个 Twenty 实例（例如通过 `npx nx start twenty-server`），你可以连接到它，而不是使用 Docker:
-
-```bash filename="Terminal"
-# During scaffolding — skip Docker, connect to your running instance
-npx create-twenty-app@latest my-app --port 3000
-
-# Or after scaffolding — add a remote pointing to your instance
-yarn twenty remote add --local --port 3000
-```
-
 ## 故障排除

 * 身份验证错误：运行 `yarn twenty auth:login`，并确保你的 API 密钥具有所需权限。
@@ -78,18 +78,6 @@ npx create-twenty-app@latest my-app
 npx create-twenty-app@latest my-app --minimal
 ```

-### 如何使用本地 Twenty 实例
-
-如果你已经在本地运行一个 Twenty 实例，你可以连接到它，而不是使用 Docker。 指定本地服务器正在监听的端口（默认：`3000`）：
-
-```bash filename="Terminal"
-# 在脚手架过程中
-npx create-twenty-app@latest my-app --port 3000
-
-# 或在脚手架之后
-yarn twenty remote add --local --port 3000
-```
-
 从这里您可以：

 ```bash filename="Terminal"
@@ -6,14 +6,8 @@ const query = `query FindOnePerson($objectRecordId: UUID!) {
  person(
    filter: {or: [{deletedAt: {is: NULL}}, {deletedAt: {is: NOT_NULL}}], id: {eq: $objectRecordId}}
  ) {
-    previousCompanies {
-      edges {
-        node {
-          company {
-            name
-          }
-        }
-      }
+    company {
+      name
    }
    emails {
      primaryEmail
@@ -49,8 +43,8 @@ const query = `query FindOnePerson($objectRecordId: UUID!) {
 }`

 test('Create and update record', async ({ page }) => {
-    await page.goto('/objects/people');
-    await page.getByRole('button', { name: 'Create new Person' }).click();
+    await page.getByRole('link', { name: 'People' }).click();
+    await page.getByRole('button', { name: 'Create new record' }).click();

    // Generate a random email for testing
    const randomEmail = `testuser_${Math.random().toString(36).substring(2, 10)}@example.com`;
@@ -113,17 +107,29 @@ test('Create and update record', async ({ page }) => {
    await options.getByText('Hybrid').first().click({force: true});
    recordFieldList.getByText('Work Preference').first().click({force: true});

-    // Fill previous companies
-    await recordFieldList.getByText('Previous Companies').first().click({force: true});
-    await recordFieldList.getByText('Previous Companies').nth(1).click({force: true});
-    await page.getByPlaceholder('Search').fill('VMw');
-    await page.getByRole('listbox').first().getByText('VMware').click({force: true});
-    await page.keyboard.press('Escape');
+    // Fill company relation
+    const companyRelationWidget = page.getByTestId(/dynamic-relation-widget-.+-Company/);
+    await expect(companyRelationWidget).toBeVisible();

-    // Open full record page to get person ID
-    await page.getByRole('button', { name: /^Open/ }).click();
-    await page.waitForURL(/\/object\/person\//);
-    const newPersonId = page.url().match(/\/object\/person\/([a-f0-9-]+)/)?.[1];
+    await companyRelationWidget.hover();
+    await companyRelationWidget.locator('.tabler-icon-pencil').click();
+    await page.getByRole('textbox', { name: 'Search' }).fill('VMw');
+    await expect(page.getByRole('option', { name: 'VMware' })).toBeVisible();
+    const [updatePersonResponse] = await Promise.all([
+      page.waitForResponse(async (response) => {
+        if (!response.url().endsWith('/graphql')) {
+          return false;
+        }
+
+        const requestBody = response.request().postDataJSON();
+
+        return requestBody.operationName === 'UpdateOnePerson';
+      }),
+      await page.getByRole('option', { name: 'VMware' }).click({force: true})
+    ]);
+
+    const body = await updatePersonResponse.json()
+    const newPersonId = body.data.updatePerson.id;

    // Check data was saved
    const { authToken } = await getAccessAuthToken(page);
@@ -149,6 +155,6 @@ test('Create and update record', async ({ page }) => {
    expect(findOnePersonReponseBody.data.person.linkedinLink.primaryLinkUrl).toBe('linkedin.com/johndoe');
    expect(findOnePersonReponseBody.data.person.phones.primaryPhoneNumber).toBe('611223344');
    expect(findOnePersonReponseBody.data.person.workPreference).toEqual(['HYBRID']);
-    expect(findOnePersonReponseBody.data.person.previousCompanies.edges[0].node.company.name).toBe('VMware');
+    expect(findOnePersonReponseBody.data.person.company.name).toBe('VMware');

 });
@@ -38,7 +38,6 @@
    },
    "lingui:extract": {
      "executor": "nx:run-commands",
-      "dependsOn": ["^build"],
      "options": {
        "cwd": "{projectRoot}",
        "command": "lingui extract --overwrite --clean"
@@ -46,7 +45,6 @@
    },
    "lingui:compile": {
      "executor": "nx:run-commands",
-      "dependsOn": ["^build"],
      "options": {
        "cwd": "{projectRoot}",
        "command": "lingui compile --typescript"
@@ -10,11 +10,13 @@ module.exports = {
    './src/modules/views/graphql/**/*.{ts,tsx}',
    './src/modules/ai/graphql/**/*.{ts,tsx}',
    './src/modules/applications/graphql/**/*.{ts,tsx}',
+    './src/modules/application-variables/graphql/**/*.{ts,tsx}',

    './src/modules/workspace/graphql/**/*.{ts,tsx}',
    './src/modules/workspace-member/graphql/**/*.{ts,tsx}',
    './src/modules/workspace-invitation/graphql/**/*.{ts,tsx}',

+    './src/modules/billing/graphql/**/*.{ts,tsx}',
    './src/modules/settings/**/graphql/**/*.{ts,tsx}',
    './src/modules/logic-functions/graphql/**/*.{ts,tsx}',

@@ -292,7 +292,6 @@
    },
    "lingui:extract": {
      "executor": "nx:run-commands",
-      "dependsOn": ["^build"],
      "options": {
        "cwd": "{projectRoot}",
        "command": "lingui extract --overwrite --clean"
@@ -300,7 +299,6 @@
    },
    "lingui:compile": {
      "executor": "nx:run-commands",
-      "dependsOn": ["^build"],
      "options": {
        "cwd": "{projectRoot}",
        "command": "lingui compile --typescript"
--- a/Show More
+++ b/Show More