WIP: Start introducing dry vs wet paint concept

- Open channel notes and chat on channel click
- WIP
- Fix compile error
- Don't join live kit until requested
- Track in_call state separately from in_room



Release Notes:

- Improved channels: you can now be in a channel without joining the
audio call automatically

**or**

- N/A

---------

Co-authored-by: Nathan Sobo <nathan@zed.dev>

.github/actions/check_style/action.yml

@@ -2,29 +2,14 @@ name: "Check formatting"
 description: "Checks code formatting use cargo fmt"
 
 runs:
-  using: "composite"
-  steps:
-    - name: cargo fmt
-      shell: bash -euxo pipefail {0}
-      run: cargo fmt --all -- --check
+    using: "composite"
+    steps:
+        - name: cargo fmt
+          shell: bash -euxo pipefail {0}
+          run: cargo fmt --all -- --check
 
-    - name: cargo clippy
-      shell: bash -euxo pipefail {0}
-      # clippy.toml is not currently supporting specifying allowed lints
-      # so specify those here, and disable the rest until Zed's workspace
-      # will have more fixes & suppression for the standard lint set
-      run: |
-        cargo clippy --release --workspace --all-features --all-targets -- -A clippy::all -D clippy::dbg_macro -D clippy::todo
-        cargo clippy -p gpui
-
-    - name: Find modified migrations
-      shell: bash -euxo pipefail {0}
-      run: |
-        export SQUAWK_GITHUB_TOKEN=${{ github.token }}
-        . ./script/squawk
-
-    - uses: bufbuild/buf-setup-action@v1
-    - uses: bufbuild/buf-breaking-action@v1
-      with:
-        input: "crates/rpc/proto/"
-        against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=main,subdir=crates/rpc/proto/"
+        - name: Find modified migrations
+          shell: bash -euxo pipefail {0}
+          run: |
+              export SQUAWK_GITHUB_TOKEN=${{ github.token }}
+              . ./script/squawk

.github/actions/run_tests/action.yml

@@ -10,7 +10,7 @@ runs:
               cargo install cargo-nextest
 
         - name: Install Node
-          uses: actions/setup-node@v3
+          uses: actions/setup-node@v4
           with:
               node-version: "18"
 

.github/pull_request_template.md

@@ -2,4 +2,8 @@
 
 Release Notes:
 
-- (Added|Fixed|Improved) ... ([#<public_issue_number_if_exists>](https://github.com/zed-industries/zed/issues/<public_issue_number_if_exists>)).
+- Added/Fixed/Improved ... ([#<public_issue_number_if_exists>](https://github.com/zed-industries/zed/issues/<public_issue_number_if_exists>)).
+
+**or**
+
+- N/A

.github/workflows/ci.yml

@@ -1,148 +1,204 @@
 name: CI
 
 on:
-  push:
-    branches:
-      - main
-      - "v[0-9]+.[0-9]+.x"
-    tags:
-      - "v*"
-  pull_request:
-    branches:
-      - "**"
+    push:
+        branches:
+            - main
+            - "v[0-9]+.[0-9]+.x"
+        tags:
+            - "v*"
+    pull_request:
+        branches:
+            - "**"
 
 concurrency:
-  # Allow only one workflow per any non-`main` branch.
-  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }}
-  cancel-in-progress: true
+    # Allow only one workflow per any non-`main` branch.
+    group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }}
+    cancel-in-progress: true
 
 env:
-  CARGO_TERM_COLOR: always
-  CARGO_INCREMENTAL: 0
-  RUST_BACKTRACE: 1
+    CARGO_TERM_COLOR: always
+    CARGO_INCREMENTAL: 0
+    RUST_BACKTRACE: 1
 
 jobs:
-  style:
-    name: Check formatting, Clippy lints, and spelling
-    runs-on:
-      - self-hosted
-      - test
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-        with:
-          clean: false
-          submodules: "recursive"
-          fetch-depth: 0
+    style:
+        name: Check formatting and spelling
+        runs-on:
+            - self-hosted
+            - test
+        steps:
+            - name: Checkout repo
+              uses: actions/checkout@v4
+              with:
+                  clean: false
+                  submodules: "recursive"
+                  fetch-depth: 0
 
-      - name: Set up default .cargo/config.toml
-        run: cp ./.cargo/ci-config.toml ~/.cargo/config.toml
+            - name: Set up default .cargo/config.toml
+              run: cp ./.cargo/ci-config.toml ~/.cargo/config.toml
 
-      - name: Check spelling
-        run: |
-          if ! which typos > /dev/null; then
-            cargo install typos-cli
-          fi
-          typos
+            - name: Check spelling
+              run: |
+                  if ! which typos > /dev/null; then
+                    cargo install typos-cli
+                  fi
+                  typos
 
-      - name: Run style checks
-        uses: ./.github/actions/check_style
+            - name: Run style checks
+              uses: ./.github/actions/check_style
 
-  tests:
-    name: Run tests
-    runs-on:
-      - self-hosted
-      - test
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-        with:
-          clean: false
-          submodules: "recursive"
+            - name: Ensure fresh merge
+              shell: bash -euxo pipefail {0}
+              run: |
+                  if [ -z "$GITHUB_BASE_REF" ];
+                  then
+                    echo "BUF_BASE_BRANCH=$(git merge-base origin/main HEAD)" >> $GITHUB_ENV
+                  else
+                    git checkout -B temp
+                    git merge -q origin/$GITHUB_BASE_REF -m "merge main into temp"
+                    echo "BUF_BASE_BRANCH=$GITHUB_BASE_REF" >> $GITHUB_ENV
+                  fi
 
-      - name: Run tests
-        uses: ./.github/actions/run_tests
+            - uses: bufbuild/buf-setup-action@v1
+            - uses: bufbuild/buf-breaking-action@v1
+              with:
+                  input: "crates/rpc/proto/"
+                  against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=${BUF_BASE_BRANCH},subdir=crates/rpc/proto/"
 
-      - name: Build collab
-        run: cargo build -p collab
+    macos_tests:
+        name: (macOS) Run Clippy and tests
+        runs-on:
+            - self-hosted
+            - test
+        steps:
+            - name: Checkout repo
+              uses: actions/checkout@v4
+              with:
+                  clean: false
+                  submodules: "recursive"
 
-      - name: Build other binaries
-        run: cargo build --workspace --bins --all-features
+            - name: cargo clippy
+              shell: bash -euxo pipefail {0}
+              run: script/clippy
 
-  bundle:
-    name: Bundle app
-    runs-on:
-      - self-hosted
-      - bundle
-    if: ${{ startsWith(github.ref, 'refs/tags/v') || contains(github.event.pull_request.labels.*.name, 'run-build-dmg') }}
-    needs: tests
-    env:
-      MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
-      MACOS_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }}
-      APPLE_NOTARIZATION_USERNAME: ${{ secrets.APPLE_NOTARIZATION_USERNAME }}
-      APPLE_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }}
-    steps:
-      - name: Install Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: "18"
+            - name: Run tests
+              uses: ./.github/actions/run_tests
 
-      - name: Checkout repo
-        uses: actions/checkout@v4
-        with:
-          clean: false
-          submodules: "recursive"
+            - name: Build collab
+              run: cargo build -p collab
 
-      - name: Limit target directory size
-        run: script/clear-target-dir-if-larger-than 100
+            - name: Build other binaries
+              run: cargo build --workspace --bins --all-features
 
-      - name: Determine version and release channel
-        if: ${{ startsWith(github.ref, 'refs/tags/v') }}
-        run: |
-          set -eu
+    # todo!(linux): Actually run the tests
+    linux_tests:
+        name: (Linux) Run Clippy and tests
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout repo
+              uses: actions/checkout@v4
+              with:
+                  clean: false
+                  submodules: "recursive"
 
-          version=$(script/get-crate-version zed)
-          channel=$(cat crates/zed/RELEASE_CHANNEL)
-          echo "Publishing version: ${version} on release channel ${channel}"
-          echo "RELEASE_CHANNEL=${channel}" >> $GITHUB_ENV
+            - name: Restore from cache
+              uses: actions/cache@v4
+              with:
+                  path: |
+                      ~/.cargo/bin/
+                      ~/.cargo/registry/index/
+                      ~/.cargo/registry/cache/
+                      ~/.cargo/git/db/
+                      target/
+                  key: ${{ runner.os }}-cargo-${{ hashFiles('**/rust-toolchain.toml') }}-${{ hashFiles('**/Cargo.lock') }}
+                  restore-keys: ${{ runner.os }}-cargo-${{ hashFiles('**/rust-toolchain.toml') }}-
 
-          expected_tag_name=""
-          case ${channel} in
-            stable)
-              expected_tag_name="v${version}";;
-            preview)
-              expected_tag_name="v${version}-pre";;
-            nightly)
-              expected_tag_name="v${version}-nightly";;
-            *)
-              echo "can't publish a release on channel ${channel}"
-              exit 1;;
-          esac
-          if [[ $GITHUB_REF_NAME != $expected_tag_name ]]; then
-            echo "invalid release tag ${GITHUB_REF_NAME}. expected ${expected_tag_name}"
-            exit 1
-          fi
+            - name: configure linux
+              shell: bash -euxo pipefail {0}
+              run: script/linux
 
-      - name: Generate license file
-        run: script/generate-licenses
+            - name: cargo clippy
+              shell: bash -euxo pipefail {0}
+              run: script/clippy
 
-      - name: Create app bundle
-        run: script/bundle
-
-      - name: Upload app bundle to workflow run if main branch or specific label
-        uses: actions/upload-artifact@v3
-        if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-build-dmg') }}
-        with:
-          name: Zed_${{ github.event.pull_request.head.sha || github.sha }}.dmg
-          path: target/release/Zed.dmg
-
-      - uses: softprops/action-gh-release@v1
-        name: Upload app bundle to release
-        if: ${{ env.RELEASE_CHANNEL == 'preview' || env.RELEASE_CHANNEL == 'stable' }}
-        with:
-          draft: true
-          prerelease: ${{ env.RELEASE_CHANNEL == 'preview' }}
-          files: target/release/Zed.dmg
-          body: ""
+            - name: Build Zed
+              run: cargo build -p zed
+    bundle:
+        name: Bundle app
+        runs-on:
+            - self-hosted
+            - bundle
+        if: ${{ startsWith(github.ref, 'refs/tags/v') || contains(github.event.pull_request.labels.*.name, 'run-build-dmg') }}
+        needs: [macos_tests, linux_tests]
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
+            MACOS_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }}
+            APPLE_NOTARIZATION_USERNAME: ${{ secrets.APPLE_NOTARIZATION_USERNAME }}
+            APPLE_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }}
+            ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
+        steps:
+            - name: Install Node
+              uses: actions/setup-node@v4
+              with:
+                  node-version: "18"
+
+            - name: Checkout repo
+              uses: actions/checkout@v4
+              with:
+                  clean: false
+                  submodules: "recursive"
+
+            - name: Limit target directory size
+              run: script/clear-target-dir-if-larger-than 100
+
+            - name: Determine version and release channel
+              if: ${{ startsWith(github.ref, 'refs/tags/v') }}
+              run: |
+                  set -eu
+
+                  version=$(script/get-crate-version zed)
+                  channel=$(cat crates/zed/RELEASE_CHANNEL)
+                  echo "Publishing version: ${version} on release channel ${channel}"
+                  echo "RELEASE_CHANNEL=${channel}" >> $GITHUB_ENV
+
+                  expected_tag_name=""
+                  case ${channel} in
+                    stable)
+                      expected_tag_name="v${version}";;
+                    preview)
+                      expected_tag_name="v${version}-pre";;
+                    nightly)
+                      expected_tag_name="v${version}-nightly";;
+                    *)
+                      echo "can't publish a release on channel ${channel}"
+                      exit 1;;
+                  esac
+                  if [[ $GITHUB_REF_NAME != $expected_tag_name ]]; then
+                    echo "invalid release tag ${GITHUB_REF_NAME}. expected ${expected_tag_name}"
+                    exit 1
+                  fi
+
+            - name: Generate license file
+              run: script/generate-licenses
+
+            - name: Create app bundle
+              run: script/bundle
+
+            - name: Upload app bundle to workflow run if main branch or specific label
+              uses: actions/upload-artifact@v3
+              if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-build-dmg') }}
+              with:
+                  name: Zed_${{ github.event.pull_request.head.sha || github.sha }}.dmg
+                  path: target/release/Zed.dmg
+
+            - uses: softprops/action-gh-release@v1
+              name: Upload app bundle to release
+              if: ${{ env.RELEASE_CHANNEL == 'preview' || env.RELEASE_CHANNEL == 'stable' }}
+              with:
+                  draft: true
+                  prerelease: ${{ env.RELEASE_CHANNEL == 'preview' }}
+                  files: target/release/Zed.dmg
+                  body: ""
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/danger.yml

@@ -1,35 +1,35 @@
 name: Danger
 
 on:
-  pull_request:
-    branches: [main]
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - edited
+    pull_request:
+        branches: [main]
+        types:
+            - opened
+            - synchronize
+            - reopened
+            - edited
 
 jobs:
-  danger:
-    runs-on: ubuntu-latest
+    danger:
+        runs-on: ubuntu-latest
 
-    steps:
-      - uses: actions/checkout@v4
+        steps:
+            - uses: actions/checkout@v4
 
-      - uses: pnpm/action-setup@v2.2.4
-        with:
-          version: 8
+            - uses: pnpm/action-setup@v3
+              with:
+                  version: 8
 
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: "20"
-          cache: "pnpm"
-          cache-dependency-path: "script/danger/pnpm-lock.yaml"
+            - name: Setup Node
+              uses: actions/setup-node@v4
+              with:
+                  node-version: "20"
+                  cache: "pnpm"
+                  cache-dependency-path: "script/danger/pnpm-lock.yaml"
 
-      - run: pnpm install --dir script/danger
+            - run: pnpm install --dir script/danger
 
-      - name: Run Danger
-        run: pnpm run --dir script/danger danger ci
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
+            - name: Run Danger
+              run: pnpm run --dir script/danger danger ci
+              env:
+                  GITHUB_TOKEN: ${{ github.token }}

.github/workflows/deploy_collab.yml

@@ -0,0 +1,111 @@
+name: Publish Collab Server Image
+
+on:
+  push:
+    tags:
+      - collab-production
+      - collab-staging
+
+env:
+  DOCKER_BUILDKIT: 1
+  DIGITALOCEAN_ACCESS_TOKEN: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }}
+
+jobs:
+  style:
+    name: Check formatting and Clippy lints
+    runs-on:
+      - self-hosted
+      - test
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+        with:
+          clean: false
+          submodules: "recursive"
+          fetch-depth: 0
+
+      - name: Run style checks
+        uses: ./.github/actions/check_style
+
+      - name: Run clippy
+        shell: bash -euxo pipefail {0}
+        run: script/clippy
+
+  tests:
+    name: Run tests
+    runs-on:
+      - self-hosted
+      - test
+    needs: style
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+        with:
+          clean: false
+          submodules: "recursive"
+          fetch-depth: 0
+
+      - name: Run tests
+        uses: ./.github/actions/run_tests
+
+  publish:
+    name: Publish collab server image
+    needs:
+      - style
+      - tests
+    runs-on:
+      - self-hosted
+      - deploy
+    steps:
+      - name: Add Rust to the PATH
+        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+
+      - name: Sign into DigitalOcean docker registry
+        run: doctl registry login
+
+      - name: Prune Docker system
+        run: docker system prune  --filter 'until=720h' -f
+
+      - name: Checkout repo
+        uses: actions/checkout@v4
+        with:
+          clean: false
+          submodules: "recursive"
+
+      - name: Build docker image
+        run: docker build . --build-arg GITHUB_SHA=$GITHUB_SHA --tag registry.digitalocean.com/zed/collab:$GITHUB_SHA
+
+      - name: Publish docker image
+        run: docker push registry.digitalocean.com/zed/collab:${GITHUB_SHA}
+
+  deploy:
+    name: Deploy new server image
+    needs:
+      - publish
+    runs-on:
+      - self-hosted
+      - deploy
+
+    steps:
+      - name: Sign into Kubernetes
+        run: doctl kubernetes cluster kubeconfig save --expiry-seconds 600 ${{ secrets.CLUSTER_NAME }}
+
+      - name: Determine namespace
+        run: |
+          set -eu
+          if [[ $GITHUB_REF_NAME = "collab-production" ]]; then
+            echo "Deploying collab:$GITHUB_SHA to production"
+            echo "KUBE_NAMESPACE=production" >> $GITHUB_ENV
+          elif [[ $GITHUB_REF_NAME = "collab-staging" ]]; then
+            echo "Deploying collab:$GITHUB_SHA to staging"
+            echo "KUBE_NAMESPACE=staging" >> $GITHUB_ENV
+          else
+            echo "cowardly refusing to deploy from an unknown branch"
+            exit 1
+          fi
+
+      - name: Start rollout
+        run: kubectl -n "$KUBE_NAMESPACE" set image deployment/collab collab=registry.digitalocean.com/zed/collab:${GITHUB_SHA}
+
+      - name: Wait for rollout to finish
+        run: kubectl -n "$KUBE_NAMESPACE" rollout status deployment/collab

.github/workflows/publish_collab_image.yml

@@ -1,49 +0,0 @@
-name: Publish Collab Server Image
-
-on:
-  push:
-    tags:
-      - collab-v*
-
-env:
-  DOCKER_BUILDKIT: 1
-  DIGITALOCEAN_ACCESS_TOKEN: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }}
-
-jobs:
-  publish:
-    name: Publish collab server image
-    runs-on:
-      - self-hosted
-      - deploy
-    steps:
-      - name: Add Rust to the PATH
-        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
-
-      - name: Sign into DigitalOcean docker registry
-        run: doctl registry login
-
-      - name: Prune Docker system
-        run: docker system prune
-
-      - name: Checkout repo
-        uses: actions/checkout@v4
-        with:
-          clean: false
-          submodules: 'recursive'
-
-      - name: Determine version
-        run: |
-          set -eu
-          version=$(script/get-crate-version collab)
-          if [[ $GITHUB_REF_NAME != "collab-v${version}" ]]; then
-            echo "release tag ${GITHUB_REF_NAME} does not match version ${version}"
-            exit 1
-          fi
-          echo "Publishing collab version: ${version}"
-          echo "COLLAB_VERSION=${version}" >> $GITHUB_ENV
-
-      - name: Build docker image
-        run: docker build . --tag registry.digitalocean.com/zed/collab:v${COLLAB_VERSION}
-
-      - name: Publish docker image
-        run: docker push registry.digitalocean.com/zed/collab:v${COLLAB_VERSION}

.github/workflows/randomized_tests.yml

@@ -3,35 +3,35 @@ name: Randomized Tests
 concurrency: randomized-tests
 
 on:
-  push:
-    branches:
-      - randomized-tests-runner
-  # schedule:
-  #    - cron: '0 * * * *'
+    push:
+        branches:
+            - randomized-tests-runner
+    # schedule:
+    #    - cron: '0 * * * *'
 
 env:
-  CARGO_TERM_COLOR: always
-  CARGO_INCREMENTAL: 0
-  RUST_BACKTRACE: 1
-  ZED_SERVER_URL: https://zed.dev
+    CARGO_TERM_COLOR: always
+    CARGO_INCREMENTAL: 0
+    RUST_BACKTRACE: 1
+    ZED_SERVER_URL: https://zed.dev
 
 jobs:
-  tests:
-    name: Run randomized tests
-    runs-on:
-      - self-hosted
-      - randomized-tests
-    steps:
-      - name: Install Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: "18"
+    tests:
+        name: Run randomized tests
+        runs-on:
+            - self-hosted
+            - randomized-tests
+        steps:
+            - name: Install Node
+              uses: actions/setup-node@v4
+              with:
+                  node-version: "18"
 
-      - name: Checkout repo
-        uses: actions/checkout@v4
-        with:
-          clean: false
-          submodules: "recursive"
+            - name: Checkout repo
+              uses: actions/checkout@v4
+              with:
+                  clean: false
+                  submodules: "recursive"
 
-      - name: Run randomized tests
-        run: script/randomized-test-ci
+            - name: Run randomized tests
+              run: script/randomized-test-ci

.github/workflows/release_nightly.yml

@@ -16,6 +16,7 @@ env:
 jobs:
     style:
         name: Check formatting and Clippy lints
+        if: github.repository_owner == 'zed-industries'
         runs-on:
             - self-hosted
             - test
@@ -30,8 +31,12 @@ jobs:
             - name: Run style checks
               uses: ./.github/actions/check_style
 
+            - name: Run clippy
+              shell: bash -euxo pipefail {0}
+              run: script/clippy
     tests:
         name: Run tests
+        if: github.repository_owner == 'zed-industries'
         runs-on:
             - self-hosted
             - test
@@ -48,6 +53,7 @@ jobs:
 
     bundle:
         name: Bundle app
+        if: github.repository_owner == 'zed-industries'
         runs-on:
             - self-hosted
             - bundle
@@ -59,9 +65,10 @@ jobs:
             APPLE_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }}
             DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
             DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
+            ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
         steps:
             - name: Install Node
-              uses: actions/setup-node@v3
+              uses: actions/setup-node@v4
               with:
                   node-version: "18"
 

.github/workflows/update_all_top_ranking_issues.yml

@@ -6,6 +6,7 @@ on:
 jobs:
     update_top_ranking_issues:
         runs-on: ubuntu-latest
+        if: github.repository_owner == 'zed-industries'
         steps:
             - uses: actions/checkout@v4
             - uses: actions/setup-python@v4

.github/workflows/update_weekly_top_ranking_issues.yml

@@ -6,6 +6,7 @@ on:
 jobs:
     update_top_ranking_issues:
         runs-on: ubuntu-latest
+        if: github.repository_owner == 'zed-industries'
         steps:
             - uses: actions/checkout@v4
             - uses: actions/setup-python@v4

.mailmap

@@ -13,6 +13,8 @@ Antonio Scandurra <me@as-cii.com>
 Antonio Scandurra <me@as-cii.com> <antonio@zed.dev>
 Conrad Irwin <conrad@zed.dev>
 Conrad Irwin <conrad@zed.dev> <conrad.irwin@gmail.com>
+Greg Morenz <greg-morenz@droid.cafe>
+Greg Morenz <greg-morenz@droid.cafe> <morenzg@gmail.com>
 Joseph T. Lyons <JosephTLyons@gmail.com>
 Joseph T. Lyons <JosephTLyons@gmail.com> <JosephTLyons@users.noreply.github.com>
 Julia <floc@unpromptedtirade.com>
@@ -39,6 +41,8 @@ Nathan Sobo <nathan@zed.dev> <nathan@warp.dev>
 Nathan Sobo <nathan@zed.dev> <nathansobo@gmail.com>
 Piotr Osiewicz <piotr@zed.dev>
 Piotr Osiewicz <piotr@zed.dev> <24362066+osiewicz@users.noreply.github.com>
+Robert Clover <git@clo4.net>
+Robert Clover <git@clo4.net> <robert@clover.gdn>
 Thorsten Ball <thorsten@zed.dev>
 Thorsten Ball <thorsten@zed.dev> <me@thorstenball.com>
 Thorsten Ball <thorsten@zed.dev> <mrnugget@gmail.com>

Cargo.toml

@@ -21,6 +21,7 @@ members = [
     "crates/db",
     "crates/diagnostics",
     "crates/editor",
+    "crates/extension",
     "crates/feature_flags",
     "crates/feedback",
     "crates/file_finder",
@@ -30,18 +31,16 @@ members = [
     "crates/git",
     "crates/go_to_line",
     "crates/gpui",
-    "crates/gpui",
-    "crates/gpui_macros",
     "crates/gpui_macros",
     "crates/install_cli",
     "crates/journal",
-    "crates/journal",
     "crates/language",
     "crates/language_selector",
     "crates/language_tools",
     "crates/live_kit_client",
     "crates/live_kit_server",
     "crates/lsp",
+    "crates/markdown_preview",
     "crates/media",
     "crates/menu",
     "crates/multi_buffer",
@@ -91,6 +90,91 @@ default-members = ["crates/zed"]
 resolver = "2"
 
 [workspace.dependencies]
+activity_indicator = { path = "crates/activity_indicator" }
+ai = { path = "crates/ai" }
+assets = { path = "crates/assets" }
+assistant = { path = "crates/assistant" }
+audio = { path = "crates/audio" }
+auto_update = { path = "crates/auto_update" }
+breadcrumbs = { path = "crates/breadcrumbs" }
+call = { path = "crates/call" }
+channel = { path = "crates/channel" }
+cli = { path = "crates/cli" }
+client = { path = "crates/client" }
+clock = { path = "crates/clock" }
+collab = { path = "crates/collab" }
+collab_ui = { path = "crates/collab_ui" }
+collections = { path = "crates/collections" }
+color = { path = "crates/color" }
+command_palette = { path = "crates/command_palette" }
+copilot = { path = "crates/copilot" }
+copilot_ui = { path = "crates/copilot_ui" }
+db = { path = "crates/db" }
+diagnostics = { path = "crates/diagnostics" }
+editor = { path = "crates/editor" }
+extension = { path = "crates/extension" }
+feature_flags = { path = "crates/feature_flags" }
+feedback = { path = "crates/feedback" }
+file_finder = { path = "crates/file_finder" }
+fs = { path = "crates/fs" }
+fsevent = { path = "crates/fsevent" }
+fuzzy = { path = "crates/fuzzy" }
+git = { path = "crates/git" }
+go_to_line = { path = "crates/go_to_line" }
+gpui = { path = "crates/gpui" }
+gpui_macros = { path = "crates/gpui_macros" }
+install_cli = { path = "crates/install_cli" }
+journal = { path = "crates/journal" }
+language = { path = "crates/language" }
+language_selector = { path = "crates/language_selector" }
+language_tools = { path = "crates/language_tools" }
+live_kit_client = { path = "crates/live_kit_client" }
+live_kit_server = { path = "crates/live_kit_server" }
+lsp = { path = "crates/lsp" }
+markdown_preview = { path = "crates/markdown_preview" }
+media = { path = "crates/media" }
+menu = { path = "crates/menu" }
+multi_buffer = { path = "crates/multi_buffer" }
+node_runtime = { path = "crates/node_runtime" }
+notifications = { path = "crates/notifications" }
+outline = { path = "crates/outline" }
+picker = { path = "crates/picker" }
+plugin = { path = "crates/plugin" }
+plugin_macros = { path = "crates/plugin_macros" }
+prettier = { path = "crates/prettier" }
+project = { path = "crates/project" }
+project_panel = { path = "crates/project_panel" }
+project_symbols = { path = "crates/project_symbols" }
+quick_action_bar = { path = "crates/quick_action_bar" }
+recent_projects = { path = "crates/recent_projects" }
+release_channel = { path = "crates/release_channel" }
+rich_text = { path = "crates/rich_text" }
+rope = { path = "crates/rope" }
+rpc = { path = "crates/rpc" }
+search = { path = "crates/search" }
+semantic_index = { path = "crates/semantic_index" }
+settings = { path = "crates/settings" }
+snippet = { path = "crates/snippet" }
+sqlez = { path = "crates/sqlez" }
+sqlez_macros = { path = "crates/sqlez_macros" }
+story = { path = "crates/story" }
+storybook = { path = "crates/storybook" }
+sum_tree = { path = "crates/sum_tree" }
+terminal = { path = "crates/terminal" }
+terminal_view = { path = "crates/terminal_view" }
+text = { path = "crates/text" }
+theme = { path = "crates/theme" }
+theme_importer = { path = "crates/theme_importer" }
+theme_selector = { path = "crates/theme_selector" }
+ui = { path = "crates/ui" }
+util = { path = "crates/util" }
+vcs_menu = { path = "crates/vcs_menu" }
+vim = { path = "crates/vim" }
+welcome = { path = "crates/welcome" }
+workspace = { path = "crates/workspace" }
+zed = { path = "crates/zed" }
+zed_actions = { path = "crates/zed_actions" }
+
 anyhow = "1.0.57"
 async-compression = { version = "0.4", features = ["gzip", "futures-io"] }
 async-trait = "0.1"
@@ -99,11 +183,14 @@ ctor = "0.2.6"
 derive_more = "0.99.17"
 env_logger = "0.9"
 futures = "0.3"
-git2 = { version = "0.15", default-features = false}
+git2 = { version = "0.15", default-features = false }
 globset = "0.4"
 indoc = "1"
 # We explicitly disable a http2 support in isahc.
-isahc = { version = "1.7.2", default-features = false, features = ["static-curl", "text-decoding"] }
+isahc = { version = "1.7.2", default-features = false, features = [
+    "static-curl",
+    "text-decoding",
+] }
 lazy_static = "1.4.0"
 log = { version = "0.4.16", features = ["kv_unstable_serde"] }
 ordered-float = "2.1.1"
@@ -111,6 +198,7 @@ parking_lot = "0.11.1"
 postage = { version = "0.5", features = ["futures-traits"] }
 pretty_assertions = "1.3.0"
 prost = "0.8"
+pulldown-cmark = { version = "0.9.2", default-features = false }
 rand = "0.8.5"
 refineable = { path = "./crates/refineable" }
 regex = "1.5"
@@ -120,7 +208,10 @@ schemars = "0.8"
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_derive = { version = "1.0", features = ["deserialize_in_place"] }
 serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] }
-serde_json_lenient = { version = "0.1", features = ["preserve_order", "raw_value"] }
+serde_json_lenient = { version = "0.1", features = [
+    "preserve_order",
+    "raw_value",
+] }
 serde_repr = "0.1"
 smallvec = { version = "1.6", features = ["union"] }
 smol = "1.2"
@@ -133,13 +224,15 @@ time = { version = "0.3", features = ["serde", "serde-well-known"] }
 toml = "0.5"
 tree-sitter = { version = "0.20", features = ["wasm"] }
 tree-sitter-bash = { git = "https://github.com/tree-sitter/tree-sitter-bash", rev = "7331995b19b8f8aba2d5e26deb51d2195c18bc94" }
+tree-sitter-beancount = { git = "https://github.com/polarmutex/tree-sitter-beancount", rev = "da1bf8c6eb0ae7a97588affde7227630bcd678b6" }
 tree-sitter-c = "0.20.1"
 tree-sitter-c-sharp = { git = "https://github.com/tree-sitter/tree-sitter-c-sharp", rev = "dd5e59721a5f8dae34604060833902b882023aaf" }
-tree-sitter-cpp = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev="f44509141e7e483323d2ec178f2d2e6c0fc041c1" }
+tree-sitter-cpp = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev = "f44509141e7e483323d2ec178f2d2e6c0fc041c1" }
 tree-sitter-css = { git = "https://github.com/tree-sitter/tree-sitter-css", rev = "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51" }
 tree-sitter-elixir = { git = "https://github.com/elixir-lang/tree-sitter-elixir", rev = "a2861e88a730287a60c11ea9299c033c7d076e30" }
 tree-sitter-elm = { git = "https://github.com/elm-tooling/tree-sitter-elm", rev = "692c50c0b961364c40299e73c1306aecb5d20f40" }
 tree-sitter-embedded-template = "0.20.0"
+tree-sitter-erlang = "0.4.0"
 tree-sitter-gitcommit = { git = "https://github.com/gbprod/tree-sitter-gitcommit" }
 tree-sitter-gleam = { git = "https://github.com/gleam-lang/tree-sitter-gleam", rev = "58b7cac8fc14c92b0677c542610d8738c373fa81" }
 tree-sitter-glsl = { git = "https://github.com/theHamsta/tree-sitter-glsl", rev = "2a56fb7bc8bb03a1892b4741279dd0a8758b7fb3" }
@@ -147,6 +240,7 @@ tree-sitter-go = { git = "https://github.com/tree-sitter/tree-sitter-go", rev =
 tree-sitter-gomod = { git = "https://github.com/camdencheek/tree-sitter-go-mod" }
 tree-sitter-gowork = { git = "https://github.com/d1y/tree-sitter-go-work" }
 tree-sitter-haskell = { git = "https://github.com/tree-sitter/tree-sitter-haskell", rev = "cf98de23e4285b8e6bcb57b050ef2326e2cc284b" }
+tree-sitter-hcl = { git = "https://github.com/MichaHoffmann/tree-sitter-hcl", rev = "v1.1.0" }
 tree-sitter-heex = { git = "https://github.com/phoenixframework/tree-sitter-heex", rev = "2e1348c3cf2c9323e87c2744796cf3f3868aa82a" }
 tree-sitter-html = "0.19.0"
 tree-sitter-json = { git = "https://github.com/tree-sitter/tree-sitter-json", rev = "40a81c01a40ac48744e0c8ccabbaba1920441199" }
@@ -154,8 +248,9 @@ tree-sitter-lua = "0.0.14"
 tree-sitter-markdown = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "330ecab87a3e3a7211ac69bbadc19eabecdb1cca" }
 tree-sitter-nix = { git = "https://github.com/nix-community/tree-sitter-nix", rev = "66e3e9ce9180ae08fc57372061006ef83f0abde7" }
 tree-sitter-nu = { git = "https://github.com/nushell/tree-sitter-nu", rev = "26bbaecda0039df4067861ab38ea8ea169f7f5aa" }
+tree-sitter-ocaml = { git = "https://github.com/tree-sitter/tree-sitter-ocaml", rev = "4abfdc1c7af2c6c77a370aee974627be1c285b3b" }
 tree-sitter-php = "0.21.1"
-tree-sitter-proto = {git = "https://github.com/rewinfrey/tree-sitter-proto", rev = "36d54f288aee112f13a67b550ad32634d0c2cb52" }
+tree-sitter-proto = { git = "https://github.com/rewinfrey/tree-sitter-proto", rev = "36d54f288aee112f13a67b550ad32634d0c2cb52" }
 tree-sitter-purescript = { git = "https://github.com/ivanmoreau/tree-sitter-purescript", rev = "a37140f0c7034977b90faa73c94fcb8a5e45ed08" }
 tree-sitter-python = "0.20.2"
 tree-sitter-racket = { git = "https://github.com/zed-industries/tree-sitter-racket", rev = "eb010cf2c674c6fd9a6316a84e28ef90190fe51a" }
@@ -182,6 +277,11 @@ wasmtime = { git = "https://github.com/bytecodealliance/wasmtime", rev = "v16.0.
 split-debuginfo = "unpacked"
 debug = "limited"
 
+# todo!(linux) - Remove this
+[profile.dev.package.blade-graphics]
+split-debuginfo = "off"
+debug = "full"
+
 [profile.dev.package.taffy]
 opt-level = 3
 

Dockerfile

@@ -1,11 +1,14 @@
 # syntax = docker/dockerfile:1.2
 
-FROM rust:1.75-bullseye as builder
+FROM rust:1.76-bullseye as builder
 WORKDIR app
 COPY . .
 
 # Compile collab server
 ARG CARGO_PROFILE_RELEASE_PANIC=abort
+ARG GITHUB_SHA
+
+ENV GITHUB_SHA=$GITHUB_SHA
 RUN --mount=type=cache,target=./script/node_modules \
     --mount=type=cache,target=/usr/local/cargo/registry \
     --mount=type=cache,target=./target \

assets/icons/file_icons/elm.svg

@@ -0,0 +1,9 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.7295 12.1981L7.17677 7.64544C7.07914 7.5478 6.92085 7.5478 6.82322 7.64544L2.27053 12.1981C2.11304 12.3556 2.22458 12.6249 2.4473 12.6249H11.5527C11.7754 12.6249 11.887 12.3556 11.7295 12.1981Z" fill="black" fill-opacity="0.9"/>
+<path d="M1.80178 11.7294L6.35447 7.17668C6.4521 7.07905 6.4521 6.92076 6.35447 6.82312L1.80178 2.27043C1.64429 2.11294 1.375 2.22448 1.375 2.44721L1.375 11.5526C1.375 11.7753 1.64428 11.8869 1.80178 11.7294Z" fill="black" fill-opacity="0.9"/>
+<path d="M9.98928 9.16694L11.9794 7.17751C12.0771 7.0799 12.0771 6.92161 11.9795 6.82396L9.98928 4.833C9.89165 4.73534 9.73333 4.73532 9.63569 4.83297L7.64553 6.82313C7.5479 6.92076 7.5479 7.07905 7.64553 7.17668L9.63575 9.16691C9.73337 9.26453 9.89164 9.26455 9.98928 9.16694Z" fill="black" fill-opacity="0.9"/>
+<path d="M7.89553 1.80168L12.1982 6.10438C12.3557 6.26187 12.625 6.15033 12.625 5.9276V2.37491C12.625 1.82262 12.1773 1.37491 11.625 1.37491H8.0723C7.84958 1.37491 7.73804 1.64419 7.89553 1.80168Z" fill="black" fill-opacity="0.6"/>
+<path d="M8.73976 4.18772L5.25981 4.1895C5.03708 4.18962 4.92567 4.45896 5.08325 4.61637L6.82322 6.35456C6.92087 6.45211 7.07909 6.45207 7.17669 6.35447L8.91666 4.61449C9.0742 4.45696 8.96255 4.1876 8.73976 4.18772Z" fill="black" fill-opacity="0.6"/>
+<path d="M8.1147 3.55936L4.13431 3.55936C4.06801 3.55936 4.00442 3.53302 3.95753 3.48614L2.27057 1.79918C2.11308 1.64169 2.22462 1.37241 2.44735 1.37241L6.42774 1.37241C6.49405 1.37241 6.55763 1.39874 6.60452 1.44563L8.29148 3.13258C8.44897 3.29007 8.33743 3.55936 8.1147 3.55936Z" fill="black" fill-opacity="0.6"/>
+<path d="M12.625 8.07221V11.5526C12.625 11.7753 12.3557 11.8869 12.1982 11.7294L10.458 9.98918C10.3604 9.89155 10.3604 9.73326 10.458 9.63563L12.1982 7.89544C12.3557 7.73794 12.625 7.84949 12.625 8.07221Z" fill="black" fill-opacity="0.6"/>
+</svg>

assets/icons/file_icons/erlang.svg

@@ -0,0 +1 @@
+<svg height="64" viewBox="0 0 128 128" width="64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="0" x2="128" y1="128" y2="0"><stop offset="0" stop-color="#333"/><stop offset="1" stop-color="#5d5d5d"/></linearGradient><path d="m12.239265 30.664279h14.960911c-5.59432 5.460938-7.654216 10.692785-10.342106 18.023379-3.200764 8.729348-.549141 29.987457 3.815534 37.55289 2.943384 5.101853 6.282685 8.994876 8.233522 11.095173h-16.667861zm89.614855 0h13.90661v66.671442h-13.55518c1.31391-1.750328 3.43934-4.534454 5.12085-6.426163 2.32782-2.618784 4.97023-6.978412 4.97023-6.978412l-16.015202-8.133112s-5.48977 11.600331-15.964999 15.964998c-10.475214 4.364666-19.784679-.838179-25.604243-7.530659-5.819578-6.692502-5.82371-22.14014-5.82371-22.14014h60.797524c1.16391-14.839892-2.63216-21.249816-4.66901-25.90547-.91799-2.098266-1.89261-3.810819-3.16287-5.522484zm-38.356164 1.757154c.35429-.01632.731685-.0092 1.104497 0 11.930114.290977 13.053143 12.802122 13.053143 12.802122h-27.311192s2.170772-12.298638 13.153552-12.802122z" fill="url(#a)"/></svg>

assets/icons/file_icons/file_types.json

@@ -1,7 +1,10 @@
 {
     "suffixes": {
+        "Emakefile": "erlang",
         "aac": "audio",
         "accdb": "storage",
+        "app.src": "erlang",
+        "avi": "video",
         "avif": "image",
         "bak": "backup",
         "bash": "terminal",
@@ -23,6 +26,9 @@
         "doc": "document",
         "docx": "document",
         "eex": "elixir",
+        "elm": "elm",
+        "erl": "erlang",
+        "escript": "erlang",
         "eslintrc": "eslint",
         "eslintrc.js": "eslint",
         "eslintrc.json": "eslint",
@@ -37,33 +43,46 @@
         "gif": "image",
         "gitattributes": "vcs",
         "gitignore": "vcs",
-        "gitmodules": "vcs",
         "gitkeep": "vcs",
+        "gitmodules": "vcs",
         "go": "go",
         "h": "code",
         "handlebars": "code",
         "hbs": "template",
         "heex": "elixir",
         "heif": "image",
+        "heic": "image",
+        "hrl": "erlang",
+        "hs": "haskell",
         "htm": "template",
         "html": "template",
-        "hs": "haskell",
         "ib": "storage",
         "ico": "image",
         "ini": "settings",
+        "j2k": "image",
         "java": "code",
+        "jfif": "image",
+        "jp2": "image",
         "jpeg": "image",
         "jpg": "image",
         "js": "code",
         "json": "storage",
         "jsonc": "storage",
+        "jxl": "image",
         "ldf": "storage",
         "lock": "lock",
         "log": "log",
+        "m4a": "audio",
+        "m4v": "video",
         "md": "document",
         "mdb": "storage",
         "mdf": "storage",
         "mdx": "document",
+        "mkv": "video",
+        "mka": "audio",
+        "ml": "ocaml",
+        "mli": "ocaml",
+        "mov": "video",
         "mp3": "audio",
         "mp4": "video",
         "myd": "storage",
@@ -71,7 +90,8 @@
         "odp": "document",
         "ods": "document",
         "odt": "document",
-        "ogg": "video",
+        "ogg": "audio",
+        "opus": "audio",
         "pdb": "storage",
         "pdf": "document",
         "php": "php",
@@ -80,11 +100,14 @@
         "pptx": "document",
         "prettierignore": "prettier",
         "prettierrc": "prettier",
+        "prisma": "prisma",
         "profile": "terminal",
         "ps1": "terminal",
         "psd": "image",
         "py": "python",
+        "qoi": "image",
         "rb": "ruby",
+        "rebar.config": "erlang",
         "rkt": "code",
         "rs": "rust",
         "rtf": "document",
@@ -104,13 +127,18 @@
         "txt": "document",
         "vue": "vue",
         "wav": "audio",
-        "webp": "image",
         "webm": "video",
+        "webp": "image",
+        "wma": "audio",
+        "wmv": "video",
+        "wv": "audio",
         "xls": "document",
         "xlsx": "document",
         "xml": "template",
+        "xrl": "erlang",
         "yaml": "settings",
         "yml": "settings",
+        "yrl": "erlang",
         "zlogin": "terminal",
         "zsh": "terminal",
         "zsh_aliases": "terminal",
@@ -133,7 +161,7 @@
             "icon": "icons/file_icons/folder.svg"
         },
         "css": {
-          "icon": "icons/file_icons/css.svg"
+            "icon": "icons/file_icons/css.svg"
         },
         "default": {
             "icon": "icons/file_icons/file.svg"
@@ -144,6 +172,12 @@
         "elixir": {
             "icon": "icons/file_icons/elixir.svg"
         },
+        "elm": {
+            "icon": "icons/file_icons/elm.svg"
+        },
+        "erlang": {
+            "icon": "icons/file_icons/erlang.svg"
+        },
         "eslint": {
             "icon": "icons/file_icons/eslint.svg"
         },
@@ -168,6 +202,9 @@
         "log": {
             "icon": "icons/file_icons/info.svg"
         },
+        "ocaml": {
+          "icon": "icons/file_icons/ocaml.svg"
+        },
         "phoenix": {
             "icon": "icons/file_icons/phoenix.svg"
         },
@@ -177,6 +214,9 @@
         "prettier": {
             "icon": "icons/file_icons/prettier.svg"
         },
+        "prisma": {
+            "icon": "icons/file_icons/prisma.svg"
+        },
         "python": {
             "icon": "icons/file_icons/python.svg"
         },

assets/icons/file_icons/ocaml.svg

@@ -0,0 +1,5 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.73843 11.709C6.70584 11.6334 6.60683 11.4367 6.55712 11.3736C6.44917 11.2362 6.42396 11.2258 6.39221 11.0523C6.33703 10.7501 6.19094 10.202 6.01879 9.82381C5.92987 9.62863 5.78201 9.46467 5.64665 9.32312C5.52847 9.19895 5.26214 8.99002 5.2157 9.00037C4.7807 9.09487 4.64576 9.55902 4.44115 9.92673C4.32795 10.1301 4.208 10.3031 4.1188 10.5195C4.03641 10.7184 4.04373 10.9387 3.90268 11.1095C3.75801 11.2849 3.66398 11.4715 3.59311 11.6981C3.57968 11.7412 3.54148 12.1939 3.5 12.3006L4.14649 12.2511C4.74896 12.2958 4.57496 12.547 5.51526 12.4922L7 12.4423C6.95398 12.2942 6.89056 12.1228 6.86613 12.067C6.82472 11.9732 6.77267 11.7897 6.73843 11.709Z" fill="black"/>
+<path d="M8.72454 8.42043C8.61775 8.50889 8.40904 8.72165 7.95506 8.8021C7.75133 8.83825 7.56076 8.84122 7.35158 8.82925C7.24918 8.8236 7.15263 8.81758 7.04997 8.81605C6.9895 8.81552 6.78663 8.80812 6.79667 8.83039L6.77408 8.89506C6.7776 8.91633 6.78497 8.96949 6.78703 8.98237C6.79534 9.03461 6.79766 9.07617 6.79939 9.12421C6.80252 9.22297 6.79228 9.32592 6.79667 9.42559C6.80577 9.63232 6.87262 9.82076 6.88106 10.0293C6.89029 10.2615 6.99037 10.5072 7.08718 10.6969C7.12393 10.7691 7.17988 10.7773 7.20426 10.8663C7.23284 10.9681 7.20579 11.0762 7.21968 11.1848C7.27417 11.6058 7.37982 12.0459 7.54501 12.4259C7.54621 12.4291 7.54747 12.4325 7.54893 12.4354C7.75293 12.3961 7.95732 12.3119 8.22239 12.2669C8.70839 12.1841 9.3843 12.2268 9.81848 12.1801C10.9171 12.0616 11.5133 12.6972 12.5 12.4367V3.09052C12.5 2.21217 11.8798 1.5 11.1142 1.5H2.88578C2.1205 1.5 1.5 2.21217 1.5 3.09052V6.5608C1.69828 6.47851 1.98348 5.99435 2.07285 5.87661C2.2292 5.67071 2.25758 5.40808 2.33546 5.24267C2.51281 4.86596 2.54331 4.60691 2.94645 4.60691C3.13436 4.60691 3.20899 4.65663 3.3361 4.85238C3.42454 4.98851 3.57731 5.24 3.64881 5.40815C3.73134 5.60215 3.86583 5.86464 3.92497 5.91763C3.96876 5.95698 4.01221 5.9865 4.05275 6.00396C4.11813 6.0321 4.17222 5.98047 4.21595 5.94051C4.27176 5.8895 4.29582 5.78556 4.34751 5.64692C4.422 5.44689 4.5032 5.20721 4.54938 5.12356C4.62932 4.97897 4.65656 4.80739 4.74288 4.72427C4.8702 4.60172 5.03632 4.59311 5.08203 4.58274C5.33779 4.52478 5.45408 4.72419 5.58006 4.85315C5.66253 4.93764 5.77522 5.10785 5.85523 5.33594C5.91776 5.51408 5.99736 5.67887 6.03065 5.78174C6.06281 5.88103 6.14222 6.04018 6.18926 6.23098C6.23199 6.40424 6.34635 6.537 6.3898 6.61936C6.3898 6.61936 6.45632 6.83319 6.86079 7.02864C6.9485 7.07104 7.12579 7.13998 7.23157 7.18413C7.40733 7.25741 7.57757 7.24788 7.79432 7.21807C7.94888 7.21807 8.03261 6.96123 8.10284 6.75556C8.14437 6.634 8.18418 6.28566 8.21129 6.18675C8.23754 6.09051 8.17614 6.01608 8.22843 5.93174C8.28956 5.83329 8.32591 5.82796 8.3612 5.69961C8.43701 5.42478 8.87524 5.4109 9.12156 5.4109C9.32689 5.4109 9.30078 5.63967 9.6491 5.56143C9.84858 5.51652 10.0408 5.59094 10.2526 5.65531C10.4309 5.7096 10.5986 5.77145 10.699 5.90642C10.764 5.99382 10.9254 6.43169 10.761 6.45037C10.7768 6.47257 10.7884 6.5126 10.8179 6.53456C10.7813 6.69974 10.622 6.58207 10.5335 6.56087C10.4142 6.5325 10.33 6.56514 10.2133 6.6244C10.0138 6.72635 9.72206 6.71446 9.5483 6.88055C9.40085 7.02132 9.40111 7.33558 9.33234 7.51166C9.33234 7.51166 9.14137 8.07551 8.72454 8.42043Z" fill="black"/>
+<path d="M3.6514 8.80413C3.57333 8.79137 3.50083 8.77702 3.425 8.75238C3.28339 8.70644 3.12867 8.66165 2.9892 8.60788C2.90451 8.57488 2.62239 8.41409 2.5611 8.36877C2.41737 8.26211 2.32191 7.97231 2.20955 8.00214C2.13782 8.02098 2.06795 8.06058 2.02333 8.17701C1.98692 8.27196 1.97457 8.43521 1.94936 8.54469C1.92011 8.67177 1.86959 8.7904 1.82536 8.91149C1.74401 9.13362 1.59759 9.33453 1.5345 9.55093C1.52181 9.59546 1.51055 9.64527 1.5 9.6972V10.5274V11.9637V12.1713C1.57359 12.1915 1.65057 12.2164 1.73674 12.2535C2.37264 12.5265 2.52781 12.5497 3.15152 12.4348L3.21002 12.4223C3.25775 12.2625 3.2946 11.718 3.32555 11.5494C3.34966 11.4202 3.38279 11.3173 3.39537 11.1853C3.40723 11.06 3.39427 10.9406 3.3876 10.8267C3.37011 10.5414 3.51669 10.4395 3.58667 10.1945C3.64976 9.97283 3.68617 9.7206 3.73839 9.49399C3.78847 9.27653 3.86665 8.96922 4 8.85975C3.98382 8.82938 3.72144 8.81539 3.6514 8.80413Z" fill="black"/>
+</svg>

assets/icons/file_icons/prisma.svg

@@ -0,0 +1,6 @@
+<svg width="14" height="14" viewBox="
+0 0 425 512" xmlns="http://www.w3.org/2000/svg" fill="#000000
+">
+    <path
+        d="m381.38934 405.88714-229.67062 67.92744c-7.01651 2.07778-13.74132-3.99173-12.2669-11.07217l82.04834-392.9335c1.53436-7.352147 11.69152-8.514905 14.89609-1.710173l151.9177 322.59543c2.86494 6.08949-.40357 13.26702-6.92461 15.19297zm39.38512-16.02808-175.89887-373.53306c-11.59465-21.691431-39.0351-20.904032-49.75484-2.749064l-190.77231 308.99c-5.9096786 9.63371-5.7938027 21.50903.3356409 31.01887l93.252489 144.4589c9.615412 11.46292 18.506512 16.87006 33.692012 12.37878l270.68561-80.05849c18.03265-5.40039 26.72265-22.82202 18.46027-40.50593z" />
+</svg>

assets/keymaps/default.json

@@ -415,7 +415,15 @@
       "cmd-?": "assistant::ToggleFocus",
       "cmd-alt-s": "workspace::SaveAll",
       "cmd-k m": "language_selector::Toggle",
-      "escape": "workspace::Unfollow"
+      "escape": "workspace::Unfollow",
+      "cmd-k cmd-left": ["workspace::ActivatePaneInDirection", "Left"],
+      "cmd-k cmd-right": ["workspace::ActivatePaneInDirection", "Right"],
+      "cmd-k cmd-up": ["workspace::ActivatePaneInDirection", "Up"],
+      "cmd-k cmd-down": ["workspace::ActivatePaneInDirection", "Down"],
+      "cmd-k shift-left": ["workspace::SwapPaneInDirection", "Left"],
+      "cmd-k shift-right": ["workspace::SwapPaneInDirection", "Right"],
+      "cmd-k shift-up": ["workspace::SwapPaneInDirection", "Up"],
+      "cmd-k shift-down": ["workspace::SwapPaneInDirection", "Down"]
     }
   },
   // Bindings from Sublime Text
@@ -441,18 +449,6 @@
       "ctrl-alt-shift-f": "editor::SelectToNextSubwordEnd"
     }
   },
-  {
-    "bindings": {
-      "cmd-k cmd-left": ["workspace::ActivatePaneInDirection", "Left"],
-      "cmd-k cmd-right": ["workspace::ActivatePaneInDirection", "Right"],
-      "cmd-k cmd-up": ["workspace::ActivatePaneInDirection", "Up"],
-      "cmd-k cmd-down": ["workspace::ActivatePaneInDirection", "Down"],
-      "cmd-k shift-left": ["workspace::SwapPaneInDirection", "Left"],
-      "cmd-k shift-right": ["workspace::SwapPaneInDirection", "Right"],
-      "cmd-k shift-up": ["workspace::SwapPaneInDirection", "Up"],
-      "cmd-k shift-down": ["workspace::SwapPaneInDirection", "Down"]
-    }
-  },
   // Bindings from Atom
   {
     "context": "Pane",
@@ -569,6 +565,12 @@
       "tab": "channel_modal::ToggleMode"
     }
   },
+  {
+    "context": "ChatPanel > MessageEditor",
+    "bindings": {
+      "escape": "chat_panel::CloseReplyPreview"
+    }
+  },
   {
     "context": "Terminal",
     "bindings": {

assets/keymaps/jetbrains.json

@@ -42,6 +42,7 @@
       "shift-alt-up": "editor::MoveLineUp",
       "shift-alt-down": "editor::MoveLineDown",
       "cmd-alt-l": "editor::Format",
+      "shift-f6": "editor::Rename",
       "cmd-[": "pane::GoBack",
       "cmd-]": "pane::GoForward",
       "alt-f7": "editor::FindAllReferences",
@@ -80,10 +81,18 @@
       "cmd-6": "diagnostics::Deploy"
     }
   },
+  {
+    "context": "Pane",
+    "bindings": {
+      "cmd-alt-left": "pane::GoBack",
+      "cmd-alt-right": "pane::GoForward"
+    }
+  },
   {
     "context": "ProjectPanel",
     "bindings": {
-      "enter": "project_panel::Open"
+      "enter": "project_panel::Open",
+      "shift-f6": "project_panel::Rename"
     }
   }
 ]

assets/keymaps/vim.json

@@ -96,6 +96,8 @@
           }
         }
       ],
+      ";": "vim::RepeatFind",
+      ",": "vim::RepeatFindReversed",
       "ctrl-o": "pane::GoBack",
       "ctrl-i": "pane::GoForward",
       "ctrl-]": "editor::GoToDefinition",
@@ -282,7 +284,8 @@
       "ctrl-w o": "workspace::CloseInactiveTabsAndPanes",
       "ctrl-w ctrl-o": "workspace::CloseInactiveTabsAndPanes",
       "ctrl-w n": ["workspace::NewFileInDirection", "Up"],
-      "ctrl-w ctrl-n": ["workspace::NewFileInDirection", "Up"]
+      "ctrl-w ctrl-n": ["workspace::NewFileInDirection", "Up"],
+      "-": "pane::RevealInProjectPanel"
     }
   },
   {
@@ -333,8 +336,6 @@
       ],
       "*": "vim::MoveToNext",
       "#": "vim::MoveToPrev",
-      ";": "vim::RepeatFind",
-      ",": "vim::RepeatFindReversed",
       "r": ["vim::PushOperator", "Replace"],
       "s": "vim::Substitute",
       "shift-s": "vim::SubstituteLine",

assets/settings/default.json

@@ -107,6 +107,13 @@
     // Join calls with the microphone muted by default
     "mute_on_join": false
   },
+  // Toolbar related settings
+  "toolbar": {
+    // Whether to show breadcrumbs.
+    "breadcrumbs": true,
+    // Whether to show quick action buttons.
+    "quick_actions": true
+  },
   // Scrollbar related settings
   "scrollbar": {
     // When to show the scrollbar in the editor.
@@ -127,8 +134,12 @@
     // Whether to show selections in the scrollbar.
     "selections": true,
     // Whether to show symbols selections in the scrollbar.
-    "symbols_selections": true
+    "symbols_selections": true,
+    // Whether to show diagnostic indicators in the scrollbar.
+    "diagnostics": true
   },
+  // The number of lines to keep above/below the cursor when scrolling.
+  "vertical_scroll_margin": 3,
   "relative_line_numbers": false,
   // When to populate a new search's query based on the text under the cursor.
   // This setting can take the following three values:
@@ -485,6 +496,9 @@
     "JavaScript": {
       "tab_size": 2
     },
+    "Terraform": {
+      "tab_size": 2
+    },
     "TypeScript": {
       "tab_size": 2
     },
@@ -496,6 +510,12 @@
     },
     "JSON": {
       "tab_size": 2
+    },
+    "OCaml": {
+      "tab_size": 2
+    },
+    "OCaml Interface": {
+      "tab_size": 2
     }
   },
   // Zed's Prettier integration settings.
@@ -538,7 +558,7 @@
   "stable": {
     // "theme": "Andromeda"
   },
-  // Settings overrides to use when using Zed Stable.
+  // Settings overrides to use when using Zed Dev.
   // Mostly useful for developers who are managing multiple instances of Zed.
   "dev": {
     // "theme": "Andromeda"

assets/settings/initial_local_settings.json

@@ -1,5 +1,5 @@
 // Folder-specific settings
 //
 // For a full list of overridable settings, and general information on folder-specific settings,
-// see the documentation: https://docs.zed.dev/configuration/configuring-zed#folder-specific-settings
+// see the documentation: https://zed.dev/docs/configuring-zed#folder-specific-settings
 {}

assets/themes/andromeda/andromeda.json

@@ -42,7 +42,7 @@
         "tab_bar.background": "#21242bff",
         "tab.inactive_background": "#21242bff",
         "tab.active_background": "#1e2025ff",
-        "search.match_background": null,
+        "search.match_background": "#11a79366",
         "panel.background": "#21242bff",
         "panel.focused_border": null,
         "pane.focused_border": null,

assets/themes/atelier/atelier.json

@@ -42,7 +42,7 @@
         "tab_bar.background": "#221f26ff",
         "tab.inactive_background": "#221f26ff",
         "tab.active_background": "#19171cff",
-        "search.match_background": null,
+        "search.match_background": "#576dda66",
         "panel.background": "#221f26ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -426,7 +426,7 @@
         "tab_bar.background": "#e6e3ebff",
         "tab.inactive_background": "#e6e3ebff",
         "tab.active_background": "#efecf4ff",
-        "search.match_background": null,
+        "search.match_background": "#586dda66",
         "panel.background": "#e6e3ebff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -810,7 +810,7 @@
         "tab_bar.background": "#262622ff",
         "tab.inactive_background": "#262622ff",
         "tab.active_background": "#20201dff",
-        "search.match_background": null,
+        "search.match_background": "#6684e066",
         "panel.background": "#262622ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -1194,7 +1194,7 @@
         "tab_bar.background": "#eeebd7ff",
         "tab.inactive_background": "#eeebd7ff",
         "tab.active_background": "#fefbecff",
-        "search.match_background": null,
+        "search.match_background": "#6784e066",
         "panel.background": "#eeebd7ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -1578,7 +1578,7 @@
         "tab_bar.background": "#2c2b23ff",
         "tab.inactive_background": "#2c2b23ff",
         "tab.active_background": "#22221bff",
-        "search.match_background": null,
+        "search.match_background": "#37a16666",
         "panel.background": "#2c2b23ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -1962,7 +1962,7 @@
         "tab_bar.background": "#ebeae3ff",
         "tab.inactive_background": "#ebeae3ff",
         "tab.active_background": "#f4f3ecff",
-        "search.match_background": null,
+        "search.match_background": "#38a16666",
         "panel.background": "#ebeae3ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -2346,7 +2346,7 @@
         "tab_bar.background": "#27211eff",
         "tab.inactive_background": "#27211eff",
         "tab.active_background": "#1b1918ff",
-        "search.match_background": null,
+        "search.match_background": "#417ee666",
         "panel.background": "#27211eff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -2730,7 +2730,7 @@
         "tab_bar.background": "#e9e6e4ff",
         "tab.inactive_background": "#e9e6e4ff",
         "tab.active_background": "#f0eeedff",
-        "search.match_background": null,
+        "search.match_background": "#417ee666",
         "panel.background": "#e9e6e4ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -3114,7 +3114,7 @@
         "tab_bar.background": "#252025ff",
         "tab.inactive_background": "#252025ff",
         "tab.active_background": "#1b181bff",
-        "search.match_background": null,
+        "search.match_background": "#526aeb66",
         "panel.background": "#252025ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -3498,7 +3498,7 @@
         "tab_bar.background": "#e0d5e0ff",
         "tab.inactive_background": "#e0d5e0ff",
         "tab.active_background": "#f7f3f7ff",
-        "search.match_background": null,
+        "search.match_background": "#526aeb66",
         "panel.background": "#e0d5e0ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -3882,7 +3882,7 @@
         "tab_bar.background": "#1c2529ff",
         "tab.inactive_background": "#1c2529ff",
         "tab.active_background": "#161b1dff",
-        "search.match_background": null,
+        "search.match_background": "#277fad66",
         "panel.background": "#1c2529ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -4266,7 +4266,7 @@
         "tab_bar.background": "#cdeaf9ff",
         "tab.inactive_background": "#cdeaf9ff",
         "tab.active_background": "#ebf8ffff",
-        "search.match_background": null,
+        "search.match_background": "#277fad66",
         "panel.background": "#cdeaf9ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -4650,7 +4650,7 @@
         "tab_bar.background": "#252020ff",
         "tab.inactive_background": "#252020ff",
         "tab.active_background": "#1b1818ff",
-        "search.match_background": null,
+        "search.match_background": "#7272ca66",
         "panel.background": "#252020ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -5034,7 +5034,7 @@
         "tab_bar.background": "#ebe3e3ff",
         "tab.inactive_background": "#ebe3e3ff",
         "tab.active_background": "#f4ececff",
-        "search.match_background": null,
+        "search.match_background": "#7372ca66",
         "panel.background": "#ebe3e3ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -5418,7 +5418,7 @@
         "tab_bar.background": "#1f2621ff",
         "tab.inactive_background": "#1f2621ff",
         "tab.active_background": "#171c19ff",
-        "search.match_background": null,
+        "search.match_background": "#478c9066",
         "panel.background": "#1f2621ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -5802,7 +5802,7 @@
         "tab_bar.background": "#e3ebe6ff",
         "tab.inactive_background": "#e3ebe6ff",
         "tab.active_background": "#ecf4eeff",
-        "search.match_background": null,
+        "search.match_background": "#488c9066",
         "panel.background": "#e3ebe6ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -6186,7 +6186,7 @@
         "tab_bar.background": "#1f231fff",
         "tab.inactive_background": "#1f231fff",
         "tab.active_background": "#131513ff",
-        "search.match_background": null,
+        "search.match_background": "#3e62f466",
         "panel.background": "#1f231fff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -6570,7 +6570,7 @@
         "tab_bar.background": "#daeedaff",
         "tab.inactive_background": "#daeedaff",
         "tab.active_background": "#f3faf3ff",
-        "search.match_background": null,
+        "search.match_background": "#3f62f466",
         "panel.background": "#daeedaff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -6954,7 +6954,7 @@
         "tab_bar.background": "#262f51ff",
         "tab.inactive_background": "#262f51ff",
         "tab.active_background": "#202646ff",
-        "search.match_background": null,
+        "search.match_background": "#3e8fd066",
         "panel.background": "#262f51ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -7338,7 +7338,7 @@
         "tab_bar.background": "#e5e8f5ff",
         "tab.inactive_background": "#e5e8f5ff",
         "tab.active_background": "#f5f7ffff",
-        "search.match_background": null,
+        "search.match_background": "#3f8fd066",
         "panel.background": "#e5e8f5ff",
         "panel.focused_border": null,
         "pane.focused_border": null,

assets/themes/ayu/ayu.json

@@ -42,7 +42,7 @@
         "tab_bar.background": "#1f2127ff",
         "tab.inactive_background": "#1f2127ff",
         "tab.active_background": "#0d1016ff",
-        "search.match_background": null,
+        "search.match_background": "#5ac2fe66",
         "panel.background": "#1f2127ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -411,7 +411,7 @@
         "tab_bar.background": "#ececedff",
         "tab.inactive_background": "#ececedff",
         "tab.active_background": "#fcfcfcff",
-        "search.match_background": null,
+        "search.match_background": "#3b9ee566",
         "panel.background": "#ececedff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -780,7 +780,7 @@
         "tab_bar.background": "#353944ff",
         "tab.inactive_background": "#353944ff",
         "tab.active_background": "#242835ff",
-        "search.match_background": null,
+        "search.match_background": "#73cffe66",
         "panel.background": "#353944ff",
         "panel.focused_border": null,
         "pane.focused_border": null,

assets/themes/gruvbox/gruvbox.json

@@ -42,7 +42,7 @@
         "tab_bar.background": "#3a3735ff",
         "tab.inactive_background": "#3a3735ff",
         "tab.active_background": "#282828ff",
-        "search.match_background": null,
+        "search.match_background": "#83a59866",
         "panel.background": "#3a3735ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -416,7 +416,7 @@
         "tab_bar.background": "#393634ff",
         "tab.inactive_background": "#393634ff",
         "tab.active_background": "#1d2021ff",
-        "search.match_background": null,
+        "search.match_background": "#83a59866",
         "panel.background": "#393634ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -790,7 +790,7 @@
         "tab_bar.background": "#3b3735ff",
         "tab.inactive_background": "#3b3735ff",
         "tab.active_background": "#32302fff",
-        "search.match_background": null,
+        "search.match_background": "#83a59866",
         "panel.background": "#3b3735ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -1164,7 +1164,7 @@
         "tab_bar.background": "#ecddb4ff",
         "tab.inactive_background": "#ecddb4ff",
         "tab.active_background": "#fbf1c7ff",
-        "search.match_background": null,
+        "search.match_background": "#0b667866",
         "panel.background": "#ecddb4ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -1538,7 +1538,7 @@
         "tab_bar.background": "#ecddb5ff",
         "tab.inactive_background": "#ecddb5ff",
         "tab.active_background": "#f9f5d7ff",
-        "search.match_background": null,
+        "search.match_background": "#0b667866",
         "panel.background": "#ecddb5ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -1912,7 +1912,7 @@
         "tab_bar.background": "#ecdcb3ff",
         "tab.inactive_background": "#ecdcb3ff",
         "tab.active_background": "#f2e5bcff",
-        "search.match_background": null,
+        "search.match_background": "#0b667866",
         "panel.background": "#ecdcb3ff",
         "panel.focused_border": null,
         "pane.focused_border": null,

assets/themes/one/one.json

@@ -42,7 +42,7 @@
         "tab_bar.background": "#2f343eff",
         "tab.inactive_background": "#2f343eff",
         "tab.active_background": "#282c33ff",
-        "search.match_background": null,
+        "search.match_background": "#74ade866",
         "panel.background": "#2f343eff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -416,7 +416,7 @@
         "tab_bar.background": "#ebebecff",
         "tab.inactive_background": "#ebebecff",
         "tab.active_background": "#fafafaff",
-        "search.match_background": null,
+        "search.match_background": "#5c79e266",
         "panel.background": "#ebebecff",
         "panel.focused_border": null,
         "pane.focused_border": null,

assets/themes/rose_pine/rose_pine.json

@@ -42,7 +42,7 @@
         "tab_bar.background": "#1c1b2aff",
         "tab.inactive_background": "#1c1b2aff",
         "tab.active_background": "#191724ff",
-        "search.match_background": null,
+        "search.match_background": "#57949f66",
         "panel.background": "#1c1b2aff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -421,7 +421,7 @@
         "tab_bar.background": "#fef9f2ff",
         "tab.inactive_background": "#fef9f2ff",
         "tab.active_background": "#faf4edff",
-        "search.match_background": null,
+        "search.match_background": "#9cced766",
         "panel.background": "#fef9f2ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -800,7 +800,7 @@
         "tab_bar.background": "#28253cff",
         "tab.inactive_background": "#28253cff",
         "tab.active_background": "#232136ff",
-        "search.match_background": null,
+        "search.match_background": "#9cced766",
         "panel.background": "#28253cff",
         "panel.focused_border": null,
         "pane.focused_border": null,

assets/themes/sandcastle/sandcastle.json

@@ -42,7 +42,7 @@
         "tab_bar.background": "#2b3038ff",
         "tab.inactive_background": "#2b3038ff",
         "tab.active_background": "#282c33ff",
-        "search.match_background": null,
+        "search.match_background": "#528b8b66",
         "panel.background": "#2b3038ff",
         "panel.focused_border": null,
         "pane.focused_border": null,

assets/themes/solarized/solarized.json

@@ -42,7 +42,7 @@
         "tab_bar.background": "#04313bff",
         "tab.inactive_background": "#04313bff",
         "tab.active_background": "#002a35ff",
-        "search.match_background": null,
+        "search.match_background": "#288bd166",
         "panel.background": "#04313bff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -411,7 +411,7 @@
         "tab_bar.background": "#f3eddaff",
         "tab.inactive_background": "#f3eddaff",
         "tab.active_background": "#fdf6e3ff",
-        "search.match_background": null,
+        "search.match_background": "#298bd166",
         "panel.background": "#f3eddaff",
         "panel.focused_border": null,
         "pane.focused_border": null,

assets/themes/summercamp/summercamp.json

@@ -42,7 +42,7 @@
         "tab_bar.background": "#231f16ff",
         "tab.inactive_background": "#231f16ff",
         "tab.active_background": "#1b1810ff",
-        "search.match_background": null,
+        "search.match_background": "#499bef66",
         "panel.background": "#231f16ff",
         "panel.focused_border": null,
         "pane.focused_border": null,

crates/activity_indicator/Cargo.toml

@@ -11,18 +11,18 @@ doctest = false
 
 [dependencies]
 anyhow.workspace = true
-auto_update = { path = "../auto_update" }
-editor = { path = "../editor" }
+auto_update.workspace = true
+editor.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui" }
-language = { path = "../language" }
-project = { path = "../project" }
-settings = { path = "../settings" }
+gpui.workspace = true
+language.workspace = true
+project.workspace = true
+settings.workspace = true
 smallvec.workspace = true
-theme = { path = "../theme" }
-ui = { path = "../ui" }
-util = { path = "../util" }
-workspace = { path = "../workspace", package = "workspace" }
+theme.workspace = true
+ui.workspace = true
+util.workspace = true
+workspace.workspace = true
 
 [dev-dependencies]
-editor = { path = "../editor", features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }

crates/ai/Cargo.toml

@@ -17,9 +17,9 @@ anyhow.workspace = true
 async-trait.workspace = true
 bincode = "1.3.3"
 futures.workspace = true
-gpui = { path = "../gpui" }
+gpui.workspace = true
 isahc.workspace = true
-language = { path = "../language" }
+language.workspace = true
 lazy_static.workspace = true
 log.workspace = true
 matrixmultiply = "0.3.7"
@@ -33,7 +33,7 @@ rusqlite = { version = "0.29.0", features = ["blob", "array", "modern_sqlite"] }
 serde.workspace = true
 serde_json.workspace = true
 tiktoken-rs.workspace = true
-util = { path = "../util" }
+util.workspace = true
 
 [dev-dependencies]
-gpui = { path = "../gpui", features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }

crates/ai/src/providers/open_ai/embedding.rs

@@ -134,7 +134,7 @@ impl OpenAiEmbeddingProvider {
         spans: Vec<&str>,
         request_timeout: u64,
     ) -> Result<Response<AsyncBody>> {
-        let request = Request::post("https://api.openai.com/v1/embeddings")
+        let request = Request::post(format!("{OPEN_AI_API_URL}/embeddings"))
             .redirect_policy(isahc::config::RedirectPolicy::Follow)
             .timeout(Duration::from_secs(request_timeout))
             .header("Content-Type", "application/json")

crates/assets/Cargo.toml

@@ -7,5 +7,5 @@ license = "GPL-3.0-or-later"
 
 [dependencies]
 anyhow.workspace = true
-gpui = { path = "../gpui" }
+gpui.workspace = true
 rust-embed.workspace = true

crates/assistant/Cargo.toml

@@ -10,44 +10,44 @@ path = "src/assistant.rs"
 doctest = false
 
 [dependencies]
-ai = { path = "../ai" }
+ai.workspace = true
 anyhow.workspace = true
 chrono.workspace = true
-client = { path = "../client" }
-collections = { path = "../collections" }
-editor = { path = "../editor" }
-fs = { path = "../fs" }
+client.workspace = true
+collections.workspace = true
+editor.workspace = true
+fs.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui" }
+gpui.workspace = true
 indoc.workspace = true
 isahc.workspace = true
-language = { path = "../language" }
+language.workspace = true
 log.workspace = true
-menu = { path = "../menu" }
-multi_buffer = { path = "../multi_buffer" }
+menu.workspace = true
+multi_buffer.workspace = true
 ordered-float.workspace = true
 parking_lot.workspace = true
-project = { path = "../project" }
+project.workspace = true
 regex.workspace = true
 schemars.workspace = true
-search = { path = "../search" }
-semantic_index = { path = "../semantic_index" }
+search.workspace = true
+semantic_index.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 smol.workspace = true
-theme = { path = "../theme" }
+theme.workspace = true
 tiktoken-rs.workspace = true
-ui = { path = "../ui" }
-util = { path = "../util" }
+ui.workspace = true
+util.workspace = true
 uuid.workspace = true
-workspace = { path = "../workspace" }
+workspace.workspace = true
 
 [dev-dependencies]
-ai = { path = "../ai", features = ["test-support"] }
+ai = { workspace = true, features = ["test-support"] }
 ctor.workspace = true
-editor = { path = "../editor", features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
 env_logger.workspace = true
 log.workspace = true
-project = { path = "../project", features = ["test-support"] }
+project = { workspace = true, features = ["test-support"] }
 rand.workspace = true

crates/assistant/src/assistant_panel.rs

@@ -199,9 +199,13 @@ impl AssistantPanel {
             .update(cx, |toolbar, cx| toolbar.focus_changed(true, cx));
         cx.notify();
         if self.focus_handle.is_focused(cx) {
-            if let Some(editor) = self.active_editor() {
-                cx.focus_view(editor);
-            } else if let Some(api_key_editor) = self.api_key_editor.as_ref() {
+            if self.has_credentials() {
+                if let Some(editor) = self.active_editor() {
+                    cx.focus_view(editor);
+                }
+            }
+
+            if let Some(api_key_editor) = self.api_key_editor.as_ref() {
                 cx.focus_view(api_key_editor);
             }
         }
@@ -777,6 +781,10 @@ impl AssistantPanel {
         });
     }
 
+    fn build_api_key_editor(&mut self, cx: &mut WindowContext<'_>) {
+        self.api_key_editor = Some(build_api_key_editor(cx));
+    }
+
     fn new_conversation(&mut self, cx: &mut ViewContext<Self>) -> View<ConversationEditor> {
         let editor = cx.new_view(|cx| {
             ConversationEditor::new(
@@ -870,7 +878,7 @@ impl AssistantPanel {
             cx.update(|cx| completion_provider.delete_credentials(cx))?
                 .await;
             this.update(&mut cx, |this, cx| {
-                this.api_key_editor = Some(build_api_key_editor(cx));
+                this.build_api_key_editor(cx);
                 this.focus_handle.focus(cx);
                 cx.notify();
             })
@@ -954,6 +962,7 @@ impl AssistantPanel {
             line_height: relative(1.3).into(),
             background_color: None,
             underline: None,
+            strikethrough: None,
             white_space: WhiteSpace::Normal,
         };
         EditorElement::new(
@@ -1136,7 +1145,7 @@ impl AssistantPanel {
     }
 }
 
-fn build_api_key_editor(cx: &mut ViewContext<AssistantPanel>) -> View<Editor> {
+fn build_api_key_editor(cx: &mut WindowContext) -> View<Editor> {
     cx.new_view(|cx| {
         let mut editor = Editor::single_line(cx);
         editor.set_placeholder_text("sk-000000000000000000000000000000000000000000000000", cx);
@@ -1147,9 +1156,10 @@ fn build_api_key_editor(cx: &mut ViewContext<AssistantPanel>) -> View<Editor> {
 impl Render for AssistantPanel {
     fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
         if let Some(api_key_editor) = self.api_key_editor.clone() {
-            const INSTRUCTIONS: [&'static str; 5] = [
+            const INSTRUCTIONS: [&'static str; 6] = [
                 "To use the assistant panel or inline assistant, you need to add your OpenAI API key.",
                 " - You can create an API key at: platform.openai.com/api-keys",
+                " - Make sure your OpenAI account has credits",
                 " - Having a subscription for another service like GitHub Copilot won't work.",
                 " ",
                 "Paste your OpenAI API key and press Enter to use the assistant:"
@@ -1342,7 +1352,9 @@ impl Panel for AssistantPanel {
             cx.spawn(|this, mut cx| async move {
                 load_credentials.await;
                 this.update(&mut cx, |this, cx| {
-                    if this.editors.is_empty() {
+                    if !this.has_credentials() {
+                        this.build_api_key_editor(cx);
+                    } else if this.editors.is_empty() {
                         this.new_conversation(cx);
                     }
                 })
@@ -3155,6 +3167,7 @@ impl InlineAssistant {
             line_height: relative(1.3).into(),
             background_color: None,
             underline: None,
+            strikethrough: None,
             white_space: WhiteSpace::Normal,
         };
         EditorElement::new(

crates/assistant/src/codegen.rs

@@ -366,7 +366,8 @@ mod tests {
     use gpui::{Context, TestAppContext};
     use indoc::indoc;
     use language::{
-        language_settings, tree_sitter_rust, Buffer, BufferId, Language, LanguageConfig, Point,
+        language_settings, tree_sitter_rust, Buffer, BufferId, Language, LanguageConfig,
+        LanguageMatcher, Point,
     };
     use rand::prelude::*;
     use serde::Serialize;
@@ -675,7 +676,10 @@ mod tests {
         Language::new(
             LanguageConfig {
                 name: "Rust".into(),
-                path_suffixes: vec!["rs".to_string()],
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".to_string()],
+                    ..Default::default()
+                },
                 ..Default::default()
             },
             Some(tree_sitter_rust::language()),

crates/assistant/src/prompts.rs

@@ -172,22 +172,24 @@ pub fn generate_content_prompt(
 
 #[cfg(test)]
 pub(crate) mod tests {
-
     use super::*;
-    use std::sync::Arc;
-
     use gpui::{AppContext, Context};
     use indoc::indoc;
     use language::{
-        language_settings, tree_sitter_rust, Buffer, BufferId, Language, LanguageConfig, Point,
+        language_settings, tree_sitter_rust, Buffer, BufferId, Language, LanguageConfig,
+        LanguageMatcher, Point,
     };
     use settings::SettingsStore;
+    use std::sync::Arc;
 
     pub(crate) fn rust_lang() -> Language {
         Language::new(
             LanguageConfig {
                 name: "Rust".into(),
-                path_suffixes: vec!["rs".to_string()],
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".to_string()],
+                    ..Default::default()
+                },
                 ..Default::default()
             },
             Some(tree_sitter_rust::language()),

crates/audio/Cargo.toml

@@ -11,11 +11,11 @@ doctest = false
 
 [dependencies]
 anyhow.workspace = true
-collections = { path = "../collections" }
+collections.workspace = true
 derive_more.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui" }
+gpui.workspace = true
 log.workspace = true
 parking_lot.workspace = true
 rodio = { version = "0.17.1", default-features = false, features = ["wav"] }
-util = { path = "../util" }
+util.workspace = true

crates/auto_update/Cargo.toml

@@ -11,22 +11,22 @@ doctest = false
 
 [dependencies]
 anyhow.workspace = true
-client = { path = "../client" }
-db = { path = "../db" }
-gpui = { path = "../gpui" }
+client.workspace = true
+db.workspace = true
+gpui.workspace = true
 isahc.workspace = true
 lazy_static.workspace = true
 log.workspace = true
-menu = { path = "../menu" }
-project = { path = "../project" }
-release_channel = { path = "../release_channel" }
+menu.workspace = true
+project.workspace = true
+release_channel.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 smol.workspace = true
 tempfile.workspace = true
-theme = { path = "../theme" }
-util = { path = "../util" }
-workspace = { path = "../workspace" }
+theme.workspace = true
+util.workspace = true
+workspace.workspace = true

crates/auto_update/src/auto_update.rs

@@ -1,7 +1,7 @@
 mod update_notification;
 
 use anyhow::{anyhow, Context, Result};
-use client::{Client, TelemetrySettings, ZED_APP_PATH, ZED_APP_VERSION};
+use client::{Client, TelemetrySettings, ZED_APP_PATH};
 use db::kvp::KEY_VALUE_STORE;
 use db::RELEASE_CHANNEL;
 use gpui::{
@@ -108,29 +108,28 @@ pub fn init(http_client: Arc<ZedHttpClient>, cx: &mut AppContext) {
     })
     .detach();
 
-    if let Some(version) = ZED_APP_VERSION.or_else(|| cx.app_metadata().app_version) {
-        let auto_updater = cx.new_model(|cx| {
-            let updater = AutoUpdater::new(version, http_client);
+    let version = release_channel::AppVersion::global(cx);
+    let auto_updater = cx.new_model(|cx| {
+        let updater = AutoUpdater::new(version, http_client);
 
-            let mut update_subscription = AutoUpdateSetting::get_global(cx)
-                .0
-                .then(|| updater.start_polling(cx));
+        let mut update_subscription = AutoUpdateSetting::get_global(cx)
+            .0
+            .then(|| updater.start_polling(cx));
 
-            cx.observe_global::<SettingsStore>(move |updater, cx| {
-                if AutoUpdateSetting::get_global(cx).0 {
-                    if update_subscription.is_none() {
-                        update_subscription = Some(updater.start_polling(cx))
-                    }
-                } else {
-                    update_subscription.take();
+        cx.observe_global::<SettingsStore>(move |updater, cx| {
+            if AutoUpdateSetting::get_global(cx).0 {
+                if update_subscription.is_none() {
+                    update_subscription = Some(updater.start_polling(cx))
                 }
-            })
-            .detach();
+            } else {
+                update_subscription.take();
+            }
+        })
+        .detach();
 
-            updater
-        });
-        cx.set_global(GlobalAutoUpdate(Some(auto_updater)));
-    }
+        updater
+    });
+    cx.set_global(GlobalAutoUpdate(Some(auto_updater)));
 }
 
 pub fn check(_: &Check, cx: &mut WindowContext) {

crates/auto_update/src/update_notification.rs

@@ -40,10 +40,11 @@ impl Render for UpdateNotification {
                     .id("notes")
                     .child(Label::new("View the release notes"))
                     .cursor_pointer()
-                    .on_click(|_, cx| {
+                    .on_click(cx.listener(|this, _, cx| {
                         crate::view_release_notes(&Default::default(), cx);
-                    }),
-            )
+                        this.dismiss(&menu::Cancel, cx)
+                    })),
+            );
     }
 }
 

crates/breadcrumbs/Cargo.toml

@@ -10,20 +10,20 @@ path = "src/breadcrumbs.rs"
 doctest = false
 
 [dependencies]
-collections = { path = "../collections" }
-editor = { path = "../editor" }
-gpui = { path = "../gpui" }
+collections.workspace = true
+editor.workspace = true
+gpui.workspace = true
 itertools = "0.10"
-language = { path = "../language" }
-outline = { path = "../outline" }
-project = { path = "../project" }
-search = { path = "../search" }
-settings = { path = "../settings" }
-theme = { path = "../theme" }
-ui = { path = "../ui" }
-workspace = { path = "../workspace" }
+language.workspace = true
+outline.workspace = true
+project.workspace = true
+search.workspace = true
+settings.workspace = true
+theme.workspace = true
+ui.workspace = true
+workspace.workspace = true
 
 [dev-dependencies]
-editor = { path = "../editor", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-workspace = { path = "../workspace", features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+workspace = { workspace = true, features = ["test-support"] }

crates/call/Cargo.toml

@@ -22,33 +22,33 @@ test-support = [
 [dependencies]
 anyhow.workspace = true
 async-broadcast = "0.4"
-audio = { path = "../audio" }
-client = { path = "../client" }
-collections = { path = "../collections" }
-fs = { path = "../fs" }
+audio.workspace = true
+client.workspace = true
+collections.workspace = true
+fs.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui" }
+gpui.workspace = true
 image = "0.23"
-language = { path = "../language" }
-live_kit_client = { path = "../live_kit_client" }
+language.workspace = true
+live_kit_client.workspace = true
 log.workspace = true
-media = { path = "../media" }
+media.workspace = true
 postage.workspace = true
-project = { path = "../project" }
+project.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 smallvec.workspace = true
-util = { path = "../util" }
+util.workspace = true
 
 [dev-dependencies]
-client = { path = "../client", features = ["test-support"] }
-collections = { path = "../collections", features = ["test-support"] }
-fs = { path = "../fs", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-language = { path = "../language", features = ["test-support"] }
-live_kit_client = { path = "../live_kit_client", features = ["test-support"] }
-project = { path = "../project", features = ["test-support"] }
-util = { path = "../util", features = ["test-support"] }
+client = { workspace = true, features = ["test-support"] }
+collections = { workspace = true, features = ["test-support"] }
+fs = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+language = { workspace = true, features = ["test-support"] }
+live_kit_client = { workspace = true, features = ["test-support"] }
+project = { workspace = true, features = ["test-support"] }
+util = { workspace = true, features = ["test-support"] }

crates/call/src/participant.rs

@@ -49,6 +49,7 @@ pub struct RemoteParticipant {
     pub participant_index: ParticipantIndex,
     pub muted: bool,
     pub speaking: bool,
+    pub in_call: bool,
     pub video_tracks: HashMap<live_kit_client::Sid, Arc<RemoteVideoTrack>>,
     pub audio_tracks: HashMap<live_kit_client::Sid, Arc<RemoteAudioTrack>>,
 }

crates/call/src/room.rs

@@ -61,6 +61,7 @@ pub struct Room {
     id: u64,
     channel_id: Option<u64>,
     live_kit: Option<LiveKitRoom>,
+    live_kit_connection_info: Option<proto::LiveKitConnectionInfo>,
     status: RoomStatus,
     shared_projects: HashSet<WeakModel<Project>>,
     joined_projects: HashSet<WeakModel<Project>>,
@@ -112,91 +113,18 @@ impl Room {
         user_store: Model<UserStore>,
         cx: &mut ModelContext<Self>,
     ) -> Self {
-        let live_kit_room = if let Some(connection_info) = live_kit_connection_info {
-            let room = live_kit_client::Room::new();
-            let mut status = room.status();
-            // Consume the initial status of the room.
-            let _ = status.try_recv();
-            let _maintain_room = cx.spawn(|this, mut cx| async move {
-                while let Some(status) = status.next().await {
-                    let this = if let Some(this) = this.upgrade() {
-                        this
-                    } else {
-                        break;
-                    };
-
-                    if status == live_kit_client::ConnectionState::Disconnected {
-                        this.update(&mut cx, |this, cx| this.leave(cx).log_err())
-                            .ok();
-                        break;
-                    }
-                }
-            });
-
-            let _handle_updates = cx.spawn({
-                let room = room.clone();
-                move |this, mut cx| async move {
-                    let mut updates = room.updates();
-                    while let Some(update) = updates.next().await {
-                        let this = if let Some(this) = this.upgrade() {
-                            this
-                        } else {
-                            break;
-                        };
-
-                        this.update(&mut cx, |this, cx| {
-                            this.live_kit_room_updated(update, cx).log_err()
-                        })
-                        .ok();
-                    }
-                }
-            });
-
-            let connect = room.connect(&connection_info.server_url, &connection_info.token);
-            cx.spawn(|this, mut cx| async move {
-                connect.await?;
-                this.update(&mut cx, |this, cx| {
-                    if !this.read_only() {
-                        if let Some(live_kit) = &this.live_kit {
-                            if !live_kit.muted_by_user && !live_kit.deafened {
-                                return this.share_microphone(cx);
-                            }
-                        }
-                    }
-                    Task::ready(Ok(()))
-                })?
-                .await
-            })
-            .detach_and_log_err(cx);
-
-            Some(LiveKitRoom {
-                room,
-                screen_track: LocalTrack::None,
-                microphone_track: LocalTrack::None,
-                next_publish_id: 0,
-                muted_by_user: Self::mute_on_join(cx),
-                deafened: false,
-                speaking: false,
-                _maintain_room,
-                _handle_updates,
-            })
-        } else {
-            None
-        };
-
         let maintain_connection = cx.spawn({
             let client = client.clone();
             move |this, cx| Self::maintain_connection(this, client.clone(), cx).log_err()
         });
 
-        Audio::play_sound(Sound::Joined, cx);
-
         let (room_update_completed_tx, room_update_completed_rx) = watch::channel();
 
-        Self {
+        let mut this = Self {
             id,
             channel_id,
-            live_kit: live_kit_room,
+            live_kit: None,
+            live_kit_connection_info,
             status: RoomStatus::Online,
             shared_projects: Default::default(),
             joined_projects: Default::default(),
@@ -220,7 +148,11 @@ impl Room {
             maintain_connection: Some(maintain_connection),
             room_update_completed_tx,
             room_update_completed_rx,
+        };
+        if this.live_kit_connection_info.is_some() {
+            this.join_call(cx).detach_and_log_err(cx);
         }
+        this
     }
 
     pub(crate) fn create(
@@ -279,7 +211,7 @@ impl Room {
         cx: AsyncAppContext,
     ) -> Result<Model<Self>> {
         Self::from_join_response(
-            client.request(proto::JoinChannel { channel_id }).await?,
+            client.request(proto::JoinChannel2 { channel_id }).await?,
             client,
             user_store,
             cx,
@@ -324,7 +256,7 @@ impl Room {
     }
 
     pub fn mute_on_join(cx: &AppContext) -> bool {
-        CallSettings::get_global(cx).mute_on_join || client::IMPERSONATE_LOGIN.is_some()
+        CallSettings::get_global(cx).mute_on_join
     }
 
     fn from_join_response(
@@ -374,7 +306,9 @@ impl Room {
         }
 
         log::info!("leaving room");
-        Audio::play_sound(Sound::Leave, cx);
+        if self.live_kit.is_some() {
+            Audio::play_sound(Sound::Leave, cx);
+        }
 
         self.clear_state(cx);
 
@@ -593,6 +527,24 @@ impl Room {
         &self.remote_participants
     }
 
+    pub fn call_participants(&self, cx: &AppContext) -> Vec<Arc<User>> {
+        self.remote_participants()
+            .values()
+            .filter_map(|participant| {
+                if participant.in_call {
+                    Some(participant.user.clone())
+                } else {
+                    None
+                }
+            })
+            .chain(if self.in_call() {
+                self.user_store.read(cx).current_user()
+            } else {
+                None
+            })
+            .collect()
+    }
+
     pub fn remote_participant_for_peer_id(&self, peer_id: PeerId) -> Option<&RemoteParticipant> {
         self.remote_participants
             .values()
@@ -824,6 +776,7 @@ impl Room {
                         }
 
                         let role = participant.role();
+                        let in_call = participant.in_call;
                         let location = ParticipantLocation::from_proto(participant.location)
                             .unwrap_or(ParticipantLocation::External);
                         if let Some(remote_participant) =
@@ -834,9 +787,15 @@ impl Room {
                             remote_participant.participant_index = participant_index;
                             if location != remote_participant.location
                                 || role != remote_participant.role
+                                || in_call != remote_participant.in_call
                             {
+                                if in_call && !remote_participant.in_call {
+                                    Audio::play_sound(Sound::Joined, cx);
+                                }
                                 remote_participant.location = location;
                                 remote_participant.role = role;
+                                remote_participant.in_call = participant.in_call;
+
                                 cx.emit(Event::ParticipantLocationChanged {
                                     participant_id: peer_id,
                                 });
@@ -853,12 +812,15 @@ impl Room {
                                     role,
                                     muted: true,
                                     speaking: false,
+                                    in_call: participant.in_call,
                                     video_tracks: Default::default(),
                                     audio_tracks: Default::default(),
                                 },
                             );
 
-                            Audio::play_sound(Sound::Joined, cx);
+                            if participant.in_call {
+                                Audio::play_sound(Sound::Joined, cx);
+                            }
 
                             if let Some(live_kit) = this.live_kit.as_ref() {
                                 let video_tracks =
@@ -1047,15 +1009,6 @@ impl Room {
             }
 
             RoomUpdate::SubscribedToRemoteAudioTrack(track, publication) => {
-                if let Some(live_kit) = &self.live_kit {
-                    if live_kit.deafened {
-                        track.stop();
-                        cx.foreground_executor()
-                            .spawn(publication.set_enabled(false))
-                            .detach();
-                    }
-                }
-
                 let user_id = track.publisher_id().parse()?;
                 let track_id = track.sid().to_string();
                 let participant = self
@@ -1304,18 +1257,14 @@ impl Room {
         })
     }
 
-    pub fn is_sharing_mic(&self) -> bool {
-        self.live_kit.as_ref().map_or(false, |live_kit| {
-            !matches!(live_kit.microphone_track, LocalTrack::None)
-        })
-    }
-
     pub fn is_muted(&self) -> bool {
-        self.live_kit.as_ref().map_or(false, |live_kit| {
-            matches!(live_kit.microphone_track, LocalTrack::None)
-                || live_kit.muted_by_user
-                || live_kit.deafened
-        })
+        self.live_kit
+            .as_ref()
+            .map_or(true, |live_kit| match &live_kit.microphone_track {
+                LocalTrack::None => true,
+                LocalTrack::Pending { .. } => true,
+                LocalTrack::Published { track_publication } => track_publication.is_muted(),
+            })
     }
 
     pub fn read_only(&self) -> bool {
@@ -1329,8 +1278,8 @@ impl Room {
             .map_or(false, |live_kit| live_kit.speaking)
     }
 
-    pub fn is_deafened(&self) -> Option<bool> {
-        self.live_kit.as_ref().map(|live_kit| live_kit.deafened)
+    pub fn in_call(&self) -> bool {
+        self.live_kit.is_some()
     }
 
     #[track_caller]
@@ -1383,12 +1332,8 @@ impl Room {
                         Ok(publication) => {
                             if canceled {
                                 live_kit.room.unpublish_track(publication);
+                                live_kit.microphone_track = LocalTrack::None;
                             } else {
-                                if live_kit.muted_by_user || live_kit.deafened {
-                                    cx.background_executor()
-                                        .spawn(publication.set_mute(true))
-                                        .detach();
-                                }
                                 live_kit.microphone_track = LocalTrack::Published {
                                     track_publication: publication,
                                 };
@@ -1492,50 +1437,140 @@ impl Room {
     }
 
     pub fn toggle_mute(&mut self, cx: &mut ModelContext<Self>) {
-        if let Some(live_kit) = self.live_kit.as_mut() {
-            // When unmuting, undeafen if the user was deafened before.
-            let was_deafened = live_kit.deafened;
-            if live_kit.muted_by_user
-                || live_kit.deafened
-                || matches!(live_kit.microphone_track, LocalTrack::None)
-            {
-                live_kit.muted_by_user = false;
-                live_kit.deafened = false;
-            } else {
-                live_kit.muted_by_user = true;
-            }
-            let muted = live_kit.muted_by_user;
-            let should_undeafen = was_deafened && !live_kit.deafened;
-
-            if let Some(task) = self.set_mute(muted, cx) {
-                task.detach_and_log_err(cx);
-            }
-
-            if should_undeafen {
-                if let Some(task) = self.set_deafened(false, cx) {
-                    task.detach_and_log_err(cx);
-                }
-            }
+        let muted = !self.is_muted();
+        if let Some(task) = self.set_mute(muted, cx) {
+            task.detach_and_log_err(cx);
         }
     }
 
-    pub fn toggle_deafen(&mut self, cx: &mut ModelContext<Self>) {
-        if let Some(live_kit) = self.live_kit.as_mut() {
-            // When deafening, mute the microphone if it was not already muted.
-            // When un-deafening, unmute the microphone, unless it was explicitly muted.
-            let deafened = !live_kit.deafened;
-            live_kit.deafened = deafened;
-            let should_change_mute = !live_kit.muted_by_user;
+    pub fn join_call(&mut self, cx: &mut ModelContext<Self>) -> Task<Result<()>> {
+        if self.live_kit.is_some() {
+            return Task::ready(Ok(()));
+        }
 
-            if let Some(task) = self.set_deafened(deafened, cx) {
-                task.detach_and_log_err(cx);
-            }
+        let room = live_kit_client::Room::new();
+        let mut status = room.status();
+        // Consume the initial status of the room.
+        let _ = status.try_recv();
+        let _maintain_room = cx.spawn(|this, mut cx| async move {
+            while let Some(status) = status.next().await {
+                let this = if let Some(this) = this.upgrade() {
+                    this
+                } else {
+                    break;
+                };
 
-            if should_change_mute {
-                if let Some(task) = self.set_mute(deafened, cx) {
-                    task.detach_and_log_err(cx);
+                if status == live_kit_client::ConnectionState::Disconnected {
+                    this.update(&mut cx, |this, cx| this.leave(cx).log_err())
+                        .ok();
+                    break;
                 }
             }
+        });
+
+        let _handle_updates = cx.spawn({
+            let room = room.clone();
+            move |this, mut cx| async move {
+                let mut updates = room.updates();
+                while let Some(update) = updates.next().await {
+                    let this = if let Some(this) = this.upgrade() {
+                        this
+                    } else {
+                        break;
+                    };
+
+                    this.update(&mut cx, |this, cx| {
+                        this.live_kit_room_updated(update, cx).log_err()
+                    })
+                    .ok();
+                }
+            }
+        });
+
+        self.live_kit = Some(LiveKitRoom {
+            room: room.clone(),
+            screen_track: LocalTrack::None,
+            microphone_track: LocalTrack::None,
+            next_publish_id: 0,
+            speaking: false,
+            _maintain_room,
+            _handle_updates,
+        });
+
+        cx.spawn({
+            let client = self.client.clone();
+            let share_microphone = !self.read_only() && !Self::mute_on_join(cx);
+            let connection_info = self.live_kit_connection_info.clone();
+            let channel_id = self.channel_id;
+
+            move |this, mut cx| async move {
+                let connection_info = if let Some(connection_info) = connection_info {
+                    connection_info.clone()
+                } else if let Some(channel_id) = channel_id {
+                    if let Some(connection_info) = client
+                        .request(proto::JoinChannelCall { channel_id })
+                        .await?
+                        .live_kit_connection_info
+                    {
+                        connection_info
+                    } else {
+                        return Err(anyhow!("failed to get connection info from server"));
+                    }
+                } else {
+                    return Err(anyhow!(
+                        "tried to connect to livekit without connection info"
+                    ));
+                };
+                room.connect(&connection_info.server_url, &connection_info.token)
+                    .await?;
+
+                let track_updates = this.update(&mut cx, |this, cx| {
+                    Audio::play_sound(Sound::Joined, cx);
+                    let Some(live_kit) = this.live_kit.as_mut() else {
+                        return vec![];
+                    };
+
+                    let mut track_updates = Vec::new();
+                    for participant in this.remote_participants.values() {
+                        for publication in live_kit
+                            .room
+                            .remote_audio_track_publications(&participant.user.id.to_string())
+                        {
+                            track_updates.push(publication.set_enabled(true));
+                        }
+
+                        for track in participant.audio_tracks.values() {
+                            track.start();
+                        }
+                    }
+                    track_updates
+                })?;
+
+                if share_microphone {
+                    this.update(&mut cx, |this, cx| this.share_microphone(cx))?
+                        .await?
+                };
+
+                for result in futures::future::join_all(track_updates).await {
+                    result?;
+                }
+                anyhow::Ok(())
+            }
+        })
+    }
+
+    pub fn leave_call(&mut self, cx: &mut ModelContext<Self>) {
+        Audio::play_sound(Sound::Leave, cx);
+        if let Some(channel_id) = self.channel_id() {
+            let client = self.client.clone();
+            cx.background_executor()
+                .spawn(client.request(proto::LeaveChannelCall { channel_id }))
+                .detach_and_log_err(cx);
+            self.live_kit.take();
+            self.live_kit_connection_info.take();
+            cx.notify();
+        } else {
+            self.leave(cx).detach_and_log_err(cx)
         }
     }
 
@@ -1566,40 +1601,6 @@ impl Room {
         }
     }
 
-    fn set_deafened(
-        &mut self,
-        deafened: bool,
-        cx: &mut ModelContext<Self>,
-    ) -> Option<Task<Result<()>>> {
-        let live_kit = self.live_kit.as_mut()?;
-        cx.notify();
-
-        let mut track_updates = Vec::new();
-        for participant in self.remote_participants.values() {
-            for publication in live_kit
-                .room
-                .remote_audio_track_publications(&participant.user.id.to_string())
-            {
-                track_updates.push(publication.set_enabled(!deafened));
-            }
-
-            for track in participant.audio_tracks.values() {
-                if deafened {
-                    track.stop();
-                } else {
-                    track.start();
-                }
-            }
-        }
-
-        Some(cx.foreground_executor().spawn(async move {
-            for result in futures::future::join_all(track_updates).await {
-                result?;
-            }
-            Ok(())
-        }))
-    }
-
     fn set_mute(
         &mut self,
         should_mute: bool,
@@ -1644,9 +1645,6 @@ struct LiveKitRoom {
     room: Arc<live_kit_client::Room>,
     screen_track: LocalTrack,
     microphone_track: LocalTrack,
-    /// Tracks whether we're currently in a muted state due to auto-mute from deafening or manual mute performed by user.
-    muted_by_user: bool,
-    deafened: bool,
     speaking: bool,
     next_publish_id: usize,
     _maintain_room: Task<()>,

crates/channel/Cargo.toml

@@ -14,42 +14,42 @@ test-support = ["collections/test-support", "gpui/test-support", "rpc/test-suppo
 
 [dependencies]
 anyhow.workspace = true
-client = { path = "../client" }
-clock = { path = "../clock" }
-collections = { path = "../collections" }
-db = { path = "../db" }
-feature_flags = { path = "../feature_flags" }
+client.workspace = true
+clock.workspace = true
+collections.workspace = true
+db.workspace = true
+feature_flags.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui" }
+gpui.workspace = true
 image = "0.23"
-language = { path = "../language" }
+language.workspace = true
 lazy_static.workspace = true
 log.workspace = true
 parking_lot.workspace = true
 postage.workspace = true
 rand.workspace = true
-release_channel = { path = "../release_channel" }
-rpc = { path = "../rpc" }
+release_channel.workspace = true
+rpc.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 smallvec.workspace = true
 smol.workspace = true
-sum_tree = { path = "../sum_tree" }
+sum_tree.workspace = true
 tempfile.workspace = true
-text = { path = "../text" }
+text.workspace = true
 thiserror.workspace = true
 time.workspace = true
 tiny_http = "0.8"
 url.workspace = true
-util = { path = "../util" }
+util.workspace = true
 uuid.workspace = true
 
 [dev-dependencies]
-collections = { path = "../collections", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-rpc = { path = "../rpc", features = ["test-support"] }
-client = { path = "../client", features = ["test-support"] }
-settings = { path = "../settings", features = ["test-support"] }
-util = { path = "../util", features = ["test-support"] }
+collections = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+rpc = { workspace = true, features = ["test-support"] }
+client = { workspace = true, features = ["test-support"] }
+settings = { workspace = true, features = ["test-support"] }
+util = { workspace = true, features = ["test-support"] }

crates/channel/src/channel_chat.rs

@@ -5,12 +5,13 @@ use client::{
     user::{User, UserStore},
     Client, Subscription, TypedEnvelope, UserId,
 };
+use collections::HashSet;
 use futures::lock::Mutex;
-use gpui::{AppContext, AsyncAppContext, Context, EventEmitter, Model, ModelContext, Task};
+use gpui::{
+    AppContext, AsyncAppContext, Context, EventEmitter, Model, ModelContext, Task, WeakModel,
+};
 use rand::prelude::*;
 use std::{
-    collections::HashSet,
-    mem,
     ops::{ControlFlow, Range},
     sync::Arc,
 };
@@ -26,6 +27,7 @@ pub struct ChannelChat {
     loaded_all_messages: bool,
     last_acknowledged_id: Option<u64>,
     next_pending_message_id: usize,
+    first_loaded_message_id: Option<u64>,
     user_store: Model<UserStore>,
     rpc: Arc<Client>,
     outgoing_messages_lock: Arc<Mutex<()>>,
@@ -37,6 +39,7 @@ pub struct ChannelChat {
 pub struct MessageParams {
     pub text: String,
     pub mentions: Vec<(Range<usize>, UserId)>,
+    pub reply_to_message_id: Option<u64>,
 }
 
 #[derive(Clone, Debug)]
@@ -47,6 +50,7 @@ pub struct ChannelMessage {
     pub sender: Arc<User>,
     pub nonce: u128,
     pub mentions: Vec<(Range<usize>, UserId)>,
+    pub reply_to_message_id: Option<u64>,
 }
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
@@ -55,6 +59,15 @@ pub enum ChannelMessageId {
     Pending(usize),
 }
 
+impl Into<Option<u64>> for ChannelMessageId {
+    fn into(self) -> Option<u64> {
+        match self {
+            ChannelMessageId::Saved(id) => Some(id),
+            ChannelMessageId::Pending(_) => None,
+        }
+    }
+}
+
 #[derive(Clone, Debug, Default)]
 pub struct ChannelMessageSummary {
     max_id: ChannelMessageId,
@@ -96,28 +109,35 @@ impl ChannelChat {
         let response = client
             .request(proto::JoinChannelChat { channel_id })
             .await?;
-        let messages = messages_from_proto(response.messages, &user_store, &mut cx).await?;
-        let loaded_all_messages = response.done;
 
-        Ok(cx.new_model(|cx| {
+        let handle = cx.new_model(|cx| {
             cx.on_release(Self::release).detach();
-            let mut this = Self {
+            Self {
                 channel_id: channel.id,
-                user_store,
+                user_store: user_store.clone(),
                 channel_store,
-                rpc: client,
+                rpc: client.clone(),
                 outgoing_messages_lock: Default::default(),
                 messages: Default::default(),
                 acknowledged_message_ids: Default::default(),
-                loaded_all_messages,
+                loaded_all_messages: false,
                 next_pending_message_id: 0,
                 last_acknowledged_id: None,
                 rng: StdRng::from_entropy(),
+                first_loaded_message_id: None,
                 _subscription: subscription.set_model(&cx.handle(), &mut cx.to_async()),
-            };
-            this.insert_messages(messages, cx);
-            this
-        })?)
+            }
+        })?;
+        Self::handle_loaded_messages(
+            handle.downgrade(),
+            user_store,
+            client,
+            response.messages,
+            response.done,
+            &mut cx,
+        )
+        .await?;
+        Ok(handle)
     }
 
     fn release(&mut self, _: &mut AppContext) {
@@ -166,6 +186,7 @@ impl ChannelChat {
                     timestamp: OffsetDateTime::now_utc(),
                     mentions: message.mentions.clone(),
                     nonce,
+                    reply_to_message_id: message.reply_to_message_id,
                 },
                 &(),
             ),
@@ -183,6 +204,7 @@ impl ChannelChat {
                 body: message.text,
                 nonce: Some(nonce.into()),
                 mentions: mentions_to_proto(&message.mentions),
+                reply_to_message_id: message.reply_to_message_id,
             });
             let response = request.await?;
             drop(outgoing_message_guard);
@@ -227,12 +249,16 @@ impl ChannelChat {
                         before_message_id,
                     })
                     .await?;
-                let loaded_all_messages = response.done;
-                let messages = messages_from_proto(response.messages, &user_store, &mut cx).await?;
-                this.update(&mut cx, |this, cx| {
-                    this.loaded_all_messages = loaded_all_messages;
-                    this.insert_messages(messages, cx);
-                })?;
+                Self::handle_loaded_messages(
+                    this,
+                    user_store,
+                    rpc,
+                    response.messages,
+                    response.done,
+                    &mut cx,
+                )
+                .await?;
+
                 anyhow::Ok(())
             }
             .log_err()
@@ -240,9 +266,14 @@ impl ChannelChat {
     }
 
     pub fn first_loaded_message_id(&mut self) -> Option<u64> {
-        self.messages.first().and_then(|message| match message.id {
-            ChannelMessageId::Saved(id) => Some(id),
-            ChannelMessageId::Pending(_) => None,
+        self.first_loaded_message_id
+    }
+
+    /// Load a message by its id, if it's already stored locally.
+    pub fn find_loaded_message(&self, id: u64) -> Option<&ChannelMessage> {
+        self.messages.iter().find(|message| match message.id {
+            ChannelMessageId::Saved(message_id) => message_id == id,
+            ChannelMessageId::Pending(_) => false,
         })
     }
 
@@ -304,6 +335,66 @@ impl ChannelChat {
         }
     }
 
+    async fn handle_loaded_messages(
+        this: WeakModel<Self>,
+        user_store: Model<UserStore>,
+        rpc: Arc<Client>,
+        proto_messages: Vec<proto::ChannelMessage>,
+        loaded_all_messages: bool,
+        cx: &mut AsyncAppContext,
+    ) -> Result<()> {
+        let loaded_messages = messages_from_proto(proto_messages, &user_store, cx).await?;
+
+        let first_loaded_message_id = loaded_messages.first().map(|m| m.id);
+        let loaded_message_ids = this.update(cx, |this, _| {
+            let mut loaded_message_ids: HashSet<u64> = HashSet::default();
+            for message in loaded_messages.iter() {
+                if let Some(saved_message_id) = message.id.into() {
+                    loaded_message_ids.insert(saved_message_id);
+                }
+            }
+            for message in this.messages.iter() {
+                if let Some(saved_message_id) = message.id.into() {
+                    loaded_message_ids.insert(saved_message_id);
+                }
+            }
+            loaded_message_ids
+        })?;
+
+        let missing_ancestors = loaded_messages
+            .iter()
+            .filter_map(|message| {
+                if let Some(ancestor_id) = message.reply_to_message_id {
+                    if !loaded_message_ids.contains(&ancestor_id) {
+                        return Some(ancestor_id);
+                    }
+                }
+                None
+            })
+            .collect::<Vec<_>>();
+
+        let loaded_ancestors = if missing_ancestors.is_empty() {
+            None
+        } else {
+            let response = rpc
+                .request(proto::GetChannelMessagesById {
+                    message_ids: missing_ancestors,
+                })
+                .await?;
+            Some(messages_from_proto(response.messages, &user_store, cx).await?)
+        };
+        this.update(cx, |this, cx| {
+            this.first_loaded_message_id = first_loaded_message_id.and_then(|msg_id| msg_id.into());
+            this.loaded_all_messages = loaded_all_messages;
+            this.insert_messages(loaded_messages, cx);
+            if let Some(loaded_ancestors) = loaded_ancestors {
+                this.insert_messages(loaded_ancestors, cx);
+            }
+        })?;
+
+        Ok(())
+    }
+
     pub fn rejoin(&mut self, cx: &mut ModelContext<Self>) {
         let user_store = self.user_store.clone();
         let rpc = self.rpc.clone();
@@ -311,28 +402,17 @@ impl ChannelChat {
         cx.spawn(move |this, mut cx| {
             async move {
                 let response = rpc.request(proto::JoinChannelChat { channel_id }).await?;
-                let messages = messages_from_proto(response.messages, &user_store, &mut cx).await?;
-                let loaded_all_messages = response.done;
-
-                let pending_messages = this.update(&mut cx, |this, cx| {
-                    if let Some((first_new_message, last_old_message)) =
-                        messages.first().zip(this.messages.last())
-                    {
-                        if first_new_message.id > last_old_message.id {
-                            let old_messages = mem::take(&mut this.messages);
-                            cx.emit(ChannelChatEvent::MessagesUpdated {
-                                old_range: 0..old_messages.summary().count,
-                                new_count: 0,
-                            });
-                            this.loaded_all_messages = loaded_all_messages;
-                        }
-                    }
-
-                    this.insert_messages(messages, cx);
-                    if loaded_all_messages {
-                        this.loaded_all_messages = loaded_all_messages;
-                    }
+                Self::handle_loaded_messages(
+                    this.clone(),
+                    user_store.clone(),
+                    rpc.clone(),
+                    response.messages,
+                    response.done,
+                    &mut cx,
+                )
+                .await?;
 
+                let pending_messages = this.update(&mut cx, |this, _| {
                     this.pending_messages().cloned().collect::<Vec<_>>()
                 })?;
 
@@ -342,6 +422,7 @@ impl ChannelChat {
                         body: pending_message.body,
                         mentions: mentions_to_proto(&pending_message.mentions),
                         nonce: Some(pending_message.nonce.into()),
+                        reply_to_message_id: pending_message.reply_to_message_id,
                     });
                     let response = request.await?;
                     let message = ChannelMessage::from_proto(
@@ -553,6 +634,7 @@ impl ChannelMessage {
                 .nonce
                 .ok_or_else(|| anyhow!("nonce is required"))?
                 .into(),
+            reply_to_message_id: message.reply_to_message_id,
         })
     }
 
@@ -642,6 +724,7 @@ impl<'a> From<&'a str> for MessageParams {
         Self {
             text: value.into(),
             mentions: Vec::new(),
+            reply_to_message_id: None,
         }
     }
 }

crates/channel/src/channel_store.rs

@@ -74,11 +74,19 @@ impl Channel {
     pub fn link(&self) -> String {
         RELEASE_CHANNEL.link_prefix().to_owned()
             + "channel/"
-            + &self.slug()
+            + &Self::slug(&self.name)
             + "-"
             + &self.id.to_string()
     }
 
+    pub fn notes_link(&self, heading: Option<String>) -> String {
+        self.link()
+            + "/notes"
+            + &heading
+                .map(|h| format!("#{}", Self::slug(&h)))
+                .unwrap_or_default()
+    }
+
     pub fn is_root_channel(&self) -> bool {
         self.parent_path.is_empty()
     }
@@ -90,9 +98,8 @@ impl Channel {
             .unwrap_or(self.id)
     }
 
-    pub fn slug(&self) -> String {
-        let slug: String = self
-            .name
+    pub fn slug(str: &str) -> String {
+        let slug: String = str
             .chars()
             .map(|c| if c.is_alphanumeric() { c } else { '-' })
             .collect();

crates/channel/src/channel_store_tests.rs

@@ -184,6 +184,7 @@ async fn test_channel_messages(cx: &mut TestAppContext) {
                     sender_id: 5,
                     mentions: vec![],
                     nonce: Some(1.into()),
+                    reply_to_message_id: None,
                 },
                 proto::ChannelMessage {
                     id: 11,
@@ -192,6 +193,7 @@ async fn test_channel_messages(cx: &mut TestAppContext) {
                     sender_id: 6,
                     mentions: vec![],
                     nonce: Some(2.into()),
+                    reply_to_message_id: None,
                 },
             ],
             done: false,
@@ -239,6 +241,7 @@ async fn test_channel_messages(cx: &mut TestAppContext) {
             sender_id: 7,
             mentions: vec![],
             nonce: Some(3.into()),
+            reply_to_message_id: None,
         }),
     });
 
@@ -292,6 +295,7 @@ async fn test_channel_messages(cx: &mut TestAppContext) {
                     sender_id: 5,
                     nonce: Some(4.into()),
                     mentions: vec![],
+                    reply_to_message_id: None,
                 },
                 proto::ChannelMessage {
                     id: 9,
@@ -300,6 +304,7 @@ async fn test_channel_messages(cx: &mut TestAppContext) {
                     sender_id: 6,
                     nonce: Some(5.into()),
                     mentions: vec![],
+                    reply_to_message_id: None,
                 },
             ],
         },
@@ -329,6 +334,7 @@ async fn test_channel_messages(cx: &mut TestAppContext) {
 fn init_test(cx: &mut AppContext) -> Model<ChannelStore> {
     let settings_store = SettingsStore::test(cx);
     cx.set_global(settings_store);
+    release_channel::init("0.0.0", cx);
     client::init_settings(cx);
 
     let http = FakeHttpClient::with_404_response();

crates/cli/Cargo.toml

@@ -20,7 +20,7 @@ dirs = "3.0"
 ipc-channel = "0.16"
 serde.workspace = true
 serde_derive.workspace = true
-util = { path = "../util" }
+util.workspace = true
 
 [target.'cfg(target_os = "macos")'.dependencies]
 core-foundation = "0.9"

crates/cli/src/main.rs

@@ -1,20 +1,14 @@
+#![cfg_attr(target_os = "linux", allow(dead_code))]
+
 use anyhow::{anyhow, Context, Result};
 use clap::Parser;
-use cli::{CliRequest, CliResponse, IpcHandshake, FORCE_CLI_MODE_ENV_VAR_NAME};
-use core_foundation::{
-    array::{CFArray, CFIndex},
-    string::kCFStringEncodingUTF8,
-    url::{CFURLCreateWithBytes, CFURL},
-};
-use core_services::{kLSLaunchDefaults, LSLaunchURLSpec, LSOpenFromURLSpec, TCFType};
-use ipc_channel::ipc::{IpcOneShotServer, IpcReceiver, IpcSender};
+use cli::{CliRequest, CliResponse};
 use serde::Deserialize;
 use std::{
     ffi::OsStr,
     fs::{self, OpenOptions},
     io,
     path::{Path, PathBuf},
-    ptr,
 };
 use util::paths::PathLikeWithPosition;
 
@@ -112,136 +106,6 @@ enum Bundle {
     },
 }
 
-impl Bundle {
-    fn detect(args_bundle_path: Option<&Path>) -> anyhow::Result<Self> {
-        let bundle_path = if let Some(bundle_path) = args_bundle_path {
-            bundle_path
-                .canonicalize()
-                .with_context(|| format!("Args bundle path {bundle_path:?} canonicalization"))?
-        } else {
-            locate_bundle().context("bundle autodiscovery")?
-        };
-
-        match bundle_path.extension().and_then(|ext| ext.to_str()) {
-            Some("app") => {
-                let plist_path = bundle_path.join("Contents/Info.plist");
-                let plist = plist::from_file::<_, InfoPlist>(&plist_path).with_context(|| {
-                    format!("Reading *.app bundle plist file at {plist_path:?}")
-                })?;
-                Ok(Self::App {
-                    app_bundle: bundle_path,
-                    plist,
-                })
-            }
-            _ => {
-                println!("Bundle path {bundle_path:?} has no *.app extension, attempting to locate a dev build");
-                let plist_path = bundle_path
-                    .parent()
-                    .with_context(|| format!("Bundle path {bundle_path:?} has no parent"))?
-                    .join("WebRTC.framework/Resources/Info.plist");
-                let plist = plist::from_file::<_, InfoPlist>(&plist_path)
-                    .with_context(|| format!("Reading dev bundle plist file at {plist_path:?}"))?;
-                Ok(Self::LocalPath {
-                    executable: bundle_path,
-                    plist,
-                })
-            }
-        }
-    }
-
-    fn plist(&self) -> &InfoPlist {
-        match self {
-            Self::App { plist, .. } => plist,
-            Self::LocalPath { plist, .. } => plist,
-        }
-    }
-
-    fn path(&self) -> &Path {
-        match self {
-            Self::App { app_bundle, .. } => app_bundle,
-            Self::LocalPath { executable, .. } => executable,
-        }
-    }
-
-    fn launch(&self) -> anyhow::Result<(IpcSender<CliRequest>, IpcReceiver<CliResponse>)> {
-        let (server, server_name) =
-            IpcOneShotServer::<IpcHandshake>::new().context("Handshake before Zed spawn")?;
-        let url = format!("zed-cli://{server_name}");
-
-        match self {
-            Self::App { app_bundle, .. } => {
-                let app_path = app_bundle;
-
-                let status = unsafe {
-                    let app_url = CFURL::from_path(app_path, true)
-                        .with_context(|| format!("invalid app path {app_path:?}"))?;
-                    let url_to_open = CFURL::wrap_under_create_rule(CFURLCreateWithBytes(
-                        ptr::null(),
-                        url.as_ptr(),
-                        url.len() as CFIndex,
-                        kCFStringEncodingUTF8,
-                        ptr::null(),
-                    ));
-                    // equivalent to: open zed-cli:... -a /Applications/Zed\ Preview.app
-                    let urls_to_open = CFArray::from_copyable(&[url_to_open.as_concrete_TypeRef()]);
-                    LSOpenFromURLSpec(
-                        &LSLaunchURLSpec {
-                            appURL: app_url.as_concrete_TypeRef(),
-                            itemURLs: urls_to_open.as_concrete_TypeRef(),
-                            passThruParams: ptr::null(),
-                            launchFlags: kLSLaunchDefaults,
-                            asyncRefCon: ptr::null_mut(),
-                        },
-                        ptr::null_mut(),
-                    )
-                };
-
-                anyhow::ensure!(
-                    status == 0,
-                    "cannot start app bundle {}",
-                    self.zed_version_string()
-                );
-            }
-
-            Self::LocalPath { executable, .. } => {
-                let executable_parent = executable
-                    .parent()
-                    .with_context(|| format!("Executable {executable:?} path has no parent"))?;
-                let subprocess_stdout_file =
-                    fs::File::create(executable_parent.join("zed_dev.log"))
-                        .with_context(|| format!("Log file creation in {executable_parent:?}"))?;
-                let subprocess_stdin_file =
-                    subprocess_stdout_file.try_clone().with_context(|| {
-                        format!("Cloning descriptor for file {subprocess_stdout_file:?}")
-                    })?;
-                let mut command = std::process::Command::new(executable);
-                let command = command
-                    .env(FORCE_CLI_MODE_ENV_VAR_NAME, "")
-                    .stderr(subprocess_stdout_file)
-                    .stdout(subprocess_stdin_file)
-                    .arg(url);
-
-                command
-                    .spawn()
-                    .with_context(|| format!("Spawning {command:?}"))?;
-            }
-        }
-
-        let (_, handshake) = server.accept().context("Handshake after Zed spawn")?;
-        Ok((handshake.requests, handshake.responses))
-    }
-
-    fn zed_version_string(&self) -> String {
-        let is_dev = matches!(self, Self::LocalPath { .. });
-        format!(
-            "Zed {}{} – {}",
-            self.plist().bundle_short_version_string,
-            if is_dev { " (dev)" } else { "" },
-            self.path().display(),
-        )
-    }
-}
-
 fn touch(path: &Path) -> io::Result<()> {
     match OpenOptions::new().create(true).write(true).open(path) {
         Ok(_) => Ok(()),
@@ -259,3 +123,187 @@ fn locate_bundle() -> Result<PathBuf> {
     }
     Ok(app_path)
 }
+
+#[cfg(target_os = "linux")]
+mod linux {
+    use std::path::Path;
+
+    use cli::{CliRequest, CliResponse};
+    use ipc_channel::ipc::{IpcReceiver, IpcSender};
+
+    use crate::{Bundle, InfoPlist};
+
+    impl Bundle {
+        pub fn detect(_args_bundle_path: Option<&Path>) -> anyhow::Result<Self> {
+            unimplemented!()
+        }
+
+        pub fn plist(&self) -> &InfoPlist {
+            unimplemented!()
+        }
+
+        pub fn path(&self) -> &Path {
+            unimplemented!()
+        }
+
+        pub fn launch(&self) -> anyhow::Result<(IpcSender<CliRequest>, IpcReceiver<CliResponse>)> {
+            unimplemented!()
+        }
+
+        pub fn zed_version_string(&self) -> String {
+            unimplemented!()
+        }
+    }
+}
+
+#[cfg(target_os = "macos")]
+mod mac_os {
+    use anyhow::Context;
+    use core_foundation::{
+        array::{CFArray, CFIndex},
+        string::kCFStringEncodingUTF8,
+        url::{CFURLCreateWithBytes, CFURL},
+    };
+    use core_services::{kLSLaunchDefaults, LSLaunchURLSpec, LSOpenFromURLSpec, TCFType};
+    use std::{fs, path::Path, ptr};
+
+    use cli::{CliRequest, CliResponse, IpcHandshake, FORCE_CLI_MODE_ENV_VAR_NAME};
+    use ipc_channel::ipc::{IpcOneShotServer, IpcReceiver, IpcSender};
+
+    use crate::{locate_bundle, Bundle, InfoPlist};
+
+    impl Bundle {
+        pub fn detect(args_bundle_path: Option<&Path>) -> anyhow::Result<Self> {
+            let bundle_path = if let Some(bundle_path) = args_bundle_path {
+                bundle_path
+                    .canonicalize()
+                    .with_context(|| format!("Args bundle path {bundle_path:?} canonicalization"))?
+            } else {
+                locate_bundle().context("bundle autodiscovery")?
+            };
+
+            match bundle_path.extension().and_then(|ext| ext.to_str()) {
+                Some("app") => {
+                    let plist_path = bundle_path.join("Contents/Info.plist");
+                    let plist =
+                        plist::from_file::<_, InfoPlist>(&plist_path).with_context(|| {
+                            format!("Reading *.app bundle plist file at {plist_path:?}")
+                        })?;
+                    Ok(Self::App {
+                        app_bundle: bundle_path,
+                        plist,
+                    })
+                }
+                _ => {
+                    println!("Bundle path {bundle_path:?} has no *.app extension, attempting to locate a dev build");
+                    let plist_path = bundle_path
+                        .parent()
+                        .with_context(|| format!("Bundle path {bundle_path:?} has no parent"))?
+                        .join("WebRTC.framework/Resources/Info.plist");
+                    let plist =
+                        plist::from_file::<_, InfoPlist>(&plist_path).with_context(|| {
+                            format!("Reading dev bundle plist file at {plist_path:?}")
+                        })?;
+                    Ok(Self::LocalPath {
+                        executable: bundle_path,
+                        plist,
+                    })
+                }
+            }
+        }
+
+        fn plist(&self) -> &InfoPlist {
+            match self {
+                Self::App { plist, .. } => plist,
+                Self::LocalPath { plist, .. } => plist,
+            }
+        }
+
+        fn path(&self) -> &Path {
+            match self {
+                Self::App { app_bundle, .. } => app_bundle,
+                Self::LocalPath { executable, .. } => executable,
+            }
+        }
+
+        pub fn launch(&self) -> anyhow::Result<(IpcSender<CliRequest>, IpcReceiver<CliResponse>)> {
+            let (server, server_name) =
+                IpcOneShotServer::<IpcHandshake>::new().context("Handshake before Zed spawn")?;
+            let url = format!("zed-cli://{server_name}");
+
+            match self {
+                Self::App { app_bundle, .. } => {
+                    let app_path = app_bundle;
+
+                    let status = unsafe {
+                        let app_url = CFURL::from_path(app_path, true)
+                            .with_context(|| format!("invalid app path {app_path:?}"))?;
+                        let url_to_open = CFURL::wrap_under_create_rule(CFURLCreateWithBytes(
+                            ptr::null(),
+                            url.as_ptr(),
+                            url.len() as CFIndex,
+                            kCFStringEncodingUTF8,
+                            ptr::null(),
+                        ));
+                        // equivalent to: open zed-cli:... -a /Applications/Zed\ Preview.app
+                        let urls_to_open =
+                            CFArray::from_copyable(&[url_to_open.as_concrete_TypeRef()]);
+                        LSOpenFromURLSpec(
+                            &LSLaunchURLSpec {
+                                appURL: app_url.as_concrete_TypeRef(),
+                                itemURLs: urls_to_open.as_concrete_TypeRef(),
+                                passThruParams: ptr::null(),
+                                launchFlags: kLSLaunchDefaults,
+                                asyncRefCon: ptr::null_mut(),
+                            },
+                            ptr::null_mut(),
+                        )
+                    };
+
+                    anyhow::ensure!(
+                        status == 0,
+                        "cannot start app bundle {}",
+                        self.zed_version_string()
+                    );
+                }
+
+                Self::LocalPath { executable, .. } => {
+                    let executable_parent = executable
+                        .parent()
+                        .with_context(|| format!("Executable {executable:?} path has no parent"))?;
+                    let subprocess_stdout_file = fs::File::create(
+                        executable_parent.join("zed_dev.log"),
+                    )
+                    .with_context(|| format!("Log file creation in {executable_parent:?}"))?;
+                    let subprocess_stdin_file =
+                        subprocess_stdout_file.try_clone().with_context(|| {
+                            format!("Cloning descriptor for file {subprocess_stdout_file:?}")
+                        })?;
+                    let mut command = std::process::Command::new(executable);
+                    let command = command
+                        .env(FORCE_CLI_MODE_ENV_VAR_NAME, "")
+                        .stderr(subprocess_stdout_file)
+                        .stdout(subprocess_stdin_file)
+                        .arg(url);
+
+                    command
+                        .spawn()
+                        .with_context(|| format!("Spawning {command:?}"))?;
+                }
+            }
+
+            let (_, handshake) = server.accept().context("Handshake after Zed spawn")?;
+            Ok((handshake.requests, handshake.responses))
+        }
+
+        pub fn zed_version_string(&self) -> String {
+            let is_dev = matches!(self, Self::LocalPath { .. });
+            format!(
+                "Zed {}{} – {}",
+                self.plist().bundle_short_version_string,
+                if is_dev { " (dev)" } else { "" },
+                self.path().display(),
+            )
+        }
+    }
+}

crates/client/Cargo.toml

@@ -14,24 +14,25 @@ test-support = ["collections/test-support", "gpui/test-support", "rpc/test-suppo
 
 [dependencies]
 chrono = { version = "0.4", features = ["serde"] }
-collections = { path = "../collections" }
-db = { path = "../db" }
-gpui = { path = "../gpui" }
-util = { path = "../util" }
-release_channel = { path = "../release_channel" }
-rpc = { path = "../rpc" }
-text = { path = "../text" }
-settings = { path = "../settings" }
-feature_flags = { path = "../feature_flags" }
-sum_tree = { path = "../sum_tree" }
+collections.workspace = true
+db.workspace = true
+gpui.workspace = true
+util.workspace = true
+release_channel.workspace = true
+rpc.workspace = true
+text.workspace = true
+settings.workspace = true
+feature_flags.workspace = true
+sum_tree.workspace = true
 
 anyhow.workspace = true
 async-recursion = "0.3"
-async-tungstenite = { version = "0.16", features = ["async-tls"] }
+async-tungstenite = { version = "0.16", features = ["async-std", "async-native-tls"] }
 futures.workspace = true
 image = "0.23"
 lazy_static.workspace = true
 log.workspace = true
+once_cell = "1.19.0"
 parking_lot.workspace = true
 postage.workspace = true
 rand.workspace = true
@@ -39,6 +40,7 @@ schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
+sha2 = "0.10"
 smol.workspace = true
 sysinfo.workspace = true
 tempfile.workspace = true
@@ -49,8 +51,8 @@ uuid.workspace = true
 url.workspace = true
 
 [dev-dependencies]
-collections = { path = "../collections", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-rpc = { path = "../rpc", features = ["test-support"] }
-settings = { path = "../settings", features = ["test-support"] }
-util = { path = "../util", features = ["test-support"] }
+collections = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+rpc = { workspace = true, features = ["test-support"] }
+settings = { workspace = true, features = ["test-support"] }
+util = { workspace = true, features = ["test-support"] }

crates/client/src/client.rs

@@ -10,19 +10,19 @@ use async_tungstenite::tungstenite::{
     error::Error as WebsocketError,
     http::{Request, StatusCode},
 };
+use collections::HashMap;
 use futures::{
     channel::oneshot, future::LocalBoxFuture, AsyncReadExt, FutureExt, SinkExt, StreamExt,
     TryFutureExt as _, TryStreamExt,
 };
 use gpui::{
-    actions, AnyModel, AnyWeakModel, AppContext, AsyncAppContext, Global, Model, SemanticVersion,
-    Task, WeakModel,
+    actions, AnyModel, AnyWeakModel, AppContext, AsyncAppContext, Global, Model, Task, WeakModel,
 };
 use lazy_static::lazy_static;
 use parking_lot::RwLock;
 use postage::watch;
 use rand::prelude::*;
-use release_channel::ReleaseChannel;
+use release_channel::{AppVersion, ReleaseChannel};
 use rpc::proto::{AnyTypedEnvelope, EntityMessage, EnvelopedMessage, PeerId, RequestMessage};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -30,7 +30,6 @@ use serde_json;
 use settings::{Settings, SettingsStore};
 use std::{
     any::TypeId,
-    collections::HashMap,
     convert::TryFrom,
     fmt::Write as _,
     future::Future,
@@ -58,9 +57,6 @@ lazy_static! {
     pub static ref ADMIN_API_TOKEN: Option<String> = std::env::var("ZED_ADMIN_API_TOKEN")
         .ok()
         .and_then(|s| if s.is_empty() { None } else { Some(s) });
-    pub static ref ZED_APP_VERSION: Option<SemanticVersion> = std::env::var("ZED_APP_VERSION")
-        .ok()
-        .and_then(|v| v.parse().ok());
     pub static ref ZED_APP_PATH: Option<PathBuf> =
         std::env::var("ZED_APP_PATH").ok().map(PathBuf::from);
     pub static ref ZED_ALWAYS_ACTIVE: bool =
@@ -1011,13 +1007,22 @@ impl Client {
             .update(|cx| ReleaseChannel::try_global(cx))
             .ok()
             .flatten();
+        let app_version = cx
+            .update(|cx| AppVersion::global(cx).to_string())
+            .ok()
+            .unwrap_or_default();
 
         let request = Request::builder()
             .header(
                 "Authorization",
                 format!("{} {}", credentials.user_id, credentials.access_token),
             )
-            .header("x-zed-protocol-version", rpc::PROTOCOL_VERSION);
+            .header("x-zed-protocol-version", rpc::PROTOCOL_VERSION)
+            .header("x-zed-app-version", app_version)
+            .header(
+                "x-zed-release-channel",
+                release_channel.map(|r| r.dev_name()).unwrap_or("unknown"),
+            );
 
         let http = self.http.clone();
         cx.background_executor().spawn(async move {
@@ -1035,7 +1040,7 @@ impl Client {
                     rpc_url.set_scheme("wss").unwrap();
                     let request = request.uri(rpc_url.as_str()).body(())?;
                     let (stream, _) =
-                        async_tungstenite::async_tls::client_async_tls(request, stream).await?;
+                        async_tungstenite::async_std::client_async_tls(request, stream).await?;
                     Ok(Connection::new(
                         stream
                             .map_err(|error| anyhow!(error))

crates/client/src/telemetry.rs

@@ -4,16 +4,19 @@ use crate::TelemetrySettings;
 use chrono::{DateTime, Utc};
 use futures::Future;
 use gpui::{AppContext, AppMetadata, BackgroundExecutor, Task};
+use once_cell::sync::Lazy;
 use parking_lot::Mutex;
 use release_channel::ReleaseChannel;
 use serde::Serialize;
 use settings::{Settings, SettingsStore};
-use std::{env, io::Write, mem, path::PathBuf, sync::Arc, time::Duration};
+use sha2::{Digest, Sha256};
+use std::io::Write;
+use std::{env, mem, path::PathBuf, sync::Arc, time::Duration};
 use sysinfo::{
     CpuRefreshKind, Pid, PidExt, ProcessExt, ProcessRefreshKind, RefreshKind, System, SystemExt,
 };
 use tempfile::NamedTempFile;
-use util::http::{HttpClient, ZedHttpClient};
+use util::http::{self, HttpClient, Method, ZedHttpClient};
 #[cfg(not(debug_assertions))]
 use util::ResultExt;
 use util::TryFutureExt;
@@ -142,6 +145,16 @@ const FLUSH_INTERVAL: Duration = Duration::from_secs(1);
 #[cfg(not(debug_assertions))]
 const FLUSH_INTERVAL: Duration = Duration::from_secs(60 * 5);
 
+static ZED_CLIENT_CHECKSUM_SEED: Lazy<Option<Vec<u8>>> = Lazy::new(|| {
+    option_env!("ZED_CLIENT_CHECKSUM_SEED")
+        .map(|s| s.as_bytes().into())
+        .or_else(|| {
+            env::var("ZED_CLIENT_CHECKSUM_SEED")
+                .ok()
+                .map(|s| s.as_bytes().into())
+        })
+});
+
 impl Telemetry {
     pub fn new(client: Arc<ZedHttpClient>, cx: &mut AppContext) -> Arc<Self> {
         let release_channel =
@@ -500,6 +513,10 @@ impl Telemetry {
             return;
         }
 
+        let Some(checksum_seed) = &*ZED_CLIENT_CHECKSUM_SEED else {
+            return;
+        };
+
         let this = self.clone();
         self.executor
             .spawn(
@@ -540,9 +557,27 @@ impl Telemetry {
                         serde_json::to_writer(&mut json_bytes, &request_body)?;
                     }
 
-                    this.http_client
-                        .post_json(&this.http_client.zed_url("/api/events"), json_bytes.into())
-                        .await?;
+                    let mut summer = Sha256::new();
+                    summer.update(checksum_seed);
+                    summer.update(&json_bytes);
+                    summer.update(checksum_seed);
+                    let mut checksum = String::new();
+                    for byte in summer.finalize().as_slice() {
+                        use std::fmt::Write;
+                        write!(&mut checksum, "{:02x}", byte).unwrap();
+                    }
+
+                    let request = http::Request::builder()
+                        .method(Method::POST)
+                        .uri(&this.http_client.zed_url("/api/events"))
+                        .header("Content-Type", "text/plain")
+                        .header("x-zed-checksum", checksum)
+                        .body(json_bytes.into());
+
+                    let response = this.http_client.send(request?).await?;
+                    if response.status() != 200 {
+                        log::error!("Failed to send events: HTTP {:?}", response.status());
+                    }
                     anyhow::Ok(())
                 }
                 .log_err(),

crates/collab/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Nathan Sobo <nathan@zed.dev>"]
 default-run = "collab"
 edition = "2021"
 name = "collab"
-version = "0.43.0"
+version = "0.44.0"
 publish = false
 license = "AGPL-3.0-or-later"
 
@@ -22,15 +22,15 @@ axum-extra = { version = "0.3", features = ["erased-json"] }
 base64 = "0.13"
 chrono.workspace = true
 clap = { version = "3.1", features = ["derive"], optional = true }
-clock = { path = "../clock" }
-collections = { path = "../collections" }
+clock.workspace = true
+collections.workspace = true
 dashmap = "5.4"
 envy = "0.4.2"
 futures.workspace = true
 hyper = "0.14"
 lazy_static.workspace = true
 lipsum = { version = "0.8", optional = true }
-live_kit_server = { path = "../live_kit_server" }
+live_kit_server.workspace = true
 log.workspace = true
 nanoid = "0.4"
 parking_lot.workspace = true
@@ -38,7 +38,7 @@ prometheus = "0.13"
 prost.workspace = true
 rand.workspace = true
 reqwest = { version = "0.11", features = ["json"], optional = true }
-rpc = { path = "../rpc" }
+rpc.workspace = true
 scrypt = "0.7"
 sea-orm = { version = "0.12.x", features = ["sqlx-postgres", "postgres-array", "runtime-tokio-rustls", "with-uuid"] }
 serde.workspace = true
@@ -47,7 +47,7 @@ serde_json.workspace = true
 sha-1 = "0.9"
 smallvec.workspace = true
 sqlx = { version = "0.7", features = ["runtime-tokio-rustls", "postgres", "json", "time", "uuid", "any"] }
-text = { path = "../text" }
+text.workspace = true
 time.workspace = true
 tokio = { version = "1", features = ["full"] }
 tokio-tungstenite = "0.17"
@@ -57,43 +57,44 @@ tower = "0.4"
 tracing = "0.1.34"
 tracing-log = "0.1.3"
 tracing-subscriber = { version = "0.3.11", features = ["env-filter", "json"] }
-util = { path = "../util" }
+util.workspace = true
 uuid.workspace = true
 
 [dev-dependencies]
+release_channel.workspace = true
 async-trait.workspace = true
-audio = { path = "../audio" }
-call = { path = "../call", features = ["test-support"] }
-channel = { path = "../channel" }
-client = { path = "../client", features = ["test-support"] }
-collab_ui = { path = "../collab_ui", features = ["test-support"] }
-collections = { path = "../collections", features = ["test-support"] }
+audio.workspace = true
+call = { workspace = true, features = ["test-support"] }
+channel.workspace = true
+client = { workspace = true, features = ["test-support"] }
+collab_ui = { workspace = true, features = ["test-support"] }
+collections = { workspace = true, features = ["test-support"] }
 ctor.workspace = true
-editor = { path = "../editor", features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
 env_logger.workspace = true
-file_finder = { path = "../file_finder" }
-fs = { path = "../fs", features = ["test-support"] }
-git = { path = "../git", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
+file_finder.workspace = true
+fs = { workspace = true, features = ["test-support"] }
+git = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
 indoc.workspace = true
-language = { path = "../language", features = ["test-support"] }
+language = { workspace = true, features = ["test-support"] }
 lazy_static.workspace = true
-live_kit_client = { path = "../live_kit_client", features = ["test-support"] }
-lsp = { path = "../lsp", features = ["test-support"] }
-menu = { path = "../menu" }
-node_runtime = { path = "../node_runtime" }
-notifications = { path = "../notifications", features = ["test-support"] }
+live_kit_client = { workspace = true, features = ["test-support"] }
+lsp = { workspace = true, features = ["test-support"] }
+menu.workspace = true
+node_runtime.workspace = true
+notifications = { workspace = true, features = ["test-support"] }
 pretty_assertions.workspace = true
-project = { path = "../project", features = ["test-support"] }
-rpc = { path = "../rpc", features = ["test-support"] }
+project = { workspace = true, features = ["test-support"] }
+rpc = { workspace = true, features = ["test-support"] }
 sea-orm = { version = "0.12.x", features = ["sqlx-sqlite"] }
 serde_json.workspace = true
-settings = { path = "../settings", features = ["test-support"] }
+settings = { workspace = true, features = ["test-support"] }
 sqlx = { version = "0.7", features = ["sqlite"] }
-theme = { path = "../theme" }
+theme.workspace = true
 unindent.workspace = true
-util = { path = "../util" }
-workspace = { path = "../workspace", features = ["test-support"] }
+util.workspace = true
+workspace = { workspace = true, features = ["test-support"] }
 
 [features]
 seed-support = ["clap", "lipsum", "reqwest"]

crates/collab/README.md

@@ -3,3 +3,35 @@
 This crate is what we run at https://collab.zed.dev.
 
 It contains our back-end logic for collaboration, to which we connect from the Zed client via a websocket after authenticating via https://zed.dev, which is a separate repo running on Vercel.
+
+# Local Development
+
+ Detailed instructions on getting started are [here](https://zed.dev/docs/local-collaboration).
+
+# Deployment
+
+We run two instances of collab:
+
+* Staging (https://staging-collab.zed.dev)
+* Production (https://collab.zed.dev)
+
+Both of these run on the Kubernetes cluster hosted in Digital Ocean.
+
+Deployment is triggered by pushing to the `collab-staging` (or `collab-production`) tag in Github. The best way to do this is:
+
+* `./script/deploy-collab staging`
+* `./script/deploy-collab production`
+
+You can tell what is currently deployed with `./script/what-is-deployed`.
+
+# Database Migrations
+
+To create a new migration:
+
+```
+./script/sqlx migrate add <name>
+```
+
+Migrations are run automatically on service start, so run `foreman start` again. The service will crash if the migrations fail.
+
+When you create a new migration, you also need to update the [SQLite schema](./migrations.sqlite/20221109000000_test_schema.sql) that is used for testing.

crates/collab/migrations.sqlite/20221109000000_test_schema.sql

@@ -163,7 +163,8 @@ CREATE TABLE "room_participants" (
     "calling_connection_id" INTEGER NOT NULL,
     "calling_connection_server_id" INTEGER REFERENCES servers (id) ON DELETE SET NULL,
     "participant_index" INTEGER,
-    "role" TEXT
+    "role" TEXT,
+    "in_call" BOOLEAN NOT NULL DEFAULT FALSE
 );
 CREATE UNIQUE INDEX "index_room_participants_on_user_id" ON "room_participants" ("user_id");
 CREATE INDEX "index_room_participants_on_room_id" ON "room_participants" ("room_id");
@@ -217,7 +218,8 @@ CREATE TABLE IF NOT EXISTS "channel_messages" (
     "sender_id" INTEGER NOT NULL REFERENCES users (id),
     "body" TEXT NOT NULL,
     "sent_at" TIMESTAMP,
-    "nonce" BLOB NOT NULL
+    "nonce" BLOB NOT NULL,
+    "reply_to_message_id" INTEGER DEFAULT NULL
 );
 CREATE INDEX "index_channel_messages_on_channel_id" ON "channel_messages" ("channel_id");
 CREATE UNIQUE INDEX "index_channel_messages_on_sender_id_nonce" ON "channel_messages" ("sender_id", "nonce");

crates/collab/migrations/20240203113741_add_reply_to_message.sql

@@ -0,0 +1 @@
+ALTER TABLE channel_messages ADD reply_to_message_id INTEGER DEFAULT NULL

crates/collab/migrations/20240207041417_add_in_call_column_to_room_participants.sql

@@ -0,0 +1,3 @@
+-- Add migration script here
+
+ALTER TABLE room_participants ADD COLUMN in_call BOOL NOT NULL DEFAULT FALSE;

crates/collab/src/db.rs

@@ -692,7 +692,7 @@ impl ProjectCollaborator {
 pub struct LeftProject {
     pub id: ProjectId,
     pub host_user_id: UserId,
-    pub host_connection_id: ConnectionId,
+    pub host_connection_id: Option<ConnectionId>,
     pub connection_ids: Vec<ConnectionId>,
 }
 

crates/collab/src/db/queries/channels.rs

@@ -97,11 +97,57 @@ impl Database {
         .await
     }
 
+    pub async fn set_in_channel_call(
+        &self,
+        channel_id: ChannelId,
+        user_id: UserId,
+        in_call: bool,
+    ) -> Result<(proto::Room, ChannelRole)> {
+        self.transaction(move |tx| async move {
+            let channel = self.get_channel_internal(channel_id, &*tx).await?;
+            let role = self.channel_role_for_user(&channel, user_id, &*tx).await?;
+            if role.is_none() || role == Some(ChannelRole::Banned) {
+                Err(ErrorCode::Forbidden.anyhow())?
+            }
+            let role = role.unwrap();
+
+            let Some(room) = room::Entity::find()
+                .filter(room::Column::ChannelId.eq(channel_id))
+                .one(&*tx)
+                .await?
+            else {
+                Err(anyhow!("no room exists"))?
+            };
+
+            let result = room_participant::Entity::update_many()
+                .filter(
+                    Condition::all()
+                        .add(room_participant::Column::RoomId.eq(room.id))
+                        .add(room_participant::Column::UserId.eq(user_id)),
+                )
+                .set(room_participant::ActiveModel {
+                    in_call: ActiveValue::Set(in_call),
+                    ..Default::default()
+                })
+                .exec(&*tx)
+                .await?;
+
+            if result.rows_affected != 1 {
+                Err(anyhow!("not in channel"))?
+            }
+
+            let room = self.get_room(room.id, &*tx).await?;
+            Ok((room, role))
+        })
+        .await
+    }
+
     /// Adds a user to the specified channel.
     pub async fn join_channel(
         &self,
         channel_id: ChannelId,
         user_id: UserId,
+        autojoin: bool,
         connection: ConnectionId,
         environment: &str,
     ) -> Result<(JoinRoom, Option<MembershipUpdated>, ChannelRole)> {
@@ -166,7 +212,7 @@ impl Database {
                 .get_or_create_channel_room(channel_id, &live_kit_room, environment, &*tx)
                 .await?;
 
-            self.join_channel_room_internal(room_id, user_id, connection, role, &*tx)
+            self.join_channel_room_internal(room_id, user_id, autojoin, connection, role, &*tx)
                 .await
                 .map(|jr| (jr, accept_invite_result, role))
         })

crates/collab/src/db/queries/messages.rs

@@ -161,6 +161,7 @@ impl Database {
                         upper_half: nonce.0,
                         lower_half: nonce.1,
                     }),
+                    reply_to_message_id: row.reply_to_message_id.map(|id| id.to_proto()),
                 }
             })
             .collect::<Vec<_>>();
@@ -207,6 +208,7 @@ impl Database {
         mentions: &[proto::ChatMention],
         timestamp: OffsetDateTime,
         nonce: u128,
+        reply_to_message_id: Option<MessageId>,
     ) -> Result<CreatedChannelMessage> {
         self.transaction(|tx| async move {
             let channel = self.get_channel_internal(channel_id, &*tx).await?;
@@ -245,6 +247,7 @@ impl Database {
                 sent_at: ActiveValue::Set(timestamp),
                 nonce: ActiveValue::Set(Uuid::from_u128(nonce)),
                 id: ActiveValue::NotSet,
+                reply_to_message_id: ActiveValue::Set(reply_to_message_id),
             })
             .on_conflict(
                 OnConflict::columns([

crates/collab/src/db/queries/projects.rs

@@ -778,7 +778,7 @@ impl Database {
             let left_project = LeftProject {
                 id: project_id,
                 host_user_id: project.host_user_id,
-                host_connection_id: project.host_connection()?,
+                host_connection_id: Some(project.host_connection()?),
                 connection_ids,
             };
             Ok((room, left_project))

crates/collab/src/db/queries/rooms.rs

@@ -135,6 +135,7 @@ impl Database {
                 ))),
                 participant_index: ActiveValue::set(Some(0)),
                 role: ActiveValue::set(Some(ChannelRole::Admin)),
+                in_call: ActiveValue::set(true),
 
                 id: ActiveValue::NotSet,
                 location_kind: ActiveValue::NotSet,
@@ -187,6 +188,7 @@ impl Database {
                 ))),
                 initial_project_id: ActiveValue::set(initial_project_id),
                 role: ActiveValue::set(Some(called_user_role)),
+                in_call: ActiveValue::set(true),
 
                 id: ActiveValue::NotSet,
                 answering_connection_id: ActiveValue::NotSet,
@@ -414,6 +416,7 @@ impl Database {
         &self,
         room_id: RoomId,
         user_id: UserId,
+        autojoin: bool,
         connection: ConnectionId,
         role: ChannelRole,
         tx: &DatabaseTransaction,
@@ -437,6 +440,8 @@ impl Database {
             ))),
             participant_index: ActiveValue::Set(Some(participant_index)),
             role: ActiveValue::set(Some(role)),
+            in_call: ActiveValue::set(autojoin),
+
             id: ActiveValue::NotSet,
             location_kind: ActiveValue::NotSet,
             location_project_id: ActiveValue::NotSet,
@@ -862,7 +867,7 @@ impl Database {
                                 id: collaborator.project_id,
                                 host_user_id: Default::default(),
                                 connection_ids: Default::default(),
-                                host_connection_id: Default::default(),
+                                host_connection_id: None,
                             });
 
                     let collaborator_connection_id = collaborator.connection();
@@ -872,7 +877,7 @@ impl Database {
 
                     if collaborator.is_host {
                         left_project.host_user_id = collaborator.user_id;
-                        left_project.host_connection_id = collaborator_connection_id;
+                        left_project.host_connection_id = Some(collaborator_connection_id);
                     }
                 }
                 drop(collaborators);
@@ -1258,6 +1263,7 @@ impl Database {
                         location: Some(proto::ParticipantLocation { variant: location }),
                         participant_index: participant_index as u32,
                         role: db_participant.role.unwrap_or(ChannelRole::Member).into(),
+                        in_call: db_participant.in_call,
                     },
                 );
             } else {

crates/collab/src/db/tables/channel_message.rs

@@ -12,6 +12,7 @@ pub struct Model {
     pub body: String,
     pub sent_at: PrimitiveDateTime,
     pub nonce: Uuid,
+    pub reply_to_message_id: Option<MessageId>,
 }
 
 impl ActiveModelBehavior for ActiveModel {}

crates/collab/src/db/tables/room_participant.rs

@@ -20,6 +20,7 @@ pub struct Model {
     pub calling_connection_server_id: Option<ServerId>,
     pub participant_index: Option<i32>,
     pub role: Option<ChannelRole>,
+    pub in_call: bool,
 }
 
 impl Model {

crates/collab/src/db/tests/channel_tests.rs

@@ -138,6 +138,7 @@ async fn test_joining_channels(db: &Arc<Database>) {
         .join_channel(
             channel_1,
             user_1,
+            false,
             ConnectionId { owner_id, id: 1 },
             TEST_RELEASE_CHANNEL,
         )
@@ -732,9 +733,15 @@ async fn test_guest_access(db: &Arc<Database>) {
         .await
         .is_err());
 
-    db.join_channel(zed_channel, guest, guest_connection, TEST_RELEASE_CHANNEL)
-        .await
-        .unwrap();
+    db.join_channel(
+        zed_channel,
+        guest,
+        false,
+        guest_connection,
+        TEST_RELEASE_CHANNEL,
+    )
+    .await
+    .unwrap();
 
     assert!(db
         .join_channel_chat(zed_channel, guest_connection, guest)

crates/collab/src/db/tests/message_tests.rs

@@ -32,6 +32,7 @@ async fn test_channel_message_retrieval(db: &Arc<Database>) {
                 &[],
                 OffsetDateTime::now_utc(),
                 i,
+                None,
             )
             .await
             .unwrap()
@@ -106,6 +107,7 @@ async fn test_channel_message_nonces(db: &Arc<Database>) {
             &mentions_to_proto(&[(3..10, user_b.to_proto())]),
             OffsetDateTime::now_utc(),
             100,
+            None,
         )
         .await
         .unwrap()
@@ -118,6 +120,7 @@ async fn test_channel_message_nonces(db: &Arc<Database>) {
             &mentions_to_proto(&[]),
             OffsetDateTime::now_utc(),
             200,
+            None,
         )
         .await
         .unwrap()
@@ -130,6 +133,7 @@ async fn test_channel_message_nonces(db: &Arc<Database>) {
             &mentions_to_proto(&[(4..11, user_c.to_proto())]),
             OffsetDateTime::now_utc(),
             100,
+            None,
         )
         .await
         .unwrap()
@@ -142,6 +146,7 @@ async fn test_channel_message_nonces(db: &Arc<Database>) {
             &mentions_to_proto(&[]),
             OffsetDateTime::now_utc(),
             200,
+            None,
         )
         .await
         .unwrap()
@@ -157,6 +162,7 @@ async fn test_channel_message_nonces(db: &Arc<Database>) {
             &mentions_to_proto(&[(4..11, user_a.to_proto())]),
             OffsetDateTime::now_utc(),
             100,
+            None,
         )
         .await
         .unwrap()
@@ -231,17 +237,41 @@ async fn test_unseen_channel_messages(db: &Arc<Database>) {
         .unwrap();
 
     let _ = db
-        .create_channel_message(channel_1, user, "1_1", &[], OffsetDateTime::now_utc(), 1)
+        .create_channel_message(
+            channel_1,
+            user,
+            "1_1",
+            &[],
+            OffsetDateTime::now_utc(),
+            1,
+            None,
+        )
         .await
         .unwrap();
 
     let _ = db
-        .create_channel_message(channel_1, user, "1_2", &[], OffsetDateTime::now_utc(), 2)
+        .create_channel_message(
+            channel_1,
+            user,
+            "1_2",
+            &[],
+            OffsetDateTime::now_utc(),
+            2,
+            None,
+        )
         .await
         .unwrap();
 
     let third_message = db
-        .create_channel_message(channel_1, user, "1_3", &[], OffsetDateTime::now_utc(), 3)
+        .create_channel_message(
+            channel_1,
+            user,
+            "1_3",
+            &[],
+            OffsetDateTime::now_utc(),
+            3,
+            None,
+        )
         .await
         .unwrap()
         .message_id;
@@ -251,7 +281,15 @@ async fn test_unseen_channel_messages(db: &Arc<Database>) {
         .unwrap();
 
     let fourth_message = db
-        .create_channel_message(channel_2, user, "2_1", &[], OffsetDateTime::now_utc(), 4)
+        .create_channel_message(
+            channel_2,
+            user,
+            "2_1",
+            &[],
+            OffsetDateTime::now_utc(),
+            4,
+            None,
+        )
         .await
         .unwrap()
         .message_id;
@@ -317,6 +355,7 @@ async fn test_channel_message_mentions(db: &Arc<Database>) {
         &mentions_to_proto(&[(3..10, user_b.to_proto()), (15..22, user_c.to_proto())]),
         OffsetDateTime::now_utc(),
         1,
+        None,
     )
     .await
     .unwrap();
@@ -327,6 +366,7 @@ async fn test_channel_message_mentions(db: &Arc<Database>) {
         &mentions_to_proto(&[(4..11, user_c.to_proto())]),
         OffsetDateTime::now_utc(),
         2,
+        None,
     )
     .await
     .unwrap();
@@ -337,6 +377,7 @@ async fn test_channel_message_mentions(db: &Arc<Database>) {
         &mentions_to_proto(&[]),
         OffsetDateTime::now_utc(),
         3,
+        None,
     )
     .await
     .unwrap();
@@ -347,6 +388,7 @@ async fn test_channel_message_mentions(db: &Arc<Database>) {
         &mentions_to_proto(&[(0..7, user_b.to_proto())]),
         OffsetDateTime::now_utc(),
         4,
+        None,
     )
     .await
     .unwrap();

crates/collab/src/main.rs

@@ -14,6 +14,7 @@ use tracing_subscriber::{filter::EnvFilter, fmt::format::JsonFields, Layer};
 use util::ResultExt;
 
 const VERSION: &'static str = env!("CARGO_PKG_VERSION");
+const REVISION: Option<&'static str> = option_env!("GITHUB_SHA");
 
 #[tokio::main]
 async fn main() -> Result<()> {
@@ -26,7 +27,7 @@ async fn main() -> Result<()> {
 
     match args().skip(1).next().as_deref() {
         Some("version") => {
-            println!("collab v{VERSION}");
+            println!("collab v{} ({})", VERSION, REVISION.unwrap_or("unknown"));
         }
         Some("migrate") => {
             run_migrations().await?;
@@ -105,7 +106,7 @@ async fn run_migrations() -> Result<()> {
 }
 
 async fn handle_root() -> String {
-    format!("collab v{VERSION}")
+    format!("collab v{} ({})", VERSION, REVISION.unwrap_or("unknown"))
 }
 
 async fn handle_liveness_probe(Extension(state): Extension<Arc<AppState>>) -> Result<String> {

crates/collab/src/rpc.rs

@@ -64,6 +64,7 @@ use time::OffsetDateTime;
 use tokio::sync::{watch, Semaphore};
 use tower::ServiceBuilder;
 use tracing::{field, info_span, instrument, Instrument};
+use util::SemanticVersion;
 
 pub const RECONNECT_TIMEOUT: Duration = Duration::from_secs(30);
 pub const CLEANUP_TIMEOUT: Duration = Duration::from_secs(10);
@@ -104,6 +105,7 @@ struct Session {
     zed_environment: Arc<str>,
     user_id: UserId,
     connection_id: ConnectionId,
+    zed_version: SemanticVersion,
     db: Arc<tokio::sync::Mutex<DbHandle>>,
     peer: Arc<Peer>,
     connection_pool: Arc<parking_lot::Mutex<ConnectionPool>>,
@@ -130,6 +132,19 @@ impl Session {
             _not_send: PhantomData,
         }
     }
+
+    fn endpoint_removed_in(&self, endpoint: &str, version: SemanticVersion) -> anyhow::Result<()> {
+        if self.zed_version > version {
+            Err(anyhow!(
+                "{} was removed in {} (you're on {})",
+                endpoint,
+                version,
+                self.zed_version
+            ))
+        } else {
+            Ok(())
+        }
+    }
 }
 
 impl fmt::Debug for Session {
@@ -273,8 +288,11 @@ impl Server {
             .add_request_handler(get_channel_members)
             .add_request_handler(respond_to_channel_invite)
             .add_request_handler(join_channel)
+            .add_request_handler(join_channel2)
             .add_request_handler(join_channel_chat)
             .add_message_handler(leave_channel_chat)
+            .add_request_handler(join_channel_call)
+            .add_request_handler(leave_channel_call)
             .add_request_handler(send_channel_message)
             .add_request_handler(remove_channel_message)
             .add_request_handler(get_channel_messages)
@@ -558,6 +576,7 @@ impl Server {
         connection: Connection,
         address: String,
         user: User,
+        zed_version: SemanticVersion,
         impersonator: Option<User>,
         mut send_connection_id: Option<oneshot::Sender<ConnectionId>>,
         executor: Executor,
@@ -615,6 +634,7 @@ impl Server {
             let session = Session {
                 user_id,
                 connection_id,
+                zed_version,
                 db: Arc::new(tokio::sync::Mutex::new(DbHandle(this.app_state.db.clone()))),
                 zed_environment: this.app_state.config.zed_environment.clone(),
                 peer: this.peer.clone(),
@@ -795,6 +815,7 @@ fn broadcast<F>(
 
 lazy_static! {
     static ref ZED_PROTOCOL_VERSION: HeaderName = HeaderName::from_static("x-zed-protocol-version");
+    static ref ZED_APP_VERSION: HeaderName = HeaderName::from_static("x-zed-app-version");
 }
 
 pub struct ProtocolVersion(u32);
@@ -824,6 +845,32 @@ impl Header for ProtocolVersion {
     }
 }
 
+pub struct AppVersionHeader(SemanticVersion);
+impl Header for AppVersionHeader {
+    fn name() -> &'static HeaderName {
+        &ZED_APP_VERSION
+    }
+
+    fn decode<'i, I>(values: &mut I) -> Result<Self, axum::headers::Error>
+    where
+        Self: Sized,
+        I: Iterator<Item = &'i axum::http::HeaderValue>,
+    {
+        let version = values
+            .next()
+            .ok_or_else(axum::headers::Error::invalid)?
+            .to_str()
+            .map_err(|_| axum::headers::Error::invalid())?
+            .parse()
+            .map_err(|_| axum::headers::Error::invalid())?;
+        Ok(Self(version))
+    }
+
+    fn encode<E: Extend<axum::http::HeaderValue>>(&self, values: &mut E) {
+        values.extend([self.0.to_string().parse().unwrap()]);
+    }
+}
+
 pub fn routes(server: Arc<Server>) -> Router<Body> {
     Router::new()
         .route("/rpc", get(handle_websocket_request))
@@ -838,6 +885,7 @@ pub fn routes(server: Arc<Server>) -> Router<Body> {
 
 pub async fn handle_websocket_request(
     TypedHeader(ProtocolVersion(protocol_version)): TypedHeader<ProtocolVersion>,
+    app_version_header: Option<TypedHeader<AppVersionHeader>>,
     ConnectInfo(socket_address): ConnectInfo<SocketAddr>,
     Extension(server): Extension<Arc<Server>>,
     Extension(user): Extension<User>,
@@ -851,6 +899,13 @@ pub async fn handle_websocket_request(
         )
             .into_response();
     }
+
+    // zed 0.122.x was the first version that sent an app header, so once that hits stable
+    // we can return UPGRADE_REQUIRED instead of unwrap_or_default();
+    let app_version = app_version_header
+        .map(|header| header.0 .0)
+        .unwrap_or_default();
+
     let socket_address = socket_address.to_string();
     ws.on_upgrade(move |socket| {
         use util::ResultExt;
@@ -865,6 +920,7 @@ pub async fn handle_websocket_request(
                     connection,
                     socket_address,
                     user,
+                    app_version,
                     impersonator.0,
                     None,
                     Executor::Production,
@@ -1007,7 +1063,7 @@ async fn join_room(
     let channel_id = session.db().await.channel_id_for_room(room_id).await?;
 
     if let Some(channel_id) = channel_id {
-        return join_channel_internal(channel_id, Box::new(response), session).await;
+        return join_channel_internal(channel_id, true, Box::new(response), session).await;
     }
 
     let joined_room = {
@@ -1661,7 +1717,7 @@ async fn leave_project(request: proto::LeaveProject, session: Session) -> Result
     tracing::info!(
         %project_id,
         host_user_id = %project.host_user_id,
-        host_connection_id = %project.host_connection_id,
+        host_connection_id = ?project.host_connection_id,
         "leave project"
     );
 
@@ -2670,14 +2726,67 @@ async fn respond_to_channel_invite(
     Ok(())
 }
 
-/// Join the channels' room
+/// Join the channels' call
 async fn join_channel(
     request: proto::JoinChannel,
     response: Response<proto::JoinChannel>,
     session: Session,
 ) -> Result<()> {
+    session.endpoint_removed_in("join_channel", "0.123.0".parse().unwrap())?;
+
     let channel_id = ChannelId::from_proto(request.channel_id);
-    join_channel_internal(channel_id, Box::new(response), session).await
+    join_channel_internal(channel_id, true, Box::new(response), session).await
+}
+
+async fn join_channel2(
+    request: proto::JoinChannel2,
+    response: Response<proto::JoinChannel2>,
+    session: Session,
+) -> Result<()> {
+    let channel_id = ChannelId::from_proto(request.channel_id);
+    join_channel_internal(channel_id, false, Box::new(response), session).await
+}
+
+async fn join_channel_call(
+    request: proto::JoinChannelCall,
+    response: Response<proto::JoinChannelCall>,
+    session: Session,
+) -> Result<()> {
+    let channel_id = ChannelId::from_proto(request.channel_id);
+    let db = session.db().await;
+    let (joined_room, role) = db
+        .set_in_channel_call(channel_id, session.user_id, true)
+        .await?;
+
+    let Some(connection_info) = session.live_kit_client.as_ref().and_then(|live_kit| {
+        live_kit_info_for_user(live_kit, &session.user_id, role, &joined_room.live_kit_room)
+    }) else {
+        Err(anyhow!("no live kit token info"))?
+    };
+
+    room_updated(&joined_room, &session.peer);
+    response.send(proto::JoinChannelCallResponse {
+        live_kit_connection_info: Some(connection_info),
+    })?;
+
+    Ok(())
+}
+
+async fn leave_channel_call(
+    request: proto::LeaveChannelCall,
+    response: Response<proto::LeaveChannelCall>,
+    session: Session,
+) -> Result<()> {
+    let channel_id = ChannelId::from_proto(request.channel_id);
+    let db = session.db().await;
+    let (joined_room, _) = db
+        .set_in_channel_call(channel_id, session.user_id, false)
+        .await?;
+
+    room_updated(&joined_room, &session.peer);
+    response.send(proto::Ack {})?;
+
+    Ok(())
 }
 
 trait JoinChannelInternalResponse {
@@ -2693,9 +2802,15 @@ impl JoinChannelInternalResponse for Response<proto::JoinRoom> {
         Response::<proto::JoinRoom>::send(self, result)
     }
 }
+impl JoinChannelInternalResponse for Response<proto::JoinChannel2> {
+    fn send(self, result: proto::JoinRoomResponse) -> Result<()> {
+        Response::<proto::JoinChannel2>::send(self, result)
+    }
+}
 
 async fn join_channel_internal(
     channel_id: ChannelId,
+    autojoin: bool,
     response: Box<impl JoinChannelInternalResponse>,
     session: Session,
 ) -> Result<()> {
@@ -2707,39 +2822,22 @@ async fn join_channel_internal(
             .join_channel(
                 channel_id,
                 session.user_id,
+                autojoin,
                 session.connection_id,
                 session.zed_environment.as_ref(),
             )
             .await?;
 
         let live_kit_connection_info = session.live_kit_client.as_ref().and_then(|live_kit| {
-            let (can_publish, token) = if role == ChannelRole::Guest {
-                (
-                    false,
-                    live_kit
-                        .guest_token(
-                            &joined_room.room.live_kit_room,
-                            &session.user_id.to_string(),
-                        )
-                        .trace_err()?,
-                )
-            } else {
-                (
-                    true,
-                    live_kit
-                        .room_token(
-                            &joined_room.room.live_kit_room,
-                            &session.user_id.to_string(),
-                        )
-                        .trace_err()?,
-                )
-            };
-
-            Some(LiveKitConnectionInfo {
-                server_url: live_kit.url().into(),
-                token,
-                can_publish,
-            })
+            if !autojoin {
+                return None;
+            }
+            live_kit_info_for_user(
+                live_kit,
+                &session.user_id,
+                role,
+                &joined_room.room.live_kit_room,
+            )
         });
 
         response.send(proto::JoinRoomResponse {
@@ -2775,6 +2873,35 @@ async fn join_channel_internal(
     Ok(())
 }
 
+fn live_kit_info_for_user(
+    live_kit: &Arc<dyn live_kit_server::api::Client>,
+    user_id: &UserId,
+    role: ChannelRole,
+    live_kit_room: &String,
+) -> Option<LiveKitConnectionInfo> {
+    let (can_publish, token) = if role == ChannelRole::Guest {
+        (
+            false,
+            live_kit
+                .guest_token(live_kit_room, &user_id.to_string())
+                .trace_err()?,
+        )
+    } else {
+        (
+            true,
+            live_kit
+                .room_token(live_kit_room, &user_id.to_string())
+                .trace_err()?,
+        )
+    };
+
+    Some(LiveKitConnectionInfo {
+        server_url: live_kit.url().into(),
+        token,
+        can_publish,
+    })
+}
+
 /// Start editing the channel notes
 async fn join_channel_buffer(
     request: proto::JoinChannelBuffer,
@@ -2989,6 +3116,10 @@ async fn send_channel_message(
             &request.mentions,
             timestamp,
             nonce.clone().into(),
+            match request.reply_to_message_id {
+                Some(reply_to_message_id) => Some(MessageId::from_proto(reply_to_message_id)),
+                None => None,
+            },
         )
         .await?;
     let message = proto::ChannelMessage {
@@ -2998,6 +3129,7 @@ async fn send_channel_message(
         mentions: request.mentions,
         timestamp: timestamp.unix_timestamp() as u64,
         nonce: Some(nonce),
+        reply_to_message_id: request.reply_to_message_id,
     };
     broadcast(
         Some(session.connection_id),

crates/collab/src/tests/channel_buffer_tests.rs

@@ -161,15 +161,15 @@ async fn test_channel_notes_participant_indices(
 
     // Clients A, B, and C open the channel notes
     let channel_view_a = cx_a
-        .update(|cx| ChannelView::open(channel_id, workspace_a.clone(), cx))
+        .update(|cx| ChannelView::open(channel_id, None, workspace_a.clone(), cx))
         .await
         .unwrap();
     let channel_view_b = cx_b
-        .update(|cx| ChannelView::open(channel_id, workspace_b.clone(), cx))
+        .update(|cx| ChannelView::open(channel_id, None, workspace_b.clone(), cx))
         .await
         .unwrap();
     let channel_view_c = cx_c
-        .update(|cx| ChannelView::open(channel_id, workspace_c.clone(), cx))
+        .update(|cx| ChannelView::open(channel_id, None, workspace_c.clone(), cx))
         .await
         .unwrap();
 
@@ -644,7 +644,7 @@ async fn test_channel_buffer_changes(
     let project_b = client_b.build_empty_local_project(cx_b);
     let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
     let channel_view_b = cx_b
-        .update(|cx| ChannelView::open(channel_id, workspace_b.clone(), cx))
+        .update(|cx| ChannelView::open(channel_id, None, workspace_b.clone(), cx))
         .await
         .unwrap();
     deterministic.run_until_parked();

crates/collab/src/tests/channel_guest_tests.rs

@@ -1,4 +1,7 @@
-use crate::{db::ChannelId, tests::TestServer};
+use crate::{
+    db::ChannelId,
+    tests::{test_server::join_channel_call, TestServer},
+};
 use call::ActiveCall;
 use editor::Editor;
 use gpui::{BackgroundExecutor, TestAppContext};
@@ -32,7 +35,7 @@ async fn test_channel_guests(
     cx_a.executor().run_until_parked();
 
     // Client B joins channel A as a guest
-    cx_b.update(|cx| workspace::join_channel(channel_id, client_b.app_state.clone(), None, cx))
+    cx_b.update(|cx| workspace::open_channel(channel_id, client_b.app_state.clone(), None, cx))
         .await
         .unwrap();
 
@@ -72,7 +75,7 @@ async fn test_channel_guest_promotion(cx_a: &mut TestAppContext, cx_b: &mut Test
         .await;
 
     let project_a = client_a.build_test_project(cx_a).await;
-    cx_a.update(|cx| workspace::join_channel(channel_id, client_a.app_state.clone(), None, cx))
+    cx_a.update(|cx| workspace::open_channel(channel_id, client_a.app_state.clone(), None, cx))
         .await
         .unwrap();
 
@@ -84,11 +87,13 @@ async fn test_channel_guest_promotion(cx_a: &mut TestAppContext, cx_b: &mut Test
     cx_a.run_until_parked();
 
     // Client B joins channel A as a guest
-    cx_b.update(|cx| workspace::join_channel(channel_id, client_b.app_state.clone(), None, cx))
+    cx_b.update(|cx| workspace::open_channel(channel_id, client_b.app_state.clone(), None, cx))
         .await
         .unwrap();
     cx_a.run_until_parked();
 
+    join_channel_call(cx_b).await.unwrap();
+
     // client B opens 1.txt as a guest
     let (workspace_b, cx_b) = client_b.active_workspace(cx_b);
     let room_b = cx_b

crates/collab/src/tests/channel_message_tests.rs

@@ -43,6 +43,7 @@ async fn test_basic_channel_messages(
                 MessageParams {
                     text: "hi @user_c!".into(),
                     mentions: vec![(3..10, client_c.id())],
+                    reply_to_message_id: None,
                 },
                 cx,
             )
@@ -402,3 +403,66 @@ async fn test_channel_message_changes(
 
     assert!(b_has_messages);
 }
+
+#[gpui::test]
+async fn test_chat_replies(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
+    let mut server = TestServer::start(cx_a.executor()).await;
+    let client_a = server.create_client(cx_a, "user_a").await;
+    let client_b = server.create_client(cx_b, "user_b").await;
+
+    let channel_id = server
+        .make_channel(
+            "the-channel",
+            None,
+            (&client_a, cx_a),
+            &mut [(&client_b, cx_b)],
+        )
+        .await;
+
+    // Client A sends a message, client B should see that there is a new message.
+    let channel_chat_a = client_a
+        .channel_store()
+        .update(cx_a, |store, cx| store.open_channel_chat(channel_id, cx))
+        .await
+        .unwrap();
+
+    let channel_chat_b = client_b
+        .channel_store()
+        .update(cx_b, |store, cx| store.open_channel_chat(channel_id, cx))
+        .await
+        .unwrap();
+
+    let msg_id = channel_chat_a
+        .update(cx_a, |c, cx| c.send_message("one".into(), cx).unwrap())
+        .await
+        .unwrap();
+
+    cx_a.run_until_parked();
+
+    let reply_id = channel_chat_b
+        .update(cx_b, |c, cx| {
+            c.send_message(
+                MessageParams {
+                    text: "reply".into(),
+                    reply_to_message_id: Some(msg_id),
+                    mentions: Vec::new(),
+                },
+                cx,
+            )
+            .unwrap()
+        })
+        .await
+        .unwrap();
+
+    cx_a.run_until_parked();
+
+    channel_chat_a.update(cx_a, |channel_chat, _| {
+        assert_eq!(
+            channel_chat
+                .find_loaded_message(reply_id)
+                .unwrap()
+                .reply_to_message_id,
+            Some(msg_id),
+        )
+    });
+}

crates/collab/src/tests/channel_tests.rs

@@ -1,7 +1,7 @@
 use crate::{
     db::{self, UserId},
     rpc::RECONNECT_TIMEOUT,
-    tests::{room_participants, RoomParticipants, TestServer},
+    tests::{room_participants, test_server::join_channel_call, RoomParticipants, TestServer},
 };
 use call::ActiveCall;
 use channel::{ChannelId, ChannelMembership, ChannelStore};
@@ -382,6 +382,7 @@ async fn test_channel_room(
         .update(cx_a, |active_call, cx| active_call.join_channel(zed_id, cx))
         .await
         .unwrap();
+    join_channel_call(cx_a).await.unwrap();
 
     // Give everyone a chance to observe user A joining
     executor.run_until_parked();
@@ -429,7 +430,7 @@ async fn test_channel_room(
         .update(cx_b, |active_call, cx| active_call.join_channel(zed_id, cx))
         .await
         .unwrap();
-
+    join_channel_call(cx_b).await.unwrap();
     executor.run_until_parked();
 
     cx_a.read(|cx| {
@@ -552,6 +553,9 @@ async fn test_channel_room(
         .await
         .unwrap();
 
+    join_channel_call(cx_a).await.unwrap();
+    join_channel_call(cx_b).await.unwrap();
+
     executor.run_until_parked();
 
     let room_a =

crates/collab/src/tests/editor_tests.rs

@@ -19,7 +19,7 @@ use gpui::{TestAppContext, VisualContext, VisualTestContext};
 use indoc::indoc;
 use language::{
     language_settings::{AllLanguageSettings, InlayHintSettings},
-    tree_sitter_rust, FakeLspAdapter, Language, LanguageConfig,
+    tree_sitter_rust, FakeLspAdapter, Language, LanguageConfig, LanguageMatcher,
 };
 use rpc::RECEIVE_TIMEOUT;
 use serde_json::json;
@@ -269,7 +269,10 @@ async fn test_collaborating_with_completion(cx_a: &mut TestAppContext, cx_b: &mu
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -455,7 +458,10 @@ async fn test_collaborating_with_code_actions(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -668,7 +674,10 @@ async fn test_collaborating_with_renames(cx_a: &mut TestAppContext, cx_b: &mut T
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -853,7 +862,10 @@ async fn test_language_server_statuses(cx_a: &mut TestAppContext, cx_b: &mut Tes
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -1144,7 +1156,10 @@ async fn test_on_input_format_from_host_to_guest(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -1272,7 +1287,10 @@ async fn test_on_input_format_from_guest_to_host(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -1431,7 +1449,10 @@ async fn test_mutual_editor_inlay_hint_cache_update(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -1697,7 +1718,10 @@ async fn test_inlay_hint_refresh_is_forwarded(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),

crates/collab/src/tests/following_tests.rs

@@ -22,7 +22,9 @@ use workspace::{
     SplitDirection, Workspace,
 };
 
-#[gpui::test(iterations = 10)]
+use super::TestClient;
+
+#[gpui::test]
 async fn test_basic_following(
     cx_a: &mut TestAppContext,
     cx_b: &mut TestAppContext,
@@ -435,6 +437,7 @@ async fn test_basic_following(
         })
         .await
         .unwrap();
+
     executor.run_until_parked();
     let shared_screen = workspace_a.update(cx_a, |workspace, cx| {
         workspace
@@ -520,6 +523,7 @@ async fn test_basic_following(
         workspace_a.update(cx_a, |workspace, _| workspace.leader_for_pane(&pane_a)),
         None
     );
+    executor.run_until_parked();
 }
 
 #[gpui::test]
@@ -1905,7 +1909,7 @@ async fn test_following_to_channel_notes_without_a_shared_project(
 
     // Client A opens the notes for channel 1.
     let channel_notes_1_a = cx_a
-        .update(|cx| ChannelView::open(channel_1_id, workspace_a.clone(), cx))
+        .update(|cx| ChannelView::open(channel_1_id, None, workspace_a.clone(), cx))
         .await
         .unwrap();
     channel_notes_1_a.update(cx_a, |notes, cx| {
@@ -1951,7 +1955,7 @@ async fn test_following_to_channel_notes_without_a_shared_project(
 
     //  Client A opens the notes for channel 2.
     let channel_notes_2_a = cx_a
-        .update(|cx| ChannelView::open(channel_2_id, workspace_a.clone(), cx))
+        .update(|cx| ChannelView::open(channel_2_id, None, workspace_a.clone(), cx))
         .await
         .unwrap();
     channel_notes_2_a.update(cx_a, |notes, cx| {
@@ -1996,3 +2000,82 @@ async fn test_following_to_channel_notes_without_a_shared_project(
         );
     });
 }
+
+async fn join_channel(
+    channel_id: u64,
+    client: &TestClient,
+    cx: &mut TestAppContext,
+) -> anyhow::Result<()> {
+    cx.update(|cx| workspace::open_channel(channel_id, client.app_state.clone(), None, cx))
+        .await
+}
+
+async fn share_workspace(
+    workspace: &View<Workspace>,
+    cx: &mut VisualTestContext,
+) -> anyhow::Result<u64> {
+    let project = workspace.update(cx, |workspace, _| workspace.project().clone());
+    cx.read(ActiveCall::global)
+        .update(cx, |call, cx| call.share_project(project, cx))
+        .await
+}
+
+#[gpui::test]
+async fn test_following_to_channel_notes_other_workspace(
+    cx_a: &mut TestAppContext,
+    cx_b: &mut TestAppContext,
+) {
+    let (_, client_a, client_b, channel) = TestServer::start2(cx_a, cx_b).await;
+
+    let mut cx_a2 = cx_a.clone();
+    let (workspace_a, cx_a) = client_a.build_test_workspace(cx_a).await;
+    join_channel(channel, &client_a, cx_a).await.unwrap();
+    share_workspace(&workspace_a, cx_a).await.unwrap();
+
+    // a opens 1.txt
+    cx_a.simulate_keystrokes("cmd-p 1 enter");
+    cx_a.run_until_parked();
+    workspace_a.update(cx_a, |workspace, cx| {
+        let editor = workspace.active_item(cx).unwrap();
+        assert_eq!(editor.tab_description(0, cx).unwrap(), "1.txt");
+    });
+
+    // b joins channel and is following a
+    join_channel(channel, &client_b, cx_b).await.unwrap();
+    cx_b.run_until_parked();
+    let (workspace_b, cx_b) = client_b.active_workspace(cx_b);
+    workspace_b.update(cx_b, |workspace, cx| {
+        let editor = workspace.active_item(cx).unwrap();
+        assert_eq!(editor.tab_description(0, cx).unwrap(), "1.txt");
+    });
+
+    // a opens a second workspace and the channel notes
+    let (workspace_a2, cx_a2) = client_a.build_test_workspace(&mut cx_a2).await;
+    cx_a2.update(|cx| cx.activate_window());
+    cx_a2
+        .update(|cx| ChannelView::open(channel, None, workspace_a2, cx))
+        .await
+        .unwrap();
+    cx_a2.run_until_parked();
+
+    // b should follow a to the channel notes
+    workspace_b.update(cx_b, |workspace, cx| {
+        let editor = workspace.active_item_as::<ChannelView>(cx).unwrap();
+        assert_eq!(editor.read(cx).channel(cx).unwrap().id, channel);
+    });
+
+    // a returns to the shared project
+    cx_a.update(|cx| cx.activate_window());
+    cx_a.run_until_parked();
+
+    workspace_a.update(cx_a, |workspace, cx| {
+        let editor = workspace.active_item(cx).unwrap();
+        assert_eq!(editor.tab_description(0, cx).unwrap(), "1.txt");
+    });
+
+    // b should follow a back
+    workspace_b.update(cx_b, |workspace, cx| {
+        let editor = workspace.active_item_as::<Editor>(cx).unwrap();
+        assert_eq!(editor.tab_description(0, cx).unwrap(), "1.txt");
+    });
+}

crates/collab/src/tests/integration_tests.rs

@@ -14,7 +14,7 @@ use gpui::{
 use language::{
     language_settings::{AllLanguageSettings, Formatter},
     tree_sitter_rust, Diagnostic, DiagnosticEntry, FakeLspAdapter, Language, LanguageConfig,
-    LineEnding, OffsetRangeExt, Point, Rope,
+    LanguageMatcher, LineEnding, OffsetRangeExt, Point, Rope,
 };
 use live_kit_client::MacOSDisplay;
 use lsp::LanguageServerId;
@@ -1881,7 +1881,7 @@ fn active_call_events(cx: &mut TestAppContext) -> Rc<RefCell<Vec<room::Event>>>
 }
 
 #[gpui::test]
-async fn test_mute_deafen(
+async fn test_mute(
     executor: BackgroundExecutor,
     cx_a: &mut TestAppContext,
     cx_b: &mut TestAppContext,
@@ -1920,7 +1920,7 @@ async fn test_mute_deafen(
     room_a.read_with(cx_a, |room, _| assert!(!room.is_muted()));
     room_b.read_with(cx_b, |room, _| assert!(!room.is_muted()));
 
-    // Users A and B are both muted.
+    // Users A and B are both unmuted.
     assert_eq!(
         participant_audio_state(&room_a, cx_a),
         &[ParticipantAudioState {
@@ -1962,30 +1962,6 @@ async fn test_mute_deafen(
         }]
     );
 
-    // User A deafens
-    room_a.update(cx_a, |room, cx| room.toggle_deafen(cx));
-    executor.run_until_parked();
-
-    // User A does not hear user B.
-    room_a.read_with(cx_a, |room, _| assert!(room.is_muted()));
-    room_b.read_with(cx_b, |room, _| assert!(!room.is_muted()));
-    assert_eq!(
-        participant_audio_state(&room_a, cx_a),
-        &[ParticipantAudioState {
-            user_id: client_b.user_id().unwrap(),
-            is_muted: false,
-            audio_tracks_playing: vec![false],
-        }]
-    );
-    assert_eq!(
-        participant_audio_state(&room_b, cx_b),
-        &[ParticipantAudioState {
-            user_id: client_a.user_id().unwrap(),
-            is_muted: true,
-            audio_tracks_playing: vec![true],
-        }]
-    );
-
     // User B calls user C, C joins.
     active_call_b
         .update(cx_b, |call, cx| {
@@ -2000,22 +1976,6 @@ async fn test_mute_deafen(
         .unwrap();
     executor.run_until_parked();
 
-    // User A does not hear users B or C.
-    assert_eq!(
-        participant_audio_state(&room_a, cx_a),
-        &[
-            ParticipantAudioState {
-                user_id: client_b.user_id().unwrap(),
-                is_muted: false,
-                audio_tracks_playing: vec![false],
-            },
-            ParticipantAudioState {
-                user_id: client_c.user_id().unwrap(),
-                is_muted: false,
-                audio_tracks_playing: vec![false],
-            }
-        ]
-    );
     assert_eq!(
         participant_audio_state(&room_b, cx_b),
         &[
@@ -2246,7 +2206,10 @@ async fn test_propagate_saves_and_fs_changes(
     let rust = Arc::new(Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -2254,7 +2217,10 @@ async fn test_propagate_saves_and_fs_changes(
     let javascript = Arc::new(Language::new(
         LanguageConfig {
             name: "JavaScript".into(),
-            path_suffixes: vec!["js".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["js".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -3783,7 +3749,10 @@ async fn test_collaborating_with_diagnostics(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -4061,7 +4030,10 @@ async fn test_collaborating_with_lsp_progress_updates_and_diagnostics_ordering(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -4290,7 +4262,10 @@ async fn test_formatting_buffer(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -4395,7 +4370,10 @@ async fn test_prettier_formatting_buffer(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             prettier_parser_name: Some("test_parser".to_string()),
             ..Default::default()
         },
@@ -4511,7 +4489,10 @@ async fn test_definition(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -4655,7 +4636,10 @@ async fn test_references(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -4852,7 +4836,10 @@ async fn test_document_highlights(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -4955,7 +4942,10 @@ async fn test_lsp_hover(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -5051,7 +5041,10 @@ async fn test_project_symbols(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -5160,7 +5153,10 @@ async fn test_open_buffer_while_getting_definition_pointing_to_it(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -5967,6 +5963,6 @@ async fn test_cmd_k_left(cx: &mut TestAppContext) {
     cx.executor().advance_clock(Duration::from_secs(2));
     cx.simulate_keystrokes("left");
     workspace.update(cx, |workspace, cx| {
-        assert!(workspace.items(cx).collect::<Vec<_>>().len() == 3);
+        assert!(workspace.items(cx).collect::<Vec<_>>().len() == 2);
     });
 }

crates/collab/src/tests/random_project_collaboration_tests.rs

@@ -8,7 +8,9 @@ use editor::Bias;
 use fs::{repository::GitFileStatus, FakeFs, Fs as _};
 use futures::StreamExt;
 use gpui::{BackgroundExecutor, Model, TestAppContext};
-use language::{range_to_lsp, FakeLspAdapter, Language, LanguageConfig, PointUtf16};
+use language::{
+    range_to_lsp, FakeLspAdapter, Language, LanguageConfig, LanguageMatcher, PointUtf16,
+};
 use lsp::FakeLanguageServer;
 use pretty_assertions::assert_eq;
 use project::{search::SearchQuery, Project, ProjectPath};
@@ -1022,7 +1024,10 @@ impl RandomizedTest for ProjectCollaborationTest {
         let mut language = Language::new(
             LanguageConfig {
                 name: "Rust".into(),
-                path_suffixes: vec!["rs".to_string()],
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".to_string()],
+                    ..Default::default()
+                },
                 ..Default::default()
             },
             None,

crates/collab/src/tests/test_server.rs

@@ -13,7 +13,7 @@ use client::{
 use collections::{HashMap, HashSet};
 use fs::FakeFs;
 use futures::{channel::oneshot, StreamExt as _};
-use gpui::{BackgroundExecutor, Context, Model, TestAppContext, View, VisualTestContext};
+use gpui::{BackgroundExecutor, Context, Model, Task, TestAppContext, View, VisualTestContext};
 use language::LanguageRegistry;
 use node_runtime::FakeNodeRuntime;
 
@@ -36,7 +36,7 @@ use std::{
         Arc,
     },
 };
-use util::http::FakeHttpClient;
+use util::{http::FakeHttpClient, SemanticVersion};
 use workspace::{Workspace, WorkspaceStore};
 
 pub struct TestServer {
@@ -123,7 +123,12 @@ impl TestServer {
         let client_a = server.create_client(cx_a, "user_a").await;
         let client_b = server.create_client(cx_b, "user_b").await;
         let channel_id = server
-            .make_channel("a", None, (&client_a, cx_a), &mut [(&client_b, cx_b)])
+            .make_channel(
+                "test-channel",
+                None,
+                (&client_a, cx_a),
+                &mut [(&client_b, cx_b)],
+            )
             .await;
         cx_a.run_until_parked();
 
@@ -153,6 +158,7 @@ impl TestServer {
             }
             let settings = SettingsStore::test(cx);
             cx.set_global(settings);
+            release_channel::init("0.0.0", cx);
             client::init_settings(cx);
         });
 
@@ -224,6 +230,7 @@ impl TestServer {
                                 server_conn,
                                 client_name,
                                 user,
+                                SemanticVersion::default(),
                                 None,
                                 Some(connection_id_tx),
                                 Executor::Deterministic(cx.background_executor().clone()),
@@ -679,7 +686,7 @@ impl TestClient {
         channel_id: u64,
         cx: &'a mut TestAppContext,
     ) -> (View<Workspace>, &'a mut VisualTestContext) {
-        cx.update(|cx| workspace::join_channel(channel_id, self.app_state.clone(), None, cx))
+        cx.update(|cx| workspace::open_channel(channel_id, self.app_state.clone(), None, cx))
             .await
             .unwrap();
         cx.run_until_parked();
@@ -754,6 +761,11 @@ impl TestClient {
     }
 }
 
+pub fn join_channel_call(cx: &mut TestAppContext) -> Task<anyhow::Result<()>> {
+    let room = cx.read(|cx| ActiveCall::global(cx).read(cx).room().cloned());
+    room.unwrap().update(cx, |room, cx| room.join_call(cx))
+}
+
 impl Drop for TestClient {
     fn drop(&mut self) {
         self.app_state.client.teardown();

crates/collab_ui/Cargo.toml

@@ -26,58 +26,58 @@ test-support = [
 
 [dependencies]
 anyhow.workspace = true
-auto_update = { path = "../auto_update" }
-call = { path = "../call" }
-channel = { path = "../channel" }
-client = { path = "../client" }
-clock = { path = "../clock" }
-collections = { path = "../collections" }
-db = { path = "../db" }
-editor = { path = "../editor" }
-feature_flags = { path = "../feature_flags" }
-feedback = { path = "../feedback" }
+auto_update.workspace = true
+call.workspace = true
+channel.workspace = true
+client.workspace = true
+clock.workspace = true
+collections.workspace = true
+db.workspace = true
+editor.workspace = true
+feature_flags.workspace = true
+feedback.workspace = true
 futures.workspace = true
-fuzzy = { path = "../fuzzy" }
-gpui = { path = "../gpui" }
-language = { path = "../language" }
+fuzzy.workspace = true
+gpui.workspace = true
+language.workspace = true
 lazy_static.workspace = true
 log.workspace = true
-menu = { path = "../menu" }
-notifications = { path = "../notifications" }
+menu.workspace = true
+notifications.workspace = true
 parking_lot.workspace = true
-picker = { path = "../picker" }
+picker.workspace = true
 postage.workspace = true
-project = { path = "../project" }
-recent_projects = { path = "../recent_projects" }
-rich_text = { path = "../rich_text" }
-rpc = { path = "../rpc" }
+project.workspace = true
+recent_projects.workspace = true
+rich_text.workspace = true
+rpc.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 smallvec.workspace = true
-story = { path = "../story", optional = true }
-theme = { path = "../theme" }
-theme_selector = { path = "../theme_selector" }
+story = { workspace = true, optional = true }
+theme.workspace = true
+theme_selector.workspace = true
 time.workspace = true
-ui = { path = "../ui" }
-util = { path = "../util" }
-vcs_menu = { path = "../vcs_menu" }
-workspace = { path = "../workspace" }
-zed_actions = { path = "../zed_actions" }
+ui.workspace = true
+util.workspace = true
+vcs_menu.workspace = true
+workspace.workspace = true
+zed_actions.workspace = true
 
 [dev-dependencies]
-call = { path = "../call", features = ["test-support"] }
-client = { path = "../client", features = ["test-support"] }
-collections = { path = "../collections", features = ["test-support"] }
-editor = { path = "../editor", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-notifications = { path = "../notifications", features = ["test-support"] }
+call = { workspace = true, features = ["test-support"] }
+client = { workspace = true, features = ["test-support"] }
+collections = { workspace = true, features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+notifications = { workspace = true, features = ["test-support"] }
 pretty_assertions.workspace = true
-project = { path = "../project", features = ["test-support"] }
-rpc = { path = "../rpc", features = ["test-support"] }
-settings = { path = "../settings", features = ["test-support"] }
+project = { workspace = true, features = ["test-support"] }
+rpc = { workspace = true, features = ["test-support"] }
+settings = { workspace = true, features = ["test-support"] }
 tree-sitter-markdown.workspace = true
-util = { path = "../util", features = ["test-support"] }
-workspace = { path = "../workspace", features = ["test-support"] }
+util = { workspace = true, features = ["test-support"] }
+workspace = { workspace = true, features = ["test-support"] }

crates/collab_ui/src/channel_view.rs

@@ -6,11 +6,14 @@ use client::{
     Collaborator, ParticipantIndex,
 };
 use collections::HashMap;
-use editor::{CollaborationHub, Editor, EditorEvent};
+use editor::{
+    display_map::ToDisplayPoint, scroll::Autoscroll, CollaborationHub, DisplayPoint, Editor,
+    EditorEvent,
+};
 use gpui::{
-    actions, AnyElement, AnyView, AppContext, Entity as _, EventEmitter, FocusableView,
-    IntoElement as _, Model, Pixels, Point, Render, Subscription, Task, View, ViewContext,
-    VisualContext as _, WindowContext,
+    actions, AnyElement, AnyView, AppContext, ClipboardItem, Entity as _, EventEmitter,
+    FocusableView, IntoElement as _, Model, Pixels, Point, Render, Subscription, Task, View,
+    ViewContext, VisualContext as _, WeakView, WindowContext,
 };
 use project::Project;
 use std::{
@@ -23,10 +26,10 @@ use workspace::{
     item::{FollowableItem, Item, ItemEvent, ItemHandle},
     register_followable_item,
     searchable::SearchableItemHandle,
-    ItemNavHistory, Pane, SaveIntent, ViewId, Workspace, WorkspaceId,
+    ItemNavHistory, Pane, SaveIntent, Toast, ViewId, Workspace, WorkspaceId,
 };
 
-actions!(collab, [Deploy]);
+actions!(collab, [CopyLink]);
 
 pub fn init(cx: &mut AppContext) {
     register_followable_item::<ChannelView>(cx)
@@ -34,21 +37,30 @@ pub fn init(cx: &mut AppContext) {
 
 pub struct ChannelView {
     pub editor: View<Editor>,
+    workspace: WeakView<Workspace>,
     project: Model<Project>,
     channel_store: Model<ChannelStore>,
     channel_buffer: Model<ChannelBuffer>,
     remote_id: Option<ViewId>,
     _editor_event_subscription: Subscription,
+    _reparse_subscription: Option<Subscription>,
 }
 
 impl ChannelView {
     pub fn open(
         channel_id: ChannelId,
+        link_position: Option<String>,
         workspace: View<Workspace>,
         cx: &mut WindowContext,
     ) -> Task<Result<View<Self>>> {
         let pane = workspace.read(cx).active_pane().clone();
-        let channel_view = Self::open_in_pane(channel_id, pane.clone(), workspace.clone(), cx);
+        let channel_view = Self::open_in_pane(
+            channel_id,
+            link_position,
+            pane.clone(),
+            workspace.clone(),
+            cx,
+        );
         cx.spawn(|mut cx| async move {
             let channel_view = channel_view.await?;
             pane.update(&mut cx, |pane, cx| {
@@ -66,10 +78,12 @@ impl ChannelView {
 
     pub fn open_in_pane(
         channel_id: ChannelId,
+        link_position: Option<String>,
         pane: View<Pane>,
         workspace: View<Workspace>,
         cx: &mut WindowContext,
     ) -> Task<Result<View<Self>>> {
+        let weak_workspace = workspace.downgrade();
         let workspace = workspace.read(cx);
         let project = workspace.project().to_owned();
         let channel_store = ChannelStore::global(cx);
@@ -82,12 +96,13 @@ impl ChannelView {
             let channel_buffer = channel_buffer.await?;
             let markdown = markdown.await.log_err();
 
-            channel_buffer.update(&mut cx, |buffer, cx| {
-                buffer.buffer().update(cx, |buffer, cx| {
+            channel_buffer.update(&mut cx, |channel_buffer, cx| {
+                channel_buffer.buffer().update(cx, |buffer, cx| {
                     buffer.set_language_registry(language_registry);
-                    if let Some(markdown) = markdown {
-                        buffer.set_language(Some(markdown), cx);
-                    }
+                    let Some(markdown) = markdown else {
+                        return;
+                    };
+                    buffer.set_language(Some(markdown), cx);
                 })
             })?;
 
@@ -101,12 +116,18 @@ impl ChannelView {
                 // If this channel buffer is already open in this pane, just return it.
                 if let Some(existing_view) = existing_view.clone() {
                     if existing_view.read(cx).channel_buffer == channel_buffer {
+                        if let Some(link_position) = link_position {
+                            existing_view.update(cx, |channel_view, cx| {
+                                channel_view.focus_position_from_link(link_position, true, cx)
+                            });
+                        }
                         return existing_view;
                     }
                 }
 
                 let view = cx.new_view(|cx| {
-                    let mut this = Self::new(project, channel_store, channel_buffer, cx);
+                    let mut this =
+                        Self::new(project, weak_workspace, channel_store, channel_buffer, cx);
                     this.acknowledge_buffer_version(cx);
                     this
                 });
@@ -121,6 +142,12 @@ impl ChannelView {
                     }
                 }
 
+                if let Some(link_position) = link_position {
+                    view.update(cx, |channel_view, cx| {
+                        channel_view.focus_position_from_link(link_position, true, cx)
+                    });
+                }
+
                 view
             })
         })
@@ -128,16 +155,29 @@ impl ChannelView {
 
     pub fn new(
         project: Model<Project>,
+        workspace: WeakView<Workspace>,
         channel_store: Model<ChannelStore>,
         channel_buffer: Model<ChannelBuffer>,
         cx: &mut ViewContext<Self>,
     ) -> Self {
         let buffer = channel_buffer.read(cx).buffer();
+        let this = cx.view().downgrade();
         let editor = cx.new_view(|cx| {
             let mut editor = Editor::for_buffer(buffer, None, cx);
             editor.set_collaboration_hub(Box::new(ChannelBufferCollaborationHub(
                 channel_buffer.clone(),
             )));
+            editor.set_custom_context_menu(move |_, position, cx| {
+                let this = this.clone();
+                Some(ui::ContextMenu::build(cx, move |menu, _| {
+                    menu.entry("Copy link to section", None, move |cx| {
+                        this.update(cx, |this, cx| {
+                            this.copy_link_for_position(position.clone(), cx)
+                        })
+                        .ok();
+                    })
+                }))
+            });
             editor
         });
         let _editor_event_subscription =
@@ -148,14 +188,94 @@ impl ChannelView {
 
         Self {
             editor,
+            workspace,
             project,
             channel_store,
             channel_buffer,
             remote_id: None,
             _editor_event_subscription,
+            _reparse_subscription: None,
         }
     }
 
+    fn focus_position_from_link(
+        &mut self,
+        position: String,
+        first_attempt: bool,
+        cx: &mut ViewContext<Self>,
+    ) {
+        let position = Channel::slug(&position).to_lowercase();
+        let snapshot = self.editor.update(cx, |editor, cx| editor.snapshot(cx));
+
+        if let Some(outline) = snapshot.buffer_snapshot.outline(None) {
+            if let Some(item) = outline
+                .items
+                .iter()
+                .find(|item| &Channel::slug(&item.text).to_lowercase() == &position)
+            {
+                self.editor.update(cx, |editor, cx| {
+                    editor.change_selections(Some(Autoscroll::focused()), cx, |s| {
+                        s.replace_cursors_with(|map| vec![item.range.start.to_display_point(&map)])
+                    })
+                });
+                return;
+            }
+        }
+
+        if !first_attempt {
+            return;
+        }
+        self._reparse_subscription = Some(cx.subscribe(
+            &self.editor,
+            move |this, _, e: &EditorEvent, cx| {
+                match e {
+                    EditorEvent::Reparsed => {
+                        this.focus_position_from_link(position.clone(), false, cx);
+                        this._reparse_subscription.take();
+                    }
+                    EditorEvent::Edited | EditorEvent::SelectionsChanged { local: true } => {
+                        this._reparse_subscription.take();
+                    }
+                    _ => {}
+                };
+            },
+        ));
+    }
+
+    fn copy_link(&mut self, _: &CopyLink, cx: &mut ViewContext<Self>) {
+        let position = self
+            .editor
+            .update(cx, |editor, cx| editor.selections.newest_display(cx).start);
+        self.copy_link_for_position(position, cx)
+    }
+
+    fn copy_link_for_position(&self, position: DisplayPoint, cx: &mut ViewContext<Self>) {
+        let snapshot = self.editor.update(cx, |editor, cx| editor.snapshot(cx));
+
+        let mut closest_heading = None;
+
+        if let Some(outline) = snapshot.buffer_snapshot.outline(None) {
+            for item in outline.items {
+                if item.range.start.to_display_point(&snapshot) > position {
+                    break;
+                }
+                closest_heading = Some(item);
+            }
+        }
+
+        let Some(channel) = self.channel(cx) else {
+            return;
+        };
+
+        let link = channel.notes_link(closest_heading.map(|heading| heading.text));
+        cx.write_to_clipboard(ClipboardItem::new(link));
+        self.workspace
+            .update(cx, |workspace, cx| {
+                workspace.show_toast(Toast::new(0, "Link copied to clipboard"), cx);
+            })
+            .ok();
+    }
+
     pub fn channel(&self, cx: &AppContext) -> Option<Arc<Channel>> {
         self.channel_buffer.read(cx).channel(cx)
     }
@@ -215,8 +335,11 @@ impl ChannelView {
 impl EventEmitter<EditorEvent> for ChannelView {}
 
 impl Render for ChannelView {
-    fn render(&mut self, _cx: &mut ViewContext<Self>) -> impl IntoElement {
-        self.editor.clone()
+    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
+        div()
+            .size_full()
+            .on_action(cx.listener(Self::copy_link))
+            .child(self.editor.clone())
     }
 }
 
@@ -274,6 +397,7 @@ impl Item for ChannelView {
         Some(cx.new_view(|cx| {
             Self::new(
                 self.project.clone(),
+                self.workspace.clone(),
                 self.channel_store.clone(),
                 self.channel_buffer.clone(),
                 cx,
@@ -356,7 +480,7 @@ impl FollowableItem for ChannelView {
             unreachable!()
         };
 
-        let open = ChannelView::open_in_pane(state.channel_id, pane, workspace, cx);
+        let open = ChannelView::open_in_pane(state.channel_id, None, pane, workspace, cx);
 
         Some(cx.spawn(|mut cx| async move {
             let this = open.await?;

crates/collab_ui/src/chat_panel.rs

@@ -1,16 +1,16 @@
 use crate::{collab_panel, ChatPanelSettings};
 use anyhow::Result;
 use call::{room, ActiveCall};
-use channel::{ChannelChat, ChannelChatEvent, ChannelMessageId, ChannelStore};
+use channel::{ChannelChat, ChannelChatEvent, ChannelMessage, ChannelMessageId, ChannelStore};
 use client::Client;
 use collections::HashMap;
 use db::kvp::KEY_VALUE_STORE;
 use editor::Editor;
 use gpui::{
-    actions, div, list, prelude::*, px, Action, AppContext, AsyncWindowContext, DismissEvent,
-    ElementId, EventEmitter, Fill, FocusHandle, FocusableView, FontWeight, ListOffset,
-    ListScrollEvent, ListState, Model, Render, Subscription, Task, View, ViewContext,
-    VisualContext, WeakView,
+    actions, div, list, prelude::*, px, Action, AppContext, AsyncWindowContext, CursorStyle,
+    DismissEvent, ElementId, EventEmitter, FocusHandle, FocusableView, FontStyle, FontWeight,
+    HighlightStyle, ListOffset, ListScrollEvent, ListState, Model, Render, StyledText,
+    Subscription, Task, View, ViewContext, VisualContext, WeakView,
 };
 use language::LanguageRegistry;
 use menu::Confirm;
@@ -23,7 +23,7 @@ use std::{sync::Arc, time::Duration};
 use time::{OffsetDateTime, UtcOffset};
 use ui::{
     popover_menu, prelude::*, Avatar, Button, ContextMenu, IconButton, IconName, KeyBinding, Label,
-    TabBar,
+    TabBar, Tooltip,
 };
 use util::{ResultExt, TryFutureExt};
 use workspace::{
@@ -62,6 +62,7 @@ pub struct ChatPanel {
     markdown_data: HashMap<ChannelMessageId, RichText>,
     focus_handle: FocusHandle,
     open_context_menu: Option<(u64, Subscription)>,
+    highlighted_message: Option<(u64, Task<()>)>,
 }
 
 #[derive(Serialize, Deserialize)]
@@ -69,7 +70,7 @@ struct SerializedChatPanel {
     width: Option<Pixels>,
 }
 
-actions!(chat_panel, [ToggleFocus]);
+actions!(chat_panel, [ToggleFocus, CloseReplyPreview]);
 
 impl ChatPanel {
     pub fn new(workspace: &mut Workspace, cx: &mut ViewContext<Workspace>) -> View<Self> {
@@ -124,6 +125,7 @@ impl ChatPanel {
                 markdown_data: Default::default(),
                 focus_handle: cx.focus_handle(),
                 open_context_menu: None,
+                highlighted_message: None,
             };
 
             if let Some(channel_id) = ActiveCall::global(cx)
@@ -236,6 +238,7 @@ impl ChatPanel {
                 let channel_name = chat.channel(cx).map(|channel| channel.name.clone());
                 self.message_editor.update(cx, |editor, cx| {
                     editor.set_channel(channel_id, channel_name, cx);
+                    editor.clear_reply_to_message_id();
                 });
             };
             let subscription = cx.subscribe(&chat, Self::channel_did_change);
@@ -285,6 +288,99 @@ impl ChatPanel {
         }
     }
 
+    fn render_replied_to_message(
+        &mut self,
+        message_id: Option<ChannelMessageId>,
+        reply_to_message: &ChannelMessage,
+        cx: &mut ViewContext<Self>,
+    ) -> impl IntoElement {
+        let body_element_id: ElementId = match message_id {
+            Some(ChannelMessageId::Saved(id)) => ("reply-to-saved-message", id).into(),
+            Some(ChannelMessageId::Pending(id)) => ("reply-to-pending-message", id).into(), // This should never happen
+            None => ("composing-reply").into(),
+        };
+
+        let message_element_id: ElementId = match message_id {
+            Some(ChannelMessageId::Saved(id)) => ("reply-to-saved-message-container", id).into(),
+            Some(ChannelMessageId::Pending(id)) => {
+                ("reply-to-pending-message-container", id).into()
+            } // This should never happen
+            None => ("composing-reply-container").into(),
+        };
+
+        let current_channel_id = self.channel_id(cx);
+        let reply_to_message_id = reply_to_message.id;
+
+        let reply_to_message_body = self
+            .markdown_data
+            .entry(reply_to_message.id)
+            .or_insert_with(|| {
+                Self::render_markdown_with_mentions(
+                    &self.languages,
+                    self.client.id(),
+                    reply_to_message,
+                )
+            });
+
+        const REPLY_TO_PREFIX: &str = "Reply to @";
+
+        div().flex_grow().child(
+            v_flex()
+                .id(message_element_id)
+                .text_ui_xs()
+                .child(
+                    h_flex()
+                        .gap_x_1()
+                        .items_center()
+                        .justify_start()
+                        .overflow_x_hidden()
+                        .whitespace_nowrap()
+                        .child(
+                            StyledText::new(format!(
+                                "{}{}",
+                                REPLY_TO_PREFIX,
+                                reply_to_message.sender.github_login.clone()
+                            ))
+                            .with_highlights(
+                                &cx.text_style(),
+                                vec![(
+                                    (REPLY_TO_PREFIX.len() - 1)
+                                        ..(reply_to_message.sender.github_login.len()
+                                            + REPLY_TO_PREFIX.len()),
+                                    HighlightStyle {
+                                        font_weight: Some(FontWeight::BOLD),
+                                        ..Default::default()
+                                    },
+                                )],
+                            ),
+                        ),
+                )
+                .child(
+                    div()
+                        .border_l_2()
+                        .border_color(cx.theme().colors().border)
+                        .px_1()
+                        .py_0p5()
+                        .mb_1()
+                        .overflow_hidden()
+                        .child(
+                            div()
+                                .max_h_12()
+                                .child(reply_to_message_body.element(body_element_id, cx)),
+                        ),
+                )
+                .cursor(CursorStyle::PointingHand)
+                .tooltip(|cx| Tooltip::text("Go to message", cx))
+                .on_click(cx.listener(move |chat_panel, _, cx| {
+                    if let Some(channel_id) = current_channel_id {
+                        chat_panel
+                            .select_channel(channel_id, reply_to_message_id.into(), cx)
+                            .detach_and_log_err(cx)
+                    }
+                })),
+        )
+    }
+
     fn render_message(&mut self, ix: usize, cx: &mut ViewContext<Self>) -> impl IntoElement {
         let active_chat = &self.active_chat.as_ref().unwrap().0;
         let (message, is_continuation_from_previous, is_admin) =
@@ -317,18 +413,9 @@ impl ChatPanel {
             });
 
         let _is_pending = message.is_pending();
-        let text = self.markdown_data.entry(message.id).or_insert_with(|| {
-            Self::render_markdown_with_mentions(&self.languages, self.client.id(), &message)
-        });
 
         let belongs_to_user = Some(message.sender.id) == self.client.user_id();
-        let message_id_to_remove = if let (ChannelMessageId::Saved(id), true) =
-            (message.id, belongs_to_user || is_admin)
-        {
-            Some(id)
-        } else {
-            None
-        };
+        let can_delete_message = belongs_to_user || is_admin;
 
         let element_id: ElementId = match message.id {
             ChannelMessageId::Saved(id) => ("saved-message", id).into(),
@@ -341,19 +428,41 @@ impl ChatPanel {
             .iter()
             .any(|m| Some(m.1) == self.client.user_id());
 
+        let message_id = match message.id {
+            ChannelMessageId::Saved(id) => Some(id),
+            ChannelMessageId::Pending(_) => None,
+        };
+
+        let reply_to_message = message
+            .reply_to_message_id
+            .map(|id| active_chat.read(cx).find_loaded_message(id))
+            .flatten()
+            .cloned();
+
+        let replied_to_you =
+            reply_to_message.as_ref().map(|m| m.sender.id) == self.client.user_id();
+
+        let is_highlighted_message = self
+            .highlighted_message
+            .as_ref()
+            .is_some_and(|(id, _)| Some(id) == message_id.as_ref());
+        let background = if is_highlighted_message {
+            cx.theme().status().info_background
+        } else if mentioning_you || replied_to_you {
+            cx.theme().colors().background
+        } else {
+            cx.theme().colors().panel_background
+        };
+
         v_flex().w_full().relative().child(
             div()
-                .bg(if mentioning_you {
-                    Fill::from(cx.theme().colors().background)
-                } else {
-                    Fill::default()
-                })
+                .bg(background)
                 .rounded_md()
                 .overflow_hidden()
                 .px_1()
                 .py_0p5()
                 .when(!is_continuation_from_previous, |this| {
-                    this.mt_1().child(
+                    this.mt_2().child(
                         h_flex()
                             .text_ui_sm()
                             .child(div().absolute().child(
@@ -377,36 +486,86 @@ impl ChatPanel {
                             ),
                     )
                 })
-                .when(mentioning_you, |this| this.mt_1())
-                .child(
-                    v_flex()
-                        .w_full()
-                        .text_ui_sm()
-                        .id(element_id)
-                        .group("")
-                        .child(text.element("body".into(), cx))
-                        .child(
+                .when(
+                    message.reply_to_message_id.is_some() && reply_to_message.is_none(),
+                    |this| {
+                        const MESSAGE_DELETED: &str = "Message has been deleted";
+
+                        let body_text = StyledText::new(MESSAGE_DELETED).with_highlights(
+                            &cx.text_style(),
+                            vec![(
+                                0..MESSAGE_DELETED.len(),
+                                HighlightStyle {
+                                    font_style: Some(FontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            )],
+                        );
+
+                        this.child(
                             div()
-                                .absolute()
-                                .z_index(1)
-                                .right_0()
-                                .w_6()
-                                .bg(cx.theme().colors().panel_background)
-                                .when(!self.has_open_menu(message_id_to_remove), |el| {
-                                    el.visible_on_hover("")
-                                })
-                                .children(message_id_to_remove.map(|message_id| {
-                                    popover_menu(("menu", message_id))
-                                        .trigger(IconButton::new(
-                                            ("trigger", message_id),
-                                            IconName::Ellipsis,
-                                        ))
-                                        .menu(move |cx| {
-                                            Some(Self::render_message_menu(&this, message_id, cx))
-                                        })
-                                })),
-                        ),
-                ),
+                                .border_l_2()
+                                .text_ui_xs()
+                                .border_color(cx.theme().colors().border)
+                                .px_1()
+                                .py_0p5()
+                                .child(body_text),
+                        )
+                    },
+                )
+                .when_some(reply_to_message, |el, reply_to_message| {
+                    el.child(self.render_replied_to_message(
+                        Some(message.id),
+                        &reply_to_message,
+                        cx,
+                    ))
+                })
+                .when(mentioning_you || replied_to_you, |this| this.my_0p5())
+                .map(|el| {
+                    let text = self.markdown_data.entry(message.id).or_insert_with(|| {
+                        Self::render_markdown_with_mentions(
+                            &self.languages,
+                            self.client.id(),
+                            &message,
+                        )
+                    });
+                    el.child(
+                        v_flex()
+                            .w_full()
+                            .text_ui_sm()
+                            .id(element_id)
+                            .group("")
+                            .child(text.element("body".into(), cx))
+                            .child(
+                                div()
+                                    .absolute()
+                                    .z_index(1)
+                                    .right_0()
+                                    .w_6()
+                                    .bg(background)
+                                    .when(!self.has_open_menu(message_id), |el| {
+                                        el.visible_on_hover("")
+                                    })
+                                    .when_some(message_id, |el, message_id| {
+                                        el.child(
+                                            popover_menu(("menu", message_id))
+                                                .trigger(IconButton::new(
+                                                    ("trigger", message_id),
+                                                    IconName::Ellipsis,
+                                                ))
+                                                .menu(move |cx| {
+                                                    Some(Self::render_message_menu(
+                                                        &this,
+                                                        message_id,
+                                                        can_delete_message,
+                                                        cx,
+                                                    ))
+                                                }),
+                                        )
+                                    }),
+                            ),
+                    )
+                }),
         )
     }
 
@@ -420,13 +579,27 @@ impl ChatPanel {
     fn render_message_menu(
         this: &View<Self>,
         message_id: u64,
+        can_delete_message: bool,
         cx: &mut WindowContext,
     ) -> View<ContextMenu> {
         let menu = {
-            let this = this.clone();
-            ContextMenu::build(cx, move |menu, _| {
-                menu.entry("Delete message", None, move |cx| {
-                    this.update(cx, |this, cx| this.remove_message(message_id, cx))
+            ContextMenu::build(cx, move |menu, cx| {
+                menu.entry(
+                    "Reply to message",
+                    None,
+                    cx.handler_for(&this, move |this, cx| {
+                        this.message_editor.update(cx, |editor, cx| {
+                            editor.set_reply_to_message_id(message_id);
+                            editor.focus_handle(cx).focus(cx);
+                        })
+                    }),
+                )
+                .when(can_delete_message, move |menu| {
+                    menu.entry(
+                        "Delete message",
+                        None,
+                        cx.handler_for(&this, move |this, cx| this.remove_message(message_id, cx)),
+                    )
                 })
             })
         };
@@ -453,7 +626,7 @@ impl ChatPanel {
             })
             .collect::<Vec<_>>();
 
-        rich_text::render_markdown(message.body.clone(), &mentions, language_registry, None)
+        rich_text::render_rich_text(message.body.clone(), &mentions, language_registry, None)
     }
 
     fn send(&mut self, _: &Confirm, cx: &mut ViewContext<Self>) {
@@ -517,7 +690,21 @@ impl ChatPanel {
                     ChannelChat::load_history_since_message(chat.clone(), message_id, (*cx).clone())
                         .await
                 {
+                    let task = cx.spawn({
+                        let this = this.clone();
+
+                        |mut cx| async move {
+                            cx.background_executor().timer(Duration::from_secs(2)).await;
+                            this.update(&mut cx, |this, cx| {
+                                this.highlighted_message.take();
+                                cx.notify();
+                            })
+                            .ok();
+                        }
+                    });
+
                     this.update(&mut cx, |this, cx| {
+                        this.highlighted_message = Some((message_id, task));
                         if this.active_chat.as_ref().map_or(false, |(c, _)| *c == chat) {
                             this.message_list.scroll_to(ListOffset {
                                 item_ix,
@@ -532,11 +719,19 @@ impl ChatPanel {
             Ok(())
         })
     }
+
+    fn close_reply_preview(&mut self, _: &CloseReplyPreview, cx: &mut ViewContext<Self>) {
+        self.message_editor
+            .update(cx, |editor, _| editor.clear_reply_to_message_id());
+    }
 }
 
 impl Render for ChatPanel {
     fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
+        let reply_to_message_id = self.message_editor.read(cx).reply_to_message_id();
+
         v_flex()
+            .key_context("ChatPanel")
             .track_focus(&self.focus_handle)
             .full()
             .on_action(cx.listener(Self::send))
@@ -558,7 +753,7 @@ impl Render for ChatPanel {
                     ),
                 ),
             )
-            .child(div().flex_grow().px_2().pt_1().map(|this| {
+            .child(div().flex_grow().px_2().map(|this| {
                 if self.active_chat.is_some() {
                     this.child(list(self.message_list.clone()).full())
                 } else {
@@ -589,25 +784,65 @@ impl Render for ChatPanel {
                     )
                 }
             }))
-            .child(
-                h_flex()
-                    .when(!self.is_scrolled_to_bottom, |el| {
-                        el.border_t_1().border_color(cx.theme().colors().border)
+            .when_some(reply_to_message_id, |el, reply_to_message_id| {
+                let reply_message = self
+                    .active_chat()
+                    .map(|active_chat| {
+                        active_chat.read(cx).messages().iter().find_map(|m| {
+                            if m.id == ChannelMessageId::Saved(reply_to_message_id) {
+                                Some(m)
+                            } else {
+                                None
+                            }
+                        })
                     })
-                    .p_2()
-                    .map(|el| {
-                        if self.active_chat.is_some() {
-                            el.child(self.message_editor.clone())
-                        } else {
-                            el.child(
-                                div()
-                                    .rounded_md()
-                                    .h_6()
-                                    .w_full()
-                                    .bg(cx.theme().colors().editor_background),
-                            )
-                        }
-                    }),
+                    .flatten()
+                    .cloned();
+
+                el.when_some(reply_message, |el, reply_message| {
+                    el.child(
+                        div()
+                            .when(!self.is_scrolled_to_bottom, |el| {
+                                el.border_t_1().border_color(cx.theme().colors().border)
+                            })
+                            .flex()
+                            .w_full()
+                            .items_start()
+                            .overflow_hidden()
+                            .py_1()
+                            .px_2()
+                            .bg(cx.theme().colors().background)
+                            .child(self.render_replied_to_message(None, &reply_message, cx))
+                            .child(
+                                IconButton::new("close-reply-preview", IconName::Close)
+                                    .shape(ui::IconButtonShape::Square)
+                                    .tooltip(|cx| {
+                                        Tooltip::for_action(
+                                            "Close reply preview",
+                                            &CloseReplyPreview,
+                                            cx,
+                                        )
+                                    })
+                                    .on_click(cx.listener(move |_, _, cx| {
+                                        cx.dispatch_action(CloseReplyPreview.boxed_clone())
+                                    })),
+                            ),
+                    )
+                })
+            })
+            .children(
+                Some(
+                    h_flex()
+                        .key_context("MessageEditor")
+                        .on_action(cx.listener(ChatPanel::close_reply_preview))
+                        .when(
+                            !self.is_scrolled_to_bottom && reply_to_message_id.is_none(),
+                            |el| el.border_t_1().border_color(cx.theme().colors().border),
+                        )
+                        .p_2()
+                        .map(|el| el.child(self.message_editor.clone())),
+                )
+                .filter(|_| self.active_chat.is_some()),
             )
             .into_any()
     }
@@ -747,6 +982,7 @@ mod tests {
             }),
             nonce: 5,
             mentions: vec![(ranges[0].clone(), 101), (ranges[1].clone(), 102)],
+            reply_to_message_id: None,
         };
 
         let message = ChatPanel::render_markdown_with_mentions(&language_registry, 102, &message);

crates/collab_ui/src/chat_panel/message_editor.rs

@@ -34,6 +34,7 @@ pub struct MessageEditor {
     mentions: Vec<UserId>,
     mentions_task: Option<Task<()>>,
     channel_id: Option<ChannelId>,
+    reply_to_message_id: Option<u64>,
 }
 
 struct MessageEditorCompletionProvider(WeakView<MessageEditor>);
@@ -112,9 +113,22 @@ impl MessageEditor {
             channel_id: None,
             mentions: Vec::new(),
             mentions_task: None,
+            reply_to_message_id: None,
         }
     }
 
+    pub fn reply_to_message_id(&self) -> Option<u64> {
+        self.reply_to_message_id
+    }
+
+    pub fn set_reply_to_message_id(&mut self, reply_to_message_id: u64) {
+        self.reply_to_message_id = Some(reply_to_message_id);
+    }
+
+    pub fn clear_reply_to_message_id(&mut self) {
+        self.reply_to_message_id = None;
+    }
+
     pub fn set_channel(
         &mut self,
         channel_id: u64,
@@ -172,8 +186,13 @@ impl MessageEditor {
 
             editor.clear(cx);
             self.mentions.clear();
+            let reply_to_message_id = std::mem::take(&mut self.reply_to_message_id);
 
-            MessageParams { text, mentions }
+            MessageParams {
+                text,
+                mentions,
+                reply_to_message_id,
+            }
         })
     }
 
@@ -341,6 +360,7 @@ impl Render for MessageEditor {
             line_height: relative(1.3).into(),
             background_color: None,
             underline: None,
+            strikethrough: None,
             white_space: WhiteSpace::Normal,
         };
 
@@ -424,6 +444,7 @@ mod tests {
                 MessageParams {
                     text,
                     mentions: vec![(ranges[0].clone(), 101), (ranges[1].clone(), 102)],
+                    reply_to_message_id: None
                 }
             );
         });

crates/collab_ui/src/collab_panel.rs

@@ -162,6 +162,9 @@ enum ListEntry {
         depth: usize,
         has_children: bool,
     },
+    ChannelCall {
+        channel_id: ChannelId,
+    },
     ChannelNotes {
         channel_id: ChannelId,
     },
@@ -369,6 +372,7 @@ impl CollabPanel {
 
                 if query.is_empty() {
                     if let Some(channel_id) = room.channel_id() {
+                        self.entries.push(ListEntry::ChannelCall { channel_id });
                         self.entries.push(ListEntry::ChannelNotes { channel_id });
                         self.entries.push(ListEntry::ChannelChat { channel_id });
                     }
@@ -466,7 +470,7 @@ impl CollabPanel {
                                 && participant.video_tracks.is_empty(),
                         });
                     }
-                    if !participant.video_tracks.is_empty() {
+                    if room.in_call() && !participant.video_tracks.is_empty() {
                         self.entries.push(ListEntry::ParticipantScreen {
                             peer_id: Some(participant.peer_id),
                             is_last: true,
@@ -819,8 +823,6 @@ impl CollabPanel {
         cx: &mut ViewContext<Self>,
     ) -> ListItem {
         let user_id = user.id;
-        let is_current_user =
-            self.user_store.read(cx).current_user().map(|user| user.id) == Some(user_id);
         let tooltip = format!("Follow {}", user.github_login);
 
         let is_call_admin = ActiveCall::global(cx).read(cx).room().is_some_and(|room| {
@@ -833,12 +835,6 @@ impl CollabPanel {
             .selected(is_selected)
             .end_slot(if is_pending {
                 Label::new("Calling").color(Color::Muted).into_any_element()
-            } else if is_current_user {
-                IconButton::new("leave-call", IconName::Exit)
-                    .style(ButtonStyle::Subtle)
-                    .on_click(move |_, cx| Self::leave_call(cx))
-                    .tooltip(|cx| Tooltip::text("Leave Call", cx))
-                    .into_any_element()
             } else if role == proto::ChannelRole::Guest {
                 Label::new("Guest").color(Color::Muted).into_any_element()
             } else {
@@ -940,12 +936,88 @@ impl CollabPanel {
         }
     }
 
+    fn render_channel_call(
+        &self,
+        channel_id: ChannelId,
+        is_selected: bool,
+        cx: &mut ViewContext<Self>,
+    ) -> impl IntoElement {
+        let (is_in_call, call_participants) = ActiveCall::global(cx)
+            .read(cx)
+            .room()
+            .map(|room| (room.read(cx).in_call(), room.read(cx).call_participants(cx)))
+            .unwrap_or_default();
+
+        const FACEPILE_LIMIT: usize = 3;
+
+        let face_pile = if !call_participants.is_empty() {
+            let extra_count = call_participants.len().saturating_sub(FACEPILE_LIMIT);
+            let result = FacePile::new(
+                call_participants
+                    .iter()
+                    .map(|user| Avatar::new(user.avatar_uri.clone()).into_any_element())
+                    .take(FACEPILE_LIMIT)
+                    .chain(if extra_count > 0 {
+                        Some(
+                            div()
+                                .ml_2()
+                                .child(Label::new(format!("+{extra_count}")))
+                                .into_any_element(),
+                        )
+                    } else {
+                        None
+                    })
+                    .collect::<SmallVec<_>>(),
+            );
+
+            Some(result)
+        } else {
+            None
+        };
+
+        ListItem::new("channel-call")
+            .selected(is_selected)
+            .start_slot(
+                h_flex()
+                    .gap_1()
+                    .child(render_tree_branch(false, true, cx))
+                    .child(IconButton::new(0, IconName::AudioOn)),
+            )
+            .when(is_in_call, |el| {
+                el.end_slot(
+                    IconButton::new(1, IconName::Exit)
+                        .style(ButtonStyle::Filled)
+                        .shape(ui::IconButtonShape::Square)
+                        .tooltip(|cx| Tooltip::text("Leave call", cx))
+                        .on_click(cx.listener(|this, _, cx| this.leave_channel_call(cx))),
+                )
+            })
+            .when(!is_in_call, |el| {
+                el.tooltip(move |cx| Tooltip::text("Join audio call", cx))
+                    .on_click(cx.listener(move |this, _, cx| {
+                        this.join_channel_call(channel_id, cx);
+                    }))
+            })
+            .child(
+                div()
+                    .text_ui()
+                    .when(!call_participants.is_empty(), |el| {
+                        el.font_weight(FontWeight::SEMIBOLD)
+                    })
+                    .child("call"),
+            )
+            .children(face_pile)
+    }
+
     fn render_channel_notes(
         &self,
         channel_id: ChannelId,
         is_selected: bool,
         cx: &mut ViewContext<Self>,
     ) -> impl IntoElement {
+        let channel_store = self.channel_store.read(cx);
+        let has_notes_notification = channel_store.has_channel_buffer_changed(channel_id);
+
         ListItem::new("channel-notes")
             .selected(is_selected)
             .on_click(cx.listener(move |this, _, cx| {
@@ -957,7 +1029,14 @@ impl CollabPanel {
                     .child(render_tree_branch(false, true, cx))
                     .child(IconButton::new(0, IconName::File)),
             )
-            .child(div().h_7().w_full().child(Label::new("notes")))
+            .child(
+                div()
+                    .text_ui()
+                    .when(has_notes_notification, |el| {
+                        el.font_weight(FontWeight::SEMIBOLD)
+                    })
+                    .child("notes"),
+            )
             .tooltip(move |cx| Tooltip::text("Open Channel Notes", cx))
     }
 
@@ -967,6 +1046,8 @@ impl CollabPanel {
         is_selected: bool,
         cx: &mut ViewContext<Self>,
     ) -> impl IntoElement {
+        let channel_store = self.channel_store.read(cx);
+        let has_messages_notification = channel_store.has_new_messages(channel_id);
         ListItem::new("channel-chat")
             .selected(is_selected)
             .on_click(cx.listener(move |this, _, cx| {
@@ -978,7 +1059,14 @@ impl CollabPanel {
                     .child(render_tree_branch(false, false, cx))
                     .child(IconButton::new(0, IconName::MessageBubbles)),
             )
-            .child(Label::new("chat"))
+            .child(
+                div()
+                    .text_ui()
+                    .when(has_messages_notification, |el| {
+                        el.font_weight(FontWeight::SEMIBOLD)
+                    })
+                    .child("chat"),
+            )
             .tooltip(move |cx| Tooltip::text("Open Chat", cx))
     }
 
@@ -1236,12 +1324,14 @@ impl CollabPanel {
         cx: &mut ViewContext<Self>,
     ) {
         let this = cx.view().clone();
-        let in_room = ActiveCall::global(cx).read(cx).room().is_some();
+        let room = ActiveCall::global(cx).read(cx).room();
+        let in_room = room.is_some();
+        let in_call = room.is_some_and(|room| room.read(cx).in_call());
 
         let context_menu = ContextMenu::build(cx, |mut context_menu, _| {
             let user_id = contact.user.id;
 
-            if contact.online && !contact.busy {
+            if contact.online && !contact.busy && (!in_room || in_call) {
                 let label = if in_room {
                     format!("Invite {} to join", contact.user.github_login)
                 } else {
@@ -1389,7 +1479,7 @@ impl CollabPanel {
                         if is_active {
                             self.open_channel_notes(channel.id, cx)
                         } else {
-                            self.join_channel(channel.id, cx)
+                            self.open_channel(channel.id, cx)
                         }
                     }
                     ListEntry::ContactPlaceholder => self.toggle_contact_finder(cx),
@@ -1408,6 +1498,9 @@ impl CollabPanel {
                     ListEntry::ChannelInvite(channel) => {
                         self.respond_to_channel_invite(channel.id, true, cx)
                     }
+                    ListEntry::ChannelCall { channel_id } => {
+                        self.join_channel_call(*channel_id, cx)
+                    }
                     ListEntry::ChannelNotes { channel_id } => {
                         self.open_channel_notes(*channel_id, cx)
                     }
@@ -1678,7 +1771,7 @@ impl CollabPanel {
 
     fn open_channel_notes(&mut self, channel_id: ChannelId, cx: &mut ViewContext<Self>) {
         if let Some(workspace) = self.workspace.upgrade() {
-            ChannelView::open(channel_id, workspace, cx).detach();
+            ChannelView::open(channel_id, None, workspace, cx).detach();
         }
     }
 
@@ -1870,14 +1963,14 @@ impl CollabPanel {
             .detach_and_prompt_err("Call failed", cx, |_, _| None);
     }
 
-    fn join_channel(&self, channel_id: u64, cx: &mut ViewContext<Self>) {
+    fn open_channel(&self, channel_id: u64, cx: &mut ViewContext<Self>) {
         let Some(workspace) = self.workspace.upgrade() else {
             return;
         };
         let Some(handle) = cx.window_handle().downcast::<Workspace>() else {
             return;
         };
-        workspace::join_channel(
+        workspace::open_channel(
             channel_id,
             workspace.read(cx).app_state().clone(),
             Some(handle),
@@ -1886,6 +1979,23 @@ impl CollabPanel {
         .detach_and_prompt_err("Failed to join channel", cx, |_, _| None)
     }
 
+    fn join_channel_call(&mut self, _channel_id: ChannelId, cx: &mut ViewContext<Self>) {
+        let Some(room) = ActiveCall::global(cx).read(cx).room().cloned() else {
+            return;
+        };
+
+        room.update(cx, |room, cx| room.join_call(cx))
+            .detach_and_prompt_err("Failed to join call", cx, |_, _| None)
+    }
+
+    fn leave_channel_call(&mut self, cx: &mut ViewContext<Self>) {
+        let Some(room) = ActiveCall::global(cx).read(cx).room().cloned() else {
+            return;
+        };
+
+        room.update(cx, |room, cx| room.leave_call(cx));
+    }
+
     fn join_channel_chat(&mut self, channel_id: ChannelId, cx: &mut ViewContext<Self>) {
         let Some(workspace) = self.workspace.upgrade() else {
             return;
@@ -2011,6 +2121,9 @@ impl CollabPanel {
             ListEntry::ParticipantScreen { peer_id, is_last } => self
                 .render_participant_screen(*peer_id, *is_last, is_selected, cx)
                 .into_any_element(),
+            ListEntry::ChannelCall { channel_id } => self
+                .render_channel_call(*channel_id, is_selected, cx)
+                .into_any_element(),
             ListEntry::ChannelNotes { channel_id } => self
                 .render_channel_notes(*channel_id, is_selected, cx)
                 .into_any_element(),
@@ -2055,6 +2168,7 @@ impl CollabPanel {
             line_height: relative(1.3).into(),
             background_color: None,
             underline: None,
+            strikethrough: None,
             white_space: WhiteSpace::Normal,
         };
 
@@ -2075,7 +2189,6 @@ impl CollabPanel {
         is_collapsed: bool,
         cx: &ViewContext<Self>,
     ) -> impl IntoElement {
-        let mut channel_link = None;
         let mut channel_tooltip_text = None;
         let mut channel_icon = None;
 
@@ -2086,13 +2199,12 @@ impl CollabPanel {
 
                     let channel = self.channel_store.read(cx).channel_for_id(channel_id)?;
 
-                    channel_link = Some(channel.link());
                     (channel_icon, channel_tooltip_text) = match channel.visibility {
                         proto::ChannelVisibility::Public => {
-                            (Some("icons/public.svg"), Some("Copy public channel link."))
+                            (Some(IconName::Public), Some("Close Channel"))
                         }
                         proto::ChannelVisibility::Members => {
-                            (Some("icons/hash.svg"), Some("Copy private channel link."))
+                            (Some(IconName::Hash), Some("Close Channel"))
                         }
                     };
 
@@ -2114,17 +2226,10 @@ impl CollabPanel {
         };
 
         let button = match section {
-            Section::ActiveCall => channel_link.map(|channel_link| {
-                let channel_link_copy = channel_link.clone();
-                IconButton::new("channel-link", IconName::Copy)
-                    .icon_size(IconSize::Small)
-                    .size(ButtonSize::None)
-                    .visible_on_hover("section-header")
-                    .on_click(move |_, cx| {
-                        let item = ClipboardItem::new(channel_link_copy.clone());
-                        cx.write_to_clipboard(item)
-                    })
-                    .tooltip(|cx| Tooltip::text("Copy channel link", cx))
+            Section::ActiveCall => channel_icon.map(|_| {
+                IconButton::new("channel-link", IconName::Close)
+                    .on_click(move |_, cx| Self::leave_call(cx))
+                    .tooltip(|cx| Tooltip::text("Close channel", cx))
                     .into_any_element()
             }),
             Section::Contacts => Some(
@@ -2159,6 +2264,9 @@ impl CollabPanel {
                             this.toggle_section_expanded(section, cx);
                         }))
                 })
+                .when_some(channel_icon, |el, channel_icon| {
+                    el.start_slot(Icon::new(channel_icon).color(Color::Muted))
+                })
                 .inset(true)
                 .end_slot::<AnyElement>(button)
                 .selected(is_selected),
@@ -2464,11 +2572,9 @@ impl CollabPanel {
                         }),
                     )
                     .on_click(cx.listener(move |this, _, cx| {
-                        if is_active {
-                            this.open_channel_notes(channel_id, cx)
-                        } else {
-                            this.join_channel(channel_id, cx)
-                        }
+                        this.open_channel(channel_id, cx);
+                        this.open_channel_notes(channel_id, cx);
+                        this.join_channel_chat(channel_id, cx);
                     }))
                     .on_secondary_mouse_down(cx.listener(
                         move |this, event: &MouseDownEvent, cx| {
@@ -2485,61 +2591,24 @@ impl CollabPanel {
                         .color(Color::Muted),
                     )
                     .child(
-                        h_flex()
-                            .id(channel_id as usize)
-                            .child(Label::new(channel.name.clone()))
-                            .children(face_pile.map(|face_pile| face_pile.p_1())),
+                        h_flex().id(channel_id as usize).child(
+                            div()
+                                .text_ui()
+                                .when(has_messages_notification || has_notes_notification, |el| {
+                                    el.font_weight(FontWeight::SEMIBOLD)
+                                })
+                                .child(channel.name.clone()),
+                        ),
                     ),
             )
-            .child(
+            .children(face_pile.map(|face_pile| {
                 h_flex()
                     .absolute()
                     .right(rems(0.))
                     .z_index(1)
                     .h_full()
-                    .child(
-                        h_flex()
-                            .h_full()
-                            .gap_1()
-                            .px_1()
-                            .child(
-                                IconButton::new("channel_chat", IconName::MessageBubbles)
-                                    .style(ButtonStyle::Filled)
-                                    .shape(ui::IconButtonShape::Square)
-                                    .icon_size(IconSize::Small)
-                                    .icon_color(if has_messages_notification {
-                                        Color::Default
-                                    } else {
-                                        Color::Muted
-                                    })
-                                    .on_click(cx.listener(move |this, _, cx| {
-                                        this.join_channel_chat(channel_id, cx)
-                                    }))
-                                    .tooltip(|cx| Tooltip::text("Open channel chat", cx))
-                                    .when(!has_messages_notification, |this| {
-                                        this.visible_on_hover("")
-                                    }),
-                            )
-                            .child(
-                                IconButton::new("channel_notes", IconName::File)
-                                    .style(ButtonStyle::Filled)
-                                    .shape(ui::IconButtonShape::Square)
-                                    .icon_size(IconSize::Small)
-                                    .icon_color(if has_notes_notification {
-                                        Color::Default
-                                    } else {
-                                        Color::Muted
-                                    })
-                                    .on_click(cx.listener(move |this, _, cx| {
-                                        this.open_channel_notes(channel_id, cx)
-                                    }))
-                                    .tooltip(|cx| Tooltip::text("Open channel notes", cx))
-                                    .when(!has_notes_notification, |this| {
-                                        this.visible_on_hover("")
-                                    }),
-                            ),
-                    ),
-            )
+                    .child(face_pile.p_1())
+            }))
             .tooltip({
                 let channel_store = self.channel_store.clone();
                 move |cx| {
@@ -2743,6 +2812,14 @@ impl PartialEq for ListEntry {
                     return channel_1.id == channel_2.id;
                 }
             }
+            ListEntry::ChannelCall { channel_id } => {
+                if let ListEntry::ChannelCall {
+                    channel_id: other_id,
+                } = other
+                {
+                    return channel_id == other_id;
+                }
+            }
             ListEntry::ChannelNotes { channel_id } => {
                 if let ListEntry::ChannelNotes {
                     channel_id: other_id,
@@ -2841,7 +2918,7 @@ impl Render for JoinChannelTooltip {
                 .read(cx)
                 .channel_participants(self.channel_id);
 
-            div.child(Label::new("Join Channel"))
+            div.child(Label::new("Open Channel"))
                 .children(participants.iter().map(|participant| {
                     h_flex()
                         .gap_2()

crates/collab_ui/src/collab_titlebar_item.rs

@@ -102,6 +102,10 @@ impl Render for CollabTitlebarItem {
                                 room.remote_participants().values().collect::<Vec<_>>();
                             remote_participants.sort_by_key(|p| p.participant_index.0);
 
+                            if !room.in_call() {
+                                return this;
+                            }
+
                             let current_user_face_pile = self.render_collaborator(
                                 &current_user,
                                 peer_id,
@@ -133,6 +137,10 @@ impl Render for CollabTitlebarItem {
                                             == ParticipantLocation::SharedProject { project_id }
                                     });
 
+                                    if !collaborator.in_call {
+                                        return None;
+                                    }
+
                                     let face_pile = self.render_collaborator(
                                         &collaborator.user,
                                         collaborator.peer_id,
@@ -185,7 +193,7 @@ impl Render for CollabTitlebarItem {
                         let is_local = project.is_local();
                         let is_shared = is_local && project.is_shared();
                         let is_muted = room.is_muted();
-                        let is_deafened = room.is_deafened().unwrap_or(false);
+                        let is_connected_to_livekit = room.in_call();
                         let is_screen_sharing = room.is_screen_sharing();
                         let read_only = room.read_only();
 
@@ -220,22 +228,28 @@ impl Render for CollabTitlebarItem {
                                 )),
                             )
                         })
-                        .child(
-                            div()
-                                .child(
-                                    IconButton::new("leave-call", ui::IconName::Exit)
-                                        .style(ButtonStyle::Subtle)
-                                        .tooltip(|cx| Tooltip::text("Leave call", cx))
-                                        .icon_size(IconSize::Small)
-                                        .on_click(move |_, cx| {
-                                            ActiveCall::global(cx)
-                                                .update(cx, |call, cx| call.hang_up(cx))
-                                                .detach_and_log_err(cx);
-                                        }),
-                                )
-                                .pr_2(),
-                        )
-                        .when(!read_only, |this| {
+                        .when(is_connected_to_livekit, |el| {
+                            el.child(
+                                div()
+                                    .child(
+                                        IconButton::new("leave-call", ui::IconName::Exit)
+                                            .style(ButtonStyle::Subtle)
+                                            .tooltip(|cx| Tooltip::text("Leave call", cx))
+                                            .icon_size(IconSize::Small)
+                                            .on_click(move |_, cx| {
+                                                ActiveCall::global(cx).update(cx, |call, cx| {
+                                                    if let Some(room) = call.room() {
+                                                        room.update(cx, |room, cx| {
+                                                            room.leave_call(cx)
+                                                        })
+                                                    }
+                                                })
+                                            }),
+                                    )
+                                    .pl_2(),
+                            )
+                        })
+                        .when(!read_only && is_connected_to_livekit, |this| {
                             this.child(
                                 IconButton::new(
                                     "mute-microphone",
@@ -262,34 +276,7 @@ impl Render for CollabTitlebarItem {
                                 .on_click(move |_, cx| crate::toggle_mute(&Default::default(), cx)),
                             )
                         })
-                        .child(
-                            IconButton::new(
-                                "mute-sound",
-                                if is_deafened {
-                                    ui::IconName::AudioOff
-                                } else {
-                                    ui::IconName::AudioOn
-                                },
-                            )
-                            .style(ButtonStyle::Subtle)
-                            .selected_style(ButtonStyle::Tinted(TintColor::Negative))
-                            .icon_size(IconSize::Small)
-                            .selected(is_deafened)
-                            .tooltip(move |cx| {
-                                if !read_only {
-                                    Tooltip::with_meta(
-                                        "Deafen Audio",
-                                        None,
-                                        "Mic will be muted",
-                                        cx,
-                                    )
-                                } else {
-                                    Tooltip::text("Deafen Audio", cx)
-                                }
-                            })
-                            .on_click(move |_, cx| crate::toggle_deafen(&Default::default(), cx)),
-                        )
-                        .when(!read_only, |this| {
+                        .when(!read_only && is_connected_to_livekit, |this| {
                             this.child(
                                 IconButton::new("screen-share", ui::IconName::Screen)
                                     .style(ButtonStyle::Subtle)
@@ -562,14 +549,23 @@ impl CollabTitlebarItem {
     }
 
     fn window_activation_changed(&mut self, cx: &mut ViewContext<Self>) {
-        let project = if cx.is_window_active() {
-            Some(self.project.clone())
-        } else {
-            None
-        };
-        ActiveCall::global(cx)
-            .update(cx, |call, cx| call.set_location(project.as_ref(), cx))
-            .detach_and_log_err(cx);
+        if cx.is_window_active() {
+            ActiveCall::global(cx)
+                .update(cx, |call, cx| call.set_location(Some(&self.project), cx))
+                .detach_and_log_err(cx);
+            return;
+        }
+
+        if cx.active_window().is_none() {
+            ActiveCall::global(cx)
+                .update(cx, |call, cx| call.set_location(None, cx))
+                .detach_and_log_err(cx);
+        }
+        self.workspace
+            .update(cx, |workspace, cx| {
+                workspace.update_active_view_for_followers(cx);
+            })
+            .ok();
     }
 
     fn active_call_changed(&mut self, cx: &mut ViewContext<Self>) {

crates/collab_ui/src/collab_ui.rs

@@ -14,18 +14,15 @@ pub use collab_panel::CollabPanel;
 pub use collab_titlebar_item::CollabTitlebarItem;
 use gpui::{
     actions, point, AppContext, GlobalPixels, Pixels, PlatformDisplay, Size, Task, WindowBounds,
-    WindowKind, WindowOptions,
+    WindowContext, WindowKind, WindowOptions,
 };
 pub use panel_settings::{
     ChatPanelSettings, CollaborationPanelSettings, NotificationPanelSettings,
 };
 use settings::Settings;
-use workspace::AppState;
+use workspace::{notifications::DetachAndPromptErr, AppState};
 
-actions!(
-    collab,
-    [ToggleScreenSharing, ToggleMute, ToggleDeafen, LeaveCall]
-);
+actions!(collab, [ToggleScreenSharing, ToggleMute, LeaveCall]);
 
 pub fn init(app_state: &Arc<AppState>, cx: &mut AppContext) {
     CollaborationPanelSettings::register(cx);
@@ -41,7 +38,7 @@ pub fn init(app_state: &Arc<AppState>, cx: &mut AppContext) {
     notifications::init(&app_state, cx);
 }
 
-pub fn toggle_screen_sharing(_: &ToggleScreenSharing, cx: &mut AppContext) {
+pub fn toggle_screen_sharing(_: &ToggleScreenSharing, cx: &mut WindowContext) {
     let call = ActiveCall::global(cx).read(cx);
     if let Some(room) = call.room().cloned() {
         let client = call.client();
@@ -64,7 +61,7 @@ pub fn toggle_screen_sharing(_: &ToggleScreenSharing, cx: &mut AppContext) {
                 room.share_screen(cx)
             }
         });
-        toggle_screen_sharing.detach_and_log_err(cx);
+        toggle_screen_sharing.detach_and_prompt_err("Sharing Screen Failed", cx, |e, _| Some(format!("{:?}\n\nPlease check that you have given Zed permissions to record your screen in Settings.", e)));
     }
 }
 
@@ -85,12 +82,6 @@ pub fn toggle_mute(_: &ToggleMute, cx: &mut AppContext) {
     }
 }
 
-pub fn toggle_deafen(_: &ToggleDeafen, cx: &mut AppContext) {
-    if let Some(room) = ActiveCall::global(cx).read(cx).room().cloned() {
-        room.update(cx, |room, cx| room.toggle_deafen(cx));
-    }
-}
-
 fn notification_window_options(
     screen: Rc<dyn PlatformDisplay>,
     window_size: Size<Pixels>,

crates/color/Cargo.toml

@@ -16,4 +16,4 @@ doctest = true
 [dependencies]
 itertools = { version = "0.11.0", optional = true }
 palette = "0.7.3"
-story = { path = "../story", optional = true }
+story = { workspace = true, optional = true }

crates/command_palette/Cargo.toml

@@ -11,32 +11,32 @@ doctest = false
 
 [dependencies]
 anyhow.workspace = true
-client = { path = "../client" }
-collections = { path = "../collections" }
+client.workspace = true
+collections.workspace = true
 # HACK: We're only depending on `copilot` here for `CommandPaletteFilter`.  See the attached comment on that type.
-copilot = { path = "../copilot" }
-editor = { path = "../editor" }
-fuzzy = {  path = "../fuzzy" }
-gpui = { path = "../gpui" }
-picker = { path = "../picker" }
-project = { path = "../project" }
-release_channel = { path = "../release_channel" }
+copilot.workspace = true
+editor.workspace = true
+fuzzy.workspace = true
+gpui.workspace = true
+picker.workspace = true
+project.workspace = true
+release_channel.workspace = true
 serde.workspace = true
-settings = { path = "../settings" }
-theme = { path = "../theme" }
-ui = { path = "../ui" }
-util = { path = "../util" }
-workspace = { path = "../workspace" }
-zed_actions = { path = "../zed_actions" }
+settings.workspace = true
+theme.workspace = true
+ui.workspace = true
+util.workspace = true
+workspace.workspace = true
+zed_actions.workspace = true
 
 [dev-dependencies]
 ctor.workspace = true
-editor = { path = "../editor", features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
 env_logger.workspace = true
-go_to_line = { path = "../go_to_line" }
-gpui = { path = "../gpui", features = ["test-support"] }
-language = { path = "../language", features = ["test-support"] }
-menu = { path = "../menu" }
-project = { path = "../project", features = ["test-support"] }
+go_to_line.workspace = true
+gpui = { workspace = true, features = ["test-support"] }
+language = { workspace = true, features = ["test-support"] }
+menu.workspace = true
+project = { workspace = true, features = ["test-support"] }
 serde_json.workspace = true
-workspace = { path = "../workspace", features = ["test-support"] }
+workspace = { workspace = true, features = ["test-support"] }

crates/copilot/Cargo.toml

@@ -23,28 +23,28 @@ test-support = [
 anyhow.workspace = true
 async-compression.workspace = true
 async-tar = "0.4.2"
-collections = { path = "../collections" }
+collections.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui" }
-language = { path = "../language" }
+gpui.workspace = true
+language.workspace = true
 log.workspace = true
-lsp = { path = "../lsp" }
-node_runtime = { path = "../node_runtime" }
+lsp.workspace = true
+node_runtime.workspace = true
 parking_lot.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 smol.workspace = true
-theme = { path = "../theme" }
-util = { path = "../util" }
+theme.workspace = true
+util.workspace = true
 
 [dev-dependencies]
-clock = { path = "../clock" }
-collections = { path = "../collections", features = ["test-support"] }
-fs = { path = "../fs", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-language = { path = "../language", features = ["test-support"] }
-lsp = { path = "../lsp", features = ["test-support"] }
-rpc = { path = "../rpc", features = ["test-support"] }
-settings = { path = "../settings", features = ["test-support"] }
-util = { path = "../util", features = ["test-support"] }
+clock.workspace = true
+collections = { workspace = true, features = ["test-support"] }
+fs = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+language = { workspace = true, features = ["test-support"] }
+lsp = { workspace = true, features = ["test-support"] }
+rpc = { workspace = true, features = ["test-support"] }
+settings = { workspace = true, features = ["test-support"] }
+util = { workspace = true, features = ["test-support"] }

crates/copilot/src/copilot.rs

@@ -445,7 +445,7 @@ impl Copilot {
                     )
                     .detach();
 
-                let server = server.initialize(Default::default()).await?;
+                let server = cx.update(|cx| server.initialize(None, cx))?.await?;
 
                 let status = server
                     .request::<request::CheckStatus>(request::CheckStatusParams {
@@ -976,9 +976,10 @@ async fn get_copilot_lsp(http: Arc<dyn HttpClient>) -> anyhow::Result<PathBuf> {
 
     ///Check for the latest copilot language server and download it if we haven't already
     async fn fetch_latest(http: Arc<dyn HttpClient>) -> anyhow::Result<PathBuf> {
-        let release = latest_github_release("zed-industries/copilot", false, http.clone()).await?;
+        let release =
+            latest_github_release("zed-industries/copilot", true, false, http.clone()).await?;
 
-        let version_dir = &*paths::COPILOT_DIR.join(format!("copilot-{}", release.name));
+        let version_dir = &*paths::COPILOT_DIR.join(format!("copilot-{}", release.tag_name));
 
         fs::create_dir_all(version_dir).await?;
         let server_path = version_dir.join(SERVER_PATH);
@@ -997,7 +998,7 @@ async fn get_copilot_lsp(http: Arc<dyn HttpClient>) -> anyhow::Result<PathBuf> {
             let mut response = http
                 .get(url, Default::default(), true)
                 .await
-                .map_err(|err| anyhow!("error downloading copilot release: {}", err))?;
+                .context("error downloading copilot release")?;
             let decompressed_bytes = GzipDecoder::new(BufReader::new(response.body_mut()));
             let archive = Archive::new(decompressed_bytes);
             archive.unpack(dist_dir).await?;

crates/copilot_ui/Cargo.toml

@@ -11,19 +11,19 @@ doctest = false
 
 [dependencies]
 anyhow.workspace = true
-copilot = { path = "../copilot" }
-editor = { path = "../editor" }
-fs = { path = "../fs" }
+copilot.workspace = true
+editor.workspace = true
+fs.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui" }
-language = { path = "../language" }
-settings = { path = "../settings" }
+gpui.workspace = true
+language.workspace = true
+settings.workspace = true
 smol.workspace = true
-theme = { path = "../theme" }
-ui = { path = "../ui" }
-util = { path = "../util" }
-workspace = { path = "../workspace" }
-zed_actions = { path = "../zed_actions" }
+theme.workspace = true
+ui.workspace = true
+util.workspace = true
+workspace.workspace = true
+zed_actions.workspace = true
 
 [dev-dependencies]
-editor = { path = "../editor", features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }

crates/copilot_ui/src/sign_in.rs

@@ -144,6 +144,12 @@ impl CopilotCodeVerification {
                     .on_click(|_, cx| cx.open_url(COPILOT_SIGN_UP_URL)),
             )
     }
+
+    fn render_disabled_modal() -> impl Element {
+        v_flex()
+            .child(Headline::new("Copilot is disabled").size(HeadlineSize::Large))
+            .child(Label::new("You can enable Copilot in your settings."))
+    }
 }
 
 impl Render for CopilotCodeVerification {
@@ -160,6 +166,10 @@ impl Render for CopilotCodeVerification {
                 self.connect_clicked = false;
                 Self::render_enabled_modal(cx).into_any_element()
             }
+            Status::Disabled => {
+                self.connect_clicked = false;
+                Self::render_disabled_modal().into_any_element()
+            }
             _ => div().into_any_element(),
         };
 

crates/db/Cargo.toml

@@ -15,21 +15,21 @@ test-support = []
 [dependencies]
 anyhow.workspace = true
 async-trait.workspace = true
-collections = { path = "../collections" }
-gpui = { path = "../gpui" }
+collections.workspace = true
+gpui.workspace = true
 indoc.workspace = true
 lazy_static.workspace = true
 log.workspace = true
 parking_lot.workspace = true
-release_channel = { path = "../release_channel" }
+release_channel.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 smol.workspace = true
-sqlez = { path = "../sqlez" }
-sqlez_macros = { path = "../sqlez_macros" }
-util = { path = "../util" }
+sqlez.workspace = true
+sqlez_macros.workspace = true
+util.workspace = true
 
 [dev-dependencies]
 env_logger.workspace = true
-gpui = { path = "../gpui", features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
 tempfile.workspace = true

crates/diagnostics/Cargo.toml

@@ -11,32 +11,32 @@ doctest = false
 
 [dependencies]
 anyhow.workspace = true
-collections = { path = "../collections" }
-editor = { path = "../editor" }
+collections.workspace = true
+editor.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui" }
-language = { path = "../language" }
+gpui.workspace = true
+language.workspace = true
 log.workspace = true
-lsp = { path = "../lsp" }
+lsp.workspace = true
 postage.workspace = true
-project = { path = "../project" }
+project.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 smallvec.workspace = true
-theme = { path = "../theme" }
-ui = { path = "../ui" }
-util = { path = "../util" }
-workspace = { path = "../workspace" }
+theme.workspace = true
+ui.workspace = true
+util.workspace = true
+workspace.workspace = true
 
 [dev-dependencies]
-client = { path = "../client", features = ["test-support"] }
-editor = { path = "../editor", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-language = { path = "../language", features = ["test-support"] }
-lsp = { path = "../lsp", features = ["test-support"] }
+client = { workspace = true, features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+language = { workspace = true, features = ["test-support"] }
+lsp = { workspace = true, features = ["test-support"] }
 serde_json.workspace = true
-theme = { path = "../theme", features = ["test-support"] }
+theme = { workspace = true, features = ["test-support"] }
 unindent.workspace = true
-workspace = { path = "../workspace", features = ["test-support"] }
+workspace = { workspace = true, features = ["test-support"] }

crates/editor/Cargo.toml

@@ -20,72 +20,74 @@ test-support = [
     "util/test-support",
     "workspace/test-support",
     "tree-sitter-rust",
-    "tree-sitter-typescript"
+    "tree-sitter-typescript",
 ]
 
 [dependencies]
 aho-corasick = "1.1"
 anyhow.workspace = true
-client = { path = "../client" }
-clock = { path = "../clock" }
-collections = { path = "../collections" }
+client.workspace = true
+clock.workspace = true
+collections.workspace = true
 convert_case = "0.6.0"
-copilot = { path = "../copilot" }
-db = { path = "../db" }
+copilot.workspace = true
+db.workspace = true
 futures.workspace = true
-fuzzy = {  path = "../fuzzy" }
-git = { path = "../git" }
-gpui = { path = "../gpui" }
+fuzzy.workspace = true
+git.workspace = true
+gpui.workspace = true
 indoc = "1.0.4"
 itertools = "0.10"
-language = { path = "../language" }
+language.workspace = true
 lazy_static.workspace = true
+linkify = "0.10.0"
 log.workspace = true
-lsp = { path = "../lsp" }
-multi_buffer = { path = "../multi_buffer" }
+lsp.workspace = true
+multi_buffer.workspace = true
 ordered-float.workspace = true
 parking_lot.workspace = true
 postage.workspace = true
-project = { path = "../project" }
+project.workspace = true
 rand.workspace = true
-rich_text = { path = "../rich_text" }
-rpc = { path = "../rpc" }
+rich_text.workspace = true
+rpc.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 smallvec.workspace = true
 smol.workspace = true
-snippet = { path = "../snippet" }
-sqlez = { path = "../sqlez" }
-sum_tree = { path = "../sum_tree" }
-text = { path = "../text" }
-theme = { path = "../theme" }
+snippet.workspace = true
+sqlez.workspace = true
+sum_tree.workspace = true
+text.workspace = true
+theme.workspace = true
 tree-sitter-html = { workspace = true, optional = true }
 tree-sitter-rust = { workspace = true, optional = true }
 tree-sitter-typescript = { workspace = true, optional = true }
-ui = { path = "../ui" }
+ui.workspace = true
 url.workspace = true
-util = { path = "../util" }
-workspace = { path = "../workspace" }
+util.workspace = true
+workspace.workspace = true
 
 [dev-dependencies]
-copilot = { path = "../copilot", features = ["test-support"] }
+copilot = { workspace = true, features = ["test-support"] }
 ctor.workspace = true
 env_logger.workspace = true
-gpui = { path = "../gpui", features = ["test-support"] }
-language = { path = "../language", features = ["test-support"] }
-lsp = { path = "../lsp", features = ["test-support"] }
-multi_buffer = { path = "../multi_buffer", features = ["test-support"] }
-project = { path = "../project", features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+language = { workspace = true, features = ["test-support"] }
+lsp = { workspace = true, features = ["test-support"] }
+multi_buffer = { workspace = true, features = ["test-support"] }
+project = { workspace = true, features = ["test-support"] }
+release_channel.workspace = true
 rand.workspace = true
-settings = { path = "../settings", features = ["test-support"] }
-text = { path = "../text", features = ["test-support"] }
+settings = { workspace = true, features = ["test-support"] }
+text = { workspace = true, features = ["test-support"] }
 tree-sitter-html.workspace = true
 tree-sitter-rust.workspace = true
 tree-sitter-typescript.workspace = true
 tree-sitter.workspace = true
 unindent.workspace = true
-util = { path = "../util", features = ["test-support"] }
-workspace = { path = "../workspace", features = ["test-support"] }
+util = { workspace = true, features = ["test-support"] }
+workspace = { workspace = true, features = ["test-support"] }