Add sandbox setup cmd for VSCodium

package.json

@@ -17,7 +17,6 @@
     "fix:meta": "pnpm run meta-updater:base && pnpm -r exec prettier --write tsconfig.json package.json",
     "fix:syncpack": "pnpm syncpack fix-mismatches",
     "init-vscode-sandbox": "pnpm --filter=@cursorless/cursorless-vscode init-launch-sandbox",
-    "init-codium-sandbox": "pnpm --filter=@cursorless/cursorless-vscode init-launch-sandbox-codium",
     "lint:meta": "pnpm run meta-updater:base --test",
     "lint:ts": "cross-env ESLINT_USE_FLAT_CONFIG=false eslint packages --ext ts,tsx,mts",
     "lint": "pnpm run lint:meta && syncpack list-mismatches && pnpm run lint:ts",

packages/cursorless-org-docs/src/docs/contributing/CONTRIBUTING.mdx

@@ -3,8 +3,7 @@ import TabItem from '@theme/TabItem';
 
 # Contributing
 
-Welcome! So glad you've decided to help make Cursorless better. You'll want to start by getting [set up](#initial-setup) and learning how to [run / test a local copy of the
-extension](#running--testing-extension-locally). You may also find the [VSCode API docs](https://code.visualstudio.com/api) helpful to learn about VSCode extension development.
+Welcome! So glad you've decided to help make Cursorless better. You'll want to start by getting [set up](#initial-setup) and learning how to [run / test a local copy of the extension](#running--testing-extension-locally). You may also find the [VSCode API docs](https://code.visualstudio.com/api) helpful to learn about VSCode extension development.
 
 ## Initial setup
 
@@ -13,18 +12,20 @@ extension](#running--testing-extension-locally). You may also find the [VSCode A
 - [Git](https://git-scm.com/)
 - [Node.js](https://nodejs.org/en/)
 - [Corepack](https://nodejs.org/api/corepack.html) or [pnpm](https://pnpm.io/installation)
-- [VSCode](https://code.visualstudio.com/) or [VSCodium](https://vscodium.com/); minimum version for local development is 1.72.0 (1.72.0.22279 for VSCodium) in order to support settings profiles for sandboxed development. Please file an issue if that is a problem.
+- [VSCode](https://code.visualstudio.com/) or [VSCodium](https://vscodium.com/); Please file an issue if you are unable to use [settings profiles](https://code.visualstudio.com/updates/v1_72#_settings-profiles), as they are required for the development environment.
+Both VSCode and VSCodium will be referred to as VSCode except when instructions differ between the editors.
 
 ### Steps
 
 1. Clone [`cursorless`](https://github.com/cursorless-dev/cursorless) locally. Note that it doesn't matter where you clone it, as long as you _**do not**_ clone it into your Talon user directory.
-2. Open the newly created `cursorless` directory in VSCode/VSCodium. If you're on Windows, don't use WSL (see [#919](https://github.com/cursorless-dev/cursorless/issues/919) for discussion / workaround).
+2. Open the newly created `cursorless` directory in VSCode. If you're on Windows, don't use WSL (see [#919](https://github.com/cursorless-dev/cursorless/issues/919) for discussion / workaround).
 3. Run the following in the terminal:
 
    ```bash
    pnpm install
    pnpm compile
    ```
+Don't fret if `pnpm compile` fails! While required for running tests locally on your machine, you will still be able to run tests through GitHub Actions, and it will not prevent you from contributing otherwise. 
 
 4. Run the following in the terminal:
 
@@ -41,7 +42,7 @@ extension](#running--testing-extension-locally). You may also find the [VSCode A
       </TabItem>
    </Tabs>
 
-   and then close the window that opens (eg say `"window close"`). This step is necessary to create the [settings profile](https://code.visualstudio.com/updates/v1_72#_settings-profiles) that acts as a sandbox containing a specific set of VSX extensions that will be run alongside Cursorless when you launch Cursorless in debug or test mode. Once https://github.com/microsoft/vscode/issues/172046 is resolved, we will be able to remove this step, as the profile can then automatically be created.
+   and then close the window that opens (eg say `"window close"`). This step is necessary to create the [settings profile](https://code.visualstudio.com/updates/v1_72#_settings-profiles) that acts as a sandbox containing a specific set of VSCode extensions that will be run alongside Cursorless when you launch Cursorless in debug or test mode. Once https://github.com/microsoft/vscode/issues/172046 is resolved, we will be able to remove this step, as the profile can then automatically be created.
 
 5. Run the following in the terminal:
 
@@ -53,12 +54,14 @@ extension](#running--testing-extension-locally). You may also find the [VSCode A
       </TabItem>
       <TabItem value="vscodium" label="VSCodium">
       ```bash
-      pnpm init-codium-sandbox
+      pnpm init-vscode-sandbox
       ```
+      VSCodium users will also need to manually download and install the `jrieken:vscode-tree-sitter-query` extension, as it is [currently not avalible](https://github.com/jrieken/vscode-tree-sitter-query/issues/28) on the OpenVSX Marketplace.
+      Instructions on how to manually download the extension can be found [in this Stack Overflow post](https://stackoverflow.com/a/79565372) ([archived](https://web.archive.org/web/20250421130639/https://stackoverflow.com/questions/79359919/how-can-i-manually-download-vsix-files-now-that-the-vs-code-marketplace-no-long/79565372#79565372)), while manual installation instructions can be found directly below—replace `some.extension` with the acquired `.vsix` file's path instead of an extension id.
       </TabItem>
    </Tabs>
 
-   Said command adds extensions to the aforementioned settings profile that acts as a sandbox containing a specific set of VSX extensions that will be run alongside Cursorless when you launch Cursorless in debug or test mode. This approach is [suggested](https://code.visualstudio.com/updates/v1_72#_extension-debugging-in-a-clean-environment) by the VSCode documentation. If you need to update any of the extension dependencies in the sandbox, you can add `--force` to the command. If you'd like to use additional extensions when debugging locally, you can use the following command:
+   Said command adds extensions to the aforementioned settings profile that acts as a sandbox containing a specific set of VSCode extensions that will be run alongside Cursorless when you launch Cursorless in debug or test mode. This approach is [suggested](https://code.visualstudio.com/updates/v1_72#_extension-debugging-in-a-clean-environment) by the VSCode documentation. If you need to update any of the extension dependencies in the sandbox, you can add `--force` to the command. If you'd like to use additional extensions when debugging locally, you can use the following command:
 
    <Tabs groupId="vsx">
       <TabItem value="vscode" label="VSCode">

packages/cursorless-vscode/package.json

@@ -1248,7 +1248,6 @@
     "esbuild:meta": "pnpm run esbuild:base --metafile=meta.json",
     "populate-dist": "my-ts-node ./src/scripts/populateDist/index.ts",
     "init-launch-sandbox": "my-ts-node src/scripts/initLaunchSandbox.ts",
-    "init-launch-sandbox-codium": "my-ts-node src/scripts/initLaunchSandboxCodium.ts",
     "preprocess-svg-hats": "my-ts-node src/scripts/preprocessSvgHats.ts",
     "hat-adjustment-add": "my-ts-node src/scripts/hatAdjustments/add.ts",
     "hat-adjustment-average": "my-ts-node src/scripts/hatAdjustments/average.ts",

packages/cursorless-vscode/src/scripts/initLaunchSandbox.ts

@@ -7,8 +7,47 @@ import { extensionDependencies } from "@cursorless/common";
 import * as cp from "child_process";
 
 const extraExtensions = ["pokey.command-server"];
+const vsCodeToolName = "code";
+const vsCodiumToolName = "codium";
 
 async function main() {
+
+  // CLI tool name check
+
+  var cliToolName: string = vsCodeToolName;
+  var foundTool: boolean = false;
+
+  console.log("Checking avalible VSC cli tool...");
+
+  while (!foundTool) {
+    try {
+      const checkToolSubprocess = cp.spawn(cliToolName, ["-v"], {
+      stdio: "inherit",
+      shell: true,
+    });
+
+    await new Promise<void>((resolve, reject) => {
+      checkToolSubprocess.on("error", reject);
+      checkToolSubprocess.on("exit", (code) => {
+        if (code === 0) {
+          foundTool = true;
+          resolve();
+        } else {
+          reject(new Error(`Process returned code ${code}`));
+        }
+      });
+    });
+
+    } catch(error) {
+      if (cliToolName === vsCodeToolName) {
+        cliToolName = vsCodiumToolName;
+      } else if (cliToolName === vsCodiumToolName) {
+        console.error("No VSC command line interface found!");
+        process.exit(2);
+      }
+    }
+  }
+  console.log("Found '%s' cli tool!", vsCodeToolName)
   try {
     const args = [
       "--profile=cursorlessDevelopment",
@@ -21,8 +60,16 @@ async function main() {
       args.push("--force");
     }
 
+    // Do not attempt to install jrieken:vscode-tree-sitter-query if editor is VSCodium
+    if (cliToolName === vsCodiumToolName) {
+      const index: number = args.findIndex((value) => value.includes("vscode-tree-sitter-query"))
+      args.splice(index, 1)
+      console.log("Not installing jrieken:vscode-tree-sitter-query as it is not on the OpenVSX Marketplace.")
+      console.log("You should install this extension manually. Check the Cursorless contributor documentation for more info.")
+    }
+
     // Install extension dependencies
-    const subprocess = cp.spawn("code", args, {
+    const subprocess = cp.spawn(cliToolName, args, {
       stdio: "inherit",
       shell: true,
     });