diff --git a/.changeset/empty-bees-suffer.md b/.changeset/empty-bees-suffer.md new file mode 100644 index 00000000000..e3d87a51ad2 --- /dev/null +++ b/.changeset/empty-bees-suffer.md @@ -0,0 +1,5 @@ +--- +"roo-cline": patch +--- + +Revert tool progress for now diff --git a/src/core/Cline.ts b/src/core/Cline.ts index 3d27a502555..3d1f980c7d8 100644 --- a/src/core/Cline.ts +++ b/src/core/Cline.ts @@ -48,7 +48,6 @@ import { ClineSay, ClineSayBrowserAction, ClineSayTool, - ToolProgressStatus, } from "../shared/ExtensionMessage" import { getApiMetrics } from "../shared/getApiMetrics" import { HistoryItem } from "../shared/HistoryItem" @@ -409,7 +408,6 @@ export class Cline { type: ClineAsk, text?: string, partial?: boolean, - progressStatus?: ToolProgressStatus, ): Promise<{ response: ClineAskResponse; text?: string; images?: string[] }> { // If this Cline instance was aborted by the provider, then the only thing keeping us alive is a promise still running in the background, in which case we don't want to send its result to the webview as it is attached to a new instance of Cline now. So we can safely ignore the result of any active promises, and this class will be deallocated. (Although we set Cline = undefined in provider, that simply removes the reference to this instance, but the instance is still alive until this promise resolves or rejects.) if (this.abort) { @@ -425,7 +423,6 @@ export class Cline { // existing partial message, so update it lastMessage.text = text lastMessage.partial = partial - lastMessage.progressStatus = progressStatus // todo be more efficient about saving and posting only new data or one whole message at a time so ignore partial for saves, and only post parts of partial message instead of whole array in new listener // await this.saveClineMessages() // await this.providerRef.deref()?.postStateToWebview() @@ -463,8 +460,6 @@ export class Cline { // lastMessage.ts = askTs lastMessage.text = text lastMessage.partial = false - lastMessage.progressStatus = progressStatus - await this.saveClineMessages() // await this.providerRef.deref()?.postStateToWebview() await this.providerRef @@ -516,7 +511,6 @@ export class Cline { images?: string[], partial?: boolean, checkpoint?: Record, - progressStatus?: ToolProgressStatus, ): Promise { if (this.abort) { throw new Error(`Task: ${this.taskNumber} Roo Code instance aborted (#2)`) @@ -532,7 +526,6 @@ export class Cline { lastMessage.text = text lastMessage.images = images lastMessage.partial = partial - lastMessage.progressStatus = progressStatus await this.providerRef .deref() ?.postMessageToWebview({ type: "partialMessage", partialMessage: lastMessage }) @@ -552,7 +545,6 @@ export class Cline { lastMessage.text = text lastMessage.images = images lastMessage.partial = false - lastMessage.progressStatus = progressStatus // instead of streaming partialMessage events, we do a save and post like normal to persist to disk await this.saveClineMessages() @@ -1711,16 +1703,8 @@ export class Cline { try { if (block.partial) { // update gui message - let toolProgressStatus - if (this.diffStrategy && this.diffStrategy.getProgressStatus) { - toolProgressStatus = this.diffStrategy.getProgressStatus(block) - } - const partialMessage = JSON.stringify(sharedMessageProps) - - await this.ask("tool", partialMessage, block.partial, toolProgressStatus).catch( - () => {}, - ) + await this.ask("tool", partialMessage, block.partial).catch(() => {}) break } else { if (!relPath) { @@ -1815,14 +1799,6 @@ export class Cline { diff: diffContent, } satisfies ClineSayTool) - let toolProgressStatus - if (this.diffStrategy && this.diffStrategy.getProgressStatus) { - toolProgressStatus = this.diffStrategy.getProgressStatus(block, diffResult) - } - await this.ask("tool", completeMessage, block.partial, toolProgressStatus).catch( - () => {}, - ) - const didApprove = await askApproval("tool", completeMessage) if (!didApprove) { await this.diffViewProvider.revertChanges() // This likely handles closing the diff view diff --git a/src/core/diff/strategies/multi-search-replace.ts b/src/core/diff/strategies/multi-search-replace.ts index bcf2f654308..99c22a31df9 100644 --- a/src/core/diff/strategies/multi-search-replace.ts +++ b/src/core/diff/strategies/multi-search-replace.ts @@ -1,8 +1,6 @@ import { DiffStrategy, DiffResult } from "../types" import { addLineNumbers, everyLineHasLineNumbers, stripLineNumbers } from "../../../integrations/misc/extract-text" import { distance } from "fastest-levenshtein" -import { ToolProgressStatus } from "../../../shared/ExtensionMessage" -import { ToolUse } from "../../assistant-message" const BUFFER_LINES = 40 // Number of extra context lines to show before and after matches @@ -364,27 +362,4 @@ Only use a single line of '=======' between search and replacement content, beca failParts: diffResults, } } - - getProgressStatus(toolUse: ToolUse, result?: DiffResult): ToolProgressStatus { - const diffContent = toolUse.params.diff - if (diffContent) { - const icon = "diff-multiple" - const searchBlockCount = (diffContent.match(/SEARCH/g) || []).length - if (toolUse.partial) { - if (diffContent.length < 1000 || (diffContent.length / 50) % 10 === 0) { - return { icon, text: `${searchBlockCount}` } - } - } else if (result) { - if (result.failParts?.length) { - return { - icon, - text: `${searchBlockCount - result.failParts.length}/${searchBlockCount}`, - } - } else { - return { icon, text: `${searchBlockCount}` } - } - } - } - return {} - } } diff --git a/src/core/diff/types.ts b/src/core/diff/types.ts index e12a47762d5..be6d8cd3110 100644 --- a/src/core/diff/types.ts +++ b/src/core/diff/types.ts @@ -2,9 +2,6 @@ * Interface for implementing different diff strategies */ -import { ToolProgressStatus } from "../../shared/ExtensionMessage" -import { ToolUse } from "../assistant-message" - export type DiffResult = | { success: true; content: string; failParts?: DiffResult[] } | ({ @@ -37,6 +34,4 @@ export interface DiffStrategy { * @returns A DiffResult object containing either the successful result or error details */ applyDiff(originalContent: string, diffContent: string, startLine?: number, endLine?: number): Promise - - getProgressStatus?(toolUse: ToolUse, result?: any): ToolProgressStatus } diff --git a/src/shared/ExtensionMessage.ts b/src/shared/ExtensionMessage.ts index b7e3d850cfd..7487d338b19 100644 --- a/src/shared/ExtensionMessage.ts +++ b/src/shared/ExtensionMessage.ts @@ -155,7 +155,6 @@ export interface ClineMessage { reasoning?: string conversationHistoryIndex?: number checkpoint?: Record - progressStatus?: ToolProgressStatus } export type ClineAsk = @@ -275,8 +274,3 @@ export interface HumanRelayCancelMessage { } export type ClineApiReqCancelReason = "streaming_failed" | "user_cancelled" - -export type ToolProgressStatus = { - icon?: string - text?: string -} diff --git a/webview-ui/src/components/chat/ChatRow.tsx b/webview-ui/src/components/chat/ChatRow.tsx index b19d67dc052..259c03fa213 100644 --- a/webview-ui/src/components/chat/ChatRow.tsx +++ b/webview-ui/src/components/chat/ChatRow.tsx @@ -258,7 +258,6 @@ export const ChatRowContent = ({ Roo wants to edit this file: void isLoading?: boolean - progressStatus?: ToolProgressStatus } /* @@ -34,7 +32,6 @@ const CodeAccordian = ({ isExpanded, onToggleExpand, isLoading, - progressStatus, }: CodeAccordianProps) => { const inferredLanguage = useMemo( () => code && (language ?? (path ? getLanguageFromPath(path) : undefined)), @@ -98,14 +95,6 @@ const CodeAccordian = ({ )}
- {progressStatus && progressStatus.text && ( - <> - {progressStatus.icon && } - - {progressStatus.text} - - - )} )}