Merge branch 'master' into codex/plan-lets-system-config-support

Author: kindermax

docs/docs/changelog.md

@@ -11,14 +11,16 @@ title: Changelog
 * `[Added]` Expose `LETS_OS` and `LETS_ARCH` environment variables at command runtime.
 * `[Removed]` Drop deprecated `eval_env` directive. Use `env` with `sh` execution mode instead.
 * `[Added]` When a command or its `depends` chain fails, print an indented tree to stderr showing the full chain with the failing command highlighted
-* `[Changed]` Format command failure output as a `lets:`-prefixed tree plus a separate final status line such as `lets: exit status 1`.
+* `[Changed]` Format command failure output as a logger-prefixed `command failed:` block followed by the dependency tree, while preserving the final status line such as `lets: exit status 1`.
 * `[Added]` Support `env_file` in global config and commands. File names are expanded after `env` is resolved, and values loaded from env files override values from `env`.
 * `[Changed]` Migrate the LSP YAML parser from the CGO-based tree-sitter bindings to pure-Go [`gotreesitter`](https://github.com/odvcencio/gotreesitter), removing the C toolchain requirement from normal builds and release packaging.
 * `[Refactoring]` Move CLI startup flow from `cmd/lets/main.go` into `internal/cli/cli.go`, keeping `main.go` as a thin launcher.
 * `[Added]` Add `lets self doc` command to open the online documentation in a browser.
 * `[Added]` Show background update notifications for interactive sessions, with Homebrew-aware guidance and `LETS_CHECK_UPDATE` opt-out.
 * `[Changed]` Centralize the `lets:` log prefix in the formatter and render debug messages in blue.
 * `[Added]` Add user settings in `~/.config/lets/config.yaml` for lets behavior such as `no_color` and `upgrade_notify`, with env variables still taking precedence.
+* `[Fixed]` Resolve `go to definition` from YAML merge aliases such as `<<: *test` to the referenced command in `lets self lsp`.
+* `[Added]` Load local mixin files into LSP storage and command index so mixin commands are available for navigation.
 
 ## [0.0.59](https://github.com/lets-cli/lets/releases/tag/v0.0.59)
 

examples/python/requirements.txt

@@ -1,3 +1,3 @@
-aiohttp==3.7.4
+aiohttp==3.13.4
 
 ipython==8.10.0

go.mod

@@ -9,7 +9,8 @@ require (
 	github.com/coreos/go-semver v0.3.1
 	github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
 	github.com/fatih/color v1.16.0
-	github.com/odvcencio/gotreesitter v0.9.2
+	github.com/mattn/go-isatty v0.0.20
+	github.com/odvcencio/gotreesitter v0.12.1
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.10.2
@@ -24,7 +25,6 @@ require (
 	github.com/iancoleman/strcase v0.3.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-runewidth v0.0.14 // indirect
 	github.com/muesli/termenv v0.15.2 // indirect
 	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect

go.sum

@@ -79,8 +79,8 @@ github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1n
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U=
-github.com/odvcencio/gotreesitter v0.9.2 h1:ZROpRS+bTcC1mwofBp53l66Jv00FH0ccViSwGVmaBBM=
-github.com/odvcencio/gotreesitter v0.9.2/go.mod h1:Sx+iYJBfw5xSWkSttLSuFvguJctlH+ma1BTxZ0MPCqo=
+github.com/odvcencio/gotreesitter v0.12.1 h1:bJI2ZH6K/A8Vdqqa+ilA6+V82JQ3wyCRlHsFEIKTSIY=
+github.com/odvcencio/gotreesitter v0.12.1/go.mod h1:Sx+iYJBfw5xSWkSttLSuFvguJctlH+ma1BTxZ0MPCqo=
 github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ=
 github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

internal/cli/cli.go

@@ -143,8 +143,9 @@ func Main(version string, buildDate string) int {
 	if err := rootCmd.ExecuteContext(ctx); err != nil {
 		var depErr *executor.DependencyError
 		if errors.As(err, &depErr) {
-			executor.PrintDependencyTree(depErr, os.Stderr)
+			log.Errorf("%s", depErr.TreeMessage())
 			log.Errorf("%s", depErr.FailureMessage())
+
 			return getExitCode(err, 1)
 		}
 

internal/executor/dependency_error.go

@@ -9,15 +9,17 @@ import (
 	"github.com/fatih/color"
 )
 
+const dependencyTreeIndent = "  "
+const dependencyTreeHeader = "command failed:"
+const dependencyTreeJoint = "└─ "
+
 // DependencyError carries the full dependency chain when a command fails.
 // Chain is outermost-first (e.g., ["deploy", "build", "lint"]).
 type DependencyError struct {
 	Chain []string
 	Err   error
 }
 
-const treePrefix = "lets: "
-
 func (e *DependencyError) Error() string { return e.Err.Error() }
 func (e *DependencyError) Unwrap() error { return e.Err }
 
@@ -40,6 +42,28 @@ func (e *DependencyError) FailureMessage() string {
 	return e.Err.Error()
 }
 
+func (e *DependencyError) TreeMessage() string {
+	red := color.New(color.FgRed).SprintFunc()
+
+	var builder strings.Builder
+
+	builder.WriteString(dependencyTreeHeader)
+
+	for i, name := range e.Chain {
+		builder.WriteByte('\n')
+		builder.WriteString(strings.Repeat(dependencyTreeIndent, i+1))
+		builder.WriteString(dependencyTreeJoint)
+		builder.WriteString(name)
+
+		if i == len(e.Chain)-1 {
+			builder.WriteString(dependencyTreeIndent)
+			builder.WriteString(red("<-- failed here"))
+		}
+	}
+
+	return builder.String()
+}
+
 // prependToChain prepends name to the chain in err if err is already a *DependencyError,
 // otherwise wraps err in a new single-element DependencyError.
 func prependToChain(name string, err error) error {
@@ -55,19 +79,5 @@ func prependToChain(name string, err error) error {
 // The failing node (last in chain) is annotated in red.
 // Respects NO_COLOR automatically via fatih/color.
 func PrintDependencyTree(e *DependencyError, w io.Writer) {
-	red := color.New(color.FgRed).SprintFunc()
-	treeIndent := strings.Repeat(" ", len(treePrefix))
-
-	for i, name := range e.Chain {
-		indent := treeIndent + strings.Repeat("  ", i+1)
-		if i == 0 {
-			indent = treePrefix
-		}
-
-		if i == len(e.Chain)-1 {
-			fmt.Fprintf(w, "%s%s  %s\n", indent, name, red("<-- failed here"))
-		} else {
-			fmt.Fprintf(w, "%s%s\n", indent, name)
-		}
-	}
+	fmt.Fprintln(w, e.TreeMessage())
 }

internal/executor/dependency_error_test.go

@@ -150,14 +150,18 @@ func TestPrintDependencyTree(t *testing.T) {
 		PrintDependencyTree(depErr, &buf)
 		out := buf.String()
 		lines := strings.Split(strings.TrimRight(out, "\n"), "\n")
-		if len(lines) != 1 {
-			t.Fatalf("expected 1 line, got %d: %v", len(lines), lines)
+		if len(lines) != 2 {
+			t.Fatalf("expected 2 lines, got %d: %v", len(lines), lines)
 		}
-		if !strings.HasPrefix(lines[0], "lets: lint") {
-			t.Errorf("expected line to start with 'lets: lint', got: %q", lines[0])
+		want := []string{
+			dependencyTreeHeader,
+			dependencyTreeIndent + dependencyTreeJoint + "lint" + dependencyTreeIndent + "<-- failed here",
 		}
-		if !strings.Contains(out, "failed here") {
-			t.Errorf("expected 'failed here' annotation on lint line, got: %q", out)
+
+		for i := range want {
+			if lines[i] != want[i] {
+				t.Errorf("line %d: want %q, got %q", i, want[i], lines[i])
+			}
 		}
 	})
 
@@ -170,28 +174,20 @@ func TestPrintDependencyTree(t *testing.T) {
 		PrintDependencyTree(depErr, &buf)
 		lines := strings.Split(strings.TrimRight(buf.String(), "\n"), "\n")
 
-		if len(lines) != 3 {
-			t.Fatalf("expected 3 lines, got %d: %v", len(lines), lines)
-		}
-		// index 0 = 2 spaces, index 1 = 4 spaces, index 2 = 6 spaces (outermost first)
-		checks := []struct {
-			prefix    string
-			name      string
-			hasFailed bool
-		}{
-			{"lets: ", "deploy", false},
-			{"          ", "build", false},
-			{"            ", "lint", true},
-		}
-		for i, c := range checks {
-			if !strings.HasPrefix(lines[i], c.prefix+c.name) {
-				t.Errorf("line %d: want prefix %q + name %q, got %q", i, c.prefix, c.name, lines[i])
-			}
-			if c.hasFailed && !strings.Contains(lines[i], "failed here") {
-				t.Errorf("line %d: expected 'failed here' annotation, got %q", i, lines[i])
-			}
-			if !c.hasFailed && strings.Contains(lines[i], "failed here") {
-				t.Errorf("line %d: unexpected 'failed here' annotation on non-failing node, got %q", i, lines[i])
+		if len(lines) != 4 {
+			t.Fatalf("expected 4 lines, got %d: %v", len(lines), lines)
+		}
+		want := []string{
+			dependencyTreeHeader,
+			dependencyTreeIndent + dependencyTreeJoint + "deploy",
+			strings.Repeat(dependencyTreeIndent, 2) + dependencyTreeJoint + "build",
+			strings.Repeat(dependencyTreeIndent, 3) + dependencyTreeJoint + "lint" +
+				dependencyTreeIndent + "<-- failed here",
+		}
+
+		for i := range want {
+			if lines[i] != want[i] {
+				t.Errorf("line %d: want %q, got %q", i, want[i], lines[i])
 			}
 		}
 	})