Merge branch 'zoo-port/nag-removals' into zoo-port/integration

# Conflicts:
#	packages/types/src/vscode-extension-host.ts
#	webview-ui/src/components/chat/ChatView.tsx

Author: allquixotic

packages/types/src/global-settings.ts

@@ -83,10 +83,8 @@ export const globalSettingsSchema = z.object({
 	listApiConfigMeta: z.array(providerSettingsEntrySchema).optional(),
 	pinnedApiConfigs: z.record(z.string(), z.boolean()).optional(),
 
-	lastShownAnnouncementId: z.string().optional(),
 	customInstructions: z.string().optional(),
 	taskHistory: z.array(historyItemSchema).optional(),
-	dismissedUpsells: z.array(z.string()).optional(),
 
 	// Image generation settings (experimental) - flattened for simplicity
 	imageGenerationProvider: z.enum(["openrouter", "roo"]).optional(),
@@ -326,8 +324,6 @@ export const isGlobalStateKey = (key: string): key is Keys<GlobalState> =>
 export const EVALS_SETTINGS: RooCodeSettings = {
 	apiProvider: "openrouter",
 
-	lastShownAnnouncementId: "jul-09-2025-3-23-0",
-
 	pinnedApiConfigs: {},
 
 	autoApprovalEnabled: true,

packages/types/src/vscode-extension-host.ts

@@ -89,7 +89,6 @@ export interface ExtensionMessage {
 		| "showEditMessageDialog"
 		| "commands"
 		| "insertTextIntoTextarea"
-		| "dismissedUpsells"
 		| "organizationSwitchResult"
 		| "interactionRequired"
 		| "customToolsResult"
@@ -185,7 +184,6 @@ export interface ExtensionMessage {
 	context?: string
 	commands?: Command[]
 	queuedMessages?: QueuedMessage[]
-	list?: string[] // For dismissedUpsells
 	organizationId?: string | null // For organizationSwitchResult
 	tools?: SerializedCustomToolDefinition[] // For customToolsResult
 	skills?: SkillMetadata[] // For skills response
@@ -273,7 +271,6 @@ export type ExtensionState = Pick<
 	| "listApiConfigMeta"
 	| "pinnedApiConfigs"
 	| "customInstructions"
-	| "dismissedUpsells"
 	| "autoApprovalEnabled"
 	| "yoloMode"
 	| "alwaysAllowReadOnly"
@@ -337,7 +334,6 @@ export type ExtensionState = Pick<
 	currentTaskTodos?: TodoItem[] // Initial todos for the current task
 	apiConfiguration: ProviderSettings
 	uriScheme?: string
-	shouldShowAnnouncement: boolean
 	activeConversations?: ActiveConversationSummary[]
 
 	taskHistory: HistoryItem[]
@@ -390,7 +386,6 @@ export type ExtensionState = Pick<
 	hasOpenedModeSelector: boolean
 	openRouterImageApiKey?: string
 	messageQueue?: QueuedMessage[]
-	lastShownAnnouncementId?: string
 	apiModelId?: string
 	mcpServers?: McpServer[]
 	mdmCompliant?: boolean
@@ -455,7 +450,6 @@ export interface WebviewMessage {
 		| "askResponse"
 		| "terminalOperation"
 		| "clearTask"
-		| "didShowAnnouncement"
 		| "selectImages"
 		| "exportCurrentTask"
 		| "shareCurrentTask"
@@ -578,8 +572,6 @@ export interface WebviewMessage {
 		| "queueMessage"
 		| "removeQueuedMessage"
 		| "editQueuedMessage"
-		| "dismissUpsell"
-		| "getDismissedUpsells"
 		| "openMarkdownPreview"
 		| "updateSettings"
 		| "allowedCommands"
@@ -675,8 +667,6 @@ export interface WebviewMessage {
 	visibility?: ShareVisibility // For share visibility
 	hasContent?: boolean // For checkRulesDirectoryResult
 	checkOnly?: boolean // For deleteCustomMode check
-	upsellId?: string // For dismissUpsell
-	list?: string[] // For dismissedUpsells response
 	organizationId?: string | null // For organization switching
 	useProviderSignup?: boolean // For rooCloudSignIn to use provider signup flow
 	codeIndexSettings?: {

src/core/webview/ClineProvider.ts

@@ -174,7 +174,6 @@ export class ClineProvider
 
 	public isViewLaunched = false
 	public settingsImportedAt?: number
-	public readonly latestAnnouncementId = "apr-2026-v3.53.0-community-handoff-gpt55-opus47" // v3.53.0 Community handoff, GPT-5.5, Claude Opus 4.7, checkpoint navigation
 	public readonly providerSettingsManager: ProviderSettingsManager
 	public readonly customModesManager: CustomModesManager
 
@@ -2312,7 +2311,6 @@ export class ClineProvider
 
 		const {
 			apiConfiguration,
-			lastShownAnnouncementId,
 			customInstructions,
 			alwaysAllowReadOnly,
 			alwaysAllowReadOnlyOutsideWorkspace,
@@ -2484,8 +2482,6 @@ export class ClineProvider
 			ttsSpeed: ttsSpeed ?? 1.0,
 			enableCheckpoints: enableCheckpoints ?? true,
 			checkpointTimeout: checkpointTimeout ?? DEFAULT_CHECKPOINT_TIMEOUT_SECONDS,
-			shouldShowAnnouncement:
-				telemetrySetting !== "unset" && lastShownAnnouncementId !== this.latestAnnouncementId,
 			allowedCommands: mergedAllowedCommands,
 			deniedCommands: mergedDeniedCommands,
 			soundVolume: soundVolume ?? 0.5,
@@ -2589,10 +2585,7 @@ export class ClineProvider
 	 */
 
 	async getState(): Promise<
-		Omit<
-			ExtensionState,
-			"clineMessages" | "renderContext" | "hasOpenedModeSelector" | "version" | "shouldShowAnnouncement"
-		>
+		Omit<ExtensionState, "clineMessages" | "renderContext" | "hasOpenedModeSelector" | "version">
 	> {
 		const stateValues = this.contextProxy.getValues()
 		const customModes = await this.customModesManager.getCustomModes()
@@ -2663,7 +2656,6 @@ export class ClineProvider
 		// Return the same structure as before.
 		return {
 			apiConfiguration: providerSettings,
-			lastShownAnnouncementId: stateValues.lastShownAnnouncementId,
 			customInstructions: stateValues.customInstructions,
 			apiModelId: stateValues.apiModelId,
 			yoloMode: stateValues.yoloMode ?? false,

src/core/webview/__tests__/ClineProvider.spec.ts

@@ -521,7 +521,6 @@ describe("ClineProvider", () => {
 			version: "1.0.0",
 			clineMessages: [],
 			taskHistory: [],
-			shouldShowAnnouncement: false,
 			apiConfiguration: {
 				apiProvider: "openrouter",
 			},

src/core/webview/webviewMessageHandler.ts

@@ -801,10 +801,6 @@ export const webviewMessageHandler = async (
 			await provider.clearTask()
 			await provider.postStateToWebview()
 			break
-		case "didShowAnnouncement":
-			await updateGlobalState("lastShownAnnouncementId", provider.latestAnnouncementId)
-			await provider.postStateToWebview()
-			break
 		case "selectImages":
 			const images = await selectImages()
 			await provider.postMessageToWebview({
@@ -3333,41 +3329,6 @@ export const webviewMessageHandler = async (
 			break
 		}
 
-		case "dismissUpsell": {
-			if (message.upsellId) {
-				try {
-					// Get current list of dismissed upsells
-					const dismissedUpsells = getGlobalState("dismissedUpsells") || []
-
-					// Add the new upsell ID if not already present
-					let updatedList = dismissedUpsells
-					if (!dismissedUpsells.includes(message.upsellId)) {
-						updatedList = [...dismissedUpsells, message.upsellId]
-						await updateGlobalState("dismissedUpsells", updatedList)
-					}
-
-					// Send updated list back to webview (use the already computed updatedList)
-					await provider.postMessageToWebview({
-						type: "dismissedUpsells",
-						list: updatedList,
-					})
-				} catch (error) {
-					// Fail silently as per Bruno's comment - it's OK to fail silently in this case
-					provider.log(`Failed to dismiss upsell: ${error instanceof Error ? error.message : String(error)}`)
-				}
-			}
-			break
-		}
-		case "getDismissedUpsells": {
-			// Send the current list of dismissed upsells to the webview
-			const dismissedUpsells = getGlobalState("dismissedUpsells") || []
-			await provider.postMessageToWebview({
-				type: "dismissedUpsells",
-				list: dismissedUpsells,
-			})
-			break
-		}
-
 		case "openMarkdownPreview": {
 			if (message.text) {
 				try {

webview-ui/src/App.tsx

@@ -55,7 +55,6 @@ const App = () => {
 		didHydrateState,
 		showWelcome,
 		settingsImportedAt,
-		shouldShowAnnouncement,
 		telemetrySetting,
 		telemetryKey,
 		machineId,
@@ -66,7 +65,6 @@ const App = () => {
 	// Create a persistent state manager
 	const marketplaceStateManager = useMemo(() => new MarketplaceViewStateManager(), [])
 
-	const [showAnnouncement, setShowAnnouncement] = useState(false)
 	const [tab, setTab] = useState<Tab>("chat")
 	const handledImportRef = useRef<number | undefined>(undefined)
 
@@ -164,13 +162,6 @@ const App = () => {
 
 	useEvent("message", onMessage)
 
-	useEffect(() => {
-		if (shouldShowAnnouncement && tab === "chat") {
-			setShowAnnouncement(true)
-			vscode.postMessage({ type: "didShowAnnouncement" })
-		}
-	}, [shouldShowAnnouncement, tab])
-
 	useEffect(() => {
 		const isRecoverableTab = tab === "settings" || tab === "marketplace"
 
@@ -246,12 +237,7 @@ const App = () => {
 					targetTab={currentMarketplaceTab as "mcp" | "mode" | undefined}
 				/>
 			)}
-			<ChatView
-				ref={chatViewRef}
-				isHidden={tab !== "chat"}
-				showAnnouncement={showAnnouncement}
-				hideAnnouncement={() => setShowAnnouncement(false)}
-			/>
+			<ChatView ref={chatViewRef} isHidden={tab !== "chat"} />
 			{deleteMessageDialogState.hasCheckpoint ? (
 				<MemoizedCheckpointRestoreDialog
 					open={deleteMessageDialogState.isOpen}

webview-ui/src/__tests__/App.spec.tsx

@@ -166,7 +166,6 @@ describe("App", () => {
 		mockUseExtensionState.mockReturnValue({
 			didHydrateState: true,
 			showWelcome: false,
-			shouldShowAnnouncement: false,
 			experiments: {},
 			language: "en",
 			telemetrySetting: "enabled",
@@ -191,7 +190,6 @@ describe("App", () => {
 	const createSetupIncompleteState = () => ({
 		didHydrateState: true,
 		showWelcome: true,
-		shouldShowAnnouncement: false,
 		experiments: {},
 		language: "en",
 		telemetrySetting: "enabled",
@@ -209,7 +207,6 @@ describe("App", () => {
 		mockUseExtensionState.mockReturnValue({
 			didHydrateState: true,
 			showWelcome: true,
-			shouldShowAnnouncement: false,
 			experiments: {},
 			language: "en",
 			telemetrySetting: "enabled",
@@ -242,7 +239,6 @@ describe("App", () => {
 		mockUseExtensionState.mockReturnValue({
 			didHydrateState: true,
 			showWelcome: true,
-			shouldShowAnnouncement: false,
 			experiments: {},
 			language: "en",
 			telemetrySetting: "enabled",
@@ -262,7 +258,6 @@ describe("App", () => {
 		mockUseExtensionState.mockReturnValue({
 			didHydrateState: true,
 			showWelcome: true,
-			shouldShowAnnouncement: false,
 			experiments: {},
 			language: "en",
 			telemetrySetting: "enabled",