diff --git a/.config/hakari.toml b/.config/hakari.toml
index 57bb73cf54aeb14be5a594cdf61c836dd7c74f46..1e8386a14115be2e36b287ace0d47d464df9e620 100644
--- a/.config/hakari.toml
+++ b/.config/hakari.toml
@@ -24,7 +24,7 @@ workspace-members = [
 third-party = [
     { name = "reqwest", version = "0.11.27" },
     # build of remote_server should not include scap / its x11 dependency
-    { name = "scap", git = "https://github.com/zed-industries/scap", rev = "808aa5c45b41e8f44729d02e38fd00a2fe2722e7" },
+    { name = "zed-scap", git = "https://github.com/zed-industries/scap", rev = "4afea48c3b002197176fb19cd0f9b180dd36eaac", version = "0.0.8-zed" },
     # build of remote_server should not need to include on libalsa through rodio
     { name = "rodio", git = "https://github.com/RustAudio/rodio" },
 ]
diff --git a/Cargo.lock b/Cargo.lock
index 547ef3e57e87638d91ac85116cb12be369a95139..456b292df8a97fb657144e83144b65c945c4dedf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11,7 +11,6 @@ dependencies = [
  "agent_settings",
  "anyhow",
  "buffer_diff",
- "collections",
  "editor",
  "env_logger 0.11.8",
  "file_icons",
@@ -36,10 +35,11 @@ dependencies = [
  "terminal",
  "ui",
  "url",
- "util",
  "uuid",
  "watch",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
 ]
 
 [[package]]
@@ -47,7 +47,6 @@ name = "acp_tools"
 version = "0.1.0"
 dependencies = [
  "agent-client-protocol",
- "collections",
  "gpui",
  "language",
  "markdown",
@@ -57,9 +56,10 @@ dependencies = [
  "settings",
  "theme",
  "ui",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
 ]
 
 [[package]]
@@ -69,7 +69,6 @@ dependencies = [
  "anyhow",
  "buffer_diff",
  "clock",
- "collections",
  "ctor",
  "futures 0.3.31",
  "gpui",
@@ -82,9 +81,10 @@ dependencies = [
  "serde_json",
  "settings",
  "text",
- "util",
  "watch",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
  "zlog",
 ]
 
@@ -104,9 +104,9 @@ dependencies = [
  "release_channel",
  "smallvec",
  "ui",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-util",
 ]
 
 [[package]]
@@ -149,7 +149,6 @@ dependencies = [
  "chrono",
  "client",
  "cloud_llm_client",
- "collections",
  "component",
  "context_server",
  "convert_case 0.8.0",
@@ -158,7 +157,6 @@ dependencies = [
  "git",
  "gpui",
  "heed",
- "http_client",
  "icons",
  "indoc",
  "itertools 0.14.0",
@@ -185,10 +183,12 @@ dependencies = [
  "theme",
  "thiserror 2.0.12",
  "time",
- "util",
  "uuid",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-http-client",
+ "zed-util",
  "zed_env_vars",
  "zstd",
 ]
@@ -228,7 +228,6 @@ dependencies = [
  "client",
  "clock",
  "cloud_llm_client",
- "collections",
  "context_server",
  "ctor",
  "db",
@@ -241,7 +240,6 @@ dependencies = [
  "gpui_tokio",
  "handlebars 4.5.0",
  "html_to_markdown",
- "http_client",
  "indoc",
  "itertools 0.14.0",
  "language",
@@ -273,12 +271,14 @@ dependencies = [
  "tree-sitter-rust",
  "ui",
  "unindent",
- "util",
  "uuid",
  "watch",
  "web_search",
  "workspace-hack",
  "worktree",
+ "zed-collections",
+ "zed-http-client",
+ "zed-util",
  "zed_env_vars",
  "zlog",
  "zstd",
@@ -296,13 +296,11 @@ dependencies = [
  "anyhow",
  "async-trait",
  "client",
- "collections",
  "env_logger 0.11.8",
  "fs",
  "futures 0.3.31",
  "gpui",
  "gpui_tokio",
- "http_client",
  "indoc",
  "language",
  "language_model",
@@ -321,10 +319,12 @@ dependencies = [
  "terminal",
  "thiserror 2.0.12",
  "ui",
- "util",
  "uuid",
  "watch",
  "workspace-hack",
+ "zed-collections",
+ "zed-http-client",
+ "zed-util",
 ]
 
 [[package]]
@@ -333,7 +333,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "cloud_llm_client",
- "collections",
  "convert_case 0.8.0",
  "fs",
  "gpui",
@@ -345,8 +344,9 @@ dependencies = [
  "serde_json",
  "serde_json_lenient",
  "settings",
- "util",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
 ]
 
 [[package]]
@@ -373,7 +373,6 @@ dependencies = [
  "chrono",
  "client",
  "cloud_llm_client",
- "collections",
  "command_palette_hooks",
  "component",
  "context_server",
@@ -388,7 +387,6 @@ dependencies = [
  "fuzzy",
  "gpui",
  "html_to_markdown",
- "http_client",
  "indoc",
  "itertools 0.14.0",
  "jsonschema",
@@ -438,10 +436,12 @@ dependencies = [
  "unindent",
  "url",
  "urlencoding",
- "util",
  "watch",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-http-client",
+ "zed-util",
  "zed_actions",
 ]
 
@@ -659,7 +659,6 @@ dependencies = [
  "anyhow",
  "chrono",
  "futures 0.3.31",
- "http_client",
  "schemars 1.0.1",
  "serde",
  "serde_json",
@@ -667,6 +666,7 @@ dependencies = [
  "strum 0.27.1",
  "thiserror 2.0.12",
  "workspace-hack",
+ "zed-http-client",
 ]
 
 [[package]]
@@ -810,9 +810,9 @@ dependencies = [
  "proto",
  "smol",
  "tempfile",
- "util",
  "windows 0.61.1",
  "workspace-hack",
+ "zed-util",
  "zeroize",
 ]
 
@@ -838,7 +838,6 @@ dependencies = [
  "client",
  "clock",
  "cloud_llm_client",
- "collections",
  "context_server",
  "fs",
  "futures 0.3.31",
@@ -867,10 +866,11 @@ dependencies = [
  "text",
  "ui",
  "unindent",
- "util",
  "uuid",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
  "zed_env_vars",
 ]
 
@@ -880,7 +880,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "collections",
  "derive_more",
  "extension",
  "futures 0.3.31",
@@ -892,9 +891,10 @@ dependencies = [
  "serde",
  "serde_json",
  "ui",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
 ]
 
 [[package]]
@@ -904,7 +904,6 @@ dependencies = [
  "anyhow",
  "assistant_slash_command",
  "chrono",
- "collections",
  "context_server",
  "editor",
  "feature_flags",
@@ -914,7 +913,6 @@ dependencies = [
  "globset",
  "gpui",
  "html_to_markdown",
- "http_client",
  "language",
  "pretty_assertions",
  "project",
@@ -926,10 +924,12 @@ dependencies = [
  "smol",
  "text",
  "ui",
- "util",
  "workspace",
  "workspace-hack",
  "worktree",
+ "zed-collections",
+ "zed-http-client",
+ "zed-util",
  "zlog",
 ]
 
@@ -941,7 +941,6 @@ dependencies = [
  "anyhow",
  "buffer_diff",
  "clock",
- "collections",
  "ctor",
  "derive_more",
  "gpui",
@@ -959,9 +958,10 @@ dependencies = [
  "serde_json",
  "settings",
  "text",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
  "zlog",
 ]
 
@@ -978,7 +978,6 @@ dependencies = [
  "client",
  "clock",
  "cloud_llm_client",
- "collections",
  "component",
  "derive_more",
  "diffy",
@@ -990,7 +989,6 @@ dependencies = [
  "gpui_tokio",
  "handlebars 4.5.0",
  "html_to_markdown",
- "http_client",
  "indoc",
  "itertools 0.14.0",
  "language",
@@ -1025,11 +1023,13 @@ dependencies = [
  "tree-sitter-rust",
  "ui",
  "unindent",
- "util",
  "watch",
  "web_search",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-http-client",
+ "zed-util",
  "zlog",
 ]
 
@@ -1404,7 +1404,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-tar",
- "collections",
  "crossbeam",
  "denoise",
  "gpui",
@@ -1416,8 +1415,9 @@ dependencies = [
  "settings",
  "smol",
  "thiserror 2.0.12",
- "util",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
 ]
 
 [[package]]
@@ -1440,7 +1440,6 @@ dependencies = [
  "client",
  "db",
  "gpui",
- "http_client",
  "log",
  "paths",
  "release_channel",
@@ -1452,6 +1451,7 @@ dependencies = [
  "which 6.0.3",
  "workspace",
  "workspace-hack",
+ "zed-http-client",
 ]
 
 [[package]]
@@ -1475,15 +1475,15 @@ dependencies = [
  "client",
  "editor",
  "gpui",
- "http_client",
  "markdown_preview",
  "release_channel",
  "serde",
  "serde_json",
  "smol",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-http-client",
+ "zed-util",
 ]
 
 [[package]]
@@ -2010,8 +2010,8 @@ version = "0.1.0"
 dependencies = [
  "aws-smithy-runtime-api",
  "aws-smithy-types",
- "http_client",
  "workspace-hack",
+ "zed-http-client",
 ]
 
 [[package]]
@@ -2481,11 +2481,11 @@ dependencies = [
  "rand 0.9.1",
  "rope",
  "serde_json",
- "sum_tree",
  "text",
  "unindent",
- "util",
  "workspace-hack",
+ "zed-sum-tree",
+ "zed-util",
  "zlog",
 ]
 
@@ -2623,13 +2623,11 @@ dependencies = [
  "anyhow",
  "audio",
  "client",
- "collections",
  "feature_flags",
  "fs",
  "futures 0.3.31",
  "gpui",
  "gpui_tokio",
- "http_client",
  "language",
  "livekit_client",
  "log",
@@ -2638,8 +2636,10 @@ dependencies = [
  "serde",
  "settings",
  "telemetry",
- "util",
  "workspace-hack",
+ "zed-collections",
+ "zed-http-client",
+ "zed-util",
 ]
 
 [[package]]
@@ -2938,10 +2938,8 @@ dependencies = [
  "anyhow",
  "client",
  "clock",
- "collections",
  "futures 0.3.31",
  "gpui",
- "http_client",
  "language",
  "log",
  "postage",
@@ -2950,8 +2948,10 @@ dependencies = [
  "settings",
  "text",
  "time",
- "util",
  "workspace-hack",
+ "zed-collections",
+ "zed-http-client",
+ "zed-util",
 ]
 
 [[package]]
@@ -3087,7 +3087,6 @@ dependencies = [
  "anyhow",
  "askpass",
  "clap",
- "collections",
  "core-foundation 0.10.0",
  "core-services",
  "exec",
@@ -3099,9 +3098,10 @@ dependencies = [
  "release_channel",
  "serde",
  "tempfile",
- "util",
  "windows 0.61.1",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
 ]
 
 [[package]]
@@ -3115,7 +3115,6 @@ dependencies = [
  "clock",
  "cloud_api_client",
  "cloud_llm_client",
- "collections",
  "credentials_provider",
  "derive_more",
  "feature_flags",
@@ -3123,7 +3122,6 @@ dependencies = [
  "futures 0.3.31",
  "gpui",
  "gpui_tokio",
- "http_client",
  "http_client_tls",
  "httparse",
  "log",
@@ -3153,10 +3151,12 @@ dependencies = [
  "tokio-rustls 0.26.2",
  "tokio-socks",
  "url",
- "util",
  "windows 0.61.1",
  "workspace-hack",
  "worktree",
+ "zed-collections",
+ "zed-http-client",
+ "zed-util",
 ]
 
 [[package]]
@@ -3178,11 +3178,11 @@ dependencies = [
  "futures 0.3.31",
  "gpui",
  "gpui_tokio",
- "http_client",
  "parking_lot",
  "serde_json",
  "workspace-hack",
  "yawc",
+ "zed-http-client",
 ]
 
 [[package]]
@@ -3337,7 +3337,6 @@ dependencies = [
  "client",
  "clock",
  "collab_ui",
- "collections",
  "command_palette_hooks",
  "context_server",
  "ctor",
@@ -3358,7 +3357,6 @@ dependencies = [
  "gpui",
  "gpui_tokio",
  "hex",
- "http_client",
  "hyper 0.14.32",
  "indoc",
  "language",
@@ -3388,7 +3386,6 @@ dependencies = [
  "rpc",
  "scrypt",
  "sea-orm",
- "semantic_version",
  "semver",
  "serde",
  "serde_json",
@@ -3412,11 +3409,14 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "unindent",
- "util",
  "uuid",
  "workspace",
  "workspace-hack",
  "worktree",
+ "zed-collections",
+ "zed-http-client",
+ "zed-semantic-version",
+ "zed-util",
  "zlog",
 ]
 
@@ -3429,13 +3429,11 @@ dependencies = [
  "channel",
  "chrono",
  "client",
- "collections",
  "db",
  "editor",
  "futures 0.3.31",
  "fuzzy",
  "gpui",
- "http_client",
  "log",
  "menu",
  "notifications",
@@ -3456,18 +3454,11 @@ dependencies = [
  "title_bar",
  "tree-sitter-md",
  "ui",
- "util",
  "workspace",
  "workspace-hack",
-]
-
-[[package]]
-name = "collections"
-version = "0.1.0"
-dependencies = [
- "indexmap 2.9.0",
- "rustc-hash 2.1.1",
- "workspace-hack",
+ "zed-collections",
+ "zed-http-client",
+ "zed-util",
 ]
 
 [[package]]
@@ -3508,7 +3499,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "client",
- "collections",
  "command_palette_hooks",
  "ctor",
  "db",
@@ -3530,9 +3520,10 @@ dependencies = [
  "theme",
  "time",
  "ui",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
  "zed_actions",
 ]
 
@@ -3540,17 +3531,16 @@ dependencies = [
 name = "command_palette_hooks"
 version = "0.1.0"
 dependencies = [
- "collections",
  "derive_more",
  "gpui",
  "workspace-hack",
+ "zed-collections",
 ]
 
 [[package]]
 name = "component"
 version = "0.1.0"
 dependencies = [
- "collections",
  "documented",
  "gpui",
  "inventory",
@@ -3558,6 +3548,7 @@ dependencies = [
  "strum 0.27.1",
  "theme",
  "workspace-hack",
+ "zed-collections",
 ]
 
 [[package]]
@@ -3620,7 +3611,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "collections",
  "futures 0.3.31",
  "gpui",
  "log",
@@ -3634,8 +3624,9 @@ dependencies = [
  "smol",
  "tempfile",
  "url",
- "util",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
 ]
 
 [[package]]
@@ -3671,7 +3662,6 @@ dependencies = [
  "chrono",
  "client",
  "clock",
- "collections",
  "command_palette_hooks",
  "ctor",
  "dirs 4.0.0",
@@ -3680,7 +3670,6 @@ dependencies = [
  "fs",
  "futures 0.3.31",
  "gpui",
- "http_client",
  "indoc",
  "itertools 0.14.0",
  "language",
@@ -3696,13 +3685,15 @@ dependencies = [
  "serde",
  "serde_json",
  "settings",
- "sum_tree",
  "task",
  "theme",
  "ui",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-http-client",
+ "zed-sum-tree",
+ "zed-util",
  "zlog",
 ]
 
@@ -4416,12 +4407,10 @@ dependencies = [
  "async-tar",
  "async-trait",
  "client",
- "collections",
  "dap-types",
  "fs",
  "futures 0.3.31",
  "gpui",
- "http_client",
  "language",
  "libc",
  "log",
@@ -4439,8 +4428,10 @@ dependencies = [
  "telemetry",
  "tree-sitter",
  "tree-sitter-go",
- "util",
  "workspace-hack",
+ "zed-collections",
+ "zed-http-client",
+ "zed-util",
  "zlog",
 ]
 
@@ -4460,7 +4451,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "collections",
  "dap",
  "dotenvy",
  "fs",
@@ -4475,8 +4465,9 @@ dependencies = [
  "shlex",
  "smol",
  "task",
- "util",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
 ]
 
 [[package]]
@@ -4573,8 +4564,8 @@ dependencies = [
  "sqlez",
  "sqlez_macros",
  "tempfile",
- "util",
  "workspace-hack",
+ "zed-util",
  "zed_env_vars",
 ]
 
@@ -4600,8 +4591,8 @@ dependencies = [
  "gpui",
  "serde_json",
  "task",
- "util",
  "workspace-hack",
+ "zed-util",
 ]
 
 [[package]]
@@ -4617,9 +4608,9 @@ dependencies = [
  "serde_json",
  "settings",
  "smol",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-util",
 ]
 
 [[package]]
@@ -4630,7 +4621,6 @@ dependencies = [
  "anyhow",
  "bitflags 2.9.0",
  "client",
- "collections",
  "command_palette_hooks",
  "dap",
  "dap_adapters",
@@ -4673,9 +4663,10 @@ dependencies = [
  "tree-sitter-json",
  "ui",
  "unindent",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
  "zed_actions",
  "zlog",
 ]
@@ -4695,11 +4686,11 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "futures 0.3.31",
- "http_client",
  "schemars 1.0.1",
  "serde",
  "serde_json",
  "workspace-hack",
+ "zed-http-client",
 ]
 
 [[package]]
@@ -4777,23 +4768,12 @@ dependencies = [
  "syn 2.0.101",
 ]
 
-[[package]]
-name = "derive_refineable"
-version = "0.1.0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.101",
- "workspace-hack",
-]
-
 [[package]]
 name = "diagnostics"
 version = "0.1.0"
 dependencies = [
  "anyhow",
  "client",
- "collections",
  "component",
  "ctor",
  "editor",
@@ -4813,9 +4793,10 @@ dependencies = [
  "theme",
  "ui",
  "unindent",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
  "zlog",
 ]
 
@@ -4970,9 +4951,9 @@ dependencies = [
  "serde",
  "serde_json",
  "settings",
- "util",
  "workspace-hack",
  "zed",
+ "zed-util",
  "zlog",
 ]
 
@@ -5164,7 +5145,6 @@ dependencies = [
  "arrayvec",
  "clap",
  "cloud_llm_client",
- "collections",
  "futures 0.3.31",
  "gpui",
  "hashbrown 0.15.3",
@@ -5184,8 +5164,9 @@ dependencies = [
  "strum 0.27.1",
  "text",
  "tree-sitter",
- "util",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
  "zlog",
 ]
 
@@ -5199,7 +5180,6 @@ dependencies = [
  "buffer_diff",
  "client",
  "clock",
- "collections",
  "convert_case 0.8.0",
  "criterion",
  "ctor",
@@ -5213,7 +5193,6 @@ dependencies = [
  "fuzzy",
  "git",
  "gpui",
- "http_client",
  "indoc",
  "itertools 0.14.0",
  "language",
@@ -5239,7 +5218,6 @@ dependencies = [
  "smallvec",
  "smol",
  "snippet",
- "sum_tree",
  "task",
  "telemetry",
  "tempfile",
@@ -5258,11 +5236,14 @@ dependencies = [
  "unicode-segmentation",
  "unindent",
  "url",
- "util",
  "uuid",
  "vim_mode_setting",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-http-client",
+ "zed-sum-tree",
+ "zed-util",
  "zed_actions",
  "zlog",
 ]
@@ -5544,7 +5525,6 @@ dependencies = [
  "clap",
  "client",
  "cloud_llm_client",
- "collections",
  "debug_adapter_extension",
  "dirs 4.0.0",
  "dotenvy",
@@ -5579,10 +5559,11 @@ dependencies = [
  "terminal_view",
  "toml 0.8.20",
  "unindent",
- "util",
  "uuid",
  "watch",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
 ]
 
 [[package]]
@@ -5661,28 +5642,28 @@ dependencies = [
  "async-compression",
  "async-tar",
  "async-trait",
- "collections",
  "dap",
  "fs",
  "futures 0.3.31",
  "gpui",
  "heck 0.5.0",
- "http_client",
  "language",
  "log",
  "lsp",
  "parking_lot",
  "pretty_assertions",
- "semantic_version",
  "serde",
  "serde_json",
  "task",
  "toml 0.8.20",
  "url",
- "util",
  "wasm-encoder 0.221.3",
  "wasmparser 0.221.3",
  "workspace-hack",
+ "zed-collections",
+ "zed-http-client",
+ "zed-semantic-version",
+ "zed-util",
 ]
 
 [[package]]
@@ -5718,7 +5699,6 @@ dependencies = [
  "async-tar",
  "async-trait",
  "client",
- "collections",
  "criterion",
  "ctor",
  "dap",
@@ -5726,7 +5706,6 @@ dependencies = [
  "fs",
  "futures 0.3.31",
  "gpui",
- "http_client",
  "language",
  "language_extension",
  "log",
@@ -5740,7 +5719,6 @@ dependencies = [
  "release_channel",
  "remote",
  "reqwest_client",
- "semantic_version",
  "serde",
  "serde_json",
  "serde_json_lenient",
@@ -5752,11 +5730,14 @@ dependencies = [
  "theme_extension",
  "toml 0.8.20",
  "url",
- "util",
  "wasmparser 0.221.3",
  "wasmtime",
  "wasmtime-wasi",
  "workspace-hack",
+ "zed-collections",
+ "zed-http-client",
+ "zed-semantic-version",
+ "zed-util",
  "zlog",
 ]
 
@@ -5766,7 +5747,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "client",
- "collections",
  "db",
  "editor",
  "extension",
@@ -5780,7 +5760,6 @@ dependencies = [
  "picker",
  "project",
  "release_channel",
- "semantic_version",
  "serde",
  "settings",
  "smallvec",
@@ -5788,10 +5767,12 @@ dependencies = [
  "telemetry",
  "theme",
  "ui",
- "util",
  "vim_mode_setting",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-semantic-version",
+ "zed-util",
  "zed_actions",
 ]
 
@@ -5884,9 +5865,9 @@ dependencies = [
  "system_specs",
  "ui",
  "urlencoding",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-util",
  "zed_actions",
 ]
 
@@ -5905,7 +5886,6 @@ name = "file_finder"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "collections",
  "ctor",
  "editor",
  "file_icons",
@@ -5925,9 +5905,10 @@ dependencies = [
  "text",
  "theme",
  "ui",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
  "zlog",
 ]
 
@@ -5939,8 +5920,8 @@ dependencies = [
  "serde",
  "settings",
  "theme",
- "util",
  "workspace-hack",
+ "zed-util",
 ]
 
 [[package]]
@@ -6047,30 +6028,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 
-[[package]]
-name = "font-kit"
-version = "0.14.1"
-source = "git+https://github.com/zed-industries/font-kit?rev=5474cfad4b719a72ec8ed2cb7327b2b01fd10568#5474cfad4b719a72ec8ed2cb7327b2b01fd10568"
-dependencies = [
- "bitflags 2.9.0",
- "byteorder",
- "core-foundation 0.10.0",
- "core-graphics 0.24.0",
- "core-text",
- "dirs 5.0.1",
- "dwrote",
- "float-ord",
- "freetype-sys",
- "lazy_static",
- "libc",
- "log",
- "pathfinder_geometry",
- "pathfinder_simd",
- "walkdir",
- "winapi",
- "yeslogic-fontconfig-sys",
-]
-
 [[package]]
 name = "font-types"
 version = "0.8.4"
@@ -6207,7 +6164,6 @@ dependencies = [
  "async-tar",
  "async-trait",
  "cocoa 0.26.0",
- "collections",
  "fsevent",
  "futures 0.3.31",
  "git",
@@ -6227,9 +6183,10 @@ dependencies = [
  "tempfile",
  "text",
  "time",
- "util",
  "windows 0.61.1",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
 ]
 
 [[package]]
@@ -6448,8 +6405,8 @@ version = "0.1.0"
 dependencies = [
  "gpui",
  "log",
- "util",
  "workspace-hack",
+ "zed-util",
 ]
 
 [[package]]
@@ -6787,12 +6744,10 @@ dependencies = [
  "anyhow",
  "askpass",
  "async-trait",
- "collections",
  "derive_more",
  "futures 0.3.31",
  "git2",
  "gpui",
- "http_client",
  "log",
  "parking_lot",
  "pretty_assertions",
@@ -6803,16 +6758,18 @@ dependencies = [
  "serde",
  "serde_json",
  "smol",
- "sum_tree",
  "tempfile",
  "text",
  "thiserror 2.0.12",
  "time",
  "unindent",
  "url",
- "util",
  "uuid",
  "workspace-hack",
+ "zed-collections",
+ "zed-http-client",
+ "zed-sum-tree",
+ "zed-util",
 ]
 
 [[package]]
@@ -6837,7 +6794,6 @@ dependencies = [
  "futures 0.3.31",
  "git",
  "gpui",
- "http_client",
  "indoc",
  "pretty_assertions",
  "regex",
@@ -6845,8 +6801,9 @@ dependencies = [
  "serde_json",
  "settings",
  "url",
- "util",
  "workspace-hack",
+ "zed-http-client",
+ "zed-util",
 ]
 
 [[package]]
@@ -6860,7 +6817,6 @@ dependencies = [
  "call",
  "chrono",
  "cloud_llm_client",
- "collections",
  "command_palette_hooks",
  "component",
  "ctor",
@@ -6896,11 +6852,12 @@ dependencies = [
  "time_format",
  "ui",
  "unindent",
- "util",
  "watch",
  "windows 0.61.1",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
  "zed_actions",
  "zeroize",
  "zlog",
@@ -6968,9 +6925,9 @@ dependencies = [
  "tree-sitter-rust",
  "tree-sitter-typescript",
  "ui",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-util",
 ]
 
 [[package]]
@@ -6990,13 +6947,13 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "futures 0.3.31",
- "http_client",
  "schemars 1.0.1",
  "serde",
  "serde_json",
  "settings",
  "strum 0.27.1",
  "workspace-hack",
+ "zed-http-client",
 ]
 
 [[package]]
@@ -7048,7 +7005,6 @@ dependencies = [
  "calloop-wayland-source",
  "cbindgen",
  "cocoa 0.26.0",
- "collections",
  "core-foundation 0.10.0",
  "core-foundation-sys",
  "core-graphics 0.24.0",
@@ -7062,18 +7018,15 @@ dependencies = [
  "etagere",
  "filedescriptor",
  "flume",
- "font-kit",
  "foreign-types 0.5.0",
  "futures 0.3.31",
- "gpui_macros",
- "http_client",
+ "gpui-macros",
  "image",
  "inventory",
  "itertools 0.14.0",
  "libc",
  "log",
  "lyon",
- "media",
  "metal",
  "naga",
  "num_cpus",
@@ -7090,13 +7043,10 @@ dependencies = [
  "profiling",
  "rand 0.9.1",
  "raw-window-handle",
- "refineable",
  "reqwest_client",
  "resvg",
- "scap",
  "schemars 1.0.1",
  "seahash",
- "semantic_version",
  "serde",
  "serde_json",
  "slotmap",
@@ -7104,13 +7054,10 @@ dependencies = [
  "smol",
  "stacksafe",
  "strum 0.27.1",
- "sum_tree",
  "taffy",
  "thiserror 2.0.12",
  "unicode-segmentation",
  "usvg",
- "util",
- "util_macros",
  "uuid",
  "waker-fn",
  "wayland-backend",
@@ -7125,12 +7072,22 @@ dependencies = [
  "workspace-hack",
  "x11-clipboard",
  "x11rb",
- "xim",
  "xkbcommon",
+ "zed-collections",
+ "zed-font-kit",
+ "zed-http-client",
+ "zed-media",
+ "zed-refineable",
+ "zed-scap",
+ "zed-semantic-version",
+ "zed-sum-tree",
+ "zed-util",
+ "zed-util-macros",
+ "zed-xim",
 ]
 
 [[package]]
-name = "gpui_macros"
+name = "gpui-macros"
 version = "0.1.0"
 dependencies = [
  "gpui",
@@ -7148,8 +7105,8 @@ dependencies = [
  "anyhow",
  "gpui",
  "tokio",
- "util",
  "workspace-hack",
+ "zed-util",
 ]
 
 [[package]]
@@ -7554,31 +7511,6 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f"
 
-[[package]]
-name = "http_client"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-compression",
- "async-fs",
- "async-tar",
- "bytes 1.10.1",
- "derive_more",
- "futures 0.3.31",
- "http 1.3.1",
- "http-body 1.0.1",
- "log",
- "parking_lot",
- "reqwest 0.12.15 (git+https://github.com/zed-industries/reqwest.git?rev=951c770a32f1998d6e999cef3e59e0013e6c4415)",
- "serde",
- "serde_json",
- "sha2",
- "tempfile",
- "url",
- "util",
- "workspace-hack",
-]
-
 [[package]]
 name = "http_client_tls"
 version = "0.1.0"
@@ -7972,9 +7904,9 @@ dependencies = [
  "settings",
  "theme",
  "ui",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-util",
 ]
 
 [[package]]
@@ -8093,10 +8025,10 @@ dependencies = [
  "serde_json_lenient",
  "theme",
  "ui",
- "util",
- "util_macros",
  "workspace",
  "workspace-hack",
+ "zed-util",
+ "zed-util-macros",
  "zed_actions",
 ]
 
@@ -8109,9 +8041,9 @@ dependencies = [
  "gpui",
  "release_channel",
  "smol",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-util",
 ]
 
 [[package]]
@@ -8411,8 +8343,8 @@ dependencies = [
  "snippet_provider",
  "task",
  "theme",
- "util",
  "workspace-hack",
+ "zed-util",
 ]
 
 [[package]]
@@ -8436,7 +8368,7 @@ dependencies = [
  "referencing",
  "regex",
  "regex-syntax",
- "reqwest 0.12.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "reqwest 0.12.15",
  "serde",
  "serde_json",
  "uuid-simd",
@@ -8493,7 +8425,6 @@ name = "keymap_editor"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "collections",
  "command_palette",
  "component",
  "db",
@@ -8520,10 +8451,11 @@ dependencies = [
  "tree-sitter-rust",
  "ui",
  "ui_input",
- "util",
  "vim",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
  "zed_actions",
 ]
 
@@ -8583,7 +8515,6 @@ dependencies = [
  "anyhow",
  "async-trait",
  "clock",
- "collections",
  "ctor",
  "diffy",
  "ec4rs",
@@ -8592,7 +8523,6 @@ dependencies = [
  "fuzzy",
  "globset",
  "gpui",
- "http_client",
  "imara-diff",
  "indoc",
  "itertools 0.14.0",
@@ -8613,7 +8543,6 @@ dependencies = [
  "smol",
  "streaming-iterator",
  "strsim",
- "sum_tree",
  "task",
  "text",
  "theme",
@@ -8631,9 +8560,12 @@ dependencies = [
  "tree-sitter-typescript",
  "unicase",
  "unindent",
- "util",
  "watch",
  "workspace-hack",
+ "zed-collections",
+ "zed-http-client",
+ "zed-sum-tree",
+ "zed-util",
  "zlog",
 ]
 
@@ -8643,7 +8575,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "collections",
  "extension",
  "fs",
  "futures 0.3.31",
@@ -8654,8 +8585,9 @@ dependencies = [
  "project",
  "serde",
  "serde_json",
- "util",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
 ]
 
 [[package]]
@@ -8668,10 +8600,8 @@ dependencies = [
  "client",
  "cloud_api_types",
  "cloud_llm_client",
- "collections",
  "futures 0.3.31",
  "gpui",
- "http_client",
  "icons",
  "image",
  "log",
@@ -8685,8 +8615,10 @@ dependencies = [
  "smol",
  "telemetry_events",
  "thiserror 2.0.12",
- "util",
  "workspace-hack",
+ "zed-collections",
+ "zed-http-client",
+ "zed-util",
 ]
 
 [[package]]
@@ -8703,7 +8635,6 @@ dependencies = [
  "chrono",
  "client",
  "cloud_llm_client",
- "collections",
  "component",
  "convert_case 0.8.0",
  "copilot",
@@ -8715,7 +8646,6 @@ dependencies = [
  "google_ai",
  "gpui",
  "gpui_tokio",
- "http_client",
  "language",
  "language_model",
  "lmstudio",
@@ -8739,10 +8669,12 @@ dependencies = [
  "tokio",
  "ui",
  "ui_input",
- "util",
  "vercel",
  "workspace-hack",
  "x_ai",
+ "zed-collections",
+ "zed-http-client",
+ "zed-util",
  "zed_env_vars",
 ]
 
@@ -8774,9 +8706,9 @@ dependencies = [
  "project",
  "settings",
  "ui",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-util",
 ]
 
 [[package]]
@@ -8785,7 +8717,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "client",
- "collections",
  "command_palette_hooks",
  "copilot",
  "editor",
@@ -8802,9 +8733,10 @@ dependencies = [
  "theme",
  "tree-sitter",
  "ui",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
  "zed_actions",
  "zlog",
 ]
@@ -8819,10 +8751,8 @@ dependencies = [
  "async-tar",
  "async-trait",
  "chrono",
- "collections",
  "futures 0.3.31",
  "gpui",
- "http_client",
  "itertools 0.14.0",
  "json_schema_store",
  "language",
@@ -8872,9 +8802,11 @@ dependencies = [
  "tree-sitter-yaml",
  "unindent",
  "url",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-http-client",
+ "zed-util",
 ]
 
 [[package]]
@@ -9056,9 +8988,9 @@ dependencies = [
  "picker",
  "project",
  "ui",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-util",
 ]
 
 [[package]]
@@ -9181,9 +9113,9 @@ dependencies = [
  "prost 0.9.0",
  "prost-build 0.9.0",
  "prost-types 0.9.0",
- "reqwest 0.12.15 (git+https://github.com/zed-industries/reqwest.git?rev=951c770a32f1998d6e999cef3e59e0013e6c4415)",
  "serde",
  "workspace-hack",
+ "zed-reqwest",
 ]
 
 [[package]]
@@ -9193,7 +9125,6 @@ dependencies = [
  "anyhow",
  "async-trait",
  "audio",
- "collections",
  "core-foundation 0.10.0",
  "core-video",
  "coreaudio-rs 0.12.1",
@@ -9212,7 +9143,6 @@ dependencies = [
  "parking_lot",
  "postage",
  "rodio",
- "scap",
  "serde",
  "serde_json",
  "serde_urlencoded",
@@ -9222,8 +9152,10 @@ dependencies = [
  "smallvec",
  "tokio-tungstenite 0.26.2",
  "ui",
- "util",
  "workspace-hack",
+ "zed-collections",
+ "zed-scap",
+ "zed-util",
 ]
 
 [[package]]
@@ -9243,11 +9175,11 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "futures 0.3.31",
- "http_client",
  "schemars 1.0.1",
  "serde",
  "serde_json",
  "workspace-hack",
+ "zed-http-client",
 ]
 
 [[package]]
@@ -9307,7 +9239,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-pipe",
- "collections",
  "ctor",
  "futures 0.3.31",
  "gpui",
@@ -9320,8 +9251,9 @@ dependencies = [
  "serde",
  "serde_json",
  "smol",
- "util",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
  "zlog",
 ]
 
@@ -9444,7 +9376,6 @@ version = "0.1.0"
 dependencies = [
  "assets",
  "base64 0.22.1",
- "collections",
  "env_logger 0.11.8",
  "fs",
  "futures 0.3.31",
@@ -9456,11 +9387,12 @@ dependencies = [
  "node_runtime",
  "pulldown-cmark 0.12.2",
  "settings",
- "sum_tree",
  "theme",
  "ui",
- "util",
  "workspace-hack",
+ "zed-collections",
+ "zed-sum-tree",
+ "zed-util",
 ]
 
 [[package]]
@@ -9469,7 +9401,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-recursion",
- "collections",
  "editor",
  "fs",
  "gpui",
@@ -9483,9 +9414,10 @@ dependencies = [
  "settings",
  "theme",
  "ui",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
 ]
 
 [[package]]
@@ -9613,21 +9545,6 @@ dependencies = [
  "warp",
 ]
 
-[[package]]
-name = "media"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "bindgen 0.71.1",
- "core-foundation 0.10.0",
- "core-video",
- "ctor",
- "foreign-types 0.5.0",
- "metal",
- "objc",
- "workspace-hack",
-]
-
 [[package]]
 name = "memchr"
 version = "2.7.4"
@@ -9690,7 +9607,6 @@ name = "migrator"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "collections",
  "convert_case 0.8.0",
  "log",
  "pretty_assertions",
@@ -9702,6 +9618,7 @@ dependencies = [
  "tree-sitter-json",
  "unindent",
  "workspace-hack",
+ "zed-collections",
 ]
 
 [[package]]
@@ -9847,12 +9764,12 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "futures 0.3.31",
- "http_client",
  "schemars 1.0.1",
  "serde",
  "serde_json",
  "strum 0.27.1",
  "workspace-hack",
+ "zed-http-client",
 ]
 
 [[package]]
@@ -9890,7 +9807,6 @@ dependencies = [
  "anyhow",
  "buffer_diff",
  "clock",
- "collections",
  "ctor",
  "gpui",
  "indoc",
@@ -9906,12 +9822,13 @@ dependencies = [
  "settings",
  "smallvec",
  "smol",
- "sum_tree",
  "text",
  "theme",
  "tree-sitter",
- "util",
  "workspace-hack",
+ "zed-collections",
+ "zed-sum-tree",
+ "zed-util",
  "zlog",
 ]
 
@@ -10100,17 +10017,17 @@ dependencies = [
  "async-tar",
  "async-trait",
  "futures 0.3.31",
- "http_client",
  "log",
  "paths",
  "semver",
  "serde",
  "serde_json",
  "smol",
- "util",
  "watch",
  "which 6.0.3",
  "workspace-hack",
+ "zed-http-client",
+ "zed-util",
 ]
 
 [[package]]
@@ -10154,18 +10071,18 @@ dependencies = [
  "anyhow",
  "channel",
  "client",
- "collections",
  "component",
  "db",
  "gpui",
  "rpc",
  "settings",
- "sum_tree",
  "time",
  "ui",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-sum-tree",
+ "zed-util",
  "zed_actions",
 ]
 
@@ -10604,12 +10521,12 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "futures 0.3.31",
- "http_client",
  "schemars 1.0.1",
  "serde",
  "serde_json",
  "settings",
  "workspace-hack",
+ "zed-http-client",
 ]
 
 [[package]]
@@ -10641,10 +10558,10 @@ dependencies = [
  "theme",
  "ui",
  "ui_input",
- "util",
  "vim_mode_setting",
  "workspace",
  "workspace-hack",
+ "zed-util",
  "zed_actions",
  "zlog",
 ]
@@ -10713,7 +10630,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "futures 0.3.31",
- "http_client",
  "log",
  "schemars 1.0.1",
  "serde",
@@ -10721,6 +10637,7 @@ dependencies = [
  "settings",
  "strum 0.27.1",
  "workspace-hack",
+ "zed-http-client",
 ]
 
 [[package]]
@@ -10729,7 +10646,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "futures 0.3.31",
- "http_client",
  "schemars 1.0.1",
  "serde",
  "serde_json",
@@ -10737,6 +10653,7 @@ dependencies = [
  "strum 0.27.1",
  "thiserror 2.0.12",
  "workspace-hack",
+ "zed-http-client",
 ]
 
 [[package]]
@@ -10885,9 +10802,9 @@ dependencies = [
  "tree-sitter-rust",
  "tree-sitter-typescript",
  "ui",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-util",
  "zed_actions",
 ]
 
@@ -10896,7 +10813,6 @@ name = "outline_panel"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "collections",
  "db",
  "editor",
  "file_icons",
@@ -10917,10 +10833,11 @@ dependencies = [
  "smol",
  "theme",
  "ui",
- "util",
  "workspace",
  "workspace-hack",
  "worktree",
+ "zed-collections",
+ "zed-util",
  "zed_actions",
 ]
 
@@ -11090,8 +11007,8 @@ version = "0.1.0"
 dependencies = [
  "dirs 4.0.0",
  "ignore",
- "util",
  "workspace-hack",
+ "zed-util",
 ]
 
 [[package]]
@@ -11184,16 +11101,6 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
-[[package]]
-name = "perf"
-version = "0.1.0"
-dependencies = [
- "collections",
- "serde",
- "serde_json",
- "workspace-hack",
-]
-
 [[package]]
 name = "pest"
 version = "2.8.0"
@@ -11959,7 +11866,6 @@ name = "prettier"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "collections",
  "fs",
  "gpui",
  "language",
@@ -11970,8 +11876,9 @@ dependencies = [
  "paths",
  "serde",
  "serde_json",
- "util",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
 ]
 
 [[package]]
@@ -12098,7 +12005,6 @@ dependencies = [
  "circular-buffer",
  "client",
  "clock",
- "collections",
  "context_server",
  "dap",
  "dap_adapters",
@@ -12113,7 +12019,6 @@ dependencies = [
  "git_hosting_providers",
  "globset",
  "gpui",
- "http_client",
  "image",
  "indexmap 2.9.0",
  "itertools 0.14.0",
@@ -12144,7 +12049,6 @@ dependencies = [
  "smol",
  "snippet",
  "snippet_provider",
- "sum_tree",
  "task",
  "tempfile",
  "terminal",
@@ -12152,11 +12056,14 @@ dependencies = [
  "toml 0.8.20",
  "unindent",
  "url",
- "util",
  "watch",
  "which 6.0.3",
  "workspace-hack",
  "worktree",
+ "zed-collections",
+ "zed-http-client",
+ "zed-sum-tree",
+ "zed-util",
  "zeroize",
  "zlog",
 ]
@@ -12167,7 +12074,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "client",
- "collections",
  "command_palette_hooks",
  "criterion",
  "db",
@@ -12190,10 +12096,11 @@ dependencies = [
  "telemetry",
  "theme",
  "ui",
- "util",
  "workspace",
  "workspace-hack",
  "worktree",
+ "zed-collections",
+ "zed-util",
  "zed_actions",
 ]
 
@@ -12215,9 +12122,9 @@ dependencies = [
  "serde_json",
  "settings",
  "theme",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-util",
 ]
 
 [[package]]
@@ -12242,7 +12149,6 @@ dependencies = [
  "anyhow",
  "assets",
  "chrono",
- "collections",
  "fs",
  "futures 0.3.31",
  "fuzzy",
@@ -12257,9 +12163,10 @@ dependencies = [
  "serde",
  "serde_json",
  "text",
- "util",
  "uuid",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
 ]
 
 [[package]]
@@ -12373,12 +12280,12 @@ name = "proto"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "collections",
  "prost 0.9.0",
  "prost-build 0.9.0",
  "serde",
  "typed-path",
  "workspace-hack",
+ "zed-collections",
 ]
 
 [[package]]
@@ -12862,10 +12769,10 @@ dependencies = [
  "telemetry",
  "theme",
  "ui",
- "util",
  "windows-registry 0.6.0",
  "workspace",
  "workspace-hack",
+ "zed-util",
  "zed_actions",
 ]
 
@@ -12943,14 +12850,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "refineable"
-version = "0.1.0"
-dependencies = [
- "derive_refineable",
- "workspace-hack",
-]
-
 [[package]]
 name = "regalloc2"
 version = "0.11.2"
@@ -13016,7 +12915,6 @@ dependencies = [
  "anyhow",
  "askpass",
  "async-trait",
- "collections",
  "fs",
  "futures 0.3.31",
  "gpui",
@@ -13035,9 +12933,10 @@ dependencies = [
  "tempfile",
  "thiserror 2.0.12",
  "urlencoding",
- "util",
  "which 6.0.3",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
 ]
 
 [[package]]
@@ -13053,7 +12952,6 @@ dependencies = [
  "clap",
  "client",
  "clock",
- "collections",
  "crash-handler",
  "crashes",
  "dap",
@@ -13071,7 +12969,6 @@ dependencies = [
  "git_hosting_providers",
  "gpui",
  "gpui_tokio",
- "http_client",
  "json_schema_store",
  "language",
  "language_extension",
@@ -13100,10 +12997,12 @@ dependencies = [
  "thiserror 2.0.12",
  "toml 0.8.20",
  "unindent",
- "util",
  "watch",
  "workspace",
  "worktree",
+ "zed-collections",
+ "zed-http-client",
+ "zed-util",
  "zlog",
 ]
 
@@ -13126,7 +13025,6 @@ dependencies = [
  "async-tungstenite",
  "base64 0.22.1",
  "client",
- "collections",
  "command_palette_hooks",
  "editor",
  "env_logger 0.11.8",
@@ -13134,7 +13032,6 @@ dependencies = [
  "file_icons",
  "futures 0.3.31",
  "gpui",
- "http_client",
  "image",
  "indoc",
  "jupyter-protocol",
@@ -13161,10 +13058,12 @@ dependencies = [
  "tree-sitter-python",
  "tree-sitter-typescript",
  "ui",
- "util",
  "uuid",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-http-client",
+ "zed-util",
 ]
 
 [[package]]
@@ -13248,55 +13147,6 @@ dependencies = [
  "windows-registry 0.4.0",
 ]
 
-[[package]]
-name = "reqwest"
-version = "0.12.15"
-source = "git+https://github.com/zed-industries/reqwest.git?rev=951c770a32f1998d6e999cef3e59e0013e6c4415#951c770a32f1998d6e999cef3e59e0013e6c4415"
-dependencies = [
- "base64 0.22.1",
- "bytes 1.10.1",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2 0.4.9",
- "http 1.3.1",
- "http-body 1.0.1",
- "http-body-util",
- "hyper 1.6.0",
- "hyper-rustls 0.27.5",
- "hyper-util",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "mime_guess",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "quinn",
- "rustls 0.23.26",
- "rustls-native-certs 0.8.1",
- "rustls-pemfile 2.2.0",
- "rustls-pki-types",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper 1.0.2",
- "system-configuration 0.6.1",
- "tokio",
- "tokio-rustls 0.26.2",
- "tokio-socks",
- "tokio-util",
- "tower 0.5.2",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-streams",
- "web-sys",
- "windows-registry 0.4.0",
-]
-
 [[package]]
 name = "reqwest_client"
 version = "0.1.0"
@@ -13305,14 +13155,14 @@ dependencies = [
  "bytes 1.10.1",
  "futures 0.3.31",
  "gpui",
- "http_client",
  "http_client_tls",
  "log",
  "regex",
- "reqwest 0.12.15 (git+https://github.com/zed-industries/reqwest.git?rev=951c770a32f1998d6e999cef3e59e0013e6c4415)",
  "serde",
  "tokio",
  "workspace-hack",
+ "zed-http-client",
+ "zed-reqwest",
 ]
 
 [[package]]
@@ -13360,8 +13210,8 @@ dependencies = [
  "pulldown-cmark 0.12.2",
  "theme",
  "ui",
- "util",
  "workspace-hack",
+ "zed-util",
 ]
 
 [[package]]
@@ -13454,10 +13304,10 @@ dependencies = [
  "rand 0.9.1",
  "rayon",
  "smallvec",
- "sum_tree",
  "unicode-segmentation",
- "util",
  "workspace-hack",
+ "zed-sum-tree",
+ "zed-util",
  "zlog",
 ]
 
@@ -13475,7 +13325,6 @@ dependencies = [
  "async-tungstenite",
  "base64 0.22.1",
  "chrono",
- "collections",
  "futures 0.3.31",
  "gpui",
  "parking_lot",
@@ -13487,8 +13336,9 @@ dependencies = [
  "sha2",
  "strum 0.27.1",
  "tracing",
- "util",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
  "zlog",
  "zstd",
 ]
@@ -13524,7 +13374,6 @@ name = "rules_library"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "collections",
  "editor",
  "gpui",
  "language",
@@ -13540,9 +13389,10 @@ dependencies = [
  "theme",
  "title_bar",
  "ui",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
  "zed_actions",
 ]
 
@@ -13914,27 +13764,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "scap"
-version = "0.0.8"
-source = "git+https://github.com/zed-industries/scap?rev=808aa5c45b41e8f44729d02e38fd00a2fe2722e7#808aa5c45b41e8f44729d02e38fd00a2fe2722e7"
-dependencies = [
- "anyhow",
- "cocoa 0.25.0",
- "core-graphics-helmer-fork",
- "log",
- "objc",
- "rand 0.8.5",
- "screencapturekit",
- "screencapturekit-sys",
- "sysinfo",
- "tao-core-video-sys",
- "windows 0.61.1",
- "windows-capture",
- "x11",
- "xcb",
-]
-
 [[package]]
 name = "schannel"
 version = "0.1.27"
@@ -14194,7 +14023,6 @@ dependencies = [
  "anyhow",
  "bitflags 2.9.0",
  "client",
- "collections",
  "editor",
  "futures 0.3.31",
  "gpui",
@@ -14209,9 +14037,10 @@ dependencies = [
  "theme",
  "ui",
  "unindent",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
  "zed_actions",
 ]
 
@@ -14271,15 +14100,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f7d95a54511e0c7be3f51e8867aa8cf35148d7b9445d44de2f943e2b206e749"
 
-[[package]]
-name = "semantic_version"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "serde",
- "workspace-hack",
-]
-
 [[package]]
 name = "semver"
 version = "1.0.26"
@@ -14462,9 +14282,9 @@ dependencies = [
  "db",
  "gpui",
  "serde_json",
- "util",
  "uuid",
  "workspace-hack",
+ "zed-util",
 ]
 
 [[package]]
@@ -14472,7 +14292,6 @@ name = "settings"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "collections",
  "ec4rs",
  "fs",
  "futures 0.3.31",
@@ -14497,8 +14316,9 @@ dependencies = [
  "tree-sitter",
  "tree-sitter-json",
  "unindent",
- "util",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
  "zlog",
 ]
 
@@ -14559,9 +14379,9 @@ dependencies = [
  "strum 0.27.1",
  "theme",
  "ui",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-util",
  "zlog",
 ]
 
@@ -14832,7 +14652,6 @@ name = "snippet_provider"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "collections",
  "extension",
  "fs",
  "futures 0.3.31",
@@ -14845,8 +14664,9 @@ dependencies = [
  "serde_json",
  "serde_json_lenient",
  "snippet",
- "util",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
 ]
 
 [[package]]
@@ -14862,9 +14682,9 @@ dependencies = [
  "picker",
  "settings",
  "ui",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-util",
 ]
 
 [[package]]
@@ -14935,7 +14755,6 @@ name = "sqlez"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "collections",
  "futures 0.3.31",
  "indoc",
  "libsqlite3-sys",
@@ -14944,9 +14763,10 @@ dependencies = [
  "smol",
  "sqlformat",
  "thread_local",
- "util",
  "uuid",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
 ]
 
 [[package]]
@@ -15279,8 +15099,8 @@ dependencies = [
  "ordered-float 2.10.1",
  "rand 0.9.1",
  "rope",
- "util",
  "workspace-hack",
+ "zed-util",
 ]
 
 [[package]]
@@ -15390,32 +15210,17 @@ version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
-[[package]]
-name = "sum_tree"
-version = "0.1.0"
-dependencies = [
- "arrayvec",
- "ctor",
- "log",
- "rand 0.9.1",
- "rayon",
- "workspace-hack",
- "zlog",
-]
-
 [[package]]
 name = "supermaven"
 version = "0.1.0"
 dependencies = [
  "anyhow",
  "client",
- "collections",
  "edit_prediction",
  "editor",
  "env_logger 0.11.8",
  "futures 0.3.31",
  "gpui",
- "http_client",
  "language",
  "log",
  "postage",
@@ -15429,8 +15234,10 @@ dependencies = [
  "theme",
  "ui",
  "unicode-segmentation",
- "util",
  "workspace-hack",
+ "zed-collections",
+ "zed-http-client",
+ "zed-util",
 ]
 
 [[package]]
@@ -15439,13 +15246,13 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "futures 0.3.31",
- "http_client",
  "paths",
  "serde",
  "serde_json",
  "smol",
- "util",
  "workspace-hack",
+ "zed-http-client",
+ "zed-util",
 ]
 
 [[package]]
@@ -15912,7 +15719,6 @@ name = "tab_switcher"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "collections",
  "ctor",
  "editor",
  "fuzzy",
@@ -15928,9 +15734,10 @@ dependencies = [
  "smol",
  "theme",
  "ui",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
  "zlog",
 ]
 
@@ -15993,7 +15800,6 @@ name = "task"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "collections",
  "futures 0.3.31",
  "gpui",
  "hex",
@@ -16007,8 +15813,9 @@ dependencies = [
  "serde_json_lenient",
  "sha2",
  "shellexpand 2.1.2",
- "util",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
  "zed_actions",
 ]
 
@@ -16017,7 +15824,6 @@ name = "tasks_ui"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "collections",
  "editor",
  "file_icons",
  "fuzzy",
@@ -16033,9 +15839,10 @@ dependencies = [
  "tree-sitter-rust",
  "tree-sitter-typescript",
  "ui",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
  "zed_actions",
 ]
 
@@ -16054,10 +15861,10 @@ dependencies = [
 name = "telemetry_events"
 version = "0.1.0"
 dependencies = [
- "semantic_version",
  "serde",
  "serde_json",
  "workspace-hack",
+ "zed-semantic-version",
 ]
 
 [[package]]
@@ -16099,7 +15906,6 @@ version = "0.1.0"
 dependencies = [
  "alacritty_terminal",
  "anyhow",
- "collections",
  "futures 0.3.31",
  "gpui",
  "itertools 0.14.0",
@@ -16118,9 +15924,10 @@ dependencies = [
  "thiserror 2.0.12",
  "url",
  "urlencoding",
- "util",
  "windows 0.61.1",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
 ]
 
 [[package]]
@@ -16142,7 +15949,6 @@ dependencies = [
  "async-recursion",
  "breadcrumbs",
  "client",
- "collections",
  "db",
  "dirs 4.0.0",
  "editor",
@@ -16166,9 +15972,10 @@ dependencies = [
  "terminal",
  "theme",
  "ui",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
  "zed_actions",
 ]
 
@@ -16178,10 +15985,8 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clock",
- "collections",
  "ctor",
  "gpui",
- "http_client",
  "log",
  "parking_lot",
  "postage",
@@ -16189,9 +15994,11 @@ dependencies = [
  "regex",
  "rope",
  "smallvec",
- "sum_tree",
- "util",
  "workspace-hack",
+ "zed-collections",
+ "zed-http-client",
+ "zed-sum-tree",
+ "zed-util",
  "zlog",
 ]
 
@@ -16200,7 +16007,6 @@ name = "theme"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "collections",
  "derive_more",
  "fs",
  "futures 0.3.31",
@@ -16208,7 +16014,6 @@ dependencies = [
  "log",
  "palette",
  "parking_lot",
- "refineable",
  "schemars 1.0.1",
  "serde",
  "serde_json",
@@ -16216,9 +16021,11 @@ dependencies = [
  "settings",
  "strum 0.27.1",
  "thiserror 2.0.12",
- "util",
  "uuid",
  "workspace-hack",
+ "zed-collections",
+ "zed-refineable",
+ "zed-util",
 ]
 
 [[package]]
@@ -16239,7 +16046,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap",
- "collections",
  "gpui",
  "indexmap 2.9.0",
  "log",
@@ -16252,6 +16058,7 @@ dependencies = [
  "theme",
  "vscode_theme",
  "workspace-hack",
+ "zed-collections",
 ]
 
 [[package]]
@@ -16268,9 +16075,9 @@ dependencies = [
  "telemetry",
  "theme",
  "ui",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-util",
  "zed_actions",
 ]
 
@@ -16486,10 +16293,8 @@ dependencies = [
  "chrono",
  "client",
  "cloud_llm_client",
- "collections",
  "db",
  "gpui",
- "http_client",
  "notifications",
  "pretty_assertions",
  "project",
@@ -16504,10 +16309,12 @@ dependencies = [
  "theme",
  "tree-sitter-md",
  "ui",
- "util",
  "windows 0.61.1",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-http-client",
+ "zed-util",
  "zed_actions",
 ]
 
@@ -16724,9 +16531,9 @@ dependencies = [
  "picker",
  "project",
  "ui",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-util",
 ]
 
 [[package]]
@@ -17302,7 +17109,7 @@ dependencies = [
  "component",
  "documented",
  "gpui",
- "gpui_macros",
+ "gpui-macros",
  "icons",
  "itertools 0.14.0",
  "menu",
@@ -17314,9 +17121,9 @@ dependencies = [
  "strum 0.27.1",
  "theme",
  "ui_macros",
- "util",
  "windows 0.61.1",
  "workspace-hack",
+ "zed-util",
 ]
 
 [[package]]
@@ -17538,55 +17345,6 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
-[[package]]
-name = "util"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-fs",
- "async_zip",
- "collections",
- "command-fds",
- "dirs 4.0.0",
- "dunce",
- "futures 0.3.31",
- "futures-lite 1.13.0",
- "git2",
- "globset",
- "indoc",
- "itertools 0.14.0",
- "libc",
- "log",
- "nix 0.29.0",
- "pretty_assertions",
- "rand 0.9.1",
- "regex",
- "rust-embed",
- "schemars 1.0.1",
- "serde",
- "serde_json",
- "serde_json_lenient",
- "shlex",
- "smol",
- "take-until",
- "tempfile",
- "tendril",
- "unicase",
- "util_macros",
- "walkdir",
- "workspace-hack",
-]
-
-[[package]]
-name = "util_macros"
-version = "0.1.0"
-dependencies = [
- "perf",
- "quote",
- "syn 2.0.101",
- "workspace-hack",
-]
-
 [[package]]
 name = "uuid"
 version = "1.16.0"
@@ -17699,7 +17457,6 @@ dependencies = [
  "assets",
  "async-compat",
  "async-trait",
- "collections",
  "command_palette",
  "command_palette_hooks",
  "db",
@@ -17717,7 +17474,6 @@ dependencies = [
  "multi_buffer",
  "nvim-rs",
  "parking_lot",
- "perf",
  "picker",
  "project",
  "project_panel",
@@ -17733,11 +17489,13 @@ dependencies = [
  "theme",
  "tokio",
  "ui",
- "util",
- "util_macros",
  "vim_mode_setting",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-perf",
+ "zed-util",
+ "zed-util-macros",
  "zed_actions",
 ]
 
@@ -18480,10 +18238,10 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "cloud_llm_client",
- "collections",
  "gpui",
  "serde",
  "workspace-hack",
+ "zed-collections",
 ]
 
 [[package]]
@@ -18495,12 +18253,12 @@ dependencies = [
  "cloud_llm_client",
  "futures 0.3.31",
  "gpui",
- "http_client",
  "language_model",
  "serde",
  "serde_json",
  "web_search",
  "workspace-hack",
+ "zed-http-client",
 ]
 
 [[package]]
@@ -19616,14 +19374,12 @@ dependencies = [
  "call",
  "client",
  "clock",
- "collections",
  "component",
  "dap",
  "db",
  "fs",
  "futures 0.3.31",
  "gpui",
- "http_client",
  "itertools 0.14.0",
  "language",
  "log",
@@ -19647,10 +19403,12 @@ dependencies = [
  "tempfile",
  "theme",
  "ui",
- "util",
  "uuid",
  "windows 0.61.1",
  "workspace-hack",
+ "zed-collections",
+ "zed-http-client",
+ "zed-util",
  "zed_actions",
  "zlog",
 ]
@@ -19853,14 +19611,12 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clock",
- "collections",
  "fs",
  "futures 0.3.31",
  "fuzzy",
  "git",
  "git2",
  "gpui",
- "http_client",
  "ignore",
  "language",
  "log",
@@ -19875,10 +19631,12 @@ dependencies = [
  "settings",
  "smallvec",
  "smol",
- "sum_tree",
  "text",
- "util",
  "workspace-hack",
+ "zed-collections",
+ "zed-http-client",
+ "zed-sum-tree",
+ "zed-util",
  "zlog",
 ]
 
@@ -19980,23 +19738,10 @@ version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61"
 
-[[package]]
-name = "xim"
-version = "0.4.0"
-source = "git+https://github.com/zed-industries/xim-rs?rev=c0a70c1bd2ce197364216e5e818a2cb3adb99a8d#c0a70c1bd2ce197364216e5e818a2cb3adb99a8d"
-dependencies = [
- "ahash 0.8.11",
- "hashbrown 0.14.5",
- "log",
- "x11rb",
- "xim-ctext",
- "xim-parser",
-]
-
 [[package]]
 name = "xim-ctext"
 version = "0.3.0"
-source = "git+https://github.com/zed-industries/xim-rs?rev=c0a70c1bd2ce197364216e5e818a2cb3adb99a8d#c0a70c1bd2ce197364216e5e818a2cb3adb99a8d"
+source = "git+https://github.com/zed-industries/xim-rs.git?rev=16f35a2c881b815a2b6cdfd6687988e84f8447d8#16f35a2c881b815a2b6cdfd6687988e84f8447d8"
 dependencies = [
  "encoding_rs",
 ]
@@ -20004,7 +19749,7 @@ dependencies = [
 [[package]]
 name = "xim-parser"
 version = "0.2.1"
-source = "git+https://github.com/zed-industries/xim-rs?rev=c0a70c1bd2ce197364216e5e818a2cb3adb99a8d#c0a70c1bd2ce197364216e5e818a2cb3adb99a8d"
+source = "git+https://github.com/zed-industries/xim-rs.git?rev=16f35a2c881b815a2b6cdfd6687988e84f8447d8#16f35a2c881b815a2b6cdfd6687988e84f8447d8"
 dependencies = [
  "bitflags 2.9.0",
 ]
@@ -20233,7 +19978,6 @@ dependencies = [
  "cli",
  "client",
  "collab_ui",
- "collections",
  "command_palette",
  "component",
  "copilot",
@@ -20262,7 +20006,6 @@ dependencies = [
  "go_to_line",
  "gpui",
  "gpui_tokio",
- "http_client",
  "image_viewer",
  "inspector_ui",
  "install_cli",
@@ -20306,7 +20049,6 @@ dependencies = [
  "release_channel",
  "remote",
  "repl",
- "reqwest 0.12.15 (git+https://github.com/zed-industries/reqwest.git?rev=951c770a32f1998d6e999cef3e59e0013e6c4415)",
  "reqwest_client",
  "rope",
  "search",
@@ -20343,7 +20085,6 @@ dependencies = [
  "ui_prompt",
  "url",
  "urlencoding",
- "util",
  "uuid",
  "vim",
  "vim_mode_setting",
@@ -20354,6 +20095,10 @@ dependencies = [
  "winresource",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-http-client",
+ "zed-reqwest",
+ "zed-util",
  "zed_actions",
  "zed_env_vars",
  "zeta",
@@ -20363,6 +20108,261 @@ dependencies = [
  "zlog_settings",
 ]
 
+[[package]]
+name = "zed-collections"
+version = "0.1.0"
+dependencies = [
+ "indexmap 2.9.0",
+ "rustc-hash 2.1.1",
+ "workspace-hack",
+]
+
+[[package]]
+name = "zed-derive-refineable"
+version = "0.1.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+ "workspace-hack",
+]
+
+[[package]]
+name = "zed-font-kit"
+version = "0.14.1-zed"
+source = "git+https://github.com/zed-industries/font-kit?rev=110523127440aefb11ce0cf280ae7c5071337ec5#110523127440aefb11ce0cf280ae7c5071337ec5"
+dependencies = [
+ "bitflags 2.9.0",
+ "byteorder",
+ "core-foundation 0.10.0",
+ "core-graphics 0.24.0",
+ "core-text",
+ "dirs 5.0.1",
+ "dwrote",
+ "float-ord",
+ "freetype-sys",
+ "lazy_static",
+ "libc",
+ "log",
+ "pathfinder_geometry",
+ "pathfinder_simd",
+ "walkdir",
+ "winapi",
+ "yeslogic-fontconfig-sys",
+]
+
+[[package]]
+name = "zed-http-client"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-compression",
+ "async-fs",
+ "async-tar",
+ "bytes 1.10.1",
+ "derive_more",
+ "futures 0.3.31",
+ "http 1.3.1",
+ "http-body 1.0.1",
+ "log",
+ "parking_lot",
+ "serde",
+ "serde_json",
+ "sha2",
+ "tempfile",
+ "url",
+ "workspace-hack",
+ "zed-reqwest",
+ "zed-util",
+]
+
+[[package]]
+name = "zed-media"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "bindgen 0.71.1",
+ "core-foundation 0.10.0",
+ "core-video",
+ "ctor",
+ "foreign-types 0.5.0",
+ "metal",
+ "objc",
+ "workspace-hack",
+]
+
+[[package]]
+name = "zed-perf"
+version = "0.1.0"
+dependencies = [
+ "serde",
+ "serde_json",
+ "workspace-hack",
+ "zed-collections",
+]
+
+[[package]]
+name = "zed-refineable"
+version = "0.1.0"
+dependencies = [
+ "workspace-hack",
+ "zed-derive-refineable",
+]
+
+[[package]]
+name = "zed-reqwest"
+version = "0.12.15-zed"
+source = "git+https://github.com/zed-industries/reqwest.git?rev=c15662463bda39148ba154100dd44d3fba5873a4#c15662463bda39148ba154100dd44d3fba5873a4"
+dependencies = [
+ "base64 0.22.1",
+ "bytes 1.10.1",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "h2 0.4.9",
+ "http 1.3.1",
+ "http-body 1.0.1",
+ "http-body-util",
+ "hyper 1.6.0",
+ "hyper-rustls 0.27.5",
+ "hyper-util",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "mime_guess",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "quinn",
+ "rustls 0.23.26",
+ "rustls-native-certs 0.8.1",
+ "rustls-pemfile 2.2.0",
+ "rustls-pki-types",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper 1.0.2",
+ "system-configuration 0.6.1",
+ "tokio",
+ "tokio-rustls 0.26.2",
+ "tokio-socks",
+ "tokio-util",
+ "tower 0.5.2",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-streams",
+ "web-sys",
+ "windows-registry 0.4.0",
+]
+
+[[package]]
+name = "zed-scap"
+version = "0.0.8-zed"
+source = "git+https://github.com/zed-industries/scap?rev=4afea48c3b002197176fb19cd0f9b180dd36eaac#4afea48c3b002197176fb19cd0f9b180dd36eaac"
+dependencies = [
+ "anyhow",
+ "cocoa 0.25.0",
+ "core-graphics-helmer-fork",
+ "log",
+ "objc",
+ "rand 0.8.5",
+ "screencapturekit",
+ "screencapturekit-sys",
+ "sysinfo",
+ "tao-core-video-sys",
+ "windows 0.61.1",
+ "windows-capture",
+ "x11",
+ "xcb",
+]
+
+[[package]]
+name = "zed-semantic-version"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "serde",
+ "workspace-hack",
+]
+
+[[package]]
+name = "zed-sum-tree"
+version = "0.1.0"
+dependencies = [
+ "arrayvec",
+ "ctor",
+ "log",
+ "rand 0.9.1",
+ "rayon",
+ "workspace-hack",
+ "zlog",
+]
+
+[[package]]
+name = "zed-util"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-fs",
+ "async_zip",
+ "command-fds",
+ "dirs 4.0.0",
+ "dunce",
+ "futures 0.3.31",
+ "futures-lite 1.13.0",
+ "git2",
+ "globset",
+ "indoc",
+ "itertools 0.14.0",
+ "libc",
+ "log",
+ "nix 0.29.0",
+ "pretty_assertions",
+ "rand 0.9.1",
+ "regex",
+ "rust-embed",
+ "schemars 1.0.1",
+ "serde",
+ "serde_json",
+ "serde_json_lenient",
+ "shlex",
+ "smol",
+ "take-until",
+ "tempfile",
+ "tendril",
+ "unicase",
+ "walkdir",
+ "workspace-hack",
+ "zed-collections",
+ "zed-util-macros",
+]
+
+[[package]]
+name = "zed-util-macros"
+version = "0.1.0"
+dependencies = [
+ "quote",
+ "syn 2.0.101",
+ "workspace-hack",
+ "zed-perf",
+]
+
+[[package]]
+name = "zed-xim"
+version = "0.4.0-zed"
+source = "git+https://github.com/zed-industries/xim-rs.git?rev=16f35a2c881b815a2b6cdfd6687988e84f8447d8#16f35a2c881b815a2b6cdfd6687988e84f8447d8"
+dependencies = [
+ "ahash 0.8.11",
+ "hashbrown 0.14.5",
+ "log",
+ "x11rb",
+ "xim-ctext",
+ "xim-parser",
+]
+
 [[package]]
 name = "zed_actions"
 version = "0.1.0"
@@ -20586,7 +20586,6 @@ dependencies = [
  "clock",
  "cloud_api_types",
  "cloud_llm_client",
- "collections",
  "command_palette_hooks",
  "copilot",
  "ctor",
@@ -20597,7 +20596,6 @@ dependencies = [
  "fs",
  "futures 0.3.31",
  "gpui",
- "http_client",
  "indoc",
  "itertools 0.14.0",
  "language",
@@ -20623,11 +20621,13 @@ dependencies = [
  "tree-sitter-go",
  "tree-sitter-rust",
  "ui",
- "util",
  "uuid",
  "workspace",
  "workspace-hack",
  "worktree",
+ "zed-collections",
+ "zed-http-client",
+ "zed-util",
  "zed_actions",
  "zlog",
 ]
@@ -20658,11 +20658,11 @@ dependencies = [
  "serde_json",
  "settings",
  "thiserror 2.0.12",
- "util",
  "uuid",
  "workspace",
  "workspace-hack",
  "worktree",
+ "zed-util",
 ]
 
 [[package]]
@@ -20673,7 +20673,6 @@ dependencies = [
  "clap",
  "client",
  "cloud_llm_client",
- "collections",
  "edit_prediction_context",
  "editor",
  "futures 0.3.31",
@@ -20689,9 +20688,10 @@ dependencies = [
  "text",
  "ui",
  "ui_input",
- "util",
  "workspace",
  "workspace-hack",
+ "zed-collections",
+ "zed-util",
  "zeta2",
  "zlog",
 ]
@@ -20731,9 +20731,9 @@ dependencies = [
  "shellexpand 2.1.2",
  "smol",
  "terminal_view",
- "util",
  "watch",
  "workspace-hack",
+ "zed-util",
  "zeta",
  "zeta2",
  "zlog",
@@ -20780,20 +20780,20 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "chrono",
- "collections",
  "log",
  "tempfile",
  "workspace-hack",
+ "zed-collections",
 ]
 
 [[package]]
 name = "zlog_settings"
 version = "0.1.0"
 dependencies = [
- "collections",
  "gpui",
  "settings",
  "workspace-hack",
+ "zed-collections",
  "zlog",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 9c64ef0464db0ad2d557c1e5d2e107fd3e6c4804..cd4b169d92a55752ea9d7ce8087342310689a6a7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -273,7 +273,7 @@ cloud_llm_client = { path = "crates/cloud_llm_client" }
 cloud_zeta2_prompt = { path = "crates/cloud_zeta2_prompt" }
 collab = { path = "crates/collab" }
 collab_ui = { path = "crates/collab_ui" }
-collections = { path = "crates/collections" }
+collections = { path = "crates/collections", package = "zed-collections", version = "0.1.0" }
 command_palette = { path = "crates/command_palette" }
 command_palette_hooks = { path = "crates/command_palette_hooks" }
 component = { path = "crates/component" }
@@ -289,6 +289,7 @@ debug_adapter_extension = { path = "crates/debug_adapter_extension" }
 debugger_tools = { path = "crates/debugger_tools" }
 debugger_ui = { path = "crates/debugger_ui" }
 deepseek = { path = "crates/deepseek" }
+derive_refineable = { path = "crates/refineable/derive_refineable", package = "zed-derive-refineable", version = "0.1.0" }
 diagnostics = { path = "crates/diagnostics" }
 editor = { path = "crates/editor" }
 extension = { path = "crates/extension" }
@@ -307,10 +308,10 @@ git_ui = { path = "crates/git_ui" }
 go_to_line = { path = "crates/go_to_line" }
 google_ai = { path = "crates/google_ai" }
 gpui = { path = "crates/gpui", default-features = false }
-gpui_macros = { path = "crates/gpui_macros" }
+gpui_macros = { path = "crates/gpui_macros", package = "gpui-macros", version = "0.1.0" }
 gpui_tokio = { path = "crates/gpui_tokio" }
 html_to_markdown = { path = "crates/html_to_markdown" }
-http_client = { path = "crates/http_client" }
+http_client = { path = "crates/http_client", package = "zed-http-client", version = "0.1.0" }
 http_client_tls = { path = "crates/http_client_tls" }
 icons = { path = "crates/icons" }
 image_viewer = { path = "crates/image_viewer" }
@@ -339,7 +340,7 @@ lsp = { path = "crates/lsp" }
 markdown = { path = "crates/markdown" }
 markdown_preview = { path = "crates/markdown_preview" }
 svg_preview = { path = "crates/svg_preview" }
-media = { path = "crates/media" }
+media = { path = "crates/media", package = "zed-media", version = "0.1.0" }
 menu = { path = "crates/menu" }
 migrator = { path = "crates/migrator" }
 mistral = { path = "crates/mistral" }
@@ -356,7 +357,7 @@ outline = { path = "crates/outline" }
 outline_panel = { path = "crates/outline_panel" }
 panel = { path = "crates/panel" }
 paths = { path = "crates/paths" }
-perf = { path = "tooling/perf" }
+perf = { path = "tooling/perf", package = "zed-perf", version = "0.1.0" }
 picker = { path = "crates/picker" }
 plugin = { path = "crates/plugin" }
 plugin_macros = { path = "crates/plugin_macros" }
@@ -368,7 +369,7 @@ project_symbols = { path = "crates/project_symbols" }
 prompt_store = { path = "crates/prompt_store" }
 proto = { path = "crates/proto" }
 recent_projects = { path = "crates/recent_projects" }
-refineable = { path = "crates/refineable" }
+refineable = { path = "crates/refineable", package = "zed-refineable", version = "0.1.0" }
 release_channel = { path = "crates/release_channel" }
 scheduler = { path = "crates/scheduler" }
 remote = { path = "crates/remote" }
@@ -381,7 +382,7 @@ rope = { path = "crates/rope" }
 rpc = { path = "crates/rpc" }
 rules_library = { path = "crates/rules_library" }
 search = { path = "crates/search" }
-semantic_version = { path = "crates/semantic_version" }
+semantic_version = { path = "crates/semantic_version", package = "zed-semantic-version", version = "0.1.0" }
 session = { path = "crates/session" }
 settings = { path = "crates/settings" }
 settings_macros = { path = "crates/settings_macros" }
@@ -394,7 +395,7 @@ sqlez_macros = { path = "crates/sqlez_macros" }
 story = { path = "crates/story" }
 storybook = { path = "crates/storybook" }
 streaming_diff = { path = "crates/streaming_diff" }
-sum_tree = { path = "crates/sum_tree" }
+sum_tree = { path = "crates/sum_tree", package = "zed-sum-tree", version = "0.1.0" }
 supermaven = { path = "crates/supermaven" }
 supermaven_api = { path = "crates/supermaven_api" }
 system_specs = { path = "crates/system_specs" }
@@ -417,8 +418,8 @@ ui = { path = "crates/ui" }
 ui_input = { path = "crates/ui_input" }
 ui_macros = { path = "crates/ui_macros" }
 ui_prompt = { path = "crates/ui_prompt" }
-util = { path = "crates/util" }
-util_macros = { path = "crates/util_macros" }
+util = { path = "crates/util", package = "zed-util", version = "0.1.0" }
+util_macros = { path = "crates/util_macros", package = "zed-util-macros", version = "0.1.0" }
 vercel = { path = "crates/vercel" }
 vim = { path = "crates/vim" }
 vim_mode_setting = { path = "crates/vim_mode_setting" }
@@ -605,7 +606,8 @@ rand = "0.9"
 rayon = "1.8"
 ref-cast = "1.0.24"
 regex = "1.5"
-reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "951c770a32f1998d6e999cef3e59e0013e6c4415", default-features = false, features = [
+# WARNING: If you change this, you must also publish a new version of zed-reqwest to crates.io
+reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "c15662463bda39148ba154100dd44d3fba5873a4", default-features = false, features = [
     "charset",
     "http2",
     "macos-system-configuration",
@@ -613,7 +615,7 @@ reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "951c77
     "rustls-tls-native-roots",
     "socks",
     "stream",
-] }
+], package = "zed-reqwest", version = "0.12.15-zed" }
 rsa = "0.9.6"
 runtimelib = {  git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734", default-features = false, features = [
     "async-dispatcher-runtime",
@@ -622,7 +624,8 @@ rust-embed = { version = "8.4", features = ["include-exclude"] }
 rustc-hash = "2.1.0"
 rustls = { version = "0.23.26" }
 rustls-platform-verifier = "0.5.0"
-scap = { git = "https://github.com/zed-industries/scap", rev = "808aa5c45b41e8f44729d02e38fd00a2fe2722e7", default-features = false }
+# WARNING: If you change this, you must also publish a new version of zed-scap to crates.io
+scap = { git = "https://github.com/zed-industries/scap", rev = "4afea48c3b002197176fb19cd0f9b180dd36eaac", default-features = false, package = "zed-scap", version = "0.0.8-zed" }
 schemars = { version = "1.0", features = ["indexmap2"] }
 semver = "1.0"
 serde = { version = "1.0.221", features = ["derive", "rc"] }
@@ -648,7 +651,7 @@ streaming-iterator = "0.1"
 strsim = "0.11"
 strum = { version = "0.27.0", features = ["derive"] }
 subtle = "2.5.0"
-syn = { version = "2.0.101", features = ["full", "extra-traits"] }
+syn = { version = "2.0.101", features = ["full", "extra-traits", "visit-mut"] }
 sys-locale = "0.3.1"
 sysinfo = "0.31.0"
 take-until = "0.2.0"
@@ -800,7 +803,7 @@ wasmtime = { opt-level = 3 }
 activity_indicator = { codegen-units = 1 }
 assets = { codegen-units = 1 }
 breadcrumbs = { codegen-units = 1 }
-collections = { codegen-units = 1 }
+zed-collections = { codegen-units = 1 }
 command_palette = { codegen-units = 1 }
 command_palette_hooks = { codegen-units = 1 }
 extension_cli = { codegen-units = 1 }
@@ -820,11 +823,11 @@ outline = { codegen-units = 1 }
 paths = { codegen-units = 1 }
 prettier = { codegen-units = 1 }
 project_symbols = { codegen-units = 1 }
-refineable = { codegen-units = 1 }
+zed-refineable = { codegen-units = 1 }
 release_channel = { codegen-units = 1 }
 reqwest_client = { codegen-units = 1 }
 rich_text = { codegen-units = 1 }
-semantic_version = { codegen-units = 1 }
+zed-semantic-version = { codegen-units = 1 }
 session = { codegen-units = 1 }
 snippet = { codegen-units = 1 }
 snippets_ui = { codegen-units = 1 }
diff --git a/crates/collections/Cargo.toml b/crates/collections/Cargo.toml
index bec87ce1eafc6af5f686dd38ed60d7ecb17c9f38..c0a6dd833851c290e276ce108106ca8ce1a793e5 100644
--- a/crates/collections/Cargo.toml
+++ b/crates/collections/Cargo.toml
@@ -1,9 +1,10 @@
 [package]
-name = "collections"
+name = "zed-collections"
 version = "0.1.0"
 edition.workspace = true
-publish.workspace = true
+publish = true
 license = "Apache-2.0"
+description = "Standard collection type re-exports used by Zed and GPUI"
 
 [lints]
 workspace = true
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 4544b561c33f4507e8264e4eed46711425ce2a04..761803fe7f38f11ad24e82e718c331a237f4609d 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -5,8 +5,13 @@ edition.workspace = true
 authors = ["Nathan Sobo <nathan@zed.dev>"]
 description = "Zed's GPU-accelerated UI framework"
 repository = "https://github.com/zed-industries/zed"
-publish.workspace = true
+publish = true
 license = "Apache-2.0"
+homepage = "https://gpui.rs"
+readme = "README.md"
+keywords = ["desktop", "gui", "immediate"]
+categories = ["gui"]
+
 
 [lints]
 workspace = true
@@ -139,7 +144,8 @@ core-foundation-sys.workspace = true
 core-graphics = "0.24"
 core-video.workspace = true
 core-text = "21"
-font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "5474cfad4b719a72ec8ed2cb7327b2b01fd10568", optional = true }
+# WARNING: If you change this, you must also publish a new version of zed-font-kit to crates.io
+font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "110523127440aefb11ce0cf280ae7c5071337ec5", package = "zed-font-kit", version = "0.14.1-zed", optional = true }
 foreign-types = "0.5"
 log.workspace = true
 media.workspace = true
@@ -170,7 +176,8 @@ blade-macros = { workspace = true, optional = true }
 blade-util = { workspace = true, optional = true }
 bytemuck = { version = "1", optional = true }
 cosmic-text = { version = "0.14.0", optional = true }
-font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "5474cfad4b719a72ec8ed2cb7327b2b01fd10568", features = [
+# WARNING: If you change this, you must also publish a new version of zed-font-kit to crates.io
+font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "110523127440aefb11ce0cf280ae7c5071337ec5", package = "zed-font-kit", version = "0.14.1-zed", features = [
     "source-fontconfig-dlopen",
 ], optional = true }
 
@@ -210,10 +217,11 @@ xkbcommon = { version = "0.8.0", features = [
     "wayland",
     "x11",
 ], optional = true }
-xim = { git = "https://github.com/zed-industries/xim-rs", rev = "c0a70c1bd2ce197364216e5e818a2cb3adb99a8d" , features = [
+# WARNING: If you change this, you must also publish a new version of zed-xim to crates.io
+xim = { git = "https://github.com/zed-industries/xim-rs.git", rev = "16f35a2c881b815a2b6cdfd6687988e84f8447d8" , features = [
     "x11rb-xcb",
     "x11rb-client",
-], optional = true }
+], package = "zed-xim", version = "0.4.0-zed", optional = true }
 x11-clipboard = { version = "0.9.3", optional = true }
 
 [target.'cfg(target_os = "windows")'.dependencies]
diff --git a/crates/gpui/README.md b/crates/gpui/README.md
index 1b492094eaf102f523427a07029c4b1558ca7af6..71d22e0cd8cd96af5cf130757a314be150aa1ec7 100644
--- a/crates/gpui/README.md
+++ b/crates/gpui/README.md
@@ -5,10 +5,10 @@ for Rust, designed to support a wide variety of applications.
 
 ## Getting Started
 
-GPUI is still in active development as we work on the Zed code editor and isn't yet on crates.io. You'll also need to use the latest version of stable Rust and be on macOS or Linux. Add the following to your `Cargo.toml`:
+GPUI is still in active development as we work on the Zed code editor, and is still pre-1.0. There will often be breaking changes between versions. You'll also need to use the latest version of stable Rust and be on macOS or Linux. Add the following to your `Cargo.toml`:
 
 ```toml
-gpui = { git = "https://github.com/zed-industries/zed" }
+gpui = { version = "*" }
 ```
 
 Everything in GPUI starts with an `Application`. You can create one with `Application::new()`, and kick off your application by passing a callback to `Application::run()`. Inside this callback, you can create a new window with `App::open_window()`, and register your first root view. See [gpui.rs](https://www.gpui.rs/) for a complete example.
diff --git a/crates/gpui_macros/Cargo.toml b/crates/gpui_macros/Cargo.toml
index 6dad698177af0bed634fc70f296bf52285f851a7..0722d8d229108c999a8f4b0ff45621b1d53587a6 100644
--- a/crates/gpui_macros/Cargo.toml
+++ b/crates/gpui_macros/Cargo.toml
@@ -1,9 +1,10 @@
 [package]
-name = "gpui_macros"
+name = "gpui-macros"
 version = "0.1.0"
 edition.workspace = true
-publish.workspace = true
+publish = true
 license = "Apache-2.0"
+description = "Macros used by gpui"
 
 [lints]
 workspace = true
diff --git a/crates/http_client/Cargo.toml b/crates/http_client/Cargo.toml
index bdcfe0fc06d4a195776fe1a4e745eb9aad55125d..3a4d875f6a99a868d4adfe39bc83bf5ee2007023 100644
--- a/crates/http_client/Cargo.toml
+++ b/crates/http_client/Cargo.toml
@@ -1,9 +1,10 @@
 [package]
-name = "http_client"
+name = "zed-http-client"
 version = "0.1.0"
 edition.workspace = true
-publish.workspace = true
+publish = true
 license = "Apache-2.0"
+description = "A HTTP client library for Zed and GPUI"
 
 [lints]
 workspace = true
diff --git a/crates/media/Cargo.toml b/crates/media/Cargo.toml
index 0dd5b8e0a4dabccdffbd3b3fe304f72dae77a25e..be72aa0b08b215c49937e0ca6a992d1470bec4df 100644
--- a/crates/media/Cargo.toml
+++ b/crates/media/Cargo.toml
@@ -1,9 +1,10 @@
 [package]
-name = "media"
+name = "zed-media"
 version = "0.1.0"
 edition.workspace = true
-publish.workspace = true
+publish = true
 license = "Apache-2.0"
+description = "Bindings to macos media handling APIs for Zed"
 
 [lints]
 workspace = true
diff --git a/crates/refineable/Cargo.toml b/crates/refineable/Cargo.toml
index 88348c6edc5b1d5937ad2efb2a1eb848f5c60ddf..76ed82548d1bfc8cda3976a09f5f0e424b1857b0 100644
--- a/crates/refineable/Cargo.toml
+++ b/crates/refineable/Cargo.toml
@@ -1,9 +1,10 @@
 [package]
-name = "refineable"
+name = "zed-refineable"
 version = "0.1.0"
 edition.workspace = true
-publish.workspace = true
+publish = true
 license = "Apache-2.0"
+description = "A macro for creating 'refinement' types that can be used to partially initialize or mutate a complex struct"
 
 [lints]
 workspace = true
@@ -13,5 +14,5 @@ path = "src/refineable.rs"
 doctest = false
 
 [dependencies]
-derive_refineable = { path = "./derive_refineable" }
+derive_refineable.workspace = true
 workspace-hack.workspace = true
diff --git a/crates/refineable/derive_refineable/Cargo.toml b/crates/refineable/derive_refineable/Cargo.toml
index 2afc8cd1afc066349008ad690e64de491657e310..42b9ef9ca69deef406c3f64229a9f392d064d33c 100644
--- a/crates/refineable/derive_refineable/Cargo.toml
+++ b/crates/refineable/derive_refineable/Cargo.toml
@@ -1,9 +1,11 @@
 [package]
-name = "derive_refineable"
+name = "zed-derive-refineable"
 version = "0.1.0"
 edition.workspace = true
-publish.workspace = true
+publish = true
 license = "Apache-2.0"
+description = "A derive macro for creating refinement types in Rust"
+
 
 [lints]
 workspace = true
diff --git a/crates/refineable/src/refineable.rs b/crates/refineable/src/refineable.rs
index 930f80dbefada3ee15b9c6a1ca2fabed78b21034..d2a7c3d3f2148ae174be10121dc23b4dbfc5a650 100644
--- a/crates/refineable/src/refineable.rs
+++ b/crates/refineable/src/refineable.rs
@@ -17,47 +17,6 @@ pub use derive_refineable::Refineable;
 /// - **Optional fields** (`Option<T>`): Remain as `Option<T>`
 /// - **Regular fields**: Become `Option<T>`
 ///
-/// ## Example
-///
-/// ```
-/// use derive_refineable::Refineable as _;
-/// use refineable::Refineable;
-///
-/// #[derive(Refineable, Clone, Default)]
-/// struct Example {
-///     color: String,
-///     font_size: Option<u32>,
-///     #[refineable]
-///     margin: Margin,
-/// }
-///
-/// #[derive(Refineable, Clone, Default)]
-/// struct Margin {
-///     top: u32,
-///     left: u32,
-/// }
-///
-///
-/// fn example() {
-///     let mut base_style = Example::default();
-///     let refinement = ExampleRefinement {
-///         color: Some("red".to_string()),
-///         font_size: None,
-///         margin: MarginRefinement {
-///             top: Some(10),
-///             left: None,
-///         },
-///     };
-///
-///     base_style.refine(&refinement);
-/// }
-/// ```
-///
-/// This generates `ExampleRefinement` with:
-/// - `color: Option<String>`
-/// - `font_size: Option<u32>` (unchanged)
-/// - `margin: MarginRefinement`
-///
 /// ## Attributes
 ///
 /// The derive macro supports these attributes on the struct:
diff --git a/crates/semantic_version/Cargo.toml b/crates/semantic_version/Cargo.toml
index eafbf903ffda809f0735c5dcaf6965e682264c86..b0ecef94d71026a0b596baafc7460b96ade7d4c0 100644
--- a/crates/semantic_version/Cargo.toml
+++ b/crates/semantic_version/Cargo.toml
@@ -1,9 +1,10 @@
 [package]
-name = "semantic_version"
+name = "zed-semantic-version"
 version = "0.1.0"
 edition.workspace = true
-publish.workspace = true
+publish = true
 license = "Apache-2.0"
+description = "A library for working with semantic versioning in gpui and Zed"
 
 [lints]
 workspace = true
diff --git a/crates/sum_tree/Cargo.toml b/crates/sum_tree/Cargo.toml
index 63542b0615493125af4a72a8ab2bbe613e364ff3..2e95bc8a5f60b7431ed5d75d57c3f2e2afbe2724 100644
--- a/crates/sum_tree/Cargo.toml
+++ b/crates/sum_tree/Cargo.toml
@@ -1,9 +1,10 @@
 [package]
-name = "sum_tree"
+name = "zed-sum-tree"
 version = "0.1.0"
 edition.workspace = true
-publish.workspace = true
+publish = true
 license = "Apache-2.0"
+description = "A sum tree data structure, a concurrency-friendly B-tree"
 
 [lints]
 workspace = true
diff --git a/crates/util/Cargo.toml b/crates/util/Cargo.toml
index c42688bf9162f649437de990f3f219d1479e2515..cb7aaec3745ff39108c13cd03a48ce4ed9232c9a 100644
--- a/crates/util/Cargo.toml
+++ b/crates/util/Cargo.toml
@@ -1,9 +1,11 @@
 [package]
-name = "util"
+name = "zed-util"
 version = "0.1.0"
 edition.workspace = true
-publish.workspace = true
+publish = true
 license = "Apache-2.0"
+description = "A collection of utility structs and functions used by Zed and GPUI"
+
 
 [lints]
 workspace = true
diff --git a/crates/util/src/paths.rs b/crates/util/src/paths.rs
index 3fe6a526c866ff132b8f77d7efb4673bcc2a65fa..31424fd6e3b6e02b8fa00ad3bc7d86a64ff35f74 100644
--- a/crates/util/src/paths.rs
+++ b/crates/util/src/paths.rs
@@ -427,7 +427,7 @@ impl PathWithPosition {
     /// # Examples
     ///
     /// ```
-    /// # use util::paths::PathWithPosition;
+    /// # use zed_util::paths::PathWithPosition;
     /// # use std::path::PathBuf;
     /// assert_eq!(PathWithPosition::parse_str("test_file"), PathWithPosition {
     ///     path: PathBuf::from("test_file"),
@@ -458,7 +458,7 @@ impl PathWithPosition {
     ///
     /// # Expected parsing results when encounter ill-formatted inputs.
     /// ```
-    /// # use util::paths::PathWithPosition;
+    /// # use zed_util::paths::PathWithPosition;
     /// # use std::path::PathBuf;
     /// assert_eq!(PathWithPosition::parse_str("test_file.rs:a"), PathWithPosition {
     ///     path: PathBuf::from("test_file.rs:a"),
diff --git a/crates/util/src/util.rs b/crates/util/src/util.rs
index 7ec4552c779ac48f76012f47c3424ffbf89c9833..a54aa209cf425cbfa697c6bff13423c93b82cf47 100644
--- a/crates/util/src/util.rs
+++ b/crates/util/src/util.rs
@@ -940,7 +940,7 @@ impl PartialOrd for NumericPrefixWithSuffix<'_> {
 /// # Examples
 ///
 /// ```
-/// use util::capitalize;
+/// use zed_util::capitalize;
 ///
 /// assert_eq!(capitalize("hello"), "Hello");
 /// assert_eq!(capitalize("WORLD"), "WORLD");
diff --git a/crates/util_macros/Cargo.toml b/crates/util_macros/Cargo.toml
index 344331f1395ebb90251c4b08f92c57f28213fa4f..b1c0334c870f7fee799ddc8b208ba9ad8d48fc53 100644
--- a/crates/util_macros/Cargo.toml
+++ b/crates/util_macros/Cargo.toml
@@ -1,9 +1,10 @@
 [package]
-name = "util_macros"
+name = "zed-util-macros"
 version = "0.1.0"
 edition.workspace = true
-publish.workspace = true
+publish = true
 license = "Apache-2.0"
+description = "Utility macros for Zed"
 
 [lints]
 workspace = true
diff --git a/crates/util_macros/src/util_macros.rs b/crates/util_macros/src/util_macros.rs
index 4973e41de2837645d29378ba2572430289c8ac86..2cdc7f46f5f0f015498b90e736a7cbe7863f2784 100644
--- a/crates/util_macros/src/util_macros.rs
+++ b/crates/util_macros/src/util_macros.rs
@@ -12,7 +12,7 @@ use syn::{ItemFn, LitStr, parse_macro_input, parse_quote};
 ///
 /// # Example
 /// ```rust
-/// use util_macros::path;
+/// use zed_util_macros::path;
 ///
 /// let path = path!("/Users/user/file.txt");
 /// #[cfg(target_os = "windows")]
@@ -43,7 +43,7 @@ pub fn path(input: TokenStream) -> TokenStream {
 ///
 /// # Example
 /// ```rust
-/// use util_macros::uri;
+/// use zed_util_macros::uri;
 ///
 /// let uri = uri!("file:///path/to/file");
 /// #[cfg(target_os = "windows")]
@@ -69,7 +69,7 @@ pub fn uri(input: TokenStream) -> TokenStream {
 ///
 /// # Example
 /// ```rust
-/// use util_macros::line_endings;
+/// use zed_util_macros::line_endings;
 ///
 /// let text = line_endings!("Hello\nWorld");
 /// #[cfg(target_os = "windows")]
@@ -156,7 +156,7 @@ impl PerfArgs {
 ///
 /// # Examples
 /// ```rust
-/// use util_macros::perf;
+/// use zed_util_macros::perf;
 ///
 /// #[perf]
 /// fn generic_test() {
@@ -172,7 +172,7 @@ impl PerfArgs {
 /// This also works with `#[gpui::test]`s, though in most cases it shouldn't
 /// be used with automatic iterations.
 /// ```rust,ignore
-/// use util_macros::perf;
+/// use zed_util_macros::perf;
 ///
 /// #[perf(iterations = 1, critical)]
 /// #[gpui::test]
diff --git a/tooling/perf/Cargo.toml b/tooling/perf/Cargo.toml
index bae7d7442f101c75d6fe320a36584e4853ad2f21..bbca817a3e7fcdb2bbe599715f29604cc4b05a1c 100644
--- a/tooling/perf/Cargo.toml
+++ b/tooling/perf/Cargo.toml
@@ -1,9 +1,10 @@
 [package]
-name = "perf"
+name = "zed-perf"
 version = "0.1.0"
-description = "A tool for measuring Zed test performance, with too many Clippy lints"
-publish.workspace = true
+publish = true
 edition.workspace = true
+license = "Apache-2.0"
+description = "A tool for measuring Zed test performance, with too many Clippy lints"
 
 [lib]
 
diff --git a/tooling/perf/src/main.rs b/tooling/perf/src/main.rs
index 0ab1a0f396525414a930b2c52796dc010b24c279..910b172958a0d9ade05c907b38794a6afd993f03 100644
--- a/tooling/perf/src/main.rs
+++ b/tooling/perf/src/main.rs
@@ -46,7 +46,7 @@
 //! This should probably not be called manually unless you're working on the profiler
 //! itself; use the `cargo perf-test` alias (after building this crate) instead.
 
-use perf::{FailKind, Importance, Output, TestMdata, Timings, consts};
+use zed_perf::{FailKind, Importance, Output, TestMdata, Timings, consts};
 
 use std::{
     fs::OpenOptions,