Open source AI coding agent. Designed for large projects and real world tasks.
Go aiai-agentsai-developer-toolsai-toolsclicommand-linedeveloper-toolsgitgolanggpt-4llmopenaipolyglot-programmingterminalterminal-basedterminal-ui
Improve API handlers with better error reporting
Dane Schneiderc87b028c082b
diff --git a/app/server/handlers/context_helper.go b/app/server/handlers/context_helper.goindex 4bdf0cc4..1197fddb 100644--- a/app/server/handlers/context_helper.go+++ b/app/server/handlers/context_helper.go@@ -36,16 +36,32 @@ func loadContexts(cachedMapsByPath := params.cachedMapsByPathautoLoaded := params.autoLoaded- log.Printf("Starting loadContexts with %d contexts, cachedMapsByPath: %v, autoLoaded: %v", len(*loadReq), cachedMapsByPath != nil, autoLoaded)+ log.Printf("[ContextHelper] Starting loadContexts with %d contexts, cachedMapsByPath: %v, autoLoaded: %v", len(*loadReq), cachedMapsByPath != nil, autoLoaded)// check file count and size limits+ // this is all a sanity check - we should have already checked these limits in the clienttotalFiles := 0mapFilesCount := 0for _, context := range *loadReq {totalFiles++if context.ContextType == shared.ContextMapType {mapFilesCount++- log.Printf("Found map file: %s with %d map inputs", context.FilePath, len(context.MapInputs))+ log.Printf("[ContextHelper] Found map file: %s with %d map bodies", context.FilePath, len(context.MapBodies))++ if len(context.MapBodies) > shared.MaxContextMapPaths {+ log.Printf("Error: Too many map files to load (found %d, limit is %d)\n", len(context.MapBodies), shared.MaxContextMapPaths)+ http.Error(w, fmt.Sprintf("Too many map files to load (found %d, limit is %d)", len(context.MapBodies), shared.MaxContextMapPaths), http.StatusBadRequest)+ return nil, nil+ }++ // these are already mapped, so they shouldn't be anywhere close to the input limit, but we'll use it for the sanity check+ for _, body := range context.MapBodies {+ if len(body) > shared.MaxContextMapSingleInputSize {+ log.Printf("Error: Map file %s exceeds size limit (size %d, limit %d)\n", context.FilePath, len(body), shared.MaxContextMapSingleInputSize)+ http.Error(w, fmt.Sprintf("Map file %s exceeds size limit (size %d, limit %d)", context.FilePath, len(body), shared.MaxContextMapSingleInputSize), http.StatusBadRequest)+ return nil, nil+ }+ }}if totalFiles > shared.MaxContextCount {@@ -60,10 +76,11 @@ func loadContexts(http.Error(w, fmt.Sprintf("Context %s exceeds size limit (size %.2f MB, limit %d MB)", context.Name, float64(fileSize)/1024/1024, int(shared.MaxContextBodySize)/1024/1024), http.StatusBadRequest)return nil, nil}+}if mapFilesCount > 0 {- log.Printf("Processing %d map files out of %d total contexts", mapFilesCount, totalFiles)+ log.Printf("[ContextHelper] Processing %d map files out of %d total contexts", mapFilesCount, totalFiles)}var err error@@ -169,9 +186,9 @@ func loadContexts(CancelFn: cancel,ClearRepoOnErr: true,}, func(repo *db.GitRepo) error {- log.Printf("Calling db.LoadContexts with %d contexts, %d cached maps", len(*loadReq), len(cachedMapsByPath))+ log.Printf("[ContextHelper] Calling db.LoadContexts with %d contexts, %d cached maps", len(*loadReq), len(cachedMapsByPath))for path := range cachedMapsByPath {- log.Printf("Using cached map for path: %s", path)+ log.Printf("[ContextHelper] Using cached map for path: %s", path)}res, dbContextsRes, err := db.LoadContexts(ctx, db.LoadContextsParams{@@ -191,30 +208,33 @@ func loadContexts(loadRes = resdbContexts = dbContextsRes- log.Printf("db.LoadContexts completed successfully, loaded %d contexts", len(dbContexts))+ log.Printf("[ContextHelper] db.LoadContexts completed successfully, loaded %d contexts", len(dbContexts))// Log information about loaded map contextsmapContextsCount := 0for _, context := range dbContexts {if context.ContextType == shared.ContextMapType {mapContextsCount++- log.Printf("Loaded map context: %s, path: %s, tokens: %d", context.Name, context.FilePath, context.NumTokens)+ log.Printf("[ContextHelper] Loaded map context: %s, path: %s, tokens: %d", context.Name, context.FilePath, context.NumTokens)}}if mapContextsCount > 0 {- log.Printf("Successfully loaded %d map contexts out of %d total contexts", mapContextsCount, len(dbContexts))+ log.Printf("[ContextHelper] Successfully loaded %d map contexts out of %d total contexts", mapContextsCount, len(dbContexts))}if loadRes.MaxTokensExceeded {return nil}+ log.Printf("[ContextHelper] Committing changes to branch %s", branchName)err = repo.GitAddAndCommit(branchName, res.Msg)if err != nil {return fmt.Errorf("error committing changes: %v", err)}+ log.Printf("[ContextHelper] Committing changes to branch %s completed successfully", branchName)+return nil})diff --git a/app/server/handlers/plans_changes.go b/app/server/handlers/plans_changes.goindex 2dcd8408..969fedfd 100644--- a/app/server/handlers/plans_changes.go+++ b/app/server/handlers/plans_changes.go@@ -55,6 +55,7 @@ func CurrentPlanHandler(w http.ResponseWriter, r *http.Request) {Scope: scope,Ctx: ctx,CancelFn: cancel,+ Reason: "get current plan state",}, func(repo *db.GitRepo) error {var err errorif sha != "" {diff --git a/app/server/handlers/plans_exec.go b/app/server/handlers/plans_exec.goindex a4cbf236..4e4b52b2 100644--- a/app/server/handlers/plans_exec.go+++ b/app/server/handlers/plans_exec.go@@ -264,7 +264,7 @@ func StopPlanHandler(w http.ResponseWriter, r *http.Request) {Ctx: ctx,CancelFn: cancel,}, func(repo *db.GitRepo) error {- log.Println("Stopping plan")+ log.Println("Stopping plan - storing partial reply")err = modelPlan.StorePartialReply(repo, planId, branch, auth.User.Id, auth.OrgId)return err})