From 3b66f9076e56318993b2ad158f339e7ce14244de Mon Sep 17 00:00:00 2001
From: Neel <neel@zed.dev>
Date: Fri, 27 Mar 2026 10:26:52 +0000
Subject: [PATCH] client: Persist last used organization (#52505)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Context

Persists last used organization through restart. Opted to do this via
`kvp` instead of `settings.json` since the value could change often, and
we would have to persist an ID rather than a friendly name.

Closes CLO-568.

## How to Review

<!-- Help reviewers focus their attention:
- For small PRs: note what to focus on (e.g., "error handling in
foo.rs")
- For large PRs (>400 LOC): provide a guided tour — numbered list of
files/commits to read in order. (The `large-pr` label is applied
automatically.)
     - See the review process guidelines for comment conventions -->

## Self-Review Checklist

<!-- Check before requesting review: -->
- [ ] I've reviewed my own diff for quality, security, and reliability
- [ ] Unsafe blocks (if any) have justifying comments
- [ ] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [ ] Tests cover the new/changed behavior
- [ ] Performance impact has been considered and is acceptable

Release Notes:

- N/A
---
 Cargo.lock                |  1 +
 crates/client/Cargo.toml  |  1 +
 crates/client/src/user.rs | 33 +++++++++++++++++++++++++++++----
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dd421f8059245978ce45c0821c38e6105532b22b..d24b5173abb50429a36c8be32af3b688b47e6b88 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2972,6 +2972,7 @@ dependencies = [
  "cloud_llm_client",
  "collections",
  "credentials_provider",
+ "db",
  "derive_more",
  "feature_flags",
  "fs",
diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml
index d9ef55056049e387d931bc9fe59e0327b4ce1637..1edbb3399e4332e2ebd23f812c66697bda72d587 100644
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -25,6 +25,7 @@ cloud_api_client.workspace = true
 cloud_llm_client.workspace = true
 collections.workspace = true
 credentials_provider.workspace = true
+db.workspace = true
 derive_more.workspace = true
 feature_flags.workspace = true
 fs.workspace = true
diff --git a/crates/client/src/user.rs b/crates/client/src/user.rs
index df0c00d86636b6b4a138161a151e20a1c50a688d..e9b9acf68573ef5a05d642c09ed96a4d8aa23580 100644
--- a/crates/client/src/user.rs
+++ b/crates/client/src/user.rs
@@ -9,6 +9,7 @@ use cloud_llm_client::{
     EDIT_PREDICTIONS_USAGE_AMOUNT_HEADER_NAME, EDIT_PREDICTIONS_USAGE_LIMIT_HEADER_NAME, UsageLimit,
 };
 use collections::{HashMap, HashSet, hash_map::Entry};
+use db::kvp::KeyValueStore;
 use derive_more::Deref;
 use feature_flags::FeatureFlagAppExt;
 use futures::{Future, StreamExt, channel::mpsc};
@@ -25,6 +26,8 @@ use std::{
 use text::ReplicaId;
 use util::{ResultExt, TryFutureExt as _};
 
+const CURRENT_ORGANIZATION_ID_KEY: &str = "current_organization_id";
+
 pub type UserId = u64;
 
 #[derive(
@@ -706,9 +709,16 @@ impl UserStore {
             .is_some_and(|current| current.id == organization.id);
 
         if !is_same_organization {
+            let organization_id = organization.id.0.to_string();
             self.current_organization.replace(organization);
             cx.emit(Event::OrganizationChanged);
             cx.notify();
+
+            let kvp = KeyValueStore::global(cx);
+            db::write_and_log(cx, move || async move {
+                kvp.write_kvp(CURRENT_ORGANIZATION_ID_KEY.into(), organization_id)
+                    .await
+            });
         }
     }
 
@@ -816,14 +826,29 @@ impl UserStore {
         }
 
         self.organizations = response.organizations.into_iter().map(Arc::new).collect();
-        self.current_organization = response
-            .default_organization_id
-            .and_then(|default_organization_id| {
+        let persisted_org_id = KeyValueStore::global(cx)
+            .read_kvp(CURRENT_ORGANIZATION_ID_KEY)
+            .log_err()
+            .flatten()
+            .map(|id| OrganizationId(Arc::from(id)));
+
+        self.current_organization = persisted_org_id
+            .and_then(|persisted_id| {
                 self.organizations
                     .iter()
-                    .find(|organization| organization.id == default_organization_id)
+                    .find(|org| org.id == persisted_id)
                     .cloned()
             })
+            .or_else(|| {
+                response
+                    .default_organization_id
+                    .and_then(|default_organization_id| {
+                        self.organizations
+                            .iter()
+                            .find(|organization| organization.id == default_organization_id)
+                            .cloned()
+                    })
+            })
             .or_else(|| self.organizations.first().cloned());
         self.plans_by_organization = response
             .plans_by_organization