Restructure and rename projects to simplify focus to just the vscode …

.github/workflows/ci.yml

@@ -25,13 +25,13 @@ jobs:
           dotnet-version: '10.0.x'
 
       - name: Restore dependencies
-        run: dotnet restore src/KustoLsp.Tests/KustoLspTests.csproj
+        run: dotnet restore src/ServerTests/ServerTests.csproj
 
       - name: Build
-        run: dotnet build src/KustoLsp.Tests/KustoLspTests.csproj --no-restore --configuration Release
+        run: dotnet build src/ServerTests/ServerTests.csproj --no-restore --configuration Release
 
       - name: Run tests
-        run: ./src/KustoLsp.Tests/bin/Release/net10.0/KustoLspTests
+        run: ./src/ServerTests/bin/Release/net10.0/ServerTests
 
   lint-typescript:
     name: Lint and Build (TypeScript)
@@ -47,15 +47,15 @@ jobs:
         with:
           node-version: 'lts/*'
           cache: 'npm'
-          cache-dependency-path: src/VsCodeExtension/package-lock.json
+          cache-dependency-path: src/Client/package-lock.json
 
       - name: Install dependencies
         run: npm ci
-        working-directory: src/VsCodeExtension
+        working-directory: src/Client
 
       - name: Compile TypeScript
         run: npm run compile
-        working-directory: src/VsCodeExtension
+        working-directory: src/Client
 
   package-vsix:
     name: Build VSIX Package
@@ -77,22 +77,22 @@ jobs:
         with:
           node-version: 'lts/*'
           cache: 'npm'
-          cache-dependency-path: src/VsCodeExtension/package-lock.json
+          cache-dependency-path: src/Client/package-lock.json
 
       - name: Install dependencies
         run: npm ci
-        working-directory: src/VsCodeExtension
+        working-directory: src/Client
 
       - name: Install vsce
         run: npm install -g @vscode/vsce
 
       - name: Build VSIX package
         run: npm run package
-        working-directory: src/VsCodeExtension
+        working-directory: src/Client
 
       - name: Upload VSIX artifact
         uses: actions/upload-artifact@v4
         with:
           name: kusto-explorer-vsix
-          path: src/VsCodeExtension/*.vsix
+          path: src/Client/*.vsix
           retention-days: 30

.gitignore

@@ -418,8 +418,8 @@ FodyWeavers.xsd
 *.msp
 
 # VS Code extension build output - exclude compiled server files
-src/VsCodeExtension/server/
-src/VsCodeExtension/out/
-src/VsCodeExtension/LICENSE
-src/VsCodeExtension/PATH.TXT
+src/Client/server/
+src/Client/out/
+src/Client/LICENSE
+src/Client/PATH.TXT
 

CONTRIBUTING.md

@@ -31,14 +31,14 @@ contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additio
 ### Building the Language Server
 
 ```bash
-cd src/KustoLspServer
+cd src/Server
 dotnet build
 ```
 
 ### Building the VS Code Extension
 
 ```bash
-cd src/VsCodeExtension
+cd src/Client
 npm install
 npm run compile
 ```
@@ -52,17 +52,16 @@ npm run compile
 ### Packaging the Extension
 
 ```bash
-cd src/VsCodeExtension
+cd src/Client
 npm run package
 ```
 
 This will create a `.vsix` file that can be installed in VS Code.
 
 ## Project Structure
 
-- `src/KustoLspServer/` - .NET Language Server Protocol implementation
-- `src/KustoLanguageServer/` - Core language server functionality
-- `src/VsCodeExtension/` - VS Code extension (TypeScript)
+- `src/Server/` - Vs Code extension Server (C#)
+- `src/Client/` - VS Code extension Client (TypeScript)
 
 ## Reporting Issues
 

README.md

@@ -1,4 +1,4 @@
-# Kusto Language Server
+# Kusto Explorer for VS Code
 
 A VS Code extension for the Kusto Query Language (KQL)
 
@@ -108,7 +108,7 @@ A VS Code extension for the Kusto Query Language (KQL)
 ## Creating the VSIX installer
 
 1. Must have vsce installed (npm install -g @vscode/vsce)
-2. run `npm run package` on command line within VsCodeExtension folder to build the .vsix file
+2. run `npm run package` on command line within `src/Client` folder to build the .vsix file
 
 ## Installing the VSIX manually
 
@@ -120,37 +120,37 @@ Run `code --uninstall-extension Microsoft.kusto-explorer-vscode` on command line
 
 ## Launching in VS Code debug mode (without installing VSIX)
 
-1. Open VsCodeExtension folder in VS Code.
+1. Open `src\Client` folder in VS Code.
 2. Build the client side using `compile` command in explorer panel `NPM SCRIPTS`
 3. Build the server side using `build-debug-server` in explorer panel `NPM SCRIPTS`
-4. Press F5 to launch the extension in a new VS Code window with debugging enabled.
-
-## Contributing
-
-This project welcomes contributions and suggestions. Please see [CONTRIBUTING.md](CONTRIBUTING.md) for details.
-
-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
-For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or
-contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
-
-## Security
-
-If you believe you have found a security vulnerability in this repository, please report it to us through coordinated disclosure.
-
-**Please do not report security vulnerabilities through public GitHub issues.**
-
-Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://msrc.microsoft.com/create-report).
-
-For more information, see [SECURITY.md](SECURITY.md) or visit [Microsoft's Security Policy](https://github.com/microsoft/Kusto-Language-Server/security/policy).
-
-## Trademarks
-
-This project may contain trademarks or logos for projects, products, or services. Authorized use of Microsoft 
-trademarks or logos is subject to and must follow 
-[Microsoft's Trademark & Brand Guidelines](https://www.microsoft.com/en-us/legal/intellectualproperty/trademarks/usage/general).
-Use of Microsoft trademarks or logos in modified versions of this project must not cause confusion or imply Microsoft sponsorship.
-Any use of third-party trademarks or logos are subject to those third-party's policies.
-
-## License
-
-This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
+4. Press F5 to launch the extension in a new VS Code window with debugging enabled.
+
+## Contributing
+
+This project welcomes contributions and suggestions. Please see [CONTRIBUTING.md](CONTRIBUTING.md) for details.
+
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
+For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or
+contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
+
+## Security
+
+If you believe you have found a security vulnerability in this repository, please report it to us through coordinated disclosure.
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://msrc.microsoft.com/create-report).
+
+For more information, see [SECURITY.md](SECURITY.md) or visit [Microsoft's Security Policy](https://github.com/microsoft/Kusto-Language-Server/security/policy).
+
+## Trademarks
+
+This project may contain trademarks or logos for projects, products, or services. Authorized use of Microsoft 
+trademarks or logos is subject to and must follow 
+[Microsoft's Trademark & Brand Guidelines](https://www.microsoft.com/en-us/legal/intellectualproperty/trademarks/usage/general).
+Use of Microsoft trademarks or logos in modified versions of this project must not cause confusion or imply Microsoft sponsorship.
+Any use of third-party trademarks or logos are subject to those third-party's policies.
+
+## License
+
+This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.

src/VsCodeExtension/package.json → src/Client/package.json

@@ -23,8 +23,8 @@
   "scripts": {
     "compile": "tsc -p .",
     "watch": "tsc -watch -p .",
-    "build-release-server": "dotnet publish ../KustoLspServer/KustoLspServer.csproj -c Release -o ./server",
-    "build-debug-server": "dotnet publish ../KustoLspServer/KustoLspServer.csproj -c Debug -o ./server",
+    "build-release-server": "dotnet publish ../Server/Server.csproj -c Release -o ./server",
+    "build-debug-server": "dotnet publish ../Server/Server.csproj -c Debug -o ./server",
     "package": "shx cp ../../LICENSE . && npm run compile && npm run build-release-server && vsce package",
     "publish": "vsce publish"
   },

src/KustoExplorerVscode.slnx

@@ -0,0 +1,8 @@
+<Solution>
+  <Project Path="Server/Server.csproj" />
+  <Project Path="ServerTests/ServerTests.csproj" />
+  <Project Path="Client/Client.esproj">
+    <Build />
+    <Deploy />
+  </Project>
+</Solution>

src/KustoLanguageServer/Charting/ChartConstants.cs → src/Server/Charting/ChartConstants.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-namespace Kusto.Lsp;
+namespace Kusto.Vscode;
 
 /// <summary>
 /// Constants for chart visualization kinds.

src/KustoLanguageServer/Charting/ChartOptions.cs → src/Server/Charting/ChartOptions.cs

@@ -5,7 +5,7 @@
 using System.Runtime.Serialization;
 using Kusto.Data.Utils;
 
-namespace Kusto.Lsp;
+namespace Kusto.Vscode;
 
 /// <summary>
 /// Serializable representation of chart visualization options.

src/KustoLanguageServer/Charting/IChartManager.cs → src/Server/Charting/IChartManager.cs

@@ -1,9 +1,9 @@
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
 using System.Data;
 
-namespace Kusto.Lsp;
+namespace Kusto.Vscode;
 
 public interface IChartManager
 {

src/KustoLanguageServer/Charting/PlotlyChartBuilder.cs → src/Server/Charting/PlotlyChartBuilder.cs

@@ -2,7 +2,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Kusto.Lsp;
+namespace Kusto.Vscode;
 
 /// <summary>
 /// Immutable fluent builder for creating Plotly charts with C# idioms.

src/KustoLanguageServer/Charting/PlotlyChartExtensions.cs → src/Server/Charting/PlotlyChartExtensions.cs

@@ -1,4 +1,4 @@
-namespace Kusto.Lsp;
+namespace Kusto.Vscode;
 
 /// <summary>
 /// Extension methods for building charts with fluent syntax.
@@ -560,7 +560,7 @@ public static PlotlyChartBuilder SetGrouped(this PlotlyChartBuilder builder)
     /// Sets the title for the 2D X-axis.
     /// </summary>
     /// <param name="builder">The chart builder instance.</param>
-    /// <param name="title">The axis title text (e.g., "Time", "Region", "Temperature (°C)").</param>
+    /// <param name="title">The axis title text (e.g., "Time", "Region", "Temperature (�C)").</param>
     /// <returns>A new immutable PlotlyChartBuilder with the X-axis title set.</returns>
     public static PlotlyChartBuilder SetXAxisTitle(this PlotlyChartBuilder builder, string title)
     {