pacnpal/Roo-Code
1
0
Fork 0
mirror of https://github.com/pacnpal/Roo-Code.git synced 2025-12-20 12:21:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Saoud Rizwan
2024-10-03 03:37:56 -04:00
parent 237c9aa02f
commit e50edd0767
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/ClaudeDev.ts
View File

@@ -570,7 +570,7 @@ export class ClaudeDev {
newUserContent.push({ newUserContent.push({
type: "text", type: "text",
text: text:
`Task resumption: This autonomous coding task was interrupted ${agoText}. It may or may not be complete, so please reassess the task context. Be aware that the project state may have changed since then. The current working directory is now '${cwd.toPosix()}'. If the task has not been completed, retry the last step before interruption and proceed with completing the task.` + `Task resumption: This autonomous coding task was interrupted ${agoText}. It may or may not be complete, so please reassess the task context. Be aware that the project state may have changed since then. The current working directory is now '${cwd.toPosix()}'. If the task has not been completed, retry the last step before interruption and proceed with completing the task. Note: If you previously attempted a tool use that the user did not provide a result for, you should assume the tool use was not successful and assess whether you should retry.` +
(responseText (responseText
? `\n\nNew instructions for task continuation:\n<user_message>\n${responseText}\n</user_message>` ? `\n\nNew instructions for task continuation:\n<user_message>\n${responseText}\n</user_message>`
: ""), : ""),

21
webview-ui/src/components/chat/ChatView.tsx
View File

@@ -506,14 +506,27 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
useEffect(() => { useEffect(() => {
const lastMessage = messages.at(-1) const lastMessage = messages.at(-1)
if (lastMessage && lastMessage.say === "api_req_retried") { if (lastMessage) {
// unique case where the api_req_started row will shrink in size when scrollview at bottom, causing didScrollUp to get set to true and followoutput to break. To mitigate this when an api request is retried, it's safe to assume they're already scrolled to the bottom switch (lastMessage.say) {
case "user_feedback": {
// when sending a message user should be scrolled to the bottom (this also addresses a bug where sometimes when sending a message virtuoso would jump upwards, possibly due to textarea changing in size)
const timer = setTimeout(() => { const timer = setTimeout(() => {
scrollToBottomAuto() scrollToBottomSmooth()
}, 0) }, 0)
return () => clearTimeout(timer) return () => clearTimeout(timer)
} }
}, [messages, scrollToBottomAuto]) case "api_req_retried": {
// unique case where the api_req_started row will shrink in size when scrollview at bottom, causing didScrollUp to get set to true and followoutput to break. To mitigate this when an api request is retried, it's safe to assume they're already scrolled to the bottom
const timer = setTimeout(() => {
scrollToBottomAuto()
}, 50)
return () => clearTimeout(timer)
}
default:
break
}
}
}, [messages, scrollToBottomAuto, scrollToBottomSmooth])
const placeholderText = useMemo(() => { const placeholderText = useMemo(() => {
const text = task ? "Type a message (@ to add context)..." : "Type your task here (@ to add context)..." const text = task ? "Type a message (@ to add context)..." : "Type your task here (@ to add context)..."