Open source AI coding agent. Designed for large projects and real world tasks.
Go aiai-agentsai-developer-toolsai-toolsclicommand-linedeveloper-toolsgitgolanggpt-4llmopenaipolyglot-programmingterminalterminal-basedterminal-ui
architect prompt reinforcement, locks verbose logging off, more logging for stage resolution
Dane Schneider6b624aab873d
diff --git a/app/server/db/locks.go b/app/server/db/locks.goindex c20ea524..1f9b3e5a 100644--- a/app/server/db/locks.go+++ b/app/server/db/locks.go@@ -18,7 +18,7 @@ import ("github.com/pkg/errors")-const locksVerboseLogging = true+const locksVerboseLogging = falseconst lockHeartbeatInterval = 3 * time.Secondconst lockHeartbeatTimeout = 60 * time.Second@@ -59,12 +59,16 @@ func lockRepoDB(params LockRepoParams, numRetry int) (string, error) {// Format truncated stack excluding runtime framesstackTrace := formatStackTrace(stack)- log.Println()- log.Printf("LOCK_ATTEMPT | params: %+v | retry: %d | stack:\n%s", params, numRetry, stackTrace)+ if locksVerboseLogging {+ log.Println()+ log.Printf("LOCK_ATTEMPT | params: %+v | retry: %d | stack:\n%s", params, numRetry, stackTrace)+ }// ensure context did not cancelif params.Ctx.Err() != nil {- log.Printf("[Lock][%d] Context canceled, returning error: %v", goroutineID, params.Ctx.Err())+ if locksVerboseLogging {+ log.Printf("[Lock][%d] Context canceled, returning error: %v", goroutineID, params.Ctx.Err())+ }return "", params.Ctx.Err()}@@ -374,6 +378,8 @@ func lockRepoDB(params LockRepoParams, numRetry int) (string, error) {committed = true+ log.Printf("Lock acquired: %s for plan %s with scope %s", newLock.Id, planId, scope)+if locksVerboseLogging {log.Println()log.Printf("LOCK_ACQUIRED | id: %s | params: %+v | stack:\n%s", newLock.Id, params, stackTrace)@@ -560,8 +566,12 @@ func deleteRepoLockDB(id, planId string, numRetry int) error {log.Printf("[Delete][%d] Error checking rows affected: %v", goroutineID, err)}} else {- if locksVerboseLogging {- log.Printf("[Delete][%d] Deleted %d rows", goroutineID, rowsAffected)+ if rowsAffected > 0 {+ log.Printf("Lock released: %s for plan %s", id, planId)++ if locksVerboseLogging {+ log.Printf("[Delete][%d] Deleted %d rows", goroutineID, rowsAffected)+ }}}@@ -660,9 +670,7 @@ func retryWithExponentialBackoff(}func CleanupAllLocks(ctx context.Context) error {- if locksVerboseLogging {- log.Println("Cleaning up all repo locks...")- }+ log.Println("Cleaning up all repo locks...")// Start a transaction with repeatable read isolation leveltx, err := Conn.BeginTxx(ctx, &sql.TxOptions{Isolation: sql.LevelRepeatableRead})@@ -702,8 +710,6 @@ func CleanupAllLocks(ctx context.Context) error {return fmt.Errorf("error committing transaction: %v", err)}- if locksVerboseLogging {- log.Println("Successfully cleaned up all repo locks")- }+ log.Println("Successfully cleaned up all repo locks")return nil}diff --git a/app/server/model/plan/tell_stream_finish.go b/app/server/model/plan/tell_stream_finish.goindex ad1f45c3..7e4a52da 100644--- a/app/server/model/plan/tell_stream_finish.go+++ b/app/server/model/plan/tell_stream_finish.go@@ -9,6 +9,8 @@ import ("time"shared "plandex-shared"++ "github.com/davecgh/go-spew/spew")const MaxAutoContinueIterations = 200@@ -70,6 +72,10 @@ func (state *activeTellStreamState) handleStreamFinished() handleStreamFinishedRremovedSubtasks := state.checkRemoveSubtasks()hasNewSubtasks := len(addedSubtasks) > 0+ log.Println("removedSubtasks:\n", spew.Sdump(removedSubtasks))+ log.Println("addedSubtasks:\n", spew.Sdump(addedSubtasks))+ log.Println("hasNewSubtasks:\n", hasNewSubtasks)+handleDescAndExecStatusRes := state.handleDescAndExecStatus()if handleDescAndExecStatusRes.shouldContinueMainLoop || handleDescAndExecStatusRes.shouldReturn {return handleDescAndExecStatusRes.handleStreamFinishedResult@@ -77,6 +83,8 @@ func (state *activeTellStreamState) handleStreamFinished() handleStreamFinishedRgeneratedDescription := handleDescAndExecStatusRes.generatedDescriptionsubtaskFinished := handleDescAndExecStatusRes.subtaskFinished+ log.Printf("subtaskFinished: %v\n", subtaskFinished)+storeOnFinishedResult := state.storeOnFinished(storeOnFinishedParams{replyOperations: replyOperations,generatedDescription: generatedDescription,@@ -91,6 +99,8 @@ func (state *activeTellStreamState) handleStreamFinished() handleStreamFinishedR}allSubtasksFinished := storeOnFinishedResult.allSubtasksFinished+ log.Println("allSubtasksFinished:\n", spew.Sdump(allSubtasksFinished))+// summarize convo needs to come *after* the reply is stored in order to correctly summarize the latest messagelog.Println("summarizing convo in background")// summarize in the backgrounddiff --git a/app/server/model/plan/tell_stream_store.go b/app/server/model/plan/tell_stream_store.goindex ff599c17..d0022e98 100644--- a/app/server/model/plan/tell_stream_store.go+++ b/app/server/model/plan/tell_stream_store.go@@ -54,6 +54,10 @@ func (state *activeTellStreamState) storeOnFinished(params storeOnFinishedParamsCancelFn: active.CancelFn,Reason: "store on finished",}, func(repo *db.GitRepo) error {+ log.Println("storeOnFinished: hasNewSubtasks", hasNewSubtasks)+ log.Println("storeOnFinished: subtaskFinished", subtaskFinished)+ log.Println("storeOnFinished: removedSubtasks", removedSubtasks)+// first resolve subtask stateif hasNewSubtasks || len(removedSubtasks) > 0 || subtaskFinished {if subtaskFinished && state.currentSubtask != nil {@@ -90,6 +94,10 @@ func (state *activeTellStreamState) storeOnFinished(params storeOnFinishedParamsstate.currentSubtask.NumTries++}+ log.Println("storeOnFinished: state.currentSubtask", state.currentSubtask)+ log.Println("storeOnFinished: state.subtasks", state.subtasks)+ log.Println("storeOnFinished: state.currentStage", state.currentStage)+var flags shared.ConvoMessageFlagsflags.CurrentStage = state.currentStage@@ -98,9 +106,11 @@ func (state *activeTellStreamState) storeOnFinished(params storeOnFinishedParamsflags.DidWriteCode = true}if hasNewSubtasks {+ log.Println("storeOnFinished: hasNewSubtasks")flags.DidMakePlan = true}if len(removedSubtasks) > 0 {+ log.Println("storeOnFinished: len(removedSubtasks) > 0")flags.DidMakePlan = trueflags.DidRemoveTasks = true}@@ -111,12 +121,16 @@ func (state *activeTellStreamState) storeOnFinished(params storeOnFinishedParamsflags.DidCompleteTask = true}if allSubtasksFinished {+ log.Println("storeOnFinished: allSubtasksFinished")flags.DidCompletePlan = true}if hasNewSubtasks && (state.req.IsApplyDebug || state.req.IsUserDebug) {+ log.Println("storeOnFinished: hasNewSubtasks && (state.req.IsApplyDebug || state.req.IsUserDebug)")flags.DidMakeDebuggingPlan = true}+ log.Println("storeOnFinished: flags", flags)+assistantMsg, convoCommitMsg, err := state.storeAssistantReply(repo, storeAssistantReplyParams{flags: flags,subtask: state.currentSubtask,diff --git a/app/server/model/plan/tell_subtasks.go b/app/server/model/plan/tell_subtasks.goindex f32a9a60..9ab4881b 100644--- a/app/server/model/plan/tell_subtasks.go+++ b/app/server/model/plan/tell_subtasks.go@@ -136,8 +136,8 @@ func (state *activeTellStreamState) checkNewSubtasks() []*db.Subtask {}}- // log.Println("state.subtasks:\n", spew.Sdump(state.subtasks))- // log.Println("state.currentSubtask:\n", spew.Sdump(state.currentSubtask))+ log.Println("state.subtasks:\n", spew.Sdump(state.subtasks))+ log.Println("state.currentSubtask:\n", spew.Sdump(state.currentSubtask))return newSubtasks}@@ -201,6 +201,7 @@ func (state *activeTellStreamState) checkRemoveSubtasks() []string {for _, subtask := range removedSubtasks {removedSubtaskTitles = append(removedSubtaskTitles, subtask.Title)}+ log.Println("removedSubtaskTitles:\n", spew.Sdump(removedSubtaskTitles))return removedSubtaskTitles}diff --git a/app/server/model/prompts/architect_context.go b/app/server/model/prompts/architect_context.goindex 31a2df3a..5b7c1957 100644--- a/app/server/model/prompts/architect_context.go+++ b/app/server/model/prompts/architect_context.go@@ -60,10 +60,15 @@ CRITICAL RULES:- Do NOT write any code or implementation details- Do NOT create tasks or plans- Stop immediately after <PlandexFinish/>+- ONLY include files that are in the codebase map--Even if context has been loaded previously in the conversation, you MUST load ALL relevant files again. Any context you do NOT include in the '### Files' section will be missing from the next phase. Be absolutely certain that you have included all relevant files.++--++It is CRITICAL to remember that you can only load files which ARE IN THE CODEBASE MAP in the '### Files' section. Do NOT include ANY OTHER FILES except for those which are explicitly listed in the codebase map. Do NOT make up or include files that are not in the codebase map. I know you are capable of following this rule if you give it your full attention.`func GetAutoContextTellPrompt(params CreatePromptParams) string {