consistem
diff --git a/‎.github/ISSUE_TEMPLATE/bug_report.md‎
Lines changed: 1 addition & 0 deletions b/‎.github/ISSUE_TEMPLATE/bug_report.md‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎.github/ISSUE_TEMPLATE/feature_request.md‎
Lines changed: 1 addition & 0 deletions b/‎.github/ISSUE_TEMPLATE/feature_request.md‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎.github/workflows/main.yml‎
Lines changed: 3 additions & 3 deletions b/‎.github/workflows/main.yml‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎.github/workflows/prerelease.yml‎
Lines changed: 3 additions & 3 deletions b/‎.github/workflows/prerelease.yml‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎.vscode/settings.json‎
Lines changed: 3 additions & 0 deletions b/‎.vscode/settings.json‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎CHANGELOG.md‎
Lines changed: 43 additions & 0 deletions b/‎CHANGELOG.md‎
Lines changed: 43 additions & 0 deletions
diff --git a/‎README.md‎
Lines changed: 4 additions & 11 deletions b/‎README.md‎
Lines changed: 4 additions & 11 deletions
@@ -7,6 +7,7 @@ assignees: ''
 
 ---
 
+<!-- ⚠️ If you have an InterSystems support contract, please contact InterSystems' Worldwide Response Center (WRC) for support. -->
 <!-- Please read our issue reporting guide: https://docs.intersystems.com/components/csp/docbook/DocBook.UI.Page.cls?KEY=GVSCO_reporting -->
 <!-- Please read our docs on troubleshooting common issues: https://docs.intersystems.com/components/csp/docbook/DocBook.UI.Page.cls?KEY=GVSCO_editproblems -->
 <!-- 🔎 Search existing issues to avoid creating duplicates. -->
 
@@ -7,6 +7,7 @@ assignees: ''
 
 ---
 
+<!-- ⚠️ If you have an InterSystems support contract, please contact InterSystems' Worldwide Response Center (WRC) for support. -->
 <!-- 🔎 Search existing issues to avoid creating duplicates. -->
 
 <!-- Describe the feature you'd like. -->
@@ -69,7 +69,7 @@ jobs:
         run: xvfb-run npm test
       - name: Build package
         run: |
-          npx vsce package -o ${{ steps.set-version.outputs.name }}.vsix
+          npx @vscode/vsce package -o ${{ steps.set-version.outputs.name }}.vsix
       - uses: actions/upload-artifact@v6
         if: github.event_name != 'release'
         with:
@@ -142,7 +142,7 @@ jobs:
           git push
       - name: Build package
         run: |
-          npx vsce package -o ${{ steps.set-version.outputs.name }}.vsix
+          npx @vscode/vsce package -o ${{ steps.set-version.outputs.name }}.vsix
       - name: Upload Release Asset
         id: upload-release-asset
         uses: softprops/action-gh-release@v3
@@ -153,7 +153,7 @@ jobs:
       - name: Publish to VSCode Marketplace
         run: |
           [ -n "${{ secrets.VSCE_TOKEN }}" ] && \
-            npx vsce publish --packagePath ${{ steps.set-version.outputs.name }}.vsix -p ${{ secrets.VSCE_TOKEN }} || true
+            npx @vscode/vsce publish --packagePath ${{ steps.set-version.outputs.name }}.vsix -p ${{ secrets.VSCE_TOKEN }} || true
       - name: Publish to Open VSX Registry
         timeout-minutes: 5
         run: |
 
@@ -64,7 +64,7 @@ jobs:
         run: xvfb-run npm test
       - name: Build pre-release package
         run: |
-          npx vsce package --pre-release -o ${{ steps.set-version.outputs.name }}.vsix
+          npx @vscode/vsce package --pre-release -o ${{ steps.set-version.outputs.name }}.vsix
       - uses: actions/upload-artifact@v6
         if: github.event_name != 'release'
         with:
@@ -138,7 +138,7 @@ jobs:
           git push
       - name: Build pre-release package
         run: |
-          npx vsce package --pre-release -o ${{ steps.set-version.outputs.name }}.vsix
+          npx @vscode/vsce package --pre-release -o ${{ steps.set-version.outputs.name }}.vsix
       - name: Upload Release Asset
         id: upload-release-asset
         uses: softprops/action-gh-release@v3
@@ -149,4 +149,4 @@ jobs:
       - name: Publish to VSCode Marketplace
         run: |
           [ -n "${{ secrets.VSCE_TOKEN }}" ] && \
-            npx vsce publish --pre-release --packagePath ${{ steps.set-version.outputs.name }}.vsix -p ${{ secrets.VSCE_TOKEN }} || true
+            npx @vscode/vsce publish --pre-release --packagePath ${{ steps.set-version.outputs.name }}.vsix -p ${{ secrets.VSCE_TOKEN }} || true
@@ -5,4 +5,7 @@
     "editor.formatOnSave": true
   },
   "js/ts.tsdk.path": "node_modules/typescript/lib",
+  "git.branchProtection": [
+    "master"
+  ],
 }
@@ -1,5 +1,48 @@
 # Change Log
 
+## [3.8.3] 11-Sep-2026 (Consistem)
+- Enhancements
+  - Synchronize the Consistem fork with upstream through `v3.8.6-beta.8`.
+  - Preserve Consistem navigation, conversion, namespace activation and internal unit-test integrations.
+- Fixes
+  - Incorporate upstream authentication, connection lifecycle, Podman and dependency updates.
+
+## [3.8.5] 02-Sep-2026
+- Fixes
+  - Fix crash when opening a file with no workspace folder open (#1834)
+  - Skip credential resolution for inactive connections during activation (#1835)
+  - Fix crash from unresolved auth on named-server connections (#1836)
+  - Fix intermittent issues when importing a client-side folder on Windows (#1839)
+  - Restore unauthenticated-connection support (regression from OAuth2 rewrite) (#1840)
+  - Fix server-side projects when connected to a very old server (#1842)
+  - `serverForUri()` should either return a usable server definition or `undefined` (#1843)
+  - Deprecate configuring a server host/port/credentials in `objectscript.conn` in favor of using Server Manager (#1844)
+  - Relax server-side URI validation for routines whose dotted section before the extension is only digits (#1845)
+  - Passwords stored in plaintext in `objectscript.conn` should be passed to other extensions in `serverForUri()` (#1846)
+  - Upgrade dependencies
+
+## [3.8.4] 20-Aug-2026
+- Fixes
+  - Fix issue where exported `serverForUri()` function may expose a password (#1824)
+  - Sending stale cookies can cause authorization failures (#1824)
+  - Support abstract documents when importing a client-side folder (#1827)
+  - Fix issue where user is intermittently unable to connect to server (#1830)
+  - Telemetry changes:
+    - Remove `clientSideFileSynced` event
+    - Add `usesServerManager` key to `workspaceFolder` event for client-side folders
+
+## [3.8.3] 11-Aug-2026
+- Enhancements
+  - Support OAuth2 for authorizing with InterSystems servers (#1799, #1820)
+  - Update `Open InterSystems Document...` command to show a flat list of documents (#1804)
+- Fixes
+  - Always overwrite entire class for Pull Server Changes when there's a conflict between the local copy and server copy (#1797)
+  - Improve management of web sessions when connection changes (#1808)
+  - Improve performance of server-side project query (#1809)
+  - Only timeout server connection check during extension activation (#1814)
+  - Sync server-side web app files as raw bytes (#1818)
+  - Upgrade dependencies
+
 ## [3.8.2] 04-Jun-2026
 - Enhancements
   - Add `Import Files...` command that supports many file types (#1764)
 
@@ -4,14 +4,11 @@
 
 # Consistem ObjectScript extension for VS Code
 
-[![](https://img.shields.io/visual-studio-marketplace/v/consistem-sistemas.consistem-vscode-objectscript.svg)](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.consistem-vscode-objectscript)
-[![](https://img.shields.io/visual-studio-marketplace/i/consistem-sistemas.consistem-vscode-objectscript.svg)](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.consistem-vscode-objectscript)
-[![Known Vulnerabilities](https://snyk.io/test/github/intersystems-community/vscode-objectscript/badge.svg)](https://snyk.io/test/github/intersystems-community/vscode-objectscript)
+[![Visual Studio Marketplace Version](https://vsmarketplacebadges.dev/version/consistem-sistemas.consistem-vscode-objectscript.svg)](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.consistem-vscode-objectscript)
+[![Visual Studio Marketplace Installs](https://vsmarketplacebadges.dev/installs/consistem-sistemas.consistem-vscode-objectscript.svg)](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.consistem-vscode-objectscript)
 [![Consistem](https://img.shields.io/badge/Consistem-Website-brightgreen)](https://consistem.com.br/)
 
 [![](https://img.shields.io/badge/InterSystems-IRIS-blue.svg)](https://www.intersystems.com/products/intersystems-iris/)
-[![](https://img.shields.io/badge/InterSystems-Cach%C3%A9-blue.svg)](https://www.intersystems.com/products/cache/)
-[![](https://img.shields.io/badge/InterSystems-Ensemble-blue.svg)](https://www.intersystems.com/products/ensemble/)
 
 > **Note:** The best way to install and use this extension is by installing the [InterSystems ObjectScript Extension Pack](https://marketplace.visualstudio.com/items?itemName=intersystems-community.objectscript-pack)
 > and following the [documentation here](https://docs.intersystems.com/components/csp/docbook/DocBook.UI.Page.cls?KEY=GVSCO).
@@ -74,12 +71,8 @@ To unlock these features (optional):
 
 1. Download and install a beta version from GitHub. This is necessary because Marketplace does not allow publication of extensions that use proposed APIs.
 	- Go to https://github.com/intersystems-community/vscode-objectscript/releases
-	- Locate the beta immediately above the release you installed from Marketplace. For instance, if you installed `3.8.2`, look for `3.8.3-beta.1`. This will be functionally identical to the Marketplace version apart from being able to use proposed APIs.
-	- Download the VSIX file (for example `vscode-objectscript-3.8.3-beta.1.vsix`) and install it. One way to install a VSIX is to drag it from your download folder and drop it onto the list of extensions in the Extensions view of VS Code.
-
-   - Go to https://github.com/intersystems-community/vscode-objectscript/releases
-   - Locate the beta immediately above the release you installed from Marketplace. For instance, if you installed `3.4.0`, look for `3.4.1-beta.1`. This will be functionally identical to the Marketplace version apart from being able to use proposed APIs.
-   - Download the VSIX file (for example `vscode-objectscript-3.4.1-beta.1.vsix`) and install it. One way to install a VSIX is to drag it from your download folder and drop it onto the list of extensions in the Extensions view of VS Code.
+	- Locate the beta immediately above the release you installed from Marketplace. For instance, if you installed `3.8.5`, look for `3.8.6-beta.1`. This will be functionally identical to the Marketplace version apart from being able to use proposed APIs.
+	- Download the VSIX file (for example `vscode-objectscript-3.8.6-beta.1.vsix`) and install it. One way to install a VSIX is to drag it from your download folder and drop it onto the list of extensions in the Extensions view of VS Code.
 
 2. From [Command Palette](https://code.visualstudio.com/docs/getstarted/tips-and-tricks#_command-palette) choose `Preferences: Configure Runtime Arguments`.
 3. In the argv.json file that opens, add this line (required for both Stable and Insiders versions of VS Code):
Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,7 @@`
`5`	`5`	`"editor.formatOnSave": true`
`6`	`6`	`},`
`7`	`7`	`"js/ts.tsdk.path": "node_modules/typescript/lib",`
	`8`	`+ "git.branchProtection": [`
	`9`	`+ "master"`
	`10`	`+ ],`
`8`	`11`	`}`