Skip to content

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

Add conflict resolution for context updates

Dane Schneiderd1bd39955f72
diff --git a/app/server/db/context_helpers_conflicts.go b/app/server/db/context_helpers_conflicts.go
new file mode 100644
index 00000000..e2a16702
--- /dev/null
+++ b/app/server/db/context_helpers_conflicts.go
@@ -0,0 +1,108 @@
+package db
+
+import (
+ "fmt"
+ shared "plandex-shared"
+)
+
+type invalidateConflictedResultsParams struct {
+ orgId string
+ planId string
+ filesToUpdate map[string]string
+ descriptions []*ConvoMessageDescription
+ currentPlan *shared.CurrentPlanState
+}
+
+func invalidateConflictedResults(params invalidateConflictedResultsParams) error {
+ orgId := params.orgId
+ planId := params.planId
+ filesToUpdate := params.filesToUpdate
+
+ var descriptions []*ConvoMessageDescription
+
+ if params.descriptions == nil {
+ var err error
+ descriptions, err = GetConvoMessageDescriptions(orgId, planId)
+ if err != nil {
+ return fmt.Errorf("error getting pending build descriptions: %v", err)
+ }
+ } else {
+ descriptions = params.descriptions
+ }
+
+ var currentPlan *shared.CurrentPlanState
+
+ if params.currentPlan == nil {
+ var err error
+ currentPlan, err = GetCurrentPlanState(CurrentPlanStateParams{
+ OrgId: orgId,
+ PlanId: planId,
+ ConvoMessageDescriptions: descriptions,
+ })
+ if err != nil {
+ return fmt.Errorf("error getting current plan state: %v", err)
+ }
+ } else {
+ currentPlan = params.currentPlan
+ }
+
+ conflictPaths := currentPlan.PlanResult.FileResultsByPath.ConflictedPaths(filesToUpdate)
+
+ // log.Println("invalidateConflictedResults - Conflicted paths:", conflictPaths)
+
+ if len(conflictPaths) > 0 {
+ toUpdateDescs := []*ConvoMessageDescription{}
+
+ for _, desc := range descriptions {
+ if !desc.DidBuild || desc.AppliedAt != nil {
+ continue
+ }
+
+ for _, op := range desc.Operations {
+ if _, found := conflictPaths[op.Path]; found {
+ if desc.BuildPathsInvalidated == nil {
+ desc.BuildPathsInvalidated = make(map[string]bool)
+ }
+ desc.BuildPathsInvalidated[op.Path] = true
+ toUpdateDescs = append(toUpdateDescs, desc)
+ }
+ }
+ }
+
+ numRoutines := len(toUpdateDescs) + 1
+ errCh := make(chan error, numRoutines)
+
+ for _, desc := range toUpdateDescs {
+ go func(desc *ConvoMessageDescription) {
+ err := StoreDescription(desc)
+
+ if err != nil {
+ errCh <- fmt.Errorf("error storing description: %v", err)
+ return
+ }
+
+ errCh <- nil
+ }(desc)
+ }
+
+ go func() {
+ err := DeletePendingResultsForPaths(orgId, planId, conflictPaths)
+
+ if err != nil {
+ errCh <- fmt.Errorf("error deleting pending results: %v", err)
+ return
+ }
+
+ errCh <- nil
+ }()
+
+ for i := 0; i < numRoutines; i++ {
+ err := <-errCh
+ if err != nil {
+ return fmt.Errorf("error storing description: %v", err)
+ }
+ }
+ }
+
+ return nil
+}