diff --git a/clients/vscode/CHANGELOG.md b/clients/vscode/CHANGELOG.md
index b910c91fb063..58d756bc98dc 100644
--- a/clients/vscode/CHANGELOG.md
+++ b/clients/vscode/CHANGELOG.md
@@ -1,3 +1,18 @@
+## 1.18.0
+
+### Features
+
+- **Chat**:
+  - Added support to explicitly select a configured Git repository as the context for chat conversations.
+  - Added support to use the active Notebook editor selection as the context for chat conversations.
+  - Display error messages and suggest actions when failing to load the chat panel.
+  - **Note**: Requires updating the Tabby server to version 0.23.0 or later.
+
+### Fixes & Improvements
+
+- Updated the status bar item to show warning when the server returns an error due to too many requests.
+- Improved the UI for the Tabby command palette and when updating the token.
+
 ## 1.16.0
 
 ### Features
diff --git a/clients/vscode/package.json b/clients/vscode/package.json
index 9198b1fab601..289bc0b2f275 100644
--- a/clients/vscode/package.json
+++ b/clients/vscode/package.json
@@ -7,7 +7,7 @@
   "repository": "https://github.com/TabbyML/tabby",
   "bugs": "https://github.com/TabbyML/tabby/issues",
   "license": "Apache-2.0",
-  "version": "1.17.0-dev",
+  "version": "1.19.0-dev",
   "keywords": [
     "ai",
     "autocomplete",