Skip to content

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

couple more fixes

Dane Schneider9351b2364d2c
diff --git a/app/server/model/plan/tell.go b/app/server/model/plan/tell.go
index 0fcfc76f..ace657f4 100644
--- a/app/server/model/plan/tell.go
+++ b/app/server/model/plan/tell.go
@@ -1020,19 +1020,19 @@ func execTellPlan(
content := delta.Content
if missingFileResponse != "" {
- if chunksReceived < 3 && strings.Contains(content, "```") {
- // received closing triple backticks in first 3 chunks after missing file response
- // means this is a redundant start of a new file block, so just ignore it
-
- maybeRedundantBacktickContent += content
- continue
- } else if maybeRedundantBacktickContent != "" {
+ if maybeRedundantBacktickContent != "" {
if strings.Contains(content, "\n") {
maybeRedundantBacktickContent = ""
} else {
maybeRedundantBacktickContent += content
- continue
}
+ continue
+ } else if chunksReceived < 3 && strings.Contains(content, "```") {
+ // received closing triple backticks in first 3 chunks after missing file response
+ // means this is a redundant start of a new file block, so just ignore it
+
+ maybeRedundantBacktickContent += content
+ continue
}
}
diff --git a/app/server/model/prompts/create.go b/app/server/model/prompts/create.go
index 8ec73a3e..f995dad6 100644
--- a/app/server/model/prompts/create.go
+++ b/app/server/model/prompts/create.go
@@ -104,25 +104,3 @@ var CreateSysMsgNumTokens, _ = shared.GetNumTokens(SysCreate)
const PromptWrapperFormatStr = "The user's latest prompt:\n```\n%s\n```\n\n Please respond according to the 'Your instructions' section above. If you're making a plan, remember to precede code blocks with the file path *exactly* as described in 2a, and do not use any other formatting for file paths. **Do not include explanations or any other text apart from the file path in code block labels.** Always use triple backticks to start and end code blocks. Only list out subtasks once for the plan--after that, do not list or describe a subtask that can be implemented in code without including a code block that implements the subtask. Do not ask the user to do anything that you can do yourself with a code block. If you're making a plan, also remember to end every response with either " + `"All tasks have been completed.", "Next, " (plus a brief descripton of the next step), or "The plan cannot be continued." according to your instructions for ending a response.`
var PromptWrapperTokens, _ = shared.GetNumTokens(fmt.Sprintf(PromptWrapperFormatStr, ""))
-
-// --
-// For each task or subtask identified:
-
-// 1. Directly Implement in Code: Instead of describing what needs to be done,
-// directly implement the solution in code. This includes writing functions,
-// handlers, and any other necessary logic in the appropriate programming
-// language.
-// 2. Code Snippets: Provide complete code snippets that can be directly used
-// or easily adapted for use. Ensure these snippets are ready to be integrated
-// into the project.
-// 3. Detailed Instructions with Code: If a task requires explanation or
-// context, accompany these explanations with corresponding code snippets that
-// demonstrate or complete the task.
-// 4. No Placeholder Tasks: Avoid leaving tasks as placeholders or to-be-done
-// items. If a task is mentioned, it must be accompanied by its implementation
-// in code within the same response.
-// 5. Executable Plan: Ensure the plan culminates in a fully executable
-// implementation. By the end of your response, the user should have a clear,
-// actionable codebase that addresses the initial request without needing
-// further modifications or clarifications.
-// --