zgsm-ai
diff --git a/‎apps/web-roo-code/src/components/providers/google-analytics-provider.tsx‎
Lines changed: 87 additions & 26 deletions b/‎apps/web-roo-code/src/components/providers/google-analytics-provider.tsx‎
Lines changed: 87 additions & 26 deletions
diff --git a/‎packages/types/src/codebase-index.ts‎
Lines changed: 3 additions & 1 deletion b/‎packages/types/src/codebase-index.ts‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎packages/types/src/global-settings.ts‎
Lines changed: 1 addition & 0 deletions b/‎packages/types/src/global-settings.ts‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎packages/types/src/provider-settings.ts‎
Lines changed: 2 additions & 7 deletions b/‎packages/types/src/provider-settings.ts‎
Lines changed: 2 additions & 7 deletions
diff --git a/‎packages/types/src/providers/chutes.ts‎
Lines changed: 2 additions & 0 deletions b/‎packages/types/src/providers/chutes.ts‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎packages/types/src/providers/fireworks.ts‎
Lines changed: 22 additions & 0 deletions b/‎packages/types/src/providers/fireworks.ts‎
Lines changed: 22 additions & 0 deletions
@@ -8,72 +8,133 @@ import { hasConsent, onConsentChange } from "@/lib/analytics/consent-manager"
 const GTM_ID = "AW-17391954825"
 
 /**
- * Google Analytics Provider
- * Only loads Google Tag Manager after user gives consent
+ * Google Analytics Provider with Consent Mode v2
+ * Implements cookieless pings and advanced consent management
  */
 export function GoogleAnalyticsProvider({ children }: { children: React.ReactNode }) {
 	const [shouldLoad, setShouldLoad] = useState(false)
 
 	useEffect(() => {
+		// Initialize consent defaults BEFORE loading gtag.js (required for Consent Mode v2)
+		initializeConsentDefaults()
+
 		// Check initial consent status
 		if (hasConsent()) {
 			setShouldLoad(true)
-			initializeGoogleAnalytics()
+			updateConsentGranted()
 		}
 
 		// Listen for consent changes
 		const unsubscribe = onConsentChange((consented) => {
-			if (consented && !shouldLoad) {
-				setShouldLoad(true)
-				initializeGoogleAnalytics()
+			if (consented) {
+				if (!shouldLoad) {
+					setShouldLoad(true)
+				}
+				updateConsentGranted()
+			} else {
+				updateConsentDenied()
 			}
 		})
 
 		return unsubscribe
-	}, [shouldLoad])
+		// eslint-disable-next-line react-hooks/exhaustive-deps -- shouldLoad intentionally omitted to prevent re-initialization loop
+	}, [])
 
-	const initializeGoogleAnalytics = () => {
-		// Initialize the dataLayer and gtag function
+	const initializeConsentDefaults = () => {
+		// Set up consent defaults before gtag loads (Consent Mode v2 requirement)
 		if (typeof window !== "undefined") {
 			window.dataLayer = window.dataLayer || []
 			window.gtag = function (...args: GtagArgs) {
 				window.dataLayer.push(args)
 			}
-			window.gtag("js", new Date())
-			window.gtag("config", GTM_ID)
+
+			// Set default consent state to 'denied' with cookieless pings enabled
+			window.gtag("consent", "default", {
+				ad_storage: "denied",
+				ad_user_data: "denied",
+				ad_personalization: "denied",
+				analytics_storage: "denied",
+				functionality_storage: "denied",
+				personalization_storage: "denied",
+				security_storage: "granted", // Always granted for security
+				wait_for_update: 500, // Wait 500ms for consent before sending data
+			})
+
+			// Enable cookieless pings for Google Ads
+			window.gtag("set", "url_passthrough", true)
 		}
 	}
 
-	// Only render Google Analytics scripts if consent is given
-	if (!shouldLoad) {
-		return <>{children}</>
+	const updateConsentGranted = () => {
+		// User accepted cookies - update consent to granted
+		if (typeof window !== "undefined" && window.gtag) {
+			window.gtag("consent", "update", {
+				ad_storage: "granted",
+				ad_user_data: "granted",
+				ad_personalization: "granted",
+				analytics_storage: "granted",
+				functionality_storage: "granted",
+				personalization_storage: "granted",
+			})
+		}
 	}
 
+	const updateConsentDenied = () => {
+		// User declined cookies - keep consent denied (cookieless pings still work)
+		if (typeof window !== "undefined" && window.gtag) {
+			window.gtag("consent", "update", {
+				ad_storage: "denied",
+				ad_user_data: "denied",
+				ad_personalization: "denied",
+				analytics_storage: "denied",
+				functionality_storage: "denied",
+				personalization_storage: "denied",
+			})
+		}
+	}
+
+	// Always render scripts (Consent Mode v2 needs gtag loaded even without consent)
+	// Cookieless pings will work with denied consent
+
 	return (
 		<>
-			{/* Google tag (gtag.js) - Only loads after consent */}
+			{/* Google tag (gtag.js) - Loads immediately for Consent Mode v2 */}
 			<Script
 				src={`https://www.googletagmanager.com/gtag/js?id=${GTM_ID}`}
 				strategy="afterInteractive"
 				onLoad={() => {
-					console.log("Google Analytics loaded with consent")
+					// Initialize gtag config after script loads
+					if (typeof window !== "undefined" && window.gtag) {
+						window.gtag("js", new Date())
+						window.gtag("config", GTM_ID)
+					}
 				}}
 			/>
-			<Script id="google-analytics-init" strategy="afterInteractive">
-				{`
-					window.dataLayer = window.dataLayer || [];
-					function gtag(){dataLayer.push(arguments);}
-					gtag('js', new Date());
-					gtag('config', '${GTM_ID}');
-				`}
-			</Script>
 			{children}
 		</>
 	)
 }
 
-// Type definitions for Google Analytics
-type GtagArgs = ["js", Date] | ["config", string, GtagConfig?] | ["event", string, GtagEventParameters?]
+// Type definitions for Google Analytics with Consent Mode v2
+type ConsentState = "granted" | "denied"
+
+interface ConsentParams {
+	ad_storage?: ConsentState
+	ad_user_data?: ConsentState
+	ad_personalization?: ConsentState
+	analytics_storage?: ConsentState
+	functionality_storage?: ConsentState
+	personalization_storage?: ConsentState
+	security_storage?: ConsentState
+	wait_for_update?: number
+}
+
+type GtagArgs =
+	| ["js", Date]
+	| ["config", string, GtagConfig?]
+	| ["event", string, GtagEventParameters?]
+	| ["consent", "default" | "update", ConsentParams]
+	| ["set", string, unknown]
 
 interface GtagConfig {
 	[key: string]: unknown
 
@@ -22,7 +22,7 @@ export const codebaseIndexConfigSchema = z.object({
 	codebaseIndexEnabled: z.boolean().optional(),
 	codebaseIndexQdrantUrl: z.string().optional(),
 	codebaseIndexEmbedderProvider: z
-		.enum(["openai", "ollama", "openai-compatible", "gemini", "mistral", "vercel-ai-gateway"])
+		.enum(["openai", "ollama", "openai-compatible", "gemini", "mistral", "vercel-ai-gateway", "openrouter"])
 		.optional(),
 	codebaseIndexEmbedderBaseUrl: z.string().optional(),
 	codebaseIndexEmbedderModelId: z.string().optional(),
@@ -51,6 +51,7 @@ export const codebaseIndexModelsSchema = z.object({
 	gemini: z.record(z.string(), z.object({ dimension: z.number() })).optional(),
 	mistral: z.record(z.string(), z.object({ dimension: z.number() })).optional(),
 	"vercel-ai-gateway": z.record(z.string(), z.object({ dimension: z.number() })).optional(),
+	openrouter: z.record(z.string(), z.object({ dimension: z.number() })).optional(),
 })
 
 export type CodebaseIndexModels = z.infer<typeof codebaseIndexModelsSchema>
@@ -68,6 +69,7 @@ export const codebaseIndexProviderSchema = z.object({
 	codebaseIndexGeminiApiKey: z.string().optional(),
 	codebaseIndexMistralApiKey: z.string().optional(),
 	codebaseIndexVercelAiGatewayApiKey: z.string().optional(),
+	codebaseIndexOpenRouterApiKey: z.string().optional(),
 })
 
 export type CodebaseIndexProvider = z.infer<typeof codebaseIndexProviderSchema>
@@ -245,6 +245,7 @@ export const SECRET_STATE_KEYS = [
 	"codebaseIndexGeminiApiKey",
 	"codebaseIndexMistralApiKey",
 	"codebaseIndexVercelAiGatewayApiKey",
+	"codebaseIndexOpenRouterApiKey",
 	"huggingFaceApiKey",
 	"sambaNovaApiKey",
 	"zaiApiKey",
 
@@ -6,7 +6,6 @@ import {
 	anthropicModels,
 	bedrockModels,
 	cerebrasModels,
-	chutesModels,
 	claudeCodeModels,
 	deepSeekModels,
 	doubaoModels,
@@ -51,6 +50,7 @@ export const dynamicProviders = [
 	"unbound",
 	"glama",
 	"roo",
+	"chutes",
 ] as const
 
 export type DynamicProvider = (typeof dynamicProviders)[number]
@@ -122,7 +122,6 @@ export const providerNames = [
 	"anthropic",
 	"bedrock",
 	"cerebras",
-	"chutes",
 	"claude-code",
 	"doubao",
 	"deepseek",
@@ -689,11 +688,6 @@ export const MODELS_BY_PROVIDER: Record<
 		label: "Cerebras",
 		models: Object.keys(cerebrasModels),
 	},
-	chutes: {
-		id: "chutes",
-		label: "Chutes AI",
-		models: Object.keys(chutesModels),
-	},
 	"claude-code": { id: "claude-code", label: "Claude Code", models: Object.keys(claudeCodeModels) },
 	deepseek: {
 		id: "deepseek",
@@ -771,6 +765,7 @@ export const MODELS_BY_PROVIDER: Record<
 	unbound: { id: "unbound", label: "Unbound", models: [] },
 	deepinfra: { id: "deepinfra", label: "DeepInfra", models: [] },
 	"vercel-ai-gateway": { id: "vercel-ai-gateway", label: "Vercel AI Gateway", models: [] },
+	chutes: { id: "chutes", label: "Chutes AI", models: [] },
 
 	// Local providers; models discovered from localhost endpoints.
 	lmstudio: { id: "lmstudio", label: "LM Studio", models: [] },
 
@@ -417,3 +417,5 @@ export const chutesModels = {
 			"Qwen3‑VL‑235B‑A22B‑Thinking is an open‑weight MoE vision‑language model (235B total, ~22B activated) optimized for deliberate multi‑step reasoning with strong text‑image‑video understanding and long‑context capabilities.",
 	},
 } as const satisfies Record<string, ModelInfo>
+
+export const chutesDefaultModelInfo: ModelInfo = chutesModels[chutesDefaultModelId]
@@ -3,13 +3,15 @@ import type { ModelInfo } from "../model.js"
 export type FireworksModelId =
 	| "accounts/fireworks/models/kimi-k2-instruct"
 	| "accounts/fireworks/models/kimi-k2-instruct-0905"
+	| "accounts/fireworks/models/minimax-m2"
 	| "accounts/fireworks/models/qwen3-235b-a22b-instruct-2507"
 	| "accounts/fireworks/models/qwen3-coder-480b-a35b-instruct"
 	| "accounts/fireworks/models/deepseek-r1-0528"
 	| "accounts/fireworks/models/deepseek-v3"
 	| "accounts/fireworks/models/deepseek-v3p1"
 	| "accounts/fireworks/models/glm-4p5"
 	| "accounts/fireworks/models/glm-4p5-air"
+	| "accounts/fireworks/models/glm-4p6"
 	| "accounts/fireworks/models/gpt-oss-20b"
 	| "accounts/fireworks/models/gpt-oss-120b"
 
@@ -37,6 +39,16 @@ export const fireworksModels = {
 		description:
 			"Kimi K2 is a state-of-the-art mixture-of-experts (MoE) language model with 32 billion activated parameters and 1 trillion total parameters. Trained with the Muon optimizer, Kimi K2 achieves exceptional performance across frontier knowledge, reasoning, and coding tasks while being meticulously optimized for agentic capabilities.",
 	},
+	"accounts/fireworks/models/minimax-m2": {
+		maxTokens: 4096,
+		contextWindow: 204800,
+		supportsImages: false,
+		supportsPromptCache: false,
+		inputPrice: 0.3,
+		outputPrice: 1.2,
+		description:
+			"MiniMax M2 is a high-performance language model with 204.8K context window, optimized for long-context understanding and generation tasks.",
+	},
 	"accounts/fireworks/models/qwen3-235b-a22b-instruct-2507": {
 		maxTokens: 32768,
 		contextWindow: 256000,
@@ -105,6 +117,16 @@ export const fireworksModels = {
 		description:
 			"Z.ai GLM-4.5-Air with 106B total parameters and 12B active parameters. Features unified reasoning, coding, and intelligent agent capabilities.",
 	},
+	"accounts/fireworks/models/glm-4p6": {
+		maxTokens: 25344,
+		contextWindow: 198000,
+		supportsImages: false,
+		supportsPromptCache: false,
+		inputPrice: 0.55,
+		outputPrice: 2.19,
+		description:
+			"Z.ai GLM-4.6 is an advanced coding model with exceptional performance on complex programming tasks. Features improved reasoning capabilities and enhanced code generation quality, making it ideal for software development workflows.",
+	},
 	"accounts/fireworks/models/gpt-oss-20b": {
 		maxTokens: 16384,
 		contextWindow: 128000,