From fe22d1ff2d147fe3edbb842ccf25e638cdabefda Mon Sep 17 00:00:00 2001 From: RaySinner <118297374+RaySinner@users.noreply.github.com> Date: Tue, 7 Jan 2025 16:26:34 +0300 Subject: [PATCH 1/4] feat: add retry request control with delay settings - Add requestDelaySeconds setting for configuring delay between retry attempts - Add alwaysApproveResubmit option for automatic retry approval - Add api_req_retry_delayed message type for delayed retries - Update UI components to support new retry control settings --- src/core/Cline.ts | 190 ++++++++++-------- src/core/webview/ClineProvider.ts | 48 +++-- .../webview/__tests__/ClineProvider.test.ts | 70 +++++-- src/shared/ExtensionMessage.ts | 59 +++--- src/shared/WebviewMessage.ts | 100 ++++----- .../src/components/settings/SettingsView.tsx | 46 ++++- .../src/context/ExtensionStateContext.tsx | 32 +-- 7 files changed, 337 insertions(+), 208 deletions(-) diff --git a/src/core/Cline.ts b/src/core/Cline.ts index 84bf47c..4c4d53d 100644 --- a/src/core/Cline.ts +++ b/src/core/Cline.ts @@ -205,10 +205,10 @@ export class Cline { const taskMessage = this.clineMessages[0] // first message is always the task say const lastRelevantMessage = this.clineMessages[ - findLastIndex( - this.clineMessages, - (m) => !(m.ask === "resume_task" || m.ask === "resume_completed_task"), - ) + findLastIndex( + this.clineMessages, + (m) => !(m.ask === "resume_task" || m.ask === "resume_completed_task"), + ) ] await this.providerRef.deref()?.updateTaskHistory({ id: this.taskId, @@ -390,8 +390,7 @@ export class Cline { async sayAndCreateMissingParamError(toolName: ToolUseName, paramName: string, relPath?: string) { await this.say( "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...`, ) return formatResponse.toolError(formatResponse.missingToolParameterError(paramName)) @@ -449,7 +448,7 @@ export class Cline { // need to make sure that the api conversation history can be resumed by the api, even if it goes out of sync with cline messages let existingApiConversationHistory: Anthropic.Messages.MessageParam[] = - await this.getSavedApiConversationHistory() + await this.getSavedApiConversationHistory() // Now present the cline messages to the user and ask if they want to resume @@ -560,8 +559,8 @@ export class Cline { : [{ type: "text", text: lastMessage.content }] if (previousAssistantMessage && previousAssistantMessage.role === "assistant") { const assistantContent = Array.isArray(previousAssistantMessage.content) - ? previousAssistantMessage.content - : [{ type: "text", text: previousAssistantMessage.content }] + ? previousAssistantMessage.content + : [{ type: "text", text: previousAssistantMessage.content }] const toolUseBlocks = assistantContent.filter( (block) => block.type === "tool_use", @@ -626,10 +625,9 @@ export class Cline { newUserContent.push({ type: "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 - ? "\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." - : "" + `[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." + : "" }` + (responseText ? `\n\nNew instructions for task continuation:\n\n${responseText}\n` @@ -743,8 +741,7 @@ export class Cline { return [ true, 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\n${userFeedback.text}\n`, userFeedback.images, ), @@ -756,8 +753,7 @@ export class Cline { } else { return [ 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.`, ] } @@ -766,7 +762,7 @@ export class Cline { async *attemptApiRequest(previousApiReqIndex: number): ApiStream { let mcpHub: McpHub | undefined - const { mcpEnabled } = await this.providerRef.deref()?.getState() ?? {} + const { mcpEnabled, alwaysApproveResubmit, requestDelaySeconds } = await this.providerRef.deref()?.getState() ?? {} if (mcpEnabled ?? true) { mcpHub = this.providerRef.deref()?.mcpHub @@ -810,18 +806,41 @@ export class Cline { yield firstChunk.value } catch (error) { // note that this api_req_failed ask is unique in that we only present this option if the api hasn't streamed any content yet (ie it fails on the first chunk due), as it would allow them to hit a retry button. However if the api failed mid-stream, it could be in any arbitrary state where some tools may have executed, so that error is handled differently and requires cancelling the task entirely. - const { response } = await this.ask( - "api_req_failed", - error.message ?? JSON.stringify(serializeError(error), null, 2), - ) - if (response !== "yesButtonClicked") { - // this will never happen since if noButtonClicked, we will clear current task, aborting this instance - throw new Error("API request failed") + if (alwaysApproveResubmit) { + // Automatically retry with delay + await this.say( + "error", + `Error (${ + error.message?.toLowerCase().includes("429") || + error.message?.toLowerCase().includes("rate limit") || + error.message?.toLowerCase().includes("too many requests") || + error.message?.toLowerCase().includes("throttled") + ? "rate limit" + : error.message?.includes("500") || error.message?.includes("503") + ? "internal server error" + : "unknown" + }). ↺ Retrying...`, + ) + await this.say("api_req_retry_delayed") + await delay((requestDelaySeconds || 5) * 1000) + await this.say("api_req_retried") + // delegate generator output from the recursive call + yield* this.attemptApiRequest(previousApiReqIndex) + return + } else { + const { response } = await this.ask( + "api_req_failed", + error.message ?? JSON.stringify(serializeError(error), null, 2), + ) + if (response !== "yesButtonClicked") { + // this will never happen since if noButtonClicked, we will clear current task, aborting this instance + throw new Error("API request failed") + } + await this.say("api_req_retried") + // delegate generator output from the recursive call + yield* this.attemptApiRequest(previousApiReqIndex) + return } - await this.say("api_req_retried") - // delegate generator output from the recursive call - yield* this.attemptApiRequest(previousApiReqIndex) - return } // no error, so we can continue to yield all remaining chunks @@ -912,9 +931,8 @@ export class Cline { case "apply_diff": return `[${block.name} for '${block.params.path}']` 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": return `[${block.name} for '${block.params.path}']` case "list_code_definition_names": @@ -1100,7 +1118,7 @@ export class Cline { if (block.partial) { // update gui message const partialMessage = JSON.stringify(sharedMessageProps) - await this.ask("tool", partialMessage, block.partial).catch(() => {}) + await this.ask("tool", partialMessage, block.partial).catch(() => { }) // update editor if (!this.diffViewProvider.isEditing) { // open the editor and prepare to stream content in @@ -1136,7 +1154,7 @@ export class Cline { if (!this.diffViewProvider.isEditing) { // show gui message before showing edit animation const partialMessage = JSON.stringify(sharedMessageProps) - await this.ask("tool", partialMessage, true).catch(() => {}) // sending true for partial even though it's not a partial, this shows the edit row before the content is streamed into the editor + await this.ask("tool", partialMessage, true).catch(() => { }) // sending true for partial even though it's not a partial, this shows the edit row before the content is streamed into the editor await this.diffViewProvider.open(relPath) } await this.diffViewProvider.update(everyLineHasLineNumbers(newContent) ? stripLineNumbers(newContent) : newContent, true) @@ -1174,10 +1192,10 @@ export class Cline { content: fileExists ? undefined : newContent, diff: fileExists ? formatResponse.createPrettyPatch( - relPath, - this.diffViewProvider.originalContent, - newContent, - ) + relPath, + this.diffViewProvider.originalContent, + newContent, + ) : undefined, } satisfies ClineSayTool) const didApprove = await askApproval("tool", completeMessage) @@ -1199,13 +1217,13 @@ export class Cline { ) pushToolResult( `The user made the following updates to your content:\n\n${userEdits}\n\n` + - `The updated content, which includes both your original modifications and the user's edits, has been successfully saved to ${relPath.toPosix()}. Here is the full, updated content of the file, including line numbers:\n\n` + - `\n${addLineNumbers(finalContent || '')}\n\n\n` + - `Please note:\n` + - `1. You do not need to re-write the file with these changes, as they have already been applied.\n` + - `2. Proceed with the task using this updated file content as the new baseline.\n` + - `3. If the user's edits have addressed part of the task or changed the requirements, adjust your approach accordingly.` + - `${newProblemsMessage}`, + `The updated content, which includes both your original modifications and the user's edits, has been successfully saved to ${relPath.toPosix()}. Here is the full, updated content of the file, including line numbers:\n\n` + + `\n${addLineNumbers(finalContent || '')}\n\n\n` + + `Please note:\n` + + `1. You do not need to re-write the file with these changes, as they have already been applied.\n` + + `2. Proceed with the task using this updated file content as the new baseline.\n` + + `3. If the user's edits have addressed part of the task or changed the requirements, adjust your approach accordingly.` + + `${newProblemsMessage}`, ) } else { pushToolResult( @@ -1234,7 +1252,7 @@ export class Cline { if (block.partial) { // update gui message const partialMessage = JSON.stringify(sharedMessageProps) - await this.ask("tool", partialMessage, block.partial).catch(() => {}) + await this.ask("tool", partialMessage, block.partial).catch(() => { }) break } else { if (!relPath) { @@ -1263,9 +1281,9 @@ export class Cline { // Apply the diff to the original content const diffResult = this.diffStrategy?.applyDiff( - originalContent, - diffContent, - parseInt(block.params.start_line ?? ''), + originalContent, + diffContent, + parseInt(block.params.start_line ?? ''), parseInt(block.params.end_line ?? '') ) ?? { success: false, @@ -1317,13 +1335,13 @@ export class Cline { ) pushToolResult( `The user made the following updates to your content:\n\n${userEdits}\n\n` + - `The updated content, which includes both your original modifications and the user's edits, has been successfully saved to ${relPath.toPosix()}. Here is the full, updated content of the file, including line numbers:\n\n` + - `\n${addLineNumbers(finalContent || '')}\n\n\n` + - `Please note:\n` + - `1. You do not need to re-write the file with these changes, as they have already been applied.\n` + - `2. Proceed with the task using this updated file content as the new baseline.\n` + - `3. If the user's edits have addressed part of the task or changed the requirements, adjust your approach accordingly.` + - `${newProblemsMessage}`, + `The updated content, which includes both your original modifications and the user's edits, has been successfully saved to ${relPath.toPosix()}. Here is the full, updated content of the file, including line numbers:\n\n` + + `\n${addLineNumbers(finalContent || '')}\n\n\n` + + `Please note:\n` + + `1. You do not need to re-write the file with these changes, as they have already been applied.\n` + + `2. Proceed with the task using this updated file content as the new baseline.\n` + + `3. If the user's edits have addressed part of the task or changed the requirements, adjust your approach accordingly.` + + `${newProblemsMessage}`, ) } else { pushToolResult(`Changes successfully applied to ${relPath.toPosix()}:\n\n${newProblemsMessage}`) @@ -1349,7 +1367,7 @@ export class Cline { ...sharedMessageProps, content: undefined, } satisfies ClineSayTool) - await this.ask("tool", partialMessage, block.partial).catch(() => {}) + await this.ask("tool", partialMessage, block.partial).catch(() => { }) break } else { if (!relPath) { @@ -1391,7 +1409,7 @@ export class Cline { ...sharedMessageProps, content: "", } satisfies ClineSayTool) - await this.ask("tool", partialMessage, block.partial).catch(() => {}) + await this.ask("tool", partialMessage, block.partial).catch(() => { }) break } else { if (!relDirPath) { @@ -1431,7 +1449,7 @@ export class Cline { ...sharedMessageProps, content: "", } satisfies ClineSayTool) - await this.ask("tool", partialMessage, block.partial).catch(() => {}) + await this.ask("tool", partialMessage, block.partial).catch(() => { }) break } else { if (!relDirPath) { @@ -1476,7 +1494,7 @@ export class Cline { ...sharedMessageProps, content: "", } satisfies ClineSayTool) - await this.ask("tool", partialMessage, block.partial).catch(() => {}) + await this.ask("tool", partialMessage, block.partial).catch(() => { }) break } else { if (!relDirPath) { @@ -1531,7 +1549,7 @@ export class Cline { "browser_action_launch", removeClosingTag("url", url), block.partial - ).catch(() => {}) + ).catch(() => { }) } else { await this.say( "browser_action", @@ -1631,8 +1649,7 @@ export class Cline { await this.say("browser_action_result", JSON.stringify(browserActionResult)) pushToolResult( 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.)`, browserActionResult.screenshot ? [browserActionResult.screenshot] : [], ), @@ -1659,7 +1676,7 @@ export class Cline { try { if (block.partial) { await this.ask("command", removeClosingTag("command", command), block.partial).catch( - () => {} + () => { } ) break } else { @@ -1700,7 +1717,7 @@ export class Cline { toolName: removeClosingTag("tool_name", tool_name), arguments: removeClosingTag("arguments", mcp_arguments), } satisfies ClineAskUseMcpServer) - await this.ask("use_mcp_server", partialMessage, block.partial).catch(() => {}) + await this.ask("use_mcp_server", partialMessage, block.partial).catch(() => { }) break } else { if (!server_name) { @@ -1761,19 +1778,19 @@ export class Cline { // TODO: add progress indicator and ability to parse images and non-text responses const toolResultPretty = (toolResult?.isError ? "Error:\n" : "") + - toolResult?.content - .map((item) => { - if (item.type === "text") { - return item.text - } - if (item.type === "resource") { - const { blob, ...rest } = item.resource - return JSON.stringify(rest, null, 2) - } - return "" - }) - .filter(Boolean) - .join("\n\n") || "(No response)" + toolResult?.content + .map((item) => { + if (item.type === "text") { + return item.text + } + if (item.type === "resource") { + const { blob, ...rest } = item.resource + return JSON.stringify(rest, null, 2) + } + return "" + }) + .filter(Boolean) + .join("\n\n") || "(No response)" await this.say("mcp_server_response", toolResultPretty) pushToolResult(formatResponse.toolResult(toolResultPretty)) break @@ -1793,7 +1810,7 @@ export class Cline { serverName: removeClosingTag("server_name", server_name), uri: removeClosingTag("uri", uri), } satisfies ClineAskUseMcpServer) - await this.ask("use_mcp_server", partialMessage, block.partial).catch(() => {}) + await this.ask("use_mcp_server", partialMessage, block.partial).catch(() => { }) break } else { if (!server_name) { @@ -1849,7 +1866,7 @@ export class Cline { try { if (block.partial) { await this.ask("followup", removeClosingTag("question", question), block.partial).catch( - () => {}, + () => { }, ) break } else { @@ -1908,7 +1925,7 @@ export class Cline { "command", removeClosingTag("command", command), block.partial, - ).catch(() => {}) + ).catch(() => { }) } else { // last message is completion_result // we have command string, which means we have the result as well, so finish it (doesnt have to exist yet) @@ -1922,7 +1939,7 @@ export class Cline { "command", removeClosingTag("command", command), block.partial, - ).catch(() => {}) + ).catch(() => { }) } } else { // no command, still outputting partial result @@ -2148,10 +2165,9 @@ export class Cline { type: "text", text: assistantMessage + - `\n\n[${ - cancelReason === "streaming_failed" - ? "Response interrupted by API Error" - : "Response interrupted by user" + `\n\n[${cancelReason === "streaming_failed" + ? "Response interrupted by API Error" + : "Response interrupted by user" }]`, }, ], @@ -2405,7 +2421,7 @@ export class Cline { await pWaitFor(() => busyTerminals.every((t) => !this.terminalManager.isProcessHot(t.id)), { interval: 100, timeout: 15_000, - }).catch(() => {}) + }).catch(() => { }) } // we want to get diagnostics AFTER terminal cools down for a few reasons: terminal could be scaffolding a project, dev servers (compilers like webpack) will first re-compile and then send diagnostics, etc diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts index c6b1eab..b70d814 100644 --- a/src/core/webview/ClineProvider.ts +++ b/src/core/webview/ClineProvider.ts @@ -83,6 +83,8 @@ type GlobalStateKey = | "writeDelayMs" | "terminalOutputLineLimit" | "mcpEnabled" + | "alwaysApproveResubmit" + | "requestDelaySeconds" export const GlobalFileNames = { apiConversationHistory: "api_conversation_history.json", uiMessages: "ui_messages.json", @@ -233,7 +235,7 @@ export class ClineProvider implements vscode.WebviewViewProvider { diffEnabled, fuzzyMatchThreshold } = await this.getState() - + this.cline = new Cline( this, apiConfiguration, @@ -253,7 +255,7 @@ export class ClineProvider implements vscode.WebviewViewProvider { diffEnabled, fuzzyMatchThreshold } = await this.getState() - + this.cline = new Cline( this, apiConfiguration, @@ -319,15 +321,15 @@ export class ClineProvider implements vscode.WebviewViewProvider { // Use a nonce to only allow a specific script to be run. /* - content security policy of your webview to only allow scripts that have a specific nonce - create a content security policy meta tag so that only loading scripts with a nonce is allowed - As your extension grows you will likely want to add custom styles, fonts, and/or images to your webview. If you do, you will need to update the content security policy meta tag to explicity allow for these resources. E.g. - + content security policy of your webview to only allow scripts that have a specific nonce + create a content security policy meta tag so that only loading scripts with a nonce is allowed + As your extension grows you will likely want to add custom styles, fonts, and/or images to your webview. If you do, you will need to update the content security policy meta tag to explicity allow for these resources. E.g. + - 'unsafe-inline' is required for styles due to vscode-webview-toolkit's dynamic style injection - since we pass base64 images to the webview, we need to specify img-src ${webview.cspSource} data:; - in meta tag we add nonce attribute: A cryptographic nonce (only used once) to allow scripts. The server must generate a unique nonce value each time it transmits a policy. It is critical to provide a nonce that cannot be guessed as bypassing a resource's policy is otherwise trivial. - */ + in meta tag we add nonce attribute: A cryptographic nonce (only used once) to allow scripts. The server must generate a unique nonce value each time it transmits a policy. It is critical to provide a nonce that cannot be guessed as bypassing a resource's policy is otherwise trivial. + */ const nonce = getNonce() // Tip: Install the es6-string-html VS Code extension to enable code highlighting below @@ -555,7 +557,7 @@ export class ClineProvider implements vscode.WebviewViewProvider { this.postMessageToWebview({ type: "lmStudioModels", lmStudioModels }) break case "refreshGlamaModels": - await this.refreshGlamaModels() + await this.refreshGlamaModels() break case "refreshOpenRouterModels": await this.refreshOpenRouterModels() @@ -564,7 +566,7 @@ export class ClineProvider implements vscode.WebviewViewProvider { if (message?.values?.baseUrl && message?.values?.apiKey) { const openAiModels = await this.getOpenAiModels(message?.values?.baseUrl, message?.values?.apiKey) this.postMessageToWebview({ type: "openAiModels", openAiModels }) - } + } break case "openImage": openImage(message.text!) @@ -675,6 +677,14 @@ export class ClineProvider implements vscode.WebviewViewProvider { await this.updateGlobalState("fuzzyMatchThreshold", message.value) await this.postStateToWebview() break + case "alwaysApproveResubmit": + await this.updateGlobalState("alwaysApproveResubmit", message.bool ?? false) + await this.postStateToWebview() + break + case "requestDelaySeconds": + await this.updateGlobalState("requestDelaySeconds", message.value ?? 5) + await this.postStateToWebview() + break case "preferredLanguage": await this.updateGlobalState("preferredLanguage", message.text) await this.postStateToWebview() @@ -1224,9 +1234,9 @@ export class ClineProvider implements vscode.WebviewViewProvider { } async getStateToPostToWebview() { - const { - apiConfiguration, - lastShownAnnouncementId, + const { + apiConfiguration, + lastShownAnnouncementId, customInstructions, alwaysAllowReadOnly, alwaysAllowWrite, @@ -1244,8 +1254,10 @@ export class ClineProvider implements vscode.WebviewViewProvider { terminalOutputLineLimit, fuzzyMatchThreshold, mcpEnabled, + alwaysApproveResubmit, + requestDelaySeconds, } = await this.getState() - + const allowedCommands = vscode.workspace .getConfiguration('roo-cline') .get('allowedCommands') || [] @@ -1276,6 +1288,8 @@ export class ClineProvider implements vscode.WebviewViewProvider { terminalOutputLineLimit: terminalOutputLineLimit ?? 500, fuzzyMatchThreshold: fuzzyMatchThreshold ?? 1.0, mcpEnabled: mcpEnabled ?? true, + alwaysApproveResubmit: alwaysApproveResubmit ?? false, + requestDelaySeconds: requestDelaySeconds ?? 5, } } @@ -1381,6 +1395,8 @@ export class ClineProvider implements vscode.WebviewViewProvider { screenshotQuality, terminalOutputLineLimit, mcpEnabled, + alwaysApproveResubmit, + requestDelaySeconds, ] = await Promise.all([ this.getGlobalState("apiProvider") as Promise, this.getGlobalState("apiModelId") as Promise, @@ -1431,6 +1447,8 @@ export class ClineProvider implements vscode.WebviewViewProvider { this.getGlobalState("screenshotQuality") as Promise, this.getGlobalState("terminalOutputLineLimit") as Promise, this.getGlobalState("mcpEnabled") as Promise, + this.getGlobalState("alwaysApproveResubmit") as Promise, + this.getGlobalState("requestDelaySeconds") as Promise, ]) let apiProvider: ApiProvider @@ -1525,6 +1543,8 @@ export class ClineProvider implements vscode.WebviewViewProvider { return langMap[vscodeLang.split('-')[0]] ?? 'English'; })(), mcpEnabled: mcpEnabled ?? true, + alwaysApproveResubmit: alwaysApproveResubmit ?? false, + requestDelaySeconds: requestDelaySeconds ?? 5, } } diff --git a/src/core/webview/__tests__/ClineProvider.test.ts b/src/core/webview/__tests__/ClineProvider.test.ts index 6283ba5..c3470fe 100644 --- a/src/core/webview/__tests__/ClineProvider.test.ts +++ b/src/core/webview/__tests__/ClineProvider.test.ts @@ -146,8 +146,8 @@ jest.mock('../../../integrations/misc/extract-text', () => ({ // Spy on console.error and console.log to suppress expected messages beforeAll(() => { - jest.spyOn(console, 'error').mockImplementation(() => {}) - jest.spyOn(console, 'log').mockImplementation(() => {}) + jest.spyOn(console, 'error').mockImplementation(() => { }) + jest.spyOn(console, 'log').mockImplementation(() => { }) }) afterAll(() => { @@ -230,7 +230,7 @@ describe('ClineProvider', () => { test('resolveWebviewView sets up webview correctly', () => { provider.resolveWebviewView(mockWebviewView) - + expect(mockWebviewView.webview.options).toEqual({ enableScripts: true, localResourceRoots: [mockContext.extensionUri] @@ -240,7 +240,7 @@ describe('ClineProvider', () => { test('postMessageToWebview sends message to webview', async () => { provider.resolveWebviewView(mockWebviewView) - + const mockState: ExtensionState = { version: '1.0.0', preferredLanguage: 'English', @@ -263,14 +263,16 @@ describe('ClineProvider', () => { browserViewportSize: "900x600", fuzzyMatchThreshold: 1.0, mcpEnabled: true, + alwaysApproveResubmit: false, + requestDelaySeconds: 5, } - - const message: ExtensionMessage = { - type: 'state', + + const message: ExtensionMessage = { + type: 'state', state: mockState } await provider.postMessageToWebview(message) - + expect(mockPostMessage).toHaveBeenCalledWith(message) }) @@ -301,7 +303,7 @@ describe('ClineProvider', () => { test('getState returns correct initial state', async () => { const state = await provider.getState() - + expect(state).toHaveProperty('apiConfiguration') expect(state.apiConfiguration).toHaveProperty('apiProvider') expect(state).toHaveProperty('customInstructions') @@ -318,7 +320,7 @@ describe('ClineProvider', () => { test('preferredLanguage defaults to VSCode language when not set', async () => { // Mock VSCode language as Spanish (vscode.env as any).language = 'es-ES'; - + const state = await provider.getState(); expect(state.preferredLanguage).toBe('Spanish'); }) @@ -326,7 +328,7 @@ describe('ClineProvider', () => { test('preferredLanguage defaults to English for unsupported VSCode language', async () => { // Mock VSCode language as an unsupported language (vscode.env as any).language = 'unsupported-LANG'; - + const state = await provider.getState(); expect(state.preferredLanguage).toBe('English'); }) @@ -334,9 +336,9 @@ describe('ClineProvider', () => { test('diffEnabled defaults to true when not set', async () => { // Mock globalState.get to return undefined for diffEnabled (mockContext.globalState.get as jest.Mock).mockReturnValue(undefined) - + const state = await provider.getState() - + expect(state.diffEnabled).toBe(true) }) @@ -348,7 +350,7 @@ describe('ClineProvider', () => { } return null }) - + const state = await provider.getState() expect(state.writeDelayMs).toBe(1000) }) @@ -356,9 +358,9 @@ describe('ClineProvider', () => { test('handles writeDelayMs message', async () => { provider.resolveWebviewView(mockWebviewView) const messageHandler = (mockWebviewView.webview.onDidReceiveMessage as jest.Mock).mock.calls[0][0] - + await messageHandler({ type: 'writeDelayMs', value: 2000 }) - + expect(mockContext.globalState.update).toHaveBeenCalledWith('writeDelayMs', 2000) expect(mockPostMessage).toHaveBeenCalled() }) @@ -382,6 +384,42 @@ describe('ClineProvider', () => { expect(mockPostMessage).toHaveBeenCalled() }) + test('requestDelaySeconds defaults to 5 seconds', async () => { + // Mock globalState.get to return undefined for requestDelaySeconds + (mockContext.globalState.get as jest.Mock).mockImplementation((key: string) => { + if (key === 'requestDelaySeconds') { + return undefined + } + return null + }) + + const state = await provider.getState() + expect(state.requestDelaySeconds).toBe(5) + }) + + test('alwaysApproveResubmit defaults to false', async () => { + // Mock globalState.get to return undefined for alwaysApproveResubmit + (mockContext.globalState.get as jest.Mock).mockReturnValue(undefined) + + const state = await provider.getState() + expect(state.alwaysApproveResubmit).toBe(false) + }) + + test('handles request delay settings messages', async () => { + provider.resolveWebviewView(mockWebviewView) + const messageHandler = (mockWebviewView.webview.onDidReceiveMessage as jest.Mock).mock.calls[0][0] + + // Test alwaysApproveResubmit + await messageHandler({ type: 'alwaysApproveResubmit', bool: true }) + expect(mockContext.globalState.update).toHaveBeenCalledWith('alwaysApproveResubmit', true) + expect(mockPostMessage).toHaveBeenCalled() + + // Test requestDelaySeconds + await messageHandler({ type: 'requestDelaySeconds', value: 10 }) + expect(mockContext.globalState.update).toHaveBeenCalledWith('requestDelaySeconds', 10) + expect(mockPostMessage).toHaveBeenCalled() + }) + test('file content includes line numbers', async () => { const { extractTextFromFile } = require('../../../integrations/misc/extract-text') const result = await extractTextFromFile('test.js') diff --git a/src/shared/ExtensionMessage.ts b/src/shared/ExtensionMessage.ts index 30df793..f9e5c61 100644 --- a/src/shared/ExtensionMessage.ts +++ b/src/shared/ExtensionMessage.ts @@ -8,28 +8,28 @@ import { GitCommit } from "../utils/git" // webview will hold state export interface ExtensionMessage { type: - | "action" - | "state" - | "selectedImages" - | "ollamaModels" - | "lmStudioModels" - | "theme" - | "workspaceUpdated" - | "invoke" - | "partialMessage" - | "glamaModels" - | "openRouterModels" - | "openAiModels" - | "mcpServers" - | "enhancedPrompt" - | "commitSearchResults" + | "action" + | "state" + | "selectedImages" + | "ollamaModels" + | "lmStudioModels" + | "theme" + | "workspaceUpdated" + | "invoke" + | "partialMessage" + | "glamaModels" + | "openRouterModels" + | "openAiModels" + | "mcpServers" + | "enhancedPrompt" + | "commitSearchResults" text?: string action?: - | "chatButtonClicked" - | "mcpButtonClicked" - | "settingsButtonClicked" - | "historyButtonClicked" - | "didBecomeVisible" + | "chatButtonClicked" + | "mcpButtonClicked" + | "settingsButtonClicked" + | "historyButtonClicked" + | "didBecomeVisible" invoke?: "sendMessage" | "primaryButtonClick" | "secondaryButtonClick" state?: ExtensionState images?: string[] @@ -56,6 +56,8 @@ export interface ExtensionState { alwaysAllowExecute?: boolean alwaysAllowBrowser?: boolean alwaysAllowMcp?: boolean + alwaysApproveResubmit?: boolean + requestDelaySeconds: number uriScheme?: string allowedCommands?: string[] soundEnabled?: boolean @@ -103,6 +105,7 @@ export type ClineSay = | "user_feedback" | "user_feedback_diff" | "api_req_retried" + | "api_req_retry_delayed" | "command_output" | "tool" | "shell_integration_warning" @@ -114,14 +117,14 @@ export type ClineSay = export interface ClineSayTool { tool: - | "editedExistingFile" - | "appliedDiff" - | "newFileCreated" - | "readFile" - | "listFilesTopLevel" - | "listFilesRecursive" - | "listCodeDefinitionNames" - | "searchFiles" + | "editedExistingFile" + | "appliedDiff" + | "newFileCreated" + | "readFile" + | "listFilesTopLevel" + | "listFilesRecursive" + | "listCodeDefinitionNames" + | "searchFiles" path?: string diff?: string content?: string diff --git a/src/shared/WebviewMessage.ts b/src/shared/WebviewMessage.ts index 48eeb4a..e5c9b64 100644 --- a/src/shared/WebviewMessage.ts +++ b/src/shared/WebviewMessage.ts @@ -1,57 +1,59 @@ -import { ApiConfiguration, ApiProvider } from "./api" +import { ApiConfiguration } from "./api" export type AudioType = "notification" | "celebration" | "progress_loop" export interface WebviewMessage { type: - | "apiConfiguration" - | "customInstructions" - | "allowedCommands" - | "alwaysAllowReadOnly" - | "alwaysAllowWrite" - | "alwaysAllowExecute" - | "webviewDidLaunch" - | "newTask" - | "askResponse" - | "clearTask" - | "didShowAnnouncement" - | "selectImages" - | "exportCurrentTask" - | "showTaskWithId" - | "deleteTaskWithId" - | "exportTaskWithId" - | "resetState" - | "requestOllamaModels" - | "requestLmStudioModels" - | "openImage" - | "openFile" - | "openMention" - | "cancelTask" - | "refreshGlamaModels" - | "refreshOpenRouterModels" - | "refreshOpenAiModels" - | "alwaysAllowBrowser" - | "alwaysAllowMcp" - | "playSound" - | "soundEnabled" - | "soundVolume" - | "diffEnabled" - | "browserViewportSize" - | "screenshotQuality" - | "openMcpSettings" - | "restartMcpServer" - | "toggleToolAlwaysAllow" - | "toggleMcpServer" - | "fuzzyMatchThreshold" - | "preferredLanguage" - | "writeDelayMs" - | "enhancePrompt" - | "enhancedPrompt" - | "draggedImages" - | "deleteMessage" - | "terminalOutputLineLimit" - | "mcpEnabled" - | "searchCommits" + | "apiConfiguration" + | "customInstructions" + | "allowedCommands" + | "alwaysAllowReadOnly" + | "alwaysAllowWrite" + | "alwaysAllowExecute" + | "webviewDidLaunch" + | "newTask" + | "askResponse" + | "clearTask" + | "didShowAnnouncement" + | "selectImages" + | "exportCurrentTask" + | "showTaskWithId" + | "deleteTaskWithId" + | "exportTaskWithId" + | "resetState" + | "requestOllamaModels" + | "requestLmStudioModels" + | "openImage" + | "openFile" + | "openMention" + | "cancelTask" + | "refreshGlamaModels" + | "refreshOpenRouterModels" + | "refreshOpenAiModels" + | "alwaysAllowBrowser" + | "alwaysAllowMcp" + | "playSound" + | "soundEnabled" + | "soundVolume" + | "diffEnabled" + | "browserViewportSize" + | "screenshotQuality" + | "openMcpSettings" + | "restartMcpServer" + | "toggleToolAlwaysAllow" + | "toggleMcpServer" + | "fuzzyMatchThreshold" + | "preferredLanguage" + | "writeDelayMs" + | "enhancePrompt" + | "enhancedPrompt" + | "draggedImages" + | "deleteMessage" + | "terminalOutputLineLimit" + | "mcpEnabled" + | "searchCommits" + | "alwaysApproveResubmit" + | "requestDelaySeconds" text?: string disabled?: boolean askResponse?: ClineAskResponse diff --git a/webview-ui/src/components/settings/SettingsView.tsx b/webview-ui/src/components/settings/SettingsView.tsx index 5ae0858..d24bd49 100644 --- a/webview-ui/src/components/settings/SettingsView.tsx +++ b/webview-ui/src/components/settings/SettingsView.tsx @@ -51,6 +51,10 @@ const SettingsView = ({ onDone }: SettingsViewProps) => { terminalOutputLineLimit, setTerminalOutputLineLimit, mcpEnabled, + alwaysApproveResubmit, + setAlwaysApproveResubmit, + requestDelaySeconds, + setRequestDelaySeconds, } = useExtensionState() const [apiErrorMessage, setApiErrorMessage] = useState(undefined) const [modelIdErrorMessage, setModelIdErrorMessage] = useState(undefined) @@ -83,6 +87,8 @@ const SettingsView = ({ onDone }: SettingsViewProps) => { vscode.postMessage({ type: "screenshotQuality", value: screenshotQuality ?? 75 }) vscode.postMessage({ type: "terminalOutputLineLimit", value: terminalOutputLineLimit ?? 500 }) vscode.postMessage({ type: "mcpEnabled", bool: mcpEnabled }) + vscode.postMessage({ type: "alwaysApproveResubmit", bool: alwaysApproveResubmit }) + vscode.postMessage({ type: "requestDelaySeconds", value: requestDelaySeconds }) onDone() } } @@ -355,11 +361,47 @@ const SettingsView = ({ onDone }: SettingsViewProps) => { Always approve browser actions

- Automatically perform browser actions without requiring approval
+ Automatically perform browser actions without requiring approval
Note: Only applies when the model supports computer use

+
+ setAlwaysApproveResubmit(e.target.checked)}> + Always approve resubmit request + +

+ Automatically retry request when server returns an error response, with a configurable delay +

+ {alwaysApproveResubmit && ( +
+
+ setRequestDelaySeconds(parseInt(e.target.value))} + style={{ + flex: 1, + accentColor: 'var(--vscode-button-background)', + height: '2px' + }} + /> + + {requestDelaySeconds}s + +
+

+ Delay before retrying the request +

+
+ )} +
+
{
-

Notification Settings

+

Notification Settings

setSoundEnabled(e.target.checked)}> Enable sound effects diff --git a/webview-ui/src/context/ExtensionStateContext.tsx b/webview-ui/src/context/ExtensionStateContext.tsx index 52ee1e4..b6a922d 100644 --- a/webview-ui/src/context/ExtensionStateContext.tsx +++ b/webview-ui/src/context/ExtensionStateContext.tsx @@ -46,6 +46,10 @@ export interface ExtensionStateContextType extends ExtensionState { setTerminalOutputLineLimit: (value: number) => void mcpEnabled: boolean setMcpEnabled: (value: boolean) => void + alwaysApproveResubmit?: boolean + setAlwaysApproveResubmit: (value: boolean) => void + requestDelaySeconds: number + setRequestDelaySeconds: (value: number) => void } export const ExtensionStateContext = createContext(undefined) @@ -67,6 +71,8 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode screenshotQuality: 75, terminalOutputLineLimit: 500, mcpEnabled: true, + alwaysApproveResubmit: false, + requestDelaySeconds: 5 }) const [didHydrateState, setDidHydrateState] = useState(false) const [showWelcome, setShowWelcome] = useState(false) @@ -90,18 +96,18 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode const config = message.state?.apiConfiguration const hasKey = config ? [ - config.apiKey, - config.glamaApiKey, - config.openRouterApiKey, - config.awsRegion, - config.vertexProjectId, - config.openAiApiKey, - config.ollamaModelId, - config.lmStudioModelId, - config.geminiApiKey, - config.openAiNativeApiKey, - config.deepSeekApiKey, - ].some((key) => key !== undefined) + config.apiKey, + config.glamaApiKey, + config.openRouterApiKey, + config.awsRegion, + config.vertexProjectId, + config.openAiApiKey, + config.ollamaModelId, + config.lmStudioModelId, + config.geminiApiKey, + config.openAiNativeApiKey, + config.deepSeekApiKey, + ].some((key) => key !== undefined) : false setShowWelcome(!hasKey) setDidHydrateState(true) @@ -201,6 +207,8 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode setScreenshotQuality: (value) => setState((prevState) => ({ ...prevState, screenshotQuality: value })), setTerminalOutputLineLimit: (value) => setState((prevState) => ({ ...prevState, terminalOutputLineLimit: value })), setMcpEnabled: (value) => setState((prevState) => ({ ...prevState, mcpEnabled: value })), + setAlwaysApproveResubmit: (value) => setState((prevState) => ({ ...prevState, alwaysApproveResubmit: value })), + setRequestDelaySeconds: (value) => setState((prevState) => ({ ...prevState, requestDelaySeconds: value })) } return {children} From c9de9cda6644e9bffdb2e9f3d6ca38733d0dca4f Mon Sep 17 00:00:00 2001 From: Matt Rubens Date: Tue, 7 Jan 2025 10:25:51 -0500 Subject: [PATCH 2/4] Revert some whitespace changes --- src/core/Cline.ts | 143 +++++++++--------- src/core/webview/ClineProvider.ts | 22 +-- .../webview/__tests__/ClineProvider.test.ts | 35 +++-- src/shared/ExtensionMessage.ts | 56 +++---- src/shared/WebviewMessage.ts | 102 ++++++------- .../src/context/ExtensionStateContext.tsx | 24 +-- 6 files changed, 194 insertions(+), 188 deletions(-) diff --git a/src/core/Cline.ts b/src/core/Cline.ts index 4c4d53d..afbae37 100644 --- a/src/core/Cline.ts +++ b/src/core/Cline.ts @@ -205,10 +205,10 @@ export class Cline { const taskMessage = this.clineMessages[0] // first message is always the task say const lastRelevantMessage = this.clineMessages[ - findLastIndex( - this.clineMessages, - (m) => !(m.ask === "resume_task" || m.ask === "resume_completed_task"), - ) + findLastIndex( + this.clineMessages, + (m) => !(m.ask === "resume_task" || m.ask === "resume_completed_task"), + ) ] await this.providerRef.deref()?.updateTaskHistory({ id: this.taskId, @@ -390,7 +390,8 @@ export class Cline { async sayAndCreateMissingParamError(toolName: ToolUseName, paramName: string, relPath?: string) { await this.say( "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...`, ) return formatResponse.toolError(formatResponse.missingToolParameterError(paramName)) @@ -448,7 +449,7 @@ export class Cline { // need to make sure that the api conversation history can be resumed by the api, even if it goes out of sync with cline messages let existingApiConversationHistory: Anthropic.Messages.MessageParam[] = - await this.getSavedApiConversationHistory() + await this.getSavedApiConversationHistory() // Now present the cline messages to the user and ask if they want to resume @@ -559,8 +560,8 @@ export class Cline { : [{ type: "text", text: lastMessage.content }] if (previousAssistantMessage && previousAssistantMessage.role === "assistant") { const assistantContent = Array.isArray(previousAssistantMessage.content) - ? previousAssistantMessage.content - : [{ type: "text", text: previousAssistantMessage.content }] + ? previousAssistantMessage.content + : [{ type: "text", text: previousAssistantMessage.content }] const toolUseBlocks = assistantContent.filter( (block) => block.type === "tool_use", @@ -625,9 +626,10 @@ export class Cline { newUserContent.push({ type: "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 - ? "\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." - : "" + `[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." + : "" }` + (responseText ? `\n\nNew instructions for task continuation:\n\n${responseText}\n` @@ -741,7 +743,8 @@ export class Cline { return [ true, 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\n${userFeedback.text}\n`, userFeedback.images, ), @@ -753,7 +756,8 @@ export class Cline { } else { return [ 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.`, ] } @@ -931,8 +935,9 @@ export class Cline { case "apply_diff": return `[${block.name} for '${block.params.path}']` 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": return `[${block.name} for '${block.params.path}']` case "list_code_definition_names": @@ -1118,7 +1123,7 @@ export class Cline { if (block.partial) { // update gui message const partialMessage = JSON.stringify(sharedMessageProps) - await this.ask("tool", partialMessage, block.partial).catch(() => { }) + await this.ask("tool", partialMessage, block.partial).catch(() => {}) // update editor if (!this.diffViewProvider.isEditing) { // open the editor and prepare to stream content in @@ -1154,7 +1159,7 @@ export class Cline { if (!this.diffViewProvider.isEditing) { // show gui message before showing edit animation const partialMessage = JSON.stringify(sharedMessageProps) - await this.ask("tool", partialMessage, true).catch(() => { }) // sending true for partial even though it's not a partial, this shows the edit row before the content is streamed into the editor + await this.ask("tool", partialMessage, true).catch(() => {}) // sending true for partial even though it's not a partial, this shows the edit row before the content is streamed into the editor await this.diffViewProvider.open(relPath) } await this.diffViewProvider.update(everyLineHasLineNumbers(newContent) ? stripLineNumbers(newContent) : newContent, true) @@ -1192,10 +1197,10 @@ export class Cline { content: fileExists ? undefined : newContent, diff: fileExists ? formatResponse.createPrettyPatch( - relPath, - this.diffViewProvider.originalContent, - newContent, - ) + relPath, + this.diffViewProvider.originalContent, + newContent, + ) : undefined, } satisfies ClineSayTool) const didApprove = await askApproval("tool", completeMessage) @@ -1217,13 +1222,13 @@ export class Cline { ) pushToolResult( `The user made the following updates to your content:\n\n${userEdits}\n\n` + - `The updated content, which includes both your original modifications and the user's edits, has been successfully saved to ${relPath.toPosix()}. Here is the full, updated content of the file, including line numbers:\n\n` + - `\n${addLineNumbers(finalContent || '')}\n\n\n` + - `Please note:\n` + - `1. You do not need to re-write the file with these changes, as they have already been applied.\n` + - `2. Proceed with the task using this updated file content as the new baseline.\n` + - `3. If the user's edits have addressed part of the task or changed the requirements, adjust your approach accordingly.` + - `${newProblemsMessage}`, + `The updated content, which includes both your original modifications and the user's edits, has been successfully saved to ${relPath.toPosix()}. Here is the full, updated content of the file, including line numbers:\n\n` + + `\n${addLineNumbers(finalContent || '')}\n\n\n` + + `Please note:\n` + + `1. You do not need to re-write the file with these changes, as they have already been applied.\n` + + `2. Proceed with the task using this updated file content as the new baseline.\n` + + `3. If the user's edits have addressed part of the task or changed the requirements, adjust your approach accordingly.` + + `${newProblemsMessage}`, ) } else { pushToolResult( @@ -1252,7 +1257,7 @@ export class Cline { if (block.partial) { // update gui message const partialMessage = JSON.stringify(sharedMessageProps) - await this.ask("tool", partialMessage, block.partial).catch(() => { }) + await this.ask("tool", partialMessage, block.partial).catch(() => {}) break } else { if (!relPath) { @@ -1281,9 +1286,9 @@ export class Cline { // Apply the diff to the original content const diffResult = this.diffStrategy?.applyDiff( - originalContent, - diffContent, - parseInt(block.params.start_line ?? ''), + originalContent, + diffContent, + parseInt(block.params.start_line ?? ''), parseInt(block.params.end_line ?? '') ) ?? { success: false, @@ -1335,13 +1340,13 @@ export class Cline { ) pushToolResult( `The user made the following updates to your content:\n\n${userEdits}\n\n` + - `The updated content, which includes both your original modifications and the user's edits, has been successfully saved to ${relPath.toPosix()}. Here is the full, updated content of the file, including line numbers:\n\n` + - `\n${addLineNumbers(finalContent || '')}\n\n\n` + - `Please note:\n` + - `1. You do not need to re-write the file with these changes, as they have already been applied.\n` + - `2. Proceed with the task using this updated file content as the new baseline.\n` + - `3. If the user's edits have addressed part of the task or changed the requirements, adjust your approach accordingly.` + - `${newProblemsMessage}`, + `The updated content, which includes both your original modifications and the user's edits, has been successfully saved to ${relPath.toPosix()}. Here is the full, updated content of the file, including line numbers:\n\n` + + `\n${addLineNumbers(finalContent || '')}\n\n\n` + + `Please note:\n` + + `1. You do not need to re-write the file with these changes, as they have already been applied.\n` + + `2. Proceed with the task using this updated file content as the new baseline.\n` + + `3. If the user's edits have addressed part of the task or changed the requirements, adjust your approach accordingly.` + + `${newProblemsMessage}`, ) } else { pushToolResult(`Changes successfully applied to ${relPath.toPosix()}:\n\n${newProblemsMessage}`) @@ -1367,7 +1372,7 @@ export class Cline { ...sharedMessageProps, content: undefined, } satisfies ClineSayTool) - await this.ask("tool", partialMessage, block.partial).catch(() => { }) + await this.ask("tool", partialMessage, block.partial).catch(() => {}) break } else { if (!relPath) { @@ -1409,7 +1414,7 @@ export class Cline { ...sharedMessageProps, content: "", } satisfies ClineSayTool) - await this.ask("tool", partialMessage, block.partial).catch(() => { }) + await this.ask("tool", partialMessage, block.partial).catch(() => {}) break } else { if (!relDirPath) { @@ -1449,7 +1454,7 @@ export class Cline { ...sharedMessageProps, content: "", } satisfies ClineSayTool) - await this.ask("tool", partialMessage, block.partial).catch(() => { }) + await this.ask("tool", partialMessage, block.partial).catch(() => {}) break } else { if (!relDirPath) { @@ -1494,7 +1499,7 @@ export class Cline { ...sharedMessageProps, content: "", } satisfies ClineSayTool) - await this.ask("tool", partialMessage, block.partial).catch(() => { }) + await this.ask("tool", partialMessage, block.partial).catch(() => {}) break } else { if (!relDirPath) { @@ -1549,7 +1554,7 @@ export class Cline { "browser_action_launch", removeClosingTag("url", url), block.partial - ).catch(() => { }) + ).catch(() => {}) } else { await this.say( "browser_action", @@ -1649,7 +1654,8 @@ export class Cline { await this.say("browser_action_result", JSON.stringify(browserActionResult)) pushToolResult( 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.)`, browserActionResult.screenshot ? [browserActionResult.screenshot] : [], ), @@ -1676,7 +1682,7 @@ export class Cline { try { if (block.partial) { await this.ask("command", removeClosingTag("command", command), block.partial).catch( - () => { } + () => {} ) break } else { @@ -1717,7 +1723,7 @@ export class Cline { toolName: removeClosingTag("tool_name", tool_name), arguments: removeClosingTag("arguments", mcp_arguments), } satisfies ClineAskUseMcpServer) - await this.ask("use_mcp_server", partialMessage, block.partial).catch(() => { }) + await this.ask("use_mcp_server", partialMessage, block.partial).catch(() => {}) break } else { if (!server_name) { @@ -1778,19 +1784,19 @@ export class Cline { // TODO: add progress indicator and ability to parse images and non-text responses const toolResultPretty = (toolResult?.isError ? "Error:\n" : "") + - toolResult?.content - .map((item) => { - if (item.type === "text") { - return item.text - } - if (item.type === "resource") { - const { blob, ...rest } = item.resource - return JSON.stringify(rest, null, 2) - } - return "" - }) - .filter(Boolean) - .join("\n\n") || "(No response)" + toolResult?.content + .map((item) => { + if (item.type === "text") { + return item.text + } + if (item.type === "resource") { + const { blob, ...rest } = item.resource + return JSON.stringify(rest, null, 2) + } + return "" + }) + .filter(Boolean) + .join("\n\n") || "(No response)" await this.say("mcp_server_response", toolResultPretty) pushToolResult(formatResponse.toolResult(toolResultPretty)) break @@ -1810,7 +1816,7 @@ export class Cline { serverName: removeClosingTag("server_name", server_name), uri: removeClosingTag("uri", uri), } satisfies ClineAskUseMcpServer) - await this.ask("use_mcp_server", partialMessage, block.partial).catch(() => { }) + await this.ask("use_mcp_server", partialMessage, block.partial).catch(() => {}) break } else { if (!server_name) { @@ -1866,7 +1872,7 @@ export class Cline { try { if (block.partial) { await this.ask("followup", removeClosingTag("question", question), block.partial).catch( - () => { }, + () => {}, ) break } else { @@ -1925,7 +1931,7 @@ export class Cline { "command", removeClosingTag("command", command), block.partial, - ).catch(() => { }) + ).catch(() => {}) } else { // last message is completion_result // we have command string, which means we have the result as well, so finish it (doesnt have to exist yet) @@ -1939,7 +1945,7 @@ export class Cline { "command", removeClosingTag("command", command), block.partial, - ).catch(() => { }) + ).catch(() => {}) } } else { // no command, still outputting partial result @@ -2165,9 +2171,10 @@ export class Cline { type: "text", text: assistantMessage + - `\n\n[${cancelReason === "streaming_failed" - ? "Response interrupted by API Error" - : "Response interrupted by user" + `\n\n[${ + cancelReason === "streaming_failed" + ? "Response interrupted by API Error" + : "Response interrupted by user" }]`, }, ], @@ -2421,7 +2428,7 @@ export class Cline { await pWaitFor(() => busyTerminals.every((t) => !this.terminalManager.isProcessHot(t.id)), { interval: 100, timeout: 15_000, - }).catch(() => { }) + }).catch(() => {}) } // we want to get diagnostics AFTER terminal cools down for a few reasons: terminal could be scaffolding a project, dev servers (compilers like webpack) will first re-compile and then send diagnostics, etc diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts index b70d814..579a12e 100644 --- a/src/core/webview/ClineProvider.ts +++ b/src/core/webview/ClineProvider.ts @@ -235,7 +235,7 @@ export class ClineProvider implements vscode.WebviewViewProvider { diffEnabled, fuzzyMatchThreshold } = await this.getState() - + this.cline = new Cline( this, apiConfiguration, @@ -255,7 +255,7 @@ export class ClineProvider implements vscode.WebviewViewProvider { diffEnabled, fuzzyMatchThreshold } = await this.getState() - + this.cline = new Cline( this, apiConfiguration, @@ -321,15 +321,15 @@ export class ClineProvider implements vscode.WebviewViewProvider { // Use a nonce to only allow a specific script to be run. /* - content security policy of your webview to only allow scripts that have a specific nonce - create a content security policy meta tag so that only loading scripts with a nonce is allowed - As your extension grows you will likely want to add custom styles, fonts, and/or images to your webview. If you do, you will need to update the content security policy meta tag to explicity allow for these resources. E.g. - + content security policy of your webview to only allow scripts that have a specific nonce + create a content security policy meta tag so that only loading scripts with a nonce is allowed + As your extension grows you will likely want to add custom styles, fonts, and/or images to your webview. If you do, you will need to update the content security policy meta tag to explicity allow for these resources. E.g. + - 'unsafe-inline' is required for styles due to vscode-webview-toolkit's dynamic style injection - since we pass base64 images to the webview, we need to specify img-src ${webview.cspSource} data:; - in meta tag we add nonce attribute: A cryptographic nonce (only used once) to allow scripts. The server must generate a unique nonce value each time it transmits a policy. It is critical to provide a nonce that cannot be guessed as bypassing a resource's policy is otherwise trivial. - */ + in meta tag we add nonce attribute: A cryptographic nonce (only used once) to allow scripts. The server must generate a unique nonce value each time it transmits a policy. It is critical to provide a nonce that cannot be guessed as bypassing a resource's policy is otherwise trivial. + */ const nonce = getNonce() // Tip: Install the es6-string-html VS Code extension to enable code highlighting below @@ -557,7 +557,7 @@ export class ClineProvider implements vscode.WebviewViewProvider { this.postMessageToWebview({ type: "lmStudioModels", lmStudioModels }) break case "refreshGlamaModels": - await this.refreshGlamaModels() + await this.refreshGlamaModels() break case "refreshOpenRouterModels": await this.refreshOpenRouterModels() @@ -566,7 +566,7 @@ export class ClineProvider implements vscode.WebviewViewProvider { if (message?.values?.baseUrl && message?.values?.apiKey) { const openAiModels = await this.getOpenAiModels(message?.values?.baseUrl, message?.values?.apiKey) this.postMessageToWebview({ type: "openAiModels", openAiModels }) - } + } break case "openImage": openImage(message.text!) @@ -1257,7 +1257,7 @@ export class ClineProvider implements vscode.WebviewViewProvider { alwaysApproveResubmit, requestDelaySeconds, } = await this.getState() - + const allowedCommands = vscode.workspace .getConfiguration('roo-cline') .get('allowedCommands') || [] diff --git a/src/core/webview/__tests__/ClineProvider.test.ts b/src/core/webview/__tests__/ClineProvider.test.ts index c3470fe..0a7ee9a 100644 --- a/src/core/webview/__tests__/ClineProvider.test.ts +++ b/src/core/webview/__tests__/ClineProvider.test.ts @@ -146,8 +146,8 @@ jest.mock('../../../integrations/misc/extract-text', () => ({ // Spy on console.error and console.log to suppress expected messages beforeAll(() => { - jest.spyOn(console, 'error').mockImplementation(() => { }) - jest.spyOn(console, 'log').mockImplementation(() => { }) + jest.spyOn(console, 'error').mockImplementation(() => {}) + jest.spyOn(console, 'log').mockImplementation(() => {}) }) afterAll(() => { @@ -230,7 +230,7 @@ describe('ClineProvider', () => { test('resolveWebviewView sets up webview correctly', () => { provider.resolveWebviewView(mockWebviewView) - + expect(mockWebviewView.webview.options).toEqual({ enableScripts: true, localResourceRoots: [mockContext.extensionUri] @@ -240,7 +240,7 @@ describe('ClineProvider', () => { test('postMessageToWebview sends message to webview', async () => { provider.resolveWebviewView(mockWebviewView) - + const mockState: ExtensionState = { version: '1.0.0', preferredLanguage: 'English', @@ -263,16 +263,15 @@ describe('ClineProvider', () => { browserViewportSize: "900x600", fuzzyMatchThreshold: 1.0, mcpEnabled: true, - alwaysApproveResubmit: false, - requestDelaySeconds: 5, + requestDelaySeconds: 5 } - - const message: ExtensionMessage = { - type: 'state', + + const message: ExtensionMessage = { + type: 'state', state: mockState } await provider.postMessageToWebview(message) - + expect(mockPostMessage).toHaveBeenCalledWith(message) }) @@ -303,7 +302,7 @@ describe('ClineProvider', () => { test('getState returns correct initial state', async () => { const state = await provider.getState() - + expect(state).toHaveProperty('apiConfiguration') expect(state.apiConfiguration).toHaveProperty('apiProvider') expect(state).toHaveProperty('customInstructions') @@ -320,7 +319,7 @@ describe('ClineProvider', () => { test('preferredLanguage defaults to VSCode language when not set', async () => { // Mock VSCode language as Spanish (vscode.env as any).language = 'es-ES'; - + const state = await provider.getState(); expect(state.preferredLanguage).toBe('Spanish'); }) @@ -328,7 +327,7 @@ describe('ClineProvider', () => { test('preferredLanguage defaults to English for unsupported VSCode language', async () => { // Mock VSCode language as an unsupported language (vscode.env as any).language = 'unsupported-LANG'; - + const state = await provider.getState(); expect(state.preferredLanguage).toBe('English'); }) @@ -336,9 +335,9 @@ describe('ClineProvider', () => { test('diffEnabled defaults to true when not set', async () => { // Mock globalState.get to return undefined for diffEnabled (mockContext.globalState.get as jest.Mock).mockReturnValue(undefined) - + const state = await provider.getState() - + expect(state.diffEnabled).toBe(true) }) @@ -350,7 +349,7 @@ describe('ClineProvider', () => { } return null }) - + const state = await provider.getState() expect(state.writeDelayMs).toBe(1000) }) @@ -358,9 +357,9 @@ describe('ClineProvider', () => { test('handles writeDelayMs message', async () => { provider.resolveWebviewView(mockWebviewView) const messageHandler = (mockWebviewView.webview.onDidReceiveMessage as jest.Mock).mock.calls[0][0] - + await messageHandler({ type: 'writeDelayMs', value: 2000 }) - + expect(mockContext.globalState.update).toHaveBeenCalledWith('writeDelayMs', 2000) expect(mockPostMessage).toHaveBeenCalled() }) diff --git a/src/shared/ExtensionMessage.ts b/src/shared/ExtensionMessage.ts index f9e5c61..6b877a0 100644 --- a/src/shared/ExtensionMessage.ts +++ b/src/shared/ExtensionMessage.ts @@ -8,28 +8,28 @@ import { GitCommit } from "../utils/git" // webview will hold state export interface ExtensionMessage { type: - | "action" - | "state" - | "selectedImages" - | "ollamaModels" - | "lmStudioModels" - | "theme" - | "workspaceUpdated" - | "invoke" - | "partialMessage" - | "glamaModels" - | "openRouterModels" - | "openAiModels" - | "mcpServers" - | "enhancedPrompt" - | "commitSearchResults" + | "action" + | "state" + | "selectedImages" + | "ollamaModels" + | "lmStudioModels" + | "theme" + | "workspaceUpdated" + | "invoke" + | "partialMessage" + | "glamaModels" + | "openRouterModels" + | "openAiModels" + | "mcpServers" + | "enhancedPrompt" + | "commitSearchResults" text?: string action?: - | "chatButtonClicked" - | "mcpButtonClicked" - | "settingsButtonClicked" - | "historyButtonClicked" - | "didBecomeVisible" + | "chatButtonClicked" + | "mcpButtonClicked" + | "settingsButtonClicked" + | "historyButtonClicked" + | "didBecomeVisible" invoke?: "sendMessage" | "primaryButtonClick" | "secondaryButtonClick" state?: ExtensionState images?: string[] @@ -117,14 +117,14 @@ export type ClineSay = export interface ClineSayTool { tool: - | "editedExistingFile" - | "appliedDiff" - | "newFileCreated" - | "readFile" - | "listFilesTopLevel" - | "listFilesRecursive" - | "listCodeDefinitionNames" - | "searchFiles" + | "editedExistingFile" + | "appliedDiff" + | "newFileCreated" + | "readFile" + | "listFilesTopLevel" + | "listFilesRecursive" + | "listCodeDefinitionNames" + | "searchFiles" path?: string diff?: string content?: string diff --git a/src/shared/WebviewMessage.ts b/src/shared/WebviewMessage.ts index e5c9b64..0ca7cb3 100644 --- a/src/shared/WebviewMessage.ts +++ b/src/shared/WebviewMessage.ts @@ -1,59 +1,59 @@ -import { ApiConfiguration } from "./api" +import { ApiConfiguration, ApiProvider } from "./api" export type AudioType = "notification" | "celebration" | "progress_loop" export interface WebviewMessage { type: - | "apiConfiguration" - | "customInstructions" - | "allowedCommands" - | "alwaysAllowReadOnly" - | "alwaysAllowWrite" - | "alwaysAllowExecute" - | "webviewDidLaunch" - | "newTask" - | "askResponse" - | "clearTask" - | "didShowAnnouncement" - | "selectImages" - | "exportCurrentTask" - | "showTaskWithId" - | "deleteTaskWithId" - | "exportTaskWithId" - | "resetState" - | "requestOllamaModels" - | "requestLmStudioModels" - | "openImage" - | "openFile" - | "openMention" - | "cancelTask" - | "refreshGlamaModels" - | "refreshOpenRouterModels" - | "refreshOpenAiModels" - | "alwaysAllowBrowser" - | "alwaysAllowMcp" - | "playSound" - | "soundEnabled" - | "soundVolume" - | "diffEnabled" - | "browserViewportSize" - | "screenshotQuality" - | "openMcpSettings" - | "restartMcpServer" - | "toggleToolAlwaysAllow" - | "toggleMcpServer" - | "fuzzyMatchThreshold" - | "preferredLanguage" - | "writeDelayMs" - | "enhancePrompt" - | "enhancedPrompt" - | "draggedImages" - | "deleteMessage" - | "terminalOutputLineLimit" - | "mcpEnabled" - | "searchCommits" - | "alwaysApproveResubmit" - | "requestDelaySeconds" + | "apiConfiguration" + | "customInstructions" + | "allowedCommands" + | "alwaysAllowReadOnly" + | "alwaysAllowWrite" + | "alwaysAllowExecute" + | "webviewDidLaunch" + | "newTask" + | "askResponse" + | "clearTask" + | "didShowAnnouncement" + | "selectImages" + | "exportCurrentTask" + | "showTaskWithId" + | "deleteTaskWithId" + | "exportTaskWithId" + | "resetState" + | "requestOllamaModels" + | "requestLmStudioModels" + | "openImage" + | "openFile" + | "openMention" + | "cancelTask" + | "refreshGlamaModels" + | "refreshOpenRouterModels" + | "refreshOpenAiModels" + | "alwaysAllowBrowser" + | "alwaysAllowMcp" + | "playSound" + | "soundEnabled" + | "soundVolume" + | "diffEnabled" + | "browserViewportSize" + | "screenshotQuality" + | "openMcpSettings" + | "restartMcpServer" + | "toggleToolAlwaysAllow" + | "toggleMcpServer" + | "fuzzyMatchThreshold" + | "preferredLanguage" + | "writeDelayMs" + | "enhancePrompt" + | "enhancedPrompt" + | "draggedImages" + | "deleteMessage" + | "terminalOutputLineLimit" + | "mcpEnabled" + | "searchCommits" + | "alwaysApproveResubmit" + | "requestDelaySeconds" text?: string disabled?: boolean askResponse?: ClineAskResponse diff --git a/webview-ui/src/context/ExtensionStateContext.tsx b/webview-ui/src/context/ExtensionStateContext.tsx index b6a922d..131364b 100644 --- a/webview-ui/src/context/ExtensionStateContext.tsx +++ b/webview-ui/src/context/ExtensionStateContext.tsx @@ -96,18 +96,18 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode const config = message.state?.apiConfiguration const hasKey = config ? [ - config.apiKey, - config.glamaApiKey, - config.openRouterApiKey, - config.awsRegion, - config.vertexProjectId, - config.openAiApiKey, - config.ollamaModelId, - config.lmStudioModelId, - config.geminiApiKey, - config.openAiNativeApiKey, - config.deepSeekApiKey, - ].some((key) => key !== undefined) + config.apiKey, + config.glamaApiKey, + config.openRouterApiKey, + config.awsRegion, + config.vertexProjectId, + config.openAiApiKey, + config.ollamaModelId, + config.lmStudioModelId, + config.geminiApiKey, + config.openAiNativeApiKey, + config.deepSeekApiKey, + ].some((key) => key !== undefined) : false setShowWelcome(!hasKey) setDidHydrateState(true) From 0ff8fe45d4729a692529e4c8eb7b240c605594cb Mon Sep 17 00:00:00 2001 From: Matt Rubens Date: Tue, 7 Jan 2025 10:34:49 -0500 Subject: [PATCH 3/4] UI tweaks --- src/core/Cline.ts | 5 +++-- webview-ui/src/components/settings/SettingsView.tsx | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/core/Cline.ts b/src/core/Cline.ts index afbae37..e1ba0c1 100644 --- a/src/core/Cline.ts +++ b/src/core/Cline.ts @@ -811,6 +811,7 @@ export class Cline { } catch (error) { // note that this api_req_failed ask is unique in that we only present this option if the api hasn't streamed any content yet (ie it fails on the first chunk due), as it would allow them to hit a retry button. However if the api failed mid-stream, it could be in any arbitrary state where some tools may have executed, so that error is handled differently and requires cancelling the task entirely. if (alwaysApproveResubmit) { + const requestDelay = requestDelaySeconds || 5 // Automatically retry with delay await this.say( "error", @@ -823,10 +824,10 @@ export class Cline { : error.message?.includes("500") || error.message?.includes("503") ? "internal server error" : "unknown" - }). ↺ Retrying...`, + }). ↺ Retrying in ${requestDelay} seconds...`, ) await this.say("api_req_retry_delayed") - await delay((requestDelaySeconds || 5) * 1000) + await delay(requestDelay * 1000) await this.say("api_req_retried") // delegate generator output from the recursive call yield* this.attemptApiRequest(previousApiReqIndex) diff --git a/webview-ui/src/components/settings/SettingsView.tsx b/webview-ui/src/components/settings/SettingsView.tsx index d24bd49..956b76b 100644 --- a/webview-ui/src/components/settings/SettingsView.tsx +++ b/webview-ui/src/components/settings/SettingsView.tsx @@ -370,10 +370,10 @@ const SettingsView = ({ onDone }: SettingsViewProps) => { setAlwaysApproveResubmit(e.target.checked)}> - Always approve resubmit request + Always retry failed API requests

- Automatically retry request when server returns an error response, with a configurable delay + Automatically retry failed API requests when server returns an error response

{alwaysApproveResubmit && (
From f7a98c7f51132af52a3fdfeeaab86046fadb91c9 Mon Sep 17 00:00:00 2001 From: Matt Rubens Date: Tue, 7 Jan 2025 10:37:12 -0500 Subject: [PATCH 4/4] Release --- .changeset/slow-ladybugs-invite.md | 5 +++++ README.md | 1 + 2 files changed, 6 insertions(+) create mode 100644 .changeset/slow-ladybugs-invite.md diff --git a/.changeset/slow-ladybugs-invite.md b/.changeset/slow-ladybugs-invite.md new file mode 100644 index 0000000..eca059e --- /dev/null +++ b/.changeset/slow-ladybugs-invite.md @@ -0,0 +1,5 @@ +--- +"roo-cline": patch +--- + +Automatically retry failed API requests with a configurable delay (thanks @RaySinner!) diff --git a/README.md b/README.md index bf2a627..d067902 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ A fork of Cline, an autonomous coding agent, with some additional experimental f - Per-tool MCP auto-approval - Enable/disable individual MCP servers - Enable/disable the MCP feature overall +- Automatically retry failed API requests with a configurable delay - Configurable delay after auto-writes to allow diagnostics to detect potential problems - Control the number of terminal output lines to pass to the model when executing commands - Runs alongside the original Cline