agentHost Adopt new tree-sitter

package.json

@@ -109,7 +109,7 @@
     "@vscode/spdlog": "^0.15.8",
     "@vscode/sqlite3": "5.1.12-vscode",
     "@vscode/sudo-prompt": "9.3.2",
-    "@vscode/tree-sitter-wasm": "^0.3.0",
+    "@vscode/tree-sitter-wasm": "^0.3.1",
     "@vscode/vscode-languagedetection": "1.0.23",
     "@vscode/windows-mutex": "^0.5.0",
     "@vscode/windows-process-tree": "^0.6.0",

remote/package.json

@@ -16,7 +16,7 @@
     "@vscode/ripgrep": "^1.17.1",
     "@vscode/spdlog": "^0.15.8",
     "@vscode/sqlite3": "5.1.12-vscode",
-    "@vscode/tree-sitter-wasm": "^0.3.0",
+    "@vscode/tree-sitter-wasm": "^0.3.1",
     "@vscode/vscode-languagedetection": "1.0.23",
     "@vscode/windows-process-tree": "^0.6.0",
     "@vscode/windows-registry": "^1.2.0",
@@ -38,12 +38,12 @@
     "kerberos": "2.1.1",
     "minimist": "^1.2.8",
     "node-pty": "^1.2.0-beta.12",
+    "ssh2": "^1.16.0",
     "tas-client": "0.3.1",
     "vscode-oniguruma": "1.7.0",
     "vscode-regexpp": "^3.1.0",
     "vscode-textmate": "^9.3.2",
     "ws": "^8.19.0",
-    "ssh2": "^1.16.0",
     "yauzl": "^3.0.0",
     "yazl": "^2.4.3"
   },

remote/web/package.json

@@ -7,7 +7,7 @@
     "@microsoft/1ds-post-js": "^3.2.13",
     "@vscode/codicons": "^0.0.46-1",
     "@vscode/iconv-lite-umd": "0.7.1",
-    "@vscode/tree-sitter-wasm": "^0.3.0",
+    "@vscode/tree-sitter-wasm": "^0.3.1",
     "@vscode/vscode-languagedetection": "1.0.23",
     "@xterm/addon-clipboard": "^0.3.0-beta.196",
     "@xterm/addon-image": "^0.10.0-beta.196",

src/vs/platform/agentHost/node/commandAutoApprover.ts

@@ -172,7 +172,11 @@ export class CommandAutoApprover extends Disposable {
 
 	private async _initTreeSitter(): Promise<void> {
 		try {
-			const TreeSitter = await import('@vscode/tree-sitter-wasm');
+			const { default: TreeSitter } = (await import('@vscode/tree-sitter-wasm'));
+
+			if (this._store.isDisposed) {
+				return;
+			}
 
 			// Resolve WASM files from node_modules
 			const moduleRoot = URI.joinPath(FileAccess.asFileUri(''), '..', 'node_modules', '@vscode', 'tree-sitter-wasm', 'wasm');
@@ -184,14 +188,33 @@ export class CommandAutoApprover extends Disposable {
 				}
 			});
 
+			if (this._store.isDisposed) {
+				return;
+			}
+
 			const parser = new TreeSitter.Parser();
-			this._register(toDisposable(() => parser.delete()));
+			this._register(toDisposable(() => {
+				try {
+					parser.delete();
+				} catch {
+					// WASM memory may already be freed
+				}
+			}));
 
 			// Load bash grammar
 			const bashWasmPath = URI.joinPath(moduleRoot, 'tree-sitter-bash.wasm').fsPath;
 			const bashWasm = await fs.promises.readFile(bashWasmPath);
+
+			if (this._store.isDisposed) {
+				return;
+			}
+
 			const bashLanguage = await TreeSitter.Language.load(new Uint8Array(bashWasm.buffer, bashWasm.byteOffset, bashWasm.byteLength));
 
+			if (this._store.isDisposed) {
+				return;
+			}
+
 			this._parser = parser;
 			this._bashLanguage = bashLanguage;
 			this._queryClass = TreeSitter.Query;