Skip to content

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

fix for replacements failed issue with entire file replacements

Dane Schneider3f1314fabe5e
diff --git a/app/cli/changes_tui/replace.go b/app/cli/changes_tui/replace.go
index f62036c6..a9204e72 100644
--- a/app/cli/changes_tui/replace.go
+++ b/app/cli/changes_tui/replace.go
@@ -22,9 +22,16 @@ type oldReplacementRes struct {
}
func (m changesUIModel) getReplacementOldDisplay() oldReplacementRes {
- oldContent := m.selectionInfo.currentRep.Old
+
originalFile := m.selectionInfo.currentFilesBeforeReplacement.Files[m.selectionInfo.currentPath]
+ var oldContent string
+ if m.selectionInfo.currentRep.EntireFile {
+ oldContent = originalFile
+ } else {
+ oldContent = m.selectionInfo.currentRep.Old
+ }
+
// log.Println(originalFile)
oldContent = strings.ReplaceAll(oldContent, "\\`\\`\\`", "```")
diff --git a/app/server/model/plan/build_result.go b/app/server/model/plan/build_result.go
index 6761acb5..88e5ae8f 100644
--- a/app/server/model/plan/build_result.go
+++ b/app/server/model/plan/build_result.go
@@ -73,8 +73,8 @@ func GetPlanResult(ctx context.Context, params PlanResultParams) (*db.PlanFileRe
new := streamedChange.New
if streamedChange.Old.EntireFile {
- old = preBuildState
replacements = append(replacements, &shared.Replacement{
+ EntireFile: true,
Old: old,
New: new,
StreamedChange: streamedChange,
diff --git a/app/server/model/plan/build_state.go b/app/server/model/plan/build_state.go
index 392f766e..64dfc2fc 100644
--- a/app/server/model/plan/build_state.go
+++ b/app/server/model/plan/build_state.go
@@ -10,8 +10,8 @@ import (
const MaxBuildStreamErrorRetries = 3 // uses semi-exponential backoff so be careful with this
-const FixSyntaxRetries = 2
-const FixSyntaxEpochs = 2
+const FixSyntaxRetries = 3
+const FixSyntaxEpochs = 3
type activeBuildStreamState struct {
clients map[string]*openai.Client
diff --git a/app/shared/data_models.go b/app/shared/data_models.go
index 6c845337..45b142be 100644
--- a/app/shared/data_models.go
+++ b/app/shared/data_models.go
@@ -145,6 +145,7 @@ type PlanBuild struct {
type Replacement struct {
Id string `json:"id"`
Old string `json:"old"`
+ EntireFile bool `json:"entireFile"`
New string `json:"new"`
Failed bool `json:"failed"`
RejectedAt *time.Time `json:"rejectedAt,omitempty"`
diff --git a/app/shared/plan_result_replacements.go b/app/shared/plan_result_replacements.go
index 6a81f082..50fcb334 100644
--- a/app/shared/plan_result_replacements.go
+++ b/app/shared/plan_result_replacements.go
@@ -21,7 +21,14 @@ func ApplyReplacements(content string, replacements []*Replacement, setFailed bo
pre := updated[:lastInsertedIdx]
sub := updated[lastInsertedIdx:]
- originalIdx := strings.Index(sub, replacement.Old)
+
+ var originalIdx int
+
+ if replacement.EntireFile {
+ originalIdx = 0
+ } else {
+ originalIdx = strings.Index(sub, replacement.Old)
+ }
// log.Println("originalIdx:", originalIdx)
@@ -47,6 +54,9 @@ func ApplyReplacements(content string, replacements []*Replacement, setFailed bo
return updated, i
+ } else if replacement.EntireFile {
+ updated = replacement.New
+ lastInsertedIdx = 0
} else {
// log.Printf("originalIdx: %d, len(replacement.Old): %d\n", originalIdx, len(replacement.Old))
// log.Println("Old: ", replacement.Old)