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
Add new planner model packs (gemini, o3, r1, perplexity, opus)
Dane Schneider2ab22c3748c3
diff --git a/app/cli/cmd/plan_start_helpers.go b/app/cli/cmd/plan_start_helpers.goindex 264de1fd..01339d39 100644--- a/app/cli/cmd/plan_start_helpers.go+++ b/app/cli/cmd/plan_start_helpers.go@@ -21,12 +21,16 @@ var (fullAuto bool// Type flags- dailyModels bool- reasoningModels bool- strongModels bool- ossModels bool- cheapModels bool- geminiModels bool+ dailyModels bool+ reasoningModels bool+ strongModels bool+ ossModels bool+ cheapModels bool+ geminiPlannerModels bool+ o3PlannerModels bool+ r1PlannerModels bool+ perplexityPlannerModels bool+ opusPlannerModels bool)func AddNewPlanFlags(cmd *cobra.Command) {@@ -43,7 +47,12 @@ func AddNewPlanFlags(cmd *cobra.Command) {cmd.Flags().BoolVar(&strongModels, "strong", false, shared.StrongModelPack.Description)cmd.Flags().BoolVar(&cheapModels, "cheap", false, shared.CheapModelPack.Description)cmd.Flags().BoolVar(&ossModels, "oss", false, shared.OSSModelPack.Description)- cmd.Flags().BoolVar(&geminiModels, "gemini", false, shared.GeminiModelPack.Description)++ cmd.Flags().BoolVar(&geminiPlannerModels, "gemini-planner", false, shared.GeminiPlannerModelPack.Description)+ cmd.Flags().BoolVar(&o3PlannerModels, "o3-planner", false, shared.O3PlannerModelPack.Description)+ cmd.Flags().BoolVar(&r1PlannerModels, "r1-planner", false, shared.R1PlannerModelPack.Description)+ cmd.Flags().BoolVar(&perplexityPlannerModels, "perplexity-planner", false, shared.PerplexityPlannerModelPack.Description)+ cmd.Flags().BoolVar(&opusPlannerModels, "opus-planner", false, shared.OpusPlannerModelPack.Description)}func resolveAutoMode(config *shared.PlanConfig) (bool, *shared.PlanConfig) {@@ -139,8 +148,16 @@ func resolveModelPackWithArgs(settings *shared.PlanSettings, silent bool) (*sharpackName = shared.ReasoningModelPack.Name} else if dailyModels {packName = shared.DailyDriverModelPack.Name- } else if geminiModels {- packName = shared.GeminiModelPack.Name+ } else if geminiPlannerModels {+ packName = shared.GeminiPlannerModelPack.Name+ } else if o3PlannerModels {+ packName = shared.O3PlannerModelPack.Name+ } else if r1PlannerModels {+ packName = shared.R1PlannerModelPack.Name+ } else if perplexityPlannerModels {+ packName = shared.PerplexityPlannerModelPack.Name+ } else if opusPlannerModels {+ packName = shared.OpusPlannerModelPack.Name}if packName != "" && packName != originalSettings.GetModelPack().Name {diff --git a/app/cli/cmd/repl.go b/app/cli/cmd/repl.goindex e41c8bca..ff8c21a4 100644--- a/app/cli/cmd/repl.go+++ b/app/cli/cmd/repl.go@@ -130,8 +130,16 @@ func runRepl(cmd *cobra.Command, args []string) {args = append(args, "--daily")} else if reasoningModels {args = append(args, "--reasoning")- } else if geminiModels {- args = append(args, "--gemini-preview")+ } else if geminiPlannerModels {+ args = append(args, "--gemini-planner")+ } else if o3PlannerModels {+ args = append(args, "--o3-planner")+ } else if r1PlannerModels {+ args = append(args, "--r1-planner")+ } else if perplexityPlannerModels {+ args = append(args, "--perplexity-planner")+ } else if opusPlannerModels {+ args = append(args, "--opus-planner")}newCmd.Run(newCmd, args)diff --git a/app/cli/term/help.go b/app/cli/term/help.goindex 1d74f768..11b23b30 100644--- a/app/cli/term/help.go+++ b/app/cli/term/help.go@@ -43,7 +43,12 @@ var CliCommands = []CmdConfig{{"new --strong", "", fmt.Sprintf("start a new plan with %s model pack", "'strong'"), true},{"new --cheap", "", fmt.Sprintf("start a new plan with %s model pack", "'cheap'"), true},{"new --oss", "", fmt.Sprintf("start a new plan with %s model pack", "'oss'"), true},- {"new --gemini", "", fmt.Sprintf("start a new plan with %s model pack", "'gemini'"), true},+ {"new --gemini-planner", "", fmt.Sprintf("start a new plan with %s model pack", "'gemini-planner'"), true},+ {"new --o3-planner", "", fmt.Sprintf("start a new plan with %s model pack", "'o3-planner'"), true},+ {"new --r1-planner", "", fmt.Sprintf("start a new plan with %s model pack", "'r1-planner'"), true},+ {"new --perplexity-planner", "", fmt.Sprintf("start a new plan with %s model pack", "'perplexity-planner'"), true},+ {"new --opus-planner", "", fmt.Sprintf("start a new plan with %s model pack", "'opus-planner'"), true},+{"plans", "pl", "list plans", true},{"cd", "", "set current plan by name or index", true},{"current", "cu", "show current plan", true},@@ -126,7 +131,11 @@ var CliCommands = []CmdConfig{{"set-model strong", "", fmt.Sprintf("Use %s model pack", "'strong'"), true},{"set-model cheap", "", fmt.Sprintf("Use %s model pack", "'cheap'"), true},{"set-model oss", "", fmt.Sprintf("Use %s model pack", "'oss'"), true},- {"set-model gemini", "", fmt.Sprintf("Use %s model pack", "'gemini'"), true},+ {"set-model gemini-planner", "", fmt.Sprintf("Use %s model pack", "'gemini-planner'"), true},+ {"set-model o3-planner", "", fmt.Sprintf("Use %s model pack", "'o3-planner'"), true},+ {"set-model r1-planner", "", fmt.Sprintf("Use %s model pack", "'r1-planner'"), true},+ {"set-model perplexity-planner", "", fmt.Sprintf("Use %s model pack", "'perplexity-planner'"), true},+ {"set-model opus-planner", "", fmt.Sprintf("Use %s model pack", "'opus-planner'"), true},{"ps", "", "list active and recently finished plan streams", true},{"stop", "", "stop an active plan stream", true},@@ -341,7 +350,7 @@ func PrintHelpAllCommands() {fmt.Fprintln(builder)color.New(color.Bold, color.BgCyan, color.FgHiWhite).Fprintln(builder, " New Plan Shortcuts ")- printCmds(builder, " ", []color.Attribute{color.Bold, ColorHiCyan}, "new --full", "new --semi", "new --plus", "new --basic", "new --none", "new --daily", "new --reasoning", "new --strong", "new --cheap", "new --oss", "new --gemini" /*"new --crazy"*/)+ printCmds(builder, " ", []color.Attribute{color.Bold, ColorHiCyan}, "new --full", "new --semi", "new --plus", "new --basic", "new --none", "new --daily", "new --reasoning", "new --strong", "new --cheap", "new --oss", "new --gemini-planner", "new --o3-planner", "new --r1-planner", "new --perplexity-planner", "new --opus-planner")fmt.Fprintln(builder)fmt.Print(builder.String())diff --git a/app/shared/ai_models_packs.go b/app/shared/ai_models_packs.goindex ac5fb684..d7efe7d8 100644--- a/app/shared/ai_models_packs.go+++ b/app/shared/ai_models_packs.go@@ -11,14 +11,16 @@ var StrongModelOpus ModelPackvar AnthropicModelPack ModelPackvar OpenAIModelPack ModelPack+var GoogleModelPack ModelPack-var GeminiModelPack ModelPack+var GeminiPlannerModelPack ModelPack+var O3PlannerModelPack ModelPackvar R1PlannerModelPack ModelPackvar PerplexityPlannerModelPack ModelPackvar OllamaExperimentalModelPack ModelPackvar OllamaAdaptiveOssModelPack ModelPack-var OllamaAdaptiveCommercialModelPack ModelPack+var OllamaAdaptiveDailyModelPack ModelPackvar BuiltInModelPacks = []*ModelPack{&DailyDriverModelPack,@@ -28,16 +30,20 @@ var BuiltInModelPacks = []*ModelPack{&OSSModelPack,&OllamaExperimentalModelPack,&OllamaAdaptiveOssModelPack,- &OllamaAdaptiveCommercialModelPack,+ &OllamaAdaptiveDailyModelPack,&OpusPlannerModelPack,&StrongModelOpus,&AnthropicModelPack,&OpenAIModelPack,- &GeminiModelPack,+ &GoogleModelPack,+ &GeminiPlannerModelPack,+ &O3PlannerModelPack,&R1PlannerModelPack,&PerplexityPlannerModelPack,}+var BuiltInModelPacksByName = make(map[string]*ModelPack)+var DefaultModelPack *ModelPack = &DailyDriverModelPackfunc getModelRoleConfig(role ModelRole, modelId ModelId, fns ...func(*ModelRoleConfigSchema)) ModelRoleConfigSchema {@@ -81,19 +87,22 @@ func getStrongModelFallback(role ModelRole, modelId ModelId, fns ...func(*ModelR}var (- DailyDriverSchema ModelPackSchema- ReasoningSchema ModelPackSchema- StrongSchema ModelPackSchema- OssSchema ModelPackSchema- CheapSchema ModelPackSchema- OllamaExperimentalSchema ModelPackSchema- OllamaAdaptiveOssSchema ModelPackSchema- OllamaAdaptiveCommercialSchema ModelPackSchema- AnthropicSchema ModelPackSchema- OpenAISchema ModelPackSchema- GeminiSchema ModelPackSchema- R1PlannerSchema ModelPackSchema- PerplexityPlannerSchema ModelPackSchema+ DailyDriverSchema ModelPackSchema+ ReasoningSchema ModelPackSchema+ StrongSchema ModelPackSchema+ OssSchema ModelPackSchema+ CheapSchema ModelPackSchema+ OllamaExperimentalSchema ModelPackSchema+ OllamaAdaptiveOssSchema ModelPackSchema+ OllamaAdaptiveDailySchema ModelPackSchema+ AnthropicSchema ModelPackSchema+ OpenAISchema ModelPackSchema+ GoogleSchema ModelPackSchema+ GeminiPlannerSchema ModelPackSchema+ OpusPlannerSchema ModelPackSchema+ R1PlannerSchema ModelPackSchema+ PerplexityPlannerSchema ModelPackSchema+ O3PlannerSchema ModelPackSchema)var BuiltInModelPackSchemas = []*ModelPackSchema{@@ -104,10 +113,12 @@ var BuiltInModelPackSchemas = []*ModelPackSchema{&OssSchema,&OllamaExperimentalSchema,&OllamaAdaptiveOssSchema,- &OllamaAdaptiveCommercialSchema,+ &OllamaAdaptiveDailySchema,&AnthropicSchema,&OpenAISchema,- &GeminiSchema,+ &GeminiPlannerSchema,+ &OpusPlannerSchema,+ &O3PlannerSchema,&R1PlannerSchema,&PerplexityPlannerSchema,}@@ -202,45 +213,45 @@ func init() {Builder: getModelRoleConfig(ModelRoleBuilder, "deepseek/r1-hidden"),WholeFileBuilder: Pointer(getModelRoleConfig(ModelRoleWholeFileBuilder,"deepseek/r1-hidden")),- Namer: getModelRoleConfig(ModelRoleName, "qwen/qwen3-8b"),- CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "qwen/qwen3-8b"),+ Namer: getModelRoleConfig(ModelRoleName, "qwen/qwen3-8b-cloud"),+ CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "qwen/qwen3-8b-cloud"),ExecStatus: getModelRoleConfig(ModelRoleExecStatus, "deepseek/r1-hidden"),},}OllamaExperimentalSchema = ModelPackSchema{- Name: "ollama-experimental",+ Name: "ollama",Description: "Ollama experimental local blend. Supports up to 110k context. For now, more for experimentation and benchmarking than getting work done.",ModelPackSchemaRoles: ModelPackSchemaRoles{LocalProvider: ModelProviderOllama,- Planner: getModelRoleConfig(ModelRolePlanner, "qwen/qwen3-32b"),+ Planner: getModelRoleConfig(ModelRolePlanner, "qwen/qwen3-32b-local"),PlanSummary: getModelRoleConfig(ModelRolePlanSummary, "mistral/devstral-small"),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"),+ Namer: getModelRoleConfig(ModelRoleName, "qwen/qwen3-8b-local"),+ CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "qwen/qwen3-8b-local"),ExecStatus: getModelRoleConfig(ModelRoleExecStatus, "mistral/devstral-small"),},}// Copy daily driver schema and modify it to use ollama for lighter tasks- OllamaAdaptiveCommercialSchema = cloneSchema(DailyDriverSchema)- OllamaAdaptiveCommercialSchema.Name = "ollama-adaptive-commercial"- OllamaAdaptiveCommercialSchema.Description = "Ollama adaptive commercial blend. Uses 'daily-driver' for heavy lifting, local models for lighter tasks."- OllamaAdaptiveCommercialSchema.LocalProvider = ModelProviderOllama- OllamaAdaptiveCommercialSchema.PlanSummary = getModelRoleConfig(ModelRolePlanSummary, "mistral/devstral-small")- OllamaAdaptiveCommercialSchema.CommitMsg = getModelRoleConfig(ModelRoleCommitMsg, "qwen/qwen3-8b")- OllamaAdaptiveCommercialSchema.Namer = getModelRoleConfig(ModelRoleName, "qwen/qwen3-8b")+ OllamaAdaptiveDailySchema = cloneSchema(DailyDriverSchema)+ OllamaAdaptiveDailySchema.Name = "ollama-daily"+ OllamaAdaptiveDailySchema.Description = "Ollama adaptive/daily-driver blend. Uses 'daily-driver' for heavy lifting, local models for lighter tasks."+ OllamaAdaptiveDailySchema.LocalProvider = ModelProviderOllama+ OllamaAdaptiveDailySchema.PlanSummary = getModelRoleConfig(ModelRolePlanSummary, "mistral/devstral-small")+ OllamaAdaptiveDailySchema.CommitMsg = getModelRoleConfig(ModelRoleCommitMsg, "qwen/qwen3-8b-local")+ OllamaAdaptiveDailySchema.Namer = getModelRoleConfig(ModelRoleName, "qwen/qwen3-8b-local")// Copy oss schema and modify it to use ollama for lighter tasksOllamaAdaptiveOssSchema = cloneSchema(OssSchema)- OllamaAdaptiveOssSchema.Name = "ollama-adaptive-oss"- OllamaAdaptiveOssSchema.Description = "Ollama adaptive OSS blend. Uses local models for planning and context selection, open source cloud models for implementation and file edits. Supports up to 110k context."+ OllamaAdaptiveOssSchema.Name = "ollama-oss"+ OllamaAdaptiveOssSchema.Description = "Ollama adaptive/oss blend. Uses local models for planning and context selection, open source cloud models for implementation and file edits. Supports up to 110k context."OllamaAdaptiveOssSchema.LocalProvider = ModelProviderOllamaOllamaAdaptiveOssSchema.PlanSummary = getModelRoleConfig(ModelRolePlanSummary, "mistral/devstral-small")- OllamaAdaptiveOssSchema.CommitMsg = getModelRoleConfig(ModelRoleCommitMsg, "qwen/qwen3-8b")- OllamaAdaptiveOssSchema.Namer = getModelRoleConfig(ModelRoleName, "qwen/qwen3-8b")+ OllamaAdaptiveOssSchema.CommitMsg = getModelRoleConfig(ModelRoleCommitMsg, "qwen/qwen3-8b-local")+ OllamaAdaptiveOssSchema.Namer = getModelRoleConfig(ModelRoleName, "qwen/qwen3-8b-local")OpenAISchema = ModelPackSchema{Name: "openai",@@ -273,12 +284,64 @@ func init() {},}- GeminiSchema = 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.",+ GoogleSchema = ModelPackSchema{+ Name: "google",+ Description: "Uses Gemini 2.5 Pro for heavy lifting, 2.5 Flash for light tasks. Supports up to 1M input context.",ModelPackSchemaRoles: ModelPackSchemaRoles{Planner: getModelRoleConfig(ModelRolePlanner, "google/gemini-2.5-pro"),- Coder: Pointer(getModelRoleConfig(ModelRoleCoder, "google/gemini-2.5-pro")),+ Coder: Pointer(getModelRoleConfig(ModelRoleCoder, "google/gemini-2.5-flash")),+ PlanSummary: getModelRoleConfig(ModelRolePlanSummary, "google/gemini-2.5-flash"),+ Builder: getModelRoleConfig(ModelRoleBuilder, "google/gemini-2.5-pro"),+ Namer: getModelRoleConfig(ModelRoleName, "google/gemini-2.5-flash"),+ CommitMsg: getModelRoleConfig(ModelRoleCommitMsg, "google/gemini-2.5-flash"),+ ExecStatus: getModelRoleConfig(ModelRoleExecStatus, "google/gemini-2.5-pro"),+ },+ }++ GeminiPlannerSchema = ModelPackSchema{+ Name: "gemini-planner",+ Description: "Uses Gemini 2.5 Pro for planning, default models for other roles. Supports up to 1M input context.",+ ModelPackSchemaRoles: ModelPackSchemaRoles{+ Planner: getModelRoleConfig(ModelRolePlanner, "google/gemini-2.5-pro"),+ 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"),+ },+ }++ O3PlannerSchema = ModelPackSchema{+ Name: "o3-planner",+ Description: "Uses Claude Opus 4 for planning, default models for other roles. Supports up to 180k input context.",+ ModelPackSchemaRoles: ModelPackSchemaRoles{+ Planner: getModelRoleConfig(ModelRolePlanner, "anthropic/opus-4"),+ 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"),+ },+ }++ O3PlannerSchema = ModelPackSchema{+ Name: "o3-planner",+ Description: "Uses OpenAI o3-medium for planning, default models for other roles. Supports up to 160k input context.",+ ModelPackSchemaRoles: ModelPackSchemaRoles{+ Planner: getModelRoleConfig(ModelRolePlanner, "openai/o3-medium"),+ 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,@@ -328,12 +391,15 @@ func init() {OSSModelPack = OssSchema.ToModelPack()OllamaExperimentalModelPack = OllamaExperimentalSchema.ToModelPack()OllamaAdaptiveOssModelPack = OllamaAdaptiveOssSchema.ToModelPack()- OllamaAdaptiveCommercialModelPack = OllamaAdaptiveCommercialSchema.ToModelPack()+ OllamaAdaptiveDailyModelPack = OllamaAdaptiveDailySchema.ToModelPack()AnthropicModelPack = AnthropicSchema.ToModelPack()OpenAIModelPack = OpenAISchema.ToModelPack()- GeminiModelPack = GeminiSchema.ToModelPack()+ GoogleModelPack = GoogleSchema.ToModelPack()+ GeminiPlannerModelPack = GeminiPlannerSchema.ToModelPack()+ OpusPlannerModelPack = OpusPlannerSchema.ToModelPack()R1PlannerModelPack = R1PlannerSchema.ToModelPack()PerplexityPlannerModelPack = PerplexityPlannerSchema.ToModelPack()+ O3PlannerModelPack = O3PlannerSchema.ToModelPack()BuiltInModelPacks = []*ModelPack{&DailyDriverModelPack,@@ -343,10 +409,13 @@ func init() {&OSSModelPack,&OllamaExperimentalModelPack,&OllamaAdaptiveOssModelPack,- &OllamaAdaptiveCommercialModelPack,+ &OllamaAdaptiveDailyModelPack,&AnthropicModelPack,&OpenAIModelPack,- &GeminiModelPack,+ &GoogleModelPack,+ &GeminiPlannerModelPack,+ &OpusPlannerModelPack,+ &O3PlannerModelPack,&R1PlannerModelPack,&PerplexityPlannerModelPack,}@@ -354,6 +423,8 @@ func init() {DefaultModelPack = &DailyDriverModelPackfor _, mp := range BuiltInModelPacks {+ BuiltInModelPacksByName[mp.Name] = mp+for _, id := range mp.ToModelPackSchema().AllModelIds() {if BuiltInBaseModelsById[id] == nil {panic("missing base model: " + id)