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
custom models refactor and migration work
Dane Schneider771b05511b9e
diff --git a/app/cli/api/clients.go b/app/cli/api/clients.goindex 9dcfbaad..7a0c7587 100644--- a/app/cli/api/clients.go+++ b/app/cli/api/clients.go@@ -50,6 +50,7 @@ func (t *authenticatedTransport) RoundTrip(req *http.Request) (*http.Response, eif err != nil {return nil, err}+ auth.SetVersionHeader(req)return t.underlyingTransport.RoundTrip(req)}@@ -58,6 +59,7 @@ type unauthenticatedTransport struct {}func (t *unauthenticatedTransport) RoundTrip(req *http.Request) (*http.Response, error) {+ auth.SetVersionHeader(req)return t.underlyingTransport.RoundTrip(req)}diff --git a/app/cli/api/methods.go b/app/cli/api/methods.goindex d3abbec7..3a0ac39d 100644--- a/app/cli/api/methods.go+++ b/app/cli/api/methods.go@@ -2054,7 +2054,7 @@ func (a *Api) UpdateDefaultPlanConfig(req shared.UpdateDefaultPlanConfigRequest)return nil}-func (a *Api) CreateCustomModel(model *shared.AvailableModel) *shared.ApiError {+func (a *Api) CreateCustomModel(model *shared.CustomModel) *shared.ApiError {serverUrl := fmt.Sprintf("%s/custom_models", GetApiHost())body, err := json.Marshal(model)if err != nil {@@ -2081,7 +2081,7 @@ func (a *Api) CreateCustomModel(model *shared.AvailableModel) *shared.ApiError {return nil}-func (a *Api) ListCustomModels() ([]*shared.AvailableModel, *shared.ApiError) {+func (a *Api) ListCustomModels() ([]*shared.CustomModel, *shared.ApiError) {serverUrl := fmt.Sprintf("%s/custom_models", GetApiHost())resp, err := authenticatedFastClient.Get(serverUrl)if err != nil {@@ -2100,7 +2100,7 @@ func (a *Api) ListCustomModels() ([]*shared.AvailableModel, *shared.ApiError) {return nil, apiErr}- var models []*shared.AvailableModel+ var models []*shared.CustomModelerr = json.NewDecoder(resp.Body).Decode(&models)if err != nil {return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error decoding response: %v", err)}@@ -2109,7 +2109,7 @@ func (a *Api) ListCustomModels() ([]*shared.AvailableModel, *shared.ApiError) {return models, nil}-func (a *Api) DeleteAvailableModel(modelId string) *shared.ApiError {+func (a *Api) DeleteCustomModel(modelId string) *shared.ApiError {serverUrl := fmt.Sprintf("%s/custom_models/%s", GetApiHost(), modelId)req, err := http.NewRequest(http.MethodDelete, serverUrl, nil)if err != nil {@@ -2128,7 +2128,7 @@ func (a *Api) DeleteAvailableModel(modelId string) *shared.ApiError {apiErr := HandleApiError(resp, errorBody)authRefreshed, apiErr := refreshAuthIfNeeded(apiErr)if authRefreshed {- return a.DeleteAvailableModel(modelId)+ return a.DeleteCustomModel(modelId)}return apiErr}@@ -2136,7 +2136,7 @@ func (a *Api) DeleteAvailableModel(modelId string) *shared.ApiError {return nil}-func (a *Api) UpdateCustomModel(model *shared.AvailableModel) *shared.ApiError {+func (a *Api) UpdateCustomModel(model *shared.CustomModel) *shared.ApiError {serverUrl := fmt.Sprintf("%s/custom_models/%s", GetApiHost(), model.Id)body, err := json.Marshal(model)if err != nil {@@ -2168,6 +2168,117 @@ func (a *Api) UpdateCustomModel(model *shared.AvailableModel) *shared.ApiError {return nil}+func (a *Api) CreateCustomProvider(provider *shared.CustomProvider) *shared.ApiError {+ serverUrl := fmt.Sprintf("%s/custom_providers", GetApiHost())+ body, err := json.Marshal(provider)+ if err != nil {+ return &shared.ApiError{Msg: "Failed to marshal provider"}+ }++ resp, err := authenticatedFastClient.Post(serverUrl, "application/json", bytes.NewBuffer(body))+ if err != nil {+ return &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error sending request: %v", err)}+ }+ defer resp.Body.Close()++ if resp.StatusCode >= 400 {+ errorBody, _ := io.ReadAll(resp.Body)+ apiErr := HandleApiError(resp, errorBody)+ authRefreshed, apiErr := refreshAuthIfNeeded(apiErr)+ if authRefreshed {+ return a.CreateCustomProvider(provider)+ }+ return apiErr+ }++ return nil+}++func (a *Api) UpdateCustomProvider(provider *shared.CustomProvider) *shared.ApiError {+ serverUrl := fmt.Sprintf("%s/custom_providers/%s", GetApiHost(), provider.Id)+ body, err := json.Marshal(provider)+ if err != nil {+ return &shared.ApiError{Msg: "Failed to marshal provider"}+ }++ req, err := http.NewRequest(http.MethodPut, serverUrl, bytes.NewBuffer(body))+ if err != nil {+ return &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error creating request: %v", err)}+ }+ req.Header.Set("Content-Type", "application/json")++ resp, err := authenticatedFastClient.Do(req)+ if err != nil {+ return &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error sending request: %v", err)}+ }+ defer resp.Body.Close()++ if resp.StatusCode >= 400 {+ errorBody, _ := io.ReadAll(resp.Body)+ apiErr := HandleApiError(resp, errorBody)+ authRefreshed, apiErr := refreshAuthIfNeeded(apiErr)+ if authRefreshed {+ return a.UpdateCustomProvider(provider)+ }+ return apiErr+ }++ return nil+}++func (a *Api) ListCustomProviders() ([]*shared.CustomProvider, *shared.ApiError) {+ serverUrl := fmt.Sprintf("%s/custom_providers", GetApiHost())+ resp, err := authenticatedFastClient.Get(serverUrl)+ if err != nil {+ return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error sending request: %v", err)}+ }+ defer resp.Body.Close()++ if resp.StatusCode >= 400 {+ errorBody, _ := io.ReadAll(resp.Body)+ apiErr := HandleApiError(resp, errorBody)+ authRefreshed, apiErr := refreshAuthIfNeeded(apiErr)+ if authRefreshed {+ return a.ListCustomProviders()+ }+ return nil, apiErr+ }++ var providers []*shared.CustomProvider+ err = json.NewDecoder(resp.Body).Decode(&providers)+ if err != nil {+ return nil, &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error decoding response: %v", err)}+ }++ return providers, nil+}++func (a *Api) DeleteCustomProvider(providerId string) *shared.ApiError {+ serverUrl := fmt.Sprintf("%s/custom_providers/%s", GetApiHost(), providerId)+ req, err := http.NewRequest(http.MethodDelete, serverUrl, nil)+ if err != nil {+ return &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error creating request: %v", err)}+ }++ resp, err := authenticatedFastClient.Do(req)+ if err != nil {+ return &shared.ApiError{Type: shared.ApiErrorTypeOther, Msg: fmt.Sprintf("error sending request: %v", err)}+ }+ defer resp.Body.Close()++ if resp.StatusCode >= 400 {+ errorBody, _ := io.ReadAll(resp.Body)+ apiErr := HandleApiError(resp, errorBody)+ authRefreshed, apiErr := refreshAuthIfNeeded(apiErr)+ if authRefreshed {+ return a.DeleteCustomProvider(providerId)+ }+ return apiErr+ }++ return nil+}+func (a *Api) CreateModelPack(set *shared.ModelPack) *shared.ApiError {serverUrl := fmt.Sprintf("%s/model_sets", GetApiHost())body, err := json.Marshal(set)diff --git a/app/cli/auth/api.go b/app/cli/auth/api.goindex 4dc9e416..c1f78077 100644--- a/app/cli/auth/api.go+++ b/app/cli/auth/api.go@@ -6,6 +6,7 @@ import ("fmt""net/http""plandex-cli/types"+ "plandex-cli/version"shared "plandex-shared")@@ -41,3 +42,7 @@ func SetAuthHeader(req *http.Request) error {return nil}++func SetVersionHeader(req *http.Request) {+ req.Header.Set("X-Client-Version", version.Version)+}diff --git a/app/cli/cmd/model_packs.go b/app/cli/cmd/model_packs.goindex a0815611..6035fb63 100644--- a/app/cli/cmd/model_packs.go+++ b/app/cli/cmd/model_packs.go@@ -59,6 +59,7 @@ func init() {modelPacksCmd.AddCommand(updateModelPackCmd)modelPacksCmd.AddCommand(showModelPackCmd)modelPacksCmd.Flags().BoolVarP(&customModelPacksOnly, "custom", "c", false, "Only show custom model packs")+ modelPacksCmd.Flags().BoolVarP(&allProperties, "all", "a", false, "Show all properties")}func deleteModelPack(cmd *cobra.Command, args []string) {@@ -313,7 +314,7 @@ func updateModelPack(cmd *cobra.Command, args []string) {roleOpts[i] = string(role)}- renderModelPack(toUpdate)+ renderModelPack(toUpdate, allProperties)for {selected, err := term.SelectFromList("Select a role to update:", roleOpts)@@ -430,19 +431,19 @@ func showModelPack(cmd *cobra.Command, args []string) {return}- renderModelPack(modelPack)+ renderModelPack(modelPack, allProperties)fmt.Println()term.PrintCmds("", "model-packs update", "model-packs delete", "set-model", "set-model default")}-func getModelRoleConfig(customModels []*shared.AvailableModel, modelRole shared.ModelRole) shared.ModelRoleConfig {+func getModelRoleConfig(customModels []*shared.CustomModel, modelRole shared.ModelRole) shared.ModelRoleConfig {_, modelConfig := getModelWithRoleConfig(customModels, modelRole)return modelConfig}-func getModelWithRoleConfig(customModels []*shared.AvailableModel, modelRole shared.ModelRole) (*shared.AvailableModel, shared.ModelRoleConfig) {+func getModelWithRoleConfig(customModels []*shared.CustomModel, modelRole shared.ModelRole) (*shared.CustomModel, shared.ModelRoleConfig) {role := string(modelRole)model := getModelForRole(customModels, modelRole)@@ -478,15 +479,15 @@ func getModelWithRoleConfig(customModels []*shared.AvailableModel, modelRole sha}return model, shared.ModelRoleConfig{+ ModelId: model.ModelId,Role: modelRole,- BaseModelConfig: &model.BaseModelConfig,Temperature: float32(temperature),TopP: float32(topP),ReservedOutputTokens: reservedOutputTokens,}}-func getPlannerRoleConfig(customModels []*shared.AvailableModel) shared.PlannerRoleConfig {+func getPlannerRoleConfig(customModels []*shared.CustomModel) shared.PlannerRoleConfig {model, modelConfig := getModelWithRoleConfig(customModels, shared.ModelRolePlanner)return shared.PlannerRoleConfig{@@ -497,7 +498,7 @@ func getPlannerRoleConfig(customModels []*shared.AvailableModel) shared.PlannerR}}-func getModelForRole(customModels []*shared.AvailableModel, role shared.ModelRole) *shared.AvailableModel {+func getModelForRole(customModels []*shared.CustomModel, role shared.ModelRole) *shared.CustomModel {color.New(color.Bold).Printf("Select a model for the %s role 👇\n", role)return lib.SelectModelForRole(customModels, role, false)}diff --git a/app/cli/cmd/model_providers.go b/app/cli/cmd/model_providers.gonew file mode 100644index 00000000..878554d7--- /dev/null+++ b/app/cli/cmd/model_providers.go@@ -0,0 +1,317 @@+package cmd++import (+ "fmt"+ "os"+ "strconv"+ "strings"++ "plandex-cli/api"+ "plandex-cli/auth"+ "plandex-cli/term"++ shared "plandex-shared"++ "github.com/fatih/color"+ "github.com/olekukonko/tablewriter"+ "github.com/spf13/cobra"+)++var providersCmd = &cobra.Command{+ Use: "providers",+ Short: "Manage custom model providers",+}++var listProvidersCmd = &cobra.Command{+ Use: "list",+ Aliases: []string{"ls"},+ Short: "List custom model providers",+ Run: listProviders,+}++var addProviderCmd = &cobra.Command{+ Use: "add",+ Aliases: []string{"create"},+ Short: "Add a custom model provider",+ Run: addProvider,+}++var showProviderCmd = &cobra.Command{+ Use: "show [id|name]",+ Short: "Show a custom model provider",+ Args: cobra.MaximumNArgs(1),+ Run: showProvider,+}++var updateProviderCmd = &cobra.Command{+ Use: "update [id|name]",+ Aliases: []string{"edit"},+ Short: "Update a custom model provider",+ Args: cobra.MaximumNArgs(1),+ Run: updateProvider,+}++func init() {+ RootCmd.AddCommand(providersCmd)+ providersCmd.AddCommand(listProvidersCmd)+ providersCmd.AddCommand(addProviderCmd)+ providersCmd.AddCommand(showProviderCmd)+ providersCmd.AddCommand(updateProviderCmd)+}++func listProviders(cmd *cobra.Command, args []string) {+ auth.MustResolveAuthWithOrg()++ term.StartSpinner("")+ providers, apiErr := api.Client.ListCustomProviders()+ term.StopSpinner()+ if apiErr != nil {+ term.OutputErrorAndExit("Error fetching providers: %v", apiErr.Msg)+ return+ }++ if len(providers) == 0 {+ fmt.Println("🤷♂️ No custom providers")+ fmt.Println()+ term.PrintCmds("", "providers add")+ return+ }++ table := tablewriter.NewWriter(os.Stdout)+ table.SetHeader([]string{"#", "Name", "Base URL", "Skip Auth", "API Key Env Var"})+ for i, p := range providers {+ table.Append([]string{+ strconv.Itoa(i + 1),+ p.Name,+ p.BaseUrl,+ fmt.Sprintf("%v", p.SkipAuth),+ p.ApiKeyEnvVar,+ })+ }+ table.Render()+ fmt.Println()+ term.PrintCmds("", "providers show", "providers update", "providers add")+}++func addProvider(cmd *cobra.Command, args []string) {+ auth.MustResolveAuthWithOrg()++ name, err := term.GetRequiredUserStringInput("Provider name:")+ if err != nil {+ term.OutputErrorAndExit("Error reading name: %v", err)+ return+ }++ baseUrl, err := term.GetRequiredUserStringInput("Base URL:")+ if err != nil {+ term.OutputErrorAndExit("Error reading base URL: %v", err)+ return+ }+ baseUrl = strings.TrimSuffix(baseUrl, "/")++ skipAuth, err := term.ConfirmYesNo("Skip auth?")+ if err != nil {+ term.OutputErrorAndExit("Error reading skip auth: %v", err)+ return+ }++ var apiKeyEnvVar string+ if !skipAuth {+ apiKeyEnvVar, err = term.GetRequiredUserStringInput("API key env var:")+ if err != nil {+ term.OutputErrorAndExit("Error reading env var: %v", err)+ return+ }+ }++ provider := &shared.CustomProvider{+ Name: name,+ BaseUrl: baseUrl,+ SkipAuth: skipAuth,+ ApiKeyEnvVar: apiKeyEnvVar,+ }++ term.StartSpinner("")+ apiErr := api.Client.CreateCustomProvider(provider)+ term.StopSpinner()+ if apiErr != nil {+ term.OutputErrorAndExit("Error creating provider: %v", apiErr.Msg)+ return+ }++ fmt.Println("✅ Added custom provider", color.New(color.Bold, term.ColorHiCyan).Sprint(name))+}++func showProvider(cmd *cobra.Command, args []string) {+ auth.MustResolveAuthWithOrg()++ term.StartSpinner("")+ providers, apiErr := api.Client.ListCustomProviders()+ term.StopSpinner()+ if apiErr != nil {+ term.OutputErrorAndExit("Error fetching providers: %v", apiErr.Msg)+ return+ }++ if len(providers) == 0 {+ fmt.Println("🤷♂️ No custom providers")+ fmt.Println()+ term.PrintCmds("", "providers add")+ return+ }++ var selected *shared.CustomProvider+ if len(args) == 1 {+ input := args[0]+ idx, err := strconv.Atoi(input)+ if err == nil && idx > 0 && idx <= len(providers) {+ selected = providers[idx-1]+ } else {+ for _, p := range providers {+ if p.Name == input || p.Id == input {+ selected = p+ break+ }+ }+ }+ }++ if selected == nil {+ opts := make([]string, len(providers))+ for i, p := range providers {+ opts[i] = fmt.Sprintf("%s (%s)", p.Name, p.BaseUrl)+ }+ choice, err := term.SelectFromList("Select provider:", opts)+ if err != nil {+ term.OutputErrorAndExit("Error selecting provider: %v", err)+ return+ }+ for i, o := range opts {+ if o == choice {+ selected = providers[i]+ break+ }+ }+ }++ table := tablewriter.NewWriter(os.Stdout)+ table.SetAutoWrapText(false)+ table.SetHeader([]string{"Field", "Value"})+ table.Append([]string{"Name", selected.Name})+ table.Append([]string{"Base URL", selected.BaseUrl})+ table.Append([]string{"Skip Auth", fmt.Sprintf("%v", selected.SkipAuth)})+ table.Append([]string{"API Key Env Var", selected.ApiKeyEnvVar})+ if len(selected.ExtraAuthVars) > 0 {+ for i, v := range selected.ExtraAuthVars {+ label := fmt.Sprintf("Extra Auth %d", i+1)+ table.Append([]string{label, v.Var})+ }+ }+ table.Render()+ fmt.Println()+ term.PrintCmds("", "providers update", "providers list")+}++func updateProvider(cmd *cobra.Command, args []string) {+ auth.MustResolveAuthWithOrg()++ term.StartSpinner("")+ providers, apiErr := api.Client.ListCustomProviders()+ term.StopSpinner()+ if apiErr != nil {+ term.OutputErrorAndExit("Error fetching providers: %v", apiErr.Msg)+ return+ }++ if len(providers) == 0 {+ fmt.Println("🤷♂️ No custom providers")+ fmt.Println()+ term.PrintCmds("", "providers add")+ return+ }++ var selected *shared.CustomProvider+ if len(args) == 1 {+ input := args[0]+ idx, err := strconv.Atoi(input)+ if err == nil && idx > 0 && idx <= len(providers) {+ selected = providers[idx-1]+ } else {+ for _, p := range providers {+ if p.Name == input || p.Id == input {+ selected = p+ break+ }+ }+ }+ }++ if selected == nil {+ opts := make([]string, len(providers))+ for i, p := range providers {+ opts[i] = fmt.Sprintf("%s (%s)", p.Name, p.BaseUrl)+ }+ choice, err := term.SelectFromList("Select provider:", opts)+ if err != nil {+ term.OutputErrorAndExit("Error selecting provider: %v", err)+ return+ }+ for i, o := range opts {+ if o == choice {+ selected = providers[i]+ break+ }+ }+ }++ newName, err := term.GetRequiredUserStringInputWithDefault("Provider name:", selected.Name)+ if err != nil {+ term.OutputErrorAndExit("Error reading name: %v", err)+ return+ }++ newBaseUrl, err := term.GetRequiredUserStringInputWithDefault("Base URL:", selected.BaseUrl)+ if err != nil {+ term.OutputErrorAndExit("Error reading base URL: %v", err)+ return+ }+ newBaseUrl = strings.TrimSuffix(newBaseUrl, "/")++ newSkipAuth := selected.SkipAuth+ changeSkip, err := term.ConfirmYesNo("Change skip auth? (current: " + fmt.Sprintf("%v", selected.SkipAuth) + ")")+ if err == nil && changeSkip {+ newSkipAuth, err = term.ConfirmYesNo("Skip auth?")+ if err != nil {+ term.OutputErrorAndExit("Error reading skip auth: %v", err)+ return+ }+ }++ var newApiKeyEnvVar string+ if !newSkipAuth {+ newApiKeyEnvVar, err = term.GetRequiredUserStringInputWithDefault("API key env var:", selected.ApiKeyEnvVar)+ if err != nil {+ term.OutputErrorAndExit("Error reading env var: %v", err)+ return+ }+ }++ provider := &shared.CustomProvider{+ Id: selected.Id,+ Name: newName,+ BaseUrl: newBaseUrl,+ SkipAuth: newSkipAuth,+ ApiKeyEnvVar: newApiKeyEnvVar,+ ExtraAuthVars: selected.ExtraAuthVars,+ }++ term.StartSpinner("")+ apiErr = api.Client.UpdateCustomProvider(provider)+ term.StopSpinner()+ if apiErr != nil {+ term.OutputErrorAndExit("Error updating provider: %v", apiErr.Msg)+ return+ }++ fmt.Println("✅ Updated custom provider", color.New(color.Bold, term.ColorHiCyan).Sprint(newName))+}diff --git a/app/cli/cmd/models.go b/app/cli/cmd/models.goindex f99e20e4..0ad4f3ad 100644--- a/app/cli/cmd/models.go+++ b/app/cli/cmd/models.go@@ -19,8 +19,13 @@ import (var customModelsOnly bool+var allProperties bool+func init() {RootCmd.AddCommand(modelsCmd)++ modelsCmd.Flags().BoolVarP(&allProperties, "all", "a", false, "Show all properties")+modelsCmd.AddCommand(listAvailableModelsCmd)modelsCmd.AddCommand(createCustomModelCmd)modelsCmd.AddCommand(deleteCustomModelCmd)@@ -267,7 +272,7 @@ func createCustomModel(cmd *cobra.Command, args []string) {}for key, label := range outputFormatLabels {if label == res {- model.PreferredModelOutputFormat = shared.ModelOutputFormat(key)+ model.PreferredOutputFormat = shared.ModelOutputFormat(key)break}}@@ -324,7 +329,7 @@ func models(cmd *cobra.Command, args []string) {table.Render()fmt.Println()- renderSettings(settings)+ renderSettings(settings, allProperties)term.PrintCmds("", "set-model", "models available", "models default")}@@ -348,7 +353,7 @@ func defaultModels(cmd *cobra.Command, args []string) {table.Render()fmt.Println()- renderSettings(settings)+ renderSettings(settings, allProperties)term.PrintCmds("", "set-model default", "models available", "models")}@@ -369,12 +374,13 @@ func listAvailableModels(cmd *cobra.Command, args []string) {if !customModelsOnly {color.New(color.Bold, term.ColorHiCyan).Println("🏠 Built-in Models")- builtIn := shared.AvailableModelstable := tablewriter.NewWriter(os.Stdout)table.SetAutoWrapText(false)- table.SetHeader([]string{"Provider", "Name", "🪙", "🔑"})- for _, model := range builtIn {- table.Append([]string{string(model.Provider), string(model.ModelId), strconv.Itoa(model.MaxTokens), model.ApiKeyEnvVar})+ table.SetHeader([]string{"Model", "Input", "Output", "Reserved"})+ for _, modelId := range shared.BaseModelIds {+ model := shared.BuiltInBaseModelsById[modelId]++ table.Append([]string{string(modelId), fmt.Sprintf("%d 🪙", model.MaxTokens), fmt.Sprintf("%d 🪙", model.MaxOutputTokens), fmt.Sprintf("%d 🪙", model.ReservedOutputTokens)})}table.Render()fmt.Println()@@ -497,42 +503,44 @@ func deleteCustomModel(cmd *cobra.Command, args []string) {term.PrintCmds("", "models available", "models add")}-func renderSettings(settings *shared.PlanSettings) {+func renderSettings(settings *shared.PlanSettings, allProperties bool) {modelPack := settings.ModelPackcolor.New(color.Bold, term.ColorHiCyan).Println("🎛️ Current Model Pack")- renderModelPack(modelPack)+ renderModelPack(modelPack, allProperties)- color.New(color.Bold, term.ColorHiCyan).Println("🧠 Planner Defaults")- table := tablewriter.NewWriter(os.Stdout)- table.SetAutoWrapText(false)- table.SetHeader([]string{"Max Tokens", "Max Convo Tokens"})- table.Append([]string{- fmt.Sprintf("%d", modelPack.Planner.GetFinalLargeContextFallback().BaseModelConfig.MaxTokens),- fmt.Sprintf("%d", modelPack.Planner.MaxConvoTokens),- })- table.Render()- fmt.Println()+ if allProperties {+ color.New(color.Bold, term.ColorHiCyan).Println("🧠 Planner Defaults")+ table := tablewriter.NewWriter(os.Stdout)+ table.SetAutoWrapText(false)+ table.SetHeader([]string{"Max Tokens", "Max Convo Tokens"})+ table.Append([]string{+ fmt.Sprintf("%d", modelPack.Planner.GetFinalLargeContextFallback().GetSharedBaseConfig().MaxTokens),+ fmt.Sprintf("%d", modelPack.Planner.MaxConvoTokens),+ })+ table.Render()+ fmt.Println()- color.New(color.Bold, term.ColorHiCyan).Println("⚙️ Planner Overrides")- table = tablewriter.NewWriter(os.Stdout)- table.SetAutoWrapText(false)- table.SetHeader([]string{"Name", "Value"})- if settings.ModelOverrides.MaxTokens == nil {- table.Append([]string{"Max Tokens", "no override"})- } else {- table.Append([]string{"Max Tokens", fmt.Sprintf("%d", *settings.ModelOverrides.MaxTokens)})- }- if settings.ModelOverrides.MaxConvoTokens == nil {- table.Append([]string{"Max Convo Tokens", "no override"})- } else {- table.Append([]string{"Max Convo Tokens", fmt.Sprintf("%d", *settings.ModelOverrides.MaxConvoTokens)})+ color.New(color.Bold, term.ColorHiCyan).Println("⚙️ Planner Overrides")+ table = tablewriter.NewWriter(os.Stdout)+ table.SetAutoWrapText(false)+ table.SetHeader([]string{"Name", "Value"})+ if settings.ModelOverrides.MaxTokens == nil {+ table.Append([]string{"Max Tokens", "no override"})+ } else {+ table.Append([]string{"Max Tokens", fmt.Sprintf("%d", *settings.ModelOverrides.MaxTokens)})+ }+ if settings.ModelOverrides.MaxConvoTokens == nil {+ table.Append([]string{"Max Convo Tokens", "no override"})+ } else {+ table.Append([]string{"Max Convo Tokens", fmt.Sprintf("%d", *settings.ModelOverrides.MaxConvoTokens)})+ }+ table.Render()+ fmt.Println()}- table.Render()- fmt.Println()}-func renderModelPack(modelPack *shared.ModelPack) {+func renderModelPack(modelPack *shared.ModelPack, allProperties bool) {table := tablewriter.NewWriter(os.Stdout)table.SetAutoFormatHeaders(false)table.SetAutoWrapText(true)@@ -545,25 +553,37 @@ func renderModelPack(modelPack *shared.ModelPack) {color.New(color.Bold, term.ColorHiCyan).Println("🤖 Models")table = tablewriter.NewWriter(os.Stdout)table.SetAutoWrapText(false)- table.SetHeader([]string{"Role", "Provider", "Model", "Temperature", "Top P", "Max Input"})- table.SetColumnAlignment([]int{- tablewriter.ALIGN_LEFT, // Role- tablewriter.ALIGN_LEFT, // Provider- tablewriter.ALIGN_LEFT, // Model- tablewriter.ALIGN_RIGHT, // Temperature- tablewriter.ALIGN_RIGHT, // Top P- tablewriter.ALIGN_RIGHT, // Max Input- })+ cols := []string{+ "Role",+ "Model",+ }+ align := []int{+ tablewriter.ALIGN_LEFT, // Role+ tablewriter.ALIGN_LEFT, // Model+ }+ if allProperties {+ cols = append(cols, []string{+ "Temperature",+ "Top P",+ "Max Input",+ }...)+ align = append(align, []int{+ tablewriter.ALIGN_RIGHT, // Temperature+ tablewriter.ALIGN_RIGHT, // Top P+ tablewriter.ALIGN_RIGHT, // Max Input+ }...)+ }+ table.SetHeader(cols)+ table.SetColumnAlignment(align)anyRoleParamsDisabled := falseaddModelRow := func(role string, config shared.ModelRoleConfig) {-var temp float32var topP float32var disabled bool- if config.BaseModelConfig.RoleParamsDisabled {+ if config.GetSharedBaseConfig().RoleParamsDisabled {temp = 1topP = 1disabled = true@@ -583,19 +603,24 @@ func renderModelPack(modelPack *shared.ModelPack) {topPStr = "*" + topPStr}- table.Append([]string{+ row := []string{role,- string(config.BaseModelConfig.Provider),- string(config.BaseModelConfig.ModelId),- tempStr,- topPStr,- fmt.Sprintf("%d 🪙", config.BaseModelConfig.MaxTokens-config.GetReservedOutputTokens()),- })+ string(config.ModelId),+ }++ if allProperties {+ row = append(row, []string{+ tempStr,+ topPStr,+ fmt.Sprintf("%d 🪙", config.GetSharedBaseConfig().MaxTokens-config.GetReservedOutputTokens()),+ }...)+ }+ table.Append(row)// Add large context and large output fallback(s) if presentif config.LargeContextFallback != nil {- if config.LargeContextFallback.BaseModelConfig.RoleParamsDisabled {+ if config.LargeContextFallback.GetSharedBaseConfig().RoleParamsDisabled {temp = 1topP = 1disabled = true@@ -615,18 +640,23 @@ func renderModelPack(modelPack *shared.ModelPack) {topPStr = "*" + topPStr}- table.Append([]string{+ row = []string{"└─ large-context",- string(config.LargeContextFallback.BaseModelConfig.Provider),- string(config.LargeContextFallback.BaseModelConfig.ModelId),- tempStr,- topPStr,- fmt.Sprintf("%d 🪙", config.LargeContextFallback.BaseModelConfig.MaxTokens-config.LargeContextFallback.GetReservedOutputTokens()),- })+ string(config.LargeContextFallback.ModelId),+ }+ if allProperties {+ row = append(row, []string{+ tempStr,+ topPStr,+ fmt.Sprintf("%d 🪙", config.LargeContextFallback.GetSharedBaseConfig().MaxTokens-config.LargeContextFallback.GetReservedOutputTokens()),+ }...)+ }++ table.Append(row)}if config.LargeOutputFallback != nil {- if config.LargeOutputFallback.BaseModelConfig.RoleParamsDisabled {+ if config.LargeOutputFallback.GetSharedBaseConfig().RoleParamsDisabled {temp = 1topP = 1disabled = true@@ -646,22 +676,27 @@ func renderModelPack(modelPack *shared.ModelPack) {topPStr = "*" + topPStr}- table.Append([]string{+ row := []string{"└─ large-output",- string(config.LargeOutputFallback.BaseModelConfig.Provider),- string(config.LargeOutputFallback.BaseModelConfig.ModelId),- tempStr,- topPStr,- fmt.Sprintf("%d 🪙", config.LargeOutputFallback.BaseModelConfig.MaxTokens-config.LargeOutputFallback.GetReservedOutputTokens()),- })+ string(config.LargeOutputFallback.ModelId),+ }+ if allProperties {+ row = append(row, []string{+ tempStr,+ topPStr,+ fmt.Sprintf("%d 🪙", config.LargeOutputFallback.GetSharedBaseConfig().MaxTokens-config.LargeOutputFallback.GetReservedOutputTokens()),+ }...)+ }+ table.Append(row)}}+ // Handle planner separately since it has a different fallback structurevar temp float32var topP float32var disabled bool- if modelPack.Planner.BaseModelConfig.RoleParamsDisabled {+ if modelPack.Planner.GetSharedBaseConfig().RoleParamsDisabled {temp = 1topP = 1disabled = true@@ -681,21 +716,25 @@ func renderModelPack(modelPack *shared.ModelPack) {topPStr = "*" + topPStr}- // Handle planner separately since it has a different fallback structure- table.Append([]string{+ row := []string{string(shared.ModelRolePlanner),- string(modelPack.Planner.BaseModelConfig.Provider),- string(modelPack.Planner.BaseModelConfig.ModelId),- tempStr,- topPStr,- fmt.Sprintf("%d 🪙", modelPack.Planner.BaseModelConfig.MaxTokens-modelPack.Planner.GetReservedOutputTokens()),- })+ string(modelPack.Planner.ModelId),+ }+ if allProperties {+ row = append(row, []string{+ tempStr,+ topPStr,+ fmt.Sprintf("%d 🪙", modelPack.Planner.GetSharedBaseConfig().MaxTokens-modelPack.Planner.GetReservedOutputTokens()),+ }...)+ }+ table.Append(row)+if modelPack.Planner.LargeContextFallback != nil {var temp float32var topP float32var disabled bool- if modelPack.Planner.LargeContextFallback.BaseModelConfig.RoleParamsDisabled {+ if modelPack.Planner.LargeContextFallback.GetSharedBaseConfig().RoleParamsDisabled {temp = 1topP = 1disabled = true@@ -715,14 +754,18 @@ func renderModelPack(modelPack *shared.ModelPack) {topPStr = "*" + topPStr}- table.Append([]string{+ row := []string{"└─ large-context",- string(modelPack.Planner.LargeContextFallback.BaseModelConfig.Provider),- string(modelPack.Planner.LargeContextFallback.BaseModelConfig.ModelId),- tempStr,- topPStr,- fmt.Sprintf("%d 🪙", modelPack.Planner.LargeContextFallback.BaseModelConfig.MaxTokens-modelPack.Planner.LargeContextFallback.GetReservedOutputTokens()),- })+ string(modelPack.Planner.LargeContextFallback.ModelId),+ }+ if allProperties {+ row = append(row, []string{+ tempStr,+ topPStr,+ fmt.Sprintf("%d 🪙", modelPack.Planner.LargeContextFallback.GetSharedBaseConfig().MaxTokens-modelPack.Planner.LargeContextFallback.GetReservedOutputTokens()),+ }...)+ }+ table.Append(row)}addModelRow(string(shared.ModelRoleArchitect), modelPack.GetArchitect())@@ -735,7 +778,7 @@ func renderModelPack(modelPack *shared.ModelPack) {addModelRow(string(shared.ModelRoleExecStatus), modelPack.ExecStatus)table.Render()- if anyRoleParamsDisabled {+ if anyRoleParamsDisabled && allProperties {fmt.Println("* these models do not support changing temperature or top p")}diff --git a/app/cli/go.mod b/app/cli/go.modindex 65dc5ec3..817966dc 100644--- a/app/cli/go.mod+++ b/app/cli/go.mod@@ -3,9 +3,7 @@ module plandex-cligo 1.23.3require (- github.com/aws/aws-sdk-go-v2 v1.36.3github.com/aws/aws-sdk-go-v2/config v1.29.14- github.com/aws/aws-sdk-go-v2/credentials v1.17.67github.com/charmbracelet/lipgloss v1.0.0github.com/chromedp/cdproto v0.0.0-20250319231242-a755498943c8github.com/chromedp/chromedp v0.13.3@@ -31,6 +29,8 @@ require (github.com/alecthomas/chroma v0.10.0 // indirectgithub.com/andybalholm/cascadia v1.3.2 // indirectgithub.com/atotto/clipboard v0.1.4 // indirect+ github.com/aws/aws-sdk-go-v2 v1.36.3 // indirect+ github.com/aws/aws-sdk-go-v2/credentials v1.17.67 // indirectgithub.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirectgithub.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirectgithub.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect@@ -54,6 +54,7 @@ require (github.com/gobwas/pool v0.2.1 // indirectgithub.com/gobwas/ws v1.4.0 // indirectgithub.com/gorilla/css v1.0.1 // indirect+ github.com/jinzhu/copier v0.4.0 // indirectgithub.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirectgithub.com/lucasb-eyer/go-colorful v1.2.0 // indirectgithub.com/mattn/go-colorable v0.1.13 // indirectdiff --git a/app/cli/go.sum b/app/cli/go.sumindex 811f1fa4..f8c6554a 100644--- a/app/cli/go.sum+++ b/app/cli/go.sum@@ -524,6 +524,8 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytgithub.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=+github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8=+github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=diff --git a/app/cli/lib/model_settings.go b/app/cli/lib/model_settings.goindex a63f143f..5c95e8ff 100644--- a/app/cli/lib/model_settings.go+++ b/app/cli/lib/model_settings.go@@ -9,93 +9,24 @@ import (const GoBack = "← Go back"-func SelectModelForRole(customModels []*shared.AvailableModel, role shared.ModelRole, includeProviderGoBack bool) *shared.AvailableModel {- var providers []string- addedProviders := map[string]bool{}-- builtInModels := shared.FilterCompatibleModels(shared.AvailableModels, role)-- for _, m := range builtInModels {- var p string- if m.Provider == shared.ModelProviderCustom {- p = *m.CustomProvider- } else {- p = string(m.Provider)- }-- if !addedProviders[p] {- providers = append(providers, p)- addedProviders[p] = true- }- }-- customModels = shared.FilterCompatibleModels(customModels, role)-- for _, m := range customModels {- var p string- if m.Provider == shared.ModelProviderCustom {- p = *m.CustomProvider- } else {- p = string(m.Provider)- }-- if !addedProviders[p] {- providers = append(providers, p)- addedProviders[p] = true- }- }+func SelectModelForRole(customModels []*shared.CustomModel, role shared.ModelRole) *shared.CustomModel {+ builtInModels := shared.FilterAvailableCompatibleModels(shared.AvailableModels, role)+ customModels = shared.FilterCustomCompatibleModels(customModels, role)for {- var opts []string- opts = append(opts, providers...)- if includeProviderGoBack {- opts = append(opts, GoBack)- }- provider, err := term.SelectFromList("Select a provider:", opts)- if err != nil {- if err.Error() == "interrupt" {- return nil- }-- term.OutputErrorAndExit("Error selecting provider: %v", err)- return nil- }-- if provider == GoBack {- break- }-var selectableModels []*shared.AvailableModel- opts = []string{}+ opts := []string{}for _, m := range builtInModels {- var p string- if m.Provider == shared.ModelProviderCustom {- p = *m.CustomProvider- } else {- p = string(m.Provider)- }-- if p == provider {- label := fmt.Sprintf("%s | max %d 🪙", m.ModelString(), m.MaxTokens)- opts = append(opts, label)- selectableModels = append(selectableModels, m)- }+ label := fmt.Sprintf("%s | max %d 🪙", m.ModelString(), m.MaxTokens)+ opts = append(opts, label)+ selectableModels = append(selectableModels, m)}for _, m := range customModels {- var p string- if m.Provider == shared.ModelProviderCustom {- p = *m.CustomProvider- } else {- p = string(m.Provider)- }-- if p == provider {- label := fmt.Sprintf("%s → %s | max %d 🪙", p, m.ModelName, m.MaxTokens)- opts = append(opts, label)- selectableModels = append(selectableModels, m)- }+ label := fmt.Sprintf("%s → %s | max %d 🪙", p, m.ModelName, m.MaxTokens)+ opts = append(opts, label)+ selectableModels = append(selectableModels, m)}opts = append(opts, GoBack)diff --git a/app/cli/types/api.go b/app/cli/types/api.goindex f8aa9c5c..5efb9f3b 100644--- a/app/cli/types/api.go+++ b/app/cli/types/api.go@@ -103,10 +103,15 @@ type ApiClient interface {GetDefaultPlanConfig() (*shared.PlanConfig, *shared.ApiError)UpdateDefaultPlanConfig(req shared.UpdateDefaultPlanConfigRequest) *shared.ApiError- CreateCustomModel(model *shared.AvailableModel) *shared.ApiError- UpdateCustomModel(model *shared.AvailableModel) *shared.ApiError- ListCustomModels() ([]*shared.AvailableModel, *shared.ApiError)- DeleteAvailableModel(modelId string) *shared.ApiError+ CreateCustomModel(model *shared.CustomModel) *shared.ApiError+ UpdateCustomModel(model *shared.CustomModel) *shared.ApiError+ ListCustomModels() ([]*shared.CustomModel, *shared.ApiError)+ DeleteCustomModel(modelId string) *shared.ApiError++ CreateCustomProvider(provider *shared.CustomProvider) *shared.ApiError+ UpdateCustomProvider(provider *shared.CustomProvider) *shared.ApiError+ ListCustomProviders() ([]*shared.CustomProvider, *shared.ApiError)+ DeleteCustomProvider(providerId string) *shared.ApiErrorCreateModelPack(set *shared.ModelPack) *shared.ApiErrorUpdateModelPack(set *shared.ModelPack) *shared.ApiErrordiff --git a/app/plans/json-prompts-to-xml.md b/app/plans/json-prompts-to-xml.mdindex d4d8a55a..6825bfd6 100644--- a/app/plans/json-prompts-to-xml.md+++ b/app/plans/json-prompts-to-xml.md@@ -10,9 +10,9 @@ Look at 'build_exec.go' for an example of how to extract XML from a response.For each of the LLM calls:-- Before the call, you'll need to check the model config to see if the 'PreferredModelOutputFormat' field is set to xml/tool call json. We'll need to branch all the logic and prompts based on this.+- Before the call, you'll need to check the model config to see if the 'PreferredOutputFormat' field is set to xml/tool call json. We'll need to branch all the logic and prompts based on this.-- Add new prompting to output the same data using xml tags instead of a JSON function call if the model's 'PreferredModelOutputFormat' field is set to 'Xml'. do not use XML attributes, just simple tags. if there are multiple results in the json schema for the function call, update the prompt to output multiple tags. keep the rest of the prompts exactly the same. You can refactor shared aspects of the prompts between the xml version and the tool call json version.+- Add new prompting to output the same data using xml tags instead of a JSON function call if the model's 'PreferredOutputFormat' field is set to 'Xml'. do not use XML attributes, just simple tags. if there are multiple results in the json schema for the function call, update the prompt to output multiple tags. keep the rest of the prompts exactly the same. You can refactor shared aspects of the prompts between the xml version and the tool call json version.- Look at the corresponding prompts for the build (in prompt/build.go) and use similar language for outputting xml tags in the xml versions of prompts.diff --git a/app/server/db/data_models.go b/app/server/db/data_models.goindex 96dc593c..69866136 100644--- a/app/server/db/data_models.go+++ b/app/server/db/data_models.go@@ -1,6 +1,9 @@package dbimport (+ "database/sql/driver"+ "encoding/json"+ "fmt""time"shared "plandex-shared"@@ -328,58 +331,223 @@ func (modelPack *ModelPack) ToApi() *shared.ModelPack {}}-type AvailableModel struct {+// old version prior to 2.2.0 models refactor+// type AvailableModel struct {+// Id string `db:"id"`+// OrgId string `db:"org_id"`+// Provider shared.ModelProvider `db:"provider"`+// CustomProvider *string `db:"custom_provider"`+// BaseUrl string `db:"base_url"`+// ModelTag shared.ModelTag `db:"model_tag"`+// ModelId shared.ModelId `db:"model_id"`+// ModelName shared.ModelName `db:"model_name"`+// Description string `db:"description"`+// MaxTokens int `db:"max_tokens"`+// ApiKeyEnvVar string `db:"api_key_env_var"`+// DefaultMaxConvoTokens int `db:"default_max_convo_tokens"`+// MaxOutputTokens int `db:"max_output_tokens"`+// ReservedOutputTokens int `db:"reserved_output_tokens"`+// HasImageSupport bool `db:"has_image_support"`+// PreferredOutputFormat shared.ModelOutputFormat `db:"preferred_output_format"`+// CreatedAt time.Time `db:"created_at"`+// UpdatedAt time.Time `db:"updated_at"`+// }++type CustomModel struct {Id string `db:"id"`OrgId string `db:"org_id"`- Provider shared.ModelProvider `db:"provider"`- CustomProvider *string `db:"custom_provider"`- BaseUrl string `db:"base_url"`- ModelTag shared.ModelTag `db:"model_tag"`ModelId shared.ModelId `db:"model_id"`- ModelName shared.ModelName `db:"model_name"`+ Publisher shared.ModelPublisher `db:"publisher"`Description string `db:"description"`MaxTokens int `db:"max_tokens"`- ApiKeyEnvVar string `db:"api_key_env_var"`DefaultMaxConvoTokens int `db:"default_max_convo_tokens"`MaxOutputTokens int `db:"max_output_tokens"`ReservedOutputTokens int `db:"reserved_output_tokens"`HasImageSupport bool `db:"has_image_support"`PreferredOutputFormat shared.ModelOutputFormat `db:"preferred_output_format"`- CreatedAt time.Time `db:"created_at"`- UpdatedAt time.Time `db:"updated_at"`-}--func (model *AvailableModel) ToApi() *shared.AvailableModel {- return &shared.AvailableModel{- Id: model.Id,- BaseModelConfig: shared.BaseModelConfig{- ModelTag: model.ModelTag,- ModelId: model.ModelId,-- BaseModelShared: shared.BaseModelShared{- MaxTokens: model.MaxTokens,- MaxOutputTokens: model.MaxOutputTokens,- ReservedOutputTokens: model.ReservedOutputTokens,- ModelCompatibility: shared.ModelCompatibility{- HasImageSupport: model.HasImageSupport,- },- },- BaseModelProviderConfig: shared.BaseModelProviderConfig{- ModelName: model.ModelName,- ModelProviderConfigSchema: shared.ModelProviderConfigSchema{- Provider: model.Provider,- CustomProvider: model.CustomProvider,- BaseUrl: model.BaseUrl,- ApiKeyEnvVar: model.ApiKeyEnvVar,- },+ SystemPromptDisabled bool `db:"system_prompt_disabled"`+ RoleParamsDisabled bool `db:"role_params_disabled"`+ StopDisabled bool `db:"stop_disabled"`+ PredictedOutputEnabled bool `db:"predicted_output_enabled"`+ ReasoningEffortEnabled bool `db:"reasoning_effort_enabled"`+ ReasoningEffort shared.ReasoningEffort `db:"reasoning_effort"`+ IncludeReasoning bool `db:"include_reasoning"`+ ReasoningBudget int `db:"reasoning_budget"`+ SupportsCacheControl bool `db:"supports_cache_control"`+ // for anthropic, single message system prompt needs to be flipped to 'user'+ SingleMessageNoSystemPrompt bool `db:"single_message_no_system_prompt"`++ // for anthropic, token estimate padding percentage+ TokenEstimatePaddingPct float64 `db:"token_estimate_padding_pct"`++ Providers CustomModelProviders `db:"providers"`++ CreatedAt time.Time `db:"created_at"`+ UpdatedAt time.Time `db:"updated_at"`+}++func CustomModelFromApi(apiModel *shared.CustomModel) *CustomModel {+ providers := make(CustomModelProviders, len(apiModel.Providers))+ for i, provider := range apiModel.Providers {+ providers[i] = CustomModelUsesProvider{+ Provider: provider.Provider,+ CustomProvider: provider.CustomProvider,+ ModelName: provider.ModelName,+ }+ }+ dbModel := CustomModel{+ Id: apiModel.Id,+ ModelId: apiModel.ModelId,+ Publisher: apiModel.Publisher,+ Description: apiModel.Description,+ MaxTokens: apiModel.MaxTokens,+ HasImageSupport: apiModel.ModelCompatibility.HasImageSupport,+ DefaultMaxConvoTokens: apiModel.DefaultMaxConvoTokens,+ MaxOutputTokens: apiModel.MaxOutputTokens,+ ReservedOutputTokens: apiModel.ReservedOutputTokens,+ PreferredOutputFormat: apiModel.PreferredOutputFormat,+ SystemPromptDisabled: apiModel.SystemPromptDisabled,+ RoleParamsDisabled: apiModel.RoleParamsDisabled,+ StopDisabled: apiModel.StopDisabled,+ PredictedOutputEnabled: apiModel.PredictedOutputEnabled,+ IncludeReasoning: apiModel.IncludeReasoning,+ ReasoningEffortEnabled: apiModel.ReasoningEffortEnabled,+ ReasoningEffort: apiModel.ReasoningEffort,+ ReasoningBudget: apiModel.ReasoningBudget,+ SupportsCacheControl: apiModel.SupportsCacheControl,+ SingleMessageNoSystemPrompt: apiModel.SingleMessageNoSystemPrompt,+ TokenEstimatePaddingPct: apiModel.TokenEstimatePaddingPct,+ Providers: providers,+ }++ return &dbModel+}++func (model *CustomModel) ToApi() *shared.CustomModel {+ providers := make([]shared.BaseModelUsesProvider, len(model.Providers))+ for i, provider := range model.Providers {+ providers[i] = *provider.ToApi()+ }+ return &shared.CustomModel{+ Id: model.Id,+ ModelId: model.ModelId,+ Publisher: model.Publisher,+ Description: model.Description,+ BaseModelShared: shared.BaseModelShared{+ DefaultMaxConvoTokens: model.DefaultMaxConvoTokens,+ MaxTokens: model.MaxTokens,+ MaxOutputTokens: model.MaxOutputTokens,+ ReservedOutputTokens: model.ReservedOutputTokens,+ PreferredOutputFormat: model.PreferredOutputFormat,+ SystemPromptDisabled: model.SystemPromptDisabled,+ RoleParamsDisabled: model.RoleParamsDisabled,+ StopDisabled: model.StopDisabled,+ PredictedOutputEnabled: model.PredictedOutputEnabled,+ IncludeReasoning: model.IncludeReasoning,+ ReasoningEffortEnabled: model.ReasoningEffortEnabled,+ ReasoningEffort: model.ReasoningEffort,+ ReasoningBudget: model.ReasoningBudget,+ SupportsCacheControl: model.SupportsCacheControl,+ SingleMessageNoSystemPrompt: model.SingleMessageNoSystemPrompt,+ TokenEstimatePaddingPct: model.TokenEstimatePaddingPct,++ ModelCompatibility: shared.ModelCompatibility{+ HasImageSupport: model.HasImageSupport,},},- Description: model.Description,- DefaultMaxConvoTokens: model.DefaultMaxConvoTokens,- CreatedAt: model.CreatedAt,- UpdatedAt: model.UpdatedAt,+ Providers: providers,+ }+}++type ExtraAuthVars []shared.ModelProviderExtraAuthVars++func (e *ExtraAuthVars) Scan(src interface{}) error {+ if src == nil {+ return nil+ }++ switch s := src.(type) {+ case []byte:+ return json.Unmarshal(s, e)+ case string:+ return json.Unmarshal([]byte(s), e)+ default:+ return fmt.Errorf("unsupported data type: %T", src)+ }+}++func (e ExtraAuthVars) Value() (driver.Value, error) {+ return json.Marshal(e)+}++type CustomProvider struct {+ Id string `db:"id"`+ OrgId string `db:"org_id"`+ Name string `db:"name"`+ BaseUrl string `db:"base_url"`+ SkipAuth bool `db:"skip_auth"`+ ApiKeyEnvVar string `db:"api_key_env_var"`+ ExtraAuthVars ExtraAuthVars `db:"extra_auth_vars"`+ CreatedAt time.Time `db:"created_at"`+ UpdatedAt time.Time `db:"updated_at"`+}++func CustomProviderFromApi(apiProvider *shared.CustomProvider) *CustomProvider {+ return &CustomProvider{+ Id: apiProvider.Id,+ Name: apiProvider.Name,+ BaseUrl: apiProvider.BaseUrl,+ SkipAuth: apiProvider.SkipAuth,+ ApiKeyEnvVar: apiProvider.ApiKeyEnvVar,+ ExtraAuthVars: apiProvider.ExtraAuthVars,+ }+}++func (provider *CustomProvider) ToApi() *shared.CustomProvider {+ return &shared.CustomProvider{+ Id: provider.Id,+ Name: provider.Name,+ BaseUrl: provider.BaseUrl,+ SkipAuth: provider.SkipAuth,+ ApiKeyEnvVar: provider.ApiKeyEnvVar,+ ExtraAuthVars: provider.ExtraAuthVars,+ }+}++type CustomModelUsesProvider struct {+ Provider shared.ModelProvider `db:"provider"`+ CustomProvider *string `db:"custom_provider"`+ ModelName shared.ModelName `db:"model_name"`+}++func (usesProvider *CustomModelUsesProvider) ToApi() *shared.BaseModelUsesProvider {+ return &shared.BaseModelUsesProvider{+ Provider: usesProvider.Provider,+ ModelName: usesProvider.ModelName,+ CustomProvider: usesProvider.CustomProvider,+ }+}++type CustomModelProviders []CustomModelUsesProvider++func (providers *CustomModelProviders) Scan(src interface{}) error {+ if src == nil {+ return nil+ }++ switch s := src.(type) {+ case []byte:+ return json.Unmarshal(s, providers)+ case string:+ return json.Unmarshal([]byte(s), providers)}++ return fmt.Errorf("unsupported data type: %T", src)+}++func (providers *CustomModelProviders) Value() (driver.Value, error) {+ return json.Marshal(providers)}type DefaultPlanSettings struct {diff --git a/app/server/db/db.go b/app/server/db/db.goindex 8a6dc038..2d9b591a 100644--- a/app/server/db/db.go+++ b/app/server/db/db.go@@ -127,7 +127,7 @@ func migrationsUp(dir string) error {// Uncomment below (and update migration version) to reset migration state to a specific version after a failure// if os.Getenv("GOENV") == "development" {- // migrateVersion := 2025022000+ // migrateVersion := 2025051600// if err := m.Force(migrateVersion); err != nil {// return fmt.Errorf("error forcing migration version: %v", err)// }diff --git a/app/server/db/models.go b/app/server/db/models.goindex 2144456c..7b3e82a8 100644--- a/app/server/db/models.go+++ b/app/server/db/models.go@@ -1,54 +1,207 @@package dbimport (+ "database/sql""fmt")-func CreateCustomModel(model *AvailableModel) error {- query := `INSERT INTO custom_models (org_id, provider, custom_provider, base_url, model_name, model_id, description, max_tokens, api_key_env_var, default_max_convo_tokens, max_output_tokens, reserved_output_tokens, preferred_output_format, has_image_support) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14)+func CreateCustomModel(model *CustomModel) error {+ query := `INSERT INTO custom_models (+ org_id,+ model_id,+ publisher,+ description,+ max_tokens,+ default_max_convo_tokens,+ max_output_tokens,+ reserved_output_tokens,+ has_image_support,+ preferred_output_format,+ system_prompt_disabled,+ role_params_disabled,+ stop_disabled,+ predicted_output_enabled,+ reasoning_effort_enabled,+ reasoning_effort,+ include_reasoning,+ reasoning_budget,+ supports_cache_control,+ single_message_no_system_prompt,+ token_estimate_padding_pct,+ providers+ ) VALUES (+ $1,$2,$3,$4,$5,$6,$7,$8,$9,$10,+ $11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22+ )RETURNING id, created_at, updated_at`- err := Conn.QueryRow(query, model.OrgId, model.Provider, model.CustomProvider, model.BaseUrl, model.ModelName, model.ModelId, model.Description, model.MaxTokens, model.ApiKeyEnvVar, model.DefaultMaxConvoTokens, model.MaxOutputTokens, model.ReservedOutputTokens, model.PreferredOutputFormat, model.HasImageSupport).Scan(&model.Id, &model.CreatedAt, &model.UpdatedAt)- if err != nil {- return fmt.Errorf("error inserting new custom model: %v", err)- }+ return Conn.QueryRow(+ query,+ model.OrgId,+ model.ModelId,+ model.Publisher,+ model.Description,+ model.MaxTokens,+ model.DefaultMaxConvoTokens,+ model.MaxOutputTokens,+ model.ReservedOutputTokens,+ model.HasImageSupport,+ model.PreferredOutputFormat,+ model.SystemPromptDisabled,+ model.RoleParamsDisabled,+ model.StopDisabled,+ model.PredictedOutputEnabled,+ model.ReasoningEffortEnabled,+ model.ReasoningEffort,+ model.IncludeReasoning,+ model.ReasoningBudget,+ model.SupportsCacheControl,+ model.SingleMessageNoSystemPrompt,+ model.TokenEstimatePaddingPct,+ model.Providers,+ ).Scan(&model.Id, &model.CreatedAt, &model.UpdatedAt)+}- return nil+func UpdateCustomModel(model *CustomModel) error {+ query := `UPDATE custom_models SET+ model_id = $3,+ publisher = $4,+ description = $5,+ max_tokens = $6,+ default_max_convo_tokens = $7,+ max_output_tokens = $8,+ reserved_output_tokens = $9,+ has_image_support = $10,+ preferred_output_format = $11,+ system_prompt_disabled = $12,+ role_params_disabled = $13,+ stop_disabled = $14,+ predicted_output_enabled = $15,+ reasoning_effort_enabled = $16,+ reasoning_effort = $17,+ include_reasoning = $18,+ reasoning_budget = $19,+ supports_cache_control = $20,+ single_message_no_system_prompt = $21,+ token_estimate_padding_pct = $22,+ providers = $23+ WHERE id = $1 AND org_id = $2`++ _, err := Conn.Exec(+ query,+ model.Id,+ model.OrgId,+ model.ModelId,+ model.Publisher,+ model.Description,+ model.MaxTokens,+ model.DefaultMaxConvoTokens,+ model.MaxOutputTokens,+ model.ReservedOutputTokens,+ model.HasImageSupport,+ model.PreferredOutputFormat,+ model.SystemPromptDisabled,+ model.RoleParamsDisabled,+ model.StopDisabled,+ model.PredictedOutputEnabled,+ model.ReasoningEffortEnabled,+ model.ReasoningEffort,+ model.IncludeReasoning,+ model.ReasoningBudget,+ model.SupportsCacheControl,+ model.SingleMessageNoSystemPrompt,+ model.TokenEstimatePaddingPct,+ model.Providers,+ )+ return err}-func UpdateCustomModel(model *AvailableModel) error {- query := `UPDATE custom_models SET provider = $2, custom_provider = $3, base_url = $4, model_name = $5, model_id = $6, description = $7, max_tokens = $8, api_key_env_var = $9, default_max_convo_tokens = $10, max_output_tokens = $11, reserved_output_tokens = $12, preferred_output_format = $13, has_image_support = $14 WHERE id = $1`- _, err := Conn.Exec(query, model.Id, model.Provider, model.CustomProvider, model.BaseUrl, model.ModelName, model.ModelId, model.Description, model.MaxTokens, model.ApiKeyEnvVar, model.DefaultMaxConvoTokens, model.MaxOutputTokens, model.ReservedOutputTokens, model.PreferredOutputFormat, model.HasImageSupport)+func ListCustomModels(orgId string) ([]*CustomModel, error) {+ var models []*CustomModel+ err := Conn.Select(&models, `SELECT * FROM custom_models WHERE org_id = $1 ORDER BY created_at`, orgId)+ return models, err+}++func GetCustomModel(orgId, id string) (*CustomModel, error) {+ var model CustomModel+ err := Conn.Get(&model, `SELECT * FROM custom_models WHERE org_id = $1 AND id = $2`, orgId, id)if err != nil {- return fmt.Errorf("error updating custom model: %v", err)+ if err == sql.ErrNoRows {+ return nil, nil+ }+ return nil, err}-- return nil+ return &model, nil}-func ListCustomModels(orgId string) ([]*AvailableModel, error) {- var models []*AvailableModel+func DeleteCustomModel(orgId, id string) error {+ _, err := Conn.Exec(`DELETE FROM custom_models WHERE org_id = $1 AND id = $2`, orgId, id)+ return err+}- query := `SELECT * FROM custom_models WHERE org_id = $1`+func CreateCustomProvider(p *CustomProvider) error {+ query := `INSERT INTO custom_providers (+ org_id,+ name,+ base_url,+ skip_auth,+ api_key_env_var,+ extra_auth_vars+ ) VALUES ($1,$2,$3,$4,$5,$6)+ RETURNING id, created_at, updated_at`+ return Conn.QueryRow(+ query,+ p.OrgId,+ p.Name,+ p.BaseUrl,+ p.SkipAuth,+ p.ApiKeyEnvVar,+ p.ExtraAuthVars,+ ).Scan(&p.Id, &p.CreatedAt, &p.UpdatedAt)+}- err := Conn.Select(&models, query, orgId)+func UpdateCustomProvider(p *CustomProvider) error {+ query := `UPDATE custom_providers SET+ name = $3,+ base_url = $4,+ skip_auth = $5,+ api_key_env_var = $6,+ extra_auth_vars = $7+ WHERE id = $1 AND org_id = $2`+ _, err := Conn.Exec(+ query,+ p.Id,+ p.OrgId,+ p.Name,+ p.BaseUrl,+ p.SkipAuth,+ p.ApiKeyEnvVar,+ p.ExtraAuthVars,+ )+ return err+}+func GetCustomProvider(orgId, id string) (*CustomProvider, error) {+ var provider CustomProvider+ err := Conn.Get(&provider, `SELECT * FROM custom_providers WHERE org_id = $1 AND id = $2`, orgId, id)if err != nil {- return nil, fmt.Errorf("error fetching custom models: %v", err)+ if err == sql.ErrNoRows {+ return nil, nil+ }+ return nil, err}-- return models, nil+ return &provider, nil}-func DeleteAvailableModel(modelId string) error {- query := `DELETE FROM custom_models WHERE id = $1`- _, err := Conn.Exec(query, modelId)-- if err != nil {- return fmt.Errorf("error deleting custom model: %v", err)- }+func ListCustomProviders(orgId string) ([]*CustomProvider, error) {+ var providers []*CustomProvider+ err := Conn.Select(&providers, `SELECT * FROM custom_providers WHERE org_id = $1 ORDER BY name`, orgId)+ return providers, err+}- return nil+func DeleteCustomProvider(orgId, id string) error {+ _, err := Conn.Exec(`DELETE FROM custom_providers WHERE org_id = $1 AND id = $2`, orgId, id)+ return err}func CreateModelPack(ms *ModelPack) error {diff --git a/app/server/go.mod b/app/server/go.modindex 3183f7df..0a8830c6 100644--- a/app/server/go.mod+++ b/app/server/go.mod@@ -7,7 +7,7 @@ require (github.com/google/uuid v1.6.0github.com/gorilla/mux v1.8.1github.com/pkg/errors v0.9.1- github.com/sashabaranov/go-openai v1.38.1+ github.com/sashabaranov/go-openai v1.40.0plandex-shared v0.0.0-00010101000000-000000000000)@@ -17,6 +17,7 @@ require (github.com/godbus/dbus/v5 v5.1.0 // indirectgithub.com/hashicorp/errwrap v1.1.0 // indirectgithub.com/hashicorp/go-multierror v1.1.1 // indirect+ github.com/jinzhu/copier v0.4.0 // indirectgithub.com/jmespath/go-jmespath v0.4.0 // indirectgithub.com/mattn/go-colorable v0.1.14 // indirectgithub.com/mattn/go-isatty v0.0.20 // indirect@@ -29,22 +30,23 @@ require (github.com/shopspring/decimal v1.4.0 // indirectgithub.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af // indirectgo.uber.org/atomic v1.11.0 // indirect- golang.org/x/image v0.25.0 // indirect- golang.org/x/sys v0.29.0 // indirect+ golang.org/x/image v0.27.0 // indirect+ golang.org/x/sys v0.33.0 // indirectgopkg.in/yaml.v3 v3.0.1 // indirect)require (github.com/atotto/clipboard v0.1.4- github.com/aws/aws-sdk-go v1.55.6+ github.com/aws/aws-sdk-go v1.55.7github.com/fatih/color v1.18.0github.com/gen2brain/beeep v0.0.0-20240516210008-9c006672e7f4- github.com/golang-migrate/migrate/v4 v4.18.2+ github.com/golang-migrate/migrate/v4 v4.18.3github.com/jmoiron/sqlx v1.4.0github.com/lib/pq v1.10.9github.com/smacker/go-tree-sitter v0.0.0-20240827094217-dd81d9e9be82github.com/stretchr/testify v1.10.0- golang.org/x/net v0.34.0+ golang.org/x/mod v0.21.0+ golang.org/x/net v0.40.0)replace plandex-shared => ../shareddiff --git a/app/server/go.sum b/app/server/go.sumindex 925ac064..8e10a00a 100644--- a/app/server/go.sum+++ b/app/server/go.sum@@ -6,13 +6,13 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERogithub.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=-github.com/aws/aws-sdk-go v1.55.6 h1:cSg4pvZ3m8dgYcgqB97MrcdjUmZ1BeMYKUxMMB89IPk=-github.com/aws/aws-sdk-go v1.55.6/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=+github.com/aws/aws-sdk-go v1.55.7 h1:UJrkFq7es5CShfBwlWAC8DA077vp8PyVbQd3lqLiztE=+github.com/aws/aws-sdk-go v1.55.7/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=-github.com/dhui/dktest v0.4.4 h1:+I4s6JRE1yGuqflzwqG+aIaMdgXIorCf5P98JnaAWa8=-github.com/dhui/dktest v0.4.4/go.mod h1:4+22R4lgsdAXrDyaH4Nqx2JEz2hLp49MqQmm9HLCQhM=+github.com/dhui/dktest v0.4.5 h1:uUfYBIVREmj/Rw6MvgmqNAYzTiKOHJak+enB5Di73MM=+github.com/dhui/dktest v0.4.5/go.mod h1:tmcyeHDKagvlDrz7gDKq4UAJOLIfVZYkfD5OnHDwcCo=github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ=@@ -41,8 +41,8 @@ github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=-github.com/golang-migrate/migrate/v4 v4.18.2 h1:2VSCMz7x7mjyTXx3m2zPokOY82LTRgxK1yQYKo6wWQ8=-github.com/golang-migrate/migrate/v4 v4.18.2/go.mod h1:2CM6tJvn2kqPXwnXO/d3rAQYiyoIm180VsO8PRX6Rpk=+github.com/golang-migrate/migrate/v4 v4.18.3 h1:EYGkoOsvgHHfm5U/naS1RP/6PL/Xv3S4B/swMiAmDLs=+github.com/golang-migrate/migrate/v4 v4.18.3/go.mod h1:99BKpIi6ruaaXRM1A77eqZ+FWPQ3cfRa+ZVy5bmWMaY=github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=@@ -52,6 +52,8 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDYgithub.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=+github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8=+github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=@@ -92,8 +94,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNgithub.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=-github.com/sashabaranov/go-openai v1.38.1 h1:TtZabbFQZa1nEni/IhVtDF/WQjVqDgd+cWR5OeddzF8=-github.com/sashabaranov/go-openai v1.38.1/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=+github.com/sashabaranov/go-openai v1.40.0 h1:Peg9Iag5mUJtPW00aYatlsn97YML0iNULiLNe74iPrU=+github.com/sashabaranov/go-openai v1.40.0/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=github.com/smacker/go-tree-sitter v0.0.0-20240827094217-dd81d9e9be82 h1:6C8qej6f1bStuePVkLSFxoU22XBS165D3klxlzRg8F4=@@ -113,13 +115,15 @@ go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt3go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ=go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=-golang.org/x/image v0.25.0 h1:Y6uW6rH1y5y/LK1J8BPWZtr6yZ7hrsy6hFrXjgsc2fQ=-golang.org/x/image v0.25.0/go.mod h1:tCAmOEGthTtkalusGp1g3xa2gke8J6c2N565dTyl9Rs=-golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=-golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=+golang.org/x/image v0.27.0 h1:C8gA4oWU/tKkdCfYT6T2u4faJu3MeNS5O8UPWlPF61w=+golang.org/x/image v0.27.0/go.mod h1:xbdrClrAUway1MUTEZDq9mz/UpRwYAkFFNUslZtcB+g=+golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=+golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=+golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=+golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=+golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=+golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=diff --git a/app/server/handlers/auth_helpers.go b/app/server/handlers/auth_helpers.goindex 9d8a938e..6023a51b 100644--- a/app/server/handlers/auth_helpers.go+++ b/app/server/handlers/auth_helpers.go@@ -16,6 +16,7 @@ import (shared "plandex-shared""github.com/jmoiron/sqlx"+ "golang.org/x/mod/semver")func Authenticate(w http.ResponseWriter, r *http.Request, requireOrg bool) *types.ServerAuth {@@ -438,6 +439,27 @@ func ValidateAndSignIn(w http.ResponseWriter, r *http.Request, req shared.SignInreturn &resp, nil}+func requireMinClientVersion(w http.ResponseWriter, r *http.Request, minVersion string) bool {+ msg := fmt.Sprintf("Client version is too old for this endpoint. Please upgrade to version %s or later.", minVersion)++ version := r.Header.Get("X-Client-Version")+ if version == "" {+ http.Error(w, msg, http.StatusBadRequest)+ return false+ }++ if version == "development" {+ return true+ }++ if semver.Compare(version, minVersion) < 0 {+ http.Error(w, msg, http.StatusBadRequest)+ return false+ }++ return true+}+func execAuthenticate(w http.ResponseWriter, r *http.Request, requireOrg bool, raiseErr bool) *types.ServerAuth {log.Println("authenticating request")diff --git a/app/server/handlers/models.go b/app/server/handlers/models.goindex 5fc7c0e1..d8748e2b 100644--- a/app/server/handlers/models.go+++ b/app/server/handlers/models.go@@ -2,6 +2,7 @@ package handlersimport ("encoding/json"+ "fmt""log""net/http""os"@@ -12,6 +13,8 @@ import ("github.com/gorilla/mux")+const CustomModelsMinClientVersion = "2.2.0"+func CreateCustomModelHandler(w http.ResponseWriter, r *http.Request) {log.Println("Received request for CreateCustomModelHandler")@@ -20,38 +23,34 @@ func CreateCustomModelHandler(w http.ResponseWriter, r *http.Request) {return}- var model shared.AvailableModel+ if !requireMinClientVersion(w, r, CustomModelsMinClientVersion) {+ return+ }++ var model shared.CustomModelif err := json.NewDecoder(r.Body).Decode(&model); err != nil {log.Printf("Error decoding request body: %v\n", err)http.Error(w, "Invalid request body", http.StatusBadRequest)return}- if os.Getenv("IS_CLOUD") != "" && model.Provider == shared.ModelProviderCustom {- http.Error(w, "Custom model providers are not supported on Plandex Cloud", http.StatusBadRequest)+ if model.ModelId == "" {+ msg := "Model id is required"+ log.Println(msg)+ http.Error(w, msg, http.StatusBadRequest)return}- baseModelConfig := model.BaseModelConfig-- dbModel := &db.AvailableModel{- Id: model.Id,- OrgId: auth.OrgId,- Provider: baseModelConfig.Provider,- CustomProvider: baseModelConfig.CustomProvider,- BaseUrl: baseModelConfig.BaseUrl,- ModelId: baseModelConfig.ModelId,- ModelName: baseModelConfig.ModelName,- Description: model.Description,- MaxTokens: baseModelConfig.MaxTokens,- ApiKeyEnvVar: baseModelConfig.ApiKeyEnvVar,- HasImageSupport: baseModelConfig.ModelCompatibility.HasImageSupport,- DefaultMaxConvoTokens: model.DefaultMaxConvoTokens,- MaxOutputTokens: baseModelConfig.MaxOutputTokens,- ReservedOutputTokens: baseModelConfig.ReservedOutputTokens,- PreferredOutputFormat: baseModelConfig.PreferredModelOutputFormat,+ if shared.BuiltInBaseModelsById[model.ModelId] != nil {+ msg := fmt.Sprintf("%s is a built-in base model id, so it can't be used for a custom model", model.ModelId)+ log.Println(msg)+ http.Error(w, msg, http.StatusUnprocessableEntity)+ return}+ dbModel := db.CustomModelFromApi(&model)+ dbModel.OrgId = auth.OrgId+if err := db.CreateCustomModel(dbModel); err != nil {log.Printf("Error creating custom model: %v\n", err)http.Error(w, "Failed to create custom model: "+err.Error(), http.StatusInternalServerError)@@ -71,57 +70,34 @@ func UpdateCustomModelHandler(w http.ResponseWriter, r *http.Request) {return}- modelId := mux.Vars(r)["modelId"]+ if !requireMinClientVersion(w, r, CustomModelsMinClientVersion) {+ return+ }++ id := mux.Vars(r)["modelId"]- var model shared.AvailableModel+ var model shared.CustomModelif err := json.NewDecoder(r.Body).Decode(&model); err != nil {log.Printf("Error decoding request body: %v\n", err)http.Error(w, "Invalid request body", http.StatusBadRequest)return}- models, err := db.ListCustomModels(auth.OrgId)+ res, err := db.GetCustomModel(auth.OrgId, id)if err != nil {- log.Printf("Error fetching custom models: %v\n", err)- http.Error(w, "Failed to fetch custom models: "+err.Error(), http.StatusInternalServerError)+ log.Printf("Error fetching custom model: %v\n", err)+ http.Error(w, "Failed to fetch custom model: "+err.Error(), http.StatusInternalServerError)return}- found := false- for _, m := range models {- if m.Id == modelId {- found = true- break- }- }-- if !found {+ if res == nil {http.Error(w, "Custom model not found", http.StatusNotFound)return}- if os.Getenv("IS_CLOUD") != "" && model.Provider == shared.ModelProviderCustom {- http.Error(w, "Custom model providers are not supported on Plandex Cloud", http.StatusBadRequest)- return- }-- dbModel := &db.AvailableModel{- Id: modelId,- OrgId: auth.OrgId,- Provider: model.BaseModelConfig.Provider,- CustomProvider: model.BaseModelConfig.CustomProvider,- BaseUrl: model.BaseModelConfig.BaseUrl,- ModelId: model.BaseModelConfig.ModelId,- ModelName: model.BaseModelConfig.ModelName,- Description: model.Description,- MaxTokens: model.BaseModelConfig.MaxTokens,- ApiKeyEnvVar: model.BaseModelConfig.ApiKeyEnvVar,- HasImageSupport: model.BaseModelConfig.ModelCompatibility.HasImageSupport,- DefaultMaxConvoTokens: model.DefaultMaxConvoTokens,- MaxOutputTokens: model.BaseModelConfig.MaxOutputTokens,- ReservedOutputTokens: model.BaseModelConfig.ReservedOutputTokens,- PreferredOutputFormat: model.BaseModelConfig.PreferredModelOutputFormat,- }+ dbModel := db.CustomModelFromApi(&model)+ dbModel.Id = id+ dbModel.OrgId = auth.OrgIdif err := db.UpdateCustomModel(dbModel); err != nil {log.Printf("Error updating custom model: %v\n", err)@@ -134,6 +110,38 @@ func UpdateCustomModelHandler(w http.ResponseWriter, r *http.Request) {log.Println("Successfully updated custom model")}+func GetCustomModelHandler(w http.ResponseWriter, r *http.Request) {+ log.Println("Received request for GetCustomModelHandler")++ auth := Authenticate(w, r, true)+ if auth == nil {+ return+ }++ id := mux.Vars(r)["modelId"]++ res, err := db.GetCustomModel(auth.OrgId, id)+ if err != nil {+ log.Printf("Error fetching custom model: %v\n", err)+ http.Error(w, "Failed to fetch custom model: "+err.Error(), http.StatusInternalServerError)+ return+ }++ if res == nil {+ http.Error(w, "Custom model not found", http.StatusNotFound)+ return+ }++ err = json.NewEncoder(w).Encode(res.ToApi())+ if err != nil {+ log.Printf("Error encoding custom model: %v\n", err)+ http.Error(w, fmt.Sprintf("Error encoding custom model: %v", err), http.StatusInternalServerError)+ return+ }++ log.Println("Successfully fetched custom model")+}+func ListCustomModelsHandler(w http.ResponseWriter, r *http.Request) {log.Println("Received request for ListCustomModelsHandler")@@ -142,6 +150,10 @@ func ListCustomModelsHandler(w http.ResponseWriter, r *http.Request) {return}+ if !requireMinClientVersion(w, r, CustomModelsMinClientVersion) {+ return+ }+models, err := db.ListCustomModels(auth.OrgId)if err != nil {log.Printf("Error fetching custom models: %v\n", err)@@ -149,12 +161,22 @@ func ListCustomModelsHandler(w http.ResponseWriter, r *http.Request) {return}- json.NewEncoder(w).Encode(models)+ var apiList []*shared.CustomModel+ for _, m := range models {+ apiList = append(apiList, m.ToApi())+ }++ err = json.NewEncoder(w).Encode(apiList)+ if err != nil {+ log.Printf("Error encoding custom models: %v\n", err)+ http.Error(w, fmt.Sprintf("Error encoding custom models: %v", err), http.StatusInternalServerError)+ return+ }log.Println("Successfully fetched custom models")}-func DeleteAvailableModelHandler(w http.ResponseWriter, r *http.Request) {+func DeleteCustomModelHandler(w http.ResponseWriter, r *http.Request) {log.Println("Received request for DeleteAvailableModelHandler")auth := Authenticate(w, r, true)@@ -162,7 +184,11 @@ func DeleteAvailableModelHandler(w http.ResponseWriter, r *http.Request) {return}- modelId := mux.Vars(r)["modelId"]+ if !requireMinClientVersion(w, r, CustomModelsMinClientVersion) {+ return+ }++ id := mux.Vars(r)["modelId"]models, err := db.ListCustomModels(auth.OrgId)if err != nil {@@ -173,7 +199,7 @@ func DeleteAvailableModelHandler(w http.ResponseWriter, r *http.Request) {found := falsefor _, m := range models {- if m.Id == modelId {+ if m.Id == id {found = truebreak}@@ -184,7 +210,7 @@ func DeleteAvailableModelHandler(w http.ResponseWriter, r *http.Request) {return}- if err := db.DeleteAvailableModel(modelId); err != nil {+ if err := db.DeleteCustomModel(auth.OrgId, id); err != nil {log.Printf("Error deleting custom model: %v\n", err)http.Error(w, "Failed to delete custom model: "+err.Error(), http.StatusInternalServerError)return@@ -195,6 +221,144 @@ func DeleteAvailableModelHandler(w http.ResponseWriter, r *http.Request) {log.Println("Successfully deleted custom model")}+func CreateCustomProviderHandler(w http.ResponseWriter, r *http.Request) {+ auth := Authenticate(w, r, true)+ if auth == nil {+ return+ }++ if os.Getenv("IS_CLOUD") != "" {+ http.Error(w, "Custom model providers are not supported on Plandex Cloud", http.StatusBadRequest)+ return+ }++ var p shared.CustomProvider+ if err := json.NewDecoder(r.Body).Decode(&p); err != nil {+ http.Error(w, "invalid body", http.StatusBadRequest)+ return+ }++ dbP := db.CustomProviderFromApi(&p)+ dbP.OrgId = auth.OrgId++ if err := db.CreateCustomProvider(dbP); err != nil {+ http.Error(w, err.Error(), http.StatusInternalServerError)+ return+ }+ w.WriteHeader(http.StatusCreated)++ log.Println("Successfully created custom provider")+}++func UpdateCustomProviderHandler(w http.ResponseWriter, r *http.Request) {+ auth := Authenticate(w, r, true)+ if auth == nil {+ return+ }++ if os.Getenv("IS_CLOUD") != "" {+ http.Error(w, "Custom model providers are not supported on Plandex Cloud", http.StatusBadRequest)+ return+ }++ id := mux.Vars(r)["providerId"]++ var p shared.CustomProvider+ if err := json.NewDecoder(r.Body).Decode(&p); err != nil {+ http.Error(w, "invalid body", http.StatusBadRequest)+ return+ }+ p.Id = id++ dbP := db.CustomProviderFromApi(&p)+ dbP.OrgId = auth.OrgId++ if err := db.UpdateCustomProvider(dbP); err != nil {+ http.Error(w, err.Error(), http.StatusInternalServerError)+ return+ }+ w.WriteHeader(http.StatusOK)++ log.Println("Successfully updated custom provider")+}++func GetCustomProviderHandler(w http.ResponseWriter, r *http.Request) {+ auth := Authenticate(w, r, true)+ if auth == nil {+ return+ }++ id := mux.Vars(r)["providerId"]++ res, err := db.GetCustomProvider(auth.OrgId, id)+ if err != nil {+ http.Error(w, err.Error(), http.StatusInternalServerError)+ return+ }++ err = json.NewEncoder(w).Encode(res.ToApi())+ if err != nil {+ log.Printf("Error encoding custom provider: %v\n", err)+ http.Error(w, fmt.Sprintf("Error encoding custom provider: %v", err), http.StatusInternalServerError)+ return+ }++ log.Println("Successfully fetched custom provider")+}++func ListCustomProvidersHandler(w http.ResponseWriter, r *http.Request) {+ auth := Authenticate(w, r, true)+ if auth == nil {+ return+ }++ if os.Getenv("IS_CLOUD") != "" {+ http.Error(w, "Custom model providers are not supported on Plandex Cloud", http.StatusBadRequest)+ return+ }++ list, err := db.ListCustomProviders(auth.OrgId)+ if err != nil {+ http.Error(w, err.Error(), http.StatusInternalServerError)+ return+ }++ var apiList []*shared.CustomProvider+ for _, p := range list {+ apiList = append(apiList, p.ToApi())+ }++ err = json.NewEncoder(w).Encode(apiList)+ if err != nil {+ log.Printf("Error encoding custom providers: %v\n", err)+ http.Error(w, fmt.Sprintf("Error encoding custom providers: %v", err), http.StatusInternalServerError)+ return+ }++ log.Println("Successfully fetched custom providers")+}++func DeleteCustomProviderHandler(w http.ResponseWriter, r *http.Request) {+ auth := Authenticate(w, r, true)+ if auth == nil {+ return+ }++ if os.Getenv("IS_CLOUD") != "" {+ http.Error(w, "Custom model providers are not supported on Plandex Cloud", http.StatusBadRequest)+ return+ }++ id := mux.Vars(r)["providerId"]+ if err := db.DeleteCustomProvider(auth.OrgId, id); err != nil {+ http.Error(w, err.Error(), http.StatusInternalServerError)+ return+ }+ w.WriteHeader(http.StatusOK)++ log.Println("Successfully deleted custom provider")+}+func CreateModelPackHandler(w http.ResponseWriter, r *http.Request) {log.Println("Received request for CreateModelPackHandler")@@ -203,6 +367,10 @@ func CreateModelPackHandler(w http.ResponseWriter, r *http.Request) {return}+ if !requireMinClientVersion(w, r, CustomModelsMinClientVersion) {+ return+ }+var ms shared.ModelPackif err := json.NewDecoder(r.Body).Decode(&ms); err != nil {http.Error(w, "Invalid request body", http.StatusBadRequest)@@ -243,6 +411,10 @@ func UpdateModelPackHandler(w http.ResponseWriter, r *http.Request) {return}+ if !requireMinClientVersion(w, r, CustomModelsMinClientVersion) {+ return+ }+mpId := mux.Vars(r)["setId"]var ms shared.ModelPack@@ -306,6 +478,10 @@ func ListModelPacksHandler(w http.ResponseWriter, r *http.Request) {return}+ if !requireMinClientVersion(w, r, CustomModelsMinClientVersion) {+ return+ }+sets, err := db.ListModelPacks(auth.OrgId)if err != nil {log.Printf("Error fetching model packs: %v\n", err)@@ -332,6 +508,10 @@ func DeleteModelPackHandler(w http.ResponseWriter, r *http.Request) {return}+ if !requireMinClientVersion(w, r, CustomModelsMinClientVersion) {+ return+ }+mpId := mux.Vars(r)["setId"]packs, err := db.ListModelPacks(auth.OrgId)diff --git a/app/server/main.go b/app/server/main.goindex 3916f524..a6639522 100644--- a/app/server/main.go+++ b/app/server/main.go@@ -1,6 +1,7 @@package mainimport (+ "fmt""log""os""plandex-server/model"@@ -18,7 +19,10 @@ func main() {return router.HandleFunc(path, handler)})- model.EnsureLiteLLM(2)+ err := model.EnsureLiteLLM(2)+ if err != nil {+ panic(fmt.Sprintf("Failed to start LiteLLM proxy: %v", err))+ }setup.RegisterShutdownHook(func() {model.ShutdownLiteLLMServer()})diff --git a/app/server/migrations/2025051600_custom_models_refactor.down.sql b/app/server/migrations/2025051600_custom_models_refactor.down.sqlnew file mode 100644index 00000000..af33bdf3--- /dev/null+++ b/app/server/migrations/2025051600_custom_models_refactor.down.sql@@ -0,0 +1,4 @@+DROP TABLE IF EXISTS custom_models;+DROP TABLE IF EXISTS custom_providers;++ALTER TABLE custom_models_legacy RENAME TO custom_models;diff --git a/app/server/migrations/2025051600_custom_models_refactor.up.sql b/app/server/migrations/2025051600_custom_models_refactor.up.sqlnew file mode 100644index 00000000..6fbb1b03--- /dev/null+++ b/app/server/migrations/2025051600_custom_models_refactor.up.sql@@ -0,0 +1,107 @@++BEGIN;+ALTER TABLE custom_models RENAME TO custom_models_legacy;++CREATE TABLE IF NOT EXISTS custom_models (+ id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),+ org_id UUID NOT NULL REFERENCES orgs(id) ON DELETE CASCADE,++ model_id VARCHAR(255) NOT NULL,+ description TEXT,+ publisher VARCHAR(64) NOT NULL DEFAULT '',++ max_tokens INTEGER NOT NULL,+ default_max_convo_tokens INTEGER NOT NULL,+ max_output_tokens INTEGER NOT NULL,+ reserved_output_tokens INTEGER NOT NULL,++ has_image_support BOOLEAN NOT NULL DEFAULT FALSE,+ preferred_output_format VARCHAR(32) NOT NULL DEFAULT 'xml',++ system_prompt_disabled BOOLEAN NOT NULL DEFAULT FALSE,+ role_params_disabled BOOLEAN NOT NULL DEFAULT FALSE,+ stop_disabled BOOLEAN NOT NULL DEFAULT FALSE,+ predicted_output_enabled BOOLEAN NOT NULL DEFAULT FALSE,+ reasoning_effort_enabled BOOLEAN NOT NULL DEFAULT FALSE,+ reasoning_effort VARCHAR(32) NOT NULL DEFAULT '',+ include_reasoning BOOLEAN NOT NULL DEFAULT FALSE,+ reasoning_budget INTEGER NOT NULL DEFAULT 0,+ supports_cache_control BOOLEAN NOT NULL DEFAULT FALSE,+ single_message_no_system_prompt BOOLEAN NOT NULL DEFAULT FALSE,+ token_estimate_padding_pct FLOAT NOT NULL DEFAULT 0.0,++ providers JSON NOT NULL DEFAULT '[]',++ created_at TIMESTAMP NOT NULL DEFAULT NOW(),+ updated_at TIMESTAMP NOT NULL DEFAULT NOW()+);+CREATE INDEX IF NOT EXISTS cmv_org_idx ON custom_models(org_id);+CREATE UNIQUE INDEX IF NOT EXISTS cmv_unique_idx ON custom_models(org_id, model_id);++CREATE TRIGGER cmv_modtime BEFORE UPDATE ON custom_models+ FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();++CREATE TABLE IF NOT EXISTS custom_providers (+ id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),+ org_id UUID NOT NULL REFERENCES orgs(id) ON DELETE CASCADE,++ name VARCHAR(255) NOT NULL,+ base_url VARCHAR(255) NOT NULL,+ skip_auth BOOLEAN NOT NULL DEFAULT FALSE,+ api_key_env_var VARCHAR(255),++ extra_auth_vars JSON NOT NULL DEFAULT '[]',++ created_at TIMESTAMP NOT NULL DEFAULT NOW(),+ updated_at TIMESTAMP NOT NULL DEFAULT NOW()+);+CREATE INDEX IF NOT EXISTS cp_org_idx ON custom_providers(org_id);+CREATE UNIQUE INDEX IF NOT EXISTS cp_unique_idx ON custom_providers(org_id, name);+CREATE TRIGGER cp_modtime BEFORE UPDATE ON custom_providers+ FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();++/* ---- migrate base rows into the new custom_models ------------------ */+INSERT INTO custom_models (+ id, org_id, model_id, description,+ max_tokens, default_max_convo_tokens,+ max_output_tokens, reserved_output_tokens,+ has_image_support, preferred_output_format,++ providers, -- <-- aggregated JSON array+ created_at, updated_at+)+SELECT+ id, org_id, model_id, description,+ max_tokens, default_max_convo_tokens,+ max_output_tokens, reserved_output_tokens,+ has_image_support, preferred_output_format,++ /* -------- build a one-element providers array -------- */+ json_build_array(+ json_build_object(+ 'provider', provider,+ 'custom_provider', custom_provider,+ 'model_name', model_name+ )+ )::json,++ created_at, updated_at+FROM custom_models_legacy+ON CONFLICT (id) DO NOTHING;++/* ---- migrate unique custom providers ------------------------------- */+WITH src AS (+ SELECT DISTINCT+ org_id,+ custom_provider AS name,+ base_url,+ api_key_env_var+ FROM custom_models_legacy+ WHERE custom_provider IS NOT NULL+)+INSERT INTO custom_providers (org_id, name, base_url, api_key_env_var)+SELECT org_id, name, base_url, api_key_env_var+FROM src+ON CONFLICT (org_id, name) DO NOTHING;++COMMIT;\ No newline at end of filediff --git a/app/server/model/name.go b/app/server/model/name.goindex 74ba603a..1aee4fe6 100644--- a/app/server/model/name.go+++ b/app/server/model/name.go@@ -32,7 +32,7 @@ func GenPlanName(baseModelConfig := config.GetBaseModelConfig(authVars)var sysPrompt string- if baseModelConfig.PreferredModelOutputFormat == shared.ModelOutputFormatXml {+ if baseModelConfig.PreferredOutputFormat == shared.ModelOutputFormatXml {sysPrompt = prompts.SysPlanNameXml} else {sysPrompt = prompts.SysPlanName@@ -86,7 +86,7 @@ func GenPlanName(var planName stringcontent := modelRes.Content- if baseModelConfig.PreferredModelOutputFormat == shared.ModelOutputFormatXml {+ if baseModelConfig.PreferredOutputFormat == shared.ModelOutputFormatXml {planName = utils.GetXMLContent(content, "planName")if planName == "" {return "", fmt.Errorf("No planName tag found in XML response")@@ -127,7 +127,7 @@ func GenPipedDataName(baseModelConfig := config.GetBaseModelConfig(authVars)- if baseModelConfig.PreferredModelOutputFormat == shared.ModelOutputFormatXml {+ if baseModelConfig.PreferredOutputFormat == shared.ModelOutputFormatXml {sysPrompt = prompts.SysPipedDataNameXml} else {sysPrompt = prompts.SysPipedDataName@@ -181,7 +181,7 @@ func GenPipedDataName(var name stringcontent := modelRes.Content- if baseModelConfig.PreferredModelOutputFormat == shared.ModelOutputFormatXml {+ if baseModelConfig.PreferredOutputFormat == shared.ModelOutputFormatXml {name = utils.GetXMLContent(content, "name")if name == "" {return "", fmt.Errorf("No name tag found in XML response")@@ -222,7 +222,7 @@ func GenNoteName(baseModelConfig := config.GetBaseModelConfig(authVars)- if baseModelConfig.PreferredModelOutputFormat == shared.ModelOutputFormatXml {+ if baseModelConfig.PreferredOutputFormat == shared.ModelOutputFormatXml {sysPrompt = prompts.SysNoteNameXml} else {sysPrompt = prompts.SysNoteName@@ -276,7 +276,7 @@ func GenNoteName(var name stringcontent := modelRes.Content- if baseModelConfig.PreferredModelOutputFormat == shared.ModelOutputFormatXml {+ if baseModelConfig.PreferredOutputFormat == shared.ModelOutputFormatXml {name = utils.GetXMLContent(content, "name")if name == "" {return "", fmt.Errorf("No name tag found in XML response")diff --git a/app/server/model/plan/commit_msg.go b/app/server/model/plan/commit_msg.goindex fc43ed41..5ac7cc96 100644--- a/app/server/model/plan/commit_msg.go+++ b/app/server/model/plan/commit_msg.go@@ -45,7 +45,7 @@ func (state *activeTellStreamState) genPlanDescription() (*db.ConvoMessageDescrivar tools []openai.Toolvar toolChoice *openai.ToolChoice- if baseModelConfig.PreferredModelOutputFormat == shared.ModelOutputFormatXml {+ if baseModelConfig.PreferredOutputFormat == shared.ModelOutputFormatXml {sysPrompt = prompts.SysDescribeXml} else {sysPrompt = prompts.SysDescribe@@ -123,7 +123,7 @@ func (state *activeTellStreamState) genPlanDescription() (*db.ConvoMessageDescrivar commitMsg string- if baseModelConfig.PreferredModelOutputFormat == shared.ModelOutputFormatXml {+ if baseModelConfig.PreferredOutputFormat == shared.ModelOutputFormatXml {commitMsg = utils.GetXMLContent(content, "commitMsg")if commitMsg == "" {go notify.NotifyErr(notify.SeverityError, fmt.Errorf("no commitMsg tag found in XML response"))diff --git a/app/server/model/plan/exec_status.go b/app/server/model/plan/exec_status.goindex 95e5eb5d..2f7003f2 100644--- a/app/server/model/plan/exec_status.go+++ b/app/server/model/plan/exec_status.go@@ -119,11 +119,11 @@ func (state *activeTellStreamState) execStatusShouldContinue(currentMessage stri}prompt := prompts.GetExecStatusFinishedSubtask(prompts.GetExecStatusFinishedSubtaskParams{- UserPrompt: state.userPrompt,- CurrentSubtask: fullSubtask,- CurrentMessage: currentMessage,- PreviousMessages: previousMessages,- PreferredModelOutputFormat: baseModelConfig.PreferredModelOutputFormat,+ UserPrompt: state.userPrompt,+ CurrentSubtask: fullSubtask,+ CurrentMessage: currentMessage,+ PreviousMessages: previousMessages,+ PreferredOutputFormat: baseModelConfig.PreferredOutputFormat,})messages := []types.ExtendedChatMessage{@@ -161,7 +161,7 @@ func (state *activeTellStreamState) execStatusShouldContinue(currentMessage strivar reasoning stringvar subtaskFinished bool- if baseModelConfig.PreferredModelOutputFormat == shared.ModelOutputFormatXml {+ if baseModelConfig.PreferredOutputFormat == shared.ModelOutputFormatXml {reasoning = utils.GetXMLContent(content, "reasoning")subtaskFinishedStr := utils.GetXMLContent(content, "subtaskFinished")subtaskFinished = subtaskFinishedStr == "true"diff --git a/app/server/model/prompts/exec_status.go b/app/server/model/prompts/exec_status.goindex 01eb664a..d1fc1c6b 100644--- a/app/server/model/prompts/exec_status.go+++ b/app/server/model/prompts/exec_status.go@@ -46,11 +46,11 @@ The 'subtaskFinished' key is a boolean that indicates whether the current task hYou must always call 'didFinishSubtask'. Don't call any other function.`type GetExecStatusFinishedSubtaskParams struct {- UserPrompt string- CurrentSubtask string- CurrentMessage string- PreviousMessages []string- PreferredModelOutputFormat shared.ModelOutputFormat+ UserPrompt string+ CurrentSubtask string+ CurrentMessage string+ PreviousMessages []string+ PreferredOutputFormat shared.ModelOutputFormat}func GetExecStatusFinishedSubtask(params GetExecStatusFinishedSubtaskParams) string {@@ -58,10 +58,10 @@ func GetExecStatusFinishedSubtask(params GetExecStatusFinishedSubtaskParams) strcurrentSubtask := params.CurrentSubtaskcurrentMessage := params.CurrentMessagepreviousMessages := params.PreviousMessages- preferredModelOutputFormat := params.PreferredModelOutputFormat+ preferredOutputFormat := params.PreferredOutputFormatvar s string- if preferredModelOutputFormat == shared.ModelOutputFormatXml {+ if preferredOutputFormat == shared.ModelOutputFormatXml {s = SysExecStatusFinishedSubtaskXml} else {s = SysExecStatusFinishedSubtaskdiff --git a/app/server/routes/routes.go b/app/server/routes/routes.goindex 38573611..ed878597 100644--- a/app/server/routes/routes.go+++ b/app/server/routes/routes.go@@ -123,7 +123,7 @@ func addApiRoutes(r *mux.Router, prefix string) {HandlePlandexFn(r, prefix+"/projects/{projectId}/plans", false, handlers.CreatePlanHandler).Methods("POST")- HandlePlandexFn(r, prefix+"/projects/{projectId}/plans", false, handlers.CreatePlanHandler).Methods("DELETE")+ HandlePlandexFn(r, prefix+"/projects/{projectId}/plans", false, handlers.DeleteAllPlansHandler).Methods("DELETE")HandlePlandexFn(r, prefix+"/plans/{planId}", false, handlers.GetPlanHandler).Methods("GET")HandlePlandexFn(r, prefix+"/plans/{planId}", false, handlers.DeletePlanHandler).Methods("DELETE")@@ -164,8 +164,15 @@ func addApiRoutes(r *mux.Router, prefix string) {HandlePlandexFn(r, prefix+"/custom_models", false, handlers.ListCustomModelsHandler).Methods("GET")HandlePlandexFn(r, prefix+"/custom_models", false, handlers.CreateCustomModelHandler).Methods("POST")- HandlePlandexFn(r, prefix+"/custom_models/{modelId}", false, handlers.DeleteAvailableModelHandler).Methods("DELETE")+ HandlePlandexFn(r, prefix+"/custom_models/{modelId}", false, handlers.DeleteCustomModelHandler).Methods("DELETE")HandlePlandexFn(r, prefix+"/custom_models/{modelId}", false, handlers.UpdateCustomModelHandler).Methods("PUT")+ HandlePlandexFn(r, prefix+"/custom_models/{modelId}", false, handlers.GetCustomModelHandler).Methods("GET")++ HandlePlandexFn(r, prefix+"/custom_providers", false, handlers.ListCustomProvidersHandler).Methods("GET")+ HandlePlandexFn(r, prefix+"/custom_providers", false, handlers.CreateCustomProviderHandler).Methods("POST")+ HandlePlandexFn(r, prefix+"/custom_providers/{providerId}", false, handlers.DeleteCustomProviderHandler).Methods("DELETE")+ HandlePlandexFn(r, prefix+"/custom_providers/{providerId}", false, handlers.UpdateCustomProviderHandler).Methods("PUT")+ HandlePlandexFn(r, prefix+"/custom_providers/{providerId}", false, handlers.GetCustomProviderHandler).Methods("GET")HandlePlandexFn(r, prefix+"/model_sets", false, handlers.ListModelPacksHandler).Methods("GET")HandlePlandexFn(r, prefix+"/model_sets", false, handlers.CreateModelPackHandler).Methods("POST")diff --git a/app/shared/ai_models_available.go b/app/shared/ai_models_available.goindex 78904b0f..cc6805e2 100644--- a/app/shared/ai_models_available.go+++ b/app/shared/ai_models_available.go@@ -31,7 +31,7 @@ When checking for sufficient credits on Plandex Cloud, we use MaxOutputTokens-In'BaseUrl' is the base URL for the provider.-'PreferredModelOutputFormat' is the preferred output format for the model—currently either 'ModelOutputFormatToolCallJson' or 'ModelOutputFormatXml' — OpenAI models like JSON (and benefit from strict JSON schemas), while most other providers are unreliable for JSON generation and do better with XML, even if they claim to support JSON.+'PreferredOutputFormat' is the preferred output format for the model—currently either 'ModelOutputFormatToolCallJson' or 'ModelOutputFormatXml' — OpenAI models like JSON (and benefit from strict JSON schemas), while most other providers are unreliable for JSON generation and do better with XML, even if they claim to support JSON.'RoleParamsDisabled' is used to disable role-based parameters like temperature, top_p, etc. for the model—OpenAI early releases often don't allow changes to these.@@ -48,21 +48,21 @@ When checking for sufficient credits on Plandex Cloud, we use MaxOutputTokens-Invar BuiltInModels = []*BaseModelConfigSchema{{- ModelTag: "openai/o3",- Publisher: ModelPublisherOpenAI,- Description: "OpenAI o3",- DefaultMaxConvoTokens: 15000,+ ModelTag: "openai/o3",+ Publisher: ModelPublisherOpenAI,+ Description: "OpenAI o3",BaseModelShared: BaseModelShared{- MaxTokens: 200000,- MaxOutputTokens: 100000,- ReservedOutputTokens: 40000, // 25k for reasoning, 15k for output- ModelCompatibility: fullCompatibility,- PreferredModelOutputFormat: ModelOutputFormatXml,- SystemPromptDisabled: true,- RoleParamsDisabled: true,- ReasoningEffortEnabled: true,- StopDisabled: true,+ DefaultMaxConvoTokens: 15000,+ MaxTokens: 200000,+ MaxOutputTokens: 100000,+ ReservedOutputTokens: 40000, // 25k for reasoning, 15k for output+ ModelCompatibility: fullCompatibility,+ PreferredOutputFormat: ModelOutputFormatXml,+ SystemPromptDisabled: true,+ RoleParamsDisabled: true,+ ReasoningEffortEnabled: true,+ StopDisabled: true,},RequiresVariantOverrides: []string{@@ -109,22 +109,22 @@ var BuiltInModels = []*BaseModelConfigSchema{},},{- ModelTag: "openai/o4-mini",- Publisher: ModelPublisherOpenAI,- Description: "OpenAI o4-mini",- DefaultMaxConvoTokens: 10000,+ ModelTag: "openai/o4-mini",+ Publisher: ModelPublisherOpenAI,+ Description: "OpenAI o4-mini",BaseModelShared: BaseModelShared{- MaxTokens: 200000,- MaxOutputTokens: 100000,- ReservedOutputTokens: 40000, // 25k for reasoning, 15k for output- ModelCompatibility: fullCompatibility,- PreferredModelOutputFormat: ModelOutputFormatToolCallJson,- SystemPromptDisabled: true,- RoleParamsDisabled: true,- ReasoningEffortEnabled: true,- ReasoningEffort: ReasoningEffortHigh,- StopDisabled: true,+ DefaultMaxConvoTokens: 10000,+ MaxTokens: 200000,+ MaxOutputTokens: 100000,+ ReservedOutputTokens: 40000, // 25k for reasoning, 15k for output+ ModelCompatibility: fullCompatibility,+ PreferredOutputFormat: ModelOutputFormatToolCallJson,+ SystemPromptDisabled: true,+ RoleParamsDisabled: true,+ ReasoningEffortEnabled: true,+ ReasoningEffort: ReasoningEffortHigh,+ StopDisabled: true,},RequiresVariantOverrides: []string{@@ -174,17 +174,17 @@ var BuiltInModels = []*BaseModelConfigSchema{},{- ModelTag: "openai/gpt-4.1",- Publisher: ModelPublisherOpenAI,- Description: "OpenAI gpt-4.1",- DefaultMaxConvoTokens: 75000,+ ModelTag: "openai/gpt-4.1",+ Publisher: ModelPublisherOpenAI,+ Description: "OpenAI gpt-4.1",BaseModelShared: BaseModelShared{- MaxTokens: 1047576,- MaxOutputTokens: 32768,- ReservedOutputTokens: 32768,- ModelCompatibility: fullCompatibility,- PreferredModelOutputFormat: ModelOutputFormatToolCallJson,+ DefaultMaxConvoTokens: 75000,+ MaxTokens: 1047576,+ MaxOutputTokens: 32768,+ ReservedOutputTokens: 32768,+ ModelCompatibility: fullCompatibility,+ PreferredOutputFormat: ModelOutputFormatToolCallJson,},Providers: []BaseModelUsesProvider{@@ -204,17 +204,17 @@ var BuiltInModels = []*BaseModelConfigSchema{},{- ModelTag: "openai/gpt-4.1-mini",- Publisher: ModelPublisherOpenAI,- Description: "OpenAI gpt-4.1-mini",- DefaultMaxConvoTokens: 75000,+ ModelTag: "openai/gpt-4.1-mini",+ Publisher: ModelPublisherOpenAI,+ Description: "OpenAI gpt-4.1-mini",BaseModelShared: BaseModelShared{- MaxTokens: 1047576,- MaxOutputTokens: 32768,- ReservedOutputTokens: 32768,- ModelCompatibility: fullCompatibility,- PreferredModelOutputFormat: ModelOutputFormatToolCallJson,+ DefaultMaxConvoTokens: 75000,+ MaxTokens: 1047576,+ MaxOutputTokens: 32768,+ ReservedOutputTokens: 32768,+ ModelCompatibility: fullCompatibility,+ PreferredOutputFormat: ModelOutputFormatToolCallJson,},Providers: []BaseModelUsesProvider{@@ -234,17 +234,17 @@ var BuiltInModels = []*BaseModelConfigSchema{},{- ModelTag: "openai/gpt-4.1-nano",- Publisher: ModelPublisherOpenAI,- Description: "OpenAI gpt-4.1-nano",- DefaultMaxConvoTokens: 75000,+ ModelTag: "openai/gpt-4.1-nano",+ Publisher: ModelPublisherOpenAI,+ Description: "OpenAI gpt-4.1-nano",BaseModelShared: BaseModelShared{- MaxTokens: 1047576,- MaxOutputTokens: 32768,- ReservedOutputTokens: 32768,- ModelCompatibility: fullCompatibility,- PreferredModelOutputFormat: ModelOutputFormatToolCallJson,+ DefaultMaxConvoTokens: 75000,+ MaxTokens: 1047576,+ MaxOutputTokens: 32768,+ ReservedOutputTokens: 32768,+ ModelCompatibility: fullCompatibility,+ PreferredOutputFormat: ModelOutputFormatToolCallJson,},Providers: []BaseModelUsesProvider{@@ -264,22 +264,22 @@ var BuiltInModels = []*BaseModelConfigSchema{},{- ModelTag: "openai/o3-mini",- Publisher: ModelPublisherOpenAI,- Description: "OpenAI o3-mini",- DefaultMaxConvoTokens: 10000,+ ModelTag: "openai/o3-mini",+ Publisher: ModelPublisherOpenAI,+ Description: "OpenAI o3-mini",BaseModelShared: BaseModelShared{- MaxTokens: 200000,- MaxOutputTokens: 100000,- ReservedOutputTokens: 40000, // 25k for reasoning, 15k for output- ModelCompatibility: fullCompatibility,- PreferredModelOutputFormat: ModelOutputFormatToolCallJson,- SystemPromptDisabled: true,- RoleParamsDisabled: true,- ReasoningEffortEnabled: true,- ReasoningEffort: ReasoningEffortHigh,- StopDisabled: true,+ DefaultMaxConvoTokens: 10000,+ MaxTokens: 200000,+ MaxOutputTokens: 100000,+ ReservedOutputTokens: 40000, // 25k for reasoning, 15k for output+ ModelCompatibility: fullCompatibility,+ PreferredOutputFormat: ModelOutputFormatToolCallJson,+ SystemPromptDisabled: true,+ RoleParamsDisabled: true,+ ReasoningEffortEnabled: true,+ ReasoningEffort: ReasoningEffortHigh,+ StopDisabled: true,},RequiresVariantOverrides: []string{@@ -329,17 +329,17 @@ var BuiltInModels = []*BaseModelConfigSchema{},{- ModelTag: "anthropic/claude-3.7-sonnet",- Publisher: ModelPublisherAnthropic,- Description: "Anthropic Claude 3.7 Sonnet",- DefaultMaxConvoTokens: 15000,+ ModelTag: "anthropic/claude-3.7-sonnet",+ Publisher: ModelPublisherAnthropic,+ Description: "Anthropic Claude 3.7 Sonnet",BaseModelShared: BaseModelShared{+ DefaultMaxConvoTokens: 15000,MaxTokens: 200000,MaxOutputTokens: 128000,ReservedOutputTokens: 20000,SupportsCacheControl: true,- PreferredModelOutputFormat: ModelOutputFormatXml,+ PreferredOutputFormat: ModelOutputFormatXml,SingleMessageNoSystemPrompt: true,TokenEstimatePaddingPct: 0.10,},@@ -395,17 +395,17 @@ var BuiltInModels = []*BaseModelConfigSchema{},{- ModelTag: "anthropic/claude-3.5-sonnet",- Publisher: ModelPublisherAnthropic,- Description: "Anthropic Claude 3.5 Sonnet",- DefaultMaxConvoTokens: 15000,+ ModelTag: "anthropic/claude-3.5-sonnet",+ Publisher: ModelPublisherAnthropic,+ Description: "Anthropic Claude 3.5 Sonnet",BaseModelShared: BaseModelShared{+ DefaultMaxConvoTokens: 15000,MaxTokens: 200000,MaxOutputTokens: 128000,ReservedOutputTokens: 20000,SupportsCacheControl: true,- PreferredModelOutputFormat: ModelOutputFormatXml,+ PreferredOutputFormat: ModelOutputFormatXml,SingleMessageNoSystemPrompt: true,TokenEstimatePaddingPct: 0.10,},@@ -431,17 +431,17 @@ var BuiltInModels = []*BaseModelConfigSchema{},{- ModelTag: "anthropic/claude-3.5-haiku",- Publisher: ModelPublisherAnthropic,- Description: "Anthropic Claude 3.5 Haiku",- DefaultMaxConvoTokens: 15000,+ ModelTag: "anthropic/claude-3.5-haiku",+ Publisher: ModelPublisherAnthropic,+ Description: "Anthropic Claude 3.5 Haiku",BaseModelShared: BaseModelShared{+ DefaultMaxConvoTokens: 15000,MaxTokens: 200000,MaxOutputTokens: 8192,ReservedOutputTokens: 8192,SupportsCacheControl: true,- PreferredModelOutputFormat: ModelOutputFormatXml,+ PreferredOutputFormat: ModelOutputFormatXml,SingleMessageNoSystemPrompt: true,TokenEstimatePaddingPct: 0.10,},@@ -467,17 +467,17 @@ var BuiltInModels = []*BaseModelConfigSchema{},{- ModelTag: "google/gemini-pro-1.5",- Publisher: ModelPublisherGoogle,- Description: "Google Gemini 1.5 Pro",- DefaultMaxConvoTokens: 75000,+ ModelTag: "google/gemini-pro-1.5",+ Publisher: ModelPublisherGoogle,+ Description: "Google Gemini 1.5 Pro",BaseModelShared: BaseModelShared{- MaxTokens: 2000000,- MaxOutputTokens: 8192,- ReservedOutputTokens: 8192,+ DefaultMaxConvoTokens: 75000,+ MaxTokens: 2000000,+ MaxOutputTokens: 8192,+ ReservedOutputTokens: 8192,// SupportsCacheControl: true, // gemini now uses implicit caching- PreferredModelOutputFormat: ModelOutputFormatXml,+ PreferredOutputFormat: ModelOutputFormatXml,},Providers: []BaseModelUsesProvider{@@ -496,17 +496,17 @@ var BuiltInModels = []*BaseModelConfigSchema{},},{- ModelTag: "google/gemini-2.5-pro-preview",- Publisher: ModelPublisherGoogle,- Description: "Google Gemini 2.5 Pro (Preview)",- DefaultMaxConvoTokens: 75000,+ ModelTag: "google/gemini-2.5-pro-preview",+ Publisher: ModelPublisherGoogle,+ Description: "Google Gemini 2.5 Pro (Preview)",BaseModelShared: BaseModelShared{- MaxTokens: 1048576,- MaxOutputTokens: 65535,- ReservedOutputTokens: 65535,+ DefaultMaxConvoTokens: 75000,+ MaxTokens: 1048576,+ MaxOutputTokens: 65535,+ ReservedOutputTokens: 65535,// SupportsCacheControl: true, // gemini now uses implicit caching- PreferredModelOutputFormat: ModelOutputFormatXml,+ PreferredOutputFormat: ModelOutputFormatXml,},Providers: []BaseModelUsesProvider{@@ -525,16 +525,16 @@ var BuiltInModels = []*BaseModelConfigSchema{},},{- ModelTag: "google/gemini-2.5-pro-exp",- Publisher: ModelPublisherGoogle,- Description: "Google Gemini 2.5 Pro (Experimental)",- DefaultMaxConvoTokens: 75000,+ ModelTag: "google/gemini-2.5-pro-exp",+ Publisher: ModelPublisherGoogle,+ Description: "Google Gemini 2.5 Pro (Experimental)",BaseModelShared: BaseModelShared{- MaxTokens: 1048576,- MaxOutputTokens: 65535,- ReservedOutputTokens: 65535,- PreferredModelOutputFormat: ModelOutputFormatXml,+ DefaultMaxConvoTokens: 75000,+ MaxTokens: 1048576,+ MaxOutputTokens: 65535,+ ReservedOutputTokens: 65535,+ PreferredOutputFormat: ModelOutputFormatXml,},Providers: []BaseModelUsesProvider{@@ -553,17 +553,18 @@ var BuiltInModels = []*BaseModelConfigSchema{},},{- ModelTag: "google/gemini-2.5-flash-preview",- Publisher: ModelPublisherGoogle,- Description: "Google Gemini 2.5 Flash (Preview)",- DefaultMaxConvoTokens: 75000,+ ModelTag: "google/gemini-2.5-flash-preview",+ Publisher: ModelPublisherGoogle,+ Description: "Google Gemini 2.5 Flash (Preview)",BaseModelShared: BaseModelShared{+ DefaultMaxConvoTokens: 75000,+MaxTokens: 1048576,MaxOutputTokens: 65535,ReservedOutputTokens: 65535,// SupportsCacheControl: true, // gemini now uses implicit caching- PreferredModelOutputFormat: ModelOutputFormatXml,+ PreferredOutputFormat: ModelOutputFormatXml,},Providers: []BaseModelUsesProvider{@@ -583,16 +584,17 @@ var BuiltInModels = []*BaseModelConfigSchema{},{- ModelTag: "deepseek/v3-0324",- Publisher: ModelPublisherDeepSeek,- Description: "DeepSeek V3 (0324)",- DefaultMaxConvoTokens: 7500,+ ModelTag: "deepseek/v3-0324",+ Publisher: ModelPublisherDeepSeek,+ Description: "DeepSeek V3 (0324)",BaseModelShared: BaseModelShared{- MaxTokens: 64000,- MaxOutputTokens: 8192,- ReservedOutputTokens: 8192,- PreferredModelOutputFormat: ModelOutputFormatXml,+ DefaultMaxConvoTokens: 7500,++ MaxTokens: 64000,+ MaxOutputTokens: 8192,+ ReservedOutputTokens: 8192,+ PreferredOutputFormat: ModelOutputFormatXml,},Providers: []BaseModelUsesProvider{@@ -607,16 +609,17 @@ var BuiltInModels = []*BaseModelConfigSchema{},},{- ModelTag: "deepseek/r1",- Publisher: ModelPublisherDeepSeek,- Description: "DeepSeek R1",- DefaultMaxConvoTokens: 7500,+ ModelTag: "deepseek/r1",+ Publisher: ModelPublisherDeepSeek,+ Description: "DeepSeek R1",BaseModelShared: BaseModelShared{- MaxTokens: 64000,- MaxOutputTokens: 8192,- ReservedOutputTokens: 8192,- PreferredModelOutputFormat: ModelOutputFormatXml,+ DefaultMaxConvoTokens: 7500,++ MaxTokens: 64000,+ MaxOutputTokens: 8192,+ ReservedOutputTokens: 8192,+ PreferredOutputFormat: ModelOutputFormatXml,},Variants: []BaseModelConfigVariant{@@ -649,16 +652,17 @@ var BuiltInModels = []*BaseModelConfigSchema{},{- ModelTag: "perplexity/r1-1776",- Publisher: ModelPublisherPerplexity,- Description: "Perplexity R1-1776",- DefaultMaxConvoTokens: 7500,+ ModelTag: "perplexity/r1-1776",+ Publisher: ModelPublisherPerplexity,+ Description: "Perplexity R1-1776",BaseModelShared: BaseModelShared{- MaxTokens: 128000,- MaxOutputTokens: 128000,- ReservedOutputTokens: 30000,- PreferredModelOutputFormat: ModelOutputFormatXml,+ DefaultMaxConvoTokens: 7500,++ MaxTokens: 128000,+ MaxOutputTokens: 128000,+ ReservedOutputTokens: 30000,+ PreferredOutputFormat: ModelOutputFormatXml,},Variants: []BaseModelConfigVariant{@@ -684,16 +688,17 @@ var BuiltInModels = []*BaseModelConfigSchema{},},{- ModelTag: "perplexity/sonar-reasoning",- Description: "Perplexity Sonar Reasoning",- Publisher: ModelPublisherPerplexity,- DefaultMaxConvoTokens: 7500,+ ModelTag: "perplexity/sonar-reasoning",+ Description: "Perplexity Sonar Reasoning",+ Publisher: ModelPublisherPerplexity,BaseModelShared: BaseModelShared{- MaxTokens: 127000,- MaxOutputTokens: 127000,- ReservedOutputTokens: 30000,- PreferredModelOutputFormat: ModelOutputFormatXml,+ DefaultMaxConvoTokens: 7500,++ MaxTokens: 127000,+ MaxOutputTokens: 127000,+ ReservedOutputTokens: 30000,+ PreferredOutputFormat: ModelOutputFormatXml,},Variants: []BaseModelConfigVariant{@@ -720,16 +725,17 @@ var BuiltInModels = []*BaseModelConfigSchema{},{- ModelTag: "qwen/qwen-2.5-coder-32b-instruct",- Publisher: ModelPublisherQwen,- Description: "Qwen 2.5 Coder 32B (Instruct)",- DefaultMaxConvoTokens: 10000,+ ModelTag: "qwen/qwen-2.5-coder-32b-instruct",+ Publisher: ModelPublisherQwen,+ Description: "Qwen 2.5 Coder 32B (Instruct)",BaseModelShared: BaseModelShared{- MaxTokens: 128000,- MaxOutputTokens: 8192,- ReservedOutputTokens: 8192,- PreferredModelOutputFormat: ModelOutputFormatXml,+ DefaultMaxConvoTokens: 10000,++ MaxTokens: 128000,+ MaxOutputTokens: 8192,+ ReservedOutputTokens: 8192,+ PreferredOutputFormat: ModelOutputFormatXml,},Providers: []BaseModelUsesProvider{@@ -738,16 +744,16 @@ var BuiltInModels = []*BaseModelConfigSchema{},{- ModelTag: "qwen/qwen3-32b",- Publisher: ModelPublisherQwen,- Description: "Qwen 3-32B (Experimental)",- DefaultMaxConvoTokens: 15000, // feel free to raise once you test+ ModelTag: "qwen/qwen3-32b",+ Publisher: ModelPublisherQwen,+ Description: "Qwen 3-32B (Experimental)",BaseModelShared: BaseModelShared{- MaxTokens: 128000,- MaxOutputTokens: 16384,- ReservedOutputTokens: 16384,- PreferredModelOutputFormat: ModelOutputFormatXml,+ DefaultMaxConvoTokens: 15000,+ MaxTokens: 128000,+ MaxOutputTokens: 16384,+ ReservedOutputTokens: 16384,+ PreferredOutputFormat: ModelOutputFormatXml,// leave IncludeReasoning unset – Qwen3 has its own “thinking” mode but OR// exposes it via a special prompt key, not a flag},@@ -759,16 +765,16 @@ var BuiltInModels = []*BaseModelConfigSchema{},},{- ModelTag: "qwen/qwen3-8b",- Publisher: ModelPublisherQwen,- Description: "Qwen 3-8B (Experimental)",- DefaultMaxConvoTokens: 7500,+ ModelTag: "qwen/qwen3-8b",+ Publisher: ModelPublisherQwen,+ Description: "Qwen 3-8B (Experimental)",BaseModelShared: BaseModelShared{- MaxTokens: 32768,- MaxOutputTokens: 8192,- ReservedOutputTokens: 8192,- PreferredModelOutputFormat: ModelOutputFormatXml,+ DefaultMaxConvoTokens: 7500,+ MaxTokens: 32768,+ MaxOutputTokens: 8192,+ ReservedOutputTokens: 8192,+ PreferredOutputFormat: ModelOutputFormatXml,},Providers: []BaseModelUsesProvider{@@ -777,6 +783,7 @@ var BuiltInModels = []*BaseModelConfigSchema{},}+var BaseModelIds = []ModelId{}var BuiltInBaseModelsById = map[ModelId]*BaseModelConfigSchema{}var BuiltInModelProvidersByModelId = map[ModelId][]BaseModelUsesProvider{}@@ -806,6 +813,7 @@ func init() {BuiltInModelProvidersByModelId[modelId] = model.ProvidersBuiltInBaseModelsById[modelId] = model+ BaseModelIds = append(BaseModelIds, modelId)}}@@ -815,6 +823,7 @@ func init() {modelId := ModelId(string(model.ModelTag))BuiltInModelProvidersByModelId[modelId] = model.ProvidersBuiltInBaseModelsById[modelId] = model+ BaseModelIds = append(BaseModelIds, modelId)}}@@ -866,7 +875,7 @@ func init() {panic("base url is not set")}- if model.PreferredModelOutputFormat == "" {+ if model.PreferredOutputFormat == "" {spew.Dump(model)panic("preferred model output format is not set")}@@ -880,3 +889,11 @@ func GetAvailableModel(provider ModelProvider, modelId ModelId) *AvailableModelcompositeKey := string(provider) + "/" + string(modelId)return AvailableModelsByComposite[compositeKey]}++func GetBuiltInBaseModels() []*BaseModelConfigSchema {+ models := []*BaseModelConfigSchema{}+ for _, id := range BaseModelIds {+ models = append(models, BuiltInBaseModelsById[id])+ }+ return models+}diff --git a/app/shared/ai_models_compatibility.go b/app/shared/ai_models_compatibility.goindex df04e7c0..e2bd83f0 100644--- a/app/shared/ai_models_compatibility.go+++ b/app/shared/ai_models_compatibility.go@@ -16,9 +16,22 @@ var RequiredCompatibilityByRole = map[ModelRole]ModelCompatibility{ModelRoleWholeFileBuilder: {},}-func FilterCompatibleModels(models []*AvailableModel, role ModelRole) []*AvailableModel {+func FilterBuiltInCompatibleModels(models []*BaseModelConfigSchema, role ModelRole) []*BaseModelConfigSchema {// required := RequiredCompatibilityByRole[role]- var compatibleModels []*AvailableModel+ var compatibleModels []*BaseModelConfigSchema++ for _, model := range models {+ // no compatibility checks are needed in v2, but keeping this here in case compatibility checks are needed in the future++ compatibleModels = append(compatibleModels, model)+ }++ return compatibleModels+}++func FilterCustomCompatibleModels(models []*CustomModel, role ModelRole) []*CustomModel {+ // required := RequiredCompatibilityByRole[role]+ var compatibleModels []*CustomModelfor _, model := range models {// no compatibility checks are needed in v2, but keeping this here in case compatibility checks are needed in the futurediff --git a/app/shared/ai_models_custom.go b/app/shared/ai_models_custom.gonew file mode 100644index 00000000..fd2f80ff--- /dev/null+++ b/app/shared/ai_models_custom.go@@ -0,0 +1,32 @@+package shared++import "time"++type CustomModel struct {+ Id string `json:"id"`+ ModelId ModelId `json:"modelId"`+ Publisher ModelPublisher `json:"publisher"`+ Description string `json:"description"`++ BaseModelShared++ Providers []BaseModelUsesProvider `json:"providers"`++ CreatedAt time.Time `json:"createdAt"`+ UpdatedAt time.Time `json:"updatedAt"`+}++type CustomProvider struct {+ Id string `json:"id"`+ Name string `json:"name"`+ BaseUrl string `json:"baseUrl"`++ // for AWS Bedrock models+ HasAWSAuth bool `json:"hasAWSAuth,omitempty"`++ // for local models that don't require auth (ollama, etc.)+ SkipAuth bool `json:"skipAuth,omitempty"`++ ApiKeyEnvVar string `json:"apiKeyEnvVar,omitempty"`+ ExtraAuthVars []ModelProviderExtraAuthVars `json:"extraAuthVars,omitempty"`+}diff --git a/app/shared/ai_models_data_models.go b/app/shared/ai_models_data_models.goindex 43db62b5..f27108d0 100644--- a/app/shared/ai_models_data_models.go+++ b/app/shared/ai_models_data_models.go@@ -26,23 +26,24 @@ type ModelTag stringtype VariantTag stringtype BaseModelShared struct {- MaxTokens int `json:"maxTokens"`- MaxOutputTokens int `json:"maxOutputTokens"`- ReservedOutputTokens int `json:"reservedOutputTokens"`- PreferredModelOutputFormat ModelOutputFormat `json:"preferredModelOutputFormat"`- SystemPromptDisabled bool `json:"systemPromptDisabled"`- RoleParamsDisabled bool `json:"roleParamsDisabled"`- StopDisabled bool `json:"stopDisabled"`- PredictedOutputEnabled bool `json:"predictedOutputEnabled"`- ReasoningEffortEnabled bool `json:"reasoningEffortEnabled"`- ReasoningEffort ReasoningEffort `json:"reasoningEffort"`- IncludeReasoning bool `json:"includeReasoning"`- ReasoningBudget int `json:"reasoningBudget"`- SupportsCacheControl bool `json:"supportsCacheControl"`+ DefaultMaxConvoTokens int `json:"defaultMaxConvoTokens"`+ MaxTokens int `json:"maxTokens"`+ MaxOutputTokens int `json:"maxOutputTokens"`+ ReservedOutputTokens int `json:"reservedOutputTokens"`+ PreferredOutputFormat ModelOutputFormat `json:"preferredOutputFormat"`+ SystemPromptDisabled bool `json:"systemPromptDisabled"`+ RoleParamsDisabled bool `json:"roleParamsDisabled"`+ StopDisabled bool `json:"stopDisabled"`+ PredictedOutputEnabled bool `json:"predictedOutputEnabled"`+ ReasoningEffortEnabled bool `json:"reasoningEffortEnabled"`+ ReasoningEffort ReasoningEffort `json:"reasoningEffort"`+ IncludeReasoning bool `json:"includeReasoning"`+ ReasoningBudget int `json:"reasoningBudget"`+ SupportsCacheControl bool `json:"supportsCacheControl"`// for anthropic, single message system prompt needs to be flipped to 'user'SingleMessageNoSystemPrompt bool `json:"singleMessageNoSystemPrompt"`- // for openai, token estimate padding percentage+ // for anthropic, token estimate padding percentageTokenEstimatePaddingPct float64 `json:"tokenEstimatePaddingPct"`ModelCompatibility@@ -75,10 +76,10 @@ func (b BaseModelUsesProvider) ToComposite() string {}type BaseModelConfigSchema struct {- ModelTag ModelTag `json:"modelTag"`- Publisher ModelPublisher `json:"publisher"`- Description string `json:"description"`- DefaultMaxConvoTokens int `json:"defaultMaxConvoTokens"`+ ModelTag ModelTag `json:"modelTag"`+ Publisher ModelPublisher `json:"publisher"`+ Description string `json:"description"`+BaseModelSharedRequiresVariantOverrides []string `json:"requiresVariantOverrides"`diff --git a/app/shared/ai_models_packs.go b/app/shared/ai_models_packs.goindex 33dcb81d..9309841b 100644--- a/app/shared/ai_models_packs.go+++ b/app/shared/ai_models_packs.go@@ -145,7 +145,7 @@ func init() {ReasoningPackSchema = ModelPackSchema{Name: "reasoning",- Description: "Same blend, but Sonnet:thinking with visible reasoning.",+ Description: "Like the daily driver, but uses 3.7-sonnet:thinking with reasoning enabled for planning and coding. Supports up to 160k input context.",Planner: getModelRoleConfig(ModelRolePlanner, "anthropic/claude-3.7-sonnet-thinking-hidden"),Coder: Pointer(getModelRoleConfig(ModelRoleCoder, "anthropic/claude-3.7-sonnet-thinking-hidden")),PlanSummary: getModelRoleConfig(ModelRolePlanSummary, "openai/o4-mini-low", getErrorFallback("openai/o3-mini-low")),diff --git a/app/shared/ai_models_providers.go b/app/shared/ai_models_providers.goindex 8787e4ce..823ca44b 100644--- a/app/shared/ai_models_providers.go+++ b/app/shared/ai_models_providers.go@@ -70,7 +70,7 @@ var AllModelProviders = []string{type ModelProviderExtraAuthVars struct {Var string `json:"var"`- MaybeJSONFilePath bool `json:"isFilePath,omitempty"`+ MaybeJSONFilePath bool `json:"maybeJSONFilePath,omitempty"`Required bool `json:"required,omitempty"`Default string `json:"default,omitempty"`}diff --git a/app/shared/json-schemas/available-model-packs.schema.json b/app/shared/json-schemas/available-model-packs.schema.jsondeleted file mode 100644index e85edf24..00000000--- a/app/shared/json-schemas/available-model-packs.schema.json+++ /dev/null@@ -1,18 +0,0 @@-{- "$schema": "https://json-schema.org/draft/2020-12/schema",- "$id": "https://plandex.ai/schemas/available-model-packs.schema.json",- "title": "Available Model Packs",- "description": "A list of available model packs",- "type": "object",- "properties": {- "modelPacks": {- "type": "array",- "items": {- "$ref": "./model-pack-config.schema.json"- }- }- },- "required": [- "modelPacks"- ]-}\ No newline at end of filediff --git a/app/shared/json-schemas/available-models.schema.json b/app/shared/json-schemas/available-models.schema.jsondeleted file mode 100644index 4c80d61e..00000000--- a/app/shared/json-schemas/available-models.schema.json+++ /dev/null@@ -1,18 +0,0 @@-{- "$schema": "https://json-schema.org/draft/2020-12/schema",- "$id": "https://plandex.ai/schemas/available-models.schema.json",- "title": "Available Models",- "description": "A list of available models",- "type": "object",- "properties": {- "models": {- "type": "array",- "items": {- "$ref": "./model-config.schema.json"- }- }- },- "required": [- "models"- ]-}\ No newline at end of filediff --git a/app/shared/json-schemas/model-config.schema.json b/app/shared/json-schemas/model-config.schema.jsonindex e8656972..4fc92a35 100644--- a/app/shared/json-schemas/model-config.schema.json+++ b/app/shared/json-schemas/model-config.schema.json@@ -5,7 +5,10 @@"description": "Config for a model","type": "object","properties": {- "modelTag": {+ "modelId": {+ "type": "string"+ },+ "publisher": {"type": "string"},"description": {@@ -23,7 +26,7 @@"reservedOutputTokens": {"type": "number"},- "preferredModelOutputFormat": {+ "preferredOutputFormat": {"type": "string","enum": ["xml",@@ -42,6 +45,15 @@"predictedOutputEnabled": {"type": "boolean"},+ "includeReasoning": {+ "type": "boolean"+ },+ "reasoningBudget": {+ "type": "number"+ },+ "hasImageSupport": {+ "type": "boolean"+ },"reasoningEffortEnabled": {"type": "boolean"},@@ -109,12 +121,12 @@}},"required": [- "modelTag",- "description",+ "modelId",+ "defaultMaxConvoTokens","maxTokens","maxOutputTokens","reservedOutputTokens",- "preferredModelOutputFormat",+ "preferredOutputFormat","providers"]}\ No newline at end of filediff --git a/app/shared/json-schemas/model-provider-config.schema.json b/app/shared/json-schemas/model-provider-config.schema.jsonindex 0cb8c4f7..3a79fcef 100644--- a/app/shared/json-schemas/model-provider-config.schema.json+++ b/app/shared/json-schemas/model-provider-config.schema.json@@ -29,11 +29,14 @@"var": {"type": "string"},- "isFilePath": {+ "maybeJSONFilePath": {"type": "boolean"},"required": {"type": "boolean"+ },+ "default": {+ "type": "string"}},"required": [diff --git a/app/shared/json-schemas/model-role-config.schema.json b/app/shared/json-schemas/model-role-config.schema.jsonindex e57fd7ff..0170bb3a 100644--- a/app/shared/json-schemas/model-role-config.schema.json+++ b/app/shared/json-schemas/model-role-config.schema.json@@ -8,7 +8,7 @@"role": {"$ref": "./definitions/model-roles.schema.json"},- "modelTag": {+ "modelId": {"type": "string"},"temperature": {@@ -38,6 +38,6 @@},"required": ["role",- "modelTag"+ "modelId"]}\ No newline at end of filediff --git a/app/shared/json/available_model_packs.json b/app/shared/json/available_model_packs.jsondeleted file mode 100644index e69de29b..00000000diff --git a/app/shared/json/available_models.json b/app/shared/json/available_models.jsondeleted file mode 100644index 74b61c2a..00000000--- a/app/shared/json/available_models.json+++ /dev/null@@ -1,28 +0,0 @@-{- "$schema": "../json-schemas/available-models.schema.json",- "models": [- {- "description": "OpenAI o3-high",- "modelTag": "openai/o3-high",- "maxTokens": 200000,- "maxOutputTokens": 100000,- "reservedOutputTokens": 40000,- "apiKeyEnvVar": "OPENAI_API_KEY",- "modelCompatibility": {- "hasImageSupport": true- },- "preferredModelOutputFormat": "xml",- "systemPromptDisabled": true,- "roleParamsDisabled": true,- "reasoningEffortEnabled": true,- "reasoningEffort": "high",- "stopDisabled": true,- "providers": [- {- "provider": "openai",- "modelName": "o3"- }- ]- }- ]-}\ No newline at end of file