fix: merge history

Author: edelauna

CHANGELOG.md

@@ -1314,6 +1314,7 @@ The entries below are preserved from the upstream Roo Code project history befor
 - Reposition Add Image button inside ChatTextArea (thanks @roomote!)
 - Bring back a way to temporarily and globally pause auto-approve without losing your toggle state (thanks @brunobergher!)
 - Makes text area buttons appear only when there's text (thanks @brunobergher!)
+- CONTRIBUTING.md tweaks and issue template rewrite (thanks @hannesrudolph!)
 - Bump axios from 1.9.0 to 1.12.0 (thanks @dependabot!)
 
 ## [3.28.2] - 2025-09-14
@@ -1773,6 +1774,7 @@ The entries below are preserved from the upstream Roo Code project history befor
 - Fix Claude model detection by name for API protocol selection (thanks @daniel-lxs!)
 - Move marketplace icon from overflow menu to top navigation
 - Optional setting to prevent completion with open todos
+- Added YouTube to website footer (thanks @thill2323!)
 
 ## [3.23.14] - 2025-07-17
 
@@ -2166,6 +2168,7 @@ The entries below are preserved from the upstream Roo Code project history befor
 - Fix bug with context condensing in Amazon Bedrock
 - Fix UTF-8 encoding in ExecaTerminalProcess (thanks @mr-ryan-james!)
 - Set sidebar name bugfix (thanks @chrarnoldus!)
+- Fix link to CONTRIBUTING.md in feature request template (thanks @cannuri!)
 - Add task metadata to Unbound and improve caching logic (thanks @pugazhendhi-m!)
 
 ## [3.19.0] - 2025-05-29
@@ -3133,6 +3136,7 @@ The entries below are preserved from the upstream Roo Code project history befor
 - Ask and Architect modes can now edit markdown files
 - Custom modes can now be restricted to specific file patterns (for example, a technical writer who can only edit markdown files 👋)
 - Support for configuring the Bedrock provider with AWS Profiles
+- New Roo Code community Discord at https://roocode.com/discord!
 
 ## [3.2.8]
 
@@ -3172,6 +3176,8 @@ The entries below are preserved from the upstream Roo Code project history befor
     - Create specialized assistants for any workflow
     - Just type "Create a new mode for <X>" or visit the Prompts tab in the top menu to get started
 
+Join us at https://www.reddit.com/r/RooCode to share your custom modes and be part of our next chapter!
+
 ## [3.1.7]
 
 - DeepSeek-R1 support (thanks @philipnext!)
@@ -3219,8 +3225,12 @@ The entries below are preserved from the upstream Roo Code project history befor
 
 ## [3.0.1]
 
+- Fix the reddit link and a small visual glitch in the chat input
+
 ## [3.0.0]
 
+- This release adds chat modes! Now you can ask Roo Code questions about system architecture or the codebase without immediately jumping into writing code. You can even assign different API configuration profiles to each mode if you prefer to use different models for thinking vs coding. Would love feedback in the new Roo Code Reddit! https://www.reddit.com/r/RooCode
+
 ## [2.2.46]
 
 - Only parse @-mentions in user input (not in files)

webview-ui/src/context/ExtensionStateContext.tsx

@@ -118,6 +118,7 @@ export interface ExtensionStateContextType extends ExtensionState {
 	setMaxImageFileSize: (value: number) => void
 	maxTotalImageSize: number
 	setMaxTotalImageSize: (value: number) => void
+	machineId?: string
 	pinnedApiConfigs?: Record<string, boolean>
 	setPinnedApiConfigs: (value: Record<string, boolean>) => void
 	togglePinnedApiConfig: (configName: string) => void
@@ -143,9 +144,6 @@ export interface ExtensionStateContextType extends ExtensionState {
 	showWorktreesInHomeScreen: boolean
 	setShowWorktreesInHomeScreen: (value: boolean) => void
 	skills?: SkillMetadata[]
-	telemetrySetting: ExtensionState["telemetrySetting"]
-	telemetryKey?: string
-	machineId?: string
 }
 
 export const ExtensionStateContext = createContext<ExtensionStateContextType | undefined>(undefined)
@@ -166,7 +164,7 @@ export const mergeExtensionState = (prevState: ExtensionState, newState: Partial
 	const rest = { ...prevRest, ...newRest }
 
 	// Protect clineMessages from stale state pushes using sequence numbering.
-	// Multiple async event sources (settings, task streaming) can trigger
+	// Multiple async event sources (cloud auth, settings, task streaming) can trigger
 	// concurrent state pushes. If a stale push arrives after a newer one, its clineMessages
 	// would overwrite the newer messages. The sequence number prevents this by only applying
 	// clineMessages when the incoming seq is strictly greater than the last applied seq.
@@ -224,6 +222,7 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode
 		maxOpenTabsContext: 20,
 		maxWorkspaceFiles: 200,
 		cwd: "",
+		telemetrySetting: "unset",
 		showRooIgnoredFiles: true, // Default to showing .rooignore'd files with lock symbol (current behavior).
 		enableSubfolderRules: false, // Default to disabled - must be enabled to load rules from subdirectories
 		renderContext: "sidebar",
@@ -264,7 +263,6 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode
 		includeCurrentTime: true,
 		includeCurrentCost: true,
 		lockApiConfigAcrossModes: false,
-		telemetrySetting: "unset",
 	})
 
 	const [didHydrateState, setDidHydrateState] = useState(false)
@@ -332,6 +330,13 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode
 					if ((newState as any).includeCurrentCost !== undefined) {
 						setIncludeCurrentCost((newState as any).includeCurrentCost)
 					}
+					// Handle marketplace data if present in state message
+					if (newState.marketplaceItems !== undefined) {
+						setMarketplaceItems(newState.marketplaceItems)
+					}
+					if (newState.marketplaceInstalledMetadata !== undefined) {
+						setMarketplaceInstalledMetadata(newState.marketplaceInstalledMetadata)
+					}
 					break
 				}
 				case "action": {
@@ -375,7 +380,7 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode
 							return { ...prevState, clineMessages: newClineMessages }
 						}
 						// Log a warning if messageUpdated arrives for a timestamp not in the
-						// frontend's clineMessages. With the sequence guard in place,
+						// frontend's clineMessages. With the seq guard and cloud event isolation
 						// (layers 1+2), this should not happen under normal conditions. If it
 						// does, it signals a state synchronization issue worth investigating.
 						console.warn(
@@ -483,16 +488,15 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode
 		ttsSpeed: state.ttsSpeed,
 		writeDelayMs: state.writeDelayMs,
 		routerModels: extensionRouterModels,
-		profileThresholds: state.profileThresholds ?? {},
-		organizationSettingsVersion: state.organizationSettingsVersion ?? -1,
 		cloudIsAuthenticated: state.cloudIsAuthenticated ?? false,
-		cloudOrganizations: state.cloudOrganizations,
-		sharingEnabled: state.sharingEnabled ?? false,
-		publicSharingEnabled: state.publicSharingEnabled ?? false,
+		cloudOrganizations: state.cloudOrganizations ?? [],
+		organizationSettingsVersion: state.organizationSettingsVersion ?? -1,
 		marketplaceItems,
 		marketplaceInstalledMetadata,
+		profileThresholds: state.profileThresholds ?? {},
 		alwaysAllowFollowupQuestions,
 		followupAutoApproveTimeoutMs,
+		taskSyncEnabled: state.taskSyncEnabled,
 		setExperimentEnabled: (id, enabled) =>
 			setState((prevState) => ({ ...prevState, experiments: { ...prevState.experiments, [id]: enabled } })),
 		setApiConfiguration,
@@ -530,8 +534,7 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode
 			setState((prevState) => ({ ...prevState, terminalShellIntegrationDisabled: value })),
 		setTerminalZdotdir: (value) => setState((prevState) => ({ ...prevState, terminalZdotdir: value })),
 		setMcpEnabled: (value) => setState((prevState) => ({ ...prevState, mcpEnabled: value })),
-		taskSyncEnabled: state.taskSyncEnabled ?? false,
-		setTaskSyncEnabled: (value) => setState((prevState) => ({ ...prevState, taskSyncEnabled: value })),
+		setTaskSyncEnabled: (value) => setState((prevState) => ({ ...prevState, taskSyncEnabled: value }) as any),
 		setCurrentApiConfigName: (value) => setState((prevState) => ({ ...prevState, currentApiConfigName: value })),
 		setListApiConfigMeta,
 		setMode: (value: Mode) => setState((prevState) => ({ ...prevState, mode: value })),