Skip to content

Open source AI coding agent. Designed for large projects and real world tasks.

refactor: update ModelName type and cache token tracking in API interfaces

Dane Schneider80e5d9272609
diff --git a/app/server/hooks/hooks.go b/app/server/hooks/hooks.go
index 41fbb75e..f54aed2e 100644
--- a/app/server/hooks/hooks.go
+++ b/app/server/hooks/hooks.go
@@ -30,13 +30,14 @@ const (
type WillSendModelRequestParams struct {
InputTokens int
OutputTokens int
- ModelName string
+ ModelName shared.ModelName
}
type DidSendModelRequestParams struct {
InputTokens int
OutputTokens int
- ModelName string
+ CachedTokens int
+ ModelName shared.ModelName
ModelProvider shared.ModelProvider
ModelRole shared.ModelRole
ModelPackName string
diff --git a/app/server/types/active_plan.go b/app/server/types/active_plan.go
index 9c0179e3..d85d8f5a 100644
--- a/app/server/types/active_plan.go
+++ b/app/server/types/active_plan.go
@@ -188,7 +188,7 @@ func (ap *ActivePlan) Stream(msg shared.StreamMessage) {
ap.streamMu.Lock()
skipBuffer := false
- if msg.Type == shared.StreamMessagePromptMissingFile || msg.Type == shared.StreamMessageFinished || msg.Type == shared.StreamMessageError {
+ if msg.Type == shared.StreamMessagePromptMissingFile || msg.Type == shared.StreamMessageLoadContext || msg.Type == shared.StreamMessageFinished || msg.Type == shared.StreamMessageError {
skipBuffer = true
log.Println("ActivePlan.Stream: skipping buffer for special message")
diff --git a/app/server/types/reply_test_examples/10.md b/app/server/types/reply_test_examples/10.md
index 3b03cdb6..85101567 100644
--- a/app/server/types/reply_test_examples/10.md
+++ b/app/server/types/reply_test_examples/10.md
@@ -74,7 +74,7 @@ func (state *activeTellStreamState) genPlanDescription() (*db.ConvoMessageDescri
Plan: plan,
WillSendModelRequestParams: &hooks.WillSendModelRequestParams{
InputTokens: numTokens,
- OutputTokens: config.GetReservedOutputTokens(),
+ OutputTokens: config.BaseModelConfig.MaxOutputTokens,
ModelName: config.BaseModelConfig.ModelName,
},
})