Skip to content

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

apply commit message fixes, apply stash logic fix

Dane Schneiderab3f26521f8d
diff --git a/app/cli/lib/git.go b/app/cli/lib/git.go
index 8b4e2b45..897a6439 100644
--- a/app/cli/lib/git.go
+++ b/app/cli/lib/git.go
@@ -87,7 +87,7 @@ func GitStashCreate(message string) error {
gitMutex.Lock()
defer gitMutex.Unlock()
- res, err := exec.Command("git", "stash", "push", "-m", message).CombinedOutput()
+ res, err := exec.Command("git", "stash", "push", "-u", "-m", message).CombinedOutput()
if err != nil {
return fmt.Errorf("error creating git stash: %v, output: %s", err, string(res))
}
diff --git a/app/server/model/plan/build.go b/app/server/model/plan/build.go
index d327f9e3..4436225e 100644
--- a/app/server/model/plan/build.go
+++ b/app/server/model/plan/build.go
@@ -54,9 +54,13 @@ func execPlanBuild(currentOrgId, currentUserId, branch string, activePlan *types
filePath := activeBuilds[0].Path
planId := activePlan.Id
var convoMessageIds []string
+ added := map[string]bool{}
for _, activeBuild := range activeBuilds {
- convoMessageIds = append(convoMessageIds, activeBuild.AssistantMessageId)
+ if !added[activeBuild.AssistantMessageId] {
+ convoMessageIds = append(convoMessageIds, activeBuild.AssistantMessageId)
+ added[activeBuild.AssistantMessageId] = true
+ }
}
UpdateActivePlan(activePlan.Id, activePlan.Branch, func(ap *types.ActivePlan) {
diff --git a/app/shared/plan_result.go b/app/shared/plan_result.go
index 2d761162..92ad9880 100644
--- a/app/shared/plan_result.go
+++ b/app/shared/plan_result.go
@@ -181,35 +181,99 @@ func (planState *CurrentPlanState) GetFilesBeforeReplacement(
}
func (state *CurrentPlanState) PendingChangesSummary() string {
-
var msgs []string
- var multiDescs [][]*ConvoMessageDescription
- for i, result := range state.PlanResult.Results {
- if i >= len(multiDescs) {
- multiDescs = append(multiDescs, []*ConvoMessageDescription{})
+ descByConvoMessageId := make(map[string]*ConvoMessageDescription)
+ for _, desc := range state.PendingBuildDescriptions {
+ if desc.ConvoMessageId == "" {
+ log.Println("Warning: ConvoMessageId is empty for description:", desc)
+ continue
}
+
+ descByConvoMessageId[desc.ConvoMessageId] = desc
+ }
+
+ type changeset struct {
+ descsSet map[string]bool
+ descs []*ConvoMessageDescription
+ results []*PlanFileResult
+ }
+ byDescs := map[string]*changeset{}
+
+ for _, result := range state.PlanResult.Results {
+ convoIds := map[string]bool{}
for _, convoMessageId := range result.ConvoMessageIds {
- for _, desc := range state.PendingBuildDescriptions {
- if desc.ConvoMessageId == convoMessageId {
- multiDescs[i] = append(multiDescs[i], desc)
+ if descByConvoMessageId[convoMessageId] != nil {
+ convoIds[convoMessageId] = true
+ }
+ }
+ var uniqueConvoIds []string
+ for convoId := range convoIds {
+ uniqueConvoIds = append(uniqueConvoIds, convoId)
+ }
+
+ composite := strings.Join(uniqueConvoIds, "|")
+ if _, ok := byDescs[composite]; !ok {
+ byDescs[composite] = &changeset{
+ descsSet: make(map[string]bool),
+ }
+ }
+
+ ch := byDescs[composite]
+ ch.results = append(byDescs[composite].results, result)
+
+ for _, convoMessageId := range uniqueConvoIds {
+ if desc, ok := descByConvoMessageId[convoMessageId]; ok {
+ if !ch.descsSet[convoMessageId] {
+ ch.descs = append(ch.descs, desc)
+ ch.descsSet[convoMessageId] = true
}
+ } else {
+ log.Println("Warning: no description for convo message id:", convoMessageId)
}
}
}
- for i, descs := range multiDescs {
- result := state.PlanResult.Results[i]
+ var sortedChangesets []*changeset
+ for _, ch := range byDescs {
+ sortedChangesets = append(sortedChangesets, ch)
+ }
+
+ sort.Slice(sortedChangesets, func(i, j int) bool {
+ // put changesets with no descriptions last, otherwise sort by date
+ if len(sortedChangesets[i].descs) == 0 {
+ return false
+ }
+ if len(sortedChangesets[j].descs) == 0 {
+ return true
+ }
+ return sortedChangesets[i].descs[0].CreatedAt.Before(sortedChangesets[j].descs[0].CreatedAt)
+ })
+
+ for _, ch := range sortedChangesets {
+ var descMsgs []string
+
+ if len(ch.descs) == 0 {
+ descMsgs = append(descMsgs, "πŸ“ Changes")
+ } else {
+ for _, desc := range ch.descs {
+ descMsgs = append(descMsgs, fmt.Sprintf("πŸ“ %s", desc.CommitMsg))
+ }
+ }
+
pendingNewFilesSet := make(map[string]bool)
pendingReplacementPathsSet := make(map[string]bool)
pendingReplacementsByPath := make(map[string][]*Replacement)
- if result.IsPending() {
- if len(result.Replacements) == 0 && result.Content != "" {
- pendingNewFilesSet[result.Path] = true
- } else {
- pendingReplacementPathsSet[result.Path] = true
- pendingReplacementsByPath[result.Path] = append(pendingReplacementsByPath[result.Path], result.Replacements...)
+ for _, result := range ch.results {
+
+ if result.IsPending() {
+ if len(result.Replacements) == 0 && result.Content != "" {
+ pendingNewFilesSet[result.Path] = true
+ } else {
+ pendingReplacementPathsSet[result.Path] = true
+ pendingReplacementsByPath[result.Path] = append(pendingReplacementsByPath[result.Path], result.Replacements...)
+ }
}
}
@@ -217,6 +281,8 @@ func (state *CurrentPlanState) PendingChangesSummary() string {
continue
}
+ msgs = append(msgs, descMsgs...)
+
var pendingNewFiles []string
var pendingReplacementPaths []string
@@ -236,17 +302,12 @@ func (state *CurrentPlanState) PendingChangesSummary() string {
return pendingNewFiles[i] < pendingNewFiles[j]
})
- var descMsgs []string
- for _, desc := range descs {
- descMsgs = append(descMsgs, fmt.Sprintf("πŸ“ %s", desc.CommitMsg))
- }
-
if len(pendingNewFiles) > 0 {
newMsg := " πŸ“„ New files:\n"
for _, path := range pendingNewFiles {
newMsg += fmt.Sprintf(" β€’ %s\n", path)
}
- descMsgs = append(descMsgs, newMsg)
+ msgs = append(msgs, newMsg)
}
if len(pendingReplacementPaths) > 0 {
@@ -261,11 +322,9 @@ func (state *CurrentPlanState) PendingChangesSummary() string {
updatesMsg += fmt.Sprintf(" βœ… %s\n", replacement.Summary)
}
}
- descMsgs = append(descMsgs, updatesMsg)
+ msgs = append(msgs, updatesMsg)
}
- msgs = append(msgs, strings.Join(descMsgs, "\n"))
-
}
return strings.Join(msgs, "\n")
}