Merge branch 'main' into flex-working1

Author: mechanicmuthu

CHANGELOG.md

@@ -1,5 +1,29 @@
 # Roo Code Changelog
 
+## [3.25.13] - 2025-08-12
+
+- Add Sonnet 1M context checkbox to Bedrock
+- Fix: add --no-messages flag to ripgrep to suppress file access errors (#6756 by @R-omk, PR by @app/roomote)
+- Add support for AGENT.md alongside AGENTS.md (#6912 by @Brendan-Z, PR by @app/roomote)
+- Remove deprecated GPT-4.5 Preview model (thanks @PeterDaveHello!)
+
+## [3.25.12] - 2025-08-12
+
+- Update: Claude Sonnet 4 context window configurable to 1 million tokens in Anthropic provider (thanks @daniel-lxs!)
+- Add: Minimal reasoning support to OpenRouter (thanks @daniel-lxs!)
+- Fix: Add configurable API request timeout for local providers (#6521 by @dabockster, PR by @app/roomote)
+- Fix: Add --no-sandbox flag to browser launch options (#6632 by @QuinsZouls, PR by @QuinsZouls)
+- Fix: Ensure JSON files respect .rooignore during indexing (#6690 by @evermoving, PR by @app/roomote)
+- Add: New Chutes provider models (#6698 by @fstandhartinger, PR by @app/roomote)
+- Add: OpenAI gpt-oss models to Amazon Bedrock dropdown (#6752 by @josh-clanton-powerschool, PR by @app/roomote)
+- Fix: Correct tool repetition detector to not block first tool call when limit is 1 (#6834 by @NaccOll, PR by @app/roomote)
+- Fix: Improve checkpoint service initialization handling (thanks @NaccOll!)
+- Update: Improve zh-TW Traditional Chinese locale (thanks @PeterDaveHello!)
+- Add: Task expand and collapse translations (thanks @app/roomote!)
+- Update: Exclude GPT-5 models from 20% context window output token cap (thanks @app/roomote!)
+- Fix: Truncate long model names in model selector to prevent overflow (thanks @app/roomote!)
+- Add: Requesty base url support (thanks @requesty-JohnCosta27!)
+
 ## [3.25.11] - 2025-08-11
 
 - Add: Native OpenAI provider support for Codex Mini model (#5386 by @KJ7LNW, PR by @daniel-lxs)

packages/types/src/global-settings.ts

@@ -29,13 +29,6 @@ export const DEFAULT_WRITE_DELAY_MS = 1000
  */
 export const DEFAULT_TERMINAL_OUTPUT_CHARACTER_LIMIT = 50_000
 
-/**
- * Default timeout for background usage collection in milliseconds.
- * This timeout prevents the background task from running indefinitely
- * when collecting usage data from streaming API responses.
- */
-export const DEFAULT_USAGE_COLLECTION_TIMEOUT_MS = 30_000
-
 /**
  * GlobalSettings
  */

packages/types/src/provider-settings.ts

@@ -3,6 +3,9 @@ import { z } from "zod"
 import { reasoningEffortsSchema, verbosityLevelsSchema, modelInfoSchema } from "./model.js"
 import { codebaseIndexProviderSchema } from "./codebase-index.js"
 
+// Bedrock Claude Sonnet 4 model ID that supports 1M context
+export const BEDROCK_CLAUDE_SONNET_4_MODEL_ID = "anthropic.claude-sonnet-4-20250514-v1:0"
+
 // Extended schema that includes "minimal" for GPT-5 models
 export const extendedReasoningEffortsSchema = z.union([reasoningEffortsSchema, z.literal("minimal")])
 
@@ -102,6 +105,7 @@ const anthropicSchema = apiModelIdProviderModelSchema.extend({
 	apiKey: z.string().optional(),
 	anthropicBaseUrl: z.string().optional(),
 	anthropicUseAuthToken: z.boolean().optional(),
+	anthropicBeta1MContext: z.boolean().optional(), // Enable 'context-1m-2025-08-07' beta for 1M context window
 })
 
 const claudeCodeSchema = apiModelIdProviderModelSchema.extend({
@@ -137,6 +141,7 @@ const bedrockSchema = apiModelIdProviderModelSchema.extend({
 	awsModelContextWindow: z.number().optional(),
 	awsBedrockEndpointEnabled: z.boolean().optional(),
 	awsBedrockEndpoint: z.string().optional(),
+	awsBedrock1MContext: z.boolean().optional(), // Enable 'context-1m-2025-08-07' beta for 1M context window
 })
 
 const vertexSchema = apiModelIdProviderModelSchema.extend({
@@ -228,6 +233,7 @@ const unboundSchema = baseProviderSettingsSchema.extend({
 })
 
 const requestySchema = baseProviderSettingsSchema.extend({
+	requestyBaseUrl: z.string().optional(),
 	requestyApiKey: z.string().optional(),
 	requestyModelId: z.string().optional(),
 })

packages/types/src/providers/anthropic.ts

@@ -8,15 +8,25 @@ export const anthropicDefaultModelId: AnthropicModelId = "claude-sonnet-4-202505
 export const anthropicModels = {
 	"claude-sonnet-4-20250514": {
 		maxTokens: 64_000, // Overridden to 8k if `enableReasoningEffort` is false.
-		contextWindow: 200_000,
+		contextWindow: 200_000, // Default 200K, extendable to 1M with beta flag 'context-1m-2025-08-07'
 		supportsImages: true,
 		supportsComputerUse: true,
 		supportsPromptCache: true,
-		inputPrice: 3.0, // $3 per million input tokens
-		outputPrice: 15.0, // $15 per million output tokens
+		inputPrice: 3.0, // $3 per million input tokens (≤200K context)
+		outputPrice: 15.0, // $15 per million output tokens (≤200K context)
 		cacheWritesPrice: 3.75, // $3.75 per million tokens
 		cacheReadsPrice: 0.3, // $0.30 per million tokens
 		supportsReasoningBudget: true,
+		// Tiered pricing for extended context (requires beta flag 'context-1m-2025-08-07')
+		tiers: [
+			{
+				contextWindow: 1_000_000, // 1M tokens with beta flag
+				inputPrice: 6.0, // $6 per million input tokens (>200K context)
+				outputPrice: 22.5, // $22.50 per million output tokens (>200K context)
+				cacheWritesPrice: 7.5, // $7.50 per million tokens (>200K context)
+				cacheReadsPrice: 0.6, // $0.60 per million tokens (>200K context)
+			},
+		],
 	},
 	"claude-opus-4-1-20250805": {
 		maxTokens: 8192,

packages/types/src/providers/bedrock.ts

@@ -221,6 +221,26 @@ export const bedrockModels = {
 		inputPrice: 1.35,
 		outputPrice: 5.4,
 	},
+	"openai.gpt-oss-20b-1:0": {
+		maxTokens: 8192,
+		contextWindow: 128_000,
+		supportsImages: false,
+		supportsComputerUse: false,
+		supportsPromptCache: false,
+		inputPrice: 0.5,
+		outputPrice: 1.5,
+		description: "GPT-OSS 20B - Optimized for low latency and local/specialized use cases",
+	},
+	"openai.gpt-oss-120b-1:0": {
+		maxTokens: 8192,
+		contextWindow: 128_000,
+		supportsImages: false,
+		supportsComputerUse: false,
+		supportsPromptCache: false,
+		inputPrice: 2.0,
+		outputPrice: 6.0,
+		description: "GPT-OSS 120B - Production-ready, general-purpose, high-reasoning model",
+	},
 	"meta.llama3-3-70b-instruct-v1:0": {
 		maxTokens: 8192,
 		contextWindow: 128_000,

packages/types/src/providers/openai.ts

@@ -218,15 +218,6 @@ export const openAiNativeModels = {
 		outputPrice: 4.4,
 		cacheReadsPrice: 0.55,
 	},
-	"gpt-4.5-preview": {
-		maxTokens: 16_384,
-		contextWindow: 128_000,
-		supportsImages: true,
-		supportsPromptCache: true,
-		inputPrice: 75,
-		outputPrice: 150,
-		cacheReadsPrice: 37.5,
-	},
 	"gpt-4o": {
 		maxTokens: 16_384,
 		contextWindow: 128_000,

pnpm-lock.yaml

@@ -58,6 +58,54 @@ if (!unlink && watch) {
 	}
 }
 
+function generateNpmPackageJson(sourcePath, npmPath) {
+	const npmDir = path.join(sourcePath, npmPath)
+	const npmPackagePath = path.join(npmDir, "package.json")
+	const npmMetadataPath = path.join(npmDir, "package.metadata.json")
+	const monorepoPackagePath = path.join(sourcePath, "package.json")
+
+	if (fs.existsSync(npmPackagePath)) {
+		console.log(`  ✓ npm/package.json already exists`)
+		return
+	}
+
+	if (!fs.existsSync(npmMetadataPath)) {
+		console.log(`  ⚠ No package.metadata.json found, skipping npm package.json generation`)
+		return
+	}
+
+	try {
+		console.log(`  📦 Generating npm/package.json...`)
+		const monorepoPackage = JSON.parse(fs.readFileSync(monorepoPackagePath, "utf8"))
+		const npmMetadata = JSON.parse(fs.readFileSync(npmMetadataPath, "utf8"))
+
+		const npmPackage = {
+			...npmMetadata,
+			type: "module",
+			dependencies: monorepoPackage.dependencies || {},
+			main: "./dist/index.cjs",
+			module: "./dist/index.js",
+			types: "./dist/index.d.ts",
+			exports: {
+				".": {
+					types: "./dist/index.d.ts",
+					import: "./dist/index.js",
+					require: {
+						types: "./dist/index.d.cts",
+						default: "./dist/index.cjs",
+					},
+				},
+			},
+			files: ["dist"],
+		}
+
+		fs.writeFileSync(npmPackagePath, JSON.stringify(npmPackage, null, 2) + "\n")
+		console.log(`  ✓ Generated npm/package.json for ${npmPackage.name}`)
+	} catch (error) {
+		console.error(`  ✗ Failed to generate npm/package.json: ${error.message}`)
+	}
+}
+
 function linkPackage(pkg) {
 	const sourcePath = path.resolve(__dirname, "..", pkg.sourcePath)
 	const targetPath = path.resolve(__dirname, "..", pkg.targetPath)
@@ -78,6 +126,11 @@ function linkPackage(pkg) {
 		}
 	}
 
+	// If npmPath is specified, check if we need to generate package.json.
+	if (pkg.npmPath) {
+		generateNpmPackageJson(sourcePath, pkg.npmPath)
+	}
+
 	// Create symlink.
 	fs.rmSync(targetPath, { recursive: true, force: true })
 	fs.mkdirSync(path.dirname(targetPath), { recursive: true })