feat(core): block diff ui

feat(core): markdown-diff & patch apply
2026-02-04 16:44:56 +00:00 · 2025-06-19 11:30:58 +08:00 · 2025-06-18 11:12:39 +08:00
1380 changed files with 17240 additions and 57639 deletions
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -25,7 +25,7 @@ services:
    image: redis

  indexer:
-    image: manticoresearch/manticore:${MANTICORE_VERSION:-10.1.0}
+    image: manticoresearch/manticore:${MANTICORE_VERSION:-9.3.2}
    ulimits:
      nproc: 65535
      nofile:
--- a/.docker/dev/.env.example
+++ b/.docker/dev/.env.example
@@ -12,4 +12,4 @@ DB_DATABASE_NAME=affine
 # ELASTIC_PLATFORM=linux/arm64

 # manticoresearch
-MANTICORE_VERSION=10.1.0
+MANTICORE_VERSION=9.3.2
--- a/.docker/dev/README.md
+++ b/.docker/dev/README.md
@@ -15,7 +15,13 @@ yarn affine cert --install

 ```bash
 # certificates will be located at `./.docker/dev/certs/${domain}`
-yarn affine cert --domain affine.localhost
+yarn affine cert --domain dev.affine.fail
 ```

-### 3. Enable nginx service in compose.yml
+### 3. Enable dns and nginx service in compose.yml
+
+### 4. Add custom dns server
+
+```bash
+echo "nameserver 127.0.0.1" | sudo tee /etc/resolver/dev.affine.fail
+```
--- a/.docker/dev/compose.yml.example
+++ b/.docker/dev/compose.yml.example
@@ -26,7 +26,7 @@ services:

  # https://manual.manticoresearch.com/Starting_the_server/Docker
  manticoresearch:
-    image: manticoresearch/manticore:${MANTICORE_VERSION:-10.1.0}
+    image: manticoresearch/manticore:${MANTICORE_VERSION:-9.3.2}
    ports:
      - 9308:9308
    ulimits:
@@ -73,6 +73,17 @@ services:
  #     timeout: 10s
  #     retries: 120

+  # dns:
+  #   image: strm/dnsmasq
+  #   volumes:
+  #     - ./dnsmasq.conf:/etc/dnsmasq.d/local.conf
+  #   ports:
+  #     - "53:53/udp"
+  #   cap_add:
+  #     - NET_ADMIN
+  #   depends_on:
+  #     - nginx
+
  # nginx:
  #   image: nginx:alpine
  #   volumes:
--- a/.docker/dev/dnsmasq.conf
+++ b/.docker/dev/dnsmasq.conf
@@ -0,0 +1,2 @@
+log-queries
+address=/dev.affine.fail/127.0.0.1
--- a/.docker/selfhost/compose.yml
+++ b/.docker/selfhost/compose.yml
@@ -1,7 +1,7 @@
 name: affine
 services:
  affine:
-    image: ghcr.io/toeverything/affine:${AFFINE_REVISION:-stable}
+    image: ghcr.io/toeverything/affine-graphql:${AFFINE_REVISION:-stable}
    container_name: affine_server
    ports:
      - '${PORT:-3010}:3010'
@@ -25,7 +25,7 @@ services:
    restart: unless-stopped

  affine_migration:
-    image: ghcr.io/toeverything/affine:${AFFINE_REVISION:-stable}
+    image: ghcr.io/toeverything/affine-graphql:${AFFINE_REVISION:-stable}
    container_name: affine_migration_job
    volumes:
      # custom configurations
--- a/.docker/selfhost/schema.json
+++ b/.docker/selfhost/schema.json
@@ -540,11 +540,6 @@
          "description": "Where the server get deployed(FQDN).\n@default \"localhost\"\n@environment `AFFINE_SERVER_HOST`",
          "default": "localhost"
        },
-        "hosts": {
-          "type": "array",
-          "description": "Multiple hosts the server will accept requests from.\n@default []",
-          "default": []
-        },
        "port": {
          "type": "number",
          "description": "Which port the server will listen on.\n@default 3010\n@environment `AFFINE_SERVER_PORT`",
@@ -565,11 +560,6 @@
          "type": "boolean",
          "description": "Only allow users with early access features to access the app\n@default false",
          "default": false
-        },
-        "allowGuestDemoWorkspace": {
-          "type": "boolean",
-          "description": "Whether allow guest users to create demo workspaces.\n@default true",
-          "default": true
        }
      }
    },
@@ -737,11 +727,6 @@
          },
          "default": {}
        },
-        "providers.morph": {
-          "type": "object",
-          "description": "The config for the morph provider.\n@default {}",
-          "default": {}
-        },
        "unsplash": {
          "type": "object",
          "description": "The config for the unsplash key.\n@default {\"key\":\"\"}",
@@ -879,6 +864,22 @@
        }
      }
    },
+    "customerIo": {
+      "type": "object",
+      "description": "Configuration for customerIo module",
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "description": "Enable customer.io integration\n@default false",
+          "default": false
+        },
+        "token": {
+          "type": "string",
+          "description": "Customer.io token\n@default \"\"",
+          "default": ""
+        }
+      }
+    },
    "indexer": {
      "type": "object",
      "description": "Configuration for indexer module",
@@ -920,22 +921,6 @@
        }
      }
    },
-    "customerIo": {
-      "type": "object",
-      "description": "Configuration for customerIo module",
-      "properties": {
-        "enabled": {
-          "type": "boolean",
-          "description": "Enable customer.io integration\n@default false",
-          "default": false
-        },
-        "token": {
-          "type": "string",
-          "description": "Customer.io token\n@default \"\"",
-          "default": ""
-        }
-      }
-    },
    "oauth": {
      "type": "object",
      "description": "Configuration for oauth module",
--- a/.github/actions/deploy/action.yml
+++ b/.github/actions/deploy/action.yml
@@ -1,6 +1,9 @@
 name: 'Deploy to Cluster'
 description: 'Deploy AFFiNE Cloud to cluster'
 inputs:
+  build-type:
+    description: 'Align with App build type, canary|beta|stable|internal'
+    default: 'canary'
  gcp-project-number:
    description: 'GCP project number'
    required: true
@@ -33,3 +36,5 @@ runs:
    - name: Deploy
      shell: bash
      run: node ./.github/actions/deploy/deploy.mjs
+      env:
+        BUILD_TYPE: '${{ inputs.build-type }}'
--- a/.github/actions/deploy/deploy.mjs
+++ b/.github/actions/deploy/deploy.mjs
@@ -126,10 +126,7 @@ const createHelmCommand = ({ isDryRun }) => {
        ? 'internal'
        : 'dev';

-  const hosts = (DEPLOY_HOST || CANARY_DEPLOY_HOST)
-    .split(',')
-    .map(host => host.trim())
-    .filter(host => host);
+  const host = DEPLOY_HOST || CANARY_DEPLOY_HOST;
  const deployCommand = [
    `helm upgrade --install affine .github/helm/affine`,
    `--namespace  ${namespace}`,
@@ -138,9 +135,7 @@ const createHelmCommand = ({ isDryRun }) => {
    `--set-string global.app.buildType="${buildType}"`,
    `--set        global.ingress.enabled=true`,
    `--set-json   global.ingress.annotations="{ \\"kubernetes.io/ingress.class\\": \\"gce\\", \\"kubernetes.io/ingress.allow-http\\": \\"true\\", \\"kubernetes.io/ingress.global-static-ip-name\\": \\"${STATIC_IP_NAME}\\" }"`,
-    ...hosts.map(
-      (host, index) => `--set global.ingress.hosts[${index}]=${host}`
-    ),
+    `--set-string global.ingress.host="${host}"`,
    `--set-string global.version="${APP_VERSION}"`,
    ...redisAndPostgres,
    ...indexerOptions,
@@ -148,14 +143,14 @@ const createHelmCommand = ({ isDryRun }) => {
    `--set-string web.image.tag="${imageTag}"`,
    `--set        graphql.replicaCount=${replica.graphql}`,
    `--set-string graphql.image.tag="${imageTag}"`,
-    `--set        graphql.app.host=${hosts[0]}`,
+    `--set        graphql.app.host=${host}`,
    `--set        sync.replicaCount=${replica.sync}`,
    `--set-string sync.image.tag="${imageTag}"`,
    `--set-string renderer.image.tag="${imageTag}"`,
-    `--set        renderer.app.host=${hosts[0]}`,
+    `--set        renderer.app.host=${host}`,
    `--set        renderer.replicaCount=${replica.renderer}`,
    `--set-string doc.image.tag="${imageTag}"`,
-    `--set        doc.app.host=${hosts[0]}`,
+    `--set        doc.app.host=${host}`,
    `--set        doc.replicaCount=${replica.doc}`,
    ...serviceAnnotations,
    ...resources,
--- a/.github/actions/prepare-release/action.yml
+++ b/.github/actions/prepare-release/action.yml
@@ -1,41 +0,0 @@
-name: Prepare Release
-description: 'Prepare Release'
-outputs:
-  APP_VERSION:
-    description: 'App Version'
-    value: ${{ steps.get-version.outputs.APP_VERSION }}
-  GIT_SHORT_HASH:
-    description: 'Git Short Hash'
-    value: ${{ steps.get-version.outputs.GIT_SHORT_HASH }}
-  BUILD_TYPE:
-    description: 'Build Type'
-    value: ${{ steps.get-version.outputs.BUILD_TYPE }}
-runs:
-  using: 'composite'
-  steps:
-    - name: Get Version
-      id: get-version
-      shell: bash
-      run: |
-        GIT_SHORT_HASH=$(git rev-parse --short HEAD)
-        if [ "${{ github.ref_type }}" == "tag" ]; then
-          APP_VERSION=$(echo "${{ github.ref_name }}" | sed 's/^v//')
-        else
-          APP_VERSION=$(date '+%Y.%-m.%-d-canary.%-H%M')
-        fi
-        if [[ "$APP_VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-          BUILD_TYPE=stable
-        elif [[ "$APP_VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+-beta\.[0-9]+$ ]]; then
-          BUILD_TYPE=beta
-        elif [[ "$APP_VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+-canary\.[0-9a-f]+$ ]]; then
-          BUILD_TYPE=canary
-        else
-          echo "Error: unsupported version string: $APP_VERSION" >&2
-          exit 1
-        fi
-        echo $APP_VERSION
-        echo $GIT_SHORT_HASH
-        echo $BUILD_TYPE
-        echo "APP_VERSION=$APP_VERSION" >> "$GITHUB_OUTPUT"
-        echo "GIT_SHORT_HASH=$GIT_SHORT_HASH" >> "$GITHUB_OUTPUT"
-        echo "BUILD_TYPE=$BUILD_TYPE" >> "$GITHUB_OUTPUT"
--- a/.github/actions/setup-version/action.yml
+++ b/.github/actions/setup-version/action.yml
@@ -1,18 +1,24 @@
 name: Setup Version
 description: 'Setup Version'
-inputs:
-  app-version:
+outputs:
+  APP_VERSION:
    description: 'App Version'
-    required: true
-  ios-app-version:
-    description: 'iOS App Store Version (Optional, use App version if empty)'
-    required: false
-    type: string
+    value: ${{ steps.version.outputs.APP_VERSION }}
 runs:
  using: 'composite'
  steps:
    - name: 'Write Version'
+      id: version
      shell: bash
-      env:
-        IOS_APP_VERSION: ${{ inputs.ios-app-version }}
-      run: ./scripts/set-version.sh ${{ inputs.app-version }}
+      run: |
+        if [ "${{ github.ref_type }}" == "tag" ]; then
+          APP_VERSION=$(echo "${{ github.ref_name }}" | sed 's/^v//')
+        else
+          PACKAGE_VERSION=$(node -p "require('./package.json').version")
+          TIME_VERSION=$(date +%Y%m%d%H%M)
+          GIT_SHORT_HASH=$(git rev-parse --short HEAD)
+          APP_VERSION=$PACKAGE_VERSION-nightly-$GIT_SHORT_HASH
+        fi
+        echo $APP_VERSION
+        echo "APP_VERSION=$APP_VERSION" >> "$GITHUB_OUTPUT"
+        ./scripts/set-version.sh $APP_VERSION
--- a/.github/deployment/node/Dockerfile
+++ b/.github/deployment/node/Dockerfile
@@ -7,10 +7,7 @@ COPY ./packages/frontend/apps/mobile/dist /app/static/mobile
 WORKDIR /app

 RUN apt-get update && \
-  apt-get install -y --no-install-recommends openssl libjemalloc2 && \
+  apt-get install -y --no-install-recommends openssl && \
  rm -rf /var/lib/apt/lists/*

-# Enable jemalloc by preloading the library
-ENV LD_PRELOAD=libjemalloc.so.2
-
 CMD ["node", "./dist/main.js"]
--- a/.github/helm/affine/Chart.yaml
+++ b/.github/helm/affine/Chart.yaml
@@ -3,4 +3,4 @@ name: affine
 description: AFFiNE cloud chart
 type: application
 version: 0.0.0
-appVersion: "0.22.4"
+appVersion: "0.21.0"
--- a/.github/helm/affine/charts/doc/Chart.yaml
+++ b/.github/helm/affine/charts/doc/Chart.yaml
@@ -3,7 +3,7 @@ name: doc
 description: AFFiNE doc server
 type: application
 version: 0.0.0
-appVersion: "0.22.4"
+appVersion: "0.20.0"
 dependencies:
  - name: gcloud-sql-proxy
    version: 0.0.0
--- a/.github/helm/affine/charts/doc/values.yaml
+++ b/.github/helm/affine/charts/doc/values.yaml
@@ -1,6 +1,6 @@
 replicaCount: 1
 image:
-  repository: ghcr.io/toeverything/affine
+  repository: ghcr.io/toeverything/affine-graphql
  pullPolicy: IfNotPresent
  tag: ''

--- a/.github/helm/affine/charts/graphql/Chart.yaml
+++ b/.github/helm/affine/charts/graphql/Chart.yaml
@@ -3,7 +3,7 @@ name: graphql
 description: AFFiNE GraphQL server
 type: application
 version: 0.0.0
-appVersion: "0.22.4"
+appVersion: "0.21.0"
 dependencies:
  - name: gcloud-sql-proxy
    version: 0.0.0
--- a/.github/helm/affine/charts/graphql/values.yaml
+++ b/.github/helm/affine/charts/graphql/values.yaml
@@ -1,6 +1,6 @@
 replicaCount: 1
 image:
-  repository: ghcr.io/toeverything/affine
+  repository: ghcr.io/toeverything/affine-graphql
  pullPolicy: IfNotPresent
  tag: ''

--- a/.github/helm/affine/charts/renderer/Chart.yaml
+++ b/.github/helm/affine/charts/renderer/Chart.yaml
@@ -3,7 +3,7 @@ name: renderer
 description: AFFiNE renderer server
 type: application
 version: 0.0.0
-appVersion: "0.22.4"
+appVersion: "0.16.0"
 dependencies:
  - name: gcloud-sql-proxy
    version: 0.0.0
--- a/.github/helm/affine/charts/renderer/values.yaml
+++ b/.github/helm/affine/charts/renderer/values.yaml
@@ -1,6 +1,6 @@
 replicaCount: 1
 image:
-  repository: ghcr.io/toeverything/affine
+  repository: ghcr.io/toeverything/affine-graphql
  pullPolicy: IfNotPresent
  tag: ''

--- a/.github/helm/affine/charts/sync/Chart.yaml
+++ b/.github/helm/affine/charts/sync/Chart.yaml
@@ -3,7 +3,7 @@ name: sync
 description: AFFiNE Sync Server
 type: application
 version: 0.0.0
-appVersion: "0.22.4"
+appVersion: "0.21.0"
 dependencies:
  - name: gcloud-sql-proxy
    version: 0.0.0
--- a/.github/helm/affine/charts/sync/values.yaml
+++ b/.github/helm/affine/charts/sync/values.yaml
@@ -1,6 +1,6 @@
 replicaCount: 1
 image:
-  repository: ghcr.io/toeverything/affine
+  repository: ghcr.io/toeverything/affine-graphql
  pullPolicy: IfNotPresent
  tag: ''

--- a/.github/helm/affine/templates/ingress.yaml
+++ b/.github/helm/affine/templates/ingress.yaml
@@ -36,8 +36,7 @@ spec:
    {{- end }}
  {{- end }}
  rules:
-    {{- range .Values.global.ingress.hosts }}
-    - host: {{ . | quote }}
+    - host: "{{ .Values.global.ingress.host }}"
      http:
        paths:
          - path: /socket.io
@@ -46,34 +45,33 @@ spec:
              service:
                name: affine-sync
                port:
-                  number: {{ $.Values.sync.service.port }}
+                  number: {{ .Values.sync.service.port }}
          - path: /graphql
            pathType: Prefix
            backend:
              service:
                name: affine-graphql
                port:
-                  number: {{ $.Values.graphql.service.port }}
+                  number: {{ .Values.graphql.service.port }}
          - path: /api
            pathType: Prefix
            backend:
              service:
                name: affine-graphql
                port:
-                  number: {{ $.Values.graphql.service.port }}
+                  number: {{ .Values.graphql.service.port }}
          - path: /workspace
            pathType: Prefix
            backend:
              service:
                name: affine-renderer
                port:
-                  number: {{ $.Values.renderer.service.port }}
+                  number: {{ .Values.renderer.service.port }}
          - path: /
            pathType: Prefix
            backend:
              service:
                name: affine-web
                port:
-                  number: {{ $.Values.web.service.port }}
-    {{- end }}
+                  number: {{ .Values.web.service.port }}
 {{- end }}
--- a/.github/helm/affine/values.yaml
+++ b/.github/helm/affine/values.yaml
@@ -4,13 +4,7 @@ global:
  ingress:
    enabled: false
    className: ''
-    # hosts for ingress rules
-    # e.g.
-    # hosts:
-    #  - affine.pro
-    #  - www.affine.pro
-    hosts:
-      - affine.pro
+    host: affine.pro
    tls: []
  secret:
    secretName: 'server-private-key'
--- a/.github/workflows/build-images.yml
+++ b/.github/workflows/build-images.yml
@@ -3,13 +3,7 @@ name: Build Images
 on:
  workflow_call:
    inputs:
-      build-type:
-        type: string
-        required: true
-      app-version:
-        type: string
-        required: true
-      git-short-hash:
+      flavor:
        type: string
        required: true

@@ -22,13 +16,12 @@ jobs:
  build-web:
    name: Build @affine/web
    runs-on: ubuntu-latest
-    environment: ${{ inputs.build-type }}
+    environment: ${{ github.event.inputs.flavor }}
    steps:
      - uses: actions/checkout@v4
      - name: Setup Version
+        id: version
        uses: ./.github/actions/setup-version
-        with:
-          app-version: ${{ inputs.app-version }}
      - name: Setup Node.js
        uses: ./.github/actions/setup-node
      - name: Build Core
@@ -37,11 +30,11 @@ jobs:
          R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
          R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
          R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
-          BUILD_TYPE: ${{ inputs.build-type }}
+          BUILD_TYPE: ${{ github.event.inputs.flavor }}
          CAPTCHA_SITE_KEY: ${{ secrets.CAPTCHA_SITE_KEY }}
          SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
          SENTRY_PROJECT: 'affine-web'
-          SENTRY_RELEASE: ${{ inputs.app-version }}
+          SENTRY_RELEASE: ${{ steps.version.outputs.APP_VERSION }}
          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
          PERFSEE_TOKEN: ${{ secrets.PERFSEE_TOKEN }}
@@ -56,13 +49,12 @@ jobs:
  build-admin:
    name: Build @affine/admin
    runs-on: ubuntu-latest
-    environment: ${{ inputs.build-type }}
+    environment: ${{ github.event.inputs.flavor }}
    steps:
      - uses: actions/checkout@v4
      - name: Setup Version
+        id: version
        uses: ./.github/actions/setup-version
-        with:
-          app-version: ${{ inputs.app-version }}
      - name: Setup Node.js
        uses: ./.github/actions/setup-node
      - name: Build Admin
@@ -71,7 +63,7 @@ jobs:
          R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
          R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
          R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
-          BUILD_TYPE: ${{ inputs.build-type }}
+          BUILD_TYPE: ${{ github.event.inputs.flavor }}
          CAPTCHA_SITE_KEY: ${{ secrets.CAPTCHA_SITE_KEY }}
          SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
          SENTRY_PROJECT: 'affine-admin'
@@ -89,13 +81,12 @@ jobs:
  build-mobile:
    name: Build @affine/mobile
    runs-on: ubuntu-latest
-    environment: ${{ inputs.build-type }}
+    environment: ${{ github.event.inputs.flavor }}
    steps:
      - uses: actions/checkout@v4
      - name: Setup Version
+        id: version
        uses: ./.github/actions/setup-version
-        with:
-          app-version: ${{ inputs.app-version }}
      - name: Setup Node.js
        uses: ./.github/actions/setup-node
      - name: Build Mobile
@@ -104,7 +95,7 @@ jobs:
          R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
          R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
          R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
-          BUILD_TYPE: ${{ inputs.build-type }}
+          BUILD_TYPE: ${{ github.event.inputs.flavor }}
          CAPTCHA_SITE_KEY: ${{ secrets.CAPTCHA_SITE_KEY }}
          SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
          SENTRY_PROJECT: 'affine-mobile'
@@ -122,7 +113,7 @@ jobs:
  build-server-native:
    name: Build Server native - ${{ matrix.targets.name }}
    runs-on: ubuntu-latest
-    environment: ${{ inputs.build-type }}
+    environment: ${{ github.event.inputs.flavor }}
    strategy:
      fail-fast: false
      matrix:
@@ -137,9 +128,8 @@ jobs:
    steps:
      - uses: actions/checkout@v4
      - name: Setup Version
+        id: version
        uses: ./.github/actions/setup-version
-        with:
-          app-version: ${{ inputs.app-version }}
      - name: Setup Node.js
        uses: ./.github/actions/setup-node
        with:
@@ -171,9 +161,8 @@ jobs:
    steps:
      - uses: actions/checkout@v4
      - name: Setup Version
+        id: version
        uses: ./.github/actions/setup-version
-        with:
-          app-version: ${{ inputs.app-version }}
      - name: Setup Node.js
        uses: ./.github/actions/setup-node
        with:
@@ -213,6 +202,16 @@ jobs:
        with:
          name: server-dist
          path: ./packages/backend/server/dist
+      - name: Setup env
+        run: |
+          echo "GIT_SHORT_HASH=$(git rev-parse --short HEAD)" >> "$GITHUB_ENV"
+          if [ -z "${{ inputs.flavor }}" ]
+          then
+            echo "RELEASE_FLAVOR=canary" >> "$GITHUB_ENV"
+          else
+            echo "RELEASE_FLAVOR=${{ inputs.flavor }}" >> "$GITHUB_ENV"
+          fi
+
      - name: Login to GitHub Container Registry
        uses: docker/login-action@v3
        with:
@@ -264,9 +263,8 @@ jobs:
        run: mv ./node_modules ./packages/backend/server

      - name: Setup Version
+        id: version
        uses: ./.github/actions/setup-version
-        with:
-          app-version: ${{ inputs.app-version }}

      - name: Build front Dockerfile
        uses: docker/build-push-action@v6
@@ -277,7 +275,7 @@ jobs:
          platforms: linux/amd64,linux/arm64
          provenance: true
          file: .github/deployment/front/Dockerfile
-          tags: ghcr.io/toeverything/affine-front:${{inputs.build-type}}-${{ inputs.git-short-hash }}
+          tags: ghcr.io/toeverything/affine-front:${{env.RELEASE_FLAVOR}}-${{ env.GIT_SHORT_HASH }},ghcr.io/toeverything/affine-front:${{env.RELEASE_FLAVOR}}

      - name: Build graphql Dockerfile
        uses: docker/build-push-action@v6
@@ -288,4 +286,4 @@ jobs:
          platforms: linux/amd64,linux/arm64,linux/arm/v7
          provenance: true
          file: .github/deployment/node/Dockerfile
-          tags: ghcr.io/toeverything/affine:${{inputs.build-type}}-${{ inputs.git-short-hash }}
+          tags: ghcr.io/toeverything/affine-graphql:${{env.RELEASE_FLAVOR}}-${{ env.GIT_SHORT_HASH }},ghcr.io/toeverything/affine-graphql:${{env.RELEASE_FLAVOR}}
--- a/.github/workflows/build-selfhost-image.yml
+++ b/.github/workflows/build-selfhost-image.yml
@@ -0,0 +1,25 @@
+name: Build Selfhost Image
+
+on:
+  workflow_dispatch:
+    inputs:
+      flavor:
+        description: 'Select distribution to build'
+        type: choice
+        default: canary
+        options:
+          - canary
+          - beta
+          - stable
+
+permissions:
+  contents: 'write'
+  id-token: 'write'
+  packages: 'write'
+
+jobs:
+  build-image:
+    name: Build Image
+    uses: ./.github/workflows/build-images.yml
+    with:
+      flavor: ${{ github.event.inputs.flavor }}
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -11,7 +11,6 @@ on:
    paths-ignore:
      - README.md
  pull_request:
-  merge_group:

 env:
  DEBUG: napi:*
@@ -28,11 +27,26 @@ concurrency:
  cancel-in-progress: true

 jobs:
+  optimize_ci:
+    name: Optimize CI
+    runs-on: ubuntu-latest
+    outputs:
+      skip: ${{ steps.check_skip.outputs.skip }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Graphite CI Optimizer
+        uses: withgraphite/graphite-ci-action@main
+        id: check_skip
+        with:
+          graphite_token: ${{ secrets.GRAPHITE_CI_OPTIMIZER_TOKEN }}
+
  analyze:
    name: Analyze
    runs-on: ubuntu-latest
    env:
      NODE_OPTIONS: --max-old-space-size=14384
+    needs: optimize_ci
+    if: needs.optimize_ci.outputs.skip == 'false'
    permissions:
      actions: read
      contents: read
@@ -66,6 +80,9 @@ jobs:
  lint:
    name: Lint
    runs-on: ubuntu-24.04-arm
+    needs: optimize_ci
+    if: needs.optimize_ci.outputs.skip == 'false'
+
    steps:
      - uses: actions/checkout@v4
      - name: Run oxlint
@@ -91,6 +108,8 @@ jobs:
  typecheck:
    name: Typecheck
    runs-on: ubuntu-24.04-arm
+    needs: optimize_ci
+    if: needs.optimize_ci.outputs.skip == 'false'
    env:
      NODE_OPTIONS: --max-old-space-size=14384
    steps:
@@ -118,6 +137,8 @@ jobs:
  lint-rust:
    name: Lint Rust
    runs-on: ubuntu-latest
+    needs: optimize_ci
+    if: needs.optimize_ci.outputs.skip == 'false'
    steps:
      - uses: actions/checkout@v4
      - uses: ./.github/actions/build-rust
@@ -138,7 +159,9 @@ jobs:
    name: Check Git Status
    runs-on: ubuntu-latest
    needs:
+      - optimize_ci
      - build-server-native
+    if: needs.optimize_ci.outputs.skip == 'false'
    steps:
      - uses: actions/checkout@v4
      - name: Setup Node.js
@@ -174,6 +197,8 @@ jobs:
  check-yarn-binary:
    name: Check yarn binary
    runs-on: ubuntu-latest
+    needs: optimize_ci
+    if: needs.optimize_ci.outputs.skip == 'false'
    steps:
      - uses: actions/checkout@v4
      - name: Run check
@@ -184,6 +209,8 @@ jobs:
  e2e-blocksuite-test:
    name: E2E BlockSuite Test
    runs-on: ubuntu-latest
+    needs: optimize_ci
+    if: needs.optimize_ci.outputs.skip == 'false'
    strategy:
      fail-fast: false
      matrix:
@@ -215,6 +242,8 @@ jobs:
  e2e-blocksuite-cross-browser-test:
    name: E2E BlockSuite Cross Browser Test
    runs-on: ubuntu-latest
+    needs: optimize_ci
+    if: needs.optimize_ci.outputs.skip == 'false'
    strategy:
      fail-fast: false
      matrix:
@@ -249,6 +278,8 @@ jobs:
  e2e-test:
    name: E2E Test
    runs-on: ubuntu-24.04-arm
+    needs: optimize_ci
+    if: needs.optimize_ci.outputs.skip == 'false'
    env:
      DISTRIBUTION: web
      IN_CI_TEST: true
@@ -281,6 +312,8 @@ jobs:
  e2e-mobile-test:
    name: E2E Mobile Test
    runs-on: ubuntu-latest
+    needs: optimize_ci
+    if: needs.optimize_ci.outputs.skip == 'false'
    env:
      DISTRIBUTION: mobile
      IN_CI_TEST: true
@@ -312,7 +345,9 @@ jobs:
    name: Unit Test
    runs-on: ubuntu-latest
    needs:
+      - optimize_ci
      - build-native
+    if: needs.optimize_ci.outputs.skip == 'false'
    env:
      DISTRIBUTION: web
    strategy:
@@ -349,6 +384,8 @@ jobs:
  build-native:
    name: Build AFFiNE native (${{ matrix.spec.target }})
    runs-on: ${{ matrix.spec.os }}
+    needs: optimize_ci
+    if: needs.optimize_ci.outputs.skip == 'false'
    env:
      CARGO_PROFILE_RELEASE_DEBUG: '1'
    strategy:
@@ -391,6 +428,8 @@ jobs:
  build-windows-native:
    name: Build AFFiNE native (${{ matrix.spec.target }})
    runs-on: ${{ matrix.spec.os }}
+    needs: optimize_ci
+    if: needs.optimize_ci.outputs.skip == 'false'
    env:
      CARGO_PROFILE_RELEASE_DEBUG: '1'
    strategy:
@@ -438,6 +477,8 @@ jobs:
  build-server-native:
    name: Build Server native
    runs-on: ubuntu-latest
+    needs: optimize_ci
+    if: needs.optimize_ci.outputs.skip == 'false'
    env:
      CARGO_PROFILE_RELEASE_DEBUG: '1'
    steps:
@@ -463,6 +504,8 @@ jobs:
  build-electron-renderer:
    name: Build @affine/electron renderer
    runs-on: ubuntu-latest
+    needs: optimize_ci
+    if: needs.optimize_ci.outputs.skip == 'false'
    steps:
      - uses: actions/checkout@v4
      - name: Setup Node.js
@@ -488,7 +531,9 @@ jobs:
    name: Native Unit Test
    runs-on: ubuntu-latest
    needs:
+      - optimize_ci
      - build-native
+    if: needs.optimize_ci.outputs.skip == 'false'
    steps:
      - uses: actions/checkout@v4
      - name: Setup Node.js
@@ -508,7 +553,9 @@ jobs:
    name: Server Test
    runs-on: ubuntu-latest
    needs:
+      - optimize_ci
      - build-server-native
+    if: needs.optimize_ci.outputs.skip == 'false'
    strategy:
      fail-fast: false
      matrix:
@@ -540,7 +587,7 @@ jobs:
          - 1025:1025
          - 8025:8025
      indexer:
-        image: manticoresearch/manticore:10.1.0
+        image: manticoresearch/manticore:9.3.2
        ports:
          - 9308:9308
    steps:
@@ -581,7 +628,9 @@ jobs:
    name: Server Test with Elasticsearch
    runs-on: ubuntu-latest
    needs:
+      - optimize_ci
      - build-server-native
+    if: needs.optimize_ci.outputs.skip == 'false'
    strategy:
      fail-fast: false
    env:
@@ -664,7 +713,9 @@ jobs:
    name: Server E2E Test
    runs-on: ubuntu-latest
    needs:
+      - optimize_ci
      - build-server-native
+    if: needs.optimize_ci.outputs.skip == 'false'
    env:
      NODE_ENV: test
      DATABASE_URL: postgresql://affine:affine@localhost:5432/affine
@@ -686,7 +737,7 @@ jobs:
        ports:
          - 6379:6379
      indexer:
-        image: manticoresearch/manticore:10.1.0
+        image: manticoresearch/manticore:9.3.2
        ports:
          - 9308:9308
    steps:
@@ -722,6 +773,9 @@ jobs:
  miri:
    name: miri code check
    runs-on: ubuntu-latest
+    needs:
+      - optimize_ci
+    if: needs.optimize_ci.outputs.skip == 'false'
    env:
      RUST_BACKTRACE: full
      CARGO_TERM_COLOR: always
@@ -735,9 +789,7 @@ jobs:
          toolchain: nightly
          components: miri
      - name: Install latest nextest release
-        uses: taiki-e/install-action@v2
-        with:
-          tool: nextest@0.9.98
+        uses: taiki-e/install-action@nextest

      - name: Miri Code Check
        continue-on-error: true
@@ -747,6 +799,9 @@ jobs:
  loom:
    name: loom thread test
    runs-on: ubuntu-latest
+    needs:
+      - optimize_ci
+    if: needs.optimize_ci.outputs.skip == 'false'
    env:
      RUSTFLAGS: --cfg loom
      RUST_BACKTRACE: full
@@ -759,9 +814,7 @@ jobs:
        with:
          toolchain: stable
      - name: Install latest nextest release
-        uses: taiki-e/install-action@v2
-        with:
-          tool: nextest@0.9.98
+        uses: taiki-e/install-action@nextest

      - name: Loom Thread Test
        run: |
@@ -770,6 +823,9 @@ jobs:
  fuzzing:
    name: fuzzing
    runs-on: ubuntu-latest
+    needs:
+      - optimize_ci
+    if: needs.optimize_ci.outputs.skip == 'false'
    env:
      CARGO_TERM_COLOR: always
    steps:
@@ -816,6 +872,9 @@ jobs:
          - { target: 'aarch64-apple-darwin', os: 'macos-latest' }
          - { target: 'x86_64-pc-windows-msvc', os: 'windows-latest' }
          - { target: 'aarch64-pc-windows-msvc', os: 'windows-11-arm' }
+    needs:
+      - optimize_ci
+    if: needs.optimize_ci.outputs.skip == 'false'
    steps:
      - uses: actions/checkout@v4
      - name: Setup Node.js
@@ -849,6 +908,8 @@ jobs:
  rust-test:
    name: Run native tests
    runs-on: ubuntu-latest
+    needs: optimize_ci
+    if: needs.optimize_ci.outputs.skip == 'false'
    env:
      CARGO_TERM_COLOR: always
    steps:
@@ -860,9 +921,7 @@ jobs:
          no-build: 'true'

      - name: Install latest nextest release
-        uses: taiki-e/install-action@v2
-        with:
-          tool: nextest@0.9.98
+        uses: taiki-e/install-action@nextest

      - name: Run tests
        run: cargo nextest run --workspace --exclude affine_server_native --features use-as-lib --release --no-fail-fast
@@ -871,7 +930,9 @@ jobs:
    name: Server Copilot Api Test
    runs-on: ubuntu-latest
    needs:
+      - optimize_ci
      - build-server-native
+    if: needs.optimize_ci.outputs.skip == 'false'
    env:
      NODE_ENV: test
      DISTRIBUTION: web
@@ -899,7 +960,7 @@ jobs:
          - 1025:1025
          - 8025:8025
      indexer:
-        image: manticoresearch/manticore:10.1.0
+        image: manticoresearch/manticore:9.3.2
        ports:
          - 9308:9308
    steps:
@@ -972,8 +1033,8 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        shardIndex: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-        shardTotal: [10]
+        shardIndex: [1, 2, 3, 4, 5, 6, 7, 8]
+        shardTotal: [8]
    needs:
      - build-server-native
    services:
@@ -993,7 +1054,7 @@ jobs:
        ports:
          - 6379:6379
      indexer:
-        image: manticoresearch/manticore:10.1.0
+        image: manticoresearch/manticore:9.3.2
        ports:
          - 9308:9308
    steps:
@@ -1053,8 +1114,10 @@ jobs:
    name: ${{ matrix.tests.name }}
    runs-on: ubuntu-latest
    needs:
+      - optimize_ci
      - build-server-native
      - build-native
+    if: needs.optimize_ci.outputs.skip == 'false'
    env:
      DISTRIBUTION: web
      DATABASE_URL: postgresql://affine:affine@localhost:5432/affine
@@ -1064,36 +1127,24 @@ jobs:
      fail-fast: false
      matrix:
        tests:
-          - name: 'Cloud E2E Test 1/10'
+          - name: 'Cloud E2E Test 1/6'
            shard: 1
-            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=1/10
-          - name: 'Cloud E2E Test 2/10'
+            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=1/6
+          - name: 'Cloud E2E Test 2/6'
            shard: 2
-            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=2/10
-          - name: 'Cloud E2E Test 3/10'
+            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=2/6
+          - name: 'Cloud E2E Test 3/6'
            shard: 3
-            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=3/10
-          - name: 'Cloud E2E Test 4/10'
+            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=3/6
+          - name: 'Cloud E2E Test 4/6'
            shard: 4
-            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=4/10
-          - name: 'Cloud E2E Test 5/10'
+            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=4/6
+          - name: 'Cloud E2E Test 5/6'
            shard: 5
-            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=5/10
-          - name: 'Cloud E2E Test 6/10'
+            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=5/6
+          - name: 'Cloud E2E Test 6/6'
            shard: 6
-            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=6/10
-          - name: 'Cloud E2E Test 7/10'
-            shard: 7
-            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=7/10
-          - name: 'Cloud E2E Test 8/10'
-            shard: 8
-            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=8/10
-          - name: 'Cloud E2E Test 9/10'
-            shard: 9
-            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=9/10
-          - name: 'Cloud E2E Test 10/10'
-            shard: 10
-            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=10/10
+            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=6/6
          - name: 'Cloud Desktop E2E Test'
            shard: desktop
            script: |
@@ -1125,7 +1176,7 @@ jobs:
          - 1025:1025
          - 8025:8025
      indexer:
-        image: manticoresearch/manticore:10.1.0
+        image: manticoresearch/manticore:9.3.2
        ports:
          - 9308:9308
    steps:
@@ -1170,8 +1221,10 @@ jobs:
    name: Desktop Test (${{ matrix.spec.os }}, ${{ matrix.spec.platform }}, ${{ matrix.spec.arch }}, ${{ matrix.spec.target }}, ${{ matrix.spec.test }})
    runs-on: ${{ matrix.spec.os }}
    needs:
+      - optimize_ci
      - build-electron-renderer
      - build-native
+    if: needs.optimize_ci.outputs.skip == 'false'
    strategy:
      fail-fast: false
      matrix:
@@ -1266,8 +1319,10 @@ jobs:
    name: Desktop bundle check (${{ matrix.spec.os }}, ${{ matrix.spec.platform }}, ${{ matrix.spec.arch }}, ${{ matrix.spec.target }}, ${{ matrix.spec.test }})
    runs-on: ${{ matrix.spec.os }}
    needs:
+      - optimize_ci
      - build-electron-renderer
      - build-native
+    if: needs.optimize_ci.outputs.skip == 'false'
    strategy:
      fail-fast: false
      matrix:
@@ -1371,6 +1426,17 @@ jobs:
        run: |
          yarn affine @affine/electron node ./scripts/macos-arm64-output-check.ts

+  test-build-mobile-app:
+    uses: ./.github/workflows/release-mobile.yml
+    needs: optimize_ci
+    if: needs.optimize_ci.outputs.skip == 'false'
+    with:
+      build-type: canary
+      build-target: development
+    secrets: inherit
+    permissions:
+      id-token: 'write'
+
  test-done:
    needs:
      - analyze
@@ -1401,6 +1467,7 @@ jobs:
      - desktop-test
      - desktop-bundle-check
      - cloud-e2e-test
+      - test-build-mobile-app
    if: always()
    runs-on: ubuntu-latest
    name: 3, 2, 1 Launch
--- a/.github/workflows/copilot-test.yml
+++ b/.github/workflows/copilot-test.yml
@@ -60,7 +60,7 @@ jobs:
          - 1025:1025
          - 8025:8025
      indexer:
-        image: manticoresearch/manticore:10.1.0
+        image: manticoresearch/manticore:9.3.2
        ports:
          - 9308:9308
    steps:
@@ -109,8 +109,8 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        shardIndex: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-        shardTotal: [10]
+        shardIndex: [1, 2, 3, 4, 5, 6, 7, 8]
+        shardTotal: [8]
    needs:
      - build-server-native
    services:
@@ -130,7 +130,7 @@ jobs:
        ports:
          - 6379:6379
      indexer:
-        image: manticoresearch/manticore:10.1.0
+        image: manticoresearch/manticore:9.3.2
        ports:
          - 9308:9308
    steps:
--- a/.github/workflows/deploy-automatically.yml
+++ b/.github/workflows/deploy-automatically.yml
@@ -0,0 +1,32 @@
+name: Deploy Automatically
+
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+-canary.[0-9]+'
+  schedule:
+    - cron: '0 9 * * *'
+
+permissions:
+  contents: write
+  pull-requests: write
+  actions: write
+
+jobs:
+  dispatch-deploy:
+    runs-on: ubuntu-latest
+    name: Setup Deploy
+    steps:
+      - name: dispatch deploy by tag
+        if: ${{ github.event_name == 'push' }}
+        uses: benc-uk/workflow-dispatch@v1
+        with:
+          workflow: deploy.yml
+          inputs: '{ "flavor": "canary" }'
+      - name: dispatch deploy by schedule
+        if: ${{ github.event_name == 'schedule' }}
+        uses: benc-uk/workflow-dispatch@v1
+        with:
+          workflow: deploy.yml
+          inputs: '{ "flavor": "canary" }'
+          ref: canary
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -0,0 +1,189 @@
+name: Deploy
+
+on:
+  workflow_dispatch:
+    inputs:
+      flavor:
+        description: 'Select what enverionment to deploy to'
+        type: choice
+        default: canary
+        options:
+          - canary
+          - beta
+          - stable
+          - internal
+
+permissions:
+  contents: 'write'
+  id-token: 'write'
+  packages: 'write'
+
+jobs:
+  output-prev-version:
+    name: Output previous version
+    runs-on: ubuntu-latest
+    environment: ${{ github.event.inputs.flavor }}
+    outputs:
+      prev: ${{ steps.print.outputs.version }}
+      namespace: ${{ steps.print.outputs.namespace }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Auth to Cluster
+        uses: './.github/actions/cluster-auth'
+        with:
+          gcp-project-number: ${{ secrets.GCP_PROJECT_NUMBER }}
+          gcp-project-id: ${{ secrets.GCP_PROJECT_ID }}
+          service-account: ${{ secrets.GCP_HELM_DEPLOY_SERVICE_ACCOUNT }}
+          cluster-name: ${{ secrets.GCP_CLUSTER_NAME }}
+          cluster-location: ${{ secrets.GCP_CLUSTER_LOCATION }}
+      - name: Output previous version
+        id: print
+        run: |
+          namespace=""
+          if [ "${{ github.event.inputs.flavor }}" = "canary" ]; then
+            namespace="dev"
+          elif [ "${{ github.event.inputs.flavor }}" = "beta" ]; then
+            namespace="beta"
+          elif [ "${{ github.event.inputs.flavor }}" = "stable" ]; then
+            namespace="production"
+          else
+            echo "Invalid flavor: ${{ github.event.inputs.flavor }}"
+            exit 1
+          fi
+
+          echo "Namespace set to: $namespace"
+
+          # Get the previous version from the deployment
+          prev_version=$(kubectl get deployment -n $namespace affine-graphql -o=jsonpath='{.spec.template.spec.containers[0].image}' | awk -F '-' '{print $3}')
+
+          echo "Previous version: $prev_version"
+          echo "version=$prev_version" >> $GITHUB_OUTPUT
+          echo "namesapce=$namespace" >> $GITHUB_OUTPUT
+
+  build-images:
+    name: Build Images
+    uses: ./.github/workflows/build-images.yml
+    secrets: inherit
+    with:
+      flavor: ${{ github.event.inputs.flavor }}
+
+  deploy:
+    name: Deploy to cluster
+    if: ${{ github.event_name == 'workflow_dispatch' }}
+    environment: ${{ github.event.inputs.flavor }}
+    needs:
+      - build-images
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Version
+        id: version
+        uses: ./.github/actions/setup-version
+      - name: Deploy to ${{ github.event.inputs.flavor }}
+        uses: ./.github/actions/deploy
+        with:
+          build-type: ${{ github.event.inputs.flavor }}
+          gcp-project-number: ${{ secrets.GCP_PROJECT_NUMBER }}
+          gcp-project-id: ${{ secrets.GCP_PROJECT_ID }}
+          service-account: ${{ secrets.GCP_HELM_DEPLOY_SERVICE_ACCOUNT }}
+          cluster-name: ${{ secrets.GCP_CLUSTER_NAME }}
+          cluster-location: ${{ secrets.GCP_CLUSTER_LOCATION }}
+        env:
+          APP_VERSION: ${{ steps.version.outputs.APP_VERSION }}
+          DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
+          CANARY_DEPLOY_HOST: ${{ secrets.CANARY_DEPLOY_HOST }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          DATABASE_URL: ${{ secrets.DATABASE_URL }}
+          DATABASE_USERNAME: ${{ secrets.DATABASE_USERNAME }}
+          DATABASE_PASSWORD: ${{ secrets.DATABASE_PASSWORD }}
+          DATABASE_NAME: ${{ secrets.DATABASE_NAME }}
+          GCLOUD_CONNECTION_NAME: ${{ secrets.GCLOUD_CONNECTION_NAME }}
+          REDIS_SERVER_HOST: ${{ secrets.REDIS_SERVER_HOST }}
+          REDIS_SERVER_PASSWORD: ${{ secrets.REDIS_SERVER_PASSWORD }}
+          CLOUD_SQL_IAM_ACCOUNT: ${{ secrets.CLOUD_SQL_IAM_ACCOUNT }}
+          APP_IAM_ACCOUNT: ${{ secrets.APP_IAM_ACCOUNT }}
+          STATIC_IP_NAME: ${{ secrets.STATIC_IP_NAME }}
+          AFFINE_INDEXER_SEARCH_PROVIDER: ${{ secrets.AFFINE_INDEXER_SEARCH_PROVIDER }}
+          AFFINE_INDEXER_SEARCH_ENDPOINT: ${{ secrets.AFFINE_INDEXER_SEARCH_ENDPOINT }}
+          AFFINE_INDEXER_SEARCH_API_KEY: ${{ secrets.AFFINE_INDEXER_SEARCH_API_KEY }}
+
+  deploy-done:
+    needs:
+      - output-prev-version
+      - build-images
+      - deploy
+    if: always()
+    runs-on: ubuntu-latest
+    name: Post deploy message
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: actions/checkout@v4
+        with:
+          repository: toeverything/blocksuite
+          path: blocksuite
+          fetch-depth: 0
+          fetch-tags: true
+      - name: Setup Node.js
+        uses: ./.github/actions/setup-node
+        with:
+          extra-flags: 'workspaces focus @affine/changelog'
+          electron-install: false
+      - name: Output deployed info
+        if: ${{ always() && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') }}
+        id: set_info
+        run: |
+          if [ "${{ github.event.inputs.flavor }}" = "canary" ]; then
+            echo "deployed_url=https://affine.fail" >> $GITHUB_OUTPUT
+          elif [ "${{ github.event.inputs.flavor }}" = "beta" ]; then
+            echo "deployed_url=https://insider.affine.pro" >> $GITHUB_OUTPUT
+          elif [ "${{ github.event.inputs.flavor }}" = "stable" ]; then
+            echo "deployed_url=https://app.affine.pro" >> $GITHUB_OUTPUT
+          else
+            exit 1
+          fi
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+      - name: Post Success event to a Slack channel
+        if: ${{ always() && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') }}
+        run: node ./tools/changelog/index.js
+        env:
+          CHANNEL_ID: ${{ secrets.RELEASE_SLACK_CHNNEL_ID }}
+          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+          DEPLOYED_URL: ${{ steps.set_info.outputs.deployed_url }}
+          PREV_VERSION: ${{ needs.output-prev-version.outputs.prev }}
+          NAMESPACE: ${{ needs.output-prev-version.outputs.namespace }}
+          DEPLOYMENT: 'SERVER'
+          FLAVOR: ${{ github.event.inputs.flavor }}
+          BLOCKSUITE_REPO_PATH: ${{ github.workspace }}/blocksuite
+      - name: Post Failed event to a Slack channel
+        id: failed-slack
+        uses: slackapi/slack-github-action@v2.1.0
+        if: ${{ always() && contains(needs.*.result, 'failure') }}
+        with:
+          method: chat.postMessage
+          token: ${{ secrets.SLACK_BOT_TOKEN }}
+          payload: |
+            channel: ${{ secrets.RELEASE_SLACK_CHNNEL_ID }}
+            text: "<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|Backend deploy failed `${{ github.event.inputs.flavor }}`>"
+            blocks:
+              - type: section
+                text:
+                  type: mrkdwn
+                  text: "<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|Backend deploy failed `${{ github.event.inputs.flavor }}`>"
+      - name: Post Cancel event to a Slack channel
+        id: cancel-slack
+        uses: slackapi/slack-github-action@v2.1.0
+        if: ${{ always() && contains(needs.*.result, 'cancelled') && !contains(needs.*.result, 'failure') }}
+        with:
+          token: ${{ secrets.SLACK_BOT_TOKEN }}
+          method: chat.postMessage
+          payload: |
+            channel: ${{ secrets.RELEASE_SLACK_CHNNEL_ID }}
+            text: "<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|Backend deploy cancelled `${{ github.event.inputs.flavor }}`>"
+            blocks:
+              - type: section
+                text:
+                  type: mrkdwn
+                  text: "<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|Backend deploy cancelled `${{ github.event.inputs.flavor }}`>"
--- a/.github/workflows/helm-releaser.yml
+++ b/.github/workflows/helm-releaser.yml
@@ -0,0 +1,66 @@
+name: Release Charts
+
+on:
+  push:
+    branches: [canary]
+    paths:
+      - '.github/helm/**/Chart.yml'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Checkout Helm chart repo
+        uses: actions/checkout@v4
+        with:
+          repository: toeverything/helm-charts
+          path: .helm-chart-repo
+          ref: gh-pages
+          token: ${{ secrets.HELM_RELEASER_TOKEN }}
+
+      - name: Install Helm
+        uses: azure/setup-helm@v4
+
+      - name: Install chart releaser
+        run: |
+          set -e
+          arch="$(dpkg --print-architecture)"
+          curl -s https://api.github.com/repos/helm/chart-releaser/releases/latest \
+          | yq --indent 0 --no-colors --input-format json --unwrapScalar \
+            ".assets[] | select(.name | test("\""^chart-releaser_.+_linux_${arch}\.tar\.gz$"\"")) | .browser_download_url" \
+          | xargs curl -SsL \
+          | tar zxf - -C /usr/local/bin
+
+      - name: Package charts
+        working-directory: .helm-chart-repo
+        run: |
+          mkdir -p .cr-index
+          helm repo add bitnami https://charts.bitnami.com/bitnami
+          helm repo update
+
+          helm dependencies build ../.github/helm/affine
+          helm dependencies build ../.github/helm/affine-cloud
+          cr package ../.github/helm/affine
+          cr package ../.github/helm/affine-cloud
+
+      - name: Publish charts
+        working-directory: .helm-chart-repo
+        run: |
+          set -ex
+          git config --local user.name "$GITHUB_ACTOR"
+          git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com"
+          owner=$(cut -d '/' -f 1 <<< '${{ github.repository }}')
+          repo=helm-charts
+          git_hash=$(git rev-parse HEAD)
+          cr upload --commit "$git_hash" \
+            --git-repo "$repo" --owner "$owner" \
+            --token '${{ secrets.HELM_RELEASER_TOKEN }}' \
+            --skip-existing
+          cr index --git-repo "$repo" --owner "$owner" \
+            --token '${{ secrets.HELM_RELEASER_TOKEN }}' \
+            --index-path .cr-index --push
--- a/.github/workflows/label-checker.yml
+++ b/.github/workflows/label-checker.yml
@@ -0,0 +1,19 @@
+name: Label Checker
+on:
+  pull_request:
+    types:
+      - opened
+      - labeled
+      - unlabeled
+    branches:
+      - canary
+
+jobs:
+  check_labels:
+    name: PR should not have a blocked label
+    runs-on: ubuntu-latest
+    steps:
+      - uses: docker://agilepathway/pull-request-label-checker:latest
+        with:
+          none_of: blocked
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/pr-auto-assign.yml
+++ b/.github/workflows/pr-auto-assign.yml
@@ -0,0 +1,12 @@
+name: Pull request auto assign
+
+# on: pull_request
+on:
+  pull_request:
+    types: [opened, ready_for_review]
+
+jobs:
+  add-reviews:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: kentaro-m/auto-assign-action@v2.0.0
--- a/.github/workflows/release-automatically.yml
+++ b/.github/workflows/release-automatically.yml
@@ -0,0 +1,38 @@
+name: Release Desktop/Mobile Automatically
+
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+-canary.[0-9]+'
+  schedule:
+    - cron: '0 9 * * *'
+
+permissions:
+  contents: write
+  pull-requests: write
+  actions: write
+
+jobs:
+  dispatch-release-desktop:
+    runs-on: ubuntu-latest
+    name: Setup Release Desktop
+    steps:
+      - name: dispatch desktop release by tag
+        if: ${{ github.event_name == 'push' }}
+        uses: benc-uk/workflow-dispatch@v1
+        with:
+          workflow: release-desktop.yml
+          inputs: '{ "build-type": "canary", "is-draft": false, "is-pre-release": true }'
+
+      - name: dispatch desktop release by schedule
+        if: ${{ github.event_name == 'schedule' }}
+        uses: benc-uk/workflow-dispatch@v1
+        with:
+          workflow: release-desktop.yml
+          inputs: '{ "build-type": "canary", "is-draft": false, "is-pre-release": true }'
+          ref: canary
+      - name: dispatch desktop release by tag
+        uses: benc-uk/workflow-dispatch@v1
+        with:
+          workflow: release-mobile.yml
+          inputs: '{ "build-type": "canary", "build-target": "distribution" }'
--- a/.github/workflows/release-cloud.yml
+++ b/.github/workflows/release-cloud.yml
@@ -1,66 +0,0 @@
-name: Release Cloud
-
-on:
-  workflow_call:
-    inputs:
-      build-type:
-        required: true
-        type: string
-      app-version:
-        required: true
-        type: string
-      git-short-hash:
-        required: true
-        type: string
-
-permissions:
-  contents: 'write'
-  id-token: 'write'
-  packages: 'write'
-
-jobs:
-  build-images:
-    name: Build Images
-    uses: ./.github/workflows/build-images.yml
-    secrets: inherit
-    with:
-      build-type: ${{ inputs.build-type }}
-      app-version: ${{ inputs.app-version }}
-      git-short-hash: ${{ inputs.git-short-hash }}
-
-  deploy:
-    name: Deploy to cluster
-    environment: ${{ inputs.build-type }}
-    needs:
-      - build-images
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Deploy to ${{ inputs.build-type }}
-        uses: ./.github/actions/deploy
-        with:
-          gcp-project-number: ${{ secrets.GCP_PROJECT_NUMBER }}
-          gcp-project-id: ${{ secrets.GCP_PROJECT_ID }}
-          service-account: ${{ secrets.GCP_HELM_DEPLOY_SERVICE_ACCOUNT }}
-          cluster-name: ${{ secrets.GCP_CLUSTER_NAME }}
-          cluster-location: ${{ secrets.GCP_CLUSTER_LOCATION }}
-        env:
-          BUILD_TYPE: ${{ inputs.build-type }}
-          APP_VERSION: ${{ inputs.app-version }}
-          GIT_SHORT_HASH: ${{ inputs.git-short-hash }}
-          DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
-          CANARY_DEPLOY_HOST: ${{ secrets.CANARY_DEPLOY_HOST }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          DATABASE_URL: ${{ secrets.DATABASE_URL }}
-          DATABASE_USERNAME: ${{ secrets.DATABASE_USERNAME }}
-          DATABASE_PASSWORD: ${{ secrets.DATABASE_PASSWORD }}
-          DATABASE_NAME: ${{ secrets.DATABASE_NAME }}
-          GCLOUD_CONNECTION_NAME: ${{ secrets.GCLOUD_CONNECTION_NAME }}
-          REDIS_SERVER_HOST: ${{ secrets.REDIS_SERVER_HOST }}
-          REDIS_SERVER_PASSWORD: ${{ secrets.REDIS_SERVER_PASSWORD }}
-          CLOUD_SQL_IAM_ACCOUNT: ${{ secrets.CLOUD_SQL_IAM_ACCOUNT }}
-          APP_IAM_ACCOUNT: ${{ secrets.APP_IAM_ACCOUNT }}
-          STATIC_IP_NAME: ${{ secrets.STATIC_IP_NAME }}
-          AFFINE_INDEXER_SEARCH_PROVIDER: ${{ secrets.AFFINE_INDEXER_SEARCH_PROVIDER }}
-          AFFINE_INDEXER_SEARCH_ENDPOINT: ${{ secrets.AFFINE_INDEXER_SEARCH_ENDPOINT }}
-          AFFINE_INDEXER_SEARCH_API_KEY: ${{ secrets.AFFINE_INDEXER_SEARCH_API_KEY }}
--- a/.github/workflows/release-desktop.yml
+++ b/.github/workflows/release-desktop.yml
@@ -1,17 +1,27 @@
-name: Release Desktop
+name: Release Desktop App

 on:
-  workflow_call:
+  workflow_dispatch:
    inputs:
      build-type:
+        description: 'Build Type'
+        type: choice
        required: true
-        type: string
-      app-version:
+        default: canary
+        options:
+          - canary
+          - beta
+          - stable
+      is-draft:
+        description: 'Draft Release?'
+        type: boolean
        required: true
-        type: string
-      git-short-hash:
+        default: true
+      is-pre-release:
+        description: 'Pre Release? (labeled as "PreRelease")'
+        type: boolean
        required: true
-        type: string
+        default: true

 permissions:
  actions: write
@@ -21,8 +31,7 @@ permissions:
  attestations: write

 env:
-  BUILD_TYPE: ${{ inputs.build-type }}
-  RELEASE_VERSION: ${{ inputs.app-version }}
+  BUILD_TYPE: ${{ github.event.inputs.build-type }}
  DEBUG: 'affine:*,napi:*'
  APP_NAME: affine
  MACOSX_DEPLOYMENT_TARGET: '10.13'
@@ -30,13 +39,14 @@ env:
 jobs:
  before-make:
    runs-on: ubuntu-latest
-    environment: ${{ inputs.build-type }}
+    environment: ${{ github.event.inputs.build-type }}
+    outputs:
+      RELEASE_VERSION: ${{ steps.version.outputs.APP_VERSION }}
    steps:
      - uses: actions/checkout@v4
      - name: Setup Version
+        id: version
        uses: ./.github/actions/setup-version
-        with:
-          app-version: ${{ inputs.app-version }}
      - name: Setup Node.js
        uses: ./.github/actions/setup-node
      - name: Setup @sentry/cli
@@ -48,14 +58,14 @@ jobs:
          SENTRY_PROJECT: 'affine'
          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
-          SENTRY_RELEASE: ${{ inputs.app-version }}
-          RELEASE_VERSION: ${{ inputs.app-version }}
+          SENTRY_RELEASE: ${{ steps.version.outputs.APP_VERSION }}
+          RELEASE_VERSION: ${{ steps.version.outputs.APP_VERSION }}
          MIXPANEL_TOKEN: ${{ secrets.MIXPANEL_TOKEN }}

      - name: Upload web artifact
        uses: actions/upload-artifact@v4
        with:
-          name: desktop-web
+          name: web
          path: packages/frontend/apps/electron/resources/web-static

  make-distribution:
@@ -77,7 +87,7 @@ jobs:
            target: x86_64-unknown-linux-gnu
    runs-on: ${{ matrix.spec.runner }}
    needs: before-make
-    environment: ${{ inputs.build-type }}
+    environment: ${{ github.event.inputs.build-type }}
    env:
      APPLE_ID: ${{ secrets.APPLE_ID }}
      APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
@@ -87,14 +97,13 @@ jobs:
      SENTRY_PROJECT: 'affine'
      SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
      SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
-      SENTRY_RELEASE: ${{ inputs.app-version }}
+      SENTRY_RELEASE: ${{ needs.before-make.outputs.RELEASE_VERSION }}
      MIXPANEL_TOKEN: ${{ secrets.MIXPANEL_TOKEN }}
    steps:
      - uses: actions/checkout@v4
      - name: Setup Version
+        id: version
        uses: ./.github/actions/setup-version
-        with:
-          app-version: ${{ inputs.app-version }}
      - name: Setup Node.js
        timeout-minutes: 10
        uses: ./.github/actions/setup-node
@@ -110,7 +119,7 @@ jobs:
          package: '@affine/native'
      - uses: actions/download-artifact@v4
        with:
-          name: desktop-web
+          name: web
          path: packages/frontend/apps/electron/resources/web-static

      - name: Build Desktop Layers
@@ -156,31 +165,31 @@ jobs:
        if: ${{ matrix.spec.platform == 'darwin' }}
        run: |
          mkdir -p builds
-          mv packages/frontend/apps/electron/out/*/make/*.dmg ./builds/affine-${{ env.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-macos-${{ matrix.spec.arch }}.dmg
-          mv packages/frontend/apps/electron/out/*/make/zip/darwin/${{ matrix.spec.arch }}/*.zip ./builds/affine-${{ env.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-macos-${{ matrix.spec.arch }}.zip
+          mv packages/frontend/apps/electron/out/*/make/*.dmg ./builds/affine-${{ needs.before-make.outputs.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-macos-${{ matrix.spec.arch }}.dmg
+          mv packages/frontend/apps/electron/out/*/make/zip/darwin/${{ matrix.spec.arch }}/*.zip ./builds/affine-${{ needs.before-make.outputs.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-macos-${{ matrix.spec.arch }}.zip
      - name: Save artifacts (linux)
        if: ${{ matrix.spec.platform == 'linux' }}
        run: |
          mkdir -p builds
-          mv packages/frontend/apps/electron/out/*/make/zip/linux/${{ matrix.spec.arch }}/*.zip ./builds/affine-${{ env.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-linux-${{ matrix.spec.arch }}.zip
-          mv packages/frontend/apps/electron/out/*/make/*.AppImage ./builds/affine-${{ env.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-linux-${{ matrix.spec.arch }}.appimage
-          mv packages/frontend/apps/electron/out/*/make/deb/${{ matrix.spec.arch }}/*.deb ./builds/affine-${{ env.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-linux-${{ matrix.spec.arch }}.deb
-          mv packages/frontend/apps/electron/out/*/make/flatpak/*/*.flatpak ./builds/affine-${{ env.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-linux-${{ matrix.spec.arch }}.flatpak
+          mv packages/frontend/apps/electron/out/*/make/zip/linux/${{ matrix.spec.arch }}/*.zip ./builds/affine-${{ needs.before-make.outputs.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-linux-${{ matrix.spec.arch }}.zip
+          mv packages/frontend/apps/electron/out/*/make/*.AppImage ./builds/affine-${{ needs.before-make.outputs.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-linux-${{ matrix.spec.arch }}.appimage
+          mv packages/frontend/apps/electron/out/*/make/deb/${{ matrix.spec.arch }}/*.deb ./builds/affine-${{ needs.before-make.outputs.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-linux-${{ matrix.spec.arch }}.deb
+          mv packages/frontend/apps/electron/out/*/make/flatpak/*/*.flatpak ./builds/affine-${{ needs.before-make.outputs.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-linux-${{ matrix.spec.arch }}.flatpak

      - uses: actions/attest-build-provenance@v2
        if: ${{ matrix.spec.platform == 'darwin' }}
        with:
          subject-path: |
-            ./builds/affine-${{ env.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-macos-${{ matrix.spec.arch }}.zip
-            ./builds/affine-${{ env.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-macos-${{ matrix.spec.arch }}.dmg
+            ./builds/affine-${{ needs.before-make.outputs.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-macos-${{ matrix.spec.arch }}.zip
+            ./builds/affine-${{ needs.before-make.outputs.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-macos-${{ matrix.spec.arch }}.dmg

      - uses: actions/attest-build-provenance@v2
        if: ${{ matrix.spec.platform == 'linux' }}
        with:
          subject-path: |
-            ./builds/affine-${{ env.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-linux-x64.zip
-            ./builds/affine-${{ env.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-linux-x64.appimage
-            ./builds/affine-${{ env.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-linux-x64.deb
+            ./builds/affine-${{ needs.before-make.outputs.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-linux-x64.zip
+            ./builds/affine-${{ needs.before-make.outputs.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-linux-x64.appimage
+            ./builds/affine-${{ needs.before-make.outputs.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-linux-x64.deb
      - name: Upload Artifact
        uses: actions/upload-artifact@v4
        with:
@@ -188,7 +197,7 @@ jobs:
          path: builds

  package-distribution-windows:
-    environment: ${{ inputs.build-type }}
+    environment: ${{ github.event.inputs.build-type }}
    strategy:
      fail-fast: false
      matrix:
@@ -212,14 +221,13 @@ jobs:
      SENTRY_PROJECT: 'affine'
      SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
      SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
-      SENTRY_RELEASE: ${{ inputs.app-version }}
+      SENTRY_RELEASE: ${{ needs.before-make.outputs.RELEASE_VERSION }}
      MIXPANEL_TOKEN: ${{ secrets.MIXPANEL_TOKEN }}
    steps:
      - uses: actions/checkout@v4
      - name: Setup Version
+        id: version
        uses: ./.github/actions/setup-version
-        with:
-          app-version: ${{ inputs.app-version }}
      - name: Setup Node.js
        timeout-minutes: 10
        uses: ./.github/actions/setup-node
@@ -234,7 +242,7 @@ jobs:
          package: '@affine/native'
      - uses: actions/download-artifact@v4
        with:
-          name: desktop-web
+          name: web
          path: packages/frontend/apps/electron/resources/web-static

      - name: Build Desktop Layers
@@ -306,9 +314,8 @@ jobs:
    steps:
      - uses: actions/checkout@v4
      - name: Setup Version
+        id: version
        uses: ./.github/actions/setup-version
-        with:
-          app-version: ${{ inputs.app-version }}
      - name: Setup Node.js
        timeout-minutes: 10
        uses: ./.github/actions/setup-node
@@ -392,16 +399,16 @@ jobs:
      - name: Save artifacts
        run: |
          mkdir -p builds
-          mv packages/frontend/apps/electron/out/*/make/zip/win32/${{ matrix.spec.arch }}/AFFiNE*-win32-${{ matrix.spec.arch }}-*.zip ./builds/affine-${{ env.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-windows-${{ matrix.spec.arch }}.zip
-          mv packages/frontend/apps/electron/out/*/make/squirrel.windows/${{ matrix.spec.arch }}/*.exe ./builds/affine-${{ env.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-windows-${{ matrix.spec.arch }}.exe
-          mv packages/frontend/apps/electron/out/*/make/nsis.windows/${{ matrix.spec.arch }}/*.exe ./builds/affine-${{ env.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-windows-${{ matrix.spec.arch }}.nsis.exe
+          mv packages/frontend/apps/electron/out/*/make/zip/win32/${{ matrix.spec.arch }}/AFFiNE*-win32-${{ matrix.spec.arch }}-*.zip ./builds/affine-${{ needs.before-make.outputs.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-windows-${{ matrix.spec.arch }}.zip
+          mv packages/frontend/apps/electron/out/*/make/squirrel.windows/${{ matrix.spec.arch }}/*.exe ./builds/affine-${{ needs.before-make.outputs.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-windows-${{ matrix.spec.arch }}.exe
+          mv packages/frontend/apps/electron/out/*/make/nsis.windows/${{ matrix.spec.arch }}/*.exe ./builds/affine-${{ needs.before-make.outputs.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-windows-${{ matrix.spec.arch }}.nsis.exe

      - uses: actions/attest-build-provenance@v2
        with:
          subject-path: |
-            ./builds/affine-${{ env.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-windows-${{ matrix.spec.arch }}.zip
-            ./builds/affine-${{ env.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-windows-${{ matrix.spec.arch }}.exe
-            ./builds/affine-${{ env.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-windows-${{ matrix.spec.arch }}.nsis.exe
+            ./builds/affine-${{ needs.before-make.outputs.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-windows-${{ matrix.spec.arch }}.zip
+            ./builds/affine-${{ needs.before-make.outputs.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-windows-${{ matrix.spec.arch }}.exe
+            ./builds/affine-${{ needs.before-make.outputs.RELEASE_VERSION }}-${{ env.BUILD_TYPE }}-windows-${{ matrix.spec.arch }}.nsis.exe

      - name: Upload Artifact
        uses: actions/upload-artifact@v4
@@ -417,7 +424,7 @@ jobs:
      - uses: actions/checkout@v4
      - uses: actions/download-artifact@v4
        with:
-          name: desktop-web
+          name: web
          path: web-static
      - name: Zip web-static
        run: zip -r web-static.zip web-static
@@ -458,14 +465,32 @@ jobs:
        run: |
          node ./scripts/generate-release-yml.mjs
        env:
-          RELEASE_VERSION: ${{ env.RELEASE_VERSION }}
-      - name: Create GitHub Release
+          RELEASE_VERSION: ${{ needs.before-make.outputs.RELEASE_VERSION }}
+      - name: Create Release Draft
+        if: ${{ github.ref_type == 'tag' }}
        uses: softprops/action-gh-release@v2
        with:
-          name: ${{ env.RELEASE_VERSION }}
-          draft: ${{ inputs.build-type == 'stable' }}
-          prerelease: ${{ inputs.build-type != 'stable' }}
-          tag_name: ${{ env.RELEASE_VERSION}}
+          name: ${{ needs.before-make.outputs.RELEASE_VERSION }}
+          body: ''
+          draft: ${{ github.event.inputs.is-draft }}
+          prerelease: ${{ github.event.inputs.is-pre-release }}
+          files: |
+            ./release/*
+            ./release/.env.example
+      - name: Create Nightly Release Draft
+        if: ${{ github.ref_type == 'branch' }}
+        uses: softprops/action-gh-release@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+        with:
+          # Temporarily, treat release from branch as nightly release, artifact saved to AFFiNE-Releases.
+          # Need to improve internal build and nightly release logic.
+          repository: 'toeverything/AFFiNE-Releases'
+          name: ${{ needs.before-make.outputs.RELEASE_VERSION }}
+          tag_name: ${{ needs.before-make.outputs.RELEASE_VERSION }}
+          body: ''
+          draft: false
+          prerelease: true
          files: |
            ./release/*
            ./release/.env.example
--- a/.github/workflows/release-mobile.yml
+++ b/.github/workflows/release-mobile.yml
@@ -1,36 +1,68 @@
-name: Release Mobile
+name: Release Mobile App

 on:
  workflow_call:
    inputs:
-      app-version:
-        type: string
-        required: true
-      git-short-hash:
+      build-target:
+        description: 'Build Target'
        type: string
        required: true
      build-type:
+        description: 'Build Type'
        type: string
        required: true
-      ios-app-version:
-        type: string
-        required: false
-
+  workflow_dispatch:
+    inputs:
+      build-target:
+        description: 'Build Target'
+        type: choice
+        required: true
+        default: distribution
+        options:
+          - development
+          - distribution
+      build-type:
+        description: 'Build Type'
+        type: choice
+        required: true
+        default: canary
+        options:
+          - canary
+          - beta
+          - stable
 env:
-  BUILD_TYPE: ${{ inputs.build-type }}
+  BUILD_TYPE: ${{ inputs.build-type || github.event.inputs.build-type }}
+  BUILD_TARGET: ${{ inputs.build-target || github.event.inputs.build-target }}
  DEBUG: napi:*
  KEYCHAIN_NAME: ${{ github.workspace }}/signing_temp

 jobs:
-  build-ios-web:
+  output-env:
    runs-on: ubuntu-latest
-    environment: ${{ inputs.build-type }}
+    outputs:
+      ENVIRONMENT: ${{ steps.env.outputs.ENVIRONMENT }}
+    steps:
+      - name: Output Environment
+        id: env
+        run: |
+          if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
+            echo "ENVIRONMENT=${{ github.event.inputs.build-type }}" >> $GITHUB_OUTPUT
+          else
+            echo "ENVIRONMENT=" >> $GITHUB_OUTPUT
+          fi
+
+  build-ios-web:
+    needs:
+      - output-env
+    runs-on: ubuntu-24.04-arm
+    environment: ${{ needs.output-env.outputs.ENVIRONMENT }}
+    outputs:
+      RELEASE_VERSION: ${{ steps.version.outputs.APP_VERSION }}
    steps:
      - uses: actions/checkout@v4
      - name: Setup Version
+        id: version
        uses: ./.github/actions/setup-version
-        with:
-          app-version: ${{ inputs.app-version }}
      - name: Setup Node.js
        uses: ./.github/actions/setup-node
      - name: Setup @sentry/cli
@@ -44,8 +76,8 @@ jobs:
          SENTRY_PROJECT: 'affine'
          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
-          SENTRY_RELEASE: ${{ inputs.app-version }}
-          RELEASE_VERSION: ${{ inputs.app-version }}
+          SENTRY_RELEASE: ${{ steps.version.outputs.APP_VERSION }}
+          RELEASE_VERSION: ${{ steps.version.outputs.APP_VERSION }}
      - name: Upload ios artifact
        uses: actions/upload-artifact@v4
        with:
@@ -53,13 +85,17 @@ jobs:
          path: packages/frontend/apps/ios/dist

  build-android-web:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
+    needs:
+      - output-env
+    environment: ${{ needs.output-env.outputs.ENVIRONMENT }}
+    outputs:
+      RELEASE_VERSION: ${{ steps.version.outputs.APP_VERSION }}
    steps:
      - uses: actions/checkout@v4
      - name: Setup Version
+        id: version
        uses: ./.github/actions/setup-version
-        with:
-          app-version: ${{ inputs.app-version }}
      - name: Setup Node.js
        uses: ./.github/actions/setup-node
      - name: Setup @sentry/cli
@@ -73,7 +109,8 @@ jobs:
          SENTRY_PROJECT: 'affine'
          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
-          SENTRY_RELEASE: ${{ inputs.app-version }}
+          SENTRY_RELEASE: ${{ steps.version.outputs.APP_VERSION }}
+          RELEASE_VERSION: ${{ steps.version.outputs.APP_VERSION }}
      - name: Upload android artifact
        uses: actions/upload-artifact@v4
        with:
@@ -81,19 +118,11 @@ jobs:
          path: packages/frontend/apps/android/dist

  ios:
-    runs-on: 'macos-15'
+    runs-on: ${{ github.ref_name == 'canary' && 'macos-latest' || 'blaze/macos-14' }}
    needs:
      - build-ios-web
    steps:
      - uses: actions/checkout@v4
-      - name: Setup Version
-        uses: ./.github/actions/setup-version
-        with:
-          app-version: ${{ inputs.app-version }}
-          ios-app-version: ${{ inputs.ios-app-version }}
-      - name: 'Update Code Sign Identity'
-        shell: bash
-        run: ./packages/frontend/apps/ios/update_code_sign_identity.sh
      - name: Download mobile artifact
        uses: actions/download-artifact@v4
        with:
@@ -110,7 +139,7 @@ jobs:
          enableScripts: false
      - uses: maxim-lobanov/setup-xcode@v1
        with:
-          xcode-version: 16.4
+          xcode-version: 16.2
      - name: Install Swiftformat
        run: brew install swiftformat
      - name: Cap sync
@@ -128,6 +157,7 @@ jobs:
          package: 'affine_mobile_native'
          no-build: 'true'
      - name: Testflight
+        if: ${{ env.BUILD_TYPE != 'stable' }}
        working-directory: packages/frontend/apps/ios/App
        run: |
          echo -n "${{ env.BUILD_PROVISION_PROFILE }}" | base64 --decode -o $PP_PATH
@@ -135,7 +165,6 @@ jobs:
          cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
          fastlane beta
        env:
-          BUILD_TARGET: distribution
          BUILD_PROVISION_PROFILE: ${{ secrets.BUILD_PROVISION_PROFILE }}
          PP_PATH: ${{ runner.temp }}/build_pp.mobileprovision
          APPLE_STORE_CONNECT_API_KEY_ID: ${{ secrets.APPLE_STORE_CONNECT_API_KEY_ID }}
@@ -151,9 +180,8 @@ jobs:
    steps:
      - uses: actions/checkout@v4
      - name: Setup Version
+        id: version
        uses: ./.github/actions/setup-version
-        with:
-          app-version: ${{ inputs.app-version }}
      - name: Download mobile artifact
        uses: actions/download-artifact@v4
        with:
@@ -186,6 +214,7 @@ jobs:
      - name: Auth gcloud
        id: auth
        uses: google-github-actions/auth@v2
+        if: ${{ env.BUILD_TARGET == 'distribution' }}
        with:
          workload_identity_provider: 'projects/${{ secrets.GCP_PROJECT_NUMBER }}/locations/global/workloadIdentityPools/github-actions/providers/github-actions-helm-deploy'
          service_account: '${{ secrets.GCP_HELM_DEPLOY_SERVICE_ACCOUNT }}'
@@ -199,6 +228,7 @@ jobs:
          cache: 'gradle'
      - name: Auto increment version code
        id: bump
+        if: ${{ env.BUILD_TARGET == 'distribution' }}
        run: yarn affine @affine/playstore-auto-bump bump
        env:
          GOOGLE_APPLICATION_CREDENTIALS: ${{ steps.auth.outputs.credentials_file_path }}
@@ -210,13 +240,14 @@ jobs:
          AFFINE_ANDROID_KEYSTORE_PASSWORD: ${{ secrets.AFFINE_ANDROID_KEYSTORE_PASSWORD }}
          AFFINE_ANDROID_KEYSTORE_ALIAS_PASSWORD: ${{ secrets.AFFINE_ANDROID_KEYSTORE_ALIAS_PASSWORD }}
          AFFINE_ANDROID_SIGN_KEYSTORE: ${{ secrets.AFFINE_ANDROID_SIGN_KEYSTORE }}
-          VERSION_NAME: ${{ inputs.app-version }}
+          VERSION_NAME: ${{ steps.version.outputs.APP_VERSION }}
      - name: Upload to Google Play
        uses: r0adkll/upload-google-play@v1
+        if: ${{ env.BUILD_TARGET == 'distribution' }}
        with:
          serviceAccountJson: ${{ steps.auth.outputs.credentials_file_path }}
          packageName: app.affine.pro
-          releaseName: ${{ inputs.app-version }}
+          releaseName: ${{ steps.version.outputs.APP_VERSION }}
          releaseFiles: packages/frontend/apps/android/App/app/build/outputs/bundle/${{ env.BUILD_TYPE }}Release/app-${{ env.BUILD_TYPE }}-release-signed.aab
          track: internal
          status: draft
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,124 +0,0 @@
-name: Release
-
-on:
-  schedule:
-    - cron: '0 9 * * *'
-
-  workflow_dispatch:
-    inputs:
-      web:
-        description: 'Release Web?'
-        required: true
-        type: boolean
-        default: false
-      desktop:
-        description: 'Release Desktop?'
-        required: true
-        type: boolean
-        default: false
-      mobile:
-        description: 'Release Mobile?'
-        required: true
-        type: boolean
-        default: false
-      ios-app-version:
-        description: 'iOS App Store Version (Optional, use tag version if empty)'
-        required: false
-        type: string
-
-permissions:
-  contents: write
-  pull-requests: write
-  actions: write
-  id-token: write
-  packages: write
-  security-events: write
-  attestations: write
-
-jobs:
-  prepare:
-    name: Prepare
-    runs-on: ubuntu-latest
-    outputs:
-      APP_VERSION: ${{ steps.prepare.outputs.APP_VERSION }}
-      GIT_SHORT_HASH: ${{ steps.prepare.outputs.GIT_SHORT_HASH }}
-      BUILD_TYPE: ${{ steps.prepare.outputs.BUILD_TYPE }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Prepare Release
-        id: prepare
-        uses: ./.github/actions/prepare-release
-
-  cloud:
-    name: Release Cloud
-    if: ${{ inputs.web || github.event_name != 'workflow_dispatch' }}
-    needs:
-      - prepare
-    uses: ./.github/workflows/release-cloud.yml
-    secrets: inherit
-    with:
-      build-type: ${{ needs.prepare.outputs.BUILD_TYPE }}
-      app-version: ${{ needs.prepare.outputs.APP_VERSION }}
-      git-short-hash: ${{ needs.prepare.outputs.GIT_SHORT_HASH }}
-
-  image:
-    name: Release Docker Image
-    runs-on: ubuntu-latest
-    needs:
-      - prepare
-      - cloud
-    steps:
-      - uses: trstringer/manual-approval@v1
-        if: ${{ needs.prepare.outputs.BUILD_TYPE == 'stable' }}
-        name: Wait for approval
-        with:
-          secret: ${{ secrets.GITHUB_TOKEN }}
-          approvers: forehalo,fengmk2
-          fail-on-denial: true
-          issue-title: Please confirm to release docker image
-          issue-body: |
-            Env: ${{ needs.prepare.outputs.BUILD_TYPE }}
-            Candidate: ghcr.io/toeverything/affine:${{ needs.prepare.outputs.BUILD_TYPE }}-${{ needs.prepare.outputs.GIT_SHORT_HASH }}
-            Tag: ghcr.io/toeverything/affine:${{ needs.prepare.outputs.BUILD_TYPE }}
-
-            > comment with "approve", "approved", "lgtm", "yes" to approve
-            > comment with "deny", "deny", "no" to deny
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          logout: false
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Tag Image
-        run: |
-          docker buildx imagetools create --tag ghcr.io/toeverything/affine:${{needs.prepare.outputs.BUILD_TYPE}} ghcr.io/toeverything/affine:${{needs.prepare.outputs.BUILD_TYPE}}-${{needs.prepare.outputs.GIT_SHORT_HASH}}
-          docker buildx imagetools create --tag ghcr.io/toeverything/affine:${{needs.prepare.outputs.APP_VERSION}} ghcr.io/toeverything/affine:${{needs.prepare.outputs.BUILD_TYPE}}-${{needs.prepare.outputs.GIT_SHORT_HASH}}
-
-  desktop:
-    name: Release Desktop
-    if: ${{ inputs.desktop || github.event_name != 'workflow_dispatch' }}
-    needs:
-      - prepare
-    uses: ./.github/workflows/release-desktop.yml
-    secrets: inherit
-    with:
-      build-type: ${{ needs.prepare.outputs.BUILD_TYPE }}
-      app-version: ${{ needs.prepare.outputs.APP_VERSION }}
-      git-short-hash: ${{ needs.prepare.outputs.GIT_SHORT_HASH }}
-
-  mobile:
-    name: Release Mobile
-    if: ${{ inputs.mobile }}
-    needs:
-      - prepare
-    uses: ./.github/workflows/release-mobile.yml
-    secrets: inherit
-    with:
-      build-type: ${{ needs.prepare.outputs.BUILD_TYPE }}
-      app-version: ${{ needs.prepare.outputs.APP_VERSION }}
-      git-short-hash: ${{ needs.prepare.outputs.GIT_SHORT_HASH }}
-      ios-app-version: ${{ inputs.ios-app-version }}
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -77,10 +77,8 @@ version = "0.0.0"
 dependencies = [
 "block2",
 "core-foundation",
- "coreaudio-rs 0.12.1",
- "cpal",
+ "coreaudio-rs",
 "criterion2",
- "crossbeam-channel",
 "dispatch2",
 "libc",
 "napi",
@@ -93,8 +91,6 @@ dependencies = [
 "symphonia",
 "thiserror 2.0.12",
 "uuid",
- "windows 0.61.1",
- "windows-core 0.61.2",
 ]

 [[package]]
@@ -217,28 +213,6 @@ version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"

-[[package]]
-name = "alsa"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43"
-dependencies = [
- "alsa-sys",
- "bitflags 2.9.1",
- "cfg-if",
- "libc",
-]
-
-[[package]]
-name = "alsa-sys"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527"
-dependencies = [
- "libc",
- "pkg-config",
-]
-
 [[package]]
 name = "android-tzdata"
 version = "0.1.1"
@@ -721,17 +695,9 @@ version = "1.2.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16595d3be041c03b09d08d0858631facccee9221e579704070e6e9e4915d3bc7"
 dependencies = [
- "jobserver",
- "libc",
 "shlex",
 ]

-[[package]]
-name = "cesu8"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
-
 [[package]]
 name = "cexpr"
 version = "0.6.0"
@@ -887,16 +853,6 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"

-[[package]]
-name = "combine"
-version = "4.6.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
-dependencies = [
- "bytes",
- "memchr",
-]
-
 [[package]]
 name = "concurrent-queue"
 version = "2.5.0"
@@ -1023,17 +979,6 @@ dependencies = [
 "libm",
 ]

-[[package]]
-name = "coreaudio-rs"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation-sys",
- "coreaudio-sys",
-]
-
 [[package]]
 name = "coreaudio-rs"
 version = "0.12.1"
@@ -1054,29 +999,6 @@ dependencies = [
 "bindgen",
 ]

-[[package]]
-name = "cpal"
-version = "0.15.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779"
-dependencies = [
- "alsa",
- "core-foundation-sys",
- "coreaudio-rs 0.11.3",
- "dasp_sample",
- "jni",
- "js-sys",
- "libc",
- "mach2",
- "ndk",
- "ndk-context",
- "oboe",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "windows 0.54.0",
-]
-
 [[package]]
 name = "cpufeatures"
 version = "0.2.17"
@@ -1163,15 +1085,6 @@ dependencies = [
 "walkdir",
 ]

-[[package]]
-name = "crossbeam-channel"
-version = "0.5.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
-dependencies = [
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-deque"
 version = "0.8.6"
@@ -1252,12 +1165,6 @@ dependencies = [
 "parking_lot_core",
 ]

-[[package]]
-name = "dasp_sample"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
-
 [[package]]
 name = "der"
 version = "0.7.10"
@@ -1913,7 +1820,7 @@ dependencies = [
 "js-sys",
 "log",
 "wasm-bindgen",
- "windows-core 0.57.0",
+ "windows-core 0.61.2",
 ]

 [[package]]
@@ -2175,38 +2082,6 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47f142fe24a9c9944451e8349de0a56af5f3e7226dc46f3ed4d4ecc0b85af75e"

-[[package]]
-name = "jni"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
-dependencies = [
- "cesu8",
- "cfg-if",
- "combine",
- "jni-sys",
- "log",
- "thiserror 1.0.69",
- "walkdir",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "jni-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
-
-[[package]]
-name = "jobserver"
-version = "0.1.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
-dependencies = [
- "getrandom 0.3.3",
- "libc",
-]
-
 [[package]]
 name = "js-sys"
 version = "0.3.77"
@@ -2284,7 +2159,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
 dependencies = [
 "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]

 [[package]]
@@ -2389,15 +2264,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"

-[[package]]
-name = "mach2"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "malloc_buf"
 version = "0.0.6"
@@ -2504,9 +2370,9 @@ dependencies = [

 [[package]]
 name = "napi"
-version = "3.0.0-beta.8"
+version = "3.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c502f122fc89e92c6222810b3144411c6f945da5aa3b713ddfad3bdcae7c9bb4"
+checksum = "2a5c343e6e1fb57bf3ea3386638c4affb394ee932708128840a56aaac3d6a8ab"
 dependencies = [
 "anyhow",
 "bitflags 2.9.1",
@@ -2514,23 +2380,21 @@ dependencies = [
 "ctor",
 "napi-build",
 "napi-sys",
- "nohash-hasher",
- "rustc-hash 2.1.1",
 "serde",
 "tokio",
 ]

 [[package]]
 name = "napi-build"
-version = "2.2.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44e0e3177307063d3e7e55b7dd7b648cca9d7f46daa35422c0d98cc2bf48c2c1"
+checksum = "03acbfa4f156a32188bfa09b86dc11a431b5725253fc1fc6f6df5bed273382c4"

 [[package]]
 name = "napi-derive"
-version = "3.0.0-beta.8"
+version = "3.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcf1e732a67e934b069d6d527251d6288753a36840572abe132a7aed9e77f0bc"
+checksum = "08d23065ee795a4b1a8755fdf4a39c2a229679f01f923a8feea33f045d6d96cb"
 dependencies = [
 "convert_case 0.8.0",
 "ctor",
@@ -2542,9 +2406,9 @@ dependencies = [

 [[package]]
 name = "napi-derive-backend"
-version = "2.0.0-beta.8"
+version = "2.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "462b775ba74791c98989fadc46c4bb2ec53016427be4d420d31c4bbaab34b308"
+checksum = "348aaac2c51b5d11cf90cf7670b470c7f4d1607d15c338efd4d3db361003e4f5"
 dependencies = [
 "convert_case 0.8.0",
 "proc-macro2",
@@ -2555,42 +2419,13 @@ dependencies = [

 [[package]]
 name = "napi-sys"
-version = "3.0.0-alpha.3"
+version = "3.0.0-alpha.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4401c63f866b42d673a8b213d5662c84a0701b0f6c3acff7e2b9fc439f1675d"
+checksum = "b443b980b2258dbaa31b99115e74da6c0866e537278309d566b4672a2f8df516"
 dependencies = [
 "libloading",
 ]

-[[package]]
-name = "ndk"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
-dependencies = [
- "bitflags 2.9.1",
- "jni-sys",
- "log",
- "ndk-sys",
- "num_enum",
- "thiserror 1.0.69",
-]
-
-[[package]]
-name = "ndk-context"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
-
-[[package]]
-name = "ndk-sys"
-version = "0.5.0+25.2.9519653"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691"
-dependencies = [
- "jni-sys",
-]
-
 [[package]]
 name = "new_debug_unreachable"
 version = "1.0.6"
@@ -2609,12 +2444,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "nohash-hasher"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
-
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -2681,17 +2510,6 @@ dependencies = [
 "num-traits",
 ]

-[[package]]
-name = "num-derive"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.101",
-]
-
 [[package]]
 name = "num-integer"
 version = "0.1.46"
@@ -2810,29 +2628,6 @@ dependencies = [
 "memchr",
 ]

-[[package]]
-name = "oboe"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb"
-dependencies = [
- "jni",
- "ndk",
- "ndk-context",
- "num-derive",
- "num-traits",
- "oboe-sys",
-]
-
-[[package]]
-name = "oboe-sys"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.21.3"
@@ -5208,19 +5003,6 @@ dependencies = [
 "wasm-bindgen-shared",
 ]

-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
-dependencies = [
- "cfg-if",
- "js-sys",
- "once_cell",
- "wasm-bindgen",
- "web-sys",
-]
-
 [[package]]
 name = "wasm-bindgen-macro"
 version = "0.2.100"
@@ -5334,7 +5116,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -5343,16 +5125,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

-[[package]]
-name = "windows"
-version = "0.54.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
-dependencies = [
- "windows-core 0.54.0",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows"
 version = "0.57.0"
@@ -5385,16 +5157,6 @@ dependencies = [
 "windows-core 0.61.2",
 ]

-[[package]]
-name = "windows-core"
-version = "0.54.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
-dependencies = [
- "windows-result 0.1.2",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-core"
 version = "0.57.0"
@@ -5518,15 +5280,6 @@ dependencies = [
 "windows-link",
 ]

-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.2",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -5554,21 +5307,6 @@ dependencies = [
 "windows-targets 0.52.6",
 ]

-[[package]]
-name = "windows-targets"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -5609,12 +5347,6 @@ dependencies = [
 "windows-link",
 ]

-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -5627,12 +5359,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"

-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -5645,12 +5371,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"

-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -5669,12 +5389,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"

-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -5687,12 +5401,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"

-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
@@ -5705,12 +5413,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"

-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
@@ -5723,12 +5425,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"

-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,14 +28,12 @@ base64-simd            = "0.8"
 bitvec                 = "1.0"
 block2                 = "0.6"
 byteorder              = "1.5"
-cpal                   = "0.15"
 chrono                 = "0.4"
 clap                   = { version = "4.4", features = ["derive"] }
 core-foundation        = "0.10"
 coreaudio-rs           = "0.12"
 criterion              = { version = "0.5", features = ["html_reports"] }
 criterion2             = { version = "3", default-features = false }
-crossbeam-channel      = "0.5"
 dispatch2              = "0.3"
 docx-parser            = { git = "https://github.com/toeverything/docx-parser" }
 dotenvy                = "0.15"
@@ -99,19 +97,6 @@ uniffi                 = "0.29"
 url                    = { version = "2.5" }
 uuid                   = "1.8"
 v_htmlescape           = "0.15"
-windows                = { version = "0.61", features = [
-  "Win32_Devices_FunctionDiscovery",
-  "Win32_UI_Shell_PropertiesSystem",
-  "Win32_Media_Audio",
-  "Win32_System_Variant",
-  "Win32_System_Com_StructuredStorage",
-  "Win32_System_Threading",
-  "Win32_System_ProcessStatus",
-  "Win32_Foundation",
-  "Win32_System_Com",
-  "Win32_System_Diagnostics_ToolHelp",
-] }
-windows-core = { version = "0.61" }
 y-octo                 = { path = "./packages/common/y-octo/core" }
 y-sync                 = { version = "0.4" }
 yrs                    = "0.23.0"
--- a/blocksuite/affine/all/package.json
+++ b/blocksuite/affine/all/package.json
@@ -48,7 +48,6 @@
    "@blocksuite/affine-gfx-template": "workspace:*",
    "@blocksuite/affine-gfx-text": "workspace:*",
    "@blocksuite/affine-gfx-turbo-renderer": "workspace:*",
-    "@blocksuite/affine-inline-comment": "workspace:*",
    "@blocksuite/affine-inline-footnote": "workspace:*",
    "@blocksuite/affine-inline-latex": "workspace:*",
    "@blocksuite/affine-inline-link": "workspace:*",
@@ -174,7 +173,6 @@
    "./inlines/footnote": "./src/inlines/footnote/index.ts",
    "./inlines/footnote/view": "./src/inlines/footnote/view.ts",
    "./inlines/footnote/store": "./src/inlines/footnote/store.ts",
-    "./inlines/comment": "./src/inlines/comment/index.ts",
    "./inlines/latex": "./src/inlines/latex/index.ts",
    "./inlines/latex/store": "./src/inlines/latex/store.ts",
    "./inlines/latex/view": "./src/inlines/latex/view.ts",
@@ -266,7 +264,6 @@
    "./components/toggle-button": "./src/components/toggle-button.ts",
    "./components/toggle-switch": "./src/components/toggle-switch.ts",
    "./components/toolbar": "./src/components/toolbar.ts",
-    "./components/tooltip": "./src/components/tooltip.ts",
    "./components/view-dropdown-menu": "./src/components/view-dropdown-menu.ts",
    "./components/tooltip-content-with-shortcut": "./src/components/tooltip-content-with-shortcut.ts",
    "./components/resource": "./src/components/resource.ts",
@@ -286,7 +283,6 @@
    "./sync": "./src/sync/index.ts",
    "./extensions/store": "./src/extensions/store.ts",
    "./extensions/view": "./src/extensions/view.ts",
-    "./foundation/clipboard": "./src/foundation/clipboard.ts",
    "./foundation/store": "./src/foundation/store.ts",
    "./foundation/view": "./src/foundation/view.ts"
  },
@@ -296,7 +292,7 @@
    "!src/__tests__",
    "!dist/__tests__"
  ],
-  "version": "0.22.4",
+  "version": "0.21.0",
  "devDependencies": {
    "@vanilla-extract/vite-plugin": "^5.0.0",
    "msw": "^2.8.4",
--- a/blocksuite/affine/all/src/components/tooltip.ts
+++ b/blocksuite/affine/all/src/components/tooltip.ts
@@ -1 +0,0 @@
-export * from '@blocksuite/affine-components/tooltip';
--- a/blocksuite/affine/all/src/extensions/view.ts
+++ b/blocksuite/affine/all/src/extensions/view.ts
@@ -33,7 +33,6 @@ import { PointerViewExtension } from '@blocksuite/affine-gfx-pointer/view';
 import { ShapeViewExtension } from '@blocksuite/affine-gfx-shape/view';
 import { TemplateViewExtension } from '@blocksuite/affine-gfx-template/view';
 import { TextViewExtension } from '@blocksuite/affine-gfx-text/view';
-import { InlineCommentViewExtension } from '@blocksuite/affine-inline-comment/view';
 import { FootnoteViewExtension } from '@blocksuite/affine-inline-footnote/view';
 import { LatexViewExtension as InlineLatexViewExtension } from '@blocksuite/affine-inline-latex/view';
 import { LinkViewExtension } from '@blocksuite/affine-inline-link/view';
@@ -96,7 +95,6 @@ export function getInternalViewExtensions() {
    RootViewExtension,

    // Inline
-    InlineCommentViewExtension,
    FootnoteViewExtension,
    LinkViewExtension,
    ReferenceViewExtension,
--- a/blocksuite/affine/all/src/foundation/clipboard.ts
+++ b/blocksuite/affine/all/src/foundation/clipboard.ts
@@ -1 +0,0 @@
-export * from '@blocksuite/affine-foundation/clipboard';
--- a/blocksuite/affine/all/src/inlines/comment/index.ts
+++ b/blocksuite/affine/all/src/inlines/comment/index.ts
@@ -1 +0,0 @@
-export * from '@blocksuite/affine-inline-comment';
--- a/blocksuite/affine/all/tsconfig.json
+++ b/blocksuite/affine/all/tsconfig.json
@@ -45,7 +45,6 @@
    { "path": "../gfx/template" },
    { "path": "../gfx/text" },
    { "path": "../gfx/turbo-renderer" },
-    { "path": "../inlines/comment" },
    { "path": "../inlines/footnote" },
    { "path": "../inlines/latex" },
    { "path": "../inlines/link" },
--- a/blocksuite/affine/blocks/attachment/package.json
+++ b/blocksuite/affine/blocks/attachment/package.json
@@ -23,7 +23,7 @@
    "@floating-ui/dom": "^1.6.13",
    "@lit/context": "^1.1.2",
    "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.16",
+    "@toeverything/theme": "^1.1.15",
    "file-type": "^21.0.0",
    "lit": "^3.2.0",
    "minimatch": "^10.0.1",
@@ -41,5 +41,5 @@
    "!src/__tests__",
    "!dist/__tests__"
  ],
-  "version": "0.22.4"
+  "version": "0.21.0"
 }
--- a/blocksuite/affine/blocks/attachment/src/attachment-block.ts
+++ b/blocksuite/affine/blocks/attachment/src/attachment-block.ts
@@ -17,7 +17,6 @@ import {
  AttachmentBlockStyles,
 } from '@blocksuite/affine-model';
 import {
-  BlockElementCommentManager,
  CitationProvider,
  DocModeProvider,
  FileSizeLimitProvider,
@@ -93,14 +92,6 @@ export class AttachmentBlockComponent extends CaptionedBlockComponent<Attachment
    return this.citationService.isCitationModel(this.model);
  }

-  get isCommentHighlighted() {
-    return (
-      this.std
-        .getOptional(BlockElementCommentManager)
-        ?.isBlockCommentHighlighted(this.model) ?? false
-    );
-  }
-
  convertTo = () => {
    return this.std
      .get(AttachmentEmbedProvider)
@@ -508,7 +499,6 @@ export class AttachmentBlockComponent extends CaptionedBlockComponent<Attachment
        class=${classMap({
          'affine-attachment-container': true,
          focused: this.selected$.value,
-          'comment-highlighted': this.isCommentHighlighted,
        })}
        style=${this.containerStyleMap}
      >
--- a/blocksuite/affine/blocks/attachment/src/styles.ts
+++ b/blocksuite/affine/blocks/attachment/src/styles.ts
@@ -15,10 +15,6 @@ export const styles = css`
    }
  }

-  .affine-attachment-container.comment-highlighted {
-    outline: 2px solid ${unsafeCSSVarV2('block/comment/highlightUnderline')};
-  }
-
  .affine-attachment-card {
    display: flex;
    gap: 12px;
--- a/blocksuite/affine/blocks/bookmark/package.json
+++ b/blocksuite/affine/blocks/bookmark/package.json
@@ -24,7 +24,7 @@
    "@blocksuite/store": "workspace:*",
    "@lit/context": "^1.1.2",
    "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.16",
+    "@toeverything/theme": "^1.1.15",
    "lit": "^3.2.0",
    "minimatch": "^10.0.1",
    "rxjs": "^7.8.1",
@@ -45,5 +45,5 @@
    "!src/__tests__",
    "!dist/__tests__"
  ],
-  "version": "0.22.4"
+  "version": "0.21.0"
 }
--- a/blocksuite/affine/blocks/bookmark/src/bookmark-block.ts
+++ b/blocksuite/affine/blocks/bookmark/src/bookmark-block.ts
@@ -8,7 +8,6 @@ import type {
 } from '@blocksuite/affine-model';
 import { ImageProxyService } from '@blocksuite/affine-shared/adapters';
 import {
-  BlockElementCommentManager,
  CitationProvider,
  DocModeProvider,
  LinkPreviewServiceIdentifier,
@@ -129,14 +128,6 @@ export class BookmarkBlockComponent extends CaptionedBlockComponent<BookmarkBloc
    return this.std.get(ImageProxyService);
  }

-  get isCommentHighlighted() {
-    return (
-      this.std
-        .getOptional(BlockElementCommentManager)
-        ?.isBlockCommentHighlighted(this.model) ?? false
-    );
-  }
-
  handleClick = (event: MouseEvent) => {
    event.stopPropagation();

--- a/blocksuite/affine/blocks/bookmark/src/components/bookmark-card.ts
+++ b/blocksuite/affine/blocks/bookmark/src/components/bookmark-card.ts
@@ -45,7 +45,6 @@ export class BookmarkCard extends SignalWatcher(
      [style]: true,
      selected: this.bookmark.selected$.value,
      edgeless: isGfxBlockComponent(this.bookmark),
-      'comment-highlighted': this.bookmark.isCommentHighlighted,
    });

    const domainName = url.match(
--- a/blocksuite/affine/blocks/bookmark/src/configs/toolbar.ts
+++ b/blocksuite/affine/blocks/bookmark/src/configs/toolbar.ts
@@ -1,5 +1,4 @@
 import {
-  canEmbedAsEmbedBlock,
  canEmbedAsIframe,
  EMBED_IFRAME_DEFAULT_HEIGHT_IN_SURFACE,
  EMBED_IFRAME_DEFAULT_WIDTH_IN_SURFACE,
@@ -150,10 +149,13 @@ const builtinToolbarConfig = {
            if (!model) return true;

            const url = model.props.url;
+            // check if the url can be embedded as iframe block or other embed blocks
+            const options = ctx.std
+              .get(EmbedOptionProvider)
+              .getEmbedBlockOptions(url);

            return (
-              !canEmbedAsIframe(ctx.std, url) &&
-              !canEmbedAsEmbedBlock(ctx.std, url)
+              !canEmbedAsIframe(ctx.std, url) && options?.viewType !== 'embed'
            );
          },
          run(ctx) {
@@ -167,8 +169,15 @@ const builtinToolbarConfig = {

            let blockId: string | undefined;

-            // first try to embed as a custom embed block
-            if (canEmbedAsEmbedBlock(ctx.std, url)) {
+            // first try to embed as iframe block
+            if (canEmbedAsIframe(ctx.std, url)) {
+              const embedIframeService = ctx.std.get(EmbedIframeService);
+              blockId = embedIframeService.addEmbedIframeBlock(
+                { url, caption, title, description },
+                parent.id,
+                index
+              );
+            } else {
              const options = ctx.std
                .get(EmbedOptionProvider)
                .getEmbedBlockOptions(url);
@@ -193,13 +202,6 @@ const builtinToolbarConfig = {
                parent,
                index
              );
-            } else if (canEmbedAsIframe(ctx.std, url)) {
-              const embedIframeService = ctx.std.get(EmbedIframeService);
-              blockId = embedIframeService.addEmbedIframeBlock(
-                { url, caption, title, description },
-                parent.id,
-                index
-              );
            }

            if (!blockId) return;
@@ -377,8 +379,27 @@ const builtinSurfaceToolbarConfig = {

            let newId: string | undefined;

-            // first try to embed as a custom embed block
-            if (canEmbedAsEmbedBlock(ctx.std, url)) {
+            // first try to embed as iframe block
+            if (canEmbedAsIframe(ctx.std, url)) {
+              const embedIframeService = ctx.std.get(EmbedIframeService);
+              const config = embedIframeService.getConfig(url);
+              if (!config) {
+                return;
+              }
+
+              const bound = Bound.deserialize(xywh);
+              const options = config.options;
+              const { widthInSurface, heightInSurface } = options ?? {};
+              bound.w = widthInSurface ?? EMBED_IFRAME_DEFAULT_WIDTH_IN_SURFACE;
+              bound.h =
+                heightInSurface ?? EMBED_IFRAME_DEFAULT_HEIGHT_IN_SURFACE;
+
+              newId = ctx.store.addBlock(
+                'affine:embed-iframe',
+                { url, caption, title, description, xywh: bound.serialize() },
+                parent
+              );
+            } else {
              const options = ctx.std
                .get(EmbedOptionProvider)
                .getEmbedBlockOptions(url);
@@ -408,29 +429,8 @@ const builtinSurfaceToolbarConfig = {
                },
                parent
              );
-            } else if (canEmbedAsIframe(ctx.std, url)) {
-              const embedIframeService = ctx.std.get(EmbedIframeService);
-              const config = embedIframeService.getConfig(url);
-              if (!config) {
-                return;
-              }
-
-              const bound = Bound.deserialize(xywh);
-              const options = config.options;
-              const { widthInSurface, heightInSurface } = options ?? {};
-              bound.w = widthInSurface ?? EMBED_IFRAME_DEFAULT_WIDTH_IN_SURFACE;
-              bound.h =
-                heightInSurface ?? EMBED_IFRAME_DEFAULT_HEIGHT_IN_SURFACE;
-
-              newId = ctx.store.addBlock(
-                'affine:embed-iframe',
-                { url, caption, title, description, xywh: bound.serialize() },
-                parent
-              );
            }

-            if (!newId) return;
-
            ctx.command.exec(reassociateConnectorsCommand, { oldId, newId });

            ctx.store.deleteBlock(model);
@@ -449,10 +449,13 @@ const builtinSurfaceToolbarConfig = {
      when(ctx) {
        const model = ctx.getCurrentModelByType(BookmarkBlockModel);
        if (!model) return false;
+
        const { url } = model.props;
-        return (
-          canEmbedAsIframe(ctx.std, url) || canEmbedAsEmbedBlock(ctx.std, url)
-        );
+        const options = ctx.std
+          .get(EmbedOptionProvider)
+          .getEmbedBlockOptions(url);
+
+        return canEmbedAsIframe(ctx.std, url) || options?.viewType === 'embed';
      },
      content(ctx) {
        const model = ctx.getCurrentModelByType(BookmarkBlockModel);
--- a/blocksuite/affine/blocks/bookmark/src/styles.ts
+++ b/blocksuite/affine/blocks/bookmark/src/styles.ts
@@ -1,4 +1,4 @@
-import { unsafeCSSVar, unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
+import { unsafeCSSVar } from '@blocksuite/affine-shared/theme';
 import { baseTheme } from '@toeverything/theme';
 import { css, unsafeCSS } from 'lit';

@@ -17,9 +17,9 @@ export const styles = css`
    width: 100%;

    border-radius: 8px;
-    border: 1px solid ${unsafeCSSVarV2('layer/background/tertiary')};
+    border: 1px solid var(--affine-background-tertiary-color);

-    background: ${unsafeCSSVarV2('layer/background/primary')};
+    background: var(--affine-background-primary-color);
    user-select: none;
  }

@@ -158,10 +158,6 @@ export const styles = css`
    border-radius: 4px;
  }

-  .affine-bookmark-card.comment-highlighted {
-    outline: 2px solid ${unsafeCSSVarV2('block/comment/highlightUnderline')};
-  }
-
  .affine-bookmark-card.loading {
    .affine-bookmark-content-title-text {
      color: var(--affine-placeholder-color);
--- a/blocksuite/affine/blocks/callout/package.json
+++ b/blocksuite/affine/blocks/callout/package.json
@@ -25,7 +25,7 @@
    "@floating-ui/dom": "^1.6.10",
    "@lit/context": "^1.1.2",
    "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.16",
+    "@toeverything/theme": "^1.1.15",
    "@types/mdast": "^4.0.4",
    "emoji-mart": "^5.6.0",
    "lit": "^3.2.0",
@@ -44,5 +44,5 @@
    "!src/__tests__",
    "!dist/__tests__"
  ],
-  "version": "0.22.4"
+  "version": "0.21.0"
 }
--- a/blocksuite/affine/blocks/code/package.json
+++ b/blocksuite/affine/blocks/code/package.json
@@ -13,7 +13,6 @@
    "@blocksuite/affine-components": "workspace:*",
    "@blocksuite/affine-ext-loader": "workspace:*",
    "@blocksuite/affine-gfx-turbo-renderer": "workspace:*",
-    "@blocksuite/affine-inline-comment": "workspace:*",
    "@blocksuite/affine-inline-latex": "workspace:*",
    "@blocksuite/affine-inline-link": "workspace:*",
    "@blocksuite/affine-inline-preset": "workspace:*",
@@ -28,7 +27,7 @@
    "@floating-ui/dom": "^1.6.13",
    "@lit/context": "^1.1.2",
    "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.16",
+    "@toeverything/theme": "^1.1.15",
    "@types/mdast": "^4.0.4",
    "lit": "^3.2.0",
    "minimatch": "^10.0.1",
@@ -48,5 +47,5 @@
    "!src/__tests__",
    "!dist/__tests__"
  ],
-  "version": "0.22.4"
+  "version": "0.21.0"
 }
--- a/blocksuite/affine/blocks/code/src/code-block-inline.ts
+++ b/blocksuite/affine/blocks/code/src/code-block-inline.ts
@@ -1,4 +1,3 @@
-import { CommentInlineSpecExtension } from '@blocksuite/affine-inline-comment';
 import { LatexInlineSpecExtension } from '@blocksuite/affine-inline-latex';
 import { LinkInlineSpecExtension } from '@blocksuite/affine-inline-link';
 import {
@@ -21,9 +20,7 @@ import { z } from 'zod';
 export const CodeBlockUnitSpecExtension =
  InlineSpecExtension<AffineTextAttributes>({
    name: 'code-block-unit',
-    schema: z.object({
-      'code-block-uint': z.undefined(),
-    }),
+    schema: z.undefined(),
    match: () => true,
    renderer: ({ delta }) => {
      return html`<affine-code-unit .delta=${delta}></affine-code-unit>`;
@@ -45,6 +42,5 @@ export const CodeBlockInlineManagerExtension =
      LatexInlineSpecExtension.identifier,
      LinkInlineSpecExtension.identifier,
      CodeBlockUnitSpecExtension.identifier,
-      CommentInlineSpecExtension.identifier,
    ],
  });
--- a/blocksuite/affine/blocks/code/src/code-block-service.ts
+++ b/blocksuite/affine/blocks/code/src/code-block-service.ts
@@ -19,12 +19,8 @@ import {
 export class CodeBlockHighlighter extends LifeCycleWatcher {
  static override key = 'code-block-highlighter';

-  // Singleton highlighter instance
-  private static _sharedHighlighter: HighlighterCore | null = null;
-  private static _highlighterPromise: Promise<HighlighterCore> | null = null;
-  private static _refCount = 0;
-
  private _darkThemeKey: string | undefined;
+
  private _lightThemeKey: string | undefined;

  highlighter$: Signal<HighlighterCore | null> = signal(null);
@@ -48,45 +44,18 @@ export class CodeBlockHighlighter extends LifeCycleWatcher {
    this.highlighter$.value = highlighter;
  };

-  private static async _getOrCreateHighlighter(): Promise<HighlighterCore> {
-    if (CodeBlockHighlighter._sharedHighlighter) {
-      return CodeBlockHighlighter._sharedHighlighter;
-    }
-
-    if (!CodeBlockHighlighter._highlighterPromise) {
-      CodeBlockHighlighter._highlighterPromise = createHighlighterCore({
-        engine: createOnigurumaEngine(() => getWasm),
-      }).then(highlighter => {
-        CodeBlockHighlighter._sharedHighlighter = highlighter;
-        return highlighter;
-      });
-    }
-
-    return CodeBlockHighlighter._highlighterPromise;
-  }
-
  override mounted(): void {
    super.mounted();

-    CodeBlockHighlighter._refCount++;
-
-    CodeBlockHighlighter._getOrCreateHighlighter()
+    createHighlighterCore({
+      engine: createOnigurumaEngine(() => getWasm),
+    })
      .then(this._loadTheme)
      .catch(console.error);
  }

  override unmounted(): void {
-    CodeBlockHighlighter._refCount--;
-
-    // Only dispose the shared highlighter when no instances are using it
-    if (
-      CodeBlockHighlighter._refCount === 0 &&
-      CodeBlockHighlighter._sharedHighlighter
-    ) {
-      CodeBlockHighlighter._sharedHighlighter.dispose();
-      CodeBlockHighlighter._sharedHighlighter = null;
-      CodeBlockHighlighter._highlighterPromise = null;
-    }
+    this.highlighter$.value?.dispose();
  }
 }

--- a/blocksuite/affine/blocks/code/src/code-block.ts
+++ b/blocksuite/affine/blocks/code/src/code-block.ts
@@ -6,7 +6,6 @@ import {
  EDGELESS_TOP_CONTENTEDITABLE_SELECTOR,
 } from '@blocksuite/affine-shared/consts';
 import {
-  BlockElementCommentManager,
  DocModeProvider,
  NotificationProvider,
 } from '@blocksuite/affine-shared/services';
@@ -391,14 +390,6 @@ export class CodeBlockComponent extends CaptionedBlockComponent<CodeBlockModel>
      });
  }

-  get isCommentHighlighted() {
-    return (
-      this.std
-        .getOptional(BlockElementCommentManager)
-        ?.isBlockCommentHighlighted(this.model) ?? false
-    );
-  }
-
  override async getUpdateComplete() {
    const result = await super.getUpdateComplete();
    await this._richTextElement?.updateComplete;
@@ -422,7 +413,6 @@ export class CodeBlockComponent extends CaptionedBlockComponent<CodeBlockModel>
      <div
        class=${classMap({
          'affine-code-block-container': true,
-          'highlight-comment': this.isCommentHighlighted,
          mobile: IS_MOBILE,
          wrap: this.model.props.wrap,
          'disable-line-numbers': !showLineNumbers,
@@ -460,7 +450,7 @@ export class CodeBlockComponent extends CaptionedBlockComponent<CodeBlockModel>
          contenteditable="false"
          class="affine-code-block-preview"
        >
-          ${shouldRenderPreview && previewContext?.renderer(this.model)}
+          ${previewContext?.renderer(this.model)}
        </div>
        ${this.renderChildren(this.model)} ${Object.values(this.widgets)}
      </div>
--- a/blocksuite/affine/blocks/code/src/code-toolbar/config.ts
+++ b/blocksuite/affine/blocks/code/src/code-toolbar/config.ts
@@ -7,10 +7,9 @@ import {
  WrapIcon,
 } from '@blocksuite/affine-components/icons';
 import type { MenuItemGroup } from '@blocksuite/affine-components/toolbar';
-import { CommentProviderIdentifier } from '@blocksuite/affine-shared/services';
 import { isInsidePageEditor } from '@blocksuite/affine-shared/utils';
 import { noop, sleep } from '@blocksuite/global/utils';
-import { CommentIcon, NumberedListIcon } from '@blocksuite/icons/lit';
+import { NumberedListIcon } from '@blocksuite/icons/lit';
 import { BlockSelection } from '@blocksuite/std';
 import { html } from 'lit';
 import { ifDefined } from 'lit/directives/if-defined.js';
@@ -114,47 +113,6 @@ export const PRIMARY_GROUPS: MenuItemGroup<CodeBlockToolbarContext>[] = [
          };
        },
      },
-      {
-        type: 'comment',
-        label: 'Comment',
-        tooltip: 'Comment',
-        icon: CommentIcon({
-          width: '20',
-          height: '20',
-        }),
-        when: ({ std }) => !!std.getOptional(CommentProviderIdentifier),
-        generate: ({ blockComponent }) => {
-          return {
-            action: () => {
-              const commentProvider = blockComponent.std.getOptional(
-                CommentProviderIdentifier
-              );
-              if (!commentProvider) return;
-
-              commentProvider.addComment([
-                new BlockSelection({
-                  blockId: blockComponent.model.id,
-                }),
-              ]);
-            },
-            render: item =>
-              html`<editor-icon-button
-                class="code-toolbar-button comment"
-                aria-label=${ifDefined(item.label)}
-                .tooltip=${item.label}
-                .tooltipOffset=${4}
-                .iconSize=${'16px'}
-                .iconContainerPadding=${4}
-                @click=${(e: MouseEvent) => {
-                  e.stopPropagation();
-                  item.action();
-                }}
-              >
-                ${item.icon}
-              </editor-icon-button>`,
-          };
-        },
-      },
    ],
  },
 ];
--- a/blocksuite/affine/blocks/code/src/index.ts
+++ b/blocksuite/affine/blocks/code/src/index.ts
@@ -2,9 +2,7 @@ export * from './adapters';
 export * from './clipboard';
 export * from './code-block';
 export * from './code-block-config';
-export * from './code-block-service';
 export * from './code-preview-extension';
 export * from './code-toolbar';
-export * from './highlight/const';
 export * from './turbo/code-layout-handler';
 export * from './turbo/code-painter.worker';
--- a/blocksuite/affine/blocks/code/src/styles.ts
+++ b/blocksuite/affine/blocks/code/src/styles.ts
@@ -1,5 +1,4 @@
 import { scrollbarStyle } from '@blocksuite/affine-shared/styles';
-import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
 import { css } from 'lit';

 export const codeBlockStyles = css`
@@ -21,10 +20,6 @@ export const codeBlockStyles = css`
    padding: 12px;
  }

-  .affine-code-block-container.highlight-comment {
-    outline: 2px solid ${unsafeCSSVarV2('block/comment/highlightUnderline')};
-  }
-
  ${scrollbarStyle('.affine-code-block-container rich-text')}

  .affine-code-block-container .inline-editor {
--- a/blocksuite/affine/blocks/code/tsconfig.json
+++ b/blocksuite/affine/blocks/code/tsconfig.json
@@ -10,7 +10,6 @@
    { "path": "../../components" },
    { "path": "../../ext-loader" },
    { "path": "../../gfx/turbo-renderer" },
-    { "path": "../../inlines/comment" },
    { "path": "../../inlines/latex" },
    { "path": "../../inlines/link" },
    { "path": "../../inlines/preset" },
--- a/blocksuite/affine/blocks/data-view/package.json
+++ b/blocksuite/affine/blocks/data-view/package.json
@@ -24,7 +24,7 @@
    "@floating-ui/dom": "^1.6.13",
    "@lit/context": "^1.1.2",
    "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.16",
+    "@toeverything/theme": "^1.1.15",
    "@types/mdast": "^4.0.4",
    "lit": "^3.2.0",
    "minimatch": "^10.0.1",
@@ -42,5 +42,5 @@
    "!src/__tests__",
    "!dist/__tests__"
  ],
-  "version": "0.22.4"
+  "version": "0.21.0"
 }
--- a/blocksuite/affine/blocks/data-view/src/data-view-block.ts
+++ b/blocksuite/affine/blocks/data-view/src/data-view-block.ts
@@ -40,7 +40,6 @@ import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/std/inline';
 import { Slice } from '@blocksuite/store';
 import { computed, signal } from '@preact/signals-core';
 import { css, nothing, unsafeCSS } from 'lit';
-import { repeat } from 'lit/directives/repeat.js';
 import { html } from 'lit/static-html.js';

 import { BlockQueryDataSource } from './data-source.js';
@@ -304,15 +303,9 @@ export class DataViewBlockComponent extends CaptionedBlockComponent<DataViewBloc
    },
  });
  override renderBlock() {
-    const widgets = html`${repeat(
-      Object.entries(this.widgets),
-      ([id]) => id,
-      ([_, widget]) => widget
-    )}`;
-
    return html`
      <div contenteditable="false" style="position: relative">
-        ${this.dataViewRootLogic.render()} ${widgets}
+        ${this.dataViewRootLogic.render()}
      </div>
    `;
  }
--- a/blocksuite/affine/blocks/database/package.json
+++ b/blocksuite/affine/blocks/database/package.json
@@ -28,7 +28,7 @@
    "@floating-ui/dom": "^1.6.13",
    "@lit/context": "^1.1.2",
    "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.16",
+    "@toeverything/theme": "^1.1.15",
    "@types/mdast": "^4.0.4",
    "date-fns": "^4.0.0",
    "lit": "^3.2.0",
@@ -48,5 +48,5 @@
    "!src/__tests__",
    "!dist/__tests__"
  ],
-  "version": "0.22.4"
+  "version": "0.21.0"
 }
--- a/blocksuite/affine/blocks/database/src/components/title/index.ts
+++ b/blocksuite/affine/blocks/database/src/components/title/index.ts
@@ -1,4 +1,3 @@
-import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
 import { stopPropagation } from '@blocksuite/affine-shared/utils';
 import type { DataViewUILogicBase } from '@blocksuite/data-view';
 import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
@@ -73,12 +72,6 @@ export class DatabaseTitle extends SignalWatcher(
    .affine-database-title [data-title-focus='true']::before {
      color: var(--affine-placeholder-color);
    }
-
-    .affine-database-title.comment-highlighted {
-      border-bottom: 2px solid
-        ${unsafeCSSVarV2('block/comment/highlightUnderline')};
-      background-color: ${unsafeCSSVarV2('block/comment/highlightActive')};
-    }
  `;

  private readonly compositionEnd = () => {
@@ -141,7 +134,6 @@ export class DatabaseTitle extends SignalWatcher(
    const classList = classMap({
      'affine-database-title': true,
      ellipsis: !this.isFocus$.value,
-      'comment-highlighted': this.database?.isCommentHighlighted ?? false,
    });
    const untitledStyle = styleMap({
      height: isEmpty ? 'auto' : 0,
--- a/blocksuite/affine/blocks/database/src/database-block.ts
+++ b/blocksuite/affine/blocks/database/src/database-block.ts
@@ -10,8 +10,6 @@ import { toast } from '@blocksuite/affine-components/toast';
 import type { DatabaseBlockModel } from '@blocksuite/affine-model';
 import { EDGELESS_TOP_CONTENTEDITABLE_SELECTOR } from '@blocksuite/affine-shared/consts';
 import {
-  BlockElementCommentManager,
-  CommentProviderIdentifier,
  DocModeProvider,
  NotificationProvider,
  type TelemetryEventMap,
@@ -36,18 +34,16 @@ import {
 import { widgetPresets } from '@blocksuite/data-view/widget-presets';
 import { Rect } from '@blocksuite/global/gfx';
 import {
-  CommentIcon,
  CopyIcon,
  DeleteIcon,
  MoreHorizontalIcon,
 } from '@blocksuite/icons/lit';
-import { type BlockComponent, BlockSelection } from '@blocksuite/std';
+import { type BlockComponent } from '@blocksuite/std';
 import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/std/inline';
 import { Slice } from '@blocksuite/store';
 import { autoUpdate } from '@floating-ui/dom';
 import { computed, signal } from '@preact/signals-core';
 import { html, nothing } from 'lit';
-import { repeat } from 'lit/directives/repeat.js';

 import { popSideDetail } from './components/layout.js';
 import { DatabaseConfigExtension } from './config.js';
@@ -86,18 +82,6 @@ export class DatabaseBlockComponent extends CaptionedBlockComponent<DatabaseBloc
            );
          },
        }),
-        menu.action({
-          prefix: CommentIcon(),
-          name: 'Comment',
-          hide: () => !this.std.getOptional(CommentProviderIdentifier),
-          select: () => {
-            this.std.getOptional(CommentProviderIdentifier)?.addComment([
-              new BlockSelection({
-                blockId: this.blockId,
-              }),
-            ]);
-          },
-        }),
        menu.action({
          prefix: CopyIcon(),
          name: 'Copy',
@@ -313,14 +297,6 @@ export class DatabaseBlockComponent extends CaptionedBlockComponent<DatabaseBloc
    };
  }

-  get isCommentHighlighted() {
-    return (
-      this.std
-        .getOptional(BlockElementCommentManager)
-        ?.isBlockCommentHighlighted(this.model) ?? false
-    );
-  }
-
  override get topContenteditableElement() {
    if (this.std.get(DocModeProvider).getEditorMode() === 'edgeless') {
      return this.closest<BlockComponent>(
@@ -452,15 +428,9 @@ export class DatabaseBlockComponent extends CaptionedBlockComponent<DatabaseBloc
      })
  );
  override renderBlock() {
-    const widgets = html`${repeat(
-      Object.entries(this.widgets),
-      ([id]) => id,
-      ([_, widget]) => widget
-    )}`;
-
    return html`
      <div contenteditable="false" class="${databaseContentStyles}">
-        ${this.dataViewRootLogic.value.render()} ${widgets}
+        ${this.dataViewRootLogic.value.render()}
      </div>
    `;
  }
--- a/blocksuite/affine/blocks/database/src/properties/rich-text/cell-renderer.ts
+++ b/blocksuite/affine/blocks/database/src/properties/rich-text/cell-renderer.ts
@@ -70,7 +70,7 @@ function toggleStyle(
        return [k, v];
      }
    })
-  ) as AffineTextAttributes;
+  );

  inlineEditor.formatText(inlineRange, newAttributes, {
    mode: 'merge',
--- a/blocksuite/affine/blocks/divider/package.json
+++ b/blocksuite/affine/blocks/divider/package.json
@@ -21,7 +21,7 @@
    "@floating-ui/dom": "^1.6.13",
    "@lit/context": "^1.1.2",
    "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.16",
+    "@toeverything/theme": "^1.1.15",
    "@types/mdast": "^4.0.4",
    "lit": "^3.2.0",
    "minimatch": "^10.0.1",
@@ -39,5 +39,5 @@
    "!src/__tests__",
    "!dist/__tests__"
  ],
-  "version": "0.22.4"
+  "version": "0.21.0"
 }
--- a/blocksuite/affine/blocks/edgeless-text/package.json
+++ b/blocksuite/affine/blocks/edgeless-text/package.json
@@ -26,7 +26,7 @@
    "@floating-ui/dom": "^1.6.13",
    "@lit/context": "^1.1.2",
    "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.16",
+    "@toeverything/theme": "^1.1.15",
    "lit": "^3.2.0",
    "minimatch": "^10.0.1",
    "rxjs": "^7.8.1",
@@ -43,5 +43,5 @@
    "!src/__tests__",
    "!dist/__tests__"
  ],
-  "version": "0.22.4"
+  "version": "0.21.0"
 }
--- a/blocksuite/affine/blocks/embed-doc/package.json
+++ b/blocksuite/affine/blocks/embed-doc/package.json
@@ -26,7 +26,7 @@
    "@floating-ui/dom": "^1.6.13",
    "@lit/context": "^1.1.2",
    "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.16",
+    "@toeverything/theme": "^1.1.15",
    "@types/lodash-es": "^4.17.12",
    "lit": "^3.2.0",
    "lodash-es": "^4.17.21",
@@ -49,5 +49,5 @@
    "!src/__tests__",
    "!dist/__tests__"
  ],
-  "version": "0.22.4"
+  "version": "0.21.0"
 }
--- a/blocksuite/affine/blocks/embed-doc/src/embed-linked-doc-block/embed-linked-doc-block.ts
+++ b/blocksuite/affine/blocks/embed-doc/src/embed-linked-doc-block/embed-linked-doc-block.ts
@@ -338,7 +338,6 @@ export class EmbedLinkedDocBlockComponent extends EmbedBlockComponent<EmbedLinke
      'note-empty': this.isNoteContentEmpty,
      'in-canvas': inCanvas,
      [this._cardStyle]: true,
-      'comment-highlighted': this.isCommentHighlighted,
    });

    const theme = this.std.get(ThemeProvider).theme;
@@ -496,6 +495,14 @@ export class EmbedLinkedDocBlockComponent extends EmbedBlockComponent<EmbedLinke

    const linkedDoc = this.linkedDoc;
    if (linkedDoc) {
+      this.disposables.add(
+        linkedDoc.workspace.slots.docListUpdated.subscribe(() => {
+          this._load().catch(e => {
+            console.error(e);
+            this.isError = true;
+          });
+        })
+      );
      // Should throttle the blockUpdated event to avoid too many re-renders
      // Because the blockUpdated event is triggered too frequently at some cases
      this.disposables.add(
--- a/blocksuite/affine/blocks/embed-doc/src/embed-linked-doc-block/index.ts
+++ b/blocksuite/affine/blocks/embed-doc/src/embed-linked-doc-block/index.ts
@@ -5,4 +5,3 @@ export * from './edgeless-clipboard-config';
 export * from './embed-edgeless-linked-doc-block';
 export * from './embed-linked-doc-block';
 export * from './embed-linked-doc-spec';
-export { getEmbedLinkedDocIcons } from './utils';
--- a/blocksuite/affine/blocks/embed-doc/src/embed-linked-doc-block/styles.ts
+++ b/blocksuite/affine/blocks/embed-doc/src/embed-linked-doc-block/styles.ts
@@ -9,16 +9,12 @@ export const styles = css`
    width: 100%;
    height: 100%;
    border-radius: 8px;
-    border: 1px solid ${unsafeCSSVarV2('layer/background/tertiary')};
+    border: 1px solid var(--affine-background-tertiary-color);
    background: ${unsafeCSSVarV2('layer/background/primary')};
    user-select: none;
    position: relative;
  }

-  .affine-embed-linked-doc-block.comment-highlighted {
-    outline: 2px solid ${unsafeCSSVarV2('block/comment/highlightUnderline')};
-  }
-
  .affine-embed-linked-doc-block.in-canvas {
    border: 1px solid ${unsafeCSSVarV2('layer/insideBorder/border')};
    background: ${unsafeCSSVarV2('layer/background/linkedDocOnEdgeless')};
@@ -168,7 +164,6 @@ export const styles = css`
  .affine-embed-linked-doc-banner {
    margin: 12px 12px 0px 0px;
    width: 204px;
-    min-width: 204px;
    max-width: 100%;
    height: 102px;
    pointer-events: none;
--- a/blocksuite/affine/blocks/embed-doc/src/embed-synced-doc-block/embed-synced-doc-block.ts
+++ b/blocksuite/affine/blocks/embed-doc/src/embed-synced-doc-block/embed-synced-doc-block.ts
@@ -232,7 +232,6 @@ export class EmbedSyncedDocBlockComponent extends EmbedBlockComponent<EmbedSynce
            surface: false,
            selected: this.selected$.value,
            'show-hover-border': true,
-            'comment-highlighted': this.isCommentHighlighted,
          })}
          @click=${this._handleClick}
          style=${containerStyleMap}
--- a/blocksuite/affine/blocks/embed-doc/src/embed-synced-doc-block/styles.ts
+++ b/blocksuite/affine/blocks/embed-doc/src/embed-synced-doc-block/styles.ts
@@ -57,9 +57,6 @@ export const blockStyles = css`
    border-radius: 8px;
    overflow: hidden;
  }
-  .affine-embed-synced-doc-container.comment-highlighted {
-    outline: 2px solid ${unsafeCSSVarV2('block/comment/highlightUnderline')};
-  }
  .affine-embed-synced-doc-container.show-hover-border:hover {
    border-color: var(--affine-border-color);
  }
@@ -197,8 +194,8 @@ export const cardStyles = css`
    width: 100%;
    height: ${EMBED_CARD_HEIGHT.horizontal}px;
    border-radius: 8px;
-    border: 1px solid ${unsafeCSSVarV2('layer/background/tertiary')};
-    background: ${unsafeCSSVarV2('layer/background/primary')};
+    border: 1px solid var(--affine-background-tertiary-color);
+    background: var(--affine-background-primary-color);
    user-select: none;
  }

--- a/blocksuite/affine/blocks/embed/package.json
+++ b/blocksuite/affine/blocks/embed/package.json
@@ -26,7 +26,7 @@
    "@floating-ui/dom": "^1.6.13",
    "@lit/context": "^1.1.2",
    "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.16",
+    "@toeverything/theme": "^1.1.15",
    "@types/lodash-es": "^4.17.12",
    "lit": "^3.2.0",
    "lodash-es": "^4.17.21",
@@ -49,5 +49,5 @@
    "!src/__tests__",
    "!dist/__tests__"
  ],
-  "version": "0.22.4"
+  "version": "0.21.0"
 }
--- a/blocksuite/affine/blocks/embed/src/common/embed-block-element.ts
+++ b/blocksuite/affine/blocks/embed/src/common/embed-block-element.ts
@@ -2,20 +2,17 @@ import {
  CaptionedBlockComponent,
  SelectedStyle,
 } from '@blocksuite/affine-components/caption';
-import type { EmbedCardStyle, EmbedProps } from '@blocksuite/affine-model';
+import type { EmbedCardStyle } from '@blocksuite/affine-model';
 import {
  EMBED_CARD_HEIGHT,
  EMBED_CARD_MIN_WIDTH,
  EMBED_CARD_WIDTH,
 } from '@blocksuite/affine-shared/consts';
-import {
-  BlockElementCommentManager,
-  DocModeProvider,
-} from '@blocksuite/affine-shared/services';
-import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
+import { DocModeProvider } from '@blocksuite/affine-shared/services';
 import { findAncestorModel } from '@blocksuite/affine-shared/utils';
 import type { BlockService } from '@blocksuite/std';
 import {
+  type GfxCompatibleProps,
  GfxViewInteractionExtension,
  type ResizeConstraint,
 } from '@blocksuite/std/gfx';
@@ -28,7 +25,7 @@ import { type ClassInfo, classMap } from 'lit/directives/class-map.js';
 import { type StyleInfo, styleMap } from 'lit/directives/style-map.js';

 export class EmbedBlockComponent<
-  Model extends BlockModel<EmbedProps> = BlockModel<EmbedProps>,
+  Model extends BlockModel<GfxCompatibleProps> = BlockModel<GfxCompatibleProps>,
  Service extends BlockService = BlockService,
  WidgetName extends string = string,
 > extends CaptionedBlockComponent<Model, Service, WidgetName> {
@@ -62,14 +59,6 @@ export class EmbedBlockComponent<
   */
  protected embedContainerStyle: StyleInfo = {};

-  get isCommentHighlighted() {
-    return (
-      this.std
-        .getOptional(BlockElementCommentManager)
-        ?.isBlockCommentHighlighted(this.model) ?? false
-    );
-  }
-
  renderEmbed = (content: () => TemplateResult) => {
    if (
      this._cardStyle === 'horizontal' ||
@@ -101,11 +90,6 @@ export class EmbedBlockComponent<
        style=${styleMap({
          height: `${this._cardHeight}px`,
          width: '100%',
-          ...(this.isCommentHighlighted
-            ? {
-                border: `2px solid ${unsafeCSSVarV2('block/comment/highlightUnderline')}`,
-              }
-            : {}),
          ...this.embedContainerStyle,
        })}
      >
--- a/blocksuite/affine/blocks/embed/src/common/embed-note-content-styles.ts
+++ b/blocksuite/affine/blocks/embed/src/common/embed-note-content-styles.ts
@@ -57,11 +57,6 @@ export const embedNoteContentStyles = css`
    font-weight: 600;
  }

-  .affine-embed-doc-content-note-blocks inline-comment {
-    background-color: unset !important;
-    border-bottom: unset !important;
-  }
-
  .affine-embed-linked-doc-block.horizontal {
    affine-paragraph,
    affine-list {
--- a/blocksuite/affine/blocks/embed/src/common/to-edgeless-embed-block.ts
+++ b/blocksuite/affine/blocks/embed/src/common/to-edgeless-embed-block.ts
@@ -1,5 +1,4 @@
 import { EdgelessLegacySlotIdentifier } from '@blocksuite/affine-block-surface';
-import type { EmbedProps } from '@blocksuite/affine-model';
 import { Bound } from '@blocksuite/global/gfx';
 import {
  blockComponentSymbol,
@@ -8,13 +7,16 @@ import {
  GfxElementSymbol,
  toGfxBlockComponent,
 } from '@blocksuite/std';
-import type { GfxBlockElementModel } from '@blocksuite/std/gfx';
+import type {
+  GfxBlockElementModel,
+  GfxCompatibleProps,
+} from '@blocksuite/std/gfx';
 import type { StyleInfo } from 'lit/directives/style-map.js';

 import type { EmbedBlockComponent } from './embed-block-element.js';

 export function toEdgelessEmbedBlock<
-  Model extends GfxBlockElementModel<EmbedProps>,
+  Model extends GfxBlockElementModel<GfxCompatibleProps>,
  Service extends BlockService,
  WidgetName extends string,
  B extends typeof EmbedBlockComponent<Model, Service, WidgetName>,
--- a/blocksuite/affine/blocks/embed/src/common/utils.ts
+++ b/blocksuite/affine/blocks/embed/src/common/utils.ts
@@ -11,8 +11,6 @@ import {
  EmbedCardLightVerticalIcon,
 } from '@blocksuite/affine-components/icons';
 import { ColorScheme } from '@blocksuite/affine-model';
-import { EmbedOptionProvider } from '@blocksuite/affine-shared/services';
-import type { BlockStdScope } from '@blocksuite/std';
 import type { TemplateResult } from 'lit';

 type EmbedCardIcons = {
@@ -42,8 +40,3 @@ export function getEmbedCardIcons(theme: ColorScheme): EmbedCardIcons {
    };
  }
 }
-
-export function canEmbedAsEmbedBlock(std: BlockStdScope, url: string) {
-  const options = std.get(EmbedOptionProvider).getEmbedBlockOptions(url);
-  return options?.viewType === 'embed';
-}
--- a/blocksuite/affine/blocks/embed/src/embed-figma-block/styles.ts
+++ b/blocksuite/affine/blocks/embed/src/embed-figma-block/styles.ts
@@ -11,9 +11,9 @@ export const styles = css`
    height: 100%;

    border-radius: 8px;
-    border: 1px solid ${unsafeCSSVarV2('layer/background/tertiary')};
+    border: 1px solid var(--affine-background-tertiary-color);

-    background: ${unsafeCSSVarV2('layer/background/primary')};
+    background: var(--affine-background-primary-color);
    user-select: none;
  }

--- a/blocksuite/affine/blocks/embed/src/embed-github-block/styles.ts
+++ b/blocksuite/affine/blocks/embed/src/embed-github-block/styles.ts
@@ -1,4 +1,3 @@
-import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
 import { css, html } from 'lit';

 export const styles = css`
@@ -10,9 +9,9 @@ export const styles = css`
    height: 100%;

    border-radius: 8px;
-    border: 1px solid ${unsafeCSSVarV2('layer/background/tertiary')};
+    border: 1px solid var(--affine-background-tertiary-color);

-    background: ${unsafeCSSVarV2('layer/background/primary')};
+    background: var(--affine-background-primary-color);
    user-select: none;
    overflow: hidden;
  }
--- a/blocksuite/affine/blocks/embed/src/embed-html-block/styles.ts
+++ b/blocksuite/affine/blocks/embed/src/embed-html-block/styles.ts
@@ -1,4 +1,3 @@
-import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
 import { css, html } from 'lit';

 export const EMBED_HTML_MIN_WIDTH = 370;
@@ -16,9 +15,9 @@ export const styles = css`
    gap: 20px;

    border-radius: 12px;
-    border: 1px solid ${unsafeCSSVarV2('layer/background/tertiary')};
+    border: 1px solid var(--affine-background-tertiary-color);

-    background: ${unsafeCSSVarV2('layer/background/primary')};
+    background: var(--affine-background-primary-color);
    user-select: none;
  }

--- a/blocksuite/affine/blocks/embed/src/embed-iframe-block/configs/providers/generic.ts
+++ b/blocksuite/affine/blocks/embed/src/embed-iframe-block/configs/providers/generic.ts
@@ -1,75 +0,0 @@
-import { EmbedIframeConfigExtension } from '@blocksuite/affine-shared/services';
-
-const GENERIC_DEFAULT_WIDTH_IN_SURFACE = 800;
-const GENERIC_DEFAULT_HEIGHT_IN_SURFACE = 600;
-const GENERIC_DEFAULT_WIDTH_PERCENT = 100;
-const GENERIC_DEFAULT_HEIGHT_IN_NOTE = 400;
-
-/**
- * AFFiNE domains that should be excluded from generic embedding
- * These are based on the centralized cloud constants and known AFFiNE domains
- */
-const AFFINE_DOMAINS = [
-  'affine.pro', // Main AFFiNE domain
-  'app.affine.pro', // Stable cloud domain
-  'insider.affine.pro', // Beta/internal cloud domain
-  'affine.fail', // Canary cloud domain
-  'toeverything.app', // Safety measure for potential future use
-  'apple.getaffineapp.com', // Cloud domain for Apple app
-];
-
-/**
- * Validates if a URL is suitable for generic iframe embedding
- * Allows HTTPS URLs but excludes AFFiNE domains
- * @param url The URL to validate
- * @returns Boolean indicating if the URL can be generically embedded
- */
-function isValidGenericEmbedUrl(url: string): boolean {
-  try {
-    const parsedUrl = new URL(url);
-
-    // Only allow HTTPS for security
-    if (parsedUrl.protocol !== 'https:') {
-      return false;
-    }
-
-    // Exclude AFFiNE domains
-    const hostname = parsedUrl.hostname.toLowerCase();
-    if (
-      AFFINE_DOMAINS.some(
-        domain => hostname === domain || hostname.endsWith(`.${domain}`)
-      )
-    ) {
-      return false;
-    }
-
-    return true;
-  } catch {
-    // Invalid URL
-    return false;
-  }
-}
-
-const genericConfig = {
-  name: 'generic',
-  match: (url: string) => isValidGenericEmbedUrl(url),
-  buildOEmbedUrl: (url: string) => {
-    if (!isValidGenericEmbedUrl(url)) {
-      return undefined;
-    }
-    return url;
-  },
-  useOEmbedUrlDirectly: true,
-  options: {
-    widthInSurface: GENERIC_DEFAULT_WIDTH_IN_SURFACE,
-    heightInSurface: GENERIC_DEFAULT_HEIGHT_IN_SURFACE,
-    widthPercent: GENERIC_DEFAULT_WIDTH_PERCENT,
-    heightInNote: GENERIC_DEFAULT_HEIGHT_IN_NOTE,
-    allowFullscreen: true,
-    style: 'border: none; border-radius: 8px;',
-    allow: 'clipboard-read; clipboard-write; picture-in-picture;',
-    referrerpolicy: 'no-referrer-when-downgrade',
-  },
-};
-
-export const GenericEmbedConfig = EmbedIframeConfigExtension(genericConfig);
--- a/blocksuite/affine/blocks/embed/src/embed-iframe-block/configs/providers/index.ts
+++ b/blocksuite/affine/blocks/embed/src/embed-iframe-block/configs/providers/index.ts
@@ -1,5 +1,4 @@
 import { ExcalidrawEmbedConfig } from './excalidraw';
-import { GenericEmbedConfig } from './generic';
 import { GoogleDocsEmbedConfig } from './google-docs';
 import { GoogleDriveEmbedConfig } from './google-drive';
 import { MiroEmbedConfig } from './miro';
@@ -11,5 +10,4 @@ export const EmbedIframeConfigExtensions = [
  MiroEmbedConfig,
  ExcalidrawEmbedConfig,
  GoogleDocsEmbedConfig,
-  GenericEmbedConfig,
 ];
--- a/blocksuite/affine/blocks/embed/src/embed-iframe-block/embed-iframe-block.ts
+++ b/blocksuite/affine/blocks/embed/src/embed-iframe-block/embed-iframe-block.ts
@@ -11,7 +11,6 @@ import {
  type IframeOptions,
  LinkPreviewServiceIdentifier,
  NotificationProvider,
-  VirtualKeyboardProvider,
 } from '@blocksuite/affine-shared/services';
 import { matchModels } from '@blocksuite/affine-shared/utils';
 import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';
@@ -214,33 +213,9 @@ export class EmbedIframeBlockComponent extends CaptionedBlockComponent<EmbedIfra
      this._linkInputAbortController.abort();
    }

-    const keyboard = this.host.std.getOptional(VirtualKeyboardProvider);
-    const computePosition = keyboard
-      ? {
-          referenceElement: document.body,
-          placement: 'top' as const,
-          middleware: [
-            offset(({ rects }) => ({
-              mainAxis:
-                -rects.floating.height -
-                (window.innerHeight -
-                  rects.floating.height -
-                  keyboard.height$.value) /
-                  2,
-            })),
-          ],
-          autoUpdate: { animationFrame: true },
-        }
-      : {
-          referenceElement: this._blockContainer,
-          placement: 'bottom' as const,
-          middleware: [flip(), offset(LINK_CREATE_POPUP_OFFSET), shift()],
-          autoUpdate: { animationFrame: true },
-        };
-
    this._linkInputAbortController = new AbortController();

-    const { update } = createLitPortal({
+    createLitPortal({
      template: html`<embed-iframe-link-input-popup
        .model=${this.model}
        .abortController=${this._linkInputAbortController}
@@ -249,19 +224,15 @@ export class EmbedIframeBlockComponent extends CaptionedBlockComponent<EmbedIfra
        .options=${options}
      ></embed-iframe-link-input-popup>`,
      container: document.body,
-      computePosition,
+      computePosition: {
+        referenceElement: this._blockContainer,
+        placement: 'bottom',
+        middleware: [flip(), offset(LINK_CREATE_POPUP_OFFSET), shift()],
+        autoUpdate: { animationFrame: true },
+      },
      abortController: this._linkInputAbortController,
      closeOnClickAway: true,
    });
-
-    if (keyboard) {
-      this._linkInputAbortController.signal.addEventListener(
-        'abort',
-        keyboard.height$.subscribe(() => {
-          update();
-        })
-      );
-    }
  };

  /**
--- a/blocksuite/affine/blocks/embed/src/embed-loom-block/styles.ts
+++ b/blocksuite/affine/blocks/embed/src/embed-loom-block/styles.ts
@@ -1,4 +1,3 @@
-import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
 import { css, html } from 'lit';

 export const styles = css`
@@ -13,9 +12,9 @@ export const styles = css`
    height: 100%;

    border-radius: 8px;
-    border: 1px solid ${unsafeCSSVarV2('layer/background/tertiary')};
+    border: 1px solid var(--affine-background-tertiary-color);

-    background: ${unsafeCSSVarV2('layer/background/primary')};
+    background: var(--affine-background-primary-color);
    user-select: none;
  }

--- a/blocksuite/affine/blocks/embed/src/embed-youtube-block/styles.ts
+++ b/blocksuite/affine/blocks/embed/src/embed-youtube-block/styles.ts
@@ -13,9 +13,9 @@ export const styles = css`
    padding: 12px;

    border-radius: 8px;
-    border: 1px solid ${unsafeCSSVarV2('layer/background/tertiary')};
+    border: 1px solid var(--affine-background-tertiary-color);

-    background: ${unsafeCSSVarV2('layer/background/primary')};
+    background: var(--affine-background-primary-color);
    user-select: none;
  }

--- a/blocksuite/affine/blocks/frame/package.json
+++ b/blocksuite/affine/blocks/frame/package.json
@@ -25,7 +25,7 @@
    "@floating-ui/dom": "^1.6.13",
    "@lit/context": "^1.1.2",
    "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.16",
+    "@toeverything/theme": "^1.1.15",
    "@types/mdast": "^4.0.4",
    "lit": "^3.2.0",
    "minimatch": "^10.0.1",
@@ -44,5 +44,5 @@
    "!src/__tests__",
    "!dist/__tests__"
  ],
-  "version": "0.22.4"
+  "version": "0.21.0"
 }
--- a/blocksuite/affine/blocks/frame/src/frame-toolbar.ts
+++ b/blocksuite/affine/blocks/frame/src/frame-toolbar.ts
@@ -62,11 +62,13 @@ const builtinSurfaceToolbarConfig = {
        if (!rootModel) return;

        const { id: frameId, xywh } = model;
-        let lastNoteId = rootModel.children.findLast(
-          note =>
-            matchModels(note, [NoteBlockModel]) &&
-            note.props.displayMode !== NoteDisplayMode.EdgelessOnly
-        )?.id;
+        let lastNoteId = rootModel.children
+          .filter(
+            note =>
+              matchModels(note, [NoteBlockModel]) &&
+              note.props.displayMode !== NoteDisplayMode.EdgelessOnly
+          )
+          .pop()?.id;

        if (!lastNoteId) {
          const bounds = Bound.deserialize(xywh);
--- a/blocksuite/affine/blocks/image/package.json
+++ b/blocksuite/affine/blocks/image/package.json
@@ -25,7 +25,7 @@
    "@floating-ui/dom": "^1.6.13",
    "@lit/context": "^1.1.2",
    "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.16",
+    "@toeverything/theme": "^1.1.15",
    "file-type": "^21.0.0",
    "lit": "^3.2.0",
    "minimatch": "^10.0.1",
@@ -44,5 +44,5 @@
    "!src/__tests__",
    "!dist/__tests__"
  ],
-  "version": "0.22.4"
+  "version": "0.21.0"
 }
--- a/blocksuite/affine/blocks/image/src/components/page-image-block.ts
+++ b/blocksuite/affine/blocks/image/src/components/page-image-block.ts
@@ -18,7 +18,6 @@ import type { BaseSelection } from '@blocksuite/store';
 import { computed } from '@preact/signals-core';
 import { css, html, type PropertyValues } from 'lit';
 import { property, query } from 'lit/decorators.js';
-import { classMap } from 'lit/directives/class-map.js';
 import { styleMap } from 'lit/directives/style-map.js';
 import { when } from 'lit/directives/when.js';

@@ -77,10 +76,6 @@ export class ImageBlockPageComponent extends SignalWatcher(
      width: 100%;
      height: 100%;
    }
-
-    affine-page-image .comment-highlighted {
-      outline: 2px solid ${unsafeCSSVarV2('block/comment/highlightUnderline')};
-    }
  `;

  resizeable$ = computed(() => this.block.resizeable$.value);
@@ -369,13 +364,7 @@ export class ImageBlockPageComponent extends SignalWatcher(
    const { loading, error, icon, description, needUpload } = this.state;

    return html`
-      <div
-        class=${classMap({
-          'resizable-img': true,
-          'comment-highlighted': this.block.isCommentHighlighted,
-        })}
-        style=${styleMap(imageSize)}
-      >
+      <div class="resizable-img" style=${styleMap(imageSize)}>
        <img
          class="drag-target"
          draggable="false"
--- a/blocksuite/affine/blocks/image/src/image-block.ts
+++ b/blocksuite/affine/blocks/image/src/image-block.ts
@@ -5,10 +5,7 @@ import { Peekable } from '@blocksuite/affine-components/peek';
 import { ResourceController } from '@blocksuite/affine-components/resource';
 import type { ImageBlockModel } from '@blocksuite/affine-model';
 import { ImageSelection } from '@blocksuite/affine-shared/selection';
-import {
-  BlockElementCommentManager,
-  ToolbarRegistryIdentifier,
-} from '@blocksuite/affine-shared/services';
+import { ToolbarRegistryIdentifier } from '@blocksuite/affine-shared/services';
 import { formatSize } from '@blocksuite/affine-shared/utils';
 import { IS_MOBILE } from '@blocksuite/global/env';
 import { BrokenImageIcon, ImageIcon } from '@blocksuite/icons/lit';
@@ -68,14 +65,6 @@ export class ImageBlockComponent extends CaptionedBlockComponent<ImageBlockModel
    return this.pageImage?.resizeImg;
  }

-  get isCommentHighlighted() {
-    return (
-      this.std
-        .getOptional(BlockElementCommentManager)
-        ?.isBlockCommentHighlighted(this.model) ?? false
-    );
-  }
-
  private _handleClick(event: MouseEvent) {
    // the peek view need handle shift + click
    if (event.defaultPrevented) return;
--- a/blocksuite/affine/blocks/image/src/preview-image/edgeless.ts
+++ b/blocksuite/affine/blocks/image/src/preview-image/edgeless.ts
@@ -1,4 +1,3 @@
-import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
 import { toGfxBlockComponent } from '@blocksuite/std';
 import { css } from 'lit';

@@ -10,7 +9,7 @@ export class ImageEdgelessPlaceholderBlockComponent extends toGfxBlockComponent(
  static override styles = css`
    affine-edgeless-placeholder-preview-image
      .affine-placeholder-preview-container {
-      border: 1px solid ${unsafeCSSVarV2('layer/background/tertiary')};
+      border: 1px solid var(--affine-background-tertiary-color);
    }
  `;

--- a/blocksuite/affine/blocks/latex/package.json
+++ b/blocksuite/affine/blocks/latex/package.json
@@ -25,7 +25,7 @@
    "@floating-ui/dom": "^1.6.13",
    "@lit/context": "^1.1.2",
    "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.16",
+    "@toeverything/theme": "^1.1.15",
    "@types/katex": "^0.16.7",
    "@types/mdast": "^4.0.4",
    "katex": "^0.16.11",
@@ -46,5 +46,5 @@
    "!src/__tests__",
    "!dist/__tests__"
  ],
-  "version": "0.22.4"
+  "version": "0.21.0"
 }
--- a/blocksuite/affine/blocks/latex/src/latex-block.ts
+++ b/blocksuite/affine/blocks/latex/src/latex-block.ts
@@ -116,7 +116,7 @@ export class LatexBlockComponent extends CaptionedBlockComponent<LatexBlockModel

    this.selection.setGroup('note', []);

-    const { portal } = createLitPortal({
+    const portal = createLitPortal({
      template: html`<latex-editor-menu
        .std=${this.std}
        .latexSignal=${this.model.props.latex$}
--- a/blocksuite/affine/blocks/list/package.json
+++ b/blocksuite/affine/blocks/list/package.json
@@ -24,7 +24,7 @@
    "@floating-ui/dom": "^1.6.13",
    "@lit/context": "^1.1.2",
    "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.16",
+    "@toeverything/theme": "^1.1.15",
    "@types/mdast": "^4.0.4",
    "lit": "^3.2.0",
    "minimatch": "^10.0.1",
@@ -46,5 +46,5 @@
    "!src/__tests__",
    "!dist/__tests__"
  ],
-  "version": "0.22.4"
+  "version": "0.21.0"
 }
--- a/blocksuite/affine/blocks/list/src/list-block.ts
+++ b/blocksuite/affine/blocks/list/src/list-block.ts
@@ -23,7 +23,6 @@ import { effect } from '@preact/signals-core';
 import { html, nothing, type TemplateResult } from 'lit';
 import { query, state } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
-import { repeat } from 'lit/directives/repeat.js';
 import { styleMap } from 'lit/directives/style-map.js';

 import { correctNumberedListsOrderToPrev } from './commands/utils.js';
@@ -139,11 +138,6 @@ export class ListBlockComponent extends CaptionedBlockComponent<ListBlockModel>

  override renderBlock(): TemplateResult<1> {
    const { model, _onClickIcon } = this;
-    const widgets = html`${repeat(
-      Object.entries(this.widgets),
-      ([id]) => id,
-      ([_, widget]) => widget
-    )}`;
    const collapsed = this.store.readonly
      ? this._readonlyCollapsed
      : model.props.collapsed;
@@ -205,7 +199,7 @@ export class ListBlockComponent extends CaptionedBlockComponent<ListBlockModel>
          ></rich-text>
        </div>

-        ${children} ${widgets}
+        ${children}
      </div>
    `;
  }
--- a/blocksuite/affine/blocks/note/package.json
+++ b/blocksuite/affine/blocks/note/package.json
@@ -27,7 +27,7 @@
    "@blocksuite/store": "workspace:*",
    "@lit/context": "^1.1.2",
    "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.16",
+    "@toeverything/theme": "^1.1.15",
    "@types/lodash-es": "^4.17.12",
    "@types/mdast": "^4.0.4",
    "@vanilla-extract/css": "^1.17.0",
@@ -49,5 +49,5 @@
    "!src/__tests__",
    "!dist/__tests__"
  ],
-  "version": "0.22.4"
+  "version": "0.21.0"
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
yoyoyohamapi	2dc69a3bef	feat(core): block diff ui	2025-06-19 11:30:58 +08:00
yoyoyohamapi	e8d774a2ad	feat(core): markdown-diff & patch apply	2025-06-18 11:12:39 +08:00
				`@@ -1 +0,0 @@`
				`export * from '@blocksuite/affine-components/tooltip';`
				`@@ -1 +0,0 @@`
				`export * from '@blocksuite/affine-foundation/clipboard';`
				`@@ -1 +0,0 @@`
				`export * from '@blocksuite/affine-inline-comment';`