chore: support both names

Author: psteinroe

.github/workflows/release.yml

@@ -89,6 +89,8 @@ jobs:
           # Strip all debug symbols from the resulting binaries
           RUSTFLAGS: "-C strip=symbols -C codegen-units=1"
           # Inline the version in the CLI binary
+          PGLS_VERSION: ${{ needs.extract_version.outputs.version }}
+          # Inline the version in the CLI binary (deprecated)
           PGT_VERSION: ${{ needs.extract_version.outputs.version }}
 
       # windows is a special snowflake too, it saves binaries as .exe

CLAUDE.md

@@ -62,11 +62,11 @@ just new-crate <name>
 ```
 
 ### CLI Usage
-The main CLI binary is `postgrestools`:
+The main CLI binary is `postgres-language-server`:
 ```bash
 cargo run -p pgt_cli -- check file.sql
 # or after building:
-./target/release/postgrestools check file.sql
+./target/release/postgres-language-server check file.sql
 ```
 
 ## Architecture
@@ -76,7 +76,7 @@ The project uses a modular Rust workspace with crates prefixed with `pgt_`:
 
 **Core Infrastructure:**
 - `pgt_workspace` - Main API and workspace management
-- `pgt_lsp` - Language Server Protocol implementation  
+- `pgt_lsp` - Language Server Protocol implementation
 - `pgt_cli` - Command-line interface
 - `pgt_fs` - Virtual file system abstraction
 - `pgt_configuration` - Configuration management
@@ -103,8 +103,8 @@ The project uses a modular Rust workspace with crates prefixed with `pgt_`:
 ### TypeScript Packages
 Located in `packages/` and `editors/`:
 - VSCode extension in `editors/code/`
-- Backend JSON-RPC bridge in `packages/@postgrestools/backend-jsonrpc/`
-- Main TypeScript package in `packages/@postgrestools/postgrestools/`
+- Backend JSON-RPC bridge in `packages/@postgres-language-server/backend-jsonrpc/`
+- Main TypeScript package in `packages/@postgres-language-server/postgres-language-server/`
 
 ### Database Integration
 The server connects to a Postgres database to build an in-memory schema cache containing tables, columns, functions, and type information. This enables accurate autocompletion and type checking.
@@ -132,7 +132,7 @@ cargo insta review
 
 ### Rust Configuration
 - `Cargo.toml` - Workspace definition with all crate dependencies
-- `rust-toolchain.toml` - Rust version specification  
+- `rust-toolchain.toml` - Rust version specification
 - `rustfmt.toml` - Code formatting configuration
 - `clippy.toml` - Clippy linting configuration
 
@@ -150,6 +150,6 @@ Many parser structures are generated from PostgreSQL's protobuf definitions usin
 ### Database Schema
 The `pgt_schema_cache` crate contains SQL queries in `src/queries/` that introspect the database schema to build the in-memory cache.
 
-### Multi-Platform Support  
+### Multi-Platform Support
 The project includes platform-specific allocators and build configurations for Windows, macOS, and Linux.
-- Seeing the Treesitter tree for an SQL query can be helpful to debug and implement features. To do this, create a file with an SQL query, and run `just tree-print <file.sql>`.
+- Seeing the Treesitter tree for an SQL query can be helpful to debug and implement features. To do this, create a file with an SQL query, and run `just tree-print <file.sql>`.

crates/pgt_analyse/src/options.rs

@@ -45,7 +45,7 @@ impl AnalyserRules {
 /// A set of information useful to the analyser infrastructure
 #[derive(Debug, Default)]
 pub struct AnalyserOptions {
-    /// A data structured derived from the [`postgrestools.jsonc`] file
+    /// A data structured derived from the [`postgres-language-server.jsonc`] file
     pub rules: AnalyserRules,
 }
 

crates/pgt_analyser/CONTRIBUTING.md

@@ -81,7 +81,7 @@ Let's assume that the rule we implement support the following options:
 - `threshold`: an integer between 0 and 255;
 - `behaviorExceptions`: an array of strings.
 
-We would like to set the options in the `postgrestools.jsonc` configuration file:
+We would like to set the options in the `postgres-language-server.jsonc` configuration file:
 
 ```json
 {
@@ -143,9 +143,9 @@ We currently require implementing _serde_'s traits `Deserialize`/`Serialize`.
 
 Also, we use other `serde` macros to adjust the JSON configuration:
 
-- `rename_all = "camelCase"`: it renames all fields in camel-case, so they are in line with the naming style of the `postgrestools.jsonc`.
+- `rename_all = "camelCase"`: it renames all fields in camel-case, so they are in line with the naming style of the `postgres-language-server.jsonc`.
 - `deny_unknown_fields`: it raises an error if the configuration contains extraneous fields.
-- `default`: it uses the `Default` value when the field is missing from `postgrestools.jsonc`. This macro makes the field optional.
+- `default`: it uses the `Default` value when the field is missing from `postgres-language-server.jsonc`. This macro makes the field optional.
 
 You can simply use a derive macros:
 

crates/pgt_cli/src/cli_options.rs

@@ -22,7 +22,8 @@ pub struct CliOptions {
     #[bpaf(long("verbose"), switch, fallback(false))]
     pub verbose: bool,
 
-    /// Set the file path to the configuration file, or the directory path to find `postgrestools.jsonc`.
+    /// Set the file path to the configuration file, or the directory path to find
+    /// `postgres-language-server.jsonc`.
     /// If used, it disables the default configuration file resolution.
     #[bpaf(long("config-path"), argument("PATH"), optional)]
     pub config_path: Option<String>,
@@ -58,6 +59,7 @@ pub struct CliOptions {
 
     #[bpaf(
         env("PGT_LOG_LEVEL"),
+        env("PGLS_LOG_LEVEL"),
         long("log-level"),
         argument("none|debug|info|warn|error"),
         fallback(LoggingLevel::default()),

crates/pgt_cli/src/commands/clean.rs

@@ -1,15 +1,15 @@
-use crate::commands::daemon::default_pgt_log_path;
+use crate::commands::daemon::default_pgls_log_path;
 use crate::{CliDiagnostic, CliSession};
-use pgt_flags::pgt_env;
+use pgt_flags::pgls_env;
 use std::fs::{create_dir, remove_dir_all};
 use std::path::PathBuf;
 
 /// Runs the clean command
 pub fn clean(_cli_session: CliSession) -> Result<(), CliDiagnostic> {
-    let logs_path = pgt_env()
+    let logs_path = pgls_env()
         .pgt_log_path
         .value()
-        .map_or(default_pgt_log_path(), PathBuf::from);
+        .map_or(default_pgls_log_path(), PathBuf::from);
     remove_dir_all(logs_path.clone()).and_then(|_| create_dir(logs_path))?;
     Ok(())
 }

crates/pgt_cli/src/commands/daemon.rs

@@ -233,15 +233,15 @@ fn setup_tracing_subscriber(
     }
 }
 
-pub fn default_pgt_log_path() -> PathBuf {
-    match env::var_os("PGT_LOG_PATH") {
+pub fn default_pgls_log_path() -> PathBuf {
+    match env::var_os("PGLS_LOG_PATH") {
         Some(directory) => PathBuf::from(directory),
-        None => pgt_fs::ensure_cache_dir().join("pgt-logs"),
+        None => pgt_fs::ensure_cache_dir().join("pgls-logs"),
     }
 }
 
 /// Tracing Filter with two rules:
-/// For all crates starting with pgt*, use `PGT_LOG_LEVEL` or CLI option or "info" as default
+/// For all crates starting with pgt*, use `PGLS_LOG_LEVEL` or CLI option or "info" as default
 /// For all other crates, use "info"
 struct PgtLoggingFilter(LevelFilter);
 

crates/pgt_cli/src/commands/init.rs

@@ -8,10 +8,10 @@ pub(crate) fn init(mut session: CliSession) -> Result<(), CliDiagnostic> {
     let fs = &mut session.app.fs;
     let config = &mut PartialConfiguration::init();
     create_config(fs, config)?;
-    let file_created = ConfigName::pgt_jsonc();
+    let file_created = ConfigName::pgls_jsonc();
     session.app.console.log(markup! {
 "
-Welcome to the Postgres Language Tools! Let's get you started...
+Welcome to the Postgres Language Server! Let's get you started...
 
 "<Info><Emphasis>"Files created "</Emphasis></Info>"
 

crates/pgt_cli/src/commands/mod.rs

@@ -58,7 +58,7 @@ pub enum PgtCommand {
         changed: bool,
 
         /// Use this to specify the base branch to compare against when you're using the --changed
-        /// flag and the `defaultBranch` is not set in your `postgrestools.jsonc`
+        /// flag and the `defaultBranch` is not set in your `postgres-language-server.jsonc`
         #[bpaf(long("since"), argument("REF"))]
         since: Option<String>,
 
@@ -73,6 +73,7 @@ pub enum PgtCommand {
         /// Allows to change the prefix applied to the file name of the logs.
         #[bpaf(
             env("PGT_LOG_PREFIX_NAME"),
+            env("PGLS_LOG_PREFIX_NAME"),
             long("log-prefix-name"),
             argument("STRING"),
             hide_usage,
@@ -84,15 +85,21 @@ pub enum PgtCommand {
         /// Allows to change the folder where logs are stored.
         #[bpaf(
             env("PGT_LOG_PATH"),
+            env("PGLS_LOG_PATH"),
             long("log-path"),
             argument("PATH"),
             hide_usage,
             fallback(pgt_fs::ensure_cache_dir().join("pgt-logs")),
         )]
         log_path: PathBuf,
         /// Allows to set a custom file path to the configuration file,
-        /// or a custom directory path to find `postgrestools.jsonc`
-        #[bpaf(env("PGT_LOG_PREFIX_NAME"), long("config-path"), argument("PATH"))]
+        /// or a custom directory path to find `postgres-language-server.jsonc`
+        #[bpaf(
+            env("PGT_LOG_PREFIX_NAME"),
+            env("PGLS_LOG_PREFIX_NAME"),
+            long("config-path"),
+            argument("PATH")
+        )]
         config_path: Option<PathBuf>,
     },
 
@@ -110,6 +117,7 @@ pub enum PgtCommand {
         /// Allows to change the prefix applied to the file name of the logs.
         #[bpaf(
             env("PGT_LOG_PREFIX_NAME"),
+            env("PGLS_LOG_PREFIX_NAME"),
             long("log-prefix-name"),
             argument("STRING"),
             hide_usage,
@@ -120,15 +128,21 @@ pub enum PgtCommand {
         /// Allows to change the folder where logs are stored.
         #[bpaf(
             env("PGT_LOG_PATH"),
+            env("PGLS_LOG_PATH"),
             long("log-path"),
             argument("PATH"),
             hide_usage,
             fallback(pgt_fs::ensure_cache_dir().join("pgt-logs")),
         )]
         log_path: PathBuf,
         /// Allows to set a custom file path to the configuration file,
-        /// or a custom directory path to find `postgrestools.jsonc`
-        #[bpaf(env("PGT_CONFIG_PATH"), long("config-path"), argument("PATH"))]
+        /// or a custom directory path to find `postgres-language-server.jsonc`
+        #[bpaf(
+            env("PGT_CONFIG_PATH"),
+            env("PGLS_CONFIG_PATH"),
+            long("config-path"),
+            argument("PATH")
+        )]
         config_path: Option<PathBuf>,
         /// Bogus argument to make the command work with vscode-languageclient
         #[bpaf(long("stdio"), hide, hide_usage, switch)]
@@ -144,6 +158,7 @@ pub enum PgtCommand {
         /// Allows to change the prefix applied to the file name of the logs.
         #[bpaf(
             env("PGT_LOG_PREFIX_NAME"),
+            env("PGLS_LOG_PREFIX_NAME"),
             long("log-prefix-name"),
             argument("STRING"),
             hide_usage,
@@ -155,6 +170,7 @@ pub enum PgtCommand {
         /// Allows to change the folder where logs are stored.
         #[bpaf(
             env("PGT_LOG_PATH"),
+            env("PGLS_LOG_PATH"),
             long("log-path"),
             argument("PATH"),
             hide_usage,
@@ -165,6 +181,7 @@ pub enum PgtCommand {
         /// Allows to change the log level. Default is debug. This will only affect "pgt*" crates. All others are logged with info level.
         #[bpaf(
             env("PGT_LOG_LEVEL"),
+            env("PGLS_LOG_LEVEL"),
             long("log-level"),
             argument("trace|debug|info|warn|error|none"),
             fallback(String::from("debug"))
@@ -174,6 +191,7 @@ pub enum PgtCommand {
         /// Allows to change the logging format kind. Default is hierarchical.
         #[bpaf(
             env("PGT_LOG_KIND"),
+            env("PGLS_LOG_KIND"),
             long("log-kind"),
             argument("hierarchical|bunyan"),
             fallback(String::from("hierarchical"))
@@ -183,8 +201,13 @@ pub enum PgtCommand {
         #[bpaf(long("stop-on-disconnect"), hide_usage)]
         stop_on_disconnect: bool,
         /// Allows to set a custom file path to the configuration file,
-        /// or a custom directory path to find `postgrestools.jsonc`
-        #[bpaf(env("PGT_CONFIG_PATH"), long("config-path"), argument("PATH"))]
+        /// or a custom directory path to find `postgres-language-server.jsonc`
+        #[bpaf(
+            env("PGT_CONFIG_PATH"),
+            env("PGLS_CONFIG_PATH"),
+            long("config-path"),
+            argument("PATH")
+        )]
         config_path: Option<PathBuf>,
     },
     #[bpaf(command("__print_socket"), hide)]

crates/pgt_cli/src/diagnostics.rs

@@ -11,7 +11,7 @@ fn command_name() -> String {
     current_exe()
         .ok()
         .and_then(|path| Some(path.file_name()?.to_str()?.to_string()))
-        .unwrap_or_else(|| String::from("postgrestools"))
+        .unwrap_or_else(|| String::from("postgres-language-server"))
 }
 
 /// A diagnostic that is emitted when running Postgres Tools via CLI.
@@ -47,7 +47,7 @@ pub enum CliDiagnostic {
     IoError(IoDiagnostic),
     /// The daemon is not running
     ServerNotRunning(ServerNotRunning),
-    /// The end configuration (`postgrestools.jsonc` + other options) is incompatible with the command
+    /// The end configuration (`postgres-language-server.jsonc` + other options) is incompatible with the command
     IncompatibleEndConfiguration(IncompatibleEndConfiguration),
     /// No files processed during the file system traversal
     NoFilesWereProcessed(NoFilesWereProcessed),
@@ -390,7 +390,7 @@ impl CliDiagnostic {
         Self::ServerNotRunning(ServerNotRunning)
     }
 
-    /// Emitted when the end configuration (`postgrestools.jsonc` file + CLI arguments + LSP configuration)
+    /// Emitted when the end configuration (`postgres-language-server.jsonc` file + CLI arguments + LSP configuration)
     /// results in a combination of options that doesn't allow to run the command correctly.
     ///
     /// A reason needs to be provided