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
hooks for credit checks and deductions in integrated models mode, adapt CLI to new trial
Dane Schneider47c8d0353abd
diff --git a/app/cli/api/methods.go b/app/cli/api/methods.goindex 959a9d0a..f2fbd684 100644--- a/app/cli/api/methods.go+++ b/app/cli/api/methods.go@@ -13,10 +13,15 @@ import ("github.com/plandex/plandex/shared")-func (a *Api) StartTrial() (*shared.StartTrialResponse, *shared.ApiError) {+func (a *Api) StartTrial(req shared.StartTrialRequest) (*shared.StartTrialResponse, *shared.ApiError) {serverUrl := cloudApiHost + "/accounts/start_trial"- resp, err := unauthenticatedClient.Post(serverUrl, "application/json", nil)+ reqBytes, err := json.Marshal(req)+ if err != nil {+ return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error marshalling request: %v", err)}+ }++ resp, err := unauthenticatedClient.Post(serverUrl, "application/json", bytes.NewBuffer(reqBytes))if err != nil {return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error sending request: %v", err)}}diff --git a/app/cli/auth/account.go b/app/cli/auth/account.goindex 955740a9..b4038b2c 100644--- a/app/cli/auth/account.go+++ b/app/cli/auth/account.go@@ -10,7 +10,7 @@ import ()const (- AuthFreeTrialOption = "Start an anonymous trial on Plandex Cloud (no email required)"+ AuthFreeTrialOption = "Start a trial on Plandex Cloud"AuthAccountOption = "Sign in, accept an invite, or create an account")@@ -186,9 +186,6 @@ func promptSignInNewAccount() error {}}- fmt.Printf("✅ Signed in as %s | Org: %s\n", color.New(color.Bold, term.ColorHiGreen).Sprintf("<%s> %s", Current.UserName, Current.Email), color.New(term.ColorHiCyan).Sprint(Current.OrgName))- fmt.Println()-term.PrintCmds("", "new", "plans")return nil@@ -315,5 +312,8 @@ func createAccount(email, pin, host string) error {return fmt.Errorf("error writing auth: %v", err)}+ fmt.Printf("✅ Signed in as %s | Org: %s\n", color.New(color.Bold, term.ColorHiGreen).Sprintf("<%s> %s", Current.UserName, Current.Email), color.New(term.ColorHiCyan).Sprint(Current.OrgName))+ fmt.Println()+return nil}diff --git a/app/cli/auth/trial.go b/app/cli/auth/trial.goindex c6611564..7da1ee2d 100644--- a/app/cli/auth/trial.go+++ b/app/cli/auth/trial.go@@ -5,6 +5,7 @@ import ("plandex/term""plandex/types"+ "github.com/fatih/color""github.com/plandex/plandex/shared")@@ -77,27 +78,93 @@ func ConvertTrial() error {return nil}+const (+ TrialIntegratedModelsOption = "Integrated Models Mode\n • no OpenAI (or other provider) account required\n • Use OpenAI, Anthropic, and open source models\n • start with $5 trial"+ TrialBYOModelsOption = "BYO API Key Mode\n • requires OpenAI account (or another provider) and API key\n • start with free trial"+)+func startTrial() error {- term.StartSpinner("🌟 Starting trial...")+ fmt.Printf("\n☁️ There are %s to use Plandex Cloud.\n\nYou can use %s to purchase LLM credits from Plandex directly, avoiding rate limits and the need to manage model provider accounts and API keys.\n\nOr you can use %s to use Plandex with your own account and API key from OpenAI or another model provider.\n\n",+ color.New(color.Bold).Sprint("two ways"),+ color.New(color.Bold, term.ColorHiYellow).Sprint("Integrated Models Mode"),+ color.New(color.Bold, term.ColorHiYellow).Sprint("BYO API Key Mode"),+ )++ selected, err := term.SelectFromList("Which do you want to start with?", []string{TrialIntegratedModelsOption, TrialBYOModelsOption})++ if err != nil {+ return fmt.Errorf("error selecting integrated models option: %v", err)+ }++ integratedModelsMode := selected == TrialIntegratedModelsOption++ email, err := term.GetRequiredUserStringInput("Your email:")++ if err != nil {+ return fmt.Errorf("error prompting email: %v", err)+ }++ hasAccount, pin, err := verifyEmail(email, "")++ if err != nil {+ return fmt.Errorf("error verifying email: %v", err)+ }++ if hasAccount {+ term.OutputErrorAndExit("Can't convert a trial into an account that already exists")+ }++ name, err := term.GetUserStringInput("Your name:")++ if err != nil {+ return fmt.Errorf("error prompting name: %v", err)+ }++ orgName, err := term.GetRequiredUserStringInput("Org name:")++ if err != nil {+ return fmt.Errorf("error prompting org name: %v", err)+ }- res, apiErr := apiClient.StartTrial()+ autoAddDomainUsers, err := promptAutoAddUsersIfValid(email)+ if err != nil {+ return fmt.Errorf("error prompting auto add domain users: %v", err)+ }++ term.StartSpinner("🌟 Starting trial...")+ res, apiErr := apiClient.StartTrial(shared.StartTrialRequest{+ Account: shared.CreateAccountRequest{+ Email: email,+ Pin: pin,+ UserName: name,+ },+ Org: shared.CreateCloudOrgRequest{+ CreateOrgRequest: shared.CreateOrgRequest{+ Name: orgName,+ AutoAddDomainUsers: autoAddDomainUsers,+ },+ IntegratedModelsMode: integratedModelsMode,+ },+ })term.StopSpinner()+if apiErr != nil {- return fmt.Errorf("error starting trial: %v", apiErr.Msg)+ return fmt.Errorf("error starting trial: %v", apiErr)}- err := setAuth(&types.ClientAuth{+ err = setAuth(&types.ClientAuth{ClientAccount: types.ClientAccount{- Email: res.Email,+ Email: email,UserId: res.UserId,- UserName: res.UserName,+ UserName: name,Token: res.Token,- IsTrial: true,IsCloud: true,+ IsTrial: true,},- OrgId: res.OrgId,- OrgName: res.OrgName,+ OrgId: res.OrgId,+ OrgName: orgName,+ IntegratedModelsMode: integratedModelsMode,})if err != nil {@@ -106,3 +173,34 @@ func startTrial() error {return nil}++// func startTrial() error {++// term.StartSpinner("🌟 Starting trial...")++// res, apiErr := apiClient.StartTrial()++// term.StopSpinner()+// if apiErr != nil {+// return fmt.Errorf("error starting trial: %v", apiErr.Msg)+// }++// err := setAuth(&types.ClientAuth{+// ClientAccount: types.ClientAccount{+// Email: res.Email,+// UserId: res.UserId,+// UserName: res.UserName,+// Token: res.Token,+// IsTrial: true,+// IsCloud: true,+// },+// OrgId: res.OrgId,+// OrgName: res.OrgName,+// })++// if err != nil {+// return fmt.Errorf("error setting auth: %v", err)+// }++// return nil+// }diff --git a/app/cli/types/api.go b/app/cli/types/api.goindex 313776c5..47bd4e29 100644--- a/app/cli/types/api.go+++ b/app/cli/types/api.go@@ -12,7 +12,7 @@ type OnStreamPlanParams struct {type OnStreamPlan func(params OnStreamPlanParams)type ApiClient interface {- StartTrial() (*shared.StartTrialResponse, *shared.ApiError)+ StartTrial(req shared.StartTrialRequest) (*shared.StartTrialResponse, *shared.ApiError)ConvertTrial(req shared.ConvertTrialRequest) (*shared.SessionResponse, *shared.ApiError)CreateEmailVerification(email, customHost, userId string) (*shared.CreateEmailVerificationResponse, *shared.ApiError)diff --git a/app/cli/types/types.go b/app/cli/types/types.goindex 7b2ddb90..65567acb 100644--- a/app/cli/types/types.go+++ b/app/cli/types/types.go@@ -17,8 +17,9 @@ type ClientAccount struct {type ClientAuth struct {ClientAccount- OrgId string `json:"orgId"`- OrgName string `json:"orgName"`+ OrgId string `json:"orgId"`+ OrgName string `json:"orgName"`+ IntegratedModelsMode bool `json:"integratedModelsMode"`}type LoadContextParams struct {diff --git a/app/server/handlers/accounts.go b/app/server/handlers/accounts.goindex 7efd16bd..2f533ad1 100644--- a/app/server/handlers/accounts.go+++ b/app/server/handlers/accounts.go@@ -72,12 +72,12 @@ func CreateAccountHandler(w http.ResponseWriter, r *http.Request) {token := res.TokenorgId := res.OrgId- err = hooks.ExecHook(hooks.CreateAccount, hooks.HookParams{- W: w,+ apiErr := hooks.ExecHook(hooks.CreateAccount, hooks.HookParams{User: user,OrgId: orgId,})- if err != nil {+ if apiErr != nil {+ WriteApiError(w, *apiErr)return}diff --git a/app/server/handlers/context_helper.go b/app/server/handlers/context_helper.goindex 3c54b232..d9d69241 100644--- a/app/server/handlers/context_helper.go+++ b/app/server/handlers/context_helper.go@@ -65,7 +65,7 @@ func loadContexts(w http.ResponseWriter, r *http.Request, auth *types.ServerAuthnum++go func(context *shared.LoadContextParams) {- name, err := model.GenPipedDataName(client, settings.ModelPack.Namer, context.Body)+ name, err := model.GenPipedDataName(auth, plan, settings, client, context.Body)if err != nil {errCh <- fmt.Errorf("error generating name for piped data: %v", err)@@ -78,7 +78,7 @@ func loadContexts(w http.ResponseWriter, r *http.Request, auth *types.ServerAuthnum++go func(context *shared.LoadContextParams) {- name, err := model.GenNoteName(client, settings.ModelPack.Namer, context.Body)+ name, err := model.GenNoteName(auth, plan, settings, client, context.Body)if err != nil {errCh <- fmt.Errorf("error generating name for note: %v", err)diff --git a/app/server/handlers/plans_changes.go b/app/server/handlers/plans_changes.goindex e914c3d7..bbc65362 100644--- a/app/server/handlers/plans_changes.go+++ b/app/server/handlers/plans_changes.go@@ -142,7 +142,7 @@ func ApplyPlanHandler(w http.ResponseWriter, r *http.Request) {envVar := settings.ModelPack.CommitMsg.BaseModelConfig.ApiKeyEnvVarclient := clients[envVar]- s, err := modelPlan.GenCommitMsgForPendingResults(client, settings.ModelPack.CommitMsg, currentPlan, r.Context())+ s, err := modelPlan.GenCommitMsgForPendingResults(auth, plan, client, settings, currentPlan, r.Context())if err != nil {log.Printf("Error generating commit message: %v\n", err)diff --git a/app/server/handlers/plans_crud.go b/app/server/handlers/plans_crud.goindex c89e8af2..1c9c30f3 100644--- a/app/server/handlers/plans_crud.go+++ b/app/server/handlers/plans_crud.go@@ -40,8 +40,9 @@ func CreatePlanHandler(w http.ResponseWriter, r *http.Request) {return}- err := hooks.ExecHook(hooks.WillCreatePlan, hooks.HookParams{W: w, User: auth.User})- if err != nil {+ apiErr := hooks.ExecHook(hooks.WillCreatePlan, hooks.HookParams{User: auth.User})+ if apiErr != nil {+ WriteApiError(w, *apiErr)return}diff --git a/app/server/handlers/plans_exec.go b/app/server/handlers/plans_exec.goindex 4b6b17f4..bf4c97cd 100644--- a/app/server/handlers/plans_exec.go+++ b/app/server/handlers/plans_exec.go@@ -62,12 +62,12 @@ func TellPlanHandler(w http.ResponseWriter, r *http.Request) {return}- err = hooks.ExecHook(hooks.WillTellPlan, hooks.HookParams{- W: w,+ apiErr := hooks.ExecHook(hooks.WillTellPlan, hooks.HookParams{User: auth.User,Plan: plan,})- if err != nil {+ if apiErr != nil {+ WriteApiError(w, *apiErr)return}diff --git a/app/server/hooks/hooks.go b/app/server/hooks/hooks.goindex d17df937..fac1fb62 100644--- a/app/server/hooks/hooks.go+++ b/app/server/hooks/hooks.go@@ -1,7 +1,6 @@package hooksimport (- "net/http""plandex-server/db""github.com/plandex/plandex/shared"@@ -16,33 +15,32 @@ const (DidSendModelRequest = "did_send_model_request")-type WillExecPlanParams struct {- StreamDoneCh chan *shared.ApiError-}-type WillSendModelRequestParams struct {- StreamDoneCh chan *shared.ApiError- TotalRequestTokens int- ModelName string+ InputTokens int+ OutputTokens int+ ModelName string}type DidSendModelRequestParams struct {- InputTokens int- ModelName string+ InputTokens int+ OutputTokens int+ ModelName string+ ModelProvider shared.ModelProvider+ ModelRole shared.ModelRole+ ModelPackName string+ Purpose string}type HookParams struct {- W http.ResponseWriterUser *db.UserOrgId stringPlan *db.Plan- WillExecPlanParams *WillExecPlanParamsWillSendModelRequestParams *WillSendModelRequestParamsDidSendModelRequestParams *DidSendModelRequestParams}-type Hook func(params HookParams) error+type Hook func(params HookParams) *shared.ApiErrorvar hooks = make(map[string]Hook)@@ -50,7 +48,7 @@ func RegisterHook(name string, hook Hook) {hooks[name] = hook}-func ExecHook(name string, params HookParams) error {+func ExecHook(name string, params HookParams) *shared.ApiError {hook, ok := hooks[name]if !ok {return nildiff --git a/app/server/model/client.go b/app/server/model/client.goindex 31d613ab..661f339f 100644--- a/app/server/model/client.go+++ b/app/server/model/client.go@@ -12,6 +12,7 @@ import ()const OPENAI_STREAM_CHUNK_TIMEOUT = time.Duration(30) * time.Second+const OPENAI_USAGE_CHUNK_TIMEOUT = time.Duration(5) * time.Secondfunc InitClients(apiKeys map[string]string, endpointsByApiKeyEnvVar map[string]string, openAIEndpoint, orgId string) map[string]*openai.Client {clients := make(map[string]*openai.Client)diff --git a/app/server/model/name.go b/app/server/model/name.goindex 527f77fb..5a23d874 100644--- a/app/server/model/name.go+++ b/app/server/model/name.go@@ -5,17 +5,38 @@ import ("encoding/json""fmt""log"+ "plandex-server/db"+ "plandex-server/hooks""plandex-server/model/prompts"+ "plandex-server/types""github.com/plandex/plandex/shared""github.com/sashabaranov/go-openai")-func GenPlanName(client *openai.Client, config shared.ModelRoleConfig, planContent string) (string, error) {+func GenPlanName(+ auth *types.ServerAuth,+ plan *db.Plan,+ settings *shared.PlanSettings,+ client *openai.Client,+ planContent string,+ ctx context.Context,+) (string, error) {+ config := settings.ModelPack.Namer+ content := prompts.GetPlanNamePrompt(planContent)++ contentTokens, err := shared.GetNumTokens(content)++ if err != nil {+ return "", fmt.Errorf("error getting num tokens for content: %v", err)+ }++ numTokens := prompts.ExtraTokensPerRequest + prompts.ExtraTokensPerMessage + contentTokens+messages := []openai.ChatCompletionMessage{{Role: openai.ChatMessageRoleSystem,- Content: prompts.GetPlanNamePrompt(planContent),+ Content: content,},}@@ -24,9 +45,23 @@ func GenPlanName(client *openai.Client, config shared.ModelRoleConfig, planConteresponseFormat = &openai.ChatCompletionResponseFormat{Type: "json_object"}}+ apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{+ User: auth.User,+ OrgId: auth.OrgId,+ Plan: plan,+ WillSendModelRequestParams: &hooks.WillSendModelRequestParams{+ InputTokens: numTokens,+ OutputTokens: shared.AvailableModelsByName[config.BaseModelConfig.ModelName].DefaultReservedOutputTokens,+ ModelName: config.BaseModelConfig.ModelName,+ },+ })+ if apiErr != nil {+ return "", err+ }+resp, err := CreateChatCompletionWithRetries(client,- context.Background(),+ ctx,openai.ChatCompletionRequest{Model: config.BaseModelConfig.ModelName,Tools: []openai.Tool{@@ -65,6 +100,35 @@ func GenPlanName(client *openai.Client, config shared.ModelRoleConfig, planConte}}+ var inputTokens int+ var outputTokens int+ if resp.Usage.CompletionTokens > 0 {+ inputTokens = resp.Usage.PromptTokens+ outputTokens = resp.Usage.CompletionTokens+ } else {+ inputTokens = numTokens+ outputTokens, err = shared.GetNumTokens(res)++ if err != nil {+ return "", fmt.Errorf("error getting num tokens for content: %v", err)+ }+ }++ apiErr = hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{+ User: auth.User,+ OrgId: auth.OrgId,+ Plan: plan,+ DidSendModelRequestParams: &hooks.DidSendModelRequestParams{+ InputTokens: inputTokens,+ OutputTokens: outputTokens,+ ModelName: config.BaseModelConfig.ModelName,+ ModelProvider: config.BaseModelConfig.Provider,+ ModelPackName: settings.ModelPack.Name,+ ModelRole: shared.ModelRolePlanSummary,+ Purpose: "Generated plan name",+ },+ })+if res == "" {fmt.Println("no namePlan function call found in response")return "", err@@ -82,19 +146,51 @@ func GenPlanName(client *openai.Client, config shared.ModelRoleConfig, planConte}-func GenPipedDataName(client *openai.Client, config shared.ModelRoleConfig, pipedContent string) (string, error) {+func GenPipedDataName(+ auth *types.ServerAuth,+ plan *db.Plan,+ settings *shared.PlanSettings,+ client *openai.Client,+ pipedContent string,+) (string, error) {+ config := settings.ModelPack.Namer++ content := prompts.GetPipedDataNamePrompt(pipedContent)++ contentTokens, err := shared.GetNumTokens(content)++ if err != nil {+ return "", fmt.Errorf("error getting num tokens for content: %v", err)+ }+messages := []openai.ChatCompletionMessage{{Role: openai.ChatMessageRoleSystem,- Content: prompts.GetPipedDataNamePrompt(pipedContent),+ Content: content,},}+ numTokens := prompts.ExtraTokensPerRequest + prompts.ExtraTokensPerMessage + contentTokens+var responseFormat *openai.ChatCompletionResponseFormatif config.BaseModelConfig.HasJsonResponseMode {responseFormat = &openai.ChatCompletionResponseFormat{Type: "json_object"}}+ apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{+ User: auth.User,+ OrgId: auth.OrgId,+ Plan: plan,+ WillSendModelRequestParams: &hooks.WillSendModelRequestParams{+ InputTokens: numTokens,+ OutputTokens: shared.AvailableModelsByName[config.BaseModelConfig.ModelName].DefaultReservedOutputTokens,+ ModelName: config.BaseModelConfig.ModelName,+ },+ })+ if apiErr != nil {+ return "", err+ }+log.Println("calling piped data name model")// log.Printf("model: %s\n", config.BaseModelConfig.ModelName)// log.Printf("temperature: %f\n", config.Temperature)@@ -144,6 +240,39 @@ func GenPipedDataName(client *openai.Client, config shared.ModelRoleConfig, pipe}}+ var inputTokens int+ var outputTokens int+ if resp.Usage.CompletionTokens > 0 {+ inputTokens = resp.Usage.PromptTokens+ outputTokens = resp.Usage.CompletionTokens+ } else {+ inputTokens = numTokens+ outputTokens, err = shared.GetNumTokens(res)++ if err != nil {+ return "", fmt.Errorf("error getting num tokens for content: %v", err)+ }+ }++ apiErr = hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{+ User: auth.User,+ OrgId: auth.OrgId,+ Plan: plan,+ DidSendModelRequestParams: &hooks.DidSendModelRequestParams{+ InputTokens: inputTokens,+ OutputTokens: outputTokens,+ ModelName: config.BaseModelConfig.ModelName,+ ModelProvider: config.BaseModelConfig.Provider,+ ModelPackName: settings.ModelPack.Name,+ ModelRole: shared.ModelRolePlanSummary,+ Purpose: "Generated name for data piped into context",+ },+ })++ if apiErr != nil {+ return "", fmt.Errorf("error executing hook: %v", apiErr)+ }+if res == "" {fmt.Println("no namePipedData function call found in response")return "", err@@ -161,11 +290,29 @@ func GenPipedDataName(client *openai.Client, config shared.ModelRoleConfig, pipe}-func GenNoteName(client *openai.Client, config shared.ModelRoleConfig, note string) (string, error) {+func GenNoteName(+ auth *types.ServerAuth,+ plan *db.Plan,+ settings *shared.PlanSettings,+ client *openai.Client,+ note string,+) (string, error) {+ config := settings.ModelPack.Namer++ content := prompts.GetNoteNamePrompt(note)++ contentTokens, err := shared.GetNumTokens(content)++ if err != nil {+ return "", fmt.Errorf("error getting num tokens for content: %v", err)+ }++ numTokens := prompts.ExtraTokensPerRequest + prompts.ExtraTokensPerMessage + contentTokens+messages := []openai.ChatCompletionMessage{{Role: openai.ChatMessageRoleSystem,- Content: prompts.GetNoteNamePrompt(note),+ Content: content,},}@@ -174,6 +321,20 @@ func GenNoteName(client *openai.Client, config shared.ModelRoleConfig, note striresponseFormat = &openai.ChatCompletionResponseFormat{Type: "json_object"}}+ apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{+ User: auth.User,+ OrgId: auth.OrgId,+ Plan: plan,+ WillSendModelRequestParams: &hooks.WillSendModelRequestParams{+ InputTokens: numTokens,+ OutputTokens: shared.AvailableModelsByName[config.BaseModelConfig.ModelName].DefaultReservedOutputTokens,+ ModelName: config.BaseModelConfig.ModelName,+ },+ })+ if apiErr != nil {+ return "", err+ }+log.Println("calling piped data name model")// log.Printf("model: %s\n", config.BaseModelConfig.ModelName)// log.Printf("temperature: %f\n", config.Temperature)@@ -223,6 +384,39 @@ func GenNoteName(client *openai.Client, config shared.ModelRoleConfig, note stri}}+ var inputTokens int+ var outputTokens int+ if resp.Usage.CompletionTokens > 0 {+ inputTokens = resp.Usage.PromptTokens+ outputTokens = resp.Usage.CompletionTokens+ } else {+ inputTokens = numTokens+ outputTokens, err = shared.GetNumTokens(res)++ if err != nil {+ return "", fmt.Errorf("error getting num tokens for content: %v", err)+ }+ }++ apiErr = hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{+ User: auth.User,+ OrgId: auth.OrgId,+ Plan: plan,+ DidSendModelRequestParams: &hooks.DidSendModelRequestParams{+ InputTokens: inputTokens,+ OutputTokens: outputTokens,+ ModelName: config.BaseModelConfig.ModelName,+ ModelProvider: config.BaseModelConfig.Provider,+ ModelPackName: settings.ModelPack.Name,+ ModelRole: shared.ModelRolePlanSummary,+ Purpose: "Generated name for note added to context",+ },+ })++ if apiErr != nil {+ return "", fmt.Errorf("error executing hook: %v", apiErr)+ }+if res == "" {fmt.Println("no nameNote function call found in response")return "", errdiff --git a/app/server/model/plan/build_exec.go b/app/server/model/plan/build_exec.goindex 3750751d..dd0c2f93 100644--- a/app/server/model/plan/build_exec.go+++ b/app/server/model/plan/build_exec.go@@ -5,6 +5,7 @@ import ("fmt""log""plandex-server/db"+ "plandex-server/hooks""plandex-server/model""plandex-server/model/prompts""plandex-server/syntax"@@ -279,6 +280,7 @@ func (fileState *activeBuildStreamFileState) buildFile() {}func (fileState *activeBuildStreamFileState) buildFileLineNums() {+ auth := fileState.authfilePath := fileState.filePathactiveBuild := fileState.activeBuildclients := fileState.clients@@ -308,6 +310,33 @@ func (fileState *activeBuildStreamFileState) buildFileLineNums() {},}+ promptTokens, err := shared.GetNumTokens(sysPrompt)++ if err != nil {+ log.Printf("Error getting num tokens for prompt: %v\n", err)+ fileState.onBuildFileError(fmt.Errorf("error getting num tokens for prompt: %v", err))+ return+ }++ inputTokens := prompts.ExtraTokensPerRequest + prompts.ExtraTokensPerMessage + promptTokens++ fileState.inputTokens = inputTokens++ apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{+ User: auth.User,+ OrgId: auth.OrgId,+ Plan: fileState.plan,+ WillSendModelRequestParams: &hooks.WillSendModelRequestParams{+ InputTokens: inputTokens,+ OutputTokens: shared.AvailableModelsByName[fileState.settings.ModelPack.Builder.BaseModelConfig.ModelName].DefaultReservedOutputTokens,+ ModelName: fileState.settings.ModelPack.Builder.BaseModelConfig.ModelName,+ },+ })+ if apiErr != nil {+ activePlan.StreamDoneCh <- apiErr+ return+ }+log.Println("buildFileLineNums - calling model for file: " + filePath)// for _, msg := range fileMessages {diff --git a/app/server/model/plan/build_fix.go b/app/server/model/plan/build_fix.goindex 36a67401..63d12e26 100644--- a/app/server/model/plan/build_fix.go+++ b/app/server/model/plan/build_fix.go@@ -4,6 +4,7 @@ import ("encoding/json""fmt""log"+ "plandex-server/hooks""plandex-server/model""plandex-server/model/prompts""plandex-server/types"@@ -14,6 +15,7 @@ import ()func (fileState *activeBuildStreamFileState) fixFileLineNums() {+ auth := fileState.authfilePath := fileState.filePathactiveBuild := fileState.activeBuildclients := fileState.clients@@ -61,6 +63,33 @@ func (fileState *activeBuildStreamFileState) fixFileLineNums() {},}+ promptTokens, err := shared.GetNumTokens(sysPrompt)++ if err != nil {+ log.Printf("Error getting num tokens for prompt: %v\n", err)+ fileState.onBuildFileError(fmt.Errorf("error getting num tokens for prompt: %v", err))+ return+ }++ inputTokens := prompts.ExtraTokensPerRequest + prompts.ExtraTokensPerMessage + promptTokens++ fileState.inputTokens = inputTokens++ apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{+ User: auth.User,+ OrgId: auth.OrgId,+ Plan: fileState.plan,+ WillSendModelRequestParams: &hooks.WillSendModelRequestParams{+ InputTokens: inputTokens,+ OutputTokens: shared.AvailableModelsByName[fileState.settings.ModelPack.GetAutoFix().BaseModelConfig.ModelName].DefaultReservedOutputTokens,+ ModelName: fileState.settings.ModelPack.GetAutoFix().BaseModelConfig.ModelName,+ },+ })+ if apiErr != nil {+ activePlan.StreamDoneCh <- apiErr+ return+ }+log.Println("fixFileLineNums - calling model for file: " + filePath)// for _, msg := range fileMessages {diff --git a/app/server/model/plan/build_fix_stream.go b/app/server/model/plan/build_fix_stream.goindex fc24ae98..20f88620 100644--- a/app/server/model/plan/build_fix_stream.go+++ b/app/server/model/plan/build_fix_stream.go@@ -6,16 +6,19 @@ import ("fmt""log""math"+ "plandex-server/hooks""plandex-server/model""plandex-server/types""strings""time"+ "github.com/davecgh/go-spew/spew""github.com/plandex/plandex/shared""github.com/sashabaranov/go-openai")func (fileState *activeBuildStreamFileState) listenStreamFixChanges(stream *openai.ChatCompletionStream) {+ auth := fileState.authfilePath := fileState.filePathplanId := fileState.plan.Idbranch := fileState.branch@@ -33,13 +36,57 @@ func (fileState *activeBuildStreamFileState) listenStreamFixChanges(stream *opentimer := time.NewTimer(model.OPENAI_STREAM_CHUNK_TIMEOUT)defer timer.Stop()+ streamFinished := false++ execHookOnStop := func(sendStreamErr bool) {+ apiErr := hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{+ User: auth.User,+ OrgId: auth.OrgId,+ Plan: fileState.plan,+ DidSendModelRequestParams: &hooks.DidSendModelRequestParams{+ InputTokens: fileState.inputTokens,+ OutputTokens: fileState.activeBuild.FixBufferTokens,+ ModelName: fileState.settings.ModelPack.GetAutoFix().BaseModelConfig.ModelName,+ ModelProvider: fileState.settings.ModelPack.GetAutoFix().BaseModelConfig.Provider,+ ModelPackName: fileState.settings.ModelPack.Name,+ ModelRole: shared.ModelRoleAutoFix,+ Purpose: "Generated file update for auto-fix",+ },+ })++ if apiErr != nil {+ log.Printf("Error executing did send model request hook after cancel or error: %v\n", apiErr)++ if sendStreamErr {+ activePlan := GetActivePlan(planId, branch)++ if activePlan == nil {+ log.Printf("listenStreamFixChanges - Active plan not found for plan ID %s on branch %s\n", planId, branch)+ return+ }++ activePlan.StreamDoneCh <- apiErr+ }+ }+ }+for {select {case <-activePlan.Ctx.Done():// The main context was canceled (not the timer)+ if !streamFinished {+ execHookOnStop(false)+ }returncase <-timer.C:- // Timer triggered because no new chunk was received in time+ log.Println("\nFix: stream timed out due to inactivity")++ execHookOnStop(true)+ if streamFinished {+ log.Println("\nFix stream finished-timed out waiting for usage chunk")+ return+ }+fileState.fixRetryOrAbort(fmt.Errorf("listenStreamFixChanges - stream timeout due to inactivity for file '%s'", filePath))returndefault:@@ -53,6 +100,7 @@ func (fileState *activeBuildStreamFileState) listenStreamFixChanges(stream *opentimer.Reset(model.OPENAI_STREAM_CHUNK_TIMEOUT)} else {log.Printf("listenStreamFixChanges - File %s: Error receiving stream chunk: %v\n", filePath, err)+ execHookOnStop(true)if err == context.Canceled {log.Printf("listenStreamFixChanges - File %s: Stream canceled\n", filePath)@@ -64,12 +112,49 @@ func (fileState *activeBuildStreamFileState) listenStreamFixChanges(stream *open}if len(response.Choices) == 0 {+ if response.Usage != nil {+ log.Println("Fix stream usage:")+ spew.Dump(response.Usage)++ apiErr := hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{+ User: auth.User,+ OrgId: auth.OrgId,+ Plan: fileState.plan,+ DidSendModelRequestParams: &hooks.DidSendModelRequestParams{+ InputTokens: response.Usage.PromptTokens,+ OutputTokens: response.Usage.CompletionTokens,+ ModelName: fileState.settings.ModelPack.GetAutoFix().BaseModelConfig.ModelName,+ ModelProvider: fileState.settings.ModelPack.GetAutoFix().BaseModelConfig.Provider,+ ModelPackName: fileState.settings.ModelPack.Name,+ ModelRole: shared.ModelRoleAutoFix,+ Purpose: "Generated file update for auto-fix",+ },+ })++ if apiErr != nil {+ log.Printf("Fix stream: error executing did send model request hook: %v\n", apiErr)++ // ensure the active plan is still available+ activePlan := GetActivePlan(planId, branch)++ if activePlan == nil {+ log.Printf(" Active plan not found for plan ID %s on branch %s\n", planId, branch)+ return+ }++ activePlan.StreamDoneCh <- apiErr+ }+ return+ }++ execHookOnStop(true)fileState.fixRetryOrAbort(fmt.Errorf("listenStreamFixChanges - stream error: no choices"))return}var content string- delta := response.Choices[0].Delta+ choice := response.Choices[0]+ delta := choice.Deltaif len(delta.ToolCalls) > 0 {content = delta.ToolCalls[0].Function.Arguments@@ -77,6 +162,7 @@ func (fileState *activeBuildStreamFileState) listenStreamFixChanges(stream *opentrimmed := strings.TrimSpace(content)if trimmed == "{%invalidjson%}" || trimmed == "``(no output)``````" {log.Println("listenStreamFixChanges - File", filePath+":", "%invalidjson%} token in streamed chunk")+ execHookOnStop(true)fileState.fixRetryOrAbort(fmt.Errorf("listenStreamFixChanges - invalid JSON in streamed chunk for file '%s'", filePath))return}@@ -107,6 +193,7 @@ func (fileState *activeBuildStreamFileState) listenStreamFixChanges(stream *openlog.Println("Buffer:")log.Println(fileState.activeBuild.FixBuffer)+ execHookOnStop(true)fileState.fixRetryOrAbort(fmt.Errorf("listenStreamFixChanges - stream buffer tokens too high for file '%s'", filePath))return}@@ -118,11 +205,20 @@ func (fileState *activeBuildStreamFileState) listenStreamFixChanges(stream *openif err == nil {log.Printf("listenStreamFixChanges - File %s: Parsed streamed replacements\n", filePath)// spew.Dump(streamed)+ streamFinished = true // Stream finished successfullyfileState.onFixResult(streamed)- return++ // Reset the timer for the usage chunk+ if !timer.Stop() {+ <-timer.C+ }+ timer.Reset(model.OPENAI_USAGE_CHUNK_TIMEOUT)++ continue // continue for usage chunk} else if len(delta.ToolCalls) == 0 {- log.Println("listenStreamFixChanges - Stream chunk missing function call.")+ log.Printf("listenStreamFixChanges - File %s: Stream chunk missing function call. Reason: %s\n", filePath, choice.FinishReason)+ execHookOnStop(true)fileState.fixRetryOrAbort(fmt.Errorf("listenStreamFixChanges - stream chunk missing function call. File: %s", filePath))return}diff --git a/app/server/model/plan/build_result.go b/app/server/model/plan/build_result.goindex 65e6d4a7..06a55d47 100644--- a/app/server/model/plan/build_result.go+++ b/app/server/model/plan/build_result.go@@ -230,7 +230,6 @@ func (fileState *activeBuildStreamFileState) onBuildResult(res types.ChangesWithsorted := []*shared.StreamedChangeWithLineNums{}- // Sort the streamed changes by start linefor _, change := range res.Changes {if change.HasChange {sorted = append(sorted, change)diff --git a/app/server/model/plan/build_state.go b/app/server/model/plan/build_state.goindex 392f766e..3ec6487b 100644--- a/app/server/model/plan/build_state.go+++ b/app/server/model/plan/build_state.go@@ -50,4 +50,6 @@ type activeBuildStreamFileState struct {syntaxErrors []stringisNewFile bool++ inputTokens int}diff --git a/app/server/model/plan/build_stream_line_nums.go b/app/server/model/plan/build_stream_line_nums.goindex 429305e5..fb9c10f4 100644--- a/app/server/model/plan/build_stream_line_nums.go+++ b/app/server/model/plan/build_stream_line_nums.go@@ -6,16 +6,19 @@ import ("fmt""log""math"+ "plandex-server/hooks""plandex-server/model""plandex-server/types""strings""time"+ "github.com/davecgh/go-spew/spew""github.com/plandex/plandex/shared""github.com/sashabaranov/go-openai")func (fileState *activeBuildStreamFileState) listenStreamChangesWithLineNums(stream *openai.ChatCompletionStream) {+ auth := fileState.authfilePath := fileState.filePathplanId := fileState.plan.Idbranch := fileState.branch@@ -33,13 +36,56 @@ func (fileState *activeBuildStreamFileState) listenStreamChangesWithLineNums(strtimer := time.NewTimer(model.OPENAI_STREAM_CHUNK_TIMEOUT)defer timer.Stop()+ streamFinished := false++ execHookOnStop := func(sendStreamErr bool) {+ apiErr := hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{+ User: auth.User,+ OrgId: auth.OrgId,+ Plan: fileState.plan,+ DidSendModelRequestParams: &hooks.DidSendModelRequestParams{+ InputTokens: fileState.inputTokens,+ OutputTokens: fileState.activeBuild.WithLineNumsBufferTokens,+ ModelName: fileState.settings.ModelPack.Builder.BaseModelConfig.ModelName,+ ModelProvider: fileState.settings.ModelPack.Builder.BaseModelConfig.Provider,+ ModelPackName: fileState.settings.ModelPack.Name,+ ModelRole: shared.ModelRoleBuilder,+ Purpose: "Generated file update",+ },+ })++ if apiErr != nil {+ log.Printf("Error executing did send model request hook after cancel or error: %v\n", apiErr)++ if sendStreamErr {+ activePlan := GetActivePlan(planId, branch)++ if activePlan == nil {+ log.Printf("listenStream - Active plan not found for plan ID %s on branch %s\n", planId, branch)+ return+ }++ activePlan.StreamDoneCh <- apiErr+ }+ }+ }+for {select {case <-activePlan.Ctx.Done():// The main context was canceled (not the timer)+ if !streamFinished {+ execHookOnStop(false)+ }returncase <-timer.C:- // Timer triggered because no new chunk was received in time+ log.Println("\nBuild: stream timed out due to inactivity")+ execHookOnStop(true)+ if streamFinished {+ log.Println("\nBuild stream finished-timed out waiting for usage chunk")+ return+ }+fileState.lineNumsRetryOrError(fmt.Errorf("listenStream - stream timeout due to inactivity for file '%s'", filePath))returndefault:@@ -53,6 +99,7 @@ func (fileState *activeBuildStreamFileState) listenStreamChangesWithLineNums(strtimer.Reset(model.OPENAI_STREAM_CHUNK_TIMEOUT)} else {log.Printf("listenStream - File %s: Error receiving stream chunk: %v\n", filePath, err)+ execHookOnStop(true)if err == context.Canceled {log.Printf("listenStream - File %s: Stream canceled\n", filePath)@@ -66,6 +113,42 @@ func (fileState *activeBuildStreamFileState) listenStreamChangesWithLineNums(str}if len(response.Choices) == 0 {+ if response.Usage != nil {+ log.Println("Build stream usage:")+ spew.Dump(response.Usage)++ apiErr := hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{+ User: auth.User,+ OrgId: auth.OrgId,+ Plan: fileState.plan,+ DidSendModelRequestParams: &hooks.DidSendModelRequestParams{+ InputTokens: response.Usage.PromptTokens,+ OutputTokens: response.Usage.CompletionTokens,+ ModelName: fileState.settings.ModelPack.Builder.BaseModelConfig.ModelName,+ ModelProvider: fileState.settings.ModelPack.Builder.BaseModelConfig.Provider,+ ModelPackName: fileState.settings.ModelPack.Name,+ ModelRole: shared.ModelRoleBuilder,+ Purpose: "Generated file update",+ },+ })++ if apiErr != nil {+ log.Printf("Build stream: error executing did send model request hook: %v\n", apiErr)++ // ensure the active plan is still available+ activePlan := GetActivePlan(planId, branch)++ if activePlan == nil {+ log.Printf(" Active plan not found for plan ID %s on branch %s\n", planId, branch)+ return+ }++ activePlan.StreamDoneCh <- apiErr+ }+ return+ }++ execHookOnStop(true)fileState.lineNumsRetryOrError(fmt.Errorf("listenStream - stream error: no choices"))return}@@ -80,8 +163,8 @@ func (fileState *activeBuildStreamFileState) listenStreamChangesWithLineNums(strtrimmed := strings.TrimSpace(content)if trimmed == "{%invalidjson%}" || trimmed == "``(no output)``````" {log.Println("File", filePath+":", "%invalidjson%} token in streamed chunk")+ execHookOnStop(true)fileState.lineNumsRetryOrError(fmt.Errorf("invalid JSON in streamed chunk for file '%s'", filePath))-return}@@ -111,6 +194,7 @@ func (fileState *activeBuildStreamFileState) listenStreamChangesWithLineNums(strlog.Println("Buffer:")log.Println(fileState.activeBuild.WithLineNumsBuffer)+ execHookOnStop(true)fileState.lineNumsRetryOrError(fmt.Errorf("listenStream - stream buffer tokens too high for file '%s'", filePath))return}@@ -123,8 +207,16 @@ func (fileState *activeBuildStreamFileState) listenStreamChangesWithLineNums(strlog.Printf("listenStream - File %s: Parsed streamed replacements\n", filePath)// spew.Dump(streamed)+ streamFinished = true // Stream finished successfullyfileState.onBuildResult(streamed)- return++ // Reset the timer for the usage chunk+ if !timer.Stop() {+ <-timer.C+ }+ timer.Reset(model.OPENAI_USAGE_CHUNK_TIMEOUT)++ continue // continue for usage chunk} else if len(delta.ToolCalls) == 0 {log.Println("listenStream - Stream chunk missing function call.")// log.Println(spew.Sdump(response))@@ -133,6 +225,7 @@ func (fileState *activeBuildStreamFileState) listenStreamChangesWithLineNums(str// log.Println("Current buffer:")// log.Println(fileState.activeBuild.WithLineNumsBuffer)+ execHookOnStop(true)fileState.lineNumsRetryOrError(fmt.Errorf("listenStream - stream chunk missing function call. Reason: %s, File: %s", choice.FinishReason, filePath))return}diff --git a/app/server/model/plan/build_verify.go b/app/server/model/plan/build_verify.goindex d0b9daaf..f6d3c006 100644--- a/app/server/model/plan/build_verify.go+++ b/app/server/model/plan/build_verify.go@@ -5,6 +5,7 @@ import ("fmt""log""plandex-server/db"+ "plandex-server/hooks""plandex-server/model""plandex-server/model/prompts""plandex-server/types"@@ -14,6 +15,7 @@ import ()func (fileState *activeBuildStreamFileState) verifyFileBuild() {+ auth := fileState.authfilePath := fileState.filePathplanId := fileState.plan.Idbranch := fileState.branch@@ -81,6 +83,33 @@ func (fileState *activeBuildStreamFileState) verifyFileBuild() {},}+ promptTokens, err := shared.GetNumTokens(sysPrompt)++ if err != nil {+ log.Printf("Error getting num tokens for prompt: %v\n", err)+ fileState.onBuildFileError(fmt.Errorf("error getting num tokens for prompt: %v", err))+ return+ }++ inputTokens := prompts.ExtraTokensPerRequest + prompts.ExtraTokensPerMessage + promptTokens++ fileState.inputTokens = inputTokens++ apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{+ User: auth.User,+ OrgId: auth.OrgId,+ Plan: fileState.plan,+ WillSendModelRequestParams: &hooks.WillSendModelRequestParams{+ InputTokens: inputTokens,+ OutputTokens: shared.AvailableModelsByName[fileState.settings.ModelPack.GetVerifier().BaseModelConfig.ModelName].DefaultReservedOutputTokens,+ ModelName: fileState.settings.ModelPack.GetVerifier().BaseModelConfig.ModelName,+ },+ })+ if apiErr != nil {+ activePlan.StreamDoneCh <- apiErr+ return+ }+log.Println("verifyFileBuild - Calling verify model for file: " + filePath)// for _, msg := range fileMessages {diff --git a/app/server/model/plan/build_verify_stream.go b/app/server/model/plan/build_verify_stream.goindex 21718125..29604f22 100644--- a/app/server/model/plan/build_verify_stream.go+++ b/app/server/model/plan/build_verify_stream.go@@ -5,17 +5,19 @@ import ("encoding/json""fmt""log"+ "plandex-server/hooks""plandex-server/model""plandex-server/types""strings""time"+ "github.com/davecgh/go-spew/spew""github.com/plandex/plandex/shared""github.com/sashabaranov/go-openai")func (fileState *activeBuildStreamFileState) listenStreamVerifyOutput(stream *openai.ChatCompletionStream) {-+ auth := fileState.authfilePath := fileState.filePathplanId := fileState.plan.Idbranch := fileState.branch@@ -33,13 +35,58 @@ func (fileState *activeBuildStreamFileState) listenStreamVerifyOutput(stream *optimer := time.NewTimer(model.OPENAI_STREAM_CHUNK_TIMEOUT)defer timer.Stop()+ streamFinished := false++ execHookOnStop := func(sendStreamErr bool) {+ err := hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{+ User: auth.User,+ OrgId: auth.OrgId,+ Plan: fileState.plan,+ DidSendModelRequestParams: &hooks.DidSendModelRequestParams{+ InputTokens: fileState.inputTokens,+ OutputTokens: fileState.activeBuild.VerifyBufferTokens,+ ModelName: fileState.settings.ModelPack.GetVerifier().BaseModelConfig.ModelName,+ ModelProvider: fileState.settings.ModelPack.GetVerifier().BaseModelConfig.Provider,+ ModelPackName: fileState.settings.ModelPack.Name,+ ModelRole: shared.ModelRoleVerifier,+ Purpose: "Verified file update",+ },+ })++ if err != nil {+ log.Printf("Error executing did send model request hook after cancel or error: %v\n", err)++ if sendStreamErr {+ activePlan := GetActivePlan(planId, branch)++ if activePlan == nil {+ log.Printf(" Active plan not found for plan ID %s on branch %s\n", planId, branch)+ return+ }++ activePlan.StreamDoneCh <- err+ }++ }+ }+for {select {case <-activePlan.Ctx.Done():// The main context was canceled (not the timer)+ if !streamFinished {+ execHookOnStop(false)+ }returncase <-timer.C:+ log.Println("\nVerify: stream timeout due to inactivity")+ if streamFinished {+ log.Println("\nVerify stream finished-timed out waiting for usage chunk")+ return+ }+// Timer triggered because no new chunk was received in time+ execHookOnStop(false)fileState.verifyRetryOrAbort(fmt.Errorf("listenStreamVerifyOutput - stream timeout due to inactivity for file '%s'", filePath))returndefault:@@ -53,6 +100,7 @@ func (fileState *activeBuildStreamFileState) listenStreamVerifyOutput(stream *optimer.Reset(model.OPENAI_STREAM_CHUNK_TIMEOUT)} else {log.Printf("listenStreamVerifyOutput - File %s: Error receiving stream chunk: %v\n", filePath, err)+ execHookOnStop(false)if err == context.Canceled {log.Printf("listenStreamVerifyOutput - File %s: Stream canceled\n", filePath)@@ -64,13 +112,50 @@ func (fileState *activeBuildStreamFileState) listenStreamVerifyOutput(stream *op}if len(response.Choices) == 0 {+ if response.Usage != nil {+ log.Println("Fix stream usage:")+ spew.Dump(response.Usage)++ apiErr := hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{+ User: auth.User,+ OrgId: auth.OrgId,+ Plan: fileState.plan,+ DidSendModelRequestParams: &hooks.DidSendModelRequestParams{+ InputTokens: response.Usage.PromptTokens,+ OutputTokens: response.Usage.CompletionTokens,+ ModelName: fileState.settings.ModelPack.GetVerifier().BaseModelConfig.ModelName,+ ModelProvider: fileState.settings.ModelPack.GetVerifier().BaseModelConfig.Provider,+ ModelPackName: fileState.settings.ModelPack.Name,+ ModelRole: shared.ModelRoleVerifier,+ Purpose: "Verified file update",+ },+ })++ if apiErr != nil {+ // stream has already finished so just log the error+ log.Printf("Verify stream: executing did send model request hook: %v\n", err)++ // ensure the active plan is still available+ activePlan := GetActivePlan(planId, branch)++ if activePlan == nil {+ log.Printf(" Active plan not found for plan ID %s on branch %s\n", planId, branch)+ return+ }++ activePlan.StreamDoneCh <- apiErr+ }+ return+ }++ execHookOnStop(false)fileState.verifyRetryOrAbort(fmt.Errorf("listenStreamVerifyOutput - stream error: no choices"))return}choice := response.Choices[0]var content string- delta := response.Choices[0].Delta+ delta := choice.Deltaif len(delta.ToolCalls) > 0 {content = delta.ToolCalls[0].Function.Arguments@@ -78,6 +163,7 @@ func (fileState *activeBuildStreamFileState) listenStreamVerifyOutput(stream *optrimmed := strings.TrimSpace(content)if trimmed == "{%invalidjson%}" || trimmed == "``(no output)``````" {log.Println("File", filePath+":", "%invalidjson%} token in streamed chunk")+ execHookOnStop(false)fileState.verifyRetryOrAbort(fmt.Errorf("invalid JSON in streamed chunk for file '%s'", filePath))return}@@ -104,13 +190,21 @@ func (fileState *activeBuildStreamFileState) listenStreamVerifyOutput(stream *opif err == nil {log.Printf("listenStreamVerifyOutput - File %s: Parsed streamed verify result\n", filePath)// spew.Dump(streamed)-+ streamFinished = true // Stream finished successfullyfileState.onVerifyResult(streamed)- return++ // Reset the timer for the usage chunk+ if !timer.Stop() {+ <-timer.C+ }+ timer.Reset(model.OPENAI_USAGE_CHUNK_TIMEOUT)++ continue // continue for usage chunk} else if len(delta.ToolCalls) == 0 {- log.Println("listenStreamVerifyOutput - Stream chunk missing function call.")- // log.Println(spew.Sdump(response))+ log.Printf("listenStreamVerifyOuput - File %s: Stream chunk missing function call. Reason: %s\n", filePath, choice.FinishReason)++ execHookOnStop(false)fileState.verifyRetryOrAbort(fmt.Errorf("listenStreamVerifyOutput - stream chunk missing function call. Reason: %s, File: %s", choice.FinishReason, filePath))}}diff --git a/app/server/model/plan/commit_msg.go b/app/server/model/plan/commit_msg.goindex 5e666e84..3d762270 100644--- a/app/server/model/plan/commit_msg.go+++ b/app/server/model/plan/commit_msg.go@@ -3,16 +3,29 @@ package planimport ("context""encoding/json"+ "errors""fmt""plandex-server/db"+ "plandex-server/hooks""plandex-server/model""plandex-server/model/prompts"+ "plandex-server/types""github.com/plandex/plandex/shared""github.com/sashabaranov/go-openai")-func genPlanDescription(client *openai.Client, config shared.ModelRoleConfig, planId, branch string, ctx context.Context) (*db.ConvoMessageDescription, error) {+func (state *activeTellStreamState) genPlanDescription() (*db.ConvoMessageDescription, error) {+ auth := state.auth+ plan := state.plan+ planId := plan.Id+ branch := state.branch+ settings := state.settings+ clients := state.clients+ config := settings.ModelPack.CommitMsg+ envVar := config.BaseModelConfig.ApiKeyEnvVar+ client := clients[envVar]+activePlan := GetActivePlan(planId, branch)if activePlan == nil {return nil, fmt.Errorf("active plan not found")@@ -23,9 +36,25 @@ func genPlanDescription(client *openai.Client, config shared.ModelRoleConfig, plresponseFormat = &openai.ChatCompletionResponseFormat{Type: "json_object"}}+ numTokens := prompts.ExtraTokensPerRequest + (prompts.ExtraTokensPerMessage * 2) + prompts.SysDescribeNumTokens + activePlan.NumTokens++ apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{+ User: auth.User,+ OrgId: auth.OrgId,+ Plan: plan,+ WillSendModelRequestParams: &hooks.WillSendModelRequestParams{+ InputTokens: numTokens,+ OutputTokens: shared.AvailableModelsByName[config.BaseModelConfig.ModelName].DefaultReservedOutputTokens,+ ModelName: config.BaseModelConfig.ModelName,+ },+ })+ if apiErr != nil {+ return nil, errors.New(apiErr.Msg)+ }+descResp, err := model.CreateChatCompletionWithRetries(client,- ctx,+ activePlan.Ctx,openai.ChatCompletionRequest{Model: config.BaseModelConfig.ModelName,Tools: []openai.Tool{@@ -73,6 +102,39 @@ func genPlanDescription(client *openai.Client, config shared.ModelRoleConfig, pl}}+ var inputTokens int+ var outputTokens int+ if descResp.Usage.CompletionTokens > 0 {+ inputTokens = descResp.Usage.PromptTokens+ outputTokens = descResp.Usage.CompletionTokens+ } else {+ inputTokens = numTokens+ outputTokens, err = shared.GetNumTokens(descStrRes)++ if err != nil {+ return nil, fmt.Errorf("error getting num tokens for content: %v", err)+ }+ }++ apiErr = hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{+ User: auth.User,+ OrgId: auth.OrgId,+ Plan: plan,+ DidSendModelRequestParams: &hooks.DidSendModelRequestParams{+ InputTokens: inputTokens,+ OutputTokens: outputTokens,+ ModelName: config.BaseModelConfig.ModelName,+ ModelProvider: config.BaseModelConfig.Provider,+ ModelPackName: settings.ModelPack.Name,+ ModelRole: shared.ModelRoleCommitMsg,+ Purpose: "Generated commit message for suggested changes",+ },+ })++ if apiErr != nil {+ return nil, errors.New(apiErr.Msg)+ }+if descStrRes == "" {fmt.Println("no describePlan function call found in response")return nil, fmt.Errorf("no describePlan function call found in response")@@ -92,7 +154,9 @@ func genPlanDescription(client *openai.Client, config shared.ModelRoleConfig, pl}, nil}-func GenCommitMsgForPendingResults(client *openai.Client, config shared.ModelRoleConfig, current *shared.CurrentPlanState, ctx context.Context) (string, error) {+func GenCommitMsgForPendingResults(auth *types.ServerAuth, plan *db.Plan, client *openai.Client, settings *shared.PlanSettings, current *shared.CurrentPlanState, ctx context.Context) (string, error) {+ config := settings.ModelPack.CommitMsg+s := ""num := 0@@ -107,6 +171,30 @@ func GenCommitMsgForPendingResults(client *openai.Client, config shared.ModelRolreturn s, nil}+ content := "Pending changes:\n\n" + s++ contentTokens, err := shared.GetNumTokens(content)++ if err != nil {+ return "", fmt.Errorf("error getting num tokens for content: %v", err)+ }++ numTokens := prompts.ExtraTokensPerRequest + (prompts.ExtraTokensPerMessage * 2) + prompts.SysPendingResultsNumTokens + contentTokens++ apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{+ User: auth.User,+ OrgId: auth.OrgId,+ Plan: plan,+ WillSendModelRequestParams: &hooks.WillSendModelRequestParams{+ InputTokens: numTokens,+ OutputTokens: shared.AvailableModelsByName[config.BaseModelConfig.ModelName].DefaultReservedOutputTokens,+ ModelName: config.BaseModelConfig.ModelName,+ },+ })+ if apiErr != nil {+ return "", errors.New(apiErr.Msg)+ }+messages := []openai.ChatCompletionMessage{{Role: openai.ChatMessageRoleSystem,@@ -114,7 +202,7 @@ func GenCommitMsgForPendingResults(client *openai.Client, config shared.ModelRol},{Role: openai.ChatMessageRoleUser,- Content: "Pending changes:\n\n" + s,+ Content: content,},}@@ -139,7 +227,40 @@ func GenCommitMsgForPendingResults(client *openai.Client, config shared.ModelRolreturn "", fmt.Errorf("no response from GPT")}- content := resp.Choices[0].Message.Content+ commitMsg := resp.Choices[0].Message.Content++ var inputTokens int+ var outputTokens int+ if resp.Usage.CompletionTokens > 0 {+ inputTokens = resp.Usage.PromptTokens+ outputTokens = resp.Usage.CompletionTokens+ } else {+ inputTokens = numTokens+ outputTokens, err = shared.GetNumTokens(commitMsg)++ if err != nil {+ return "", fmt.Errorf("error getting num tokens for content: %v", err)+ }+ }++ apiErr = hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{+ User: auth.User,+ OrgId: auth.OrgId,+ Plan: plan,+ DidSendModelRequestParams: &hooks.DidSendModelRequestParams{+ InputTokens: inputTokens,+ OutputTokens: outputTokens,+ ModelName: config.BaseModelConfig.ModelName,+ ModelProvider: config.BaseModelConfig.Provider,+ ModelPackName: settings.ModelPack.Name,+ ModelRole: shared.ModelRoleCommitMsg,+ Purpose: "Generated commit message for pending changes",+ },+ })++ if apiErr != nil {+ return "", errors.New(apiErr.Msg)+ }- return content, nil+ return commitMsg, nil}diff --git a/app/server/model/plan/exec_status.go b/app/server/model/plan/exec_status.goindex 4baafad9..122dd752 100644--- a/app/server/model/plan/exec_status.go+++ b/app/server/model/plan/exec_status.go@@ -6,15 +6,19 @@ import ("fmt""log""plandex-server/db"+ "plandex-server/hooks""plandex-server/model""plandex-server/model/prompts""strings""github.com/davecgh/go-spew/spew"+ "github.com/plandex/plandex/shared""github.com/sashabaranov/go-openai")func (state *activeTellStreamState) execStatusShouldContinue(message string, latestSummaryCh chan *db.ConvoSummary, ctx context.Context) (bool, string, error) {+ auth := state.auth+ plan := state.plansettings := state.settingsclients := state.clientsconfig := settings.ModelPack.ExecStatus@@ -68,10 +72,35 @@ func (state *activeTellStreamState) execStatusShouldContinue(message string, latsummary = latestSummary.Summary}+ content := prompts.GetExecStatusShouldContinue(summary, prevAssistantMsg, state.userPrompt, message)++ contentTokens, err := shared.GetNumTokens(content)++ if err != nil {+ log.Printf("Error getting num tokens for content: %v\n", err)+ return false, "", fmt.Errorf("error getting num tokens for content: %v", err)+ }++ numTokens := prompts.ExtraTokensPerRequest + prompts.ExtraTokensPerMessage + contentTokens++ apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{+ User: auth.User,+ OrgId: auth.OrgId,+ Plan: plan,+ WillSendModelRequestParams: &hooks.WillSendModelRequestParams{+ InputTokens: numTokens,+ OutputTokens: shared.AvailableModelsByName[config.BaseModelConfig.ModelName].DefaultReservedOutputTokens,+ ModelName: config.BaseModelConfig.ModelName,+ },+ })+ if apiErr != nil {+ return false, "", err+ }+messages := []openai.ChatCompletionMessage{{Role: openai.ChatMessageRoleSystem,- Content: prompts.GetExecStatusShouldContinue(summary, prevAssistantMsg, state.userPrompt, message),+ Content: content,},}@@ -139,6 +168,39 @@ func (state *activeTellStreamState) execStatusShouldContinue(message string, lat}}+ var inputTokens int+ var outputTokens int+ if resp.Usage.CompletionTokens > 0 {+ inputTokens = resp.Usage.PromptTokens+ outputTokens = resp.Usage.CompletionTokens+ } else {+ inputTokens = numTokens+ outputTokens, err = shared.GetNumTokens(strRes)++ if err != nil {+ return false, "", fmt.Errorf("error getting num tokens for res: %v", err)+ }+ }++ apiErr = hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{+ User: auth.User,+ OrgId: auth.OrgId,+ Plan: plan,+ DidSendModelRequestParams: &hooks.DidSendModelRequestParams{+ InputTokens: inputTokens,+ OutputTokens: outputTokens,+ ModelName: config.BaseModelConfig.ModelName,+ ModelProvider: config.BaseModelConfig.Provider,+ ModelPackName: settings.ModelPack.Name,+ ModelRole: shared.ModelRolePlanSummary,+ Purpose: "Evaluate if plan should auto-continue",+ },+ })++ if apiErr != nil {+ return false, "", fmt.Errorf("error executing hook: %v", apiErr)+ }+if strRes == "" {log.Println("No shouldAutoContinue function call found in response")log.Println(spew.Sdump(resp))diff --git a/app/server/model/plan/tell_exec.go b/app/server/model/plan/tell_exec.goindex fafc210b..5452d326 100644--- a/app/server/model/plan/tell_exec.go+++ b/app/server/model/plan/tell_exec.go@@ -68,15 +68,12 @@ func execTellPlan(}if missingFileResponse == "" {- err := hooks.ExecHook(hooks.WillExecPlan, hooks.HookParams{+ apiErr := hooks.ExecHook(hooks.WillExecPlan, hooks.HookParams{User: auth.User,Plan: plan,- WillExecPlanParams: &hooks.WillExecPlanParams{- StreamDoneCh: active.StreamDoneCh,- },})- if err != nil {+ if apiErr != nil {return}}@@ -230,18 +227,7 @@ func execTellPlan(}promptTokens = prompts.PromptWrapperTokens + numPromptTokens} else if iteration > 0 && missingFileResponse == "" {- numPromptTokens, err = shared.GetNumTokens(prompts.AutoContinuePrompt)-- if err != nil {- err = fmt.Errorf("error getting number of tokens in auto continue prompt: %v", err)- log.Println(err)- active.StreamDoneCh <- &shared.ApiError{- Type: shared.ApiErrorTypeOther,- Status: http.StatusInternalServerError,- Msg: "Error getting number of tokens in auto continue prompt",- }- return- }+ numPromptTokens = prompts.AutoContinuePromptTokenspromptTokens = prompts.PromptWrapperTokens + numPromptTokens}@@ -427,23 +413,28 @@ func execTellPlan(// log.Printf("%s: %s\n", message.Role, message.Content)// }- err = hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{+ apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{User: auth.User,OrgId: auth.OrgId,Plan: plan,WillSendModelRequestParams: &hooks.WillSendModelRequestParams{- StreamDoneCh: active.StreamDoneCh,- TotalRequestTokens: state.totalRequestTokens,+ InputTokens: state.totalRequestTokens,+ OutputTokens: state.settings.ModelPack.Planner.ReservedOutputTokens,+ ModelName: state.settings.ModelPack.Planner.BaseModelConfig.ModelName,},})- if err != nil {+ if apiErr != nil {+ active.StreamDoneCh <- apiErrreturn}modelReq := openai.ChatCompletionRequest{- Model: state.settings.ModelPack.Planner.BaseModelConfig.ModelName,- Messages: state.messages,- Stream: true,+ Model: state.settings.ModelPack.Planner.BaseModelConfig.ModelName,+ Messages: state.messages,+ Stream: true,+ StreamOptions: &openai.StreamOptions{+ IncludeUsage: true,+ },Temperature: state.settings.ModelPack.Planner.Temperature,TopP: state.settings.ModelPack.Planner.TopP,}diff --git a/app/server/model/plan/tell_load.go b/app/server/model/plan/tell_load.goindex 2e09ad71..0415650d 100644--- a/app/server/model/plan/tell_load.go+++ b/app/server/model/plan/tell_load.go@@ -77,7 +77,14 @@ func (state *activeTellStreamState) loadTellPlan() error {envVar := settings.ModelPack.Namer.BaseModelConfig.ApiKeyEnvVarclient := clients[envVar]- name, err := model.GenPlanName(client, settings.ModelPack.Namer, req.Prompt)+ name, err := model.GenPlanName(+ auth,+ plan,+ settings,+ client,+ req.Prompt,+ active.Ctx,+ )if err != nil {log.Printf("Error generating plan name: %v\n", err)diff --git a/app/server/model/plan/tell_stream.go b/app/server/model/plan/tell_stream.goindex 4f3c0e1d..bd3a0bb3 100644--- a/app/server/model/plan/tell_stream.go+++ b/app/server/model/plan/tell_stream.go@@ -6,11 +6,13 @@ import ("log""net/http""plandex-server/db"+ "plandex-server/hooks""plandex-server/model""plandex-server/types""strings""time"+ "github.com/davecgh/go-spew/spew""github.com/plandex/plandex/shared""github.com/sashabaranov/go-openai")@@ -54,17 +56,63 @@ func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionSttimer := time.NewTimer(model.OPENAI_STREAM_CHUNK_TIMEOUT)defer timer.Stop()+ streamFinished := false++ execHookOnStop := func(sendStreamErr bool) {+ err := hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{+ User: auth.User,+ OrgId: auth.OrgId,+ Plan: plan,+ DidSendModelRequestParams: &hooks.DidSendModelRequestParams{+ InputTokens: state.totalRequestTokens,+ OutputTokens: active.NumTokens,+ ModelName: state.settings.ModelPack.Planner.BaseModelConfig.ModelName,+ ModelProvider: state.settings.ModelPack.Planner.BaseModelConfig.Provider,+ ModelPackName: state.settings.ModelPack.Name,+ ModelRole: shared.ModelRolePlanner,+ Purpose: "Generated plan reply",+ },+ })++ if err != nil {+ log.Printf("Error executing did send model request hook after cancel or error: %v\n", err)++ if sendStreamErr {+ activePlan := GetActivePlan(planId, branch)++ if activePlan == nil {+ log.Printf(" Active plan not found for plan ID %s on branch %s\n", planId, branch)+ return+ }++ activePlan.StreamDoneCh <- err+ }+ }+ }++mainLoop:for {select {case <-active.Ctx.Done():// The main modelContext was canceled (not the timer)log.Println("\nTell: stream canceled")++ if !streamFinished {+ execHookOnStop(false)+ }+returncase <-timer.C:// Timer triggered because no new chunk was received in timelog.Println("\nTell: stream timeout due to inactivity")- state.onError(fmt.Errorf("stream timeout due to inactivity"), true, "", "")- return+ if streamFinished {+ log.Println("Tell stream finished—timed out waiting for usage chunk")+ return+ } else {+ state.onError(fmt.Errorf("stream timeout due to inactivity"), true, "", "")+ continue mainLoop+ }+default:response, err := stream.Recv()@@ -79,19 +127,55 @@ func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionStif err != nil {if err.Error() == "context canceled" {log.Println("Tell: stream context canceled")+ execHookOnStop(true)return}-}if len(response.Choices) == 0 {+ if response.Usage != nil {++ log.Println("Tell stream usage:")+ spew.Dump(response.Usage)++ apiErr := hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{+ User: auth.User,+ OrgId: auth.OrgId,+ Plan: plan,+ DidSendModelRequestParams: &hooks.DidSendModelRequestParams{+ InputTokens: response.Usage.PromptTokens,+ OutputTokens: response.Usage.CompletionTokens,+ ModelName: state.settings.ModelPack.Planner.BaseModelConfig.ModelName,+ ModelProvider: state.settings.ModelPack.Planner.BaseModelConfig.Provider,+ ModelPackName: state.settings.ModelPack.Name,+ ModelRole: shared.ModelRolePlanner,+ Purpose: "Generated plan reply",+ },+ })++ if apiErr != nil {+ log.Printf("Tell stream: error executing did send model request hook: %v\n", err)++ // ensure the active plan is still available+ activePlan := GetActivePlan(planId, branch)++ if activePlan == nil {+ log.Printf(" Active plan not found for plan ID %s on branch %s\n", planId, branch)+ return+ }++ activePlan.StreamDoneCh <- apiErr+ }+ return+ }+state.onError(fmt.Errorf("stream finished with no choices"), true, "", "")- return+ continue mainLoop}if len(response.Choices) > 1 {state.onError(fmt.Errorf("stream finished with more than one choice"), true, "", "")- return+ continue mainLoop}choice := response.Choices[0]@@ -109,7 +193,7 @@ func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionSterr := db.SetPlanStatus(planId, branch, shared.PlanStatusDescribing, "")if err != nil {state.onError(fmt.Errorf("failed to set plan status to describing: %v", err), true, "", "")- return+ continue mainLoop}latestSummaryCh := active.LatestSummaryCh@@ -123,10 +207,7 @@ func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionStif len(replyFiles) > 0 {log.Println("Generating plan description")- envVar := settings.ModelPack.CommitMsg.BaseModelConfig.ApiKeyEnvVar- client := clients[envVar]-- res, err := genPlanDescription(client, settings.ModelPack.CommitMsg, planId, branch, active.Ctx)+ res, err := state.genPlanDescription()if err != nil {errCh <- fmt.Errorf("failed to generate plan description: %v", err)return@@ -158,7 +239,7 @@ func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionSterr := <-errChif err != nil {state.onError(err, true, "", "")- return+ continue mainLoop}}@@ -183,7 +264,7 @@ func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionStStatus: http.StatusInternalServerError,Msg: "Error locking repo",}- return+ continue mainLoop}log.Println("Locked repo for assistant reply and description")@@ -259,7 +340,7 @@ func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionSt}()if err != nil {- return+ continue mainLoop}// summarize convo needs to come *after* the reply is stored in order to correctly summarize the latest message@@ -268,15 +349,29 @@ func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionStclient := clients[envVar]// summarize in the background- go summarizeConvo(client, settings.ModelPack.PlanSummary, summarizeConvoParams{- planId: planId,- branch: branch,- convo: convo,- summaries: summaries,- userPrompt: state.userPrompt,- currentOrgId: currentOrgId,- currentReply: active.CurrentReplyContent,- }, active.SummaryCtx)+ go func() {+ err := summarizeConvo(client, settings.ModelPack.PlanSummary, summarizeConvoParams{+ user: auth.User,+ plan: plan,+ branch: branch,+ convo: convo,+ summaries: summaries,+ userPrompt: state.userPrompt,+ currentOrgId: currentOrgId,+ currentReply: active.CurrentReplyContent,+ currentReplyNumTokens: active.NumTokens,+ modelPackName: settings.ModelPack.Name,+ }, active.SummaryCtx)++ if err != nil {+ log.Printf("Error summarizing convo: %v\n", err)+ active.StreamDoneCh <- &shared.ApiError{+ Type: shared.ApiErrorTypeOther,+ Status: http.StatusInternalServerError,+ Msg: fmt.Sprintf("Error summarizing convo: %v", err),+ }+ }+ }()log.Println("Sending active.CurrentReplyDoneCh <- true")@@ -320,7 +415,7 @@ func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionStStatus: http.StatusInternalServerError,Msg: "Error setting plan status to building",}- return+ continue mainLoop}log.Println("Sending RepliesFinished stream message")@@ -330,7 +425,13 @@ func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionSt}}- return+ // Reset the timer for the usage chunk+ if !timer.Stop() {+ <-timer.C+ }+ timer.Reset(model.OPENAI_USAGE_CHUNK_TIMEOUT)+ streamFinished = true+ continue}chunksReceived++@@ -344,13 +445,13 @@ func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionSt} else {maybeRedundantBacktickContent += content}- continue+ continue // skip processing this chunk} else if chunksReceived < 3 && strings.Contains(content, "```") {// received closing triple backticks in first 3 chunks after missing file response// means this is a redundant start of a new file block, so just ignore itmaybeRedundantBacktickContent += content- continue+ continue // skip processing this chunk}}@@ -395,7 +496,7 @@ func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionStStatus: http.StatusInternalServerError,Msg: "Error setting plan status to prompting",}- return+ continue mainLoop}UpdateActivePlan(planId, branch, func(ap *types.ActivePlan) {@@ -423,6 +524,7 @@ func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionStselect {case <-active.Ctx.Done():log.Println("Context cancelled while waiting for missing file response")+ execHookOnStop(true)returncase userChoice = <-active.MissingFileResponseCh:}@@ -488,7 +590,7 @@ func (state *activeTellStreamState) listenStream(stream *openai.ChatCompletionStif err != nil {log.Printf("Error getting num tokens for file %s: %v\n", file, err)state.onError(fmt.Errorf("error getting num tokens for file %s: %v", file, err), true, "", "")- return+ continue mainLoop}buildState.queueBuilds([]*types.ActiveBuild{{diff --git a/app/server/model/plan/tell_summary.go b/app/server/model/plan/tell_summary.goindex 2ddaea66..44eb770e 100644--- a/app/server/model/plan/tell_summary.go+++ b/app/server/model/plan/tell_summary.go@@ -28,10 +28,10 @@ func (state *activeTellStreamState) injectSummariesAsNeeded() bool {return false}- conversationTokens := 0+ conversationTokens := prompts.ExtraTokensPerRequesttokensUpToTimestamp := make(map[int64]int)for _, convoMessage := range convo {- conversationTokens += convoMessage.Tokens+ conversationTokens += convoMessage.Tokens + prompts.ExtraTokensPerMessagetimestamp := convoMessage.CreatedAt.UnixNano() / int64(time.Millisecond)tokensUpToTimestamp[timestamp] = conversationTokens// log.Printf("Timestamp: %s | Tokens: %d | Total: %d | conversationTokens\n", convoMessage.Timestamp, convoMessage.Tokens, conversationTokens)@@ -174,19 +174,25 @@ func (state *activeTellStreamState) injectSummariesAsNeeded() bool {}type summarizeConvoParams struct {- planId string- branch string- convo []*db.ConvoMessage- summaries []*db.ConvoSummary- userPrompt string- currentReply string- currentOrgId string+ plan *db.Plan+ user *db.User+ branch string+ convo []*db.ConvoMessage+ summaries []*db.ConvoSummary+ userPrompt string+ currentReply string+ currentReplyNumTokens int+ currentOrgId string+ modelPackName string}func summarizeConvo(client *openai.Client, config shared.ModelRoleConfig, params summarizeConvoParams, ctx context.Context) error {- log.Printf("summarizeConvo: Called for plan ID %s on branch %s\n", params.planId, params.branch)- log.Printf("summarizeConvo: Starting summarizeConvo for planId: %s\n", params.planId)- planId := params.planId+ plan := params.plan+ user := params.user+ planId := plan.Id+ log.Printf("summarizeConvo: Called for plan ID %s on branch %s\n", planId, params.branch)+ log.Printf("summarizeConvo: Starting summarizeConvo for planId: %s\n", planId)+branch := params.branchconvo := params.convosummaries := params.summaries@@ -227,6 +233,8 @@ func summarizeConvo(client *openai.Client, config shared.ModelRoleConfig, params// log.Println("Generating plan summary - convo:")// spew.Dump(convo)+ numTokens := prompts.ExtraTokensPerRequest+if latestSummary == nil {for _, convoMessage := range convo {summaryMessages = append(summaryMessages, &openai.ChatCompletionMessage{@@ -236,6 +244,7 @@ func summarizeConvo(client *openai.Client, config shared.ModelRoleConfig, paramslatestMessageId = convoMessage.IdlatestMessageSummarizedAt = convoMessage.CreatedAtnumMessagesSummarized+++ numTokens += convoMessage.Tokens + prompts.ExtraTokensPerMessage}} else {summaryMessages = append(summaryMessages, &openai.ChatCompletionMessage{@@ -243,6 +252,8 @@ func summarizeConvo(client *openai.Client, config shared.ModelRoleConfig, paramsContent: latestSummary.Summary,})+ numTokens += latestSummary.Tokens + prompts.ExtraTokensPerMessage+var found boolfor _, convoMessage := range convo {if convoMessage.Id == latestSummary.LatestConvoMessageId {@@ -255,6 +266,7 @@ func summarizeConvo(client *openai.Client, config shared.ModelRoleConfig, paramsContent: convoMessage.Message,})numMessagesSummarized+++ numTokens += convoMessage.Tokens + prompts.ExtraTokensPerMessage}}@@ -267,26 +279,20 @@ func summarizeConvo(client *openai.Client, config shared.ModelRoleConfig, paramslog.Println("generating summary - latestMessageSummarizedAt:", latestMessageSummarizedAt)if userPrompt != "" {- active := GetActivePlan(planId, branch)- if active == nil {- log.Printf("Active plan not found for plan ID %s and branch %s\n", planId, branch)- return fmt.Errorf("active plan not found for plan ID %s and branch %s", planId, branch)- }-if userPrompt != prompts.UserContinuePrompt && userPrompt != prompts.AutoContinuePrompt {summaryMessages = append(summaryMessages, &openai.ChatCompletionMessage{Role: openai.ChatMessageRoleUser,Content: userPrompt,})- }- // log.Println("Current reply content:")- // log.Println(active.CurrentReplyContent)+ tokens, err := shared.GetNumTokens(userPrompt)+ if err != nil {+ log.Printf("Error getting num tokens for user prompt: %v\n", err)+ return err+ }- summaryMessages = append(summaryMessages, &openai.ChatCompletionMessage{- Role: openai.ChatMessageRoleAssistant,- Content: active.CurrentReplyContent,- })+ numTokens += tokens + prompts.ExtraTokensPerMessage+ }}if currentReply != "" {@@ -294,6 +300,8 @@ func summarizeConvo(client *openai.Client, config shared.ModelRoleConfig, paramsRole: openai.ChatMessageRoleAssistant,Content: currentReply,})++ numTokens += params.currentReplyNumTokens + prompts.ExtraTokensPerMessage}log.Printf("Calling model for plan summary. Summarizing %d messages\n", len(summaryMessages))@@ -306,19 +314,22 @@ func summarizeConvo(client *openai.Client, config shared.ModelRoleConfig, paramssummary, err := model.PlanSummary(client, config, model.PlanSummaryParams{Conversation: summaryMessages,+ ConversationNumTokens: numTokens,LatestConvoMessageId: latestMessageId,LatestConvoMessageCreatedAt: latestMessageSummarizedAt,NumMessages: numMessagesSummarized,OrgId: currentOrgId,- PlanId: planId,+ Plan: plan,+ User: user,+ ModelPackName: params.modelPackName,}, ctx)if err != nil {- log.Printf("summarizeConvo: Error generating plan summary for plan %s: %v\n", params.planId, err)+ log.Printf("summarizeConvo: Error generating plan summary for plan %s: %v\n", planId, err)return err}- log.Printf("summarizeConvo: Summary generated and stored for plan %s\n", params.planId)+ log.Printf("summarizeConvo: Summary generated and stored for plan %s\n", planId)// log.Println("Generated summary:")// spew.Dump(summary)diff --git a/app/server/model/prompts/create.go b/app/server/model/prompts/create.goindex 6a30f769..1d3e6a0b 100644--- a/app/server/model/prompts/create.go+++ b/app/server/model/prompts/create.go@@ -224,7 +224,7 @@ const SysCreate = Identity + ` A plan is a set of files with an attached context[END OF YOUR INSTRUCTIONS]`-var CreateSysMsgNumTokens, _ = shared.GetNumTokens(SysCreate)+var CreateSysMsgNumTokens intconst promptWrapperFormatStr = "# The user's latest prompt:\n```\n%s\n```\n\n" + `Please respond according to the 'Your instructions' section above.@@ -256,7 +256,7 @@ func GetWrappedPrompt(prompt string) string {return fmt.Sprintf(promptWrapperFormatStr, prompt)}-var PromptWrapperTokens, _ = shared.GetNumTokens(fmt.Sprintf(promptWrapperFormatStr, ""))+var PromptWrapperTokens intconst UserContinuePrompt = "Continue the plan."@@ -272,6 +272,30 @@ If you break up a task into subtasks, only include subtasks that can be implemenDo NOT include tests or documentation in the subtasks unless the user has specifically asked for them. Do not include extra code or features beyond what the user has asked for. Focus on the user's request and implement only what is necessary to fulfill it.`+var AutoContinuePromptTokens int+const SkippedPathsPrompt = "\n\nSome files have been skipped by the user and *must not* be generated. The user will handle any updates to these files themselves. Skip any parts of the plan that require generating these files. You *must not* generate a file block for any of these files.\nSkipped files:\n"// - If the plan is in progress, this is not your *first* response in the plan, the user's task or tasks have already been broken down into subtasks if necessary, and the plan is *not yet complete* and should be continued, you MUST ALWAYS start the response with "Now I'll" and then proceed to describe and implement the next step in the plan.++func init() {+ var err error+ CreateSysMsgNumTokens, err = shared.GetNumTokens(SysCreate)++ if err != nil {+ panic(fmt.Sprintf("Error getting number of tokens for sys msg: %v", err))+ }++ PromptWrapperTokens, err = shared.GetNumTokens(fmt.Sprintf(promptWrapperFormatStr, ""))++ if err != nil {+ panic(fmt.Sprintf("Error getting number of tokens for prompt wrapper: %v", err))+ }++ AutoContinuePromptTokens, err = shared.GetNumTokens(AutoContinuePrompt)++ if err != nil {+ panic(fmt.Sprintf("Error getting number of tokens for auto continue prompt: %v", err))+ }++}diff --git a/app/server/model/prompts/describe.go b/app/server/model/prompts/describe.goindex daef04b9..1d263390 100644--- a/app/server/model/prompts/describe.go+++ b/app/server/model/prompts/describe.go@@ -1,6 +1,9 @@package promptsimport (+ "fmt"++ "github.com/plandex/plandex/shared""github.com/sashabaranov/go-openai""github.com/sashabaranov/go-openai/jsonschema")@@ -20,4 +23,24 @@ var DescribePlanFn = openai.FunctionDefinition{},}+var SysDescribeNumTokens int+const SysPendingResults = "You are an AI commit message summarizer. You take a list of descriptions of pending changes and turn them into a succinct one-line summary of all the pending changes that makes for a good commit message title. Output ONLY this one-line title and nothing else."++var SysPendingResultsNumTokens int++func init() {+ var err error+ SysDescribeNumTokens, err = shared.GetNumTokens(SysDescribe)++ if err != nil {+ panic(fmt.Sprintf("Error getting num tokens for describe plan prompt: %v\n", err))+ }++ SysPendingResultsNumTokens, err = shared.GetNumTokens(SysPendingResults)++ if err != nil {+ panic(fmt.Sprintf("Error getting num tokens for pending results prompt: %v\n", err))+ }++}diff --git a/app/server/model/prompts/shared.go b/app/server/model/prompts/shared.goindex 12bb9a65..aff37859 100644--- a/app/server/model/prompts/shared.go+++ b/app/server/model/prompts/shared.go@@ -1,3 +1,24 @@package prompts+import (+ "fmt"++ "github.com/plandex/plandex/shared"+)+const Identity = "You are Plandex, an AI programming and system administration assistant. You and the programmer collaborate to create a 'plan' for the task at hand."++var IdentityNumTokens int++func init() {+ var err error+ IdentityNumTokens, err = shared.GetNumTokens(Identity)++ if err != nil {+ panic(fmt.Sprintf("Error getting num tokens for identity prompt: %v\n", err))+ }+}++// these account for control tokens like %system%, %user%, %assistant%, etc. and add more tokens to the request+const ExtraTokensPerRequest = 3+const ExtraTokensPerMessage = 4diff --git a/app/server/model/prompts/summary.go b/app/server/model/prompts/summary.goindex e407e78b..38bb1dea 100644--- a/app/server/model/prompts/summary.go+++ b/app/server/model/prompts/summary.go@@ -1,6 +1,9 @@package promptsimport (+ "fmt"++ "github.com/plandex/plandex/shared""github.com/sashabaranov/go-openai""github.com/sashabaranov/go-openai/jsonschema")@@ -65,3 +68,14 @@ Based on the existing summary and the conversation so far, make a summary of theOutput only the summary of the current state of the plan and nothing else.`++var PlanSummaryNumTokens int++func init() {+ var err error+ PlanSummaryNumTokens, err = shared.GetNumTokens(PlanSummary)++ if err != nil {+ panic(fmt.Sprintf("Error getting num tokens for plan summary prompt: %v\n", err))+ }+}diff --git a/app/server/model/summarize.go b/app/server/model/summarize.goindex 4d1d1306..31dc952e 100644--- a/app/server/model/summarize.go+++ b/app/server/model/summarize.go@@ -2,9 +2,12 @@ package modelimport ("context"+ "errors""fmt""plandex-server/db"+ "plandex-server/hooks""plandex-server/model/prompts"+ "plandex-server/types""time""github.com/plandex/plandex/shared"@@ -12,12 +15,16 @@ import ()type PlanSummaryParams struct {+ User *db.User+ OrgId string+ Plan *db.Plan+ ActivePlan *types.ActivePlan+ ModelPackName stringConversation []*openai.ChatCompletionMessage+ ConversationNumTokens intLatestConvoMessageId stringLatestConvoMessageCreatedAt time.TimeNumMessages int- OrgId string- PlanId string}func PlanSummary(client *openai.Client, config shared.ModelRoleConfig, params PlanSummaryParams, ctx context.Context) (*db.ConvoSummary, error) {@@ -28,6 +35,8 @@ func PlanSummary(client *openai.Client, config shared.ModelRoleConfig, params Pl},}+ numTokens := params.ConversationNumTokens + prompts.IdentityNumTokens+for _, message := range params.Conversation {messages = append(messages, *message)}@@ -37,6 +46,22 @@ func PlanSummary(client *openai.Client, config shared.ModelRoleConfig, params PlContent: prompts.PlanSummary,})+ numTokens += prompts.PlanSummaryNumTokens++ apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{+ User: params.User,+ OrgId: params.OrgId,+ Plan: params.Plan,+ WillSendModelRequestParams: &hooks.WillSendModelRequestParams{+ InputTokens: numTokens,+ OutputTokens: shared.AvailableModelsByName[config.BaseModelConfig.ModelName].DefaultReservedOutputTokens,+ ModelName: config.BaseModelConfig.ModelName,+ },+ })+ if apiErr != nil {+ return nil, errors.New(apiErr.Msg)+ }+fmt.Println("summarizing messages:")// spew.Dump(messages)@@ -63,12 +88,45 @@ func PlanSummary(client *openai.Client, config shared.ModelRoleConfig, params Plcontent := resp.Choices[0].Message.Content+ var inputTokens int+ var outputTokens int+ if resp.Usage.CompletionTokens > 0 {+ inputTokens = resp.Usage.PromptTokens+ outputTokens = resp.Usage.CompletionTokens+ } else {+ inputTokens = numTokens+ outputTokens, err = shared.GetNumTokens(content)++ if err != nil {+ return nil, err+ }+ }++ apiErr = hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{+ User: params.User,+ OrgId: params.OrgId,+ Plan: params.Plan,+ DidSendModelRequestParams: &hooks.DidSendModelRequestParams{+ InputTokens: inputTokens,+ OutputTokens: outputTokens,+ ModelName: config.BaseModelConfig.ModelName,+ ModelProvider: config.BaseModelConfig.Provider,+ ModelPackName: params.ModelPackName,+ ModelRole: shared.ModelRolePlanSummary,+ Purpose: "Generated plan summary",+ },+ })++ if apiErr != nil {+ return nil, errors.New(apiErr.Msg)+ }+// log.Println("Plan summary content:")// log.Println(content)return &db.ConvoSummary{OrgId: params.OrgId,- PlanId: params.PlanId,+ PlanId: params.Plan.Id,Summary: "## Summary of the plan so far:\n\n" + content,Tokens: resp.Usage.CompletionTokens,LatestConvoMessageId: params.LatestConvoMessageId,diff --git a/app/shared/data_models.go b/app/shared/data_models.goindex 63f32803..04929614 100644--- a/app/shared/data_models.go+++ b/app/shared/data_models.go@@ -10,9 +10,11 @@ import ()type Org struct {- Id string `json:"id"`- Name string `json:"name"`- IsPending bool `json:"isPending"`+ Id string `json:"id"`+ Name string `json:"name"`++ // optional cloud attributes+ IntegratedModelsMode bool `json:"integratedModelsMode,omitempty"`}type User struct {diff --git a/app/shared/req_res.go b/app/shared/req_res.goindex 53f37e81..f16a4756 100644--- a/app/shared/req_res.go+++ b/app/shared/req_res.go@@ -237,3 +237,26 @@ type ApplyPlanRequest struct {type RenamePlanRequest struct {Name string `json:"name"`}++// Cloud requests and responses+type CreateCloudOrgRequest struct {+ CreateOrgRequest+ IntegratedModelsMode bool `json:"integratedModelsMode"`+}++type StartTrialRequest struct {+ Account CreateAccountRequest `json:"account"`+ Org CreateCloudOrgRequest `json:"org"`+}++type StartTrialResponse struct {+ UserId string `json:"userId"`+ Token string `json:"token"`+ OrgId string `json:"orgId"`+ StripeCustomerId string `json:"stripeCustomerId"`+ TrialPaymentAmountCents int `json:"trialPaymentAmount"`+}++type TrialPaymentRequest struct {+ StripeToken string `json:"stripeToken"`+}