Maybe GITHUB_BASE_REF?

Renamed config option.
Disable linting.
2024-09-30 22:57:03 -04:00 · 2024-09-30 22:06:48 -04:00 · 2024-09-30 21:54:28 -04:00 · 2024-09-30 21:50:48 -04:00 · 2024-09-30 21:50:09 -04:00 · 2024-09-18 17:26:44 -04:00
519 changed files with 12560 additions and 19483 deletions
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -2,4 +2,14 @@ Closes #ISSUE

 Release Notes:

- N/A *or* Added/Fixed/Improved ...
+- Added/Fixed/Improved ...
+
+Optionally, include screenshots / media showcasing your addition that can be included in the release notes.
+
+### Or...
+
+Closes #ISSUE
+
+Release Notes:
+
+- N/A
--- a/.github/workflows/bump_collab_staging.yml
+++ b/.github/workflows/bump_collab_staging.yml
@@ -11,7 +11,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          fetch-depth: 0

--- a/.github/workflows/bump_patch_version.yml
+++ b/.github/workflows/bump_patch_version.yml
@@ -18,7 +18,7 @@ jobs:
      - buildjet-16vcpu-ubuntu-2204
    steps:
      - name: Checkout code
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          ref: ${{ github.event.inputs.branch }}
          ssh-key: ${{ secrets.ZED_BOT_DEPLOY_KEY }}
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,13 +7,9 @@ on:
      - "v[0-9]+.[0-9]+.x"
    tags:
      - "v*"
-    paths-ignore:
-      - "docs/**"
  pull_request:
    branches:
      - "**"
-    paths-ignore:
-      - "docs/**"

 concurrency:
  # Allow only one workflow per any non-`main` branch.
@@ -34,7 +30,7 @@ jobs:
      - test
    steps:
      - name: Checkout repo
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false
          fetch-depth: 0
@@ -69,13 +65,13 @@ jobs:
            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
+      - name: Protobuf checks
+        uses: bufbuild/buf-action@v1
        with:
+          version: 1.35.0
          input: "crates/proto/proto/"
-          against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=${BUF_BASE_BRANCH},subdir=crates/proto/proto/"
+          breaking_against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=${GITHUB_BASE_REF},subdir=crates/proto/proto/"
+          lint: false

  macos_tests:
    timeout-minutes: 60
@@ -85,7 +81,7 @@ jobs:
      - test
    steps:
      - name: Checkout repo
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

@@ -96,13 +92,10 @@ jobs:
        uses: ./.github/actions/run_tests

      - name: Build collab
-        run: RUSTFLAGS="-D warnings" cargo build -p collab
+        run: cargo build -p collab

      - name: Build other binaries and features
-        run: |
-          RUSTFLAGS="-D warnings" cargo build --workspace --bins --all-features
-          cargo check -p gpui --features "macos-blade"
-          RUSTFLAGS="-D warnings" cargo build -p remote_server
+        run: cargo build --workspace --bins --all-features; cargo check -p gpui --features "macos-blade"

  linux_tests:
    timeout-minutes: 60
@@ -114,7 +107,7 @@ jobs:
        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH

      - name: Checkout repo
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

@@ -134,33 +127,7 @@ jobs:
        uses: ./.github/actions/run_tests

      - name: Build Zed
-        run: RUSTFLAGS="-D warnings" cargo build -p zed
-
-  build_remote_server:
-    timeout-minutes: 60
-    name: (Linux) Build Remote Server
-    runs-on:
-      - buildjet-16vcpu-ubuntu-2204
-    steps:
-      - name: Add Rust to the PATH
-        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
-
-      - name: Checkout repo
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
-        with:
-          clean: false
-
-      - name: Cache dependencies
-        uses: swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2
-        with:
-          save-if: ${{ github.ref == 'refs/heads/main' }}
-          cache-provider: "buildjet"
-
-      - name: Install Clang & Mold
-        run: ./script/remote-server && ./script/install-mold 2.34.0
-
-      - name: Build Remote Server
-        run: RUSTFLAGS="-D warnings" cargo build -p remote_server
+        run: cargo build -p zed

  # todo(windows): Actually run the tests
  windows_tests:
@@ -169,7 +136,7 @@ jobs:
    runs-on: hosted-windows-1
    steps:
      - name: Checkout repo
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

@@ -184,7 +151,7 @@ jobs:
        run: cargo xtask clippy

      - name: Build Zed
-        run: $env:RUSTFLAGS="-D warnings"; cargo build
+        run: cargo build -p zed

  bundle-mac:
    timeout-minutes: 60
@@ -210,7 +177,7 @@ jobs:
          node-version: "18"

      - name: Checkout repo
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          # We need to fetch more than one commit so that `script/draft-release-notes`
          # is able to diff between the current and previous tag.
@@ -248,20 +215,20 @@ jobs:
          mv target/x86_64-apple-darwin/release/Zed.dmg target/x86_64-apple-darwin/release/Zed-x86_64.dmg

      - name: Upload app bundle (universal) to workflow run if main branch or specific label
-        uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4
+        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
        if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
        with:
          name: Zed_${{ github.event.pull_request.head.sha || github.sha }}.dmg
          path: target/release/Zed.dmg
      - name: Upload app bundle (aarch64) to workflow run if main branch or specific label
-        uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4
+        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
        if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
        with:
          name: Zed_${{ github.event.pull_request.head.sha || github.sha }}-aarch64.dmg
          path: target/aarch64-apple-darwin/release/Zed-aarch64.dmg

      - name: Upload app bundle (x86_64) to workflow run if main branch or specific label
-        uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4
+        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
        if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
        with:
          name: Zed_${{ github.event.pull_request.head.sha || github.sha }}-x86_64.dmg
@@ -295,7 +262,7 @@ jobs:
      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
    steps:
      - name: Checkout repo
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

@@ -312,7 +279,7 @@ jobs:
        run: script/bundle-linux

      - name: Upload Linux bundle to workflow run if main branch or specific label
-        uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4
+        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
        if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
        with:
          name: zed-${{ github.event.pull_request.head.sha || github.sha }}-x86_64-unknown-linux-gnu.tar.gz
@@ -342,7 +309,7 @@ jobs:
      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
    steps:
      - name: Checkout repo
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

@@ -359,7 +326,7 @@ jobs:
        run: script/bundle-linux

      - name: Upload Linux bundle to workflow run if main branch or specific label
-        uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4
+        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
        if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
        with:
          name: zed-${{ github.event.pull_request.head.sha || github.sha }}-aarch64-unknown-linux-gnu.tar.gz
--- a/.github/workflows/close_stale_issues.yml
+++ b/.github/workflows/close_stale_issues.yml
@@ -14,16 +14,16 @@ jobs:
          stale-issue-message: >
            Hi there! 👋

-            We're working to clean up our issue tracker by closing older issues that might not be relevant anymore. Are you able to reproduce this issue in the latest version of Zed? If so, please let us know by commenting on this issue and we will keep it open; otherwise, we'll close it in 7 days. Feel free to open a new issue if you're seeing this message after the issue has been closed.
+            We're working to clean up our issue tracker by closing older issues that might not be relevant anymore. Are you able to reproduce this issue in the latest version of Zed? If so, please let us know by commenting on this issue and we will keep it open; otherwise, we'll close it in 10 days. Feel free to open a new issue if you're seeing this message after the issue has been closed.

            Thanks for your help!
-          close-issue-message: "This issue was closed due to inactivity. If you're still experiencing this problem, feel free to ping a Zed team member to reopen this issue or open a new one."
+          close-issue-message: "This issue was closed due to inactivity; feel free to open a new issue if you're still experiencing this problem!"
          # We will increase `days-before-stale` to 365 on or after Jan 24th,
          # 2024. This date marks one year since migrating issues from
          # 'community' to 'zed' repository. The migration added activity to all
          # issues, preventing 365 days from working until then.
          days-before-stale: 180
-          days-before-close: 7
+          days-before-close: 10
          any-of-issue-labels: "defect,panic / crash"
          operations-per-run: 1000
          ascending: true
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -14,7 +14,7 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4

      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
        with:
--- a/.github/workflows/deploy_cloudflare.yml
+++ b/.github/workflows/deploy_cloudflare.yml
@@ -12,7 +12,7 @@ jobs:

    steps:
      - name: Checkout repo
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

@@ -36,28 +36,28 @@ jobs:
          mdbook build ./docs --dest-dir=../target/deploy/docs/

      - name: Deploy Docs
-        uses: cloudflare/wrangler-action@9681c2997648301493e78cacbfb790a9f19c833f # v3
+        uses: cloudflare/wrangler-action@f84a562284fc78278ff9052435d9526f9c718361 # v3
        with:
          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
          command: pages deploy target/deploy --project-name=docs

      - name: Deploy Install
-        uses: cloudflare/wrangler-action@9681c2997648301493e78cacbfb790a9f19c833f # v3
+        uses: cloudflare/wrangler-action@f84a562284fc78278ff9052435d9526f9c718361 # v3
        with:
          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
          command: r2 object put -f script/install.sh zed-open-source-website-assets/install.sh

      - name: Deploy Docs Workers
-        uses: cloudflare/wrangler-action@9681c2997648301493e78cacbfb790a9f19c833f # v3
+        uses: cloudflare/wrangler-action@f84a562284fc78278ff9052435d9526f9c718361 # v3
        with:
          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
          command: deploy .cloudflare/docs-proxy/src/worker.js

      - name: Deploy Install Workers
-        uses: cloudflare/wrangler-action@9681c2997648301493e78cacbfb790a9f19c833f # v3
+        uses: cloudflare/wrangler-action@f84a562284fc78278ff9052435d9526f9c718361 # v3
        with:
          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
--- a/.github/workflows/deploy_collab.yml
+++ b/.github/workflows/deploy_collab.yml
@@ -17,7 +17,7 @@ jobs:
      - test
    steps:
      - name: Checkout repo
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false
          fetch-depth: 0
@@ -36,7 +36,7 @@ jobs:
    needs: style
    steps:
      - name: Checkout repo
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false
          fetch-depth: 0
@@ -71,7 +71,7 @@ jobs:
        run: doctl registry login

      - name: Checkout repo
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

@@ -97,7 +97,7 @@ jobs:

    steps:
      - name: Checkout repo
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -14,20 +14,17 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4

      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
        with:
          version: 9

-      - name: Prettier Check on /docs
-        working-directory: ./docs
-        run: |
+      - run: |
          pnpm dlx prettier . --check || {
            echo "To fix, run from the root of the zed repo:"
            echo "  cd docs && pnpm dlx prettier . --write && cd .."
            false
          }

-      - name: Check spelling
-        run: script/check-spelling docs/
+        working-directory: ./docs
--- a/.github/workflows/publish_extension_cli.yml
+++ b/.github/workflows/publish_extension_cli.yml
@@ -16,7 +16,7 @@ jobs:
      - ubuntu-latest
    steps:
      - name: Checkout repo
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

--- a/.github/workflows/randomized_tests.yml
+++ b/.github/workflows/randomized_tests.yml
@@ -27,7 +27,7 @@ jobs:
          node-version: "18"

      - name: Checkout repo
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

--- a/.github/workflows/release_actions.yml
+++ b/.github/workflows/release_actions.yml
@@ -1,5 +1,3 @@
-name: Release Actions
-
 on:
  release:
    types: [published]
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -23,7 +23,7 @@ jobs:
      - test
    steps:
      - name: Checkout repo
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false
          fetch-depth: 0
@@ -44,7 +44,7 @@ jobs:
    needs: style
    steps:
      - name: Checkout repo
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

@@ -75,7 +75,7 @@ jobs:
          node-version: "18"

      - name: Checkout repo
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

@@ -109,7 +109,7 @@ jobs:
      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
    steps:
      - name: Checkout repo
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

@@ -149,7 +149,7 @@ jobs:
      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
    steps:
      - name: Checkout repo
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

@@ -182,7 +182,7 @@ jobs:
      - bundle-linux-arm
    steps:
      - name: Checkout repo
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          fetch-depth: 0

--- a/.github/workflows/update_all_top_ranking_issues.yml
+++ b/.github/workflows/update_all_top_ranking_issues.yml
@@ -1,5 +1,3 @@
-name: Update All Top Ranking Issues
-
 on:
  schedule:
    - cron: "0 */12 * * *"
@@ -10,16 +8,11 @@ jobs:
    runs-on: ubuntu-latest
    if: github.repository_owner == 'zed-industries'
    steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
-      - name: Set up uv
-        uses: astral-sh/setup-uv@f3bcaebff5eace81a1c062af9f9011aae482ca9d # v3
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5
        with:
-          version: "latest"
-          enable-cache: true
-          cache-dependency-glob: "script/update_top_ranking_issues/pyproject.toml"
-      - name: Install Python 3.13
-        run: uv python install 3.13
-      - name: Install dependencies
-        run: uv sync --project script/update_top_ranking_issues -p 3.13
-      - name: Run script
-        run: uv run --project script/update_top_ranking_issues script/update_top_ranking_issues/main.py --github-token ${{ secrets.GITHUB_TOKEN }} --issue-reference-number 5393
+          python-version: "3.11"
+          architecture: "x64"
+          cache: "pip"
+      - run: pip install -r script/update_top_ranking_issues/requirements.txt
+      - run: python script/update_top_ranking_issues/main.py --github-token ${{ secrets.GITHUB_TOKEN }} --issue-reference-number 5393
--- a/.github/workflows/update_weekly_top_ranking_issues.yml
+++ b/.github/workflows/update_weekly_top_ranking_issues.yml
@@ -1,5 +1,3 @@
-name: Update Weekly Top Ranking Issues
-
 on:
  schedule:
    - cron: "0 15 * * *"
@@ -10,16 +8,11 @@ jobs:
    runs-on: ubuntu-latest
    if: github.repository_owner == 'zed-industries'
    steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
-      - name: Set up uv
-        uses: astral-sh/setup-uv@f3bcaebff5eace81a1c062af9f9011aae482ca9d # v3
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5
        with:
-          version: "latest"
-          enable-cache: true
-          cache-dependency-glob: "script/update_top_ranking_issues/pyproject.toml"
-      - name: Install Python 3.13
-        run: uv python install 3.13
-      - name: Install dependencies
-        run: uv sync --project script/update_top_ranking_issues -p 3.13
-      - name: Run script
-        run: uv run --project script/update_top_ranking_issues script/update_top_ranking_issues/main.py --github-token ${{ secrets.GITHUB_TOKEN }} --issue-reference-number 6952 --query-day-interval 7
+          python-version: "3.11"
+          architecture: "x64"
+          cache: "pip"
+      - run: pip install -r script/update_top_ranking_issues/requirements.txt
+      - run: python script/update_top_ranking_issues/main.py --github-token ${{ secrets.GITHUB_TOKEN }} --issue-reference-number 6952 --query-day-interval 7
--- a/.zed/settings.json
+++ b/.zed/settings.json
@@ -36,6 +36,9 @@
          "RUST_DEFAULT_PACKAGE_RUN": "zed"
        }
      }
+    },
+    "proto": {
+      "tab_size": 2
    }
  },
  "file_types": {
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -52,6 +52,7 @@ members = [
    "crates/indexed_docs",
    "crates/inline_completion_button",
    "crates/install_cli",
+    "crates/isahc_http_client",
    "crates/journal",
    "crates/language",
    "crates/language_model",
@@ -87,7 +88,6 @@ members = [
    "crates/remote",
    "crates/remote_server",
    "crates/repl",
-    "crates/reqwest_client",
    "crates/rich_text",
    "crates/rope",
    "crates/rpc",
@@ -99,7 +99,6 @@ members = [
    "crates/settings_ui",
    "crates/snippet",
    "crates/snippet_provider",
-    "crates/snippets_ui",
    "crates/sqlez",
    "crates/sqlez_macros",
    "crates/story",
@@ -122,7 +121,6 @@ members = [
    "crates/ui",
    "crates/ui_input",
    "crates/ui_macros",
-    "crates/reqwest_client",
    "crates/util",
    "crates/vcs_menu",
    "crates/vim",
@@ -145,6 +143,7 @@ members = [
    "extensions/elm",
    "extensions/emmet",
    "extensions/erlang",
+    "extensions/gleam",
    "extensions/glsl",
    "extensions/haskell",
    "extensions/html",
@@ -153,9 +152,9 @@ members = [
    "extensions/php",
    "extensions/perplexity",
    "extensions/prisma",
-    "extensions/proto",
    "extensions/purescript",
    "extensions/ruff",
+    "extensions/ruby",
    "extensions/slash-commands-example",
    "extensions/snippets",
    "extensions/svelte",
@@ -175,7 +174,6 @@ members = [
 default-members = ["crates/zed"]

 [workspace.dependencies]
-
 #
 # Workspace member crates
 #
@@ -219,8 +217,9 @@ git = { path = "crates/git" }
 git_hosting_providers = { path = "crates/git_hosting_providers" }
 go_to_line = { path = "crates/go_to_line" }
 google_ai = { path = "crates/google_ai" }
-gpui = { path = "crates/gpui", default-features = false, features = ["http_client"]}
+gpui = { path = "crates/gpui" }
 gpui_macros = { path = "crates/gpui_macros" }
+handlebars = "4.3"
 headless = { path = "crates/headless" }
 html_to_markdown = { path = "crates/html_to_markdown" }
 http_client = { path = "crates/http_client" }
@@ -228,6 +227,7 @@ image_viewer = { path = "crates/image_viewer" }
 indexed_docs = { path = "crates/indexed_docs" }
 inline_completion_button = { path = "crates/inline_completion_button" }
 install_cli = { path = "crates/install_cli" }
+isahc_http_client = { path = "crates/isahc_http_client" }
 journal = { path = "crates/journal" }
 language = { path = "crates/language" }
 language_model = { path = "crates/language_model" }
@@ -264,7 +264,6 @@ release_channel = { path = "crates/release_channel" }
 remote = { path = "crates/remote" }
 remote_server = { path = "crates/remote_server" }
 repl = { path = "crates/repl" }
-reqwest_client = { path = "crates/reqwest_client" }
 rich_text = { path = "crates/rich_text" }
 rope = { path = "crates/rope" }
 rpc = { path = "crates/rpc" }
@@ -276,7 +275,6 @@ settings = { path = "crates/settings" }
 settings_ui = { path = "crates/settings_ui" }
 snippet = { path = "crates/snippet" }
 snippet_provider = { path = "crates/snippet_provider" }
-snippets_ui = { path = "crates/snippets_ui" }
 sqlez = { path = "crates/sqlez" }
 sqlez_macros = { path = "crates/sqlez_macros" }
 story = { path = "crates/story" }
@@ -318,7 +316,6 @@ any_vec = "0.14"
 anyhow = "1.0.86"
 arrayvec = { version = "0.7.4", features = ["serde"] }
 ashpd = "0.9.1"
-async-compat = "0.2.1"
 async-compression = { version = "0.4", features = ["gzip", "futures-io"] }
 async-dispatcher = "0.1"
 async-fs = "1.6"
@@ -326,7 +323,7 @@ async-pipe = { git = "https://github.com/zed-industries/async-pipe-rs", rev = "8
 async-recursion = "1.0.0"
 async-tar = "0.5.0"
 async-trait = "0.1"
-async-tungstenite = "0.24"
+async-tungstenite = "0.23"
 async-watch = "0.3.1"
 async_zip = { version = "0.0.17", features = ["deflate", "deflate64"] }
 base64 = "0.22"
@@ -335,7 +332,6 @@ blade-graphics = { git = "https://github.com/kvark/blade", rev = "e142a3a5e678eb
 blade-macros = { git = "https://github.com/kvark/blade", rev = "e142a3a5e678eb6a13e642ad8401b1f3aa38e969" }
 blade-util = { git = "https://github.com/kvark/blade", rev = "e142a3a5e678eb6a13e642ad8401b1f3aa38e969" }
 blake3 = "1.5.3"
-bytes = "1.0"
 cargo_metadata = "0.18"
 cargo_toml = "0.20"
 chrono = { version = "0.4", features = ["serde"] }
@@ -358,15 +354,18 @@ futures-batch = "0.6.1"
 futures-lite = "1.13"
 git2 = { version = "0.19", default-features = false }
 globset = "0.4"
-handlebars = "4.3"
 heed = { version = "0.20.1", features = ["read-txn-no-tls"] }
 hex = "0.4.3"
-html5ever = "0.27.0"
 hyper = "0.14"
+html5ever = "0.27.0"
 ignore = "0.4.22"
 image = "0.25.1"
 indexmap = { version = "1.6.2", features = ["serde"] }
 indoc = "2"
+# We explicitly disable http2 support in isahc.
+isahc = { version = "1.7.2", default-features = false, features = [
+    "text-decoding",
+] }
 itertools = "0.13.0"
 jsonwebtoken = "9.3"
 libc = "0.2"
@@ -381,9 +380,9 @@ ordered-float = "2.1.1"
 palette = { version = "0.7.5", default-features = false, features = ["std"] }
 parking_lot = "0.12.1"
 pathdiff = "0.2"
+profiling = "1"
 postage = { version = "0.5", features = ["futures-traits"] }
 pretty_assertions = "1.3.0"
-profiling = "1"
 prost = "0.9"
 prost-build = "0.9"
 prost-types = "0.9"
@@ -391,7 +390,6 @@ pulldown-cmark = { version = "0.12.0", default-features = false }
 rand = "0.8.5"
 regex = "1.5"
 repair_json = "0.1.0"
-reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "fd110f6998da16bbca97b6dddda9be7827c50e29", default-features = false, features = ["charset", "http2", "macos-system-configuration", "rustls-tls-native-roots", "stream"]}
 rsa = "0.9.6"
 runtimelib = { version = "0.15", default-features = false, features = [
    "async-dispatcher-runtime",
@@ -418,7 +416,6 @@ similar = "1.3"
 simplelog = "0.12.2"
 smallvec = { version = "1.6", features = ["union"] }
 smol = "1.2"
-sqlformat = "0.2"
 strsim = "0.11"
 strum = { version = "0.25.0", features = ["derive"] }
 subtle = "2.5.0"
@@ -436,7 +433,7 @@ time = { version = "0.3", features = [
 ] }
 tiny_http = "0.8"
 toml = "0.8"
-tokio = { version = "1" }
+tokio = { version = "1", features = ["full"] }
 tower-http = "0.4.4"
 tree-sitter = { version = "0.23", features = ["wasm"] }
 tree-sitter-bash = "0.23"
@@ -449,19 +446,19 @@ tree-sitter-go = "0.23"
 tree-sitter-go-mod = { git = "https://github.com/zed-industries/tree-sitter-go-mod", rev = "a9aea5e358cde4d0f8ff20b7bc4fa311e359c7ca", package = "tree-sitter-gomod" }
 tree-sitter-gowork = { git = "https://github.com/zed-industries/tree-sitter-go-work", rev = "acb0617bf7f4fda02c6217676cc64acb89536dc7" }
 tree-sitter-heex = { git = "https://github.com/zed-industries/tree-sitter-heex", rev = "1dd45142fbb05562e35b2040c6129c9bca346592" }
-tree-sitter-diff = "0.1.0"
 tree-sitter-html = "0.20"
 tree-sitter-jsdoc = "0.23"
 tree-sitter-json = "0.23"
 tree-sitter-md = { git = "https://github.com/zed-industries/tree-sitter-markdown", rev = "4cfa6aad6b75052a5077c80fd934757d9267d81b" }
+protols-tree-sitter-proto = { git = "https://github.com/zed-industries/tree-sitter-proto", rev = "0848bd30a64be48772e15fbb9d5ba8c0cc5772ad" }
 tree-sitter-python = "0.23"
 tree-sitter-regex = "0.23"
 tree-sitter-ruby = "0.23"
 tree-sitter-rust = "0.23"
 tree-sitter-typescript = "0.23"
-tree-sitter-yaml = { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a" }
-unicase = "2.6"
+tree-sitter-yaml =  { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a" }
 unindent = "0.1.7"
+unicase = "2.6"
 unicode-segmentation = "1.10"
 url = "2.2"
 uuid = { version = "1.1.2", features = ["v4", "v5", "serde"] }
@@ -477,11 +474,9 @@ wasmtime = { version = "24", default-features = false, features = [
 wasmtime-wasi = "24"
 which = "6.0.0"
 wit-component = "0.201"
-zstd = "0.11"

 [workspace.dependencies.async-stripe]
-git = "https://github.com/zed-industries/async-stripe"
-rev = "3672dd4efb7181aa597bf580bf5a2f5d23db6735"
+version = "0.39"
 default-features = false
 features = [
    "runtime-tokio-hyper-rustls",
--- a/Cross.toml
+++ b/Cross.toml
@@ -1,2 +0,0 @@
-[build]
-dockerfile = "Dockerfile-cross"
--- a/23
+++ b/23
@@ -13,9 +13,28 @@ ARG GITHUB_SHA

 ENV GITHUB_SHA=$GITHUB_SHA

-# Also add `cmake`, since we need it to build `wasmtime`.
+# At some point in the past 3 weeks, additional dependencies on `xkbcommon` and
+# `xkbcommon-x11` were introduced into collab.
+#
+# A `git bisect` points to this commit as being the culprit: `b8e6098f60e5dabe98fe8281f993858dacc04a55`.
+#
+# Now when we try to build collab for the Docker image, it fails with the following
+# error:
+#
+# ```
+# 985.3   = note: /usr/bin/ld: cannot find -lxkbcommon: No such file or directory
+# 985.3           /usr/bin/ld: cannot find -lxkbcommon-x11: No such file or directory
+# 985.3           collect2: error: ld returned 1 exit status
+# ```
+#
+# The last successful deploys were at:
+# - Staging: `4f408ec65a3867278322a189b4eb20f1ab51f508`
+# - Production: `fc4c533d0a8c489e5636a4249d2b52a80039fbd7`
+#
+# Installing these as a temporary workaround, but I think ideally we'd want to figure
+# out what caused them to be included in the first place.
 RUN apt-get update; \
-    apt-get install -y --no-install-recommends cmake
+    apt-get install -y --no-install-recommends libxkbcommon-dev libxkbcommon-x11-dev

 RUN --mount=type=cache,target=./script/node_modules \
    --mount=type=cache,target=/usr/local/cargo/registry \
--- a/17
+++ b/17
@@ -1,17 +0,0 @@
-# syntax=docker/dockerfile:1
-
-ARG CROSS_BASE_IMAGE
-FROM ${CROSS_BASE_IMAGE}
-WORKDIR /app
-ARG TZ=Etc/UTC \
-    LANG=C.UTF-8 \
-    LC_ALL=C.UTF-8 \
-    DEBIAN_FRONTEND=noninteractive
-ENV CARGO_TERM_COLOR=always
-
-COPY script/install-mold script/
-RUN ./script/install-mold "2.34.0"
-COPY script/remote-server script/
-RUN ./script/remote-server
-
-COPY . .
--- a/Dockerfile-cross.dockerignore
+++ b/Dockerfile-cross.dockerignore
@@ -1,16 +0,0 @@
-.git
-.github
-**/.gitignore
-**/.gitkeep
-.gitattributes
-.mailmap
-**/target
-zed.xcworkspace
-.DS_Store
-compose.yml
-plugins/bin
-script/node_modules
-styles/node_modules
-crates/collab/static/styles.css
-vendor/bin
-assets/themes/
--- a/assets/icons/file_icons/file_types.json
+++ b/assets/icons/file_icons/file_types.json
@@ -20,7 +20,6 @@
    "bashrc": "terminal",
    "bmp": "image",
    "c": "c",
-    "c++": "cpp",
    "cc": "cpp",
    "cjs": "javascript",
    "coffee": "coffeescript",
@@ -28,7 +27,6 @@
    "cpp": "cpp",
    "css": "css",
    "csv": "storage",
-    "cxx": "cpp",
    "cts": "typescript",
    "dart": "dart",
    "dat": "storage",
@@ -68,13 +66,11 @@
    "heex": "elixir",
    "heic": "image",
    "heif": "image",
-    "hh": "cpp",
    "hpp": "cpp",
    "hrl": "erlang",
    "hs": "haskell",
    "htm": "template",
    "html": "template",
-    "hxx": "cpp",
    "ib": "storage",
    "ico": "image",
    "ini": "settings",
--- a/assets/icons/trash_alt.svg
+++ b/assets/icons/trash_alt.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-trash"><path d="M3 6h18"/><path d="M19 6v14c0 1-1 2-2 2H7c-1 0-2-1-2-2V6"/><path d="M8 6V4c0-1 1-2 2-2h4c1 0 2 1 2 2v2"/></svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -664,8 +664,7 @@
      "shift-up": "terminal::ScrollLineUp",
      "shift-down": "terminal::ScrollLineDown",
      "shift-home": "terminal::ScrollToTop",
-      "shift-end": "terminal::ScrollToBottom",
-      "ctrl-shift-space": "terminal::ToggleViMode"
+      "shift-end": "terminal::ScrollToBottom"
    }
  },
  {
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -395,7 +395,6 @@
      // Change the default action on `menu::Confirm` by setting the parameter
      // "alt-cmd-o": ["projects::OpenRecent", {"create_new_window": true }],
      "alt-cmd-o": "projects::OpenRecent",
-      "ctrl-cmd-o": "projects::OpenRemote",
      "alt-cmd-b": "branches::OpenRecent",
      "ctrl-~": "workspace::NewTerminal",
      "cmd-s": "workspace::Save",
@@ -441,12 +440,7 @@
      "cmd-k shift-right": ["workspace::SwapPaneInDirection", "Right"],
      "cmd-k shift-up": ["workspace::SwapPaneInDirection", "Up"],
      "cmd-k shift-down": ["workspace::SwapPaneInDirection", "Down"],
-      "cmd-shift-x": "zed::Extensions"
-    }
-  },
-  {
-    "context": "Workspace && !Terminal",
-    "bindings": {
+      "cmd-shift-x": "zed::Extensions",
      "alt-t": "task::Rerun",
      "alt-shift-t": "task::Spawn"
    }
@@ -679,8 +673,7 @@
      "cmd-home": "terminal::ScrollToTop",
      "cmd-end": "terminal::ScrollToBottom",
      "shift-home": "terminal::ScrollToTop",
-      "shift-end": "terminal::ScrollToBottom",
-      "ctrl-shift-space": "terminal::ToggleViMode"
+      "shift-end": "terminal::ScrollToBottom"
    }
  }
 ]
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -128,10 +128,6 @@
      "shift-m": "vim::WindowMiddle",
      "shift-l": "vim::WindowBottom",
      // z commands
-      "z enter": ["workspace::SendKeystrokes", "z t ^"],
-      "z -": ["workspace::SendKeystrokes", "z b ^"],
-      "z ^": ["workspace::SendKeystrokes", "shift-h k z b ^"],
-      "z +": ["workspace::SendKeystrokes", "shift-l j z t ^"],
      "z t": "editor::ScrollCursorTop",
      "z z": "editor::ScrollCursorCenter",
      "z .": ["workspace::SendKeystrokes", "z z ^"],
@@ -256,7 +252,6 @@
      "@": ["vim::PushOperator", "ReplayRegister"],
      "ctrl-pagedown": "pane::ActivateNextItem",
      "ctrl-pageup": "pane::ActivatePrevItem",
-      "insert": "vim::InsertBefore",
      // tree-sitter related commands
      "[ x": "editor::SelectLargerSyntaxNode",
      "] x": "editor::SelectSmallerSyntaxNode",
@@ -339,8 +334,7 @@
      "ctrl-t": "vim::Indent",
      "ctrl-d": "vim::Outdent",
      "ctrl-k": ["vim::PushOperator", { "Digraph": {} }],
-      "ctrl-r": ["vim::PushOperator", "Register"],
-      "insert": "vim::ToggleReplace"
+      "ctrl-r": ["vim::PushOperator", "Register"]
    }
  },
  {
@@ -359,8 +353,7 @@
      "ctrl-k": ["vim::PushOperator", { "Digraph": {} }],
      "backspace": "vim::UndoReplace",
      "tab": "vim::Tab",
-      "enter": "vim::Enter",
-      "insert": "vim::InsertBefore"
+      "enter": "vim::Enter"
    }
  },
  {
--- a/assets/prompts/content_prompt.hbs
+++ b/assets/prompts/content_prompt.hbs
@@ -50,9 +50,6 @@ And here's the section to rewrite based on that prompt again for reference:

 {{#if diagnostic_errors}}
 {{#each diagnostic_errors}}
-
-Below are the diagnostic errors visible to the user.  If the user requests problems to be fixed, use this information, but do not try to fix these errors if the user hasn't asked you to.
-
 <diagnostic_error>
    <line_number>{{line_number}}</line_number>
    <error_message>{{error_message}}</error_message>
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -118,8 +118,8 @@
  //     "bar"
  //  2. A block that surrounds the following character
  //     "block"
-  //  3. An underline / underscore that runs along the following character
-  //     "underline"
+  //  3. An underline that runs along the following character
+  //     "underscore"
  //  4. A box drawn around the following character
  //     "hollow"
  //
@@ -356,19 +356,9 @@
    /// Scrollbar-related settings
    "scrollbar": {
      /// When to show the scrollbar in the project panel.
-      /// This setting can take four values:
      ///
-      /// 1. null (default): Inherit editor settings
-      /// 2. Show the scrollbar if there's important information or
-      ///    follow the system's configured behavior (default):
-      ///   "auto"
-      /// 3. Match the system's configured behavior:
-      ///    "system"
-      /// 4. Always show the scrollbar:
-      ///    "always"
-      /// 5. Never show the scrollbar:
-      ///    "never"
-      "show": null
+      /// Default: always
+      "show": "always"
    }
  },
  "outline_panel": {
@@ -494,14 +484,7 @@
    // Position of the close button on the editor tabs.
    "close_position": "right",
    // Whether to show the file icon for a tab.
-    "file_icons": false,
-    // What to do after closing the current tab.
-    //
-    // 1. Activate the tab that was open previously (default)
-    //     "History"
-    // 2. Activate the neighbour tab (prefers the right one, if present)
-    //     "Neighbour"
-    "activate_on_close": "history"
+    "file_icons": false
  },
  // Settings related to preview tabs.
  "preview_tabs": {
@@ -691,8 +674,8 @@
    //     "block"
    //  2. A vertical bar
    //     "bar"
-    //  3. An underline / underscore that runs along the following character
-    //     "underline"
+    //  3. An underline that runs along the following character
+    //     "underscore"
    //  4. A box drawn around the following character
    //     "hollow"
    //
@@ -824,7 +807,6 @@
  // Different settings for specific languages.
  "languages": {
    "Astro": {
-      "language_servers": ["astro-language-server", "..."],
      "prettier": {
        "allowed": true,
        "plugins": ["prettier-plugin-astro"]
@@ -848,13 +830,6 @@
        "allowed": true
      }
    },
-    "Dart": {
-      "tab_size": 2
-    },
-    "Diff": {
-      "remove_trailing_whitespace_on_save": false,
-      "ensure_final_newline_on_save": false
-    },
    "Elixir": {
      "language_servers": ["elixir-ls", "!next-ls", "!lexical", "..."]
    },
--- a/assets/settings/initial_server_settings.json
+++ b/assets/settings/initial_server_settings.json
@@ -1,7 +0,0 @@
-// Server-specific settings
-//
-// For a full list of overridable settings, and general information on settings,
-// see the documentation: https://zed.dev/docs/configuring-zed#settings-files
-{
-  "lsp": {}
-}
--- a/clippy.toml
+++ b/clippy.toml
@@ -1,2 +1 @@
 allow-private-module-inception = true
-avoid-breaking-exported-api = false
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/crates/activity_indicator/src/activity_indicator.rs
@@ -10,7 +10,7 @@ use gpui::{
 use language::{
    LanguageRegistry, LanguageServerBinaryStatus, LanguageServerId, LanguageServerName,
 };
-use project::{EnvironmentErrorMessage, LanguageServerProgress, Project, WorktreeId};
+use project::{LanguageServerProgress, Project};
 use smallvec::SmallVec;
 use std::{cmp::Reverse, fmt::Write, sync::Arc, time::Duration};
 use ui::{prelude::*, ButtonLike, ContextMenu, PopoverMenu, PopoverMenuHandle};
@@ -101,7 +101,6 @@ impl ActivityIndicator {
                            None,
                            cx,
                        );
-                        buffer.set_capability(language::Capability::ReadOnly, cx);
                    })?;
                    workspace.update(&mut cx, |workspace, cx| {
                        workspace.add_item_to_active_pane(
@@ -176,31 +175,7 @@ impl ActivityIndicator {
            .flatten()
    }

-    fn pending_environment_errors<'a>(
-        &'a self,
-        cx: &'a AppContext,
-    ) -> impl Iterator<Item = (&'a WorktreeId, &'a EnvironmentErrorMessage)> {
-        self.project.read(cx).shell_environment_errors(cx)
-    }
-
    fn content_to_render(&mut self, cx: &mut ViewContext<Self>) -> Option<Content> {
-        // Show if any direnv calls failed
-        if let Some((&worktree_id, error)) = self.pending_environment_errors(cx).next() {
-            return Some(Content {
-                icon: Some(
-                    Icon::new(IconName::Warning)
-                        .size(IconSize::Small)
-                        .into_any_element(),
-                ),
-                message: error.0.clone(),
-                on_click: Some(Arc::new(move |this, cx| {
-                    this.project.update(cx, |project, cx| {
-                        project.remove_environment_error(cx, worktree_id);
-                    });
-                    cx.dispatch_action(Box::new(workspace::OpenLog));
-                })),
-            });
-        }
        // Show any language server has pending activity.
        let mut pending_work = self.pending_language_server_work(cx);
        if let Some(PendingWork {
--- a/crates/anthropic/Cargo.toml
+++ b/crates/anthropic/Cargo.toml
@@ -26,3 +26,6 @@ serde_json.workspace = true
 strum.workspace = true
 thiserror.workspace = true
 util.workspace = true
+
+[dev-dependencies]
+tokio.workspace = true
--- a/crates/anthropic/src/anthropic.rs
+++ b/crates/anthropic/src/anthropic.rs
@@ -521,10 +521,6 @@ pub struct Usage {
    pub input_tokens: Option<u32>,
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub output_tokens: Option<u32>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub cache_creation_input_tokens: Option<u32>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub cache_read_input_tokens: Option<u32>,
 }

 #[derive(Debug, Serialize, Deserialize)]
--- a/crates/assistant/src/assistant_panel.rs
+++ b/crates/assistant/src/assistant_panel.rs
@@ -18,7 +18,7 @@ use crate::{
    PendingSlashCommand, PendingSlashCommandStatus, QuoteSelection, RemoteContextMetadata,
    SavedContextMetadata, Split, ToggleFocus, ToggleModelSelector, WorkflowStepResolution,
 };
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use assistant_slash_command::{SlashCommand, SlashCommandOutputSection};
 use assistant_tool::ToolRegistry;
 use client::{proto, Client, Status};
@@ -77,7 +77,7 @@ use ui::TintColor;
 use ui::{
    prelude::*,
    utils::{format_distance_from_now, DateTimeType},
-    Avatar, ButtonLike, ContextMenu, Disclosure, ElevationIndex, KeyBinding, ListItem,
+    Avatar, AvatarShape, ButtonLike, ContextMenu, Disclosure, ElevationIndex, KeyBinding, ListItem,
    ListItemSpacing, PopoverMenu, PopoverMenuHandle, Tooltip,
 };
 use util::{maybe, ResultExt};
@@ -262,7 +262,9 @@ impl PickerDelegate for SavedContextPickerDelegate {
                            .gap_2()
                            .children(if let Some(host_user) = host_user {
                                vec![
-                                    Avatar::new(host_user.avatar_uri.clone()).into_any_element(),
+                                    Avatar::new(host_user.avatar_uri.clone())
+                                        .shape(AvatarShape::Circle)
+                                        .into_any_element(),
                                    Label::new(format!("Shared by @{}", host_user.github_login))
                                        .color(Color::Muted)
                                        .size(LabelSize::Small)
@@ -697,9 +699,7 @@ impl AssistantPanel {
            log::error!("no context found with ID: {}", context_id.to_proto());
            return;
        };
-        let lsp_adapter_delegate = make_lsp_adapter_delegate(&self.project, cx)
-            .log_err()
-            .flatten();
+        let lsp_adapter_delegate = make_lsp_adapter_delegate(&self.project, cx).log_err();

        let assistant_panel = cx.view().downgrade();
        let editor = cx.new_view(|cx| {
@@ -973,8 +973,7 @@ impl AssistantPanel {
                this.update(&mut cx, |this, cx| {
                    let workspace = this.workspace.clone();
                    let project = this.project.clone();
-                    let lsp_adapter_delegate =
-                        make_lsp_adapter_delegate(&project, cx).log_err().flatten();
+                    let lsp_adapter_delegate = make_lsp_adapter_delegate(&project, cx).log_err();

                    let fs = this.fs.clone();
                    let project = this.project.clone();
@@ -1004,9 +1003,7 @@ impl AssistantPanel {
            None
        } else {
            let context = self.context_store.update(cx, |store, cx| store.create(cx));
-            let lsp_adapter_delegate = make_lsp_adapter_delegate(&self.project, cx)
-                .log_err()
-                .flatten();
+            let lsp_adapter_delegate = make_lsp_adapter_delegate(&self.project, cx).log_err();

            let assistant_panel = cx.view().downgrade();
            let editor = cx.new_view(|cx| {
@@ -1212,7 +1209,7 @@ impl AssistantPanel {
        let project = self.project.clone();
        let workspace = self.workspace.clone();

-        let lsp_adapter_delegate = make_lsp_adapter_delegate(&project, cx).log_err().flatten();
+        let lsp_adapter_delegate = make_lsp_adapter_delegate(&project, cx).log_err();

        cx.spawn(|this, mut cx| async move {
            let context = context.await?;
@@ -1259,9 +1256,7 @@ impl AssistantPanel {
            .update(cx, |store, cx| store.open_remote_context(id, cx));
        let fs = self.fs.clone();
        let workspace = self.workspace.clone();
-        let lsp_adapter_delegate = make_lsp_adapter_delegate(&self.project, cx)
-            .log_err()
-            .flatten();
+        let lsp_adapter_delegate = make_lsp_adapter_delegate(&self.project, cx).log_err();

        cx.spawn(|this, mut cx| async move {
            let context = context.await?;
@@ -1503,13 +1498,6 @@ struct WorkflowAssist {

 type MessageHeader = MessageMetadata;

-#[derive(Clone)]
-enum AssistError {
-    PaymentRequired,
-    MaxMonthlySpendReached,
-    Message(SharedString),
-}
-
 pub struct ContextEditor {
    context: Model<Context>,
    fs: Arc<dyn Fs>,
@@ -1528,7 +1516,7 @@ pub struct ContextEditor {
    workflow_steps: HashMap<Range<language::Anchor>, WorkflowStepViewState>,
    active_workflow_step: Option<ActiveWorkflowStep>,
    assistant_panel: WeakView<AssistantPanel>,
-    last_error: Option<AssistError>,
+    error_message: Option<SharedString>,
    show_accept_terms: bool,
    pub(crate) slash_menu_handle:
        PopoverMenuHandle<Picker<slash_command_picker::SlashCommandDelegate>>,
@@ -1567,7 +1555,7 @@ impl ContextEditor {
            editor.set_show_runnables(false, cx);
            editor.set_show_wrap_guides(false, cx);
            editor.set_show_indent_guides(false, cx);
-            editor.set_completion_provider(Some(Box::new(completion_provider)));
+            editor.set_completion_provider(Box::new(completion_provider));
            editor.set_collaboration_hub(Box::new(project.clone()));
            editor
        });
@@ -1599,7 +1587,7 @@ impl ContextEditor {
            workflow_steps: HashMap::default(),
            active_workflow_step: None,
            assistant_panel,
-            last_error: None,
+            error_message: None,
            show_accept_terms: false,
            slash_menu_handle: Default::default(),
            dragged_file_worktrees: Vec::new(),
@@ -1643,7 +1631,7 @@ impl ContextEditor {
        }

        if !self.apply_active_workflow_step(cx) {
-            self.last_error = None;
+            self.error_message = None;
            self.send_to_model(cx);
            cx.notify();
        }
@@ -1793,7 +1781,7 @@ impl ContextEditor {
    }

    fn cancel(&mut self, _: &editor::actions::Cancel, cx: &mut ViewContext<Self>) {
-        self.last_error = None;
+        self.error_message = None;

        if self
            .context
@@ -2298,13 +2286,7 @@ impl ContextEditor {
            }
            ContextEvent::Operation(_) => {}
            ContextEvent::ShowAssistError(error_message) => {
-                self.last_error = Some(AssistError::Message(error_message.clone()));
-            }
-            ContextEvent::ShowPaymentRequiredError => {
-                self.last_error = Some(AssistError::PaymentRequired);
-            }
-            ContextEvent::ShowMaxMonthlySpendReachedError => {
-                self.last_error = Some(AssistError::MaxMonthlySpendReached);
+                self.error_message = Some(error_message.clone());
            }
        }
    }
@@ -4318,154 +4300,6 @@ impl ContextEditor {
                focus_handle.dispatch_action(&Assist, cx);
            })
    }
-
-    fn render_last_error(&self, cx: &mut ViewContext<Self>) -> Option<AnyElement> {
-        let last_error = self.last_error.as_ref()?;
-
-        Some(
-            div()
-                .absolute()
-                .right_3()
-                .bottom_12()
-                .max_w_96()
-                .py_2()
-                .px_3()
-                .elevation_2(cx)
-                .occlude()
-                .child(match last_error {
-                    AssistError::PaymentRequired => self.render_payment_required_error(cx),
-                    AssistError::MaxMonthlySpendReached => {
-                        self.render_max_monthly_spend_reached_error(cx)
-                    }
-                    AssistError::Message(error_message) => {
-                        self.render_assist_error(error_message, cx)
-                    }
-                })
-                .into_any(),
-        )
-    }
-
-    fn render_payment_required_error(&self, cx: &mut ViewContext<Self>) -> AnyElement {
-        const ERROR_MESSAGE: &str = "Free tier exceeded. Subscribe and add payment to continue using Zed LLMs. You'll be billed at cost for tokens used.";
-        const ACCOUNT_URL: &str = "https://zed.dev/account";
-
-        v_flex()
-            .gap_0p5()
-            .child(
-                h_flex()
-                    .gap_1p5()
-                    .items_center()
-                    .child(Icon::new(IconName::XCircle).color(Color::Error))
-                    .child(Label::new("Free Usage Exceeded").weight(FontWeight::MEDIUM)),
-            )
-            .child(
-                div()
-                    .id("error-message")
-                    .max_h_24()
-                    .overflow_y_scroll()
-                    .child(Label::new(ERROR_MESSAGE)),
-            )
-            .child(
-                h_flex()
-                    .justify_end()
-                    .mt_1()
-                    .child(Button::new("subscribe", "Subscribe").on_click(cx.listener(
-                        |this, _, cx| {
-                            this.last_error = None;
-                            cx.open_url(ACCOUNT_URL);
-                            cx.notify();
-                        },
-                    )))
-                    .child(Button::new("dismiss", "Dismiss").on_click(cx.listener(
-                        |this, _, cx| {
-                            this.last_error = None;
-                            cx.notify();
-                        },
-                    ))),
-            )
-            .into_any()
-    }
-
-    fn render_max_monthly_spend_reached_error(&self, cx: &mut ViewContext<Self>) -> AnyElement {
-        const ERROR_MESSAGE: &str = "You have reached your maximum monthly spend. Increase your spend limit to continue using Zed LLMs.";
-        const ACCOUNT_URL: &str = "https://zed.dev/account";
-
-        v_flex()
-            .gap_0p5()
-            .child(
-                h_flex()
-                    .gap_1p5()
-                    .items_center()
-                    .child(Icon::new(IconName::XCircle).color(Color::Error))
-                    .child(Label::new("Max Monthly Spend Reached").weight(FontWeight::MEDIUM)),
-            )
-            .child(
-                div()
-                    .id("error-message")
-                    .max_h_24()
-                    .overflow_y_scroll()
-                    .child(Label::new(ERROR_MESSAGE)),
-            )
-            .child(
-                h_flex()
-                    .justify_end()
-                    .mt_1()
-                    .child(
-                        Button::new("subscribe", "Update Monthly Spend Limit").on_click(
-                            cx.listener(|this, _, cx| {
-                                this.last_error = None;
-                                cx.open_url(ACCOUNT_URL);
-                                cx.notify();
-                            }),
-                        ),
-                    )
-                    .child(Button::new("dismiss", "Dismiss").on_click(cx.listener(
-                        |this, _, cx| {
-                            this.last_error = None;
-                            cx.notify();
-                        },
-                    ))),
-            )
-            .into_any()
-    }
-
-    fn render_assist_error(
-        &self,
-        error_message: &SharedString,
-        cx: &mut ViewContext<Self>,
-    ) -> AnyElement {
-        v_flex()
-            .gap_0p5()
-            .child(
-                h_flex()
-                    .gap_1p5()
-                    .items_center()
-                    .child(Icon::new(IconName::XCircle).color(Color::Error))
-                    .child(
-                        Label::new("Error interacting with language model")
-                            .weight(FontWeight::MEDIUM),
-                    ),
-            )
-            .child(
-                div()
-                    .id("error-message")
-                    .max_h_24()
-                    .overflow_y_scroll()
-                    .child(Label::new(error_message.clone())),
-            )
-            .child(
-                h_flex()
-                    .justify_end()
-                    .mt_1()
-                    .child(Button::new("dismiss", "Dismiss").on_click(cx.listener(
-                        |this, _, cx| {
-                            this.last_error = None;
-                            cx.notify();
-                        },
-                    ))),
-            )
-            .into_any()
-    }
 }

 /// Returns the contents of the *outermost* fenced code block that contains the given offset.
@@ -4602,7 +4436,48 @@ impl Render for ContextEditor {
                        .child(element),
                )
            })
-            .children(self.render_last_error(cx))
+            .when_some(self.error_message.clone(), |this, error_message| {
+                this.child(
+                    div()
+                        .absolute()
+                        .right_3()
+                        .bottom_12()
+                        .max_w_96()
+                        .py_2()
+                        .px_3()
+                        .elevation_2(cx)
+                        .occlude()
+                        .child(
+                            v_flex()
+                                .gap_0p5()
+                                .child(
+                                    h_flex()
+                                        .gap_1p5()
+                                        .items_center()
+                                        .child(Icon::new(IconName::XCircle).color(Color::Error))
+                                        .child(
+                                            Label::new("Error interacting with language model")
+                                                .weight(FontWeight::MEDIUM),
+                                        ),
+                                )
+                                .child(
+                                    div()
+                                        .id("error-message")
+                                        .max_h_24()
+                                        .overflow_y_scroll()
+                                        .child(Label::new(error_message)),
+                                )
+                                .child(h_flex().justify_end().mt_1().child(
+                                    Button::new("dismiss", "Dismiss").on_click(cx.listener(
+                                        |this, _, cx| {
+                                            this.error_message = None;
+                                            cx.notify();
+                                        },
+                                    )),
+                                )),
+                        ),
+                )
+            })
            .child(
                h_flex().w_full().relative().child(
                    h_flex()
@@ -5632,21 +5507,22 @@ fn render_docs_slash_command_trailer(
 fn make_lsp_adapter_delegate(
    project: &Model<Project>,
    cx: &mut AppContext,
-) -> Result<Option<Arc<dyn LspAdapterDelegate>>> {
+) -> Result<Arc<dyn LspAdapterDelegate>> {
    project.update(cx, |project, cx| {
        // TODO: Find the right worktree.
-        let Some(worktree) = project.worktrees(cx).next() else {
-            return Ok(None::<Arc<dyn LspAdapterDelegate>>);
-        };
+        let worktree = project
+            .worktrees(cx)
+            .next()
+            .ok_or_else(|| anyhow!("no worktrees when constructing LocalLspAdapterDelegate"))?;
        let http_client = project.client().http_client().clone();
        project.lsp_store().update(cx, |lsp_store, cx| {
-            Ok(Some(LocalLspAdapterDelegate::new(
+            Ok(LocalLspAdapterDelegate::new(
                lsp_store,
                &worktree,
                http_client,
                project.fs().clone(),
                cx,
-            ) as Arc<dyn LspAdapterDelegate>))
+            ) as Arc<dyn LspAdapterDelegate>)
        })
    })
 }
--- a/crates/assistant/src/context.rs
+++ b/crates/assistant/src/context.rs
@@ -26,7 +26,6 @@ use gpui::{

 use language::{AnchorRangeExt, Bias, Buffer, LanguageRegistry, OffsetRangeExt, Point, ToOffset};
 use language_model::{
-    provider::cloud::{MaxMonthlySpendReachedError, PaymentRequiredError},
    LanguageModel, LanguageModelCacheConfiguration, LanguageModelCompletionEvent,
    LanguageModelImage, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
    LanguageModelRequestTool, LanguageModelToolResult, LanguageModelToolUse, MessageContent, Role,
@@ -47,7 +46,7 @@ use std::{
    sync::Arc,
    time::{Duration, Instant},
 };
-use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};
+use telemetry_events::{AssistantKind, AssistantPhase};
 use text::BufferSnapshot;
 use util::{post_inc, ResultExt, TryFutureExt};
 use uuid::Uuid;
@@ -295,8 +294,6 @@ impl ContextOperation {
 #[derive(Debug, Clone)]
 pub enum ContextEvent {
    ShowAssistError(SharedString),
-    ShowPaymentRequiredError,
-    ShowMaxMonthlySpendReachedError,
    MessagesEdited,
    SummaryChanged,
    StreamedCompletion,
@@ -552,7 +549,7 @@ impl Context {
        cx: &mut ModelContext<Self>,
    ) -> Self {
        let buffer = cx.new_model(|_cx| {
-            let buffer = Buffer::remote(
+            let mut buffer = Buffer::remote(
                language::BufferId::new(1).unwrap(),
                replica_id,
                capability,
@@ -2115,53 +2112,35 @@ impl Context {
                let result = stream_completion.await;

                this.update(&mut cx, |this, cx| {
-                    let error_message = if let Some(error) = result.as_ref().err() {
-                        if error.is::<PaymentRequiredError>() {
-                            cx.emit(ContextEvent::ShowPaymentRequiredError);
-                            this.update_metadata(assistant_message_id, cx, |metadata| {
-                                metadata.status = MessageStatus::Canceled;
-                            });
-                            Some(error.to_string())
-                        } else if error.is::<MaxMonthlySpendReachedError>() {
-                            cx.emit(ContextEvent::ShowMaxMonthlySpendReachedError);
-                            this.update_metadata(assistant_message_id, cx, |metadata| {
-                                metadata.status = MessageStatus::Canceled;
-                            });
-                            Some(error.to_string())
+                    let error_message = result
+                        .as_ref()
+                        .err()
+                        .map(|error| error.to_string().trim().to_string());
+
+                    if let Some(error_message) = error_message.as_ref() {
+                        cx.emit(ContextEvent::ShowAssistError(SharedString::from(
+                            error_message.clone(),
+                        )));
+                    }
+
+                    this.update_metadata(assistant_message_id, cx, |metadata| {
+                        if let Some(error_message) = error_message.as_ref() {
+                            metadata.status =
+                                MessageStatus::Error(SharedString::from(error_message.clone()));
                        } else {
-                            let error_message = error.to_string().trim().to_string();
-                            cx.emit(ContextEvent::ShowAssistError(SharedString::from(
-                                error_message.clone(),
-                            )));
-                            this.update_metadata(assistant_message_id, cx, |metadata| {
-                                metadata.status =
-                                    MessageStatus::Error(SharedString::from(error_message.clone()));
-                            });
-                            Some(error_message)
-                        }
-                    } else {
-                        this.update_metadata(assistant_message_id, cx, |metadata| {
                            metadata.status = MessageStatus::Done;
-                        });
-                        None
-                    };
+                        }
+                    });

                    if let Some(telemetry) = this.telemetry.as_ref() {
-                        let language_name = this
-                            .buffer
-                            .read(cx)
-                            .language()
-                            .map(|language| language.name());
-                        telemetry.report_assistant_event(AssistantEvent {
-                            conversation_id: Some(this.id.0.clone()),
-                            kind: AssistantKind::Panel,
-                            phase: AssistantPhase::Response,
-                            model: model.telemetry_id(),
-                            model_provider: model.provider_id().to_string(),
+                        telemetry.report_assistant_event(
+                            Some(this.id.0.clone()),
+                            AssistantKind::Panel,
+                            AssistantPhase::Response,
+                            model.telemetry_id(),
                            response_latency,
                            error_message,
-                            language_name: language_name.map(|name| name.to_proto()),
-                        });
+                        );
                    }

                    if let Ok(stop_reason) = result {
--- a/crates/assistant/src/inline_assistant.rs
+++ b/crates/assistant/src/inline_assistant.rs
@@ -50,7 +50,6 @@ use std::{
    task::{self, Poll},
    time::{Duration, Instant},
 };
-use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};
 use terminal_view::terminal_panel::TerminalPanel;
 use text::{OffsetRangeExt, ToPoint as _};
 use theme::ThemeSettings;
@@ -210,6 +209,18 @@ impl InlineAssistant {
        initial_prompt: Option<String>,
        cx: &mut WindowContext,
    ) {
+        if let Some(telemetry) = self.telemetry.as_ref() {
+            if let Some(model) = LanguageModelRegistry::read_global(cx).active_model() {
+                telemetry.report_assistant_event(
+                    None,
+                    telemetry_events::AssistantKind::Inline,
+                    telemetry_events::AssistantPhase::Invoked,
+                    model.telemetry_id(),
+                    None,
+                    None,
+                );
+            }
+        }
        let snapshot = editor.read(cx).buffer().read(cx).snapshot(cx);

        let mut selections = Vec::<Selection<Point>>::new();
@@ -256,21 +267,6 @@ impl InlineAssistant {
                text_anchor: buffer.anchor_after(buffer_range.end),
            };
            codegen_ranges.push(start..end);
-
-            if let Some(telemetry) = self.telemetry.as_ref() {
-                if let Some(model) = LanguageModelRegistry::read_global(cx).active_model() {
-                    telemetry.report_assistant_event(AssistantEvent {
-                        conversation_id: None,
-                        kind: AssistantKind::Inline,
-                        phase: AssistantPhase::Invoked,
-                        model: model.telemetry_id(),
-                        model_provider: model.provider_id().to_string(),
-                        response_latency: None,
-                        error_message: None,
-                        language_name: buffer.language().map(|language| language.name().to_proto()),
-                    });
-                }
-            }
        }

        let assist_group_id = self.next_assist_group_id.post_inc();
@@ -765,34 +761,23 @@ impl InlineAssistant {
    }

    pub fn finish_assist(&mut self, assist_id: InlineAssistId, undo: bool, cx: &mut WindowContext) {
-        if let Some(assist) = self.assists.get(&assist_id) {
-            if let Some(telemetry) = self.telemetry.as_ref() {
-                if let Some(model) = LanguageModelRegistry::read_global(cx).active_model() {
-                    let language_name = assist.editor.upgrade().and_then(|editor| {
-                        let multibuffer = editor.read(cx).buffer().read(cx);
-                        let ranges = multibuffer.range_to_buffer_ranges(assist.range.clone(), cx);
-                        ranges
-                            .first()
-                            .and_then(|(buffer, _, _)| buffer.read(cx).language())
-                            .map(|language| language.name())
-                    });
-                    telemetry.report_assistant_event(AssistantEvent {
-                        conversation_id: None,
-                        kind: AssistantKind::Inline,
-                        phase: if undo {
-                            AssistantPhase::Rejected
-                        } else {
-                            AssistantPhase::Accepted
-                        },
-                        model: model.telemetry_id(),
-                        model_provider: model.provider_id().to_string(),
-                        response_latency: None,
-                        error_message: None,
-                        language_name: language_name.map(|name| name.to_proto()),
-                    });
-                }
+        if let Some(telemetry) = self.telemetry.as_ref() {
+            if let Some(model) = LanguageModelRegistry::read_global(cx).active_model() {
+                telemetry.report_assistant_event(
+                    None,
+                    telemetry_events::AssistantKind::Inline,
+                    if undo {
+                        telemetry_events::AssistantPhase::Rejected
+                    } else {
+                        telemetry_events::AssistantPhase::Accepted
+                    },
+                    model.telemetry_id(),
+                    None,
+                    None,
+                );
            }
-
+        }
+        if let Some(assist) = self.assists.get(&assist_id) {
            let assist_group_id = assist.group_id;
            if self.assist_groups[&assist_group_id].linked {
                for assist_id in self.unlink_assist_group(assist_group_id, cx) {
@@ -2278,7 +2263,7 @@ impl InlineAssist {
                                            struct InlineAssistantError;

                                            let id =
-                                                NotificationId::composite::<InlineAssistantError>(
+                                                NotificationId::identified::<InlineAssistantError>(
                                                    assist_id.0,
                                                );

@@ -2721,7 +2706,6 @@ impl CodegenAlternative {
        self.edit_position = Some(self.range.start.bias_right(&self.snapshot));

        let telemetry_id = model.telemetry_id();
-        let provider_id = model.provider_id();
        let chunks: LocalBoxFuture<Result<BoxStream<Result<String>>>> =
            if user_prompt.trim().to_lowercase() == "delete" {
                async { Ok(stream::empty().boxed()) }.boxed_local()
@@ -2732,7 +2716,7 @@ impl CodegenAlternative {
                    .spawn(|_, cx| async move { model.stream_completion_text(request, &cx).await });
                async move { Ok(chunks.await?.boxed()) }.boxed_local()
            };
-        self.handle_stream(telemetry_id, provider_id.to_string(), chunks, cx);
+        self.handle_stream(telemetry_id, chunks, cx);
        Ok(())
    }

@@ -2796,7 +2780,6 @@ impl CodegenAlternative {
    pub fn handle_stream(
        &mut self,
        model_telemetry_id: String,
-        model_provider_id: String,
        stream: impl 'static + Future<Output = Result<BoxStream<'static, Result<String>>>>,
        cx: &mut ModelContext<Self>,
    ) {
@@ -2827,15 +2810,6 @@ impl CodegenAlternative {
        }

        let telemetry = self.telemetry.clone();
-        let language_name = {
-            let multibuffer = self.buffer.read(cx);
-            let ranges = multibuffer.range_to_buffer_ranges(self.range.clone(), cx);
-            ranges
-                .first()
-                .and_then(|(buffer, _, _)| buffer.read(cx).language())
-                .map(|language| language.name())
-        };
-
        self.diff = Diff::default();
        self.status = CodegenStatus::Pending;
        let mut edit_start = self.range.start.to_offset(&snapshot);
@@ -2946,16 +2920,14 @@ impl CodegenAlternative {
                            let error_message =
                                result.as_ref().err().map(|error| error.to_string());
                            if let Some(telemetry) = telemetry {
-                                telemetry.report_assistant_event(AssistantEvent {
-                                    conversation_id: None,
-                                    kind: AssistantKind::Inline,
-                                    phase: AssistantPhase::Response,
-                                    model: model_telemetry_id,
-                                    model_provider: model_provider_id.to_string(),
+                                telemetry.report_assistant_event(
+                                    None,
+                                    telemetry_events::AssistantKind::Inline,
+                                    telemetry_events::AssistantPhase::Response,
+                                    model_telemetry_id,
                                    response_latency,
                                    error_message,
-                                    language_name: language_name.map(|name| name.to_proto()),
-                                });
+                                );
                            }

                            result?;
@@ -3567,7 +3539,6 @@ mod tests {
        let (chunks_tx, chunks_rx) = mpsc::unbounded();
        codegen.update(cx, |codegen, cx| {
            codegen.handle_stream(
-                String::new(),
                String::new(),
                future::ready(Ok(chunks_rx.map(Ok).boxed())),
                cx,
@@ -3639,7 +3610,6 @@ mod tests {
        let (chunks_tx, chunks_rx) = mpsc::unbounded();
        codegen.update(cx, |codegen, cx| {
            codegen.handle_stream(
-                String::new(),
                String::new(),
                future::ready(Ok(chunks_rx.map(Ok).boxed())),
                cx,
@@ -3714,7 +3684,6 @@ mod tests {
        let (chunks_tx, chunks_rx) = mpsc::unbounded();
        codegen.update(cx, |codegen, cx| {
            codegen.handle_stream(
-                String::new(),
                String::new(),
                future::ready(Ok(chunks_rx.map(Ok).boxed())),
                cx,
@@ -3788,7 +3757,6 @@ mod tests {
        let (chunks_tx, chunks_rx) = mpsc::unbounded();
        codegen.update(cx, |codegen, cx| {
            codegen.handle_stream(
-                String::new(),
                String::new(),
                future::ready(Ok(chunks_rx.map(Ok).boxed())),
                cx,
@@ -3852,7 +3820,6 @@ mod tests {
        let (chunks_tx, chunks_rx) = mpsc::unbounded();
        codegen.update(cx, |codegen, cx| {
            codegen.handle_stream(
-                String::new(),
                String::new(),
                future::ready(Ok(chunks_rx.map(Ok).boxed())),
                cx,
--- a/crates/assistant/src/prompt_library.rs
+++ b/crates/assistant/src/prompt_library.rs
@@ -521,9 +521,9 @@ impl PromptLibrary {
                            editor.set_show_indent_guides(false, cx);
                            editor.set_use_modal_editing(false);
                            editor.set_current_line_highlight(Some(CurrentLineHighlight::None));
-                            editor.set_completion_provider(Some(Box::new(
+                            editor.set_completion_provider(Box::new(
                                SlashCommandCompletionProvider::new(None, None),
-                            )));
+                            ));
                            if focus {
                                editor.focus(cx);
                            }
@@ -910,7 +910,7 @@ impl PromptLibrary {
                                                            .features
                                                            .clone(),
                                                        font_size: HeadlineSize::Large
-                                                            .rems()
+                                                            .size()
                                                            .into(),
                                                        font_weight: settings.ui_font.weight,
                                                        line_height: relative(
--- a/crates/assistant/src/slash_command/auto_command.rs
+++ b/crates/assistant/src/slash_command/auto_command.rs
@@ -31,11 +31,11 @@ impl SlashCommand for AutoCommand {
    }

    fn description(&self) -> String {
-        "Automatically infer what context to add".into()
+        "Automatically infer what context to add, based on your prompt".into()
    }

    fn menu_text(&self) -> String {
-        self.description()
+        "Automatically Infer Context".into()
    }

    fn label(&self, cx: &AppContext) -> CodeLabel {
--- a/crates/assistant/src/slash_command/context_server_command.rs
+++ b/crates/assistant/src/slash_command/context_server_command.rs
@@ -1,4 +1,3 @@
-use super::create_label_for_command;
 use anyhow::{anyhow, Result};
 use assistant_slash_command::{
    AfterCompletion, ArgumentCompletion, SlashCommand, SlashCommandOutput,
@@ -7,9 +6,9 @@ use assistant_slash_command::{
 use collections::HashMap;
 use context_servers::{
    manager::{ContextServer, ContextServerManager},
-    types::Prompt,
+    protocol::PromptInfo,
 };
-use gpui::{AppContext, Task, WeakView, WindowContext};
+use gpui::{Task, WeakView, WindowContext};
 use language::{BufferSnapshot, CodeLabel, LspAdapterDelegate};
 use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
@@ -19,11 +18,11 @@ use workspace::Workspace;

 pub struct ContextServerSlashCommand {
    server_id: String,
-    prompt: Prompt,
+    prompt: PromptInfo,
 }

 impl ContextServerSlashCommand {
-    pub fn new(server: &Arc<ContextServer>, prompt: Prompt) -> Self {
+    pub fn new(server: &Arc<ContextServer>, prompt: PromptInfo) -> Self {
        Self {
            server_id: server.id.clone(),
            prompt,
@@ -36,28 +35,12 @@ impl SlashCommand for ContextServerSlashCommand {
        self.prompt.name.clone()
    }

-    fn label(&self, cx: &AppContext) -> language::CodeLabel {
-        let mut parts = vec![self.prompt.name.as_str()];
-        if let Some(args) = &self.prompt.arguments {
-            if let Some(arg) = args.first() {
-                parts.push(arg.name.as_str());
-            }
-        }
-        create_label_for_command(&parts[0], &parts[1..], cx)
-    }
-
    fn description(&self) -> String {
-        match &self.prompt.description {
-            Some(desc) => desc.clone(),
-            None => format!("Run '{}' from {}", self.prompt.name, self.server_id),
-        }
+        format!("Run context server command: {}", self.prompt.name)
    }

    fn menu_text(&self) -> String {
-        match &self.prompt.description {
-            Some(desc) => desc.clone(),
-            None => format!("Run '{}' from {}", self.prompt.name, self.server_id),
-        }
+        format!("Run '{}' from {}", self.prompt.name, self.server_id)
    }

    fn requires_argument(&self) -> bool {
@@ -171,7 +154,7 @@ impl SlashCommand for ContextServerSlashCommand {
    }
 }

-fn completion_argument(prompt: &Prompt, arguments: &[String]) -> Result<(String, String)> {
+fn completion_argument(prompt: &PromptInfo, arguments: &[String]) -> Result<(String, String)> {
    if arguments.is_empty() {
        return Err(anyhow!("No arguments given"));
    }
@@ -187,7 +170,7 @@ fn completion_argument(prompt: &Prompt, arguments: &[String]) -> Result<(String,
    }
 }

-fn prompt_arguments(prompt: &Prompt, arguments: &[String]) -> Result<HashMap<String, String>> {
+fn prompt_arguments(prompt: &PromptInfo, arguments: &[String]) -> Result<HashMap<String, String>> {
    match &prompt.arguments {
        Some(args) if args.len() > 1 => Err(anyhow!(
            "Prompt has more than one argument, which is not supported"
@@ -216,7 +199,7 @@ fn prompt_arguments(prompt: &Prompt, arguments: &[String]) -> Result<HashMap<Str
 /// MCP servers can return prompts with multiple arguments. Since we only
 /// support one argument, we ignore all others. This is the necessary predicate
 /// for this.
-pub fn acceptable_prompt(prompt: &Prompt) -> bool {
+pub fn acceptable_prompt(prompt: &PromptInfo) -> bool {
    match &prompt.arguments {
        None => true,
        Some(args) if args.len() <= 1 => true,
--- a/crates/assistant/src/slash_command/delta_command.rs
+++ b/crates/assistant/src/slash_command/delta_command.rs
@@ -19,11 +19,11 @@ impl SlashCommand for DeltaSlashCommand {
    }

    fn description(&self) -> String {
-        "Re-insert changed files".into()
+        "re-insert changed files".into()
    }

    fn menu_text(&self) -> String {
-        self.description()
+        "Re-insert Changed Files".into()
    }

    fn requires_argument(&self) -> bool {
--- a/crates/assistant/src/slash_command/diagnostics_command.rs
+++ b/crates/assistant/src/slash_command/diagnostics_command.rs
@@ -95,7 +95,7 @@ impl SlashCommand for DiagnosticsSlashCommand {
    }

    fn menu_text(&self) -> String {
-        self.description()
+        "Insert Diagnostics".into()
    }

    fn requires_argument(&self) -> bool {
--- a/crates/assistant/src/slash_command/fetch_command.rs
+++ b/crates/assistant/src/slash_command/fetch_command.rs
@@ -104,11 +104,11 @@ impl SlashCommand for FetchSlashCommand {
    }

    fn description(&self) -> String {
-        "Insert fetched URL contents".into()
+        "insert URL contents".into()
    }

    fn menu_text(&self) -> String {
-        self.description()
+        "Insert fetched URL contents".into()
    }

    fn requires_argument(&self) -> bool {
--- a/crates/assistant/src/slash_command/file_command.rs
+++ b/crates/assistant/src/slash_command/file_command.rs
@@ -110,11 +110,11 @@ impl SlashCommand for FileSlashCommand {
    }

    fn description(&self) -> String {
-        "Insert file".into()
+        "insert file".into()
    }

    fn menu_text(&self) -> String {
-        self.description()
+        "Insert File".into()
    }

    fn requires_argument(&self) -> bool {
--- a/crates/assistant/src/slash_command/now_command.rs
+++ b/crates/assistant/src/slash_command/now_command.rs
@@ -19,11 +19,11 @@ impl SlashCommand for NowSlashCommand {
    }

    fn description(&self) -> String {
-        "Insert current date and time".into()
+        "insert the current date and time".into()
    }

    fn menu_text(&self) -> String {
-        self.description()
+        "Insert Current Date and Time".into()
    }

    fn requires_argument(&self) -> bool {
--- a/crates/assistant/src/slash_command/project_command.rs
+++ b/crates/assistant/src/slash_command/project_command.rs
@@ -47,11 +47,11 @@ impl SlashCommand for ProjectSlashCommand {
    }

    fn description(&self) -> String {
-        "Generate a semantic search based on context".into()
+        "Generate semantic searches based on the current context".into()
    }

    fn menu_text(&self) -> String {
-        self.description()
+        "Project Context".into()
    }

    fn requires_argument(&self) -> bool {
--- a/crates/assistant/src/slash_command/prompt_command.rs
+++ b/crates/assistant/src/slash_command/prompt_command.rs
@@ -16,11 +16,11 @@ impl SlashCommand for PromptSlashCommand {
    }

    fn description(&self) -> String {
-        "Insert prompt from library".into()
+        "insert prompt from library".into()
    }

    fn menu_text(&self) -> String {
-        self.description()
+        "Insert Prompt from Library".into()
    }

    fn requires_argument(&self) -> bool {
--- a/crates/assistant/src/slash_command/search_command.rs
+++ b/crates/assistant/src/slash_command/search_command.rs
@@ -34,11 +34,11 @@ impl SlashCommand for SearchSlashCommand {
    }

    fn description(&self) -> String {
-        "Search your project semantically".into()
+        "semantic search".into()
    }

    fn menu_text(&self) -> String {
-        self.description()
+        "Semantic Search".into()
    }

    fn requires_argument(&self) -> bool {
--- a/crates/assistant/src/slash_command/symbols_command.rs
+++ b/crates/assistant/src/slash_command/symbols_command.rs
@@ -17,11 +17,11 @@ impl SlashCommand for OutlineSlashCommand {
    }

    fn description(&self) -> String {
-        "Insert symbols for active tab".into()
+        "insert symbols for active tab".into()
    }

    fn menu_text(&self) -> String {
-        self.description()
+        "Insert Symbols for Active Tab".into()
    }

    fn complete_argument(
--- a/crates/assistant/src/slash_command/tab_command.rs
+++ b/crates/assistant/src/slash_command/tab_command.rs
@@ -24,11 +24,11 @@ impl SlashCommand for TabSlashCommand {
    }

    fn description(&self) -> String {
-        "Insert open tabs (active tab by default)".to_owned()
+        "insert open tabs (active tab by default)".to_owned()
    }

    fn menu_text(&self) -> String {
-        self.description()
+        "Insert Open Tabs".to_owned()
    }

    fn requires_argument(&self) -> bool {
--- a/crates/assistant/src/slash_command/terminal_command.rs
+++ b/crates/assistant/src/slash_command/terminal_command.rs
@@ -29,11 +29,11 @@ impl SlashCommand for TerminalSlashCommand {
    }

    fn description(&self) -> String {
-        "Insert terminal output".into()
+        "insert terminal output".into()
    }

    fn menu_text(&self) -> String {
-        self.description()
+        "Insert Terminal Output".into()
    }

    fn requires_argument(&self) -> bool {
--- a/crates/assistant/src/slash_command/workflow_command.rs
+++ b/crates/assistant/src/slash_command/workflow_command.rs
@@ -29,11 +29,11 @@ impl SlashCommand for WorkflowSlashCommand {
    }

    fn description(&self) -> String {
-        "Insert prompt to opt into the edit workflow".into()
+        "insert a prompt that opts into the edit workflow".into()
    }

    fn menu_text(&self) -> String {
-        self.description()
+        "Insert Workflow Prompt".into()
    }

    fn requires_argument(&self) -> bool {
--- a/crates/assistant/src/slash_command_picker.rs
+++ b/crates/assistant/src/slash_command_picker.rs
@@ -184,7 +184,7 @@ impl PickerDelegate for SlashCommandDelegate {
                        h_flex()
                            .group(format!("command-entry-label-{ix}"))
                            .w_full()
-                            .min_w(px(250.))
+                            .min_w(px(220.))
                            .child(
                                v_flex()
                                    .child(
@@ -203,9 +203,7 @@ impl PickerDelegate for SlashCommandDelegate {
                                                    div()
                                                        .font_buffer(cx)
                                                        .child(
-                                                            Label::new(args)
-                                                                .size(LabelSize::Small)
-                                                                .color(Color::Muted),
+                                                            Label::new(args).size(LabelSize::Small),
                                                        )
                                                        .visible_on_hover(format!(
                                                            "command-entry-label-{ix}"
--- a/crates/assistant/src/slash_command_settings.rs
+++ b/crates/assistant/src/slash_command_settings.rs
@@ -38,10 +38,7 @@ impl Settings for SlashCommandSettings {

    fn load(sources: SettingsSources<Self::FileContent>, _cx: &mut AppContext) -> Result<Self> {
        SettingsSources::<Self::FileContent>::json_merge_with(
-            [sources.default]
-                .into_iter()
-                .chain(sources.user)
-                .chain(sources.server),
+            [sources.default].into_iter().chain(sources.user),
        )
    }
 }
--- a/crates/assistant/src/terminal_inline_assistant.rs
+++ b/crates/assistant/src/terminal_inline_assistant.rs
@@ -25,7 +25,6 @@ use std::{
    sync::Arc,
    time::{Duration, Instant},
 };
-use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};
 use terminal::Terminal;
 use terminal_view::TerminalView;
 use theme::ThemeSettings;
@@ -414,7 +413,7 @@ impl TerminalInlineAssist {
                                            struct InlineAssistantError;

                                            let id =
-                                                NotificationId::composite::<InlineAssistantError>(
+                                                NotificationId::identified::<InlineAssistantError>(
                                                    assist_id.0,
                                                );

@@ -1040,7 +1039,6 @@ impl Codegen {
        self.transaction = Some(TerminalTransaction::start(self.terminal.clone()));
        self.generation = cx.spawn(|this, mut cx| async move {
            let model_telemetry_id = model.telemetry_id();
-            let model_provider_id = model.provider_id();
            let response = model.stream_completion_text(prompt, &cx).await;
            let generate = async {
                let (mut hunks_tx, mut hunks_rx) = mpsc::channel(1);
@@ -1065,16 +1063,14 @@ impl Codegen {

                    let error_message = result.as_ref().err().map(|error| error.to_string());
                    if let Some(telemetry) = telemetry {
-                        telemetry.report_assistant_event(AssistantEvent {
-                            conversation_id: None,
-                            kind: AssistantKind::Inline,
-                            phase: AssistantPhase::Response,
-                            model: model_telemetry_id,
-                            model_provider: model_provider_id.to_string(),
+                        telemetry.report_assistant_event(
+                            None,
+                            telemetry_events::AssistantKind::Inline,
+                            telemetry_events::AssistantPhase::Response,
+                            model_telemetry_id,
                            response_latency,
                            error_message,
-                            language_name: None,
-                        });
+                        );
                    }

                    result?;
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -130,7 +130,7 @@ impl Settings for AutoUpdateSetting {
    type FileContent = Option<AutoUpdateSettingContent>;

    fn load(sources: SettingsSources<Self::FileContent>, _: &mut AppContext) -> Result<Self> {
-        let auto_update = [sources.server, sources.release_channel, sources.user]
+        let auto_update = [sources.release_channel, sources.user]
            .into_iter()
            .find_map(|value| value.copied().flatten())
            .unwrap_or(sources.default.ok_or_else(Self::missing_default)?);
@@ -464,7 +464,6 @@ impl AutoUpdater {
        smol::fs::create_dir_all(&platform_dir).await.ok();

        let client = this.read_with(cx, |this, _| this.http_client.clone())?;
-
        if smol::fs::metadata(&version_path).await.is_err() {
            log::info!("downloading zed-remote-server {os} {arch}");
            download_remote_server_binary(&version_path, release, client, cx).await?;
--- a/crates/call/src/room.rs
+++ b/crates/call/src/room.rs
@@ -1178,7 +1178,7 @@ impl Room {
            this.update(&mut cx, |this, cx| {
                this.joined_projects.retain(|project| {
                    if let Some(project) = project.upgrade() {
-                        !project.read(cx).is_disconnected(cx)
+                        !project.read(cx).is_disconnected()
                    } else {
                        false
                    }
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -58,32 +58,27 @@ struct Args {
    dev_server_token: Option<String>,
 }

-fn parse_path_with_position(argument_str: &str) -> anyhow::Result<String> {
-    let canonicalized = match Path::new(argument_str).canonicalize() {
-        Ok(existing_path) => PathWithPosition::from_path(existing_path),
-        Err(_) => {
-            let path = PathWithPosition::parse_str(argument_str);
-            let curdir = env::current_dir().context("reteiving current directory")?;
-            path.map_path(|path| match fs::canonicalize(&path) {
-                Ok(path) => Ok(path),
-                Err(e) => {
-                    if let Some(mut parent) = path.parent() {
-                        if parent == Path::new("") {
-                            parent = &curdir
-                        }
-                        match fs::canonicalize(parent) {
-                            Ok(parent) => Ok(parent.join(path.file_name().unwrap())),
-                            Err(_) => Err(e),
-                        }
-                    } else {
-                        Err(e)
-                    }
+fn parse_path_with_position(argument_str: &str) -> Result<String, std::io::Error> {
+    let path = PathWithPosition::parse_str(argument_str);
+    let curdir = env::current_dir()?;
+
+    let canonicalized = path.map_path(|path| match fs::canonicalize(&path) {
+        Ok(path) => Ok(path),
+        Err(e) => {
+            if let Some(mut parent) = path.parent() {
+                if parent == Path::new("") {
+                    parent = &curdir
                }
-            })
+                match fs::canonicalize(parent) {
+                    Ok(parent) => Ok(parent.join(path.file_name().unwrap())),
+                    Err(_) => Err(e),
+                }
+            } else {
+                Err(e)
+            }
        }
-        .with_context(|| format!("parsing as path with position {argument_str}"))?,
-    };
-    Ok(canonicalized.to_string(|path| path.to_string_lossy().to_string()))
+    })?;
+    Ok(canonicalized.to_string(|path| path.display().to_string()))
 }

 fn main() -> Result<()> {
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -34,8 +34,8 @@ postage.workspace = true
 rand.workspace = true
 release_channel.workspace = true
 rpc = { workspace = true, features = ["gpui"] }
-rustls-native-certs.workspace = true
 rustls.workspace = true
+rustls-native-certs.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -141,7 +141,6 @@ impl Settings for ProxySettings {
        Ok(Self {
            proxy: sources
                .user
-                .or(sources.server)
                .and_then(|value| value.proxy.clone())
                .or(sources.default.proxy.clone()),
        })
@@ -395,7 +394,7 @@ pub struct PendingEntitySubscription<T: 'static> {
 }

 impl<T: 'static> PendingEntitySubscription<T> {
-    pub fn set_model(mut self, model: &Model<T>, cx: &AsyncAppContext) -> Subscription {
+    pub fn set_model(mut self, model: &Model<T>, cx: &mut AsyncAppContext) -> Subscription {
        self.consumed = true;
        let mut handlers = self.client.handler_set.lock();
        let id = (TypeId::of::<T>(), self.remote_id);
@@ -473,21 +472,15 @@ impl settings::Settings for TelemetrySettings {

    fn load(sources: SettingsSources<Self::FileContent>, _: &mut AppContext) -> Result<Self> {
        Ok(Self {
-            diagnostics: sources
-                .user
-                .as_ref()
-                .or(sources.server.as_ref())
-                .and_then(|v| v.diagnostics)
-                .unwrap_or(
-                    sources
-                        .default
-                        .diagnostics
-                        .ok_or_else(Self::missing_default)?,
-                ),
+            diagnostics: sources.user.as_ref().and_then(|v| v.diagnostics).unwrap_or(
+                sources
+                    .default
+                    .diagnostics
+                    .ok_or_else(Self::missing_default)?,
+            ),
            metrics: sources
                .user
                .as_ref()
-                .or(sources.server.as_ref())
                .and_then(|v| v.metrics)
                .unwrap_or(sources.default.metrics.ok_or_else(Self::missing_default)?),
        })
@@ -1030,7 +1023,7 @@ impl Client {
        &self,
        http: Arc<HttpClientWithUrl>,
        release_channel: Option<ReleaseChannel>,
-    ) -> impl Future<Output = Result<url::Url>> {
+    ) -> impl Future<Output = Result<Url>> {
        #[cfg(any(test, feature = "test-support"))]
        let url_override = self.rpc_url.read().clone();

@@ -1124,7 +1117,7 @@ impl Client {
            // for us from the RPC URL.
            //
            // Among other things, it will generate and set a `Sec-WebSocket-Key` header for us.
-            let mut request = IntoClientRequest::into_client_request(rpc_url.as_str())?;
+            let mut request = rpc_url.into_client_request()?;

            // We then modify the request to add our desired headers.
            let request_headers = request.headers_mut();
@@ -1163,7 +1156,6 @@ impl Client {
                            .with_root_certificates(root_store)
                            .with_no_client_auth()
                    };
-
                    let (stream, _) =
                        async_tungstenite::async_tls::client_async_tls_with_connector(
                            request,
@@ -1760,7 +1752,7 @@ impl CredentialsProvider for KeychainCredentialsProvider {
 }

 /// prefix for the zed:// url scheme
-pub const ZED_URL_SCHEME: &str = "zed";
+pub static ZED_URL_SCHEME: &str = "zed";

 /// Parses the given link into a Zed link.
 ///
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -1,13 +1,12 @@
 mod event_coalescer;

 use crate::{ChannelId, TelemetrySettings};
-use anyhow::Result;
 use chrono::{DateTime, Utc};
 use clock::SystemClock;
 use collections::{HashMap, HashSet};
 use futures::Future;
 use gpui::{AppContext, BackgroundExecutor, Task};
-use http_client::{self, AsyncBody, HttpClient, HttpClientWithUrl, Method, Request};
+use http_client::{self, HttpClient, HttpClientWithUrl, Method};
 use once_cell::sync::Lazy;
 use parking_lot::Mutex;
 use release_channel::ReleaseChannel;
@@ -17,9 +16,9 @@ use std::io::Write;
 use std::{env, mem, path::PathBuf, sync::Arc, time::Duration};
 use sysinfo::{CpuRefreshKind, Pid, ProcessRefreshKind, RefreshKind, System};
 use telemetry_events::{
-    ActionEvent, AppEvent, AssistantEvent, CallEvent, CpuEvent, EditEvent, EditorEvent, Event,
-    EventRequestBody, EventWrapper, ExtensionEvent, InlineCompletionEvent, MemoryEvent, ReplEvent,
-    SettingEvent,
+    ActionEvent, AppEvent, AssistantEvent, AssistantKind, AssistantPhase, CallEvent, CpuEvent,
+    EditEvent, EditorEvent, Event, EventRequestBody, EventWrapper, ExtensionEvent,
+    InlineCompletionEvent, MemoryEvent, ReplEvent, SettingEvent,
 };
 use tempfile::NamedTempFile;
 #[cfg(not(debug_assertions))]
@@ -289,7 +288,7 @@ impl Telemetry {
        system_id: Option<String>,
        installation_id: Option<String>,
        session_id: String,
-        cx: &AppContext,
+        cx: &mut AppContext,
    ) {
        let mut state = self.state.lock();
        state.system_id = system_id.map(|id| id.into());
@@ -365,7 +364,6 @@ impl Telemetry {
        operation: &'static str,
        copilot_enabled: bool,
        copilot_enabled_for_language: bool,
-        is_via_ssh: bool,
    ) {
        let event = Event::Editor(EditorEvent {
            file_extension,
@@ -373,7 +371,6 @@ impl Telemetry {
            operation: operation.into(),
            copilot_enabled,
            copilot_enabled_for_language,
-            is_via_ssh,
        });

        self.report_event(event)
@@ -394,8 +391,25 @@ impl Telemetry {
        self.report_event(event)
    }

-    pub fn report_assistant_event(self: &Arc<Self>, event: AssistantEvent) {
-        self.report_event(Event::Assistant(event));
+    pub fn report_assistant_event(
+        self: &Arc<Self>,
+        conversation_id: Option<String>,
+        kind: AssistantKind,
+        phase: AssistantPhase,
+        model: String,
+        response_latency: Option<Duration>,
+        error_message: Option<String>,
+    ) {
+        let event = Event::Assistant(AssistantEvent {
+            conversation_id,
+            kind,
+            phase,
+            model: model.to_string(),
+            response_latency,
+            error_message,
+        });
+
+        self.report_event(event)
    }

    pub fn report_call_event(
@@ -459,7 +473,7 @@ impl Telemetry {
        }))
    }

-    pub fn log_edit_event(self: &Arc<Self>, environment: &'static str, is_via_ssh: bool) {
+    pub fn log_edit_event(self: &Arc<Self>, environment: &'static str) {
        let mut state = self.state.lock();
        let period_data = state.event_coalescer.log_event(environment);
        drop(state);
@@ -468,7 +482,6 @@ impl Telemetry {
            let event = Event::Edit(EditEvent {
                duration: end.timestamp_millis() - start.timestamp_millis(),
                environment: environment.to_string(),
-                is_via_ssh,
            });

            self.report_event(event);
@@ -489,7 +502,7 @@ impl Telemetry {
        worktree_id: WorktreeId,
        updated_entries_set: &UpdatedEntriesSet,
    ) {
-        let project_type_names: Vec<String> = {
+        let project_names: Vec<String> = {
            let mut state = self.state.lock();
            state
                .worktree_id_map
@@ -525,8 +538,8 @@ impl Telemetry {
        };

        // Done on purpose to avoid calling `self.state.lock()` multiple times
-        for project_type_name in project_type_names {
-            self.report_app_event(format!("open {} project", project_type_name));
+        for project_name in project_names {
+            self.report_app_event(format!("open {} project", project_name));
        }
    }

@@ -598,29 +611,6 @@ impl Telemetry {
        self.state.lock().is_staff
    }

-    fn build_request(
-        self: &Arc<Self>,
-        // We take in the JSON bytes buffer so we can reuse the existing allocation.
-        mut json_bytes: Vec<u8>,
-        event_request: EventRequestBody,
-    ) -> Result<Request<AsyncBody>> {
-        json_bytes.clear();
-        serde_json::to_writer(&mut json_bytes, &event_request)?;
-
-        let checksum = calculate_json_checksum(&json_bytes).unwrap_or("".to_string());
-
-        Ok(Request::builder()
-            .method(Method::POST)
-            .uri(
-                self.http_client
-                    .build_zed_api_url("/telemetry/events", &[])?
-                    .as_ref(),
-            )
-            .header("Content-Type", "application/json")
-            .header("x-zed-checksum", checksum)
-            .body(json_bytes.into())?)
-    }
-
    pub fn flush_events(self: &Arc<Self>) {
        let mut state = self.state.lock();
        state.first_event_date_time = None;
@@ -647,10 +637,10 @@ impl Telemetry {
                        }
                    }

-                    let request_body = {
+                    {
                        let state = this.state.lock();

-                        EventRequestBody {
+                        let request_body = EventRequestBody {
                            system_id: state.system_id.as_deref().map(Into::into),
                            installation_id: state.installation_id.as_deref().map(Into::into),
                            session_id: state.session_id.clone(),
@@ -663,11 +653,25 @@ impl Telemetry {

                            release_channel: state.release_channel.map(Into::into),
                            events,
-                        }
-                    };
+                        };
+                        json_bytes.clear();
+                        serde_json::to_writer(&mut json_bytes, &request_body)?;
+                    }

-                    let request = this.build_request(json_bytes, request_body)?;
-                    let response = this.http_client.send(request).await?;
+                    let checksum = calculate_json_checksum(&json_bytes).unwrap_or("".to_string());
+
+                    let request = http_client::Request::builder()
+                        .method(Method::POST)
+                        .uri(
+                            this.http_client
+                                .build_zed_api_url("/telemetry/events", &[])?
+                                .as_ref(),
+                        )
+                        .header("Content-Type", "text/plain")
+                        .header("x-zed-checksum", checksum)
+                        .body(json_bytes.into());
+
+                    let response = this.http_client.send(request?).await?;
                    if response.status() != 200 {
                        log::error!("Failed to send events: HTTP {:?}", response.status());
                    }
--- a/crates/client/src/user.rs
+++ b/crates/client/src/user.rs
@@ -138,7 +138,7 @@ enum UpdateContacts {
 }

 impl UserStore {
-    pub fn new(client: Arc<Client>, cx: &ModelContext<Self>) -> Self {
+    pub fn new(client: Arc<Client>, cx: &mut ModelContext<Self>) -> Self {
        let (mut current_user_tx, current_user_rx) = watch::channel();
        let (update_contacts_tx, mut update_contacts_rx) = mpsc::unbounded();
        let rpc_subscriptions = vec![
@@ -310,7 +310,7 @@ impl UserStore {
    fn update_contacts(
        &mut self,
        message: UpdateContacts,
-        cx: &ModelContext<Self>,
+        cx: &mut ModelContext<Self>,
    ) -> Task<Result<()>> {
        match message {
            UpdateContacts::Wait(barrier) => {
@@ -525,9 +525,9 @@ impl UserStore {
    }

    pub fn dismiss_contact_request(
-        &self,
+        &mut self,
        requester_id: u64,
-        cx: &ModelContext<Self>,
+        cx: &mut ModelContext<Self>,
    ) -> Task<Result<()>> {
        let client = self.client.upgrade();
        cx.spawn(move |_, _| async move {
@@ -573,7 +573,7 @@ impl UserStore {
        })
    }

-    pub fn clear_contacts(&self) -> impl Future<Output = ()> {
+    pub fn clear_contacts(&mut self) -> impl Future<Output = ()> {
        let (tx, mut rx) = postage::barrier::channel();
        self.update_contacts_tx
            .unbounded_send(UpdateContacts::Clear(tx))
@@ -583,7 +583,7 @@ impl UserStore {
        }
    }

-    pub fn contact_updates_done(&self) -> impl Future<Output = ()> {
+    pub fn contact_updates_done(&mut self) -> impl Future<Output = ()> {
        let (tx, mut rx) = postage::barrier::channel();
        self.update_contacts_tx
            .unbounded_send(UpdateContacts::Wait(tx))
@@ -594,9 +594,9 @@ impl UserStore {
    }

    pub fn get_users(
-        &self,
+        &mut self,
        user_ids: Vec<u64>,
-        cx: &ModelContext<Self>,
+        cx: &mut ModelContext<Self>,
    ) -> Task<Result<Vec<Arc<User>>>> {
        let mut user_ids_to_fetch = user_ids.clone();
        user_ids_to_fetch.retain(|id| !self.users.contains_key(id));
@@ -629,9 +629,9 @@ impl UserStore {
    }

    pub fn fuzzy_search_users(
-        &self,
+        &mut self,
        query: String,
-        cx: &ModelContext<Self>,
+        cx: &mut ModelContext<Self>,
    ) -> Task<Result<Vec<Arc<User>>>> {
        self.load_users(proto::FuzzySearchUsers { query }, cx)
    }
@@ -640,7 +640,11 @@ impl UserStore {
        self.users.get(&user_id).cloned()
    }

-    pub fn get_user_optimistic(&self, user_id: u64, cx: &ModelContext<Self>) -> Option<Arc<User>> {
+    pub fn get_user_optimistic(
+        &mut self,
+        user_id: u64,
+        cx: &mut ModelContext<Self>,
+    ) -> Option<Arc<User>> {
        if let Some(user) = self.users.get(&user_id).cloned() {
            return Some(user);
        }
@@ -649,7 +653,11 @@ impl UserStore {
        None
    }

-    pub fn get_user(&self, user_id: u64, cx: &ModelContext<Self>) -> Task<Result<Arc<User>>> {
+    pub fn get_user(
+        &mut self,
+        user_id: u64,
+        cx: &mut ModelContext<Self>,
+    ) -> Task<Result<Arc<User>>> {
        if let Some(user) = self.users.get(&user_id).cloned() {
            return Task::ready(Ok(user));
        }
@@ -689,7 +697,7 @@ impl UserStore {
            .map(|accepted_tos_at| accepted_tos_at.is_some())
    }

-    pub fn accept_terms_of_service(&self, cx: &ModelContext<Self>) -> Task<Result<()>> {
+    pub fn accept_terms_of_service(&mut self, cx: &mut ModelContext<Self>) -> Task<Result<()>> {
        if self.current_user().is_none() {
            return Task::ready(Err(anyhow!("no current user")));
        };
@@ -718,9 +726,9 @@ impl UserStore {
    }

    fn load_users(
-        &self,
+        &mut self,
        request: impl RequestMessage<Response = UsersResponse>,
-        cx: &ModelContext<Self>,
+        cx: &mut ModelContext<Self>,
    ) -> Task<Result<Vec<Arc<User>>>> {
        let client = self.client.clone();
        cx.spawn(|this, mut cx| async move {
--- a/crates/clock/src/clock.rs
+++ b/crates/clock/src/clock.rs
@@ -216,11 +216,10 @@ impl fmt::Debug for Global {
            if timestamp.replica_id > 0 {
                write!(f, ", ")?;
            }
-            if timestamp.replica_id == LOCAL_BRANCH_REPLICA_ID {
-                write!(f, "<branch>: {}", timestamp.value)?;
-            } else {
-                write!(f, "{}: {}", timestamp.replica_id, timestamp.value)?;
-            }
+            write!(f, "{}: {}", timestamp.replica_id, timestamp.value)?;
+        }
+        if self.local_branch_value > 0 {
+            write!(f, "<branch>: {}", self.local_branch_value)?;
        }
        write!(f, "}}")
    }
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -28,29 +28,28 @@ axum = { version = "0.6", features = ["json", "headers", "ws"] }
 axum-extra = { version = "0.4", features = ["erased-json"] }
 base64.workspace = true
 chrono.workspace = true
-clickhouse.workspace = true
 clock.workspace = true
+clickhouse.workspace = true
 collections.workspace = true
 dashmap.workspace = true
-derive_more.workspace = true
 envy = "0.4.2"
 futures.workspace = true
 google_ai.workspace = true
 hex.workspace = true
 http_client.workspace = true
+isahc_http_client.workspace = true
 jsonwebtoken.workspace = true
 live_kit_server.workspace = true
 log.workspace = true
 nanoid.workspace = true
 open_ai.workspace = true
+supermaven_api.workspace = true
 parking_lot.workspace = true
 prometheus = "0.13"
 prost.workspace = true
 rand.workspace = true
 reqwest = { version = "0.11", features = ["json"] }
-reqwest_client.workspace = true
 rpc.workspace = true
-rustc-demangle.workspace = true
 scrypt = "0.11"
 sea-orm = { version = "1.1.0-rc.1", features = ["sqlx-postgres", "postgres-array", "runtime-tokio-rustls", "with-uuid"] }
 semantic_version.workspace = true
@@ -62,12 +61,12 @@ sha2.workspace = true
 sqlx = { version = "0.8", features = ["runtime-tokio-rustls", "postgres", "json", "time", "uuid", "any"] }
 strum.workspace = true
 subtle.workspace = true
-supermaven_api.workspace = true
+rustc-demangle.workspace = true
 telemetry_events.workspace = true
 text.workspace = true
 thiserror.workspace = true
 time.workspace = true
-tokio = { workspace = true, features = ["full"] }
+tokio.workspace = true
 toml.workspace = true
 tower = "0.4"
 tower-http = { workspace = true, features = ["trace"] }
@@ -86,7 +85,6 @@ client = { workspace = true, features = ["test-support"] }
 collab_ui = { workspace = true, features = ["test-support"] }
 collections = { workspace = true, features = ["test-support"] }
 ctor.workspace = true
-dev_server_projects.workspace = true
 editor = { workspace = true, features = ["test-support"] }
 env_logger.workspace = true
 file_finder.workspace = true
@@ -94,7 +92,6 @@ fs = { workspace = true, features = ["test-support"] }
 git = { workspace = true, features = ["test-support"] }
 git_hosting_providers.workspace = true
 gpui = { workspace = true, features = ["test-support"] }
-headless.workspace = true
 hyper.workspace = true
 indoc.workspace = true
 language = { workspace = true, features = ["test-support"] }
@@ -111,6 +108,7 @@ recent_projects = { workspace = true }
 release_channel.workspace = true
 remote = { workspace = true, features = ["test-support"] }
 remote_server.workspace = true
+dev_server_projects.workspace = true
 rpc = { workspace = true, features = ["test-support"] }
 sea-orm = { version = "1.1.0-rc.1", features = ["sqlx-sqlite"] }
 serde_json.workspace = true
@@ -122,6 +120,7 @@ unindent.workspace = true
 util.workspace = true
 workspace = { workspace = true, features = ["test-support"] }
 worktree = { workspace = true, features = ["test-support"] }
+headless.workspace = true

 [package.metadata.cargo-machete]
 ignored = ["async-stripe"]
--- a/crates/collab/k8s/collab.template.yml
+++ b/crates/collab/k8s/collab.template.yml
@@ -199,12 +199,6 @@ spec:
                secretKeyRef:
                  name: slack
                  key: panics_webhook
-            - name: STRIPE_API_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: stripe
-                  key: api_key
-                  optional: true
            - name: COMPLETE_WITH_LANGUAGE_MODEL_RATE_LIMIT_PER_HOUR
              value: "1000"
            - name: SUPERMAVEN_ADMIN_API_KEY
--- a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
+++ b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
@@ -112,7 +112,6 @@ CREATE TABLE "worktree_settings_files" (
    "worktree_id" INTEGER NOT NULL,
    "path" VARCHAR NOT NULL,
    "content" TEXT,
-    "kind" VARCHAR,
    PRIMARY KEY(project_id, worktree_id, path),
    FOREIGN KEY(project_id, worktree_id) REFERENCES worktrees (project_id, id) ON DELETE CASCADE
 );
@@ -422,15 +421,6 @@ CREATE TABLE dev_server_projects (
    paths TEXT NOT NULL
 );

-CREATE TABLE IF NOT EXISTS billing_preferences (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    user_id INTEGER NOT NULL REFERENCES users(id),
-    max_monthly_llm_usage_spending_in_cents INTEGER NOT NULL
-);
-
-CREATE UNIQUE INDEX "uix_billing_preferences_on_user_id" ON billing_preferences (user_id);
-
 CREATE TABLE IF NOT EXISTS billing_customers (
    id INTEGER PRIMARY KEY AUTOINCREMENT,
    created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
--- a/crates/collab/migrations/20241002120231_add_local_settings_kind.sql
+++ b/crates/collab/migrations/20241002120231_add_local_settings_kind.sql
@@ -1 +0,0 @@
-ALTER TABLE "worktree_settings_files" ADD COLUMN "kind" VARCHAR;
--- a/crates/collab/migrations/20241009190639_add_billing_preferences.sql
+++ b/crates/collab/migrations/20241009190639_add_billing_preferences.sql
@@ -1,8 +0,0 @@
-create table if not exists billing_preferences (
-    id serial primary key,
-    created_at timestamp without time zone not null default now(),
-    user_id integer not null references users(id) on delete cascade,
-    max_monthly_llm_usage_spending_in_cents integer not null
-);
-
-create unique index "uix_billing_preferences_on_user_id" on billing_preferences (user_id);
--- a/crates/collab/migrations_llm/20241007173634_add_cache_token_counts.sql
+++ b/crates/collab/migrations_llm/20241007173634_add_cache_token_counts.sql
@@ -1,11 +0,0 @@
-alter table models
-    add column price_per_million_cache_creation_input_tokens integer not null default 0,
-    add column price_per_million_cache_read_input_tokens integer not null default 0;
-
-alter table usages
-    add column cache_creation_input_tokens_this_month bigint not null default 0,
-    add column cache_read_input_tokens_this_month bigint not null default 0;
-
-alter table lifetime_usages
-    add column cache_creation_input_tokens bigint not null default 0,
-    add column cache_read_input_tokens bigint not null default 0;
--- a/crates/collab/migrations_llm/20241007220716_drop_incorrect_usages_columns.sql
+++ b/crates/collab/migrations_llm/20241007220716_drop_incorrect_usages_columns.sql
@@ -1,3 +0,0 @@
-alter table usages
-    drop column cache_creation_input_tokens_this_month,
-    drop column cache_read_input_tokens_this_month;
--- a/crates/collab/migrations_llm/20241008155620_create_monthly_usages.sql
+++ b/crates/collab/migrations_llm/20241008155620_create_monthly_usages.sql
@@ -1,13 +0,0 @@
-create table monthly_usages (
-    id serial primary key,
-    user_id integer not null,
-    model_id integer not null references models (id) on delete cascade,
-    month integer not null,
-    year integer not null,
-    input_tokens bigint not null default 0,
-    cache_creation_input_tokens bigint not null default 0,
-    cache_read_input_tokens bigint not null default 0,
-    output_tokens bigint not null default 0
-);
-
-create unique index uix_monthly_usages_on_user_id_model_id_month_year on monthly_usages (user_id, model_id, month, year);
--- a/crates/collab/migrations_llm/20241010151249_create_billing_events.sql
+++ b/crates/collab/migrations_llm/20241010151249_create_billing_events.sql
@@ -1,12 +0,0 @@
-create table billing_events (
-    id serial primary key,
-    idempotency_key uuid not null default gen_random_uuid(),
-    user_id integer not null,
-    model_id integer not null references models (id) on delete cascade,
-    input_tokens bigint not null default 0,
-    input_cache_creation_tokens bigint not null default 0,
-    input_cache_read_tokens bigint not null default 0,
-    output_tokens bigint not null default 0
-);
-
-create index uix_billing_events_on_user_id_model_id on billing_events (user_id, model_id);
--- a/crates/collab/src/api/billing.rs
+++ b/crates/collab/src/api/billing.rs
@@ -1,3 +1,7 @@
+use std::str::FromStr;
+use std::sync::Arc;
+use std::time::Duration;
+
 use anyhow::{anyhow, bail, Context};
 use axum::{
    extract::{self, Query},
@@ -5,43 +9,29 @@ use axum::{
    Extension, Json, Router,
 };
 use chrono::{DateTime, SecondsFormat, Utc};
-use collections::HashSet;
 use reqwest::StatusCode;
 use sea_orm::ActiveValue;
 use serde::{Deserialize, Serialize};
-use std::{str::FromStr, sync::Arc, time::Duration};
 use stripe::{
-    BillingPortalSession, CreateBillingPortalSession, CreateBillingPortalSessionFlowData,
-    CreateBillingPortalSessionFlowDataAfterCompletion,
+    BillingPortalSession, CheckoutSession, CreateBillingPortalSession,
+    CreateBillingPortalSessionFlowData, CreateBillingPortalSessionFlowDataAfterCompletion,
    CreateBillingPortalSessionFlowDataAfterCompletionRedirect,
-    CreateBillingPortalSessionFlowDataType, CreateCustomer, Customer, CustomerId, EventObject,
-    EventType, Expandable, ListEvents, Subscription, SubscriptionId, SubscriptionStatus,
+    CreateBillingPortalSessionFlowDataType, CreateCheckoutSession, CreateCheckoutSessionLineItems,
+    CreateCustomer, Customer, CustomerId, EventObject, EventType, Expandable, ListEvents,
+    Subscription, SubscriptionId, SubscriptionStatus,
 };
 use util::ResultExt;

-use crate::llm::DEFAULT_MAX_MONTHLY_SPEND;
-use crate::rpc::{ResultExt as _, Server};
-use crate::{
-    db::{
-        billing_customer, BillingSubscriptionId, CreateBillingCustomerParams,
-        CreateBillingSubscriptionParams, CreateProcessedStripeEventParams,
-        UpdateBillingCustomerParams, UpdateBillingPreferencesParams,
-        UpdateBillingSubscriptionParams,
-    },
-    stripe_billing::StripeBilling,
-};
-use crate::{
-    db::{billing_subscription::StripeSubscriptionStatus, UserId},
-    llm::db::LlmDatabase,
+use crate::db::billing_subscription::StripeSubscriptionStatus;
+use crate::db::{
+    billing_customer, BillingSubscriptionId, CreateBillingCustomerParams,
+    CreateBillingSubscriptionParams, CreateProcessedStripeEventParams, UpdateBillingCustomerParams,
+    UpdateBillingSubscriptionParams,
 };
 use crate::{AppState, Error, Result};

 pub fn router() -> Router {
    Router::new()
-        .route(
-            "/billing/preferences",
-            get(get_billing_preferences).put(update_billing_preferences),
-        )
        .route(
            "/billing/subscriptions",
            get(list_billing_subscriptions).post(create_billing_subscription),
@@ -52,85 +42,6 @@ pub fn router() -> Router {
        )
 }

-#[derive(Debug, Deserialize)]
-struct GetBillingPreferencesParams {
-    github_user_id: i32,
-}
-
-#[derive(Debug, Serialize)]
-struct BillingPreferencesResponse {
-    max_monthly_llm_usage_spending_in_cents: i32,
-}
-
-async fn get_billing_preferences(
-    Extension(app): Extension<Arc<AppState>>,
-    Query(params): Query<GetBillingPreferencesParams>,
-) -> Result<Json<BillingPreferencesResponse>> {
-    let user = app
-        .db
-        .get_user_by_github_user_id(params.github_user_id)
-        .await?
-        .ok_or_else(|| anyhow!("user not found"))?;
-
-    let preferences = app.db.get_billing_preferences(user.id).await?;
-
-    Ok(Json(BillingPreferencesResponse {
-        max_monthly_llm_usage_spending_in_cents: preferences
-            .map_or(DEFAULT_MAX_MONTHLY_SPEND.0 as i32, |preferences| {
-                preferences.max_monthly_llm_usage_spending_in_cents
-            }),
-    }))
-}
-
-#[derive(Debug, Deserialize)]
-struct UpdateBillingPreferencesBody {
-    github_user_id: i32,
-    max_monthly_llm_usage_spending_in_cents: i32,
-}
-
-async fn update_billing_preferences(
-    Extension(app): Extension<Arc<AppState>>,
-    Extension(rpc_server): Extension<Arc<crate::rpc::Server>>,
-    extract::Json(body): extract::Json<UpdateBillingPreferencesBody>,
-) -> Result<Json<BillingPreferencesResponse>> {
-    let user = app
-        .db
-        .get_user_by_github_user_id(body.github_user_id)
-        .await?
-        .ok_or_else(|| anyhow!("user not found"))?;
-
-    let billing_preferences =
-        if let Some(_billing_preferences) = app.db.get_billing_preferences(user.id).await? {
-            app.db
-                .update_billing_preferences(
-                    user.id,
-                    &UpdateBillingPreferencesParams {
-                        max_monthly_llm_usage_spending_in_cents: ActiveValue::set(
-                            body.max_monthly_llm_usage_spending_in_cents,
-                        ),
-                    },
-                )
-                .await?
-        } else {
-            app.db
-                .create_billing_preferences(
-                    user.id,
-                    &crate::db::CreateBillingPreferencesParams {
-                        max_monthly_llm_usage_spending_in_cents: body
-                            .max_monthly_llm_usage_spending_in_cents,
-                    },
-                )
-                .await?
-        };
-
-    rpc_server.refresh_llm_tokens_for_user(user.id).await;
-
-    Ok(Json(BillingPreferencesResponse {
-        max_monthly_llm_usage_spending_in_cents: billing_preferences
-            .max_monthly_llm_usage_spending_in_cents,
-    }))
-}
-
 #[derive(Debug, Deserialize)]
 struct ListBillingSubscriptionsParams {
    github_user_id: i32,
@@ -168,7 +79,7 @@ async fn list_billing_subscriptions(
            .into_iter()
            .map(|subscription| BillingSubscriptionJson {
                id: subscription.id,
-                name: "Zed LLM Usage".to_string(),
+                name: "Zed Pro".to_string(),
                status: subscription.stripe_subscription_status,
                cancel_at: subscription.stripe_cancel_at.map(|cancel_at| {
                    cancel_at
@@ -203,22 +114,12 @@ async fn create_billing_subscription(
        .await?
        .ok_or_else(|| anyhow!("user not found"))?;

-    let Some(stripe_client) = app.stripe_client.clone() else {
-        log::error!("failed to retrieve Stripe client");
-        Err(Error::http(
-            StatusCode::NOT_IMPLEMENTED,
-            "not supported".into(),
-        ))?
-    };
-    let Some(stripe_billing) = app.stripe_billing.clone() else {
-        log::error!("failed to retrieve Stripe billing object");
-        Err(Error::http(
-            StatusCode::NOT_IMPLEMENTED,
-            "not supported".into(),
-        ))?
-    };
-    let Some(llm_db) = app.llm_db.clone() else {
-        log::error!("failed to retrieve LLM database");
+    let Some((stripe_client, stripe_price_id)) = app
+        .stripe_client
+        .clone()
+        .zip(app.config.stripe_price_id.clone())
+    else {
+        log::error!("failed to retrieve Stripe client or price ID");
        Err(Error::http(
            StatusCode::NOT_IMPLEMENTED,
            "not supported".into(),
@@ -242,14 +143,26 @@ async fn create_billing_subscription(
            customer.id
        };

-    let default_model = llm_db.model(rpc::LanguageModelProvider::Anthropic, "claude-3-5-sonnet")?;
-    let stripe_model = stripe_billing.register_model(default_model).await?;
-    let success_url = format!("{}/account", app.config.zed_dot_dev_url());
-    let checkout_session_url = stripe_billing
-        .checkout(customer_id, &user.github_login, &stripe_model, &success_url)
-        .await?;
+    let checkout_session = {
+        let mut params = CreateCheckoutSession::new();
+        params.mode = Some(stripe::CheckoutSessionMode::Subscription);
+        params.customer = Some(customer_id);
+        params.client_reference_id = Some(user.github_login.as_str());
+        params.line_items = Some(vec![CreateCheckoutSessionLineItems {
+            price: Some(stripe_price_id.to_string()),
+            quantity: Some(1),
+            ..Default::default()
+        }]);
+        let success_url = format!("{}/account", app.config.zed_dot_dev_url());
+        params.success_url = Some(&success_url);
+
+        CheckoutSession::create(&stripe_client, params).await?
+    };
+
    Ok(Json(CreateBillingSubscriptionResponse {
-        checkout_session_url,
+        checkout_session_url: checkout_session
+            .url
+            .ok_or_else(|| anyhow!("no checkout session URL"))?,
    }))
 }

@@ -404,7 +317,7 @@ const NUMBER_OF_ALREADY_PROCESSED_PAGES_BEFORE_WE_STOP: usize = 4;

 /// Polls the Stripe events API periodically to reconcile the records in our
 /// database with the data in Stripe.
-pub fn poll_stripe_events_periodically(app: Arc<AppState>, rpc_server: Arc<Server>) {
+pub fn poll_stripe_events_periodically(app: Arc<AppState>) {
    let Some(stripe_client) = app.stripe_client.clone() else {
        log::warn!("failed to retrieve Stripe client");
        return;
@@ -415,9 +328,7 @@ pub fn poll_stripe_events_periodically(app: Arc<AppState>, rpc_server: Arc<Serve
        let executor = executor.clone();
        async move {
            loop {
-                poll_stripe_events(&app, &rpc_server, &stripe_client)
-                    .await
-                    .log_err();
+                poll_stripe_events(&app, &stripe_client).await.log_err();

                executor.sleep(POLL_EVENTS_INTERVAL).await;
            }
@@ -427,7 +338,6 @@ pub fn poll_stripe_events_periodically(app: Arc<AppState>, rpc_server: Arc<Serve

 async fn poll_stripe_events(
    app: &Arc<AppState>,
-    rpc_server: &Arc<Server>,
    stripe_client: &stripe::Client,
 ) -> anyhow::Result<()> {
    fn event_type_to_string(event_type: EventType) -> String {
@@ -452,28 +362,29 @@ async fn poll_stripe_events(
    let mut pages_of_already_processed_events = 0;
    let mut unprocessed_events = Vec::new();

-    log::info!(
-        "Stripe events: starting retrieval for {}",
-        event_types.join(", ")
-    );
-    let mut params = ListEvents::new();
-    params.types = Some(event_types.clone());
-    params.limit = Some(EVENTS_LIMIT_PER_PAGE);
-
-    let mut event_pages = stripe::Event::list(&stripe_client, &params)
-        .await?
-        .paginate(params);
-
    loop {
+        if pages_of_already_processed_events >= NUMBER_OF_ALREADY_PROCESSED_PAGES_BEFORE_WE_STOP {
+            log::info!("saw {pages_of_already_processed_events} pages of already-processed events: stopping event retrieval");
+            break;
+        }
+
+        log::info!("retrieving events from Stripe: {}", event_types.join(", "));
+
+        let mut params = ListEvents::new();
+        params.types = Some(event_types.clone());
+        params.limit = Some(EVENTS_LIMIT_PER_PAGE);
+
+        let events = stripe::Event::list(stripe_client, &params).await?;
+
        let processed_event_ids = {
-            let event_ids = event_pages
-                .page
+            let event_ids = &events
                .data
                .iter()
                .map(|event| event.id.as_str())
                .collect::<Vec<_>>();
+
            app.db
-                .get_processed_stripe_events_by_event_ids(&event_ids)
+                .get_processed_stripe_events_by_event_ids(event_ids)
                .await?
                .into_iter()
                .map(|event| event.stripe_event_id)
@@ -481,13 +392,13 @@ async fn poll_stripe_events(
        };

        let mut processed_events_in_page = 0;
-        let events_in_page = event_pages.page.data.len();
-        for event in &event_pages.page.data {
+        let events_in_page = events.data.len();
+        for event in events.data {
            if processed_event_ids.contains(&event.id.to_string()) {
                processed_events_in_page += 1;
-                log::debug!("Stripe events: already processed '{}', skipping", event.id);
+                log::debug!("Stripe event {} already processed: skipping", event.id);
            } else {
-                unprocessed_events.push(event.clone());
+                unprocessed_events.push(event);
            }
        }

@@ -495,21 +406,15 @@ async fn poll_stripe_events(
            pages_of_already_processed_events += 1;
        }

-        if event_pages.page.has_more {
-            if pages_of_already_processed_events >= NUMBER_OF_ALREADY_PROCESSED_PAGES_BEFORE_WE_STOP
-            {
-                log::info!("Stripe events: stopping, saw {pages_of_already_processed_events} pages of already-processed events");
-                break;
-            } else {
-                log::info!("Stripe events: retrieving next page");
-                event_pages = event_pages.next(&stripe_client).await?;
-            }
-        } else {
+        if !events.has_more {
            break;
        }
    }

-    log::info!("Stripe events: unprocessed {}", unprocessed_events.len());
+    log::info!(
+        "unprocessed events from Stripe: {}",
+        unprocessed_events.len()
+    );

    // Sort all of the unprocessed events in ascending order, so we can handle them in the order they occurred.
    unprocessed_events.sort_by(|a, b| a.created.cmp(&b.created).then_with(|| a.id.cmp(&b.id)));
@@ -525,12 +430,12 @@ async fn poll_stripe_events(
        // If the event has happened too far in the past, we don't want to
        // process it and risk overwriting other more-recent updates.
        //
-        // 1 day was chosen arbitrarily. This could be made longer or shorter.
-        let one_day = Duration::from_secs(24 * 60 * 60);
-        let a_day_ago = Utc::now() - one_day;
-        if a_day_ago.timestamp() > event.created {
+        // 1 hour was chosen arbitrarily. This could be made longer or shorter.
+        let one_hour = Duration::from_secs(60 * 60);
+        let an_hour_ago = Utc::now() - one_hour;
+        if an_hour_ago.timestamp() > event.created {
            log::info!(
-                "Stripe events: event '{}' is more than {one_day:?} old, marking as processed",
+                "Stripe event {} is more than {one_hour:?} old, marking as processed",
                event_id
            );
            app.db
@@ -549,7 +454,7 @@ async fn poll_stripe_events(
            | EventType::CustomerSubscriptionPaused
            | EventType::CustomerSubscriptionResumed
            | EventType::CustomerSubscriptionDeleted => {
-                handle_customer_subscription_event(app, rpc_server, stripe_client, event).await
+                handle_customer_subscription_event(app, stripe_client, event).await
            }
            _ => Ok(()),
        };
@@ -617,7 +522,6 @@ async fn handle_customer_event(

 async fn handle_customer_subscription_event(
    app: &Arc<AppState>,
-    rpc_server: &Arc<Server>,
    stripe_client: &stripe::Client,
    event: stripe::Event,
 ) -> anyhow::Result<()> {
@@ -663,12 +567,6 @@ async fn handle_customer_subscription_event(
            .await?;
    }

-    // When the user's subscription changes, we want to refresh their LLM tokens
-    // to either grant/revoke access.
-    rpc_server
-        .refresh_llm_tokens_for_user(billing_customer.user_id)
-        .await;
-
    Ok(())
 }

@@ -733,74 +631,3 @@ async fn find_or_create_billing_customer(

    Ok(Some(billing_customer))
 }
-
-const SYNC_LLM_USAGE_WITH_STRIPE_INTERVAL: Duration = Duration::from_secs(60);
-
-pub fn sync_llm_usage_with_stripe_periodically(app: Arc<AppState>) {
-    let Some(stripe_billing) = app.stripe_billing.clone() else {
-        log::warn!("failed to retrieve Stripe billing object");
-        return;
-    };
-    let Some(llm_db) = app.llm_db.clone() else {
-        log::warn!("failed to retrieve LLM database");
-        return;
-    };
-
-    let executor = app.executor.clone();
-    executor.spawn_detached({
-        let executor = executor.clone();
-        async move {
-            loop {
-                sync_with_stripe(&app, &llm_db, &stripe_billing)
-                    .await
-                    .context("failed to sync LLM usage to Stripe")
-                    .trace_err();
-                executor.sleep(SYNC_LLM_USAGE_WITH_STRIPE_INTERVAL).await;
-            }
-        }
-    });
-}
-
-async fn sync_with_stripe(
-    app: &Arc<AppState>,
-    llm_db: &Arc<LlmDatabase>,
-    stripe_billing: &Arc<StripeBilling>,
-) -> anyhow::Result<()> {
-    let events = llm_db.get_billing_events().await?;
-    let user_ids = events
-        .iter()
-        .map(|(event, _)| event.user_id)
-        .collect::<HashSet<UserId>>();
-    let stripe_subscriptions = app.db.get_active_billing_subscriptions(user_ids).await?;
-
-    for (event, model) in events {
-        let Some((stripe_db_customer, stripe_db_subscription)) =
-            stripe_subscriptions.get(&event.user_id)
-        else {
-            tracing::warn!(
-                user_id = event.user_id.0,
-                "Registered billing event for user who is not a Stripe customer. Billing events should only be created for users who are Stripe customers, so this is a mistake on our side."
-            );
-            continue;
-        };
-        let stripe_subscription_id: stripe::SubscriptionId = stripe_db_subscription
-            .stripe_subscription_id
-            .parse()
-            .context("failed to parse stripe subscription id from db")?;
-        let stripe_customer_id: stripe::CustomerId = stripe_db_customer
-            .stripe_customer_id
-            .parse()
-            .context("failed to parse stripe customer id from db")?;
-
-        let stripe_model = stripe_billing.register_model(&model).await?;
-        stripe_billing
-            .subscribe_to_model(&stripe_subscription_id, &stripe_model)
-            .await?;
-        stripe_billing
-            .bill_model_usage(&stripe_customer_id, &stripe_model, &event)
-            .await?;
-        llm_db.consume_billing_event(event.id).await?;
-    }
-
-    Ok(())
-}
--- a/crates/collab/src/api/events.rs
+++ b/crates/collab/src/api/events.rs
@@ -23,7 +23,7 @@ use telemetry_events::{
 };
 use uuid::Uuid;

-const CRASH_REPORTS_BUCKET: &str = "zed-crash-reports";
+static CRASH_REPORTS_BUCKET: &str = "zed-crash-reports";

 pub fn router() -> Router {
    Router::new()
@@ -429,6 +429,8 @@ pub async fn post_events(
                country_code.clone(),
                checksum_matched,
            )),
+            // Needed for clients sending old copilot_event types
+            Event::Copilot(_) => {}
            Event::InlineCompletion(event) => {
                to_upload
                    .inline_completion_events
@@ -670,13 +672,13 @@ pub struct EditorEventRow {
    time: i64,
    copilot_enabled: bool,
    copilot_enabled_for_language: bool,
+    historical_event: bool,
    architecture: String,
    is_staff: Option<bool>,
    major: Option<i32>,
    minor: Option<i32>,
    patch: Option<i32>,
    checksum_matched: bool,
-    is_via_ssh: bool,
 }

 impl EditorEventRow {
@@ -717,7 +719,7 @@ impl EditorEventRow {
            country_code: country_code.unwrap_or("XX".to_string()),
            region_code: "".to_string(),
            city: "".to_string(),
-            is_via_ssh: event.is_via_ssh,
+            historical_event: false,
        }
    }
 }
@@ -1261,7 +1263,6 @@ pub struct EditEventRow {
    period_start: i64,
    period_end: i64,
    environment: String,
-    is_via_ssh: bool,
 }

 impl EditEventRow {
@@ -1295,7 +1296,6 @@ impl EditEventRow {
            period_start: period_start.timestamp_millis(),
            period_end: period_end.timestamp_millis(),
            environment: event.environment,
-            is_via_ssh: event.is_via_ssh,
        }
    }
 }
--- a/crates/collab/src/cents.rs
+++ b/crates/collab/src/cents.rs
@@ -1,78 +0,0 @@
-/// A number of cents.
-#[derive(
-    Debug,
-    PartialEq,
-    Eq,
-    PartialOrd,
-    Ord,
-    Hash,
-    Clone,
-    Copy,
-    derive_more::Add,
-    derive_more::AddAssign,
-)]
-pub struct Cents(pub u32);
-
-impl Cents {
-    pub const ZERO: Self = Self(0);
-
-    pub const fn new(cents: u32) -> Self {
-        Self(cents)
-    }
-
-    pub const fn from_dollars(dollars: u32) -> Self {
-        Self(dollars * 100)
-    }
-
-    pub fn saturating_sub(self, other: Cents) -> Self {
-        Self(self.0.saturating_sub(other.0))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use pretty_assertions::assert_eq;
-
-    use super::*;
-
-    #[test]
-    fn test_cents_new() {
-        assert_eq!(Cents::new(50), Cents(50));
-    }
-
-    #[test]
-    fn test_cents_from_dollars() {
-        assert_eq!(Cents::from_dollars(1), Cents(100));
-        assert_eq!(Cents::from_dollars(5), Cents(500));
-    }
-
-    #[test]
-    fn test_cents_zero() {
-        assert_eq!(Cents::ZERO, Cents(0));
-    }
-
-    #[test]
-    fn test_cents_add() {
-        assert_eq!(Cents(50) + Cents(30), Cents(80));
-    }
-
-    #[test]
-    fn test_cents_add_assign() {
-        let mut cents = Cents(50);
-        cents += Cents(30);
-        assert_eq!(cents, Cents(80));
-    }
-
-    #[test]
-    fn test_cents_saturating_sub() {
-        assert_eq!(Cents(50).saturating_sub(Cents(30)), Cents(20));
-        assert_eq!(Cents(30).saturating_sub(Cents(50)), Cents(0));
-    }
-
-    #[test]
-    fn test_cents_ordering() {
-        assert!(Cents(50) > Cents(30));
-        assert!(Cents(30) < Cents(50));
-        assert_eq!(Cents(50), Cents(50));
-    }
-}
--- a/crates/collab/src/db.rs
+++ b/crates/collab/src/db.rs
@@ -35,16 +35,12 @@ use std::{
 };
 use time::PrimitiveDateTime;
 use tokio::sync::{Mutex, OwnedMutexGuard};
-use worktree_settings_file::LocalSettingsKind;

 #[cfg(test)]
 pub use tests::TestDb;

 pub use ids::*;
 pub use queries::billing_customers::{CreateBillingCustomerParams, UpdateBillingCustomerParams};
-pub use queries::billing_preferences::{
-    CreateBillingPreferencesParams, UpdateBillingPreferencesParams,
-};
 pub use queries::billing_subscriptions::{
    CreateBillingSubscriptionParams, UpdateBillingSubscriptionParams,
 };
@@ -770,7 +766,6 @@ pub struct Worktree {
 pub struct WorktreeSettingsFile {
    pub path: String,
    pub content: String,
-    pub kind: LocalSettingsKind,
 }

 pub struct NewExtensionVersion {
@@ -788,21 +783,3 @@ pub struct ExtensionVersionConstraints {
    pub schema_versions: RangeInclusive<i32>,
    pub wasm_api_versions: RangeInclusive<SemanticVersion>,
 }
-
-impl LocalSettingsKind {
-    pub fn from_proto(proto_kind: proto::LocalSettingsKind) -> Self {
-        match proto_kind {
-            proto::LocalSettingsKind::Settings => Self::Settings,
-            proto::LocalSettingsKind::Tasks => Self::Tasks,
-            proto::LocalSettingsKind::Editorconfig => Self::Editorconfig,
-        }
-    }
-
-    pub fn to_proto(&self) -> proto::LocalSettingsKind {
-        match self {
-            Self::Settings => proto::LocalSettingsKind::Settings,
-            Self::Tasks => proto::LocalSettingsKind::Tasks,
-            Self::Editorconfig => proto::LocalSettingsKind::Editorconfig,
-        }
-    }
-}
--- a/crates/collab/src/db/ids.rs
+++ b/crates/collab/src/db/ids.rs
@@ -72,7 +72,6 @@ macro_rules! id_type {
 id_type!(AccessTokenId);
 id_type!(BillingCustomerId);
 id_type!(BillingSubscriptionId);
-id_type!(BillingPreferencesId);
 id_type!(BufferId);
 id_type!(ChannelBufferCollaboratorId);
 id_type!(ChannelChatParticipantId);
--- a/crates/collab/src/db/queries.rs
+++ b/crates/collab/src/db/queries.rs
@@ -2,7 +2,6 @@ use super::*;

 pub mod access_tokens;
 pub mod billing_customers;
-pub mod billing_preferences;
 pub mod billing_subscriptions;
 pub mod buffers;
 pub mod channels;
--- a/crates/collab/src/db/queries/billing_preferences.rs
+++ b/crates/collab/src/db/queries/billing_preferences.rs
@@ -1,75 +0,0 @@
-use super::*;
-
-#[derive(Debug)]
-pub struct CreateBillingPreferencesParams {
-    pub max_monthly_llm_usage_spending_in_cents: i32,
-}
-
-#[derive(Debug, Default)]
-pub struct UpdateBillingPreferencesParams {
-    pub max_monthly_llm_usage_spending_in_cents: ActiveValue<i32>,
-}
-
-impl Database {
-    /// Returns the billing preferences for the given user, if they exist.
-    pub async fn get_billing_preferences(
-        &self,
-        user_id: UserId,
-    ) -> Result<Option<billing_preference::Model>> {
-        self.transaction(|tx| async move {
-            Ok(billing_preference::Entity::find()
-                .filter(billing_preference::Column::UserId.eq(user_id))
-                .one(&*tx)
-                .await?)
-        })
-        .await
-    }
-
-    /// Creates new billing preferences for the given user.
-    pub async fn create_billing_preferences(
-        &self,
-        user_id: UserId,
-        params: &CreateBillingPreferencesParams,
-    ) -> Result<billing_preference::Model> {
-        self.transaction(|tx| async move {
-            let preferences = billing_preference::Entity::insert(billing_preference::ActiveModel {
-                user_id: ActiveValue::set(user_id),
-                max_monthly_llm_usage_spending_in_cents: ActiveValue::set(
-                    params.max_monthly_llm_usage_spending_in_cents,
-                ),
-                ..Default::default()
-            })
-            .exec_with_returning(&*tx)
-            .await?;
-
-            Ok(preferences)
-        })
-        .await
-    }
-
-    /// Updates the billing preferences for the given user.
-    pub async fn update_billing_preferences(
-        &self,
-        user_id: UserId,
-        params: &UpdateBillingPreferencesParams,
-    ) -> Result<billing_preference::Model> {
-        self.transaction(|tx| async move {
-            let preferences = billing_preference::Entity::update_many()
-                .set(billing_preference::ActiveModel {
-                    max_monthly_llm_usage_spending_in_cents: params
-                        .max_monthly_llm_usage_spending_in_cents
-                        .clone(),
-                    ..Default::default()
-                })
-                .filter(billing_preference::Column::UserId.eq(user_id))
-                .exec_with_returning(&*tx)
-                .await?;
-
-            Ok(preferences
-                .into_iter()
-                .next()
-                .ok_or_else(|| anyhow!("billing preferences not found"))?)
-        })
-        .await
-    }
-}
--- a/crates/collab/src/db/queries/billing_subscriptions.rs
+++ b/crates/collab/src/db/queries/billing_subscriptions.rs
@@ -112,37 +112,6 @@ impl Database {
        .await
    }

-    pub async fn get_active_billing_subscriptions(
-        &self,
-        user_ids: HashSet<UserId>,
-    ) -> Result<HashMap<UserId, (billing_customer::Model, billing_subscription::Model)>> {
-        self.transaction(|tx| {
-            let user_ids = user_ids.clone();
-            async move {
-                let mut rows = billing_subscription::Entity::find()
-                    .inner_join(billing_customer::Entity)
-                    .select_also(billing_customer::Entity)
-                    .filter(billing_customer::Column::UserId.is_in(user_ids))
-                    .filter(
-                        billing_subscription::Column::StripeSubscriptionStatus
-                            .eq(StripeSubscriptionStatus::Active),
-                    )
-                    .order_by_asc(billing_subscription::Column::Id)
-                    .stream(&*tx)
-                    .await?;
-
-                let mut subscriptions = HashMap::default();
-                while let Some(row) = rows.next().await {
-                    if let (subscription, Some(customer)) = row? {
-                        subscriptions.insert(customer.user_id, (customer, subscription));
-                    }
-                }
-                Ok(subscriptions)
-            }
-        })
-        .await
-    }
-
    /// Returns whether the user has an active billing subscription.
    pub async fn has_active_billing_subscription(&self, user_id: UserId) -> Result<bool> {
        Ok(self.count_active_billing_subscriptions(user_id).await? > 0)
--- a/crates/collab/src/db/queries/projects.rs
+++ b/crates/collab/src/db/queries/projects.rs
@@ -1,4 +1,3 @@
-use anyhow::Context as _;
 use util::ResultExt;

 use super::*;
@@ -528,12 +527,6 @@ impl Database {
        connection: ConnectionId,
    ) -> Result<TransactionGuard<Vec<ConnectionId>>> {
        let project_id = ProjectId::from_proto(update.project_id);
-        let kind = match update.kind {
-            Some(kind) => proto::LocalSettingsKind::from_i32(kind)
-                .with_context(|| format!("unknown worktree settings kind: {kind}"))?,
-            None => proto::LocalSettingsKind::Settings,
-        };
-        let kind = LocalSettingsKind::from_proto(kind);
        self.project_transaction(project_id, |tx| async move {
            // Ensure the update comes from the host.
            let project = project::Entity::find_by_id(project_id)
@@ -550,7 +543,6 @@ impl Database {
                    worktree_id: ActiveValue::Set(update.worktree_id as i64),
                    path: ActiveValue::Set(update.path.clone()),
                    content: ActiveValue::Set(content.clone()),
-                    kind: ActiveValue::Set(kind),
                })
                .on_conflict(
                    OnConflict::columns([
@@ -808,7 +800,6 @@ impl Database {
                    worktree.settings_files.push(WorktreeSettingsFile {
                        path: db_settings_file.path,
                        content: db_settings_file.content,
-                        kind: db_settings_file.kind,
                    });
                }
            }
@@ -838,7 +829,6 @@ impl Database {
                .map(|language_server| proto::LanguageServer {
                    id: language_server.id as u64,
                    name: language_server.name,
-                    worktree_id: None,
                })
                .collect(),
            dev_server_project_id: project.dev_server_project_id,
--- a/crates/collab/src/db/queries/rooms.rs
+++ b/crates/collab/src/db/queries/rooms.rs
@@ -718,7 +718,6 @@ impl Database {
            .map(|language_server| proto::LanguageServer {
                id: language_server.id as u64,
                name: language_server.name,
-                worktree_id: None,
            })
            .collect::<Vec<_>>();

@@ -736,7 +735,6 @@ impl Database {
                    worktree.settings_files.push(WorktreeSettingsFile {
                        path: db_settings_file.path,
                        content: db_settings_file.content,
-                        kind: db_settings_file.kind,
                    });
                }
            }
--- a/crates/collab/src/db/tables.rs
+++ b/crates/collab/src/db/tables.rs
@@ -1,6 +1,5 @@
 pub mod access_token;
 pub mod billing_customer;
-pub mod billing_preference;
 pub mod billing_subscription;
 pub mod buffer;
 pub mod buffer_operation;
--- a/crates/collab/src/db/tables/billing_preference.rs
+++ b/crates/collab/src/db/tables/billing_preference.rs
@@ -1,30 +0,0 @@
-use crate::db::{BillingPreferencesId, UserId};
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, Default, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "billing_preferences")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: BillingPreferencesId,
-    pub created_at: DateTime,
-    pub user_id: UserId,
-    pub max_monthly_llm_usage_spending_in_cents: i32,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::user::Entity",
-        from = "Column::UserId",
-        to = "super::user::Column::Id"
-    )]
-    User,
-}
-
-impl Related<super::user::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::User.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
--- a/crates/collab/src/db/tables/worktree_settings_file.rs
+++ b/crates/collab/src/db/tables/worktree_settings_file.rs
@@ -11,25 +11,9 @@ pub struct Model {
    #[sea_orm(primary_key)]
    pub path: String,
    pub content: String,
-    pub kind: LocalSettingsKind,
 }

 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
 pub enum Relation {}

 impl ActiveModelBehavior for ActiveModel {}
-
-#[derive(
-    Copy, Clone, Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, Default, Hash, serde::Serialize,
-)]
-#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")]
-#[serde(rename_all = "snake_case")]
-pub enum LocalSettingsKind {
-    #[default]
-    #[sea_orm(string_value = "settings")]
-    Settings,
-    #[sea_orm(string_value = "tasks")]
-    Tasks,
-    #[sea_orm(string_value = "editorconfig")]
-    Editorconfig,
-}
--- a/crates/collab/src/lib.rs
+++ b/crates/collab/src/lib.rs
@@ -1,6 +1,5 @@
 pub mod api;
 pub mod auth;
-mod cents;
 pub mod clickhouse;
 pub mod db;
 pub mod env;
@@ -10,7 +9,6 @@ pub mod migrations;
 mod rate_limiter;
 pub mod rpc;
 pub mod seed;
-pub mod stripe_billing;
 pub mod user_backfiller;

 #[cfg(test)]
@@ -22,17 +20,13 @@ use axum::{
    http::{HeaderMap, StatusCode},
    response::IntoResponse,
 };
-pub use cents::*;
 use db::{ChannelId, Database};
 use executor::Executor;
-use llm::db::LlmDatabase;
 pub use rate_limiter::*;
 use serde::Deserialize;
 use std::{path::PathBuf, sync::Arc};
 use util::ResultExt;

-use crate::stripe_billing::StripeBilling;
-
 pub type Result<T, E = Error> = std::result::Result<T, E>;

 pub enum Error {
@@ -180,6 +174,7 @@ pub struct Config {
    pub slack_panics_webhook: Option<String>,
    pub auto_join_channel_id: Option<ChannelId>,
    pub stripe_api_key: Option<String>,
+    pub stripe_price_id: Option<Arc<str>>,
    pub supermaven_admin_api_key: Option<Arc<str>>,
    pub user_backfiller_github_access_token: Option<Arc<str>>,
 }
@@ -198,10 +193,6 @@ impl Config {
        }
    }

-    pub fn is_llm_billing_enabled(&self) -> bool {
-        self.stripe_api_key.is_some()
-    }
-
    #[cfg(test)]
    pub fn test() -> Self {
        Self {
@@ -240,6 +231,7 @@ impl Config {
            migrations_path: None,
            seed_path: None,
            stripe_api_key: None,
+            stripe_price_id: None,
            supermaven_admin_api_key: None,
            user_backfiller_github_access_token: None,
        }
@@ -272,11 +264,9 @@ impl ServiceMode {

 pub struct AppState {
    pub db: Arc<Database>,
-    pub llm_db: Option<Arc<LlmDatabase>>,
    pub live_kit_client: Option<Arc<dyn live_kit_server::api::Client>>,
    pub blob_store_client: Option<aws_sdk_s3::Client>,
    pub stripe_client: Option<Arc<stripe::Client>>,
-    pub stripe_billing: Option<Arc<StripeBilling>>,
    pub rate_limiter: Arc<RateLimiter>,
    pub executor: Executor,
    pub clickhouse_client: Option<::clickhouse::Client>,
@@ -290,20 +280,6 @@ impl AppState {
        let mut db = Database::new(db_options, Executor::Production).await?;
        db.initialize_notification_kinds().await?;

-        let llm_db = if let Some((llm_database_url, llm_database_max_connections)) = config
-            .llm_database_url
-            .clone()
-            .zip(config.llm_database_max_connections)
-        {
-            let mut llm_db_options = db::ConnectOptions::new(llm_database_url);
-            llm_db_options.max_connections(llm_database_max_connections);
-            let mut llm_db = LlmDatabase::new(llm_db_options, executor.clone()).await?;
-            llm_db.initialize().await?;
-            Some(Arc::new(llm_db))
-        } else {
-            None
-        };
-
        let live_kit_client = if let Some(((server, key), secret)) = config
            .live_kit_server
            .as_ref()
@@ -320,16 +296,11 @@ impl AppState {
        };

        let db = Arc::new(db);
-        let stripe_client = build_stripe_client(&config).map(Arc::new).log_err();
        let this = Self {
            db: db.clone(),
-            llm_db,
            live_kit_client,
            blob_store_client: build_blob_store_client(&config).await.log_err(),
-            stripe_billing: stripe_client
-                .clone()
-                .map(|stripe_client| Arc::new(StripeBilling::new(stripe_client))),
-            stripe_client,
+            stripe_client: build_stripe_client(&config).await.map(Arc::new).log_err(),
            rate_limiter: Arc::new(RateLimiter::new(db)),
            executor,
            clickhouse_client: config
@@ -342,11 +313,12 @@ impl AppState {
    }
 }

-fn build_stripe_client(config: &Config) -> anyhow::Result<stripe::Client> {
+async fn build_stripe_client(config: &Config) -> anyhow::Result<stripe::Client> {
    let api_key = config
        .stripe_api_key
        .as_ref()
        .ok_or_else(|| anyhow!("missing stripe_api_key"))?;
+
    Ok(stripe::Client::new(api_key))
 }

--- a/crates/collab/src/llm.rs
+++ b/crates/collab/src/llm.rs
@@ -4,7 +4,7 @@ mod telemetry;
 mod token;

 use crate::{
-    api::CloudflareIpCountryHeader, build_clickhouse_client, db::UserId, executor::Executor, Cents,
+    api::CloudflareIpCountryHeader, build_clickhouse_client, db::UserId, executor::Executor,
    Config, Error, Result,
 };
 use anyhow::{anyhow, Context as _};
@@ -20,14 +20,13 @@ use axum::{
 };
 use chrono::{DateTime, Duration, Utc};
 use collections::HashMap;
-use db::TokenUsage;
 use db::{usage_measure::UsageMeasure, ActiveUserCount, LlmDatabase};
 use futures::{Stream, StreamExt as _};
-use reqwest_client::ReqwestClient;
+use isahc_http_client::IsahcHttpClient;
+use rpc::ListModelsResponse;
 use rpc::{
    proto::Plan, LanguageModelProvider, PerformCompletionParams, EXPIRED_LLM_TOKEN_HEADER_NAME,
 };
-use rpc::{ListModelsResponse, MAX_LLM_MONTHLY_SPEND_REACHED_HEADER_NAME};
 use std::{
    pin::Pin,
    sync::Arc,
@@ -44,7 +43,7 @@ pub struct LlmState {
    pub config: Config,
    pub executor: Executor,
    pub db: Arc<LlmDatabase>,
-    pub http_client: ReqwestClient,
+    pub http_client: IsahcHttpClient,
    pub clickhouse_client: Option<clickhouse::Client>,
    active_user_count_by_model:
        RwLock<HashMap<(LanguageModelProvider, String), (DateTime<Utc>, ActiveUserCount)>>,
@@ -70,8 +69,11 @@ impl LlmState {
        let db = Arc::new(db);

        let user_agent = format!("Zed Server/{}", env!("CARGO_PKG_VERSION"));
-        let http_client =
-            ReqwestClient::user_agent(&user_agent).context("failed to construct http client")?;
+        let http_client = IsahcHttpClient::builder()
+            .default_header("User-Agent", user_agent)
+            .build()
+            .map(IsahcHttpClient::from)
+            .context("failed to construct http client")?;

        let this = Self {
            executor,
@@ -318,31 +320,22 @@ async fn perform_completion(
            chunks
                .map(move |event| {
                    let chunk = event?;
-                    let (
-                        input_tokens,
-                        output_tokens,
-                        cache_creation_input_tokens,
-                        cache_read_input_tokens,
-                    ) = match &chunk {
+                    let (input_tokens, output_tokens) = match &chunk {
                        anthropic::Event::MessageStart {
                            message: anthropic::Response { usage, .. },
                        }
                        | anthropic::Event::MessageDelta { usage, .. } => (
                            usage.input_tokens.unwrap_or(0) as usize,
                            usage.output_tokens.unwrap_or(0) as usize,
-                            usage.cache_creation_input_tokens.unwrap_or(0) as usize,
-                            usage.cache_read_input_tokens.unwrap_or(0) as usize,
                        ),
-                        _ => (0, 0, 0, 0),
+                        _ => (0, 0),
                    };

-                    anyhow::Ok(CompletionChunk {
-                        bytes: serde_json::to_vec(&chunk).unwrap(),
+                    anyhow::Ok((
+                        serde_json::to_vec(&chunk).unwrap(),
                        input_tokens,
                        output_tokens,
-                        cache_creation_input_tokens,
-                        cache_read_input_tokens,
-                    })
+                    ))
                })
                .boxed()
        }
@@ -368,13 +361,11 @@ async fn perform_completion(
                            chunk.usage.as_ref().map_or(0, |u| u.prompt_tokens) as usize;
                        let output_tokens =
                            chunk.usage.as_ref().map_or(0, |u| u.completion_tokens) as usize;
-                        CompletionChunk {
-                            bytes: serde_json::to_vec(&chunk).unwrap(),
+                        (
+                            serde_json::to_vec(&chunk).unwrap(),
                            input_tokens,
                            output_tokens,
-                            cache_creation_input_tokens: 0,
-                            cache_read_input_tokens: 0,
-                        }
+                        )
                    })
                })
                .boxed()
@@ -398,13 +389,13 @@ async fn perform_completion(
                .map(|event| {
                    event.map(|chunk| {
                        // TODO - implement token counting for Google AI
-                        CompletionChunk {
-                            bytes: serde_json::to_vec(&chunk).unwrap(),
-                            input_tokens: 0,
-                            output_tokens: 0,
-                            cache_creation_input_tokens: 0,
-                            cache_read_input_tokens: 0,
-                        }
+                        let input_tokens = 0;
+                        let output_tokens = 0;
+                        (
+                            serde_json::to_vec(&chunk).unwrap(),
+                            input_tokens,
+                            output_tokens,
+                        )
                    })
                })
                .boxed()
@@ -416,7 +407,8 @@ async fn perform_completion(
        claims,
        provider: params.provider,
        model,
-        tokens: TokenUsage::default(),
+        input_tokens: 0,
+        output_tokens: 0,
        inner_stream: stream,
    })))
 }
@@ -433,15 +425,10 @@ fn normalize_model_name(known_models: Vec<String>, name: String) -> String {
    }
 }

-/// The maximum monthly spending an individual user can reach on the free tier
-/// before they have to pay.
-pub const FREE_TIER_MONTHLY_SPENDING_LIMIT: Cents = Cents::from_dollars(10);
-
-/// The default value to use for maximum spend per month if the user did not
-/// explicitly set a maximum spend.
+/// The maximum lifetime spending an individual user can reach before being cut off.
 ///
-/// Used to prevent surprise bills.
-pub const DEFAULT_MAX_MONTHLY_SPEND: Cents = Cents::from_dollars(10);
+/// Represented in cents.
+const LIFETIME_SPENDING_LIMIT_IN_CENTS: usize = 1_000 * 100;

 async fn check_usage_limit(
    state: &Arc<LlmState>,
@@ -460,28 +447,11 @@ async fn check_usage_limit(
        )
        .await?;

-    if state.config.is_llm_billing_enabled() {
-        if usage.spending_this_month >= FREE_TIER_MONTHLY_SPENDING_LIMIT {
-            if !claims.has_llm_subscription {
-                return Err(Error::http(
-                    StatusCode::PAYMENT_REQUIRED,
-                    "Maximum spending limit reached for this month.".to_string(),
-                ));
-            }
-
-            if usage.spending_this_month >= Cents(claims.max_monthly_spend_in_cents) {
-                return Err(Error::Http(
-                    StatusCode::FORBIDDEN,
-                    "Maximum spending limit reached for this month.".to_string(),
-                    [(
-                        HeaderName::from_static(MAX_LLM_MONTHLY_SPEND_REACHED_HEADER_NAME),
-                        HeaderValue::from_static("true"),
-                    )]
-                    .into_iter()
-                    .collect(),
-                ));
-            }
-        }
+    if usage.lifetime_spending >= LIFETIME_SPENDING_LIMIT_IN_CENTS {
+        return Err(Error::http(
+            StatusCode::FORBIDDEN,
+            "Maximum spending limit reached.".to_string(),
+        ));
    }

    let active_users = state.get_active_user_count(provider, model_name).await?;
@@ -524,6 +494,7 @@ async fn check_usage_limit(
                UsageMeasure::RequestsPerMinute => "requests_per_minute",
                UsageMeasure::TokensPerMinute => "tokens_per_minute",
                UsageMeasure::TokensPerDay => "tokens_per_day",
+                _ => "",
            };

            if let Some(client) = state.clickhouse_client.as_ref() {
@@ -582,38 +553,29 @@ async fn check_usage_limit(
    Ok(())
 }

-struct CompletionChunk {
-    bytes: Vec<u8>,
-    input_tokens: usize,
-    output_tokens: usize,
-    cache_creation_input_tokens: usize,
-    cache_read_input_tokens: usize,
-}
-
 struct TokenCountingStream<S> {
    state: Arc<LlmState>,
    claims: LlmTokenClaims,
    provider: LanguageModelProvider,
    model: String,
-    tokens: TokenUsage,
+    input_tokens: usize,
+    output_tokens: usize,
    inner_stream: S,
 }

 impl<S> Stream for TokenCountingStream<S>
 where
-    S: Stream<Item = Result<CompletionChunk, anyhow::Error>> + Unpin,
+    S: Stream<Item = Result<(Vec<u8>, usize, usize), anyhow::Error>> + Unpin,
 {
    type Item = Result<Vec<u8>, anyhow::Error>;

    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
        match Pin::new(&mut self.inner_stream).poll_next(cx) {
-            Poll::Ready(Some(Ok(mut chunk))) => {
-                chunk.bytes.push(b'\n');
-                self.tokens.input += chunk.input_tokens;
-                self.tokens.output += chunk.output_tokens;
-                self.tokens.input_cache_creation += chunk.cache_creation_input_tokens;
-                self.tokens.input_cache_read += chunk.cache_read_input_tokens;
-                Poll::Ready(Some(Ok(chunk.bytes)))
+            Poll::Ready(Some(Ok((mut bytes, input_tokens, output_tokens)))) => {
+                bytes.push(b'\n');
+                self.input_tokens += input_tokens;
+                self.output_tokens += output_tokens;
+                Poll::Ready(Some(Ok(bytes)))
            }
            Poll::Ready(Some(Err(e))) => Poll::Ready(Some(Err(e))),
            Poll::Ready(None) => Poll::Ready(None),
@@ -625,11 +587,11 @@ where
 impl<S> Drop for TokenCountingStream<S> {
    fn drop(&mut self) {
        let state = self.state.clone();
-        let is_llm_billing_enabled = state.config.is_llm_billing_enabled();
        let claims = self.claims.clone();
        let provider = self.provider;
        let model = std::mem::take(&mut self.model);
-        let tokens = self.tokens;
+        let input_token_count = self.input_tokens;
+        let output_token_count = self.output_tokens;
        self.state.executor.spawn_detached(async move {
            let usage = state
                .db
@@ -638,16 +600,8 @@ impl<S> Drop for TokenCountingStream<S> {
                    claims.is_staff,
                    provider,
                    &model,
-                    tokens,
-                    // We're passing `false` here if LLM billing is not enabled
-                    // so that we don't write any records to the
-                    // `billing_events` table until we're ready to bill users.
-                    if is_llm_billing_enabled {
-                        claims.has_llm_subscription
-                    } else {
-                        false
-                    },
-                    Cents(claims.max_monthly_spend_in_cents),
+                    input_token_count,
+                    output_token_count,
                    Utc::now(),
                )
                .await
@@ -677,25 +631,15 @@ impl<S> Drop for TokenCountingStream<S> {
                            },
                            model,
                            provider: provider.to_string(),
-                            input_token_count: tokens.input as u64,
-                            cache_creation_input_token_count: tokens.input_cache_creation as u64,
-                            cache_read_input_token_count: tokens.input_cache_read as u64,
-                            output_token_count: tokens.output as u64,
+                            input_token_count: input_token_count as u64,
+                            output_token_count: output_token_count as u64,
                            requests_this_minute: usage.requests_this_minute as u64,
                            tokens_this_minute: usage.tokens_this_minute as u64,
                            tokens_this_day: usage.tokens_this_day as u64,
-                            input_tokens_this_month: usage.tokens_this_month.input as u64,
-                            cache_creation_input_tokens_this_month: usage
-                                .tokens_this_month
-                                .input_cache_creation
-                                as u64,
-                            cache_read_input_tokens_this_month: usage
-                                .tokens_this_month
-                                .input_cache_read
-                                as u64,
-                            output_tokens_this_month: usage.tokens_this_month.output as u64,
-                            spending_this_month: usage.spending_this_month.0 as u64,
-                            lifetime_spending: usage.lifetime_spending.0 as u64,
+                            input_tokens_this_month: usage.input_tokens_this_month as u64,
+                            output_tokens_this_month: usage.output_tokens_this_month as u64,
+                            spending_this_month: usage.spending_this_month as u64,
+                            lifetime_spending: usage.lifetime_spending as u64,
                        },
                    )
                    .await
--- a/crates/collab/src/llm/db.rs
+++ b/crates/collab/src/llm/db.rs
@@ -20,7 +20,7 @@ use std::future::Future;
 use std::sync::Arc;

 use anyhow::anyhow;
-pub use queries::usages::{ActiveUserCount, TokenUsage};
+pub use queries::usages::ActiveUserCount;
 use sea_orm::prelude::*;
 pub use sea_orm::ConnectOptions;
 use sea_orm::{
@@ -97,14 +97,6 @@ impl LlmDatabase {
            .ok_or_else(|| anyhow!("unknown model {provider:?}:{name}"))?)
    }

-    pub fn model_by_id(&self, id: ModelId) -> Result<&model::Model> {
-        Ok(self
-            .models
-            .values()
-            .find(|model| model.id == id)
-            .ok_or_else(|| anyhow!("no model for ID {id:?}"))?)
-    }
-
    pub fn options(&self) -> &ConnectOptions {
        &self.options
    }
--- a/crates/collab/src/llm/db/ids.rs
+++ b/crates/collab/src/llm/db/ids.rs
@@ -3,9 +3,8 @@ use serde::{Deserialize, Serialize};

 use crate::id_type;

-id_type!(BillingEventId);
 id_type!(ModelId);
 id_type!(ProviderId);
-id_type!(RevokedAccessTokenId);
 id_type!(UsageId);
 id_type!(UsageMeasureId);
+id_type!(RevokedAccessTokenId);
--- a/crates/collab/src/llm/db/queries.rs
+++ b/crates/collab/src/llm/db/queries.rs
@@ -1,6 +1,5 @@
 use super::*;

-pub mod billing_events;
 pub mod providers;
 pub mod revoked_access_tokens;
 pub mod usages;
--- a/crates/collab/src/llm/db/queries/billing_events.rs
+++ b/crates/collab/src/llm/db/queries/billing_events.rs
@@ -1,31 +0,0 @@
-use super::*;
-use crate::Result;
-use anyhow::Context as _;
-
-impl LlmDatabase {
-    pub async fn get_billing_events(&self) -> Result<Vec<(billing_event::Model, model::Model)>> {
-        self.transaction(|tx| async move {
-            let events_with_models = billing_event::Entity::find()
-                .find_also_related(model::Entity)
-                .all(&*tx)
-                .await?;
-            events_with_models
-                .into_iter()
-                .map(|(event, model)| {
-                    let model =
-                        model.context("could not find model associated with billing event")?;
-                    Ok((event, model))
-                })
-                .collect()
-        })
-        .await
-    }
-
-    pub async fn consume_billing_event(&self, id: BillingEventId) -> Result<()> {
-        self.transaction(|tx| async move {
-            billing_event::Entity::delete_by_id(id).exec(&*tx).await?;
-            Ok(())
-        })
-        .await
-    }
-}
--- a/crates/collab/src/llm/db/queries/usages.rs
+++ b/crates/collab/src/llm/db/queries/usages.rs
@@ -1,6 +1,5 @@
-use crate::llm::Cents;
-use crate::{db::UserId, llm::FREE_TIER_MONTHLY_SPENDING_LIMIT};
-use chrono::{Datelike, Duration};
+use crate::db::UserId;
+use chrono::Duration;
 use futures::StreamExt as _;
 use rpc::LanguageModelProvider;
 use sea_orm::QuerySelect;
@@ -9,28 +8,15 @@ use strum::IntoEnumIterator as _;

 use super::*;

-#[derive(Debug, PartialEq, Clone, Copy, Default)]
-pub struct TokenUsage {
-    pub input: usize,
-    pub input_cache_creation: usize,
-    pub input_cache_read: usize,
-    pub output: usize,
-}
-
-impl TokenUsage {
-    pub fn total(&self) -> usize {
-        self.input + self.input_cache_creation + self.input_cache_read + self.output
-    }
-}
-
 #[derive(Debug, PartialEq, Clone, Copy)]
 pub struct Usage {
    pub requests_this_minute: usize,
    pub tokens_this_minute: usize,
    pub tokens_this_day: usize,
-    pub tokens_this_month: TokenUsage,
-    pub spending_this_month: Cents,
-    pub lifetime_spending: Cents,
+    pub input_tokens_this_month: usize,
+    pub output_tokens_this_month: usize,
+    pub spending_this_month: usize,
+    pub lifetime_spending: usize,
 }

 #[derive(Debug, PartialEq, Clone)]
@@ -152,46 +138,6 @@ impl LlmDatabase {
        .await
    }

-    pub async fn get_user_spending_for_month(
-        &self,
-        user_id: UserId,
-        now: DateTimeUtc,
-    ) -> Result<Cents> {
-        self.transaction(|tx| async move {
-            let month = now.date_naive().month() as i32;
-            let year = now.date_naive().year();
-
-            let mut monthly_usages = monthly_usage::Entity::find()
-                .filter(
-                    monthly_usage::Column::UserId
-                        .eq(user_id)
-                        .and(monthly_usage::Column::Month.eq(month))
-                        .and(monthly_usage::Column::Year.eq(year)),
-                )
-                .stream(&*tx)
-                .await?;
-            let mut monthly_spending = Cents::ZERO;
-
-            while let Some(usage) = monthly_usages.next().await {
-                let usage = usage?;
-                let Ok(model) = self.model_by_id(usage.model_id) else {
-                    continue;
-                };
-
-                monthly_spending += calculate_spending(
-                    model,
-                    usage.input_tokens as usize,
-                    usage.cache_creation_input_tokens as usize,
-                    usage.cache_read_input_tokens as usize,
-                    usage.output_tokens as usize,
-                );
-            }
-
-            Ok(monthly_spending)
-        })
-        .await
-    }
-
    pub async fn get_usage(
        &self,
        user_id: UserId,
@@ -214,26 +160,17 @@ impl LlmDatabase {
                .all(&*tx)
                .await?;

-            let month = now.date_naive().month() as i32;
-            let year = now.date_naive().year();
-            let monthly_usage = monthly_usage::Entity::find()
-                .filter(
-                    monthly_usage::Column::UserId
-                        .eq(user_id)
-                        .and(monthly_usage::Column::ModelId.eq(model.id))
-                        .and(monthly_usage::Column::Month.eq(month))
-                        .and(monthly_usage::Column::Year.eq(year)),
-                )
-                .one(&*tx)
-                .await?;
-            let lifetime_usage = lifetime_usage::Entity::find()
+            let (lifetime_input_tokens, lifetime_output_tokens) = lifetime_usage::Entity::find()
                .filter(
                    lifetime_usage::Column::UserId
                        .eq(user_id)
                        .and(lifetime_usage::Column::ModelId.eq(model.id)),
                )
                .one(&*tx)
-                .await?;
+                .await?
+                .map_or((0, 0), |usage| {
+                    (usage.input_tokens as usize, usage.output_tokens as usize)
+                });

            let requests_this_minute =
                self.get_usage_for_measure(&usages, now, UsageMeasure::RequestsPerMinute)?;
@@ -241,47 +178,21 @@ impl LlmDatabase {
                self.get_usage_for_measure(&usages, now, UsageMeasure::TokensPerMinute)?;
            let tokens_this_day =
                self.get_usage_for_measure(&usages, now, UsageMeasure::TokensPerDay)?;
-            let spending_this_month = if let Some(monthly_usage) = &monthly_usage {
-                calculate_spending(
-                    model,
-                    monthly_usage.input_tokens as usize,
-                    monthly_usage.cache_creation_input_tokens as usize,
-                    monthly_usage.cache_read_input_tokens as usize,
-                    monthly_usage.output_tokens as usize,
-                )
-            } else {
-                Cents::ZERO
-            };
-            let lifetime_spending = if let Some(lifetime_usage) = &lifetime_usage {
-                calculate_spending(
-                    model,
-                    lifetime_usage.input_tokens as usize,
-                    lifetime_usage.cache_creation_input_tokens as usize,
-                    lifetime_usage.cache_read_input_tokens as usize,
-                    lifetime_usage.output_tokens as usize,
-                )
-            } else {
-                Cents::ZERO
-            };
+            let input_tokens_this_month =
+                self.get_usage_for_measure(&usages, now, UsageMeasure::InputTokensPerMonth)?;
+            let output_tokens_this_month =
+                self.get_usage_for_measure(&usages, now, UsageMeasure::OutputTokensPerMonth)?;
+            let spending_this_month =
+                calculate_spending(model, input_tokens_this_month, output_tokens_this_month);
+            let lifetime_spending =
+                calculate_spending(model, lifetime_input_tokens, lifetime_output_tokens);

            Ok(Usage {
                requests_this_minute,
                tokens_this_minute,
                tokens_this_day,
-                tokens_this_month: TokenUsage {
-                    input: monthly_usage
-                        .as_ref()
-                        .map_or(0, |usage| usage.input_tokens as usize),
-                    input_cache_creation: monthly_usage
-                        .as_ref()
-                        .map_or(0, |usage| usage.cache_creation_input_tokens as usize),
-                    input_cache_read: monthly_usage
-                        .as_ref()
-                        .map_or(0, |usage| usage.cache_read_input_tokens as usize),
-                    output: monthly_usage
-                        .as_ref()
-                        .map_or(0, |usage| usage.output_tokens as usize),
-                },
+                input_tokens_this_month,
+                output_tokens_this_month,
                spending_this_month,
                lifetime_spending,
            })
@@ -296,9 +207,8 @@ impl LlmDatabase {
        is_staff: bool,
        provider: LanguageModelProvider,
        model_name: &str,
-        tokens: TokenUsage,
-        has_llm_subscription: bool,
-        max_monthly_spend: Cents,
+        input_token_count: usize,
+        output_token_count: usize,
        now: DateTimeUtc,
    ) -> Result<Usage> {
        self.transaction(|tx| async move {
@@ -333,7 +243,7 @@ impl LlmDatabase {
                    &usages,
                    UsageMeasure::TokensPerMinute,
                    now,
-                    tokens.total(),
+                    input_token_count + output_token_count,
                    &tx,
                )
                .await?;
@@ -345,90 +255,36 @@ impl LlmDatabase {
                    &usages,
                    UsageMeasure::TokensPerDay,
                    now,
-                    tokens.total(),
+                    input_token_count + output_token_count,
                    &tx,
                )
                .await?;
-
-            let month = now.date_naive().month() as i32;
-            let year = now.date_naive().year();
-
-            // Update monthly usage
-            let monthly_usage = monthly_usage::Entity::find()
-                .filter(
-                    monthly_usage::Column::UserId
-                        .eq(user_id)
-                        .and(monthly_usage::Column::ModelId.eq(model.id))
-                        .and(monthly_usage::Column::Month.eq(month))
-                        .and(monthly_usage::Column::Year.eq(year)),
+            let input_tokens_this_month = self
+                .update_usage_for_measure(
+                    user_id,
+                    is_staff,
+                    model.id,
+                    &usages,
+                    UsageMeasure::InputTokensPerMonth,
+                    now,
+                    input_token_count,
+                    &tx,
                )
-                .one(&*tx)
                .await?;
-
-            let monthly_usage = match monthly_usage {
-                Some(usage) => {
-                    monthly_usage::Entity::update(monthly_usage::ActiveModel {
-                        id: ActiveValue::unchanged(usage.id),
-                        input_tokens: ActiveValue::set(usage.input_tokens + tokens.input as i64),
-                        cache_creation_input_tokens: ActiveValue::set(
-                            usage.cache_creation_input_tokens + tokens.input_cache_creation as i64,
-                        ),
-                        cache_read_input_tokens: ActiveValue::set(
-                            usage.cache_read_input_tokens + tokens.input_cache_read as i64,
-                        ),
-                        output_tokens: ActiveValue::set(usage.output_tokens + tokens.output as i64),
-                        ..Default::default()
-                    })
-                    .exec(&*tx)
-                    .await?
-                }
-                None => {
-                    monthly_usage::ActiveModel {
-                        user_id: ActiveValue::set(user_id),
-                        model_id: ActiveValue::set(model.id),
-                        month: ActiveValue::set(month),
-                        year: ActiveValue::set(year),
-                        input_tokens: ActiveValue::set(tokens.input as i64),
-                        cache_creation_input_tokens: ActiveValue::set(
-                            tokens.input_cache_creation as i64,
-                        ),
-                        cache_read_input_tokens: ActiveValue::set(tokens.input_cache_read as i64),
-                        output_tokens: ActiveValue::set(tokens.output as i64),
-                        ..Default::default()
-                    }
-                    .insert(&*tx)
-                    .await?
-                }
-            };
-
-            let spending_this_month = calculate_spending(
-                model,
-                monthly_usage.input_tokens as usize,
-                monthly_usage.cache_creation_input_tokens as usize,
-                monthly_usage.cache_read_input_tokens as usize,
-                monthly_usage.output_tokens as usize,
-            );
-
-            if !is_staff
-                && spending_this_month > FREE_TIER_MONTHLY_SPENDING_LIMIT
-                && has_llm_subscription
-                && spending_this_month <= max_monthly_spend
-            {
-                billing_event::ActiveModel {
-                    id: ActiveValue::not_set(),
-                    idempotency_key: ActiveValue::not_set(),
-                    user_id: ActiveValue::set(user_id),
-                    model_id: ActiveValue::set(model.id),
-                    input_tokens: ActiveValue::set(tokens.input as i64),
-                    input_cache_creation_tokens: ActiveValue::set(
-                        tokens.input_cache_creation as i64,
-                    ),
-                    input_cache_read_tokens: ActiveValue::set(tokens.input_cache_read as i64),
-                    output_tokens: ActiveValue::set(tokens.output as i64),
-                }
-                .insert(&*tx)
+            let output_tokens_this_month = self
+                .update_usage_for_measure(
+                    user_id,
+                    is_staff,
+                    model.id,
+                    &usages,
+                    UsageMeasure::OutputTokensPerMonth,
+                    now,
+                    output_token_count,
+                    &tx,
+                )
                .await?;
-            }
+            let spending_this_month =
+                calculate_spending(model, input_tokens_this_month, output_tokens_this_month);

            // Update lifetime usage
            let lifetime_usage = lifetime_usage::Entity::find()
@@ -444,14 +300,12 @@ impl LlmDatabase {
                Some(usage) => {
                    lifetime_usage::Entity::update(lifetime_usage::ActiveModel {
                        id: ActiveValue::unchanged(usage.id),
-                        input_tokens: ActiveValue::set(usage.input_tokens + tokens.input as i64),
-                        cache_creation_input_tokens: ActiveValue::set(
-                            usage.cache_creation_input_tokens + tokens.input_cache_creation as i64,
+                        input_tokens: ActiveValue::set(
+                            usage.input_tokens + input_token_count as i64,
                        ),
-                        cache_read_input_tokens: ActiveValue::set(
-                            usage.cache_read_input_tokens + tokens.input_cache_read as i64,
+                        output_tokens: ActiveValue::set(
+                            usage.output_tokens + output_token_count as i64,
                        ),
-                        output_tokens: ActiveValue::set(usage.output_tokens + tokens.output as i64),
                        ..Default::default()
                    })
                    .exec(&*tx)
@@ -461,12 +315,8 @@ impl LlmDatabase {
                    lifetime_usage::ActiveModel {
                        user_id: ActiveValue::set(user_id),
                        model_id: ActiveValue::set(model.id),
-                        input_tokens: ActiveValue::set(tokens.input as i64),
-                        cache_creation_input_tokens: ActiveValue::set(
-                            tokens.input_cache_creation as i64,
-                        ),
-                        cache_read_input_tokens: ActiveValue::set(tokens.input_cache_read as i64),
-                        output_tokens: ActiveValue::set(tokens.output as i64),
+                        input_tokens: ActiveValue::set(input_token_count as i64),
+                        output_tokens: ActiveValue::set(output_token_count as i64),
                        ..Default::default()
                    }
                    .insert(&*tx)
@@ -477,8 +327,6 @@ impl LlmDatabase {
            let lifetime_spending = calculate_spending(
                model,
                lifetime_usage.input_tokens as usize,
-                lifetime_usage.cache_creation_input_tokens as usize,
-                lifetime_usage.cache_read_input_tokens as usize,
                lifetime_usage.output_tokens as usize,
            );

@@ -486,12 +334,8 @@ impl LlmDatabase {
                requests_this_minute,
                tokens_this_minute,
                tokens_this_day,
-                tokens_this_month: TokenUsage {
-                    input: monthly_usage.input_tokens as usize,
-                    input_cache_creation: monthly_usage.cache_creation_input_tokens as usize,
-                    input_cache_read: monthly_usage.cache_read_input_tokens as usize,
-                    output: monthly_usage.output_tokens as usize,
-                },
+                input_tokens_this_month,
+                output_tokens_this_month,
                spending_this_month,
                lifetime_spending,
            })
@@ -657,29 +501,18 @@ impl LlmDatabase {
 fn calculate_spending(
    model: &model::Model,
    input_tokens_this_month: usize,
-    cache_creation_input_tokens_this_month: usize,
-    cache_read_input_tokens_this_month: usize,
    output_tokens_this_month: usize,
-) -> Cents {
+) -> usize {
    let input_token_cost =
        input_tokens_this_month * model.price_per_million_input_tokens as usize / 1_000_000;
-    let cache_creation_input_token_cost = cache_creation_input_tokens_this_month
-        * model.price_per_million_cache_creation_input_tokens as usize
-        / 1_000_000;
-    let cache_read_input_token_cost = cache_read_input_tokens_this_month
-        * model.price_per_million_cache_read_input_tokens as usize
-        / 1_000_000;
    let output_token_cost =
        output_tokens_this_month * model.price_per_million_output_tokens as usize / 1_000_000;
-    let spending = input_token_cost
-        + cache_creation_input_token_cost
-        + cache_read_input_token_cost
-        + output_token_cost;
-    Cents::new(spending as u32)
+    input_token_cost + output_token_cost
 }

 const MINUTE_BUCKET_COUNT: usize = 12;
 const DAY_BUCKET_COUNT: usize = 48;
+const MONTH_BUCKET_COUNT: usize = 30;

 impl UsageMeasure {
    fn bucket_count(&self) -> usize {
@@ -687,6 +520,8 @@ impl UsageMeasure {
            UsageMeasure::RequestsPerMinute => MINUTE_BUCKET_COUNT,
            UsageMeasure::TokensPerMinute => MINUTE_BUCKET_COUNT,
            UsageMeasure::TokensPerDay => DAY_BUCKET_COUNT,
+            UsageMeasure::InputTokensPerMonth => MONTH_BUCKET_COUNT,
+            UsageMeasure::OutputTokensPerMonth => MONTH_BUCKET_COUNT,
        }
    }

@@ -695,6 +530,8 @@ impl UsageMeasure {
            UsageMeasure::RequestsPerMinute => Duration::minutes(1),
            UsageMeasure::TokensPerMinute => Duration::minutes(1),
            UsageMeasure::TokensPerDay => Duration::hours(24),
+            UsageMeasure::InputTokensPerMonth => Duration::days(30),
+            UsageMeasure::OutputTokensPerMonth => Duration::days(30),
        }
    }

--- a/crates/collab/src/llm/db/tables.rs
+++ b/crates/collab/src/llm/db/tables.rs
@@ -1,7 +1,5 @@
-pub mod billing_event;
 pub mod lifetime_usage;
 pub mod model;
-pub mod monthly_usage;
 pub mod provider;
 pub mod revoked_access_token;
 pub mod usage;
--- a/crates/collab/src/llm/db/tables/billing_event.rs
+++ b/crates/collab/src/llm/db/tables/billing_event.rs
@@ -1,37 +0,0 @@
-use crate::{
-    db::UserId,
-    llm::db::{BillingEventId, ModelId},
-};
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
-#[sea_orm(table_name = "billing_events")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: BillingEventId,
-    pub idempotency_key: Uuid,
-    pub user_id: UserId,
-    pub model_id: ModelId,
-    pub input_tokens: i64,
-    pub input_cache_creation_tokens: i64,
-    pub input_cache_read_tokens: i64,
-    pub output_tokens: i64,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::model::Entity",
-        from = "Column::ModelId",
-        to = "super::model::Column::Id"
-    )]
-    Model,
-}
-
-impl Related<super::model::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Model.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
--- a/crates/collab/src/llm/db/tables/lifetime_usage.rs
+++ b/crates/collab/src/llm/db/tables/lifetime_usage.rs
@@ -9,8 +9,6 @@ pub struct Model {
    pub user_id: UserId,
    pub model_id: ModelId,
    pub input_tokens: i64,
-    pub cache_creation_input_tokens: i64,
-    pub cache_read_input_tokens: i64,
    pub output_tokens: i64,
 }

--- a/crates/collab/src/llm/db/tables/model.rs
+++ b/crates/collab/src/llm/db/tables/model.rs
@@ -14,8 +14,6 @@ pub struct Model {
    pub max_tokens_per_minute: i64,
    pub max_tokens_per_day: i64,
    pub price_per_million_input_tokens: i32,
-    pub price_per_million_cache_creation_input_tokens: i32,
-    pub price_per_million_cache_read_input_tokens: i32,
    pub price_per_million_output_tokens: i32,
 }

@@ -29,8 +27,6 @@ pub enum Relation {
    Provider,
    #[sea_orm(has_many = "super::usage::Entity")]
    Usages,
-    #[sea_orm(has_many = "super::billing_event::Entity")]
-    BillingEvents,
 }

 impl Related<super::provider::Entity> for Entity {
@@ -45,10 +41,4 @@ impl Related<super::usage::Entity> for Entity {
    }
 }

-impl Related<super::billing_event::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::BillingEvents.def()
-    }
-}
-
 impl ActiveModelBehavior for ActiveModel {}
--- a/crates/collab/src/llm/db/tables/monthly_usage.rs
+++ b/crates/collab/src/llm/db/tables/monthly_usage.rs
@@ -1,22 +0,0 @@
-use crate::{db::UserId, llm::db::ModelId};
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
-#[sea_orm(table_name = "monthly_usages")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: i32,
-    pub user_id: UserId,
-    pub model_id: ModelId,
-    pub month: i32,
-    pub year: i32,
-    pub input_tokens: i64,
-    pub cache_creation_input_tokens: i64,
-    pub cache_read_input_tokens: i64,
-    pub output_tokens: i64,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {}
-
-impl ActiveModelBehavior for ActiveModel {}
--- a/crates/collab/src/llm/db/tables/usage_measure.rs
+++ b/crates/collab/src/llm/db/tables/usage_measure.rs
@@ -9,6 +9,8 @@ pub enum UsageMeasure {
    RequestsPerMinute,
    TokensPerMinute,
    TokensPerDay,
+    InputTokensPerMonth,
+    OutputTokensPerMonth,
 }

 #[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
--- a/crates/collab/src/llm/db/tests.rs
+++ b/crates/collab/src/llm/db/tests.rs
@@ -1,4 +1,3 @@
-mod billing_tests;
 mod provider_tests;
 mod usage_tests;

--- a/crates/collab/src/llm/db/tests/billing_tests.rs
+++ b/crates/collab/src/llm/db/tests/billing_tests.rs
@@ -1,158 +0,0 @@
-use crate::{
-    db::UserId,
-    llm::{
-        db::{
-            queries::{providers::ModelParams, usages::Usage},
-            LlmDatabase, TokenUsage,
-        },
-        FREE_TIER_MONTHLY_SPENDING_LIMIT,
-    },
-    test_llm_db, Cents,
-};
-use chrono::{DateTime, Utc};
-use pretty_assertions::assert_eq;
-use rpc::LanguageModelProvider;
-
-test_llm_db!(
-    test_billing_limit_exceeded,
-    test_billing_limit_exceeded_postgres
-);
-
-async fn test_billing_limit_exceeded(db: &mut LlmDatabase) {
-    let provider = LanguageModelProvider::Anthropic;
-    let model = "fake-claude-limerick";
-    const PRICE_PER_MILLION_INPUT_TOKENS: i32 = 5;
-    const PRICE_PER_MILLION_OUTPUT_TOKENS: i32 = 5;
-
-    // Initialize the database and insert the model
-    db.initialize().await.unwrap();
-    db.insert_models(&[ModelParams {
-        provider,
-        name: model.to_string(),
-        max_requests_per_minute: 5,
-        max_tokens_per_minute: 10_000,
-        max_tokens_per_day: 50_000,
-        price_per_million_input_tokens: PRICE_PER_MILLION_INPUT_TOKENS,
-        price_per_million_output_tokens: PRICE_PER_MILLION_OUTPUT_TOKENS,
-    }])
-    .await
-    .unwrap();
-
-    // Set a fixed datetime for consistent testing
-    let now = DateTime::parse_from_rfc3339("2024-08-08T22:46:33Z")
-        .unwrap()
-        .with_timezone(&Utc);
-
-    let user_id = UserId::from_proto(123);
-
-    let max_monthly_spend = Cents::from_dollars(11);
-
-    // Record usage that brings us close to the limit but doesn't exceed it
-    // Let's say we use $10.50 worth of tokens
-    let tokens_to_use = 210_000_000; // This will cost $10.50 at $0.05 per 1 million tokens
-    let usage = TokenUsage {
-        input: tokens_to_use,
-        input_cache_creation: 0,
-        input_cache_read: 0,
-        output: 0,
-    };
-
-    // Verify that before we record any usage, there are 0 billing events
-    let billing_events = db.get_billing_events().await.unwrap();
-    assert_eq!(billing_events.len(), 0);
-
-    db.record_usage(
-        user_id,
-        false,
-        provider,
-        model,
-        usage,
-        true,
-        max_monthly_spend,
-        now,
-    )
-    .await
-    .unwrap();
-
-    // Verify the recorded usage and spending
-    let recorded_usage = db.get_usage(user_id, provider, model, now).await.unwrap();
-
-    // Verify that we exceeded the free tier usage
-    assert!(
-        recorded_usage.spending_this_month > FREE_TIER_MONTHLY_SPENDING_LIMIT,
-        "Expected spending to exceed free tier limit"
-    );
-
-    assert_eq!(
-        recorded_usage,
-        Usage {
-            requests_this_minute: 1,
-            tokens_this_minute: tokens_to_use,
-            tokens_this_day: tokens_to_use,
-            tokens_this_month: TokenUsage {
-                input: tokens_to_use,
-                input_cache_creation: 0,
-                input_cache_read: 0,
-                output: 0,
-            },
-            spending_this_month: Cents::new(1050),
-            lifetime_spending: Cents::new(1050),
-        }
-    );
-
-    // Verify that there is one `billing_event` record
-    let billing_events = db.get_billing_events().await.unwrap();
-    assert_eq!(billing_events.len(), 1);
-
-    let (billing_event, _model) = &billing_events[0];
-    assert_eq!(billing_event.user_id, user_id);
-    assert_eq!(billing_event.input_tokens, tokens_to_use as i64);
-    assert_eq!(billing_event.input_cache_creation_tokens, 0);
-    assert_eq!(billing_event.input_cache_read_tokens, 0);
-    assert_eq!(billing_event.output_tokens, 0);
-
-    let tokens_to_exceed = 20_000_000; // This will cost $1.00 more, pushing us from $10.50 to $11.50, which is over the $11 monthly maximum limit
-    let usage_exceeding = TokenUsage {
-        input: tokens_to_exceed,
-        input_cache_creation: 0,
-        input_cache_read: 0,
-        output: 0,
-    };
-
-    // This should still create a billing event as it's the first request that exceeds the limit
-    db.record_usage(
-        user_id,
-        false,
-        provider,
-        model,
-        usage_exceeding,
-        true,
-        max_monthly_spend,
-        now,
-    )
-    .await
-    .unwrap();
-
-    // Verify that there is still one billing record
-    let billing_events = db.get_billing_events().await.unwrap();
-    assert_eq!(billing_events.len(), 1);
-
-    // Verify the updated usage and spending
-    let updated_usage = db.get_usage(user_id, provider, model, now).await.unwrap();
-    assert_eq!(
-        updated_usage,
-        Usage {
-            requests_this_minute: 2,
-            tokens_this_minute: tokens_to_use + tokens_to_exceed,
-            tokens_this_day: tokens_to_use + tokens_to_exceed,
-            tokens_this_month: TokenUsage {
-                input: tokens_to_use + tokens_to_exceed,
-                input_cache_creation: 0,
-                input_cache_read: 0,
-                output: 0,
-            },
-            spending_this_month: Cents::new(1150),
-            lifetime_spending: Cents::new(1150),
-        }
-    );
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Peter Tripp	3efbd3afa6	Maybe GITHUB_BASE_REF?	2024-09-30 22:57:03 -04:00
Peter Tripp	2e36aaf14b	Renamed config option.	2024-09-30 22:06:48 -04:00
Peter Tripp	7b0a239db7	Disable linting.	2024-09-30 21:54:28 -04:00
Peter Tripp	375537b520	Merge branch 'main' into buf_action	2024-09-30 21:50:48 -04:00
Peter Tripp	fd47471ba6	Reformat proto.	2024-09-30 21:50:09 -04:00
Peter Tripp	4aad214eae	Rewind a bit on the buf version.	2024-09-18 17:26:44 -04:00
Peter Tripp	2d62e50023	Apply buf format	2024-09-18 17:21:40 -04:00
Peter Tripp	c772f87b99	No v maybe?	2024-09-18 17:07:02 -04:00
Peter Tripp	4783fe176d	Bump buf-action to newest (v1.41.0) as buf-action requires buf >= v1.35.0	2024-09-18 16:51:41 -04:00
Peter Tripp	39c92bc9ee	Update .github/workflows/ci.yml Co-authored-by: Marshall Bowers <elliott.codes@gmail.com>	2024-09-18 16:37:05 -04:00
Peter Tripp	3bedf2b30c	ci: Switch Proto-buf checks to non-deprecated bufbuild/buf-action. - bufbuild/buf-setup-action [has been deprecated](`3de295e042`) since 2024-08-01.	2024-09-18 16:34:44 -04:00
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-trash"><path d="M3 6h18"/><path d="M19 6v14c0 1-1 2-2 2H7c-1 0-2-1-2-2V6"/><path d="M8 6V4c0-1 1-2 2-2h4c1 0 2 1 2 2v2"/></svg>`
				`@@ -1 +0,0 @@`
				`ALTER TABLE "worktree_settings_files" ADD COLUMN "kind" VARCHAR;`