Skip to content

Open source AI coding agent. Designed for large projects and real world tasks.

cleanup/little reorg

Dane Schneiderc73ae8277ddc
diff --git a/app/cli/cmd/apply.go b/app/cli/cmd/apply.go
index 9bb9e917..a5fa7de7 100644
--- a/app/cli/cmd/apply.go
+++ b/app/cli/cmd/apply.go
@@ -31,61 +31,6 @@ func apply(cmd *cobra.Command, args []string) {
return
}
- // if len(args) == 0 {
- // if lib.CurrentPlanId == "" {
- // fmt.Fprintln(os.Stderr, "No current plan")
- // os.Exit(1)
- // }
-
- // planId = lib.CurrentPlanId
- // } else {
- // nameOrIdx := args[0]
-
- // if nameOrIdx == "current" {
- // if lib.CurrentPlanId == "" {
- // fmt.Fprintln(os.Stderr, "No current plan")
- // os.Exit(1)
- // }
-
- // planId = lib.CurrentPlanId
- // } else {
- // var plan *shared.Plan
-
- // plans, apiErr := api.Client.ListPlans(lib.CurrentProjectId)
-
- // if apiErr != nil {
- // fmt.Fprintln(os.Stderr, "Error getting plans:", apiErr.Msg)
- // os.Exit(1)
- // }
-
- // // see if it's an index
- // idx, err := strconv.Atoi(nameOrIdx)
-
- // if err == nil {
- // if idx > 0 && idx <= len(plans) {
- // plan = plans[idx-1]
- // } else {
- // fmt.Fprintln(os.Stderr, "Error: index out of range")
- // os.Exit(1)
- // }
- // } else {
- // for _, p := range plans {
- // if p.Name == nameOrIdx {
- // plan = p
- // break
- // }
- // }
-
- // if plan == nil {
- // fmt.Printf("πŸ€·β€β™‚οΈ Plan with name '%s' doesn't exist\n", nameOrIdx)
- // os.Exit(1)
- // }
- // }
-
- // planId = plan.Id
- // }
- // }
-
err := lib.ApplyPlanWithOutput(lib.CurrentPlanId, lib.CurrentBranch, autoConfirm)
if err != nil {
diff --git a/app/shared/data_models.go b/app/shared/data_models.go
index 5358c681..c6abb04a 100644
--- a/app/shared/data_models.go
+++ b/app/shared/data_models.go
@@ -202,8 +202,6 @@ type OrgRole struct {
type ModelProvider string
-const ModelProviderOpenAI ModelProvider = "openai"
-
type BaseModelConfig struct {
Provider ModelProvider `json:"provider"`
BaseUrl string `json:"baseUrl"`
@@ -222,30 +220,6 @@ type TaskModelConfig struct {
type ModelRole string
-const (
- ModelRolePlanner ModelRole = "planner"
- ModelRolePlanSummary ModelRole = "summarizer"
- ModelRoleBuilder ModelRole = "builder"
- ModelRoleName ModelRole = "names"
- ModelRoleCommitMsg ModelRole = "commit-messages"
- ModelRoleExecStatus ModelRole = "auto-complete"
-)
-
-var AllModelRoles = []ModelRole{ModelRolePlanner, ModelRolePlanSummary, ModelRoleBuilder, ModelRoleName, ModelRoleCommitMsg, ModelRoleExecStatus}
-var ModelRoleDescriptions = map[ModelRole]string{
- ModelRolePlanner: "replies to prompts and makes plans",
- ModelRolePlanSummary: "summarizes conversations exceeding max-convo-tokens",
- ModelRoleBuilder: "builds a plan into file diffs",
- ModelRoleName: "names plans",
- ModelRoleCommitMsg: "writes commit messages",
- ModelRoleExecStatus: "determines whether to auto-continue",
-}
-var SettingDescriptions = map[string]string{
- "max-convo-tokens": "max conversation πŸͺ™ before summarization",
- "max-tokens": "overall πŸͺ™ limit",
- "reserved-output-tokens": "πŸͺ™ reserved for model output",
-}
-
type ModelRoleConfig struct {
Role ModelRole `json:"role"`
BaseModelConfig BaseModelConfig `json:"baseModelConfig"`
@@ -283,45 +257,3 @@ type PlanSettings struct {
ModelSet *ModelSet `json:"modelSet"`
UpdatedAt time.Time `json:"updatedAt"`
}
-
-var ModelOverridePropsDasherized = []string{"max-convo-tokens", "max-tokens", "reserved-output-tokens"}
-
-func (ps PlanSettings) GetPlannerMaxTokens() int {
- if ps.ModelOverrides.MaxTokens == nil {
- if ps.ModelSet == nil {
- return DefaultModelSet.Planner.BaseModelConfig.MaxTokens
- } else {
- return ps.ModelSet.Planner.BaseModelConfig.MaxTokens
- }
- } else {
- return *ps.ModelOverrides.MaxTokens
- }
-}
-
-func (ps PlanSettings) GetPlannerMaxConvoTokens() int {
- if ps.ModelOverrides.MaxConvoTokens == nil {
- if ps.ModelSet == nil {
- return DefaultModelSet.Planner.PlannerModelConfig.MaxConvoTokens
- } else {
- return ps.ModelSet.Planner.PlannerModelConfig.MaxConvoTokens
- }
- } else {
- return *ps.ModelOverrides.MaxConvoTokens
- }
-}
-
-func (ps PlanSettings) GetPlannerReservedOutputTokens() int {
- if ps.ModelOverrides.ReservedOutputTokens == nil {
- if ps.ModelSet == nil {
- return DefaultModelSet.Planner.PlannerModelConfig.ReservedOutputTokens
- } else {
- return ps.ModelSet.Planner.PlannerModelConfig.ReservedOutputTokens
- }
- } else {
- return *ps.ModelOverrides.ReservedOutputTokens
- }
-}
-
-func (ps PlanSettings) GetPlannerEffectiveMaxTokens() int {
- return ps.GetPlannerMaxTokens() - ps.GetPlannerReservedOutputTokens()
-}
diff --git a/app/shared/plan_settings.go b/app/shared/plan_settings.go
new file mode 100644
index 00000000..c669912b
--- /dev/null
+++ b/app/shared/plan_settings.go
@@ -0,0 +1,69 @@
+package shared
+
+const ModelProviderOpenAI ModelProvider = "openai"
+
+const (
+ ModelRolePlanner ModelRole = "planner"
+ ModelRolePlanSummary ModelRole = "summarizer"
+ ModelRoleBuilder ModelRole = "builder"
+ ModelRoleName ModelRole = "names"
+ ModelRoleCommitMsg ModelRole = "commit-messages"
+ ModelRoleExecStatus ModelRole = "auto-complete"
+)
+
+var AllModelRoles = []ModelRole{ModelRolePlanner, ModelRolePlanSummary, ModelRoleBuilder, ModelRoleName, ModelRoleCommitMsg, ModelRoleExecStatus}
+var ModelRoleDescriptions = map[ModelRole]string{
+ ModelRolePlanner: "replies to prompts and makes plans",
+ ModelRolePlanSummary: "summarizes conversations exceeding max-convo-tokens",
+ ModelRoleBuilder: "builds a plan into file diffs",
+ ModelRoleName: "names plans",
+ ModelRoleCommitMsg: "writes commit messages",
+ ModelRoleExecStatus: "determines whether to auto-continue",
+}
+var SettingDescriptions = map[string]string{
+ "max-convo-tokens": "max conversation πŸͺ™ before summarization",
+ "max-tokens": "overall πŸͺ™ limit",
+ "reserved-output-tokens": "πŸͺ™ reserved for model output",
+}
+
+var ModelOverridePropsDasherized = []string{"max-convo-tokens", "max-tokens", "reserved-output-tokens"}
+
+func (ps PlanSettings) GetPlannerMaxTokens() int {
+ if ps.ModelOverrides.MaxTokens == nil {
+ if ps.ModelSet == nil {
+ return DefaultModelSet.Planner.BaseModelConfig.MaxTokens
+ } else {
+ return ps.ModelSet.Planner.BaseModelConfig.MaxTokens
+ }
+ } else {
+ return *ps.ModelOverrides.MaxTokens
+ }
+}
+
+func (ps PlanSettings) GetPlannerMaxConvoTokens() int {
+ if ps.ModelOverrides.MaxConvoTokens == nil {
+ if ps.ModelSet == nil {
+ return DefaultModelSet.Planner.PlannerModelConfig.MaxConvoTokens
+ } else {
+ return ps.ModelSet.Planner.PlannerModelConfig.MaxConvoTokens
+ }
+ } else {
+ return *ps.ModelOverrides.MaxConvoTokens
+ }
+}
+
+func (ps PlanSettings) GetPlannerReservedOutputTokens() int {
+ if ps.ModelOverrides.ReservedOutputTokens == nil {
+ if ps.ModelSet == nil {
+ return DefaultModelSet.Planner.PlannerModelConfig.ReservedOutputTokens
+ } else {
+ return ps.ModelSet.Planner.PlannerModelConfig.ReservedOutputTokens
+ }
+ } else {
+ return *ps.ModelOverrides.ReservedOutputTokens
+ }
+}
+
+func (ps PlanSettings) GetPlannerEffectiveMaxTokens() int {
+ return ps.GetPlannerMaxTokens() - ps.GetPlannerReservedOutputTokens()
+}