Supermaven

Cargo.toml

@@ -20,7 +20,6 @@ members = [
     "crates/command_palette",
     "crates/command_palette_hooks",
     "crates/copilot",
-    "crates/copilot_ui",
     "crates/db",
     "crates/diagnostics",
     "crates/editor",
@@ -42,6 +41,7 @@ members = [
     "crates/gpui_macros",
     "crates/headless",
     "crates/image_viewer",
+    "crates/inline_completion_button",
     "crates/install_cli",
     "crates/journal",
     "crates/language",
@@ -86,6 +86,8 @@ members = [
     "crates/storybook",
     "crates/sum_tree",
     "crates/tab_switcher",
+    "crates/supermaven",
+    "crates/supermaven_api",
     "crates/terminal",
     "crates/terminal_view",
     "crates/text",
@@ -159,7 +161,6 @@ color = { path = "crates/color" }
 command_palette = { path = "crates/command_palette" }
 command_palette_hooks = { path = "crates/command_palette_hooks" }
 copilot = { path = "crates/copilot" }
-copilot_ui = { path = "crates/copilot_ui" }
 db = { path = "crates/db" }
 diagnostics = { path = "crates/diagnostics" }
 editor = { path = "crates/editor" }
@@ -180,6 +181,7 @@ gpui_macros = { path = "crates/gpui_macros" }
 headless = { path = "crates/headless" }
 install_cli = { path = "crates/install_cli" }
 image_viewer = { path = "crates/image_viewer" }
+inline_completion_button = { path = "crates/inline_completion_button" }
 journal = { path = "crates/journal" }
 language = { path = "crates/language" }
 language_selector = { path = "crates/language_selector" }
@@ -220,6 +222,8 @@ settings = { path = "crates/settings" }
 snippet = { path = "crates/snippet" }
 sqlez = { path = "crates/sqlez" }
 sqlez_macros = { path = "crates/sqlez_macros" }
+supermaven = { path = "crates/supermaven" }
+supermaven_api = { path = "crates/supermaven_api"}
 story = { path = "crates/story" }
 storybook = { path = "crates/storybook" }
 sum_tree = { path = "crates/sum_tree" }

assets/settings/default.json

@@ -12,8 +12,8 @@
   "base_keymap": "VSCode",
   // Features that can be globally enabled or disabled
   "features": {
-    // Show Copilot icon in status bar
-    "copilot": true
+    // Which inline completion provider to use.
+    "inline_completion_provider": "copilot"
   },
   // The name of a font to use for rendering text in the editor
   "buffer_font_family": "Zed Mono",

crates/anthropic/src/anthropic.rs

@@ -1,7 +1,7 @@
 use anyhow::{anyhow, Result};
 use futures::{io::BufReader, stream::BoxStream, AsyncBufReadExt, AsyncReadExt, StreamExt};
 use serde::{Deserialize, Serialize};
-use std::convert::TryFrom;
+use std::{convert::TryFrom, sync::Arc};
 use util::http::{AsyncBody, HttpClient, Method, Request as HttpRequest};
 
 #[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)]
@@ -141,7 +141,7 @@ pub enum TextDelta {
 }
 
 pub async fn stream_completion(
-    client: &dyn HttpClient,
+    client: Arc<dyn HttpClient>,
     api_url: &str,
     api_key: &str,
     request: Request,

crates/collab/Cargo.toml

@@ -39,6 +39,7 @@ 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

crates/collab/k8s/collab.template.yml

@@ -172,6 +172,11 @@ spec:
                 secretKeyRef:
                   name: slack
                   key: panics_webhook
+            - name: SUPERMAVEN_ADMIN_API_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: supermaven
+                  key: api_key
             - name: INVITE_LINK_PREFIX
               value: ${INVITE_LINK_PREFIX}
             - name: RUST_BACKTRACE

crates/collab/src/completion.rs

@@ -0,0 +1,2 @@
+use anyhow::{anyhow, Result};
+use rpc::proto;

crates/collab/src/lib.rs

@@ -138,6 +138,7 @@ pub struct Config {
     pub zed_client_checksum_seed: Option<String>,
     pub slack_panics_webhook: Option<String>,
     pub auto_join_channel_id: Option<ChannelId>,
+    pub supermaven_admin_api_key: Option<Arc<str>>,
 }
 
 impl Config {