Skip to content

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

git repo transactional rollbacks, commit --amend when build finishes

Dane Schneider043efdd394c8
diff --git a/app/server/db/git.go b/app/server/db/git.go
index ee32165f..fd4a08a3 100644
--- a/app/server/db/git.go
+++ b/app/server/db/git.go
@@ -48,6 +48,31 @@ func GitAddAndCommit(orgId, planId, branch, message string) error {
return nil
}
+func GitAddAndAmendCommit(orgId, planId, branch, addMessage string) error {
+ dir := getPlanDir(orgId, planId)
+
+ err := gitAdd(dir, ".")
+ if err != nil {
+ return fmt.Errorf("error adding files to git repository for dir: %s, err: %v", dir, err)
+ }
+
+ // Get the latest commit message
+ _, latestCommitMsg, err := getLatestCommit(dir)
+ if err != nil {
+ return fmt.Errorf("error getting latest commit message for dir: %s, err: %v", dir, err)
+ }
+
+ // Amend the latest commit with the new message
+ message := latestCommitMsg + "\n\n" + addMessage
+ res, err := exec.Command("git", "-C", dir, "commit", "--amend", "-m", message).CombinedOutput()
+
+ if err != nil {
+ return fmt.Errorf("error amending commit for dir: %s, err: %v, output: %s", dir, err, string(res))
+ }
+
+ return nil
+}
+
func GitRewindToSha(orgId, planId, branch, sha string) error {
dir := getPlanDir(orgId, planId)
diff --git a/app/server/db/plan_helpers.go b/app/server/db/plan_helpers.go
index 4fc9ee07..89cae9aa 100644
--- a/app/server/db/plan_helpers.go
+++ b/app/server/db/plan_helpers.go
@@ -215,8 +215,8 @@ func SetPlanStatus(planId, branch string, status shared.PlanStatus, errStr strin
return nil
}
-func RenamePlan(planId string, name string) error {
- _, err := Conn.Exec("UPDATE plans SET name = $1 WHERE id = $2", name, planId)
+func RenamePlan(planId string, name string, tx *sql.Tx) error {
+ _, err := tx.Exec("UPDATE plans SET name = $1 WHERE id = $2", name, planId)
if err != nil {
return fmt.Errorf("error renaming plan: %v", err)
@@ -235,8 +235,8 @@ func IncActiveBranches(planId string, inc int, tx *sql.Tx) error {
return nil
}
-func IncNumNonDraftPlans(userId string) error {
- _, err := Conn.Exec("UPDATE users SET num_non_draft_plans = num_non_draft_plans + 1 WHERE id = $1", userId)
+func IncNumNonDraftPlans(userId string, tx *sql.Tx) error {
+ _, err := tx.Exec("UPDATE users SET num_non_draft_plans = num_non_draft_plans + 1 WHERE id = $1", userId)
if err != nil {
return fmt.Errorf("error updating user num_non_draft_plans: %v", err)
diff --git a/app/server/handlers/fs_helper.go b/app/server/handlers/fs_helper.go
index 0d68daad..5660a717 100644
--- a/app/server/handlers/fs_helper.go
+++ b/app/server/handlers/fs_helper.go
@@ -33,7 +33,7 @@ func lockRepo(w http.ResponseWriter, r *http.Request, auth *types.ServerAuth, sc
fn := func(err error) {
- err = rollbackRepoIfErr(auth.OrgId, planId, err)
+ err = RollbackRepoIfErr(auth.OrgId, planId, err)
if err != nil {
log.Printf("Error rolling back repo: %v\n", err)
}
@@ -47,7 +47,7 @@ func lockRepo(w http.ResponseWriter, r *http.Request, auth *types.ServerAuth, sc
return &fn
}
-func rollbackRepoIfErr(orgId, planId string, err error) error {
+func RollbackRepoIfErr(orgId, planId string, err error) error {
// if no error, return nil
if err == nil {
return nil
diff --git a/app/server/model/plan/build.go b/app/server/model/plan/build.go
index b5d3b71a..3f68d17a 100644
--- a/app/server/model/plan/build.go
+++ b/app/server/model/plan/build.go
@@ -131,6 +131,28 @@ func execPlanBuild(client *openai.Client, currentOrgId, currentUserId, branch st
onFinishBuild := func() {
log.Println("Build finished")
+ // get fresh current plan state
+ currentPlan, err := db.GetCurrentPlanState(db.CurrentPlanStateParams{
+ OrgId: currentOrgId,
+ PlanId: planId,
+ })
+ if err != nil {
+ errCh <- fmt.Errorf("error getting current plan state: %v", err)
+ return
+ }
+
+ err = db.GitAddAndAmendCommit(currentOrgId, planId, branch, currentPlan.PendingChangesSummary())
+
+ if err != nil {
+ log.Printf("Error committing plan build: %v\n", err)
+ activePlan.StreamDoneCh <- &shared.ApiError{
+ Type: shared.ApiErrorTypeOther,
+ Status: http.StatusInternalServerError,
+ Msg: "Error committing plan build: " + err.Error(),
+ }
+ return
+ }
+
if GetActivePlan(planId, branch).RepliesFinished {
activePlan.Stream(shared.StreamMessage{
Type: shared.StreamMessageFinished,
@@ -163,7 +185,16 @@ func execPlanBuild(client *openai.Client, currentOrgId, currentUserId, branch st
}
err = func() error {
+ var err error
defer func() {
+ if err != nil {
+ log.Printf("Error: %v\n", err)
+ err = db.GitClearUncommittedChanges(currentOrgId, planId)
+ if err != nil {
+ log.Printf("Error clearing uncommitted changes: %v\n", err)
+ }
+ }
+
err := db.UnlockRepo(repoLockId)
if err != nil {
log.Printf("Error unlocking repo: %v\n", err)
diff --git a/app/server/model/plan/state.go b/app/server/model/plan/state.go
index 2edc07f5..726dd1e4 100644
--- a/app/server/model/plan/state.go
+++ b/app/server/model/plan/state.go
@@ -56,6 +56,7 @@ func CreateActivePlan(planId, branch, prompt string) *types.ActivePlan {
if err != nil {
log.Printf("Error setting plan %s status to error: %v\n", planId, err)
}
+
}
activePlan.CancelFn()
diff --git a/app/server/model/plan/tell.go b/app/server/model/plan/tell.go
index 9fc07fef..b64c7380 100644
--- a/app/server/model/plan/tell.go
+++ b/app/server/model/plan/tell.go
@@ -155,7 +155,24 @@ func execTellPlan(client *openai.Client, plan *db.Plan, branch string, auth *typ
return
}
- err = db.RenamePlan(planId, name)
+ tx, err := db.Conn.Begin()
+ if err != nil {
+ log.Printf("Error starting transaction: %v\n", err)
+ errCh <- fmt.Errorf("error starting transaction: %v", err)
+ }
+
+ // Ensure that rollback is attempted in case of failure
+ defer func() {
+ if err != nil {
+ if rbErr := tx.Rollback(); rbErr != nil {
+ log.Printf("transaction rollback error: %v\n", rbErr)
+ } else {
+ log.Println("transaction rolled back")
+ }
+ }
+ }()
+
+ err = db.RenamePlan(planId, name, tx)
if err != nil {
log.Printf("Error renaming plan: %v\n", err)
@@ -163,13 +180,20 @@ func execTellPlan(client *openai.Client, plan *db.Plan, branch string, auth *typ
return
}
- err = db.IncNumNonDraftPlans(currentUserId)
+ err = db.IncNumNonDraftPlans(currentUserId, tx)
if err != nil {
log.Printf("Error incrementing num non draft plans: %v\n", err)
errCh <- fmt.Errorf("error incrementing num non draft plans: %v", err)
return
}
+
+ err = tx.Commit()
+ if err != nil {
+ log.Printf("Error committing transaction: %v\n", err)
+ errCh <- fmt.Errorf("error committing transaction: %v", err)
+ return
+ }
}
errCh <- nil
@@ -262,7 +286,16 @@ func execTellPlan(client *openai.Client, plan *db.Plan, branch string, auth *typ
}()
err = func() error {
+ var err error
defer func() {
+ if err != nil {
+ log.Printf("Error: %v\n", err)
+ err = db.GitClearUncommittedChanges(auth.OrgId, planId)
+ if err != nil {
+ log.Printf("Error clearing uncommitted changes: %v\n", err)
+ }
+ }
+
err = db.UnlockRepo(repoLockId)
if err != nil {
log.Printf("Error unlocking repo: %v\n", err)
@@ -276,7 +309,7 @@ func execTellPlan(client *openai.Client, plan *db.Plan, branch string, auth *typ
}()
for i := 0; i < 3; i++ {
- err := <-errCh
+ err = <-errCh
if err != nil {
active.StreamDoneCh <- &shared.ApiError{
Type: shared.ApiErrorTypeOther,
@@ -808,6 +841,14 @@ func execTellPlan(client *openai.Client, plan *db.Plan, branch string, auth *typ
var shouldContinue bool
err = func() error {
defer func() {
+ if err != nil {
+ log.Printf("Error: %v\n", err)
+ err = db.GitClearUncommittedChanges(auth.OrgId, planId)
+ if err != nil {
+ log.Printf("Error clearing uncommitted changes: %v\n", err)
+ }
+ }
+
err = db.UnlockRepo(repoLockId)
if err != nil {
log.Printf("Error unlocking repo: %v\n", err)
@@ -876,7 +917,7 @@ func execTellPlan(client *openai.Client, plan *db.Plan, branch string, auth *typ
}()
for i := 0; i < 2; i++ {
- err := <-errCh
+ err = <-errCh
if err != nil {
return err
}