mirror of
https://github.com/pacnpal/Roo-Code.git
synced 2025-12-20 20:31:37 -05:00
Revert some whitespace changes
This commit is contained in:
@@ -390,7 +390,8 @@ export class Cline {
|
|||||||
async sayAndCreateMissingParamError(toolName: ToolUseName, paramName: string, relPath?: string) {
|
async sayAndCreateMissingParamError(toolName: ToolUseName, paramName: string, relPath?: string) {
|
||||||
await this.say(
|
await this.say(
|
||||||
"error",
|
"error",
|
||||||
`Cline tried to use ${toolName}${relPath ? ` for '${relPath.toPosix()}'` : ""
|
`Cline tried to use ${toolName}${
|
||||||
|
relPath ? ` for '${relPath.toPosix()}'` : ""
|
||||||
} without value for required parameter '${paramName}'. Retrying...`,
|
} without value for required parameter '${paramName}'. Retrying...`,
|
||||||
)
|
)
|
||||||
return formatResponse.toolError(formatResponse.missingToolParameterError(paramName))
|
return formatResponse.toolError(formatResponse.missingToolParameterError(paramName))
|
||||||
@@ -625,7 +626,8 @@ export class Cline {
|
|||||||
newUserContent.push({
|
newUserContent.push({
|
||||||
type: "text",
|
type: "text",
|
||||||
text:
|
text:
|
||||||
`[TASK RESUMPTION] This 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.\n\nNote: 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. If the last tool was a browser_action, the browser has been closed and you must launch a new browser if needed.${wasRecent
|
`[TASK RESUMPTION] This 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.\n\nNote: 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. If the last tool was a browser_action, the browser has been closed and you must launch a new browser if needed.${
|
||||||
|
wasRecent
|
||||||
? "\n\nIMPORTANT: If the last tool use was a write_to_file that was interrupted, the file was reverted back to its original state before the interrupted edit, and you do NOT need to re-read the file as you already have its up-to-date contents."
|
? "\n\nIMPORTANT: If the last tool use was a write_to_file that was interrupted, the file was reverted back to its original state before the interrupted edit, and you do NOT need to re-read the file as you already have its up-to-date contents."
|
||||||
: ""
|
: ""
|
||||||
}` +
|
}` +
|
||||||
@@ -741,7 +743,8 @@ export class Cline {
|
|||||||
return [
|
return [
|
||||||
true,
|
true,
|
||||||
formatResponse.toolResult(
|
formatResponse.toolResult(
|
||||||
`Command is still running in the user's terminal.${result.length > 0 ? `\nHere's the output so far:\n${result}` : ""
|
`Command is still running in the user's terminal.${
|
||||||
|
result.length > 0 ? `\nHere's the output so far:\n${result}` : ""
|
||||||
}\n\nThe user provided the following feedback:\n<feedback>\n${userFeedback.text}\n</feedback>`,
|
}\n\nThe user provided the following feedback:\n<feedback>\n${userFeedback.text}\n</feedback>`,
|
||||||
userFeedback.images,
|
userFeedback.images,
|
||||||
),
|
),
|
||||||
@@ -753,7 +756,8 @@ export class Cline {
|
|||||||
} else {
|
} else {
|
||||||
return [
|
return [
|
||||||
false,
|
false,
|
||||||
`Command is still running in the user's terminal.${result.length > 0 ? `\nHere's the output so far:\n${result}` : ""
|
`Command is still running in the user's terminal.${
|
||||||
|
result.length > 0 ? `\nHere's the output so far:\n${result}` : ""
|
||||||
}\n\nYou will be updated on the terminal status and new output in the future.`,
|
}\n\nYou will be updated on the terminal status and new output in the future.`,
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -931,7 +935,8 @@ export class Cline {
|
|||||||
case "apply_diff":
|
case "apply_diff":
|
||||||
return `[${block.name} for '${block.params.path}']`
|
return `[${block.name} for '${block.params.path}']`
|
||||||
case "search_files":
|
case "search_files":
|
||||||
return `[${block.name} for '${block.params.regex}'${block.params.file_pattern ? ` in '${block.params.file_pattern}'` : ""
|
return `[${block.name} for '${block.params.regex}'${
|
||||||
|
block.params.file_pattern ? ` in '${block.params.file_pattern}'` : ""
|
||||||
}]`
|
}]`
|
||||||
case "list_files":
|
case "list_files":
|
||||||
return `[${block.name} for '${block.params.path}']`
|
return `[${block.name} for '${block.params.path}']`
|
||||||
@@ -1649,7 +1654,8 @@ export class Cline {
|
|||||||
await this.say("browser_action_result", JSON.stringify(browserActionResult))
|
await this.say("browser_action_result", JSON.stringify(browserActionResult))
|
||||||
pushToolResult(
|
pushToolResult(
|
||||||
formatResponse.toolResult(
|
formatResponse.toolResult(
|
||||||
`The browser action has been executed. The console logs and screenshot have been captured for your analysis.\n\nConsole logs:\n${browserActionResult.logs || "(No new logs)"
|
`The browser action has been executed. The console logs and screenshot have been captured for your analysis.\n\nConsole logs:\n${
|
||||||
|
browserActionResult.logs || "(No new logs)"
|
||||||
}\n\n(REMEMBER: if you need to proceed to using non-\`browser_action\` tools or launch a new browser, you MUST first close this browser. For example, if after analyzing the logs and screenshot you need to edit a file, you must first close the browser before you can use the write_to_file tool.)`,
|
}\n\n(REMEMBER: if you need to proceed to using non-\`browser_action\` tools or launch a new browser, you MUST first close this browser. For example, if after analyzing the logs and screenshot you need to edit a file, you must first close the browser before you can use the write_to_file tool.)`,
|
||||||
browserActionResult.screenshot ? [browserActionResult.screenshot] : [],
|
browserActionResult.screenshot ? [browserActionResult.screenshot] : [],
|
||||||
),
|
),
|
||||||
@@ -2165,7 +2171,8 @@ export class Cline {
|
|||||||
type: "text",
|
type: "text",
|
||||||
text:
|
text:
|
||||||
assistantMessage +
|
assistantMessage +
|
||||||
`\n\n[${cancelReason === "streaming_failed"
|
`\n\n[${
|
||||||
|
cancelReason === "streaming_failed"
|
||||||
? "Response interrupted by API Error"
|
? "Response interrupted by API Error"
|
||||||
: "Response interrupted by user"
|
: "Response interrupted by user"
|
||||||
}]`,
|
}]`,
|
||||||
|
|||||||
@@ -263,8 +263,7 @@ describe('ClineProvider', () => {
|
|||||||
browserViewportSize: "900x600",
|
browserViewportSize: "900x600",
|
||||||
fuzzyMatchThreshold: 1.0,
|
fuzzyMatchThreshold: 1.0,
|
||||||
mcpEnabled: true,
|
mcpEnabled: true,
|
||||||
alwaysApproveResubmit: false,
|
requestDelaySeconds: 5
|
||||||
requestDelaySeconds: 5,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const message: ExtensionMessage = {
|
const message: ExtensionMessage = {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { ApiConfiguration } from "./api"
|
import { ApiConfiguration, ApiProvider } from "./api"
|
||||||
|
|
||||||
export type AudioType = "notification" | "celebration" | "progress_loop"
|
export type AudioType = "notification" | "celebration" | "progress_loop"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user