update activity, see custom counts

Author: sawka

frontend/types/gotypes.d.ts

@@ -824,6 +824,9 @@ declare global {
         "autoupdate:enabled"?: boolean;
         "loc:countrycode"?: string;
         "loc:regioncode"?: string;
+        "settings:customwidgets"?: number;
+        "settings:customaipresets"?: number;
+        "settings:customsettings"?: number;
         "activity:activeminutes"?: number;
         "activity:fgminutes"?: number;
         "activity:openminutes"?: number;
@@ -863,6 +866,9 @@ declare global {
         "autoupdate:enabled"?: boolean;
         "loc:countrycode"?: string;
         "loc:regioncode"?: string;
+        "settings:customwidgets"?: number;
+        "settings:customaipresets"?: number;
+        "settings:customsettings"?: number;
     };
 
     // waveobj.Tab

pkg/telemetry/telemetry.go

@@ -136,6 +136,12 @@ func updateActivityTEvent(ctx context.Context, tevent *telemetrydata.TEvent) err
 	eventTs := time.Now()
 	// compute to hour boundary, and round up to next hour
 	eventTs = eventTs.Truncate(time.Hour).Add(time.Hour)
+	
+	fullConfig := wconfig.GetWatcher().GetFullConfig()
+	customWidgets := fullConfig.CountCustomWidgets()
+	customAIPresets := fullConfig.CountCustomAIPresets()
+	customSettings := wconfig.CountCustomSettings()
+	
 	return wstore.WithTx(ctx, func(tx *wstore.TxWrap) error {
 		// find event that matches this timestamp with event name "app:activity"
 		var hasRow bool
@@ -151,6 +157,14 @@ func updateActivityTEvent(ctx context.Context, tevent *telemetrydata.TEvent) err
 			}
 		}
 		mergeActivity(&curActivity, tevent.Props)
+		
+		if curActivity.UserSet == nil {
+			curActivity.UserSet = &telemetrydata.TEventUserProps{}
+		}
+		curActivity.UserSet.SettingsCustomWidgets = customWidgets
+		curActivity.UserSet.SettingsCustomAIPresets = customAIPresets
+		curActivity.UserSet.SettingsCustomSettings = customSettings
+		
 		if hasRow {
 			query := `UPDATE db_tevent SET props = ? WHERE uuid = ?`
 			tx.Exec(query, dbutil.QuickJson(curActivity), uuidStr)

pkg/telemetry/telemetrydata/telemetrydata.go

@@ -51,10 +51,16 @@ type TEventUserProps struct {
 	ClientBuildTime      string `json:"client:buildtime,omitempty"`
 	ClientOSRelease      string `json:"client:osrelease,omitempty"`
 	ClientIsDev          bool   `json:"client:isdev,omitempty"`
-	AutoUpdateChannel    string `json:"autoupdate:channel,omitempty"`
-	AutoUpdateEnabled    bool   `json:"autoupdate:enabled,omitempty"`
-	LocCountryCode       string `json:"loc:countrycode,omitempty"`
-	LocRegionCode        string `json:"loc:regioncode,omitempty"`
+
+	AutoUpdateChannel string `json:"autoupdate:channel,omitempty"`
+	AutoUpdateEnabled bool   `json:"autoupdate:enabled,omitempty"`
+
+	LocCountryCode string `json:"loc:countrycode,omitempty"`
+	LocRegionCode  string `json:"loc:regioncode,omitempty"`
+
+	SettingsCustomWidgets   int `json:"settings:customwidgets,omitempty"`
+	SettingsCustomAIPresets int `json:"settings:customaipresets,omitempty"`
+	SettingsCustomSettings  int `json:"settings:customsettings,omitempty"`
 }
 
 type TEventProps struct {

pkg/wconfig/settingsconfig.go

@@ -741,3 +741,48 @@ type TermThemeType struct {
 	Background          string  `json:"background"`
 	Cursor              string  `json:"cursor"`
 }
+
+// CountCustomWidgets returns the number of custom widgets the user has defined.
+// Custom widgets are identified as widgets whose ID doesn't start with "defwidget@".
+func (fc *FullConfigType) CountCustomWidgets() int {
+	count := 0
+	for widgetID := range fc.Widgets {
+		if !strings.HasPrefix(widgetID, "defwidget@") {
+			count++
+		}
+	}
+	return count
+}
+
+// CountCustomAIPresets returns the number of custom AI presets the user has defined.
+// Custom AI presets are identified as presets that start with "ai@" but aren't "ai@global" or "ai@wave".
+func (fc *FullConfigType) CountCustomAIPresets() int {
+	count := 0
+	for presetID := range fc.Presets {
+		if strings.HasPrefix(presetID, "ai@") && presetID != "ai@global" && presetID != "ai@wave" {
+			count++
+		}
+	}
+	return count
+}
+
+// CountCustomSettings returns the number of settings the user has customized from the defaults.
+// This excludes telemetry:enabled which doesn't count as a customization.
+func CountCustomSettings() int {
+	// Load user settings
+	userSettings, _ := ReadWaveHomeConfigFile("settings.json")
+	if userSettings == nil {
+		return 0
+	}
+
+	// Count all keys except telemetry:enabled
+	count := 0
+	for key := range userSettings {
+		if key == "telemetry:enabled" {
+			continue
+		}
+		count++
+	}
+
+	return count
+}