Merge lsp-impl and bring LSP features into master

.gitignore

@@ -26,4 +26,8 @@ __pycache__
 
 # Hybroid Live generated files 
 examples/*/out
+
+# DS_Store
 .DS_Store
+
+hybroid

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "docs"]
 	path = docs
 	url = https://github.com/pewpewlive/hybroid-docs.git
+[submodule "vscode-ext"]
+	path = vscode-ext
+	url = https://github.com/pewpewlive/hybroid-vscode.git

AGENTS.md

@@ -21,6 +21,10 @@ The project is written in **Go** and follows a standard compiler architecture:
 4.  **Generator (`generator/`)**: Transpiles the AST into Lua code.
 5.  **LSP (`lsp/`)**: Provides Language Server Protocol support for editors (VS Code).
 
+### LSP single-file fallback
+
+When the editor opens a `.hyb` file without a containing folder (no `rootUri` in the `initialize` request), the LSP walks the parent directories looking for `hybconfig.toml` — the same pattern that `tsserver` uses to discover a `tsconfig.json` for loose files. If a project root is found, full workspace analysis runs as if the folder had been opened. If no marker is found, the file is analyzed in isolation and a single Information diagnostic is published at the top of the buffer: *"This file is open without its Hybroid project. Open the folder containing `hybconfig.toml` to resolve all `use` references."* See `lsp/find_project_root.go` and `lsp/handle_text_document_did_change.go`.
+
 ## Development Environments
 
 Hybroid supports distinct "environments" that dictate available standard libraries and compilation behavior:
@@ -61,6 +65,23 @@ Run standard Go tests:
 go test ./...
 ```
 
+### Releasing the LSP alpha
+
+1.  Tag the merge commit on `master` as `v0.1.0-lsp-alpha`.
+2.  Run `python utils/build_hybroid.py` to produce binaries for all platforms in `./build/`. Upload each to the GitHub Release with the name `hybroid-<platform><.exe>`.
+3.  The `install.sh` / `install.ps1` scripts at hybroid.pewpew.live fetch the matching asset and copy it to `~/.hybroid/hybroid`.
+4.  The VS Code extension is packaged and published separately in the `hybroid-vscode` repo. Bump its `version` in `package.json` to `0.1.0` and run `vsce package`.
+5.  No new CI workflow is added in this repo — the existing `.github/workflows/go.yml` validates builds and tests on push to master, which is sufficient for the alpha.
+
+### Install location and logs
+
+The Hybroid CLI/LSP binary and the LSP debug log both live under `~/.hybroid/`:
+
+*   Binary: `~/.hybroid/hybroid` (or `~/.hybroid/hybroid.exe` on Windows)
+*   LSP log (debug mode only): `~/.hybroid/logs/lsp.log`
+
+The `HYBROID_LS_LOG` environment variable overrides the log path. On macOS, VS Code has a sanitized PATH that does not include `~/.hybroid`, so the extension searches there explicitly. The `hybroid.languageServerPath` user setting is the override if both mechanisms fail. See `lsp/logpath.go` for the resolution contract and `vscode-ext/src/path-resolver.ts` (in the submodule) for the binary search chain.
+
 ## Directory Structure
 
 *   `alerts/`: Error reporting system (diagnostics, pretty printing).

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2025 Hybroid Team
+   Copyright 2026 Hybroid Team
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

alerts/printer.go

@@ -96,6 +96,10 @@ func (p *Printer) GetAlerts(sourcePath string) []Alert {
 	return p.alertsByFile[sourcePath]
 }
 
+func (p *Printer) AllAlerts() map[string][]Alert {
+	return p.alertsByFile
+}
+
 func (p *Printer) StageAlerts(sourcePath string, alerts []Alert) {
 	fileAlerts, existed := p.alertsByFile[sourcePath]
 	if !existed {

alerts/snippet.go

@@ -24,6 +24,23 @@ func writeTruncatedLine(snippet *strings.Builder, loc tokens.Location, line []by
 	start, end := loc.Column.Start, loc.Column.End
 	lineSize := len(line)
 
+	// Clamp column values into the valid range for this line. A bad or
+	// stale column (e.g. from a multi-line token whose End points past the
+	// current line, or a single-line token whose End > line length) would
+	// otherwise cause slice-out-of-range panics below.
+	if start < 1 {
+		start = 1
+	}
+	if end < start {
+		end = start
+	}
+	if start-1 > lineSize {
+		start = lineSize + 1
+	}
+	if end-1 > lineSize {
+		end = lineSize + 1
+	}
+
 	leadingSpace := start - 1
 	markerSize := end - start
 

ast/expressions.go

@@ -50,8 +50,9 @@ func (pe *EntityAccessExpr) GetType() NodeType      { return EntityAccessExpress
 func (pe *EntityAccessExpr) GetToken() tokens.Token { return pe.Expr.GetToken() }
 
 type LiteralExpr struct {
-	Value string
-	Token tokens.Token
+	Value     string
+	Token     tokens.Token
+	IsEnvPath bool // Set when this literal was generated from an environment identifier
 }
 
 func (le *LiteralExpr) GetType() NodeType      { return LiteralExpression }

cli/app.go

@@ -12,15 +12,14 @@ func RunApp() {
 	app := &cli.App{
 		Name:      "hybroid-live",
 		Usage:     "The Hybroid Live transpiler CLI",
-		Version:   "0.1.0",
-		Copyright: "Copyright (C) Hybroid Team, 2025\nLicensed under Apache-2.0",
+		Version:   "0.2.0-alpha",
+		Copyright: "Copyright (C) Hybroid Team, 2026\nLicensed under Apache-2.0",
 		Commands: []*cli.Command{
 			commands.Add(),
 			commands.Build(),
 			commands.Initialize(),
 			commands.Watch(),
-			// LSP is not yet implemented
-			// commands.Lsp(),
+			commands.Lsp(),
 		},
 	}
 

cli/commands/build.go

@@ -25,7 +25,7 @@ func Build() *cli.Command {
 	}
 }
 
-func runEvaluator(config core.HybroidConfig, filesToBuild []core.FileInformation, cwd string) error {
+func runEvaluator(config core.HybroidConfig, filesToBuild []core.File, cwd string) error {
 	outputDir := config.Project.OutputDirectory
 
 	if outputDir != "" {
@@ -87,7 +87,7 @@ func runEvaluator(config core.HybroidConfig, filesToBuild []core.FileInformation
 	return nil
 }
 
-func Build_(filesToBuild ...core.FileInformation) error {
+func Build_(filesToBuild ...core.File) error {
 	cwd, err := os.Getwd()
 	if err != nil {
 		return fmt.Errorf("failed getting current working directory: %v", err)

cli/commands/lsp.go

@@ -0,0 +1,29 @@
+package commands
+
+import (
+	"hybroid/lsp"
+
+	"github.com/urfave/cli/v2"
+)
+
+func Lsp() *cli.Command {
+	return &cli.Command{
+		Name:    "language-server",
+		Aliases: []string{"server", "lsp"},
+		Usage:   "Starts HybroidLS, an integrated Language Server for Hybroid Live",
+		Flags: []cli.Flag{
+			&cli.BoolFlag{
+				Name:  "debug",
+				Usage: "Enable verbose debug logging",
+			},
+		},
+		Action: func(ctx *cli.Context) error {
+			return languageServer(ctx)
+		},
+	}
+}
+
+func languageServer(ctx *cli.Context) error {
+	lsp.Init(ctx.Bool("debug"))
+	return nil
+}

cli/commands/watch.go

@@ -46,7 +46,7 @@ func watch(ctx *cli.Context) error {
 					fileName := strings.Split(filepath.Base(event.Name), ".")[0]
 					fileExtension := filepath.Ext(event.Name)
 
-					Build_(core.FileInformation{DirectoryPath: directoryPath, FileName: fileName, FileExtension: fileExtension})
+					Build_(core.File{DirectoryPath: directoryPath, FileName: fileName, FileExtension: fileExtension})
 				}
 			case err, ok := <-watcher.Errors:
 				if !ok {

core/files.go

@@ -0,0 +1,38 @@
+package core
+
+import (
+	"io/fs"
+	"os"
+	"path/filepath"
+	"strings"
+)
+
+func CollectFiles(dir string) ([]File, error) {
+	files := make([]File, 0)
+	err := fs.WalkDir(os.DirFS(dir), ".", func(path string, d fs.DirEntry, err error) error {
+		if d != nil && !d.IsDir() {
+			ext := filepath.Ext(path)
+			if ext != ".hyb" {
+				return nil
+			}
+
+			directoryPath, err := filepath.Rel(dir, filepath.Dir(dir+"/"+path))
+			if err != nil {
+				return err
+			}
+
+			files = append(files, File{
+				DirectoryPath: filepath.ToSlash(directoryPath),
+				FileName:      strings.ReplaceAll(d.Name(), ".hyb", ""),
+				FileExtension: ext,
+			})
+		}
+
+		return nil
+	})
+	if err != nil {
+		return files, err
+	}
+
+	return files, nil
+}

core/hybroid.go

@@ -22,21 +22,21 @@ type HybroidConfig struct {
 	//Packages        []PackageConfig `toml:"packages"`
 }
 
-type FileInformation struct {
+type File struct {
 	DirectoryPath string // The directory the file is located at (relative)
 	FileName      string // The name of the file (without an extension)
 	FileExtension string // The extension of the file
 }
 
-func (fi *FileInformation) Path() string {
+func (fi *File) Path() string {
 	if fi.DirectoryPath == "." {
 		return fmt.Sprintf("%s%s", fi.FileName, fi.FileExtension)
 	}
 
 	return fmt.Sprintf("%s/%s%s", fi.DirectoryPath, fi.FileName, fi.FileExtension)
 }
 
-func (fi *FileInformation) NewPath(start string, end string) string {
+func (fi *File) NewPath(start string, end string) string {
 	if fi.DirectoryPath == "." {
 		return fmt.Sprintf("%s/%s%s", start, fi.FileName, end)
 	}

core/logging.go

@@ -0,0 +1,13 @@
+package core
+
+import (
+	"log"
+)
+
+var IsDebug bool
+
+func DebugLog(format string, v ...any) {
+	if IsDebug {
+		log.Printf(format, v...)
+	}
+}