fix(model-selector): show accurate free and training indicators (#3943)

* fix(model-selector): respect explicit model metadata

Co-authored-by: kiloconnect[bot] <240665456+kiloconnect[bot]@users.noreply.github.com>

* style(model-selector): format metadata tests

Co-authored-by: kiloconnect[bot] <240665456+kiloconnect[bot]@users.noreply.github.com>

* fix(model-selector): preserve data collection helper behavior

Co-authored-by: kiloconnect[bot] <240665456+kiloconnect[bot]@users.noreply.github.com>

* fix(model-selector): preserve exclusive model metadata behavior

Co-authored-by: kiloconnect[bot] <240665456+kiloconnect[bot]@users.noreply.github.com>

* fix(model-selector): preserve OpenRouter metadata behavior

Co-authored-by: kiloconnect[bot] <240665456+kiloconnect[bot]@users.noreply.github.com>

* fix(model-selector): preserve list indicator size

Co-authored-by: kiloconnect[bot] <240665456+kiloconnect[bot]@users.noreply.github.com>

---------

Co-authored-by: chrarnoldus <12196001+chrarnoldus@users.noreply.github.com>
Co-authored-by: kiloconnect[bot] <240665456+kiloconnect[bot]@users.noreply.github.com>

Author: chrarnoldus

apps/mobile/src/app/(app)/agent-chat/model-picker.tsx

@@ -11,6 +11,7 @@ import {
   FREE_MODEL_FREE_LABEL,
   getFreeModelDataAccessibilityLabel,
   isFreeModelOption,
+  mayTrainOnYourPrompts,
 } from '@/lib/free-model-data-disclosure';
 import { useThemeColors } from '@/lib/hooks/use-theme-colors';
 import { type ModelOption, thinkingEffortLabel } from '@/lib/hooks/use-available-models';
@@ -202,7 +203,7 @@ export default function ModelPickerScreen() {
         const modelOption = item.model;
         const selected = modelOption.id === selectedModel;
         const free = isFreeModelOption(modelOption);
-        const collectsData = isFreeModelOption(modelOption);
+        const collectsData = mayTrainOnYourPrompts(modelOption);
         const hasVariants = modelOption.variants.length > 1;
 
         return (
@@ -218,16 +219,18 @@ export default function ModelPickerScreen() {
               <View className="flex-1">
                 <Text className="text-base text-foreground">{modelOption.name}</Text>
                 <Text className="text-xs text-muted-foreground">{modelOption.id}</Text>
-                {free ? (
+                {free || collectsData ? (
                   <View className="mt-1 flex-row items-center gap-1 self-start">
-                    <View
-                      className="rounded-full px-2 py-0.5"
-                      style={{ backgroundColor: colors.good }}
-                    >
-                      <Text className="text-[11px] font-medium text-white" numberOfLines={1}>
-                        {FREE_MODEL_FREE_LABEL}
-                      </Text>
-                    </View>
+                    {free ? (
+                      <View
+                        className="rounded-full px-2 py-0.5"
+                        style={{ backgroundColor: colors.good }}
+                      >
+                        <Text className="text-[11px] font-medium text-white" numberOfLines={1}>
+                          {FREE_MODEL_FREE_LABEL}
+                        </Text>
+                      </View>
+                    ) : null}
                     {collectsData ? (
                       <BookOpenCheck
                         accessibilityLabel={FREE_MODEL_DATA_LABEL}

apps/mobile/src/components/agents/model-selector.tsx

@@ -5,7 +5,7 @@ import { BookOpenCheck, Brain, ChevronDown } from 'lucide-react-native';
 import { Text } from '@/components/ui/text';
 import {
   getFreeModelDataAccessibilityLabel,
-  isFreeModelOption,
+  mayTrainOnYourPrompts,
 } from '@/lib/free-model-data-disclosure';
 import { type ModelOption, thinkingEffortLabel } from '@/lib/hooks/use-available-models';
 import { useThemeColors } from '@/lib/hooks/use-theme-colors';
@@ -43,7 +43,7 @@ export function ModelSelector({
 
   const selectedModel = options.find(m => m.id === value);
   const label = selectedModel?.name ?? (value || 'Model');
-  const collectsData = isFreeModelOption(selectedModel);
+  const collectsData = mayTrainOnYourPrompts(selectedModel);
   const hasVariants = selectedModel ? selectedModel.variants.length > 1 : false;
   const variantLabel = variant ? thinkingEffortLabel(variant) : '';
   const compactVariantLabel = variant ? compactThinkingEffortLabel(variant) : '';

apps/mobile/src/lib/free-model-data-disclosure.test.ts

@@ -4,6 +4,7 @@ import {
   FREE_MODEL_FREE_LABEL,
   getFreeModelDataAccessibilityLabel,
   isFreeModelOption,
+  mayTrainOnYourPrompts,
 } from './free-model-data-disclosure';
 
 describe('free model data disclosure', () => {
@@ -20,6 +21,24 @@ describe('free model data disclosure', () => {
     expect(isFreeModelOption({ id: 'anthropic/claude' })).toBe(false);
   });
 
+  it('detects training eligibility independently of freeness', () => {
+    expect(
+      mayTrainOnYourPrompts({
+        id: 'paid-training-model',
+        isFree: false,
+        mayTrainOnYourPrompts: true,
+      })
+    ).toBe(true);
+    expect(
+      mayTrainOnYourPrompts({
+        id: 'free-private-model',
+        isFree: true,
+        mayTrainOnYourPrompts: false,
+      })
+    ).toBe(false);
+    expect(mayTrainOnYourPrompts({ id: 'free-model', isFree: true })).toBe(false);
+  });
+
   it('adds a data collection phrase to accessibility labels', () => {
     expect(getFreeModelDataAccessibilityLabel('Kilo Auto')).toBe('Kilo Auto, Data collected');
   });

apps/mobile/src/lib/free-model-data-disclosure.ts

@@ -1,10 +1,20 @@
 export const FREE_MODEL_DATA_LABEL = 'Data collected';
 export const FREE_MODEL_FREE_LABEL = 'Free';
 
-export function isFreeModelOption(model: { id: string; isFree?: boolean } | undefined) {
+type ModelDataDisclosure = {
+  id: string;
+  isFree?: boolean;
+  mayTrainOnYourPrompts?: boolean;
+};
+
+export function isFreeModelOption(model: ModelDataDisclosure | undefined) {
   return model?.isFree === true;
 }
 
+export function mayTrainOnYourPrompts(model: ModelDataDisclosure | undefined) {
+  return model?.mayTrainOnYourPrompts === true;
+}
+
 export function getFreeModelDataAccessibilityLabel(label: string) {
   return `${label}, ${FREE_MODEL_DATA_LABEL}`;
 }

apps/mobile/src/lib/hooks/use-available-models.ts

@@ -13,13 +13,15 @@ export type ModelOption = {
   variants: string[];
   isPreferred: boolean;
   isFree?: boolean;
+  mayTrainOnYourPrompts?: boolean;
 };
 
 type ModelResponse = {
   data: {
     id: string;
     name: string;
     isFree?: boolean;
+    mayTrainOnYourPrompts?: boolean;
     preferredIndex?: number;
     opencode?: {
       variants?: Record<string, unknown>;
@@ -101,6 +103,7 @@ export function useAvailableModels(organizationId: string | undefined) {
       id: model.id,
       name: formatShortModelName(model.name),
       isFree: model.isFree,
+      mayTrainOnYourPrompts: model.mayTrainOnYourPrompts,
       variants: Object.keys(model.opencode?.variants ?? {}),
       preferredIndex: model.preferredIndex,
     }));
@@ -127,6 +130,7 @@ export function useAvailableModels(organizationId: string | undefined) {
       variants: item.variants,
       isPreferred: item.preferredIndex !== undefined,
       isFree: item.isFree,
+      mayTrainOnYourPrompts: item.mayTrainOnYourPrompts,
     }));
   }, [data]);
 

apps/web/src/app/(app)/claw/components/SettingsTab.tsx

@@ -2134,6 +2134,7 @@ export function SettingsTab({
           id: model.id,
           name: model.name,
           isFree: model.isFree,
+          mayTrainOnYourPrompts: model.mayTrainOnYourPrompts,
         })),
         trackedOpenClawVersion: trackedVersion,
         runningOpenClawVersion: runningVersion,

apps/web/src/app/(app)/claw/hooks/useClawModelOptions.ts

@@ -51,6 +51,7 @@ export function useClawModelOptions(): {
           id: model.id,
           name: model.name,
           isFree: model.isFree,
+          mayTrainOnYourPrompts: model.mayTrainOnYourPrompts,
         })),
         trackedOpenClawVersion: trackedVersion,
         runningOpenClawVersion: runningVersion,

apps/web/src/app/(app)/cloud/webhooks/[triggerId]/EditWebhookTriggerContent.tsx

@@ -91,6 +91,7 @@ export function EditWebhookTriggerContent({
         id: model.id,
         name: model.name,
         isFree: model.isFree,
+        mayTrainOnYourPrompts: model.mayTrainOnYourPrompts,
       })),
     [modelsData?.data]
   );

apps/web/src/app/(app)/cloud/webhooks/new/CreateWebhookTriggerContent.tsx

@@ -77,6 +77,7 @@ export function CreateWebhookTriggerContent({ organizationId }: CreateWebhookTri
         id: model.id,
         name: model.name,
         isFree: model.isFree,
+        mayTrainOnYourPrompts: model.mayTrainOnYourPrompts,
       })),
     [modelsData?.data]
   );

apps/web/src/app/(app)/gastown/[townId]/rigs/[rigId]/settings/RigSettingsPageClient.tsx

@@ -101,6 +101,7 @@ export function RigSettingsPageClient({ townId, rigId, organizationId }: Props)
         id: model.id,
         name: model.name,
         isFree: model.isFree,
+        mayTrainOnYourPrompts: model.mayTrainOnYourPrompts,
       })) ?? [],
     [modelsData]
   );