scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-09-17 23:51:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 19573887c1 into c4547d25c5

Browse source
This commit is contained in:
roomote-v0[bot] 2026-04-23 17:06:54 +00:00 • committed by GitHub
commit 0f4b746e44
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 47 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3599,7 +3599,29 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
// Only show error and count toward mistake limit after 2 consecutive failures
if (this.consecutiveNoToolUseCount >= 2) {
await this.say("error", "MODEL_NO_TOOLS_USED")
// Create diagnostic information for the details popup
const diagnosticInfo = [
"Diagnostic Information:",
"",
`Tool Protocol: ${this._taskToolProtocol ?? "unknown"}`,
`Consecutive No-Tool-Use Count: ${this.consecutiveNoToolUseCount}`,
`Assistant Message Length: ${assistantMessage.length} characters`,
"",
"Assistant Message Content Blocks:",
this.assistantMessageContent.length > 0
? this.assistantMessageContent
.map(
(block, i) =>
` ${i + 1}. Type: ${block.type}${block.type === "text" ? `, Length: ${(block as any).content?.length ?? 0} chars` : ""}`,
)
.join("\n")
: " (none)",
"",
"Raw Assistant Message:",
assistantMessage || "(empty)",
].join("\n")
await this.say("error", `MODEL_NO_TOOLS_USED\n${diagnosticInfo}`)
// Only count toward mistake limit after second consecutive failure
this.consecutiveMistakeCount++
}

28
webview-ui/src/components/chat/ChatRow.tsx
View file

@ -1291,27 +1291,47 @@ export const ChatRowContent = ({
)
case "error":
// Check if this is a model response error based on marker strings from backend
const isNoToolsUsedError = message.text === "MODEL_NO_TOOLS_USED"
const isNoAssistantMessagesError = message.text === "MODEL_NO_ASSISTANT_MESSAGES"
// The format is "MARKER\nDiagnostic Info" where diagnostic info is optional
const messageText = message.text || ""
const isNoToolsUsedError = messageText.startsWith("MODEL_NO_TOOLS_USED")
const isNoAssistantMessagesError = messageText.startsWith("MODEL_NO_ASSISTANT_MESSAGES")
if (isNoToolsUsedError) {
// Extract diagnostic info if present (after the marker and newline)
const parts = messageText.split("\n")
const diagnosticInfo = parts.length > 1 ? parts.slice(1).join("\n") : undefined
// Combine i18n detailed explanation with diagnostic info
const fullDetails = diagnosticInfo
? `${t("chat:modelResponseErrors.noToolsUsedDetails")}\n\n${diagnosticInfo}`
: t("chat:modelResponseErrors.noToolsUsedDetails")
return (
<ErrorRow
type="error"
title={t("chat:modelResponseIncomplete")}
message={t("chat:modelResponseErrors.noToolsUsed")}
errorDetails={t("chat:modelResponseErrors.noToolsUsedDetails")}
errorDetails={fullDetails}
/>
)
}
if (isNoAssistantMessagesError) {
// Extract diagnostic info if present (after the marker and newline)
const parts = messageText.split("\n")
const diagnosticInfo = parts.length > 1 ? parts.slice(1).join("\n") : undefined
// Combine i18n detailed explanation with diagnostic info
const fullDetails = diagnosticInfo
? `${t("chat:modelResponseErrors.noAssistantMessagesDetails")}\n\n${diagnosticInfo}`
: t("chat:modelResponseErrors.noAssistantMessagesDetails")
return (
<ErrorRow
type="error"
title={t("chat:modelResponseIncomplete")}
message={t("chat:modelResponseErrors.noAssistantMessages")}
errorDetails={t("chat:modelResponseErrors.noAssistantMessagesDetails")}
errorDetails={fullDetails}
/>
)
}