diff --git a/.github/workflows/version_tag_action.yaml b/.github/workflows/version_tag_action.yaml
new file mode 100644
index 00000000..4ba3c582
--- /dev/null
+++ b/.github/workflows/version_tag_action.yaml
@@ -0,0 +1,27 @@
+name: Add Version Tag
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Get version from file
+        id: version
+        run: echo ::set-output name=version::$(grep -oP "(?<=s:language_server_version = ')[^']+" autoload/codeium/server.vim)
+      - name: Check if tag exists
+        id: add_tag
+        run: |
+          if git rev-parse ${{ steps.version.outputs.version }} >/dev/null 2>&1; then
+            echo "Tag already exists"
+            exit 0
+          else
+            echo "Tag doesn't exist"
+            git tag ${{ steps.version.outputs.version }} && git push origin ${{ steps.version.outputs.version }}
+          fi
+        shell: bash
diff --git a/README.md b/README.md
index 484b6adb..63a40f08 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1,26 @@
 <p align="center">
-  <img width="300" alt="Codeium" src="codeium.svg"/>
+  <img width="300" alt="Windsurf" src="windsurf.png"/>
 </p>
 
 ---
 
 [![Discord](https://img.shields.io/discord/1027685395649015980?label=community&color=5865F2&logo=discord&logoColor=FFFFFF)](https://discord.gg/3XFf78nAx5)
-[![Twitter Follow](https://img.shields.io/badge/style--blue?style=social&logo=twitter&label=Follow%20%40codeiumdev)](https://twitter.com/intent/follow?screen_name=codeiumdev)
-![License](https://img.shields.io/github/license/Exafunction/codeium.vim)
+[![Twitter Follow](https://img.shields.io/badge/style--blue?style=social&logo=twitter&label=Follow%20%40windsurf_ai)](https://twitter.com/intent/follow?screen_name=windsurf_ai)
+![License](https://img.shields.io/github/license/Exafunction/windsurf.vim)
+[![Docs](https://img.shields.io/badge/Windsurf%20Docs-09B6A2)](https://docs.windsurf.com)
+[![Canny Board](https://img.shields.io/badge/Feature%20Requests-6b69ff)](https://windsurf.canny.io/feature-requests/)
+[![built with Windsurf](https://windsurf.com/badges/main)](https://windsurf.com?repo_name=exafunction%2Fwindsurf.vim)
 
-[![Visual Studio](https://img.shields.io/visual-studio-marketplace/d/Codeium.codeium?label=Visual%20Studio&logo=visualstudio)](https://marketplace.visualstudio.com/items?itemName=Codeium.codeium)
+[![Visual Studio](https://img.shields.io/visual-studio-marketplace/i/Codeium.codeium?label=Visual%20Studio&logo=visualstudio)](https://marketplace.visualstudio.com/items?itemName=Codeium.codeium)
 [![JetBrains](https://img.shields.io/jetbrains/plugin/d/20540?label=JetBrains)](https://plugins.jetbrains.com/plugin/20540-codeium/)
 [![Open VSX](https://img.shields.io/open-vsx/dt/Codeium/codeium?label=Open%20VSX)](https://open-vsx.org/extension/Codeium/codeium)
 [![Google Chrome](https://img.shields.io/chrome-web-store/users/hobjkcpmjhlegmobgonaagepfckjkceh?label=Google%20Chrome&logo=googlechrome&logoColor=FFFFFF)](https://chrome.google.com/webstore/detail/codeium/hobjkcpmjhlegmobgonaagepfckjkceh)
 
-# codeium.vim
+# windsurf.vim
 
 _Free, ultrafast Copilot alternative for Vim and Neovim_
 
-Codeium autocompletes your code with AI in all major IDEs. We [launched](https://www.codeium.com/blog/codeium-copilot-alternative-in-vim) this implementation of the Codeium plugin for Vim and Neovim to bring this modern coding superpower to more developers. Check out our [playground](https://www.codeium.com/playground) if you want to quickly try out Codeium online.
+Windsurf autocompletes your code with AI in all major IDEs. We [launched](https://www.windsurf.com/blog/codeium-copilot-alternative-in-vim) this implementation of the Windsurf plugin for Vim and Neovim to bring this modern coding superpower to more developers. Check out our [playground](https://www.windsurf.com/playground) if you want to quickly try out Windsurf online.
 
 Contributions are welcome! Feel free to submit pull requests and issues related to the plugin.
 
@@ -32,13 +35,13 @@ Contributions are welcome! Feel free to submit pull requests and issues related
 1. Install [Vim](https://github.com/vim/vim) (at least 9.0.0185) or [Neovim](https://github.com/neovim/neovim/releases/latest) (at
    least 0.6)
 
-2. Install `Exafunction/codeium.vim` using your vim plugin manager of
+2. Install `Exafunction/windsurf.vim` using your vim plugin manager of
    choice, or manually. See [Installation Options](#-installation-options) below.
 
-3. Run `:Codeium Auth` to set up the plugin and start using Codeium.
+3. Run `:Codeium Auth` to set up the plugin and start using Windsurf.
 
 You can run `:help codeium` for a full list of commands and configuration
-options, or see [this guide](https://www.codeium.com/vim_tutorial) for a quick tutorial on how to use Codeium.
+options, or see [this guide](https://www.windsurf.com/vim_tutorial) for a quick tutorial on how to use Windsurf.
 
 ## 🛠️ Configuration
 
@@ -47,17 +50,19 @@ A few of the most popular options are highlighted below.
 
 ### ⌨️ Keybindings
 
-Codeium provides the following functions to control suggestions:
+Windsurf provides the following functions to control suggestions:
 
-|Action|Function|Default Binding|
-|---|---|---|
-|Clear current suggestion| `codeium#Clear()` |`<C-]>`|
-|Next suggestion| `codeium#CycleCompletions(1)` |`<M-]>`|
-|Previous suggestion| `codeium#CycleCompletions(-1)` |`<M-[>`|
-|Insert suggestion| `codeium#Accept()` |`<Tab>`|
-|Manually trigger suggestion| `codeium#Complete()` |`<M-Bslash>`|
+| Action                       | Function                       | Default Binding |
+| ---------------------------  | ------------------------------ | --------------- |
+| Clear current suggestion     | `codeium#Clear()`              | `<C-]>`         |
+| Next suggestion              | `codeium#CycleCompletions(1)`  | `<M-]>`         |
+| Previous suggestion          | `codeium#CycleCompletions(-1)` | `<M-[>`         |
+| Insert suggestion            | `codeium#Accept()`             | `<Tab>`         |
+| Manually trigger suggestion  | `codeium#Complete()`           | `<M-Bslash>`    |
+| Accept word from suggestion  | `codeium#AcceptNextWord()`     | `<C-k>`         |
+| Accept line from suggestion  | `codeium#AcceptNextLine()`     | `<C-l>`         |
 
-Codeium's default keybindings can be disabled by setting
+Windsurf's default keybindings can be disabled by setting
 
 ```vim
 let g:codeium_disable_bindings = 1
@@ -65,7 +70,7 @@ let g:codeium_disable_bindings = 1
 
 or in Neovim:
 
-```vim
+```lua
 vim.g.codeium_disable_bindings = 1
 ```
 
@@ -74,9 +79,10 @@ use the `g:codeium_no_map_tab` option.
 
 If you'd like to bind the actions above to different keys, this might look something like the following in Vim:
 
-
 ```vim
-imap <C-g>   <Cmd>call codeium#Accept()<CR>
+imap <script><silent><nowait><expr> <C-g> codeium#Accept()
+imap <script><silent><nowait><expr> <C-h> codeium#AcceptNextWord()
+imap <script><silent><nowait><expr> <C-j> codeium#AcceptNextLine()
 imap <C-;>   <Cmd>call codeium#CycleCompletions(1)<CR>
 imap <C-,>   <Cmd>call codeium#CycleCompletions(-1)<CR>
 imap <C-x>   <Cmd>call codeium#Clear()<CR>
@@ -87,23 +93,22 @@ Or in Neovim (using [wbthomason/packer.nvim](https://github.com/wbthomason/packe
 ```lua
 -- Remove the `use` here if you're using folke/lazy.nvim.
 use {
-  'Exafunction/codeium.vim',
+  'Exafunction/windsurf.vim',
   config = function ()
     -- Change '<C-g>' here to any keycode you like.
-    vim.keymap.set('i', '<C-g>', function () return vim.fn['codeium#Accept']() end, { expr = true })
-    vim.keymap.set('i', '<c-;>', function() return vim.fn['codeium#CycleCompletions'](1) end, { expr = true })
-    vim.keymap.set('i', '<c-,>', function() return vim.fn['codeium#CycleCompletions'](-1) end, { expr = true })
-    vim.keymap.set('i', '<c-x>', function() return vim.fn['codeium#Clear']() end, { expr = true })
+    vim.keymap.set('i', '<C-g>', function () return vim.fn['codeium#Accept']() end, { expr = true, silent = true })
+    vim.keymap.set('i', '<c-;>', function() return vim.fn['codeium#CycleCompletions'](1) end, { expr = true, silent = true })
+    vim.keymap.set('i', '<c-,>', function() return vim.fn['codeium#CycleCompletions'](-1) end, { expr = true, silent = true })
+    vim.keymap.set('i', '<c-x>', function() return vim.fn['codeium#Clear']() end, { expr = true, silent = true })
   end
 }
 ```
 
 (Make sure that you ran `:Codeium Auth` after installation.)
 
+### ⛔ Disabling Windsurf
 
-### ⛔ Disabling Codeium
-
-Codeium can be disabled for particular filetypes by setting the
+Windsurf can be disabled for particular filetypes by setting the
 `g:codeium_filetypes` variable in your vim config file (vimrc/init.vim):
 
 ```vim
@@ -113,34 +118,118 @@ let g:codeium_filetypes = {
     \ }
 ```
 
-Codeium is enabled by default for most filetypes.
+Windsurf is enabled by default for most filetypes.
 
-You can also _disable_ codeium by default with the `g:codeium_enabled`
-variable:
+You can also _disable_ codeium by default with the `g:codeium_enabled` variable,
+and enable it manually per buffer by running `:CodeiumEnable`:
 
 ```vim
 let g:codeium_enabled = v:false
 ```
 
+or in Neovim:
+
+```lua
+vim.g.codeium_enabled = false
+```
+
+Or you can disable codeium for _all filetypes_ with the `g:codeium_filetypes_disabled_by_default` variable,
+and use the `g:codeium_filetypes` variable to selectively enable codeium for specified filetypes:
+
+```vim
+" let g:codeium_enabled = v:true
+let g:codeium_filetypes_disabled_by_default = v:true
+
+let g:codeium_filetypes = {
+    \ "rust": v:true,
+    \ "typescript": v:true,
+    \ }
+```
+
+If you would like to just disable the automatic triggering of completions:
+
+```vim
+let g:codeium_manual = v:true
+
+" You might want to use `CycleOrComplete()` instead of `CycleCompletions(1)`.
+" This will make the forward cycling of suggestions also trigger the first
+" suggestion manually.
+imap <C-;> <Cmd>call codeium#CycleOrComplete()<CR>
+```
+
+To disable automatic text rendering of suggestions (the gray text that appears for a suggestion):
+
+```vim
+let g:codeium_render = v:false
+```
+
+### Show Windsurf status in statusline
+
+Windsurf status can be generated by calling the `codeium#GetStatusString()` function. In
+Neovim, you can use `vim.api.nvim_call_function("codeium#GetStatusString", {})` instead.
+It produces a 3 char long string with Windsurf status:
+
+- `'3/8'` - third suggestion out of 8
+- `'0'` - Windsurf returned no suggestions
+- `'*'` - waiting for Windsurf response
+
+In normal mode, status shows if Windsurf is enabled or disabled by showing
+`'ON'` or `'OFF'`.
+
+In order to show it in status line add following line to your `.vimrc`:
+
+```set statusline+=\{…\}%3{codeium#GetStatusString()}```
+
+Shorter variant without Windsurf logo:
+
+```set statusline+=%3{codeium#GetStatusString()}```
+
+Please check `:help statusline` for further information about building statusline in VIM.
+
+vim-airline supports Windsurf out-of-the-box since commit [3854429d](https://github.com/vim-airline/vim-airline/commit/3854429d99c8a2fb555a9837b155f33c957a2202).
+
+### Launching Windsurf Chat
+
+Calling the `codeium#Chat()` function or using the `Codeium Chat` command will enable search and indexing in the current project and launch Codeium Chat in a new browser window.
+
+```vim
+:call codeium#Chat()
+:Codeium Chat
+```
+
+The project root is determined by looking in Vim's current working directory for some specific files or directories to be present and goes up to parent directories until one is found.  This list of hints is user-configurable and the default value is:
+
+```let g:codeium_workspace_root_hints = ['.bzr','.git','.hg','.svn','_FOSSIL_','package.json']```
+
+Note that launching chat enables telemetry.
 
 ## 💾 Installation Options
 
+### 💤 Lazy
+
+```lua
+{
+  'Exafunction/windsurf.vim',
+  event = 'BufEnter'
+}
+```
+
 ### 🔌 vim-plug
 
 ```vim
-Plug 'Exafunction/codeium.vim'
+Plug 'Exafunction/windsurf.vim', { 'branch': 'main' }
 ```
 
 ### 📦 Vundle
 
 ```vim
-Plugin 'Exafunction/codeium.vim'
+Plugin 'Exafunction/windsurf.vim'
 ```
 
 ### 📦 packer.nvim:
 
 ```vim
-use 'Exafunction/codeium.vim'
+use 'Exafunction/windsurf.vim'
 ```
 
 ### 💪 Manual
@@ -151,7 +240,7 @@ Run the following. On windows, you can replace `~/.vim` with
 `$HOME/vimfiles`:
 
 ```bash
-git clone https://github.com/Exafunction/codeium.vim ~/.vim/pack/Exafunction/start/codeium.vim
+git clone https://github.com/Exafunction/windsurf.vim ~/.vim/pack/Exafunction/start/windsurf.vim
 ```
 
 #### 💻 Neovim
@@ -160,5 +249,5 @@ Run the following. On windows, you can replace `~/.config` with
 `$HOME/AppData/Local`:
 
 ```bash
-git clone https://github.com/Exafunction/codeium.vim ~/.config/nvim/pack/Exafunction/start/codeium.vim
+git clone https://github.com/Exafunction/windsurf.vim ~/.config/nvim/pack/Exafunction/start/windsurf.vim
 ```
diff --git a/autoload/codeium.vim b/autoload/codeium.vim
index f8ea2e6f..61789f38 100644
--- a/autoload/codeium.vim
+++ b/autoload/codeium.vim
@@ -1,14 +1,11 @@
 let s:hlgroup = 'CodeiumSuggestion'
-let s:annot_hlgroup = 'CodeiumAnnotation'
 let s:request_nonce = 0
+let s:using_codeium_status = 0
 
 if !has('nvim')
   if empty(prop_type_get(s:hlgroup))
     call prop_type_add(s:hlgroup, {'highlight': s:hlgroup})
   endif
-  if empty(prop_type_get(s:annot_hlgroup))
-    call prop_type_add(s:annot_hlgroup, {'highlight': s:annot_hlgroup})
-  endif
 endif
 
 let s:default_codeium_enabled = {
@@ -19,12 +16,15 @@ let s:default_codeium_enabled = {
 
 function! codeium#Enabled() abort
   if !get(g:, 'codeium_enabled', v:true) || !get(b:, 'codeium_enabled', v:true)
-      return v:false
+    return v:false
   endif
 
   let codeium_filetypes = s:default_codeium_enabled
   call extend(codeium_filetypes, get(g:, 'codeium_filetypes', {}))
-  if !get(codeium_filetypes, &filetype, 1)
+
+  let codeium_filetypes_disabled_by_default = get(g:, 'codeium_filetypes_disabled_by_default') || get(b:, 'codeium_filetypes_disabled_by_default')
+
+  if !get(codeium_filetypes, &filetype, !codeium_filetypes_disabled_by_default)
     return v:false
   endif
 
@@ -39,63 +39,100 @@ function! codeium#CompletionText() abort
   endtry
 endfunction
 
-function! codeium#Accept() abort
+function! s:CompletionInserter(current_completion, insert_text) abort
+  let default = get(g:, 'codeium_tab_fallback', pumvisible() ? "\<C-N>" : "\t")
+
   if mode() !~# '^[iR]' || !exists('b:_codeium_completions')
-    return ''
+    return default
   endif
-  let default = get(g:, 'codeium_tab_fallback', pumvisible() ? "\<C-N>" : "\t")
 
-  let current_completion = s:GetCurrentCompletionItem()
-  if current_completion isnot v:null
-    let range = current_completion.range
-    let start_offset = get(range, 'startOffset', 0)
-    let end_offset = get(range, 'endOffset', 0)
-    let [start_row, start_col] = codeium#util#OffsetToPosition(start_offset)
-    let [end_row, end_col] = codeium#util#OffsetToPosition(end_offset)
-    let suffix = get(current_completion.completion, 'suffix', {})
-    let suffix_text = get(suffix, 'text', '')
-
-    let text = current_completion.completion.text . suffix_text
-    if empty(text)
-      return default
-    endif
+  let current_completion = a:current_completion
+  if current_completion is v:null
+    return default
+  endif
 
-    let s:completion_text = text
+  let range = current_completion.range
+  let suffix = get(current_completion, 'suffix', {})
+  let suffix_text = get(suffix, 'text', '')
+  let delta = get(suffix, 'deltaCursorOffset', 0)
+  let start_offset = get(range, 'startOffset', 0)
+  let end_offset = get(range, 'endOffset', 0)
 
-    let insert_text = "\<C-R>\<C-O>=codeium#CompletionText()\<CR>"
-    let move_to_start = "\<C-O>:call cursor(" . start_row . ',' . start_col . ")\<CR>"
-    let move_to_end = "\<C-O>:call cursor(" . end_row . ',' . end_col . ")\<CR>"
+  let text = a:insert_text . suffix_text
+  if empty(text)
+    return default
+  endif
 
-    let delete_text = move_to_start
-    if start_row == end_row
-      if end_col > start_col
-        let delete_text = move_to_start . "\<C-O>d" . (end_col - start_col) . 'l'
-      endif
-    else
-      " Delete last line, then intermediate lines.
-      let delete_text = move_to_end . "\<C-O>d0" . move_to_start . repeat("\<C-O>DJ", end_row - start_row) . "\<C-O>dl"
-    endif
+  let delete_range = ''
+  if end_offset - start_offset > 0
+    let delete_bytes = end_offset - start_offset
+    let delete_chars = strchars(strpart(getline('.'), 0, delete_bytes))
+    " We insert a space, escape to normal mode, then delete the inserted space.
+    " This lets us "accept" any auto-inserted indentation which is otherwise
+    " removed when we switch to normal mode.
+    " \"_ sequence makes sure to delete to the void register.
+    " This way our current yank is not overridden.
+    let delete_range = " \<Esc>\"_x0\"_d" . delete_chars . 'li'
+  endif
+
+  let insert_text = "\<C-R>\<C-O>=codeium#CompletionText()\<CR>"
+  let s:completion_text = text
+
+  if delta == 0
+    let cursor_text = ''
+  else
+    let cursor_text = "\<C-O>:exe 'go' line2byte(line('.'))+col('.')+(" . delta . ")\<CR>"
+  endif
+  call codeium#server#Request('AcceptCompletion', {'metadata': codeium#server#RequestMetadata(), 'completion_id': current_completion.completion.completionId})
+  return delete_range . insert_text . cursor_text
+endfunction
+
+function! codeium#Accept() abort
+  let current_completion = s:GetCurrentCompletionItem()
+  return s:CompletionInserter(current_completion, current_completion is v:null ? '' : current_completion.completion.text)
+endfunction
 
-    call codeium#server#Request('AcceptCompletion', {'metadata': codeium#server#RequestMetadata(), 'completion_id': current_completion.completion.completionId})
-    return delete_text . insert_text
+function! codeium#AcceptNextWord() abort
+  let current_completion = s:GetCurrentCompletionItem()
+  let completion_parts = current_completion is v:null ? [] : get(current_completion, 'completionParts', [])
+  if len(completion_parts) == 0
+    return ''
   endif
+  let prefix_text = get(completion_parts[0], 'prefix', '')
+  let completion_text = get(completion_parts[0], 'text', '')
+  let next_word = matchstr(completion_text, '\v^\W*\k*')
+  return s:CompletionInserter(current_completion, prefix_text . next_word)
+endfunction
 
-  return default
+function! codeium#AcceptNextLine() abort
+  let current_completion = s:GetCurrentCompletionItem()
+  let text = current_completion is v:null ? '' : substitute(current_completion.completion.text, '\v\n.*$', '', '')
+  return s:CompletionInserter(current_completion, text)
 endfunction
 
-function! s:HandleCompletionsResult(out, status) abort
+function! s:HandleCompletionsResult(out, err, status) abort
   if exists('b:_codeium_completions')
     let response_text = join(a:out, '')
     try
       let response = json_decode(response_text)
+      if get(response, 'code', v:null) isnot# v:null
+        call codeium#log#Error('Invalid response from language server')
+        call codeium#log#Error(response_text)
+        call codeium#log#Error('stderr: ' . join(a:err, ''))
+        call codeium#log#Exception()
+        return
+      endif
       let completionItems = get(response, 'completionItems', [])
 
       let b:_codeium_completions.items = completionItems
       let b:_codeium_completions.index = 0
 
+      let b:_codeium_status = 2
       call s:RenderCurrentCompletion()
     catch
       call codeium#log#Error('Invalid response from language server')
+      call codeium#log#Error(response_text)
+      call codeium#log#Error('stderr: ' . join(a:err, ''))
       call codeium#log#Exception()
     endtry
   endif
@@ -123,36 +160,90 @@ function! s:ClearCompletion() abort
     let s:nvim_extmark_ids = []
   else
     call prop_remove({'type': s:hlgroup, 'all': v:true})
-    call prop_remove({'type': s:annot_hlgroup, 'all': v:true})
   endif
 endfunction
 
 function! s:RenderCurrentCompletion() abort
   call s:ClearCompletion()
+  call codeium#RedrawStatusLine()
 
-  if mode() !~# '^[iR]' || (v:false && pumvisible())
+  if mode() !~# '^[iR]'
     return ''
   endif
-  let current_completion = s:GetCurrentCompletionItem()
-  if current_completion is v:null
-    return ''
+  if !get(g:, 'codeium_render', v:true)
+    return
   endif
 
-  let start_offset = get(current_completion.range, 'startOffset', 0)
-  let [start_row, start_col] = codeium#util#OffsetToPosition(start_offset)
-  if start_row != line('.')
-    call codeium#log#Info('Ignoring completion, line number is not the current line.')
+  let current_completion = s:GetCurrentCompletionItem()
+  if current_completion is v:null
     return ''
   endif
 
   let parts = get(current_completion, 'completionParts', [])
 
   let idx = 0
+  let inline_cumulative_cols = 0
+  let diff = 0
   for part in parts
-    let [row, col] = codeium#util#OffsetToPosition(part.offset)
+    let row = get(part, 'line', 0) + 1
+    if row != line('.')
+      call codeium#log#Warn('Ignoring completion, line number is not the current line.')
+      continue
+    endif
+    if part.type ==# 'COMPLETION_PART_TYPE_INLINE'
+      let _col = inline_cumulative_cols + len(get(part, 'prefix', '')) + 1
+      let inline_cumulative_cols = _col - 1
+    else
+      let _col = len(get(part, 'prefix', '')) + 1
+    endif
     let text = part.text
+
+    if (part.type ==# 'COMPLETION_PART_TYPE_INLINE' && idx == 0) || part.type ==# 'COMPLETION_PART_TYPE_INLINE_MASK'
+      let completion_prefix = get(part, 'prefix', '')
+      let completion_line = completion_prefix . text
+      let full_line = getline(row)
+      let cursor_prefix = strpart(full_line, 0, col('.')-1)
+      let matching_prefix = 0
+      for i in range(len(completion_line))
+        if i < len(full_line) && completion_line[i] ==# full_line[i]
+          let matching_prefix += 1
+        else
+          break
+        endif
+      endfor
+      if len(cursor_prefix) > len(completion_prefix)
+        " Case where the cursor is beyond the completion (as if it added text).
+        " We should always consume text regardless of matching or not.
+        let diff = len(cursor_prefix) - len(completion_prefix)
+      elseif len(cursor_prefix) < len(completion_prefix)
+        " Case where the cursor is before the completion.
+        " It could just be a cursor move, in which case the matching prefix goes
+        " all the way to the completion prefix or beyond. Then we shouldn't do
+        " anything.
+        if matching_prefix >= len(completion_prefix)
+          let diff = matching_prefix - len(completion_prefix)
+        else
+          let diff = len(cursor_prefix) - len(completion_prefix)
+        endif
+      endif
+      if has('nvim') && diff > 0
+        let diff = 0
+      endif
+      " Adjust completion. diff needs to be applied to all inline parts and is
+      " done below.
+      if diff < 0
+        let text = completion_prefix[diff :] . text
+      elseif diff > 0
+        let text = text[diff :]
+      endif
+    endif
+
     if has('nvim')
-      let data = {'id': idx + 1, 'hl_mode': 'combine', 'virt_text_win_col': col - 1}
+      " Set priority high so that completions appear above LSP inlay hints
+      let priority = get(b:, 'codeium_virtual_text_priority',
+                  \ get(g:, 'codeium_virtual_text_priority', 65535))
+      let _virtcol = virtcol([row, _col+diff])
+      let data = {'id': idx + 1, 'hl_mode': 'combine', 'virt_text_win_col': _virtcol - 1, 'priority': priority }
       if part.type ==# 'COMPLETION_PART_TYPE_INLINE_MASK'
         let data.virt_text = [[text, s:hlgroup]]
       elseif part.type ==# 'COMPLETION_PART_TYPE_BLOCK'
@@ -166,10 +257,10 @@ function! s:RenderCurrentCompletion() abort
       endif
 
       call add(s:nvim_extmark_ids, data.id)
-      call nvim_buf_set_extmark(0, nvim_create_namespace('codeium'), row - 1, col - 1, data)
+      call nvim_buf_set_extmark(0, nvim_create_namespace('codeium'), row - 1, 0, data)
     else
       if part.type ==# 'COMPLETION_PART_TYPE_INLINE'
-        call prop_add(row, col, {'type': s:hlgroup, 'text': text})
+        call prop_add(row, _col + diff, {'type': s:hlgroup, 'text': text})
       elseif part.type ==# 'COMPLETION_PART_TYPE_BLOCK'
         let text = split(part.text, "\n", 1)
         if empty(text[-1])
@@ -177,6 +268,15 @@ function! s:RenderCurrentCompletion() abort
         endif
 
         for line in text
+          let num_leading_tabs = 0
+          for c in split(line, '\zs')
+            if c ==# "\t"
+              let num_leading_tabs += 1
+            else
+              break
+            endif
+          endfor
+          let line = repeat(' ', num_leading_tabs * shiftwidth()) . strpart(line, num_leading_tabs)
           call prop_add(row, 0, {'type': s:hlgroup, 'text_align': 'below', 'text': line})
         endfor
       endif
@@ -187,6 +287,8 @@ function! s:RenderCurrentCompletion() abort
 endfunction
 
 function! codeium#Clear(...) abort
+  let b:_codeium_status = 0
+  call codeium#RedrawStatusLine()
   if exists('g:_codeium_timer')
     call timer_stop(remove(g:, '_codeium_timer'))
   endif
@@ -203,6 +305,7 @@ function! codeium#Clear(...) abort
     endif
     call s:RenderCurrentCompletion()
     unlet! b:_codeium_completions
+
   endif
 
   if a:0 == 0
@@ -252,10 +355,25 @@ function! codeium#Complete(...) abort
     return
   endif
 
+  if &encoding !=# 'latin1' && &encoding !=# 'utf-8'
+    echoerr 'Only latin1 and utf-8 are supported'
+    return
+  endif
+
+  let other_documents = []
+  let current_bufnr = bufnr('%')
+  let loaded_buffers = getbufinfo({'bufloaded':1})
+  for buf in loaded_buffers
+    if buf.bufnr != current_bufnr && getbufvar(buf.bufnr, '&filetype') !=# ''
+      call add(other_documents, codeium#doc#GetDocument(buf.bufnr, 1, 1))
+    endif
+  endfor
+
   let data = {
         \ 'metadata': codeium#server#RequestMetadata(),
-        \ 'document': codeium#doc#GetCurrentDocument(),
-        \ 'editor_options': codeium#doc#GetEditorOptions()
+        \ 'document': codeium#doc#GetDocument(bufnr(), line('.'), col('.')),
+        \ 'editor_options': codeium#doc#GetEditorOptions(),
+        \ 'other_documents': other_documents
         \ }
 
   if exists('b:_codeium_completions.request_data') && b:_codeium_completions.request_data ==# data
@@ -270,6 +388,7 @@ function! codeium#Complete(...) abort
   let data.metadata.request_id = request_id
 
   try
+    let b:_codeium_status = 1
     let request_job = codeium#server#Request('GetCompletions', data, function('s:HandleCompletionsResult', []))
 
     let b:_codeium_completions = {
@@ -283,8 +402,165 @@ function! codeium#Complete(...) abort
 endfunction
 
 function! codeium#DebouncedComplete(...) abort
-  call codeium#Clear(v:false)
+  call codeium#Clear()
+  if get(g:, 'codeium_manual', v:false)
+    return
+  endif
   let current_buf = bufnr('')
   let delay = get(g:, 'codeium_idle_delay', 75)
   let g:_codeium_timer = timer_start(delay, function('codeium#Complete', [current_buf]))
 endfunction
+
+function! codeium#CycleOrComplete() abort
+  if s:GetCurrentCompletionItem() is v:null
+    call codeium#Complete()
+  else
+    call codeium#CycleCompletions(1)
+  endif
+endfunction
+
+function BuildChatUrl(metadata, chat_port, ws_port) abort
+  let config = get(g:, 'codeium_server_config', {})
+  let l:has_enterprise_extension = 'false'
+  if has_key(config, 'api_url') && !empty(config.api_url)
+    let l:has_enterprise_extension = 'true'
+  endif
+
+  " Hard-coded to English locale and allowed telemetry.
+  let l:url = 'http://127.0.0.1:' . a:chat_port . '/?' . 'api_key=' . a:metadata.api_key . '&ide_name=' . a:metadata.ide_name . '&ide_version=' . a:metadata.ide_version . '&extension_name=' . a:metadata.extension_name . '&extension_version=' . a:metadata.extension_version . '&web_server_url=ws://127.0.0.1:' . a:ws_port . '&has_enterprise_extension=' . l:has_enterprise_extension . '&app_name=Vim&locale=en&ide_telemetry_enabled=true&has_index_service=true'
+  return l:url
+endfunction
+
+function! s:LaunchChat(out, err, status) abort
+  let l:metadata = codeium#server#RequestMetadata()
+  let l:processes = json_decode(join(a:out, ''))
+  let l:chat_port = l:processes['chatClientPort']
+  let l:ws_port = l:processes['chatWebServerPort']
+
+  let l:url = BuildChatUrl(l:metadata, l:chat_port, l:ws_port)
+  let l:browser = codeium#command#BrowserCommand()
+  let opened_browser = v:false
+  if !empty(browser)
+    echomsg 'Navigating to ' . l:url
+    try
+      call system(l:browser . ' ' . '"' . l:url . '"')
+      if v:shell_error is# 0
+        let l:opened_browser = v:true
+      endif
+    catch
+    endtry
+
+    if !l:opened_browser
+      echomsg 'Failed to open browser. Please go to the link above.'
+    endif
+  else
+    echomsg 'No available browser found. Please go to ' . l:url
+  endif
+endfunction
+
+let g:codeium_workspace_root_hints = ['.bzr','.git','.hg','.svn','_FOSSIL_','package.json']
+function! s:GetProjectRoot() abort
+  let l:last_dir = ''
+  let l:dir = getcwd()
+  while l:dir != l:last_dir
+    for l:root_hint in g:codeium_workspace_root_hints
+      let l:hint = l:dir . '/' . l:root_hint
+      if isdirectory(l:hint) || filereadable(l:hint)
+        return l:dir
+      endif
+    endfor
+    let l:last_dir = l:dir
+    let l:dir = fnamemodify(l:dir, ':h')
+  endwhile
+  return getcwd()
+endfunction
+
+function! codeium#RefreshContext() abort
+  " current buffer is 1
+  try
+    call codeium#server#Request('RefreshContextForIdeAction', {'active_document': codeium#doc#GetDocument(1, line('.'), col('.'))})
+  catch
+    call codeium#log#Exception()
+  endtry
+endfunction
+
+" This assumes a single workspace is involved per Vim session, for now.
+let s:codeium_workspace_indexed = v:false
+function! codeium#AddTrackedWorkspace() abort
+  if (!codeium#Enabled() || s:codeium_workspace_indexed)
+    return
+  endif
+  let s:codeium_workspace_indexed = v:true
+  try
+    call codeium#server#Request('AddTrackedWorkspace', {'workspace': s:GetProjectRoot()})
+  catch
+    call codeium#log#Exception()
+  endtry
+endfunction
+
+function! codeium#Chat() abort
+  if (!codeium#Enabled())
+    return
+  endif
+  try
+    call codeium#RefreshContext()
+    call codeium#server#Request('GetProcesses', codeium#server#RequestMetadata(), function('s:LaunchChat', []))
+    call codeium#AddTrackedWorkspace()
+    " If user has chat_ports set, they are probably using vim remotely and trying to use chat via port forwarding.
+    " In that case display the url here so that it is easier to copy, as the browser will fail to open automatically. 
+    let chat_ports = get(g:, 'codeium_port_config', {})
+    if has_key(chat_ports, 'chat_client') && !empty(chat_ports.chat_client) && has_key(chat_ports, 'web_server') && !empty(chat_ports.web_server)
+      let l:metadata = codeium#server#RequestMetadata()
+      let l:url = BuildChatUrl(l:metadata, chat_ports.chat_client, chat_ports.web_server)
+      echomsg l:url
+    endif
+  catch
+    call codeium#log#Exception()
+  endtry
+endfunction
+
+function! codeium#GetStatusString(...) abort
+  let s:using_codeium_status = 1
+  if (!codeium#Enabled())
+    return 'OFF'
+  endif
+  if mode() !~# '^[iR]'
+    return ' ON'
+  endif
+  if exists('b:_codeium_status') && b:_codeium_status > 0
+    if b:_codeium_status == 2
+      if exists('b:_codeium_completions') &&
+            \ has_key(b:_codeium_completions, 'items') &&
+            \ has_key(b:_codeium_completions, 'index')
+        if len(b:_codeium_completions.items) > 0
+          return printf('%d/%d', b:_codeium_completions.index + 1, len(b:_codeium_completions.items))
+        else
+          return ' 0 '
+        endif
+      endif
+    endif
+    if b:_codeium_status == 1
+      return ' * '
+    endif
+    return ' 0 '
+  endif
+  return '   '
+endfunction
+
+function! codeium#RedrawStatusLine() abort
+  if s:using_codeium_status
+    redrawstatus
+  endif
+endfunction
+
+function! codeium#ServerLeave() abort
+  if !exists('g:codeium_server_job') || g:codeium_server_job is v:null
+    return
+  endif
+
+  if has('nvim')
+    call jobstop(g:codeium_server_job)
+  else
+    call job_stop(g:codeium_server_job)
+  endif
+endfunction
diff --git a/autoload/codeium/command.vim b/autoload/codeium/command.vim
index fd4299fd..e7350287 100644
--- a/autoload/codeium/command.vim
+++ b/autoload/codeium/command.vim
@@ -10,17 +10,7 @@ function! codeium#command#BrowserCommand() abort
   endif
 endfunction
 
-function! s:Uuid() abort
-  if has('win32')
-    return system('powershell -Command "[guid]::NewGuid().Guid"')
-  elseif executable('uuidgen')
-    return system('uuidgen')
-  endif
-
-  throw 'Could not generate uuid. Please make sure uuidgen is installed.'
-endfunction
-
-function! s:XdgConfigDir() abort
+function! codeium#command#XdgConfigDir() abort
   let config_dir = $XDG_CONFIG_HOME
   if empty(config_dir)
     let config_dir = $HOME . '/.config'
@@ -29,10 +19,16 @@ function! s:XdgConfigDir() abort
 endfunction
 
 function! codeium#command#HomeDir() abort
-  return $HOME . '/.codeium'
+  let data_dir = $XDG_DATA_HOME
+  if empty(data_dir)
+    let data_dir = $HOME . '/.codeium'
+  else
+    let data_dir = data_dir . '/.codeium'
+  endif
+  return data_dir
 endfunction
 
-function! s:LoadConfig(dir) abort
+function! codeium#command#LoadConfig(dir) abort
   let config_path = a:dir . '/config.json'
   if filereadable(config_path)
     let contents = join(readfile(config_path), '')
@@ -44,7 +40,7 @@ function! s:LoadConfig(dir) abort
   return {}
 endfunction
 
-let s:api_key = get(s:LoadConfig(codeium#command#HomeDir()), 'apiKey', '')
+let s:api_key = get(codeium#command#LoadConfig(codeium#command#HomeDir()), 'apiKey', '')
 
 let s:commands = {}
 
@@ -55,23 +51,18 @@ function! s:commands.Auth(...) abort
     else
       let min_version = 'Vim 9.0.0185'
     endif
-    echo 'This version of Vim is unsupported. Install ' . min_version . ' or greater to use Codeium.'
+    echoerr 'This version of Vim is unsupported. Install ' . min_version . ' or greater to use Codeium.'
     return
   endif
 
-  let uuid = trim(s:Uuid())
-  let url = 'https://www.codeium.com/profile?response_type=token&redirect_uri=vim-show-auth-token&state=' . uuid . '&scope=openid%20profile%20email&redirect_parameters_type=query'
+  let config = get(g:, 'codeium_server_config', {})
+  let portal_url = get(config, 'portal_url', 'https://www.codeium.com')
+
+  let url = portal_url . '/profile?response_type=token&redirect_uri=vim-show-auth-token&state=a&scope=openid%20profile%20email&redirect_parameters_type=query'
   let browser = codeium#command#BrowserCommand()
   let opened_browser = v:false
   if !empty(browser)
-    echo 'Press ENTER to login to Codeium in your browser.'
-
-    let c = getchar()
-    while c isnot# 13 && c isnot# 10 && c isnot# 0
-      let c = getchar()
-    endwhile
-
-    echo 'Navigating to ' . url
+    echomsg 'Navigating to ' . url
     try
       call system(browser . ' ' . '"' . url . '"')
       if v:shell_error is# 0
@@ -81,25 +72,51 @@ function! s:commands.Auth(...) abort
     endtry
 
     if !opened_browser
-      echo 'Failed to open browser. Please go to the link above.'
+      echomsg 'Failed to open browser. Please go to the link above.'
     endif
   else
-    echo 'No available browser found. Please go to ' . url
+    echomsg 'No available browser found. Please go to ' . url
   endif
 
   let api_key = ''
-  let auth_token = input('Paste your token here: ')
+  call inputsave()
+  let auth_token = inputsecret('Paste your token here: ')
+  call inputrestore()
   let tries = 0
 
+  if has_key(config, 'api_url') && !empty(config.api_url)
+    let register_user_url = config.api_url . '/exa.seat_management_pb.SeatManagementService/RegisterUser'
+  else
+    let register_user_url = 'https://api.codeium.com/register_user/'
+  endif
+
   while empty(api_key) && tries < 3
-    let command = 'curl -s https://api.codeium.com/register_user/ ' .
+    let command = 'curl -sSL ' . register_user_url . ' ' .
           \ '--header "Content-Type: application/json" ' .
-          \ '--data ' . '"' . json_encode({'firebase_id_token': auth_token})->substitute('"', '\\"', 'g') . '"'
+          \ '--data ' . shellescape(json_encode({'firebase_id_token': auth_token}))
     let response = system(command)
+    let curl_ssl_error = 'The revocation function was unable to check revocation '
+          \ . 'for the certificate.'
+    if has('win32') && response=~curl_ssl_error
+        call inputsave()
+        let useNoSsl = input('For Windows systems behind a corporate proxy there '
+              \ . 'may be trouble verifying the SSL certificates. '
+              \ . 'Would you like to try auth without checking SSL certificate revocation? (y/n): ')
+        call inputrestore()
+        if useNoSsl ==? 'y'
+            let command = 'curl --ssl-no-revoke -sSL ' . register_user_url . ' ' .
+                  \ '--header "Content-Type: application/json" ' .
+                  \ '--data ' . shellescape(json_encode({'firebase_id_token': auth_token}))
+            let response = system(command)
+        endif
+    endif
     let res = json_decode(response)
     let api_key = get(res, 'api_key', '')
     if empty(api_key)
-      let auth_token = input('Invalid token, please try again: ')
+      echomsg 'Unexpected response: ' . response
+      call inputsave()
+      let auth_token = inputsecret('Invalid token, please try again: ')
+      call inputrestore()
     endif
     let tries = tries + 1
   endwhile
@@ -108,7 +125,7 @@ function! s:commands.Auth(...) abort
     let s:api_key = api_key
     let config_dir = codeium#command#HomeDir()
     let config_path = config_dir . '/config.json'
-    let config = s:LoadConfig(config_dir)
+    let config = codeium#command#LoadConfig(config_dir)
     let config.apiKey = api_key
 
     try
@@ -120,6 +137,10 @@ function! s:commands.Auth(...) abort
   endif
 endfunction
 
+function s:commands.Chat(...) abort
+  call codeium#Chat()
+endfunction
+
 function! s:commands.Disable(...) abort
   let g:codeium_enabled = 0
 endfunction
@@ -128,15 +149,36 @@ function! s:commands.DisableBuffer(...) abort
   let b:codeium_enabled = 0
 endfunction
 
+" Run codeium server only if its not already started
+function! codeium#command#StartLanguageServer() abort
+  if !get(g:, 'codeium_server_started', v:false)
+    call timer_start(0, function('codeium#server#Start'))
+    let g:codeium_server_started = v:true
+  endif
+endfunction
+
 function! s:commands.Enable(...) abort
   let g:codeium_enabled = 1
+  call codeium#command#StartLanguageServer()
 endfunction
 
 function! s:commands.EnableBuffer(...) abort
   let b:codeium_enabled = 1
+  call codeium#command#StartLanguageServer()
+endfunction
+
+function! s:commands.Toggle(...) abort
+  if exists('g:codeium_enabled') && g:codeium_enabled == v:false
+      call s:commands.Enable()
+  else
+      call s:commands.Disable()
+  endif
 endfunction
 
 function! codeium#command#ApiKey() abort
+  if s:api_key == ''
+    echom 'Codeium: No API key found; maybe you need to run `:Codeium Auth`?'
+  endif
   return s:api_key
 endfunction
 
diff --git a/autoload/codeium/doc.vim b/autoload/codeium/doc.vim
index 11ed8ba6..8084d089 100644
--- a/autoload/codeium/doc.vim
+++ b/autoload/codeium/doc.vim
@@ -21,6 +21,7 @@ let s:language_enum = {
       \ 'julia': 19,
       \ 'kotlin': 20,
       \ 'latex': 21,
+      \ 'tex': 21,
       \ 'less': 22,
       \ 'lua': 23,
       \ 'makefile': 24,
@@ -43,7 +44,7 @@ let s:language_enum = {
       \ 'sql': 41,
       \ 'starlark': 42,
       \ 'swift': 43,
-      \ 'tsx': 44,
+      \ 'typescriptreact': 44,
       \ 'typescript': 45,
       \ 'visualbasic': 46,
       \ 'vue': 47,
@@ -51,6 +52,21 @@ let s:language_enum = {
       \ 'xsl': 49,
       \ 'yaml': 50,
       \ 'svelte': 51,
+      \ 'toml': 52,
+      \ 'dart': 53,
+      \ 'rst': 54,
+      \ 'ocaml': 55,
+      \ 'cmake': 56,
+      \ 'pascal': 57,
+      \ 'elixir': 58,
+      \ 'fsharp': 59,
+      \ 'lisp': 60,
+      \ 'matlab': 61,
+      \ 'ps1': 62,
+      \ 'solidity': 63,
+      \ 'ada': 64,
+      \ 'blade': 84,
+      \ 'astro': 85,
       \ }
 
 let s:filetype_aliases = {
@@ -59,6 +75,7 @@ let s:filetype_aliases = {
       \ 'cs': 'csharp',
       \ 'cuda': 'cudacpp',
       \ 'dosini': 'ini',
+      \ 'javascriptreact': 'javascript',
       \ 'make': 'makefile',
       \ 'objc': 'objectivec',
       \ 'objcpp': 'objectivecpp',
@@ -68,20 +85,25 @@ let s:filetype_aliases = {
       \ 'text': 'plaintext',
       \ }
 
-function! codeium#doc#GetCurrentDocument() abort
-  let lines = getline(1, '$')
-  if &endofline
+function! codeium#doc#GetDocument(bufId, curLine, curCol) abort
+  let lines = getbufline(a:bufId, 1, '$')
+  if getbufvar(a:bufId, '&endofline')
     call add(lines, '')
   endif
 
-  let filetype = substitute(&filetype, '\..*', '', '')
+  let filetype = substitute(getbufvar(a:bufId, '&filetype'), '\..*', '', '')
   let language = get(s:filetype_aliases, empty(filetype) ? 'text' : filetype, filetype)
-
+  if empty(filetype) && get(g:, 'codeium_warn_filetype_missing', v:true)
+    call codeium#log#Warn('No filetype detected. This will affect completion quality.')
+    let g:codeium_warn_filetype_missing = v:false
+  endif
+  let editor_language = empty(getbufvar(a:bufId, '&filetype')) ? 'unspecified' : getbufvar(a:bufId, '&filetype')
   let doc = {
         \ 'text': join(lines, codeium#util#LineEndingChars()),
-        \ 'editor_language': &filetype,
+        \ 'editor_language': editor_language,
         \ 'language': get(s:language_enum, language, 0),
-        \ 'cursor_offset': codeium#util#PositionToOffset('.', '.'),
+        \ 'cursor_position': {'row': a:curLine - 1, 'col': a:curCol - 1},
+        \ 'absolute_path_migrate_me_to_uri': fnamemodify(bufname(a:bufId), ':p'),
         \ }
 
   let line_ending = codeium#util#LineEndingChars(v:null)
diff --git a/autoload/codeium/server.vim b/autoload/codeium/server.vim
index a5750cb3..eba00cf5 100644
--- a/autoload/codeium/server.vim
+++ b/autoload/codeium/server.vim
@@ -1,7 +1,7 @@
-let s:language_server_version = '1.1.28'
-let s:language_server_sha = '432f829edc3b3d25a8b895a0db8db6e348620ab3'
+let s:language_server_version = '1.20.8'
+let s:language_server_sha = '37f12b83df389802b7d4e293b3e1a986aca289c0'
 let s:root = expand('<sfile>:h:h:h')
-
+let s:bin = v:null
 
 if has('nvim')
   let s:ide = 'neovim'
@@ -25,13 +25,96 @@ if !exists('s:editor_version')
 endif
 
 let s:server_port = v:null
-let s:server_job = v:null
+if codeium#util#IsUsingRemoteChat()
+  let s:server_port = 42100
+endif
+
+let g:codeium_server_job = v:null
+
+function! s:DetectGlibcVersion() abort
+  if !has('unix') || has('mac')
+    return v:null
+  endif
+
+  try
+    try
+      let ldd_output = system('ldd --version 2>/dev/null')
+      if v:shell_error == 0
+        let match = matchlist(ldd_output, 'ldd (GNU libc) \(\d\+\.\d\+\)')
+        if !empty(match)
+          call codeium#log#Info('Detected glibc version via ldd: ' . match[1])
+          return match[1]
+        endif
+      endif
+    catch
+    endtry
+
+    try
+      let getconf_output = system('getconf GNU_LIBC_VERSION 2>/dev/null')
+      if v:shell_error == 0
+        let match = matchlist(getconf_output, 'glibc \(\d\+\.\d\+\)')
+        if !empty(match)
+          call codeium#log#Info('Detected glibc version via getconf: ' . match[1])
+          return match[1]
+        endif
+      endif
+    catch
+    endtry
+
+    try
+      let libc_output = system('/lib/x86_64-linux-gnu/libc.so.6 2>/dev/null')
+      if v:shell_error == 0
+        let match = matchlist(libc_output, 'GNU C Library.*release version \(\d\+\.\d\+\)')
+        if !empty(match)
+          call codeium#log#Info('Detected glibc version via libc.so.6: ' . match[1])
+          return match[1]
+        endif
+      endif
+    catch
+    endtry
+
+    call codeium#log#Warn('Could not detect glibc version using any method')
+    return v:null
+  catch
+    call codeium#log#Error('Error detecting glibc version: ' . v:exception)
+    return v:null
+  endtry
+endfunction
+
+function! s:CompareVersions(version1, version2) abort
+  let parts1 = split(a:version1, '\.')
+  let parts2 = split(a:version2, '\.')
+  
+  let major1 = str2nr(parts1[0])
+  let minor1 = str2nr(parts1[1])
+  let major2 = str2nr(parts2[0])
+  let minor2 = str2nr(parts2[1])
+  
+  if major1 != major2
+    return major1 < major2 ? -1 : 1
+  endif
+  
+  if minor1 != minor2
+    return minor1 < minor2 ? -1 : 1
+  endif
+  
+  return 0
+endfunction
+
+function! s:IsGlibcVersionLessOrEqual(target_version) abort
+  let current_version = s:DetectGlibcVersion()
+  if current_version is# v:null
+    return v:false
+  endif
+  
+  return s:CompareVersions(current_version, a:target_version) <= 0
+endfunction
 
 function! s:OnExit(result, status, on_complete_cb) abort
   let did_close = has_key(a:result, 'closed')
   if did_close
     call remove(a:result, 'closed')
-    call a:on_complete_cb(a:result.out, a:status)
+    call a:on_complete_cb(a:result.out, a:result.err, a:status)
   else
     " Wait until we receive OnClose, and call on_complete_cb then.
     let a:result.exit_status = a:status
@@ -41,7 +124,7 @@ endfunction
 function! s:OnClose(result, on_complete_cb) abort
   let did_exit = has_key(a:result, 'exit_status')
   if did_exit
-    call a:on_complete_cb(a:result.out, a:result.exit_status)
+    call a:on_complete_cb(a:result.out, a:result.err, a:result.exit_status)
   else
     " Wait until we receive OnExit, and call on_complete_cb then.
     let a:result.closed = v:true
@@ -65,27 +148,38 @@ function! codeium#server#Request(type, data, ...) abort
   if s:server_port is# v:null
     throw 'Server port has not been properly initialized.'
   endif
-  let uri = 'http://localhost:' . s:server_port .
+  let uri = 'http://127.0.0.1:' . s:server_port .
       \ '/exa.language_server_pb.LanguageServerService/' . a:type
+  let data = json_encode(a:data)
   let args = [
-              \ 'curl', uri,
+              \ 'curl', '-L', uri,
               \ '--header', 'Content-Type: application/json',
-              \ '--data', json_encode(a:data)
+              \ '-d@-'
               \ ]
-  let result = {'out': []}
+  let result = {'out': [], 'err': []}
   let ExitCallback = a:0 && !empty(a:1) ? a:1 : function('s:NoopCallback')
   if has('nvim')
-    return jobstart(args, {
+    let jobid = jobstart(args, {
                 \ 'on_stdout': { channel, data, t -> add(result.out, join(data, "\n")) },
-                \ 'on_exit': { job, status, t -> ExitCallback(result.out, status) },
+                \ 'on_stderr': { channel, data, t -> add(result.err, join(data, "\n")) },
+                \ 'on_exit': { job, status, t -> ExitCallback(result.out, result.err, status) },
                 \ })
+    call chansend(jobid, data)
+    call chanclose(jobid, 'stdin')
+    return jobid
   else
-    return job_start(args, {
+    let job = job_start(args, {
+                \ 'in_mode': 'raw',
                 \ 'out_mode': 'raw',
                 \ 'out_cb': { channel, data -> add(result.out, data) },
+                \ 'err_cb': { channel, data -> add(result.err, data) },
                 \ 'exit_cb': { job, status -> s:OnExit(result, status, ExitCallback) },
                 \ 'close_cb': { channel -> s:OnClose(result, ExitCallback) }
                 \ })
+    let channel = job_getchannel(job)
+    call ch_sendraw(channel, data)
+    call ch_close_in(channel)
+    return job
   endif
 endfunction
 
@@ -96,12 +190,33 @@ function! s:FindPort(dir, timer) abort
     if time - getftime(path) <= 5 && getftype(path) ==# 'file'
       call codeium#log#Info('Found port: ' . name)
       let s:server_port = name
+      call s:RequestServerStatus()
       call timer_stop(a:timer)
       break
     endif
   endfor
 endfunction
 
+function! s:RequestServerStatus() abort
+  call codeium#server#Request('GetStatus', {'metadata': codeium#server#RequestMetadata()}, function('s:HandleGetStatusResponse'))
+endfunction
+
+function! s:HandleGetStatusResponse(out, err, status) abort
+  " Check if the request was successful
+  if a:status == 0
+    " Parse the JSON response
+    let response = json_decode(join(a:out, "\n"))
+    let status = get(response, 'status', {})
+    " Check if there is a message in the response and echo it
+    if has_key(status, 'message') && !empty(status.message)
+      echom status.message
+    endif
+  else
+    " Handle error if the status is not 0 or if there is stderr output
+    call codeium#log#Error(join(a:err, "\n"))
+  endif
+endfunction
+
 function! s:SendHeartbeat(timer) abort
   try
     call codeium#server#Request('Heartbeat', {'metadata': codeium#server#RequestMetadata()})
@@ -110,11 +225,34 @@ function! s:SendHeartbeat(timer) abort
   endtry
 endfunction
 
-function! codeium#server#Start(timer) abort
-  let os = substitute(system('uname'), '\n', '', '')
-  let arch = substitute(system('uname -m'), '\n', '', '')
+function! codeium#server#Start(...) abort
+  let user_defined_codeium_bin = get(g:, 'codeium_bin', '')
+
+  if user_defined_codeium_bin != '' && filereadable(user_defined_codeium_bin)
+    let s:bin = user_defined_codeium_bin
+    call s:ActuallyStart()
+    return
+  endif
+  let user_defined_os = get(g:, 'codeium_os', '')
+  let user_defined_arch = get(g:, 'codeium_arch', '')
+
+  if user_defined_os != '' && user_defined_arch != ''
+    let os = user_defined_os
+    let arch = user_defined_arch
+  else
+    silent let os = substitute(system('uname'), '\n', '', '')
+    silent let arch = substitute(system('uname -m'), '\n', '', '')
+  endif
   let is_arm = stridx(arch, 'arm') == 0 || stridx(arch, 'aarch64') == 0
 
+  if empty(os)
+    if has("linux")
+      let os = "Linux"
+    elseif has("mac")
+      let os = "Darwin"
+    endif
+  endif
+
   if os ==# 'Linux' && is_arm
     let bin_suffix = 'linux_arm'
   elseif os ==# 'Linux'
@@ -127,66 +265,138 @@ function! codeium#server#Start(timer) abort
     let bin_suffix = 'windows_x64.exe'
   endif
 
-  let bin_dir = codeium#command#HomeDir() . '/bin/' . s:language_server_sha
-  let bin = bin_dir . '/language_server_' . bin_suffix
+  let config = get(g:, 'codeium_server_config', {})
+  if has_key(config, 'portal_url') && !empty(config.portal_url)
+    let has_old_glibc = s:IsGlibcVersionLessOrEqual('2.27')
+    if has_old_glibc
+      call codeium#log#Info('Using legacy language server version 1.46.0 for enterprise customer with glibc <= 2.27')
+      let s:language_server_version = '1.46.0'
+      let s:language_server_sha = 'enterprise-' . s:language_server_version
+    elseif config.portal_url =~# '\.windsurf\.com' || config.portal_url =~# 'dstart\.com'
+      call codeium#log#Info('Using pinned language server version 1.50.100 for enterprise customer')
+      let s:language_server_version = '1.50.100'
+      let s:language_server_sha = 'enterprise-' . s:language_server_version
+    else
+      let response = system('curl -sL ' . config.portal_url . '/api/version')
+      if v:shell_error == '0'
+        let s:language_server_version = response
+        let s:language_server_sha = 'enterprise-' . s:language_server_version
+      else
+        call codeium#log#Error('Failed to fetch version from ' . config.portal_url)
+        call codeium#log#Error(v:shell_error)
+      endif
+    endif
+  endif
+
+  let sha = get(codeium#command#LoadConfig(codeium#command#XdgConfigDir()), 'sha', s:language_server_sha)
+  let bin_dir = codeium#command#HomeDir() . '/bin/' . sha
+  let s:bin = bin_dir . '/language_server_' . bin_suffix
   call mkdir(bin_dir, 'p')
 
-  if empty(glob(bin))
-    let url = 'https://github.com/Exafunction/codeium/releases/download/language-server-v' . s:language_server_version . '/language_server_' . bin_suffix . '.gz'
-    call system('curl -Lo ' . shellescape(bin . '.gz') . ' ' . url)
-    if has('win32')
-      " Save old settings.
-      let old_shell = &shell
-      let old_shellquote = &shellquote
-      let old_shellpipe = &shellpipe
-      let old_shellxquote = &shellxquote
-      let old_shellcmdflag = &shellcmdflag
-      let old_shellredir = &shellredir
-      " Switch to powershell.
-      let &shell = 'powershell'
-      set shellquote= shellpipe=\| shellxquote=
-      set shellcmdflag=-NoLogo\ -NoProfile\ -ExecutionPolicy\ RemoteSigned\ -Command
-      set shellredir=\|\ Out-File\ -Encoding\ UTF8
-      call system('& { . ' . shellescape(s:root . '/powershell/gzip.ps1') . '; Expand-File ' . shellescape(bin . '.gz') . ' }')
-      " Restore old settings.
-      let &shell = old_shell
-      let &shellquote = old_shellquote
-      let &shellpipe = old_shellpipe
-      let &shellxquote = old_shellxquote
-      let &shellcmdflag = old_shellcmdflag
-      let &shellredir = old_shellredir
+  if !filereadable(s:bin)
+    call delete(s:bin)
+    if sha ==# s:language_server_sha
+      let config = get(g:, 'codeium_server_config', {})
+      if has_key(config, 'portal_url') && !empty(config.portal_url)
+        let base_url = config.portal_url
+      else
+        let base_url = 'https://github.com/Exafunction/codeium/releases/download'
+      endif
+      let base_url = substitute(base_url, '/\+$', '', '')
+      let url = base_url . '/language-server-v' . s:language_server_version . '/language_server_' . bin_suffix . '.gz'
+    else
+      let url = 'https://storage.googleapis.com/exafunction-dist/codeium/' . sha . '/language_server_' . bin_suffix . '.gz'
+    endif
+    let args = ['curl', '-Lo', s:bin . '.gz', url]
+    if has('nvim')
+      let s:download_job = jobstart(args, {'on_exit': { job, status, t -> s:UnzipAndStart(status) }})
     else
-      call system('gzip -d ' . bin . '.gz')
-      call system('chmod +x ' . bin)
+      let s:download_job = job_start(args, {'exit_cb': { job, status -> s:UnzipAndStart(status) }})
     endif
-    if empty(glob(bin))
-      call codeium#log#Error('Failed to download language server binary.')
+  else
+    call s:ActuallyStart()
+  endif
+endfunction
+
+function! s:UnzipAndStart(status) abort
+  if has('win32')
+    " Save old settings.
+    let old_shell = &shell
+    let old_shellquote = &shellquote
+    let old_shellpipe = &shellpipe
+    let old_shellxquote = &shellxquote
+    let old_shellcmdflag = &shellcmdflag
+    let old_shellredir = &shellredir
+    " Switch to powershell.
+    let &shell = 'powershell'
+    set shellquote=\"
+    set shellpipe=\|
+    set shellcmdflag=-NoLogo\ -NoProfile\ -ExecutionPolicy\ RemoteSigned\ -Command
+    set shellredir=\|\ Out-File\ -Encoding\ UTF8
+    call system('& { . ' . shellescape(s:root . '/powershell/gzip.ps1') . '; Expand-File ' . shellescape(s:bin . '.gz') . ' }')
+    " Restore old settings.
+    let &shell = old_shell
+    let &shellquote = old_shellquote
+    let &shellpipe = old_shellpipe
+    let &shellxquote = old_shellxquote
+    let &shellcmdflag = old_shellcmdflag
+    let &shellredir = old_shellredir
+  else
+    if !executable('gzip')
+      call codeium#log#Error('Failed to extract language server binary: missing `gzip`.')
       return ''
     endif
+    call system('gzip -d ' . s:bin . '.gz')
+    call system('chmod +x ' . s:bin)
+  endif
+  if !filereadable(s:bin)
+    call codeium#log#Error('Failed to download language server binary.')
+    return ''
   endif
+  call s:ActuallyStart()
+endfunction
 
+function! s:ActuallyStart() abort
   let config = get(g:, 'codeium_server_config', {})
+  let chat_ports = get(g:, 'codeium_port_config', {})
   let manager_dir = tempname() . '/codeium/manager'
   call mkdir(manager_dir, 'p')
-
   let args = [
-        \ bin,
-        \ '--api_server_host', get(config, 'api_host', 'server.codeium.com'),
-        \ '--api_server_port', get(config, 'api_port', '443'),
-        \ '--manager_dir', manager_dir
+        \ s:bin,
+        \ '--api_server_url', get(config, 'api_url', 'https://server.codeium.com'),
+        \ '--enable_local_search', '--enable_index_service', '--search_max_workspace_file_count', '5000',
+        \ '--enable_chat_web_server', '--enable_chat_client'
         \ ]
+  if has_key(config, 'api_url') && !empty(config.api_url)
+    let args += ['--enterprise_mode']
+    let args += ['--portal_url', get(config, 'portal_url', 'https://codeium.example.com')]
+  endif
+  if !codeium#util#IsUsingRemoteChat()
+    let args += ['--manager_dir', manager_dir]
+  endif
+  " If either of these is set, only one vim window (with any number of buffers) will work with Codeium.
+  " Opening other vim windows won't be able to use Codeium features.
+  if has_key(chat_ports, 'web_server') && !empty(chat_ports.web_server)
+    let args += ['--chat_web_server_port', chat_ports.web_server]
+  endif
+  if has_key(chat_ports, 'chat_client') && !empty(chat_ports.chat_client)
+    let args += ['--chat_client_port', chat_ports.chat_client]
+  endif
 
   call codeium#log#Info('Launching server with manager_dir ' . manager_dir)
   if has('nvim')
-    let s:server_job = jobstart(args, {
+    let g:codeium_server_job = jobstart(args, {
                 \ 'on_stderr': { channel, data, t -> codeium#log#Info('[SERVER] ' . join(data, "\n")) },
                 \ })
   else
-    let s:server_job = job_start(args, {
+    let g:codeium_server_job = job_start(args, {
                 \ 'out_mode': 'raw',
                 \ 'err_cb': { channel, data -> codeium#log#Info('[SERVER] ' . data) },
                 \ })
   endif
-  call timer_start(500, function('s:FindPort', [manager_dir]), {'repeat': -1})
+  if !codeium#util#IsUsingRemoteChat()
+    call timer_start(500, function('s:FindPort', [manager_dir]), {'repeat': -1})
+  endif
+
   call timer_start(5000, function('s:SendHeartbeat', []), {'repeat': -1})
 endfunction
diff --git a/autoload/codeium/util.vim b/autoload/codeium/util.vim
index 7c7c7505..48eae30b 100644
--- a/autoload/codeium/util.vim
+++ b/autoload/codeium/util.vim
@@ -1,61 +1,5 @@
-let s:line_endings = {
-      \ 'unix': "\n",
-      \ 'dos': "\r\n",
-      \ 'mac': "\r",
-      \ }
-
 function! codeium#util#LineEndingChars(...) abort
-  if has_key(s:line_endings, &fileformat)
-    return get(s:line_endings, &fileformat)
-  endif
-  if a:0 && !empty(a:1)
-    return a:1
-  else
-    return "\n"
-  endif
-endfunction
-
-function! codeium#util#UTF8Width(str) abort
-  return strchars(substitute(a:str, "\\%#=2[^\u0001-\uffff]", '    ', 'g'))
-endfunction
-
-function! codeium#util#PositionToOffset(row, col) abort
-  let lines_pre = getline(1, line(a:row) - 1)
-  let line = getline(a:row)
-  let col_index = col(a:col) - (mode() =~# '^[iR]' || empty(line))
-  call add(lines_pre, strpart(line, 0, col_index))
-
-  let text_pre = join(lines_pre, codeium#util#LineEndingChars())
-  return codeium#util#UTF8Width(text_pre)
-endfunction
-
-function! codeium#util#OffsetToPosition(offset) abort
-  " Ideally we could just use byte2line, but encoding might not be UTF-8.
-  let line_ending_len = len(codeium#util#LineEndingChars())
-  let char_offset = a:offset + 1
-  let row = 1
-
-  for line in getline(1, '$')
-    let line_len = codeium#util#UTF8Width(line) + line_ending_len
-    if line_len >= char_offset
-      let col_num = 1
-
-      for s:char in split(getline(row), '\zs')
-        let char_width = codeium#util#UTF8Width(s:char)
-        if char_width >= char_offset
-          return [row, col_num]
-        endif
-        let col_num = col_num + 1
-        let char_offset = char_offset - char_width
-      endfor
-      return [row, col([row, '$'])]
-    endif
-    let char_offset = char_offset - line_len
-    let row = row + 1
-  endfor
-
-  let row = line('$')
-  return [row, col([row, '$'])]
+  return "\n"
 endfunction
 
 function! codeium#util#HasSupportedVersion() abort
@@ -64,3 +8,8 @@ function! codeium#util#HasSupportedVersion() abort
 
   return s:nvim_virt_text_support || s:vim_virt_text_support
 endfunction
+
+function! codeium#util#IsUsingRemoteChat() abort
+  let chat_ports = get(g:, 'codeium_port_config', {})
+  return has_key(chat_ports, 'chat_client') && !empty(chat_ports.chat_client) && has_key(chat_ports, 'web_server') && !empty(chat_ports.web_server)
+endfunction
diff --git a/codeium-simple-logo.svg b/codeium-simple-logo.svg
new file mode 100644
index 00000000..7826d8f0
--- /dev/null
+++ b/codeium-simple-logo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M1 0a1 1 0 0 0-1 1v22c0 .063.007.124.018.184L0 23.199l.025.026c.103.443.5.775.975.775h22a1 1 0 0 0 1-1V1a1 1 0 0 0-1-1H1zm.707 1h20.582l-2 2H3.707l-2-2zM23 1.705v20.588l-2-2V3.705l2-2zM1 1.707l2 2v16.492l-2 2V1.707zM4 4h16v16H4V4zm3.537 3c-1.006 0-1.51.535-1.51 1.605v2.297c0 .4-.184.6-.554.6a.47.47 0 0 0-.344.139.512.512 0 0 0-.129.365c0 .144.042.261.129.353a.47.47 0 0 0 .344.139c.37 0 .554.2.554.6v2.297c0 1.07.504 1.605 1.51 1.605.136 0 .248-.05.334-.148A.494.494 0 0 0 8 16.498a.512.512 0 0 0-.129-.365.439.439 0 0 0-.334-.139c-.376 0-.564-.199-.564-.6v-2.296c0-.46-.1-.823-.297-1.092.099-.138.173-.3.222-.485.05-.183.075-.389.075-.619V8.605c0-.4.188-.6.564-.6a.439.439 0 0 0 .334-.138A.499.499 0 0 0 8 7.512a.53.53 0 0 0-.129-.364A.425.425 0 0 0 7.537 7zm8.926 0a.425.425 0 0 0-.334.148.53.53 0 0 0-.129.364c0 .144.043.263.129.355a.439.439 0 0 0 .334.139c.376 0 .564.199.564.6v2.296c0 .23.025.436.075.62.049.183.123.346.222.484-.197.27-.297.632-.297 1.092v2.297c0 .4-.188.6-.564.6a.439.439 0 0 0-.334.138.512.512 0 0 0-.129.365c0 .145.043.262.129.354a.425.425 0 0 0 .334.148c1.006 0 1.51-.535 1.51-1.605v-2.297c0-.4.184-.6.554-.6a.439.439 0 0 0 .334-.139.475.475 0 0 0 .139-.353.492.492 0 0 0-.139-.365.439.439 0 0 0-.334-.139c-.37 0-.554-.2-.554-.6V8.605c0-1.07-.504-1.605-1.51-1.605zm-7.25 6a.737.737 0 0 0-.496.227.717.717 0 0 0-.217.529.74.74 0 0 0 .75.744.74.74 0 0 0 .75-.744.717.717 0 0 0-.217-.53A.71.71 0 0 0 9.25 13h-.037zm2.75 0a.737.737 0 0 0-.496.227.717.717 0 0 0-.217.529.74.74 0 0 0 .217.53c.152.143.33.214.533.214a.74.74 0 0 0 .75-.744.717.717 0 0 0-.217-.53A.71.71 0 0 0 12 13h-.037zm2.75 0a.737.737 0 0 0-.496.227.717.717 0 0 0-.217.529.74.74 0 0 0 .217.53c.152.143.33.214.533.214a.74.74 0 0 0 .75-.744.717.717 0 0 0-.217-.53.71.71 0 0 0-.533-.226h-.037zm-11.1 8h16.68l2 2H1.613l2-2z"/></svg>
diff --git a/codeium.svg b/codeium.svg
deleted file mode 100644
index 7df5eb2d..00000000
--- a/codeium.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg viewBox="0 0 1989 450" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M392.971 32.0294L200 225L392.971 417.971C397.314 413.627 400 407.627 400 401V49C400 42.3726 397.314 36.3726 392.971 32.0294Z" fill="#60D5C4"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M392.971 32.0294L200 225L7.02942 32.0294C11.3726 27.6863 17.3726 25 24 25H376C382.627 25 388.627 27.6863 392.971 32.0294Z" fill="#71E9D8"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.02944 32.0294L200 225L7.02944 417.971C2.68629 413.627 0 407.627 0 401V49C0 42.3726 2.68629 36.3726 7.02944 32.0294Z" fill="#60D5C4"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M392.971 417.971L200 225L7.02942 417.971C11.3726 422.314 17.3726 425 24 425H376C382.627 425 388.627 422.314 392.971 417.971Z" fill="#71E9D8"/>
-<rect x="50" y="75" width="300" height="300" rx="2" fill="#09B6A2"/>
-<path d="M120.8 315.12C101.24 315.12 91.46 305.34 91.46 285.78V243.84C91.46 236.52 87.86 232.86 80.66 232.86C78.02 232.86 75.8 232.02 74 230.34C72.32 228.66 71.48 226.5 71.48 223.86C71.48 221.1 72.32 218.88 74 217.2C75.8 215.52 78.02 214.68 80.66 214.68C87.86 214.68 91.46 211.02 91.46 203.7V161.76C91.46 142.2 101.24 132.42 120.8 132.42C123.44 132.42 125.6 133.32 127.28 135.12C128.96 136.92 129.8 139.14 129.8 141.78C129.8 144.42 128.96 146.58 127.28 148.26C125.6 149.94 123.44 150.78 120.8 150.78C113.48 150.78 109.82 154.44 109.82 161.76V203.7C109.82 207.9 109.34 211.68 108.38 215.04C107.42 218.4 105.98 221.34 104.06 223.86C107.9 228.78 109.82 235.44 109.82 243.84V285.78C109.82 293.1 113.48 296.76 120.8 296.76C123.44 296.76 125.6 297.6 127.28 299.28C128.96 300.96 129.8 303.18 129.8 305.94C129.8 308.58 128.96 310.74 127.28 312.42C125.6 314.22 123.44 315.12 120.8 315.12ZM156.733 275.88C153.373 275.88 150.433 274.68 147.913 272.28C145.513 269.76 144.313 266.82 144.313 263.46C144.313 259.98 145.513 257.04 147.913 254.64C150.433 252.12 153.373 250.86 156.733 250.86C160.213 250.86 163.153 252.12 165.553 254.64C167.953 257.04 169.153 259.98 169.153 263.46C169.153 266.82 167.953 269.76 165.553 272.28C163.153 274.68 160.213 275.88 156.733 275.88ZM199.623 275.88C196.263 275.88 193.323 274.68 190.803 272.28C188.403 269.76 187.203 266.82 187.203 263.46C187.203 259.98 188.403 257.04 190.803 254.64C193.323 252.12 196.263 250.86 199.623 250.86C203.103 250.86 206.043 252.12 208.443 254.64C210.843 257.04 212.043 259.98 212.043 263.46C212.043 266.82 210.843 269.76 208.443 272.28C206.043 274.68 203.103 275.88 199.623 275.88ZM242.514 275.88C239.154 275.88 236.214 274.68 233.694 272.28C231.294 269.76 230.094 266.82 230.094 263.46C230.094 259.98 231.294 257.04 233.694 254.64C236.214 252.12 239.154 250.86 242.514 250.86C245.994 250.86 248.934 252.12 251.334 254.64C253.734 257.04 254.934 259.98 254.934 263.46C254.934 266.82 253.734 269.76 251.334 272.28C248.934 274.68 245.994 275.88 242.514 275.88ZM278.564 315.12C275.924 315.12 273.764 314.22 272.084 312.42C270.404 310.74 269.564 308.58 269.564 305.94C269.564 303.18 270.404 300.96 272.084 299.28C273.764 297.6 275.924 296.76 278.564 296.76C285.884 296.76 289.544 293.1 289.544 285.78V243.84C289.544 235.44 291.464 228.78 295.304 223.86C293.384 221.34 291.944 218.4 290.984 215.04C290.024 211.68 289.544 207.9 289.544 203.7V161.76C289.544 154.44 285.884 150.78 278.564 150.78C275.924 150.78 273.764 149.94 272.084 148.26C270.404 146.58 269.564 144.42 269.564 141.78C269.564 139.14 270.404 136.92 272.084 135.12C273.764 133.32 275.924 132.42 278.564 132.42C298.124 132.42 307.904 142.2 307.904 161.76V203.7C307.904 211.02 311.504 214.68 318.704 214.68C321.344 214.68 323.504 215.52 325.184 217.2C326.984 218.88 327.884 221.1 327.884 223.86C327.884 226.5 326.984 228.66 325.184 230.34C323.504 232.02 321.344 232.86 318.704 232.86C311.504 232.86 307.904 236.52 307.904 243.84V285.78C307.904 305.34 298.124 315.12 278.564 315.12Z" fill="white"/>
-<path d="M592.2 363.6C574.68 363.6 558.96 359.28 545.04 350.64C531.36 342 520.44 330.24 512.28 315.36C504.36 300.48 500.4 283.8 500.4 265.32C500.4 246.84 504.36 230.16 512.28 215.28C520.44 200.4 531.36 188.64 545.04 180C558.96 171.36 574.68 167.04 592.2 167.04C609 167.04 624.24 170.52 637.92 177.48C651.84 184.2 662.4 193.44 669.6 205.2L649.08 230.4C645.24 224.88 640.32 219.84 634.32 215.28C628.32 210.72 621.96 207.12 615.24 204.48C608.52 201.84 602.04 200.52 595.8 200.52C584.28 200.52 573.96 203.4 564.84 209.16C555.96 214.68 548.88 222.36 543.6 232.2C538.32 242.04 535.68 253.08 535.68 265.32C535.68 277.56 538.44 288.6 543.96 298.44C549.48 308.04 556.8 315.72 565.92 321.48C575.04 327.24 585.12 330.12 596.16 330.12C602.64 330.12 608.88 329.04 614.88 326.88C621.12 324.72 627.12 321.48 632.88 317.16C638.64 312.84 644.04 307.56 649.08 301.32L669.6 326.52C661.92 337.32 650.88 346.2 636.48 353.16C622.32 360.12 607.56 363.6 592.2 363.6ZM789.536 363.6C771.056 363.6 754.496 359.4 739.856 351C725.456 342.36 714.056 330.72 705.656 316.08C697.256 301.2 693.056 284.28 693.056 265.32C693.056 246.36 697.256 229.56 705.656 214.92C714.056 200.04 725.456 188.4 739.856 180C754.496 171.36 771.056 167.04 789.536 167.04C807.776 167.04 824.096 171.36 838.496 180C853.136 188.4 864.656 200.04 873.056 214.92C881.456 229.56 885.656 246.36 885.656 265.32C885.656 284.28 881.456 301.2 873.056 316.08C864.656 330.72 853.136 342.36 838.496 351C824.096 359.4 807.776 363.6 789.536 363.6ZM789.536 329.76C800.816 329.76 810.896 327 819.776 321.48C828.656 315.72 835.616 308.04 840.656 298.44C845.696 288.6 848.096 277.56 847.856 265.32C848.096 252.84 845.696 241.8 840.656 232.2C835.616 222.36 828.656 214.68 819.776 209.16C810.896 203.64 800.816 200.88 789.536 200.88C778.256 200.88 768.056 203.76 758.936 209.52C750.056 215.04 743.096 222.72 738.056 232.56C733.016 242.16 730.616 253.08 730.856 265.32C730.616 277.56 733.016 288.6 738.056 298.44C743.096 308.04 750.056 315.72 758.936 321.48C768.056 327 778.256 329.76 789.536 329.76ZM1004.9 363.6C987.621 363.6 972.141 359.4 958.461 351C945.021 342.36 934.341 330.72 926.421 316.08C918.501 301.2 914.541 284.28 914.541 265.32C914.541 246.36 918.381 229.56 926.061 214.92C933.981 200.04 944.661 188.4 958.101 180C971.541 171.36 986.781 167.04 1003.82 167.04C1013.18 167.04 1022.18 168.6 1030.82 171.72C1039.7 174.6 1047.62 178.68 1054.58 183.96C1061.54 189 1066.94 194.64 1070.78 200.88C1074.86 206.88 1076.9 213 1076.9 219.24L1066.1 219.96V93.6H1103.18V360H1066.1V315H1073.3C1073.3 320.76 1071.38 326.52 1067.54 332.28C1063.7 337.8 1058.54 342.96 1052.06 347.76C1045.82 352.56 1038.5 356.4 1030.1 359.28C1021.94 362.16 1013.54 363.6 1004.9 363.6ZM1009.94 331.56C1021.22 331.56 1031.18 328.68 1039.82 322.92C1048.46 317.16 1055.18 309.36 1059.98 299.52C1065.02 289.44 1067.54 278.04 1067.54 265.32C1067.54 252.6 1065.02 241.32 1059.98 231.48C1055.18 221.4 1048.46 213.48 1039.82 207.72C1031.18 201.96 1021.22 199.08 1009.94 199.08C998.661 199.08 988.701 201.96 980.061 207.72C971.421 213.48 964.581 221.4 959.541 231.48C954.741 241.32 952.341 252.6 952.341 265.32C952.341 278.04 954.741 289.44 959.541 299.52C964.581 309.36 971.421 317.16 980.061 322.92C988.701 328.68 998.661 331.56 1009.94 331.56ZM1242.42 363.6C1222.98 363.6 1205.7 359.52 1190.58 351.36C1175.7 342.96 1163.94 331.56 1155.3 317.16C1146.9 302.76 1142.7 286.2 1142.7 267.48C1142.7 252.6 1145.1 239.04 1149.9 226.8C1154.7 214.56 1161.3 204 1169.7 195.12C1178.34 186 1188.54 179.04 1200.3 174.24C1212.3 169.2 1225.26 166.68 1239.18 166.68C1251.42 166.68 1262.82 169.08 1273.38 173.88C1283.94 178.44 1293.06 184.8 1300.74 192.96C1308.66 201.12 1314.66 210.84 1318.74 222.12C1323.06 233.16 1325.1 245.28 1324.86 258.48L1324.5 274.32H1170.06L1161.78 244.8H1292.46L1287.06 250.92V242.28C1286.34 234.36 1283.7 227.28 1279.14 221.04C1274.58 214.8 1268.82 209.88 1261.86 206.28C1254.9 202.68 1247.34 200.88 1239.18 200.88C1226.22 200.88 1215.3 203.4 1206.42 208.44C1197.54 213.24 1190.82 220.44 1186.26 230.04C1181.7 239.4 1179.42 251.04 1179.42 264.96C1179.42 278.16 1182.18 289.68 1187.7 299.52C1193.22 309.12 1201.02 316.56 1211.1 321.84C1221.18 327.12 1232.82 329.76 1246.02 329.76C1255.38 329.76 1264.02 328.2 1271.94 325.08C1280.1 321.96 1288.86 316.32 1298.22 308.16L1316.94 334.44C1311.18 340.2 1304.1 345.24 1295.7 349.56C1287.54 353.88 1278.78 357.36 1269.42 360C1260.3 362.4 1251.3 363.6 1242.42 363.6ZM1371.28 360V171H1408.36V360H1371.28ZM1389.28 129.24C1381.36 129.24 1375.24 127.2 1370.92 123.12C1366.6 119.04 1364.44 113.28 1364.44 105.84C1364.44 98.88 1366.6 93.24 1370.92 88.92C1375.48 84.6 1381.6 82.44 1389.28 82.44C1397.2 82.44 1403.32 84.48 1407.64 88.56C1411.96 92.64 1414.12 98.4 1414.12 105.84C1414.12 112.8 1411.84 118.44 1407.28 122.76C1402.96 127.08 1396.96 129.24 1389.28 129.24ZM1531.6 363.6C1518.16 363.6 1506.4 360.48 1496.32 354.24C1486.48 348 1478.8 339.24 1473.28 327.96C1468 316.68 1465.36 303.24 1465.36 287.64V171H1502.44V277.56C1502.44 288.6 1504.12 298.2 1507.48 306.36C1511.08 314.28 1516.12 320.4 1522.6 324.72C1529.32 329.04 1537.36 331.2 1546.72 331.2C1553.68 331.2 1560.04 330.12 1565.8 327.96C1571.56 325.56 1576.48 322.32 1580.56 318.24C1584.88 314.16 1588.24 309.24 1590.64 303.48C1593.04 297.72 1594.24 291.48 1594.24 284.76V171H1631.32V360H1594.24V320.4L1600.72 316.08C1597.84 324.96 1592.92 333 1585.96 340.2C1579.24 347.4 1571.2 353.16 1561.84 357.48C1552.48 361.56 1542.4 363.6 1531.6 363.6ZM1682.61 360V171H1720.05V211.32L1713.21 215.64C1715.13 209.4 1718.13 203.4 1722.21 197.64C1726.53 191.88 1731.69 186.84 1737.69 182.52C1743.93 177.96 1750.53 174.36 1757.49 171.72C1764.69 169.08 1772.01 167.76 1779.45 167.76C1790.25 167.76 1799.73 169.56 1807.89 173.16C1816.05 176.76 1822.77 182.16 1828.05 189.36C1833.33 196.56 1837.17 205.56 1839.57 216.36L1833.81 214.92L1836.33 208.8C1838.97 203.28 1842.57 198.12 1847.13 193.32C1851.93 188.28 1857.33 183.84 1863.33 180C1869.33 176.16 1875.69 173.16 1882.41 171C1889.13 168.84 1895.73 167.76 1902.21 167.76C1916.37 167.76 1928.01 170.64 1937.13 176.4C1946.49 182.16 1953.45 190.92 1958.01 202.68C1962.81 214.44 1965.21 229.08 1965.21 246.6V360H1927.77V248.76C1927.77 237.96 1926.33 229.2 1923.45 222.48C1920.81 215.52 1916.73 210.36 1911.21 207C1905.69 203.64 1898.61 201.96 1889.97 201.96C1883.25 201.96 1876.89 203.16 1870.89 205.56C1865.13 207.72 1860.09 210.84 1855.77 214.92C1851.45 219 1848.09 223.8 1845.69 229.32C1843.29 234.6 1842.09 240.48 1842.09 246.96V360H1804.65V248.04C1804.65 238.2 1803.21 229.92 1800.33 223.2C1797.45 216.24 1793.25 210.96 1787.73 207.36C1782.21 203.76 1775.49 201.96 1767.57 201.96C1760.85 201.96 1754.61 203.16 1748.85 205.56C1743.09 207.72 1738.05 210.84 1733.73 214.92C1729.41 218.76 1726.05 223.44 1723.65 228.96C1721.25 234.24 1720.05 240 1720.05 246.24V360H1682.61Z" fill="#09B6A2"/>
-</svg>
diff --git a/doc/codeium.txt b/doc/codeium.txt
index a00dea3d..5c33c70d 100644
--- a/doc/codeium.txt
+++ b/doc/codeium.txt
@@ -13,6 +13,9 @@ COMMANDS                                        *:Codeium*
                                                 *:Codeium_Auth*
 :Codeium Auth           Authenticate to Codeium.
 
+                                                *:Codeium_Chat*
+:Codeium Chat           Open Codeium Chat in a browser window
+
                                                 *:Codeium_Disable*
 :Codeium Disable        Disable Codeium completions
 
@@ -23,9 +26,15 @@ COMMANDS                                        *:Codeium*
 :Codeium DisableBuffer  Disable Codeium completions in the current buffer only.
 
                                                 *:Codeium_EnableBuffer*
-:Codeium EnableBuffer   Re-eisable Codeium completions in the current
+:Codeium EnableBuffer   Re-enable Codeium completions in the current
                         buffer after running :Codeium DisableBuffer
 
+                                                *:Codeium_Toggle*
+:Codeium Toggle         Enable Codeium completions if they are disabled.
+                        Disable Codeium completions if they are enabled. Does
+                        NOT enable completions for current buffer, if they are
+                        disabled with :Codeium DisableBuffer. However, still
+                        affects other buffers.
 
 OPTIONS                                         *codeium-options*
 
@@ -47,6 +56,13 @@ g:codeium_enabled       A global boolean flag that controls whether codeium
                         let g:codeium_enabled = v:true
 <
 
+                                                *g:codeium_manual*
+g:codeium_manual        If true, codeium completions will never automatically
+                        trigger.
+>
+                        let g:codeium_manual = v:true
+<
+
                                                 *g:codeium_no_map_tab*
 g:codeium_no_map_tab    A global boolean flag that controls whether codeium
                         uses <TAB> for the mapping codeium#Accept
@@ -54,6 +70,89 @@ g:codeium_no_map_tab    A global boolean flag that controls whether codeium
                         let g:codeium_no_map_tab = v:true
 <
 
+                                                *g:codeium_idle_delay*
+g:codeium_idle_delay    Delay in milliseconds before autocompletions are
+                        shown (limited by language server to a minimum of 75).
+>
+                        let g:codeium_idle_delay = 500
+<
+                                                *g:codeium_render*
+g:codeium_render        A global boolean flag that controls whether codeium
+                        renders are enabled or disabled.
+>
+                        let g:codeium_render = v:false
+<
+
+                                                *g:codeium_tab_fallback*
+g:codeium_tab_fallback  The fallback key when there is no suggestion display
+                        in `codeium#Accept()`.
+>
+                        let g:codeium_tab_fallback = "\t"
+<
+                                                *g:codeium_bin*
+g:codeium_bin           Manually set the path to the `codeium` language server
+                        binary on your system.
+                        If unset, `codeium.vim` will fetch and download the
+                        binary from the internet.
+>
+                        let g:codeium_bin = "~/.local/bin/codeium_language_server"
+<
+                                                *g:codeium_os*
+g:codeium_os            Manually set the host OS, accepted values are
+                        "Linux", "Darwin", "Windows". if unset, the value will
+                        be obtained using `uname`.
+>
+                        let g:codeium_os = "Linux"
+<
+                                                *g:codeium_arch*
+g:codeium_arch          Manually set the host architecture, accepted values
+                        are "x86_64", "aarch64", "arm". If unset, the value
+                        will be obtained using `uname -m`.
+>
+                        let g:codeium_arch = "x86_64"
+<
+                                                *g:codeium_port_config*
+g:codeium_port_config
+                        Set the ports the chat client and web server use.
+			Pass in web_server and chat_client fields to the mapping to set.
+                        Please note that if this option is set, only one
+			window will work with codeium.
+			It is recommended to set both the web_server and chat_client options
+			if using this. 
+			If you are setting this because you are using vim remotely and want chat to work
+			you will need to forward the two ports you set here, along with port 42100.
+			That window can have as many buffers within it, but any other
+			opened windows will not be able to use Codeium's features.
+>
+                        let g:codeium_port_config = {
+				'web_server': <Your web server port>,
+				'chat_client': <Your chat client port>
+				}
+<
+                                                *g:codeium_virtual_text_priority*
+g:codeium_virtual_text_priority
+                        The priority used for Codeium's virtual text completions
+                        in Neovim. This can control how completions appear when
+                        multiple virtual text items are on the same line, such
+                        as when using LSP inlay hints.
+
+                        The priority can be set on a per-buffer basis by setting
+                        the b:codeium_virtual_text_priority variable. If
+                        neither of these are set, the default priority is 65535,
+                        which will usually place it above any other virtual text.
+>
+                        let g:codeium_virtual_text_priority = 1000
+<
+
+                                                *b:codeium_virtual_text_priority*
+b:codeium_virtual_text_priority
+                        The priority given to Codeium's virtual text completions
+                        for the current buffer in Neovim. If not set,
+                        g:codeium_virtual_text_priority is used.
+>
+                        let b:codeium_virtual_text_priority = 1000
+<
+
 MAPS                                            *codeium-maps*
 
                                                 *codeium-i_<Tab>*
diff --git a/plugin/codeium.vim b/plugin/codeium.vim
index f64f96e4..36f1bd07 100644
--- a/plugin/codeium.vim
+++ b/plugin/codeium.vim
@@ -27,6 +27,7 @@ endfunction
 augroup codeium
   autocmd!
   autocmd InsertEnter,CursorMovedI,CompleteChanged * call codeium#DebouncedComplete()
+  autocmd BufEnter     * if codeium#Enabled()|call codeium#command#StartLanguageServer()|endif
   autocmd BufEnter     * if mode() =~# '^[iR]'|call codeium#DebouncedComplete()|endif
   autocmd InsertLeave  * call codeium#Clear()
   autocmd BufLeave     * if mode() =~# '^[iR]'|call codeium#Clear()|endif
@@ -34,11 +35,13 @@ augroup codeium
   autocmd ColorScheme,VimEnter * call s:SetStyle()
   " Map tab using vim enter so it occurs after all other sourcing.
   autocmd VimEnter             * call s:MapTab()
+  autocmd VimLeave             * call codeium#ServerLeave()
 augroup END
 
 
 imap <Plug>(codeium-dismiss)     <Cmd>call codeium#Clear()<CR>
 imap <Plug>(codeium-next)     <Cmd>call codeium#CycleCompletions(1)<CR>
+imap <Plug>(codeium-next-or-complete)     <Cmd>call codeium#CycleOrComplete()<CR>
 imap <Plug>(codeium-previous) <Cmd>call codeium#CycleCompletions(-1)<CR>
 imap <Plug>(codeium-complete)  <Cmd>call codeium#Complete()<CR>
 
@@ -47,7 +50,7 @@ if !get(g:, 'codeium_disable_bindings')
     imap <silent><script><nowait><expr> <C-]> codeium#Clear() . "\<C-]>"
   endif
   if empty(mapcheck('<M-]>', 'i'))
-    imap <M-]> <Plug>(codeium-next)
+    imap <M-]> <Plug>(codeium-next-or-complete)
   endif
   if empty(mapcheck('<M-[>', 'i'))
     imap <M-[> <Plug>(codeium-previous)
@@ -55,12 +58,65 @@ if !get(g:, 'codeium_disable_bindings')
   if empty(mapcheck('<M-Bslash>', 'i'))
     imap <M-Bslash> <Plug>(codeium-complete)
   endif
+  if empty(mapcheck('<C-k>', 'i'))
+    imap <script><silent><nowait><expr> <C-k> codeium#AcceptNextWord()
+  endif
+  if empty(mapcheck('<C-l>', 'i'))
+    imap <script><silent><nowait><expr> <C-l> codeium#AcceptNextLine()
+  endif
 endif
 
 call s:SetStyle()
-call timer_start(0, function('codeium#server#Start'))
 
 let s:dir = expand('<sfile>:h:h')
 if getftime(s:dir . '/doc/codeium.txt') > getftime(s:dir . '/doc/tags')
   silent! execute 'helptags' fnameescape(s:dir . '/doc')
 endif
+
+function! CodeiumEnable()  " Enable Codeium if it is disabled
+  let g:codeium_enabled = v:true
+  call codeium#command#StartLanguageServer()
+endfun
+
+command! CodeiumEnable :silent! call CodeiumEnable()
+
+function! CodeiumDisable() " Disable Codeium altogether
+  let g:codeium_enabled = v:false
+endfun
+
+command! CodeiumDisable :silent! call CodeiumDisable()
+
+function! CodeiumToggle()
+  if exists('g:codeium_enabled') && g:codeium_enabled == v:false
+      call CodeiumEnable()
+  else
+      call CodeiumDisable()
+  endif
+endfunction
+
+command! CodeiumToggle :silent! call CodeiumToggle()
+
+function! CodeiumManual() " Disable the automatic triggering of completions
+  let g:codeium_manual = v:true
+endfun
+
+command! CodeiumManual :silent! call CodeiumManual()
+
+function! CodeiumAuto()  " Enable the automatic triggering of completions
+  let g:codeium_manual = v:false
+endfun
+
+command! CodeiumAuto :silent! call CodeiumAuto()
+
+function! CodeiumChat()
+  call codeium#Chat()
+endfun
+
+command! CodeiumChat :silent! call CodeiumChat()
+
+:amenu Plugin.Codeium.Enable\ \Codeium\ \(\:CodeiumEnable\) :call CodeiumEnable() <Esc>
+:amenu Plugin.Codeium.Disable\ \Codeium\ \(\:CodeiumDisable\) :call CodeiumDisable() <Esc>
+:amenu Plugin.Codeium.Manual\ \Codeium\ \AI\ \Autocompletion\ \(\:CodeiumManual\) :call CodeiumManual() <Esc>
+:amenu Plugin.Codeium.Automatic\ \Codeium\ \AI\ \Completion\ \(\:CodeiumAuto\) :call CodeiumAuto() <Esc>
+:amenu Plugin.Codeium.Toggle\ \Codeium\ \(\:CodeiumToggle\) :call CodeiumToggle() <Esc>
+:amenu Plugin.Codeium.Chat\ \Codeium\ \(\:CodeiumChat\) :call CodeiumChat() <Esc>
diff --git a/windsurf.png b/windsurf.png
new file mode 100644
index 00000000..cd191d57
Binary files /dev/null and b/windsurf.png differ