Merge branch 'main' of github.com:taylorwilsdon/Roo-Code into add_streamable_http_support

Author: taylorwilsdon

.github/workflows/changeset-release.yml

@@ -9,7 +9,7 @@ on:
 env:
   REPO_PATH: ${{ github.repository }}
   GIT_REF: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'main' }}
-  NODE_VERSION: 20.18.1
+  NODE_VERSION: 20.19.2
   PNPM_VERSION: 10.8.1
 
 jobs:

.github/workflows/code-qa.yml

@@ -9,7 +9,7 @@ on:
     branches: [main]
 
 env:
-  NODE_VERSION: 20.18.1
+  NODE_VERSION: 20.19.2
   PNPM_VERSION: 10.8.1
 
 jobs:

.github/workflows/marketplace-publish.yml

@@ -7,7 +7,7 @@ on:
 
 env:
   GIT_REF: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'main' }}
-  NODE_VERSION: 20.18.1
+  NODE_VERSION: 20.19.2
   PNPM_VERSION: 10.8.1
 
 jobs:

.github/workflows/nightly-publish.yml

@@ -9,7 +9,7 @@ on:
   workflow_dispatch: # Allows manual triggering.
 
 env:
-  NODE_VERSION: 20.18.1
+  NODE_VERSION: 20.19.2
   PNPM_VERSION: 10.8.1
 
 jobs:

.github/workflows/update-contributors.yml

@@ -7,7 +7,7 @@ on:
   workflow_dispatch:  # Allows manual triggering
 
 env:
-  NODE_VERSION: 20.18.1
+  NODE_VERSION: 20.19.2
   PNPM_VERSION: 10.8.1
 
 jobs:

.nvmrc

@@ -1 +1 @@
-20.19.2
+v20.19.2

evals/scripts/setup.sh

@@ -176,16 +176,16 @@ for i in "${!options[@]}"; do
   case "${plugin}" in
   "nodejs")
     if ! command -v node &>/dev/null; then
-      asdf install nodejs 20.18.1 || exit 1
-      asdf set nodejs 20.18.1 || exit 1
+      asdf install nodejs 20.19.2 || exit 1
+      asdf set nodejs 20.19.2 || exit 1
       NODE_VERSION=$(node --version)
       echo "✅ Node.js is installed ($NODE_VERSION)"
     else
       NODE_VERSION=$(node --version)
       echo "✅ Node.js is installed ($NODE_VERSION)"
     fi
 
-    if [[ $(node --version) != "v20.18.1" ]]; then
+    if [[ $(node --version) != "v20.19.2" ]]; then
       NODE_VERSION=$(node --version)
       echo "🚨 You have the wrong version of node installed ($NODE_VERSION)."
       echo "💡 If you are using nvm then run 'nvm install' to install the version specified by the repo's .nvmrc."

src/api/providers/fetchers/litellm.ts

@@ -58,6 +58,8 @@ export async function getLiteLLMModels(apiKey: string, baseUrl: string): Promise
 					outputPrice: modelInfo.output_cost_per_token
 						? modelInfo.output_cost_per_token * 1000000
 						: undefined,
+					cacheWritesPrice: modelInfo.cache_creation_input_token_cost ? modelInfo.cache_creation_input_token_cost * 1000000 : undefined,
+					cacheReadsPrice: modelInfo.cache_read_input_token_cost ? modelInfo.cache_read_input_token_cost * 1000000 : undefined,
 					description: `${modelName} via LiteLLM proxy`,
 				}
 			}

src/api/providers/lite-llm.ts

@@ -3,6 +3,8 @@ import { Anthropic } from "@anthropic-ai/sdk" // Keep for type usage only
 
 import { litellmDefaultModelId, litellmDefaultModelInfo } from "@roo-code/types"
 
+import { calculateApiCostOpenAI } from "../../shared/cost"
+
 import { ApiHandlerOptions } from "../../shared/api"
 
 import { ApiStream, ApiStreamUsageChunk } from "../transform/stream"
@@ -66,7 +68,7 @@ export class LiteLLMHandler extends RouterProvider implements SingleCompletionHa
 
 			for await (const chunk of completion) {
 				const delta = chunk.choices[0]?.delta
-				const usage = chunk.usage as OpenAI.CompletionUsage
+				const usage = chunk.usage as LiteLLMUsage
 
 				if (delta?.content) {
 					yield { type: "text", text: delta.content }
@@ -82,8 +84,12 @@ export class LiteLLMHandler extends RouterProvider implements SingleCompletionHa
 					type: "usage",
 					inputTokens: lastUsage.prompt_tokens || 0,
 					outputTokens: lastUsage.completion_tokens || 0,
+					cacheWriteTokens: lastUsage.cache_creation_input_tokens || 0,
+					cacheReadTokens: lastUsage.prompt_tokens_details?.cached_tokens || 0,
 				}
 
+				usageData.totalCost = calculateApiCostOpenAI(info, usageData.inputTokens, usageData.outputTokens, usageData.cacheWriteTokens, usageData.cacheReadTokens)
+
 				yield usageData
 			}
 		} catch (error) {
@@ -119,3 +125,8 @@ export class LiteLLMHandler extends RouterProvider implements SingleCompletionHa
 		}
 	}
 }
+
+// LiteLLM usage may include an extra field for Anthropic use cases.
+interface LiteLLMUsage extends OpenAI.CompletionUsage {
+	cache_creation_input_tokens?: number
+}

src/core/tools/applyDiffTool.ts

@@ -9,6 +9,7 @@ import { Task } from "../task/Task"
 import { ToolUse, RemoveClosingTag, AskApproval, HandleError, PushToolResult } from "../../shared/tools"
 import { formatResponse } from "../prompts/responses"
 import { fileExistsAtPath } from "../../utils/fs"
+import { addLineNumbers } from "../../integrations/misc/extract-text"
 import { RecordSource } from "../context-tracking/FileContextTrackerTypes"
 import { unescapeHtmlEntities } from "../../utils/text-normalization"
 
@@ -162,8 +163,7 @@ export async function applyDiffTool(
 				return
 			}
 
-			// Call saveChanges to update the DiffViewProvider properties
-			await cline.diffViewProvider.saveChanges()
+			const { newProblemsMessage, userEdits, finalContent } = await cline.diffViewProvider.saveChanges()
 
 			// Track file edit operation
 			if (relPath) {
@@ -178,13 +178,33 @@ export async function applyDiffTool(
 				partFailHint = `But unable to apply all diff parts to file: ${absolutePath}, silently use <read_file> tool to check newest file version and re-apply diffs\n`
 			}
 
-			// Get the formatted response message
-			const message = await cline.diffViewProvider.pushToolWriteResult(cline, cline.cwd, !fileExists)
-
-			if (partFailHint) {
-				pushToolResult(partFailHint + message)
+			if (userEdits) {
+				await cline.say(
+					"user_feedback_diff",
+					JSON.stringify({
+						tool: fileExists ? "editedExistingFile" : "newFileCreated",
+						path: getReadablePath(cline.cwd, relPath),
+						diff: userEdits,
+					} satisfies ClineSayTool),
+				)
+
+				pushToolResult(
+					`The user made the following updates to your content:\n\n${userEdits}\n\n` +
+						partFailHint +
+						`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` +
+						`<final_file_content path="${relPath.toPosix()}">\n${addLineNumbers(
+							finalContent || "",
+						)}\n</final_file_content>\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(message)
+				pushToolResult(
+					`Changes successfully applied to ${relPath.toPosix()}:\n\n${newProblemsMessage}\n` + partFailHint,
+				)
 			}
 
 			await cline.diffViewProvider.reset()