on main help sign in
Merge branch 'main' into uv-crush
commit4645157a346754e31e74736ccb7ebdc0a8438770 authorAyman Bagabas <ayman.bagabas@gmail.com> dateThu 3 Jul 2025, 14:41 (1 year ago) parent4c79031b0ad508
2 files changed+28−2
cmd/root.go+26 go.mod+2−2
cmd/root.go+26
@@ -3,6 +3,7 @@ package cmd
33import (
44 "context"
55 "fmt"
6+ "io"
67 "os"
78 "sync"
89 "time"
@@ -18,6 +19,7 @@ import (
1819 "github.com/charmbracelet/crush/internal/tui"
1920 "github.com/charmbracelet/crush/internal/version"
2021 "github.com/charmbracelet/fang"
22+ "github.com/charmbracelet/x/term"
2123 "github.com/spf13/cobra"
2224)
2325
@@ -99,6 +101,12 @@ to assist developers in writing, debugging, and understanding code directly from
99101 // Initialize MCP tools early for both modes
100102 initMCPTools(ctx, app)
101103
104+ prompt, err = maybePrependStdin(prompt)
105+ if err != nil {
106+ logging.Error("Failed to read stdin: %v", err)
107+ return err
108+ }
109+
102110 // Non-interactive mode
103111 if prompt != "" {
104112 // Run non-interactive flow using the App method
@@ -301,3 +309,21 @@ func init() {
301309 return format.SupportedFormats, cobra.ShellCompDirectiveNoFileComp
302310 })
303311}
312+
313+func maybePrependStdin(prompt string) (string, error) {
314+ if term.IsTerminal(os.Stdin.Fd()) {
315+ return prompt, nil
316+ }
317+ fi, err := os.Stdin.Stat()
318+ if err != nil {
319+ return prompt, err
320+ }
321+ if fi.Mode()&os.ModeNamedPipe == 0 {
322+ return prompt, nil
323+ }
324+ bts, err := io.ReadAll(os.Stdin)
325+ if err != nil {
326+ return prompt, err
327+ }
328+ return string(bts) + "\n\n" + prompt, nil
329+}
go.mod+2−2
@@ -20,7 +20,7 @@ require (
2020 github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.1
2121 github.com/charmbracelet/fang v0.1.0
2222 github.com/charmbracelet/glamour/v2 v2.0.0-20250516160903-6f1e2c8f9ebe
23− github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1.0.20250513162854-28902d027c40
23+ github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.2.0.20250703152125-8e1c474f8a71
2424 github.com/charmbracelet/x/ansi v0.9.3
2525 github.com/charmbracelet/x/exp/charmtone v0.0.0-20250627134340-c144409e381c
2626 github.com/charmbracelet/x/exp/golden v0.0.0-20250207160936-21c02780d27a
@@ -81,7 +81,7 @@ require (
8181 github.com/charmbracelet/colorprofile v0.3.1 // indirect
8282 github.com/charmbracelet/x/cellbuf v0.0.14-0.20250516160309-24eee56f89fa // indirect
8383 github.com/charmbracelet/x/exp/slice v0.0.0-20250611152503-f53cdd7e01ef
84− github.com/charmbracelet/x/term v0.2.1 // indirect
84+ github.com/charmbracelet/x/term v0.2.1
8585 github.com/charmbracelet/x/windows v0.2.1 // indirect
8686 github.com/davecgh/go-spew v1.1.1 // indirect
8787 github.com/disintegration/gift v1.1.2 // indirect