git.iko.soy/crush
on main help sign in
feat: add support for google reasoning
commit92944bbfc4b23d791922bd4eed6e8c19d2a49173 authorkujtimiihoxha <kujtimii.h@gmail.com> dateThu 23 Oct 2025, 10:05 (1 year ago) parentd02432a
5 files changed+43−7
compare with main
unifiedsplit
go.mod+1−1 internal/agent/agent.go+6 internal/agent/coordinator.go+7 internal/agent/tools/ls.go+1−1 internal/message/content.go+28−5
go.mod+1−1
@@ -47,7 +47,7 @@ require (
4747 mvdan.cc/sh/v3 v3.12.1-0.20250902163504-3cf4fd5717a5
4848)
4949
50−replace charm.land/fantasy => ../fantasy/
50+replace charm.land/fantasy => ../../fantasy/main/
5151
5252require (
5353 cloud.google.com/go v0.116.0 // indirect
internal/agent/agent.go+6
@@ -15,6 +15,7 @@ import (
1515 "charm.land/fantasy"
1616 "charm.land/fantasy/providers/anthropic"
1717 "charm.land/fantasy/providers/bedrock"
18+ "charm.land/fantasy/providers/google"
1819 "charm.land/fantasy/providers/openai"
1920 "github.com/charmbracelet/catwalk/pkg/catwalk"
2021 "github.com/charmbracelet/crush/internal/agent/tools"
@@ -243,6 +244,11 @@ func (a *sessionAgent) Run(ctx context.Context, call SessionAgentCall) (*fantasy
243244 currentAssistant.AppendReasoningSignature(reasoning.Signature)
244245 }
245246 }
247+ if googleData, ok := reasoning.ProviderMetadata[google.Name]; ok {
248+ if reasoning, ok := googleData.(*google.ReasoningMetadata); ok {
249+ currentAssistant.AppendReasoningSignature(reasoning.Signature)
250+ }
251+ }
246252 if openaiData, ok := reasoning.ProviderMetadata[openai.Name]; ok {
247253 if reasoning, ok := openaiData.(*openai.ResponsesReasoningMetadata); ok {
248254 currentAssistant.SetReasoningResponsesData(reasoning)
internal/agent/coordinator.go+7
@@ -218,6 +218,13 @@ func getProviderOptions(model Model, tp catwalk.Type) fantasy.ProviderOptions {
218218 options[openrouter.Name] = parsed
219219 }
220220 case google.Name:
221+ _, hasReasoning := mergedOptions["thinking_config"]
222+ if !hasReasoning {
223+ mergedOptions["thinking_config"] = map[string]any{
224+ "thinking_budget": 2000,
225+ "include_thoughts": true,
226+ }
227+ }
221228 parsed, err := google.ParseOptions(mergedOptions)
222229 if err == nil {
223230 options[google.Name] = parsed
internal/agent/tools/ls.go+1−1
@@ -16,7 +16,7 @@ import (
1616)
1717
1818type LSParams struct {
19− Path string `json:"path" description:"The path to the directory to list (defaults to current working directory)"`
19+ Path string `json:"path,omitempty" description:"The path to the directory to list (defaults to current working directory)"`
2020 Ignore []string `json:"ignore,omitempty" description:"List of glob patterns to ignore"`
2121 Depth int `json:"depth,omitempty" description:"The maximum depth to traverse"`
2222}
internal/message/content.go+28−5
@@ -9,6 +9,7 @@ import (
99
1010 "charm.land/fantasy"
1111 "charm.land/fantasy/providers/anthropic"
12+ "charm.land/fantasy/providers/google"
1213 "charm.land/fantasy/providers/openai"
1314 "github.com/charmbracelet/catwalk/pkg/catwalk"
1415)
@@ -41,11 +42,12 @@ type ContentPart interface {
4142}
4243
4344type ReasoningContent struct {
44− Thinking string `json:"thinking"`
45− Signature string `json:"signature"`
46− ResponsesData *openai.ResponsesReasoningMetadata `json:"responses_data"`
47− StartedAt int64 `json:"started_at,omitempty"`
48− FinishedAt int64 `json:"finished_at,omitempty"`
45+ Thinking string `json:"thinking"`
46+ Signature string `json:"signature"`
47+ ThoughtSignature string `json:"thought_signature"` // Used for google
48+ ResponsesData *openai.ResponsesReasoningMetadata `json:"responses_data"`
49+ StartedAt int64 `json:"started_at,omitempty"`
50+ FinishedAt int64 `json:"finished_at,omitempty"`
4951}
5052
5153func (tc ReasoningContent) String() string {
@@ -259,6 +261,22 @@ func (m *Message) AppendReasoningContent(delta string) {
259261 }
260262}
261263
264+func (m *Message) AppendThoughtSignature(signature string) {
265+ for i, part := range m.Parts {
266+ if c, ok := part.(ReasoningContent); ok {
267+ m.Parts[i] = ReasoningContent{
268+ Thinking: c.Thinking,
269+ ThoughtSignature: c.ThoughtSignature + signature,
270+ Signature: c.Signature,
271+ StartedAt: c.StartedAt,
272+ FinishedAt: c.FinishedAt,
273+ }
274+ return
275+ }
276+ }
277+ m.Parts = append(m.Parts, ReasoningContent{ThoughtSignature: signature})
278+}
279+
262280func (m *Message) AppendReasoningSignature(signature string) {
263281 for i, part := range m.Parts {
264282 if c, ok := part.(ReasoningContent); ok {
@@ -443,6 +461,11 @@ func (m *Message) ToAIMessage() []fantasy.Message {
443461 if reasoning.ResponsesData != nil {
444462 reasoningPart.ProviderOptions[openai.Name] = reasoning.ResponsesData
445463 }
464+ if reasoning.ThoughtSignature != "" {
465+ reasoningPart.ProviderOptions[google.Name] = &google.ReasoningMetadata{
466+ Signature: reasoning.ThoughtSignature,
467+ }
468+ }
446469 parts = append(parts, reasoningPart)
447470 }
448471 for _, call := range m.ToolCalls() {