Merge branch 'master' into minor-aichat-patch

Author: joeizang

apps/remix-ide/src/app/plugins/remixAIPlugin.tsx

@@ -189,6 +189,7 @@ export class RemixAIPlugin extends Plugin {
     params.stream_result = false // enforce no stream result
     params.threadId = newThreadID
     params.provider = this.assistantProvider
+    _paq.push(['trackEvent', 'ai', 'remixAI', 'GenerateNewAIWorkspace'])
 
     if (useRag) {
       try {
@@ -226,6 +227,7 @@ export class RemixAIPlugin extends Plugin {
     params.stream_result = false // enforce no stream result
     params.threadId = newThreadID
     params.provider = this.assistantProvider
+    _paq.push(['trackEvent', 'ai', 'remixAI', 'WorkspaceAgentEdit'])
     if (useRag) {
       try {
         let ragContext = ""

libs/remix-ai-core/src/types/models.ts

@@ -59,6 +59,7 @@ const CompletionParams:IParams = {
   max_new_tokens: 15,
   stream_result: false,
   max_tokens: 200,
+  version: '1.0.0'
 }
 
 const InsertionParams:IParams = {
@@ -69,6 +70,7 @@ const InsertionParams:IParams = {
   stream_result: false,
   stream: false,
   model: "",
+  version: '1.0.0',
 }
 
 const GenerationParams:IParams = {
@@ -81,6 +83,7 @@ const GenerationParams:IParams = {
   model: "",
   repeat_penalty: 1.2,
   terminal_output: false,
+  version: '1.0.0',
 }
 
 const AssistantParams:IParams = GenerationParams

libs/remix-ai-core/src/types/types.ts

@@ -89,6 +89,7 @@ export interface IParams {
   model?: string;
   stop?: string[];
   chatHistory?: any[];
+  version: string;
 }
 
 export enum AIRequestType {

libs/remix-ui/app/src/lib/remix-app/components/modals/managePreferences.tsx

@@ -118,6 +118,8 @@ const ManagePreferencesDialog = (props) => {
     settings.updateMatomoAnalyticsChoice(true) // Always true for matomo Anonymous analytics
     settings.updateMatomoPerfAnalyticsChoice(switcherState.current.matPerfSwitch) // Enable/Disable Matomo Performance analytics
     settings.updateCopilotChoice(switcherState.current.remixAISwitch) // Enable/Disable RemixAI copilot
+    _paq.push(['trackEvent', 'landingPage', 'MatomoAIModal', `MatomoPerfStatus: ${switcherState.current.matPerfSwitch}`])
+    _paq.push(['trackEvent', 'landingPage', 'MatomoAIModal', `AICopilotStatus: ${switcherState.current.remixAISwitch}`])
     setVisible(false)
     props.savePreferencesFn()
   }

libs/remix-ui/app/src/lib/remix-app/components/modals/matomo.tsx

@@ -66,14 +66,17 @@ const MatomoDialog = (props: MatomoDialogProps) => {
   }, [visible])
 
   const handleAcceptAllClick = async () => {
+    _paq.push(['setConsentGiven']) // default consent to process their anonymous data
     settings.updateMatomoAnalyticsChoice(true) // Enable Matomo Anonymous analytics
     settings.updateMatomoPerfAnalyticsChoice(true) // Enable Matomo Performance analytics
     settings.updateCopilotChoice(true) // Enable RemixAI copilot
+    _paq.push(['trackEvent', 'landingPage', 'MatomoAIModal', 'AcceptClicked'])
     setVisible(false)
     props.acceptAllFn()
   }
 
   const handleManagePreferencesClick = async () => {
+    _paq.push(['trackEvent', 'landingPage', 'MatomoAIModal', 'ManagePreferencesClicked'])
     setVisible(false)
     props.managePreferencesFn()
   }

libs/remix-ui/remix-ai-assistant/src/components/remix-ui-remix-ai-assistant.tsx

@@ -130,6 +130,7 @@ export const RemixUiRemixAiAssistant = React.forwardRef<
   const refreshContext = useCallback(async (choice: typeof contextChoice) => {
     try {
       let files: string[] = []
+      _paq.push(['trackEvent', 'remixAI', 'AddingAIContext', choice])
       switch (choice) {
       case 'none':
         await props.plugin.call('remixAI', 'setContextFiles', { context: 'none' })
@@ -373,6 +374,7 @@ export const RemixUiRemixAiAssistant = React.forwardRef<
         setMessages([])
         sendPrompt(`/setAssistant ${assistantChoice}`)
         setAssistantChoice(assistantChoice || 'mistralai')
+        _paq.push(['trackEvent', 'remixAI', 'SetAIProvider', assistantChoice])
       }
     }
     fetchAssistantChoice()
@@ -410,6 +412,7 @@ export const RemixUiRemixAiAssistant = React.forwardRef<
 
       if (description && description.trim()) {
         sendPrompt(`/generate ${description.trim()}`)
+        _paq.push(['trackEvent', 'remixAI', 'GenerateNewAIWorkspaceFromModal', description])
       }
     } catch {
       /* user cancelled */