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
Merge branch 'main' into cloud_billing
Dane Schneider7118f2da0338
diff --cc app/server/handlers/plans_changes.goindex c183a8aa,40f7fb03..0c4ee800--- a/app/server/handlers/plans_changes.go+++ b/app/server/handlers/plans_changes.go@@@ -136,10 -202,10 +202,10 @@@ func RejectAllChangesHandler(w http.Reslog.Println("Successfully rejected all changes for plan", planId)}- func RejectResultHandler(w http.ResponseWriter, r *http.Request) {- log.Println("Received request for RejectResultHandler")+ func RejectFileHandler(w http.ResponseWriter, r *http.Request) {+ log.Println("Received request for RejectFileHandler")- auth := authenticate(w, r, true)+ auth := Authenticate(w, r, true)if auth == nil {return}@@@ -171,13 -246,21 +246,21 @@@return}- log.Println("Successfully rejected plan result", resultId)+ err = db.GitAddAndCommit(auth.OrgId, planId, branch, fmt.Sprintf("🚫 Rejected pending changes to file: %s", req.FilePath))++ if err != nil {+ log.Printf("Error committing rejected changes: %v\n", err)+ http.Error(w, "Error committing rejected changes: "+err.Error(), http.StatusInternalServerError)+ return+ }++ log.Println("Successfully rejected plan file", req.FilePath)}- func RejectReplacementHandler(w http.ResponseWriter, r *http.Request) {- log.Println("Received request for RejectReplacementHandler")+ func RejectFilesHandler(w http.ResponseWriter, r *http.Request) {+ log.Println("Received request for RejectFilesHandler")- auth := authenticate(w, r, true)+ auth := Authenticate(w, r, true)if auth == nil {return}diff --cc app/server/handlers/plans_exec.goindex d02b74b3,38ba578f..d0a11bc2--- a/app/server/handlers/plans_exec.go+++ b/app/server/handlers/plans_exec.go@@@ -6,9 -6,9 +6,9 @@@ import"io""log""net/http"- "os""plandex-server/db"+ "plandex-server/hooks"- "plandex-server/model"+ "plandex-server/host"modelPlan "plandex-server/model/plan""plandex-server/types""time"@@@ -20,9 -20,9 +20,9 @@@const TrialMaxReplies = 10func TellPlanHandler(w http.ResponseWriter, r *http.Request) {- log.Println("Received request for TellPlanHandler")+ log.Println("Received request for TellPlanHandler", "ip:", host.Ip)- auth := authenticate(w, r, true)+ auth := Authenticate(w, r, true)if auth == nil {return}@@@ -62,17 -62,42 +62,27 @@@return}- if os.Getenv("IS_CLOUD") != "" {- user, err := db.GetUser(auth.User.Id)-- if err != nil {- log.Printf("Error getting user: %v\n", err)- http.Error(w, "Error getting user: "+err.Error(), http.StatusInternalServerError)- return- }-- if user.IsTrial {- if plan.TotalReplies >= types.TrialMaxReplies {- writeApiError(w, shared.ApiError{- Type: shared.ApiErrorTypeTrialMessagesExceeded,- Status: http.StatusForbidden,- Msg: "Anonymous trial message limit exceeded",- TrialMessagesExceededError: &shared.TrialMessagesExceededError{- MaxReplies: types.TrialMaxReplies,- },- })- return- }- }+ err = hooks.ExecHook("will_tell_plan", hooks.HookParams{+ W: w,+ User: auth.User,+ Plan: plan,+ })+ if err != nil {+ return}- client := model.NewClient(requestBody.ApiKey)- err = modelPlan.Tell(client, plan, branch, auth, &requestBody)+ clients := initClients(+ initClientsParams{+ w: w,+ apiKey: requestBody.ApiKey,+ apiKeys: requestBody.ApiKeys,+ endpoint: requestBody.Endpoint,+ openAIBase: requestBody.OpenAIBase,+ openAIOrgId: requestBody.OpenAIOrgId,+ plan: plan,+ },+ )+ err = modelPlan.Tell(clients, plan, branch, auth, &requestBody)if err != nil {log.Printf("Error telling plan: %v\n", err)@@@ -88,8 -113,8 +98,8 @@@}func BuildPlanHandler(w http.ResponseWriter, r *http.Request) {- log.Println("Received request for BuildPlanHandler")+ log.Println("Received request for BuildPlanHandler", "ip:", host.Ip)- auth := authenticate(w, r, true)+ auth := Authenticate(w, r, true)if auth == nil {return}diff --cc app/server/model/plan/tell_exec.goindex 15b6a8f5,8a99cbce..f404252a--- a/app/server/model/plan/tell_exec.go+++ b/app/server/model/plan/tell_exec.go@@@ -58,15 -62,26 +62,20 @@@ func execTellPlanactive := GetActivePlan(plan.Id, branch)+ if active == nil {+ log.Printf("execTellPlan: Active plan not found for plan ID %s on branch %s\n", plan.Id, branch)+ return+ }+- if os.Getenv("IS_CLOUD") != "" &&- missingFileResponse == "" {- log.Println("execTellPlan: IS_CLOUD environment variable is set")- if auth.User.IsTrial {- if plan.TotalReplies >= types.TrialMaxReplies {- active.StreamDoneCh <- &shared.ApiError{- Type: shared.ApiErrorTypeTrialMessagesExceeded,- Status: http.StatusForbidden,- Msg: "Anonymous trial message limit exceeded",- TrialMessagesExceededError: &shared.TrialMessagesExceededError{- MaxReplies: types.TrialMaxReplies,- },- }- return- }+ if missingFileResponse == "" {+ err := hooks.ExecHook("will_exec_plan", hooks.HookParams{+ User: auth.User,+ Plan: plan,+ StreamDoneCh: active.StreamDoneCh,+ })++ if err != nil {+ return}}diff --cc app/server/routes.goindex e1746700,b15a6476..5b4819da--- a/app/server/routes.go+++ b/app/server/routes.go@@@ -12,14 -13,29 +13,27 @@@ func routes() *mux.Routerr := mux.NewRouter()r.HandleFunc("/health", func(w http.ResponseWriter, r *http.Request) {- fmt.Fprintf(w, "OK")+ fmt.Fprint(w, "OK")+ })++ r.HandleFunc("/version", func(w http.ResponseWriter, r *http.Request) {+ // get version from version.txt+ bytes, err := os.ReadFile("version.txt")++ if err != nil {+ http.Error(w, "Error getting version", http.StatusInternalServerError)+ return+ }++ fmt.Fprint(w, string(bytes))})- r.HandleFunc("/accounts/start_trial", handlers.StartTrialHandler).Methods("POST")r.HandleFunc("/accounts/email_verifications", handlers.CreateEmailVerificationHandler).Methods("POST")r.HandleFunc("/accounts/sign_in", handlers.SignInHandler).Methods("POST")r.HandleFunc("/accounts/sign_out", handlers.SignOutHandler).Methods("POST")r.HandleFunc("/accounts", handlers.CreateAccountHandler).Methods("POST")- r.HandleFunc("/accounts/convert_trial", handlers.ConvertTrialHandler).Methods("POST")+ r.HandleFunc("/orgs/session", handlers.GetOrgSessionHandler).Methods("GET")r.HandleFunc("/orgs", handlers.ListOrgsHandler).Methods("GET")r.HandleFunc("/orgs", handlers.CreateOrgHandler).Methods("POST")diff --cc app/server/setup/setup.goindex 239b7aa8,00000000..d876ce1bmode 100644,000000..100644--- a/app/server/setup/setup.go+++ b/app/server/setup/setup.go@@@ -1,75 -1,0 +1,79 @@@+package setup++import (+ "fmt"+ "log"+ "net/http"+ "os"+ "os/signal"+ "plandex-server/db"+ "plandex-server/host"+ "plandex-server/model/plan"+ "plandex-server/routes"+ "syscall"+ "time"++ "github.com/gorilla/mux"+)++func MustLoadIp() {+ err := host.LoadIp()+ if err != nil {+ log.Fatal("Error loading IP: ", err)+ }+}++func MustInitDb() {+ err := db.Connect()+ if err != nil {+ log.Fatal("Error initializing database: ", err)+ }++ err = db.MigrationsUp()+ if err != nil {+ log.Fatal("Error running migrations: ", err)+ }+}++func StartServer(r *mux.Router) {++ if os.Getenv("GOENV") == "development" {++ log.Println("In development mode.")++ }+++ // Get externalPort from the environment variable or default to 8088+ externalPort := os.Getenv("PORT")+ if externalPort == "" {+ externalPort = "8088"+ }++ routes.AddRoutes(r)+ go startServer(externalPort, r)+ log.Println("Started server on port " + externalPort)++ sigTermChan := make(chan os.Signal, 1)+ signal.Notify(sigTermChan, syscall.SIGTERM)++ go func() {+ <-sigTermChan++ for {+ l := plan.NumActivePlans()+ if l == 0 {+ break+ }+ log.Printf("Waiting for %d active plans to finish...\n", l)+ time.Sleep(1 * time.Second)+ }++ os.Exit(0)+ }()++ select {}+}++func startServer(port string, routes *mux.Router) {+ err := http.ListenAndServe(fmt.Sprintf(":%s", port), routes)+ if err != nil {+ log.Fatalf("Failed to start server on port %s: %v", port, err)+ }+}