@devries-cameron20 / t3code-1 / commits / f6a8a635df
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

fix(mobile): distinguish local ACP instances by name (#32467)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

shivam committed Nov 10, 2026 at 07:19 UTC f6a8a635df60e62e46ca7abf28b6dfcabf3081d5
4 files changed +92 -6
apps/mobile/src/components/ComposerModelControl.tsx
+26 -3
@@ -7,7 +7,7 @@ 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";
10 +import { ProviderIcon, ProviderInstanceIcon, providerInstanceNameLabel } from "./ProviderIcon";
11
12 export function ComposerModelControl(props: {
13 readonly modelOption: ModelOption | null;
@@ -37,6 +37,15 @@ export function ComposerModelControl(props: {
37 : "";
38 const badge = props.modelOption?.providerBadge;
39 const label = props.modelOption?.label ?? props.selection?.model ?? "Choose model";
40 + const providerNameLabel = badge
41 + ? providerInstanceNameLabel({
42 + provider: props.modelOption?.providerDriver,
43 + iconUrl: props.modelOption?.providerIconUrl,
44 + displayName: badge.displayName,
45 + showBadge: badge.showBadge,
46 + })
47 + : null;
48 + const shortLabel = props.modelOption?.shortName ?? label;
49 return (
50 <ComposerInlineControl
51 accessibilityLabel={[
@@ -69,10 +78,24 @@ export function ComposerModelControl(props: {
78 />
79 )
80 }
72 - label={props.modelOption?.shortName ?? label}
81 + label={providerNameLabel ?? shortLabel}
82 + labelEllipsizeMode={providerNameLabel ? "middle" : undefined}
83 iconOnly={props.iconOnly}
84 + suffixWidth={providerNameLabel ? 96 : undefined}
85 suffix={
75 - summary ? (
86 + providerNameLabel ? (
87 + <Text
88 + className={
89 + props.size === "large"
90 + ? "text-sm text-foreground-muted"
91 + : "text-xs text-foreground-muted"
92 + }
93 + numberOfLines={1}
94 + >
95 + {shortLabel}
96 + {summary ? ` · ${summary}` : ""}
97 + </Text>
98 + ) : summary ? (
99 <Text
100 className={
101 props.size === "large"
apps/mobile/src/components/ComposerToolbar.tsx
+9 -1
@@ -32,7 +32,9 @@ export function ComposerInlineControl(props: {
32 readonly icon?: ComponentProps<typeof SymbolView>["name"];
33 readonly renderIcon?: (size: number) => ReactNode;
34 readonly label: string;
35 + readonly labelEllipsizeMode?: ComponentProps<typeof Text>["ellipsizeMode"];
36 readonly suffix?: ReactNode;
37 + readonly suffixWidth?: number;
38 /** Show only the icon and chevron; the label still names the control for accessibility. */
39 readonly iconOnly?: boolean;
40 readonly maxWidth?: ViewStyle["maxWidth"];
@@ -94,13 +96,19 @@ export function ComposerInlineControl(props: {
96 props.emphasized || props.selected ? "text-foreground" : "text-foreground-muted",
97 )}
98 numberOfLines={1}
99 + ellipsizeMode={props.labelEllipsizeMode}
100 >
101 {props.label}
102 </Text>
103 </Animated.View>
104 )}
105 {!props.iconOnly && props.suffix ? (
103 - <View className="min-w-0 shrink">{props.suffix}</View>
106 + <View
107 + className={cn("min-w-0", props.suffixWidth === undefined ? "shrink" : "shrink-0")}
108 + style={{ width: props.suffixWidth }}
109 + >
110 + {props.suffix}
111 + </View>
112 ) : null}
113 {props.showChevron === false ? null : (
114 <SymbolView
apps/mobile/src/components/ProviderIcon.tsx
+14
@@ -153,6 +153,20 @@ export function ProviderIcon(props: ProviderIconProps) {
153 );
154 }
155
156 +/** Local ACP agents share one fallback glyph, so a badge alone cannot tell instances apart. */
157 +export function providerInstanceNameLabel(props: {
158 + readonly provider: string | null | undefined;
159 + readonly iconUrl?: string | null | undefined;
160 + readonly displayName: string;
161 + readonly showBadge: boolean;
162 +}): string | null {
163 + return props.showBadge &&
164 + props.provider === "acpRegistry" &&
165 + resolveOfficialAcpRegistryIconUrl(props.iconUrl) === null
166 + ? props.displayName
167 + : null;
168 +}
169 +
170 export function ProviderInstanceIcon(props: {
171 readonly iconUrl?: string | null;
172 readonly provider: string | null | undefined;
apps/mobile/src/features/threads/thread-list-v2-items.tsx
+43 -2
@@ -40,7 +40,11 @@ import { AppText as Text } from "../../components/ui/AppText";
40 import { Menu } from "../../components/ui/Menu";
41 import { EnvironmentMachineSymbol } from "../../components/EnvironmentMachineSymbol";
42 import { ProjectFavicon } from "../../components/ProjectFavicon";
43 -import { ProviderIcon, ProviderInstanceIcon } from "../../components/ProviderIcon";
43 +import {
44 + ProviderIcon,
45 + ProviderInstanceIcon,
46 + providerInstanceNameLabel,
47 +} from "../../components/ProviderIcon";
48 import { useNowAfter } from "../../lib/clock";
49 import { cn } from "../../lib/cn";
50 import { copyTextWithHaptic } from "../../lib/copyTextWithHaptic";
@@ -743,6 +747,14 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
747 }, [thread, props.providers]);
748
749 const providerInstance = props.providerInstance;
750 + const providerNameLabel = providerInstance
751 + ? providerInstanceNameLabel({
752 + provider: providerInstance.driverKind,
753 + iconUrl: providerIconUrl,
754 + displayName: providerInstance.displayName,
755 + showBadge: providerInstance.showBadge,
756 + })
757 + : null;
758 const pr = useThreadPr(thread);
759 const prBadgeLabel = pr ? resolveThreadPrBadgeAction(pr).accessibilityLabel : null;
760 const handleOpenPullRequests = useCallback(() => {
@@ -764,7 +776,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
776 : workingLabel) ?? (isUnread ? DONE_STATUS_LABEL : undefined);
777 const recede = shouldRecedeThreadRow({ status, selected });
778 const isRegeneratingTitle = thread.titleRegeneration != null;
767 - const rowAccessibilityLabel = `${thread.title}${props.hasQueuedMessages ? ", messages queued to send" : ""}${isRegeneratingTitle ? ", regenerating title" : ""}`;
779 + const rowAccessibilityLabel = `${thread.title}${providerNameLabel ? `, ${providerNameLabel}` : ""}${props.hasQueuedMessages ? ", messages queued to send" : ""}${isRegeneratingTitle ? ", regenerating title" : ""}`;
780 const timeLabel = props.timeLabel;
781
782 const visitThread = useAtomCommand(threadEnvironment.visit, { reportFailure: false });
@@ -1381,6 +1393,21 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
1393 showBadge={providerInstance.showBadge}
1394 surfaceColor={rowAppearance.providerIconSurfaceColor}
1395 />
1396 + {providerNameLabel ? (
1397 + <Text
1398 + className={cn(
1399 + "ml-1.5 text-xs",
1400 + selected
1401 + ? selectedThreadRowColors.mutedForegroundClassName
1402 + : rowAppearance.tertiaryForegroundClassName,
1403 + )}
1404 + ellipsizeMode="middle"
1405 + numberOfLines={1}
1406 + style={{ maxWidth: 140 }}
1407 + >
1408 + {providerNameLabel}
1409 + </Text>
1410 + ) : null}
1411 </View>
1412 ) : null}
1413 </View>
@@ -1474,6 +1501,20 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
1501 >
1502 {thread.title}
1503 </Text>
1504 + {providerNameLabel ? (
1505 + <Text
1506 + className={cn(
1507 + "text-xs",
1508 + selected
1509 + ? selectedThreadRowColors.mutedForegroundClassName
1510 + : rowAppearance.tertiaryForegroundClassName,
1511 + )}
1512 + ellipsizeMode="middle"
1513 + numberOfLines={1}
1514 + >
1515 + {providerNameLabel}
1516 + </Text>
1517 + ) : null}
1518 {props.searchMatch ? (
1519 <ThreadSearchMatchExcerpt
1520 sidebar={sidebarPane}