WIP

.github/ISSUE_TEMPLATE/0_feature_request.yml

@@ -2,23 +2,23 @@ name: Feature Request
 description: "Tip: open this issue template from within Zed with the `request feature` command palette action"
 labels: ["admin read", "triage", "enhancement"]
 body:
-  - type: checkboxes
-    attributes:
-      label: Check for existing issues
-      description: Check the backlog of issues to reduce the chances of creating duplicates; if an issue already exists, place a `+1` (👍) on it.
-      options:
-        - label: Completed
+    - type: checkboxes
+      attributes:
+          label: Check for existing issues
+          description: Check the backlog of issues to reduce the chances of creating duplicates; if an issue already exists, place a `+1` (👍) on it.
+          options:
+              - label: Completed
+                required: true
+    - type: textarea
+      attributes:
+          label: Describe the feature
+          description: A clear and concise description of what you want to happen.
+      validations:
           required: true
-  - type: textarea
-    attributes:
-      label: Describe the feature
-      description: A clear and concise description of what you want to happen.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: |
-        If applicable, add mockups / screenshots to help present your vision of the feature
-      description: Drag images into the text input below
-    validations:
-      required: false
+    - type: textarea
+      attributes:
+          label: |
+              If applicable, add mockups / screenshots to help present your vision of the feature
+          description: Drag images into the text input below
+      validations:
+          required: false

.github/ISSUE_TEMPLATE/1_language_support.yml

@@ -2,46 +2,46 @@ name: Language Support
 description: Request language support
 title: "<name_of_language> support"
 labels:
-  [
-    "admin read",
-    "triage",
-    "enhancement",
-    "language",
-    "unsupported language",
-    "potential extension",
-  ]
+    [
+        "admin read",
+        "triage",
+        "enhancement",
+        "language",
+        "unsupported language",
+        "potential plugin",
+    ]
 body:
-  - type: checkboxes
-    attributes:
-      label: Check for existing issues
-      description: Check the backlog of issues to reduce the chances of creating duplicates; if an issue already exists, place a `+1` (👍) on it.
-      options:
-        - label: Completed
+    - type: checkboxes
+      attributes:
+          label: Check for existing issues
+          description: Check the backlog of issues to reduce the chances of creating duplicates; if an issue already exists, place a `+1` (👍) on it.
+          options:
+              - label: Completed
+                required: true
+    - type: input
+      attributes:
+          label: Language
+          description: What language do you want support for?
+          placeholder: HTML
+      validations:
           required: true
-  - type: input
-    attributes:
-      label: Language
-      description: What language do you want support for?
-      placeholder: HTML
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: Tree Sitter parser link
-      description: If applicable, provide a link to the appropriate tree sitter parser.  Look here first - https://tree-sitter.github.io/tree-sitter/#available-parsers
-      placeholder: https://github.com/tree-sitter/tree-sitter-html
-    validations:
-      required: false
-  - type: input
-    attributes:
-      label: Language server link
-      description: If applicable, provide a link to the appropriate language server.  Look here first - https://microsoft.github.io/language-server-protocol/implementors/servers/
-      placeholder: https://github.com/Microsoft/vscode/tree/main/extensions/html-language-features/server
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Misc notes
-      description: Provide any additional things the team should consider when adding support for this language
-    validations:
-      required: false
+    - type: input
+      attributes:
+          label: Tree Sitter parser link
+          description: If applicable, provide a link to the appropriate tree sitter parser.  Look here first - https://tree-sitter.github.io/tree-sitter/#available-parsers
+          placeholder: https://github.com/tree-sitter/tree-sitter-html
+      validations:
+          required: false
+    - type: input
+      attributes:
+          label: Language server link
+          description: If applicable, provide a link to the appropriate language server.  Look here first - https://microsoft.github.io/language-server-protocol/implementors/servers/
+          placeholder: https://github.com/Microsoft/vscode/tree/main/extensions/html-language-features/server
+      validations:
+          required: false
+    - type: textarea
+      attributes:
+          label: Misc notes
+          description: Provide any additional things the team should consider when adding support for this language
+      validations:
+          required: false

.github/ISSUE_TEMPLATE/2_bug_report.yml

@@ -2,37 +2,37 @@ name: Bug Report
 description: "Tip: open this issue template from within Zed with the `file bug report` command palette action"
 labels: ["admin read", "triage", "defect"]
 body:
-  - type: checkboxes
-    attributes:
-      label: Check for existing issues
-      description: Check the backlog of issues to reduce the chances of creating duplicates; if an issue already exists, place a `+1` (👍) on it.
-      options:
-        - label: Completed
+    - type: checkboxes
+      attributes:
+          label: Check for existing issues
+          description: Check the backlog of issues to reduce the chances of creating duplicates; if an issue already exists, place a `+1` (👍) on it.
+          options:
+              - label: Completed
+                required: true
+    - type: textarea
+      attributes:
+          label: Describe the bug / provide steps to reproduce it
+          description: A clear and concise description of what the bug is.
+      validations:
           required: true
-  - type: textarea
-    attributes:
-      label: Describe the bug / provide steps to reproduce it
-      description: A clear and concise description of what the bug is.
-    validations:
-      required: true
-  - type: textarea
-    id: environment
-    attributes:
-      label: Environment
-      description: Run the `copy system specs into clipboard` command palette action and paste the output in the field below.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: If applicable, add mockups / screenshots to help explain present your vision of the feature
-      description: Drag issues into the text input below
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: |
-        If applicable, attach your `~/Library/Logs/Zed/Zed.log` file to this issue.
-        If you only need the most recent lines, you can run the `zed: open log` command palette action to see the last 1000.
-      description: Drag Zed.log into the text input below
-    validations:
-      required: false
+    - type: textarea
+      id: environment
+      attributes:
+          label: Environment
+          description: Run the `copy system specs into clipboard` command palette action and paste the output in the field below.
+      validations:
+          required: true
+    - type: textarea
+      attributes:
+          label: If applicable, add mockups / screenshots to help explain present your vision of the feature
+          description: Drag issues into the text input below
+      validations:
+          required: false
+    - type: textarea
+      attributes:
+          label: |
+              If applicable, attach your `~/Library/Logs/Zed/Zed.log` file to this issue.
+              If you only need the most recent lines, you can run the `zed: open log` command palette action to see the last 1000.
+          description: Drag Zed.log into the text input below
+      validations:
+          required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -1,13 +1,10 @@
 contact_links:
-  - name: Theme Request
-    url: https://github.com/zed-industries/extensions/issues/new/choose
-    about: Request a theme in the extensions repository
-  - name: Top-Ranking Issues
-    url: https://github.com/zed-industries/zed/issues/5393
-    about: See an overview of the most popular Zed issues
-  - name: Platform Support
-    url: https://github.com/zed-industries/zed/issues/5391
-    about: A quick note on platform support
-  - name: Positive Feedback
-    url: https://github.com/zed-industries/zed/discussions/5397
-    about: A central location for kind words about Zed
+    - name: Top-Ranking Issues
+      url: https://github.com/zed-industries/zed/issues/5393
+      about: See an overview of the most popular Zed issues
+    - name: Platform Support
+      url: https://github.com/zed-industries/zed/issues/5391
+      about: A quick note on platform support
+    - name: Positive Feedback
+      url: https://github.com/zed-industries/zed/discussions/5397
+      about: A central location for kind words about Zed

.github/actions/check_style/action.yml

@@ -8,8 +8,23 @@ runs:
       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/"

.github/actions/run_tests/action.yml

@@ -2,22 +2,22 @@ name: "Run tests"
 description: "Runs the tests"
 
 runs:
-  using: "composite"
-  steps:
-    - name: Install Rust
-      shell: bash -euxo pipefail {0}
-      run: |
-        cargo install cargo-nextest
+    using: "composite"
+    steps:
+        - name: Install Rust
+          shell: bash -euxo pipefail {0}
+          run: |
+              cargo install cargo-nextest
 
-    - name: Install Node
-      uses: actions/setup-node@v4
-      with:
-        node-version: "18"
+        - name: Install Node
+          uses: actions/setup-node@v3
+          with:
+              node-version: "18"
 
-    - name: Limit target directory size
-      shell: bash -euxo pipefail {0}
-      run: script/clear-target-dir-if-larger-than 100
+        - name: Limit target directory size
+          shell: bash -euxo pipefail {0}
+          run: script/clear-target-dir-if-larger-than 100
 
-    - name: Run tests
-      shell: bash -euxo pipefail {0}
-      run: cargo nextest run --workspace --no-fail-fast
+        - name: Run tests
+          shell: bash -euxo pipefail {0}
+          run: cargo nextest run --workspace --no-fail-fast

.github/pull_request_template.md

@@ -2,10 +2,4 @@
 
 Release Notes:
 
-- Added/Fixed/Improved ... ([#<public_issue_number_if_exists>](https://github.com/zed-industries/zed/issues/<public_issue_number_if_exists>)).
-
-**or**
-
-- N/A
-
-Optionally, include screenshots / media showcasing your addition that can be included in the release notes.
+- (Added|Fixed|Improved) ... ([#<public_issue_number_if_exists>](https://github.com/zed-industries/zed/issues/<public_issue_number_if_exists>)).

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ env:
 
 jobs:
   style:
-    name: Check formatting and spelling
+    name: Check formatting, Clippy lints, and spelling
     runs-on:
       - self-hosted
       - test
@@ -35,9 +35,6 @@ jobs:
           submodules: "recursive"
           fetch-depth: 0
 
-      - name: Remove untracked files
-        run: git clean -df
-
       - name: Set up default .cargo/config.toml
         run: cp ./.cargo/ci-config.toml ~/.cargo/config.toml
 
@@ -51,28 +48,8 @@ jobs:
       - name: Run style checks
         uses: ./.github/actions/check_style
 
-      - 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
-
-      - uses: bufbuild/buf-setup-action@v1
-        with:
-          version: v1.29.0
-      - 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/"
-
-  macos_tests:
-    name: (macOS) Run Clippy and tests
+  tests:
+    name: Run tests
     runs-on:
       - self-hosted
       - test
@@ -83,99 +60,31 @@ jobs:
           clean: false
           submodules: "recursive"
 
-      - name: cargo clippy
-        shell: bash -euxo pipefail {0}
-        run: script/clippy
-
       - name: Run tests
         uses: ./.github/actions/run_tests
 
       - name: Build collab
         run: cargo build -p collab
 
-      - name: Build other binaries and features
-        run: cargo build --workspace --bins --all-features; cargo check -p gpui --features "macos-blade"
-
-  # 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"
-
-      - 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') }}
-
-      - name: configure linux
-        shell: bash -euxo pipefail {0}
-        run: script/linux
-
-      - name: cargo clippy
-        shell: bash -euxo pipefail {0}
-        run: script/clippy
-
-      - name: Build Zed
-        run: cargo build -p zed
-
-  # todo!(windows): Actually run the tests
-  windows_tests:
-    name: (Windows) Run Clippy and tests
-    runs-on: windows-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-        with:
-          clean: false
-          submodules: "recursive"
-
-      - 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') }}
-      # todo!(windows): Actually run clippy
-      #- name: cargo clippy
-      #  shell: bash -euxo pipefail {0}
-      #  run: script/clippy
-
-      - name: Build Zed
-        run: cargo build -p zed
+      - name: Build other binaries
+        run: cargo build --workspace --bins --all-features
 
   bundle:
-    name: Bundle macOS app
+    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]
+    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 }}
       ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-      DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
-      DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
     steps:
       - name: Install Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
         with:
           node-version: "18"
 

.github/workflows/danger.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: pnpm/action-setup@v3
+      - uses: pnpm/action-setup@v2.2.4
         with:
           version: 8
 

.github/workflows/deploy_collab.yml

@@ -27,10 +27,6 @@ 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
     runs-on:
@@ -45,18 +41,8 @@ jobs:
           submodules: "recursive"
           fetch-depth: 0
 
-      - name: Install cargo nextest
-        shell: bash -euxo pipefail {0}
-        run: |
-          cargo install cargo-nextest
-
-      - name: Limit target directory size
-        shell: bash -euxo pipefail {0}
-        run: script/clear-target-dir-if-larger-than 100
-
       - name: Run tests
-        shell: bash -euxo pipefail {0}
-        run: cargo nextest run --package collab --no-fail-fast
+        uses: ./.github/actions/run_tests
 
   publish:
     name: Publish collab server image
@@ -73,6 +59,9 @@ jobs:
       - 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:
@@ -85,9 +74,6 @@ jobs:
       - name: Publish docker image
         run: docker push registry.digitalocean.com/zed/collab:${GITHUB_SHA}
 
-      - name: Prune Docker system
-        run: docker system prune  --filter 'until=72h' -f
-
   deploy:
     name: Deploy new server image
     needs:
@@ -100,26 +86,22 @@ jobs:
       - name: Sign into Kubernetes
         run: doctl kubernetes cluster kubeconfig save --expiry-seconds 600 ${{ secrets.CLUSTER_NAME }}
 
-      - name: Start rollout
+      - name: Determine namespace
         run: |
           set -eu
           if [[ $GITHUB_REF_NAME = "collab-production" ]]; then
-            export ZED_KUBE_NAMESPACE=production
+            echo "Deploying collab:$GITHUB_SHA to production"
+            echo "KUBE_NAMESPACE=production" >> $GITHUB_ENV
           elif [[ $GITHUB_REF_NAME = "collab-staging" ]]; then
-            export ZED_KUBE_NAMESPACE=staging
+            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
 
-          echo "Deploying collab:$GITHUB_SHA to $ZED_KUBE_NAMESPACE"
+      - name: Start rollout
+        run: kubectl -n "$KUBE_NAMESPACE" set image deployment/collab collab=registry.digitalocean.com/zed/collab:${GITHUB_SHA}
 
-          source script/lib/deploy-helpers.sh
-          export_vars_for_environment $ZED_KUBE_NAMESPACE
-
-          export ZED_DO_CERTIFICATE_ID=$(doctl compute certificate list --format ID --no-header)
-          export ZED_IMAGE_ID="registry.digitalocean.com/zed/collab:${GITHUB_SHA}"
-
-          envsubst < crates/collab/k8s/collab.template.yml | kubectl apply -f -
-          kubectl -n "$ZED_KUBE_NAMESPACE" rollout status deployment/collab --watch
-          echo "deployed collab.template.yml to ${ZED_KUBE_NAMESPACE}"
+      - name: Wait for rollout to finish
+        run: kubectl -n "$KUBE_NAMESPACE" rollout status deployment/collab

.github/workflows/randomized_tests.yml

@@ -23,7 +23,7 @@ jobs:
       - randomized-tests
     steps:
       - name: Install Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
         with:
           node-version: "18"
 

.github/workflows/release_nightly.yml

@@ -1,98 +1,91 @@
 name: Release Nightly
 
 on:
-  schedule:
-    # Fire every day at 7:00am UTC (Roughly before EU workday and after US workday)
-    - cron: "0 7 * * *"
-  push:
-    tags:
-      - "nightly"
+    schedule:
+        # Fire every day at 7:00am UTC (Roughly before EU workday and after US workday)
+        - cron: "0 7 * * *"
+    push:
+        tags:
+            - "nightly"
 
 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 and Clippy lints
-    if: github.repository_owner == 'zed-industries'
-    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 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 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
-    needs: style
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-        with:
-          clean: false
-          submodules: "recursive"
+    tests:
+        name: Run tests
+        runs-on:
+            - self-hosted
+            - test
+        needs: style
+        steps:
+            - name: Checkout repo
+              uses: actions/checkout@v4
+              with:
+                  clean: false
+                  submodules: "recursive"
 
-      - name: Run tests
-        uses: ./.github/actions/run_tests
+            - name: Run tests
+              uses: ./.github/actions/run_tests
 
-  bundle:
-    name: Bundle app
-    if: github.repository_owner == 'zed-industries'
-    runs-on:
-      - self-hosted
-      - bundle
-    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 }}
-      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@v4
-        with:
-          node-version: "18"
+    bundle:
+        name: Bundle app
+        runs-on:
+            - self-hosted
+            - bundle
+        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 }}
+            DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
+            DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
+        steps:
+            - name: Install Node
+              uses: actions/setup-node@v3
+              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: Limit target directory size
-        run: script/clear-target-dir-if-larger-than 100
+            - name: Limit target directory size
+              run: script/clear-target-dir-if-larger-than 100
 
-      - name: Set release channel to nightly
-        run: |
-          set -eu
-          version=$(git rev-parse --short HEAD)
-          echo "Publishing version: ${version} on release channel nightly"
-          echo "nightly" > crates/zed/RELEASE_CHANNEL
+            - name: Set release channel to nightly
+              run: |
+                  set -eu
+                  version=$(git rev-parse --short HEAD)
+                  echo "Publishing version: ${version} on release channel nightly"
+                  echo "nightly" > crates/zed/RELEASE_CHANNEL
 
-      - name: Generate license file
-        run: script/generate-licenses
+            - name: Generate license file
+              run: script/generate-licenses
 
-      - name: Create app bundle
-        run: script/bundle
+            - name: Create app bundle
+              run: script/bundle
 
-      - name: Upload Zed Nightly
-        run: script/upload-nightly
+            - name: Upload Zed Nightly
+              run: script/upload-nightly

.github/workflows/update_all_top_ranking_issues.yml

@@ -1,18 +1,17 @@
 on:
-  schedule:
-    - cron: "0 */12 * * *"
-  workflow_dispatch:
+    schedule:
+        - cron: "0 */12 * * *"
+    workflow_dispatch:
 
 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
-        with:
-          python-version: "3.10.5"
-          architecture: "x64"
-          cache: "pip"
-      - run: pip install -r script/update_top_ranking_issues/requirements.txt
-      - run: python script/update_top_ranking_issues/main.py 5393 --github-token ${{ secrets.GITHUB_TOKEN }} --prod
+    update_top_ranking_issues:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+            - uses: actions/setup-python@v4
+              with:
+                  python-version: "3.10.5"
+                  architecture: "x64"
+                  cache: "pip"
+            - run: pip install -r script/update_top_ranking_issues/requirements.txt
+            - run: python script/update_top_ranking_issues/main.py 5393 --github-token ${{ secrets.GITHUB_TOKEN }} --prod

.github/workflows/update_weekly_top_ranking_issues.yml

@@ -1,18 +1,17 @@
 on:
-  schedule:
-    - cron: "0 15 * * *"
-  workflow_dispatch:
+    schedule:
+        - cron: "0 15 * * *"
+    workflow_dispatch:
 
 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
-        with:
-          python-version: "3.10.5"
-          architecture: "x64"
-          cache: "pip"
-      - run: pip install -r script/update_top_ranking_issues/requirements.txt
-      - run: python script/update_top_ranking_issues/main.py 6952 --github-token ${{ secrets.GITHUB_TOKEN }} --prod --query-day-interval 7
+    update_top_ranking_issues:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+            - uses: actions/setup-python@v4
+              with:
+                  python-version: "3.10.5"
+                  architecture: "x64"
+                  cache: "pip"
+            - run: pip install -r script/update_top_ranking_issues/requirements.txt
+            - run: python script/update_top_ranking_issues/main.py 6952 --github-token ${{ secrets.GITHUB_TOKEN }} --prod --query-day-interval 7

.gitignore

@@ -5,8 +5,12 @@
 .DS_Store
 /plugins/bin
 /script/node_modules
+/styles/node_modules
+/styles/src/types/zed.ts
 /crates/theme/schemas/theme.json
+/crates/collab/static/styles.css
 /crates/collab/.admins.json
+/vendor/bin
 /assets/*licenses.md
 **/venv
 .build
@@ -21,4 +25,3 @@ DerivedData/
 **/*.db
 .pytest_cache
 .venv
-.blob_store

.mailmap

@@ -11,12 +11,8 @@
 
 Antonio Scandurra <me@as-cii.com>
 Antonio Scandurra <me@as-cii.com> <antonio@zed.dev>
-Christian Bergschneider <christian.bergschneider@gmx.de>
-Christian Bergschneider <christian.bergschneider@gmx.de> <magiclake@gmx.de>
 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>
@@ -43,8 +39,6 @@ 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>

.zed/settings.json

@@ -1,16 +1,6 @@
 {
-  "languages": {
-    "Markdown": {
-      "tab_size": 2,
-      "formatter": "prettier"
-    },
-    "TOML": {
-      "formatter": "prettier",
-      "format_on_save": "off"
-    },
-    "YAML": {
-      "formatter": "prettier"
-    }
+  "JSON": {
+    "tab_size": 4
   },
   "formatter": "auto"
 }

Cargo.toml

@@ -21,8 +21,6 @@ members = [
     "crates/db",
     "crates/diagnostics",
     "crates/editor",
-    "crates/extension",
-    "crates/extensions_ui",
     "crates/feature_flags",
     "crates/feedback",
     "crates/file_finder",
@@ -32,9 +30,12 @@ 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",
@@ -63,8 +64,6 @@ members = [
     "crates/rich_text",
     "crates/rope",
     "crates/rpc",
-    "crates/task",
-    "crates/tasks_ui",
     "crates/search",
     "crates/semantic_index",
     "crates/settings",
@@ -93,117 +92,23 @@ 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" }
-extensions_ui = { path = "crates/extensions_ui" }
-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" }
-task = { path = "crates/task" }
-tasks_ui = { path = "crates/tasks_ui" }
-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-tar = "0.4.2"
 async-trait = "0.1"
-blade-graphics = { git = "https://github.com/kvark/blade", rev = "e9d93a4d41f3946a03ffb76136290d6ccf7f2b80" }
-blade-macros = { git = "https://github.com/kvark/blade", rev = "e9d93a4d41f3946a03ffb76136290d6ccf7f2b80" }
-blade-rwh = { package = "raw-window-handle", version = "0.5" }
 chrono = { version = "0.4", features = ["serde"] }
 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"] }
 lazy_static = "1.4.0"
-linkify = "0.10.0"
 log = { version = "0.4.16", features = ["kv_unstable_serde"] }
 ordered-float = "2.1.1"
 parking_lot = "0.11.1"
-profiling = "1"
 postage = { version = "0.5", features = ["futures-traits"] }
 pretty_assertions = "1.3.0"
 prost = "0.8"
@@ -214,7 +119,6 @@ regex = "1.5"
 rusqlite = { version = "0.29.0", features = ["blob", "array", "modern_sqlite"] }
 rust-embed = { version = "8.0", features = ["include-exclude"] }
 schemars = "0.8"
-semver = "1.0"
 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"] }
@@ -227,18 +131,14 @@ sysinfo = "0.29.10"
 tempfile = "3.9.0"
 thiserror = "1.0.29"
 tiktoken-rs = "0.5.7"
-time = { version = "0.3", features = ["serde", "serde-well-known", "formatting"] }
-toml = "0.8"
+time = { version = "0.3", features = ["serde", "serde-well-known"] }
+toml = "0.5"
 tree-sitter = { version = "0.20", features = ["wasm"] }
-tree-sitter-astro = { git = "https://github.com/virchau13/tree-sitter-astro.git", rev = "e924787e12e8a03194f36a113290ac11d6dc10f3" }
 tree-sitter-bash = { git = "https://github.com/tree-sitter/tree-sitter-bash", rev = "7331995b19b8f8aba2d5e26deb51d2195c18bc94" }
 tree-sitter-c = "0.20.1"
-tree-sitter-clojure = { git = "https://github.com/prcastro/tree-sitter-clojure", branch = "update-ts" }
 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-dockerfile = { git = "https://github.com/camdencheek/tree-sitter-dockerfile", rev = "33e22c33bcdbfc33d42806ee84cfd0b1248cc392" }
-tree-sitter-dart = { git = "https://github.com/agent3bood/tree-sitter-dart", rev = "48934e3bf757a9b78f17bdfaa3e2b4284656fdc7" }
 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"
@@ -249,29 +149,26 @@ tree-sitter-glsl = { git = "https://github.com/theHamsta/tree-sitter-glsl", rev
 tree-sitter-go = { git = "https://github.com/tree-sitter/tree-sitter-go", rev = "aeb2f33b366fd78d5789ff104956ce23508b85db" }
 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 = "8a99848fc734f9c4ea523b3f2a07df133cbbcec2" }
-tree-sitter-hcl = { git = "https://github.com/MichaHoffmann/tree-sitter-hcl", rev = "v1.1.0" }
+tree-sitter-haskell = { git = "https://github.com/tree-sitter/tree-sitter-haskell", rev = "cf98de23e4285b8e6bcb57b050ef2326e2cc284b" }
 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" }
 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 = "7dd29f9616822e5fc259f5b4ae6c4ded9a71a132" }
-tree-sitter-ocaml = { git = "https://github.com/tree-sitter/tree-sitter-ocaml", rev = "4abfdc1c7af2c6c77a370aee974627be1c285b3b" }
+tree-sitter-nu = { git = "https://github.com/nushell/tree-sitter-nu", rev = "26bbaecda0039df4067861ab38ea8ea169f7f5aa" }
 tree-sitter-php = "0.21.1"
-tree-sitter-prisma-io = { git = "https://github.com/victorhqc/tree-sitter-prisma" }
-tree-sitter-proto = { git = "https://github.com/rewinfrey/tree-sitter-proto", rev = "36d54f288aee112f13a67b550ad32634d0c2cb52" }
-tree-sitter-purescript = { git = "https://github.com/postsolar/tree-sitter-purescript", rev = "v0.1.0" }
+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" }
 tree-sitter-ruby = "0.20.0"
 tree-sitter-rust = "0.20.3"
 tree-sitter-scheme = { git = "https://github.com/6cdh/tree-sitter-scheme", rev = "af0fd1fa452cb2562dc7b5c8a8c55551c39273b9" }
-tree-sitter-svelte = { git = "https://github.com/Himujjal/tree-sitter-svelte", rev = "bd60db7d3d06f89b6ec3b287c9a6e9190b5564bd" }
+tree-sitter-svelte = { git = "https://github.com/Himujjal/tree-sitter-svelte", rev = "697bb515471871e85ff799ea57a76298a71a9cca" }
 tree-sitter-toml = { git = "https://github.com/tree-sitter/tree-sitter-toml", rev = "342d9be207c2dba869b9967124c679b5e6fd0ebe" }
 tree-sitter-typescript = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "5d20856f34315b068c41edaee2ac8a100081d259" }
-tree-sitter-uiua = { git = "https://github.com/shnarazk/tree-sitter-uiua", rev = "21dc2db39494585bf29a3f86d5add6e9d11a22ba" }
+tree-sitter-uiua = { git = "https://github.com/shnarazk/tree-sitter-uiua", rev = "9260f11be5900beda4ee6d1a24ab8ddfaf5a19b2" }
 tree-sitter-vue = { git = "https://github.com/zed-industries/tree-sitter-vue", rev = "6608d9d60c386f19d80af7d8132322fa11199c42" }
 tree-sitter-yaml = { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "f545a41f57502e1b5ddf2a6668896c1b0620f930" }
 tree-sitter-zig = { git = "https://github.com/maxxnino/tree-sitter-zig", rev = "0d08703e4c3f426ec61695d7617415fff97029bd" }
@@ -279,24 +176,15 @@ unindent = "0.1.7"
 url = "2.2"
 uuid = { version = "1.1.2", features = ["v4"] }
 wasmtime = "16"
-which = "6.0.0"
-sys-locale = "0.3.1"
 
 [patch.crates-io]
 tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "1d8975319c2d5de1bf710e7e21db25b0eee4bc66" }
 wasmtime = { git = "https://github.com/bytecodealliance/wasmtime", rev = "v16.0.0" }
-# Workaround for a broken nightly build of gpui: See #7644 and revisit once 0.5.3 is released.
-pathfinder_simd = { git = "https://github.com/servo/pathfinder.git", rev = "e4fcda0d5259d0acf902aee6de7d2501f2bd6629" }
 
 [profile.dev]
 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,6 +1,6 @@
 # syntax = docker/dockerfile:1.2
 
-FROM rust:1.76-bullseye as builder
+FROM rust:1.75-bullseye as builder
 WORKDIR app
 COPY . .
 
@@ -11,7 +11,6 @@ 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=/usr/local/cargo/git \
     --mount=type=cache,target=./target \
     cargo build --release --package collab --bin collab
 

Procfile

@@ -1,3 +1,2 @@
-collab: RUST_LOG=${RUST_LOG:-warn,collab=info} cargo run --package=collab serve
+collab: cd crates/collab && RUST_LOG=${RUST_LOG:-warn,collab=info} cargo run serve
 livekit: livekit-server --dev
-blob_store: MINIO_ROOT_USER=the-blob-store-access-key MINIO_ROOT_PASSWORD=the-blob-store-secret-key minio server .blob_store

README.md

@@ -21,8 +21,7 @@ brew install zed
 
 ## Developing Zed
 
-- [Building Zed for macOS](./docs/src/developing_zed__building_zed_macos.md)
-- [Building Zed for Linux](./docs/src/developing_zed__building_zed_linux.md)
+- [Building Zed](./docs/src/developing_zed__building_zed.md)
 - [Running Collaboration Locally](./docs/src/developing_zed__local_collaboration.md)
 
 ## Contributing

assets/icons/file_icons/astro.svg

@@ -1,4 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.32668 11.5331C4.78215 10.9852 4.62318 9.834 4.85006 9C5.24343 9.52582 5.78848 9.69239 6.35304 9.78642C7.2246 9.93151 8.08055 9.87724 8.89019 9.43877C8.98281 9.38857 9.06841 9.32182 9.16962 9.25421C9.24559 9.49681 9.26536 9.74172 9.23882 9.99099C9.1743 10.5981 8.89982 11.067 8.46326 11.4225C8.28869 11.5647 8.10397 11.6918 7.92367 11.8259C7.36978 12.2379 7.21992 12.7211 7.42805 13.4239C7.433 13.4411 7.43742 13.4582 7.44861 13.5C7.1658 13.3606 6.95923 13.1578 6.80182 12.8911C6.63558 12.6097 6.55649 12.2983 6.55233 11.9614C6.55025 11.7974 6.55025 11.632 6.53022 11.4704C6.4813 11.0763 6.31323 10.8999 5.99661 10.8897C5.67166 10.8793 5.41462 11.1004 5.34646 11.4486C5.34125 11.4753 5.33371 11.5017 5.32616 11.5328L5.32668 11.5331Z" fill="#17191E" fill-opacity="0.6"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M5.30826 8.62679L6.73279 4.5906C6.82176 4.33854 7.17823 4.33854 7.26719 4.5906L8.69173 8.62679C8.69652 8.64035 8.70626 8.65153 8.7189 8.65814C8.80645 8.6531 8.89466 8.65055 8.98347 8.65055C10.1418 8.65055 11.1986 9.08493 12 9.79967L8.83801 1.36772C8.75507 1.14653 8.54362 1 8.30739 1H5.6926C5.45637 1 5.24492 1.14653 5.16198 1.36772L1.99999 9.79968C2.80137 9.08493 3.85822 8.65055 5.01652 8.65055C5.10533 8.65055 5.19355 8.6531 5.28109 8.65814C5.29373 8.65153 5.30347 8.64035 5.30826 8.62679Z" fill="black"/>
-</svg>

assets/icons/file_icons/elm.svg

@@ -1,9 +0,0 @@
-<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/file_types.json

@@ -1,11 +1,9 @@
 {
     "suffixes": {
-        "astro": "astro",
         "Emakefile": "erlang",
         "aac": "audio",
         "accdb": "storage",
         "app.src": "erlang",
-        "avi": "video",
         "avif": "image",
         "bak": "backup",
         "bash": "terminal",
@@ -16,12 +14,10 @@
         "bmp": "image",
         "c": "code",
         "cc": "code",
-        "cjs": "code",
         "conf": "settings",
         "cpp": "code",
         "css": "css",
         "csv": "storage",
-        "cts": "typescript",
         "dat": "storage",
         "db": "storage",
         "dbf": "storage",
@@ -29,7 +25,6 @@
         "doc": "document",
         "docx": "document",
         "eex": "elixir",
-        "elm": "elm",
         "erl": "erlang",
         "escript": "erlang",
         "eslintrc": "eslint",
@@ -54,7 +49,6 @@
         "hbs": "template",
         "heex": "elixir",
         "heif": "image",
-        "heic": "image",
         "hrl": "erlang",
         "hs": "haskell",
         "htm": "template",
@@ -62,42 +56,27 @@
         "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",
-        "lua": "lua",
-        "m4a": "audio",
-        "m4v": "video",
         "md": "document",
         "mdb": "storage",
         "mdf": "storage",
         "mdx": "document",
-        "mkv": "video",
-        "mjs": "code",
-        "mka": "audio",
-        "ml": "ocaml",
-        "mli": "ocaml",
-        "mov": "video",
         "mp3": "audio",
         "mp4": "video",
-        "mts": "typescript",
         "myd": "storage",
         "myi": "storage",
         "odp": "document",
         "ods": "document",
         "odt": "document",
-        "ogg": "audio",
-        "opus": "audio",
+        "ogg": "video",
         "pdb": "storage",
         "pdf": "document",
         "php": "php",
@@ -106,12 +85,10 @@
         "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",
@@ -135,15 +112,12 @@
         "wav": "audio",
         "webm": "video",
         "webp": "image",
-        "wma": "audio",
-        "wmv": "video",
-        "wv": "audio",
         "xls": "document",
         "xlsx": "document",
         "xml": "template",
         "xrl": "erlang",
-        "yaml": "settings",
-        "yml": "settings",
+        "yaml": "yaml",
+        "yml": "yaml",
         "yrl": "erlang",
         "zlogin": "terminal",
         "zsh": "terminal",
@@ -154,9 +128,6 @@
         "zshrc": "terminal"
     },
     "types": {
-        "astro": {
-            "icon": "icons/file_icons/astro.svg"
-        },
         "audio": {
             "icon": "icons/file_icons/audio.svg"
         },
@@ -181,9 +152,6 @@
         "elixir": {
             "icon": "icons/file_icons/elixir.svg"
         },
-        "elm": {
-            "icon": "icons/file_icons/elm.svg"
-        },
         "erlang": {
             "icon": "icons/file_icons/erlang.svg"
         },
@@ -211,24 +179,18 @@
         "log": {
             "icon": "icons/file_icons/info.svg"
         },
-        "lua": {
-            "icon": "icons/file_icons/lua.svg"
-        },
-        "ocaml": {
-            "icon": "icons/file_icons/ocaml.svg"
-        },
         "phoenix": {
             "icon": "icons/file_icons/phoenix.svg"
         },
         "php": {
             "icon": "icons/file_icons/php.svg"
         },
+        "yaml": {
+            "icon": "icons/file_icons/yaml.svg"
+        },
         "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/lua.svg

@@ -1,10 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_34_7)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.2625 7.00157C12.2625 4.09565 9.90677 1.73994 7.00085 1.73994C4.09494 1.73994 1.73923 4.09565 1.73923 7.00157C1.73923 9.90749 4.09494 12.2632 7.00085 12.2632C9.90677 12.2632 12.2625 9.90749 12.2625 7.00157ZM10.7213 4.82205C10.7213 3.97095 10.0313 3.281 9.18023 3.281C8.32913 3.281 7.63917 3.97095 7.63917 4.82205C7.63917 5.67315 8.32913 6.3631 9.18023 6.3631C10.0313 6.3631 10.7213 5.67315 10.7213 4.82205ZM11.9704 11.3383L12.2849 11.6123C12.4856 11.3819 12.6732 11.1354 12.8424 10.8799L12.4947 10.6496C12.3355 10.8899 12.1591 11.1216 11.9704 11.3383ZM3.09019 12.8218C2.83557 12.6512 2.59021 12.4623 2.36091 12.2602L2.63665 11.9473C2.85224 12.1372 3.08295 12.3149 3.3224 12.4754L3.09019 12.8218ZM13.2533 9.09685L13.6488 9.22944C13.5516 9.51944 13.4341 9.806 13.2995 10.0812L12.9248 9.89792C13.0514 9.63912 13.1619 9.3696 13.2533 9.09685ZM11.3601 11.9516L11.6357 12.2647C11.4062 12.4667 11.1607 12.6555 10.9061 12.8259L10.6741 12.4793C10.9135 12.3191 11.1443 12.1415 11.3601 11.9516ZM9.92464 12.9125L10.1093 13.2865C9.83502 13.4219 9.54901 13.5406 9.25919 13.6391L9.12488 13.2442C9.39754 13.1515 9.66662 13.0399 9.92464 12.9125ZM0.698663 10.0754C0.564769 9.80041 0.447705 9.51376 0.350717 9.22346L0.746321 9.09128C0.837577 9.36442 0.947715 9.63411 1.0737 9.89286L0.698663 10.0754ZM4.7358 13.6379C4.44725 13.539 4.16148 13.4197 3.88645 13.2833L4.07178 12.9096C4.33065 13.038 4.59955 13.1503 4.871 13.2433L4.7358 13.6379ZM7.50907 0.425028L7.54103 0.00914471C7.84635 0.0326099 8.15299 0.0767322 8.45243 0.140276L8.36583 0.548303C8.08435 0.488557 7.79609 0.447081 7.50907 0.425028ZM8.28868 13.469L8.37042 13.878C8.07006 13.9381 7.76308 13.9787 7.45798 13.999L7.4304 13.5828C7.71737 13.5638 8.00614 13.5255 8.28868 13.469ZM6.56475 13.5831L6.5374 13.9993C6.23179 13.9792 5.92469 13.9385 5.62462 13.8783L5.70667 13.4693C5.98876 13.5259 6.27745 13.5642 6.56475 13.5831ZM1.71207 11.6074C1.51131 11.3768 1.32385 11.1303 1.15489 10.8748L1.5028 10.6447C1.66168 10.885 1.83795 11.1167 2.0267 11.3336L1.71207 11.6074ZM1.54706 3.2931L1.20185 3.05901C1.3739 2.80528 1.56421 2.56096 1.76748 2.33281L2.07891 2.61029C1.8878 2.82479 1.70885 3.05452 1.54706 3.2931ZM13.5829 7.4008L13.9993 7.42603C13.9807 7.73163 13.9418 8.03889 13.8834 8.33925L13.474 8.25969C13.5289 7.97721 13.5655 7.68824 13.5829 7.4008ZM2.69596 2.00373L2.42386 1.68762C2.65562 1.48813 2.90314 1.30202 3.15957 1.13448L3.38773 1.48365C3.14661 1.64119 2.91386 1.81619 2.69596 2.00373ZM4.14194 1.05867L3.96141 0.682649C4.23716 0.550267 4.52444 0.434775 4.8153 0.339358L4.9453 0.735689C4.67165 0.825447 4.40135 0.934116 4.14194 1.05867ZM6.64336 0.415732C6.35624 0.431589 6.06708 0.466692 5.78392 0.520066L5.70665 0.110177C6.00769 0.0534275 6.3151 0.0161137 6.62038 -0.00073251L6.64336 0.415732ZM9.33849 0.390492C9.62584 0.492485 9.91028 0.614901 10.1839 0.754324L9.99453 1.12595C9.73698 0.994735 9.46932 0.879534 9.19896 0.783565L9.33849 0.390492ZM0.116692 8.3334C0.0582983 8.03277 0.0192821 7.72556 0.000734408 7.42027L0.417082 7.39499C0.434525 7.68212 0.471213 7.97108 0.526144 8.25385L0.116692 8.3334ZM13.8694 5.59362C13.9308 5.89342 13.9729 6.20022 13.9945 6.50553L13.5785 6.53503C13.5581 6.24787 13.5185 5.95929 13.4607 5.67733L13.8694 5.59362ZM0.421578 6.52929L0.00551996 6.49964C0.0272978 6.19421 0.0697176 5.88734 0.131602 5.58753L0.540095 5.67184C0.48192 5.95369 0.442046 6.24218 0.421578 6.52929ZM13.268 3.85795C13.4053 4.1315 13.5257 4.41681 13.6258 4.70597L13.2317 4.84251C13.1375 4.57059 13.0243 4.30226 12.8952 4.045L13.268 3.85795ZM0.770731 4.83746L0.376902 4.70007C0.477381 4.41205 0.598242 4.12695 0.736138 3.85268L1.10878 4.04006C0.979007 4.29819 0.86526 4.56647 0.770731 4.83746ZM10.7213 1.73979C10.7213 0.888612 11.4113 0.198592 12.2625 0.198592C13.1137 0.198592 13.8037 0.888612 13.8037 1.73979C13.8037 2.59098 13.1137 3.281 12.2625 3.281C11.4113 3.281 10.7213 2.59098 10.7213 1.73979Z" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0_34_7">
-<rect width="14" height="14" fill="white" transform="matrix(-1 0 0 1 14 0)"/>
-</clipPath>
-</defs>
-</svg>

assets/icons/file_icons/ocaml.svg

@@ -1,5 +0,0 @@
-<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

@@ -1,6 +0,0 @@
-<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/icons/file_icons/yaml.svg

@@ -0,0 +1 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="457px" height="512px"><polygon points="342.0159302,0 457,0 114.9831009,512 0,512 171.0082092,256 0,0 114.9831009,0 228.4997559,169.9342041 "/></svg>

assets/icons/play.svg

@@ -1 +0,0 @@
-<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M3.24182 2.32181C3.3919 2.23132 3.5784 2.22601 3.73338 2.30781L12.7334 7.05781C12.8974 7.14436 13 7.31457 13 7.5C13 7.68543 12.8974 7.85564 12.7334 7.94219L3.73338 12.6922C3.5784 12.774 3.3919 12.7687 3.24182 12.6782C3.09175 12.5877 3 12.4252 3 12.25V2.75C3 2.57476 3.09175 2.4123 3.24182 2.32181ZM4 3.57925V11.4207L11.4288 7.5L4 3.57925Z" fill="currentColor" fill-rule="evenodd" clip-rule="evenodd"></path></svg>

assets/keymaps/default-linux.json

@@ -1,561 +0,0 @@
-[
-    {
-      "bindings": {
-        "up": "menu::SelectPrev",
-        "pageup": "menu::SelectFirst",
-        "shift-pageup": "menu::SelectFirst",
-        "ctrl-p": "menu::SelectPrev",
-        "down": "menu::SelectNext",
-        "pagedown": "menu::SelectLast",
-        "shift-pagedown": "menu::SelectFirst",
-        "ctrl-n": "menu::SelectNext",
-        "ctrl-up": "menu::SelectFirst",
-        "ctrl-down": "menu::SelectLast",
-        "enter": "menu::Confirm",
-        "shift-f10": "menu::ShowContextMenu",
-        "ctrl-enter": "menu::SecondaryConfirm",
-        "escape": "menu::Cancel",
-        "ctrl-c": "menu::Cancel",
-        "ctrl-shift-w": "workspace::CloseWindow",
-        "shift-escape": "workspace::ToggleZoom",
-        "ctrl-o": "workspace::Open",
-        "ctrl-=": "zed::IncreaseBufferFontSize",
-        "ctrl-+": "zed::IncreaseBufferFontSize",
-        "ctrl--": "zed::DecreaseBufferFontSize",
-        "ctrl-0": "zed::ResetBufferFontSize",
-        "ctrl-,": "zed::OpenSettings",
-        "ctrl-q": "zed::Quit",
-        "ctrl-h": "zed::Hide",
-        "alt-ctrl-h": "zed::HideOthers",
-        "ctrl-m": "zed::Minimize",
-        "f11": "zed::ToggleFullScreen"
-      }
-    },
-    {
-      "context": "Editor",
-      "bindings": {
-        "escape": "editor::Cancel",
-        "backspace": "editor::Backspace",
-        "shift-backspace": "editor::Backspace",
-        "ctrl-h": "editor::Backspace",
-        "delete": "editor::Delete",
-        "ctrl-d": "editor::Delete",
-        "tab": "editor::Tab",
-        "shift-tab": "editor::TabPrev",
-        "ctrl-k": "editor::CutToEndOfLine",
-        "ctrl-t": "editor::Transpose",
-        "ctrl-backspace": "editor::DeleteToBeginningOfLine",
-        "ctrl-delete": "editor::DeleteToEndOfLine",
-        "alt-backspace": "editor::DeleteToPreviousWordStart",
-        "alt-delete": "editor::DeleteToNextWordEnd",
-        "alt-h": "editor::DeleteToPreviousWordStart",
-        "alt-d": "editor::DeleteToNextWordEnd",
-        "ctrl-x": "editor::Cut",
-        "ctrl-c": "editor::Copy",
-        "ctrl-v": "editor::Paste",
-        "ctrl-z": "editor::Undo",
-        "ctrl-shift-z": "editor::Redo",
-        "ctrl-y": "editor::Redo",
-        "up": "editor::MoveUp",
-        "ctrl-up": "editor::MoveToStartOfParagraph",
-        "pageup": "editor::PageUp",
-        "shift-pageup": "editor::MovePageUp",
-        "home": "editor::MoveToBeginningOfLine",
-        "down": "editor::MoveDown",
-        "ctrl-down": "editor::MoveToEndOfParagraph",
-        "pagedown": "editor::PageDown",
-        "shift-pagedown": "editor::MovePageDown",
-        "end": "editor::MoveToEndOfLine",
-        "left": "editor::MoveLeft",
-        "right": "editor::MoveRight",
-        "ctrl-p": "editor::MoveUp",
-        "ctrl-n": "editor::MoveDown",
-        "ctrl-b": "editor::MoveLeft",
-        "ctrl-f": "editor::MoveRight",
-        "ctrl-shift-l": "editor::NextScreen", // todo!(linux): What is this
-        "alt-left": "editor::MoveToPreviousWordStart",
-        "alt-b": "editor::MoveToPreviousWordStart",
-        "alt-right": "editor::MoveToNextWordEnd",
-        "alt-f": "editor::MoveToNextWordEnd",
-        "ctrl-e": "editor::MoveToEndOfLine",
-        "ctrl-home": "editor::MoveToBeginning",
-        "ctrl-=end": "editor::MoveToEnd",
-        "shift-up": "editor::SelectUp",
-        "ctrl-shift-p": "editor::SelectUp",
-        "shift-down": "editor::SelectDown",
-        "ctrl-shift-n": "editor::SelectDown",
-        "shift-left": "editor::SelectLeft",
-        "ctrl-shift-b": "editor::SelectLeft",
-        "shift-right": "editor::SelectRight",
-        "ctrl-shift-f": "editor::SelectRight",
-        "alt-shift-left": "editor::SelectToPreviousWordStart",
-        "alt-shift-b": "editor::SelectToPreviousWordStart",
-        "alt-shift-right": "editor::SelectToNextWordEnd",
-        "alt-shift-f": "editor::SelectToNextWordEnd",
-        "ctrl-shift-up": "editor::SelectToStartOfParagraph",
-        "ctrl-shift-down": "editor::SelectToEndOfParagraph",
-        "ctrl-shift-home": "editor::SelectToBeginning",
-        "ctrl-shift-end": "editor::SelectToEnd",
-        "ctrl-a": "editor::SelectAll",
-        "ctrl-l": "editor::SelectLine",
-        "ctrl-shift-i": "editor::Format",
-        "shift-home": [
-          "editor::SelectToBeginningOfLine",
-          {
-            "stop_at_soft_wraps": true
-          }
-        ],
-        "shift-end": [
-          "editor::SelectToEndOfLine",
-          {
-            "stop_at_soft_wraps": true
-          }
-        ],
-        "ctrl-shift-e": [
-          "editor::SelectToEndOfLine",
-          {
-            "stop_at_soft_wraps": true
-          }
-        ]
-      }
-    },
-    {
-      "context": "Editor && mode == full",
-      "bindings": {
-        "enter": "editor::Newline",
-        "shift-enter": "editor::Newline",
-        "ctrl-shift-enter": "editor::NewlineAbove",
-        "ctrl-enter": "editor::NewlineBelow",
-        "alt-z": "editor::ToggleSoftWrap",
-        "ctrl-f": [
-          "buffer_search::Deploy",
-          {
-            "focus": true
-          }
-        ],
-        "alt-\\": "copilot::Suggest",
-        "alt-]": "copilot::NextSuggestion",
-        "alt-[": "copilot::PreviousSuggestion",
-        "ctrl->": "assistant::QuoteSelection"
-      }
-    },
-    {
-      "context": "Editor && mode == auto_height",
-      "bindings": {
-        "ctrl-enter": "editor::Newline",
-        "shift-enter": "editor::Newline",
-        "ctrl-shift-enter": "editor::NewlineBelow"
-      }
-    },
-    {
-      "context": "AssistantPanel",
-      "bindings": {
-        "f3": "search::SelectNextMatch",
-        "shift-f3": "search::SelectPrevMatch"
-      }
-    },
-    {
-      "context": "ConversationEditor > Editor",
-      "bindings": {
-        "ctrl-enter": "assistant::Assist",
-        "ctrl-s": "workspace::Save",
-        "ctrl->": "assistant::QuoteSelection",
-        "shift-enter": "assistant::Split",
-        "ctrl-r": "assistant::CycleMessageRole"
-      }
-    },
-    {
-      "context": "BufferSearchBar",
-      "bindings": {
-        "escape": "buffer_search::Dismiss",
-        "tab": "buffer_search::FocusEditor",
-        "enter": "search::SelectNextMatch",
-        "shift-enter": "search::SelectPrevMatch",
-        "alt-enter": "search::SelectAllMatches",
-        "alt-tab": "search::CycleMode"
-      }
-    },
-    {
-      "context": "BufferSearchBar && in_replace",
-      "bindings": {
-        "enter": "search::ReplaceNext",
-        "ctrl-enter": "search::ReplaceAll"
-      }
-    },
-    {
-      "context": "BufferSearchBar && !in_replace > Editor",
-      "bindings": {
-        "up": "search::PreviousHistoryQuery",
-        "down": "search::NextHistoryQuery"
-      }
-    },
-    {
-      "context": "ProjectSearchBar",
-      "bindings": {
-        "escape": "project_search::ToggleFocus",
-        "alt-tab": "search::CycleMode",
-        "ctrl-shift-h": "search::ToggleReplace",
-        "ctrl-alt-g": "search::ActivateRegexMode",
-        "ctrl-alt-s": "search::ActivateSemanticMode",
-        "ctrl-alt-x": "search::ActivateTextMode"
-      }
-    },
-    {
-      "context": "ProjectSearchBar > Editor",
-      "bindings": {
-        "up": "search::PreviousHistoryQuery",
-        "down": "search::NextHistoryQuery"
-      }
-    },
-    {
-      "context": "ProjectSearchBar && in_replace",
-      "bindings": {
-        "enter": "search::ReplaceNext",
-        "ctrl-enter": "search::ReplaceAll"
-      }
-    },
-    {
-      "context": "ProjectSearchView",
-      "bindings": {
-        "escape": "project_search::ToggleFocus",
-        "alt-tab": "search::CycleMode",
-        "ctrl-shift-h": "search::ToggleReplace",
-        "ctrl-alt-g": "search::ActivateRegexMode",
-        "ctrl-alt-s": "search::ActivateSemanticMode",
-        "ctrl-alt-x": "search::ActivateTextMode"
-      }
-    },
-    {
-      "context": "Pane",
-      "bindings": {
-        "ctrl-{": "pane::ActivatePrevItem",
-        "ctrl-}": "pane::ActivateNextItem",
-        "ctrl-alt-left": "pane::ActivatePrevItem",
-        "ctrl-alt-right": "pane::ActivateNextItem",
-        "ctrl-w": "pane::CloseActiveItem",
-        "ctrl-alt-t": "pane::CloseInactiveItems",
-        "ctrl-alt-shift-w": "workspace::CloseInactiveTabsAndPanes",
-        "ctrl-k u": "pane::CloseCleanItems",
-        "ctrl-k ctrl-w": "pane::CloseAllItems",
-        "ctrl-f": "project_search::ToggleFocus",
-        "f3": "search::SelectNextMatch",
-        "shift-f3": "search::SelectPrevMatch",
-        "ctrl-shift-h": "search::ToggleReplace",
-        "alt-enter": "search::SelectAllMatches",
-        "ctrl-alt-c": "search::ToggleCaseSensitive",
-        "ctrl-alt-w": "search::ToggleWholeWord",
-        "alt-tab": "search::CycleMode",
-        "ctrl-alt-f": "project_search::ToggleFilters",
-        "ctrl-alt-g": "search::ActivateRegexMode",
-        "ctrl-alt-s": "search::ActivateSemanticMode",
-        "ctrl-alt-x": "search::ActivateTextMode"
-      }
-    },
-    // Bindings from VS Code
-    {
-      "context": "Editor",
-      "bindings": {
-        "ctrl-[": "editor::Outdent",
-        "ctrl-]": "editor::Indent",
-        "ctrl-alt-up": "editor::AddSelectionAbove",
-        "ctrl-alt-down": "editor::AddSelectionBelow",
-        "ctrl-d": [
-          "editor::SelectNext",
-          {
-            "replace_newest": false
-          }
-        ],
-        "ctrl-shift-l": "editor::SelectAllMatches",
-        "ctrl-shift-d": [
-          "editor::SelectPrevious",
-          {
-            "replace_newest": false
-          }
-        ],
-        "ctrl-k ctrl-d": [
-          "editor::SelectNext",
-          {
-            "replace_newest": true
-          }
-        ],
-        "ctrl-k ctrl-shift-d": [
-          "editor::SelectPrevious",
-          {
-            "replace_newest": true
-          }
-        ],
-        "ctrl-k ctrl-i": "editor::Hover",
-        "ctrl-/": [
-          "editor::ToggleComments",
-          {
-            "advance_downwards": false
-          }
-        ],
-        "alt-up": "editor::SelectLargerSyntaxNode",
-        "alt-down": "editor::SelectSmallerSyntaxNode",
-        "ctrl-u": "editor::UndoSelection",
-        "ctrl-shift-u": "editor::RedoSelection",
-        "f8": "editor::GoToDiagnostic",
-        "shift-f8": "editor::GoToPrevDiagnostic",
-        "f2": "editor::Rename",
-        "f12": "editor::GoToDefinition",
-        "alt-f12": "editor::GoToDefinitionSplit",
-        "ctrl-f12": "editor::GoToTypeDefinition",
-        "ctrl-alt-f12": "editor::GoToTypeDefinitionSplit",
-        "alt-shift-f12": "editor::FindAllReferences",
-        "ctrl-m": "editor::MoveToEnclosingBracket",
-        "ctrl-alt-[": "editor::Fold",
-        "ctrl-alt-]": "editor::UnfoldLines",
-        "ctrl-space": "editor::ShowCompletions",
-        "ctrl-.": "editor::ToggleCodeActions",
-        "ctrl-alt-r": "editor::RevealInFinder",
-        "ctrl-alt-c": "editor::DisplayCursorNames"
-      }
-    },
-    {
-      "context": "Editor && mode == full",
-      "bindings": {
-        "ctrl-shift-o": "outline::Toggle",
-        "ctrl-g": "go_to_line::Toggle"
-      }
-    },
-    {
-      "context": "Pane",
-      "bindings": {
-        "ctrl-1": ["pane::ActivateItem", 0],
-        "ctrl-2": ["pane::ActivateItem", 1],
-        "ctrl-3": ["pane::ActivateItem", 2],
-        "ctrl-4": ["pane::ActivateItem", 3],
-        "ctrl-5": ["pane::ActivateItem", 4],
-        "ctrl-6": ["pane::ActivateItem", 5],
-        "ctrl-7": ["pane::ActivateItem", 6],
-        "ctrl-8": ["pane::ActivateItem", 7],
-        "ctrl-9": ["pane::ActivateItem", 8],
-        "ctrl-0": "pane::ActivateLastItem",
-        "ctrl--": "pane::GoBack",
-        "ctrl-_": "pane::GoForward",
-        "ctrl-shift-t": "pane::ReopenClosedItem",
-        "ctrl-shift-f": "project_search::ToggleFocus"
-      }
-    },
-    {
-      "context": "Workspace",
-      "bindings": {
-        "ctrl-alt-o": "projects::OpenRecent",
-        "ctrl-alt-b": "branches::OpenRecent",
-        "ctrl-~": "workspace::NewTerminal",
-        "ctrl-s": "workspace::Save",
-        "ctrl-shift-s": "workspace::SaveAs",
-        "ctrl-n": "workspace::NewFile",
-        "ctrl-shift-n": "workspace::NewWindow",
-        "ctrl-`": "terminal_panel::ToggleFocus",
-        "ctrl-1": ["workspace::ActivatePane", 0],
-        "ctrl-2": ["workspace::ActivatePane", 1],
-        "ctrl-3": ["workspace::ActivatePane", 2],
-        "ctrl-4": ["workspace::ActivatePane", 3],
-        "ctrl-5": ["workspace::ActivatePane", 4],
-        "ctrl-6": ["workspace::ActivatePane", 5],
-        "ctrl-7": ["workspace::ActivatePane", 6],
-        "ctrl-8": ["workspace::ActivatePane", 7],
-        "ctrl-9": ["workspace::ActivatePane", 8],
-        "ctrl-b": "workspace::ToggleLeftDock",
-        "ctrl-r": "workspace::ToggleRightDock",
-        "ctrl-j": "workspace::ToggleBottomDock",
-        "ctrl-alt-y": "workspace::CloseAllDocks",
-        "ctrl-shift-f": "pane::DeploySearch",
-        "ctrl-k ctrl-t": "theme_selector::Toggle",
-        "ctrl-k ctrl-s": "zed::OpenKeymap",
-        "ctrl-t": "project_symbols::Toggle",
-        "ctrl-p": "file_finder::Toggle",
-        "ctrl-shift-p": "command_palette::Toggle",
-        "ctrl-shift-m": "diagnostics::Deploy",
-        "ctrl-shift-e": "project_panel::ToggleFocus",
-        "ctrl-?": "assistant::ToggleFocus",
-        "ctrl-alt-s": "workspace::SaveAll",
-        "ctrl-k m": "language_selector::Toggle",
-        "escape": "workspace::Unfollow",
-        "ctrl-k ctrl-left": ["workspace::ActivatePaneInDirection", "Left"],
-        "ctrl-k ctrl-right": ["workspace::ActivatePaneInDirection", "Right"],
-        "ctrl-k ctrl-up": ["workspace::ActivatePaneInDirection", "Up"],
-        "ctrl-k ctrl-down": ["workspace::ActivatePaneInDirection", "Down"],
-        "ctrl-k shift-left": ["workspace::SwapPaneInDirection", "Left"],
-        "ctrl-k shift-right": ["workspace::SwapPaneInDirection", "Right"],
-        "ctrl-k shift-up": ["workspace::SwapPaneInDirection", "Up"],
-        "ctrl-k shift-down": ["workspace::SwapPaneInDirection", "Down"],
-        "alt-t": "task::Rerun",
-        "alt-shift-t": "task::Spawn"
-      }
-    },
-    // Bindings from Sublime Text
-    // todo!(linux) make sure these match linux bindings or remove above comment?
-    {
-      "context": "Editor",
-      "bindings": {
-        "ctrl-shift-k": "editor::DeleteLine",
-        "ctrl-shift-d": "editor::DuplicateLine",
-        "ctrl-j": "editor::JoinLines",
-        "ctrl-alt-up": "editor::MoveLineUp",
-        "ctrl-alt-down": "editor::MoveLineDown",
-        "ctrl-alt-backspace": "editor::DeleteToPreviousSubwordStart",
-        "ctrl-alt-h": "editor::DeleteToPreviousSubwordStart",
-        "ctrl-alt-delete": "editor::DeleteToNextSubwordEnd",
-        "ctrl-alt-d": "editor::DeleteToNextSubwordEnd",
-        "ctrl-alt-left": "editor::MoveToPreviousSubwordStart",
-        "ctrl-alt-b": "editor::MoveToPreviousSubwordStart",
-        "ctrl-alt-right": "editor::MoveToNextSubwordEnd",
-        "ctrl-alt-f": "editor::MoveToNextSubwordEnd",
-        "ctrl-alt-shift-left": "editor::SelectToPreviousSubwordStart",
-        "ctrl-alt-shift-b": "editor::SelectToPreviousSubwordStart",
-        "ctrl-alt-shift-right": "editor::SelectToNextSubwordEnd",
-        "ctrl-alt-shift-f": "editor::SelectToNextSubwordEnd"
-      }
-    },
-    // Bindings from Atom
-    // todo!(linux) make sure these match linux bindings or remove above comment?
-    {
-      "context": "Pane",
-      "bindings": {
-        "ctrl-k up": "pane::SplitUp",
-        "ctrl-k down": "pane::SplitDown",
-        "ctrl-k left": "pane::SplitLeft",
-        "ctrl-k right": "pane::SplitRight"
-      }
-    },
-    // Bindings that should be unified with bindings for more general actions
-    {
-      "context": "Editor && renaming",
-      "bindings": {
-        "enter": "editor::ConfirmRename"
-      }
-    },
-    {
-      "context": "Editor && showing_completions",
-      "bindings": {
-        "enter": "editor::ConfirmCompletion",
-        "tab": "editor::ConfirmCompletion"
-      }
-    },
-    {
-      "context": "Editor && showing_code_actions",
-      "bindings": {
-        "enter": "editor::ConfirmCodeAction"
-      }
-    },
-    {
-      "context": "Editor && (showing_code_actions || showing_completions)",
-      "bindings": {
-        "up": "editor::ContextMenuPrev",
-        "ctrl-p": "editor::ContextMenuPrev",
-        "down": "editor::ContextMenuNext",
-        "ctrl-n": "editor::ContextMenuNext",
-        "pageup": "editor::ContextMenuFirst",
-        "pagedown": "editor::ContextMenuLast"
-      }
-    },
-    // Custom bindings
-    {
-      "bindings": {
-        "ctrl-alt-shift-f": "workspace::FollowNextCollaborator",
-        // TODO: Move this to a dock open action
-        "ctrl-alt-c": "collab_panel::ToggleFocus",
-        "ctrl-alt-i": "zed::DebugElements",
-        "ctrl-:": "editor::ToggleInlayHints"
-      }
-    },
-    {
-      "context": "Editor && mode == full",
-      "bindings": {
-        "alt-enter": "editor::OpenExcerpts",
-        "ctrl-f8": "editor::GoToHunk",
-        "ctrl-shift-f8": "editor::GoToPrevHunk",
-        "ctrl-enter": "assistant::InlineAssist"
-      }
-    },
-    {
-      "context": "ProjectSearchBar && !in_replace",
-      "bindings": {
-        "ctrl-enter": "project_search::SearchInNew"
-      }
-    },
-    {
-      "context": "ProjectPanel",
-      "bindings": {
-        "left": "project_panel::CollapseSelectedEntry",
-        "right": "project_panel::ExpandSelectedEntry",
-        "ctrl-n": "project_panel::NewFile",
-        "ctrl-alt-n": "project_panel::NewDirectory",
-        "ctrl-x": "project_panel::Cut",
-        "ctrl-c": "project_panel::Copy",
-        "ctrl-v": "project_panel::Paste",
-        "ctrl-alt-c": "project_panel::CopyPath",
-        "ctrl-alt-shift-c": "project_panel::CopyRelativePath",
-        "f2": "project_panel::Rename",
-        "enter": "project_panel::Rename",
-        "backspace": "project_panel::Delete",
-        "ctrl-alt-r": "project_panel::RevealInFinder",
-        "alt-shift-f": "project_panel::NewSearchInDirectory"
-      }
-    },
-    {
-      "context": "ProjectPanel && not_editing",
-      "bindings": {
-        "space": "project_panel::Open"
-      }
-    },
-    {
-      "context": "CollabPanel && not_editing",
-      "bindings": {
-        "ctrl-backspace": "collab_panel::Remove",
-        "space": "menu::Confirm"
-      }
-    },
-    {
-      "context": "(CollabPanel && editing) > Editor",
-      "bindings": {
-        "space": "collab_panel::InsertSpace"
-      }
-    },
-    {
-      "context": "ChannelModal",
-      "bindings": {
-        "tab": "channel_modal::ToggleMode"
-      }
-    },
-    {
-      "context": "ChannelModal > Picker > Editor",
-      "bindings": {
-        "tab": "channel_modal::ToggleMode"
-      }
-    },
-    {
-      "context": "ChatPanel > MessageEditor",
-      "bindings": {
-        "escape": "chat_panel::CloseReplyPreview"
-      }
-    },
-    {
-      "context": "Terminal",
-      "bindings": {
-        "ctrl-alt-space": "terminal::ShowCharacterPalette",
-        "ctrl-shift-c": "terminal::Copy",
-        "ctrl-shift-v": "terminal::Paste",
-        "ctrl-k": "terminal::Clear",
-        // Some nice conveniences
-        "ctrl-backspace": ["terminal::SendText", "\u0015"],
-        "ctrl-right": ["terminal::SendText", "\u0005"],
-        "ctrl-left": ["terminal::SendText", "\u0001"],
-        // Terminal.app compatibility
-        "alt-left": ["terminal::SendText", "\u001bb"],
-        "alt-right": ["terminal::SendText", "\u001bf"],
-        // There are conflicting bindings for these keys in the global context.
-        // these bindings override them, remove at your own risk:
-        "up": ["terminal::SendKeystroke", "up"],
-        "pageup": ["terminal::SendKeystroke", "pageup"],
-        "down": ["terminal::SendKeystroke", "down"],
-        "pagedown": ["terminal::SendKeystroke", "pagedown"],
-        "escape": ["terminal::SendKeystroke", "escape"],
-        "enter": ["terminal::SendKeystroke", "enter"],
-        "ctrl-c": ["terminal::SendKeystroke", "ctrl-c"]
-      }
-    }
-  ]

assets/keymaps/default.json

@@ -415,17 +415,7 @@
       "cmd-?": "assistant::ToggleFocus",
       "cmd-alt-s": "workspace::SaveAll",
       "cmd-k m": "language_selector::Toggle",
-      "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"],
-      "alt-t": "task::Rerun",
-      "alt-shift-t": "task::Spawn"
+      "escape": "workspace::Unfollow"
     }
   },
   // Bindings from Sublime Text
@@ -451,6 +441,18 @@
       "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",
@@ -531,8 +533,7 @@
       "alt-cmd-shift-c": "project_panel::CopyRelativePath",
       "f2": "project_panel::Rename",
       "enter": "project_panel::Rename",
-      "delete": "project_panel::Delete",
-      "cmd-backspace": "project_panel::Delete",
+      "backspace": "project_panel::Delete",
       "alt-cmd-r": "project_panel::RevealInFinder",
       "alt-shift-f": "project_panel::NewSearchInDirectory"
     }
@@ -568,12 +569,6 @@
       "tab": "channel_modal::ToggleMode"
     }
   },
-  {
-    "context": "ChatPanel > MessageEditor",
-    "bindings": {
-      "escape": "chat_panel::CloseReplyPreview"
-    }
-  },
   {
     "context": "Terminal",
     "bindings": {

assets/keymaps/jetbrains.json

@@ -42,7 +42,6 @@
       "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",
@@ -81,18 +80,10 @@
       "cmd-6": "diagnostics::Deploy"
     }
   },
-  {
-    "context": "Pane",
-    "bindings": {
-      "cmd-alt-left": "pane::GoBack",
-      "cmd-alt-right": "pane::GoForward"
-    }
-  },
   {
     "context": "ProjectPanel",
     "bindings": {
-      "enter": "project_panel::Open",
-      "shift-f6": "project_panel::Rename"
+      "enter": "project_panel::Open"
     }
   }
 ]

assets/keymaps/storybook.json

@@ -1,23 +0,0 @@
-[
-  // Standard macOS bindings
-  {
-    "bindings": {
-      "up": "menu::SelectPrev",
-      "pageup": "menu::SelectFirst",
-      "shift-pageup": "menu::SelectFirst",
-      "ctrl-p": "menu::SelectPrev",
-      "down": "menu::SelectNext",
-      "pagedown": "menu::SelectLast",
-      "shift-pagedown": "menu::SelectFirst",
-      "ctrl-n": "menu::SelectNext",
-      "cmd-up": "menu::SelectFirst",
-      "cmd-down": "menu::SelectLast",
-      "enter": "menu::Confirm",
-      "ctrl-enter": "menu::ShowContextMenu",
-      "cmd-enter": "menu::SecondaryConfirm",
-      "escape": "menu::Cancel",
-      "ctrl-c": "menu::Cancel",
-      "cmd-q": "storybook::Quit"
-    }
-  }
-]

assets/keymaps/vim.json

@@ -101,14 +101,8 @@
       "ctrl-o": "pane::GoBack",
       "ctrl-i": "pane::GoForward",
       "ctrl-]": "editor::GoToDefinition",
-      "escape": [
-        "vim::SwitchMode",
-        "Normal"
-      ],
-      "ctrl-[": [
-        "vim::SwitchMode",
-        "Normal"
-      ],
+      "escape": ["vim::SwitchMode", "Normal"],
+      "ctrl-[": ["vim::SwitchMode", "Normal"],
       "v": "vim::ToggleVisual",
       "shift-v": "vim::ToggleVisualLine",
       "ctrl-v": "vim::ToggleVisualBlock",
@@ -123,15 +117,12 @@
       "ctrl-e": "vim::LineDown",
       "ctrl-y": "vim::LineUp",
       // "g" commands
-      "g e": "vim::PreviousWordEnd",
-      "g shift-e": ["vim::PreviousWordEnd", { "ignorePunctuation": true }],
       "g g": "vim::StartOfDocument",
       "g h": "editor::Hover",
       "g t": "pane::ActivateNextItem",
       "g shift-t": "pane::ActivatePrevItem",
       "g d": "editor::GoToDefinition",
       "g shift-d": "editor::GoToTypeDefinition",
-      "g x": "editor::OpenUrl",
       "g n": "vim::SelectNext",
       "g shift-n": "vim::SelectPrevious",
       "g >": [
@@ -241,123 +232,36 @@
         }
       ],
       // Count support
-      "1": [
-        "vim::Number",
-        1
-      ],
-      "2": [
-        "vim::Number",
-        2
-      ],
-      "3": [
-        "vim::Number",
-        3
-      ],
-      "4": [
-        "vim::Number",
-        4
-      ],
-      "5": [
-        "vim::Number",
-        5
-      ],
-      "6": [
-        "vim::Number",
-        6
-      ],
-      "7": [
-        "vim::Number",
-        7
-      ],
-      "8": [
-        "vim::Number",
-        8
-      ],
-      "9": [
-        "vim::Number",
-        9
-      ],
+      "1": ["vim::Number", 1],
+      "2": ["vim::Number", 2],
+      "3": ["vim::Number", 3],
+      "4": ["vim::Number", 4],
+      "5": ["vim::Number", 5],
+      "6": ["vim::Number", 6],
+      "7": ["vim::Number", 7],
+      "8": ["vim::Number", 8],
+      "9": ["vim::Number", 9],
       // window related commands (ctrl-w X)
-      "ctrl-w left": [
-        "workspace::ActivatePaneInDirection",
-        "Left"
-      ],
-      "ctrl-w right": [
-        "workspace::ActivatePaneInDirection",
-        "Right"
-      ],
-      "ctrl-w up": [
-        "workspace::ActivatePaneInDirection",
-        "Up"
-      ],
-      "ctrl-w down": [
-        "workspace::ActivatePaneInDirection",
-        "Down"
-      ],
-      "ctrl-w h": [
-        "workspace::ActivatePaneInDirection",
-        "Left"
-      ],
-      "ctrl-w l": [
-        "workspace::ActivatePaneInDirection",
-        "Right"
-      ],
-      "ctrl-w k": [
-        "workspace::ActivatePaneInDirection",
-        "Up"
-      ],
-      "ctrl-w j": [
-        "workspace::ActivatePaneInDirection",
-        "Down"
-      ],
-      "ctrl-w ctrl-h": [
-        "workspace::ActivatePaneInDirection",
-        "Left"
-      ],
-      "ctrl-w ctrl-l": [
-        "workspace::ActivatePaneInDirection",
-        "Right"
-      ],
-      "ctrl-w ctrl-k": [
-        "workspace::ActivatePaneInDirection",
-        "Up"
-      ],
-      "ctrl-w ctrl-j": [
-        "workspace::ActivatePaneInDirection",
-        "Down"
-      ],
-      "ctrl-w shift-left": [
-        "workspace::SwapPaneInDirection",
-        "Left"
-      ],
-      "ctrl-w shift-right": [
-        "workspace::SwapPaneInDirection",
-        "Right"
-      ],
-      "ctrl-w shift-up": [
-        "workspace::SwapPaneInDirection",
-        "Up"
-      ],
-      "ctrl-w shift-down": [
-        "workspace::SwapPaneInDirection",
-        "Down"
-      ],
-      "ctrl-w shift-h": [
-        "workspace::SwapPaneInDirection",
-        "Left"
-      ],
-      "ctrl-w shift-l": [
-        "workspace::SwapPaneInDirection",
-        "Right"
-      ],
-      "ctrl-w shift-k": [
-        "workspace::SwapPaneInDirection",
-        "Up"
-      ],
-      "ctrl-w shift-j": [
-        "workspace::SwapPaneInDirection",
-        "Down"
-      ],
+      "ctrl-w left": ["workspace::ActivatePaneInDirection", "Left"],
+      "ctrl-w right": ["workspace::ActivatePaneInDirection", "Right"],
+      "ctrl-w up": ["workspace::ActivatePaneInDirection", "Up"],
+      "ctrl-w down": ["workspace::ActivatePaneInDirection", "Down"],
+      "ctrl-w h": ["workspace::ActivatePaneInDirection", "Left"],
+      "ctrl-w l": ["workspace::ActivatePaneInDirection", "Right"],
+      "ctrl-w k": ["workspace::ActivatePaneInDirection", "Up"],
+      "ctrl-w j": ["workspace::ActivatePaneInDirection", "Down"],
+      "ctrl-w ctrl-h": ["workspace::ActivatePaneInDirection", "Left"],
+      "ctrl-w ctrl-l": ["workspace::ActivatePaneInDirection", "Right"],
+      "ctrl-w ctrl-k": ["workspace::ActivatePaneInDirection", "Up"],
+      "ctrl-w ctrl-j": ["workspace::ActivatePaneInDirection", "Down"],
+      "ctrl-w shift-left": ["workspace::SwapPaneInDirection", "Left"],
+      "ctrl-w shift-right": ["workspace::SwapPaneInDirection", "Right"],
+      "ctrl-w shift-up": ["workspace::SwapPaneInDirection", "Up"],
+      "ctrl-w shift-down": ["workspace::SwapPaneInDirection", "Down"],
+      "ctrl-w shift-h": ["workspace::SwapPaneInDirection", "Left"],
+      "ctrl-w shift-l": ["workspace::SwapPaneInDirection", "Right"],
+      "ctrl-w shift-k": ["workspace::SwapPaneInDirection", "Up"],
+      "ctrl-w shift-j": ["workspace::SwapPaneInDirection", "Down"],
       "ctrl-w g t": "pane::ActivateNextItem",
       "ctrl-w ctrl-g t": "pane::ActivateNextItem",
       "ctrl-w g shift-t": "pane::ActivatePrevItem",
@@ -379,15 +283,8 @@
       "ctrl-w ctrl-q": "pane::CloseAllItems",
       "ctrl-w o": "workspace::CloseInactiveTabsAndPanes",
       "ctrl-w ctrl-o": "workspace::CloseInactiveTabsAndPanes",
-      "ctrl-w n": [
-        "workspace::NewFileInDirection",
-        "Up"
-      ],
-      "ctrl-w ctrl-n": [
-        "workspace::NewFileInDirection",
-        "Up"
-      ],
-      "-": "pane::RevealInProjectPanel"
+      "ctrl-w n": ["workspace::NewFileInDirection", "Up"],
+      "ctrl-w ctrl-n": ["workspace::NewFileInDirection", "Up"]
     }
   },
   {
@@ -402,21 +299,12 @@
     "context": "Editor && vim_mode == normal && vim_operator == none && !VimWaiting",
     "bindings": {
       ".": "vim::Repeat",
-      "c": [
-        "vim::PushOperator",
-        "Change"
-      ],
+      "c": ["vim::PushOperator", "Change"],
       "shift-c": "vim::ChangeToEndOfLine",
-      "d": [
-        "vim::PushOperator",
-        "Delete"
-      ],
+      "d": ["vim::PushOperator", "Delete"],
       "shift-d": "vim::DeleteToEndOfLine",
       "shift-j": "vim::JoinLines",
-      "y": [
-        "vim::PushOperator",
-        "Yank"
-      ],
+      "y": ["vim::PushOperator", "Yank"],
       "shift-y": "vim::YankLine",
       "i": "vim::InsertBefore",
       "shift-i": "vim::InsertFirstNonWhitespace",
@@ -447,10 +335,7 @@
       ],
       "*": "vim::MoveToNext",
       "#": "vim::MoveToPrev",
-      "r": [
-        "vim::PushOperator",
-        "Replace"
-      ],
+      "r": ["vim::PushOperator", "Replace"],
       "s": "vim::Substitute",
       "shift-s": "vim::SubstituteLine",
       "> >": "editor::Indent",
@@ -462,10 +347,7 @@
   {
     "context": "Editor && VimCount",
     "bindings": {
-      "0": [
-        "vim::Number",
-        0
-      ]
+      "0": ["vim::Number", 0]
     }
   },
   {
@@ -568,22 +450,10 @@
       "shift-i": "vim::InsertBefore",
       "shift-a": "vim::InsertAfter",
       "shift-j": "vim::JoinLines",
-      "r": [
-        "vim::PushOperator",
-        "Replace"
-      ],
-      "ctrl-c": [
-        "vim::SwitchMode",
-        "Normal"
-      ],
-      "escape": [
-        "vim::SwitchMode",
-        "Normal"
-      ],
-      "ctrl-[": [
-        "vim::SwitchMode",
-        "Normal"
-      ],
+      "r": ["vim::PushOperator", "Replace"],
+      "ctrl-c": ["vim::SwitchMode", "Normal"],
+      "escape": ["vim::SwitchMode", "Normal"],
+      "ctrl-[": ["vim::SwitchMode", "Normal"],
       ">": "editor::Indent",
       "<": "editor::Outdent",
       "i": [
@@ -614,9 +484,7 @@
       "ctrl-x ctrl-a": "assistant::InlineAssist", // zed specific
       "ctrl-x ctrl-c": "copilot::Suggest", // zed specific
       "ctrl-x ctrl-l": "editor::ToggleCodeActions", // zed specific
-      "ctrl-x ctrl-z": "editor::Cancel",
-      "ctrl-w": "editor::DeleteToPreviousWordStart",
-      "ctrl-u": "editor::DeleteToBeginningOfLine"
+      "ctrl-x ctrl-z": "editor::Cancel"
     }
   },
   {
@@ -624,43 +492,28 @@
     "bindings": {
       "tab": "vim::Tab",
       "enter": "vim::Enter",
-      "escape": [
-        "vim::SwitchMode",
-        "Normal"
-      ],
-      "ctrl-[": [
-        "vim::SwitchMode",
-        "Normal"
-      ]
+      "escape": ["vim::SwitchMode", "Normal"],
+      "ctrl-[": ["vim::SwitchMode", "Normal"]
     }
   },
   {
-    "context": "BufferSearchBar && !in_replace",
+    "context": "BufferSearchBar && !in_replace > VimEnabled",
     "bindings": {
       "enter": "vim::SearchSubmit",
       "escape": "buffer_search::Dismiss"
     }
   },
   {
-    // netrw compatibility
-    "context": "ProjectPanel && not_editing",
+    "context": "Dock",
     "bindings": {
-      ":": "command_palette::Toggle",
-      "%": "project_panel::NewFile",
-      "/": "project_panel::NewSearchInDirectory",
-      "d": "project_panel::NewDirectory",
-      "enter": "project_panel::Open",
-      "escape": "project_panel::ToggleFocus",
-      "h": "project_panel::CollapseSelectedEntry",
-      "j": "menu::SelectNext",
-      "k": "menu::SelectPrev",
-      "l": "project_panel::ExpandSelectedEntry",
-      "o": "project_panel::Open",
-      "shift-d": "project_panel::Delete",
-      "shift-r": "project_panel::Rename",
-      "t": "project_panel::Open",
-      "v": "project_panel::Open",
-      "x": "project_panel::RevealInFinder"
+      "ctrl-w h": ["workspace::ActivatePaneInDirection", "Left"],
+      "ctrl-w l": ["workspace::ActivatePaneInDirection", "Right"],
+      "ctrl-w k": ["workspace::ActivatePaneInDirection", "Up"],
+      "ctrl-w j": ["workspace::ActivatePaneInDirection", "Down"],
+      "ctrl-w ctrl-h": ["workspace::ActivatePaneInDirection", "Left"],
+      "ctrl-w ctrl-l": ["workspace::ActivatePaneInDirection", "Right"],
+      "ctrl-w ctrl-k": ["workspace::ActivatePaneInDirection", "Up"],
+      "ctrl-w ctrl-j": ["workspace::ActivatePaneInDirection", "Down"]
     }
   }
 ]

assets/settings/default.json

@@ -104,17 +104,8 @@
   "show_whitespaces": "selection",
   // Settings related to calls in Zed
   "calls": {
-    // Join calls with the microphone live by default
-    "mute_on_join": false,
-    // Share your project when you are the first to join a channel
-    "share_on_join": true
-  },
-  // Toolbar related settings
-  "toolbar": {
-    // Whether to show breadcrumbs.
-    "breadcrumbs": true,
-    // Whether to show quick action buttons.
-    "quick_actions": true
+    // Join calls with the microphone muted by default
+    "mute_on_join": false
   },
   // Scrollbar related settings
   "scrollbar": {
@@ -136,20 +127,8 @@
     // Whether to show selections in the scrollbar.
     "selections": true,
     // Whether to show symbols selections in the scrollbar.
-    "symbols_selections": true,
-    // Whether to show diagnostic indicators in the scrollbar.
-    "diagnostics": true
+    "symbols_selections": true
   },
-  "gutter": {
-    // Whether to show line numbers in the gutter.
-    "line_numbers": true,
-    // Whether to show code action buttons in the gutter.
-    "code_actions": true,
-    // Whether to show fold buttons in the gutter.
-    "folds": 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:
@@ -222,8 +201,6 @@
     "default_width": 640,
     // Default height when the assistant is docked to the bottom.
     "default_height": 320,
-    // The default OpenAI API endpoint to use when starting new conversations.
-    "openai_api_url": "https://api.openai.com/v1",
     // The default OpenAI model to use when starting new conversations. This
     // setting can take three values:
     //
@@ -339,9 +316,7 @@
   "copilot": {
     // The set of glob patterns for which copilot should be disabled
     // in any matching file.
-    "disabled_globs": [
-      ".env"
-    ]
+    "disabled_globs": [".env"]
   },
   // Settings specific to journaling
   "journal": {
@@ -450,26 +425,18 @@
         // Default directories to search for virtual environments, relative
         // to the current working directory. We recommend overriding this
         // in your project's settings, rather than globally.
-        "directories": [
-          ".env",
-          "env",
-          ".venv",
-          "venv"
-        ],
+        "directories": [".env", "env", ".venv", "venv"],
         // Can also be 'csh', 'fish', and `nushell`
         "activate_script": "default"
       }
     }
     // Set the terminal's font size. If this option is not included,
     // the terminal will default to matching the buffer's font size.
-    // "font_size": 15,
+    // "font_size": "15",
     // Set the terminal's font family. If this option is not included,
     // the terminal will default to matching the buffer's font family.
     // "font_family": "Zed Mono",
-    // Sets the maximum number of lines in the terminal's scrollback buffer.
-    // Default: 10_000, maximum: 100_000 (all bigger values set will be treated as 100_000), 0 disables the scrolling.
-    // Existing terminals will not pick up this change until they are recreated.
-    // "max_scroll_history_lines": 10000,
+    // ---
   },
   // Difference settings for semantic_index
   "semantic_index": {
@@ -500,7 +467,6 @@
   "deno": {
     "enable": false
   },
-  "code_actions_on_format": {},
   // Different settings for specific languages.
   "languages": {
     "Plain Text": {
@@ -509,26 +475,16 @@
     "Elixir": {
       "tab_size": 2
     },
-    "Gleam": {
-      "tab_size": 2
-    },
     "Go": {
       "tab_size": 4,
-      "hard_tabs": true,
-      "code_actions_on_format": {
-        "source.organizeImports": true
-      }
+      "hard_tabs": true
     },
     "Markdown": {
-      "tab_size": 2,
       "soft_wrap": "preferred_line_length"
     },
     "JavaScript": {
       "tab_size": 2
     },
-    "Terraform": {
-      "tab_size": 2
-    },
     "TypeScript": {
       "tab_size": 2
     },
@@ -540,12 +496,6 @@
     },
     "JSON": {
       "tab_size": 2
-    },
-    "OCaml": {
-      "tab_size": 2
-    },
-    "OCaml Interface": {
-      "tab_size": 2
     }
   },
   // Zed's Prettier integration settings.
@@ -562,18 +512,14 @@
   "lsp": {
     // Specify the LSP name as a key here.
     // "rust-analyzer": {
-    //     // These initialization options are merged into Zed's defaults
+    //     //These initialization options are merged into Zed's defaults
     //     "initialization_options": {
-    //         "check": {
-    //             "command": "clippy" // rust-analyzer.check.command (default: "check")
+    //         "checkOnSave": {
+    //             "command": "clippy"
     //         }
     //     }
     // }
   },
-  // Vim settings
-  "vim": {
-    "use_system_clipboard": "always"
-  },
   // The server to connect to. If the environment variable
   // ZED_SERVER_URL is set, it will override this setting.
   "server_url": "https://zed.dev",
@@ -592,7 +538,7 @@
   "stable": {
     // "theme": "Andromeda"
   },
-  // Settings overrides to use when using Zed Dev.
+  // Settings overrides to use when using Zed Stable.
   // Mostly useful for developers who are managing multiple instances of Zed.
   "dev": {
     // "theme": "Andromeda"

assets/settings/initial_tasks.json

@@ -1,19 +0,0 @@
-// Static tasks configuration.
-//
-// Example:
-[
-  {
-    "label": "Example task",
-    "command": "bash",
-    // rest of the parameters are optional
-    "args": ["-c", "for i in {1..5}; do echo \"Hello $i/5\"; sleep 1; done"],
-    // Env overrides for the command, will be appended to the terminal's environment from the settings.
-    "env": { "foo": "bar" },
-    // Current working directory to spawn the command into, defaults to current project root.
-    //"cwd": "/path/to/working/directory",
-    // Whether to use a new terminal tab or reuse the existing one to spawn the process, defaults to `false`.
-    "use_new_terminal": false,
-    // Whether to allow multiple instances of the same task to be run, or rather wait for the existing ones to finish, defaults to `false`.
-    "allow_concurrent_runs": false
-  }
-]

assets/themes/andromeda/andromeda.json

@@ -42,11 +42,11 @@
         "tab_bar.background": "#21242bff",
         "tab.inactive_background": "#21242bff",
         "tab.active_background": "#1e2025ff",
-        "search.match_background": "#11a79366",
+        "search.match_background": null,
         "panel.background": "#21242bff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#f7f7f84c",
+        "scrollbar_thumb.background": "#f7f7f84c",
         "scrollbar.thumb.hover_background": "#252931ff",
         "scrollbar.thumb.border": "#252931ff",
         "scrollbar.track.background": "#00000000",

assets/themes/atelier/atelier.json

@@ -42,11 +42,11 @@
         "tab_bar.background": "#221f26ff",
         "tab.inactive_background": "#221f26ff",
         "tab.active_background": "#19171cff",
-        "search.match_background": "#576dda66",
+        "search.match_background": null,
         "panel.background": "#221f26ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#efecf44c",
+        "scrollbar_thumb.background": "#efecf44c",
         "scrollbar.thumb.hover_background": "#332f38ff",
         "scrollbar.thumb.border": "#332f38ff",
         "scrollbar.track.background": "#00000000",
@@ -426,11 +426,11 @@
         "tab_bar.background": "#e6e3ebff",
         "tab.inactive_background": "#e6e3ebff",
         "tab.active_background": "#efecf4ff",
-        "search.match_background": "#586dda66",
+        "search.match_background": null,
         "panel.background": "#e6e3ebff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#19171c4c",
+        "scrollbar_thumb.background": "#19171c4c",
         "scrollbar.thumb.hover_background": "#cbc8d1ff",
         "scrollbar.thumb.border": "#cbc8d1ff",
         "scrollbar.track.background": "#00000000",
@@ -810,11 +810,11 @@
         "tab_bar.background": "#262622ff",
         "tab.inactive_background": "#262622ff",
         "tab.active_background": "#20201dff",
-        "search.match_background": "#6684e066",
+        "search.match_background": null,
         "panel.background": "#262622ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#fefbec4c",
+        "scrollbar_thumb.background": "#fefbec4c",
         "scrollbar.thumb.hover_background": "#3b3933ff",
         "scrollbar.thumb.border": "#3b3933ff",
         "scrollbar.track.background": "#00000000",
@@ -1194,11 +1194,11 @@
         "tab_bar.background": "#eeebd7ff",
         "tab.inactive_background": "#eeebd7ff",
         "tab.active_background": "#fefbecff",
-        "search.match_background": "#6784e066",
+        "search.match_background": null,
         "panel.background": "#eeebd7ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#20201d4c",
+        "scrollbar_thumb.background": "#20201d4c",
         "scrollbar.thumb.hover_background": "#d7d3beff",
         "scrollbar.thumb.border": "#d7d3beff",
         "scrollbar.track.background": "#00000000",
@@ -1578,11 +1578,11 @@
         "tab_bar.background": "#2c2b23ff",
         "tab.inactive_background": "#2c2b23ff",
         "tab.active_background": "#22221bff",
-        "search.match_background": "#37a16666",
+        "search.match_background": null,
         "panel.background": "#2c2b23ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#f4f3ec4c",
+        "scrollbar_thumb.background": "#f4f3ec4c",
         "scrollbar.thumb.hover_background": "#3c3b31ff",
         "scrollbar.thumb.border": "#3c3b31ff",
         "scrollbar.track.background": "#00000000",
@@ -1962,11 +1962,11 @@
         "tab_bar.background": "#ebeae3ff",
         "tab.inactive_background": "#ebeae3ff",
         "tab.active_background": "#f4f3ecff",
-        "search.match_background": "#38a16666",
+        "search.match_background": null,
         "panel.background": "#ebeae3ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#22221b4c",
+        "scrollbar_thumb.background": "#22221b4c",
         "scrollbar.thumb.hover_background": "#d0cfc5ff",
         "scrollbar.thumb.border": "#d0cfc5ff",
         "scrollbar.track.background": "#00000000",
@@ -2346,11 +2346,11 @@
         "tab_bar.background": "#27211eff",
         "tab.inactive_background": "#27211eff",
         "tab.active_background": "#1b1918ff",
-        "search.match_background": "#417ee666",
+        "search.match_background": null,
         "panel.background": "#27211eff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#f0eeed4c",
+        "scrollbar_thumb.background": "#f0eeed4c",
         "scrollbar.thumb.hover_background": "#3b3431ff",
         "scrollbar.thumb.border": "#3b3431ff",
         "scrollbar.track.background": "#00000000",
@@ -2730,11 +2730,11 @@
         "tab_bar.background": "#e9e6e4ff",
         "tab.inactive_background": "#e9e6e4ff",
         "tab.active_background": "#f0eeedff",
-        "search.match_background": "#417ee666",
+        "search.match_background": null,
         "panel.background": "#e9e6e4ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#1b19184c",
+        "scrollbar_thumb.background": "#1b19184c",
         "scrollbar.thumb.hover_background": "#d6d1cfff",
         "scrollbar.thumb.border": "#d6d1cfff",
         "scrollbar.track.background": "#00000000",
@@ -3114,11 +3114,11 @@
         "tab_bar.background": "#252025ff",
         "tab.inactive_background": "#252025ff",
         "tab.active_background": "#1b181bff",
-        "search.match_background": "#526aeb66",
+        "search.match_background": null,
         "panel.background": "#252025ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#f7f3f74c",
+        "scrollbar_thumb.background": "#f7f3f74c",
         "scrollbar.thumb.hover_background": "#393239ff",
         "scrollbar.thumb.border": "#393239ff",
         "scrollbar.track.background": "#00000000",
@@ -3498,11 +3498,11 @@
         "tab_bar.background": "#e0d5e0ff",
         "tab.inactive_background": "#e0d5e0ff",
         "tab.active_background": "#f7f3f7ff",
-        "search.match_background": "#526aeb66",
+        "search.match_background": null,
         "panel.background": "#e0d5e0ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#1b181b4c",
+        "scrollbar_thumb.background": "#1b181b4c",
         "scrollbar.thumb.hover_background": "#ccbdccff",
         "scrollbar.thumb.border": "#ccbdccff",
         "scrollbar.track.background": "#00000000",
@@ -3882,11 +3882,11 @@
         "tab_bar.background": "#1c2529ff",
         "tab.inactive_background": "#1c2529ff",
         "tab.active_background": "#161b1dff",
-        "search.match_background": "#277fad66",
+        "search.match_background": null,
         "panel.background": "#1c2529ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#ebf8ff4c",
+        "scrollbar_thumb.background": "#ebf8ff4c",
         "scrollbar.thumb.hover_background": "#2c3b42ff",
         "scrollbar.thumb.border": "#2c3b42ff",
         "scrollbar.track.background": "#00000000",
@@ -4266,11 +4266,11 @@
         "tab_bar.background": "#cdeaf9ff",
         "tab.inactive_background": "#cdeaf9ff",
         "tab.active_background": "#ebf8ffff",
-        "search.match_background": "#277fad66",
+        "search.match_background": null,
         "panel.background": "#cdeaf9ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#161b1d4c",
+        "scrollbar_thumb.background": "#161b1d4c",
         "scrollbar.thumb.hover_background": "#b0d3e5ff",
         "scrollbar.thumb.border": "#b0d3e5ff",
         "scrollbar.track.background": "#00000000",
@@ -4650,11 +4650,11 @@
         "tab_bar.background": "#252020ff",
         "tab.inactive_background": "#252020ff",
         "tab.active_background": "#1b1818ff",
-        "search.match_background": "#7272ca66",
+        "search.match_background": null,
         "panel.background": "#252020ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#f4ecec4c",
+        "scrollbar_thumb.background": "#f4ecec4c",
         "scrollbar.thumb.hover_background": "#352f2fff",
         "scrollbar.thumb.border": "#352f2fff",
         "scrollbar.track.background": "#00000000",
@@ -5034,11 +5034,11 @@
         "tab_bar.background": "#ebe3e3ff",
         "tab.inactive_background": "#ebe3e3ff",
         "tab.active_background": "#f4ececff",
-        "search.match_background": "#7372ca66",
+        "search.match_background": null,
         "panel.background": "#ebe3e3ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#1b18184c",
+        "scrollbar_thumb.background": "#1b18184c",
         "scrollbar.thumb.hover_background": "#cfc7c7ff",
         "scrollbar.thumb.border": "#cfc7c7ff",
         "scrollbar.track.background": "#00000000",
@@ -5418,11 +5418,11 @@
         "tab_bar.background": "#1f2621ff",
         "tab.inactive_background": "#1f2621ff",
         "tab.active_background": "#171c19ff",
-        "search.match_background": "#478c9066",
+        "search.match_background": null,
         "panel.background": "#1f2621ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#ecf4ee4c",
+        "scrollbar_thumb.background": "#ecf4ee4c",
         "scrollbar.thumb.hover_background": "#2f3832ff",
         "scrollbar.thumb.border": "#2f3832ff",
         "scrollbar.track.background": "#00000000",
@@ -5802,11 +5802,11 @@
         "tab_bar.background": "#e3ebe6ff",
         "tab.inactive_background": "#e3ebe6ff",
         "tab.active_background": "#ecf4eeff",
-        "search.match_background": "#488c9066",
+        "search.match_background": null,
         "panel.background": "#e3ebe6ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#171c194c",
+        "scrollbar_thumb.background": "#171c194c",
         "scrollbar.thumb.hover_background": "#c8d1cbff",
         "scrollbar.thumb.border": "#c8d1cbff",
         "scrollbar.track.background": "#00000000",
@@ -6186,11 +6186,11 @@
         "tab_bar.background": "#1f231fff",
         "tab.inactive_background": "#1f231fff",
         "tab.active_background": "#131513ff",
-        "search.match_background": "#3e62f466",
+        "search.match_background": null,
         "panel.background": "#1f231fff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#f3faf34c",
+        "scrollbar_thumb.background": "#f3faf34c",
         "scrollbar.thumb.hover_background": "#333b33ff",
         "scrollbar.thumb.border": "#333b33ff",
         "scrollbar.track.background": "#00000000",
@@ -6570,11 +6570,11 @@
         "tab_bar.background": "#daeedaff",
         "tab.inactive_background": "#daeedaff",
         "tab.active_background": "#f3faf3ff",
-        "search.match_background": "#3f62f466",
+        "search.match_background": null,
         "panel.background": "#daeedaff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#1315134c",
+        "scrollbar_thumb.background": "#1315134c",
         "scrollbar.thumb.hover_background": "#bed7beff",
         "scrollbar.thumb.border": "#bed7beff",
         "scrollbar.track.background": "#00000000",
@@ -6954,11 +6954,11 @@
         "tab_bar.background": "#262f51ff",
         "tab.inactive_background": "#262f51ff",
         "tab.active_background": "#202646ff",
-        "search.match_background": "#3e8fd066",
+        "search.match_background": null,
         "panel.background": "#262f51ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#f5f7ff4c",
+        "scrollbar_thumb.background": "#f5f7ff4c",
         "scrollbar.thumb.hover_background": "#363f62ff",
         "scrollbar.thumb.border": "#363f62ff",
         "scrollbar.track.background": "#00000000",
@@ -7338,11 +7338,11 @@
         "tab_bar.background": "#e5e8f5ff",
         "tab.inactive_background": "#e5e8f5ff",
         "tab.active_background": "#f5f7ffff",
-        "search.match_background": "#3f8fd066",
+        "search.match_background": null,
         "panel.background": "#e5e8f5ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#2026464c",
+        "scrollbar_thumb.background": "#2026464c",
         "scrollbar.thumb.hover_background": "#ccd0e1ff",
         "scrollbar.thumb.border": "#ccd0e1ff",
         "scrollbar.track.background": "#00000000",

assets/themes/ayu/ayu.json

@@ -42,11 +42,11 @@
         "tab_bar.background": "#1f2127ff",
         "tab.inactive_background": "#1f2127ff",
         "tab.active_background": "#0d1016ff",
-        "search.match_background": "#5ac2fe66",
+        "search.match_background": null,
         "panel.background": "#1f2127ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#bfbdb64c",
+        "scrollbar_thumb.background": "#bfbdb64c",
         "scrollbar.thumb.hover_background": "#2d2f34ff",
         "scrollbar.thumb.border": "#2d2f34ff",
         "scrollbar.track.background": "#00000000",
@@ -411,11 +411,11 @@
         "tab_bar.background": "#ececedff",
         "tab.inactive_background": "#ececedff",
         "tab.active_background": "#fcfcfcff",
-        "search.match_background": "#3b9ee566",
+        "search.match_background": null,
         "panel.background": "#ececedff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#5c61664c",
+        "scrollbar_thumb.background": "#5c61664c",
         "scrollbar.thumb.hover_background": "#dfe0e1ff",
         "scrollbar.thumb.border": "#dfe0e1ff",
         "scrollbar.track.background": "#00000000",
@@ -780,11 +780,11 @@
         "tab_bar.background": "#353944ff",
         "tab.inactive_background": "#353944ff",
         "tab.active_background": "#242835ff",
-        "search.match_background": "#73cffe66",
+        "search.match_background": null,
         "panel.background": "#353944ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#cccac24c",
+        "scrollbar_thumb.background": "#cccac24c",
         "scrollbar.thumb.hover_background": "#43464fff",
         "scrollbar.thumb.border": "#43464fff",
         "scrollbar.track.background": "#00000000",

assets/themes/gruvbox/gruvbox.json

@@ -42,11 +42,11 @@
         "tab_bar.background": "#3a3735ff",
         "tab.inactive_background": "#3a3735ff",
         "tab.active_background": "#282828ff",
-        "search.match_background": "#83a59866",
+        "search.match_background": null,
         "panel.background": "#3a3735ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#fbf1c74c",
+        "scrollbar_thumb.background": "#fbf1c74c",
         "scrollbar.thumb.hover_background": "#494340ff",
         "scrollbar.thumb.border": "#494340ff",
         "scrollbar.track.background": "#00000000",
@@ -416,11 +416,11 @@
         "tab_bar.background": "#393634ff",
         "tab.inactive_background": "#393634ff",
         "tab.active_background": "#1d2021ff",
-        "search.match_background": "#83a59866",
+        "search.match_background": null,
         "panel.background": "#393634ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#fbf1c74c",
+        "scrollbar_thumb.background": "#fbf1c74c",
         "scrollbar.thumb.hover_background": "#494340ff",
         "scrollbar.thumb.border": "#494340ff",
         "scrollbar.track.background": "#00000000",
@@ -790,11 +790,11 @@
         "tab_bar.background": "#3b3735ff",
         "tab.inactive_background": "#3b3735ff",
         "tab.active_background": "#32302fff",
-        "search.match_background": "#83a59866",
+        "search.match_background": null,
         "panel.background": "#3b3735ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#fbf1c74c",
+        "scrollbar_thumb.background": "#fbf1c74c",
         "scrollbar.thumb.hover_background": "#494340ff",
         "scrollbar.thumb.border": "#494340ff",
         "scrollbar.track.background": "#00000000",
@@ -1164,11 +1164,11 @@
         "tab_bar.background": "#ecddb4ff",
         "tab.inactive_background": "#ecddb4ff",
         "tab.active_background": "#fbf1c7ff",
-        "search.match_background": "#0b667866",
+        "search.match_background": null,
         "panel.background": "#ecddb4ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#2828284c",
+        "scrollbar_thumb.background": "#2828284c",
         "scrollbar.thumb.hover_background": "#ddcca7ff",
         "scrollbar.thumb.border": "#ddcca7ff",
         "scrollbar.track.background": "#00000000",
@@ -1538,11 +1538,11 @@
         "tab_bar.background": "#ecddb5ff",
         "tab.inactive_background": "#ecddb5ff",
         "tab.active_background": "#f9f5d7ff",
-        "search.match_background": "#0b667866",
+        "search.match_background": null,
         "panel.background": "#ecddb5ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#2828284c",
+        "scrollbar_thumb.background": "#2828284c",
         "scrollbar.thumb.hover_background": "#ddcca7ff",
         "scrollbar.thumb.border": "#ddcca7ff",
         "scrollbar.track.background": "#00000000",
@@ -1912,11 +1912,11 @@
         "tab_bar.background": "#ecdcb3ff",
         "tab.inactive_background": "#ecdcb3ff",
         "tab.active_background": "#f2e5bcff",
-        "search.match_background": "#0b667866",
+        "search.match_background": null,
         "panel.background": "#ecdcb3ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#2828284c",
+        "scrollbar_thumb.background": "#2828284c",
         "scrollbar.thumb.hover_background": "#ddcca7ff",
         "scrollbar.thumb.border": "#ddcca7ff",
         "scrollbar.track.background": "#00000000",

assets/themes/one/one.json

@@ -42,11 +42,11 @@
         "tab_bar.background": "#2f343eff",
         "tab.inactive_background": "#2f343eff",
         "tab.active_background": "#282c33ff",
-        "search.match_background": "#74ade866",
+        "search.match_background": null,
         "panel.background": "#2f343eff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#c8ccd44c",
+        "scrollbar_thumb.background": "#c8ccd44c",
         "scrollbar.thumb.hover_background": "#363c46ff",
         "scrollbar.thumb.border": "#363c46ff",
         "scrollbar.track.background": "#00000000",
@@ -416,11 +416,11 @@
         "tab_bar.background": "#ebebecff",
         "tab.inactive_background": "#ebebecff",
         "tab.active_background": "#fafafaff",
-        "search.match_background": "#5c79e266",
+        "search.match_background": null,
         "panel.background": "#ebebecff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#383a414c",
+        "scrollbar_thumb.background": "#383a414c",
         "scrollbar.thumb.hover_background": "#dfdfe0ff",
         "scrollbar.thumb.border": "#dfdfe0ff",
         "scrollbar.track.background": "#00000000",

assets/themes/rose_pine/rose_pine.json

@@ -42,11 +42,11 @@
         "tab_bar.background": "#1c1b2aff",
         "tab.inactive_background": "#1c1b2aff",
         "tab.active_background": "#191724ff",
-        "search.match_background": "#57949f66",
+        "search.match_background": null,
         "panel.background": "#1c1b2aff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#e0def44c",
+        "scrollbar_thumb.background": "#e0def44c",
         "scrollbar.thumb.hover_background": "#232132ff",
         "scrollbar.thumb.border": "#232132ff",
         "scrollbar.track.background": "#00000000",
@@ -421,11 +421,11 @@
         "tab_bar.background": "#fef9f2ff",
         "tab.inactive_background": "#fef9f2ff",
         "tab.active_background": "#faf4edff",
-        "search.match_background": "#9cced766",
+        "search.match_background": null,
         "panel.background": "#fef9f2ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#5752794c",
+        "scrollbar_thumb.background": "#5752794c",
         "scrollbar.thumb.hover_background": "#e5e0dfff",
         "scrollbar.thumb.border": "#e5e0dfff",
         "scrollbar.track.background": "#00000000",
@@ -800,11 +800,11 @@
         "tab_bar.background": "#28253cff",
         "tab.inactive_background": "#28253cff",
         "tab.active_background": "#232136ff",
-        "search.match_background": "#9cced766",
+        "search.match_background": null,
         "panel.background": "#28253cff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#e0def44c",
+        "scrollbar_thumb.background": "#e0def44c",
         "scrollbar.thumb.hover_background": "#322f48ff",
         "scrollbar.thumb.border": "#322f48ff",
         "scrollbar.track.background": "#00000000",

assets/themes/sandcastle/sandcastle.json

@@ -42,11 +42,11 @@
         "tab_bar.background": "#2b3038ff",
         "tab.inactive_background": "#2b3038ff",
         "tab.active_background": "#282c33ff",
-        "search.match_background": "#528b8b66",
+        "search.match_background": null,
         "panel.background": "#2b3038ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#fdf4c14c",
+        "scrollbar_thumb.background": "#fdf4c14c",
         "scrollbar.thumb.hover_background": "#313741ff",
         "scrollbar.thumb.border": "#313741ff",
         "scrollbar.track.background": "#00000000",

assets/themes/solarized/solarized.json

@@ -42,11 +42,11 @@
         "tab_bar.background": "#04313bff",
         "tab.inactive_background": "#04313bff",
         "tab.active_background": "#002a35ff",
-        "search.match_background": "#288bd166",
+        "search.match_background": null,
         "panel.background": "#04313bff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#fdf6e34c",
+        "scrollbar_thumb.background": "#fdf6e34c",
         "scrollbar.thumb.hover_background": "#053541ff",
         "scrollbar.thumb.border": "#053541ff",
         "scrollbar.track.background": "#00000000",
@@ -411,11 +411,11 @@
         "tab_bar.background": "#f3eddaff",
         "tab.inactive_background": "#f3eddaff",
         "tab.active_background": "#fdf6e3ff",
-        "search.match_background": "#298bd166",
+        "search.match_background": null,
         "panel.background": "#f3eddaff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#002a354c",
+        "scrollbar_thumb.background": "#002a354c",
         "scrollbar.thumb.hover_background": "#dcdacbff",
         "scrollbar.thumb.border": "#dcdacbff",
         "scrollbar.track.background": "#00000000",

assets/themes/summercamp/summercamp.json

@@ -42,11 +42,11 @@
         "tab_bar.background": "#231f16ff",
         "tab.inactive_background": "#231f16ff",
         "tab.active_background": "#1b1810ff",
-        "search.match_background": "#499bef66",
+        "search.match_background": null,
         "panel.background": "#231f16ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
-        "scrollbar.thumb.background": "#f8f5de4c",
+        "scrollbar_thumb.background": "#f8f5de4c",
         "scrollbar.thumb.hover_background": "#29251bff",
         "scrollbar.thumb.border": "#29251bff",
         "scrollbar.track.background": "#00000000",

crates/activity_indicator/Cargo.toml

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

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

@@ -103,7 +103,6 @@ pub struct OpenAiResponseStreamEvent {
 }
 
 pub async fn stream_completion(
-    api_url: String,
     credential: ProviderCredential,
     executor: BackgroundExecutor,
     request: Box<dyn CompletionRequest>,
@@ -118,7 +117,7 @@ pub async fn stream_completion(
     let (tx, rx) = futures::channel::mpsc::unbounded::<Result<OpenAiResponseStreamEvent>>();
 
     let json_data = request.data()?;
-    let mut response = Request::post(format!("{api_url}/chat/completions"))
+    let mut response = Request::post(format!("{OPEN_AI_API_URL}/chat/completions"))
         .header("Content-Type", "application/json")
         .header("Authorization", format!("Bearer {}", api_key))
         .body(json_data)?
@@ -196,20 +195,18 @@ pub async fn stream_completion(
 
 #[derive(Clone)]
 pub struct OpenAiCompletionProvider {
-    api_url: String,
     model: OpenAiLanguageModel,
     credential: Arc<RwLock<ProviderCredential>>,
     executor: BackgroundExecutor,
 }
 
 impl OpenAiCompletionProvider {
-    pub async fn new(api_url: String, model_name: String, executor: BackgroundExecutor) -> Self {
+    pub async fn new(model_name: String, executor: BackgroundExecutor) -> Self {
         let model = executor
             .spawn(async move { OpenAiLanguageModel::load(&model_name) })
             .await;
         let credential = Arc::new(RwLock::new(ProviderCredential::NoCredentials));
         Self {
-            api_url,
             model,
             credential,
             executor,
@@ -306,8 +303,7 @@ impl CompletionProvider for OpenAiCompletionProvider {
         // which is currently model based, due to the language model.
         // At some point in the future we should rectify this.
         let credential = self.credential.read().clone();
-        let api_url = self.api_url.clone();
-        let request = stream_completion(api_url, credential, self.executor.clone(), prompt);
+        let request = stream_completion(credential, self.executor.clone(), prompt);
         async move {
             let response = request.await?;
             let stream = response

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

@@ -35,7 +35,6 @@ lazy_static! {
 
 #[derive(Clone)]
 pub struct OpenAiEmbeddingProvider {
-    api_url: String,
     model: OpenAiLanguageModel,
     credential: Arc<RwLock<ProviderCredential>>,
     pub client: Arc<dyn HttpClient>,
@@ -70,11 +69,7 @@ struct OpenAiEmbeddingUsage {
 }
 
 impl OpenAiEmbeddingProvider {
-    pub async fn new(
-        api_url: String,
-        client: Arc<dyn HttpClient>,
-        executor: BackgroundExecutor,
-    ) -> Self {
+    pub async fn new(client: Arc<dyn HttpClient>, executor: BackgroundExecutor) -> Self {
         let (rate_limit_count_tx, rate_limit_count_rx) = watch::channel_with(None);
         let rate_limit_count_tx = Arc::new(Mutex::new(rate_limit_count_tx));
 
@@ -85,7 +80,6 @@ impl OpenAiEmbeddingProvider {
         let credential = Arc::new(RwLock::new(ProviderCredential::NoCredentials));
 
         OpenAiEmbeddingProvider {
-            api_url,
             model,
             credential,
             client,
@@ -136,12 +130,11 @@ impl OpenAiEmbeddingProvider {
     }
     async fn send_request(
         &self,
-        api_url: &str,
         api_key: &str,
         spans: Vec<&str>,
         request_timeout: u64,
     ) -> Result<Response<AsyncBody>> {
-        let request = Request::post(format!("{api_url}/embeddings"))
+        let request = Request::post("https://api.openai.com/v1/embeddings")
             .redirect_policy(isahc::config::RedirectPolicy::Follow)
             .timeout(Duration::from_secs(request_timeout))
             .header("Content-Type", "application/json")
@@ -253,7 +246,6 @@ impl EmbeddingProvider for OpenAiEmbeddingProvider {
         const BACKOFF_SECONDS: [usize; 4] = [3, 5, 15, 45];
         const MAX_RETRIES: usize = 4;
 
-        let api_url = self.api_url.as_str();
         let api_key = self.get_api_key()?;
 
         let mut request_number = 0;
@@ -263,7 +255,6 @@ impl EmbeddingProvider for OpenAiEmbeddingProvider {
         while request_number < MAX_RETRIES {
             response = self
                 .send_request(
-                    &api_url,
                     &api_key,
                     spans.iter().map(|x| &**x).collect(),
                     request_timeout,

crates/assets/Cargo.toml

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

crates/assistant/Cargo.toml

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

crates/assistant/src/assistant.rs

@@ -1,5 +1,5 @@
 pub mod assistant_panel;
-pub mod assistant_settings;
+mod assistant_settings;
 mod codegen;
 mod prompts;
 mod streaming_diff;
@@ -68,7 +68,6 @@ struct SavedConversation {
     messages: Vec<SavedMessage>,
     message_metadata: HashMap<MessageId, MessageMetadata>,
     summary: String,
-    api_url: Option<String>,
     model: OpenAiModel,
 }
 

crates/assistant/src/assistant_panel.rs

@@ -7,7 +7,6 @@ use crate::{
     SavedMessage, Split, ToggleFocus, ToggleIncludeConversation, ToggleRetrieveContext,
 };
 use ai::prompts::repository_context::PromptCodeSnippet;
-use ai::providers::open_ai::OPEN_AI_API_URL;
 use ai::{
     auth::ProviderCredential,
     completion::{CompletionProvider, CompletionRequest},
@@ -122,19 +121,10 @@ impl AssistantPanel {
                 .await
                 .log_err()
                 .unwrap_or_default();
-            let (api_url, model_name) = cx.update(|cx| {
-                let settings = AssistantSettings::get_global(cx);
-                (
-                    settings.openai_api_url.clone(),
-                    settings.default_open_ai_model.full_name().to_string(),
-                )
-            })?;
-            let completion_provider = OpenAiCompletionProvider::new(
-                api_url,
-                model_name,
-                cx.background_executor().clone(),
-            )
-            .await;
+            // Defaulting currently to GPT4, allow for this to be set via config.
+            let completion_provider =
+                OpenAiCompletionProvider::new("gpt-4".into(), cx.background_executor().clone())
+                    .await;
 
             // TODO: deserialize state.
             let workspace_handle = workspace.clone();
@@ -362,7 +352,7 @@ impl AssistantPanel {
                         move |cx: &mut BlockContext| {
                             measurements.set(BlockMeasurements {
                                 anchor_x: cx.anchor_x,
-                                gutter_width: cx.gutter_dimensions.width,
+                                gutter_width: cx.gutter_width,
                             });
                             inline_assistant.clone().into_any_element()
                         }
@@ -972,7 +962,6 @@ impl AssistantPanel {
             line_height: relative(1.3).into(),
             background_color: None,
             underline: None,
-            strikethrough: None,
             white_space: WhiteSpace::Normal,
         };
         EditorElement::new(
@@ -1417,7 +1406,6 @@ struct Conversation {
     completion_count: usize,
     pending_completions: Vec<PendingCompletion>,
     model: OpenAiModel,
-    api_url: Option<String>,
     token_count: Option<usize>,
     max_token_count: usize,
     pending_token_count: Task<Option<()>>,
@@ -1452,7 +1440,6 @@ impl Conversation {
 
         let settings = AssistantSettings::get_global(cx);
         let model = settings.default_open_ai_model.clone();
-        let api_url = settings.openai_api_url.clone();
 
         let mut this = Self {
             id: Some(Uuid::new_v4().to_string()),
@@ -1466,7 +1453,6 @@ impl Conversation {
             token_count: None,
             max_token_count: tiktoken_rs::model::get_context_size(&model.full_name()),
             pending_token_count: Task::ready(None),
-            api_url: Some(api_url),
             model: model.clone(),
             _subscriptions: vec![cx.subscribe(&buffer, Self::handle_buffer_event)],
             pending_save: Task::ready(Ok(())),
@@ -1512,7 +1498,6 @@ impl Conversation {
                 .map(|summary| summary.text.clone())
                 .unwrap_or_default(),
             model: self.model.clone(),
-            api_url: self.api_url.clone(),
         }
     }
 
@@ -1527,12 +1512,8 @@ impl Conversation {
             None => Some(Uuid::new_v4().to_string()),
         };
         let model = saved_conversation.model;
-        let api_url = saved_conversation.api_url;
         let completion_provider: Arc<dyn CompletionProvider> = Arc::new(
             OpenAiCompletionProvider::new(
-                api_url
-                    .clone()
-                    .unwrap_or_else(|| OPEN_AI_API_URL.to_string()),
                 model.full_name().into(),
                 cx.background_executor().clone(),
             )
@@ -1585,7 +1566,6 @@ impl Conversation {
                 token_count: None,
                 max_token_count: tiktoken_rs::model::get_context_size(&model.full_name()),
                 pending_token_count: Task::ready(None),
-                api_url,
                 model,
                 _subscriptions: vec![cx.subscribe(&buffer, Self::handle_buffer_event)],
                 pending_save: Task::ready(Ok(())),
@@ -3186,7 +3166,6 @@ impl InlineAssistant {
             line_height: relative(1.3).into(),
             background_color: None,
             underline: None,
-            strikethrough: None,
             white_space: WhiteSpace::Normal,
         };
         EditorElement::new(

crates/assistant/src/assistant_settings.rs

@@ -55,7 +55,6 @@ pub struct AssistantSettings {
     pub default_width: Pixels,
     pub default_height: Pixels,
     pub default_open_ai_model: OpenAiModel,
-    pub openai_api_url: String,
 }
 
 /// Assistant panel settings
@@ -81,10 +80,6 @@ pub struct AssistantSettingsContent {
     ///
     /// Default: gpt-4-1106-preview
     pub default_open_ai_model: Option<OpenAiModel>,
-    /// OpenAI API base URL to use when starting new conversations.
-    ///
-    /// Default: https://api.openai.com/v1
-    pub openai_api_url: Option<String>,
 }
 
 impl Settings for AssistantSettings {

crates/assistant/src/codegen.rs

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

crates/assistant/src/prompts.rs

@@ -172,24 +172,22 @@ 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,
-        LanguageMatcher, Point,
+        language_settings, tree_sitter_rust, Buffer, BufferId, Language, LanguageConfig, Point,
     };
     use settings::SettingsStore;
-    use std::sync::Arc;
 
     pub(crate) fn rust_lang() -> Language {
         Language::new(
             LanguageConfig {
                 name: "Rust".into(),
-                matcher: LanguageMatcher {
-                    path_suffixes: vec!["rs".to_string()],
-                    ..Default::default()
-                },
+                path_suffixes: vec!["rs".to_string()],
                 ..Default::default()
             },
             Some(tree_sitter_rust::language()),

crates/audio/Cargo.toml

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

crates/auto_update/Cargo.toml

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

crates/auto_update/src/auto_update.rs

@@ -4,14 +4,12 @@ use anyhow::{anyhow, Context, Result};
 use client::{Client, TelemetrySettings, ZED_APP_PATH};
 use db::kvp::KEY_VALUE_STORE;
 use db::RELEASE_CHANNEL;
-use editor::{Editor, MultiBuffer};
 use gpui::{
     actions, AppContext, AsyncAppContext, Context as _, Global, Model, ModelContext,
-    SemanticVersion, SharedString, Task, View, ViewContext, VisualContext, WindowContext,
+    SemanticVersion, Task, ViewContext, VisualContext, WindowContext,
 };
 use isahc::AsyncBody;
 
-use markdown_preview::markdown_preview_view::MarkdownPreviewView;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use serde_derive::Serialize;
@@ -28,24 +26,13 @@ use std::{
     time::Duration,
 };
 use update_notification::UpdateNotification;
-use util::{
-    http::{HttpClient, ZedHttpClient},
-    ResultExt,
-};
+use util::http::{HttpClient, ZedHttpClient};
 use workspace::Workspace;
 
 const SHOULD_SHOW_UPDATE_NOTIFICATION_KEY: &str = "auto-updater-should-show-updated-notification";
 const POLL_INTERVAL: Duration = Duration::from_secs(60 * 60);
 
-actions!(
-    auto_update,
-    [
-        Check,
-        DismissErrorMessage,
-        ViewReleaseNotes,
-        ViewReleaseNotesLocally
-    ]
-);
+actions!(auto_update, [Check, DismissErrorMessage, ViewReleaseNotes]);
 
 #[derive(Serialize)]
 struct UpdateRequestBody {
@@ -109,12 +96,6 @@ struct GlobalAutoUpdate(Option<Model<AutoUpdater>>);
 
 impl Global for GlobalAutoUpdate {}
 
-#[derive(Deserialize)]
-struct ReleaseNotesBody {
-    title: String,
-    release_notes: String,
-}
-
 pub fn init(http_client: Arc<ZedHttpClient>, cx: &mut AppContext) {
     AutoUpdateSetting::register(cx);
 
@@ -124,10 +105,6 @@ pub fn init(http_client: Arc<ZedHttpClient>, cx: &mut AppContext) {
         workspace.register_action(|_, action, cx| {
             view_release_notes(action, cx);
         });
-
-        workspace.register_action(|workspace, _: &ViewReleaseNotesLocally, cx| {
-            view_release_notes_locally(workspace, cx);
-        });
     })
     .detach();
 
@@ -188,71 +165,6 @@ pub fn view_release_notes(_: &ViewReleaseNotes, cx: &mut AppContext) -> Option<(
     None
 }
 
-fn view_release_notes_locally(workspace: &mut Workspace, cx: &mut ViewContext<Workspace>) {
-    let release_channel = ReleaseChannel::global(cx);
-    let version = env!("CARGO_PKG_VERSION");
-
-    let client = client::Client::global(cx).http_client();
-    let url = client.zed_url(&format!(
-        "/api/release_notes/{}/{}",
-        release_channel.dev_name(),
-        version
-    ));
-
-    let markdown = workspace
-        .app_state()
-        .languages
-        .language_for_name("Markdown");
-
-    workspace
-        .with_local_workspace(cx, move |_, cx| {
-            cx.spawn(|workspace, mut cx| async move {
-                let markdown = markdown.await.log_err();
-                let response = client.get(&url, Default::default(), true).await;
-                let Some(mut response) = response.log_err() else {
-                    return;
-                };
-
-                let mut body = Vec::new();
-                response.body_mut().read_to_end(&mut body).await.ok();
-
-                let body: serde_json::Result<ReleaseNotesBody> =
-                    serde_json::from_slice(body.as_slice());
-
-                if let Ok(body) = body {
-                    workspace
-                        .update(&mut cx, |workspace, cx| {
-                            let project = workspace.project().clone();
-                            let buffer = project
-                                .update(cx, |project, cx| project.create_buffer("", markdown, cx))
-                                .expect("creating buffers on a local workspace always succeeds");
-                            buffer.update(cx, |buffer, cx| {
-                                buffer.edit([(0..0, body.release_notes)], None, cx)
-                            });
-
-                            let buffer = cx.new_model(|cx| MultiBuffer::singleton(buffer, cx));
-
-                            let tab_description = SharedString::from(body.title.to_string());
-                            let editor = cx
-                                .new_view(|cx| Editor::for_multibuffer(buffer, Some(project), cx));
-                            let workspace_handle = workspace.weak_handle();
-                            let view: View<MarkdownPreviewView> = MarkdownPreviewView::new(
-                                editor,
-                                workspace_handle,
-                                Some(tab_description),
-                                cx,
-                            );
-                            workspace.add_item(Box::new(view.clone()), cx);
-                            cx.notify();
-                        })
-                        .log_err();
-                }
-            })
-            .detach();
-        })
-        .detach();
-}
-
 pub fn notify_of_any_new_update(cx: &mut ViewContext<Workspace>) -> Option<()> {
     let updater = AutoUpdater::get(cx)?;
     let version = updater.read(cx).current_version;

crates/auto_update/src/update_notification.rs

@@ -40,11 +40,10 @@ impl Render for UpdateNotification {
                     .id("notes")
                     .child(Label::new("View the release notes"))
                     .cursor_pointer()
-                    .on_click(cx.listener(|this, _, cx| {
+                    .on_click(|_, 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.workspace = true
-editor.workspace = true
-gpui.workspace = true
+collections = { path = "../collections" }
+editor = { path = "../editor" }
+gpui = { path = "../gpui" }
 itertools = "0.10"
-language.workspace = true
-outline.workspace = true
-project.workspace = true
-search.workspace = true
-settings.workspace = true
-theme.workspace = true
-ui.workspace = true
-workspace.workspace = true
+language = { path = "../language" }
+outline = { path = "../outline" }
+project = { path = "../project" }
+search = { path = "../search" }
+settings = { path = "../settings" }
+theme = { path = "../theme" }
+ui = { path = "../ui" }
+workspace = { path = "../workspace" }
 
 [dev-dependencies]
-editor = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-workspace = { workspace = true, features = ["test-support"] }
+editor = { path = "../editor", features = ["test-support"] }
+gpui = { path = "../gpui", features = ["test-support"] }
+workspace = { path = "../workspace", features = ["test-support"] }

crates/call/Cargo.toml

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

crates/call/src/call_settings.rs

@@ -7,7 +7,6 @@ use settings::Settings;
 #[derive(Deserialize, Debug)]
 pub struct CallSettings {
     pub mute_on_join: bool,
-    pub share_on_join: bool,
 }
 
 /// Configuration of voice calls in Zed.
@@ -17,11 +16,6 @@ pub struct CallSettingsContent {
     ///
     /// Default: false
     pub mute_on_join: Option<bool>,
-
-    /// Whether your current project should be shared when joining an empty channel.
-    ///
-    /// Default: true
-    pub share_on_join: Option<bool>,
 }
 
 impl Settings for CallSettings {

crates/call/src/room.rs

@@ -156,7 +156,7 @@ impl Room {
             cx.spawn(|this, mut cx| async move {
                 connect.await?;
                 this.update(&mut cx, |this, cx| {
-                    if this.can_use_microphone() {
+                    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);
@@ -617,10 +617,6 @@ impl Room {
         self.local_participant.role == proto::ChannelRole::Admin
     }
 
-    pub fn local_participant_is_guest(&self) -> bool {
-        self.local_participant.role == proto::ChannelRole::Guest
-    }
-
     pub fn set_participant_role(
         &mut self,
         user_id: u64,
@@ -1206,7 +1202,7 @@ impl Room {
         })
     }
 
-    pub fn share_project(
+    pub(crate) fn share_project(
         &mut self,
         project: Model<Project>,
         cx: &mut ModelContext<Self>,
@@ -1322,6 +1318,11 @@ impl Room {
         })
     }
 
+    pub fn read_only(&self) -> bool {
+        !(self.local_participant().role == proto::ChannelRole::Member
+            || self.local_participant().role == proto::ChannelRole::Admin)
+    }
+
     pub fn is_speaking(&self) -> bool {
         self.live_kit
             .as_ref()
@@ -1332,22 +1333,6 @@ impl Room {
         self.live_kit.as_ref().map(|live_kit| live_kit.deafened)
     }
 
-    pub fn can_use_microphone(&self) -> bool {
-        use proto::ChannelRole::*;
-        match self.local_participant.role {
-            Admin | Member | Talker => true,
-            Guest | Banned => false,
-        }
-    }
-
-    pub fn can_share_projects(&self) -> bool {
-        use proto::ChannelRole::*;
-        match self.local_participant.role {
-            Admin | Member => true,
-            Guest | Banned | Talker => false,
-        }
-    }
-
     #[track_caller]
     pub fn share_microphone(&mut self, cx: &mut ModelContext<Self>) -> Task<Result<()>> {
         if self.status.is_offline() {

crates/channel/Cargo.toml

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

crates/channel/src/channel_chat.rs

@@ -5,13 +5,12 @@ 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, WeakModel,
-};
+use gpui::{AppContext, AsyncAppContext, Context, EventEmitter, Model, ModelContext, Task};
 use rand::prelude::*;
 use std::{
+    collections::HashSet,
+    mem,
     ops::{ControlFlow, Range},
     sync::Arc,
 };
@@ -27,7 +26,6 @@ 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<()>>,
@@ -39,7 +37,6 @@ 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)]
@@ -50,7 +47,6 @@ 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)]
@@ -59,15 +55,6 @@ 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,
@@ -109,35 +96,28 @@ 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;
 
-        let handle = cx.new_model(|cx| {
+        Ok(cx.new_model(|cx| {
             cx.on_release(Self::release).detach();
-            Self {
+            let mut this = Self {
                 channel_id: channel.id,
-                user_store: user_store.clone(),
+                user_store,
                 channel_store,
-                rpc: client.clone(),
+                rpc: client,
                 outgoing_messages_lock: Default::default(),
                 messages: Default::default(),
                 acknowledged_message_ids: Default::default(),
-                loaded_all_messages: false,
+                loaded_all_messages,
                 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()),
-            }
-        })?;
-        Self::handle_loaded_messages(
-            handle.downgrade(),
-            user_store,
-            client,
-            response.messages,
-            response.done,
-            &mut cx,
-        )
-        .await?;
-        Ok(handle)
+            };
+            this.insert_messages(messages, cx);
+            this
+        })?)
     }
 
     fn release(&mut self, _: &mut AppContext) {
@@ -186,7 +166,6 @@ impl ChannelChat {
                     timestamp: OffsetDateTime::now_utc(),
                     mentions: message.mentions.clone(),
                     nonce,
-                    reply_to_message_id: message.reply_to_message_id,
                 },
                 &(),
             ),
@@ -204,7 +183,6 @@ 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);
@@ -249,16 +227,12 @@ impl ChannelChat {
                         before_message_id,
                     })
                     .await?;
-                Self::handle_loaded_messages(
-                    this,
-                    user_store,
-                    rpc,
-                    response.messages,
-                    response.done,
-                    &mut cx,
-                )
-                .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);
+                })?;
                 anyhow::Ok(())
             }
             .log_err()
@@ -266,14 +240,9 @@ impl ChannelChat {
     }
 
     pub fn first_loaded_message_id(&mut self) -> Option<u64> {
-        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,
+        self.messages.first().and_then(|message| match message.id {
+            ChannelMessageId::Saved(id) => Some(id),
+            ChannelMessageId::Pending(_) => None,
         })
     }
 
@@ -335,66 +304,6 @@ 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();
@@ -402,17 +311,28 @@ impl ChannelChat {
         cx.spawn(move |this, mut cx| {
             async move {
                 let response = rpc.request(proto::JoinChannelChat { channel_id }).await?;
-                Self::handle_loaded_messages(
-                    this.clone(),
-                    user_store.clone(),
-                    rpc.clone(),
-                    response.messages,
-                    response.done,
-                    &mut cx,
-                )
-                .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;
+                    }
 
-                let pending_messages = this.update(&mut cx, |this, _| {
                     this.pending_messages().cloned().collect::<Vec<_>>()
                 })?;
 
@@ -422,7 +342,6 @@ 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(
@@ -634,7 +553,6 @@ impl ChannelMessage {
                 .nonce
                 .ok_or_else(|| anyhow!("nonce is required"))?
                 .into(),
-            reply_to_message_id: message.reply_to_message_id,
         })
     }
 
@@ -724,7 +642,6 @@ 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,19 +74,11 @@ impl Channel {
     pub fn link(&self) -> String {
         RELEASE_CHANNEL.link_prefix().to_owned()
             + "channel/"
-            + &Self::slug(&self.name)
+            + &self.slug()
             + "-"
             + &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()
     }
@@ -98,8 +90,9 @@ impl Channel {
             .unwrap_or(self.id)
     }
 
-    pub fn slug(str: &str) -> String {
-        let slug: String = str
+    pub fn slug(&self) -> String {
+        let slug: String = self
+            .name
             .chars()
             .map(|c| if c.is_alphanumeric() { c } else { '-' })
             .collect();
@@ -120,8 +113,7 @@ impl ChannelMembership {
                 proto::ChannelRole::Admin => 0,
                 proto::ChannelRole::Member => 1,
                 proto::ChannelRole::Banned => 2,
-                proto::ChannelRole::Talker => 3,
-                proto::ChannelRole::Guest => 4,
+                proto::ChannelRole::Guest => 3,
             },
             kind_order: match self.kind {
                 proto::channel_member::Kind::Member => 0,
@@ -349,21 +341,6 @@ impl ChannelStore {
             .is_some_and(|state| state.has_new_messages())
     }
 
-    pub fn last_acknowledge_message_id(&self, channel_id: ChannelId) -> Option<u64> {
-        self.channel_states.get(&channel_id).and_then(|state| {
-            if let Some(last_message_id) = state.latest_chat_message {
-                if state
-                    .last_acknowledged_message_id()
-                    .is_some_and(|id| id < last_message_id)
-                {
-                    return state.last_acknowledged_message_id();
-                }
-            }
-
-            None
-        })
-    }
-
     pub fn acknowledge_message_id(
         &mut self,
         channel_id: ChannelId,
@@ -1147,10 +1124,9 @@ impl ChannelState {
         if let Some(latest_version) = &self.latest_notes_versions {
             if let Some(observed_version) = &self.observed_notes_versions {
                 latest_version.epoch > observed_version.epoch
-                    || (latest_version.epoch == observed_version.epoch
-                        && latest_version
-                            .version
-                            .changed_since(&observed_version.version))
+                    || latest_version
+                        .version
+                        .changed_since(&observed_version.version)
             } else {
                 true
             }
@@ -1168,10 +1144,6 @@ impl ChannelState {
         })
     }
 
-    fn last_acknowledged_message_id(&self) -> Option<u64> {
-        self.observed_chat_message
-    }
-
     fn acknowledge_message_id(&mut self, message_id: u64) {
         let observed = self.observed_chat_message.get_or_insert(message_id);
         *observed = (*observed).max(message_id);

crates/channel/src/channel_store_tests.rs

@@ -2,7 +2,6 @@ use crate::channel_chat::ChannelChatEvent;
 
 use super::*;
 use client::{test::FakeServer, Client, UserStore};
-use clock::FakeSystemClock;
 use gpui::{AppContext, Context, Model, TestAppContext};
 use rpc::proto::{self};
 use settings::SettingsStore;
@@ -185,7 +184,6 @@ 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,
@@ -194,7 +192,6 @@ async fn test_channel_messages(cx: &mut TestAppContext) {
                     sender_id: 6,
                     mentions: vec![],
                     nonce: Some(2.into()),
-                    reply_to_message_id: None,
                 },
             ],
             done: false,
@@ -242,7 +239,6 @@ async fn test_channel_messages(cx: &mut TestAppContext) {
             sender_id: 7,
             mentions: vec![],
             nonce: Some(3.into()),
-            reply_to_message_id: None,
         }),
     });
 
@@ -296,7 +292,6 @@ 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,
@@ -305,7 +300,6 @@ async fn test_channel_messages(cx: &mut TestAppContext) {
                     sender_id: 6,
                     nonce: Some(5.into()),
                     mentions: vec![],
-                    reply_to_message_id: None,
                 },
             ],
         },
@@ -338,9 +332,8 @@ fn init_test(cx: &mut AppContext) -> Model<ChannelStore> {
     release_channel::init("0.0.0", cx);
     client::init_settings(cx);
 
-    let clock = Arc::new(FakeSystemClock::default());
     let http = FakeHttpClient::with_404_response();
-    let client = Client::new(clock, http.clone(), cx);
+    let client = Client::new(http.clone(), cx);
     let user_store = cx.new_model(|cx| UserStore::new(client.clone(), cx));
 
     client::init(&client, cx);

crates/cli/Cargo.toml

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

crates/cli/src/main.rs

@@ -1,14 +1,20 @@
-#![cfg_attr(target_os = "linux", allow(dead_code))]
-
 use anyhow::{anyhow, Context, Result};
 use clap::Parser;
-use cli::{CliRequest, CliResponse};
+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 serde::Deserialize;
 use std::{
     ffi::OsStr,
     fs::{self, OpenOptions},
     io,
     path::{Path, PathBuf},
+    ptr,
 };
 use util::paths::PathLikeWithPosition;
 
@@ -106,6 +112,136 @@ 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(()),
@@ -123,187 +259,3 @@ 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

@@ -10,25 +10,24 @@ path = "src/client.rs"
 doctest = false
 
 [features]
-test-support = ["clock/test-support", "collections/test-support", "gpui/test-support", "rpc/test-support"]
+test-support = ["collections/test-support", "gpui/test-support", "rpc/test-support"]
 
 [dependencies]
 chrono = { version = "0.4", features = ["serde"] }
-clock.workspace = true
-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
+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" }
 
 anyhow.workspace = true
 async-recursion = "0.3"
-async-tungstenite = { version = "0.16", features = ["async-std", "async-native-tls"] }
+async-tungstenite = { version = "0.16", features = ["async-tls"] }
 futures.workspace = true
 image = "0.23"
 lazy_static.workspace = true
@@ -52,9 +51,8 @@ uuid.workspace = true
 url.workspace = true
 
 [dev-dependencies]
-clock = { workspace = true, 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"] }
+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"] }

crates/client/src/client.rs

@@ -10,8 +10,6 @@ use async_tungstenite::tungstenite::{
     error::Error as WebsocketError,
     http::{Request, StatusCode},
 };
-use clock::SystemClock;
-use collections::HashMap;
 use futures::{
     channel::oneshot, future::LocalBoxFuture, AsyncReadExt, FutureExt, SinkExt, StreamExt,
     TryFutureExt as _, TryStreamExt,
@@ -31,6 +29,7 @@ use serde_json;
 use settings::{Settings, SettingsStore};
 use std::{
     any::TypeId,
+    collections::HashMap,
     convert::TryFrom,
     fmt::Write as _,
     future::Future,
@@ -422,15 +421,11 @@ impl settings::Settings for TelemetrySettings {
 }
 
 impl Client {
-    pub fn new(
-        clock: Arc<dyn SystemClock>,
-        http: Arc<ZedHttpClient>,
-        cx: &mut AppContext,
-    ) -> Arc<Self> {
+    pub fn new(http: Arc<ZedHttpClient>, cx: &mut AppContext) -> Arc<Self> {
         let client = Arc::new(Self {
             id: AtomicU64::new(0),
             peer: Peer::new(0),
-            telemetry: Telemetry::new(clock, http.clone(), cx),
+            telemetry: Telemetry::new(http.clone(), cx),
             http,
             state: Default::default(),
 
@@ -1045,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_std::client_async_tls(request, stream).await?;
+                        async_tungstenite::async_tls::client_async_tls(request, stream).await?;
                     Ok(Connection::new(
                         stream
                             .map_err(|error| anyhow!(error))
@@ -1460,7 +1455,6 @@ mod tests {
     use super::*;
     use crate::test::FakeServer;
 
-    use clock::FakeSystemClock;
     use gpui::{BackgroundExecutor, Context, TestAppContext};
     use parking_lot::Mutex;
     use settings::SettingsStore;
@@ -1471,13 +1465,7 @@ mod tests {
     async fn test_reconnection(cx: &mut TestAppContext) {
         init_test(cx);
         let user_id = 5;
-        let client = cx.update(|cx| {
-            Client::new(
-                Arc::new(FakeSystemClock::default()),
-                FakeHttpClient::with_404_response(),
-                cx,
-            )
-        });
+        let client = cx.update(|cx| Client::new(FakeHttpClient::with_404_response(), cx));
         let server = FakeServer::for_client(user_id, &client, cx).await;
         let mut status = client.status();
         assert!(matches!(
@@ -1512,13 +1500,7 @@ mod tests {
     async fn test_connection_timeout(executor: BackgroundExecutor, cx: &mut TestAppContext) {
         init_test(cx);
         let user_id = 5;
-        let client = cx.update(|cx| {
-            Client::new(
-                Arc::new(FakeSystemClock::default()),
-                FakeHttpClient::with_404_response(),
-                cx,
-            )
-        });
+        let client = cx.update(|cx| Client::new(FakeHttpClient::with_404_response(), cx));
         let mut status = client.status();
 
         // Time out when client tries to connect.
@@ -1591,13 +1573,7 @@ mod tests {
         init_test(cx);
         let auth_count = Arc::new(Mutex::new(0));
         let dropped_auth_count = Arc::new(Mutex::new(0));
-        let client = cx.update(|cx| {
-            Client::new(
-                Arc::new(FakeSystemClock::default()),
-                FakeHttpClient::with_404_response(),
-                cx,
-            )
-        });
+        let client = cx.update(|cx| Client::new(FakeHttpClient::with_404_response(), cx));
         client.override_authenticate({
             let auth_count = auth_count.clone();
             let dropped_auth_count = dropped_auth_count.clone();
@@ -1645,13 +1621,7 @@ mod tests {
     async fn test_subscribing_to_entity(cx: &mut TestAppContext) {
         init_test(cx);
         let user_id = 5;
-        let client = cx.update(|cx| {
-            Client::new(
-                Arc::new(FakeSystemClock::default()),
-                FakeHttpClient::with_404_response(),
-                cx,
-            )
-        });
+        let client = cx.update(|cx| Client::new(FakeHttpClient::with_404_response(), cx));
         let server = FakeServer::for_client(user_id, &client, cx).await;
 
         let (done_tx1, mut done_rx1) = smol::channel::unbounded();
@@ -1705,13 +1675,7 @@ mod tests {
     async fn test_subscribing_after_dropping_subscription(cx: &mut TestAppContext) {
         init_test(cx);
         let user_id = 5;
-        let client = cx.update(|cx| {
-            Client::new(
-                Arc::new(FakeSystemClock::default()),
-                FakeHttpClient::with_404_response(),
-                cx,
-            )
-        });
+        let client = cx.update(|cx| Client::new(FakeHttpClient::with_404_response(), cx));
         let server = FakeServer::for_client(user_id, &client, cx).await;
 
         let model = cx.new_model(|_| TestModel::default());
@@ -1740,13 +1704,7 @@ mod tests {
     async fn test_dropping_subscription_in_handler(cx: &mut TestAppContext) {
         init_test(cx);
         let user_id = 5;
-        let client = cx.update(|cx| {
-            Client::new(
-                Arc::new(FakeSystemClock::default()),
-                FakeHttpClient::with_404_response(),
-                cx,
-            )
-        });
+        let client = cx.update(|cx| Client::new(FakeHttpClient::with_404_response(), cx));
         let server = FakeServer::for_client(user_id, &client, cx).await;
 
         let model = cx.new_model(|_| TestModel::default());

crates/client/src/telemetry.rs

@@ -2,7 +2,6 @@ mod event_coalescer;
 
 use crate::TelemetrySettings;
 use chrono::{DateTime, Utc};
-use clock::SystemClock;
 use futures::Future;
 use gpui::{AppContext, AppMetadata, BackgroundExecutor, Task};
 use once_cell::sync::Lazy;
@@ -25,7 +24,6 @@ use util::TryFutureExt;
 use self::event_coalescer::EventCoalescer;
 
 pub struct Telemetry {
-    clock: Arc<dyn SystemClock>,
     http_client: Arc<ZedHttpClient>,
     executor: BackgroundExecutor,
     state: Arc<Mutex<TelemetryState>>,
@@ -147,22 +145,15 @@ 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(|| {
+static ZED_CLIENT_CHECKSUM_SEED: Lazy<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())
-        })
+        .unwrap_or("development-checksum-seed")
+        .as_bytes()
+        .into()
 });
 
 impl Telemetry {
-    pub fn new(
-        clock: Arc<dyn SystemClock>,
-        client: Arc<ZedHttpClient>,
-        cx: &mut AppContext,
-    ) -> Arc<Self> {
+    pub fn new(client: Arc<ZedHttpClient>, cx: &mut AppContext) -> Arc<Self> {
         let release_channel =
             ReleaseChannel::try_global(cx).map(|release_channel| release_channel.display_name());
 
@@ -211,7 +202,6 @@ impl Telemetry {
 
         // TODO: Replace all hardware stuff with nested SystemSpecs json
         let this = Arc::new(Self {
-            clock,
             http_client: client,
             executor: cx.background_executor().clone(),
             state,
@@ -324,8 +314,7 @@ impl Telemetry {
             operation,
             copilot_enabled,
             copilot_enabled_for_language,
-            milliseconds_since_first_event: self
-                .milliseconds_since_first_event(self.clock.utc_now()),
+            milliseconds_since_first_event: self.milliseconds_since_first_event(Utc::now()),
         };
 
         self.report_event(event)
@@ -341,8 +330,7 @@ impl Telemetry {
             suggestion_id,
             suggestion_accepted,
             file_extension,
-            milliseconds_since_first_event: self
-                .milliseconds_since_first_event(self.clock.utc_now()),
+            milliseconds_since_first_event: self.milliseconds_since_first_event(Utc::now()),
         };
 
         self.report_event(event)
@@ -358,8 +346,7 @@ impl Telemetry {
             conversation_id,
             kind,
             model,
-            milliseconds_since_first_event: self
-                .milliseconds_since_first_event(self.clock.utc_now()),
+            milliseconds_since_first_event: self.milliseconds_since_first_event(Utc::now()),
         };
 
         self.report_event(event)
@@ -375,8 +362,7 @@ impl Telemetry {
             operation,
             room_id,
             channel_id,
-            milliseconds_since_first_event: self
-                .milliseconds_since_first_event(self.clock.utc_now()),
+            milliseconds_since_first_event: self.milliseconds_since_first_event(Utc::now()),
         };
 
         self.report_event(event)
@@ -386,8 +372,7 @@ impl Telemetry {
         let event = Event::Cpu {
             usage_as_percentage,
             core_count,
-            milliseconds_since_first_event: self
-                .milliseconds_since_first_event(self.clock.utc_now()),
+            milliseconds_since_first_event: self.milliseconds_since_first_event(Utc::now()),
         };
 
         self.report_event(event)
@@ -401,18 +386,24 @@ impl Telemetry {
         let event = Event::Memory {
             memory_in_bytes,
             virtual_memory_in_bytes,
-            milliseconds_since_first_event: self
-                .milliseconds_since_first_event(self.clock.utc_now()),
+            milliseconds_since_first_event: self.milliseconds_since_first_event(Utc::now()),
         };
 
         self.report_event(event)
     }
 
-    pub fn report_app_event(self: &Arc<Self>, operation: String) -> Event {
+    pub fn report_app_event(self: &Arc<Self>, operation: String) {
+        self.report_app_event_with_date_time(operation, Utc::now());
+    }
+
+    fn report_app_event_with_date_time(
+        self: &Arc<Self>,
+        operation: String,
+        date_time: DateTime<Utc>,
+    ) -> Event {
         let event = Event::App {
             operation,
-            milliseconds_since_first_event: self
-                .milliseconds_since_first_event(self.clock.utc_now()),
+            milliseconds_since_first_event: self.milliseconds_since_first_event(date_time),
         };
 
         self.report_event(event.clone());
@@ -424,8 +415,7 @@ impl Telemetry {
         let event = Event::Setting {
             setting,
             value,
-            milliseconds_since_first_event: self
-                .milliseconds_since_first_event(self.clock.utc_now()),
+            milliseconds_since_first_event: self.milliseconds_since_first_event(Utc::now()),
         };
 
         self.report_event(event)
@@ -440,8 +430,7 @@ impl Telemetry {
             let event = Event::Edit {
                 duration: end.timestamp_millis() - start.timestamp_millis(),
                 environment,
-                milliseconds_since_first_event: self
-                    .milliseconds_since_first_event(self.clock.utc_now()),
+                milliseconds_since_first_event: self.milliseconds_since_first_event(Utc::now()),
             };
 
             self.report_event(event);
@@ -452,8 +441,7 @@ impl Telemetry {
         let event = Event::Action {
             source,
             action,
-            milliseconds_since_first_event: self
-                .milliseconds_since_first_event(self.clock.utc_now()),
+            milliseconds_since_first_event: self.milliseconds_since_first_event(Utc::now()),
         };
 
         self.report_event(event)
@@ -522,10 +510,6 @@ impl Telemetry {
             return;
         }
 
-        let Some(checksum_seed) = &*ZED_CLIENT_CHECKSUM_SEED else {
-            return;
-        };
-
         let this = self.clone();
         self.executor
             .spawn(
@@ -567,9 +551,9 @@ impl Telemetry {
                     }
 
                     let mut summer = Sha256::new();
-                    summer.update(checksum_seed);
+                    summer.update(&*ZED_CLIENT_CHECKSUM_SEED);
                     summer.update(&json_bytes);
-                    summer.update(checksum_seed);
+                    summer.update(&*ZED_CLIENT_CHECKSUM_SEED);
                     let mut checksum = String::new();
                     for byte in summer.finalize().as_slice() {
                         use std::fmt::Write;
@@ -599,32 +583,29 @@ impl Telemetry {
 mod tests {
     use super::*;
     use chrono::TimeZone;
-    use clock::FakeSystemClock;
     use gpui::TestAppContext;
     use util::http::FakeHttpClient;
 
     #[gpui::test]
     fn test_telemetry_flush_on_max_queue_size(cx: &mut TestAppContext) {
         init_test(cx);
-        let clock = Arc::new(FakeSystemClock::new(
-            Utc.with_ymd_and_hms(1990, 4, 12, 12, 0, 0).unwrap(),
-        ));
         let http = FakeHttpClient::with_200_response();
         let installation_id = Some("installation_id".to_string());
         let session_id = "session_id".to_string();
 
         cx.update(|cx| {
-            let telemetry = Telemetry::new(clock.clone(), http, cx);
+            let telemetry = Telemetry::new(http, cx);
 
             telemetry.state.lock().max_queue_size = 4;
             telemetry.start(installation_id, session_id, cx);
 
             assert!(is_empty_state(&telemetry));
 
-            let first_date_time = clock.utc_now();
+            let first_date_time = Utc.with_ymd_and_hms(1990, 4, 12, 12, 0, 0).unwrap();
             let operation = "test".to_string();
 
-            let event = telemetry.report_app_event(operation.clone());
+            let event =
+                telemetry.report_app_event_with_date_time(operation.clone(), first_date_time);
             assert_eq!(
                 event,
                 Event::App {
@@ -639,9 +620,9 @@ mod tests {
                 Some(first_date_time)
             );
 
-            clock.advance(chrono::Duration::milliseconds(100));
+            let mut date_time = first_date_time + chrono::Duration::milliseconds(100);
 
-            let event = telemetry.report_app_event(operation.clone());
+            let event = telemetry.report_app_event_with_date_time(operation.clone(), date_time);
             assert_eq!(
                 event,
                 Event::App {
@@ -656,9 +637,9 @@ mod tests {
                 Some(first_date_time)
             );
 
-            clock.advance(chrono::Duration::milliseconds(100));
+            date_time += chrono::Duration::milliseconds(100);
 
-            let event = telemetry.report_app_event(operation.clone());
+            let event = telemetry.report_app_event_with_date_time(operation.clone(), date_time);
             assert_eq!(
                 event,
                 Event::App {
@@ -673,10 +654,10 @@ mod tests {
                 Some(first_date_time)
             );
 
-            clock.advance(chrono::Duration::milliseconds(100));
+            date_time += chrono::Duration::milliseconds(100);
 
             // Adding a 4th event should cause a flush
-            let event = telemetry.report_app_event(operation.clone());
+            let event = telemetry.report_app_event_with_date_time(operation.clone(), date_time);
             assert_eq!(
                 event,
                 Event::App {
@@ -692,24 +673,22 @@ mod tests {
     #[gpui::test]
     async fn test_connection_timeout(executor: BackgroundExecutor, cx: &mut TestAppContext) {
         init_test(cx);
-        let clock = Arc::new(FakeSystemClock::new(
-            Utc.with_ymd_and_hms(1990, 4, 12, 12, 0, 0).unwrap(),
-        ));
         let http = FakeHttpClient::with_200_response();
         let installation_id = Some("installation_id".to_string());
         let session_id = "session_id".to_string();
 
         cx.update(|cx| {
-            let telemetry = Telemetry::new(clock.clone(), http, cx);
+            let telemetry = Telemetry::new(http, cx);
             telemetry.state.lock().max_queue_size = 4;
             telemetry.start(installation_id, session_id, cx);
 
             assert!(is_empty_state(&telemetry));
 
-            let first_date_time = clock.utc_now();
+            let first_date_time = Utc.with_ymd_and_hms(1990, 4, 12, 12, 0, 0).unwrap();
             let operation = "test".to_string();
 
-            let event = telemetry.report_app_event(operation.clone());
+            let event =
+                telemetry.report_app_event_with_date_time(operation.clone(), first_date_time);
             assert_eq!(
                 event,
                 Event::App {

crates/clock/Cargo.toml

@@ -9,10 +9,5 @@ license = "GPL-3.0-or-later"
 path = "src/clock.rs"
 doctest = false
 
-[features]
-test-support = ["dep:parking_lot"]
-
 [dependencies]
-chrono.workspace = true
-parking_lot = { workspace = true, optional = true }
 smallvec.workspace = true

crates/clock/src/clock.rs

@@ -1,28 +1,19 @@
-mod system_clock;
-
 use smallvec::SmallVec;
 use std::{
     cmp::{self, Ordering},
     fmt, iter,
 };
 
-pub use system_clock::*;
-
-/// A unique identifier for each distributed node.
 pub type ReplicaId = u16;
-
-/// A [Lamport sequence number](https://en.wikipedia.org/wiki/Lamport_timestamp).
 pub type Seq = u32;
 
-/// A [Lamport timestamp](https://en.wikipedia.org/wiki/Lamport_timestamp),
-/// used to determine the ordering of events in the editor.
 #[derive(Clone, Copy, Default, Eq, Hash, PartialEq)]
 pub struct Lamport {
     pub replica_id: ReplicaId,
     pub value: Seq,
 }
 
-/// A [vector clock](https://en.wikipedia.org/wiki/Vector_clock).
+/// A vector clock
 #[derive(Clone, Default, Hash, Eq, PartialEq)]
 pub struct Global(SmallVec<[u32; 8]>);
 

crates/clock/src/system_clock.rs

@@ -1,59 +0,0 @@
-use chrono::{DateTime, Utc};
-
-pub trait SystemClock: Send + Sync {
-    /// Returns the current date and time in UTC.
-    fn utc_now(&self) -> DateTime<Utc>;
-}
-
-pub struct RealSystemClock;
-
-impl SystemClock for RealSystemClock {
-    fn utc_now(&self) -> DateTime<Utc> {
-        Utc::now()
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-pub struct FakeSystemClockState {
-    now: DateTime<Utc>,
-}
-
-#[cfg(any(test, feature = "test-support"))]
-pub struct FakeSystemClock {
-    // Use an unfair lock to ensure tests are deterministic.
-    state: parking_lot::Mutex<FakeSystemClockState>,
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl Default for FakeSystemClock {
-    fn default() -> Self {
-        Self::new(Utc::now())
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl FakeSystemClock {
-    pub fn new(now: DateTime<Utc>) -> Self {
-        let state = FakeSystemClockState { now };
-
-        Self {
-            state: parking_lot::Mutex::new(state),
-        }
-    }
-
-    pub fn set_now(&self, now: DateTime<Utc>) {
-        self.state.lock().now = now;
-    }
-
-    /// Advances the [`FakeSystemClock`] by the specified [`Duration`](chrono::Duration).
-    pub fn advance(&self, duration: chrono::Duration) {
-        self.state.lock().now += duration;
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl SystemClock for FakeSystemClock {
-    fn utc_now(&self) -> DateTime<Utc> {
-        self.state.lock().now
-    }
-}

crates/collab/.env.toml

@@ -7,11 +7,6 @@ ZED_ENVIRONMENT = "development"
 LIVE_KIT_SERVER = "http://localhost:7880"
 LIVE_KIT_KEY = "devkey"
 LIVE_KIT_SECRET = "secret"
-BLOB_STORE_ACCESS_KEY = "the-blob-store-access-key"
-BLOB_STORE_SECRET_KEY = "the-blob-store-secret-key"
-BLOB_STORE_BUCKET = "the-extensions-bucket"
-BLOB_STORE_URL = "http://127.0.0.1:9000"
-BLOB_STORE_REGION = "the-region"
 
 # RUST_LOG=info
 # LOG_JSON=true

crates/collab/Cargo.toml

@@ -17,22 +17,20 @@ required-features = ["seed-support"]
 [dependencies]
 anyhow.workspace = true
 async-tungstenite = "0.16"
-aws-config = { version = "1.1.5" }
-aws-sdk-s3 = { version = "1.15.0" }
 axum = { version = "0.5", features = ["json", "headers", "ws"] }
 axum-extra = { version = "0.3", features = ["erased-json"] }
 base64 = "0.13"
 chrono.workspace = true
 clap = { version = "3.1", features = ["derive"], optional = true }
-clock.workspace = true
-collections.workspace = true
+clock = { path = "../clock" }
+collections = { path = "../collections" }
 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.workspace = true
+live_kit_server = { path = "../live_kit_server" }
 log.workspace = true
 nanoid = "0.4"
 parking_lot.workspace = true
@@ -40,17 +38,16 @@ prometheus = "0.13"
 prost.workspace = true
 rand.workspace = true
 reqwest = { version = "0.11", features = ["json"], optional = true }
-rpc.workspace = true
+rpc = { path = "../rpc" }
 scrypt = "0.7"
 sea-orm = { version = "0.12.x", features = ["sqlx-postgres", "postgres-array", "runtime-tokio-rustls", "with-uuid"] }
-semver.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 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.workspace = true
+text = { path = "../text" }
 time.workspace = true
 tokio = { version = "1", features = ["full"] }
 tokio-tungstenite = "0.17"
@@ -60,44 +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.workspace = true
+util = { path = "../util" }
 uuid.workspace = true
 
 [dev-dependencies]
+release_channel = { path = "../release_channel" }
 async-trait.workspace = true
-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"] }
+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"] }
 ctor.workspace = true
-editor = { workspace = true, features = ["test-support"] }
+editor = { path = "../editor", features = ["test-support"] }
 env_logger.workspace = true
-file_finder.workspace = true
-fs = { workspace = true, features = ["test-support"] }
-git = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
+file_finder = { path = "../file_finder" }
+fs = { path = "../fs", features = ["test-support"] }
+git = { path = "../git", features = ["test-support"] }
+gpui = { path = "../gpui", features = ["test-support"] }
 indoc.workspace = true
-language = { workspace = true, features = ["test-support"] }
+language = { path = "../language", features = ["test-support"] }
 lazy_static.workspace = true
-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"] }
+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"] }
 pretty_assertions.workspace = true
-project = { workspace = true, features = ["test-support"] }
-release_channel.workspace = true
-rpc = { workspace = true, features = ["test-support"] }
+project = { path = "../project", features = ["test-support"] }
+rpc = { path = "../rpc", features = ["test-support"] }
 sea-orm = { version = "0.12.x", features = ["sqlx-sqlite"] }
 serde_json.workspace = true
-settings = { workspace = true, features = ["test-support"] }
+settings = { path = "../settings", features = ["test-support"] }
 sqlx = { version = "0.7", features = ["sqlite"] }
-theme.workspace = true
+theme = { path = "../theme" }
 unindent.workspace = true
-util.workspace = true
-workspace = { workspace = true, features = ["test-support"] }
+util = { path = "../util" }
+workspace = { path = "../workspace", features = ["test-support"] }
 
 [features]
 seed-support = ["clap", "lipsum", "reqwest"]

crates/collab/k8s/collab.template.yml

@@ -105,31 +105,6 @@ spec:
                 secretKeyRef:
                   name: livekit
                   key: secret
-            - name: BLOB_STORE_ACCESS_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: blob-store
-                  key: access_key
-            - name: BLOB_STORE_SECRET_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: blob-store
-                  key: secret_key
-            - name: BLOB_STORE_URL
-              valueFrom:
-                secretKeyRef:
-                  name: blob-store
-                  key: url
-            - name: BLOB_STORE_REGION
-              valueFrom:
-                secretKeyRef:
-                  name: blob-store
-                  key: region
-            - name: BLOB_STORE_BUCKET
-              valueFrom:
-                secretKeyRef:
-                  name: blob-store
-                  key: bucket
             - name: INVITE_LINK_PREFIX
               value: ${INVITE_LINK_PREFIX}
             - name: RUST_BACKTRACE

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

@@ -163,8 +163,7 @@ 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,
-    "in_call" BOOLEAN NOT NULL DEFAULT FALSE
+    "role" TEXT
 );
 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");
@@ -218,8 +217,7 @@ 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,
-    "reply_to_message_id" INTEGER DEFAULT NULL
+    "nonce" BLOB NOT 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");
@@ -353,25 +351,3 @@ CREATE TABLE contributors (
     signed_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
     PRIMARY KEY (user_id)
 );
-
-CREATE TABLE extensions (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    external_id TEXT NOT NULL,
-    name TEXT NOT NULL,
-    latest_version TEXT NOT NULL,
-    total_download_count INTEGER NOT NULL DEFAULT 0
-);
-
-CREATE TABLE extension_versions (
-    extension_id INTEGER REFERENCES extensions(id),
-    version TEXT NOT NULL,
-    published_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    authors TEXT NOT NULL,
-    repository TEXT NOT NULL,
-    description TEXT NOT NULL,
-    download_count INTEGER NOT NULL DEFAULT 0,
-    PRIMARY KEY (extension_id, version)
-);
-
-CREATE UNIQUE INDEX "index_extensions_external_id" ON "extensions" ("external_id");
-CREATE INDEX "index_extensions_total_download_count" ON "extensions" ("total_download_count");

crates/collab/migrations/20240203113741_add_reply_to_message.sql

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

crates/collab/migrations/20240207041417_add_in_call_column_to_room_participants.sql

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

crates/collab/migrations/20240213200201_remove_unused_room_columns.sql

@@ -1,4 +0,0 @@
--- Add migration script here
-ALTER TABLE rooms DROP COLUMN enviroment;
-ALTER TABLE rooms DROP COLUMN environment;
-ALTER TABLE room_participants DROP COLUMN in_call;

crates/collab/migrations/20240214102900_add_extensions.sql

@@ -1,22 +0,0 @@
-CREATE TABLE IF NOT EXISTS extensions (
-    id SERIAL PRIMARY KEY,
-    name TEXT NOT NULL,
-    external_id TEXT NOT NULL,
-    latest_version TEXT NOT NULL,
-    total_download_count BIGINT NOT NULL DEFAULT 0
-);
-
-CREATE TABLE IF NOT EXISTS extension_versions (
-    extension_id INTEGER REFERENCES extensions(id),
-    version TEXT NOT NULL,
-    published_at TIMESTAMP NOT NULL DEFAULT now(),
-    authors TEXT NOT NULL,
-    repository TEXT NOT NULL,
-    description TEXT NOT NULL,
-    download_count BIGINT NOT NULL DEFAULT 0,
-    PRIMARY KEY(extension_id, version)
-);
-
-CREATE UNIQUE INDEX "index_extensions_external_id" ON "extensions" ("external_id");
-CREATE INDEX "trigram_index_extensions_name" ON "extensions" USING GIN(name gin_trgm_ops);
-CREATE INDEX "index_extensions_total_download_count" ON "extensions" ("total_download_count");

crates/collab/src/api.rs

@@ -1,5 +1,3 @@
-mod extensions;
-
 use crate::{
     auth,
     db::{ContributorSelector, User, UserId},
@@ -22,8 +20,6 @@ use std::sync::Arc;
 use tower::ServiceBuilder;
 use tracing::instrument;
 
-pub use extensions::fetch_extensions_from_blob_store_periodically;
-
 pub fn routes(rpc_server: Arc<rpc::Server>, state: Arc<AppState>) -> Router<Body> {
     Router::new()
         .route("/user", get(get_authenticated_user))
@@ -32,7 +28,6 @@ pub fn routes(rpc_server: Arc<rpc::Server>, state: Arc<AppState>) -> Router<Body
         .route("/rpc_server_snapshot", get(get_rpc_server_snapshot))
         .route("/contributors", get(get_contributors).post(add_contributor))
         .route("/contributor", get(check_is_contributor))
-        .merge(extensions::router())
         .layer(
             ServiceBuilder::new()
                 .layer(Extension(state))

crates/collab/src/api/extensions.rs

@@ -1,237 +0,0 @@
-use crate::{
-    db::{ExtensionMetadata, NewExtensionVersion},
-    executor::Executor,
-    AppState, Error, Result,
-};
-use anyhow::{anyhow, Context as _};
-use aws_sdk_s3::presigning::PresigningConfig;
-use axum::{
-    extract::{Path, Query},
-    response::Redirect,
-    routing::get,
-    Extension, Json, Router,
-};
-use collections::HashMap;
-use hyper::StatusCode;
-use serde::{Deserialize, Serialize};
-use std::{sync::Arc, time::Duration};
-use time::PrimitiveDateTime;
-use util::ResultExt;
-
-pub fn router() -> Router {
-    Router::new()
-        .route("/extensions", get(get_extensions))
-        .route(
-            "/extensions/:extension_id/:version/download",
-            get(download_extension),
-        )
-}
-
-#[derive(Debug, Deserialize)]
-struct GetExtensionsParams {
-    filter: Option<String>,
-}
-
-#[derive(Debug, Deserialize)]
-struct DownloadExtensionParams {
-    extension_id: String,
-    version: String,
-}
-
-#[derive(Debug, Serialize)]
-struct GetExtensionsResponse {
-    pub data: Vec<ExtensionMetadata>,
-}
-
-#[derive(Deserialize)]
-struct ExtensionManifest {
-    name: String,
-    version: String,
-    description: Option<String>,
-    authors: Vec<String>,
-    repository: String,
-}
-
-async fn get_extensions(
-    Extension(app): Extension<Arc<AppState>>,
-    Query(params): Query<GetExtensionsParams>,
-) -> Result<Json<GetExtensionsResponse>> {
-    let extensions = app.db.get_extensions(params.filter.as_deref(), 500).await?;
-    Ok(Json(GetExtensionsResponse { data: extensions }))
-}
-
-async fn download_extension(
-    Extension(app): Extension<Arc<AppState>>,
-    Path(params): Path<DownloadExtensionParams>,
-) -> Result<Redirect> {
-    let Some((blob_store_client, bucket)) = app
-        .blob_store_client
-        .clone()
-        .zip(app.config.blob_store_bucket.clone())
-    else {
-        Err(Error::Http(
-            StatusCode::NOT_IMPLEMENTED,
-            "not supported".into(),
-        ))?
-    };
-
-    let DownloadExtensionParams {
-        extension_id,
-        version,
-    } = params;
-
-    let version_exists = app
-        .db
-        .record_extension_download(&extension_id, &version)
-        .await?;
-
-    if !version_exists {
-        Err(Error::Http(
-            StatusCode::NOT_FOUND,
-            "unknown extension version".into(),
-        ))?;
-    }
-
-    let url = blob_store_client
-        .get_object()
-        .bucket(bucket)
-        .key(format!(
-            "extensions/{extension_id}/{version}/archive.tar.gz"
-        ))
-        .presigned(PresigningConfig::expires_in(EXTENSION_DOWNLOAD_URL_LIFETIME).unwrap())
-        .await
-        .map_err(|e| anyhow!("failed to create presigned extension download url {e}"))?;
-
-    Ok(Redirect::temporary(url.uri()))
-}
-
-const EXTENSION_FETCH_INTERVAL: Duration = Duration::from_secs(5 * 60);
-const EXTENSION_DOWNLOAD_URL_LIFETIME: Duration = Duration::from_secs(3 * 60);
-
-pub fn fetch_extensions_from_blob_store_periodically(app_state: Arc<AppState>, executor: Executor) {
-    let Some(blob_store_client) = app_state.blob_store_client.clone() else {
-        log::info!("no blob store client");
-        return;
-    };
-    let Some(blob_store_bucket) = app_state.config.blob_store_bucket.clone() else {
-        log::info!("no blob store bucket");
-        return;
-    };
-
-    executor.spawn_detached({
-        let executor = executor.clone();
-        async move {
-            loop {
-                fetch_extensions_from_blob_store(
-                    &blob_store_client,
-                    &blob_store_bucket,
-                    &app_state,
-                )
-                .await
-                .log_err();
-                executor.sleep(EXTENSION_FETCH_INTERVAL).await;
-            }
-        }
-    });
-}
-
-async fn fetch_extensions_from_blob_store(
-    blob_store_client: &aws_sdk_s3::Client,
-    blob_store_bucket: &String,
-    app_state: &Arc<AppState>,
-) -> anyhow::Result<()> {
-    let list = blob_store_client
-        .list_objects()
-        .bucket(blob_store_bucket)
-        .prefix("extensions/")
-        .send()
-        .await?;
-
-    let objects = list
-        .contents
-        .ok_or_else(|| anyhow!("missing bucket contents"))?;
-
-    let mut published_versions = HashMap::<&str, Vec<&str>>::default();
-    for object in &objects {
-        let Some(key) = object.key.as_ref() else {
-            continue;
-        };
-        let mut parts = key.split('/');
-        let Some(_) = parts.next().filter(|part| *part == "extensions") else {
-            continue;
-        };
-        let Some(extension_id) = parts.next() else {
-            continue;
-        };
-        let Some(version) = parts.next() else {
-            continue;
-        };
-        published_versions
-            .entry(extension_id)
-            .or_default()
-            .push(version);
-    }
-
-    let known_versions = app_state.db.get_known_extension_versions().await?;
-
-    let mut new_versions = HashMap::<&str, Vec<NewExtensionVersion>>::default();
-    let empty = Vec::new();
-    for (extension_id, published_versions) in published_versions {
-        let known_versions = known_versions.get(extension_id).unwrap_or(&empty);
-
-        for published_version in published_versions {
-            if known_versions
-                .binary_search_by_key(&published_version, String::as_str)
-                .is_err()
-            {
-                let object = blob_store_client
-                    .get_object()
-                    .bucket(blob_store_bucket)
-                    .key(format!(
-                        "extensions/{extension_id}/{published_version}/manifest.json"
-                    ))
-                    .send()
-                    .await?;
-                let manifest_bytes = object
-                    .body
-                    .collect()
-                    .await
-                    .map(|data| data.into_bytes())
-                    .with_context(|| format!("failed to download manifest for extension {extension_id} version {published_version}"))?
-                    .to_vec();
-                let manifest = serde_json::from_slice::<ExtensionManifest>(&manifest_bytes)
-                    .with_context(|| format!("invalid manifest for extension {extension_id} version {published_version}: {}", String::from_utf8_lossy(&manifest_bytes)))?;
-
-                let published_at = object.last_modified.ok_or_else(|| anyhow!("missing last modified timestamp for extension {extension_id} version {published_version}"))?;
-                let published_at =
-                    time::OffsetDateTime::from_unix_timestamp_nanos(published_at.as_nanos())?;
-                let published_at = PrimitiveDateTime::new(published_at.date(), published_at.time());
-
-                let version = semver::Version::parse(&manifest.version).with_context(|| {
-                    format!(
-                        "invalid version for extension {extension_id} version {published_version}"
-                    )
-                })?;
-
-                new_versions
-                    .entry(extension_id)
-                    .or_default()
-                    .push(NewExtensionVersion {
-                        name: manifest.name,
-                        version,
-                        description: manifest.description.unwrap_or_default(),
-                        authors: manifest.authors,
-                        repository: manifest.repository,
-                        published_at,
-                    });
-            }
-        }
-    }
-
-    app_state
-        .db
-        .insert_extension_versions(&new_versions)
-        .await?;
-
-    Ok(())
-}

crates/collab/src/bin/seed.rs

@@ -18,8 +18,8 @@ struct GitHubUser {
 async fn main() {
     load_dotenv().expect("failed to load .env.toml file");
 
-    let mut admin_logins = load_admins("crates/collab/.admins.default.json")
-        .expect("failed to load default admins file");
+    let mut admin_logins =
+        load_admins("./.admins.default.json").expect("failed to load default admins file");
     if let Ok(other_admins) = load_admins("./.admins.json") {
         admin_logins.extend(other_admins);
     }

crates/collab/src/db.rs

@@ -1,8 +1,12 @@
+#[cfg(test)]
+pub mod tests;
+
+#[cfg(test)]
+pub use tests::TestDb;
+
 mod ids;
 mod queries;
 mod tables;
-#[cfg(test)]
-pub mod tests;
 
 use crate::{executor::Executor, Error, Result};
 use anyhow::anyhow;
@@ -21,7 +25,7 @@ use sea_orm::{
     FromQueryResult, IntoActiveModel, IsolationLevel, JoinType, QueryOrder, QuerySelect, Statement,
     TransactionTrait,
 };
-use serde::{ser::Error as _, Deserialize, Serialize, Serializer};
+use serde::{Deserialize, Serialize};
 use sqlx::{
     migrate::{Migrate, Migration, MigrationSource},
     Connection,
@@ -36,17 +40,13 @@ use std::{
     sync::Arc,
     time::Duration,
 };
-use time::{format_description::well_known::iso8601, PrimitiveDateTime};
+pub use tables::*;
 use tokio::sync::{Mutex, OwnedMutexGuard};
 
-#[cfg(test)]
-pub use tests::TestDb;
-
 pub use ids::*;
 pub use queries::contributors::ContributorSelector;
 pub use sea_orm::ConnectOptions;
 pub use tables::user::Model as User;
-pub use tables::*;
 
 /// Database gives you a handle that lets you access the database.
 /// It handles pooling internally.
@@ -587,9 +587,6 @@ pub struct ChannelsForUser {
     pub channels: Vec<Channel>,
     pub channel_memberships: Vec<channel_member::Model>,
     pub channel_participants: HashMap<ChannelId, Vec<UserId>>,
-
-    pub observed_buffer_versions: Vec<proto::ChannelBufferVersion>,
-    pub observed_channel_messages: Vec<proto::ChannelMessageId>,
     pub latest_buffer_versions: Vec<proto::ChannelBufferVersion>,
     pub latest_channel_messages: Vec<proto::ChannelMessageId>,
 }
@@ -695,7 +692,7 @@ impl ProjectCollaborator {
 pub struct LeftProject {
     pub id: ProjectId,
     pub host_user_id: UserId,
-    pub host_connection_id: Option<ConnectionId>,
+    pub host_connection_id: ConnectionId,
     pub connection_ids: Vec<ConnectionId>,
 }
 
@@ -717,43 +714,3 @@ pub struct WorktreeSettingsFile {
     pub path: String,
     pub content: String,
 }
-
-pub struct NewExtensionVersion {
-    pub name: String,
-    pub version: semver::Version,
-    pub description: String,
-    pub authors: Vec<String>,
-    pub repository: String,
-    pub published_at: PrimitiveDateTime,
-}
-
-#[derive(Debug, Serialize, PartialEq)]
-pub struct ExtensionMetadata {
-    pub id: String,
-    pub name: String,
-    pub version: String,
-    pub authors: Vec<String>,
-    pub description: String,
-    pub repository: String,
-    #[serde(serialize_with = "serialize_iso8601")]
-    pub published_at: PrimitiveDateTime,
-    pub download_count: u64,
-}
-
-pub fn serialize_iso8601<S: Serializer>(
-    datetime: &PrimitiveDateTime,
-    serializer: S,
-) -> Result<S::Ok, S::Error> {
-    const SERDE_CONFIG: iso8601::EncodedConfig = iso8601::Config::DEFAULT
-        .set_year_is_six_digits(false)
-        .set_time_precision(iso8601::TimePrecision::Second {
-            decimal_digits: None,
-        })
-        .encode();
-
-    datetime
-        .assume_utc()
-        .format(&time::format_description::well_known::Iso8601::<SERDE_CONFIG>)
-        .map_err(S::Error::custom)?
-        .serialize(serializer)
-}

crates/collab/src/db/ids.rs

@@ -85,7 +85,6 @@ id_type!(SignupId);
 id_type!(UserId);
 id_type!(ChannelBufferCollaboratorId);
 id_type!(FlagId);
-id_type!(ExtensionId);
 id_type!(NotificationId);
 id_type!(NotificationKindId);
 
@@ -100,12 +99,8 @@ pub enum ChannelRole {
     #[sea_orm(string_value = "member")]
     #[default]
     Member,
-    /// Talker can read, but not write.
-    /// They can use microphones and the channel chat
-    #[sea_orm(string_value = "talker")]
-    Talker,
     /// Guest can read, but not write.
-    /// They can not use microphones but can use the chat.
+    /// (thought they can use the channel chat)
     #[sea_orm(string_value = "guest")]
     Guest,
     /// Banned may not read.
@@ -118,9 +113,8 @@ impl ChannelRole {
     pub fn should_override(&self, other: Self) -> bool {
         use ChannelRole::*;
         match self {
-            Admin => matches!(other, Member | Banned | Talker | Guest),
-            Member => matches!(other, Banned | Talker | Guest),
-            Talker => matches!(other, Guest),
+            Admin => matches!(other, Member | Banned | Guest),
+            Member => matches!(other, Banned | Guest),
             Banned => matches!(other, Guest),
             Guest => false,
         }
@@ -139,7 +133,7 @@ impl ChannelRole {
         use ChannelRole::*;
         match self {
             Admin | Member => true,
-            Guest | Talker => visibility == ChannelVisibility::Public,
+            Guest => visibility == ChannelVisibility::Public,
             Banned => false,
         }
     }
@@ -149,7 +143,7 @@ impl ChannelRole {
         use ChannelRole::*;
         match self {
             Admin | Member => true,
-            Guest | Talker | Banned => false,
+            Guest | Banned => false,
         }
     }
 
@@ -157,16 +151,16 @@ impl ChannelRole {
     pub fn can_only_see_public_descendants(&self) -> bool {
         use ChannelRole::*;
         match self {
-            Guest | Talker => true,
+            Guest => true,
             Admin | Member | Banned => false,
         }
     }
 
     /// True if the role can share screen/microphone/projects into rooms.
-    pub fn can_use_microphone(&self) -> bool {
+    pub fn can_publish_to_rooms(&self) -> bool {
         use ChannelRole::*;
         match self {
-            Admin | Member | Talker => true,
+            Admin | Member => true,
             Guest | Banned => false,
         }
     }
@@ -176,7 +170,7 @@ impl ChannelRole {
         use ChannelRole::*;
         match self {
             Admin | Member => true,
-            Talker | Guest | Banned => false,
+            Guest | Banned => false,
         }
     }
 
@@ -184,7 +178,7 @@ impl ChannelRole {
     pub fn can_read_projects(&self) -> bool {
         use ChannelRole::*;
         match self {
-            Admin | Member | Guest | Talker => true,
+            Admin | Member | Guest => true,
             Banned => false,
         }
     }
@@ -193,7 +187,7 @@ impl ChannelRole {
         use ChannelRole::*;
         match self {
             Admin | Member => true,
-            Banned | Guest | Talker => false,
+            Banned | Guest => false,
         }
     }
 }
@@ -203,7 +197,6 @@ impl From<proto::ChannelRole> for ChannelRole {
         match value {
             proto::ChannelRole::Admin => ChannelRole::Admin,
             proto::ChannelRole::Member => ChannelRole::Member,
-            proto::ChannelRole::Talker => ChannelRole::Talker,
             proto::ChannelRole::Guest => ChannelRole::Guest,
             proto::ChannelRole::Banned => ChannelRole::Banned,
         }
@@ -215,7 +208,6 @@ impl Into<proto::ChannelRole> for ChannelRole {
         match self {
             ChannelRole::Admin => proto::ChannelRole::Admin,
             ChannelRole::Member => proto::ChannelRole::Member,
-            ChannelRole::Talker => proto::ChannelRole::Talker,
             ChannelRole::Guest => proto::ChannelRole::Guest,
             ChannelRole::Banned => proto::ChannelRole::Banned,
         }

crates/collab/src/db/queries.rs

@@ -5,7 +5,6 @@ pub mod buffers;
 pub mod channels;
 pub mod contacts;
 pub mod contributors;
-pub mod extensions;
 pub mod messages;
 pub mod notifications;
 pub mod projects;

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

@@ -561,6 +561,7 @@ impl Database {
         tx: &DatabaseTransaction,
     ) -> Result<()> {
         use observed_buffer_edits::Column;
+
         observed_buffer_edits::Entity::insert(observed_buffer_edits::ActiveModel {
             user_id: ActiveValue::Set(user_id),
             buffer_id: ActiveValue::Set(buffer_id),
@@ -670,7 +671,7 @@ impl Database {
                 buffer_id: row.buffer_id,
                 epoch: row.epoch,
                 lamport_timestamp: row.lamport_timestamp,
-                replica_id: row.replica_id,
+                replica_id: row.lamport_timestamp,
                 value: Default::default(),
             });
             operations.push(proto::Operation {
@@ -749,9 +750,20 @@ impl Database {
 
     pub async fn latest_channel_buffer_changes(
         &self,
-        channel_ids_by_buffer_id: &HashMap<BufferId, ChannelId>,
+        channel_ids: &[ChannelId],
         tx: &DatabaseTransaction,
     ) -> Result<Vec<proto::ChannelBufferVersion>> {
+        let mut channel_ids_by_buffer_id = HashMap::default();
+        let mut rows = buffer::Entity::find()
+            .filter(buffer::Column::ChannelId.is_in(channel_ids.iter().copied()))
+            .stream(&*tx)
+            .await?;
+        while let Some(row) = rows.next().await {
+            let row = row?;
+            channel_ids_by_buffer_id.insert(row.id, row.channel_id);
+        }
+        drop(rows);
+
         let latest_operations = self
             .get_latest_operations_for_buffers(channel_ids_by_buffer_id.keys().copied(), &*tx)
             .await?;
@@ -771,36 +783,6 @@ impl Database {
             .collect())
     }
 
-    pub async fn observed_channel_buffer_changes(
-        &self,
-        channel_ids_by_buffer_id: &HashMap<BufferId, ChannelId>,
-        user_id: UserId,
-        tx: &DatabaseTransaction,
-    ) -> Result<Vec<proto::ChannelBufferVersion>> {
-        let observed_operations = observed_buffer_edits::Entity::find()
-            .filter(observed_buffer_edits::Column::UserId.eq(user_id))
-            .filter(
-                observed_buffer_edits::Column::BufferId
-                    .is_in(channel_ids_by_buffer_id.keys().copied()),
-            )
-            .all(&*tx)
-            .await?;
-
-        Ok(observed_operations
-            .iter()
-            .flat_map(|op| {
-                Some(proto::ChannelBufferVersion {
-                    channel_id: channel_ids_by_buffer_id.get(&op.buffer_id)?.to_proto(),
-                    epoch: op.epoch as u64,
-                    version: vec![proto::VectorClockEntry {
-                        replica_id: op.replica_id as u32,
-                        timestamp: op.lamport_timestamp as u32,
-                    }],
-                })
-            })
-            .collect())
-    }
-
     /// Returns the latest operations for the buffers with the specified IDs.
     pub async fn get_latest_operations_for_buffers(
         &self,

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

@@ -103,6 +103,7 @@ impl Database {
         channel_id: ChannelId,
         user_id: UserId,
         connection: ConnectionId,
+        environment: &str,
     ) -> Result<(JoinRoom, Option<MembershipUpdated>, ChannelRole)> {
         self.transaction(move |tx| async move {
             let channel = self.get_channel_internal(channel_id, &*tx).await?;
@@ -162,7 +163,7 @@ impl Database {
 
             let live_kit_room = format!("channel-{}", nanoid::nanoid!(30));
             let room_id = self
-                .get_or_create_channel_room(channel_id, &live_kit_room, &*tx)
+                .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)
@@ -626,40 +627,18 @@ impl Database {
         }
 
         let channel_ids = channels.iter().map(|c| c.id).collect::<Vec<_>>();
-
-        let mut channel_ids_by_buffer_id = HashMap::default();
-        let mut rows = buffer::Entity::find()
-            .filter(buffer::Column::ChannelId.is_in(channel_ids.iter().copied()))
-            .stream(&*tx)
-            .await?;
-        while let Some(row) = rows.next().await {
-            let row = row?;
-            channel_ids_by_buffer_id.insert(row.id, row.channel_id);
-        }
-        drop(rows);
-
         let latest_buffer_versions = self
-            .latest_channel_buffer_changes(&channel_ids_by_buffer_id, &*tx)
+            .latest_channel_buffer_changes(&channel_ids, &*tx)
             .await?;
 
-        let latest_channel_messages = self.latest_channel_messages(&channel_ids, &*tx).await?;
-
-        let observed_buffer_versions = self
-            .observed_channel_buffer_changes(&channel_ids_by_buffer_id, user_id, &*tx)
-            .await?;
-
-        let observed_channel_messages = self
-            .observed_channel_messages(&channel_ids, user_id, &*tx)
-            .await?;
+        let latest_messages = self.latest_channel_messages(&channel_ids, &*tx).await?;
 
         Ok(ChannelsForUser {
             channel_memberships,
             channels,
             channel_participants,
             latest_buffer_versions,
-            latest_channel_messages,
-            observed_buffer_versions,
-            observed_channel_messages,
+            latest_channel_messages: latest_messages,
         })
     }
 
@@ -795,7 +774,6 @@ impl Database {
         match role {
             Some(ChannelRole::Admin) => Ok(role.unwrap()),
             Some(ChannelRole::Member)
-            | Some(ChannelRole::Talker)
             | Some(ChannelRole::Banned)
             | Some(ChannelRole::Guest)
             | None => Err(anyhow!(
@@ -814,10 +792,7 @@ impl Database {
         let channel_role = self.channel_role_for_user(channel, user_id, tx).await?;
         match channel_role {
             Some(ChannelRole::Admin) | Some(ChannelRole::Member) => Ok(channel_role.unwrap()),
-            Some(ChannelRole::Banned)
-            | Some(ChannelRole::Guest)
-            | Some(ChannelRole::Talker)
-            | None => Err(anyhow!(
+            Some(ChannelRole::Banned) | Some(ChannelRole::Guest) | None => Err(anyhow!(
                 "user is not a channel member or channel does not exist"
             ))?,
         }
@@ -832,10 +807,9 @@ impl Database {
     ) -> Result<ChannelRole> {
         let role = self.channel_role_for_user(channel, user_id, tx).await?;
         match role {
-            Some(ChannelRole::Admin)
-            | Some(ChannelRole::Member)
-            | Some(ChannelRole::Guest)
-            | Some(ChannelRole::Talker) => Ok(role.unwrap()),
+            Some(ChannelRole::Admin) | Some(ChannelRole::Member) | Some(ChannelRole::Guest) => {
+                Ok(role.unwrap())
+            }
             Some(ChannelRole::Banned) | None => Err(anyhow!(
                 "user is not a channel participant or channel does not exist"
             ))?,
@@ -937,6 +911,7 @@ impl Database {
         &self,
         channel_id: ChannelId,
         live_kit_room: &str,
+        environment: &str,
         tx: &DatabaseTransaction,
     ) -> Result<RoomId> {
         let room = room::Entity::find()
@@ -945,11 +920,19 @@ impl Database {
             .await?;
 
         let room_id = if let Some(room) = room {
+            if let Some(env) = room.environment {
+                if &env != environment {
+                    Err(ErrorCode::WrongReleaseChannel
+                        .with_tag("required", &env)
+                        .anyhow())?;
+                }
+            }
             room.id
         } else {
             let result = room::Entity::insert(room::ActiveModel {
                 channel_id: ActiveValue::Set(Some(channel_id)),
                 live_kit_room: ActiveValue::Set(live_kit_room.to_string()),
+                environment: ActiveValue::Set(Some(environment.to_string())),
                 ..Default::default()
             })
             .exec(&*tx)

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

@@ -1,206 +0,0 @@
-use super::*;
-
-impl Database {
-    pub async fn get_extensions(
-        &self,
-        filter: Option<&str>,
-        limit: usize,
-    ) -> Result<Vec<ExtensionMetadata>> {
-        self.transaction(|tx| async move {
-            let mut condition = Condition::all();
-            if let Some(filter) = filter {
-                let fuzzy_name_filter = Self::fuzzy_like_string(filter);
-                condition = condition.add(Expr::cust_with_expr("name ILIKE $1", fuzzy_name_filter));
-            }
-
-            let extensions = extension::Entity::find()
-                .filter(condition)
-                .order_by_desc(extension::Column::TotalDownloadCount)
-                .order_by_asc(extension::Column::Name)
-                .limit(Some(limit as u64))
-                .filter(
-                    extension::Column::LatestVersion
-                        .into_expr()
-                        .eq(extension_version::Column::Version.into_expr()),
-                )
-                .inner_join(extension_version::Entity)
-                .select_also(extension_version::Entity)
-                .all(&*tx)
-                .await?;
-
-            Ok(extensions
-                .into_iter()
-                .filter_map(|(extension, latest_version)| {
-                    let version = latest_version?;
-                    Some(ExtensionMetadata {
-                        id: extension.external_id,
-                        name: extension.name,
-                        version: version.version,
-                        authors: version
-                            .authors
-                            .split(',')
-                            .map(|author| author.trim().to_string())
-                            .collect::<Vec<_>>(),
-                        description: version.description,
-                        repository: version.repository,
-                        published_at: version.published_at,
-                        download_count: extension.total_download_count as u64,
-                    })
-                })
-                .collect())
-        })
-        .await
-    }
-
-    pub async fn get_known_extension_versions<'a>(&self) -> Result<HashMap<String, Vec<String>>> {
-        self.transaction(|tx| async move {
-            let mut extension_external_ids_by_id = HashMap::default();
-
-            let mut rows = extension::Entity::find().stream(&*tx).await?;
-            while let Some(row) = rows.next().await {
-                let row = row?;
-                extension_external_ids_by_id.insert(row.id, row.external_id);
-            }
-            drop(rows);
-
-            let mut known_versions_by_extension_id: HashMap<String, Vec<String>> =
-                HashMap::default();
-            let mut rows = extension_version::Entity::find().stream(&*tx).await?;
-            while let Some(row) = rows.next().await {
-                let row = row?;
-
-                let Some(extension_id) = extension_external_ids_by_id.get(&row.extension_id) else {
-                    continue;
-                };
-
-                let versions = known_versions_by_extension_id
-                    .entry(extension_id.clone())
-                    .or_default();
-                if let Err(ix) = versions.binary_search(&row.version) {
-                    versions.insert(ix, row.version);
-                }
-            }
-            drop(rows);
-
-            Ok(known_versions_by_extension_id)
-        })
-        .await
-    }
-
-    pub async fn insert_extension_versions(
-        &self,
-        versions_by_extension_id: &HashMap<&str, Vec<NewExtensionVersion>>,
-    ) -> Result<()> {
-        self.transaction(|tx| async move {
-            for (external_id, versions) in versions_by_extension_id {
-                if versions.is_empty() {
-                    continue;
-                }
-
-                let latest_version = versions
-                    .iter()
-                    .max_by_key(|version| &version.version)
-                    .unwrap();
-
-                let insert = extension::Entity::insert(extension::ActiveModel {
-                    name: ActiveValue::Set(latest_version.name.clone()),
-                    external_id: ActiveValue::Set(external_id.to_string()),
-                    id: ActiveValue::NotSet,
-                    latest_version: ActiveValue::Set(latest_version.version.to_string()),
-                    total_download_count: ActiveValue::NotSet,
-                })
-                .on_conflict(
-                    OnConflict::columns([extension::Column::ExternalId])
-                        .update_column(extension::Column::ExternalId)
-                        .to_owned(),
-                );
-
-                let extension = if tx.support_returning() {
-                    insert.exec_with_returning(&*tx).await?
-                } else {
-                    // Sqlite
-                    insert.exec_without_returning(&*tx).await?;
-                    extension::Entity::find()
-                        .filter(extension::Column::ExternalId.eq(*external_id))
-                        .one(&*tx)
-                        .await?
-                        .ok_or_else(|| anyhow!("failed to insert extension"))?
-                };
-
-                extension_version::Entity::insert_many(versions.iter().map(|version| {
-                    extension_version::ActiveModel {
-                        extension_id: ActiveValue::Set(extension.id),
-                        published_at: ActiveValue::Set(version.published_at),
-                        version: ActiveValue::Set(version.version.to_string()),
-                        authors: ActiveValue::Set(version.authors.join(", ")),
-                        repository: ActiveValue::Set(version.repository.clone()),
-                        description: ActiveValue::Set(version.description.clone()),
-                        download_count: ActiveValue::NotSet,
-                    }
-                }))
-                .on_conflict(OnConflict::new().do_nothing().to_owned())
-                .exec_without_returning(&*tx)
-                .await?;
-
-                if let Ok(db_version) = semver::Version::parse(&extension.latest_version) {
-                    if db_version >= latest_version.version {
-                        continue;
-                    }
-                }
-
-                let mut extension = extension.into_active_model();
-                extension.latest_version = ActiveValue::Set(latest_version.version.to_string());
-                extension.name = ActiveValue::set(latest_version.name.clone());
-                extension::Entity::update(extension).exec(&*tx).await?;
-            }
-
-            Ok(())
-        })
-        .await
-    }
-
-    pub async fn record_extension_download(&self, extension: &str, version: &str) -> Result<bool> {
-        self.transaction(|tx| async move {
-            #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
-            enum QueryId {
-                Id,
-            }
-
-            let extension_id: Option<ExtensionId> = extension::Entity::find()
-                .filter(extension::Column::ExternalId.eq(extension))
-                .select_only()
-                .column(extension::Column::Id)
-                .into_values::<_, QueryId>()
-                .one(&*tx)
-                .await?;
-            let Some(extension_id) = extension_id else {
-                return Ok(false);
-            };
-
-            extension_version::Entity::update_many()
-                .col_expr(
-                    extension_version::Column::DownloadCount,
-                    extension_version::Column::DownloadCount.into_expr().add(1),
-                )
-                .filter(
-                    extension_version::Column::ExtensionId
-                        .eq(extension_id)
-                        .and(extension_version::Column::Version.eq(version)),
-                )
-                .exec(&*tx)
-                .await?;
-
-            extension::Entity::update_many()
-                .col_expr(
-                    extension::Column::TotalDownloadCount,
-                    extension::Column::TotalDownloadCount.into_expr().add(1),
-                )
-                .filter(extension::Column::Id.eq(extension_id))
-                .exec(&*tx)
-                .await?;
-
-            Ok(true)
-        })
-        .await
-    }
-}

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

@@ -161,7 +161,6 @@ 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<_>>();
@@ -208,7 +207,6 @@ 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?;
@@ -247,7 +245,6 @@ 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([
@@ -388,30 +385,6 @@ impl Database {
         Ok(())
     }
 
-    pub async fn observed_channel_messages(
-        &self,
-        channel_ids: &[ChannelId],
-        user_id: UserId,
-        tx: &DatabaseTransaction,
-    ) -> Result<Vec<proto::ChannelMessageId>> {
-        let rows = observed_channel_messages::Entity::find()
-            .filter(observed_channel_messages::Column::UserId.eq(user_id))
-            .filter(
-                observed_channel_messages::Column::ChannelId
-                    .is_in(channel_ids.iter().map(|id| id.0)),
-            )
-            .all(&*tx)
-            .await?;
-
-        Ok(rows
-            .into_iter()
-            .map(|message| proto::ChannelMessageId {
-                channel_id: message.channel_id.to_proto(),
-                message_id: message.channel_message_id.to_proto(),
-            })
-            .collect())
-    }
-
     pub async fn latest_channel_messages(
         &self,
         channel_ids: &[ChannelId],

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

@@ -51,7 +51,7 @@ impl Database {
             if !participant
                 .role
                 .unwrap_or(ChannelRole::Member)
-                .can_edit_projects()
+                .can_publish_to_rooms()
             {
                 return Err(anyhow!("guests cannot share projects"))?;
             }
@@ -778,7 +778,7 @@ impl Database {
             let left_project = LeftProject {
                 id: project_id,
                 host_user_id: project.host_user_id,
-                host_connection_id: Some(project.host_connection()?),
+                host_connection_id: project.host_connection()?,
                 connection_ids,
             };
             Ok((room, left_project))

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

@@ -110,10 +110,12 @@ impl Database {
         user_id: UserId,
         connection: ConnectionId,
         live_kit_room: &str,
+        release_channel: &str,
     ) -> Result<proto::Room> {
         self.transaction(|tx| async move {
             let room = room::ActiveModel {
                 live_kit_room: ActiveValue::set(live_kit_room.into()),
+                environment: ActiveValue::set(Some(release_channel.to_string())),
                 ..Default::default()
             }
             .insert(&*tx)
@@ -169,7 +171,7 @@ impl Database {
 
             let called_user_role = match caller.role.unwrap_or(ChannelRole::Member) {
                 ChannelRole::Admin | ChannelRole::Member => ChannelRole::Member,
-                ChannelRole::Guest | ChannelRole::Talker => ChannelRole::Guest,
+                ChannelRole::Guest => ChannelRole::Guest,
                 ChannelRole::Banned => return Err(anyhow!("banned users cannot invite").into()),
             };
 
@@ -300,21 +302,31 @@ impl Database {
         room_id: RoomId,
         user_id: UserId,
         connection: ConnectionId,
+        environment: &str,
     ) -> Result<RoomGuard<JoinRoom>> {
         self.room_transaction(room_id, |tx| async move {
             #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
-            enum QueryChannelId {
+            enum QueryChannelIdAndEnvironment {
                 ChannelId,
+                Environment,
             }
 
-            let channel_id: Option<ChannelId> = room::Entity::find()
-                .select_only()
-                .column(room::Column::ChannelId)
-                .filter(room::Column::Id.eq(room_id))
-                .into_values::<_, QueryChannelId>()
-                .one(&*tx)
-                .await?
-                .ok_or_else(|| anyhow!("no such room"))?;
+            let (channel_id, release_channel): (Option<ChannelId>, Option<String>) =
+                room::Entity::find()
+                    .select_only()
+                    .column(room::Column::ChannelId)
+                    .column(room::Column::Environment)
+                    .filter(room::Column::Id.eq(room_id))
+                    .into_values::<_, QueryChannelIdAndEnvironment>()
+                    .one(&*tx)
+                    .await?
+                    .ok_or_else(|| anyhow!("no such room"))?;
+
+            if let Some(release_channel) = release_channel {
+                if &release_channel != environment {
+                    Err(anyhow!("must join using the {} release", release_channel))?;
+                }
+            }
 
             if channel_id.is_some() {
                 Err(anyhow!("tried to join channel call directly"))?
@@ -850,7 +862,7 @@ impl Database {
                                 id: collaborator.project_id,
                                 host_user_id: Default::default(),
                                 connection_ids: Default::default(),
-                                host_connection_id: None,
+                                host_connection_id: Default::default(),
                             });
 
                     let collaborator_connection_id = collaborator.connection();
@@ -860,7 +872,7 @@ impl Database {
 
                     if collaborator.is_host {
                         left_project.host_user_id = collaborator.user_id;
-                        left_project.host_connection_id = Some(collaborator_connection_id);
+                        left_project.host_connection_id = collaborator_connection_id;
                     }
                 }
                 drop(collaborators);

crates/collab/src/db/tables.rs

@@ -10,8 +10,6 @@ pub mod channel_message;
 pub mod channel_message_mention;
 pub mod contact;
 pub mod contributor;
-pub mod extension;
-pub mod extension_version;
 pub mod feature_flag;
 pub mod follower;
 pub mod language_server;

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

@@ -12,7 +12,6 @@ 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/extension.rs

@@ -1,27 +0,0 @@
-use crate::db::ExtensionId;
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "extensions")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: ExtensionId,
-    pub external_id: String,
-    pub name: String,
-    pub latest_version: String,
-    pub total_download_count: i64,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(has_one = "super::extension_version::Entity")]
-    LatestVersion,
-}
-
-impl Related<super::extension_version::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::LatestVersion.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}