scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-10-07 02:58:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "refactor(task): switch to <feedback> wrapper to prevent focus drift after context-management event (condense/truncate)" (#9261)

Browse source
This commit is contained in:
Matt Rubens 2025-11-14 00:43:45 -05:00 • committed by GitHub
parent 161345c6fa
commit ee64f44d2b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/core/mentions/__tests__/processUserContentMentions.spec.ts
View file

@ -31,7 +31,7 @@ describe("processUserContentMentions", () => {
const userContent = [
{
type: "text" as const,
text: "<feedback>Read file with limit</feedback>",
text: "<task>Read file with limit</task>",
},
]
@ -45,7 +45,7 @@ describe("processUserContentMentions", () => {
})
expect(parseMentions).toHaveBeenCalledWith(
"<feedback>Read file with limit</feedback>",
"<task>Read file with limit</task>",
"/test",
mockUrlContentFetcher,
mockFileContextTracker,
@ -61,7 +61,7 @@ describe("processUserContentMentions", () => {
const userContent = [
{
type: "text" as const,
text: "<feedback>Read file without limit</feedback>",
text: "<task>Read file without limit</task>",
},
]
@ -74,7 +74,7 @@ describe("processUserContentMentions", () => {
})
expect(parseMentions).toHaveBeenCalledWith(
"<feedback>Read file without limit</feedback>",
"<task>Read file without limit</task>",
"/test",
mockUrlContentFetcher,
mockFileContextTracker,
@ -90,7 +90,7 @@ describe("processUserContentMentions", () => {
const userContent = [
{
type: "text" as const,
text: "<feedback>Read unlimited lines</feedback>",
text: "<task>Read unlimited lines</task>",
},
]
@ -104,7 +104,7 @@ describe("processUserContentMentions", () => {
})
expect(parseMentions).toHaveBeenCalledWith(
"<feedback>Read unlimited lines</feedback>",
"<task>Read unlimited lines</task>",
"/test",
mockUrlContentFetcher,
mockFileContextTracker,
@ -118,11 +118,11 @@ describe("processUserContentMentions", () => {
})
describe("content processing", () => {
it("should process text blocks with <feedback> tags", async () => {
it("should process text blocks with <task> tags", async () => {
const userContent = [
{
type: "text" as const,
text: "<feedback>Do something</feedback>",
text: "<task>Do something</task>",
},
]
@ -136,7 +136,7 @@ describe("processUserContentMentions", () => {
expect(parseMentions).toHaveBeenCalled()
expect(result[0]).toEqual({
type: "text",
text: "parsed: <feedback>Do something</feedback>",
text: "parsed: <task>Do something</task>",
})
})
@ -213,7 +213,7 @@ describe("processUserContentMentions", () => {
content: [
{
type: "text" as const,
text: "<feedback>Array task</feedback>",
text: "<task>Array task</task>",
},
{
type: "text" as const,
@ -237,7 +237,7 @@ describe("processUserContentMentions", () => {
content: [
{
type: "text",
text: "parsed: <feedback>Array task</feedback>",
text: "parsed: <task>Array task</task>",
},
{
type: "text",
@ -251,7 +251,7 @@ describe("processUserContentMentions", () => {
const userContent = [
{
type: "text" as const,
text: "<feedback>First task</feedback>",
text: "<task>First task</task>",
},
{
type: "image" as const,
@ -280,7 +280,7 @@ describe("processUserContentMentions", () => {
expect(result).toHaveLength(3)
expect(result[0]).toEqual({
type: "text",
text: "parsed: <feedback>First task</feedback>",
text: "parsed: <task>First task</task>",
})
expect(result[1]).toEqual(userContent[1]) // Image block unchanged
expect(result[2]).toEqual({
@ -296,7 +296,7 @@ describe("processUserContentMentions", () => {
const userContent = [
{
type: "text" as const,
text: "<feedback>Test default</feedback>",
text: "<task>Test default</task>",
},
]
@ -308,7 +308,7 @@ describe("processUserContentMentions", () => {
})
expect(parseMentions).toHaveBeenCalledWith(
"<feedback>Test default</feedback>",
"<task>Test default</task>",
"/test",
mockUrlContentFetcher,
mockFileContextTracker,
@ -324,7 +324,7 @@ describe("processUserContentMentions", () => {
const userContent = [
{
type: "text" as const,
text: "<feedback>Test explicit false</feedback>",
text: "<task>Test explicit false</task>",
},
]
@ -337,7 +337,7 @@ describe("processUserContentMentions", () => {
})
expect(parseMentions).toHaveBeenCalledWith(
"<feedback>Test explicit false</feedback>",
"<task>Test explicit false</task>",
"/test",
mockUrlContentFetcher,
mockFileContextTracker,

7
src/core/mentions/processUserContentMentions.ts
View file

@ -30,7 +30,7 @@ export async function processUserContentMentions({
// Process userContent array, which contains various block types:
// TextBlockParam, ImageBlockParam, ToolUseBlockParam, and ToolResultBlockParam.
// We need to apply parseMentions() to:
// 1. All TextBlockParam's text (first user message with feedback)
// 1. All TextBlockParam's text (first user message with task)
// 2. ToolResultBlockParam's content/context text arrays if it contains
// "<feedback>" (see formatToolDeniedFeedback, attemptCompletion,
// executeCommand, and consecutiveMistakeCount >= 3) or "<answer>"
@ -40,7 +40,10 @@ export async function processUserContentMentions({
return Promise.all(
userContent.map(async (block) => {
const shouldProcessMentions = (text: string) =>
text.includes("<feedback>") || text.includes("<answer>") || text.includes("<user_message>")
text.includes("<task>") ||
text.includes("<feedback>") ||
text.includes("<answer>") ||
text.includes("<user_message>")
if (block.type === "text") {
if (shouldProcessMentions(block.text)) {

2
src/core/task/Task.ts
View file

@ -1285,7 +1285,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
await this.initiateTaskLoop([
{
type: "text",
text: `<feedback>\n${task}\n</feedback>`,
text: `<task>\n${task}\n</task>`,
},
...imageBlocks,
])

4
src/core/task/__tests__/Task.spec.ts
View file

@ -895,7 +895,7 @@ describe("Cline", () => {
} as const,
{
type: "text",
text: "<feedback>Text with 'some/path' (see below for file content) in task tags</feedback>",
text: "<task>Text with 'some/path' (see below for file content) in task tags</task>",
} as const,
{
type: "tool_result",
@ -934,7 +934,7 @@ describe("Cline", () => {
// Text within task tags should be processed
expect((processedContent[1] as Anthropic.TextBlockParam).text).toContain("processed:")
expect((processedContent[1] as Anthropic.TextBlockParam).text).toContain(
"<feedback>Text with 'some/path' (see below for file content) in task tags</feedback>",
"<task>Text with 'some/path' (see below for file content) in task tags</task>",
)
// Feedback tag content should be processed