From 0e9a1048fdb95625a39a122f6b14b30ec0a84302 Mon Sep 17 00:00:00 2001
From: Ehab Younes <ehab.alyounes@gmail.com>
Date: Fri, 6 Mar 2026 21:28:01 +0300
Subject: [PATCH] v1.14.0-pre

---
 CHANGELOG.md | 21 +++++++++++++++------
 package.json |  2 +-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f7cabc1..ebd22e56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Change Log
 
+## Unreleased
+
+## [v1.14.0-pre](https://github.com/coder/vscode-coder/releases/tag/v1.14.0-pre) 2026-03-06
+
+### Added
+
+- Re-introduced OS keyring support for session tokens (reverted in v1.13.2), now delegating
+  to the Coder CLI instead of native `@napi-rs/keyring` binaries. This keeps the credential
+  format in sync with the CLI automatically.
+
+### Fixed
+
+- `--use-keyring` and `--global-config` are now explicitly filtered from user-configured
+  global CLI flags to prevent conflicts with the extension's auth mode.
+
 ## [v1.13.2](https://github.com/coder/vscode-coder/releases/tag/v1.13.2) 2026-03-05
 
 ### Fixed
@@ -19,12 +34,6 @@
 - Fixed CLI binary downloads failing when servers or proxies compress responses unexpectedly.
 - Clarified CLI download progress notification wording.
 
-### Added
-
-- Session tokens are now stored in the OS keyring (Keychain on macOS, Credential Manager on
-  Windows) instead of plaintext files, when using CLI >= 2.29.0. Falls back to file storage on
-  Linux, older CLIs, or if the keyring write fails. Controlled via the `coder.useKeyring` setting.
-
 ## [v1.13.0](https://github.com/coder/vscode-coder/releases/tag/v1.13.0) 2026-03-03
 
 ### Added
diff --git a/package.json b/package.json
index 838ed3c9..6adb26ee 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "coder-remote",
 	"displayName": "Coder",
-	"version": "1.13.2",
+	"version": "1.14.0",
 	"description": "Open any workspace with a single click.",
 	"categories": [
 		"Other"