git.iko.soy/crush
on main help sign in
Merge remote-tracking branch 'origin/main' into fix-openai-provider
cea9e80Kujtim Hoxha
.github/cla-signatures.json+40
compare with main
unifiedsplit
@@ -183,6 +183,46 @@
183 "created_at": "2025-08-01T22:18:28Z",
183 "created_at": "2025-08-01T22:18:28Z",
184 "repoId": 987670088,
184 "repoId": 987670088,
185 "pullRequestNo": 480
185 "pullRequestNo": 480
186+ },
187+ {
188+ "name": "yumosx",
189+ "id": 141902143,
190+ "comment_id": 3146472558,
191+ "created_at": "2025-08-02T12:24:29Z",
192+ "repoId": 987670088,
193+ "pullRequestNo": 504
194+ },
195+ {
196+ "name": "bold84",
197+ "id": 21118257,
198+ "comment_id": 3146962342,
199+ "created_at": "2025-08-03T04:07:16Z",
200+ "repoId": 987670088,
201+ "pullRequestNo": 519
202+ },
203+ {
204+ "name": "jooray",
205+ "id": 1028688,
206+ "comment_id": 3148713433,
207+ "created_at": "2025-08-03T21:35:15Z",
208+ "repoId": 987670088,
209+ "pullRequestNo": 527
210+ },
211+ {
212+ "name": "Ed4ward",
213+ "id": 153800328,
214+ "comment_id": 3150375016,
215+ "created_at": "2025-08-04T12:16:16Z",
216+ "repoId": 987670088,
217+ "pullRequestNo": 539
218+ },
219+ {
220+ "name": "ngnhng",
221+ "id": 51743767,
222+ "comment_id": 3150846779,
223+ "created_at": "2025-08-04T14:01:30Z",
224+ "repoId": 987670088,
225+ "pullRequestNo": 546
186 }
226 }
187 ]
227 ]
188}
228}
.github/labeler.yml+4
@@ -1,3 +1,5 @@
1+"area: ci":
2+ - "/^ci: /i"
1"area: diff":
3"area: diff":
2 - "/diff/i"
4 - "/diff/i"
3"area: images":
5"area: images":
@@ -40,3 +42,5 @@
40 - "/(openai|gpt)/i"
42 - "/(openai|gpt)/i"
41"provider: openrouter":
43"provider: openrouter":
42 - "/openrouter/i"
44 - "/openrouter/i"
45+"provider: qwen":
46+ - "/qwen/i"
.github/workflows/cla.yml+1−1
@@ -29,7 +29,7 @@ jobs:
29 path-to-signatures: ".github/cla-signatures.json"
29 path-to-signatures: ".github/cla-signatures.json"
30 path-to-document: "https://github.com/charmbracelet/crush/blob/main/CLA.md"
30 path-to-document: "https://github.com/charmbracelet/crush/blob/main/CLA.md"
31 branch: "main"
31 branch: "main"
32− allowlist: dependabot[bot]
32+ allowlist: charmcli,charmcrush,dependabot[bot]
33 custom-pr-sign-comment: "I have read the Contributor License Agreement (CLA) and hereby sign the CLA."
33 custom-pr-sign-comment: "I have read the Contributor License Agreement (CLA) and hereby sign the CLA."
34 custom-notsigned-precomment: "Thank you for your submission. We really appreciate it! Like many open-source projects, we ask that you sign our [Contributor License Agreement](https://github.com/charmbracelet/crush/blob/main/CLA.md) before we can accept your contribution. You can sign the CLA by just posting a Pull Request comment same as the below format."
34 custom-notsigned-precomment: "Thank you for your submission. We really appreciate it! Like many open-source projects, we ask that you sign our [Contributor License Agreement](https://github.com/charmbracelet/crush/blob/main/CLA.md) before we can accept your contribution. You can sign the CLA by just posting a Pull Request comment same as the below format."
35 lock-pullrequest-aftermerge: false
35 lock-pullrequest-aftermerge: false
.github/workflows/issue-labeler.yml+1−1
@@ -3,7 +3,7 @@ name: Issue Labeler
3on:
3on:
4 issues:
4 issues:
5 types: [opened]
5 types: [opened]
6− pull_request:
6+ pull_request_target:
7 types: [opened]
7 types: [opened]
8 workflow_dispatch:
8 workflow_dispatch:
9 inputs:
9 inputs:
go.mod+1−1
@@ -27,7 +27,7 @@ require (
27 github.com/google/uuid v1.6.0
27 github.com/google/uuid v1.6.0
28 github.com/invopop/jsonschema v0.13.0
28 github.com/invopop/jsonschema v0.13.0
29 github.com/joho/godotenv v1.5.1
29 github.com/joho/godotenv v1.5.1
30− github.com/mark3labs/mcp-go v0.34.0
30+ github.com/mark3labs/mcp-go v0.36.0
31 github.com/muesli/termenv v0.16.0
31 github.com/muesli/termenv v0.16.0
32 github.com/ncruces/go-sqlite3 v0.25.0
32 github.com/ncruces/go-sqlite3 v0.25.0
33 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
33 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
go.sum+2−2
@@ -180,8 +180,8 @@ github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69
180github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
180github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
181github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
181github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
182github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
182github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
183−github.com/mark3labs/mcp-go v0.34.0 h1:eWy7WBGvhk6EyAAyVzivTCprE52iXJwNtvHV6Cv3bR0=
183+github.com/mark3labs/mcp-go v0.36.0 h1:rIZaijrRYPeSbJG8/qNDe0hWlGrCJ7FWHNMz2SQpTis=
184−github.com/mark3labs/mcp-go v0.34.0/go.mod h1:rXqOudj/djTORU/ThxYx8fqEVj/5pvTuuebQ2RC7uk4=
184+github.com/mark3labs/mcp-go v0.36.0/go.mod h1:T7tUa2jO6MavG+3P25Oy/jR7iCeJPHImCZHRymCn39g=
185github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
185github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
186github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
186github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
187github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
187github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
internal/llm/agent/mcp-tools.go+8−3
@@ -11,10 +11,8 @@ import (
11 "github.com/charmbracelet/crush/internal/config"
11 "github.com/charmbracelet/crush/internal/config"
12 "github.com/charmbracelet/crush/internal/csync"
12 "github.com/charmbracelet/crush/internal/csync"
13 "github.com/charmbracelet/crush/internal/llm/tools"
13 "github.com/charmbracelet/crush/internal/llm/tools"
14− "github.com/charmbracelet/crush/internal/version"
15−
16 "github.com/charmbracelet/crush/internal/permission"
14 "github.com/charmbracelet/crush/internal/permission"
17−
15+ "github.com/charmbracelet/crush/internal/version"
18 "github.com/mark3labs/mcp-go/client"
16 "github.com/mark3labs/mcp-go/client"
19 "github.com/mark3labs/mcp-go/client/transport"
17 "github.com/mark3labs/mcp-go/client/transport"
20 "github.com/mark3labs/mcp-go/mcp"
18 "github.com/mark3labs/mcp-go/mcp"
@@ -191,6 +189,7 @@ func createMcpClient(m config.MCPConfig) (*client.Client, error) {
191 return client.NewStreamableHttpClient(
189 return client.NewStreamableHttpClient(
192 m.URL,
190 m.URL,
193 transport.WithHTTPHeaders(m.ResolvedHeaders()),
191 transport.WithHTTPHeaders(m.ResolvedHeaders()),
192+ transport.WithLogger(mcpHTTPLogger{}),
194 )
193 )
195 case config.MCPSse:
194 case config.MCPSse:
196 return client.NewSSEMCPClient(
195 return client.NewSSEMCPClient(
@@ -201,3 +200,9 @@ func createMcpClient(m config.MCPConfig) (*client.Client, error) {
201 return nil, fmt.Errorf("unsupported mcp type: %s", m.Type)
200 return nil, fmt.Errorf("unsupported mcp type: %s", m.Type)
202 }
201 }
203}
202}
203+
204+// for MCP's HTTP client.
205+type mcpHTTPLogger struct{}
206+
207+func (l mcpHTTPLogger) Errorf(format string, v ...any) { slog.Error(fmt.Sprintf(format, v...)) }
208+func (l mcpHTTPLogger) Infof(format string, v ...any) { slog.Info(fmt.Sprintf(format, v...)) }