Skip to content

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

better error/context handling

Dane Schneidere0212912e727
diff --git a/app/server/handlers/stream_helper.go b/app/server/handlers/stream_helper.go
index fbf36ee3..d3152a28 100644
--- a/app/server/handlers/stream_helper.go
+++ b/app/server/handlers/stream_helper.go
@@ -71,8 +71,8 @@ func startResponseStream(reqCtx context.Context, w http.ResponseWriter, auth *ty
for {
select {
- case <-active.Ctx.Done():
- log.Println("Response stream manager: context done")
+ case <-reqCtx.Done():
+ log.Println("Response stream manager: request context done")
return
case msg := <-ch:
// log.Println("Response stream manager: sending message:", msg)
diff --git a/app/server/model/client.go b/app/server/model/client.go
index 19ec6855..5e8ee799 100644
--- a/app/server/model/client.go
+++ b/app/server/model/client.go
@@ -444,7 +444,6 @@ func parseRetryAfter(errorMessage string) *time.Duration {
}
func resolveReq(req *openai.ChatCompletionRequest, modelConfig *shared.ModelRoleConfig) {
- log.Println("Resolving request")
// if system prompt is disabled, change the role of the system message to user
if modelConfig.BaseModelConfig.SystemPromptDisabled {
log.Println("System prompt disabled - changing role of system message to user")
@@ -466,8 +465,6 @@ func resolveReq(req *openai.ChatCompletionRequest, modelConfig *shared.ModelRole
req.Temperature = 1
req.TopP = 1
}
-
- log.Println("Resolved request")
}
// route directly to first-party providers on openrouter for the main models
diff --git a/app/server/model/plan/state.go b/app/server/model/plan/state.go
index 5becdc31..435a4468 100644
--- a/app/server/model/plan/state.go
+++ b/app/server/model/plan/state.go
@@ -69,7 +69,9 @@ func CreateActivePlan(orgId, userId, planId, branch, prompt string, buildOnly, a
log.Println("Stopping any active summary stream")
activePlan.SummaryCancelFn()
- time.Sleep(50 * time.Millisecond)
+ log.Println("Waiting 100ms after streaming error before canceling active plan")
+ time.Sleep(100 * time.Millisecond)
+ log.Println("Cancelling active plan")
}
activePlan.CancelFn()
diff --git a/app/server/types/active_plan.go b/app/server/types/active_plan.go
index 8af0184f..9c0179e3 100644
--- a/app/server/types/active_plan.go
+++ b/app/server/types/active_plan.go
@@ -12,6 +12,7 @@ import (
shared "plandex-shared"
+ "github.com/davecgh/go-spew/spew"
"github.com/google/uuid"
)
@@ -189,6 +190,9 @@ func (ap *ActivePlan) Stream(msg shared.StreamMessage) {
skipBuffer := false
if msg.Type == shared.StreamMessagePromptMissingFile || msg.Type == shared.StreamMessageFinished || msg.Type == shared.StreamMessageError {
skipBuffer = true
+
+ log.Println("ActivePlan.Stream: skipping buffer for special message")
+ log.Println(spew.Sdump(msg))
}
// Special messages bypass buffering