dc2230b · crush · git.iko.soy

git.iko.soy/crush

on main help sign in

Merge remote-tracking branch 'origin/main' into onboarding

dc2230bKujtim Hoxha1 year ago

.github/workflows/build.yml+2

compare with main

unifiedsplit

@@ -7,3 +7,5 @@ jobs:

7 with:

8 go-version: ""

9 go-version-file: ./go.mod

10+ secrets:

11+ gh_pat: "${{ secrets.PERSONAL_ACCESS_TOKEN }}"

.golangci.yml+1−1

@@ -6,7 +6,7 @@ linters:

6 # - goconst

7 # - godot

8 # - godox

9− - gomoddirectives

9+ # - gomoddirectives

10 - goprintffuncname

11 # - gosec

12 - misspell

README.md+72−4

@@ -12,10 +12,12 @@ Crush is a tool for building software with AI.

13## Installation

15−* [Packages](https://github.com/charmbracelet/crush/releases/tag/nightly) are available in Debian and RPM formats

15+Nightly builds are available while Crush is in development.

16−* [Binaries](https://github.com/charmbracelet/crush/releases/tag/nightly) are available for Linux and macOS

17+- [Packages](https://github.com/charmbracelet/crush/releases/tag/nightly) are available in Debian and RPM formats

18+- [Binaries](https://github.com/charmbracelet/crush/releases/tag/nightly) are available for Linux and macOS

19+

18−Or just install it with go:

20+You can also just install it with go:

20```

22```

21git clone git@github.com:charmbracelet/crush.git

23git clone git@github.com:charmbracelet/crush.git

@@ -23,6 +25,8 @@ cd crush

23go install

25go install

24```

26```

28+Note that Crush doesn't support Windows yet, however Windows support is planned and in progress.

29+

26## Getting Started

30## Getting Started

28For now, the quickest way to get started is to set an environment variable for

32For now, the quickest way to get started is to set an environment variable for

@@ -45,13 +49,77 @@ providers.

45| `AZURE_OPENAI_API_KEY` | Azure OpenAI models (optional when using Entra ID) |

49| `AZURE_OPENAI_API_KEY` | Azure OpenAI models (optional when using Entra ID) |

46| `AZURE_OPENAI_API_VERSION` | Azure OpenAI models |

50| `AZURE_OPENAI_API_VERSION` | Azure OpenAI models |

52+## Configuration

53+

54+For many use cases, Crush can be run with no config. That said, if you do need config, it can be added either local to the project itself, or globally. Configuration has the following priority:

55+

56+1. `.crush.json`

57+2. `crush.json`

58+3. `$HOME/.config/crush/crush.json`

59+

60+### LSPs

61+

62+Crush can use LSPs for additional context to help inform its decisions, just like you would. LSPs can be added manually like so:

63+

64+```json

65+{

66+ "lsp": {

67+ "go": {

68+ "command": "gopls"

69+ },

70+ "typescript": {

71+ "command": "typescript-language-server",

72+ "args": ["--stdio"]

73+ },

74+ "nix": {

75+ "command": "alejandra"

76+ }

77+ }

78+}

79+```

80+

81+### OpenAI-Compatible APIs

82+

83+Crush supports all OpenAI-compatible APIs. Here's an example configuration for Deepseek, which uses an OpenAI-compatible API. Don't forget to set `DEEPSEEK_API_KEY` in your environment.

84+

85+```json

86+{

87+ "providers": {

88+ "deepseek": {

89+ "provider_type": "openai",

90+ "base_url": "https://api.deepseek.com/v1",

91+ "models": [

92+ {

93+ "id": "deepseek-chat",

94+ "model": "Deepseek V3",

95+ "cost_per_1m_in": 0.27,

96+ "cost_per_1m_out": 1.1,

97+ "cost_per_1m_in_cached": 0.07,

98+ "cost_per_1m_out_cached": 1.1,

99+ "context_window": 64000,

100+ "default_max_tokens": 5000

101+ }

102+ ]

103+ }

104+ }

105+}

106+```

107+

108+## Whatcha think?

109+

110+We’d love to hear your thoughts on this project. Feel free to drop us a note!

111+

112+- [Twitter](https://twitter.com/charmcli)

113+- [The Fediverse](https://mastodon.social/@charmcli)

114+- [Discord](https://charm.sh/chat)

115+

48## License

116## License

117

50[MIT](https://github.com/charmbracelet/crush/raw/main/LICENSE)

118[MIT](https://github.com/charmbracelet/crush/raw/main/LICENSE)

119

52---

120---

121

54−Part of [Charm](https://charm.sh).

122+Part of [Charm](https://charm.land).

123

56<a href="https://charm.sh/"><img alt="The Charm logo" width="400" src="https://stuff.charm.sh/charm-banner-next.jpg" /></a>

124<a href="https://charm.sh/"><img alt="The Charm logo" width="400" src="https://stuff.charm.sh/charm-banner-next.jpg" /></a>

125

go.mod+10−5

@@ -2,6 +2,10 @@ module github.com/charmbracelet/crush

3go 1.24.3

5+replace github.com/charmbracelet/bubbletea/v2 => github.com/charmbracelet/bubbletea-internal/v2 v2.0.0-20250708152737-144080f3d891

7+replace github.com/charmbracelet/lipgloss/v2 => github.com/charmbracelet/lipgloss-internal/v2 v2.0.0-20250708152830-0fa4ef151093

5require (

9require (

6 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0

10 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0

7 github.com/JohannesKaufmann/html-to-markdown v1.6.0

11 github.com/JohannesKaufmann/html-to-markdown v1.6.0

@@ -13,12 +17,12 @@ require (

13 github.com/bmatcuk/doublestar/v4 v4.8.1

17 github.com/bmatcuk/doublestar/v4 v4.8.1

14 github.com/charlievieth/fastwalk v1.0.11

18 github.com/charlievieth/fastwalk v1.0.11

15 github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250607113720-eb5e1cf3b09e

19 github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250607113720-eb5e1cf3b09e

16− github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.3.0.20250609143341-c76fa36f1b94

20+ github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.1

17 github.com/charmbracelet/fang v0.1.0

21 github.com/charmbracelet/fang v0.1.0

18 github.com/charmbracelet/glamour/v2 v2.0.0-20250516160903-6f1e2c8f9ebe

22 github.com/charmbracelet/glamour/v2 v2.0.0-20250516160903-6f1e2c8f9ebe

19 github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.2.0.20250703152125-8e1c474f8a71

23 github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.2.0.20250703152125-8e1c474f8a71

20 github.com/charmbracelet/log/v2 v2.0.0-20250226163916-c379e29ff706

24 github.com/charmbracelet/log/v2 v2.0.0-20250226163916-c379e29ff706

21− github.com/charmbracelet/x/ansi v0.9.3-0.20250602153603-fb931ed90413

25+ github.com/charmbracelet/x/ansi v0.9.3

22 github.com/charmbracelet/x/exp/charmtone v0.0.0-20250627134340-c144409e381c

26 github.com/charmbracelet/x/exp/charmtone v0.0.0-20250627134340-c144409e381c

23 github.com/charmbracelet/x/exp/golden v0.0.0-20250207160936-21c02780d27a

27 github.com/charmbracelet/x/exp/golden v0.0.0-20250207160936-21c02780d27a

24 github.com/disintegration/imageorient v0.0.0-20180920195336-8147d86e83ec

28 github.com/disintegration/imageorient v0.0.0-20180920195336-8147d86e83ec

@@ -71,10 +75,11 @@ require (

71 github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect

75 github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect

72 github.com/aymerick/douceur v0.2.0 // indirect

76 github.com/aymerick/douceur v0.2.0 // indirect

73 github.com/charmbracelet/colorprofile v0.3.1 // indirect

77 github.com/charmbracelet/colorprofile v0.3.1 // indirect

78+ github.com/charmbracelet/ultraviolet v0.0.0-20250708152637-0fe0235c8db9 // indirect

74 github.com/charmbracelet/x/cellbuf v0.0.14-0.20250516160309-24eee56f89fa // indirect

79 github.com/charmbracelet/x/cellbuf v0.0.14-0.20250516160309-24eee56f89fa // indirect

75 github.com/charmbracelet/x/exp/slice v0.0.0-20250611152503-f53cdd7e01ef

80 github.com/charmbracelet/x/exp/slice v0.0.0-20250611152503-f53cdd7e01ef

76− github.com/charmbracelet/x/input v0.3.5-0.20250509021451-13796e822d86 // indirect

77 github.com/charmbracelet/x/term v0.2.1

81 github.com/charmbracelet/x/term v0.2.1

82+ github.com/charmbracelet/x/termios v0.1.1 // indirect

78 github.com/charmbracelet/x/windows v0.2.1 // indirect

83 github.com/charmbracelet/x/windows v0.2.1 // indirect

79 github.com/davecgh/go-spew v1.1.1 // indirect

84 github.com/davecgh/go-spew v1.1.1 // indirect

80 github.com/disintegration/gift v1.1.2 // indirect

85 github.com/disintegration/gift v1.1.2 // indirect

@@ -128,8 +133,8 @@ require (

128 golang.org/x/crypto v0.37.0 // indirect

133 golang.org/x/crypto v0.37.0 // indirect

129 golang.org/x/image v0.26.0 // indirect

134 golang.org/x/image v0.26.0 // indirect

130 golang.org/x/net v0.39.0 // indirect

135 golang.org/x/net v0.39.0 // indirect

131− golang.org/x/sync v0.13.0 // indirect

136+ golang.org/x/sync v0.15.0 // indirect

132− golang.org/x/sys v0.32.0 // indirect

137+ golang.org/x/sys v0.33.0 // indirect

133 golang.org/x/term v0.31.0 // indirect

138 golang.org/x/term v0.31.0 // indirect

134 golang.org/x/text v0.24.0 // indirect

139 golang.org/x/text v0.24.0 // indirect

135 google.golang.org/genai v1.3.0

140 google.golang.org/genai v1.3.0

go.sum+14−12

@@ -70,20 +70,22 @@ github.com/charlievieth/fastwalk v1.0.11 h1:5sLT/q9+d9xMdpKExawLppqvXFZCVKf6JHnr

70github.com/charlievieth/fastwalk v1.0.11/go.mod h1:yGy1zbxog41ZVMcKA/i8ojXLFsuayX5VvwhQVoj9PBI=

71github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250607113720-eb5e1cf3b09e h1:99Ugtt633rqauFsXjZobZmtkNpeaWialfj8dl6COC6A=

72github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250607113720-eb5e1cf3b09e/go.mod h1:6HamsBKWqEC/FVHuQMHgQL+knPyvHH55HwJDHl/adMw=

73−github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.3.0.20250609143341-c76fa36f1b94 h1:QIi50k+uNTJmp2sMs+33D1m/EWr/7OPTJ8x92AY3eOc=

73+github.com/charmbracelet/bubbletea-internal/v2 v2.0.0-20250708152737-144080f3d891 h1:wh6N1dR4XkDh6XsiZh1/tImJAZvYB0yVLmaUKvJXvK0=

74−github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.3.0.20250609143341-c76fa36f1b94/go.mod h1:oOn1YZGZyJHxJfh4sFAna9vDzxJRNuErLETr/lnlB/I=

74+github.com/charmbracelet/bubbletea-internal/v2 v2.0.0-20250708152737-144080f3d891/go.mod h1:SwBB+WoaQVMMOM9hknbN/7FNT86kgKG0LSHGTmLphX8=

75github.com/charmbracelet/colorprofile v0.3.1 h1:k8dTHMd7fgw4bnFd7jXTLZrSU/CQrKnL3m+AxCzDz40=

76github.com/charmbracelet/colorprofile v0.3.1/go.mod h1:/GkGusxNs8VB/RSOh3fu0TJmQ4ICMMPApIIVn0KszZ0=

77github.com/charmbracelet/fang v0.1.0 h1:SlZS2crf3/zQh7Mr4+W+7QR1k+L08rrPX5rm5z3d7Wg=

78github.com/charmbracelet/fang v0.1.0/go.mod h1:Zl/zeUQ8EtQuGyiV0ZKZlZPDowKRTzu8s/367EpN/fc=

79github.com/charmbracelet/glamour/v2 v2.0.0-20250516160903-6f1e2c8f9ebe h1:i6ce4CcAlPpTj2ER69m1DBeLZ3RRcHnKExuwhKa3GfY=

80github.com/charmbracelet/glamour/v2 v2.0.0-20250516160903-6f1e2c8f9ebe/go.mod h1:p3Q+aN4eQKeM5jhrmXPMgPrlKbmc59rWSnMsSA3udhk=

81−github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.2.0.20250703152125-8e1c474f8a71 h1:X0tsNa2UHCKNw+illiavosasVzqioRo32SRV35iwr2I=

81+github.com/charmbracelet/lipgloss-internal/v2 v2.0.0-20250708152830-0fa4ef151093 h1:c9vOmNJQUwy/lp/pNOB5ZDMhOuXJ3Y2LL9uZMYGgJxQ=

82−github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.2.0.20250703152125-8e1c474f8a71/go.mod h1:EJWvaCrhOhNGVZMvcjc0yVryl4qqpMs8tz0r9WyEkdQ=

82+github.com/charmbracelet/lipgloss-internal/v2 v2.0.0-20250708152830-0fa4ef151093/go.mod h1:XmxjFJcMEfYIHa4Mw4ra+uMjploDkTlkKIs7wLt9v4Q=

83github.com/charmbracelet/log/v2 v2.0.0-20250226163916-c379e29ff706 h1:WkwO6Ks3mSIGnGuSdKl9qDSyfbYK50z2wc2gGMggegE=

84github.com/charmbracelet/log/v2 v2.0.0-20250226163916-c379e29ff706/go.mod h1:mjJGp00cxcfvD5xdCa+bso251Jt4owrQvuimJtVmEmM=

85−github.com/charmbracelet/x/ansi v0.9.3-0.20250602153603-fb931ed90413 h1:L07QkDqRF274IZ2UJ/mCTL8DR95efU9BNWLYCDXEjvQ=

85+github.com/charmbracelet/ultraviolet v0.0.0-20250708152637-0fe0235c8db9 h1:+LLFCLxtb/sHegwY3zYdFAbaOgI/I9pv/pxdUlI1Q9s=

86+github.com/charmbracelet/ultraviolet v0.0.0-20250708152637-0fe0235c8db9/go.mod h1:/O+B00+dYG6lqRAWIaNxSvywnDrIH6dmLYQAsH0LRTg=

87+github.com/charmbracelet/x/ansi v0.9.3 h1:BXt5DHS/MKF+LjuK4huWrC6NCvHtexww7dMayh6GXd0=

86−github.com/charmbracelet/x/ansi v0.9.3-0.20250602153603-fb931ed90413/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE=

88+github.com/charmbracelet/x/ansi v0.9.3/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE=

87github.com/charmbracelet/x/cellbuf v0.0.14-0.20250516160309-24eee56f89fa h1:lphz0Z3rsiOtMYiz8axkT24i9yFiueDhJbzyNUADmME=

89github.com/charmbracelet/x/cellbuf v0.0.14-0.20250516160309-24eee56f89fa h1:lphz0Z3rsiOtMYiz8axkT24i9yFiueDhJbzyNUADmME=

88github.com/charmbracelet/x/cellbuf v0.0.14-0.20250516160309-24eee56f89fa/go.mod h1:xBlh2Yi3DL3zy/2n15kITpg0YZardf/aa/hgUaIM6Rk=

90github.com/charmbracelet/x/cellbuf v0.0.14-0.20250516160309-24eee56f89fa/go.mod h1:xBlh2Yi3DL3zy/2n15kITpg0YZardf/aa/hgUaIM6Rk=

89github.com/charmbracelet/x/exp/charmtone v0.0.0-20250627134340-c144409e381c h1:2GELBLPgfSbHU53bsQhR9XIgNuVZ6w+Rz8RWV5Lq+A4=

91github.com/charmbracelet/x/exp/charmtone v0.0.0-20250627134340-c144409e381c h1:2GELBLPgfSbHU53bsQhR9XIgNuVZ6w+Rz8RWV5Lq+A4=

@@ -92,10 +94,10 @@ github.com/charmbracelet/x/exp/golden v0.0.0-20250207160936-21c02780d27a h1:FsHE

92github.com/charmbracelet/x/exp/golden v0.0.0-20250207160936-21c02780d27a/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=

94github.com/charmbracelet/x/exp/golden v0.0.0-20250207160936-21c02780d27a/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=

93github.com/charmbracelet/x/exp/slice v0.0.0-20250611152503-f53cdd7e01ef h1:v7qwsZ2OxzlwvpKwz8dtZXp7fIJlcDEUOyFBNE4fz4Q=

95github.com/charmbracelet/x/exp/slice v0.0.0-20250611152503-f53cdd7e01ef h1:v7qwsZ2OxzlwvpKwz8dtZXp7fIJlcDEUOyFBNE4fz4Q=

94github.com/charmbracelet/x/exp/slice v0.0.0-20250611152503-f53cdd7e01ef/go.mod h1:vI5nDVMWi6veaYH+0Fmvpbe/+cv/iJfMntdh+N0+Tms=

96github.com/charmbracelet/x/exp/slice v0.0.0-20250611152503-f53cdd7e01ef/go.mod h1:vI5nDVMWi6veaYH+0Fmvpbe/+cv/iJfMntdh+N0+Tms=

95−github.com/charmbracelet/x/input v0.3.5-0.20250509021451-13796e822d86 h1:BxAEmOBIDajkgao3EsbBxKQCYvgYPGdT62WASLvtf4Y=

96−github.com/charmbracelet/x/input v0.3.5-0.20250509021451-13796e822d86/go.mod h1:62Rp/6EtTxoeJDSdtpA3tJp3y3ZRpsiekBSje+K8htA=

97github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ=

98github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=

99+github.com/charmbracelet/x/termios v0.1.1 h1:o3Q2bT8eqzGnGPOYheoYS8eEleT5ZVNYNy8JawjaNZY=

100+github.com/charmbracelet/x/termios v0.1.1/go.mod h1:rB7fnv1TgOPOyyKRJ9o+AsTU/vK5WHJ2ivHeut/Pcwo=

99github.com/charmbracelet/x/windows v0.2.1 h1:3x7vnbpQrjpuq/4L+I4gNsG5htYoCiA5oe9hLjAij5I=

101github.com/charmbracelet/x/windows v0.2.1 h1:3x7vnbpQrjpuq/4L+I4gNsG5htYoCiA5oe9hLjAij5I=

100github.com/charmbracelet/x/windows v0.2.1/go.mod h1:ptZp16h40gDYqs5TSawSVW+yiLB13j4kSMA0lSCHL0M=

102github.com/charmbracelet/x/windows v0.2.1/go.mod h1:ptZp16h40gDYqs5TSawSVW+yiLB13j4kSMA0lSCHL0M=

101github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=

103github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=

@@ -307,8 +309,8 @@ golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=

307golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

309golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

308golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

310golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

309golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

311golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

310−golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=

312+golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=

311−golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=

313+golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=

312golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

314golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

313golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

315golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

314golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

316golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

@@ -323,8 +325,8 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

323golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

325golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

324golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

326golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

325golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

327golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

326−golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=

328+golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=

327−golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=

329+golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=

328golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=

330golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=

329golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

331golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

330golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=

332golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=

internal/config/config.go+6−5

@@ -90,11 +90,12 @@ const (

90)

92type MCPConfig struct {

93− Command string `json:"command,omitempty" `

93+ Command string `json:"command,omitempty" `

94− Env []string `json:"env,omitempty"`

94+ Env []string `json:"env,omitempty"`

95− Args []string `json:"args,omitempty"`

95+ Args []string `json:"args,omitempty"`

96− Type MCPType `json:"type"`

96+ Type MCPType `json:"type"`

97− URL string `json:"url,omitempty"`

97+ URL string `json:"url,omitempty"`

98+ Disabled bool `json:"disabled,omitempty"`

99 // TODO: maybe make it possible to get the value from the env

100 // TODO: maybe make it possible to get the value from the env

100 Headers map[string]string `json:"headers,omitempty"`

101 Headers map[string]string `json:"headers,omitempty"`

internal/config/load.go+8−6

@@ -54,16 +54,12 @@ func Load(workingDir string, debug bool) (*Config, error) {

54 cfg.Options.Debug = true

55 }

57− // Init logs

57+ // Setup logs

58− log.Init(

58+ log.Setup(

59 filepath.Join(cfg.Options.DataDirectory, "logs", fmt.Sprintf("%s.log", appName)),

60 cfg.Options.Debug,

61 )

63− if err != nil {

64− return nil, fmt.Errorf("failed to load config: %w", err)

65− }

66−

67 // Load known providers, this loads the config from fur

63 // Load known providers, this loads the config from fur

68 providers, err := LoadProviders(client.New())

64 providers, err := LoadProviders(client.New())

69 if err != nil || len(providers) == 0 {

65 if err != nil || len(providers) == 0 {

@@ -147,6 +143,9 @@ func (cfg *Config) configureProviders(env env.Env, resolver VariableResolver, kn

147 continue

143 continue

148 }

144 }

149 seen[model.ID] = true

145 seen[model.ID] = true

146+ if model.Model == "" {

147+ model.Model = model.ID

148+ }

150 models = append(models, model)

149 models = append(models, model)

151 }

150 }

152 for _, model := range p.Models {

151 for _, model := range p.Models {

@@ -154,6 +153,9 @@ func (cfg *Config) configureProviders(env env.Env, resolver VariableResolver, kn

154 continue

153 continue

155 }

154 }

156 seen[model.ID] = true

155 seen[model.ID] = true

156+ if model.Model == "" {

157+ model.Model = model.ID

158+ }

157 models = append(models, model)

159 models = append(models, model)

158 }

160 }

159

161

internal/config/load_test.go+5−4

@@ -4,6 +4,7 @@ import (

4 "io"

5 "log/slog"

6 "os"

7+ "path/filepath"

7 "strings"

8 "strings"

8 "testing"

9 "testing"

@@ -45,7 +46,7 @@ func TestConfig_setDefaults(t *testing.T) {

45 assert.NotNil(t, cfg.Models)

46 assert.NotNil(t, cfg.Models)

46 assert.NotNil(t, cfg.LSP)

47 assert.NotNil(t, cfg.LSP)

47 assert.NotNil(t, cfg.MCP)

48 assert.NotNil(t, cfg.MCP)

48− assert.Equal(t, "/tmp/.crush", cfg.Options.DataDirectory)

49+ assert.Equal(t, filepath.Join("/tmp", ".crush"), cfg.Options.DataDirectory)

49 for _, path := range defaultContextPaths {

50 for _, path := range defaultContextPaths {

50 assert.Contains(t, cfg.Options.ContextPaths, path)

51 assert.Contains(t, cfg.Options.ContextPaths, path)

51 }

52 }

@@ -97,8 +98,8 @@ func TestConfig_configureProvidersWithOverride(t *testing.T) {

97 BaseURL: "https://api.openai.com/v2",

98 BaseURL: "https://api.openai.com/v2",

98 Models: []provider.Model{

99 Models: []provider.Model{

99 {

100 {

100− ID: "test-model",

101+ ID: "test-model",

101− Name: "Updated",

102+ Model: "Updated",

102 },

103 },

103 {

104 {

104 ID: "another-model",

105 ID: "another-model",

@@ -121,7 +122,7 @@ func TestConfig_configureProvidersWithOverride(t *testing.T) {

121 assert.Equal(t, "xyz", cfg.Providers["openai"].APIKey)

122 assert.Equal(t, "xyz", cfg.Providers["openai"].APIKey)

122 assert.Equal(t, "https://api.openai.com/v2", cfg.Providers["openai"].BaseURL)

123 assert.Equal(t, "https://api.openai.com/v2", cfg.Providers["openai"].BaseURL)

123 assert.Len(t, cfg.Providers["openai"].Models, 2)

124 assert.Len(t, cfg.Providers["openai"].Models, 2)

124− assert.Equal(t, "Updated", cfg.Providers["openai"].Models[0].Name)

125+ assert.Equal(t, "Updated", cfg.Providers["openai"].Models[0].Model)

125}

126}

126

127

127func TestConfig_configureProvidersWithNewProvider(t *testing.T) {

128func TestConfig_configureProvidersWithNewProvider(t *testing.T) {

internal/fsext/fileutil.go+7−2

@@ -12,6 +12,7 @@ import (

13 "github.com/bmatcuk/doublestar/v4"

14 "github.com/charlievieth/fastwalk"

15+ "github.com/charmbracelet/crush/internal/log"

16 ignore "github.com/sabhiram/go-gitignore"

17 ignore "github.com/sabhiram/go-gitignore"

17)

18)

@@ -25,11 +26,15 @@ func init() {

25 var err error

26 var err error

26 rgPath, err = exec.LookPath("rg")

27 rgPath, err = exec.LookPath("rg")

27 if err != nil {

28 if err != nil {

29+ if log.Initialized() {

28− slog.Warn("Ripgrep (rg) not found in $PATH. Some features might be limited or slower.")

30+ slog.Warn("Ripgrep (rg) not found in $PATH. Some features might be limited or slower.")

31+ }

29 }

32 }

30 fzfPath, err = exec.LookPath("fzf")

33 fzfPath, err = exec.LookPath("fzf")

31 if err != nil {

34 if err != nil {

35+ if log.Initialized() {

32− slog.Warn("FZF not found in $PATH. Some features might be limited or slower.")

36+ slog.Warn("FZF not found in $PATH. Some features might be limited or slower.")

37+ }

33 }

38 }

34}

39}

internal/fur/provider/provider.go+1−1

@@ -45,7 +45,7 @@ type Provider struct {

45// Model represents an AI model configuration.

46type Model struct {

47 ID string `json:"id"`

48− Name string `json:"model"`

48+ Model string `json:"model"`

49 CostPer1MIn float64 `json:"cost_per_1m_in"`

50 CostPer1MOut float64 `json:"cost_per_1m_out"`

51 CostPer1MInCached float64 `json:"cost_per_1m_in_cached"`

internal/llm/agent/mcp-tools.go+4

@@ -188,6 +188,10 @@ func GetMcpTools(ctx context.Context, permissions permission.Service, cfg *confi

188 return mcpTools

189 }

190 for name, m := range cfg.MCP {

191+ if m.Disabled {

192+ slog.Debug("skipping disabled mcp", "name", name)

193+ continue

194+ }

191 switch m.Type {

195 switch m.Type {

192 case config.MCPStdio:

196 case config.MCPStdio:

193 c, err := client.NewStdioMCPClient(

197 c, err := client.NewStdioMCPClient(

internal/log/log.go+11−2

@@ -6,14 +6,18 @@ import (

6 "os"

7 "runtime/debug"

8 "sync"

9+ "sync/atomic"

9 "time"

10 "time"

11 "gopkg.in/natefinch/lumberjack.v2"

12 "gopkg.in/natefinch/lumberjack.v2"

12)

13)

15+var (

14−var initOnce sync.Once

16+ initOnce sync.Once

17+ initialized atomic.Bool

18+)

16−func Init(logFile string, debug bool) {

20+func Setup(logFile string, debug bool) {

17 initOnce.Do(func() {

21 initOnce.Do(func() {

18 logRotator := &lumberjack.Logger{

22 logRotator := &lumberjack.Logger{

19 Filename: logFile,

23 Filename: logFile,

@@ -34,9 +38,14 @@ func Init(logFile string, debug bool) {

34 })

38 })

36 slog.SetDefault(slog.New(logger))

40 slog.SetDefault(slog.New(logger))

41+ initialized.Store(true)

37 })

42 })

38}

43}

45+func Initialized() bool {

46+ return initialized.Load()

47+}

48+

40func RecoverPanic(name string, cleanup func()) {

49func RecoverPanic(name string, cleanup func()) {

41 if r := recover(); r != nil {

50 if r := recover(); r != nil {

42 // Create a timestamped panic log file

51 // Create a timestamped panic log file

internal/tui/components/anim/anim.go+3−2

@@ -261,7 +261,7 @@ func (a Anim) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

261}

262

263// View renders the current state of the animation.

264−func (a Anim) View() tea.View {

264+func (a Anim) View() string {

265 var b strings.Builder

266 for i := range a.width {

267 switch {

@@ -284,7 +284,8 @@ func (a Anim) View() tea.View {

284 if a.initialized && a.labelWidth > 0 {

285 b.WriteString(a.ellipsisFrames[a.ellipsisStep/ellipsisAnimSpeed])

286 }

287+

287− return tea.NewView(b.String())

288+ return b.String()

288}

289}

289

290

290// Step is a command that triggers the next step in the animation.

291// Step is a command that triggers the next step in the animation.

internal/tui/components/anim/example/main.go+3−3

@@ -50,20 +50,20 @@ func (m model) View() tea.View {

50 }

52 v := tea.NewView("")

53− v.SetBackgroundColor(m.bgColor)

53+ v.BackgroundColor = m.bgColor

55 if m.quitting {

56 return v

57 }

59 if a, ok := m.anim.(anim.Anim); ok {

60− l := lipgloss.NewLayer(a.View().String()).

60+ l := lipgloss.NewLayer(a.View()).

61 Width(a.Width()).

62 X(m.w/2 - a.Width()/2).

63 Y(m.h / 2)

65 v = tea.NewView(lipgloss.NewCanvas(l))

66− v.SetBackgroundColor(m.bgColor)

66+ v.BackgroundColor = m.bgColor

67 return v

68 }

69 return v

internal/tui/components/chat/chat.go+8−10

@@ -104,17 +104,15 @@ func (m *messageListCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

104}

105

106// View renders the message list or an initial screen if empty.

107−func (m *messageListCmp) View() tea.View {

107+func (m *messageListCmp) View() string {

108 t := styles.CurrentTheme()

109− return tea.NewView(

110− t.S().Base.

109+ return t.S().Base.

111− Padding(1).

110+ Padding(1).

112− Width(m.width).

111+ Width(m.width).

113− Height(m.height).

112+ Height(m.height).

114− Render(

113+ Render(

115− m.listCmp.View().String(),

114+ m.listCmp.View(),

116− ),

117− )

115+ )

118}

116}

119

117

120// handleChildSession handles messages from child sessions (agent tools).

118// handleChildSession handles messages from child sessions (agent tools).

internal/tui/components/chat/editor/editor.go+9−8

@@ -35,6 +35,7 @@ type Editor interface {

35 layout.Positional

37 SetSession(session session.Session) tea.Cmd

38+ Cursor() *tea.Cursor

38}

39}

40type FileCompletionItem struct {

41type FileCompletionItem struct {

@@ -269,20 +270,22 @@ func (m *editorCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

269 return m, tea.Batch(cmds...)

270 return m, tea.Batch(cmds...)

270}

271}

271

272

272−func (m *editorCmp) View() tea.View {

273+func (m *editorCmp) Cursor() *tea.Cursor {

273− t := styles.CurrentTheme()

274 cursor := m.textarea.Cursor()

275 if cursor != nil {

276 cursor.X = cursor.X + m.x + 1

277 cursor.Y = cursor.Y + m.y + 1 // adjust for padding

278 }

279+ return cursor

280+}

281+

282+func (m *editorCmp) View() string {

283+ t := styles.CurrentTheme()

279 if len(m.attachments) == 0 {

284 if len(m.attachments) == 0 {

280 content := t.S().Base.Padding(1).Render(

285 content := t.S().Base.Padding(1).Render(

281 m.textarea.View(),

286 m.textarea.View(),

282 )

287 )

283− view := tea.NewView(content)

284− view.SetCursor(cursor)

285− return view

288+ return content

286 }

289 }

287 content := t.S().Base.Padding(0, 1, 1, 1).Render(

290 content := t.S().Base.Padding(0, 1, 1, 1).Render(

288 lipgloss.JoinVertical(lipgloss.Top,

291 lipgloss.JoinVertical(lipgloss.Top,

@@ -290,9 +293,7 @@ func (m *editorCmp) View() tea.View {

290 m.textarea.View(),

293 m.textarea.View(),

291 ),

294 ),

292 )

295 )

293− view := tea.NewView(content)

294− view.SetCursor(cursor)

295− return view

296+ return content

296}

297}

297

298

298func (m *editorCmp) SetSize(width, height int) tea.Cmd {

299func (m *editorCmp) SetSize(width, height int) tea.Cmd {

internal/tui/components/chat/header/header.go+3−3

@@ -53,9 +53,9 @@ func (p *header) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

53 return p, nil

54}

56−func (p *header) View() tea.View {

56+func (p *header) View() string {

57 if p.session.ID == "" {

58− return tea.NewView("")

58+ return ""

59 }

61 t := styles.CurrentTheme()

@@ -82,7 +82,7 @@ func (p *header) View() tea.View {

82 parts...,

83 ),

84 )

85− return tea.NewView(content)

85+ return content

86}

88func (h *header) details() string {

internal/tui/components/chat/messages/messages.go+10−12

@@ -89,20 +89,20 @@ func (m *messageCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

90// View renders the message component based on its current state.

91// Returns different views for spinning, user, and assistant messages.

92−func (m *messageCmp) View() tea.View {

92+func (m *messageCmp) View() string {

93 if m.spinning {

94− return tea.NewView(m.style().PaddingLeft(1).Render(m.anim.View().String()))

94+ return m.style().PaddingLeft(1).Render(m.anim.View())

95 }

96 if m.message.ID != "" {

97 // this is a user or assistant message

98 switch m.message.Role {

99 case message.User:

100− return tea.NewView(m.renderUserMessage())

100+ return m.renderUserMessage()

101 default:

102− return tea.NewView(m.renderAssistantMessage())

102+ return m.renderAssistantMessage()

103 }

104 }

105− return tea.NewView(m.style().Render("No message content"))

105+ return m.style().Render("No message content")

106}

107

108// GetMessage returns the underlying message data

@@ -289,7 +289,7 @@ func (m *assistantSectionModel) Update(tea.Msg) (tea.Model, tea.Cmd) {

289 return m, nil

290}

291

292−func (m *assistantSectionModel) View() tea.View {

292+func (m *assistantSectionModel) View() string {

293 t := styles.CurrentTheme()

294 finishData := m.message.FinishPart()

295 finishTime := time.Unix(finishData.Time, 0)

@@ -300,15 +300,13 @@ func (m *assistantSectionModel) View() tea.View {

300 if model == nil {

301 // This means the model is not configured anymore

302 model = &provider.Model{

303− Name: "Unknown Model",

303+ Model: "Unknown Model",

304 }

305 }

306− modelFormatted := t.S().Muted.Render(model.Name)

306+ modelFormatted := t.S().Muted.Render(model.Model)

307 assistant := fmt.Sprintf("%s %s %s", icon, modelFormatted, infoMsg)

308− return tea.NewView(

309− t.S().Base.PaddingLeft(2).Render(

308+ return t.S().Base.PaddingLeft(2).Render(

310− core.Section(assistant, m.width-2),

309+ core.Section(assistant, m.width-2),

311− ),

312 )

310 )

313}

311}

314

312

internal/tui/components/chat/messages/renderer.go+1−1

@@ -542,7 +542,7 @@ func (tr agentRenderer) Render(v *toolCallCmp) string {

542

543 if v.result.ToolCallID == "" {

544 v.spinning = true

545− parts = append(parts, v.anim.View().String())

545+ parts = append(parts, v.anim.View())

546 } else {

547 v.spinning = false

548 }

internal/tui/components/chat/messages/tool.go+4−4

@@ -145,19 +145,19 @@ func (m *toolCallCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

145

146// View renders the tool call component based on its current state.

147// Shows either a pending animation or the tool-specific rendered result.

148−func (m *toolCallCmp) View() tea.View {

148+func (m *toolCallCmp) View() string {

149 box := m.style()

150

151 if !m.call.Finished && !m.cancelled {

152− return tea.NewView(box.Render(m.renderPending()))

152+ return box.Render(m.renderPending())

153 }

154

155 r := registry.lookup(m.call.Name)

156

157 if m.isNested {

158− return tea.NewView(box.Render(r.Render(m)))

158+ return box.Render(r.Render(m))

159 }

160− return tea.NewView(box.Render(r.Render(m)))

160+ return box.Render(r.Render(m))

161}

162

163// State management methods

internal/tui/components/chat/sidebar/sidebar.go+18−19

@@ -97,7 +97,7 @@ func (m *sidebarCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

97 return m, nil

98}

100−func (m *sidebarCmp) View() tea.View {

100+func (m *sidebarCmp) View() string {

101 t := styles.CurrentTheme()

102 parts := []string{}

103 if !m.compactMode {

@@ -129,19 +129,15 @@ func (m *sidebarCmp) View() tea.View {

129 m.mcpBlock(),

130 )

131

132− // TODO: CHECK out why we need to set the background here weird issue

133 style := t.S().Base.

132 style := t.S().Base.

134− Background(t.BgBase).

135 Width(m.width).

133 Width(m.width).

136 Height(m.height).

134 Height(m.height).

137 Padding(1)

135 Padding(1)

138 if m.compactMode {

136 if m.compactMode {

139 style = style.PaddingTop(0)

137 style = style.PaddingTop(0)

140 }

138 }

141− return tea.NewView(

142− style.Render(

139+ return style.Render(

143− lipgloss.JoinVertical(lipgloss.Left, parts...),

140+ lipgloss.JoinVertical(lipgloss.Left, parts...),

144− ),

145 )

141 )

146}

142}

147

143

@@ -335,7 +331,7 @@ func (m *sidebarCmp) lspBlock() string {

335

331

336 lspList := []string{section, ""}

332 lspList := []string{section, ""}

337

333

338− lsp := config.Get().LSP

334+ lsp := config.Get().LSP.Sorted()

339 if len(lsp) == 0 {

335 if len(lsp) == 0 {

340 return lipgloss.JoinVertical(

336 return lipgloss.JoinVertical(

341 lipgloss.Left,

337 lipgloss.Left,

@@ -345,9 +341,9 @@ func (m *sidebarCmp) lspBlock() string {

345 )

341 )

346 }

342 }

347

343

348− for n, l := range lsp {

344+ for _, l := range lsp {

349 iconColor := t.Success

345 iconColor := t.Success

350− if l.Disabled {

346+ if l.LSP.Disabled {

351 iconColor = t.FgMuted

347 iconColor = t.FgMuted

352 }

348 }

353 lspErrs := map[protocol.DiagnosticSeverity]int{

349 lspErrs := map[protocol.DiagnosticSeverity]int{

@@ -356,7 +352,7 @@ func (m *sidebarCmp) lspBlock() string {

356 protocol.SeverityHint: 0,

352 protocol.SeverityHint: 0,

357 protocol.SeverityInformation: 0,

353 protocol.SeverityInformation: 0,

358 }

354 }

359− if client, ok := m.lspClients[n]; ok {

355+ if client, ok := m.lspClients[l.Name]; ok {

360 for _, diagnostics := range client.GetDiagnostics() {

356 for _, diagnostics := range client.GetDiagnostics() {

361 for _, diagnostic := range diagnostics {

357 for _, diagnostic := range diagnostics {

362 if severity, ok := lspErrs[diagnostic.Severity]; ok {

358 if severity, ok := lspErrs[diagnostic.Severity]; ok {

@@ -384,8 +380,8 @@ func (m *sidebarCmp) lspBlock() string {

384 core.Status(

380 core.Status(

385 core.StatusOpts{

381 core.StatusOpts{

386 IconColor: iconColor,

382 IconColor: iconColor,

387− Title: n,

383+ Title: l.Name,

388− Description: l.Command,

384+ Description: l.LSP.Command,

389 ExtraContent: strings.Join(errs, " "),

385 ExtraContent: strings.Join(errs, " "),

390 },

386 },

391 m.getMaxWidth(),

387 m.getMaxWidth(),

@@ -408,8 +404,8 @@ func (m *sidebarCmp) mcpBlock() string {

408

404

409 mcpList := []string{section, ""}

405 mcpList := []string{section, ""}

410

406

411− mcp := config.Get().MCP

407+ mcps := config.Get().MCP.Sorted()

412− if len(mcp) == 0 {

408+ if len(mcps) == 0 {

413 return lipgloss.JoinVertical(

409 return lipgloss.JoinVertical(

414 lipgloss.Left,

410 lipgloss.Left,

415 section,

411 section,

@@ -418,14 +414,17 @@ func (m *sidebarCmp) mcpBlock() string {

418 )

414 )

419 }

415 }

420

416

421− for n, l := range mcp {

417+ for _, l := range mcps {

422 iconColor := t.Success

418 iconColor := t.Success

419+ if l.MCP.Disabled {

420+ iconColor = t.FgMuted

421+ }

423 mcpList = append(mcpList,

422 mcpList = append(mcpList,

424 core.Status(

423 core.Status(

425 core.StatusOpts{

424 core.StatusOpts{

426 IconColor: iconColor,

425 IconColor: iconColor,

427− Title: n,

426+ Title: l.Name,

428− Description: l.Command,

427+ Description: l.MCP.Command,

429 },

428 },

430 m.getMaxWidth(),

429 m.getMaxWidth(),

431 ),

430 ),

@@ -483,7 +482,7 @@ func (s *sidebarCmp) currentModelBlock() string {

483 t := styles.CurrentTheme()

482 t := styles.CurrentTheme()

484

483

485 modelIcon := t.S().Base.Foreground(t.FgSubtle).Render(styles.ModelIcon)

484 modelIcon := t.S().Base.Foreground(t.FgSubtle).Render(styles.ModelIcon)

486− modelName := t.S().Text.Render(model.Name)

485+ modelName := t.S().Text.Render(model.Model)

487 modelInfo := fmt.Sprintf("%s %s", modelIcon, modelName)

486 modelInfo := fmt.Sprintf("%s %s", modelIcon, modelName)

488 parts := []string{

487 parts := []string{

489 modelInfo,

488 modelInfo,

internal/tui/components/chat/splash/splash.go+34−29

@@ -25,6 +25,7 @@ type Splash interface {

25 util.Model

26 layout.Sizeable

27 layout.Help

28+ Cursor() *tea.Cursor

28 // SetOnboarding controls whether the splash shows model selection UI

29 // SetOnboarding controls whether the splash shows model selection UI

29 SetOnboarding(bool)

30 SetOnboarding(bool)

30 // SetProjectInit controls whether the splash shows project initialization prompt

31 // SetProjectInit controls whether the splash shows project initialization prompt

@@ -40,15 +41,15 @@ const (

40type OnboardingCompleteMsg struct{}

41type OnboardingCompleteMsg struct{}

42type splashCmp struct {

43type splashCmp struct {

43− width, height int

44+ width, height int

44− keyMap KeyMap

45+ keyMap KeyMap

45− logoRendered string

46+ logoRendered string

46−

47+

47 // State

48 // State

48 isOnboarding bool

49 isOnboarding bool

49 needsProjectInit bool

50 needsProjectInit bool

50 selectedNo bool

51 selectedNo bool

51−

52+

52 modelList *models.ModelListComponent

53 modelList *models.ModelListComponent

53 cursorRow, cursorCol int

54 cursorRow, cursorCol int

54}

55}

@@ -69,12 +70,12 @@ func New() Splash {

69 inputStyle := t.S().Base.Padding(0, 1, 0, 1)

70 inputStyle := t.S().Base.Padding(0, 1, 0, 1)

70 modelList := models.NewModelListComponent(listKeyMap, inputStyle, "Find your fave")

71 modelList := models.NewModelListComponent(listKeyMap, inputStyle, "Find your fave")

71 return &splashCmp{

72 return &splashCmp{

72− width: 0,

73+ width: 0,

73− height: 0,

74+ height: 0,

74− keyMap: keyMap,

75+ keyMap: keyMap,

75− logoRendered: "",

76+ logoRendered: "",

76− modelList: modelList,

77+ modelList: modelList,

77− selectedNo: false,

78+ selectedNo: false,

78 }

79 }

79}

80}

@@ -278,22 +279,19 @@ func (s *splashCmp) isProviderConfigured(providerID string) bool {

278 return false

279 return false

279}

280}

280

281

281−// View implements SplashPage.

282−func (s *splashCmp) View() tea.View {

282+func (s *splashCmp) View() string {

283 t := styles.CurrentTheme()

284− var cursor *tea.Cursor

285

284

286 var content string

285 var content string

287 if s.isOnboarding {

286 if s.isOnboarding {

288 remainingHeight := s.height - lipgloss.Height(s.logoRendered) - (SplashScreenPaddingY * 2)

287 remainingHeight := s.height - lipgloss.Height(s.logoRendered) - (SplashScreenPaddingY * 2)

289 modelListView := s.modelList.View()

288 modelListView := s.modelList.View()

290− cursor = s.moveCursor(modelListView.Cursor())

291 modelSelector := t.S().Base.AlignVertical(lipgloss.Bottom).Height(remainingHeight).Render(

289 modelSelector := t.S().Base.AlignVertical(lipgloss.Bottom).Height(remainingHeight).Render(

292 lipgloss.JoinVertical(

290 lipgloss.JoinVertical(

293 lipgloss.Left,

291 lipgloss.Left,

294 t.S().Base.PaddingLeft(1).Foreground(t.Primary).Render("Choose a Model"),

292 t.S().Base.PaddingLeft(1).Foreground(t.Primary).Render("Choose a Model"),

295 "",

293 "",

296− modelListView.String(),

294+ modelListView,

297 ),

295 ),

298 )

296 )

299 content = lipgloss.JoinVertical(

297 content = lipgloss.JoinVertical(

@@ -354,19 +352,26 @@ func (s *splashCmp) View() tea.View {

354 content = s.logoRendered

352 content = s.logoRendered

355 }

353 }

356

354

357− view := tea.NewView(

358− t.S().Base.

355+ return t.S().Base.

359− Width(s.width).

356+ Width(s.width).

360− Height(s.height).

357+ Height(s.height).

361− PaddingTop(SplashScreenPaddingY).

358+ PaddingTop(SplashScreenPaddingY).

362− PaddingLeft(SplashScreenPaddingX).

359+ PaddingLeft(SplashScreenPaddingX).

363− PaddingRight(SplashScreenPaddingX).

360+ PaddingRight(SplashScreenPaddingX).

364− PaddingBottom(SplashScreenPaddingY).

361+ PaddingBottom(SplashScreenPaddingY).

365− Render(content),

362+ Render(content)

366− )

363+}

367−

364+

368− view.SetCursor(cursor)

365+func (s *splashCmp) Cursor() *tea.Cursor {

366+ if s.isOnboarding {

367+ cursor := s.modelList.Cursor()

368+ if cursor != nil {

369+ return s.moveCursor(cursor)

370+ }

371+ } else {

372+ return nil

373+ }

369− return view

374+ return nil

370}

375}

371

376

372func (s *splashCmp) logoBlock() string {

377func (s *splashCmp) logoBlock() string {

internal/tui/components/completions/completions.go+3−6

@@ -157,15 +157,12 @@ func (c *completionsCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

157}

158

159// View implements Completions.

160−func (c *completionsCmp) View() tea.View {

160+func (c *completionsCmp) View() string {

161 if len(c.list.Items()) == 0 {

162− return tea.NewView(c.style().Render("No completions found"))

162+ return c.style().Render("No completions found")

163 }

164

165− view := tea.NewView(

166− c.style().Render(c.list.View().String()),

165+ return c.style().Render(c.list.View())

167− )

168− return view

169}

166}

170

167

171func (c *completionsCmp) style() lipgloss.Style {

168func (c *completionsCmp) style() lipgloss.Style {

internal/tui/components/completions/item.go+2−2

@@ -75,7 +75,7 @@ func (c *completionItemCmp) Update(tea.Msg) (tea.Model, tea.Cmd) {

75}

77// View implements CommandItem.

78−func (c *completionItemCmp) View() tea.View {

78+func (c *completionItemCmp) View() string {

79 t := styles.CurrentTheme()

81 itemStyle := t.S().Base.Padding(0, 1).Width(c.width)

@@ -135,7 +135,7 @@ func (c *completionItemCmp) View() tea.View {

135 parts...,

136 ),

137 )

138− return tea.NewView(item)

138+ return item

139}

140

141// Blur implements CommandItem.

internal/tui/components/core/layout/container.go+9−5

@@ -72,7 +72,14 @@ func (c *container) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

72 }

73}

75−func (c *container) View() tea.View {

75+func (c *container) Cursor() *tea.Cursor {

76+ if cursor, ok := c.content.(util.Cursor); ok {

77+ return cursor.Cursor()

78+ }

79+ return nil

80+}

81+

82+func (c *container) View() string {

76 t := styles.CurrentTheme()

83 t := styles.CurrentTheme()

77 width := c.width

84 width := c.width

78 height := c.height

85 height := c.height

@@ -106,10 +113,7 @@ func (c *container) View() tea.View {

106 PaddingLeft(c.paddingLeft)

113 PaddingLeft(c.paddingLeft)

107

114

108 contentView := c.content.View()

115 contentView := c.content.View()

109− view := tea.NewView(style.Render(contentView.String()))

116+ return style.Render(contentView)

110− cursor := contentView.Cursor()

111− view.SetCursor(cursor)

112− return view

113}

117}

114

118

115func (c *container) SetSize(width, height int) tea.Cmd {

119func (c *container) SetSize(width, height int) tea.Cmd {

internal/tui/components/core/layout/split.go+24−19

@@ -103,17 +103,34 @@ func (s *splitPaneLayout) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

103 return s, tea.Batch(cmds...)

104}

105

106−func (s *splitPaneLayout) View() tea.View {

106+func (s *splitPaneLayout) Cursor() *tea.Cursor {

107+ if s.bottomPanel != nil {

108+ if c, ok := s.bottomPanel.(util.Cursor); ok {

109+ return c.Cursor()

110+ }

111+ } else if s.rightPanel != nil {

112+ if c, ok := s.rightPanel.(util.Cursor); ok {

113+ return c.Cursor()

114+ }

115+ } else if s.leftPanel != nil {

116+ if c, ok := s.leftPanel.(util.Cursor); ok {

117+ return c.Cursor()

118+ }

119+ }

120+ return nil

121+}

122+

123+func (s *splitPaneLayout) View() string {

107 var topSection string

124 var topSection string

108

125

109 if s.leftPanel != nil && s.rightPanel != nil {

126 if s.leftPanel != nil && s.rightPanel != nil {

110 leftView := s.leftPanel.View()

127 leftView := s.leftPanel.View()

111 rightView := s.rightPanel.View()

128 rightView := s.rightPanel.View()

112− topSection = lipgloss.JoinHorizontal(lipgloss.Top, leftView.String(), rightView.String())

129+ topSection = lipgloss.JoinHorizontal(lipgloss.Top, leftView, rightView)

113 } else if s.leftPanel != nil {

130 } else if s.leftPanel != nil {

114− topSection = s.leftPanel.View().String()

131+ topSection = s.leftPanel.View()

115 } else if s.rightPanel != nil {

132 } else if s.rightPanel != nil {

116− topSection = s.rightPanel.View().String()

133+ topSection = s.rightPanel.View()

117 } else {

134 } else {

118 topSection = ""

135 topSection = ""

119 }

136 }

@@ -122,32 +139,20 @@ func (s *splitPaneLayout) View() tea.View {

122

139

123 if s.bottomPanel != nil && topSection != "" {

140 if s.bottomPanel != nil && topSection != "" {

124 bottomView := s.bottomPanel.View()

141 bottomView := s.bottomPanel.View()

125− finalView = lipgloss.JoinVertical(lipgloss.Left, topSection, bottomView.String())

142+ finalView = lipgloss.JoinVertical(lipgloss.Left, topSection, bottomView)

126 } else if s.bottomPanel != nil {

143 } else if s.bottomPanel != nil {

127− finalView = s.bottomPanel.View().String()

144+ finalView = s.bottomPanel.View()

128 } else {

145 } else {

129 finalView = topSection

146 finalView = topSection

130 }

147 }

131

148

132− // TODO: think of a better way to handle multiple cursors

133− var cursor *tea.Cursor

134− if s.bottomPanel != nil {

135− cursor = s.bottomPanel.View().Cursor()

136− } else if s.rightPanel != nil {

137− cursor = s.rightPanel.View().Cursor()

138− } else if s.leftPanel != nil {

139− cursor = s.leftPanel.View().Cursor()

140− }

141−

142 t := styles.CurrentTheme()

149 t := styles.CurrentTheme()

143

150

144 style := t.S().Base.

151 style := t.S().Base.

145 Width(s.width).

152 Width(s.width).

146 Height(s.height)

153 Height(s.height)

147

154

148− view := tea.NewView(style.Render(finalView))

155+ return style.Render(finalView)

149− view.SetCursor(cursor)

150− return view

151}

156}

152

157

153func (s *splitPaneLayout) SetSize(width, height int) tea.Cmd {

158func (s *splitPaneLayout) SetSize(width, height int) tea.Cmd {

internal/tui/components/core/list/list.go+14−9

@@ -42,6 +42,7 @@ type ListModel interface {

42 SetSelected(int) tea.Cmd // Set the selected item by index and scroll to it

43 Filter(string) tea.Cmd // Filter items based on a search term

44 SetFilterPlaceholder(string) // Set the placeholder text for the filter input

45+ Cursor() *tea.Cursor // Get the current cursor position in the filter input

45}

46}

47// HasAnim interface identifies items that support animation.

48// HasAnim interface identifies items that support animation.

@@ -281,12 +282,20 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

281 return m, nil

282 return m, nil

282}

283}

283

284

285+// Cursor returns the current cursor position in the input field.

286+func (m *model) Cursor() *tea.Cursor {

287+ if m.filterable && !m.hideFilterInput {

288+ return m.input.Cursor()

289+ }

290+ return nil

291+}

292+

284// View renders the list to a string for display.

293// View renders the list to a string for display.

285// Returns empty string if the list has no dimensions.

294// Returns empty string if the list has no dimensions.

286// Triggers re-rendering if needed before returning content.

295// Triggers re-rendering if needed before returning content.

287−func (m *model) View() tea.View {

296+func (m *model) View() string {

288 if m.viewState.height == 0 || m.viewState.width == 0 {

297 if m.viewState.height == 0 || m.viewState.width == 0 {

289− return tea.NewView("") // No content to display

298+ return "" // No content to display

290 }

299 }

291 if m.renderState.needsRerender {

300 if m.renderState.needsRerender {

292 m.renderVisible()

301 m.renderVisible()

@@ -304,11 +313,7 @@ func (m *model) View() tea.View {

304 content,

313 content,

305 )

314 )

306 }

315 }

307− view := tea.NewView(content)

316+ return content

308− if m.filterable && !m.hideFilterInput {

309− view.SetCursor(m.input.Cursor())

310− }

311− return view

312}

317}

313

318

314// handleKeyPress processes keyboard input for list navigation.

319// handleKeyPress processes keyboard input for list navigation.

@@ -834,7 +839,7 @@ func (m *model) rerenderItem(inx int) {

834func (m *model) getItemLines(item util.Model) []string {

839func (m *model) getItemLines(item util.Model) []string {

835 var itemLines []string

840 var itemLines []string

836

841

837− itemLines = strings.Split(item.View().String(), "\n")

842+ itemLines = strings.Split(item.View(), "\n")

838

843

839 if m.gapSize > 0 {

844 if m.gapSize > 0 {

840 gap := make([]string, m.gapSize)

845 gap := make([]string, m.gapSize)

@@ -1262,7 +1267,7 @@ func (m *model) filterSection(sect section, search string) *section {

1262

1267

1263 // Check if section header itself matches

1268 // Check if section header itself matches

1264 if sect.header != nil {

1269 if sect.header != nil {

1265− headerText := strings.ToLower(sect.header.View().String())

1270+ headerText := strings.ToLower(sect.header.View())

1266 if strings.Contains(headerText, search) {

1271 if strings.Contains(headerText, search) {

1267 hasHeaderMatch = true

1272 hasHeaderMatch = true

1268 // If header matches, include all items in the section

1273 // If header matches, include all items in the section

internal/tui/components/core/status/status.go+2−2

@@ -60,13 +60,13 @@ func (m *statusCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

60 return m, nil

61}

63−func (m *statusCmp) View() tea.View {

63+func (m *statusCmp) View() string {

64 t := styles.CurrentTheme()

65 status := t.S().Base.Padding(0, 1, 1, 1).Render(m.help.View(m.keyMap))

66 if m.info.Msg != "" {

67 status = m.infoMsg()

68 }

69− return tea.NewView(status)

69+ return status

70}

72func (m *statusCmp) infoMsg() string {

internal/tui/components/dialogs/commands/arguments.go+10−10

@@ -139,7 +139,7 @@ func (c *commandArgumentsDialogCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

139}

140

141// View implements CommandArgumentsDialog.

142−func (c *commandArgumentsDialogCmp) View() tea.View {

142+func (c *commandArgumentsDialogCmp) View() string {

143 t := styles.CurrentTheme()

144 baseStyle := t.S().Base

145

@@ -188,19 +188,19 @@ func (c *commandArgumentsDialogCmp) View() tea.View {

188 elements...,

189 )

190

191− view := tea.NewView(

192− baseStyle.Padding(1, 1, 0, 1).

191+ return baseStyle.Padding(1, 1, 0, 1).

193− Border(lipgloss.RoundedBorder()).

192+ Border(lipgloss.RoundedBorder()).

194− BorderForeground(t.BorderFocus).

193+ BorderForeground(t.BorderFocus).

195− Width(c.width).

194+ Width(c.width).

196− Render(content),

195+ Render(content)

197− )

196+}

197+

198+func (c *commandArgumentsDialogCmp) Cursor() *tea.Cursor {

198 cursor := c.inputs[c.focusIndex].Cursor()

199 cursor := c.inputs[c.focusIndex].Cursor()

199 if cursor != nil {

200 if cursor != nil {

200 cursor = c.moveCursor(cursor)

201 cursor = c.moveCursor(cursor)

201 }

202 }

202− view.SetCursor(cursor)

203− return view

203+ return cursor

204}

205

206func (c *commandArgumentsDialogCmp) moveCursor(cursor *tea.Cursor) *tea.Cursor {

internal/tui/components/dialogs/commands/commands.go+14−8

@@ -143,23 +143,29 @@ func (c *commandDialogCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

143 return c, nil

144}

145

146−func (c *commandDialogCmp) View() tea.View {

146+func (c *commandDialogCmp) View() string {

147 t := styles.CurrentTheme()

148− listView := c.commandList.View()

148+ listView := c.commandList

149 radio := c.commandTypeRadio()

150 content := lipgloss.JoinVertical(

151 lipgloss.Left,

152 t.S().Base.Padding(0, 1, 1, 1).Render(core.Title("Commands", c.width-lipgloss.Width(radio)-5)+" "+radio),

153− listView.String(),

153+ listView.View(),

154 "",

155 t.S().Base.Width(c.width-2).PaddingLeft(1).AlignHorizontal(lipgloss.Left).Render(c.help.View(c.keyMap)),

156 )

157− v := tea.NewView(c.style().Render(content))

157+ return c.style().Render(content)

158− if listView.Cursor() != nil {

158+}

159+

160+func (c *commandDialogCmp) Cursor() *tea.Cursor {

161+ if cursor, ok := c.commandList.(util.Cursor); ok {

162+ cursor := cursor.Cursor()

163+ if cursor != nil {

159− c := c.moveCursor(listView.Cursor())

164+ cursor = c.moveCursor(cursor)

160− v.SetCursor(c)

165+ }

166+ return cursor

161 }

167 }

162− return v

168+ return nil

163}

169}

164

170

165func (c *commandDialogCmp) commandTypeRadio() string {

171func (c *commandDialogCmp) commandTypeRadio() string {

internal/tui/components/dialogs/commands/item.go+2−2

@@ -36,7 +36,7 @@ func (m *itemSectionModel) Update(tea.Msg) (tea.Model, tea.Cmd) {

36 return m, nil

37}

39−func (m *itemSectionModel) View() tea.View {

39+func (m *itemSectionModel) View() string {

40 t := styles.CurrentTheme()

41 title := ansi.Truncate(m.title, m.width-2, "…")

42 style := t.S().Base.Padding(1, 1, 0, 1)

@@ -48,7 +48,7 @@ func (m *itemSectionModel) View() tea.View {

48 section = core.Section(title, m.width-2)

49 }

51− return tea.NewView(style.Render(section))

51+ return style.Render(section)

52}

54func (m *itemSectionModel) GetSize() (int, int) {

internal/tui/components/dialogs/compact/compact.go+2−2

@@ -242,8 +242,8 @@ func (c *compactDialogCmp) render() string {

242 Render(dialogContent)

243}

244

245−func (c *compactDialogCmp) View() tea.View {

245+func (c *compactDialogCmp) View() string {

246− return tea.NewView(c.render())

246+ return c.render()

247}

248

249// SetSize sets the size of the component.

internal/tui/components/dialogs/dialogs.go+4−5

@@ -37,7 +37,7 @@ type DialogCmp interface {

37 Dialogs() []DialogModel

38 HasDialogs() bool

39 GetLayers() []*lipgloss.Layer

40− ActiveView() *tea.View

40+ ActiveModel() util.Model

41 ActiveDialogID() DialogID

42}

@@ -132,12 +132,11 @@ func (d dialogCmp) Dialogs() []DialogModel {

132 return d.dialogs

133}

134

135−func (d dialogCmp) ActiveView() *tea.View {

135+func (d dialogCmp) ActiveModel() util.Model {

136 if len(d.dialogs) == 0 {

137 return nil

138 }

139− view := d.dialogs[len(d.dialogs)-1].View()

139+ return d.dialogs[len(d.dialogs)-1]

140− return &view

141}

140}

142

141

143func (d dialogCmp) ActiveDialogID() DialogID {

142func (d dialogCmp) ActiveDialogID() DialogID {

@@ -150,7 +149,7 @@ func (d dialogCmp) ActiveDialogID() DialogID {

150func (d dialogCmp) GetLayers() []*lipgloss.Layer {

149func (d dialogCmp) GetLayers() []*lipgloss.Layer {

151 layers := []*lipgloss.Layer{}

150 layers := []*lipgloss.Layer{}

152 for _, dialog := range d.Dialogs() {

151 for _, dialog := range d.Dialogs() {

153− dialogView := dialog.View().String()

152+ dialogView := dialog.View()

154 row, col := dialog.Position()

153 row, col := dialog.Position()

155 layers = append(layers, lipgloss.NewLayer(dialogView).X(col).Y(row))

154 layers = append(layers, lipgloss.NewLayer(dialogView).X(col).Y(row))

156 }

155 }

internal/tui/components/dialogs/filepicker/filepicker.go+2−2

@@ -144,7 +144,7 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

144 return m, tea.Batch(cmds...)

145}

146

147−func (m *model) View() tea.View {

147+func (m *model) View() string {

148 t := styles.CurrentTheme()

149

150 content := lipgloss.JoinVertical(

@@ -154,7 +154,7 @@ func (m *model) View() tea.View {

154 m.filePicker.View(),

155 t.S().Base.Width(m.width-2).PaddingLeft(1).AlignHorizontal(lipgloss.Left).Render(m.help.View(m.keyMap)),

156 )

157− return tea.NewView(m.style().Render(content))

157+ return m.style().Render(content)

158}

159

160func (m *model) currentImage() string {

internal/tui/components/dialogs/models/apikey.go+6−4

@@ -50,7 +50,7 @@ func (a *APIKeyInput) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

50 return a, cmd

51}

53−func (a *APIKeyInput) View() tea.View {

53+func (a *APIKeyInput) View() string {

54 t := styles.CurrentTheme()

56 title := t.S().Base.

@@ -74,13 +74,15 @@ func (a *APIKeyInput) View() tea.View {

74 helpText,

75 )

77− view := tea.NewView(content)

77+ return content

78+}

79+

80+func (a *APIKeyInput) Cursor() *tea.Cursor {

78 cursor := a.input.Cursor()

81 cursor := a.input.Cursor()

79 if cursor != nil {

82 if cursor != nil {

80 cursor.Y += 2 // Adjust for title and spacing

83 cursor.Y += 2 // Adjust for title and spacing

81 }

84 }

82− view.SetCursor(cursor)

83− return view

85+ return cursor

84}

86}

86func (a *APIKeyInput) Value() string {

88func (a *APIKeyInput) Value() string {

internal/tui/components/dialogs/models/list.go+8−4

@@ -55,10 +55,14 @@ func (m *ModelListComponent) Update(msg tea.Msg) (*ModelListComponent, tea.Cmd)

55 return m, cmd

56}

58−func (m *ModelListComponent) View() tea.View {

58+func (m *ModelListComponent) View() string {

59 return m.list.View()

60}

62+func (m *ModelListComponent) Cursor() *tea.Cursor {

63+ return m.list.Cursor()

64+}

65+

62func (m *ModelListComponent) SetSize(width, height int) tea.Cmd {

66func (m *ModelListComponent) SetSize(width, height int) tea.Cmd {

63 return m.list.SetSize(width, height)

67 return m.list.SetSize(width, height)

64}

68}

@@ -113,7 +117,7 @@ func (m *ModelListComponent) SetModelType(modelType int) tea.Cmd {

113 for i, model := range providerConfig.Models {

117 for i, model := range providerConfig.Models {

114 configProvider.Models[i] = provider.Model{

118 configProvider.Models[i] = provider.Model{

115 ID: model.ID,

119 ID: model.ID,

116− Name: model.Name,

120+ Model: model.Model,

117 CostPer1MIn: model.CostPer1MIn,

121 CostPer1MIn: model.CostPer1MIn,

118 CostPer1MOut: model.CostPer1MOut,

122 CostPer1MOut: model.CostPer1MOut,

119 CostPer1MInCached: model.CostPer1MInCached,

123 CostPer1MInCached: model.CostPer1MInCached,

@@ -136,7 +140,7 @@ func (m *ModelListComponent) SetModelType(modelType int) tea.Cmd {

136 section.SetInfo(configured)

140 section.SetInfo(configured)

137 modelItems = append(modelItems, section)

141 modelItems = append(modelItems, section)

138 for _, model := range configProvider.Models {

142 for _, model := range configProvider.Models {

139− modelItems = append(modelItems, completions.NewCompletionItem(model.Name, ModelOption{

143+ modelItems = append(modelItems, completions.NewCompletionItem(model.Model, ModelOption{

140 Provider: configProvider,

144 Provider: configProvider,

141 Model: model,

145 Model: model,

142 }))

146 }))

@@ -171,7 +175,7 @@ func (m *ModelListComponent) SetModelType(modelType int) tea.Cmd {

171 }

175 }

172 modelItems = append(modelItems, section)

176 modelItems = append(modelItems, section)

173 for _, model := range provider.Models {

177 for _, model := range provider.Models {

174− modelItems = append(modelItems, completions.NewCompletionItem(model.Name, ModelOption{

178+ modelItems = append(modelItems, completions.NewCompletionItem(model.Model, ModelOption{

175 Provider: provider,

179 Provider: provider,

176 Model: model,

180 Model: model,

177 }))

181 }))

internal/tui/components/dialogs/models/models.go+11−7

@@ -142,23 +142,27 @@ func (m *modelDialogCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

142 return m, nil

143}

144

145−func (m *modelDialogCmp) View() tea.View {

145+func (m *modelDialogCmp) View() string {

146 t := styles.CurrentTheme()

147 listView := m.modelList.View()

148 radio := m.modelTypeRadio()

149 content := lipgloss.JoinVertical(

150 lipgloss.Left,

151 t.S().Base.Padding(0, 1, 1, 1).Render(core.Title("Switch Model", m.width-lipgloss.Width(radio)-5)+" "+radio),

152− listView.String(),

152+ listView,

153 "",

154 t.S().Base.Width(m.width-2).PaddingLeft(1).AlignHorizontal(lipgloss.Left).Render(m.help.View(m.keyMap)),

155 )

156− v := tea.NewView(m.style().Render(content))

156+ return m.style().Render(content)

157− if listView.Cursor() != nil {

157+}

158+

159+func (m *modelDialogCmp) Cursor() *tea.Cursor {

160+ cursor := m.modelList.Cursor()

161+ if cursor != nil {

158− c := m.moveCursor(listView.Cursor())

162+ cursor = m.moveCursor(cursor)

159− v.SetCursor(c)

163+ return cursor

160 }

164 }

161− return v

165+ return nil

162}

166}

163

167

164func (m *modelDialogCmp) style() lipgloss.Style {

168func (m *modelDialogCmp) style() lipgloss.Style {

internal/tui/components/dialogs/permissions/permissions.go+2−2

@@ -478,8 +478,8 @@ func (p *permissionDialogCmp) render() string {

478 )

479}

480

481−func (p *permissionDialogCmp) View() tea.View {

481+func (p *permissionDialogCmp) View() string {

482− return tea.NewView(p.render())

482+ return p.render()

483}

484

485func (p *permissionDialogCmp) SetSize() tea.Cmd {

internal/tui/components/dialogs/quit/quit.go+5−6

@@ -65,7 +65,7 @@ func (q *quitDialogCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

65}

67// View renders the quit dialog with Yes/No buttons.

68−func (q *quitDialogCmp) View() tea.View {

68+func (q *quitDialogCmp) View() string {

69 t := styles.CurrentTheme()

70 baseStyle := t.S().Base

71 yesStyle := t.S().Text

@@ -79,8 +79,9 @@ func (q *quitDialogCmp) View() tea.View {

79 noStyle = noStyle.Background(t.BgSubtle)

80 }

82+ const horizontalPadding = 3

82− yesButton := yesStyle.Padding(0, 1).Render("Yep!")

83+ yesButton := yesStyle.Padding(0, horizontalPadding).Render("Yep!")

83− noButton := noStyle.Padding(0, 1).Render("Nope")

84+ noButton := noStyle.Padding(0, horizontalPadding).Render("Nope")

85 buttons := baseStyle.Width(lipgloss.Width(question)).Align(lipgloss.Right).Render(

86 buttons := baseStyle.Width(lipgloss.Width(question)).Align(lipgloss.Right).Render(

86 lipgloss.JoinHorizontal(lipgloss.Center, yesButton, " ", noButton),

87 lipgloss.JoinHorizontal(lipgloss.Center, yesButton, " ", noButton),

@@ -100,9 +101,7 @@ func (q *quitDialogCmp) View() tea.View {

100 Border(lipgloss.RoundedBorder()).

101 Border(lipgloss.RoundedBorder()).

101 BorderForeground(t.BorderFocus)

102 BorderForeground(t.BorderFocus)

102

103

103− return tea.NewView(

104− quitDialogStyle.Render(content),

104+ return quitDialogStyle.Render(content)

105− )

106}

105}

107

106

108func (q *quitDialogCmp) Position() (int, int) {

107func (q *quitDialogCmp) Position() (int, int) {

internal/tui/components/dialogs/sessions/sessions.go+13−7

@@ -122,23 +122,29 @@ func (s *sessionDialogCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

122 return s, nil

123}

124

125−func (s *sessionDialogCmp) View() tea.View {

125+func (s *sessionDialogCmp) View() string {

126 t := styles.CurrentTheme()

127 listView := s.sessionsList.View()

128 content := lipgloss.JoinVertical(

129 lipgloss.Left,

130 t.S().Base.Padding(0, 1, 1, 1).Render(core.Title("Switch Session", s.width-4)),

131− listView.String(),

131+ listView,

132 "",

133 t.S().Base.Width(s.width-2).PaddingLeft(1).AlignHorizontal(lipgloss.Left).Render(s.help.View(s.keyMap)),

134 )

135

136− v := tea.NewView(s.style().Render(content))

136+ return s.style().Render(content)

137− if listView.Cursor() != nil {

137+}

138+

139+func (s *sessionDialogCmp) Cursor() *tea.Cursor {

140+ if cursor, ok := s.sessionsList.(util.Cursor); ok {

141+ cursor := cursor.Cursor()

142+ if cursor != nil {

138− c := s.moveCursor(listView.Cursor())

143+ cursor = s.moveCursor(cursor)

139− v.SetCursor(c)

144+ }

145+ return cursor

140 }

146 }

141− return v

147+ return nil

142}

148}

143

149

144func (s *sessionDialogCmp) style() lipgloss.Style {

150func (s *sessionDialogCmp) style() lipgloss.Style {

internal/tui/exp/list/list.go+1−1

@@ -84,6 +84,6 @@ func (l *list) Update(tea.Msg) (tea.Model, tea.Cmd) {

84}

86// View implements List.

87−func (l *list) View() tea.View {

87+func (l *list) View() string {

88 panic("unimplemented")

89}

internal/tui/page/chat/chat.go+43−43

@@ -54,13 +54,13 @@ const (

54 SideBarWidth = 31 // Width of the sidebar

55 SideBarDetailsPadding = 1 // Padding for the sidebar details section

56 HeaderHeight = 1 // Height of the header

57−

57+

58 // Layout constants for borders and padding

59 BorderWidth = 1 // Width of component borders

60 LeftRightBorders = 2 // Left + right border width (1 + 1)

61 TopBottomBorders = 2 // Top + bottom border width (1 + 1)

62 DetailsPositioning = 2 // Positioning adjustment for details panel

63−

63+

64 // Timing constants

65 CancelTimerDuration = 2 * time.Second // Duration before cancel timer expires

66)

@@ -81,23 +81,23 @@ type chatPage struct {

81 width, height int

82 detailsWidth, detailsHeight int

83 app *app.App

84−

84+

85 // Layout state

86 compact bool

87 forceCompact bool

88 focusedPane PanelType

89−

89+

90 // Session

91 session session.Session

92 keyMap KeyMap

93−

93+

94 // Components

95 header header.Header

96 sidebar sidebar.Sidebar

97 chat chat.MessageListCmp

98 editor editor.Editor

99 splash splash.Splash

100−

100+

101 // Simple state flags

102 showingDetails bool

103 isCanceling bool

@@ -123,7 +123,7 @@ func (p *chatPage) Init() tea.Cmd {

123 p.compact = compact

124 p.forceCompact = compact

125 p.sidebar.SetCompactMode(p.compact)

126−

126+

127 // Set splash state based on config

128 if !config.HasInitialDataConfig() {

129 // First-time setup: show model selection

@@ -138,7 +138,7 @@ func (p *chatPage) Init() tea.Cmd {

138 p.focusedPane = PanelTypeEditor

139 p.splashFullScreen = false

140 }

141−

141+

142 return tea.Batch(

143 p.header.Init(),

144 p.sidebar.Init(),

@@ -244,7 +244,7 @@ func (p *chatPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

244 if model.SupportsImages {

245 return p, util.CmdHandler(OpenFilePickerMsg{})

246 } else {

247− return p, util.ReportWarn("File attachments are not supported by the current model: " + model.Name)

247+ return p, util.ReportWarn("File attachments are not supported by the current model: " + model.Model)

248 }

249 case key.Matches(msg, p.keyMap.Tab):

250 if p.session.ID == "" {

@@ -279,10 +279,21 @@ func (p *chatPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

279 return p, tea.Batch(cmds...)

280}

281

282−func (p *chatPage) View() tea.View {

282+func (p *chatPage) Cursor() *tea.Cursor {

283+ switch p.focusedPane {

284+ case PanelTypeEditor:

285+ return p.editor.Cursor()

286+ case PanelTypeSplash:

287+ return p.splash.Cursor()

288+ default:

289+ return nil

290+ }

291+}

292+

293+func (p *chatPage) View() string {

283− var chatView tea.View

294+ var chatView string

284 t := styles.CurrentTheme()

295 t := styles.CurrentTheme()

285−

296+

286 if p.session.ID == "" {

297 if p.session.ID == "" {

287 splashView := p.splash.View()

298 splashView := p.splash.View()

288 // Full screen during onboarding or project initialization

299 // Full screen during onboarding or project initialization

@@ -291,49 +302,40 @@ func (p *chatPage) View() tea.View {

291 } else {

302 } else {

292 // Show splash + editor for new message state

303 // Show splash + editor for new message state

293 editorView := p.editor.View()

304 editorView := p.editor.View()

294− chatView = tea.NewView(

295− lipgloss.JoinVertical(

305+ chatView = lipgloss.JoinVertical(

296− lipgloss.Left,

306+ lipgloss.Left,

297− t.S().Base.Render(splashView.String()),

307+ t.S().Base.Render(splashView),

298− editorView.String(),

308+ editorView,

299− ),

300 )

309 )

301− chatView.SetCursor(editorView.Cursor())

302 }

310 }

303 } else {

311 } else {

304 messagesView := p.chat.View()

312 messagesView := p.chat.View()

305 editorView := p.editor.View()

313 editorView := p.editor.View()

306 if p.compact {

314 if p.compact {

307 headerView := p.header.View()

315 headerView := p.header.View()

308− chatView = tea.NewView(

309− lipgloss.JoinVertical(

316+ chatView = lipgloss.JoinVertical(

310− lipgloss.Left,

317+ lipgloss.Left,

311− headerView.String(),

318+ headerView,

312− messagesView.String(),

319+ messagesView,

313− editorView.String(),

320+ editorView,

314− ),

315 )

321 )

316− chatView.SetCursor(editorView.Cursor())

317 } else {

322 } else {

318 sidebarView := p.sidebar.View()

323 sidebarView := p.sidebar.View()

319 messages := lipgloss.JoinHorizontal(

324 messages := lipgloss.JoinHorizontal(

320 lipgloss.Left,

325 lipgloss.Left,

321− messagesView.String(),

326+ messagesView,

322− sidebarView.String(),

327+ sidebarView,

323 )

328 )

324− chatView = tea.NewView(

325− lipgloss.JoinVertical(

329+ chatView = lipgloss.JoinVertical(

326− lipgloss.Left,

330+ lipgloss.Left,

327− messages,

331+ messages,

328− p.editor.View().String(),

332+ p.editor.View(),

329− ),

330 )

333 )

331− chatView.SetCursor(editorView.Cursor())

332 }

334 }

333 }

335 }

334

336

335 layers := []*lipgloss.Layer{

337 layers := []*lipgloss.Layer{

336− lipgloss.NewLayer(chatView.String()).X(0).Y(0),

338+ lipgloss.NewLayer(chatView).X(0).Y(0),

337 }

339 }

338

340

339 if p.showingDetails {

341 if p.showingDetails {

@@ -345,7 +347,7 @@ func (p *chatPage) View() tea.View {

345 details := style.Render(

347 details := style.Render(

346 lipgloss.JoinVertical(

348 lipgloss.JoinVertical(

347 lipgloss.Left,

349 lipgloss.Left,

348− p.sidebar.View().String(),

350+ p.sidebar.View(),

349 version,

351 version,

350 ),

352 ),

351 )

353 )

@@ -354,9 +356,7 @@ func (p *chatPage) View() tea.View {

354 canvas := lipgloss.NewCanvas(

356 canvas := lipgloss.NewCanvas(

355 layers...,

357 layers...,

356 )

358 )

357− view := tea.NewView(canvas.Render())

359+ return canvas.Render()

358− view.SetCursor(chatView.Cursor())

359− return view

360}

361

362func (p *chatPage) updateCompactConfig(compact bool) tea.Cmd {

@@ -404,7 +404,7 @@ func (p *chatPage) SetSize(width, height int) tea.Cmd {

404 p.width = width

405 p.height = height

406 var cmds []tea.Cmd

407−

407+

408 if p.session.ID == "" {

409 if p.splashFullScreen {

410 cmds = append(cmds, p.splash.SetSize(width, height))

@@ -451,7 +451,7 @@ func (p *chatPage) setSession(session session.Session) tea.Cmd {

451

452 var cmds []tea.Cmd

453 p.session = session

454−

454+

455 cmds = append(cmds, p.SetSize(p.width, p.height))

456 cmds = append(cmds, p.chat.SetSession(session))

457 cmds = append(cmds, p.sidebar.SetSession(session))

internal/tui/tui.go+18−9

@@ -64,6 +64,8 @@ func (a appModel) Init() tea.Cmd {

64 cmd = a.status.Init()

65 cmds = append(cmds, cmd)

67+ cmds = append(cmds, tea.EnableMouseAllMotion)

68+

67 return tea.Batch(cmds...)

69 return tea.Batch(cmds...)

68}

70}

@@ -358,9 +360,9 @@ func (a *appModel) View() tea.View {

358 a.status.SetKeyMap(a.keyMap)

360 a.status.SetKeyMap(a.keyMap)

359 pageView := page.View()

361 pageView := page.View()

360 components := []string{

362 components := []string{

361− pageView.String(),

363+ pageView,

362 }

364 }

363− components = append(components, a.status.View().String())

365+ components = append(components, a.status.View())

364

366

365 appView := lipgloss.JoinVertical(lipgloss.Top, components...)

367 appView := lipgloss.JoinVertical(lipgloss.Top, components...)

366 layers := []*lipgloss.Layer{

368 layers := []*lipgloss.Layer{

@@ -373,14 +375,20 @@ func (a *appModel) View() tea.View {

373 )

375 )

374 }

376 }

375

377

376− cursor := pageView.Cursor()

378+ var cursor *tea.Cursor

379+ if v, ok := page.(util.Cursor); ok {

380+ cursor = v.Cursor()

381+ }

377− activeView := a.dialog.ActiveView()

382+ activeView := a.dialog.ActiveModel()

378 if activeView != nil {

383 if activeView != nil {

384+ cursor = nil // Reset cursor if a dialog is active unless it implements util.Cursor

379− cursor = activeView.Cursor()

385+ if v, ok := activeView.(util.Cursor); ok {

386+ cursor = v.Cursor()

387+ }

380 }

388 }

381

389

382 if a.completions.Open() && cursor != nil {

390 if a.completions.Open() && cursor != nil {

383− cmp := a.completions.View().String()

391+ cmp := a.completions.View()

384 x, y := a.completions.Position()

392 x, y := a.completions.Position()

385 layers = append(

393 layers = append(

386 layers,

394 layers,

@@ -392,10 +400,11 @@ func (a *appModel) View() tea.View {

392 layers...,

400 layers...,

393 )

401 )

394

402

403+ var view tea.View

395 t := styles.CurrentTheme()

404 t := styles.CurrentTheme()

396− view := tea.NewView(canvas.Render())

405+ view.Layer = canvas

397− view.SetBackgroundColor(t.BgBase)

406+ view.BackgroundColor = t.BgBase

398− view.SetCursor(cursor)

407+ view.Cursor = cursor

399 return view

408 return view

400}

409}

401

410

internal/tui/util/util.go+5−1

@@ -6,9 +6,13 @@ import (

6 tea "github.com/charmbracelet/bubbletea/v2"

9+type Cursor interface {

10+ Cursor() *tea.Cursor

11+}

12+

9type Model interface {

13type Model interface {

10 tea.Model

14 tea.Model

11− tea.Viewable

15+ tea.ViewModel

12}

16}

14func CmdHandler(msg tea.Msg) tea.Cmd {

18func CmdHandler(msg tea.Msg) tea.Cmd {

vendor/cloud.google.com/go/LICENSEnew file+202

@@ -0,0 +1,202 @@

2+ Apache License

3+ Version 2.0, January 2004

4+ http://www.apache.org/licenses/

6+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

8+ 1. Definitions.

10+ "License" shall mean the terms and conditions for use, reproduction,

11+ and distribution as defined by Sections 1 through 9 of this document.

12+

13+ "Licensor" shall mean the copyright owner or entity authorized by

14+ the copyright owner that is granting the License.

15+

16+ "Legal Entity" shall mean the union of the acting entity and all

17+ other entities that control, are controlled by, or are under common

18+ control with that entity. For the purposes of this definition,

19+ "control" means (i) the power, direct or indirect, to cause the

20+ direction or management of such entity, whether by contract or

21+ otherwise, or (ii) ownership of fifty percent (50%) or more of the

22+ outstanding shares, or (iii) beneficial ownership of such entity.

23+

24+ "You" (or "Your") shall mean an individual or Legal Entity

25+ exercising permissions granted by this License.

26+

27+ "Source" form shall mean the preferred form for making modifications,

28+ including but not limited to software source code, documentation

29+ source, and configuration files.

30+

31+ "Object" form shall mean any form resulting from mechanical

32+ transformation or translation of a Source form, including but

33+ not limited to compiled object code, generated documentation,

34+ and conversions to other media types.

35+

36+ "Work" shall mean the work of authorship, whether in Source or

37+ Object form, made available under the License, as indicated by a

38+ copyright notice that is included in or attached to the work

39+ (an example is provided in the Appendix below).

40+

41+ "Derivative Works" shall mean any work, whether in Source or Object

42+ form, that is based on (or derived from) the Work and for which the

43+ editorial revisions, annotations, elaborations, or other modifications

44+ represent, as a whole, an original work of authorship. For the purposes

45+ of this License, Derivative Works shall not include works that remain

46+ separable from, or merely link (or bind by name) to the interfaces of,

47+ the Work and Derivative Works thereof.

48+

49+ "Contribution" shall mean any work of authorship, including

50+ the original version of the Work and any modifications or additions

51+ to that Work or Derivative Works thereof, that is intentionally

52+ submitted to Licensor for inclusion in the Work by the copyright owner

53+ or by an individual or Legal Entity authorized to submit on behalf of

54+ the copyright owner. For the purposes of this definition, "submitted"

55+ means any form of electronic, verbal, or written communication sent

56+ to the Licensor or its representatives, including but not limited to

57+ communication on electronic mailing lists, source code control systems,

58+ and issue tracking systems that are managed by, or on behalf of, the

59+ Licensor for the purpose of discussing and improving the Work, but

60+ excluding communication that is conspicuously marked or otherwise

61+ designated in writing by the copyright owner as "Not a Contribution."

62+

63+ "Contributor" shall mean Licensor and any individual or Legal Entity

64+ on behalf of whom a Contribution has been received by Licensor and

65+ subsequently incorporated within the Work.

66+

67+ 2. Grant of Copyright License. Subject to the terms and conditions of

68+ this License, each Contributor hereby grants to You a perpetual,

69+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable

70+ copyright license to reproduce, prepare Derivative Works of,

71+ publicly display, publicly perform, sublicense, and distribute the

72+ Work and such Derivative Works in Source or Object form.

73+

74+ 3. Grant of Patent License. Subject to the terms and conditions of

75+ this License, each Contributor hereby grants to You a perpetual,

76+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable

77+ (except as stated in this section) patent license to make, have made,

78+ use, offer to sell, sell, import, and otherwise transfer the Work,

79+ where such license applies only to those patent claims licensable

80+ by such Contributor that are necessarily infringed by their

81+ Contribution(s) alone or by combination of their Contribution(s)

82+ with the Work to which such Contribution(s) was submitted. If You

83+ institute patent litigation against any entity (including a

84+ cross-claim or counterclaim in a lawsuit) alleging that the Work

85+ or a Contribution incorporated within the Work constitutes direct

86+ or contributory patent infringement, then any patent licenses

87+ granted to You under this License for that Work shall terminate

88+ as of the date such litigation is filed.

89+

90+ 4. Redistribution. You may reproduce and distribute copies of the

91+ Work or Derivative Works thereof in any medium, with or without

92+ modifications, and in Source or Object form, provided that You

93+ meet the following conditions:

94+

95+ (a) You must give any other recipients of the Work or

96+ Derivative Works a copy of this License; and

97+

98+ (b) You must cause any modified files to carry prominent notices

99+ stating that You changed the files; and

100+

101+ (c) You must retain, in the Source form of any Derivative Works

102+ that You distribute, all copyright, patent, trademark, and

103+ attribution notices from the Source form of the Work,

104+ excluding those notices that do not pertain to any part of

105+ the Derivative Works; and

106+

107+ (d) If the Work includes a "NOTICE" text file as part of its

108+ distribution, then any Derivative Works that You distribute must

109+ include a readable copy of the attribution notices contained

110+ within such NOTICE file, excluding those notices that do not

111+ pertain to any part of the Derivative Works, in at least one

112+ of the following places: within a NOTICE text file distributed

113+ as part of the Derivative Works; within the Source form or

114+ documentation, if provided along with the Derivative Works; or,

115+ within a display generated by the Derivative Works, if and

116+ wherever such third-party notices normally appear. The contents

117+ of the NOTICE file are for informational purposes only and

118+ do not modify the License. You may add Your own attribution

119+ notices within Derivative Works that You distribute, alongside

120+ or as an addendum to the NOTICE text from the Work, provided

121+ that such additional attribution notices cannot be construed

122+ as modifying the License.

123+

124+ You may add Your own copyright statement to Your modifications and

125+ may provide additional or different license terms and conditions

126+ for use, reproduction, or distribution of Your modifications, or

127+ for any such Derivative Works as a whole, provided Your use,

128+ reproduction, and distribution of the Work otherwise complies with

129+ the conditions stated in this License.

130+

131+ 5. Submission of Contributions. Unless You explicitly state otherwise,

132+ any Contribution intentionally submitted for inclusion in the Work

133+ by You to the Licensor shall be under the terms and conditions of

134+ this License, without any additional terms or conditions.

135+ Notwithstanding the above, nothing herein shall supersede or modify

136+ the terms of any separate license agreement you may have executed

137+ with Licensor regarding such Contributions.

138+

139+ 6. Trademarks. This License does not grant permission to use the trade

140+ names, trademarks, service marks, or product names of the Licensor,

141+ except as required for reasonable and customary use in describing the

142+ origin of the Work and reproducing the content of the NOTICE file.

143+

144+ 7. Disclaimer of Warranty. Unless required by applicable law or

145+ agreed to in writing, Licensor provides the Work (and each

146+ Contributor provides its Contributions) on an "AS IS" BASIS,

147+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

148+ implied, including, without limitation, any warranties or conditions

149+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

150+ PARTICULAR PURPOSE. You are solely responsible for determining the

151+ appropriateness of using or redistributing the Work and assume any

152+ risks associated with Your exercise of permissions under this License.

153+

154+ 8. Limitation of Liability. In no event and under no legal theory,

155+ whether in tort (including negligence), contract, or otherwise,

156+ unless required by applicable law (such as deliberate and grossly

157+ negligent acts) or agreed to in writing, shall any Contributor be

158+ liable to You for damages, including any direct, indirect, special,

159+ incidental, or consequential damages of any character arising as a

160+ result of this License or out of the use or inability to use the

161+ Work (including but not limited to damages for loss of goodwill,

162+ work stoppage, computer failure or malfunction, or any and all

163+ other commercial damages or losses), even if such Contributor

164+ has been advised of the possibility of such damages.

165+

166+ 9. Accepting Warranty or Additional Liability. While redistributing

167+ the Work or Derivative Works thereof, You may choose to offer,

168+ and charge a fee for, acceptance of support, warranty, indemnity,

169+ or other liability obligations and/or rights consistent with this

170+ License. However, in accepting such obligations, You may act only

171+ on Your own behalf and on Your sole responsibility, not on behalf

172+ of any other Contributor, and only if You agree to indemnify,

173+ defend, and hold each Contributor harmless for any liability

174+ incurred by, or claims asserted against, such Contributor by reason

175+ of your accepting any such warranty or additional liability.

176+

177+ END OF TERMS AND CONDITIONS

178+

179+ APPENDIX: How to apply the Apache License to your work.

180+

181+ To apply the Apache License to your work, attach the following

182+ boilerplate notice, with the fields enclosed by brackets "[]"

183+ replaced with your own identifying information. (Don't include

184+ the brackets!) The text should be enclosed in the appropriate

185+ comment syntax for the file format. We also recommend that a

186+ file or class name and description of purpose be included on the

187+ same "printed page" as the copyright notice for easier

188+ identification within third-party archives.

189+

190+ Copyright [yyyy] [name of copyright owner]

191+

192+ Licensed under the Apache License, Version 2.0 (the "License");

193+ you may not use this file except in compliance with the License.

194+ You may obtain a copy of the License at

195+

196+ http://www.apache.org/licenses/LICENSE-2.0

197+

198+ Unless required by applicable law or agreed to in writing, software

199+ distributed under the License is distributed on an "AS IS" BASIS,

200+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

201+ See the License for the specific language governing permissions and

202+ limitations under the License.

vendor/cloud.google.com/go/auth/CHANGES.mdnew file+368

@@ -0,0 +1,368 @@

1+# Changelog

3+## [0.13.0](https://github.com/googleapis/google-cloud-go/compare/auth/v0.12.1...auth/v0.13.0) (2024-12-13)

6+### Features

8+* **auth:** Add logging support ([#11079](https://github.com/googleapis/google-cloud-go/issues/11079)) ([c80e31d](https://github.com/googleapis/google-cloud-go/commit/c80e31df5ecb33a810be3dfb9d9e27ac531aa91d))

9+* **auth:** Pass logger from auth layer to metadata package ([#11288](https://github.com/googleapis/google-cloud-go/issues/11288)) ([b552efd](https://github.com/googleapis/google-cloud-go/commit/b552efd6ab34e5dfded18438e0fbfd925805614f))

10+

11+

12+### Bug Fixes

13+

14+* **auth:** Check compute cred type before non-default flag for DP ([#11255](https://github.com/googleapis/google-cloud-go/issues/11255)) ([4347ca1](https://github.com/googleapis/google-cloud-go/commit/4347ca141892be8ae813399b4b437662a103bc90))

15+

16+## [0.12.1](https://github.com/googleapis/google-cloud-go/compare/auth/v0.12.0...auth/v0.12.1) (2024-12-10)

17+

18+

19+### Bug Fixes

20+

21+* **auth:** Correct typo in link ([#11160](https://github.com/googleapis/google-cloud-go/issues/11160)) ([af6fb46](https://github.com/googleapis/google-cloud-go/commit/af6fb46d7cd694ddbe8c9d63bc4cdcd62b9fb2c1))

22+

23+## [0.12.0](https://github.com/googleapis/google-cloud-go/compare/auth/v0.11.0...auth/v0.12.0) (2024-12-04)

24+

25+

26+### Features

27+

28+* **auth:** Add support for providing custom certificate URL ([#11006](https://github.com/googleapis/google-cloud-go/issues/11006)) ([ebf3657](https://github.com/googleapis/google-cloud-go/commit/ebf36579724afb375d3974cf1da38f703e3b7dbc)), refs [#11005](https://github.com/googleapis/google-cloud-go/issues/11005)

29+

30+

31+### Bug Fixes

32+

33+* **auth:** Ensure endpoints are present in Validator ([#11209](https://github.com/googleapis/google-cloud-go/issues/11209)) ([106cd53](https://github.com/googleapis/google-cloud-go/commit/106cd53309facaef1b8ea78376179f523f6912b9)), refs [#11006](https://github.com/googleapis/google-cloud-go/issues/11006) [#11190](https://github.com/googleapis/google-cloud-go/issues/11190) [#11189](https://github.com/googleapis/google-cloud-go/issues/11189) [#11188](https://github.com/googleapis/google-cloud-go/issues/11188)

34+

35+## [0.11.0](https://github.com/googleapis/google-cloud-go/compare/auth/v0.10.2...auth/v0.11.0) (2024-11-21)

36+

37+

38+### Features

39+

40+* **auth:** Add universe domain support to mTLS ([#11159](https://github.com/googleapis/google-cloud-go/issues/11159)) ([117748b](https://github.com/googleapis/google-cloud-go/commit/117748ba1cfd4ae62a6a4feb7e30951cb2bc9344))

41+

42+## [0.10.2](https://github.com/googleapis/google-cloud-go/compare/auth/v0.10.1...auth/v0.10.2) (2024-11-12)

43+

44+

45+### Bug Fixes

46+

47+* **auth:** Restore use of grpc.Dial ([#11118](https://github.com/googleapis/google-cloud-go/issues/11118)) ([2456b94](https://github.com/googleapis/google-cloud-go/commit/2456b943b7b8aaabd4d8bfb7572c0f477ae0db45)), refs [#7556](https://github.com/googleapis/google-cloud-go/issues/7556)

48+

49+## [0.10.1](https://github.com/googleapis/google-cloud-go/compare/auth/v0.10.0...auth/v0.10.1) (2024-11-06)

50+

51+

52+### Bug Fixes

53+

54+* **auth:** Restore Application Default Credentials support to idtoken ([#11083](https://github.com/googleapis/google-cloud-go/issues/11083)) ([8771f2e](https://github.com/googleapis/google-cloud-go/commit/8771f2ea9807ab822083808e0678392edff3b4f2))

55+* **auth:** Skip impersonate universe domain check if empty ([#11086](https://github.com/googleapis/google-cloud-go/issues/11086)) ([87159c1](https://github.com/googleapis/google-cloud-go/commit/87159c1059d4a18d1367ce62746a838a94964ab6))

56+

57+## [0.10.0](https://github.com/googleapis/google-cloud-go/compare/auth/v0.9.9...auth/v0.10.0) (2024-10-30)

58+

59+

60+### Features

61+

62+* **auth:** Add universe domain support to credentials/impersonate ([#10953](https://github.com/googleapis/google-cloud-go/issues/10953)) ([e06cb64](https://github.com/googleapis/google-cloud-go/commit/e06cb6499f7eda3aef08ab18ff197016f667684b))

63+

64+## [0.9.9](https://github.com/googleapis/google-cloud-go/compare/auth/v0.9.8...auth/v0.9.9) (2024-10-22)

65+

66+

67+### Bug Fixes

68+

69+* **auth:** Fallback cert lookups for missing files ([#11013](https://github.com/googleapis/google-cloud-go/issues/11013)) ([bd76695](https://github.com/googleapis/google-cloud-go/commit/bd766957ec238b7c40ddbabb369e612dc9b07313)), refs [#10844](https://github.com/googleapis/google-cloud-go/issues/10844)

70+* **auth:** Replace MDS endpoint universe_domain with universe-domain ([#11000](https://github.com/googleapis/google-cloud-go/issues/11000)) ([6a1586f](https://github.com/googleapis/google-cloud-go/commit/6a1586f2ce9974684affaea84e7b629313b4d114))

71+

72+## [0.9.8](https://github.com/googleapis/google-cloud-go/compare/auth/v0.9.7...auth/v0.9.8) (2024-10-09)

73+

74+

75+### Bug Fixes

76+

77+* **auth:** Restore OpenTelemetry handling in transports ([#10968](https://github.com/googleapis/google-cloud-go/issues/10968)) ([08c6d04](https://github.com/googleapis/google-cloud-go/commit/08c6d04901c1a20e219b2d86df41dbaa6d7d7b55)), refs [#10962](https://github.com/googleapis/google-cloud-go/issues/10962)

78+* **auth:** Try talk to plaintext S2A if credentials can not be found for mTLS-S2A ([#10941](https://github.com/googleapis/google-cloud-go/issues/10941)) ([0f0bf2d](https://github.com/googleapis/google-cloud-go/commit/0f0bf2d18c97dd8b65bcf0099f0802b5631c6287))

79+

80+## [0.9.7](https://github.com/googleapis/google-cloud-go/compare/auth/v0.9.6...auth/v0.9.7) (2024-10-01)

81+

82+

83+### Bug Fixes

84+

85+* **auth:** Restore support for non-default service accounts for DirectPath ([#10937](https://github.com/googleapis/google-cloud-go/issues/10937)) ([a38650e](https://github.com/googleapis/google-cloud-go/commit/a38650edbf420223077498cafa537aec74b37aad)), refs [#10907](https://github.com/googleapis/google-cloud-go/issues/10907)

86+

87+## [0.9.6](https://github.com/googleapis/google-cloud-go/compare/auth/v0.9.5...auth/v0.9.6) (2024-09-30)

88+

89+

90+### Bug Fixes

91+

92+* **auth:** Make aws credentials provider retrieve fresh credentials ([#10920](https://github.com/googleapis/google-cloud-go/issues/10920)) ([250fbf8](https://github.com/googleapis/google-cloud-go/commit/250fbf87d858d865e399a241b7e537c4ff0c3dd8))

93+

94+## [0.9.5](https://github.com/googleapis/google-cloud-go/compare/auth/v0.9.4...auth/v0.9.5) (2024-09-25)

95+

96+

97+### Bug Fixes

98+

99+* **auth:** Restore support for GOOGLE_CLOUD_UNIVERSE_DOMAIN env ([#10915](https://github.com/googleapis/google-cloud-go/issues/10915)) ([94caaaa](https://github.com/googleapis/google-cloud-go/commit/94caaaa061362d0e00ef6214afcc8a0a3e7ebfb2))

100+* **auth:** Skip directpath credentials overwrite when it's not on GCE ([#10833](https://github.com/googleapis/google-cloud-go/issues/10833)) ([7e5e8d1](https://github.com/googleapis/google-cloud-go/commit/7e5e8d10b761b0a6e43e19a028528db361bc07b1))

101+* **auth:** Use new context for non-blocking token refresh ([#10919](https://github.com/googleapis/google-cloud-go/issues/10919)) ([cf7102d](https://github.com/googleapis/google-cloud-go/commit/cf7102d33a21be1e5a9d47a49456b3a57c43b350))

102+

103+## [0.9.4](https://github.com/googleapis/google-cloud-go/compare/auth/v0.9.3...auth/v0.9.4) (2024-09-11)

104+

105+

106+### Bug Fixes

107+

108+* **auth:** Enable self-signed JWT for non-GDU universe domain ([#10831](https://github.com/googleapis/google-cloud-go/issues/10831)) ([f9869f7](https://github.com/googleapis/google-cloud-go/commit/f9869f7903cfd34d1b97c25d0dc5669d2c5138e6))

109+

110+## [0.9.3](https://github.com/googleapis/google-cloud-go/compare/auth/v0.9.2...auth/v0.9.3) (2024-09-03)

111+

112+

113+### Bug Fixes

114+

115+* **auth:** Choose quota project envvar over file when both present ([#10807](https://github.com/googleapis/google-cloud-go/issues/10807)) ([2d8dd77](https://github.com/googleapis/google-cloud-go/commit/2d8dd7700eff92d4b95027be55e26e1e7aa79181)), refs [#10804](https://github.com/googleapis/google-cloud-go/issues/10804)

116+

117+## [0.9.2](https://github.com/googleapis/google-cloud-go/compare/auth/v0.9.1...auth/v0.9.2) (2024-08-30)

118+

119+

120+### Bug Fixes

121+

122+* **auth:** Handle non-Transport DefaultTransport ([#10733](https://github.com/googleapis/google-cloud-go/issues/10733)) ([98d91dc](https://github.com/googleapis/google-cloud-go/commit/98d91dc8316b247498fab41ab35e57a0446fe556)), refs [#10742](https://github.com/googleapis/google-cloud-go/issues/10742)

123+* **auth:** Make sure quota option takes precedence over env/file ([#10797](https://github.com/googleapis/google-cloud-go/issues/10797)) ([f1b050d](https://github.com/googleapis/google-cloud-go/commit/f1b050d56d804b245cab048c2980d32b0eaceb4e)), refs [#10795](https://github.com/googleapis/google-cloud-go/issues/10795)

124+

125+

126+### Documentation

127+

128+* **auth:** Fix Go doc comment link ([#10751](https://github.com/googleapis/google-cloud-go/issues/10751)) ([015acfa](https://github.com/googleapis/google-cloud-go/commit/015acfab4d172650928bb1119bc2cd6307b9a437))

129+

130+## [0.9.1](https://github.com/googleapis/google-cloud-go/compare/auth/v0.9.0...auth/v0.9.1) (2024-08-22)

131+

132+

133+### Bug Fixes

134+

135+* **auth:** Setting expireEarly to default when the value is 0 ([#10732](https://github.com/googleapis/google-cloud-go/issues/10732)) ([5e67869](https://github.com/googleapis/google-cloud-go/commit/5e67869a31e9e8ecb4eeebd2cfa11a761c3b1948))

136+

137+## [0.9.0](https://github.com/googleapis/google-cloud-go/compare/auth/v0.8.1...auth/v0.9.0) (2024-08-16)

138+

139+

140+### Features

141+

142+* **auth:** Auth library can talk to S2A over mTLS ([#10634](https://github.com/googleapis/google-cloud-go/issues/10634)) ([5250a13](https://github.com/googleapis/google-cloud-go/commit/5250a13ec95b8d4eefbe0158f82857ff2189cb45))

143+

144+## [0.8.1](https://github.com/googleapis/google-cloud-go/compare/auth/v0.8.0...auth/v0.8.1) (2024-08-13)

145+

146+

147+### Bug Fixes

148+

149+* **auth:** Make default client creation more lenient ([#10669](https://github.com/googleapis/google-cloud-go/issues/10669)) ([1afb9ee](https://github.com/googleapis/google-cloud-go/commit/1afb9ee1ee9de9810722800018133304a0ca34d1)), refs [#10638](https://github.com/googleapis/google-cloud-go/issues/10638)

150+

151+## [0.8.0](https://github.com/googleapis/google-cloud-go/compare/auth/v0.7.3...auth/v0.8.0) (2024-08-07)

152+

153+

154+### Features

155+

156+* **auth:** Adds support for X509 workload identity federation ([#10373](https://github.com/googleapis/google-cloud-go/issues/10373)) ([5d07505](https://github.com/googleapis/google-cloud-go/commit/5d075056cbe27bb1da4072a26070c41f8999eb9b))

157+

158+## [0.7.3](https://github.com/googleapis/google-cloud-go/compare/auth/v0.7.2...auth/v0.7.3) (2024-08-01)

159+

160+

161+### Bug Fixes

162+

163+* **auth/oauth2adapt:** Update dependencies ([257c40b](https://github.com/googleapis/google-cloud-go/commit/257c40bd6d7e59730017cf32bda8823d7a232758))

164+* **auth:** Disable automatic universe domain check for MDS ([#10620](https://github.com/googleapis/google-cloud-go/issues/10620)) ([7cea5ed](https://github.com/googleapis/google-cloud-go/commit/7cea5edd5a0c1e6bca558696f5607879141910e8))

165+* **auth:** Update dependencies ([257c40b](https://github.com/googleapis/google-cloud-go/commit/257c40bd6d7e59730017cf32bda8823d7a232758))

166+

167+## [0.7.2](https://github.com/googleapis/google-cloud-go/compare/auth/v0.7.1...auth/v0.7.2) (2024-07-22)

168+

169+

170+### Bug Fixes

171+

172+* **auth:** Use default client for universe metadata lookup ([#10551](https://github.com/googleapis/google-cloud-go/issues/10551)) ([d9046fd](https://github.com/googleapis/google-cloud-go/commit/d9046fdd1435d1ce48f374806c1def4cb5ac6cd3)), refs [#10544](https://github.com/googleapis/google-cloud-go/issues/10544)

173+

174+## [0.7.1](https://github.com/googleapis/google-cloud-go/compare/auth/v0.7.0...auth/v0.7.1) (2024-07-10)

175+

176+

177+### Bug Fixes

178+

179+* **auth:** Bump google.golang.org/grpc@v1.64.1 ([8ecc4e9](https://github.com/googleapis/google-cloud-go/commit/8ecc4e9622e5bbe9b90384d5848ab816027226c5))

180+

181+## [0.7.0](https://github.com/googleapis/google-cloud-go/compare/auth/v0.6.1...auth/v0.7.0) (2024-07-09)

182+

183+

184+### Features

185+

186+* **auth:** Add workload X509 cert provider as a default cert provider ([#10479](https://github.com/googleapis/google-cloud-go/issues/10479)) ([c51ee6c](https://github.com/googleapis/google-cloud-go/commit/c51ee6cf65ce05b4d501083e49d468c75ac1ea63))

187+

188+

189+### Bug Fixes

190+

191+* **auth/oauth2adapt:** Bump google.golang.org/api@v0.187.0 ([8fa9e39](https://github.com/googleapis/google-cloud-go/commit/8fa9e398e512fd8533fd49060371e61b5725a85b))

192+* **auth:** Bump google.golang.org/api@v0.187.0 ([8fa9e39](https://github.com/googleapis/google-cloud-go/commit/8fa9e398e512fd8533fd49060371e61b5725a85b))

193+* **auth:** Check len of slices, not non-nil ([#10483](https://github.com/googleapis/google-cloud-go/issues/10483)) ([0a966a1](https://github.com/googleapis/google-cloud-go/commit/0a966a183e5f0e811977216d736d875b7233e942))

194+

195+## [0.6.1](https://github.com/googleapis/google-cloud-go/compare/auth/v0.6.0...auth/v0.6.1) (2024-07-01)

196+

197+

198+### Bug Fixes

199+

200+* **auth:** Support gRPC API keys ([#10460](https://github.com/googleapis/google-cloud-go/issues/10460)) ([daa6646](https://github.com/googleapis/google-cloud-go/commit/daa6646d2af5d7fb5b30489f4934c7db89868c7c))

201+* **auth:** Update http and grpc transports to support token exchange over mTLS ([#10397](https://github.com/googleapis/google-cloud-go/issues/10397)) ([c6dfdcf](https://github.com/googleapis/google-cloud-go/commit/c6dfdcf893c3f971eba15026c12db0a960ae81f2))

202+

203+## [0.6.0](https://github.com/googleapis/google-cloud-go/compare/auth/v0.5.2...auth/v0.6.0) (2024-06-25)

204+

205+

206+### Features

207+

208+* **auth:** Add non-blocking token refresh for compute MDS ([#10263](https://github.com/googleapis/google-cloud-go/issues/10263)) ([9ac350d](https://github.com/googleapis/google-cloud-go/commit/9ac350da11a49b8e2174d3fc5b1a5070fec78b4e))

209+

210+

211+### Bug Fixes

212+

213+* **auth:** Return error if envvar detected file returns an error ([#10431](https://github.com/googleapis/google-cloud-go/issues/10431)) ([e52b9a7](https://github.com/googleapis/google-cloud-go/commit/e52b9a7c45468827f5d220ab00965191faeb9d05))

214+

215+## [0.5.2](https://github.com/googleapis/google-cloud-go/compare/auth/v0.5.1...auth/v0.5.2) (2024-06-24)

216+

217+

218+### Bug Fixes

219+

220+* **auth:** Fetch initial token when CachedTokenProviderOptions.DisableAutoRefresh is true ([#10415](https://github.com/googleapis/google-cloud-go/issues/10415)) ([3266763](https://github.com/googleapis/google-cloud-go/commit/32667635ca2efad05cd8c087c004ca07d7406913)), refs [#10414](https://github.com/googleapis/google-cloud-go/issues/10414)

221+

222+## [0.5.1](https://github.com/googleapis/google-cloud-go/compare/auth/v0.5.0...auth/v0.5.1) (2024-05-31)

223+

224+

225+### Bug Fixes

226+

227+* **auth:** Pass through client to 2LO and 3LO flows ([#10290](https://github.com/googleapis/google-cloud-go/issues/10290)) ([685784e](https://github.com/googleapis/google-cloud-go/commit/685784ea84358c15e9214bdecb307d37aa3b6d2f))

228+

229+## [0.5.0](https://github.com/googleapis/google-cloud-go/compare/auth/v0.4.2...auth/v0.5.0) (2024-05-28)

230+

231+

232+### Features

233+

234+* **auth:** Adds X509 workload certificate provider ([#10233](https://github.com/googleapis/google-cloud-go/issues/10233)) ([17a9db7](https://github.com/googleapis/google-cloud-go/commit/17a9db73af35e3d1a7a25ac4fd1377a103de6150))

235+

236+## [0.4.2](https://github.com/googleapis/google-cloud-go/compare/auth/v0.4.1...auth/v0.4.2) (2024-05-16)

237+

238+

239+### Bug Fixes

240+

241+* **auth:** Enable client certificates by default only for GDU ([#10151](https://github.com/googleapis/google-cloud-go/issues/10151)) ([7c52978](https://github.com/googleapis/google-cloud-go/commit/7c529786275a39b7e00525f7d5e7be0d963e9e15))

242+* **auth:** Handle non-Transport DefaultTransport ([#10162](https://github.com/googleapis/google-cloud-go/issues/10162)) ([fa3bfdb](https://github.com/googleapis/google-cloud-go/commit/fa3bfdb23aaa45b34394a8b61e753b3587506782)), refs [#10159](https://github.com/googleapis/google-cloud-go/issues/10159)

243+* **auth:** Have refresh time match docs ([#10147](https://github.com/googleapis/google-cloud-go/issues/10147)) ([bcb5568](https://github.com/googleapis/google-cloud-go/commit/bcb5568c07a54dd3d2e869d15f502b0741a609e8))

244+* **auth:** Update compute token fetching error with named prefix ([#10180](https://github.com/googleapis/google-cloud-go/issues/10180)) ([4573504](https://github.com/googleapis/google-cloud-go/commit/4573504828d2928bebedc875d87650ba227829ea))

245+

246+## [0.4.1](https://github.com/googleapis/google-cloud-go/compare/auth/v0.4.0...auth/v0.4.1) (2024-05-09)

247+

248+

249+### Bug Fixes

250+

251+* **auth:** Don't try to detect default creds it opt configured ([#10143](https://github.com/googleapis/google-cloud-go/issues/10143)) ([804632e](https://github.com/googleapis/google-cloud-go/commit/804632e7c5b0b85ff522f7951114485e256eb5bc))

252+

253+## [0.4.0](https://github.com/googleapis/google-cloud-go/compare/auth/v0.3.0...auth/v0.4.0) (2024-05-07)

254+

255+

256+### Features

257+

258+* **auth:** Enable client certificates by default ([#10102](https://github.com/googleapis/google-cloud-go/issues/10102)) ([9013e52](https://github.com/googleapis/google-cloud-go/commit/9013e5200a6ec0f178ed91acb255481ffb073a2c))

259+

260+

261+### Bug Fixes

262+

263+* **auth:** Get s2a logic up to date ([#10093](https://github.com/googleapis/google-cloud-go/issues/10093)) ([4fe9ae4](https://github.com/googleapis/google-cloud-go/commit/4fe9ae4b7101af2a5221d6d6b2e77b479305bb06))

264+

265+## [0.3.0](https://github.com/googleapis/google-cloud-go/compare/auth/v0.2.2...auth/v0.3.0) (2024-04-23)

266+

267+

268+### Features

269+

270+* **auth/httptransport:** Add ability to customize transport ([#10023](https://github.com/googleapis/google-cloud-go/issues/10023)) ([72c7f6b](https://github.com/googleapis/google-cloud-go/commit/72c7f6bbec3136cc7a62788fc7186bc33ef6c3b3)), refs [#9812](https://github.com/googleapis/google-cloud-go/issues/9812) [#9814](https://github.com/googleapis/google-cloud-go/issues/9814)

271+

272+

273+### Bug Fixes

274+

275+* **auth/credentials:** Error on bad file name if explicitly set ([#10018](https://github.com/googleapis/google-cloud-go/issues/10018)) ([55beaa9](https://github.com/googleapis/google-cloud-go/commit/55beaa993aaf052d8be39766afc6777c3c2a0bdd)), refs [#9809](https://github.com/googleapis/google-cloud-go/issues/9809)

276+

277+## [0.2.2](https://github.com/googleapis/google-cloud-go/compare/auth/v0.2.1...auth/v0.2.2) (2024-04-19)

278+

279+

280+### Bug Fixes

281+

282+* **auth:** Add internal opt to skip validation on transports ([#9999](https://github.com/googleapis/google-cloud-go/issues/9999)) ([9e20ef8](https://github.com/googleapis/google-cloud-go/commit/9e20ef89f6287d6bd03b8697d5898dc43b4a77cf)), refs [#9823](https://github.com/googleapis/google-cloud-go/issues/9823)

283+* **auth:** Set secure flag for gRPC conn pools ([#10002](https://github.com/googleapis/google-cloud-go/issues/10002)) ([14e3956](https://github.com/googleapis/google-cloud-go/commit/14e3956dfd736399731b5ee8d9b178ae085cf7ba)), refs [#9833](https://github.com/googleapis/google-cloud-go/issues/9833)

284+

285+## [0.2.1](https://github.com/googleapis/google-cloud-go/compare/auth/v0.2.0...auth/v0.2.1) (2024-04-18)

286+

287+

288+### Bug Fixes

289+

290+* **auth:** Default gRPC token type to Bearer if not set ([#9800](https://github.com/googleapis/google-cloud-go/issues/9800)) ([5284066](https://github.com/googleapis/google-cloud-go/commit/5284066670b6fe65d79089cfe0199c9660f87fc7))

291+

292+## [0.2.0](https://github.com/googleapis/google-cloud-go/compare/auth/v0.1.1...auth/v0.2.0) (2024-04-15)

293+

294+### Breaking Changes

295+

296+In the below mentioned commits there were a few large breaking changes since the

297+last release of the module.

298+

299+1. The `Credentials` type has been moved to the root of the module as it is

300+ becoming the core abstraction for the whole module.

301+2. Because of the above mentioned change many functions that previously

302+ returned a `TokenProvider` now return `Credentials`. Similarly, these

303+ functions have been renamed to be more specific.

304+3. Most places that used to take an optional `TokenProvider` now accept

305+ `Credentials`. You can make a `Credentials` from a `TokenProvider` using the

306+ constructor found in the `auth` package.

307+4. The `detect` package has been renamed to `credentials`. With this change some

308+ function signatures were also updated for better readability.

309+5. Derivative auth flows like `impersonate` and `downscope` have been moved to

310+ be under the new `credentials` package.

311+

312+Although these changes are disruptive we think that they are for the best of the

313+long-term health of the module. We do not expect any more large breaking changes

314+like these in future revisions, even before 1.0.0. This version will be the

315+first version of the auth library that our client libraries start to use and

316+depend on.

317+

318+### Features

319+

320+* **auth/credentials/externalaccount:** Add default TokenURL ([#9700](https://github.com/googleapis/google-cloud-go/issues/9700)) ([81830e6](https://github.com/googleapis/google-cloud-go/commit/81830e6848ceefd055aa4d08f933d1154455a0f6))

321+* **auth:** Add downscope.Options.UniverseDomain ([#9634](https://github.com/googleapis/google-cloud-go/issues/9634)) ([52cf7d7](https://github.com/googleapis/google-cloud-go/commit/52cf7d780853594291c4e34302d618299d1f5a1d))

322+* **auth:** Add universe domain to grpctransport and httptransport ([#9663](https://github.com/googleapis/google-cloud-go/issues/9663)) ([67d353b](https://github.com/googleapis/google-cloud-go/commit/67d353beefe3b607c08c891876fbd95ab89e5fe3)), refs [#9670](https://github.com/googleapis/google-cloud-go/issues/9670)

323+* **auth:** Add UniverseDomain to DetectOptions ([#9536](https://github.com/googleapis/google-cloud-go/issues/9536)) ([3618d3f](https://github.com/googleapis/google-cloud-go/commit/3618d3f7061615c0e189f376c75abc201203b501))

324+* **auth:** Make package externalaccount public ([#9633](https://github.com/googleapis/google-cloud-go/issues/9633)) ([a0978d8](https://github.com/googleapis/google-cloud-go/commit/a0978d8e96968399940ebd7d092539772bf9caac))

325+* **auth:** Move credentials to base auth package ([#9590](https://github.com/googleapis/google-cloud-go/issues/9590)) ([1a04baf](https://github.com/googleapis/google-cloud-go/commit/1a04bafa83c27342b9308d785645e1e5423ea10d))

326+* **auth:** Refactor public sigs to use Credentials ([#9603](https://github.com/googleapis/google-cloud-go/issues/9603)) ([69cb240](https://github.com/googleapis/google-cloud-go/commit/69cb240c530b1f7173a9af2555c19e9a1beb56c5))

327+

328+

329+### Bug Fixes

330+

331+* **auth/oauth2adapt:** Update protobuf dep to v1.33.0 ([30b038d](https://github.com/googleapis/google-cloud-go/commit/30b038d8cac0b8cd5dd4761c87f3f298760dd33a))

332+* **auth:** Fix uint32 conversion ([9221c7f](https://github.com/googleapis/google-cloud-go/commit/9221c7fa12cef9d5fb7ddc92f41f1d6204971c7b))

333+* **auth:** Port sts expires fix ([#9618](https://github.com/googleapis/google-cloud-go/issues/9618)) ([7bec97b](https://github.com/googleapis/google-cloud-go/commit/7bec97b2f51ed3ac4f9b88bf100d301da3f5d1bd))

334+* **auth:** Read universe_domain from all credentials files ([#9632](https://github.com/googleapis/google-cloud-go/issues/9632)) ([16efbb5](https://github.com/googleapis/google-cloud-go/commit/16efbb52e39ea4a319e5ee1e95c0e0305b6d9824))

335+* **auth:** Remove content-type header from idms get requests ([#9508](https://github.com/googleapis/google-cloud-go/issues/9508)) ([8589f41](https://github.com/googleapis/google-cloud-go/commit/8589f41599d265d7c3d46a3d86c9fab2329cbdd9))

336+* **auth:** Update protobuf dep to v1.33.0 ([30b038d](https://github.com/googleapis/google-cloud-go/commit/30b038d8cac0b8cd5dd4761c87f3f298760dd33a))

337+

338+## [0.1.1](https://github.com/googleapis/google-cloud-go/compare/auth/v0.1.0...auth/v0.1.1) (2024-03-10)

339+

340+

341+### Bug Fixes

342+

343+* **auth/impersonate:** Properly send default detect params ([#9529](https://github.com/googleapis/google-cloud-go/issues/9529)) ([5b6b8be](https://github.com/googleapis/google-cloud-go/commit/5b6b8bef577f82707e51f5cc5d258d5bdf90218f)), refs [#9136](https://github.com/googleapis/google-cloud-go/issues/9136)

344+* **auth:** Update grpc-go to v1.56.3 ([343cea8](https://github.com/googleapis/google-cloud-go/commit/343cea8c43b1e31ae21ad50ad31d3b0b60143f8c))

345+* **auth:** Update grpc-go to v1.59.0 ([81a97b0](https://github.com/googleapis/google-cloud-go/commit/81a97b06cb28b25432e4ece595c55a9857e960b7))

346+

347+## 0.1.0 (2023-10-18)

348+

349+

350+### Features

351+

352+* **auth:** Add base auth package ([#8465](https://github.com/googleapis/google-cloud-go/issues/8465)) ([6a45f26](https://github.com/googleapis/google-cloud-go/commit/6a45f26b809b64edae21f312c18d4205f96b180e))

353+* **auth:** Add cert support to httptransport ([#8569](https://github.com/googleapis/google-cloud-go/issues/8569)) ([37e3435](https://github.com/googleapis/google-cloud-go/commit/37e3435f8e98595eafab481bdfcb31a4c56fa993))

354+* **auth:** Add Credentials.UniverseDomain() ([#8654](https://github.com/googleapis/google-cloud-go/issues/8654)) ([af0aa1e](https://github.com/googleapis/google-cloud-go/commit/af0aa1ed8015bc8fe0dd87a7549ae029107cbdb8))

355+* **auth:** Add detect package ([#8491](https://github.com/googleapis/google-cloud-go/issues/8491)) ([d977419](https://github.com/googleapis/google-cloud-go/commit/d977419a3269f6acc193df77a2136a6eb4b4add7))

356+* **auth:** Add downscope package ([#8532](https://github.com/googleapis/google-cloud-go/issues/8532)) ([dda9bff](https://github.com/googleapis/google-cloud-go/commit/dda9bff8ec70e6d104901b4105d13dcaa4e2404c))

357+* **auth:** Add grpctransport package ([#8625](https://github.com/googleapis/google-cloud-go/issues/8625)) ([69a8347](https://github.com/googleapis/google-cloud-go/commit/69a83470bdcc7ed10c6c36d1abc3b7cfdb8a0ee5))

358+* **auth:** Add httptransport package ([#8567](https://github.com/googleapis/google-cloud-go/issues/8567)) ([6898597](https://github.com/googleapis/google-cloud-go/commit/6898597d2ea95d630fcd00fd15c58c75ea843bff))

359+* **auth:** Add idtoken package ([#8580](https://github.com/googleapis/google-cloud-go/issues/8580)) ([a79e693](https://github.com/googleapis/google-cloud-go/commit/a79e693e97e4e3e1c6742099af3dbc58866d88fe))

360+* **auth:** Add impersonate package ([#8578](https://github.com/googleapis/google-cloud-go/issues/8578)) ([e29ba0c](https://github.com/googleapis/google-cloud-go/commit/e29ba0cb7bd3888ab9e808087027dc5a32474c04))

361+* **auth:** Add support for external accounts in detect ([#8508](https://github.com/googleapis/google-cloud-go/issues/8508)) ([62210d5](https://github.com/googleapis/google-cloud-go/commit/62210d5d3e56e8e9f35db8e6ac0defec19582507))

362+* **auth:** Port external account changes ([#8697](https://github.com/googleapis/google-cloud-go/issues/8697)) ([5823db5](https://github.com/googleapis/google-cloud-go/commit/5823db5d633069999b58b9131a7f9cd77e82c899))

363+

364+

365+### Bug Fixes

366+

367+* **auth/oauth2adapt:** Update golang.org/x/net to v0.17.0 ([174da47](https://github.com/googleapis/google-cloud-go/commit/174da47254fefb12921bbfc65b7829a453af6f5d))

368+* **auth:** Update golang.org/x/net to v0.17.0 ([174da47](https://github.com/googleapis/google-cloud-go/commit/174da47254fefb12921bbfc65b7829a453af6f5d))

vendor/cloud.google.com/go/auth/LICENSEnew file+202