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
fixes to response description parsing, build structured edits flow
Dane Schneiderad4804ba7ce3
diff --git a/app/server/model/plan/build_structured_edits.go b/app/server/model/plan/build_structured_edits.goindex b89748ae..0f88fb6c 100644--- a/app/server/model/plan/build_structured_edits.go+++ b/app/server/model/plan/build_structured_edits.go@@ -57,6 +57,7 @@ func (fileState *activeBuildStreamFileState) buildStructuredEdits() {maxPotentialTokens := activeBuild.FileContentTokens + activeBuild.CurrentFileTokenslog.Printf("buildStructuredEdits - %s - applying changes\n", filePath)+applyRes := syntax.ApplyChanges(originalFile,proposedContent,@@ -65,7 +66,6 @@ func (fileState *activeBuildStreamFileState) buildStructuredEdits() {)// log.Println("buildStructuredEdits - applyRes.NewFile:")// log.Println(applyRes.NewFile)- proposedContent = applyRes.Proposedvar syntaxErrors []stringvalidateSyntax := func() {@@ -91,7 +91,7 @@ func (fileState *activeBuildStreamFileState) buildStructuredEdits() {wholeFileConfig := fileState.settings.ModelPack.GetWholeFileBuilder()- spew.Dump(wholeFileConfig)+ // spew.Dump(wholeFileConfig)reservedOutputTokens := wholeFileConfig.GetReservedOutputTokens()isSmallFile := maxPotentialTokens < SmallFileThreshold@@ -280,7 +280,6 @@ func (fileState *activeBuildStreamFileState) buildStructuredEdits() {log.Printf("buildStructuredEdits - %s - applyRes.NeedsVerifyReasons: %v\n", filePath, applyRes.NeedsVerifyReasons)- proposedContent = applyRes.ProposedvalidateSyntax()numTries++}diff --git a/app/server/model/prompts/context_load.go b/app/server/model/prompts/context_load.goindex ddaa441f..df51ae8d 100644--- a/app/server/model/prompts/context_load.go+++ b/app/server/model/prompts/context_load.go@@ -15,7 +15,7 @@ In response to the user's latest prompt, do the following:- In a section titled '### Context Categories', list one or more categories of context that are relevant to the user's task, question, or message. For example, if the user is asking you to implement an API endpoint, you might list 'API endpoints', 'database operations', 'frontend code', 'utilities', and so on. Make sure any and all relevant categories are included, but don't include more categories than necessary—if only a single category is relevant, then only list that one. Do not include file paths, symbols, or explanations—only the categories.- - Using the map and file tree in context, output a '### Relevant Symbols' list of potentially relevant *symbols* (like functions, methods, types, variables, etc.) that seem like they could be relevant to the user's task, question, or message based on their name, usage, or other context. Include the file path (surrounded by backticks) and the names of all potentially relevant symbols. File paths *absolutely must* be surrounded by backticks like this: ` + "`" + "path/to/file.go" + "`" + `. Any symbols that are referred to in the user's prompt must be included. Organize the list by category using the categories from the '### Context Categories' section.+ - Using the map and file tree in context, output a '### Relevant Symbols' list of potentially relevant *symbols* (like functions, methods, types, variables, etc.) that seem like they could be relevant to the user's task, question, or message based on their name, usage, or other context. Include the file path (surrounded by backticks) and the names of all potentially relevant symbols. File paths *absolutely must* be surrounded by backticks like this: ` + "`" + "path/to/file.go" + "`" + `. Any symbols that are referred to in the user's prompt must be included. You MUST organize the list by category using the categories from the '### Context Categories' section—ensure each category is represented in the list.` + ContextLoadingRules + `@@ -23,6 +23,8 @@ In response to the user's latest prompt, do the following:` + ContextCompletionCriteria + `+After outputting the '### Relevant Symbols' section, end your response. Do not output any additional text after that section.+[END OF CONTEXT INSTRUCTIONS]`diff --git a/app/server/syntax/structural_edits.go b/app/server/syntax/structural_edits.goindex 6f276f81..c45ac2cd 100644--- a/app/server/syntax/structural_edits.go+++ b/app/server/syntax/structural_edits.go@@ -136,8 +136,8 @@ func ApplyChanges(if !endsWithRef &&!strings.Contains(desc, "entire file") &&- !(strings.Contains(desc, "replace code") ||- strings.Contains(desc, "remove code")) &&+ !(strings.Contains(desc, " replace ") ||+ strings.Contains(desc, " remove ")) &&!strings.Contains(desc, "end of the file") {if verboseLogging {@@ -219,38 +219,51 @@ func ApplyChanges(}}- // Check for lines in proposed updates that are duplicated in new file- newLineFreq := make(map[string]int)- originalLineFreq := make(map[string]int)+ if strings.Contains(desc, " replace ") {+ // Check for lines in proposed updates that are duplicated in new file+ newLineFreq := make(map[string]int)+ originalLineFreq := make(map[string]int)+ proposedLineFreq := make(map[string]int)- // First count frequencies in original file- for _, line := range originalLines {- trimmed := strings.TrimSpace(line)- if len(trimmed) > duplicationThreshold {- originalLineFreq[line]+++ // First count frequencies in original file+ for _, line := range originalLines {+ trimmed := strings.TrimSpace(line)+ if len(trimmed) > duplicationThreshold {+ originalLineFreq[line]+++ }}- }- // Count frequencies in new file- for _, line := range newLines {- trimmed := strings.TrimSpace(line)- if len(trimmed) > duplicationThreshold {- newLineFreq[line]++- }- }-- // Check proposed lines against new frequencies, accounting for original duplicates- for _, line := range proposedLines {- trimmed := strings.TrimSpace(line)- if len(trimmed) > duplicationThreshold {- originalCount := originalLineFreq[line]- if newLineFreq[line] > originalCount+1 {- log.Println("ApplyChanges - code duplicated")- log.Println("line:")- log.Println(line)- log.Printf("original occurrences: %d, new occurrences: %d", originalCount, newLineFreq[line])- res.NeedsVerifyReasons = append(res.NeedsVerifyReasons, NeedsVerifyReasonCodeDuplicated)- break+ // Count frequencies in proposed file+ for _, line := range proposedLines {+ trimmed := strings.TrimSpace(line)+ if len(trimmed) > duplicationThreshold {+ proposedLineFreq[line]+++ }+ }++ // Count frequencies in new file+ for _, line := range newLines {+ trimmed := strings.TrimSpace(line)+ if len(trimmed) > duplicationThreshold {+ newLineFreq[line]+++ }+ }++ // Check proposed lines against new frequencies, accounting for original duplicates+ for _, line := range proposedLines {+ trimmed := strings.TrimSpace(line)+ if len(trimmed) > duplicationThreshold {+ originalCount := originalLineFreq[line]+ proposedCount := proposedLineFreq[line]+ newCount := newLineFreq[line]+ if newCount > originalCount && newCount > proposedCount {+ log.Println("ApplyChanges - code duplicated")+ log.Println("line:")+ log.Println(line)+ log.Printf("original occurrences: %d, new occurrences: %d", originalCount, newLineFreq[line])+ res.NeedsVerifyReasons = append(res.NeedsVerifyReasons, NeedsVerifyReasonCodeDuplicated)+ break+ }}}}diff --git a/app/server/types/reply.go b/app/server/types/reply.goindex 113775e4..98afc760 100644--- a/app/server/types/reply.go+++ b/app/server/types/reply.go@@ -1,12 +1,16 @@package typesimport (+ "log""os"+ "strconv""strings""github.com/plandex/plandex/shared")+const verboseLogging = false+type ReplyParserRes struct {MaybeFilePath stringCurrentFilePath string@@ -47,7 +51,9 @@ func NewReplyParser() *ReplyParser {}func (r *ReplyParser) AddChunk(chunk string, addToTotal bool) {- // log.Println("Adding chunk:", strconv.Quote(chunk)) // Logging the chunk that's being processed+ if verboseLogging {+ log.Println("Adding chunk:", strconv.Quote(chunk)) // Logging the chunk that's being processed+ }hasNewLine := falsenextChunk := ""@@ -63,12 +69,17 @@ func (r *ReplyParser) AddChunk(chunk string, addToTotal bool) {}if chunk == "\n" {- // log.Println("Chunk is \\n, adding new line")+ if verboseLogging {+ log.Println("Chunk is \\n, adding new line")+ }r.lines = append(r.lines, "")hasNewLine = truer.lineIndex++- if r.currentFilePath == "" {+ if r.currentFileOperation == nil {+ if verboseLogging {+ log.Println("Current file operation is empty--adding new description line...")+ }r.currentDescriptionLines = append(r.currentDescriptionLines, "")r.currentDescriptionLineIdx++}@@ -76,17 +87,23 @@ func (r *ReplyParser) AddChunk(chunk string, addToTotal bool) {} else {chunkLines := strings.Split(chunk, "\n")- // log.Println("Chunk lines:", len(chunkLines))+ if verboseLogging {+ log.Println("Chunk lines:", len(chunkLines))+ }currentLine := r.lines[r.lineIndex]currentLine += chunkLines[0]- // log.Println("Current line:", strconv.Quote(currentLine))+ if verboseLogging {+ log.Println("Current line:", strconv.Quote(currentLine))+ }r.lines[r.lineIndex] = currentLineif r.currentFileOperation == nil {- // log.Println("Current file path is empty--adding to current description...")- // log.Println("Current description lines:", r.currentDescriptionLines)- // log.Printf("Current description line index: %d\n", r.currentDescriptionLineIdx)+ if verboseLogging {+ log.Println("Current file operation is empty--adding to current description...")+ log.Println("Current description lines:", r.currentDescriptionLines)+ log.Printf("Current description line index: %d\n", r.currentDescriptionLineIdx)+ }currentDescLine := r.currentDescriptionLines[r.currentDescriptionLineIdx]currentDescLine += chunkLines[0]@@ -97,7 +114,13 @@ func (r *ReplyParser) AddChunk(chunk string, addToTotal bool) {r.lines = append(r.lines, chunkLines[1])r.lineIndex++- if r.currentFilePath == "" {+ if r.currentFileOperation == nil {+ if verboseLogging {+ log.Println("Current file operation is empty--adding to current description...")+ log.Println("Current description lines:", r.currentDescriptionLines)+ log.Printf("Current description line index: %d\n", r.currentDescriptionLineIdx)+ }+r.currentDescriptionLines = append(r.currentDescriptionLines, chunkLines[1])r.currentDescriptionLineIdx++}@@ -108,7 +131,9 @@ func (r *ReplyParser) AddChunk(chunk string, addToTotal bool) {tail := chunkLines[2:]nextChunk = "\n" + strings.Join(tail, "\n")defer func() {- // log.Println("Recursive add next queued chunk:", strconv.Quote(nextChunk))+ if verboseLogging {+ log.Println("Recursive add next queued chunk:", strconv.Quote(nextChunk))+ }r.AddChunk(nextChunk, false)}()}@@ -116,19 +141,27 @@ func (r *ReplyParser) AddChunk(chunk string, addToTotal bool) {}if r.lineIndex == 0 || !hasNewLine {- // log.Println("No new line detected--returning")+ if verboseLogging {+ log.Println("No new line detected--returning")+ }return}prevFullLine := r.lines[r.lineIndex-1]- // log.Println("Previous full line:", strconv.Quote(prevFullLine)) // Logging the full line that's being checked+ if verboseLogging {+ log.Println("Previous full line:", strconv.Quote(prevFullLine)) // Logging the full line that's being checked+ }prevFullLineTrimmed := strings.TrimSpace(prevFullLine)if r.maybeFilePath != "" && !r.isInMoveBlock && !r.isInRemoveBlock && !r.isInResetBlock {- // log.Println("Maybe file path is:", r.maybeFilePath) // Logging the maybeFilePath+ if verboseLogging {+ log.Println("Maybe file path is:", r.maybeFilePath) // Logging the maybeFilePath+ }if strings.HasPrefix(prevFullLineTrimmed, "<PlandexBlock") {- // log.Println("Found opening tag--confirming file path...") // Logging the confirmed file path+ if verboseLogging {+ log.Println("Found opening tag--confirming file path...") // Logging the confirmed file path+ }r.currentFilePath = r.maybeFilePathr.currentFileOperation = &shared.Operation{@@ -140,8 +173,13 @@ func (r *ReplyParser) AddChunk(chunk string, addToTotal bool) {var fileDescription stringif len(r.currentDescriptionLines) > 4 {- fileDescription = strings.Join(r.currentDescriptionLines[0:len(r.currentDescriptionLines)-4], "\n")- r.currentFileOperation.Description = fileDescription+ fileDescription = strings.TrimSpace(strings.Join(r.currentDescriptionLines[0:len(r.currentDescriptionLines)-4], "\n"))+ if verboseLogging {+ log.Println("File description:", fileDescription)+ }+ if fileDescription != "" {+ r.currentFileOperation.Description = fileDescription+ }} else {r.currentFileOperation.Description = ""}@@ -149,55 +187,82 @@ func (r *ReplyParser) AddChunk(chunk string, addToTotal bool) {r.currentDescriptionLines = []string{""}r.currentDescriptionLineIdx = 0- // log.Println("Confirmed file path:", r.currentFilePath) // Logging the confirmed file path+ if verboseLogging {+ log.Println("Confirmed file path:", r.currentFilePath) // Logging the confirmed file path+ }return} else if prevFullLineTrimmed != "" {// turns out previous maybeFilePath was not a file path since there's a non-empty line before finding opening ticks++ if verboseLogging {+ log.Println("Previous maybeFilePath was not a file path--resetting maybeFilePath")+ }+r.maybeFilePath = ""}}if r.currentFilePath == "" && !r.isInMoveBlock && !r.isInRemoveBlock && !r.isInResetBlock {- // log.Println("Current file path is empty--checking for possible file path...")+ if verboseLogging {+ log.Println("Current file path is empty--checking for possible file path...")+ }var gotPath stringif LineMaybeHasFilePath(prevFullLineTrimmed) {gotPath = extractFilePath(prevFullLineTrimmed)} else if prevFullLineTrimmed == "### Move Files" {- // log.Println("Found move block")+ if verboseLogging {+ log.Println("Found move block")+ }r.isInMoveBlock = true} else if prevFullLineTrimmed == "### Remove Files" {- // log.Println("Found remove block")+ if verboseLogging {+ log.Println("Found remove block")+ }r.isInRemoveBlock = true} else if prevFullLineTrimmed == "### Reset Changes" {- // log.Println("Found reset block")+ if verboseLogging {+ log.Println("Found reset block")+ }r.isInResetBlock = true}if gotPath != "" {- // log.Println("Detected possible file path:", gotPath) // Logging the possible file path+ if verboseLogging {+ log.Println("Detected possible file path:", gotPath) // Logging the possible file path+ }r.maybeFilePath = gotPath}} else if r.currentFilePath != "" {- // log.Println("Current file path is not empty--adding to current file...")+ if verboseLogging {+ log.Println("Current file path is not empty--adding to current file...")+ }if prevFullLineTrimmed == "</PlandexBlock>" {- // log.Println("Found closing tag--adding file to files and resetting current file...")+ if verboseLogging {+ log.Println("Found closing tag--adding file to files and resetting current file...")+ }r.operations = append(r.operations, r.currentFileOperation)r.currentFilePath = ""+ r.currentFileOperation = nil- // spew.Dump(r.files)} else {- // log.Println("Adding tokens to current file...") // Logging token addition+ if verboseLogging {+ log.Println("Adding tokens to current file...") // Logging token addition+ }r.currentFileOperation.Content += prevFullLine + "\n"r.currentFileLines = append(r.currentFileLines, prevFullLine)- // log.Printf("Added %d tokens to %s\n", tokens, r.currentFilePath) // Logging token addition+}} else if r.isInMoveBlock || r.isInRemoveBlock || r.isInResetBlock {- // log.Println("In move, remove, or reset block")+ if verboseLogging {+ log.Println("In move, remove, or reset block")+ }if prevFullLineTrimmed == "<EndPlandexFileOps/>" {- // log.Println("Found closing tag--adding operations to operations and resetting pending operations...")+ if verboseLogging {+ log.Println("Found closing tag--adding operations to operations and resetting pending operations...")+ }r.isInMoveBlock = falser.isInRemoveBlock = falser.isInResetBlock = false@@ -207,21 +272,27 @@ func (r *ReplyParser) AddChunk(chunk string, addToTotal bool) {} else if r.isInMoveBlock {op := extractMoveFile(prevFullLineTrimmed)if op != nil && !r.pendingPaths[op.Path] {- // log.Println("Found move operation")+ if verboseLogging {+ log.Println("Found move operation")+ }r.pendingOperations = append(r.pendingOperations, op)r.pendingPaths[op.Path] = true}} else if r.isInRemoveBlock {op := extractRemoveOrResetFile(shared.OperationTypeRemove, prevFullLineTrimmed)if op != nil && !r.pendingPaths[op.Path] {- // log.Println("Found remove operation")+ if verboseLogging {+ log.Println("Found remove operation")+ }r.pendingOperations = append(r.pendingOperations, op)r.pendingPaths[op.Path] = true}} else if r.isInResetBlock {op := extractRemoveOrResetFile(shared.OperationTypeReset, prevFullLineTrimmed)if op != nil && !r.pendingPaths[op.Path] {- // log.Println("Found reset operation")+ if verboseLogging {+ log.Println("Found reset operation")+ }r.pendingOperations = append(r.pendingOperations, op)r.pendingPaths[op.Path] = true}diff --git a/app/server/types/reply_test.go b/app/server/types/reply_test.goindex 1a99367b..02fc7a28 100644--- a/app/server/types/reply_test.go+++ b/app/server/types/reply_test.go@@ -3,6 +3,7 @@ package typesimport ("fmt""os"+ "strconv""testing""github.com/plandex/plandex/shared"@@ -126,6 +127,21 @@ var examples = []TestExample{},},},+ {+ Operations: []shared.Operation{+ {+ Type: shared.OperationTypeFile,+ Path: "server/model/prompts/describe.go",+ },+ {+ Type: shared.OperationTypeFile,+ Path: "server/model/plan/commit_msg.go",+ Description: `Now let's update the commit message handling in commit_msg.go:++**Updating ` + "`server/model/plan/commit_msg.go`" + `:** I'll update the genPlanDescription method to handle XML output instead of JSON.`,+ },+ },+ },}func TestReplyParser(t *testing.T) {@@ -137,6 +153,7 @@ func TestReplyParser(t *testing.T) {}for i, example := range examples {+if len(only) > 0 && !only[i] {continue}@@ -179,7 +196,15 @@ func TestReplyParser(t *testing.T) {t.Errorf("Example %d: Expected operation %s, got %s",i+1, example.Operations[j].Name(), operation.Name())}++ if example.Operations[j].Description != "" {+ if operation.Description != example.Operations[j].Description {+ t.Errorf("Example %d: Expected description %s, got %s",+ i+1, strconv.Quote(example.Operations[j].Description), strconv.Quote(operation.Description))+ }+ }}+})}}diff --git a/app/server/types/reply_test_examples/10.md b/app/server/types/reply_test_examples/10.mdnew file mode 100644index 00000000..b1abcd15--- /dev/null+++ b/app/server/types/reply_test_examples/10.md@@ -0,0 +1,172 @@+I'll work on the current subtask "Update commit message prompts and handling". This involves updating both the prompt in describe.go and the handling in commit_msg.go to use XML instead of JSON.++First, let's update the prompt in describe.go:++**Updating `server/model/prompts/describe.go`:** I'll replace the function definition and update the system prompt to use XML output instead of JSON.++- server/model/prompts/describe.go:+<PlandexBlock lang="go">+package prompts++import (+ "fmt"++ "github.com/plandex/plandex/shared"+)++const SysDescribe = `You are an AI parser. You turn an AI's plan for a programming task into a structured description. You must output a commit message for the changes proposed using XML tags.++Output your response using a <commitMsg> tag. Do not use any XML attributes, just the tag content.++Example:+<commitMsg>Add user authentication system with JWT support</commitMsg>++You must ALWAYS output a commit message using the XML format shown above. The commit message should be good and succinct.`++var SysDescribeNumTokens int++const SysPendingResults = "You are an AI commit message summarizer. You take a list of descriptions of pending changes and turn them into a succinct one-line summary of all the pending changes that makes for a good commit message title. Output ONLY this one-line title and nothing else."++var SysPendingResultsNumTokens int++func init() {+ var err error+ SysDescribeNumTokens, err = shared.GetNumTokens(SysDescribe)++ if err != nil {+ panic(fmt.Sprintf("Error getting num tokens for describe plan prompt: %v\n", err))+ }++ SysPendingResultsNumTokens, err = shared.GetNumTokens(SysPendingResults)++ if err != nil {+ panic(fmt.Sprintf("Error getting num tokens for pending results prompt: %v\n", err))+ }+}+</PlandexBlock>++Now let's update the commit message handling in commit_msg.go:++**Updating `server/model/plan/commit_msg.go`:** I'll update the genPlanDescription method to handle XML output instead of JSON.++- server/model/plan/commit_msg.go:+<PlandexBlock lang="go">+// ... existing code ...++func (state *activeTellStreamState) genPlanDescription() (*db.ConvoMessageDescription, error) {+ auth := state.auth+ plan := state.plan+ planId := plan.Id+ branch := state.branch+ settings := state.settings+ clients := state.clients+ config := settings.ModelPack.CommitMsg+ envVar := config.BaseModelConfig.ApiKeyEnvVar+ client := clients[envVar]++ activePlan := GetActivePlan(planId, branch)+ if activePlan == nil {+ return nil, fmt.Errorf("active plan not found")+ }++ numTokens := prompts.ExtraTokensPerRequest + (prompts.ExtraTokensPerMessage * 2) + prompts.SysDescribeNumTokens + activePlan.NumTokens++ _, apiErr := hooks.ExecHook(hooks.WillSendModelRequest, hooks.HookParams{+ Auth: auth,+ Plan: plan,+ WillSendModelRequestParams: &hooks.WillSendModelRequestParams{+ InputTokens: numTokens,+ OutputTokens: shared.AvailableModelsByName[config.BaseModelConfig.ModelName].DefaultReservedOutputTokens,+ ModelName: config.BaseModelConfig.ModelName,+ },+ })+ if apiErr != nil {+ return nil, errors.New(apiErr.Msg)+ }++ log.Println("Sending plan description model request")++ descResp, err := model.CreateChatCompletionWithRetries(+ client,+ activePlan.Ctx,+ openai.ChatCompletionRequest{+ Model: config.BaseModelConfig.ModelName,+ Messages: []openai.ChatCompletionMessage{+ {+ Role: openai.ChatMessageRoleSystem,+ Content: prompts.SysDescribe,+ },+ {+ Role: openai.ChatMessageRoleAssistant,+ Content: activePlan.CurrentReplyContent,+ },+ },+ Temperature: config.Temperature,+ TopP: config.TopP,+ },+ )++ if err != nil {+ fmt.Printf("Error during plan description model call: %v\n", err)+ return nil, err+ }++ log.Println("Plan description model call complete")++ if len(descResp.Choices) == 0 {+ return nil, fmt.Errorf("No choices in model response")+ }++ content := descResp.Choices[0].Message.Content+ commitMsg := GetXMLContent(content, "commitMsg")++ if commitMsg == "" {+ return nil, fmt.Errorf("No commit message found in response")+ }++ var inputTokens int+ var outputTokens int+ if descResp.Usage.CompletionTokens > 0 {+ inputTokens = descResp.Usage.PromptTokens+ outputTokens = descResp.Usage.CompletionTokens+ } else {+ inputTokens = numTokens+ outputTokens, err = shared.GetNumTokens(content)++ if err != nil {+ return nil, fmt.Errorf("error getting num tokens for content: %v", err)+ }+ }++ log.Println("Sending DidSendModelRequest hook")++ _, apiErr = hooks.ExecHook(hooks.DidSendModelRequest, hooks.HookParams{+ Auth: auth,+ Plan: plan,+ DidSendModelRequestParams: &hooks.DidSendModelRequestParams{+ InputTokens: inputTokens,+ OutputTokens: outputTokens,+ ModelName: config.BaseModelConfig.ModelName,+ ModelProvider: config.BaseModelConfig.Provider,+ ModelPackName: settings.ModelPack.Name,+ ModelRole: shared.ModelRoleCommitMsg,+ Purpose: "Generated commit message for suggested changes",+ },+ })++ if apiErr != nil {+ return nil, errors.New(apiErr.Msg)+ }++ log.Println("DidSendModelRequest hook complete")++ return &db.ConvoMessageDescription{+ PlanId: planId,+ CommitMsg: commitMsg,+ }, nil+}++// ... existing code ...+</PlandexBlock>++**Update commit message prompts and handling** has been completed.\ No newline at end of file