Roo to main

packages/types/src/providers/anthropic.ts

@@ -3,7 +3,7 @@ import type { ModelInfo } from "../model.js"
 // https://docs.anthropic.com/en/docs/about-claude/models
 
 export type AnthropicModelId = keyof typeof anthropicModels
-export const anthropicDefaultModelId: AnthropicModelId = "claude-sonnet-4-20250514"
+export const anthropicDefaultModelId: AnthropicModelId = "claude-sonnet-4-5"
 
 export const anthropicModels = {
 	"claude-sonnet-4-5": {
@@ -49,7 +49,7 @@ export const anthropicModels = {
 		],
 	},
 	"claude-opus-4-1-20250805": {
-		maxTokens: 8192,
+		maxTokens: 32_000, // Overridden to 8k if `enableReasoningEffort` is false.
 		contextWindow: 200_000,
 		supportsImages: true,
 		supportsPromptCache: true,

packages/types/src/providers/bedrock.ts

@@ -4,7 +4,7 @@ import type { ModelInfo } from "../model.js"
 
 export type BedrockModelId = keyof typeof bedrockModels
 
-export const bedrockDefaultModelId: BedrockModelId = "anthropic.claude-sonnet-4-20250514-v1:0"
+export const bedrockDefaultModelId: BedrockModelId = "anthropic.claude-sonnet-4-5-20250929-v1:0"
 
 export const bedrockDefaultPromptRouterModelId: BedrockModelId = "anthropic.claude-3-sonnet-20240229-v1:0"
 

packages/types/src/providers/cerebras.ts

@@ -7,13 +7,13 @@ export const cerebrasDefaultModelId: CerebrasModelId = "gpt-oss-120b"
 
 export const cerebrasModels = {
 	"zai-glm-4.6": {
-		maxTokens: 16_384,
-		contextWindow: 128000,
+		maxTokens: 16384, // consistent with their other models
+		contextWindow: 131072,
 		supportsImages: false,
 		supportsPromptCache: false,
 		inputPrice: 0,
 		outputPrice: 0,
-		description: "Highly intelligent general-purpose model with ~2000 tokens/s",
+		description: "Highly intelligent general purpose model with up to 1,000 tokens/s",
 	},
 	"qwen-3-coder-480b-free": {
 		maxTokens: 40000,

packages/types/src/providers/claude-code.ts

@@ -21,7 +21,7 @@ export function convertModelNameForVertex(modelName: string): string {
 
 // Claude Code
 export type ClaudeCodeModelId = keyof typeof claudeCodeModels
-export const claudeCodeDefaultModelId: ClaudeCodeModelId = "claude-sonnet-4-20250514"
+export const claudeCodeDefaultModelId: ClaudeCodeModelId = "claude-sonnet-4-5"
 export const CLAUDE_CODE_DEFAULT_MAX_OUTPUT_TOKENS = 16000
 
 /**

packages/types/src/providers/openrouter.ts

@@ -1,7 +1,7 @@
 import type { ModelInfo } from "../model.js"
 
 // https://openrouter.ai/models?order=newest&supported_parameters=tools
-export const openRouterDefaultModelId = "anthropic/claude-sonnet-4"
+export const openRouterDefaultModelId = "anthropic/claude-sonnet-4.5"
 
 export const openRouterDefaultModelInfo: ModelInfo = {
 	maxTokens: 8192,

packages/types/src/providers/unbound.ts

@@ -1,6 +1,6 @@
 import type { ModelInfo } from "../model.js"
 
-export const unboundDefaultModelId = "anthropic/claude-3-7-sonnet-20250219"
+export const unboundDefaultModelId = "anthropic/claude-sonnet-4-5"
 
 export const unboundDefaultModelInfo: ModelInfo = {
 	maxTokens: 8192,

packages/types/src/providers/zgsm.ts

@@ -1,6 +1,6 @@
 import { ModelInfo } from "../model.js"
 
-export const zgsmDefaultModelId = "GLM-4.5"
+export const zgsmDefaultModelId = "GLM-4.6"
 
 export const zgsmModels = {
 	default: {

src/api/providers/__tests__/claude-code.spec.ts

@@ -44,7 +44,7 @@ describe("ClaudeCodeHandler", () => {
 		const handlerWithInvalidModel = new ClaudeCodeHandler(options)
 		const model = handlerWithInvalidModel.getModel()
 
-		expect(model.id).toBe("claude-sonnet-4-20250514") // default model
+		expect(model.id).toBe("claude-sonnet-4-5") // default model
 	})
 
 	test("should override maxTokens when claudeCodeMaxOutputTokens is provided", () => {
@@ -69,7 +69,7 @@ describe("ClaudeCodeHandler", () => {
 		const handlerWithMaxTokens = new ClaudeCodeHandler(options)
 		const model = handlerWithMaxTokens.getModel()
 
-		expect(model.id).toBe("claude-sonnet-4-20250514") // default model
+		expect(model.id).toBe("claude-sonnet-4-5") // default model
 		expect(model.info.maxTokens).toBe(16384) // Should use the configured value
 	})
 

src/api/providers/__tests__/openrouter.spec.ts

@@ -66,6 +66,18 @@ vitest.mock("../fetchers/modelCache", () => ({
 				description: "Claude 3.7 Sonnet",
 				thinking: false,
 			},
+			"anthropic/claude-sonnet-4.5": {
+				maxTokens: 8192,
+				contextWindow: 200000,
+				supportsImages: true,
+				supportsPromptCache: true,
+				inputPrice: 3,
+				outputPrice: 15,
+				cacheWritesPrice: 3.75,
+				cacheReadsPrice: 0.3,
+				description: "Claude 4.5 Sonnet",
+				thinking: false,
+			},
 			"anthropic/claude-3.7-sonnet:thinking": {
 				maxTokens: 128000,
 				contextWindow: 200000,
@@ -121,7 +133,7 @@ describe("OpenRouterHandler", () => {
 		it("returns default model info when options are not provided", async () => {
 			const handler = new OpenRouterHandler({})
 			const result = await handler.fetchModel()
-			expect(result.id).toBe("anthropic/claude-sonnet-4")
+			expect(result.id).toBe("anthropic/claude-sonnet-4.5")
 			expect(result.info.supportsPromptCache).toBe(true)
 		})
 

src/api/providers/__tests__/unbound.spec.ts

@@ -22,6 +22,18 @@ vitest.mock("../fetchers/modelCache", () => ({
 				description: "Claude 3.5 Sonnet",
 				thinking: false,
 			},
+			"anthropic/claude-sonnet-4-5": {
+				maxTokens: 8192,
+				contextWindow: 200000,
+				supportsImages: true,
+				supportsPromptCache: true,
+				inputPrice: 3,
+				outputPrice: 15,
+				cacheWritesPrice: 3.75,
+				cacheReadsPrice: 0.3,
+				description: "Claude 4.5 Sonnet",
+				thinking: false,
+			},
 			"anthropic/claude-3-7-sonnet-20250219": {
 				maxTokens: 8192,
 				contextWindow: 200000,
@@ -312,7 +324,7 @@ describe("UnboundHandler", () => {
 		it("should return default model when invalid model provided", async () => {
 			const handlerWithInvalidModel = new UnboundHandler({ ...mockOptions, unboundModelId: "invalid/model" })
 			const modelInfo = await handlerWithInvalidModel.fetchModel()
-			expect(modelInfo.id).toBe("anthropic/claude-3-7-sonnet-20250219")
+			expect(modelInfo.id).toBe("anthropic/claude-sonnet-4-5")
 			expect(modelInfo.info).toBeDefined()
 		})
 	})

src/api/providers/zgsm.ts

@@ -172,6 +172,7 @@ export class ZgsmAiHandler extends BaseProvider implements SingleCompletionHandl
 				Object.assign(requestOptions, {
 					extra_body: {
 						prompt_mode: "strict",
+						mode: metadata?.mode,
 					},
 				})
 			}

src/core/task/Task.ts

@@ -750,9 +750,8 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 		// 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.)
-		// Exception: Allow resume asks even when aborted for soft-interrupt UX
-		if (this.abort && type !== "resume_task" && type !== "resume_completed_task") {
-			throw new Error(`[CoStrict#ask] task ${this.taskId}.${this.instanceId} aborted`)
+		if (this.abort) {
+			throw new Error(`[RooCode#ask] task ${this.taskId}.${this.instanceId} aborted`)
 		}
 
 		let askTs: number
@@ -1289,7 +1288,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 		])
 	}
 
-	public async resumeTaskFromHistory() {
+	private async resumeTaskFromHistory() {
 		// if (this.enableBridge) {
 		// 	try {
 		// 		await BridgeOrchestrator.subscribeToTask(this)
@@ -1381,13 +1380,6 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 
 		const { response, text, images } = await this.ask(askType) // Calls `postStateToWebview`.
 
-		// Reset abort flags AFTER user responds to resume ask.
-		// This is critical for the cancel → resume flow: when a task is soft-aborted
-		// (abandoned = false), we keep the instance alive but set abort = true.
-		// We only clear these flags after the user confirms they want to resume,
-		// preventing the old stream from continuing if abort was set.
-		this.resetAbortAndStreamingState()
-
 		let responseText: string | undefined
 		let responseImages: string[] | undefined
 
@@ -1546,86 +1538,6 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 		await this.initiateTaskLoop(newUserContent)
 	}
 
-	/**
-	 * Resets abort flags and streaming state to allow task resumption.
-	 * Centralizes the state reset logic used after user confirms task resumption.
-	 *
-	 * @private
-	 */
-	private resetAbortAndStreamingState(): void {
-		this.abort = false
-		this.abandoned = false
-		this.abortReason = undefined
-		this.didFinishAbortingStream = false
-		this.isStreaming = false
-
-		// Reset streaming-local fields to avoid stale state from previous stream
-		this.currentStreamingContentIndex = 0
-		this.currentStreamingDidCheckpoint = false
-		this.assistantMessageContent = []
-		this.didCompleteReadingStream = false
-		this.userMessageContent = []
-		this.userMessageContentReady = false
-		this.didRejectTool = false
-		this.didAlreadyUseTool = false
-		this.presentAssistantMessageLocked = false
-		this.presentAssistantMessageHasPendingUpdates = false
-		this.assistantMessageParser.reset()
-	}
-
-	/**
-	 * Present a resumable ask on an aborted task without rehydrating.
-	 * Used by soft-interrupt (cancelTask) to show Resume/Terminate UI.
-	 * Selects the appropriate ask type based on the last relevant message.
-	 * If the user clicks Resume, resets abort flags and continues the task loop.
-	 */
-	public async presentResumableAsk(): Promise<void> {
-		const lastClineMessage = this.clineMessages
-			.slice()
-			.reverse()
-			.find((m) => !(m.ask === "resume_task" || m.ask === "resume_completed_task"))
-
-		let askType: ClineAsk
-		if (lastClineMessage?.ask === "completion_result") {
-			askType = "resume_completed_task"
-		} else {
-			askType = "resume_task"
-		}
-
-		const { response, text, images } = await this.ask(askType)
-
-		// If user clicked Resume (not Terminate), reset abort flags and continue
-		if (response === "yesButtonClicked" || response === "messageResponse") {
-			// Reset abort flags to allow the loop to continue
-			this.resetAbortAndStreamingState()
-
-			// Prepare content for resuming the task loop
-			let userContent: Anthropic.Messages.ContentBlockParam[] = []
-
-			if (response === "messageResponse" && text) {
-				// User provided additional instructions
-				await this.say("user_feedback", text, images)
-				userContent.push({
-					type: "text",
-					text: `\n\nNew instructions for task continuation:\n<user_message>\n${text}\n</user_message>`,
-				})
-				if (images && images.length > 0) {
-					userContent.push(...formatResponse.imageBlocks(images))
-				}
-			} else {
-				// Simple resume with no new instructions
-				userContent.push({
-					type: "text",
-					text: "[TASK RESUMPTION] Resuming task...",
-				})
-			}
-
-			// Continue the task loop
-			await this.initiateTaskLoop(userContent)
-		}
-		// If user clicked Terminate (noButtonClicked), do nothing - task stays aborted
-	}
-
 	public async abortTask(isAbandoned = false) {
 		// Aborting task
 
@@ -1637,17 +1549,12 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 		this.abort = true
 		this.emit(RooCodeEventName.TaskAborted)
 
-		// Only dispose if this is a hard abort (abandoned)
-		// For soft abort (user cancel), keep the instance alive so we can present a resumable ask
-		if (isAbandoned) {
-			try {
-				this.dispose() // Call the centralized dispose method
-			} catch (error) {
-				console.error(`Error during task ${this.taskId}.${this.instanceId} disposal:`, error)
-				// Don't rethrow - we want abort to always succeed
-			}
+		try {
+			this.dispose() // Call the centralized dispose method
+		} catch (error) {
+			console.error(`Error during task ${this.taskId}.${this.instanceId} disposal:`, error)
+			// Don't rethrow - we want abort to always succeed
 		}
-
 		// Save the countdown message in the automatic retry or other content.
 		try {
 			// Save the countdown message in the automatic retry or other content.