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
set-model --json, better DSL for models JSON config, improvements to model settings update log messages, general refactoring of model packs to enable simpler config
Dane Schneider41ab888fe1fc
diff --git a/app/cli/cmd/model_helpers.go b/app/cli/cmd/model_helpers.gonew file mode 100644index 00000000..5ff95e0d--- /dev/null+++ b/app/cli/cmd/model_helpers.go@@ -0,0 +1,87 @@+package cmd++import (+ "fmt"+ "os"+ "plandex-cli/lib"+ "plandex-cli/term"++ "github.com/fatih/color"+)++func warnModelsFileLocalChanges(path, cmd string) (bool, error) {+ cmdPrefix := "\\"+ if !term.IsRepl {+ cmdPrefix = "plandex "+ }++ color.New(color.Bold, term.ColorHiYellow).Println("⚠️ The models file has local changes")++ fmt.Println()+ fmt.Println("Path → " + path)+ fmt.Println()++ fmt.Println("If you continue, local changes will be dropped in favor of the latest server state")++ fmt.Println()+ fmt.Printf("To keep the local version instead, quit and run %s\n", color.New(color.Bold, color.BgCyan, color.FgHiWhite).+ Sprintf(" %s%s --save ", cmdPrefix, cmd))+ fmt.Println()+ return term.ConfirmYesNo("Drop local changes and continue?")++}++type maybePromptAndOpenModelsFileResult struct {+ shouldReturn bool+ jsonData []byte+}++func maybePromptAndOpenModelsFile(filePath, pathArg, cmd string) maybePromptAndOpenModelsFileResult {++ printManual := func() {+ cmdPrefix := "\\"+ if !term.IsRepl {+ cmdPrefix = "plandex "+ }+ fmt.Println("To save changes, run " ++ fmt.Sprintf(" %s ", color.New(color.Bold, color.BgCyan, color.FgHiWhite).+ Sprintf(" %s%s --save%s ", cmdPrefix, cmd, pathArg)))+ }++ selectedEditor := lib.MaybePromptAndOpen(filePath)++ if selectedEditor {+ fmt.Println("📝 Opened in editor")+ fmt.Println()++ confirmed, err := term.ConfirmYesNo("Ready to save?")+ if err != nil {+ term.OutputErrorAndExit("Error confirming: %v", err)+ return maybePromptAndOpenModelsFileResult{shouldReturn: true}+ }++ if !confirmed {+ fmt.Println("🙅♂️ Update canceled")+ fmt.Println()++ printManual()+ return maybePromptAndOpenModelsFileResult{shouldReturn: true}+ }++ // get updated file state+ jsonData, err := os.ReadFile(filePath)+ if err != nil {+ term.OutputErrorAndExit("Error reading JSON file: %v", err)+ return maybePromptAndOpenModelsFileResult{shouldReturn: true}+ }++ return maybePromptAndOpenModelsFileResult{shouldReturn: false, jsonData: jsonData}+ } else {+ // No editor available or user chose manual+ fmt.Println("👨💻 Edit the file in your JSON editor of choice")+ fmt.Println()++ printManual()+ return maybePromptAndOpenModelsFileResult{shouldReturn: true}+ }+}diff --git a/app/cli/cmd/models.go b/app/cli/cmd/models.goindex 27527a0d..2e7192d8 100644--- a/app/cli/cmd/models.go+++ b/app/cli/cmd/models.go@@ -4,9 +4,7 @@ import ("encoding/json""fmt""os"- "os/exec""path/filepath"- "sort""strings""plandex-cli/api"@@ -179,11 +177,6 @@ func manageCustomModels(cmd *cobra.Command, args []string) {}hashPath := customModelsPath + ".hash"- cmdPrefix := "\\"- if !term.IsRepl {- cmdPrefix = "plandex "- }-exists := false_, err := os.Stat(customModelsPath)if err == nil {@@ -233,68 +226,64 @@ func manageCustomModels(cmd *cobra.Command, args []string) {fmt.Println("👨💻 Edit it, then come back here to save")fmt.Println()} else {- localJsonData, err := os.ReadFile(customModelsPath)- if err != nil {- term.OutputErrorAndExit("Error reading JSON file: %v", err)- return- }-+ serverClientModelsInput := serverModelsInput.ToClientModelsInput()+ serverClientModelsInput.PrepareUpdate()+ var localClientModelsInput shared.ClientModelsInputvar localModelsInput shared.ModelsInput- err = json.Unmarshal(localJsonData, &localModelsInput)- if err != nil {- term.OutputErrorAndExit("Error unmarshalling JSON file: %v", err)- return- }+ var localJsonData []byte- // we only do a conflict check on the default path in the home dir- // if user specifies the path and the file exists, just open the file without checking for conflicts- var currentHash string- if usingDefaultPath {- lastSavedHash, err := os.ReadFile(hashPath)- if err != nil && !os.IsNotExist(err) {- term.OutputErrorAndExit("Error reading hash file: %v", err)+ if exists {+ localJsonData, err = os.ReadFile(customModelsPath)+ if err != nil {+ term.OutputErrorAndExit("Error reading JSON file: %v", err)return}- currentHash, err = localModelsInput.Hash()+ err = json.Unmarshal(localJsonData, &localClientModelsInput)if err != nil {- term.OutputErrorAndExit("Error hashing models: %v", err)+ term.OutputErrorAndExit("Error unmarshalling JSON file: %v", err)return}- if currentHash != string(lastSavedHash) {- term.StopSpinner()- color.New(color.Bold, term.ColorHiYellow).Println("⚠️ The models file has local changes")-- fmt.Println()- fmt.Println("Path → " + customModelsPath)- fmt.Println()+ localModelsInput = localClientModelsInput.ToModelsInput()- fmt.Println("If you continue, local changes will be dropped in favor of the latest server state")+ // we only do a conflict check on the default path in the home dir+ // if user specifies the path and the file exists, just open the file without checking for conflicts+ var currentHash string+ if usingDefaultPath {+ lastSavedHash, err := os.ReadFile(hashPath)+ if err != nil && !os.IsNotExist(err) {+ term.OutputErrorAndExit("Error reading hash file: %v", err)+ return+ }- fmt.Println()- fmt.Printf("To keep the local version instead, quit and run %s\n", color.New(color.Bold, color.BgCyan, color.FgHiWhite).- Sprintf(" %smodels custom --save ", cmdPrefix))- fmt.Println()- res, err := term.ConfirmYesNo("Drop local changes and continue?")+ currentHash, err = localModelsInput.Hash()if err != nil {- term.OutputErrorAndExit("Error confirming: %v", err)+ term.OutputErrorAndExit("Error hashing models: %v", err)return}- if !res {- return++ if currentHash != string(lastSavedHash) {+ term.StopSpinner()++ res, err := warnModelsFileLocalChanges(customModelsPath, "models custom")+ if err != nil {+ term.OutputErrorAndExit("Error confirming: %v", err)+ return+ }+ if !res {+ return+ }+ fmt.Println()+ term.StartSpinner("")}- fmt.Println()- term.StartSpinner("")}}- serverModelsInput.PrepareUpdate()-if serverModelsInput.Equals(localModelsInput) {jsonData = localJsonData} else {- jsonData, err = json.MarshalIndent(serverModelsInput, "", " ")+ jsonData, err = json.MarshalIndent(serverClientModelsInput, "", " ")if err != nil {term.OutputErrorAndExit("Error marshalling models: %v", err)return@@ -305,14 +294,19 @@ func manageCustomModels(cmd *cobra.Command, args []string) {term.OutputErrorAndExit("Error writing file: %v", err)return}- }- if currentHash != "" {- err = os.WriteFile(hashPath, []byte(currentHash), 0644)+ hash, err := serverModelsInput.Hash()+ if err != nil {+ term.OutputErrorAndExit("Error hashing models: %v", err)+ return+ }++ err = os.WriteFile(hashPath, []byte(hash), 0644)if err != nil {term.OutputErrorAndExit("Error writing hash file: %v", err)return}+}term.StopSpinner()@@ -326,51 +320,17 @@ func manageCustomModels(cmd *cobra.Command, args []string) {if !usingDefaultPath {pathArg = fmt.Sprintf(" --file %s", customModelsPath)}- printManual := func() {- fmt.Println("To save changes, run " +- fmt.Sprintf(" %s ", color.New(color.Bold, color.BgCyan, color.FgHiWhite).- Sprintf(" %smodels custom --save%s ", cmdPrefix, pathArg)))- }-- selectedEditor := maybePromptAndOpen(customModelsPath)-- if selectedEditor {- fmt.Println("📝 Opened in editor")- fmt.Println()-- confirmed, err := term.ConfirmYesNo("Ready to save?")- if err != nil {- term.OutputErrorAndExit("Error confirming: %v", err)- return- }-- if !confirmed {- fmt.Println("🙅♂️ Update canceled")- fmt.Println()-- printManual()- return- }- // get updated file state- jsonData, err = os.ReadFile(customModelsPath)- if err != nil {- term.OutputErrorAndExit("Error reading JSON file: %v", err)- return- }- } else {- // No editor available or user chose manual- fmt.Println("👨💻 Edit the file in your JSON editor of choice")- fmt.Println()-- printManual()+ res := maybePromptAndOpenModelsFile(customModelsPath, pathArg, "models custom")+ if res.shouldReturn {return}+ jsonData = res.jsonData}term.StartSpinner("")- modelsInput, err := schema.ValidateModelsInputJSON(jsonData)+ clientModelsInput, err := schema.ValidateModelsInputJSON(jsonData)if err != nil {term.StopSpinner()color.New(color.Bold, term.ColorHiRed).Println("🚨 Error validating JSON file")@@ -378,6 +338,8 @@ func manageCustomModels(cmd *cobra.Command, args []string) {return}+ modelsInput := clientModelsInput.ToModelsInput()+noDuplicates, errMsg := modelsInput.CheckNoDuplicates()if !noDuplicates {term.StopSpinner()@@ -392,7 +354,7 @@ func manageCustomModels(cmd *cobra.Command, args []string) {fmt.Println("🤷♂️ No changes to custom models/providers/model packs")}- if modelsInput.IsEmpty() {+ if modelsInput.Equals(*serverModelsInput) {printNoChanges()return}@@ -423,13 +385,13 @@ func manageCustomModels(cmd *cobra.Command, args []string) {inputModelIds := map[string]bool{}inputProviderNames := map[string]bool{}inputModelPackNames := map[string]bool{}- for _, model := range modelsInput.CustomModels {+ for _, model := range clientModelsInput.CustomModels {inputModelIds[string(model.ModelId)] = true}- for _, provider := range modelsInput.CustomProviders {+ for _, provider := range clientModelsInput.CustomProviders {inputProviderNames[provider.Name] = true}- for _, modelPack := range modelsInput.CustomModelPacks {+ for _, modelPack := range clientModelsInput.CustomModelPacks {inputModelPackNames[modelPack.Name] = true}@@ -559,13 +521,14 @@ func defaultModels(cmd *cobra.Command, args []string) {term.StartSpinner("")settings, err := api.Client.GetOrgDefaultSettings()- term.StopSpinner()if err != nil {term.OutputErrorAndExit("Error getting default model settings: %v", err)return}+ term.StopSpinner()+title := fmt.Sprintf("%s Model Settings", color.New(color.Bold, term.ColorHiGreen).Sprint("Org-Wide Default"))table := tablewriter.NewWriter(os.Stdout)table.SetAutoWrapText(false)@@ -630,7 +593,7 @@ func listAvailableModels(cmd *cobra.Command, args []string) {}func renderSettings(settings *shared.PlanSettings, allProperties bool) {- modelPack := settings.ModelPack+ modelPack := settings.GetModelPack()color.New(color.Bold, term.ColorHiCyan).Println("🎛️ Current Model Pack")renderModelPack(modelPack, allProperties)@@ -646,23 +609,6 @@ func renderSettings(settings *shared.PlanSettings, allProperties bool) {})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)})- }- table.Render()- fmt.Println()}}@@ -796,146 +742,7 @@ func customModelsNotImplemented(cmd *cobra.Command, args []string) {os.Exit(1)}-type editorCandidate struct {- name string- cmd string- args []string- isJetBrains bool-}--const maxEditorOpts = 5--func detectEditors() []editorCandidate {- guess := []editorCandidate{- // Popular non-JetBrains launchers- {"VS Code", "code", nil, false},- {"Cursor", "cursor", nil, false},- {"Zed", "zed", nil, false},- {"Neovim", "nvim", nil, false},-- // JetBrains IDE-specific launchers- {"IntelliJ IDEA", "idea", nil, true},- {"GoLand", "goland", nil, true},- {"PyCharm", "pycharm", nil, true},- {"CLion", "clion", nil, true},- {"WebStorm", "webstorm", nil, true},- {"PhpStorm", "phpstorm", nil, true},- {"DataGrip", "datagrip", nil, true},- {"RubyMine", "rubymine", nil, true},- {"Rider", "rider", nil, true},- {"DataSpell", "dataspell", nil, true},-- // JetBrains universal CLI (2023.2+)- {"JetBrains (jb)", "jb", []string{"open"}, true},-- {"Vim", "vim", nil, false},- {"Nano", "nano", nil, false},- {"Helix", "hx", nil, false},- {"Micro", "micro", nil, false},- {"Sublime Text", "subl", nil, false},- {"TextMate", "mate", nil, false},- {"Kakoune", "kak", nil, false},- {"Emacs", "emacs", nil, false},- {"Kate", "kate", nil, false},- }- pref := map[string]bool{}- for _, env := range []string{"VISUAL", "EDITOR"} {- if v := os.Getenv(env); v != "" {- // keep only the binary name, drop path/flags- cmd := filepath.Base(strings.Fields(v)[0])- pref[cmd] = true- }- }-- _, err := exec.LookPath("jb") // true if universal launcher exists- jbOnPath := err == nil-- var found []editorCandidate- for _, c := range guess {- if _, err := exec.LookPath(c.cmd); err != nil {- continue // not on PATH- }-- // If jb is present, drop per-IDE launchers *unless* this exact cmd- // is marked preferred by VISUAL/EDITOR.- if jbOnPath && c.isJetBrains && !pref[c.cmd] {- continue- }- found = append(found, c)- }-- for cmd := range pref {- if _, err := exec.LookPath(cmd); err == nil {- already := false- for _, c := range found {- if c.cmd == cmd {- already = true- break- }- }- if !already {- found = append(found, editorCandidate{name: cmd, cmd: cmd})- }- }- }- sort.SliceStable(found, func(i, j int) bool {- pi, pj := pref[found[i].cmd], pref[found[j].cmd]- if pi == pj {- return false // keep original order- }- return pi // true → i comes before j- })- if len(found) > maxEditorOpts {- found = found[:maxEditorOpts]- }-- return found-}--func maybePromptAndOpen(path string) bool {- editors := detectEditors()- if len(editors) == 0 {- // just exit if there are no editors available- return false- }- opts := []string{}- for _, c := range editors {- opts = append(opts, "Open with "+c.name)- }-- const openManually = "Open manually"- opts = append(opts, openManually)-- choice, err := term.SelectFromList("Open the file now?", opts)- if err != nil {- term.OutputErrorAndExit("Error selecting editor: %v", err)- }-- if choice == openManually {- return false- }-- var idx int- for i, c := range opts {- if c == choice {- idx = i- break- }- }-- if idx < len(editors) {- sel := editors[idx]- err = exec.Command(sel.cmd, append(sel.args, path)...).Start()- if err != nil {- term.OutputErrorAndExit("Error opening template: %v", err)- }- return true- }-- return false-}--func getExampleTemplate(isCloud bool) shared.ModelsInput {+func getExampleTemplate(isCloud bool) shared.ClientModelsInput {exampleProviderName := "togetherai"var customProviders []*shared.CustomProvider@@ -958,7 +765,7 @@ func getExampleTemplate(isCloud bool) shared.ModelsInput {ModelName: "meta-llama/llama-4-maverick",})- return shared.ModelsInput{+ return shared.ClientModelsInput{SchemaUrl: shared.SchemaUrlInputConfig,CustomProviders: customProviders,CustomModels: []*shared.CustomModel{@@ -979,36 +786,20 @@ func getExampleTemplate(isCloud bool) shared.ModelsInput {Providers: usesProviders,},},- CustomModelPacks: []*shared.ModelPackSchema{+ CustomModelPacks: []*shared.ClientModelPackSchema{{Name: "example-model-pack",Description: "Example model pack",- Planner: shared.ModelRoleConfigSchema{- ModelId: shared.ModelId("deepseek/r1"),- },- Architect: &shared.ModelRoleConfigSchema{- ModelId: shared.ModelId("deepseek/r1"),- },- Coder: &shared.ModelRoleConfigSchema{- ModelId: shared.ModelId("deepseek/v3-0324"),- },- PlanSummary: shared.ModelRoleConfigSchema{- ModelId: shared.ModelId("meta-llama/llama-4-maverick"),- },- Builder: shared.ModelRoleConfigSchema{- ModelId: shared.ModelId("deepseek/r1-hidden"),- },- WholeFileBuilder: &shared.ModelRoleConfigSchema{- ModelId: shared.ModelId("deepseek/r1-hidden"),- },- ExecStatus: shared.ModelRoleConfigSchema{- ModelId: shared.ModelId("deepseek/r1-hidden"),- },- Namer: shared.ModelRoleConfigSchema{- ModelId: shared.ModelId("meta-llama/llama-4-maverick"),- },- CommitMsg: shared.ModelRoleConfigSchema{- ModelId: shared.ModelId("meta-llama/llama-4-maverick"),+ ClientModelPackSchemaRoles: shared.ClientModelPackSchemaRoles{+ Planner: "deepseek/r1",+ Architect: "deepseek/r1",+ Coder: "deepseek/v3-0324",+ PlanSummary: "meta-llama/llama-4-maverick",+ Builder: "deepseek/r1-hidden",+ WholeFileBuilder: "deepseek/r1-hidden",+ ExecStatus: "deepseek/r1-hidden",+ Namer: "meta-llama/llama-4-maverick",+ CommitMsg: "meta-llama/llama-4-maverick",},},},diff --git a/app/cli/cmd/plan_start_helpers.go b/app/cli/cmd/plan_start_helpers.goindex 4d1604b0..92a5b024 100644--- a/app/cli/cmd/plan_start_helpers.go+++ b/app/cli/cmd/plan_start_helpers.go@@ -143,13 +143,14 @@ func resolveModelPackWithArgs(settings *shared.PlanSettings, silent bool) (*sharpackName = shared.GeminiPreviewModelPack.Name}- if packName != "" && packName != originalSettings.ModelPack.Name {+ if packName != "" && packName != originalSettings.GetModelPack().Name {if !silent {term.StartSpinner("")}- updatedSettings := updateModelSettings([]string{packName}, originalSettings)+ updatedSettings := updateModelSettings([]string{packName}, originalSettings, "")_, apiErr = api.Client.UpdateSettings(lib.CurrentPlanId, lib.CurrentBranch, shared.UpdateSettingsRequest{- Settings: updatedSettings,+ ModelPackName: updatedSettings.ModelPackName,+ ModelPack: updatedSettings.ModelPack,})if !silent {term.StopSpinner()@@ -175,7 +176,7 @@ func resolveModelPackWithArgs(settings *shared.PlanSettings, silent bool) (*sharterm.StopSpinner()}fn := func() {- printModelPackTable(originalSettings.ModelPack.Name)+ printModelPackTable(originalSettings.GetModelPack().Name)}if !silent {diff --git a/app/cli/cmd/repl.go b/app/cli/cmd/repl.goindex 7747abec..d1157dec 100644--- a/app/cli/cmd/repl.go+++ b/app/cli/cmd/repl.go@@ -184,7 +184,7 @@ func runRepl(cmd *cobra.Command, args []string) {printAutoFn: printAutoFn,printModelFn: printModelFn,config: replConfig,- packName: settings.ModelPack.Name,+ packName: settings.GetModelPack().Name,})var p *prompt.Promptdiff --git a/app/cli/cmd/set_model.go b/app/cli/cmd/set_model.goindex 6020740f..e1d59dbd 100644--- a/app/cli/cmd/set_model.go+++ b/app/cli/cmd/set_model.go@@ -3,39 +3,53 @@ package cmdimport ("encoding/json""fmt"+ "os"+ "path/filepath""plandex-cli/api""plandex-cli/auth"+ "plandex-cli/fs""plandex-cli/lib"+ "plandex-cli/schema""plandex-cli/term"- "reflect"- "strconv""strings"shared "plandex-shared"+ "github.com/fatih/color""github.com/spf13/cobra")+var setModelUseJsonFile bool+var setModelJsonFilePath string+var setModelSave bool+func init() {RootCmd.AddCommand(modelsSetCmd)modelsSetCmd.AddCommand(defaultModelSetCmd)+ modelsSetCmd.Flags().BoolVar(&setModelUseJsonFile, "json", false, "Use a JSON file to set model settings")+ modelsSetCmd.Flags().StringVarP(&setModelJsonFilePath, "file", "f", "", "Path to model settings JSON file")+ modelsSetCmd.Flags().BoolVar(&setModelSave, "save", false, "Save model settings from JSON file")++ defaultModelSetCmd.Flags().BoolVar(&setModelUseJsonFile, "json", false, "Use a JSON file to set model settings")+ defaultModelSetCmd.Flags().StringVarP(&setModelJsonFilePath, "file", "f", "", "Path to model settings JSON file")+ defaultModelSetCmd.Flags().BoolVar(&setModelSave, "save", false, "Save model settings from JSON file")}var modelsSetCmd = &cobra.Command{- Use: "set-model [model-set-or-role-or-setting] [property-or-value] [value]",+ Use: "set-model [model-pack-name]",Aliases: []string{"set-models"},Short: "Update current plan model settings",Run: modelsSet,- Args: cobra.MaximumNArgs(3),+ Args: cobra.MaximumNArgs(1),}var defaultModelSetCmd = &cobra.Command{- Use: "default [model-set-or-role-or-setting] [property-or-value] [value]",+ Use: "default [model-pack-name]",Short: "Update org-wide default model settings",Run: defaultModelsSet,- Args: cobra.MaximumNArgs(3),+ Args: cobra.MaximumNArgs(1),}func modelsSet(cmd *cobra.Command, args []string) {@@ -44,25 +58,26 @@ func modelsSet(cmd *cobra.Command, args []string) {term.StartSpinner("")originalSettings, apiErr := api.Client.GetSettings(lib.CurrentPlanId, lib.CurrentBranch)- term.StopSpinner()if apiErr != nil {term.OutputErrorAndExit("Error getting current settings: %v", apiErr)return}- settings := updateModelSettings(args, originalSettings)+ defaultPath := filepath.Join(fs.HomePlandexDir, lib.CurrentPlanId, "model-settings.json")++ settings := updateModelSettings(args, originalSettings, defaultPath)if settings == nil {return}- term.StartSpinner("")res, apiErr := api.Client.UpdateSettings(lib.CurrentPlanId,lib.CurrentBranch,shared.UpdateSettingsRequest{- Settings: settings,+ ModelPackName: settings.ModelPackName,+ ModelPack: settings.ModelPack,})term.StopSpinner()@@ -71,6 +86,10 @@ func modelsSet(cmd *cobra.Command, args []string) {return}+ if res == nil {+ return+ }+fmt.Println(res.Msg)fmt.Println()term.PrintCmds("", "models", "set-model default", "log")@@ -88,7 +107,9 @@ func defaultModelsSet(cmd *cobra.Command, args []string) {return}- settings := updateModelSettings(args, originalSettings)+ defaultPath := filepath.Join(fs.HomePlandexDir, "default-model-settings.json")++ settings := updateModelSettings(args, originalSettings, defaultPath)if settings == nil {return@@ -97,7 +118,8 @@ func defaultModelsSet(cmd *cobra.Command, args []string) {term.StartSpinner("")res, apiErr := api.Client.UpdateOrgDefaultSettings(shared.UpdateSettingsRequest{- Settings: settings,+ ModelPackName: settings.ModelPackName,+ ModelPack: settings.ModelPack,})term.StopSpinner()@@ -106,21 +128,23 @@ func defaultModelsSet(cmd *cobra.Command, args []string) {return}+ if res == nil {+ return+ }+fmt.Println(res.Msg)fmt.Println()term.PrintCmds("", "models", "set-model default", "log")}-func updateModelSettings(args []string, originalSettings *shared.PlanSettings) *shared.PlanSettings {- // Marshal and unmarshal to make a deep copy of the settings- jsonBytes, err := json.Marshal(originalSettings)+func updateModelSettings(args []string, originalSettings *shared.PlanSettings, defaultPath string) *shared.PlanSettings {+ settings, err := originalSettings.DeepCopy()if err != nil {- term.OutputErrorAndExit("Error marshalling settings: %v", err)+ term.OutputErrorAndExit("Error copying settings: %v", err)return nil}builtInModelPacks := shared.BuiltInModelPacks-if auth.Current.IsCloud {filtered := []*shared.ModelPack{}for _, ms := range builtInModelPacks {@@ -131,432 +155,244 @@ func updateModelSettings(args []string, originalSettings *shared.PlanSettings) *builtInModelPacks = filtered}- var settings *shared.PlanSettings- err = json.Unmarshal(jsonBytes, &settings)- if err != nil {- term.OutputErrorAndExit("Error unmarshalling settings: %v", err)+ customModelPacks, apiErr := api.Client.ListModelPacks()+ if apiErr != nil {+ term.OutputErrorAndExit("Error getting custom model packs: %v", apiErr)return nil}- var modelSetOrRoleOrSetting, propertyCompact, value string- var modelPack *shared.ModelPack- var role shared.ModelRole- var settingCompact string- var settingDasherized string- var selectedModelId shared.ModelId- var temperature *float64- var topP *float64- var reservedOutputTokens *int+ useJsonFile := setModelUseJsonFile || setModelSave+ var nameArg stringif len(args) > 0 {- modelSetOrRoleOrSetting = args[0]-- compare := modelSetOrRoleOrSetting- if compare == "daily" {- compare = "daily-driver"- }- if compare == "opus-4-planner" {- compare = "opus-planner"- }+ nameArg = args[0]+ }- for _, ms := range builtInModelPacks {- if strings.EqualFold(ms.Name, compare) {- modelPack = ms- break- }- }+ if !useJsonFile {+ if nameArg == "" {+ term.StopSpinner()+ const modelPackOpt = "Select a model pack"+ const jsonOpt = "Edit model settings JSON"- if modelPack == nil {- for _, r := range shared.AllModelRoles {- if strings.EqualFold(string(r), modelSetOrRoleOrSetting) {- role = r- break+ selection, err := term.SelectFromList("Select a model pack or edit settings?", []string{modelPackOpt, jsonOpt})+ if err != nil {+ if err.Error() == "interrupt" {+ return nil}}- if role == "" {- for _, s := range shared.ModelOverridePropsDasherized {- compact := shared.Compact(s)- if strings.EqualFold(compact, shared.Compact(modelSetOrRoleOrSetting)) {- settingCompact = compact- settingDasherized = s- break- }- }++ if selection == modelPackOpt {+ useJsonFile = false+ } else {+ useJsonFile = true+ term.StartSpinner("")}}}- if modelPack == nil && role == "" && settingCompact == "" {- // Prompt user to select between updating a model-set, a top-level setting or a model role- opts := []string{"🎛️ choose a model pack to change all roles at once"}-- for _, role := range shared.AllModelRoles {- label := fmt.Sprintf("🤖 role | %s → %s", role, shared.ModelRoleDescriptions[role])- opts = append(opts, label)+ if useJsonFile {+ usingDefaultPath := false+ if setModelJsonFilePath == "" {+ usingDefaultPath = true+ setModelJsonFilePath = defaultPath}- for _, setting := range shared.ModelOverridePropsDasherized {- label := fmt.Sprintf("⚙️ override | %s → %s", shared.Dasherize(setting), shared.SettingDescriptions[setting])- opts = append(opts, label)- }-- selection, err := term.SelectFromList("Choose a new model pack, or select a role or override to update:", opts)- if err != nil {- if err.Error() == "interrupt" {- return nil- }-- term.OutputErrorAndExit("Error selecting setting or role: %v", err)+ hashPath := setModelJsonFilePath + ".hash"++ exists := false+ _, err := os.Stat(setModelJsonFilePath)+ if err == nil {+ exists = true+ } else if os.IsNotExist(err) {+ exists = false+ } else {+ term.OutputErrorAndExit("Error checking custom models file: %v", err)return nil}- idx := 0- for i, opt := range opts {- if opt == selection {- idx = i- break- }- }+ var jsonData []byte- if idx == 0 {- var opts []string- for _, ms := range builtInModelPacks {- opts = append(opts, "Built-in | "+ms.Name)+ if saveCustomModels {+ if !exists {+ term.OutputErrorAndExit("File not found: %s", customModelsPath)}-- term.StartSpinner("")- customModelPacks, apiErr := api.Client.ListModelPacks()- term.StopSpinner()-- if apiErr != nil {- term.OutputErrorAndExit("Error getting custom model packs: %v", apiErr)+ jsonData, err = os.ReadFile(setModelJsonFilePath)+ if err != nil {+ term.OutputErrorAndExit("Error reading JSON file: %v", err)return nil}-- for _, ms := range customModelPacks {- opts = append(opts, "Custom | "+ms.Name)- }-- opts = append(opts, lib.GoBack)-- selection, err := term.SelectFromList("Select a model pack:", opts)- if err != nil {- if err.Error() == "interrupt" {+ } else {+ if usingDefaultPath && exists {+ lastSavedHash, err := os.ReadFile(hashPath)+ if err != nil && !os.IsNotExist(err) {+ term.OutputErrorAndExit("Error reading hash file: %v", err)return nil}- term.OutputErrorAndExit("Error selecting model pack: %v", err)- return nil- }-- if selection == lib.GoBack {- return updateModelSettings([]string{}, originalSettings)- }-- var idx int- for i, opt := range opts {- if opt == selection {- idx = i- break+ localJsonData, err := os.ReadFile(setModelJsonFilePath)+ if err != nil {+ term.OutputErrorAndExit("Error reading JSON file: %v", err)}- }-- if idx < len(builtInModelPacks) {- modelPack = builtInModelPacks[idx]- } else {- modelPack = customModelPacks[idx-len(builtInModelPacks)]- }-- } else if idx < len(shared.AllModelRoles)+1 {- role = shared.AllModelRoles[idx-1]- } else {- settingDasherized = shared.ModelOverridePropsDasherized[idx-(len(shared.AllModelRoles)+1)]- settingCompact = shared.Compact(settingDasherized)- }- }-- if modelPack == nil {- if len(args) > 1 {- if role != "" {- propertyCompact = strings.ToLower(shared.Compact(args[1]))- } else {- value = args[1]- }- }- if len(args) > 2 {- value = args[2]- }-- if settingCompact != "" {- if value == "" {- var err error- value, err = term.GetUserStringInput(fmt.Sprintf("Set %s (leave blank for no value)", settingDasherized))+ var localModelPackSchemaRoles *shared.ClientModelPackSchemaRoles+ err = json.Unmarshal(localJsonData, &localModelPackSchemaRoles)if err != nil {- if err.Error() == "interrupt" {- return nil- }+ term.OutputErrorAndExit("Error unmarshalling JSON file: %v", err)+ }- term.OutputErrorAndExit("Error getting value: %v", err)+ currentHash, err := localModelPackSchemaRoles.ToModelPackSchemaRoles().Hash()+ if err != nil {+ term.OutputErrorAndExit("Error hashing model pack: %v", err)return nil}- }- switch settingCompact {- case "maxconvotokens":- if value == "" {- settings.ModelOverrides.MaxConvoTokens = nil- } else {- n, err := strconv.Atoi(value)+ if currentHash != string(lastSavedHash) {+ term.StopSpinner()++ res, err := warnModelsFileLocalChanges(setModelJsonFilePath, "set-model")if err != nil {- fmt.Println("Invalid value for max-convo-tokens:", value)+ term.OutputErrorAndExit("Error confirming: %v", err)return nil}- settings.ModelOverrides.MaxConvoTokens = &n- }- case "maxtokens":- if value == "" {- settings.ModelOverrides.MaxTokens = nil- } else {- n, err := strconv.Atoi(value)- if err != nil {- fmt.Println("Invalid value for max-tokens:", value)+ if !res {return nil}- settings.ModelOverrides.MaxTokens = &n++ fmt.Println()+ term.StartSpinner("")}}- }- if role != "" {- if !(propertyCompact == "temperature" || propertyCompact == "topp") {- term.StartSpinner("")- customModels, apiErr := api.Client.ListCustomModels()- term.StopSpinner()+ err = os.MkdirAll(filepath.Dir(setModelJsonFilePath), 0755)+ if err != nil {+ term.OutputErrorAndExit("Error creating directory: %v", err)+ return nil+ }- if apiErr != nil {- term.OutputErrorAndExit("Error fetching models: %v", apiErr)- }+ clientModelPackRoles := originalSettings.GetModelPack().ToModelPackSchema().ToClientModelPackSchemaRoles()+ bytes, err := json.MarshalIndent(clientModelPackRoles, "", " ")+ if err != nil {+ term.OutputErrorAndExit("Error marshalling model pack: %v", err)+ return nil+ }- builtInModels := shared.FilterBuiltInCompatibleModels(shared.BuiltInBaseModels, role)- customModels = shared.FilterCustomCompatibleModels(customModels, role)+ err = os.WriteFile(setModelJsonFilePath, bytes, 0644)+ if err != nil {+ term.OutputErrorAndExit("Error writing JSON file: %v", err)+ return nil+ }- customModelsById := map[shared.ModelId]*shared.CustomModel{}- for _, m := range customModels {- customModelsById[m.ModelId] = m- }+ term.StopSpinner()+ fmt.Printf("🧠 %s → %s\n", color.New(color.Bold, term.ColorHiCyan).Sprint("Models file"), setModelJsonFilePath)+ fmt.Println("👨💻 Edit it, then come back here to save")+ fmt.Println()- modelIds := []shared.ModelId{}- for _, m := range builtInModels {- modelIds = append(modelIds, m.ModelId)- }- for _, m := range customModels {- modelIds = append(modelIds, m.ModelId)- }+ pathArg := ""+ if !usingDefaultPath {+ pathArg = fmt.Sprintf(" --file %s", setModelJsonFilePath)+ }- for _, id := range modelIds {- if propertyCompact == fmt.Sprintf("%s/%s", role, shared.Compact(string(id))) {- selectedModelId = id- break- }- }+ res := maybePromptAndOpenModelsFile(setModelJsonFilePath, pathArg, "set-model")+ if res.shouldReturn {+ return nil}+ jsonData = res.jsonData+ }- if selectedModelId == "" && propertyCompact == "" {- Outer:- for {- opts := []string{- "Select a model",- "Set temperature",- "Set top-p",- "Set reserved output tokens",- }+ term.StartSpinner("")- opts = append(opts, lib.GoBack)+ clientModelPackRoles, err := schema.ValidateModelPackInlineJSON(jsonData)+ if err != nil {+ term.StopSpinner()+ color.New(color.Bold, term.ColorHiRed).Println("🚨 Error validating JSON file")+ fmt.Println(err.Error())+ os.Exit(1)+ }+ modelPackRoles := clientModelPackRoles.ToModelPackSchemaRoles()- selection, err := term.SelectFromList("Select a property to update:", opts)- if err != nil {- if err.Error() == "interrupt" {- return nil- }+ modelPackSchema := shared.ModelPackSchema{+ Name: "custom",+ Description: "Model pack with custom settings",+ ModelPackSchemaRoles: modelPackRoles,+ }+ modelPack := modelPackSchema.ToModelPack()+ settings.SetCustomModelPack(&modelPack)- term.OutputErrorAndExit("Error selecting property: %v", err)- return nil- }+ hash, err := modelPackRoles.Hash()+ if err != nil {+ term.OutputErrorAndExit("Error hashing model pack: %v", err)+ return nil+ }+ err = os.WriteFile(hashPath, []byte(hash), 0644)+ if err != nil {+ term.OutputErrorAndExit("Error writing hash file: %v", err)+ return nil+ }- if selection == lib.GoBack {- return updateModelSettings([]string{}, originalSettings)- }+ } else {+ if nameArg == "" {+ var names []string+ var opts []string+ for _, ms := range builtInModelPacks {+ names = append(names, ms.Name)+ opts = append(opts, "Built-in | "+ms.Name)+ }+ for _, ms := range customModelPacks {+ names = append(names, ms.Name)+ opts = append(opts, "Custom | "+ms.Name)+ }- if selection == "Select a model" {- term.StartSpinner("")- customModels, apiErr := api.Client.ListCustomModels()- term.StopSpinner()-- if apiErr != nil {- term.OutputErrorAndExit("Error fetching models: %v", apiErr)- }-- selectedModelId = lib.SelectModelIdForRole(customModels, role)-- if selectedModelId != "" {- break Outer- }- } else if selection == "Set temperature" {- propertyCompact = "temperature"- break Outer- } else if selection == "Set top-p" {- propertyCompact = "topp"- break Outer- } else if selection == "Set reserved output tokens" {- propertyCompact = "reservedoutputtokens"- break Outer- }+ term.StopSpinner()+ selection, err := term.SelectFromList("Select a model pack:", opts)+ if err != nil {+ if err.Error() == "interrupt" {+ return nil}}- if selectedModelId == "" {- if propertyCompact != "" {- if value == "" {- msg := "Set"- if propertyCompact == "temperature" {- msg += "temperature (-2.0 to 2.0)"- } else if propertyCompact == "topp" {- msg += "top-p (0.0 to 1.0)"- } else if propertyCompact == "reservedoutputtokens" {- msg += "reserved output tokens"- }- var err error- value, err = term.GetRequiredUserStringInput(msg)- if err != nil {- if err.Error() == "interrupt" {- return nil- }-- term.OutputErrorAndExit("Error getting value: %v", err)- return nil- }- }-- switch propertyCompact {- case "temperature":- f, err := strconv.ParseFloat(value, 32)- if err != nil || f < -2.0 || f > 2.0 {- fmt.Println("Invalid value for temperature:", value)- return nil- }- temperature = &f- case "topp":- f, err := strconv.ParseFloat(value, 32)- if err != nil || f < 0.0 || f > 1.0 {- fmt.Println("Invalid value for top-p:", value)- return nil- }- topP = &f- case "reservedoutputtokens":- n, err := strconv.Atoi(value)- if err != nil {- fmt.Println("Invalid value for reserved-output-tokens:", value)- return nil- }- settings.ModelOverrides.ReservedOutputTokens = &n- }+ for i, opt := range opts {+ if opt == selection {+ nameArg = names[i]+ break}}+ }- if settings.ModelPack == nil {- settings.ModelPack = shared.DefaultModelPack+ var modelPackName string+ compare := strings.ToLower(strings.TrimSpace(nameArg))+ if compare == "daily" {+ compare = "daily-driver"+ }+ if compare == "opus-4-planner" {+ compare = "opus-planner"+ }+ for _, ms := range builtInModelPacks {+ if strings.EqualFold(ms.Name, compare) {+ modelPackName = ms.Name+ break}+ }+ for _, ms := range customModelPacks {+ if strings.EqualFold(ms.Name, compare) {+ modelPackName = ms.Name+ break+ }+ }- switch role {- case shared.ModelRolePlanner:- if selectedModelId != "" {- settings.ModelPack.Planner.ModelId = selectedModelId- } else if temperature != nil {- settings.ModelPack.Planner.Temperature = float32(*temperature)- } else if topP != nil {- settings.ModelPack.Planner.TopP = float32(*topP)- } else if reservedOutputTokens != nil {- settings.ModelPack.Planner.ReservedOutputTokens = *reservedOutputTokens- }-- case shared.ModelRoleArchitect:- if selectedModelId != "" {- settings.ModelPack.Architect.ModelId = selectedModelId- } else if temperature != nil {- settings.ModelPack.Architect.Temperature = float32(*temperature)- } else if topP != nil {- settings.ModelPack.Architect.TopP = float32(*topP)- }-- case shared.ModelRoleCoder:- if selectedModelId != "" {- settings.ModelPack.Coder.ModelId = selectedModelId- } else if temperature != nil {- settings.ModelPack.Coder.Temperature = float32(*temperature)- } else if topP != nil {- settings.ModelPack.Coder.TopP = float32(*topP)- }-- case shared.ModelRolePlanSummary:- if selectedModelId != "" {- settings.ModelPack.PlanSummary.ModelId = selectedModelId- } else if temperature != nil {- settings.ModelPack.PlanSummary.Temperature = float32(*temperature)- } else if topP != nil {- settings.ModelPack.PlanSummary.TopP = float32(*topP)- }-- case shared.ModelRoleBuilder:- if selectedModelId != "" {- settings.ModelPack.Builder.ModelId = selectedModelId- } else if temperature != nil {- settings.ModelPack.Builder.Temperature = float32(*temperature)- } else if topP != nil {- settings.ModelPack.Builder.TopP = float32(*topP)- }-- case shared.ModelRoleWholeFileBuilder:- if selectedModelId != "" {- settings.ModelPack.WholeFileBuilder.ModelId = selectedModelId- } else if temperature != nil {- settings.ModelPack.WholeFileBuilder.Temperature = float32(*temperature)- } else if topP != nil {- settings.ModelPack.WholeFileBuilder.TopP = float32(*topP)- }-- case shared.ModelRoleName:- if selectedModelId != "" {- settings.ModelPack.Namer.ModelId = selectedModelId- } else if temperature != nil {- settings.ModelPack.Namer.Temperature = float32(*temperature)- } else if topP != nil {- settings.ModelPack.Namer.TopP = float32(*topP)- }+ if modelPackName == "" {+ term.OutputErrorAndExit("No model pack found with name: %s", modelPackName)+ return nil+ }- case shared.ModelRoleCommitMsg:- if selectedModelId != "" {- settings.ModelPack.CommitMsg.ModelId = selectedModelId- } else if temperature != nil {- settings.ModelPack.CommitMsg.Temperature = float32(*temperature)- } else if topP != nil {- settings.ModelPack.CommitMsg.TopP = float32(*topP)- }+ settings.SetModelPackByName(modelPackName)- case shared.ModelRoleExecStatus:- if selectedModelId != "" {- settings.ModelPack.ExecStatus.ModelId = selectedModelId- } else if temperature != nil {- settings.ModelPack.ExecStatus.Temperature = float32(*temperature)- } else if topP != nil {- settings.ModelPack.ExecStatus.TopP = float32(*topP)- }- }- }- } else {- settings.ModelPack = modelPack+ // clear the default settings file and hash file if they exist, ignoring errors+ os.Remove(defaultPath)+ os.Remove(defaultPath + ".hash")}- if reflect.DeepEqual(originalSettings, settings) {+ term.StopSpinner()++ if originalSettings.Equals(settings) {fmt.Println("🤷♂️ No model settings were updated")return nil} else {diff --git a/app/cli/lib/editor.go b/app/cli/lib/editor.gonew file mode 100644index 00000000..36305c85--- /dev/null+++ b/app/cli/lib/editor.go@@ -0,0 +1,105 @@+package lib++import (+ "os"+ "os/exec"+ "path/filepath"+ "sort"+ "strings"+)++type editorCandidate struct {+ name string+ cmd string+ args []string+ isJetBrains bool+}++const maxEditorOpts = 5++func detectEditors() []editorCandidate {+ guess := []editorCandidate{+ // Popular non-JetBrains launchers+ {"VS Code", "code", nil, false},+ {"Cursor", "cursor", nil, false},+ {"Zed", "zed", nil, false},+ {"Neovim", "nvim", nil, false},++ // JetBrains IDE-specific launchers+ {"IntelliJ IDEA", "idea", nil, true},+ {"GoLand", "goland", nil, true},+ {"PyCharm", "pycharm", nil, true},+ {"CLion", "clion", nil, true},+ {"WebStorm", "webstorm", nil, true},+ {"PhpStorm", "phpstorm", nil, true},+ {"DataGrip", "datagrip", nil, true},+ {"RubyMine", "rubymine", nil, true},+ {"Rider", "rider", nil, true},+ {"DataSpell", "dataspell", nil, true},++ // JetBrains universal CLI (2023.2+)+ {"JetBrains (jb)", "jb", []string{"open"}, true},++ {"Vim", "vim", nil, false},+ {"Nano", "nano", nil, false},+ {"Helix", "hx", nil, false},+ {"Micro", "micro", nil, false},+ {"Sublime Text", "subl", nil, false},+ {"TextMate", "mate", nil, false},+ {"Kakoune", "kak", nil, false},+ {"Emacs", "emacs", nil, false},+ {"Kate", "kate", nil, false},+ }+ pref := map[string]bool{}+ for _, env := range []string{"VISUAL", "EDITOR"} {+ if v := os.Getenv(env); v != "" {+ // keep only the binary name, drop path/flags+ cmd := filepath.Base(strings.Fields(v)[0])+ pref[cmd] = true+ }+ }++ _, err := exec.LookPath("jb") // true if universal launcher exists+ jbOnPath := err == nil++ var found []editorCandidate+ for _, c := range guess {+ if _, err := exec.LookPath(c.cmd); err != nil {+ continue // not on PATH+ }++ // If jb is present, drop per-IDE launchers *unless* this exact cmd+ // is marked preferred by VISUAL/EDITOR.+ if jbOnPath && c.isJetBrains && !pref[c.cmd] {+ continue+ }+ found = append(found, c)+ }++ for cmd := range pref {+ if _, err := exec.LookPath(cmd); err == nil {+ already := false+ for _, c := range found {+ if c.cmd == cmd {+ already = true+ break+ }+ }+ if !already {+ found = append(found, editorCandidate{name: cmd, cmd: cmd})+ }+ }+ }+ sort.SliceStable(found, func(i, j int) bool {+ pi, pj := pref[found[i].cmd], pref[found[j].cmd]+ if pi == pj {+ return false // keep original order+ }+ return pi // true → i comes before j+ })+ if len(found) > maxEditorOpts {+ found = found[:maxEditorOpts]+ }++ return found+}diff --git a/app/cli/lib/model_settings.go b/app/cli/lib/model_settings.goindex ad30e16a..a322b92e 100644--- a/app/cli/lib/model_settings.go+++ b/app/cli/lib/model_settings.go@@ -2,6 +2,7 @@ package libimport ("fmt"+ "os/exec""plandex-cli/term"shared "plandex-shared"@@ -59,3 +60,46 @@ func SelectModelIdForRole(customModels []*shared.CustomModel, role shared.ModelRreturn id}}++func MaybePromptAndOpen(path string) bool {+ editors := detectEditors()+ if len(editors) == 0 {+ // just exit if there are no editors available+ return false+ }+ opts := []string{}+ for _, c := range editors {+ opts = append(opts, "Open with "+c.name)+ }++ const openManually = "Open manually"+ opts = append(opts, openManually)++ choice, err := term.SelectFromList("Open the file now?", opts)+ if err != nil {+ term.OutputErrorAndExit("Error selecting editor: %v", err)+ }++ if choice == openManually {+ return false+ }++ var idx int+ for i, c := range opts {+ if c == choice {+ idx = i+ break+ }+ }++ if idx < len(editors) {+ sel := editors[idx]+ err = exec.Command(sel.cmd, append(sel.args, path)...).Start()+ if err != nil {+ term.OutputErrorAndExit("Error opening template: %v", err)+ }+ return true+ }++ return false+}diff --git a/app/cli/schema/json-schemas/definitions/local-providers.schema.json b/app/cli/schema/json-schemas/definitions/local-providers.schema.jsonnew file mode 100644index 00000000..53adfb32--- /dev/null+++ b/app/cli/schema/json-schemas/definitions/local-providers.schema.json@@ -0,0 +1,9 @@+{+ "$schema": "https://json-schema.org/draft/2020-12/schema",+ "$id": "https://plandex.ai/schemas/definitions/local-providers.schema.json",+ "title": "Local Provider Enum",+ "description": "Reusable enum for local providers",+ "enum": [+ "ollama"+ ]+}\ No newline at end of filediff --git a/app/cli/schema/json-schemas/model-config.schema.json b/app/cli/schema/json-schemas/model-config.schema.jsonindex 4fc92a35..ed8cd41a 100644--- a/app/cli/schema/json-schemas/model-config.schema.json+++ b/app/cli/schema/json-schemas/model-config.schema.json@@ -128,5 +128,6 @@"reservedOutputTokens","preferredOutputFormat","providers"- ]+ ],+ "additionalProperties": false}\ No newline at end of filediff --git a/app/cli/schema/json-schemas/model-pack-config.schema.json b/app/cli/schema/json-schemas/model-pack-config.schema.jsonindex 1053b130..b9425f5f 100644--- a/app/cli/schema/json-schemas/model-pack-config.schema.json+++ b/app/cli/schema/json-schemas/model-pack-config.schema.json@@ -4,69 +4,29 @@"title": "Model Pack Config","description": "Config for a model pack","type": "object",- "properties": {- "name": {- "type": "string",- "description": "The name of the model pack"- },- "description": {- "type": "string",- "description": "The description of the model pack"- },- "planner": {- "type": "object",- "description": "The planner model config",- "$ref": "./model-role-config.schema.json"- },- "coder": {- "type": "object",- "description": "The coder model config",- "$ref": "./model-role-config.schema.json"- },- "architect": {- "type": "object",- "description": "The architect model config",- "$ref": "./model-role-config.schema.json"- },- "planSummary": {- "type": "object",- "description": "The plan summary model config",- "$ref": "./model-role-config.schema.json"- },- "builder": {- "type": "object",- "description": "The builder model config",- "$ref": "./model-role-config.schema.json"- },- "wholeFileBuilder": {- "type": "object",- "description": "The whole file builder model config",- "$ref": "./model-role-config.schema.json"- },- "namer": {- "type": "object",- "description": "The namer model config",- "$ref": "./model-role-config.schema.json"- },- "commitMsg": {- "type": "object",- "description": "The commit message model config",- "$ref": "./model-role-config.schema.json"- },- "execStatus": {- "type": "object",- "description": "The execution status model config",- "$ref": "./model-role-config.schema.json"+ "allOf": [+ {+ "$ref": "./model-pack-roles.schema.json"+ },+ {+ "properties": {+ "$schema": {+ "type": "string"+ },+ "name": {+ "type": "string",+ "description": "The name of the model pack"+ },+ "description": {+ "type": "string",+ "description": "The description of the model pack"+ }+ },+ "required": [+ "name",+ "description"+ ],+ "unevaluatedProperties": false}- },- "required": [- "name",- "description",- "planner",- "planSummary",- "builder",- "namer",- "commitMsg",- "execStatus"]}\ No newline at end of filediff --git a/app/cli/schema/json-schemas/model-pack-inline.schema.json b/app/cli/schema/json-schemas/model-pack-inline.schema.jsonnew file mode 100644index 00000000..22b57702--- /dev/null+++ b/app/cli/schema/json-schemas/model-pack-inline.schema.json@@ -0,0 +1,11 @@+{+ "$schema": "https://json-schema.org/draft/2020-12/schema",+ "$id": "https://plandex.ai/schemas/model-pack-roles.strict.schema.json",+ "title": "Inline Model Pack Config",+ "allOf": [+ {+ "$ref": "./model-pack-roles.schema.json"+ }+ ],+ "unevaluatedProperties": false+}\ No newline at end of filediff --git a/app/cli/schema/json-schemas/model-pack-roles.schema.json b/app/cli/schema/json-schemas/model-pack-roles.schema.jsonnew file mode 100644index 00000000..5d38a880--- /dev/null+++ b/app/cli/schema/json-schemas/model-pack-roles.schema.json@@ -0,0 +1,73 @@+{+ "$schema": "https://json-schema.org/draft/2020-12/schema",+ "$id": "https://plandex.ai/schemas/model-pack-roles.schema.json",+ "title": "Model Pack Roles",+ "type": "object",+ "description": "Config for a model pack's roles",+ "$defs": {+ "roleRef": {+ "oneOf": [+ {+ "type": "string",+ "minLength": 1+ },+ {+ "$ref": "./model-role-config.schema.json"+ }+ ]+ }+ },+ "properties": {+ "$schema": {+ "type": "string"+ },+ "localProvider": {+ "description": "The local provider for the model pack",+ "$ref": "./definitions/local-providers.schema.json"+ },+ "planner": {+ "description": "The planner model config",+ "$ref": "#/$defs/roleRef"+ },+ "coder": {+ "description": "The coder model config",+ "$ref": "#/$defs/roleRef"+ },+ "architect": {+ "description": "The architect model config",+ "$ref": "#/$defs/roleRef"+ },+ "summarizer": {+ "description": "The plan summary model config",+ "$ref": "#/$defs/roleRef"+ },+ "builder": {+ "description": "The builder model config",+ "$ref": "#/$defs/roleRef"+ },+ "wholeFileBuilder": {+ "description": "The whole file builder model config",+ "$ref": "#/$defs/roleRef"+ },+ "names": {+ "description": "The namer model config",+ "$ref": "#/$defs/roleRef"+ },+ "commitMessages": {+ "description": "The commit message model config",+ "$ref": "#/$defs/roleRef"+ },+ "autoContinue": {+ "description": "The execution status model config",+ "$ref": "#/$defs/roleRef"+ }+ },+ "required": [+ "planner",+ "summarizer",+ "builder",+ "names",+ "commitMessages",+ "autoContinue"+ ]+}\ No newline at end of filediff --git a/app/cli/schema/json-schemas/model-provider-config.schema.json b/app/cli/schema/json-schemas/model-provider-config.schema.jsonindex 2ff85c32..9128086c 100644--- a/app/cli/schema/json-schemas/model-provider-config.schema.json+++ b/app/cli/schema/json-schemas/model-provider-config.schema.json@@ -65,5 +65,6 @@}}}- ]+ ],+ "additionalProperties": false}\ No newline at end of filediff --git a/app/cli/schema/json-schemas/model-role-config.schema.json b/app/cli/schema/json-schemas/model-role-config.schema.jsonindex a27d37ca..e5924d5c 100644--- a/app/cli/schema/json-schemas/model-role-config.schema.json+++ b/app/cli/schema/json-schemas/model-role-config.schema.json@@ -35,5 +35,6 @@},"required": ["modelId"- ]+ ],+ "additionalProperties": false}\ No newline at end of filediff --git a/app/cli/schema/json-schemas/models-input.schema.json b/app/cli/schema/json-schemas/models-input.schema.jsonindex 852c2bfd..b41f15cd 100644--- a/app/cli/schema/json-schemas/models-input.schema.json+++ b/app/cli/schema/json-schemas/models-input.schema.json@@ -5,6 +5,9 @@"description": "Input schema for custom models, providers, and model packs","type": "object","properties": {+ "$schema": {+ "type": "string"+ },"models": {"type": "array","items": {@@ -23,5 +26,6 @@"$ref": "./model-pack-config.schema.json"}}- }+ },+ "additionalProperties": false}\ No newline at end of filediff --git a/app/cli/schema/json-schemas/plan-config.schema.json b/app/cli/schema/json-schemas/plan-config.schema.jsonindex 9a96f0a2..8968cb6a 100644--- a/app/cli/schema/json-schemas/plan-config.schema.json+++ b/app/cli/schema/json-schemas/plan-config.schema.json@@ -5,8 +5,12 @@"description": "Config for a plan","type": "object","properties": {+ "$schema": {+ "type": "string"+ },"autoMode": {"$ref": "./definitions/auto-modes.schema.json"}- }+ },+ "additionalProperties": false}\ No newline at end of filediff --git a/app/cli/schema/schemas.go b/app/cli/schema/schemas.goindex ffa6b6ed..cab62ba0 100644--- a/app/cli/schema/schemas.go+++ b/app/cli/schema/schemas.go@@ -20,8 +20,9 @@ const scheme = "embed://"type SchemaPath stringconst (- SchemaPathInputConfig SchemaPath = "json-schemas/models-input.schema.json"- SchemaPathPlanConfig SchemaPath = "json-schemas/plan-config.schema.json"+ SchemaPathInputConfig SchemaPath = "json-schemas/models-input.schema.json"+ SchemaPathPlanConfig SchemaPath = "json-schemas/plan-config.schema.json"+ SchemaPathModelPackInline SchemaPath = "json-schemas/model-pack-inline.schema.json")//go:embed json-schemas/*.schema.json json-schemas/definitions/*.schema.json@@ -32,13 +33,31 @@ type embeddedSchemaLoader struct {fs embed.FS}-func ValidateModelsInputJSON(jsonData []byte) (shared.ModelsInput, error) {- return validateJSON[shared.ModelsInput](jsonData, SchemaPathInputConfig)+func ValidateModelsInputJSON(jsonData []byte) (shared.ClientModelsInput, error) {+ return validateJSON[shared.ClientModelsInput](jsonData, SchemaPathInputConfig)+}++func ValidateModelPackInlineJSON(jsonData []byte) (shared.ClientModelPackSchemaRoles, error) {+ return validateJSON[shared.ClientModelPackSchemaRoles](jsonData, SchemaPathModelPackInline)}func validateJSON[T any](jsonData []byte, schemaPath SchemaPath) (T, error) {var zero T+ // strip meta-keywords that break additionalProperties ──+ var tmp interface{}+ if err := json.Unmarshal(jsonData, &tmp); err != nil {+ return zero, fmt.Errorf("invalid json: %w", err)+ }+ if obj, ok := tmp.(map[string]interface{}); ok {+ delete(obj, "$schema") // ignore top-level $schema+ var err error+ jsonData, err = json.Marshal(obj)+ if err != nil {+ return zero, fmt.Errorf("error marshalling json: %w", err)+ }+ }+schemaLoader := newEmbeddedSchemaLoader(schemaPath)documentLoader := gojsonschema.NewBytesLoader(jsonData)diff --git a/app/server/db/context_helpers_load.go b/app/server/db/context_helpers_load.goindex 7c09ad06..6f9fb517 100644--- a/app/server/db/context_helpers_load.go+++ b/app/server/db/context_helpers_load.go@@ -79,7 +79,7 @@ func LoadContexts(ctx Ctx, params LoadContextsParams) (*shared.LoadContextRespontotalBasicPlannerTokens := 0totalMapTokens := 0- settings, err := GetPlanSettings(plan, true)+ settings, err := GetPlanSettings(plan)if err != nil {return nil, nil, fmt.Errorf("error getting settings: %v", err)}diff --git a/app/server/db/context_helpers_update.go b/app/server/db/context_helpers_update.goindex 26ca8fa8..e36fd7d2 100644--- a/app/server/db/context_helpers_update.go+++ b/app/server/db/context_helpers_update.go@@ -48,7 +48,7 @@ func UpdateContexts(params UpdateContextsParams) (*shared.UpdateContextResponse,}}- settings, err := GetPlanSettings(plan, true)+ settings, err := GetPlanSettings(plan)if err != nil {return nil, fmt.Errorf("error getting settings: %v", err)}@@ -58,6 +58,16 @@ func UpdateContexts(params UpdateContextsParams) (*shared.UpdateContextResponse,return nil, fmt.Errorf("error getting plan config: %v", err)}+ modelPacks, err := ListModelPacks(orgId)+ if err != nil {+ return nil, fmt.Errorf("error getting model packs: %v", err)+ }++ apiModelPacks := make([]*shared.ModelPack, len(modelPacks))+ for i, modelPack := range modelPacks {+ apiModelPacks[i] = modelPack.ToApi()+ }+plannerMaxTokens := settings.GetPlannerEffectiveMaxTokens()contextLoaderMaxTokens := settings.GetArchitectEffectiveMaxTokens()diff --git a/app/server/db/settings_helpers.go b/app/server/db/settings_helpers.goindex e5536ec1..5ede4d3b 100644--- a/app/server/db/settings_helpers.go+++ b/app/server/db/settings_helpers.go@@ -14,18 +14,32 @@ import ("github.com/jmoiron/sqlx")-func GetPlanSettings(plan *Plan, fillDefaultModelPack bool) (*shared.PlanSettings, error) {+func GetPlanSettings(plan *Plan) (settings *shared.PlanSettings, err error) {planDir := getPlanDir(plan.OrgId, plan.Id)settingsPath := filepath.Join(planDir, "settings.json")- var settings *shared.PlanSettings+ customModelPacks, err := ListModelPacks(plan.OrgId)+ if err != nil {+ return nil, fmt.Errorf("error getting custom model packs: %v", err)+ }++ apiModelPacks := make([]*shared.ModelPack, len(customModelPacks))+ for i, modelPack := range customModelPacks {+ apiModelPacks[i] = modelPack.ToApi()+ }++ defer func() {+ if settings != nil {+ settings.Configure(apiModelPacks, os.Getenv("PLANDEX_CLOUD") != "")+ }+ }()bytes, err := os.ReadFile(settingsPath)if os.IsNotExist(err) || len(bytes) == 0 {log.Printf("GetPlanSettings - no settings file found for plan %s - checking org defaults", plan.Id)// see if org has default settings- defaultSettings, err := GetOrgDefaultSettings(plan.OrgId, fillDefaultModelPack)+ defaultSettings, err := GetOrgDefaultSettings(plan.OrgId)if err != nil {return nil, fmt.Errorf("error getting org default settings: %v", err)@@ -42,9 +56,6 @@ func GetPlanSettings(plan *Plan, fillDefaultModelPack bool) (*shared.PlanSettingsettings = &shared.PlanSettings{UpdatedAt: plan.CreatedAt,}- if settings.ModelPack == nil && fillDefaultModelPack {- settings.ModelPack = shared.DefaultModelPack- }return settings, nil} else if err != nil {return nil, fmt.Errorf("error reading settings file: %v", err)@@ -58,26 +69,24 @@ func GetPlanSettings(plan *Plan, fillDefaultModelPack bool) (*shared.PlanSettingreturn nil, fmt.Errorf("error unmarshalling settings: %v", err)}- if settings.ModelPack == nil && fillDefaultModelPack {- log.Printf("GetPlanSettings - filling default model pack")- settings.ModelPack = shared.DefaultModelPack- }-return settings, nil}-func StorePlanSettings(plan *Plan, settings *shared.PlanSettings) error {+func StorePlanSettings(plan *Plan, settings shared.PlanSettings) error {planDir := getPlanDir(plan.OrgId, plan.Id)settingsPath := filepath.Join(planDir, "settings.json")+ settings.UpdatedAt = time.Now()+ settings.CustomModelPacks = nil+ settings.IsCloud = false+ settings.Configured = false+bytes, err := json.Marshal(settings)if err != nil {return fmt.Errorf("error marshalling settings: %v", err)}- settings.UpdatedAt = time.Now()-err = os.WriteFile(settingsPath, bytes, 0644)if err != nil {@@ -93,12 +102,28 @@ func StorePlanSettings(plan *Plan, settings *shared.PlanSettings) error {return nil}-func GetOrgDefaultSettings(orgId string, fillDefaultModelPack bool) (*shared.PlanSettings, error) {+func GetOrgDefaultSettings(orgId string) (settings *shared.PlanSettings, err error) {+ customModelPacks, err := ListModelPacks(orgId)+ if err != nil {+ return nil, fmt.Errorf("error getting custom model packs: %v", err)+ }++ apiModelPacks := make([]*shared.ModelPack, len(customModelPacks))+ for i, modelPack := range customModelPacks {+ apiModelPacks[i] = modelPack.ToApi()+ }++ defer func() {+ if settings != nil {+ settings.Configure(apiModelPacks, os.Getenv("PLANDEX_CLOUD") != "")+ }+ }()+query := "SELECT * FROM default_plan_settings WHERE org_id = $1"var defaults DefaultPlanSettings- err := Conn.Get(&defaults, query, orgId)+ err = Conn.Get(&defaults, query, orgId)if err != nil {if err == sql.ErrNoRows {@@ -107,28 +132,36 @@ func GetOrgDefaultSettings(orgId string, fillDefaultModelPack bool) (*shared.Plasettings := &shared.PlanSettings{UpdatedAt: time.Time{},}- if settings.ModelPack == nil && fillDefaultModelPack {- settings.ModelPack = shared.DefaultModelPack- }return settings, nil}return nil, fmt.Errorf("error getting default plan settings: %v", err)}- // fill in default WholeFileBuilder if not set- if defaults.PlanSettings.ModelPack.WholeFileBuilder == nil {- defaults.PlanSettings.ModelPack.WholeFileBuilder = shared.DefaultModelPack.WholeFileBuilder- }-return &defaults.PlanSettings, nil}-func GetOrgDefaultSettingsForUpdate(orgId string, tx *sqlx.Tx, fillDefaultModelPack bool) (*shared.PlanSettings, error) {+func GetOrgDefaultSettingsForUpdate(orgId string, tx *sqlx.Tx) (settings *shared.PlanSettings, err error) {+ customModelPacks, err := ListModelPacks(orgId)+ if err != nil {+ return nil, fmt.Errorf("error getting custom model packs: %v", err)+ }++ apiModelPacks := make([]*shared.ModelPack, len(customModelPacks))+ for i, modelPack := range customModelPacks {+ apiModelPacks[i] = modelPack.ToApi()+ }++ defer func() {+ if settings != nil {+ settings.Configure(apiModelPacks, os.Getenv("PLANDEX_CLOUD") != "")+ }+ }()+query := "SELECT * FROM default_plan_settings WHERE org_id = $1 FOR UPDATE"var defaults DefaultPlanSettings- err := tx.Get(&defaults, query, orgId)+ err = tx.Get(&defaults, query, orgId)if err != nil {if err == sql.ErrNoRows {@@ -136,9 +169,6 @@ func GetOrgDefaultSettingsForUpdate(orgId string, tx *sqlx.Tx, fillDefaultModelPsettings := &shared.PlanSettings{UpdatedAt: time.Time{},}- if settings.ModelPack == nil && fillDefaultModelPack {- settings.ModelPack = shared.DefaultModelPack- }return settings, nil}return nil, fmt.Errorf("error getting default plan settings: %v", err)diff --git a/app/server/handlers/context_helper.go b/app/server/handlers/context_helper.goindex 626440c3..5aab14de 100644--- a/app/server/handlers/context_helper.go+++ b/app/server/handlers/context_helper.go@@ -94,7 +94,7 @@ func loadContexts(for _, context := range *loadReq {if context.ContextType == shared.ContextPipedDataType || context.ContextType == shared.ContextNoteType || context.ContextType == shared.ContextImageType {- settings, err = db.GetPlanSettings(plan, true)+ settings, err = db.GetPlanSettings(plan)if err != nil {log.Printf("Error getting plan settings: %v\n", err)@@ -123,9 +123,9 @@ func loadContexts(// ensure image compatibility if we're loading an imagefor _, context := range *loadReq {if context.ContextType == shared.ContextImageType {- if !settings.ModelPack.Planner.GetSharedBaseConfig().HasImageSupport {- log.Printf("Error loading context: %s does not support images in context\n", settings.ModelPack.Planner.ModelId)- http.Error(w, fmt.Sprintf("Error loading context: %s does not support images in context", settings.ModelPack.Planner.ModelId), http.StatusBadRequest)+ if !settings.GetModelPack().Planner.GetSharedBaseConfig().HasImageSupport {+ log.Printf("Error loading context: %s does not support images in context\n", settings.GetModelPack().Planner.ModelId)+ http.Error(w, fmt.Sprintf("Error loading context: %s does not support images in context", settings.GetModelPack().Planner.ModelId), http.StatusBadRequest)return nil, nil}}diff --git a/app/server/handlers/models.go b/app/server/handlers/models.goindex b3d941d8..0e1934d4 100644--- a/app/server/handlers/models.go+++ b/app/server/handlers/models.go@@ -35,11 +35,6 @@ func UpsertCustomModelsHandler(w http.ResponseWriter, r *http.Request) {return}- if modelsInput.IsEmpty() {- http.Error(w, "No custom models, providers, or model packs provided", http.StatusBadRequest)- return- }-if len(modelsInput.CustomProviders) > 0 {if os.Getenv("IS_CLOUD") != "" {http.Error(w, "Custom model providers are not supported on Plandex Cloud", http.StatusBadRequest)@@ -249,6 +244,13 @@ func UpsertCustomModelsHandler(w http.ResponseWriter, r *http.Request) {}}+ numChanges := len(toUpsertCustomModels) + len(toUpsertCustomProviders) + len(toUpsertModelPacks) + len(toDeleteCustomModelIds) + len(toDeleteCustomProviderIds) + len(toDeleteModelPackIds)+ if numChanges == 0 {+ w.WriteHeader(http.StatusOK)+ log.Println("No changes to custom models/providers/model packs")+ return+ }+err = db.WithTx(r.Context(), "create custom models/providers/model packs", func(tx *sqlx.Tx) error {for _, model := range toUpsertCustomModels {if err := db.UpsertCustomModel(tx, model); err != nil {diff --git a/app/server/handlers/plans_changes.go b/app/server/handlers/plans_changes.goindex 6ea3a498..fa719d6d 100644--- a/app/server/handlers/plans_changes.go+++ b/app/server/handlers/plans_changes.go@@ -158,7 +158,7 @@ func ApplyPlanHandler(w http.ResponseWriter, r *http.Request) {CancelFn: cancel,}, func(repo *db.GitRepo) error {var err error- settings, err = db.GetPlanSettings(plan, true)+ settings, err = db.GetPlanSettings(plan)if err != nil {return fmt.Errorf("error getting plan settings: %v", err)}diff --git a/app/server/handlers/settings.go b/app/server/handlers/settings.goindex ab6bccd6..b6822d5c 100644--- a/app/server/handlers/settings.go+++ b/app/server/handlers/settings.go@@ -47,7 +47,7 @@ func GetSettingsHandler(w http.ResponseWriter, r *http.Request) {Ctx: ctx,CancelFn: cancel,}, func(repo *db.GitRepo) error {- res, err := db.GetPlanSettings(plan, true)+ res, err := db.GetPlanSettings(plan)if err != nil {return err}@@ -105,6 +105,12 @@ func UpdateSettingsHandler(w http.ResponseWriter, r *http.Request) {return}+ if req.ModelPackName == "" && req.ModelPack == nil {+ log.Println("No model pack name or model pack provided")+ http.Error(w, "No model pack name or model pack provided", http.StatusBadRequest)+ return+ }+ctx, cancel := context.WithCancel(r.Context())var commitMsg string@@ -119,25 +125,38 @@ func UpdateSettingsHandler(w http.ResponseWriter, r *http.Request) {Ctx: ctx,CancelFn: cancel,}, func(repo *db.GitRepo) error {- originalSettings, err := db.GetPlanSettings(plan, true)+ originalSettings, err := db.GetPlanSettings(plan)if err != nil {return fmt.Errorf("error getting settings: %v", err)}+ settings, err := originalSettings.DeepCopy()+ if err != nil {+ return fmt.Errorf("error copying settings: %v", err)+ }++ if req.ModelPackName != "" {+ settings.SetModelPackByName(req.ModelPackName)+ } else if req.ModelPack != nil {+ settings.SetCustomModelPack(req.ModelPack)+ } else {+ return fmt.Errorf("no model pack name or model pack provided")+ }+// log.Println("Original settings:")// spew.Dump(originalSettings)// log.Println("req.Settings:")// spew.Dump(req.Settings)- err = db.StorePlanSettings(plan, req.Settings)+ err = db.StorePlanSettings(plan, *settings)if err != nil {return fmt.Errorf("error storing settings: %v", err)}- commitMsg = getUpdateCommitMsg(req.Settings, originalSettings, false)+ commitMsg = getUpdateCommitMsg(settings, originalSettings, false)err = repo.GitAddAndCommit(branch, commitMsg)@@ -179,7 +198,7 @@ func GetDefaultSettingsHandler(w http.ResponseWriter, r *http.Request) {return}- settings, err := db.GetOrgDefaultSettings(auth.OrgId, true)+ settings, err := db.GetOrgDefaultSettings(auth.OrgId)if err != nil {log.Println("Error getting default settings: ", err)@@ -218,31 +237,45 @@ func UpdateDefaultSettingsHandler(w http.ResponseWriter, r *http.Request) {return}+ if req.ModelPackName == "" && req.ModelPack == nil {+ log.Println("No model pack name or model pack provided")+ http.Error(w, "No model pack name or model pack provided", http.StatusBadRequest)+ return+ }+var originalSettings *shared.PlanSettings+ var settings *shared.PlanSettingserr = db.WithTx(r.Context(), "update default settings", func(tx *sqlx.Tx) error {var err error- originalSettings, err = db.GetOrgDefaultSettingsForUpdate(auth.OrgId, tx, true)+ originalSettings, err = db.GetOrgDefaultSettingsForUpdate(auth.OrgId, tx)if err != nil {log.Println("Error getting default settings: ", err)return fmt.Errorf("error getting default settings: %v", err)}+ settings, err = originalSettings.DeepCopy()+ if err != nil {+ return fmt.Errorf("error copying settings: %v", err)+ }++ if req.ModelPackName != "" {+ settings.SetModelPackByName(req.ModelPackName)+ } else if req.ModelPack != nil {+ settings.SetCustomModelPack(req.ModelPack)+ } else {+ return fmt.Errorf("no model pack name or model pack provided")+ }+// log.Println("Original settings:")// spew.Dump(originalSettings)// log.Println("req.Settings:")// spew.Dump(req.Settings)- if !req.Settings.UpdatedAt.Equal(originalSettings.UpdatedAt) {- err = fmt.Errorf("default settings have been updated since you last fetched them")- log.Println("Error updating default settings: ", err)- return fmt.Errorf("error updating default settings: %v", err)- }-- err = db.StoreOrgDefaultSettings(auth.OrgId, req.Settings, tx)+ err = db.StoreOrgDefaultSettings(auth.OrgId, settings, tx)if err != nil {log.Println("Error storing default settings: ", err)@@ -258,7 +291,7 @@ func UpdateDefaultSettingsHandler(w http.ResponseWriter, r *http.Request) {return}- commitMsg := getUpdateCommitMsg(req.Settings, originalSettings, true)+ commitMsg := getUpdateCommitMsg(settings, originalSettings, true)res := shared.UpdateSettingsResponse{Msg: commitMsg,@@ -283,13 +316,6 @@ func getUpdateCommitMsg(settings *shared.PlanSettings, originalSettings *shared.// log.Println("New:")// spew.Dump(settings)- var changes []string- compareAny(originalSettings, settings, "", &changes)-- if len(changes) == 0 {- return "No changes to settings"- }-// log.Println("Changes to settings:", strings.Join(changes, "\n"))var s stringif isOrgDefault {@@ -298,6 +324,13 @@ func getUpdateCommitMsg(settings *shared.PlanSettings, originalSettings *shared.s = "⚙️ Updated model settings:"}+ var changes []string+ changes = compareSettings(originalSettings, settings, changes)++ if len(changes) == 0 {+ return "No changes to settings"+ }+for _, change := range changes {s += "\n" + " • " + change}@@ -305,32 +338,92 @@ func getUpdateCommitMsg(settings *shared.PlanSettings, originalSettings *shared.return s}-func compareAny(a, b interface{}, path string, changes *[]string) {+func compareSettings(original, updated *shared.PlanSettings, changes []string) []string {+ if updated.ModelPackName != "" {+ originalName := "custom"+ if original.ModelPackName != "" {+ originalName = original.ModelPackName+ }+ changes = append(changes, fmt.Sprintf("model-pack | %v → %v", originalName, updated.ModelPackName))+ } else if updated.ModelPack != nil {+ if original.ModelPack == nil {+ changes = append(changes, fmt.Sprintf("model-pack | %v → %v", original.ModelPackName, "custom"))+ }++ changes = compareAny(original.GetModelPack().ToModelPackSchema().ModelPackSchemaRoles, updated.GetModelPack().ToModelPackSchema().ModelPackSchemaRoles, "", changes)+ }++ return changes+}++func compareAny(a, b interface{}, path string, changes []string) []string {aVal, bVal := reflect.ValueOf(a), reflect.ValueOf(b)- // Check validity as before- if !aVal.IsValid() || !bVal.IsValid() {- return+ if !aVal.IsValid() && !bVal.IsValid() {+ return changes+ }++ // Pointer / nil handling – BEFORE dereferencing+ if aVal.Kind() == reflect.Ptr || bVal.Kind() == reflect.Ptr {+ // both nil → nothing+ if (aVal.Kind() == reflect.Ptr && aVal.IsNil()) &&+ (bVal.Kind() == reflect.Ptr && bVal.IsNil()) {+ return changes+ }++ // one nil, one non-nil → record diff+ if (aVal.Kind() == reflect.Ptr && aVal.IsNil()) ||+ (bVal.Kind() == reflect.Ptr && bVal.IsNil()) {+ aStr := "none"+ bStr := "none"+ if aVal.Kind() != reflect.Ptr || !aVal.IsNil() {+ aStr = short(aVal)+ }+ if bVal.Kind() != reflect.Ptr || !bVal.IsNil() {+ bStr = short(bVal)+ }+ changes = append(changes, fmt.Sprintf("%s | %s → %s", path, aStr, bStr))+ return changes+ }++ // both non-nil pointers → safe to dereference+ if aVal.Kind() == reflect.Ptr {+ aVal = aVal.Elem()+ }+ if bVal.Kind() == reflect.Ptr {+ bVal = bVal.Elem()+ }}- // Dereference pointers- if aVal.Kind() == reflect.Ptr && bVal.Kind() == reflect.Ptr {- aVal = aVal.Elem()- bVal = bVal.Elem()+ // Check again after dereferencing+ if !aVal.IsValid() && !bVal.IsValid() {+ return changes}- // Check validity after dereferencing+ // One side nil → record diff and stopif !aVal.IsValid() || !bVal.IsValid() {- return+ var aStr, bStr string+ if aVal.IsValid() {+ aStr = short(aVal)+ } else {+ aStr = "none"+ }+ if bVal.IsValid() {+ bStr = short(bVal)+ } else {+ bStr = "none"+ }+ changes = append(changes, fmt.Sprintf("%s | %s → %s", path, aStr, bStr))+ return changes}// Ensure we can safely call Interface()if !aVal.CanInterface() || !bVal.CanInterface() {- return+ return changes}if reflect.DeepEqual(aVal.Interface(), bVal.Interface()) {- return // No difference found+ return changes // No difference found}switch aVal.Kind() {@@ -359,23 +452,58 @@ func compareAny(a, b interface{}, path string, changes *[]string) {}}- compareAny(aVal.Field(i).Interface(), bVal.Field(i).Interface(), updatedPath, changes)+ changes = compareAny(aVal.Field(i).Interface(), bVal.Field(i).Interface(), updatedPath, changes)}default:var aStr, bStr stringif aVal.IsValid() {- aStr = fmt.Sprintf("%v", aVal.Interface())+ aStr = short(aVal)} else {aStr = "no override"}if bVal.IsValid() {- bStr = fmt.Sprintf("%v", bVal.Interface())+ bStr = short(bVal)} else {bStr = "no override"}change := fmt.Sprintf("%s | %v → %v", path, aStr, bStr)- *changes = append(*changes, change)+ changes = append(changes, change)+ }++ return changes+}++func short(v reflect.Value) string {+ if !v.IsValid() {+ return "none"+ }++ // If it’s a pointer, follow it once+ if v.Kind() == reflect.Ptr {+ if v.IsNil() {+ return "none"+ }+ v = v.Elem()+ }++ switch v.Kind() {+ case reflect.String:+ return v.String()+ case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:+ return fmt.Sprintf("%d", v.Int())+ case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:+ return fmt.Sprintf("%d", v.Uint())+ case reflect.Float32, reflect.Float64:+ return fmt.Sprintf("%g", v.Float())+ case reflect.Struct:+ // Special-case ModelRoleConfigSchema: show the ModelId only+ if f := v.FieldByName("ModelId"); f.IsValid() && f.Kind() == reflect.String {+ return f.String()+ }+ return fmt.Sprintf("%T", v.Interface()) // fall-back: just the type name+ default:+ return fmt.Sprintf("%v", v.Interface())}}diff --git a/app/server/model/name.go b/app/server/model/name.goindex 1a2af315..227db5b6 100644--- a/app/server/model/name.go+++ b/app/server/model/name.go@@ -24,12 +24,12 @@ func GenPlanName(sessionId string,ctx context.Context,) (string, error) {- config := settings.ModelPack.Namer+ config := settings.GetModelPack().Namervar tools []openai.Toolvar toolChoice *openai.ToolChoice- baseModelConfig := config.GetBaseModelConfig(authVars, settings.ModelPack.LocalProvider)+ baseModelConfig := config.GetBaseModelConfig(authVars, settings.GetModelPack().LocalProvider)var sysPrompt stringif baseModelConfig.PreferredOutputFormat == shared.ModelOutputFormatXml {@@ -76,7 +76,7 @@ func GenPlanName(Tools: tools,ToolChoice: toolChoice,SessionId: sessionId,- LocalProvider: settings.ModelPack.LocalProvider,+ LocalProvider: settings.GetModelPack().LocalProvider,})if err != nil {@@ -133,13 +133,13 @@ func GenPipedDataName(pipedContent := params.PipedContentsessionId := params.SessionId- config := settings.ModelPack.Namer+ config := settings.GetModelPack().Namervar sysPrompt stringvar tools []openai.Toolvar toolChoice *openai.ToolChoice- baseModelConfig := config.GetBaseModelConfig(authVars, settings.ModelPack.LocalProvider)+ baseModelConfig := config.GetBaseModelConfig(authVars, settings.GetModelPack().LocalProvider)if baseModelConfig.PreferredOutputFormat == shared.ModelOutputFormatXml {sysPrompt = prompts.SysPipedDataNameXml@@ -185,7 +185,7 @@ func GenPipedDataName(Tools: tools,ToolChoice: toolChoice,SessionId: sessionId,- LocalProvider: settings.ModelPack.LocalProvider,+ LocalProvider: settings.GetModelPack().LocalProvider,})if err != nil {@@ -229,13 +229,13 @@ func GenNoteName(note string,sessionId string,) (string, error) {- config := settings.ModelPack.Namer+ config := settings.GetModelPack().Namervar sysPrompt stringvar tools []openai.Toolvar toolChoice *openai.ToolChoice- baseModelConfig := config.GetBaseModelConfig(authVars, settings.ModelPack.LocalProvider)+ baseModelConfig := config.GetBaseModelConfig(authVars, settings.GetModelPack().LocalProvider)if baseModelConfig.PreferredOutputFormat == shared.ModelOutputFormatXml {sysPrompt = prompts.SysNoteNameXml@@ -281,7 +281,7 @@ func GenNoteName(Tools: tools,ToolChoice: toolChoice,SessionId: sessionId,- LocalProvider: settings.ModelPack.LocalProvider,+ LocalProvider: settings.GetModelPack().LocalProvider,})if err != nil {diff --git a/app/server/model/plan/build_load.go b/app/server/model/plan/build_load.goindex 0ea2dd27..2310f32f 100644--- a/app/server/model/plan/build_load.go+++ b/app/server/model/plan/build_load.go@@ -93,7 +93,7 @@ func (state *activeBuildStreamState) loadPendingBuilds(sessionId string) (map[struntime.Goexit() // don't allow outer function to continue and double-send to channel}}()- res, err := db.GetPlanSettings(plan, true)+ res, err := db.GetPlanSettings(plan)if err != nil {log.Printf("Error getting plan settings: %v\n", err)errCh <- fmt.Errorf("error getting plan settings: %v", err)diff --git a/app/server/model/plan/build_validate_and_fix.go b/app/server/model/plan/build_validate_and_fix.goindex a4f6efe5..f732fa5b 100644--- a/app/server/model/plan/build_validate_and_fix.go+++ b/app/server/model/plan/build_validate_and_fix.go@@ -94,7 +94,7 @@ func (fileState *activeBuildStreamFileState) buildValidateLoop(log.Printf("Using empty reasons list for attempt %d", currentAttempt)}- modelConfig := fileState.settings.ModelPack.Builder+ modelConfig := fileState.settings.GetModelPack().Builder// if available, switch to stronger model after the first attempt failedif currentAttempt > 2 && modelConfig.StrongModel != nil {log.Printf("Switching to strong model for attempt %d", currentAttempt)@@ -199,7 +199,7 @@ func (fileState *activeBuildStreamFileState) buildValidate(syntaxErrors := params.syntaxErrorsreasons := params.reasons- baseModelConfig := modelConfig.GetBaseModelConfig(authVars, fileState.settings.ModelPack.LocalProvider)+ baseModelConfig := modelConfig.GetBaseModelConfig(authVars, fileState.settings.GetModelPack().LocalProvider)// Get diff for validationlog.Printf("Getting diffs between original and updated content")@@ -277,7 +277,7 @@ func (fileState *activeBuildStreamFileState) buildValidate(ModelStreamId: fileState.modelStreamId,ConvoMessageId: fileState.convoMessageId,BuildId: fileState.build.Id,- ModelPackName: fileState.settings.ModelPack.Name,+ ModelPackName: fileState.settings.GetModelPack().Name,Stop: stop,BeforeReq: func() {log.Printf("Starting model request")@@ -292,7 +292,7 @@ func (fileState *activeBuildStreamFileState) buildValidate(WillCacheNumTokens: willCacheNumTokens,SessionId: params.sessionId,EstimatedOutputTokens: maxExpectedOutputTokens,- LocalProvider: fileState.settings.ModelPack.LocalProvider,+ LocalProvider: fileState.settings.GetModelPack().LocalProvider,})if err != nil {diff --git a/app/server/model/plan/build_whole_file.go b/app/server/model/plan/build_whole_file.goindex 0cd2848e..bc963cb5 100644--- a/app/server/model/plan/build_whole_file.go+++ b/app/server/model/plan/build_whole_file.go@@ -25,7 +25,7 @@ func (fileState *activeBuildStreamFileState) buildWholeFileFallback(buildCtx conplanId := fileState.plan.Idbranch := fileState.branchoriginalFile := fileState.preBuildState- config := fileState.settings.ModelPack.GetWholeFileBuilder()+ config := fileState.settings.GetModelPack().GetWholeFileBuilder()activePlan := GetActivePlan(planId, branch)@@ -35,7 +35,7 @@ func (fileState *activeBuildStreamFileState) buildWholeFileFallback(buildCtx conreturn "", fmt.Errorf("active plan not found for plan ID %s and branch %s", planId, branch)}- baseModelConfig := config.GetBaseModelConfig(authVars, fileState.settings.ModelPack.LocalProvider)+ baseModelConfig := config.GetBaseModelConfig(authVars, fileState.settings.GetModelPack().LocalProvider)originalFileWithLineNums := shared.AddLineNums(originalFile)proposedContentWithLineNums := shared.AddLineNums(proposedContent)@@ -110,7 +110,7 @@ func (fileState *activeBuildStreamFileState) buildWholeFileFallback(buildCtx conEstimatedOutputTokens: maxExpectedOutputTokens,SessionId: sessionId,- LocalProvider: fileState.settings.ModelPack.LocalProvider,+ LocalProvider: fileState.settings.GetModelPack().LocalProvider,})if err != nil {diff --git a/app/server/model/plan/commit_msg.go b/app/server/model/plan/commit_msg.goindex 022d7ea4..a03064c9 100644--- a/app/server/model/plan/commit_msg.go+++ b/app/server/model/plan/commit_msg.go@@ -26,7 +26,7 @@ func (state *activeTellStreamState) genPlanDescription() (*db.ConvoMessageDescrisettings := state.settingsclients := state.clientsauthVars := state.authVars- config := settings.ModelPack.CommitMsg+ config := settings.GetModelPack().CommitMsgactivePlan := GetActivePlan(planId, branch)if activePlan == nil {@@ -39,7 +39,7 @@ func (state *activeTellStreamState) genPlanDescription() (*db.ConvoMessageDescri}}- baseModelConfig := config.GetBaseModelConfig(authVars, settings.ModelPack.LocalProvider)+ baseModelConfig := config.GetBaseModelConfig(authVars, settings.GetModelPack().LocalProvider)var sysPrompt stringvar tools []openai.Tool@@ -96,7 +96,7 @@ func (state *activeTellStreamState) genPlanDescription() (*db.ConvoMessageDescriModelStreamId: state.modelStreamId,ConvoMessageId: state.replyId,SessionId: activePlan.SessionId,- LocalProvider: settings.ModelPack.LocalProvider,+ LocalProvider: settings.GetModelPack().LocalProvider,}if tools != nil {@@ -192,7 +192,7 @@ func GenCommitMsgForPendingResults(params GenCommitMsgForPendingResultsParams) (clients := params.ClientsauthVars := params.AuthVars- config := settings.ModelPack.CommitMsg+ config := settings.GetModelPack().CommitMsgs := ""@@ -240,7 +240,7 @@ func GenCommitMsgForPendingResults(params GenCommitMsgForPendingResultsParams) (Purpose: "Commit message",Messages: messages,SessionId: sessionId,- LocalProvider: settings.ModelPack.LocalProvider,+ LocalProvider: settings.GetModelPack().LocalProvider,})if err != nil {diff --git a/app/server/model/plan/exec_status.go b/app/server/model/plan/exec_status.goindex 531ccdab..99757a0f 100644--- a/app/server/model/plan/exec_status.go+++ b/app/server/model/plan/exec_status.go@@ -33,9 +33,9 @@ func (state *activeTellStreamState) execStatusShouldContinue(currentMessage strisettings := state.settingsclients := state.clientsauthVars := state.authVars- config := settings.ModelPack.ExecStatus+ config := settings.GetModelPack().ExecStatus- baseModelConfig := config.GetBaseModelConfig(authVars, settings.ModelPack.LocalProvider)+ baseModelConfig := config.GetBaseModelConfig(authVars, settings.GetModelPack().LocalProvider)currentSubtask := state.currentSubtaskif currentSubtask == nil {@@ -155,7 +155,7 @@ func (state *activeTellStreamState) execStatusShouldContinue(currentMessage striModelStreamId: state.modelStreamId,ConvoMessageId: state.replyId,SessionId: sessionId,- LocalProvider: settings.ModelPack.LocalProvider,+ LocalProvider: settings.GetModelPack().LocalProvider,})if err != nil {diff --git a/app/server/model/plan/tell_exec.go b/app/server/model/plan/tell_exec.goindex 8c411e9c..f757b234 100644--- a/app/server/model/plan/tell_exec.go+++ b/app/server/model/plan/tell_exec.go@@ -181,15 +181,15 @@ func execTellPlan(params execTellPlanParams) {if state.currentStage.TellStage == shared.TellStagePlanning {if state.currentStage.PlanningPhase == shared.PlanningPhaseContext {log.Println("Tell plan - isContextStage - setting modelConfig to context loader")- tentativeModelConfig = state.settings.ModelPack.GetArchitect()+ tentativeModelConfig = state.settings.GetModelPack().GetArchitect()tentativeMaxTokens = state.settings.GetArchitectEffectiveMaxTokens()} else {- plannerConfig := state.settings.ModelPack.Planner+ plannerConfig := state.settings.GetModelPack().PlannertentativeModelConfig = plannerConfig.ModelRoleConfigtentativeMaxTokens = state.settings.GetPlannerEffectiveMaxTokens()}} else if state.currentStage.TellStage == shared.TellStageImplementation {- tentativeModelConfig = state.settings.ModelPack.GetCoder()+ tentativeModelConfig = state.settings.GetModelPack().GetCoder()tentativeMaxTokens = state.settings.GetCoderEffectiveMaxTokens()} else {log.Printf("Tell plan - execTellPlan - unknown tell stage: %s\n", state.currentStage.TellStage)@@ -397,21 +397,21 @@ func execTellPlan(params execTellPlanParams) {if state.currentStage.TellStage == shared.TellStagePlanning {if state.currentStage.PlanningPhase == shared.PlanningPhaseContext {log.Println("Tell plan - isContextStage - setting modelConfig to context loader")- modelConfig = state.settings.ModelPack.GetArchitect().GetRoleForInputTokens(requestTokens)+ modelConfig = state.settings.GetModelPack().GetArchitect().GetRoleForInputTokens(requestTokens)log.Println("Tell plan - got modelConfig for context phase")} else if state.currentStage.PlanningPhase == shared.PlanningPhaseTasks {- modelConfig = state.settings.ModelPack.Planner.GetRoleForInputTokens(requestTokens)+ modelConfig = state.settings.GetModelPack().Planner.GetRoleForInputTokens(requestTokens)log.Println("Tell plan - got modelConfig for tasks phase")}} else if state.currentStage.TellStage == shared.TellStageImplementation {- modelConfig = state.settings.ModelPack.GetCoder().GetRoleForInputTokens(requestTokens)+ modelConfig = state.settings.GetModelPack().GetCoder().GetRoleForInputTokens(requestTokens)log.Println("Tell plan - got modelConfig for implementation stage")}// log.Println("Tell plan - modelConfig:", spew.Sdump(modelConfig))state.modelConfig = &modelConfig- baseModelConfig := modelConfig.GetBaseModelConfig(authVars, state.settings.ModelPack.LocalProvider)+ baseModelConfig := modelConfig.GetBaseModelConfig(authVars, state.settings.GetModelPack().LocalProvider)state.baseModelConfig = baseModelConfig@@ -485,11 +485,11 @@ func (state *activeTellStreamState) doTellRequest() {modelConfig := state.modelConfigactive := state.activePlan- fallbackRes := modelConfig.GetFallbackForModelError(state.numErrorRetry, state.didProviderFallback, state.modelErr, authVars, state.settings.ModelPack.LocalProvider)+ fallbackRes := modelConfig.GetFallbackForModelError(state.numErrorRetry, state.didProviderFallback, state.modelErr, authVars, state.settings.GetModelPack().LocalProvider)modelConfig = fallbackRes.ModelRoleConfigstop := []string{"<PlandexFinish/>"}- baseModelConfig := modelConfig.GetBaseModelConfig(state.authVars, state.settings.ModelPack.LocalProvider)+ baseModelConfig := modelConfig.GetBaseModelConfig(state.authVars, state.settings.GetModelPack().LocalProvider)if fallbackRes.FallbackType == shared.FallbackTypeProvider {state.didProviderFallback = true@@ -553,7 +553,7 @@ func (state *activeTellStreamState) doTellRequest() {state.numErrorRetry, state.numFallbackRetry, baseModelConfig.ModelName)// start the stream- stream, err := model.CreateChatCompletionStream(clients, authVars, modelConfig, state.settings.ModelPack.LocalProvider, active.ModelStreamCtx, modelReq)+ stream, err := model.CreateChatCompletionStream(clients, authVars, modelConfig, state.settings.GetModelPack().LocalProvider, active.ModelStreamCtx, modelReq)if err != nil {log.Printf("Error starting reply stream: %v\n", err)go notify.NotifyErr(notify.SeverityError, fmt.Errorf("error starting reply stream: %v", err))diff --git a/app/server/model/plan/tell_load.go b/app/server/model/plan/tell_load.goindex 95e3caec..0d75cd86 100644--- a/app/server/model/plan/tell_load.go+++ b/app/server/model/plan/tell_load.go@@ -74,7 +74,7 @@ func (state *activeTellStreamState) loadTellPlan() error {}}()- res, err := db.GetPlanSettings(plan, true)+ res, err := db.GetPlanSettings(plan)if err != nil {log.Printf("Error getting plan settings: %v\n", err)errCh <- fmt.Errorf("error getting plan settings: %v", err)diff --git a/app/server/model/plan/tell_stream_finish.go b/app/server/model/plan/tell_stream_finish.goindex ee6b0e36..617e0ecd 100644--- a/app/server/model/plan/tell_stream_finish.go+++ b/app/server/model/plan/tell_stream_finish.go@@ -126,7 +126,7 @@ func (state *activeTellStreamState) handleStreamFinished() handleStreamFinishedR}}()- err := summarizeConvo(clients, authVars, settings.ModelPack.LocalProvider, settings.ModelPack.PlanSummary, summarizeConvoParams{+ err := summarizeConvo(clients, authVars, settings.GetModelPack().LocalProvider, settings.GetModelPack().PlanSummary, summarizeConvoParams{auth: auth,plan: plan,branch: branch,@@ -136,7 +136,7 @@ func (state *activeTellStreamState) handleStreamFinished() handleStreamFinishedRcurrentOrgId: currentOrgId,currentReply: active.CurrentReplyContent,currentReplyNumTokens: active.NumTokens,- modelPackName: settings.ModelPack.Name,+ modelPackName: settings.GetModelPack().Name,}, active.SummaryCtx)if err != nil {diff --git a/app/server/model/plan/tell_stream_main.go b/app/server/model/plan/tell_stream_main.goindex bcd29325..078ad58a 100644--- a/app/server/model/plan/tell_stream_main.go+++ b/app/server/model/plan/tell_stream_main.go@@ -63,7 +63,7 @@ func (state *activeTellStreamState) listenStream(stream *model.ExtendedChatCompldefer timer.Stop()streamFinished := false- baseModelConfig := state.modelConfig.GetBaseModelConfig(state.authVars, state.settings.ModelPack.LocalProvider)+ baseModelConfig := state.modelConfig.GetBaseModelConfig(state.authVars, state.settings.GetModelPack().LocalProvider)modelProvider := baseModelConfig.ProvidermodelName := baseModelConfig.ModelNamediff --git a/app/server/model/plan/tell_stream_processor.go b/app/server/model/plan/tell_stream_processor.goindex 7de8a42c..ef15c63c 100644--- a/app/server/model/plan/tell_stream_processor.go+++ b/app/server/model/plan/tell_stream_processor.go@@ -58,7 +58,7 @@ func (state *activeTellStreamState) processChunk(choice types.ExtendedChatCompledelta := choice.Deltacontent := delta.Content- baseModelConfig := state.modelConfig.GetBaseModelConfig(state.authVars, state.settings.ModelPack.LocalProvider)+ baseModelConfig := state.modelConfig.GetBaseModelConfig(state.authVars, state.settings.GetModelPack().LocalProvider)if baseModelConfig.IncludeReasoning && delta.Reasoning != "" {content = delta.Reasoningdiff --git a/app/server/model/plan/tell_stream_usage.go b/app/server/model/plan/tell_stream_usage.goindex 7a5c0ab2..9bb82b88 100644--- a/app/server/model/plan/tell_stream_usage.go+++ b/app/server/model/plan/tell_stream_usage.go@@ -27,7 +27,7 @@ func (state *activeTellStreamState) handleUsageChunk(usage *openai.Usage) {sessionId := state.activePlan.SessionIdmodelConfig := state.modelConfig- baseModelConfig := modelConfig.GetBaseModelConfig(state.authVars, state.settings.ModelPack.LocalProvider)+ baseModelConfig := modelConfig.GetBaseModelConfig(state.authVars, state.settings.GetModelPack().LocalProvider)go func() {defer func() {@@ -48,7 +48,7 @@ func (state *activeTellStreamState) handleUsageChunk(usage *openai.Usage) {ModelTag: baseModelConfig.ModelTag,ModelName: baseModelConfig.ModelName,ModelProvider: baseModelConfig.Provider,- ModelPackName: state.settings.ModelPack.Name,+ ModelPackName: state.settings.GetModelPack().Name,ModelRole: modelConfig.Role,Purpose: "Response",GenerationId: generationId,@@ -90,7 +90,7 @@ func (state *activeTellStreamState) execHookOnStop(sendStreamErr bool) {}modelConfig := state.modelConfig- baseModelConfig := modelConfig.GetBaseModelConfig(state.authVars, state.settings.ModelPack.LocalProvider)+ baseModelConfig := modelConfig.GetBaseModelConfig(state.authVars, state.settings.GetModelPack().LocalProvider)go func() {defer func() {@@ -110,7 +110,7 @@ func (state *activeTellStreamState) execHookOnStop(sendStreamErr bool) {ModelTag: baseModelConfig.ModelTag,ModelName: baseModelConfig.ModelName,ModelProvider: baseModelConfig.Provider,- ModelPackName: state.settings.ModelPack.Name,+ ModelPackName: state.settings.GetModelPack().Name,ModelRole: modelConfig.Role,Purpose: "Response",GenerationId: generationId,diff --git a/app/shared/ai_models_custom.go b/app/shared/ai_models_custom.goindex fe293bb8..ba0f414c 100644--- a/app/shared/ai_models_custom.go+++ b/app/shared/ai_models_custom.go@@ -14,7 +14,11 @@ import (type SchemaUrl string-const SchemaUrlInputConfig SchemaUrl = "https://plandex.ai/schemas/models-input.schema.json"+const (+ SchemaUrlInputConfig SchemaUrl = "https://plandex.ai/schemas/models-input.schema.json"+ SchemaUrlPlanConfig SchemaUrl = "https://plandex.ai/schemas/plan-config.schema.json"+ SchemaUrlModelPackRoles SchemaUrl = "https://plandex.ai/schemas/model-pack-roles.schema.json"+)// Note that none of the custom model structs should have maps anywhere in the hierarchy, since it will break deterministic hashing. Use structs or slices instead.@@ -51,16 +55,13 @@ type CustomProvider struct {}type ModelsInput struct {- SchemaUrl SchemaUrl `json:"schemaUrl"`CustomModels []*CustomModel `json:"models"`CustomProviders []*CustomProvider `json:"providers,omitempty"`CustomModelPacks []*ModelPackSchema `json:"modelPacks"`}func (input ModelsInput) FilterUnchanged(existing *ModelsInput) ModelsInput {- filtered := ModelsInput{- SchemaUrl: input.SchemaUrl,- }+ filtered := ModelsInput{}existingProvidersById := map[string]*CustomProvider{}for _, provider := range existing.CustomProviders {@@ -140,22 +141,6 @@ func (input ModelsInput) IsEmpty() bool {return len(input.CustomModels) == 0 && len(input.CustomProviders) == 0 && len(input.CustomModelPacks) == 0}-func (input *ModelsInput) PrepareUpdate() {- input.SchemaUrl = SchemaUrlInputConfig-- for _, model := range input.CustomModels {- model.Id = ""- model.CreatedAt = nil- model.UpdatedAt = nil- }-- for _, provider := range input.CustomProviders {- provider.Id = ""- provider.CreatedAt = nil- provider.UpdatedAt = nil- }-}-func modelsEqual(a, b *CustomModel) bool {return cmp.Equal(a, b,@@ -182,6 +167,14 @@ func packsEqual(a, b *ModelPackSchema) bool {return res}+func (s *ModelPackSchema) Equals(other *ModelPackSchema) bool {+ return packsEqual(s, other)+}++func (mp *ModelPack) Equals(other *ModelPack) bool {+ return mp.ToModelPackSchema().Equals(other.ToModelPackSchema())+}+// Hash returns a deterministic hash of the ModelsInput.// WARNING: This relies on json.Marshal being deterministic for our struct types.// Do not add map fields to these structs or the hash will become non-deterministic.@@ -194,3 +187,75 @@ func (input ModelsInput) Hash() (string, error) {hash := sha256.Sum256(data)return hex.EncodeToString(hash[:]), nil}++type ClientModelPackSchema struct {+ Name string `json:"name"`+ Description string `json:"description"`++ ClientModelPackSchemaRoles+}++func (input *ClientModelPackSchema) ToModelPackSchema() *ModelPackSchema {+ return &ModelPackSchema{+ Name: input.Name,+ Description: input.Description,+ ModelPackSchemaRoles: input.ClientModelPackSchemaRoles.ToModelPackSchemaRoles(),+ }+}++func (input *ModelPackSchema) ToClientModelPackSchema() *ClientModelPackSchema {+ return &ClientModelPackSchema{+ Name: input.Name,+ Description: input.Description,+ ClientModelPackSchemaRoles: input.ToClientModelPackSchemaRoles(),+ }+}++type ClientModelsInput struct {+ SchemaUrl SchemaUrl `json:"$schema"`++ CustomModels []*CustomModel `json:"models"`+ CustomProviders []*CustomProvider `json:"providers,omitempty"`+ CustomModelPacks []*ClientModelPackSchema `json:"modelPacks"`+}++func (input ClientModelsInput) ToModelsInput() ModelsInput {+ modelPacks := []*ModelPackSchema{}+ for _, pack := range input.CustomModelPacks {+ modelPacks = append(modelPacks, pack.ToModelPackSchema())+ }++ return ModelsInput{+ CustomModels: input.CustomModels,+ CustomProviders: input.CustomProviders,+ CustomModelPacks: modelPacks,+ }+}++func (input *ClientModelsInput) PrepareUpdate() {+ for _, model := range input.CustomModels {+ model.Id = ""+ model.CreatedAt = nil+ model.UpdatedAt = nil+ }++ for _, provider := range input.CustomProviders {+ provider.Id = ""+ provider.CreatedAt = nil+ provider.UpdatedAt = nil+ }+}++func (input ModelsInput) ToClientModelsInput() ClientModelsInput {+ clientModelPacks := []*ClientModelPackSchema{}+ for _, pack := range input.CustomModelPacks {+ clientModelPacks = append(clientModelPacks, pack.ToClientModelPackSchema())+ }++ return ClientModelsInput{+ SchemaUrl: SchemaUrlInputConfig,+ CustomModels: input.CustomModels,+ CustomProviders: input.CustomProviders,+ CustomModelPacks: clientModelPacks,+ }+}diff --git a/app/shared/ai_models_data_models.go b/app/shared/ai_models_data_models.goindex ae4bafc8..b149d1d7 100644--- a/app/shared/ai_models_data_models.go+++ b/app/shared/ai_models_data_models.go@@ -1,9 +1,12 @@package sharedimport (+ "crypto/sha256""database/sql/driver"+ "encoding/hex""encoding/json""fmt"+ "reflect""strings""time")@@ -291,10 +294,10 @@ type ModelRoleModelConfig struct {type ModelRoleConfigSchema struct {ModelId ModelId `json:"modelId"`- Temperature float32 `json:"temperature,omitempty"`- TopP float32 `json:"topP,omitempty"`- ReservedOutputTokens int `json:"reservedOutputTokens,omitempty"`- MaxConvoTokens int `json:"maxConvoTokens,omitempty"`+ Temperature *float32 `json:"temperature,omitempty"`+ TopP *float32 `json:"topP,omitempty"`+ ReservedOutputTokens *int `json:"reservedOutputTokens,omitempty"`+ MaxConvoTokens *int `json:"maxConvoTokens,omitempty"`LargeContextFallback *ModelRoleConfigSchema `json:"largeContextFallback,omitempty"`LargeOutputFallback *ModelRoleConfigSchema `json:"largeOutputFallback,omitempty"`@@ -302,6 +305,47 @@ type ModelRoleConfigSchema struct {StrongModel *ModelRoleConfigSchema `json:"strongModel,omitempty"`}+func (m *ModelRoleConfigSchema) ToClientVal() RoleJSON {+ if m == nil {+ return nil+ }+ if m.bareRole() {+ return string(m.ModelId)+ }+ return m+}++// bareRole returns true if *every* field except ModelId is nil / zero.+func (m *ModelRoleConfigSchema) bareRole() bool {+ if m == nil {+ return true+ }++ v := reflect.ValueOf(*m)+ t := v.Type()++ for i := 0; i < v.NumField(); i++ {+ f := t.Field(i)+ if f.Name == "ModelId" { // skip the sentinel field+ continue+ }++ fv := v.Field(i)++ switch fv.Kind() {+ case reflect.Pointer, reflect.Interface, reflect.Map, reflect.Slice:+ if !fv.IsNil() {+ return false+ }+ default:+ if !fv.IsZero() {+ return false+ }+ }+ }+ return true+}+func (m *ModelRoleConfigSchema) AllModelIds() []ModelId {ids := []ModelId{}@@ -354,14 +398,31 @@ func (m *ModelRoleConfigSchema) toModelRoleConfig(role ModelRole) ModelRoleConfistrongModel = &c}+ temperature := m.Temperature+ topP := m.TopP++ config := DefaultConfigByRole[role]++ if temperature == nil {+ temperature = &config.Temperature+ }+ if topP == nil {+ topP = &config.TopP+ }++ var reservedOutputTokens int+ if m.ReservedOutputTokens != nil {+ reservedOutputTokens = *m.ReservedOutputTokens+ }+return ModelRoleConfig{Role: role,ModelId: m.ModelId,- Temperature: m.Temperature,- TopP: m.TopP,- ReservedOutputTokens: m.ReservedOutputTokens,+ Temperature: *temperature,+ TopP: *topP,+ ReservedOutputTokens: reservedOutputTokens,LargeContextFallback: largeContextFallback,LargeOutputFallback: largeOutputFallback,@@ -392,11 +453,28 @@ func (m *ModelRoleConfig) ToModelRoleConfigSchema() ModelRoleConfigSchema {strongModel = &c}+ defaultConfig := DefaultConfigByRole[m.Role]++ var temperature *float32+ var topP *float32+ var reservedOutputTokens *int++ if m.Temperature != defaultConfig.Temperature {+ temperature = &m.Temperature+ }+ if m.TopP != defaultConfig.TopP {+ topP = &m.TopP+ }++ if m.ReservedOutputTokens != 0 {+ reservedOutputTokens = &m.ReservedOutputTokens+ }+return ModelRoleConfigSchema{- ModelId: m.ModelId,- Temperature: m.Temperature,- TopP: m.TopP,- ReservedOutputTokens: m.ReservedOutputTokens,+ ModelId: m.GetModelId(),+ Temperature: temperature,+ TopP: topP,+ ReservedOutputTokens: reservedOutputTokens,LargeContextFallback: largeContextFallback,LargeOutputFallback: largeOutputFallback,ErrorFallback: errorFallback,@@ -404,6 +482,18 @@ func (m *ModelRoleConfig) ToModelRoleConfigSchema() ModelRoleConfigSchema {}}+func (p PlannerRoleConfig) ToModelRoleConfigSchema() ModelRoleConfigSchema {+ s := p.ModelRoleConfig.ToModelRoleConfigSchema()++ var maxConvoTokens *int+ if p.MaxConvoTokens != 0 {+ maxConvoTokens = &p.MaxConvoTokens+ }++ s.MaxConvoTokens = maxConvoTokens+ return s+}+func (m ModelRoleConfig) GetModelId() ModelId {if m.BaseModelConfig != nil {return m.BaseModelConfig.ModelId@@ -508,9 +598,81 @@ func (p PlannerRoleConfig) GetMaxConvoTokens() int {return p.ModelRoleConfig.GetSharedBaseConfig().DefaultMaxConvoTokens}-type ModelPackSchema struct {- Name string `json:"name"`- Description string `json:"description"`+type RoleJSON any++type ClientModelPackSchemaRoles struct {+ SchemaUrl SchemaUrl `json:"$schema,omitempty"`++ LocalProvider ModelProvider `json:"local-provider,omitempty"`++ // in the JSON, these can either be a role as a string or a ModelRoleConfigSchema object for more complex config+ Planner RoleJSON `json:"planner"`+ Architect RoleJSON `json:"architect,omitempty"`+ Coder RoleJSON `json:"coder,omitempty"`+ PlanSummary RoleJSON `json:"summarizer"`+ Builder RoleJSON `json:"builder"`+ WholeFileBuilder RoleJSON `json:"wholeFileBuilder,omitempty"`+ Namer RoleJSON `json:"names"`+ CommitMsg RoleJSON `json:"commitMessages"`+ ExecStatus RoleJSON `json:"autoContinue"`+}++func (c *ClientModelPackSchemaRoles) ToModelPackSchemaRoles() ModelPackSchemaRoles {+ res := ModelPackSchemaRoles{+ LocalProvider: c.LocalProvider,+ }++ // Helper function to convert o the appropriate type+ convertField := func(field interface{}) *ModelRoleConfigSchema {+ if field == nil {+ return nil+ }++ switch v := field.(type) {+ case string:+ // It's a string, handle accordingly+ return &ModelRoleConfigSchema{+ ModelId: ModelId(v),+ }+ case map[string]any:+ // re-marshal then unmarshal into the right struct+ b, _ := json.Marshal(v)+ var m ModelRoleConfigSchema+ if err := json.Unmarshal(b, &m); err != nil {+ return nil+ }+ return &m+ default:+ // Handle unexpected type - you might want to log or panic+ // Or try to convert from a map if it's coming from JSON+ return nil+ }+ }++ // Convert each field+ res.Planner = *convertField(c.Planner)+ if c.Coder != nil {+ converted := convertField(c.Coder)+ res.Coder = converted+ }+ res.PlanSummary = *convertField(c.PlanSummary)+ res.Builder = *convertField(c.Builder)+ if c.WholeFileBuilder != nil {+ converted := convertField(c.WholeFileBuilder)+ res.WholeFileBuilder = converted+ }+ res.Namer = *convertField(c.Namer)+ res.CommitMsg = *convertField(c.CommitMsg)+ res.ExecStatus = *convertField(c.ExecStatus)+ if c.Architect != nil {+ converted := convertField(c.Architect)+ res.Architect = converted+ }++ return res+}++type ModelPackSchemaRoles struct {LocalProvider ModelProvider `json:"localProvider,omitempty"`Planner ModelRoleConfigSchema `json:"planner"`Coder *ModelRoleConfigSchema `json:"coder,omitempty"`@@ -523,6 +685,41 @@ type ModelPackSchema struct {Architect *ModelRoleConfigSchema `json:"contextLoader,omitempty"`}+func (m *ModelPackSchemaRoles) ToClientModelPackSchemaRoles() ClientModelPackSchemaRoles {+ res := ClientModelPackSchemaRoles{+ SchemaUrl: SchemaUrlModelPackRoles,+ LocalProvider: m.LocalProvider,+ }++ res.Planner = m.Planner.ToClientVal()+ if m.Coder != nil {+ val := m.Coder.ToClientVal()+ res.Coder = &val+ }+ res.PlanSummary = m.PlanSummary.ToClientVal()+ res.Builder = m.Builder.ToClientVal()+ if m.WholeFileBuilder != nil {+ val := m.WholeFileBuilder.ToClientVal()+ res.WholeFileBuilder = &val+ }+ res.Namer = m.Namer.ToClientVal()+ res.CommitMsg = m.CommitMsg.ToClientVal()+ res.ExecStatus = m.ExecStatus.ToClientVal()+ if m.Architect != nil {+ val := m.Architect.ToClientVal()+ res.Architect = &val+ }++ return res+}++type ModelPackSchema struct {+ Name string `json:"name"`+ Description string `json:"description"`++ ModelPackSchemaRoles+}+func (m *ModelPackSchema) AllModelIds() []ModelId {ids := []ModelId{}@@ -563,7 +760,7 @@ func (m *ModelPackSchema) ToModelPack() ModelPack {}if m.WholeFileBuilder != nil {- c := m.WholeFileBuilder.ToModelRoleConfig(ModelRoleBuilder)+ c := m.WholeFileBuilder.ToModelRoleConfig(ModelRoleWholeFileBuilder)wholeFileBuilder = &c}@@ -572,6 +769,11 @@ func (m *ModelPackSchema) ToModelPack() ModelPack {architect = &c}+ var maxConvoTokens int+ if m.Planner.MaxConvoTokens != nil {+ maxConvoTokens = *m.Planner.MaxConvoTokens+ }+return ModelPack{Name: m.Name,Description: m.Description,@@ -579,11 +781,11 @@ func (m *ModelPackSchema) ToModelPack() ModelPack {Planner: PlannerRoleConfig{ModelRoleConfig: m.Planner.ToModelRoleConfig(ModelRolePlanner),PlannerModelConfig: PlannerModelConfig{- MaxConvoTokens: m.Planner.MaxConvoTokens,+ MaxConvoTokens: maxConvoTokens,},},Coder: coder,- PlanSummary: m.PlanSummary.ToModelRoleConfig(ModelRolePlanner),+ PlanSummary: m.PlanSummary.ToModelRoleConfig(ModelRolePlanSummary),Builder: m.Builder.ToModelRoleConfig(ModelRoleBuilder),WholeFileBuilder: wholeFileBuilder,Namer: m.Namer.ToModelRoleConfig(ModelRoleName),@@ -648,46 +850,28 @@ func (m *ModelPack) ToModelPackSchema() *ModelPackSchema {}return &ModelPackSchema{- Name: m.Name,- Description: m.Description,- Planner: m.Planner.ToModelRoleConfigSchema(),- Coder: coder,- Architect: architect,- PlanSummary: m.PlanSummary.ToModelRoleConfigSchema(),- Builder: m.Builder.ToModelRoleConfigSchema(),- WholeFileBuilder: wholeFileBuilder,- Namer: m.Namer.ToModelRoleConfigSchema(),- CommitMsg: m.CommitMsg.ToModelRoleConfigSchema(),- ExecStatus: m.ExecStatus.ToModelRoleConfigSchema(),+ Name: m.Name,+ Description: m.Description,+ ModelPackSchemaRoles: ModelPackSchemaRoles{+ LocalProvider: m.LocalProvider,+ Planner: m.Planner.ToModelRoleConfigSchema(),+ Coder: coder,+ Architect: architect,+ PlanSummary: m.PlanSummary.ToModelRoleConfigSchema(),+ Builder: m.Builder.ToModelRoleConfigSchema(),+ WholeFileBuilder: wholeFileBuilder,+ Namer: m.Namer.ToModelRoleConfigSchema(),+ CommitMsg: m.CommitMsg.ToModelRoleConfigSchema(),+ ExecStatus: m.ExecStatus.ToModelRoleConfigSchema(),+ },}}-type ModelOverrides struct {- MaxConvoTokens *int `json:"maxConvoTokens"`- MaxTokens *int `json:"maxContextTokens"`- ReservedOutputTokens *int `json:"maxOutputTokens"`-}--type PlanSettings struct {- ModelOverrides ModelOverrides `json:"modelOverrides"`- ModelPack *ModelPack `json:"modelPack"`- UpdatedAt time.Time `json:"updatedAt"`-}--func (p *PlanSettings) Scan(src interface{}) error {- if src == nil {- return nil- }- switch s := src.(type) {- case []byte:- return json.Unmarshal(s, p)- case string:- return json.Unmarshal([]byte(s), p)- default:- return fmt.Errorf("unsupported data type: %T", src)+func (m ModelPackSchemaRoles) Hash() (string, error) {+ bytes, err := json.Marshal(m)+ if err != nil {+ return "", err}-}--func (p PlanSettings) Value() (driver.Value, error) {- return json.Marshal(p)+ hash := sha256.Sum256(bytes)+ return hex.EncodeToString(hash[:]), nil}diff --git a/app/shared/ai_models_packs.go b/app/shared/ai_models_packs.goindex a2540eb9..5a921feb 100644--- a/app/shared/ai_models_packs.go+++ b/app/shared/ai_models_packs.go@@ -40,9 +40,7 @@ var DefaultModelPack *ModelPack = &DailyDriverModelPackfunc getModelRoleConfig(role ModelRole, modelId ModelId, fns ...func(*ModelRoleConfigSchema)) ModelRoleConfigSchema {c := ModelRoleConfigSchema{- ModelId: modelId,- Temperature: DefaultConfigByRole[role].Temperature,- TopP: DefaultConfigByRole[role].TopP,+ ModelId: modelId,}for _, f := range fns {f(&c)@@ -118,179 +116,203 @@ func init() {DailyDriverPackSchema = ModelPackSchema{Name: "daily-driver",Description: "A mix of models from Anthropic, OpenAI, and Google that balances speed, quality, and cost. Supports up to 2M context.",- Planner: getModelRoleConfig(ModelRolePlanner, "anthropic/claude-sonnet-4",- getLargeContextFallback(ModelRolePlanner, "google/gemini-2.5-pro-preview",- getLargeContextFallback(ModelRolePlanner, "google/gemini-pro-1.5"),+ ModelPackSchemaRoles: ModelPackSchemaRoles{+ Planner: getModelRoleConfig(ModelRolePlanner, "anthropic/claude-sonnet-4",+ getLargeContextFallback(ModelRolePlanner, "google/gemini-2.5-pro-preview",+ getLargeContextFallback(ModelRolePlanner, "google/gemini-pro-1.5"),+ ),),- ),- Architect: Pointer(getModelRoleConfig(ModelRoleArchitect, "anthropic/claude-sonnet-4",- getLargeContextFallback(ModelRoleArchitect, "google/gemini-2.5-pro-preview",- getLargeContextFallback(ModelRoleArchitect, "google/gemini-pro-1.5"),- ),- )),- Coder: Pointer(getModelRoleConfig(ModelRoleCoder, "anthropic/claude-sonnet-4",- getLargeContextFallback(ModelRoleCoder, "openai/gpt-4.1"),- )),- PlanSummary: getModelRoleConfig(ModelRolePlanSummary, "openai/o4-mini-low"),- Builder: defaultBuilder,- WholeFileBuilder: Pointer(getModelRoleConfig(ModelRoleWholeFileBuilder, "openai/o4-mini-medium")),- Namer: getModelRoleConfig(ModelRoleName, "openai/gpt-4.1-mini"),- CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "openai/gpt-4.1-mini"),- ExecStatus: getModelRoleConfig(ModelRoleExecStatus, "openai/o4-mini-low"),+ Architect: Pointer(getModelRoleConfig(ModelRoleArchitect, "anthropic/claude-sonnet-4",+ getLargeContextFallback(ModelRoleArchitect, "google/gemini-2.5-pro-preview",+ getLargeContextFallback(ModelRoleArchitect, "google/gemini-pro-1.5"),+ ),+ )),+ Coder: Pointer(getModelRoleConfig(ModelRoleCoder, "anthropic/claude-sonnet-4",+ getLargeContextFallback(ModelRoleCoder, "openai/gpt-4.1"),+ )),+ PlanSummary: getModelRoleConfig(ModelRolePlanSummary, "openai/o4-mini-low"),+ Builder: defaultBuilder,+ WholeFileBuilder: Pointer(getModelRoleConfig(ModelRoleWholeFileBuilder, "openai/o4-mini-medium")),+ Namer: getModelRoleConfig(ModelRoleName, "openai/gpt-4.1-mini"),+ CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "openai/gpt-4.1-mini"),+ ExecStatus: getModelRoleConfig(ModelRoleExecStatus, "openai/o4-mini-low"),+ },}ReasoningPackSchema = ModelPackSchema{Name: "reasoning",Description: "Like the daily driver, but uses sonnet-4-thinking with reasoning enabled for planning and coding. Supports up to 160k input context.",- Planner: getModelRoleConfig(ModelRolePlanner, "anthropic/claude-sonnet-4-thinking-hidden"),- Coder: Pointer(getModelRoleConfig(ModelRoleCoder, "anthropic/claude-sonnet-4-thinking-hidden")),- PlanSummary: getModelRoleConfig(ModelRolePlanSummary, "openai/o4-mini-low"),- Builder: defaultBuilder,- WholeFileBuilder: Pointer(getModelRoleConfig(ModelRoleWholeFileBuilder,- "openai/o4-mini-medium")),- Namer: getModelRoleConfig(ModelRoleName, "openai/gpt-4.1-mini"),- CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "openai/gpt-4.1-mini"),- ExecStatus: getModelRoleConfig(ModelRoleExecStatus, "openai/o4-mini-low"),+ ModelPackSchemaRoles: ModelPackSchemaRoles{+ Planner: getModelRoleConfig(ModelRolePlanner, "anthropic/claude-sonnet-4-thinking-hidden"),+ Coder: Pointer(getModelRoleConfig(ModelRoleCoder, "anthropic/claude-sonnet-4-thinking-hidden")),+ PlanSummary: getModelRoleConfig(ModelRolePlanSummary, "openai/o4-mini-low"),+ Builder: defaultBuilder,+ WholeFileBuilder: Pointer(getModelRoleConfig(ModelRoleWholeFileBuilder,+ "openai/o4-mini-medium")),+ Namer: getModelRoleConfig(ModelRoleName, "openai/gpt-4.1-mini"),+ CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "openai/gpt-4.1-mini"),+ ExecStatus: getModelRoleConfig(ModelRoleExecStatus, "openai/o4-mini-low"),+ },}StrongPackSchema = ModelPackSchema{Name: "strong",Description: "For difficult tasks where slower responses and builds are ok. Uses o3-high for architecture and planning, claude-sonnet-4 thinking for implementation. Supports up to 160k input context.",- Planner: getModelRoleConfig(ModelRolePlanner, "openai/o3-high"),- Architect: Pointer(getModelRoleConfig(ModelRoleArchitect, "openai/o3-high")),- Coder: Pointer(getModelRoleConfig(ModelRoleCoder, "anthropic/claude-sonnet-4-thinking-hidden")),- PlanSummary: getModelRoleConfig(ModelRolePlanSummary, "openai/o4-mini-low"),- Builder: getModelRoleConfig(ModelRoleBuilder, "openai/o4-mini-high"),- WholeFileBuilder: Pointer(getModelRoleConfig(ModelRoleWholeFileBuilder,- "openai/o4-mini-high")),- Namer: getModelRoleConfig(ModelRoleName, "openai/gpt-4.1-mini"),- CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "openai/gpt-4.1-mini"),- ExecStatus: getModelRoleConfig(ModelRoleExecStatus, "openai/o4-mini-medium"),+ ModelPackSchemaRoles: ModelPackSchemaRoles{+ Planner: getModelRoleConfig(ModelRolePlanner, "openai/o3-high"),+ Architect: Pointer(getModelRoleConfig(ModelRoleArchitect, "openai/o3-high")),+ Coder: Pointer(getModelRoleConfig(ModelRoleCoder, "anthropic/claude-sonnet-4-thinking-hidden")),+ PlanSummary: getModelRoleConfig(ModelRolePlanSummary, "openai/o4-mini-low"),+ Builder: getModelRoleConfig(ModelRoleBuilder, "openai/o4-mini-high"),+ WholeFileBuilder: Pointer(getModelRoleConfig(ModelRoleWholeFileBuilder,+ "openai/o4-mini-high")),+ Namer: getModelRoleConfig(ModelRoleName, "openai/gpt-4.1-mini"),+ CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "openai/gpt-4.1-mini"),+ ExecStatus: getModelRoleConfig(ModelRoleExecStatus, "openai/o4-mini-medium"),+ },}CheapModelPackSchema = ModelPackSchema{Name: "cheap",Description: "Cost-effective models that can still get the job done for easier tasks. Supports up to 160k context. Uses OpenAI's o4-mini model for planning, GPT-4.1 for coding, and GPT-4.1 Mini for lighter tasks.",- Planner: getModelRoleConfig(ModelRolePlanner, "openai/o4-mini-medium"),- Coder: Pointer(getModelRoleConfig(ModelRoleCoder, "openai/gpt-4.1")),- PlanSummary: getModelRoleConfig(ModelRolePlanSummary, "openai/gpt-4.1-mini"),- Builder: getModelRoleConfig(ModelRoleBuilder, "openai/o4-mini-low"),- WholeFileBuilder: Pointer(getModelRoleConfig(ModelRoleWholeFileBuilder,- "openai/o4-mini-low")),- Namer: getModelRoleConfig(ModelRoleName, "openai/gpt-4.1-mini"),- CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "openai/gpt-4.1-mini"),- ExecStatus: getModelRoleConfig(ModelRoleExecStatus, "openai/o4-mini-low"),+ ModelPackSchemaRoles: ModelPackSchemaRoles{+ Planner: getModelRoleConfig(ModelRolePlanner, "openai/o4-mini-medium"),+ Coder: Pointer(getModelRoleConfig(ModelRoleCoder, "openai/gpt-4.1")),+ PlanSummary: getModelRoleConfig(ModelRolePlanSummary, "openai/gpt-4.1-mini"),+ Builder: getModelRoleConfig(ModelRoleBuilder, "openai/o4-mini-low"),+ WholeFileBuilder: Pointer(getModelRoleConfig(ModelRoleWholeFileBuilder,+ "openai/o4-mini-low")),+ Namer: getModelRoleConfig(ModelRoleName, "openai/gpt-4.1-mini"),+ CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "openai/gpt-4.1-mini"),+ ExecStatus: getModelRoleConfig(ModelRoleExecStatus, "openai/o4-mini-low"),+ },}OSSModelPackSchema = ModelPackSchema{Name: "oss",Description: "An experimental mix of the best open source models for coding. Supports up to 56k context, 8k per file. Works best with smaller projects and files. Includes reasoning.",- Planner: getModelRoleConfig(ModelRolePlanner, "deepseek/r1-reasoning-visible"),- Coder: Pointer(getModelRoleConfig(ModelRoleCoder, "deepseek/v3-0324")),- PlanSummary: getModelRoleConfig(ModelRolePlanSummary, "deepseek/r1-reasoning-hidden"),- Builder: getModelRoleConfig(ModelRoleBuilder, "deepseek/r1-reasoning-hidden"),- WholeFileBuilder: Pointer(getModelRoleConfig(ModelRoleWholeFileBuilder,- "deepseek/r1-reasoning-hidden")),- Namer: getModelRoleConfig(ModelRoleName, "qwen/qwen-2.5-coder-32b-instruct"),- CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "qwen/qwen-2.5-coder-32b-instruct"),- ExecStatus: getModelRoleConfig(ModelRoleExecStatus, "deepseek/r1-reasoning-hidden"),+ ModelPackSchemaRoles: ModelPackSchemaRoles{+ Planner: getModelRoleConfig(ModelRolePlanner, "deepseek/r1-reasoning-visible"),+ Coder: Pointer(getModelRoleConfig(ModelRoleCoder, "deepseek/v3-0324")),+ PlanSummary: getModelRoleConfig(ModelRolePlanSummary, "deepseek/r1-reasoning-hidden"),+ Builder: getModelRoleConfig(ModelRoleBuilder, "deepseek/r1-reasoning-hidden"),+ WholeFileBuilder: Pointer(getModelRoleConfig(ModelRoleWholeFileBuilder,+ "deepseek/r1-reasoning-hidden")),+ Namer: getModelRoleConfig(ModelRoleName, "qwen/qwen-2.5-coder-32b-instruct"),+ CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "qwen/qwen-2.5-coder-32b-instruct"),+ ExecStatus: getModelRoleConfig(ModelRoleExecStatus, "deepseek/r1-reasoning-hidden"),+ },}OllamaModelPackSchema = ModelPackSchema{- Name: "ollama",- LocalProvider: ModelProviderOllama,- Description: "Ollama local blend. Supports up to 110k context. Uses Qwen3-32b model for heavy lifting, Qwen3-14b for summaries, Qwen3-8b for lighter tasks.",- Planner: getModelRoleConfig(ModelRolePlanner, "mistral/devstral-small"),- PlanSummary: getModelRoleConfig(ModelRolePlanSummary, "qwen/qwen3-14b"),- Builder: getModelRoleConfig(ModelRoleBuilder, "mistral/devstral-small"),- WholeFileBuilder: Pointer(getModelRoleConfig(ModelRoleWholeFileBuilder,- "mistral/devstral-small")),- Namer: getModelRoleConfig(ModelRoleName, "qwen/qwen3-8b"),- CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "qwen/qwen3-8b"),- ExecStatus: getModelRoleConfig(ModelRoleExecStatus, "mistral/devstral-small"),+ Name: "ollama",+ Description: "Ollama local blend. Supports up to 110k context. Uses Qwen3-32b model for heavy lifting, Qwen3-14b for summaries, Qwen3-8b for lighter tasks.",+ ModelPackSchemaRoles: ModelPackSchemaRoles{+ LocalProvider: ModelProviderOllama,+ Planner: getModelRoleConfig(ModelRolePlanner, "mistral/devstral-small"),+ PlanSummary: getModelRoleConfig(ModelRolePlanSummary, "qwen/qwen3-14b"),+ Builder: getModelRoleConfig(ModelRoleBuilder, "mistral/devstral-small"),+ WholeFileBuilder: Pointer(getModelRoleConfig(ModelRoleWholeFileBuilder,+ "mistral/devstral-small")),+ Namer: getModelRoleConfig(ModelRoleName, "qwen/qwen3-8b"),+ CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "qwen/qwen3-8b"),+ ExecStatus: getModelRoleConfig(ModelRoleExecStatus, "mistral/devstral-small"),+ },}OpenAIPackSchema = ModelPackSchema{Name: "openai",Description: "OpenAI blend. Supports up to 1M context. Uses OpenAI's GPT-4.1 model for heavy lifting, GPT-4.1 Mini for lighter tasks.",- Planner: getModelRoleConfig(ModelRolePlanner, "openai/gpt-4.1"),- PlanSummary: getModelRoleConfig(ModelRolePlanSummary, "openai/o4-mini-low"),- Builder: defaultBuilder,- WholeFileBuilder: Pointer(getModelRoleConfig(ModelRoleWholeFileBuilder,- "openai/o4-mini-medium")),- Namer: getModelRoleConfig(ModelRoleName, "openai/gpt-4.1-mini"),- CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "openai/gpt-4.1-mini"),- ExecStatus: getModelRoleConfig(ModelRoleExecStatus, "openai/o4-mini-low"),+ ModelPackSchemaRoles: ModelPackSchemaRoles{+ Planner: getModelRoleConfig(ModelRolePlanner, "openai/gpt-4.1"),+ PlanSummary: getModelRoleConfig(ModelRolePlanSummary, "openai/o4-mini-low"),+ Builder: defaultBuilder,+ WholeFileBuilder: Pointer(getModelRoleConfig(ModelRoleWholeFileBuilder,+ "openai/o4-mini-medium")),+ Namer: getModelRoleConfig(ModelRoleName, "openai/gpt-4.1-mini"),+ CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "openai/gpt-4.1-mini"),+ ExecStatus: getModelRoleConfig(ModelRoleExecStatus, "openai/o4-mini-low"),+ },}AnthropicPackSchema = ModelPackSchema{Name: "anthropic",Description: "Anthropic blend. Supports up to 180k context. Uses Claude Sonnet 4 for heavy lifting, Claude 3 Haiku for lighter tasks.",- Planner: getModelRoleConfig(ModelRolePlanner, "anthropic/claude-sonnet-4"),- Coder: Pointer(getModelRoleConfig(ModelRoleCoder, "anthropic/claude-sonnet-4")),- PlanSummary: getModelRoleConfig(ModelRolePlanSummary, "anthropic/claude-3.5-haiku"),- Builder: getModelRoleConfig(ModelRoleBuilder, "anthropic/claude-sonnet-4"),- WholeFileBuilder: Pointer(getModelRoleConfig(ModelRoleWholeFileBuilder,- "anthropic/claude-sonnet-4")),- Namer: getModelRoleConfig(ModelRoleName, "anthropic/claude-3.5-haiku"),- CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "anthropic/claude-3.5-haiku"),- ExecStatus: getModelRoleConfig(ModelRoleExecStatus, "anthropic/claude-sonnet-4"),+ ModelPackSchemaRoles: ModelPackSchemaRoles{+ Planner: getModelRoleConfig(ModelRolePlanner, "anthropic/claude-sonnet-4"),+ Coder: Pointer(getModelRoleConfig(ModelRoleCoder, "anthropic/claude-sonnet-4")),+ PlanSummary: getModelRoleConfig(ModelRolePlanSummary, "anthropic/claude-3.5-haiku"),+ Builder: getModelRoleConfig(ModelRoleBuilder, "anthropic/claude-sonnet-4"),+ WholeFileBuilder: Pointer(getModelRoleConfig(ModelRoleWholeFileBuilder,+ "anthropic/claude-sonnet-4")),+ Namer: getModelRoleConfig(ModelRoleName, "anthropic/claude-3.5-haiku"),+ CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "anthropic/claude-3.5-haiku"),+ ExecStatus: getModelRoleConfig(ModelRoleExecStatus, "anthropic/claude-sonnet-4"),+ },}GeminiPreviewPackSchema = ModelPackSchema{Name: "gemini-preview",Description: "Uses Gemini 2.5 Pro Preview for planning and coding, default models for other roles. Supports up to 1M input context.",- Planner: getModelRoleConfig(ModelRolePlanner, "google/gemini-2.5-pro-preview"),- Coder: Pointer(getModelRoleConfig(ModelRoleCoder, "google/gemini-2.5-pro-preview")),- PlanSummary: getModelRoleConfig(ModelRolePlanSummary, "openai/o4-mini-low"),- Builder: defaultBuilder,- WholeFileBuilder: Pointer(getModelRoleConfig(ModelRoleWholeFileBuilder,- "openai/o4-mini-medium")),- Namer: getModelRoleConfig(ModelRoleName, "openai/gpt-4.1-mini"),- CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "openai/gpt-4.1-mini"),- ExecStatus: getModelRoleConfig(ModelRoleExecStatus, "openai/o4-mini-low"),+ ModelPackSchemaRoles: ModelPackSchemaRoles{+ Planner: getModelRoleConfig(ModelRolePlanner, "google/gemini-2.5-pro-preview"),+ Coder: Pointer(getModelRoleConfig(ModelRoleCoder, "google/gemini-2.5-pro-preview")),+ PlanSummary: getModelRoleConfig(ModelRolePlanSummary, "openai/o4-mini-low"),+ Builder: defaultBuilder,+ WholeFileBuilder: Pointer(getModelRoleConfig(ModelRoleWholeFileBuilder,+ "openai/o4-mini-medium")),+ Namer: getModelRoleConfig(ModelRoleName, "openai/gpt-4.1-mini"),+ CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "openai/gpt-4.1-mini"),+ ExecStatus: getModelRoleConfig(ModelRoleExecStatus, "openai/o4-mini-low"),+ },}GeminiExperimentalPackSchema = ModelPackSchema{Name: "gemini-exp",Description: "Uses Gemini 2.5 Pro Experimental (free) for planning and coding, default models for other roles. Supports up to 1M input context.",- Planner: getModelRoleConfig(ModelRolePlanner, "google/gemini-2.5-pro-exp"),- Coder: Pointer(getModelRoleConfig(ModelRoleCoder, "google/gemini-2.5-pro-exp")),- PlanSummary: getModelRoleConfig(ModelRolePlanSummary, "openai/o4-mini-low"),- Builder: defaultBuilder,- WholeFileBuilder: Pointer(getModelRoleConfig(ModelRoleWholeFileBuilder,- "openai/o4-mini-medium")),- Namer: getModelRoleConfig(ModelRoleName, "openai/gpt-4.1-mini"),- CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "openai/gpt-4.1-mini"),- ExecStatus: getModelRoleConfig(ModelRoleExecStatus, "openai/o4-mini-low"),+ ModelPackSchemaRoles: ModelPackSchemaRoles{+ Planner: getModelRoleConfig(ModelRolePlanner, "google/gemini-2.5-pro-exp"),+ Coder: Pointer(getModelRoleConfig(ModelRoleCoder, "google/gemini-2.5-pro-exp")),+ PlanSummary: getModelRoleConfig(ModelRolePlanSummary, "openai/o4-mini-low"),+ Builder: defaultBuilder,+ WholeFileBuilder: Pointer(getModelRoleConfig(ModelRoleWholeFileBuilder,+ "openai/o4-mini-medium")),+ Namer: getModelRoleConfig(ModelRoleName, "openai/gpt-4.1-mini"),+ CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "openai/gpt-4.1-mini"),+ ExecStatus: getModelRoleConfig(ModelRoleExecStatus, "openai/o4-mini-low"),+ },}R1PlannerPackSchema = ModelPackSchema{Name: "r1-planner",Description: "Uses DeepSeek R1 for planning, Qwen for light tasks, and default models for implementation. Supports up to 56k input context.",- Planner: getModelRoleConfig(ModelRolePlanner, "deepseek/r1-reasoning-visible"),- Coder: Pointer(getModelRoleConfig(ModelRoleCoder, "anthropic/claude-sonnet-4")),- PlanSummary: getModelRoleConfig(ModelRolePlanSummary, "openai/o4-mini-low"),- Builder: getModelRoleConfig(ModelRoleBuilder, "openai/o4-mini-medium"),- WholeFileBuilder: Pointer(getModelRoleConfig(ModelRoleWholeFileBuilder,- "openai/o4-mini-low")),- Namer: getModelRoleConfig(ModelRoleName, "openai/gpt-4.1-mini"),- CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "openai/gpt-4.1-mini"),- ExecStatus: getModelRoleConfig(ModelRoleExecStatus, "openai/o4-mini-medium"),+ ModelPackSchemaRoles: ModelPackSchemaRoles{+ Planner: getModelRoleConfig(ModelRolePlanner, "deepseek/r1-reasoning-visible"),+ Coder: Pointer(getModelRoleConfig(ModelRoleCoder, "anthropic/claude-sonnet-4")),+ PlanSummary: getModelRoleConfig(ModelRolePlanSummary, "openai/o4-mini-low"),+ Builder: getModelRoleConfig(ModelRoleBuilder, "openai/o4-mini-medium"),+ WholeFileBuilder: Pointer(getModelRoleConfig(ModelRoleWholeFileBuilder,+ "openai/o4-mini-low")),+ Namer: getModelRoleConfig(ModelRoleName, "openai/gpt-4.1-mini"),+ CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "openai/gpt-4.1-mini"),+ ExecStatus: getModelRoleConfig(ModelRoleExecStatus, "openai/o4-mini-medium"),+ },}PerplexityPlannerPackSchema = ModelPackSchema{Name: "perplexity-planner",Description: "Uses Perplexity Sonar for planning, Qwen for light tasks, and default models for implementation. Supports up to 97k input context.",- Planner: getModelRoleConfig(ModelRolePlanner, "perplexity/sonar-reasoning-visible"),- Coder: Pointer(getModelRoleConfig(ModelRoleCoder, "anthropic/claude-sonnet-4")),- PlanSummary: getModelRoleConfig(ModelRolePlanSummary, "openai/o4-mini-low"),- Builder: getModelRoleConfig(ModelRoleBuilder, "openai/o4-mini-medium"),- WholeFileBuilder: Pointer(getModelRoleConfig(ModelRoleWholeFileBuilder,- "openai/o4-mini-low")),- Namer: getModelRoleConfig(ModelRoleName, "openai/gpt-4.1-mini"),- CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "openai/gpt-4.1-mini"),- ExecStatus: getModelRoleConfig(ModelRoleExecStatus, "openai/o4-mini-medium"),+ ModelPackSchemaRoles: ModelPackSchemaRoles{+ Planner: getModelRoleConfig(ModelRolePlanner, "perplexity/sonar-reasoning-visible"),+ Coder: Pointer(getModelRoleConfig(ModelRoleCoder, "anthropic/claude-sonnet-4")),+ PlanSummary: getModelRoleConfig(ModelRolePlanSummary, "openai/o4-mini-low"),+ Builder: getModelRoleConfig(ModelRoleBuilder, "openai/o4-mini-medium"),+ WholeFileBuilder: Pointer(getModelRoleConfig(ModelRoleWholeFileBuilder,+ "openai/o4-mini-low")),+ Namer: getModelRoleConfig(ModelRoleName, "openai/gpt-4.1-mini"),+ CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "openai/gpt-4.1-mini"),+ ExecStatus: getModelRoleConfig(ModelRoleExecStatus, "openai/o4-mini-medium"),+ },}DailyDriverModelPack = DailyDriverPackSchema.ToModelPack()diff --git a/app/shared/plan_model_settings.go b/app/shared/plan_model_settings.goindex e5495952..c1502a55 100644--- a/app/shared/plan_model_settings.go+++ b/app/shared/plan_model_settings.go@@ -1,151 +1,157 @@package shared-var SettingDescriptions = map[string]string{- "max-convo-tokens": "max conversation 🪙 before summarization",- "max-tokens": "overall 🪙 limit",- "reserved-output-tokens": "🪙 reserved for model output",-}+import (+ "database/sql/driver"+ "encoding/json"+ "fmt"+ "time"+)++type PlanSettings struct {+ ModelPackName string `json:"modelPackName"`+ ModelPack *ModelPack `json:"modelPack"`+ CustomModelPacks []*ModelPack `json:"customModelPacks"`+ IsCloud bool `json:"isCloud"`+ Configured bool `json:"configured"`+ UpdatedAt time.Time `json:"updatedAt"`+}++func (p *PlanSettings) Configure(customModelPacks []*ModelPack, isCloud bool) {+ p.CustomModelPacks = customModelPacks+ p.IsCloud = isCloud+ p.Configured = true+}++func (p PlanSettings) GetModelPack() *ModelPack {+ if !p.Configured {+ panic("PlanSettings not configured")+ }-var ModelOverridePropsDasherized = []string{"max-convo-tokens", "max-tokens", "reserved-output-tokens"}+ customModelPacks := p.CustomModelPacks+ isCloud := p.IsCloud-func (ps PlanSettings) GetPlannerMaxTokens() int {- if ps.ModelOverrides.MaxTokens == nil {- if ps.ModelPack == nil {- defaultPlanner := DefaultModelPack.Planner- fallback := defaultPlanner.GetFinalLargeContextFallback()- return fallback.GetSharedBaseConfig().MaxTokens- } else {- planner := ps.ModelPack.Planner- fallback := planner.GetFinalLargeContextFallback()- return fallback.GetSharedBaseConfig().MaxTokens+ fillDefault := true // seems best to make this the default behavior, but keeping the switch just in case++ if p.ModelPack != nil {+ return p.ModelPack+ }++ for _, builtInModelPack := range BuiltInModelPacks {+ if isCloud && builtInModelPack.LocalProvider != "" {+ continue+ }++ if builtInModelPack.Name == p.ModelPackName {+ return builtInModelPack}- } else {- return *ps.ModelOverrides.MaxTokens}-}-func (ps PlanSettings) GetPlannerMaxReservedOutputTokens() int {- if ps.ModelOverrides.MaxTokens == nil {- if ps.ModelPack == nil {- defaultPlanner := DefaultModelPack.Planner- return defaultPlanner.GetFinalLargeContextFallback().GetReservedOutputTokens()- } else {- planner := ps.ModelPack.Planner- return planner.GetFinalLargeContextFallback().GetReservedOutputTokens()+ for _, customModelPack := range customModelPacks {+ if customModelPack.Name == p.ModelPackName {+ return customModelPack}- } else {- return *ps.ModelOverrides.MaxTokens}++ if fillDefault {+ return DefaultModelPack+ }++ return nil}-func (ps PlanSettings) GetArchitectMaxTokens() int {- if ps.ModelOverrides.MaxTokens == nil {- if ps.ModelPack == nil {- defaultLoader := DefaultModelPack.GetArchitect()- fallback := defaultLoader.GetFinalLargeContextFallback()- return fallback.GetSharedBaseConfig().MaxTokens- } else {- loader := ps.ModelPack.GetArchitect()- fallback := loader.GetFinalLargeContextFallback()- return fallback.GetSharedBaseConfig().MaxTokens- }- } else {- return *ps.ModelOverrides.MaxTokens+func (p *PlanSettings) SetModelPackByName(modelPackName string) {+ p.ModelPackName = modelPackName+ p.ModelPack = nil+}++func (p *PlanSettings) SetCustomModelPack(modelPack *ModelPack) {+ p.ModelPackName = ""+ p.ModelPack = modelPack+}++func (p *PlanSettings) Scan(src interface{}) error {+ if src == nil {+ return nil+ }+ switch s := src.(type) {+ case []byte:+ return json.Unmarshal(s, p)+ case string:+ return json.Unmarshal([]byte(s), p)+ default:+ return fmt.Errorf("unsupported data type: %T", src)}}+func (p PlanSettings) Value() (driver.Value, error) {+ return json.Marshal(p)+}++func (ps PlanSettings) GetPlannerMaxTokens() int {+ modelPack := ps.GetModelPack()+ planner := modelPack.Planner+ fallback := planner.GetFinalLargeContextFallback()+ return fallback.GetSharedBaseConfig().MaxTokens+}++func (ps PlanSettings) GetPlannerMaxReservedOutputTokens() int {+ modelPack := ps.GetModelPack()+ planner := modelPack.Planner+ return planner.GetFinalLargeContextFallback().GetReservedOutputTokens()+}++func (ps PlanSettings) GetArchitectMaxTokens() int {+ modelPack := ps.GetModelPack()+ architect := modelPack.GetArchitect()+ fallback := architect.GetFinalLargeContextFallback()+ return fallback.GetSharedBaseConfig().MaxTokens+}+func (ps PlanSettings) GetArchitectMaxReservedOutputTokens() int {- if ps.ModelOverrides.MaxTokens == nil {- if ps.ModelPack == nil {- defaultLoader := DefaultModelPack.GetArchitect()- return defaultLoader.GetFinalLargeContextFallback().GetReservedOutputTokens()- } else {- loader := ps.ModelPack.GetArchitect()- return loader.GetFinalLargeContextFallback().GetReservedOutputTokens()- }- } else {- return *ps.ModelOverrides.MaxTokens- }+ modelPack := ps.GetModelPack()+ architect := modelPack.GetArchitect()+ fallback := architect.GetFinalLargeContextFallback()+ return fallback.GetReservedOutputTokens()}func (ps PlanSettings) GetCoderMaxTokens() int {- if ps.ModelOverrides.MaxTokens == nil {- if ps.ModelPack == nil {- defaultCoder := DefaultModelPack.GetCoder()- fallback := defaultCoder.GetFinalLargeContextFallback()- return fallback.GetSharedBaseConfig().MaxTokens- } else {- coder := ps.ModelPack.GetCoder()- fallback := coder.GetFinalLargeContextFallback()- return fallback.GetSharedBaseConfig().MaxTokens- }- } else {- return *ps.ModelOverrides.MaxTokens- }+ modelPack := ps.GetModelPack()+ coder := modelPack.GetCoder()+ fallback := coder.GetFinalLargeContextFallback()+ return fallback.GetSharedBaseConfig().MaxTokens}func (ps PlanSettings) GetCoderMaxReservedOutputTokens() int {- if ps.ModelOverrides.MaxTokens == nil {- if ps.ModelPack == nil {- defaultCoder := DefaultModelPack.GetCoder()- return defaultCoder.GetFinalLargeContextFallback().GetReservedOutputTokens()- } else {- coder := ps.ModelPack.GetCoder()- return coder.GetFinalLargeContextFallback().GetReservedOutputTokens()- }- } else {- return *ps.ModelOverrides.MaxTokens- }+ modelPack := ps.GetModelPack()+ coder := modelPack.GetCoder()+ fallback := coder.GetFinalLargeContextFallback()+ return fallback.GetReservedOutputTokens()}func (ps PlanSettings) GetWholeFileBuilderMaxTokens() int {- if ps.ModelOverrides.MaxTokens == nil {- if ps.ModelPack == nil {- defaultBuilder := DefaultModelPack.GetWholeFileBuilder()- fallback := defaultBuilder.GetFinalLargeContextFallback()- return fallback.GetSharedBaseConfig().MaxTokens- } else {- builder := ps.ModelPack.GetWholeFileBuilder()- fallback := builder.GetFinalLargeContextFallback()- return fallback.GetSharedBaseConfig().MaxTokens- }- } else {- return *ps.ModelOverrides.MaxTokens- }+ modelPack := ps.GetModelPack()+ builder := modelPack.GetWholeFileBuilder()+ fallback := builder.GetFinalLargeContextFallback()+ return fallback.GetSharedBaseConfig().MaxTokens}func (ps PlanSettings) GetWholeFileBuilderMaxReservedOutputTokens() int {- if ps.ModelOverrides.MaxTokens == nil {- if ps.ModelPack == nil {- defaultBuilder := DefaultModelPack.GetWholeFileBuilder()- return defaultBuilder.GetFinalLargeOutputFallback().GetReservedOutputTokens()- } else {- builder := ps.ModelPack.GetWholeFileBuilder()- return builder.GetFinalLargeOutputFallback().GetReservedOutputTokens()- }- } else {- return *ps.ModelOverrides.MaxTokens- }+ modelPack := ps.GetModelPack()+ builder := modelPack.GetWholeFileBuilder()+ fallback := builder.GetFinalLargeOutputFallback()+ return fallback.GetReservedOutputTokens()}func (ps PlanSettings) GetPlannerMaxConvoTokens() int {- if ps.ModelPack != nil && ps.ModelPack.Planner.MaxConvoTokens != 0 {- return ps.ModelPack.Planner.MaxConvoTokens- }+ modelPack := ps.GetModelPack()- if ps.ModelPack == nil {- defaultPlanner := DefaultModelPack.Planner- if defaultPlanner.MaxConvoTokens != 0 {- return defaultPlanner.MaxConvoTokens- }- return defaultPlanner.GetSharedBaseConfig().DefaultMaxConvoTokens- } else {- planner := ps.ModelPack.Planner- if planner.MaxConvoTokens != 0 {- return planner.MaxConvoTokens- }- return planner.GetSharedBaseConfig().DefaultMaxConvoTokens+ // for max convo tokens, we use the planner's default max convo tokens, *not* the fallback, so that we don't end up switching to the fallback just based on the conversation length+ planner := modelPack.Planner+ if planner.MaxConvoTokens != 0 {+ return planner.MaxConvoTokens}++ return planner.GetSharedBaseConfig().DefaultMaxConvoTokens}func (ps PlanSettings) GetPlannerEffectiveMaxTokens() int {@@ -179,7 +185,7 @@ func (ps PlanSettings) GetWholeFileBuilderEffectiveMaxTokens() int {func (ps PlanSettings) GetModelProviderOptions() ModelProviderOptions {opts := ModelProviderOptions{}- ms := ps.ModelPack+ ms := ps.GetModelPack()if ms == nil {ms = DefaultModelPack}@@ -200,6 +206,31 @@ func (ps PlanSettings) GetModelProviderOptions() ModelProviderOptions {return opts}+func (ps *PlanSettings) Equals(other *PlanSettings) bool {+ return ps.GetModelPack().Equals(other.GetModelPack())+}++func (ps PlanSettings) ForCompare() PlanSettings {+ ps.UpdatedAt = time.Time{}+ ps.CustomModelPacks = nil+ ps.IsCloud = false+ ps.Configured = false+ return ps+}++func (ps PlanSettings) DeepCopy() (*PlanSettings, error) {+ bytes, err := json.Marshal(ps)+ if err != nil {+ return nil, fmt.Errorf("error marshalling plan settings: %v", err)+ }+ var copy PlanSettings+ err = json.Unmarshal(bytes, ©)+ if err != nil {+ return nil, fmt.Errorf("error unmarshalling plan settings: %v", err)+ }+ return ©, nil+}+func getOptionalModelProviderOptions(cfg *ModelRoleConfig) ModelProviderOptions {if cfg == nil {return ModelProviderOptions{}diff --git a/app/shared/req_res.go b/app/shared/req_res.goindex e0447556..83cee339 100644--- a/app/shared/req_res.go+++ b/app/shared/req_res.go@@ -294,7 +294,8 @@ type CreateBranchRequest struct {}type UpdateSettingsRequest struct {- Settings *PlanSettings `json:"settings"`+ ModelPackName string `json:"modelPackName"`+ ModelPack *ModelPack `json:"modelPack"`}type UpdateSettingsResponse struct {