The best way to control Claude Code, Codex and more from any computer or phone
fix(web): remote machine icon no longer forces a third sidebar line (#26803)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
ahalekelly committed
Oct 30, 2026 at 14:21 UTC
32ce9db80bbc2026716781cc005facad5801246a
1 file changed
+13
-15
apps/web/src/components/sidebar/SidebarThreadRow.tsx
+13
-15
@@ -1122,14 +1122,19 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
1122
)
1123
) : null;
1124
1125
+ const remoteMachineIcon =
1126
+ isRemote && !showsScratchMachine ? (
1127
+ <span className="inline-flex shrink-0 items-center text-sidebar-muted-foreground/70">
1128
+ <EnvironmentMachineIcon aria-hidden kind={props.environmentMachine} className="size-3.5" />
1129
+ </span>
1130
+ ) : null;
1131
const diff = latestRunDiff(thread);
1126
- // Only the provider icon would remain, so the row drops the line instead of leaving it blank.
1132
+ // Only the trailing icons would remain, so the row moves them to the title line instead.
1133
const metaLineEmpty =
1134
!thread.branch &&
1135
!showsScratchMachine &&
1136
prBadge === null &&
1137
diff === null &&
1132
- !isRemote &&
1138
runningTerminalIds.length === 0;
1139
const metaLine = metaLineEmpty ? null : (
1140
<div className="mt-0.5 flex min-w-0 items-center gap-1.5 text-secondary-label text-xs">
@@ -1164,15 +1169,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
1169
aria-hidden
1170
className="pointer-events-none ml-auto inline-flex shrink-0 items-center gap-1"
1171
>
1167
- {isRemote && !showsScratchMachine ? (
1168
- <span className="inline-flex shrink-0 items-center text-sidebar-muted-foreground/70">
1169
- <EnvironmentMachineIcon
1170
- aria-hidden
1171
- kind={props.environmentMachine}
1172
- className="size-3.5"
1173
- />
1174
- </span>
1175
- ) : null}
1172
+ {remoteMachineIcon}
1173
<SidebarProviderStack
1174
thread={thread}
1175
providerEntryByInstanceId={props.providerEntryByInstanceId}
@@ -1180,8 +1177,9 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
1177
</span>
1178
</div>
1179
);
1183
- const titleLineProviderStack = metaLineEmpty ? (
1184
- <span aria-hidden className="inline-flex shrink-0">
1180
+ const titleLineIcons = metaLineEmpty ? (
1181
+ <span aria-hidden className="inline-flex shrink-0 items-center gap-1">
1182
+ {remoteMachineIcon}
1183
<SidebarProviderStack
1184
thread={thread}
1185
providerEntryByInstanceId={props.providerEntryByInstanceId}
@@ -1249,7 +1247,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
1247
)}
1248
{draftIndicator}
1249
{title}
1252
- {multiline ? titleLineProviderStack : null}
1250
+ {multiline ? titleLineIcons : null}
1251
{pinIndicator}
1252
{multiline ? null : terminalStatusIcon}
1253
{isRegeneratingTitle ? (
@@ -1569,7 +1567,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
1567
Regenerating title
1568
</span>
1569
) : null}
1572
- {titleLineProviderStack}
1570
+ {titleLineIcons}
1571
</div>
1572
{metaLine}
1573
</div>