AdguardTeam
diff --git a/‎.vscode/tasks.json‎
Lines changed: 0 additions & 51 deletions b/‎.vscode/tasks.json‎
Lines changed: 0 additions & 51 deletions
diff --git a/‎CHANGELOG.md‎
Lines changed: 26 additions & 2 deletions b/‎CHANGELOG.md‎
Lines changed: 26 additions & 2 deletions
diff --git a/‎CONTRIBUTING.md‎
Lines changed: 0 additions & 24 deletions b/‎CONTRIBUTING.md‎
Lines changed: 0 additions & 24 deletions
diff --git a/‎README.md‎
Lines changed: 14 additions & 14 deletions b/‎README.md‎
Lines changed: 14 additions & 14 deletions
diff --git a/‎client/package.json‎
Lines changed: 2 additions & 2 deletions b/‎client/package.json‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎client/src/extension.ts‎
Lines changed: 64 additions & 4 deletions b/‎client/src/extension.ts‎
Lines changed: 64 additions & 4 deletions
diff --git a/‎client/tsconfig.json‎
Lines changed: 14 additions & 13 deletions b/‎client/tsconfig.json‎
Lines changed: 14 additions & 13 deletions
@@ -17,54 +17,6 @@
             },
             "problemMatcher": "$esbuild-watch",
         },
-        {
-            "label": "Integrated AGTree dev build (watch)",
-            "type": "npm",
-            "script": "watch:agtree",
-            "isBackground": true,
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
-            "presentation": {
-                "panel": "dedicated",
-                "reveal": "never",
-                "close": true
-            },
-            "problemMatcher": "$esbuild-watch",
-        },
-        {
-            "label": "Integrated ECSSTree dev build (watch)",
-            "type": "npm",
-            "script": "watch:ecss-tree",
-            "isBackground": true,
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
-            "presentation": {
-                "panel": "dedicated",
-                "reveal": "never",
-                "close": true
-            },
-            "problemMatcher": "$esbuild-watch",
-        },
-        {
-            "label": "Integrated AGLint dev build (watch)",
-            "type": "npm",
-            "script": "watch:aglint",
-            "isBackground": true,
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
-            "presentation": {
-                "panel": "dedicated",
-                "reveal": "never",
-                "close": true
-            },
-            "problemMatcher": "$esbuild-watch",
-        },
         {
             "label": "Client dev build (watch)",
             "type": "npm",
@@ -126,9 +78,6 @@
             "dependsOn": [
                 "Grammar dev build (watch)",
                 "Server dev build (watch)",
-                "Integrated AGTree dev build (watch)",
-                "Integrated ECSSTree dev build (watch)",
-                "Integrated AGLint dev build (watch)",
                 "Client dev build (watch)"
             ],
         },
 
@@ -7,20 +7,44 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
 [Keep a Changelog]: https://keepachangelog.com/en/1.0.0/
 [Semantic Versioning]: https://semver.org/spec/v2.0.0.html
 
-## Unreleased
+## [2.0.4] (prerelease) - 2025-11-28
+
+### Changed
+
+- Improved logging.
+
+### Fixed
+
+- Loading AGLint on Windows.
+
+## [2.0.3] (prerelease) - 2025-11-28
 
 ### Added
 
 - Support for multi-root workspaces [#112].
 - `Remove this rule` quick fix option [#126].
+- Support for applying various fixes offered by AGLint [#127].
+- Support for detecting package manager automatically [#117].
+- `enableAglintDebug` and `enableInMemoryAglintCache` (experimental, disabled by default) settings.
 
 ### Changed
 
+- Updated extension for AGLint `v4.0.0`.
 - Updated `husky` dependency to version `9.0.1` [#129].
 
+### Removed
+
+- Integrated version of AGLint. From now on, AGLint only works if it is installed separately.
+  This provides more consistent behavior.
+  This removed `useExternalAglintPackages` setting.
+- `packageManager` setting. It is now detected automatically.
+
+[2.0.3]: https://github.com/AdguardTeam/VscodeAdblockSyntax/compare/1.1.17...2.0.3
 [#112]: https://github.com/AdguardTeam/VscodeAdblockSyntax/issues/112
-[#129]: https://github.com/AdguardTeam/VscodeAdblockSyntax/issues/129
+[#117]: https://github.com/AdguardTeam/VscodeAdblockSyntax/issues/117
 [#126]: https://github.com/AdguardTeam/VscodeAdblockSyntax/issues/126
+[#127]: https://github.com/AdguardTeam/VscodeAdblockSyntax/issues/127
+[#129]: https://github.com/AdguardTeam/VscodeAdblockSyntax/issues/129
 
 ## 1.1.17 - 2024-05-05
 
 
@@ -13,7 +13,6 @@ Table of Contents:
 - [Project structure](#project-structure)
 - [Running the extension in development mode](#running-the-extension-in-development-mode)
 - [Creating a production build](#creating-a-production-build)
-- [Updating integrated AGLint](#updating-integrated-aglint)
 - [Updating syntax highlighting](#updating-syntax-highlighting)
 - [Available commands](#available-commands)
 - [Useful links](#useful-links)
@@ -86,22 +85,6 @@ To create a production build of the extension:
 1. To ensure the build is correct, install the generated `.vsix` file in VSCode. Open the command palette
    (`Ctrl + Shift + P`), select "Extensions: Install from VSIX...", and choose the `vscode-adblock.vsix` file.
 
-## Updating integrated AGLint
-
-> [!NOTE]
-> This extension includes an integrated AGLint. It's a bundled version, avoiding the need for a separate AGLint
-> installation. However, the extension can use an external AGLint version if installed by a package manager.
-
-1. Update AGLint in the `server/package.json` file. Alternatively, link the local AGLint repository if it hasn't been
-   released on NPM.
-1. If there are breaking changes in the AGLint API, update the server code accordingly, changing the minimum supported
-   AGLint version in `server/index.ts` (`MIN_AGLINT_VERSION` constant).
-1. Test the extension with the new AGLint version by running it in debug mode (see
-   [*Running the extension in development mode*](#running-the-extension-in-development-mode) section). In the
-   *"Extension Development Host"* window, you should open the test project (see `test/static` folder) and check if the
-   extension works as expected.
-1. If needed, update the test project (e.g., update the config file, add new example rules).
-
 ## Updating syntax highlighting
 
 1. Update the TM grammar in the `syntaxes/adblock.yaml-tmLanguage` file.
@@ -128,11 +111,6 @@ During development, you can use the following commands (listed in `package.json`
   for Continuous Integration (CI) purposes.
 - `pnpm build:vsix` - Produces a `.vsix` file in the out directory, which is used to install the extension in VSCode.
 - `pnpm clean` - Removes all generated files in the output directories, cleaning up the build results.
-- `pnpm esbuild:aglint` - Base ESBuild command for building integrated AGLint with the common options.
-- `pnpm esbuild:agtree` - Base ESBuild command for building integrated AGTree with the common options.
-  Integrated AGTree comes with the integrated AGLint, this command just helps to bundle it to a separate file.
-  This is needed because AGTree is also used by the server, and by bundling it to a separate file, we can avoid
-  double-bundling AGTree.
 - `pnpm esbuild:server` - Base ESBuild command for building the server with the common options.
 - `pnpm esbuild:client` - Base ESBuild command for building the client with the common options.
 - `pnpm extract-changelog` - Extract changes from the `CHANGELOG.md` for a specific version. Typically, this is used by
@@ -145,8 +123,6 @@ During development, you can use the following commands (listed in `package.json`
 - `pnpm lint` - Run all linters.
 - `pnpm test:compile` - Check if the code compiles with [TypeScript][typescript].
 - `pnpm test` - Run tests with [Jest][jest].
-- `pnpm watch:aglint` - Watch for changes in the AGLint code and create a development build automatically.
-- `pnpm watch:agtree` - Watch for changes in the AGTree code and create a development build automatically.
 - `pnpm watch:client` - Watch for changes in the client code and create a development build automatically.
 - `pnpm watch:grammar` - Watch for changes in the TM grammar and rebuild it automatically.
 - `pnpm watch:server` - Watch for changes in the server code and create a development build automatically.
 
@@ -79,19 +79,16 @@ to read.
 
 ### AGLint integration (linter)
 
-We integrated [AGLint][aglint] into this extension, that makes it able to check your rules for various issues, such as
-invalid syntax, invalid domains, invalid / incompatible CSS selectors, unknown / incompatible scriptlets, bad practices,
-etc. For more information about AGLint, please refer to its [repository][aglint].
+This extension integrates [AGLint][aglint] to check your rules for syntax errors, invalid domains,
+incompatible CSS selectors, unknown scriptlets, and other issues. For more details, see the [AGLint repository][aglint].
 
-AGLint integration is done in the following way:
+The extension automatically searches for AGLint installations in this order:
 
-1. Extension will search local AGLint installation (if it is installed) and use it for linting. First, it will search
-   for local installation in the current workspace, and if it is not found, it will search for a global installation.
-   This is an ideal behavior, because if you have a local installation, it guarantees that you will use the same version
-   of AGLint, and the results will be the same.
-2. If the extension doesn't find any installation, it will use the bundled version of AGLint, which is included in the
-   extension itself. Usually, it is the latest version of AGLint. The advantage of this approach is that you don't need
-   to install AGLint manually, and you can start using the extension immediately after installation.
+1. Local workspace installation
+2. Global installation
+3. Prompts to install if not found
+
+Using a local installation ensures consistent results with your project's AGLint version.
 
 > [!WARNING]
 > Please note that the linter is under active development, so it may not work properly for some rules. If you
@@ -106,9 +103,12 @@ This extension provides the following configuration options:
 | Option | Description | Default value | Possible values |
 | ------ | ----------- | ------------- | --------------- |
 | `adblock.enableAglint` | Enable or disable AGLint integration. If disabled, only syntax highlighting and other language features will be available. | `true` | `true`, `false` |
-| `adblock.useExternalAglintPackages` | If enabled, extension will search for AGLint installations in the system. If disabled, extension will use its own AGLint installation, which is included in the extension (integrated AGLint bundle). If you have AGLint installed in your system / project, it is recommended to enable this option in order to provide consistent results. | `true` | `true`, `false` |
-| `adblock.packageManager` | Package manager to use for searching global AGLint installations. Set it to your preferred package manager. | `npm` | `npm`, `yarn`, `pnpm` |
-<!--markdownlint-enable MD013-->
+| `adblock.enableInMemoryAglintCache` | ⚠️ **Experimental**: Enable or disable in-memory caching of linting results for better performance. | `false` | `true`, `false` |
+
+**Note:** AGLint debug logging is automatically enabled when VSCode's log level is set to "Debug" or "Trace" via "Developer: Set Log Level".
+
+> **💡 Tip**: To control AGLint logging verbosity, use VSCode's built-in log level control:
+> Open Command Palette (**Cmd+Shift+P**) → **Developer: Set Log Level...** → Select **AGLint**
 
 ### GitHub Linguist support
 
 
@@ -1,13 +1,13 @@
 {
     "name": "aglint-client",
-    "version": "1.0.0",
+    "version": "2.0.0",
     "license": "MIT",
     "author": "AdGuard Software Ltd.",
     "description": "Integrates AGLint into VSCode",
     "private": true,
     "dependencies": {
         "valibot": "^1.1.0",
-        "vscode-languageclient": "^8.0.2"
+        "vscode-languageclient": "10.0.0-next.15"
     },
     "devDependencies": {
         "@types/vscode": "^1.74.0"
 
@@ -4,6 +4,7 @@ import * as v from 'valibot';
 import {
     commands,
     type ExtensionContext,
+    LogLevel,
     RelativePattern,
     StatusBarAlignment,
     type StatusBarItem,
@@ -97,6 +98,20 @@ let defaultClient: LanguageClient | undefined;
  */
 const clients = new Map<string, LanguageClient>();
 
+/**
+ * Convert VSCode LogLevel to a simple boolean for AGLint debug mode.
+ * Enable AGLint debugger only when VSCode log level is Debug or Trace.
+ *
+ * @param logLevel VSCode log level.
+ *
+ * @returns Whether AGLint debug mode should be enabled.
+ */
+function shouldEnableAglintDebug(logLevel: LogLevel): boolean {
+    // LogLevel enum: Off = 0, Trace = 1, Debug = 2, Info = 3, Warning = 4, Error = 5
+    // Enable AGLint debug when log level is Trace (1) or Debug (2)
+    return logLevel <= LogLevel.Debug;
+}
+
 /**
  * Status bar item to show the AGLint status.
  * This is shared across all workspace folders and updates based on the active editor's folder.
@@ -220,25 +235,44 @@ function createClientForFolder(folder: WorkspaceFolder, serverModule: string): L
 
     const rootFs = folder.uri.fsPath;
 
+    // Create output channel - this makes the extension appear in "Developer: Set Log Level"
+    const outputChannel = Window.createOutputChannel(`${CLIENT_NAME} (${folder.name})`, { log: true });
+
     const clientOptions: LanguageClientOptions = {
         documentSelector: [{ scheme: DOCUMENT_SCHEME, language: LANGUAGE_ID }],
 
         workspaceFolder: folder,
         initializationOptions: {
             workspaceFolder: { uri: folder.uri.toString(), name: folder.name },
+            enableAglintDebug: shouldEnableAglintDebug(outputChannel.logLevel),
         },
 
+        outputChannel,
+
         synchronize: {
             fileEvents: [
                 Workspace.createFileSystemWatcher(
-                    new RelativePattern(folder, `**/*.{${Array.from(SUPPORTED_FILE_EXTENSIONS).join(',')}}`),
+                    new RelativePattern(
+                        folder,
+                        `{**/*.{${Array.from(SUPPORTED_FILE_EXTENSIONS).join(',')}},!**/node_modules/**}`,
+                    ),
                     false,
                     true,
                     false,
                 ),
-                // eslint-disable-next-line max-len
-                Workspace.createFileSystemWatcher(new RelativePattern(folder, `**/{${Array.from(CONFIG_FILE_NAMES).join(',')}}`)),
-                Workspace.createFileSystemWatcher(new RelativePattern(folder, `**/${IGNORE_FILE_NAME}`)),
+                Workspace.createFileSystemWatcher(
+                    new RelativePattern(
+                        folder,
+                        `{**/{${Array.from(CONFIG_FILE_NAMES).join(',')}},!**/node_modules/**}`,
+                    ),
+                ),
+                Workspace.createFileSystemWatcher(
+                    new RelativePattern(folder, `{**/${IGNORE_FILE_NAME},!**/node_modules/**}`),
+                ),
+                // Watch package.json for AGLint installation changes (only root, not node_modules)
+                Workspace.createFileSystemWatcher(new RelativePattern(folder, 'package.json')),
+                // Watch node_modules directory itself for package installation/updates
+                Workspace.createFileSystemWatcher(new RelativePattern(folder, 'node_modules')),
             ],
         },
 
@@ -298,6 +332,15 @@ function createClientForFolder(folder: WorkspaceFolder, serverModule: string): L
         updateStatusBarForFolder(folder, params);
     });
 
+    // Listen for log level changes and notify the server
+    outputChannel.onDidChangeLogLevel((newLogLevel) => {
+        const enableDebug = shouldEnableAglintDebug(newLogLevel);
+        // Send notification to server about log level change
+        client.sendNotification('client/logLevelChanged', { enableAglintDebug: enableDebug }).catch(() => {
+            // Ignore errors - server might not be ready yet
+        });
+    });
+
     return client;
 }
 
@@ -316,9 +359,16 @@ function ensureDefaultClient(serverModule: string) {
         debug: { module: serverModule, transport: TransportKind.ipc },
     };
 
+    // Create output channel - this makes the extension appear in "Developer: Set Log Level"
+    const outputChannel = Window.createOutputChannel(`${CLIENT_NAME} (untitled)`, { log: true });
+
     const clientOptions: LanguageClientOptions = {
         documentSelector: [{ scheme: FileScheme.Untitled, language: LANGUAGE_ID }],
         progressOnInitialization: true,
+        outputChannel,
+        initializationOptions: {
+            enableAglintDebug: shouldEnableAglintDebug(outputChannel.logLevel),
+        },
     };
 
     // Give the untitled client a unique ID too
@@ -328,6 +378,16 @@ function ensureDefaultClient(serverModule: string) {
         serverOptions,
         clientOptions,
     );
+
+    // Listen for log level changes and notify the server
+    outputChannel.onDidChangeLogLevel((newLogLevel) => {
+        const enableDebug = shouldEnableAglintDebug(newLogLevel);
+        // Send notification to server about log level change
+        defaultClient?.sendNotification('client/logLevelChanged', { enableAglintDebug: enableDebug }).catch(() => {
+            // Ignore errors - server might not be ready yet
+        });
+    });
+
     defaultClient.start();
 }
 
 
@@ -1,13 +1,14 @@
-{
-	"compilerOptions": {
-		"module": "CommonJS",
-		"target": "es2020",
-		"lib": ["es2020"],
-		"outDir": "out",
-		"rootDir": "src",
-		"sourceMap": true,
-		"skipLibCheck": true,
-	},
-	"include": ["src"],
-	"exclude": ["node_modules", ".vscode-test"]
-}
+{
+    "compilerOptions": {
+        "module": "es2020",
+        "target": "es2020",
+        "lib": ["es2020"],
+        "moduleResolution": "bundler",
+        "outDir": "out",
+        "rootDir": "src",
+        "sourceMap": true,
+        "skipLibCheck": true
+    },
+    "include": ["src"],
+    "exclude": ["node_modules", ".vscode-test"]
+}