doc updates

Cargo.toml

@@ -33,7 +33,6 @@ gix = "0.52.0"
 tiny_http = "0.12.0"
 keyring = "2.1.0"
 whoami = "1.4.1"
-dialoguer = "0.11.0"
 
 [workspace.dependencies]
 anyhow = "1"

README.md

@@ -1,6 +1,3 @@
-see if i can put secret storage in the agent
-- vscode check to see if i can stub out the secrets stuff
-
 # sg.nvim
 
 **Status**: Beta
@@ -11,19 +8,17 @@ see if i can put secret storage in the agent
 - [Installation](#installation)
 - [Configuration](#configuration)
 
-sg.nvim is a plugin focused on bringing many of the features of sourcegraph.com into Neovim.
+sg.nvim is a plugin focused on bringing many of the features of sourcegraph.com and Cody into Neovim.
 
 ## Setup
 
-To configure logging in:
+To Log In, either:
 
-- Log in on your Sourcegraph instance.
-- Click your user menu in the top right, then select Settings > Access tokens.
-- Create your access token, and then run `:SourcegraphLogin` in your neovim editor after installation.
-- Type in the link to your Sourcegraph instance (for example: `https://sourcegraph.com`)
-- And then paste in your access token.
+- Run `:SourcegraphLogin` after following installation instructions for `sourcegraph.com` usage.
+- Use the `SRC_ENDPOINT` and `SRC_ACCESS_TOKEN` environment variables to manage tokens for enterprise usage.
+  - See :[src-cli](https://github.com/sourcegraph/src-cli#log-into-your-sourcegraph-instance) for more info
 
-An alternative to this is to use the environment variables specified for [src-cli](https://github.com/sourcegraph/src-cli#log-into-your-sourcegraph-instance).
+See `:help sg.auth` for more information.
 
 You can check that you're logged in by then running `:checkhealth sg`
 
@@ -43,6 +38,8 @@ Requires:
 
 ### Install
 
+Regardless of installation method, you must call `require("sg").setup { ... }` in your config.
+
 <details>
 <summary><code>lazy.nvim</code></summary>
 
@@ -126,8 +123,8 @@ nnoremap <space>ss <cmd>lua require('sg.extensions.telescope').fuzzy_search_resu
 Cody:
 
 - [x] Chat interface and associated commands
-- [ ] Autocompletions, prompted
-- [ ] Autocompletions, suggested
+- [x] Autocompletions, prompted
+- [x] Autocompletions, suggested
 
 Sourcegraph Browsing:
 
@@ -146,14 +143,10 @@ Sourcegraph Browsing:
   - [x] Goto Definition
   - [ ] Goto References
     - [x] <20 references
-    - [ ] kind of broken right now for lots of references
 - [x] Basic Search
   - [x] literal, regexp and structural search support
   - [x] `type:symbol` support
   - [ ] repo support
-- [ ] Advanced Search Features
-  - [ ] Autocompletion
-  - [ ] Memory of last searches
 - More? Make an issue with something you're missing :)
 
 

lua/sg/auth.lua

@@ -5,6 +5,9 @@
 --- How to manage authentication for Sourcegraph within Neovim
 --- (both for Cody and for Sourcegraph)
 ---
+--- To manage your sourcegraph account, visit:
+---     - https://sourcegraph.com/cody/manage
+---
 --- Use SRC_ENDPOINT and SRC_ACCESS_TOKEN environment variables to
 --- manually override previous configuration.
 ---
@@ -30,17 +33,6 @@ end
 local endpoint = vim.env.SRC_ENDPOINT
 local token = vim.env.SRC_ACCESS_TOKEN
 
--- TODO: Don't know if this is a good idea or not
--- local timer = vim.loop.new_timer()
--- timer:start(
---   0,
---   10000,
---   vim.schedule_wrap(function()
---     endpoint = vim.env.SRC_ENDPOINT
---     token = vim.env.SRC_ACCESS_TOKEN
---   end)
--- )
-
 --- Gets authorization from the environment variables.
 ---     It is possible these will be initialized from previous
 ---     session configuration, if not already present.

lua/sg/health.lua

@@ -153,6 +153,7 @@ local report_cody_account = function()
   -- This isn't sensitive, but I think it's just confusing for users
   user_info.id = nil
 
+  vim.health.info "To manage your Cody Account, navigate to: https://sourcegraph.com/cody/manage"
   vim.health.ok(string.format("Cody Account Information: %s", vim.inspect(user_info)))
   return true
 end

src/bin/sg-nvim-agent.rs

@@ -69,24 +69,11 @@ async fn main() -> Result<()> {
     });
 
     let notifications: JoinHandle<Result<()>> = tokio::spawn(async move {
-        // let stdout = stdout.clone();
-
-        // .auth/github/login?pc=https%3A%2F%2Fgithub.com%2F%3A%3Ae917b2b7fa9040e1edd4
-        //  &redirect=/post-sign-up?returnTo=/user/settings/tokens/new/callback?requestFrom=JETBRAINS-$port"
-
         while let Some(task) = rx.recv().await {
             match task {
                 NeovimTasks::Authentication { port } => {
-                    std::thread::spawn(|| {
+                    std::thread::spawn(move || {
                         let server = tiny_http::Server::http(format!("127.0.0.1:{port}")).unwrap();
-                        let addr = server.server_addr();
-                        let ip = match addr {
-                            tiny_http::ListenAddr::IP(ip) => ip,
-                            _ => todo!(),
-                        };
-
-                        // TODO: Get a neovim one (but this is fine for now)
-
                         let request = server.recv().expect("to launch request");
 
                         // Create url to parse the parameters, a bit goofy but it is what it is