Merge remote-tracking branch 'upstream/main' into roo-to-main

Author: mini2s

apps/web-roo-code/src/app/privacy/page.tsx

@@ -46,7 +46,7 @@ export default function Privacy() {
 					<h1 className="text-3xl font-bold tracking-tight sm:text-4xl md:text-5xl">
 						Costrict Cloud Privacy Policy
 					</h1>
-					<p className="text-muted-foreground">Last Updated: August 20, 2025</p>
+					<p className="text-muted-foreground">Last Updated: September 19, 2025</p>
 
 					<p className="lead">
 						This Privacy Policy explains how Costrict, Inc. (&quot;Costrict,&quot; &quot;we,&quot;
@@ -184,6 +184,13 @@ export default function Privacy() {
 						<li>
 							<strong>Send product updates and roadmap communications</strong> (opt‑out available)
 						</li>
+						<li>
+							<strong>Send onboarding, educational, and promotional communications</strong>. We may use
+							your account information (such as your name and email address) to send you onboarding
+							messages, product tutorials, feature announcements, newsletters, and other marketing
+							communications. You can opt out of non‑transactional emails at any time (see “Your Choices”
+							below).
+						</li>
 					</ul>
 
 					<h2 className="mt-12 text-2xl font-bold">3. Where Your Data Goes (And Doesn&apos;t)</h2>
@@ -277,6 +284,12 @@ export default function Privacy() {
 							<strong>Delete your Cloud account</strong> at any time from{" "}
 							<strong>Security Settings</strong> inside Costrict Cloud.
 						</li>
+						<li>
+							<strong>Marketing communications:</strong> You can unsubscribe from marketing and
+							promotional emails by clicking the unsubscribe link in those emails. Transactional or
+							service‑related emails (such as password resets, billing notices, or security alerts) will
+							continue even if you opt out.
+						</li>
 					</ul>
 
 					<h2 className="mt-12 text-2xl font-bold">6. Security Practices</h2>

packages/types/src/providers/sambanova.ts

@@ -6,10 +6,12 @@ export type SambaNovaModelId =
 	| "Meta-Llama-3.3-70B-Instruct"
 	| "DeepSeek-R1"
 	| "DeepSeek-V3-0324"
+	| "DeepSeek-V3.1"
 	| "DeepSeek-R1-Distill-Llama-70B"
 	| "Llama-4-Maverick-17B-128E-Instruct"
 	| "Llama-3.3-Swallow-70B-Instruct-v0.4"
 	| "Qwen3-32B"
+	| "gpt-oss-120b"
 
 export const sambaNovaDefaultModelId: SambaNovaModelId = "Meta-Llama-3.3-70B-Instruct"
 
@@ -51,6 +53,15 @@ export const sambaNovaModels = {
 		outputPrice: 4.5,
 		description: "DeepSeek V3 model with 32K context window.",
 	},
+	"DeepSeek-V3.1": {
+		maxTokens: 8192,
+		contextWindow: 32768,
+		supportsImages: false,
+		supportsPromptCache: false,
+		inputPrice: 3.0,
+		outputPrice: 4.5,
+		description: "DeepSeek V3.1 model with 32K context window.",
+	},
 	"DeepSeek-R1-Distill-Llama-70B": {
 		maxTokens: 8192,
 		contextWindow: 131072,
@@ -87,4 +98,13 @@ export const sambaNovaModels = {
 		outputPrice: 0.8,
 		description: "Alibaba Qwen 3 32B model with 8K context window.",
 	},
+	"gpt-oss-120b": {
+		maxTokens: 8192,
+		contextWindow: 131072,
+		supportsImages: false,
+		supportsPromptCache: false,
+		inputPrice: 0.22,
+		outputPrice: 0.59,
+		description: "OpenAI gpt oss 120b model with 128k context window.",
+	},
 } as const satisfies Record<string, ModelInfo>

src/api/providers/gemini.ts

@@ -286,10 +286,7 @@ export class GeminiHandler extends BaseProvider implements SingleCompletionHandl
 		outputTokens: number
 		cacheReadTokens?: number
 	}) {
-		if (!info.inputPrice || !info.outputPrice || !info.cacheReadsPrice) {
-			return undefined
-		}
-
+		// For models with tiered pricing, prices might only be defined in tiers
 		let inputPrice = info.inputPrice
 		let outputPrice = info.outputPrice
 		let cacheReadsPrice = info.cacheReadsPrice
@@ -306,6 +303,16 @@ export class GeminiHandler extends BaseProvider implements SingleCompletionHandl
 			}
 		}
 
+		// Check if we have the required prices after considering tiers
+		if (!inputPrice || !outputPrice) {
+			return undefined
+		}
+
+		// cacheReadsPrice is optional - if not defined, treat as 0
+		if (!cacheReadsPrice) {
+			cacheReadsPrice = 0
+		}
+
 		// Subtract the cached input tokens from the total input tokens.
 		const uncachedInputTokens = inputTokens - cacheReadTokens
 

src/core/task/Task.ts

@@ -218,6 +218,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 
 	didFinishAbortingStream = false
 	abandoned = false
+	abortReason?: ClineApiReqCancelReason
 	isInitialized = false
 	isPaused: boolean = false
 	pausedModeSlug: string = defaultModeSlug
@@ -1282,6 +1283,16 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 			modifiedClineMessages.splice(lastRelevantMessageIndex + 1)
 		}
 
+		// Remove any trailing reasoning-only UI messages that were not part of the persisted API conversation
+		while (modifiedClineMessages.length > 0) {
+			const last = modifiedClineMessages[modifiedClineMessages.length - 1]
+			if (last.type === "say" && last.say === "reasoning") {
+				modifiedClineMessages.pop()
+			} else {
+				break
+			}
+		}
+
 		// Since we don't use `api_req_finished` anymore, we need to check if the
 		// last `api_req_started` has a cost value, if it doesn't and no
 		// cancellation reason to present, then we remove it since it indicates
@@ -1904,28 +1915,10 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 						lastMessage.partial = false
 						// instead of streaming partialMessage events, we do a save and post like normal to persist to disk
 						console.log("updating partial message", lastMessage)
-						// await this.saveClineMessages()
 					}
 
-					// Let assistant know their response was interrupted for when task is resumed
-					await this.addToApiConversationHistory({
-						role: "assistant",
-						content: [
-							{
-								type: "text",
-								text:
-									assistantMessage +
-									`\n\n[${
-										cancelReason === "streaming_failed"
-											? "Response interrupted by API Error"
-											: "Response interrupted by user"
-									}]`,
-							},
-						],
-					})
-
 					// Update `api_req_started` to have cancelled and cost, so that
-					// we can display the cost of the partial stream.
+					// we can display the cost of the partial stream and the cancellation reason
 					updateApiReqMsg(cancelReason, streamingFailedMessage)
 					await this.saveClineMessages()
 
@@ -2209,24 +2202,23 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 						// may have executed), so we just resort to replicating a
 						// cancel task.
 
-						// Check if this was a user-initiated cancellation BEFORE calling abortTask
-						// If this.abort is already true, it means the user clicked cancel, so we should
-						// treat this as "user_cancelled" rather than "streaming_failed"
-						const cancelReason = this.abort ? "user_cancelled" : "streaming_failed"
+						// Determine cancellation reason BEFORE aborting to ensure correct persistence
+						const cancelReason: ClineApiReqCancelReason = this.abort ? "user_cancelled" : "streaming_failed"
 
 						const streamingFailedMessage = this.abort
 							? undefined
 							: (error.message ?? JSON.stringify(serializeError(error), null, 2))
 
-						// Now call abortTask after determining the cancel reason.
-						await this.abortTask()
+						// Persist interruption details first to both UI and API histories
 						await abortStream(cancelReason, streamingFailedMessage)
 
-						const history = await provider?.getTaskWithId(this.taskId)
+						// Record reason for provider to decide rehydration path
+						this.abortReason = cancelReason
 
-						if (history) {
-							await provider?.createTaskWithHistoryItem(history.historyItem)
-						}
+						// Now abort (emits TaskAborted which provider listens to)
+						await this.abortTask()
+
+						// Do not rehydrate here; provider owns rehydration to avoid duplication races
 					}
 				} finally {
 					this.isStreaming = false