Skip to content

Commit f16251f

Browse files
authored
fix(mobile): bring model controls in line with web (pingdotgg#21406)
1 parent 834ae4f commit f16251f

13 files changed

Lines changed: 640 additions & 219 deletions
Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
import type { ModelSelection, ProviderDriverKind } from "@t3tools/contracts";
2+
import {
3+
buildTraitsTriggerDisplay,
4+
getPromptControlledTraits,
5+
} from "@t3tools/client-runtime/model-traits";
6+
import type { ModelOption } from "../lib/modelOptions";
7+
import { resolveProviderOptionDescriptors } from "../lib/providerOptions";
8+
import { AppText as Text } from "./ui/AppText";
9+
import { ComposerInlineControl } from "./ComposerToolbar";
10+
import { ProviderIcon, ProviderInstanceIcon } from "./ProviderIcon";
11+
12+
export function ComposerModelControl(props: {
13+
readonly modelOption: ModelOption | null;
14+
readonly selection: ModelSelection | null;
15+
readonly provider: ProviderDriverKind | undefined;
16+
readonly reportedSelection?: ModelSelection | null | undefined;
17+
readonly prompt: string;
18+
readonly surfaceColor: string;
19+
readonly disabled?: boolean;
20+
readonly iconOnly?: boolean;
21+
readonly showSummary?: boolean;
22+
readonly onPress: () => void;
23+
}) {
24+
const descriptors = resolveProviderOptionDescriptors({
25+
capabilities: props.modelOption?.capabilities,
26+
selections: props.selection?.options,
27+
});
28+
const promptTraits = getPromptControlledTraits(descriptors, props.prompt);
29+
const summary = props.provider
30+
? buildTraitsTriggerDisplay({
31+
provider: props.provider,
32+
descriptors,
33+
primarySelectDescriptorId: promptTraits.primarySelectDescriptor?.id ?? null,
34+
ultrathinkPromptControlled: promptTraits.ultrathinkPromptControlled,
35+
modelSelection: props.selection,
36+
reportedModelSelection: props.reportedSelection,
37+
}).label
38+
: "";
39+
const badge = props.modelOption?.providerBadge;
40+
const label = props.modelOption?.label ?? props.selection?.model ?? "Choose model";
41+
return (
42+
<ComposerInlineControl
43+
accessibilityLabel={[
44+
"Model and reasoning settings",
45+
label,
46+
badge?.showBadge ? badge.displayName : null,
47+
summary,
48+
]
49+
.filter(Boolean)
50+
.join(", ")}
51+
disabled={props.disabled}
52+
emphasized
53+
renderIcon={(size) =>
54+
badge?.showBadge ? (
55+
<ProviderInstanceIcon
56+
iconUrl={props.modelOption?.providerIconUrl}
57+
provider={props.modelOption?.providerDriver}
58+
displayName={badge.displayName}
59+
accentColor={badge.accentColor}
60+
showBadge
61+
surfaceColor={props.surfaceColor}
62+
size={size}
63+
/>
64+
) : (
65+
<ProviderIcon
66+
iconUrl={props.modelOption?.providerIconUrl}
67+
provider={props.modelOption?.providerDriver}
68+
size={size}
69+
/>
70+
)
71+
}
72+
label={label}
73+
iconOnly={props.iconOnly}
74+
suffix={
75+
props.showSummary !== false && summary ? (
76+
<Text className="text-xs text-foreground-muted" numberOfLines={1}>
77+
{summary}
78+
</Text>
79+
) : undefined
80+
}
81+
maxWidth="100%"
82+
onPress={props.onPress}
83+
/>
84+
);
85+
}

‎apps/mobile/src/components/ComposerToolbar.tsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ export function ComposerInlineControl(props: {
3636
readonly icon?: ComponentProps<typeof SymbolView>["name"];
3737
readonly renderIcon?: (size: number) => ReactNode;
3838
readonly label: string;
39+
readonly suffix?: ReactNode;
3940
/** Show only the icon and chevron; the label still names the control for accessibility. */
4041
readonly iconOnly?: boolean;
4142
readonly maxWidth?: ViewStyle["maxWidth"];
@@ -105,6 +106,9 @@ export function ComposerInlineControl(props: {
105106
</Text>
106107
</Animated.View>
107108
)}
109+
{!props.iconOnly && props.suffix ? (
110+
<View className="min-w-0 shrink">{props.suffix}</View>
111+
) : null}
108112
{props.showChevron === false ? null : (
109113
<SymbolView
110114
name={props.chevronDirection === "right" ? "chevron.right" : "chevron.down"}

‎apps/mobile/src/features/settings/ScheduledTaskPickerScreens.tsx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@ export function ScheduledTaskModelPickerRouteScreen() {
5353
projectId={projectId}
5454
providerGroups={providerGroups}
5555
selectedModel={selectedModel}
56+
prompt={editor.draft.prompt}
57+
onPromptChange={(prompt) =>
58+
setEditor((current) =>
59+
current ? { ...current, draft: { ...current.draft, prompt } } : current,
60+
)
61+
}
5662
onSelectModel={(option) =>
5763
setEditor((current) =>
5864
current

‎apps/mobile/src/features/threads/NewTaskDraftScreen.tsx‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ import {
6767
} from "../../state/composer-attachment-uploads";
6868
import { FilePreviewModal, type FilePreviewSource } from "../../components/FilePreviewModal";
6969
import { VideoPreviewModal, type VideoPreviewSource } from "../../components/VideoPreviewModal";
70-
import { ProviderIcon } from "../../components/ProviderIcon";
70+
import { ComposerModelControl } from "../../components/ComposerModelControl";
7171
import { SymbolView } from "../../components/ui/AppSymbol";
7272
import { AppText as Text } from "../../components/ui/AppText";
7373
import { hasProviderUsageLimits, isUsageLimitsCommand } from "@t3tools/shared/usageLimits";
@@ -1726,19 +1726,13 @@ export function NewTaskDraftScreen(props: {
17261726
/>
17271727
<View className="min-w-0 flex-1 flex-row items-center justify-end gap-2">
17281728
<View className="min-w-0 shrink">
1729-
<ComposerInlineControl
1730-
accessibilityLabel="Model and reasoning settings"
1729+
<ComposerModelControl
1730+
modelOption={flow.selectedModelOption}
1731+
selection={flow.selectedModel}
1732+
provider={flow.selectedProviderStatus?.driver}
1733+
prompt={flow.prompt}
1734+
surfaceColor={theme["--color-composer-panel"]}
17311735
disabled={isComposerInteractionLocked}
1732-
emphasized
1733-
renderIcon={(size) => (
1734-
<ProviderIcon
1735-
iconUrl={flow.selectedModelOption?.providerIconUrl}
1736-
provider={flow.selectedModelOption?.providerDriver}
1737-
size={size}
1738-
/>
1739-
)}
1740-
label={flow.selectedModelOption?.label ?? "Choose model"}
1741-
maxWidth="100%"
17421736
onPress={settingsSheetPresentation.open}
17431737
/>
17441738
</View>

‎apps/mobile/src/features/threads/ThreadComposer.tsx‎

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,8 @@ import { VideoPreviewModal, type VideoPreviewSource } from "../../components/Vid
7474
import { GlassSurface } from "../../components/ui/GlassSurface";
7575
import { ComposerEditor, type ComposerEditorHandle } from "../../components/ComposerEditor";
7676
import { fileRoutePathSegments } from "../files/filePath";
77-
import {
78-
ComposerActionButton,
79-
ComposerInlineControl,
80-
ComposerToolbarRow,
81-
} from "../../components/ComposerToolbar";
82-
import { ProviderIcon } from "../../components/ProviderIcon";
77+
import { ComposerActionButton, ComposerToolbarRow } from "../../components/ComposerToolbar";
78+
import { ComposerModelControl } from "../../components/ComposerModelControl";
8379
import {
8480
composerStripAttachments,
8581
type DraftComposerFileAttachment,
@@ -657,6 +653,8 @@ export const ThreadComposer = function ThreadComposer(props: ThreadComposerProps
657653
...(lockedProviderInstanceId ? { lockedProviderInstanceId } : {}),
658654
providerGroups: threadProviderGroups,
659655
selectedModel: currentModelSelection,
656+
prompt: draftMessage,
657+
onPromptChange: (text) => setComposerDraftText(composerDraftKey, text),
660658
reportedModelSelection: props.reportedModelSelection,
661659
onSelectModel: (option) =>
662660
props.onUpdateModelSelection(withRememberedModelOptions(option.selection)),
@@ -761,22 +759,18 @@ export const ThreadComposer = function ThreadComposer(props: ThreadComposerProps
761759
) : null;
762760

763761
// The row and the card's toolbar share this picker. It shrinks to the provider
764-
// icon once the draft has text, so the draft keeps the width.
762+
// icon in the row once the draft has text, so the draft keeps the width.
765763
const modelControl = (
766764
<View className="min-w-0 shrink">
767-
<ComposerInlineControl
768-
accessibilityLabel="Model and reasoning settings"
769-
emphasized
770-
renderIcon={(size) => (
771-
<ProviderIcon
772-
iconUrl={currentModelOption?.providerIconUrl}
773-
provider={currentModelOption?.providerDriver}
774-
size={size}
775-
/>
776-
)}
777-
label={currentModelOption?.label ?? currentModelSelection.model}
778-
iconOnly={draftMessage.length > 0}
779-
maxWidth="100%"
765+
<ComposerModelControl
766+
modelOption={currentModelOption}
767+
selection={currentModelSelection}
768+
provider={selectedProviderStatus?.driver}
769+
reportedSelection={props.reportedModelSelection}
770+
prompt={draftMessage}
771+
surfaceColor={composerPanel}
772+
iconOnly={!usesCard && draftMessage.length > 0}
773+
showSummary={usesCard}
780774
onPress={openSettings}
781775
/>
782776
</View>

‎apps/mobile/src/features/threads/ThreadSettingsSheet.tsx‎

Lines changed: 73 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
import {
2+
getPromptControlledTraits,
3+
getTraitSelectChange,
4+
} from "@t3tools/client-runtime/model-traits";
15
import { SheetHeader } from "../../components/ui/SheetHeader";
26
import { Toolbar } from "../../components/ui/Toolbar";
37
import * as Dialog from "../../components/ui/Dialog";
@@ -247,6 +251,8 @@ type ThreadSettingsSessionProps = {
247251
readonly lockedProviderInstanceId?: ProviderInstanceId;
248252
readonly providerGroups: ReadonlyArray<ProviderGroup>;
249253
readonly selectedModel: ModelSelection | null;
254+
readonly prompt: string;
255+
readonly onPromptChange: (prompt: string) => void;
250256
readonly reportedModelSelection?: ModelSelection | null;
251257
readonly onSelectModel: (option: ModelOption) => void;
252258
readonly restoreSelection?: (selection: ModelSelection) => ModelSelection;
@@ -311,6 +317,7 @@ type ThreadSettingsSessionValue = {
311317
readonly runtimeModeChoices: ReturnType<typeof runtimeModeChoicesForSupportedModes>;
312318
readonly onUpdateRuntimeMode: (mode: RuntimeMode) => void;
313319
readonly displayedDescriptors: ReadonlyArray<ProviderOptionDescriptor>;
320+
readonly promptTraits: ReturnType<typeof getPromptControlledTraits>;
314321
readonly displayedModelSelection: ModelSelection | null;
315322
readonly reportedModelSelection: ModelSelection | null;
316323
readonly providerExpansionOverrides: ReadonlySet<string>;
@@ -491,6 +498,8 @@ function ThreadSettingsSessionProvider(
491498
() => new Set(),
492499
);
493500
const [pendingModel, setPendingModel] = useState<ModelOption | null>(null);
501+
const [pendingPrompt, setPendingPrompt] = useState<string | null>(null);
502+
const displayedPrompt = pendingModel ? (pendingPrompt ?? props.prompt) : props.prompt;
494503

495504
const isApplied = (option: ModelOption) =>
496505
option.selection.instanceId === props.selectedModel?.instanceId &&
@@ -506,6 +515,7 @@ function ThreadSettingsSessionProvider(
506515
})
507516
: []
508517
: props.optionDescriptors;
518+
const promptTraits = getPromptControlledTraits(displayedDescriptors, displayedPrompt);
509519
const displayedModel =
510520
pendingModel ??
511521
props.providerGroups.flatMap((group) => group.models).find((option) => isApplied(option)) ??
@@ -532,12 +542,39 @@ function ThreadSettingsSessionProvider(
532542
}
533543
void Haptics.selectionAsync();
534544
props.onSelectModel(pendingModel);
545+
if (pendingPrompt !== null && pendingPrompt !== props.prompt) {
546+
props.onPromptChange(pendingPrompt);
547+
}
535548
}
536549
return true;
537550
};
538551

539552
const applyOptionChange = (id: string, value: string | boolean) => {
540-
const next = applyProviderOptionSelection(displayedDescriptors, { id, value });
553+
const descriptor = displayedDescriptors.find((entry) => entry.id === id);
554+
const change =
555+
descriptor?.type === "select" && typeof value === "string"
556+
? getTraitSelectChange(
557+
{ ...promptTraits, descriptors: displayedDescriptors },
558+
descriptor,
559+
displayedPrompt,
560+
value,
561+
)
562+
: null;
563+
if (descriptor?.type === "select") {
564+
if (!change) return;
565+
if (change.prompt !== displayedPrompt) {
566+
if (pendingModel) {
567+
setPendingPrompt(change.prompt);
568+
} else {
569+
props.onPromptChange(change.prompt);
570+
}
571+
}
572+
if (!("modelOptions" in change)) return;
573+
}
574+
const next =
575+
change && "modelOptions" in change
576+
? (change.modelOptions ?? [])
577+
: applyProviderOptionSelection(displayedDescriptors, { id, value });
541578
if (!next) {
542579
return;
543580
}
@@ -564,6 +601,9 @@ function ThreadSettingsSessionProvider(
564601

565602
const pressModel = (option: ModelOption) => {
566603
void Haptics.selectionAsync();
604+
if (isApplied(option) || option.key !== pendingModel?.key) {
605+
setPendingPrompt(null);
606+
}
567607
setPendingModel((current) =>
568608
pendingModelAfterPress({
569609
current,
@@ -586,6 +626,7 @@ function ThreadSettingsSessionProvider(
586626
runtimeModeChoices,
587627
onUpdateRuntimeMode: props.onUpdateRuntimeMode,
588628
displayedDescriptors,
629+
promptTraits,
589630
displayedModelSelection: pendingModel?.selection ?? props.selectedModel,
590631
reportedModelSelection: pendingModel ? null : (props.reportedModelSelection ?? null),
591632
favoriteKeys,
@@ -832,11 +873,16 @@ function ThreadSettingsOptionsItem(props: {
832873
>
833874
<DisclosureRow
834875
label={descriptor.label}
835-
value={getProviderOptionCurrentLabel(
836-
descriptor,
837-
session.displayedModelSelection,
838-
session.reportedModelSelection,
839-
)}
876+
value={
877+
session.promptTraits.ultrathinkPromptControlled &&
878+
descriptor.id === session.promptTraits.primarySelectDescriptor?.id
879+
? "Ultrathink"
880+
: getProviderOptionCurrentLabel(
881+
descriptor,
882+
session.displayedModelSelection,
883+
session.reportedModelSelection,
884+
)
885+
}
840886
onPress={() => props.onOpenSubmenu({ kind: "descriptor", id: descriptor.id })}
841887
/>
842888
</Animated.View>
@@ -1076,16 +1122,29 @@ function ThreadSettingsChoiceContent(props: {
10761122
rows: selectableChoices(activeDescriptor).map((choice) => ({
10771123
id: choice.id,
10781124
label: choice.label,
1079-
description: undefined,
1125+
description: choice.description,
10801126
selected:
10811127
choice.id ===
1082-
getProviderOptionCurrentValue(
1083-
activeDescriptor,
1084-
session.displayedModelSelection,
1085-
session.reportedModelSelection,
1086-
),
1128+
(session.promptTraits.ultrathinkPromptControlled &&
1129+
activeDescriptor.id === session.promptTraits.primarySelectDescriptor?.id
1130+
? "ultrathink"
1131+
: getProviderOptionCurrentValue(
1132+
activeDescriptor,
1133+
session.displayedModelSelection,
1134+
session.reportedModelSelection,
1135+
)),
10871136
onPress: () => {
10881137
void Haptics.selectionAsync();
1138+
if (
1139+
session.promptTraits.ultrathinkInBodyText &&
1140+
activeDescriptor.id === session.promptTraits.primarySelectDescriptor?.id
1141+
) {
1142+
Dialog.alert(
1143+
"Reasoning controlled by prompt",
1144+
'Your prompt contains "ultrathink" in the text. Remove it to change this option.',
1145+
);
1146+
return;
1147+
}
10891148
session.applyOptionChange(activeDescriptor.id, choice.id);
10901149
props.onSelected();
10911150
},
@@ -1482,6 +1541,8 @@ export function NewTaskThreadSettingsRouteScreen() {
14821541
{...(flow.selectedModel ? { providerInstanceId: flow.selectedModel.instanceId } : {})}
14831542
providerGroups={flow.providerGroups}
14841543
selectedModel={flow.selectedModel}
1544+
prompt={flow.prompt}
1545+
onPromptChange={flow.setPrompt}
14851546
onSelectModel={(option) => flow.setSelectedModelKey(option.key, option.selection.options)}
14861547
restoreSelection={withRememberedModelOptions}
14871548
optionDescriptors={optionDescriptors}

0 commit comments

Comments
 (0)