Skip to content

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

apply stash fixes, server rollback repo fixes

Dane Schneider60dcde6874b2
diff --git a/app/cli/lib/apply.go b/app/cli/lib/apply.go
index 4f0e3706..10c93601 100644
--- a/app/cli/lib/apply.go
+++ b/app/cli/lib/apply.go
@@ -2,13 +2,12 @@ package lib
import (
"fmt"
+ "log"
"os"
"path/filepath"
"plandex/api"
"plandex/fs"
"plandex/term"
-
- "github.com/fatih/color"
)
func MustApplyPlan(planId, branch string, autoConfirm bool) {
@@ -96,6 +95,36 @@ func MustApplyPlan(planId, branch string, autoConfirm bool) {
toApply := currentPlanFiles.Files
var aborted bool
+ var stashed bool
+ var errMsg string
+ var errArgs []interface{}
+ var unformattedErrMsg string
+
+ defer func() {
+ if aborted {
+ // clear any partially applied changes before popping the stash
+ err := GitClearUncommittedChanges()
+ if err != nil {
+ log.Printf("Failed to clear uncommitted changes: %v", err)
+ }
+ }
+
+ if stashed {
+ err := GitStashPop(true)
+ if err != nil {
+ log.Printf("Failed to pop git stash: %v", err)
+ }
+ }
+
+ if errMsg != "" {
+ if unformattedErrMsg == "" {
+ term.OutputErrorAndExit(errMsg, errArgs...)
+ } else {
+ term.OutputSimpleError(errMsg, errArgs...)
+ term.OutputUnformattedErrorAndExit(unformattedErrMsg)
+ }
+ }
+ }()
if len(toApply) == 0 {
fmt.Println("πŸ€·β€β™‚οΈ No changes to apply")
@@ -125,35 +154,56 @@ func MustApplyPlan(planId, branch string, autoConfirm bool) {
// Checkout the files that will be applied
// It's safe to do this with the confidence that no work will be lost because we just ensured the plan is using the latest state of all these files
for path := range toApply {
- err := GitCheckoutFile(path)
+ exists := true
+ _, err := os.Stat(filepath.Join(fs.ProjectRoot, path))
if err != nil {
- term.OutputSimpleError("Failed to reset file %s: %v", path, err)
- term.OutputUnformattedErrorAndExit(err.Error())
+ if os.IsNotExist(err) {
+ exists = false
+ } else {
+ errMsg = "Error checking for file %s:"
+ errArgs = append(errArgs, path)
+ unformattedErrMsg = err.Error()
+ aborted = true
+ return
+ }
}
- }
- err := GitStashCreate("Plandex auto-stash")
- if err != nil {
- term.OutputSimpleError("Failed to create git stash:")
- term.OutputUnformattedErrorAndExit(err.Error())
- }
+ if exists {
+ hasChanges, err := GitFileHasUncommittedChanges(path)
- defer func() {
- if aborted {
- // clear any partially applied changes before popping the stash
- err := GitClearUncommittedChanges()
if err != nil {
- term.OutputSimpleError("Failed to clear uncommitted changes:")
- term.OutputUnformattedErrorAndExit(err.Error())
+ errMsg = "Error checking for uncommitted changes for file %s:"
+ errArgs = append(errArgs, path)
+ unformattedErrMsg = err.Error()
+ aborted = true
+ return
}
- }
- err := GitStashPop(true)
- if err != nil {
- term.OutputSimpleError("Failed to pop git stash:")
- term.OutputUnformattedErrorAndExit(err.Error())
+ // log.Printf("File %s has uncommitted changes: %v", path, hasChanges)
+
+ if hasChanges {
+ err := os.Remove(filepath.Join(fs.ProjectRoot, path))
+ if err != nil {
+ errMsg = "Failed to remove file prior to update %s:"
+ errArgs = append(errArgs, path)
+ unformattedErrMsg = err.Error()
+ aborted = true
+ return
+ }
+
+ GitCheckoutFile(path) // ignore error to cover untracked files
+ }
}
- }()
+ }
+
+ err := GitStashCreate("Plandex auto-stash")
+ if err != nil {
+ errMsg = "Failed to create git stash:"
+ unformattedErrMsg = err.Error()
+ aborted = true
+ return
+ }
+ stashed = true
}
for path, content := range toApply {
@@ -163,14 +213,18 @@ func MustApplyPlan(planId, branch string, autoConfirm bool) {
err := os.MkdirAll(filepath.Dir(dstPath), 0755)
if err != nil {
aborted = true
- term.OutputErrorAndExit("failed to create directory %s: %v", filepath.Dir(dstPath), err)
+ errMsg = "failed to create directory %s:"
+ errArgs = append(errArgs, filepath.Dir(dstPath))
+ return
}
// Write the file
err = os.WriteFile(dstPath, []byte(content), 0644)
if err != nil {
aborted = true
- term.OutputErrorAndExit("failed to write %s: %v", dstPath, err)
+ errMsg = "failed to write %s:"
+ errArgs = append(errArgs, dstPath)
+ return
}
}
@@ -180,12 +234,21 @@ func MustApplyPlan(planId, branch string, autoConfirm bool) {
if apiErr != nil {
aborted = true
- term.OutputErrorAndExit("failed to set pending results applied: %s", apiErr.Msg)
+ errMsg = "failed to set pending results applied: %s"
+ errArgs = append(errArgs, apiErr.Msg)
+ return
}
if isRepo {
// Commit the changes
- err := GitAddAndCommit(fs.ProjectRoot, color.New(color.BgBlue, color.FgHiWhite, color.Bold).Sprintln(" πŸ€– Plandex ")+currentPlanState.PendingChangesSummary(), true)
+ msg := "πŸ€– Plandex" + currentPlanState.PendingChangesSummary()
+
+ // log.Println("Committing changes with message:")
+ // log.Println(msg)
+
+ // spew.Dump(currentPlanState)
+
+ err := GitAddAndCommit(fs.ProjectRoot, msg, true)
if err != nil {
aborted = true
// return fmt.Errorf("failed to commit changes: %w", err)
diff --git a/app/cli/lib/git.go b/app/cli/lib/git.go
index 6a9ec1a7..b5ba472a 100644
--- a/app/cli/lib/git.go
+++ b/app/cli/lib/git.go
@@ -155,6 +155,18 @@ func GitClearUncommittedChanges() error {
return nil
}
+func GitFileHasUncommittedChanges(path string) (bool, error) {
+ gitMutex.Lock()
+ defer gitMutex.Unlock()
+
+ res, err := exec.Command("git", "status", "--porcelain", path).CombinedOutput()
+ if err != nil {
+ return false, fmt.Errorf("error checking for uncommitted changes for file %s | err: %v, output: %s", path, err, string(res))
+ }
+
+ return strings.TrimSpace(string(res)) != "", nil
+}
+
func GitCheckoutFile(path string) error {
gitMutex.Lock()
defer gitMutex.Unlock()
diff --git a/app/cli/stream_tui/model.go b/app/cli/stream_tui/model.go
index d410c53e..b1b52766 100644
--- a/app/cli/stream_tui/model.go
+++ b/app/cli/stream_tui/model.go
@@ -59,8 +59,9 @@ type streamUIModel struct {
prompt string
- stopped bool
- finished bool
+ stopped bool
+ background bool
+ finished bool
err error
apiErr *shared.ApiError
diff --git a/app/cli/stream_tui/run.go b/app/cli/stream_tui/run.go
index 600d0e62..a8e097c4 100644
--- a/app/cli/stream_tui/run.go
+++ b/app/cli/stream_tui/run.go
@@ -3,6 +3,7 @@ package streamtui
import (
"fmt"
"log"
+ "os"
"plandex/term"
"sync"
@@ -56,14 +57,16 @@ func StartStreamUI(prompt string, buildOnly bool) error {
if mod.stopped {
fmt.Println()
- color.New(color.BgBlack, color.Bold, color.FgHiRed).Print(" πŸ›‘ Stopped early ")
+ color.New(color.BgBlack, color.Bold, color.FgHiRed).Println(" πŸ›‘ Stopped early ")
fmt.Println()
term.PrintCmds("", "log", "rewind", "tell")
- } else {
+ os.Exit(0)
+ } else if mod.background {
fmt.Println()
- color.New(color.BgBlack, color.Bold, color.FgGreen).Print(" βœ… Plan is active in the background ")
+ color.New(color.BgBlack, color.Bold, color.FgHiGreen).Println(" βœ… Plan is active in the background ")
fmt.Println()
term.PrintCmds("", "ps", "connect", "stop")
+ os.Exit(0)
}
return nil
diff --git a/app/cli/stream_tui/update.go b/app/cli/stream_tui/update.go
index 3c46f2c1..aec6b186 100644
--- a/app/cli/stream_tui/update.go
+++ b/app/cli/stream_tui/update.go
@@ -54,6 +54,7 @@ func (m streamUIModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
switch {
case bubbleKey.Matches(msg, m.keymap.quit):
+ m.background = true
return &m, tea.Quit
case bubbleKey.Matches(msg, m.keymap.stop):
diff --git a/app/cli/stream_tui/view.go b/app/cli/stream_tui/view.go
index 72cafc43..c1c821e2 100644
--- a/app/cli/stream_tui/view.go
+++ b/app/cli/stream_tui/view.go
@@ -81,7 +81,7 @@ func (m streamUIModel) doRenderBuild(outputStatic bool) string {
lbl := "Building plan "
bgColor := color.BgGreen
if outputStatic {
- if m.finished {
+ if m.finished || len(m.finishedByPath) == len(m.tokensByPath) {
lbl = "Built plan "
} else if m.stopped || m.err != nil || m.apiErr != nil {
lbl = "Build incomplete "
diff --git a/app/server/db/result_helpers.go b/app/server/db/result_helpers.go
index aa2db100..b26bbec7 100644
--- a/app/server/db/result_helpers.go
+++ b/app/server/db/result_helpers.go
@@ -188,7 +188,7 @@ func GetConvoMessageDescriptions(orgId, planId string) ([]*ConvoMessageDescripti
bytes, err := os.ReadFile(filepath.Join(descriptionsDir, file.Name()))
if err != nil {
- errCh <- fmt.Errorf("error reading description file: %v", err)
+ errCh <- fmt.Errorf("error reading description file %s: %v", file.Name(), err)
return
}
@@ -196,7 +196,7 @@ func GetConvoMessageDescriptions(orgId, planId string) ([]*ConvoMessageDescripti
err = json.Unmarshal(bytes, &description)
if err != nil {
- errCh <- fmt.Errorf("error unmarshalling description file: %v", err)
+ errCh <- fmt.Errorf("error unmarshalling description file %s: %v", file.Name(), err)
return
}
@@ -366,7 +366,7 @@ func ApplyPlan(orgId, userId, branchName string, plan *Plan) error {
for i := 0; i < 3; i++ {
err := <-errCh
if err != nil {
- return fmt.Errorf("error applying plan: %v", err)
+ return err
}
}
diff --git a/app/server/handlers/branches.go b/app/server/handlers/branches.go
index 34b39e1f..52f44037 100644
--- a/app/server/handlers/branches.go
+++ b/app/server/handlers/branches.go
@@ -36,7 +36,9 @@ func ListBranchesHandler(w http.ResponseWriter, r *http.Request) {
if unlockFn == nil {
return
} else {
- defer (*unlockFn)(err)
+ defer func() {
+ (*unlockFn)(err)
+ }()
}
branches, err := db.ListPlanBranches(auth.OrgId, planId)
@@ -110,7 +112,9 @@ func CreateBranchHandler(w http.ResponseWriter, r *http.Request) {
if unlockFn == nil {
return
} else {
- defer (*unlockFn)(err)
+ defer func() {
+ (*unlockFn)(err)
+ }()
}
tx, err := db.Conn.Begin()
diff --git a/app/server/handlers/context_helper.go b/app/server/handlers/context_helper.go
index b74dc7b9..e1a09023 100644
--- a/app/server/handlers/context_helper.go
+++ b/app/server/handlers/context_helper.go
@@ -19,7 +19,9 @@ func loadContexts(w http.ResponseWriter, r *http.Request, auth *types.ServerAuth
if unlockFn == nil {
return nil, nil
} else {
- defer (*unlockFn)(err)
+ defer func() {
+ (*unlockFn)(err)
+ }()
}
res, dbContexts, err := db.LoadContexts(db.LoadContextsParams{
diff --git a/app/server/handlers/fs_helper.go b/app/server/handlers/fs_helper.go
index 85eb303a..f89b7729 100644
--- a/app/server/handlers/fs_helper.go
+++ b/app/server/handlers/fs_helper.go
@@ -36,6 +36,9 @@ func lockRepo(w http.ResponseWriter, r *http.Request, auth *types.ServerAuth, sc
}
fn := func(err error) {
+ log.Println("Unlocking repo in deferred unlock function")
+ log.Printf("err: %v\n", err)
+
if r := recover(); r != nil {
stackTrace := debug.Stack()
log.Printf("Recovered from panic: %v\n", r)
@@ -44,6 +47,7 @@ func lockRepo(w http.ResponseWriter, r *http.Request, auth *types.ServerAuth, sc
http.Error(w, "Error locking repo: "+err.Error(), http.StatusInternalServerError)
}
+ log.Println("Rolling back repo if error")
err = RollbackRepoIfErr(auth.OrgId, planId, err)
if err != nil {
log.Printf("Error rolling back repo: %v\n", err)
@@ -61,6 +65,7 @@ func lockRepo(w http.ResponseWriter, r *http.Request, auth *types.ServerAuth, sc
func RollbackRepoIfErr(orgId, planId string, err error) error {
// if no error, return nil
if err == nil {
+ log.Println("No error, not rolling back repo")
return nil
}
diff --git a/app/server/handlers/plans_changes.go b/app/server/handlers/plans_changes.go
index c056ea1d..d810b979 100644
--- a/app/server/handlers/plans_changes.go
+++ b/app/server/handlers/plans_changes.go
@@ -35,7 +35,9 @@ func CurrentPlanHandler(w http.ResponseWriter, r *http.Request) {
if unlockFn == nil {
return
} else {
- defer (*unlockFn)(err)
+ defer func() {
+ (*unlockFn)(err)
+ }()
}
planState, err := db.GetCurrentPlanState(db.CurrentPlanStateParams{
@@ -86,7 +88,9 @@ func ApplyPlanHandler(w http.ResponseWriter, r *http.Request) {
if unlockFn == nil {
return
} else {
- defer (*unlockFn)(err)
+ defer func() {
+ (*unlockFn)(err)
+ }()
}
err = db.ApplyPlan(auth.OrgId, auth.User.Id, branch, plan)
@@ -122,7 +126,9 @@ func RejectAllChangesHandler(w http.ResponseWriter, r *http.Request) {
if unlockFn == nil {
return
} else {
- defer (*unlockFn)(err)
+ defer func() {
+ (*unlockFn)(err)
+ }()
}
err = db.RejectAllResults(auth.OrgId, planId)
@@ -160,7 +166,9 @@ func RejectResultHandler(w http.ResponseWriter, r *http.Request) {
if unlockFn == nil {
return
} else {
- defer (*unlockFn)(err)
+ defer func() {
+ (*unlockFn)(err)
+ }()
}
err = db.RejectPlanFileResult(auth.OrgId, planId, resultId, time.Now())
@@ -199,7 +207,9 @@ func RejectReplacementHandler(w http.ResponseWriter, r *http.Request) {
if unlockFn == nil {
return
} else {
- defer (*unlockFn)(err)
+ defer func() {
+ (*unlockFn)(err)
+ }()
}
err = db.RejectReplacement(auth.OrgId, planId, resultId, replacementId)
diff --git a/app/server/handlers/plans_context.go b/app/server/handlers/plans_context.go
index ac3bab5a..a57fb931 100644
--- a/app/server/handlers/plans_context.go
+++ b/app/server/handlers/plans_context.go
@@ -34,7 +34,9 @@ func ListContextHandler(w http.ResponseWriter, r *http.Request) {
if unlockFn == nil {
return
} else {
- defer (*unlockFn)(err)
+ defer func() {
+ (*unlockFn)(err)
+ }()
}
dbContexts, err := db.GetPlanContexts(auth.OrgId, planId, false)
@@ -154,7 +156,9 @@ func UpdateContextHandler(w http.ResponseWriter, r *http.Request) {
if unlockFn == nil {
return
} else {
- defer (*unlockFn)(err)
+ defer func() {
+ (*unlockFn)(err)
+ }()
}
updateRes, err := db.UpdateContexts(db.UpdateContextsParams{
@@ -253,7 +257,9 @@ func DeleteContextHandler(w http.ResponseWriter, r *http.Request) {
if unlockFn == nil {
return
} else {
- defer (*unlockFn)(err)
+ defer func() {
+ (*unlockFn)(err)
+ }()
}
dbContexts, err := db.GetPlanContexts(auth.OrgId, planId, false)
diff --git a/app/server/handlers/plans_convo.go b/app/server/handlers/plans_convo.go
index 68b51c0a..05a546df 100644
--- a/app/server/handlers/plans_convo.go
+++ b/app/server/handlers/plans_convo.go
@@ -32,7 +32,9 @@ func ListConvoHandler(w http.ResponseWriter, r *http.Request) {
if unlockFn == nil {
return
} else {
- defer (*unlockFn)(err)
+ defer func() {
+ (*unlockFn)(err)
+ }()
}
convoMessage, err := db.GetPlanConvo(auth.OrgId, planId)
diff --git a/app/server/handlers/plans_exec.go b/app/server/handlers/plans_exec.go
index 05b335d5..bdd0cd38 100644
--- a/app/server/handlers/plans_exec.go
+++ b/app/server/handlers/plans_exec.go
@@ -252,7 +252,9 @@ func StopPlanHandler(w http.ResponseWriter, r *http.Request) {
if unlockFn == nil {
return
} else {
- defer (*unlockFn)(err)
+ defer func() {
+ (*unlockFn)(err)
+ }()
}
log.Println("Stopping plan")
diff --git a/app/server/handlers/plans_versions.go b/app/server/handlers/plans_versions.go
index 23d7ae3f..24e6cc8d 100644
--- a/app/server/handlers/plans_versions.go
+++ b/app/server/handlers/plans_versions.go
@@ -36,7 +36,9 @@ func ListLogsHandler(w http.ResponseWriter, r *http.Request) {
if unlockFn == nil {
return
} else {
- defer (*unlockFn)(err)
+ defer func() {
+ (*unlockFn)(err)
+ }()
}
body, shas, err := db.GetGitCommitHistory(auth.OrgId, planId, branch)
@@ -104,7 +106,9 @@ func RewindPlanHandler(w http.ResponseWriter, r *http.Request) {
if unlockFn == nil {
return
} else {
- defer (*unlockFn)(err)
+ defer func() {
+ (*unlockFn)(err)
+ }()
}
err = db.GitRewindToSha(auth.OrgId, planId, branch, requestBody.Sha)
diff --git a/app/server/handlers/settings.go b/app/server/handlers/settings.go
index 5af56969..9cc1cd8d 100644
--- a/app/server/handlers/settings.go
+++ b/app/server/handlers/settings.go
@@ -40,7 +40,9 @@ func GetSettingsHandler(w http.ResponseWriter, r *http.Request) {
if unlockFn == nil {
return
} else {
- defer (*unlockFn)(err)
+ defer func() {
+ (*unlockFn)(err)
+ }()
}
settings, err := db.GetPlanSettings(plan, true)
@@ -98,7 +100,9 @@ func UpdateSettingsHandler(w http.ResponseWriter, r *http.Request) {
if unlockFn == nil {
return
} else {
- defer (*unlockFn)(err)
+ defer func() {
+ (*unlockFn)(err)
+ }()
}
originalSettings, err := db.GetPlanSettings(plan, true)