pacnpal/Roo-Code
1
0
Fork 0
mirror of https://github.com/pacnpal/Roo-Code.git synced 2025-12-21 04:41:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Minor refactoring

Browse Source
This commit is contained in:
Saoud Rizwan
2024-07-23 06:38:34 -04:00
parent 9e5a475a2a
commit 5c283bc711
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ClaudeDev.ts
View File

@@ -249,7 +249,7 @@ export class ClaudeDev {
let totalOutputTokens = 0 let totalOutputTokens = 0
while (this.requestCount < this.maxRequestsPerTask) { while (this.requestCount < this.maxRequestsPerTask) {
const { didCompleteTask, inputTokens, outputTokens } = await this.recursivelyMakeClaudeRequests([ const { didEndLoop, inputTokens, outputTokens } = await this.recursivelyMakeClaudeRequests([
{ type: "text", text: userPrompt }, { type: "text", text: userPrompt },
]) ])
totalInputTokens += inputTokens totalInputTokens += inputTokens
@@ -259,7 +259,7 @@ export class ClaudeDev {
// There is a MAX_REQUESTS_PER_TASK limit to prevent infinite requests, but Claude is prompted to finish the task as efficiently as he can. // There is a MAX_REQUESTS_PER_TASK limit to prevent infinite requests, but Claude is prompted to finish the task as efficiently as he can.
//const totalCost = this.calculateApiCost(totalInputTokens, totalOutputTokens) //const totalCost = this.calculateApiCost(totalInputTokens, totalOutputTokens)
if (didCompleteTask) { if (didEndLoop) {
//this.say("task_completed", `Task completed. Total API usage cost: ${totalCost}`) //this.say("task_completed", `Task completed. Total API usage cost: ${totalCost}`)
break break
} else { } else {
@@ -533,7 +533,7 @@ export class ClaudeDev {
}, },
], ],
}) })
return { didCompleteTask: true, inputTokens: 0, outputTokens: 0 } return { didEndLoop: true, inputTokens: 0, outputTokens: 0 }
} }
} }
@@ -622,7 +622,7 @@ export class ClaudeDev {
}) })
} }
let didCompleteTask = false let didEndLoop = false
// attempt_completion is always done last, since there might have been other tools that needed to be called first before the job is finished // attempt_completion is always done last, since there might have been other tools that needed to be called first before the job is finished
// it's important to note that claude will order the tools logically in most cases, so we don't have to think about which tools make sense calling before others // it's important to note that claude will order the tools logically in most cases, so we don't have to think about which tools make sense calling before others
@@ -638,14 +638,14 @@ export class ClaudeDev {
// )}\nTool Result: ${result}` // )}\nTool Result: ${result}`
// ) // )
if (result === "") { if (result === "") {
didCompleteTask = true didEndLoop = true
result = "The user is satisfied with the result." result = "The user is satisfied with the result."
} }
toolResults.push({ type: "tool_result", tool_use_id: attemptCompletionBlock.id, content: result }) toolResults.push({ type: "tool_result", tool_use_id: attemptCompletionBlock.id, content: result })
} }
if (toolResults.length > 0) { if (toolResults.length > 0) {
if (didCompleteTask) { if (didEndLoop) {
this.conversationHistory.push({ role: "user", content: toolResults }) this.conversationHistory.push({ role: "user", content: toolResults })
this.conversationHistory.push({ this.conversationHistory.push({
role: "assistant", role: "assistant",
@@ -658,21 +658,21 @@ export class ClaudeDev {
}) })
} else { } else {
const { const {
didCompleteTask: recDidCompleteTask, didEndLoop: recDidEndLoop,
inputTokens: recInputTokens, inputTokens: recInputTokens,
outputTokens: recOutputTokens, outputTokens: recOutputTokens,
} = await this.recursivelyMakeClaudeRequests(toolResults) } = await this.recursivelyMakeClaudeRequests(toolResults)
didCompleteTask = recDidCompleteTask didEndLoop = recDidEndLoop
inputTokens += recInputTokens inputTokens += recInputTokens
outputTokens += recOutputTokens outputTokens += recOutputTokens
} }
} }
return { didCompleteTask, inputTokens, outputTokens } return { didEndLoop, inputTokens, outputTokens }
} catch (error) { } catch (error) {
// only called if the API request fails (executeTool errors are returned back to claude) // only called if the API request fails (executeTool errors are returned back to claude)
this.say("error", `API request failed:\n${error.message ?? JSON.stringify(serializeError(error), null, 2)}`) this.say("error", `API request failed:\n${error.message ?? JSON.stringify(serializeError(error), null, 2)}`)
return { didCompleteTask: true, inputTokens: 0, outputTokens: 0 } return { didEndLoop: true, inputTokens: 0, outputTokens: 0 }
} }
} }
} }

1
src/providers/SidebarProvider.ts
View File

@@ -205,6 +205,7 @@ export class SidebarProvider implements vscode.WebviewViewProvider {
this.claudeDev?.handleWebviewAskResponse(message.askResponse!, message.text) this.claudeDev?.handleWebviewAskResponse(message.askResponse!, message.text)
break break
case "clearTask": case "clearTask":
// newTask will start a new task with a given task text, while clear task resets the current session and allows for a new task to be started
await this.clearTask() await this.clearTask()
await this.postStateToWebview() await this.postStateToWebview()
break break

2
src/shared/ClaudeRequestResult.ts
View File

@@ -1,5 +1,5 @@
export interface ClaudeRequestResult { export interface ClaudeRequestResult {
didCompleteTask: boolean didEndLoop: boolean
inputTokens: number inputTokens: number
outputTokens: number outputTokens: number
} }