The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 22, 13:15 UTC
feat(web): boring sidebar can show folder threads on two lines (#26463)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Theo Browne committed
Oct 28, 2026 at 06:02 UTC
5211acfe95a0c6d82a60e2524b5e46b47fe67a3e
6 files changed
+239
-192
apps/desktop/src/settings/DesktopClientSettings.test.ts
+1
@@ -63,6 +63,7 @@ const clientSettings: ClientSettings = {
63
sidebarProjectSortOrder: "manual",
64
sidebarThreadSortOrder: "created_at",
65
boringSidebarEnabled: false,
66
+ boringSidebarMultilineRows: false,
67
legacySidebarEnabled: false,
68
sidebarWorkingShelfEnabled: false,
69
loadBalancingEnabled: false,
apps/web/src/components/Sidebar.tsx
+8
-1
@@ -962,6 +962,7 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
962
},
963
});
964
const boringSidebarEnabled = useBoringSidebarEnabled();
965
+ const folderRowsMultiline = useClientSettings((settings) => settings.boringSidebarMultilineRows);
966
const newThreadContext = useHandleNewThread();
967
// Row callbacks capture only the handler; the rest of the context changes with the route.
968
const { handleNewThread } = newThreadContext;
@@ -3168,7 +3169,13 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
3169
);
3170
const isCard =
3171
section === "active" || section === "pinned" || section === "working";
3171
- const rowVariant = folderRow ? "folder" : isCard ? "card" : "slim";
3172
+ const rowVariant = folderRow
3173
+ ? folderRowsMultiline
3174
+ ? "folder-multiline"
3175
+ : "folder"
3176
+ : isCard
3177
+ ? "card"
3178
+ : "slim";
3179
return (
3180
<SortableThreadRow
3181
key={threadKey}
apps/web/src/components/settings/LabsSettingsPanel.tsx
+21
@@ -17,6 +17,7 @@ export function LabsSettingsPanel() {
17
<SettingsPageContainer>
18
<SettingsSection id="beta" title="Beta">
19
<BoringSidebarRow />
20
+ <BoringSidebarMultilineRow />
21
{/* Clerk is only mounted when this build has T3 Connect. */}
22
{hasCloudPublicConfig() ? <GuestLinksRowWithSignIn /> : <GuestLinksRow />}
23
<LinkedEnvironmentsRow />
@@ -47,6 +48,26 @@ function BoringSidebarRow() {
48
);
49
}
50
51
+function BoringSidebarMultilineRow() {
52
+ const settings = useScopedSettings();
53
+ const updateSettings = useUpdateScopedSettings();
54
+ return (
55
+ <SettingsRow
56
+ {...searchableSetting("boring-sidebar-multiline")}
57
+ description="In the boring sidebar, show folder threads on two lines: the title, then the branch, pull request, and agent."
58
+ control={
59
+ <Switch
60
+ checked={settings.boringSidebarMultilineRows}
61
+ onCheckedChange={(checked) =>
62
+ updateSettings({ boringSidebarMultilineRows: Boolean(checked) })
63
+ }
64
+ aria-label="Two-line folder rows"
65
+ />
66
+ }
67
+ />
68
+ );
69
+}
70
+
71
/** Signed out of T3 Connect, the row offers to sign in instead of its switch. */
72
function GuestLinksRowWithSignIn() {
73
const { isSignedIn } = useAuth();
apps/web/src/components/settings/settingsSearch.ts
+6
@@ -431,6 +431,12 @@ export const SETTINGS_SEARCH_ITEMS = [
431
to: "/settings/labs",
432
searchTerms: ["beta folders project tree legacy old classic sidebar"],
433
},
434
+ {
435
+ id: "boring-sidebar-multiline",
436
+ title: "Two-line folder rows",
437
+ to: "/settings/labs",
438
+ searchTerms: ["beta boring sidebar folder rows multiline branch pull request details"],
439
+ },
440
{
441
id: "guest-links",
442
title: "Guest links",
apps/web/src/components/sidebar/SidebarThreadRow.tsx
+199
-191
@@ -533,8 +533,9 @@ function TopStatusIcon(props: { icon: keyof typeof TOP_STATUS_ICONS; className:
533
534
type SidebarThreadRowProps = {
535
thread: SidebarThreadSummary;
536
- // "folder" is a one-line row inside a boring sidebar project folder.
537
- variant: "card" | "slim" | "folder";
536
+ // "folder" is a one-line row inside a boring sidebar project folder;
537
+ // "folder-multiline" adds the card's branch and PR line under it.
538
+ variant: "card" | "slim" | "folder" | "folder-multiline";
539
navigationParent?: string | undefined;
540
variantAction: SidebarSweepAction;
541
settlementSupported: boolean;
@@ -1121,8 +1122,76 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
1122
)
1123
) : null;
1124
1125
+ const diff = latestRunDiff(thread);
1126
+ // Only the provider icon would remain, so the row drops the line instead of leaving it blank.
1127
+ const metaLineEmpty =
1128
+ !thread.branch &&
1129
+ !showsScratchMachine &&
1130
+ prBadge === null &&
1131
+ diff === null &&
1132
+ !isRemote &&
1133
+ runningTerminalIds.length === 0;
1134
+ const metaLine = metaLineEmpty ? null : (
1135
+ <div className="mt-0.5 flex min-w-0 items-center gap-1.5 text-secondary-label text-xs">
1136
+ {thread.branch ? (
1137
+ <>
1138
+ <ThreadWorktreeIndicator thread={thread} />
1139
+ <span className="flex min-w-0 flex-1">
1140
+ <MiddleTruncate value={thread.branch} showTitle={false} />
1141
+ </span>
1142
+ </>
1143
+ ) : showsScratchMachine ? (
1144
+ <>
1145
+ <EnvironmentMachineIcon
1146
+ aria-hidden
1147
+ kind={props.environmentMachine}
1148
+ className="size-3 shrink-0"
1149
+ />
1150
+ <span className="min-w-0 flex-1 truncate">{props.scratchMachineLabel}</span>
1151
+ </>
1152
+ ) : (
1153
+ <span className="flex-1" />
1154
+ )}
1155
+ {terminalStatusIcon}
1156
+ {prBadge}
1157
+ {diff ? (
1158
+ <span className="shrink-0 font-mono">
1159
+ <span className="text-diff-addition-foreground">+{formatDiffCount(diff.insertions)}</span>{" "}
1160
+ <span className="text-diff-deletion-foreground">−{formatDiffCount(diff.deletions)}</span>
1161
+ </span>
1162
+ ) : null}
1163
+ <span
1164
+ aria-hidden
1165
+ className="pointer-events-none ml-auto inline-flex shrink-0 items-center gap-1"
1166
+ >
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}
1176
+ <SidebarProviderStack
1177
+ thread={thread}
1178
+ providerEntryByInstanceId={props.providerEntryByInstanceId}
1179
+ />
1180
+ </span>
1181
+ </div>
1182
+ );
1183
+ const titleLineProviderStack = metaLineEmpty ? (
1184
+ <span aria-hidden className="inline-flex shrink-0">
1185
+ <SidebarProviderStack
1186
+ thread={thread}
1187
+ providerEntryByInstanceId={props.providerEntryByInstanceId}
1188
+ />
1189
+ </span>
1190
+ ) : null;
1191
+
1192
if (variant !== "card") {
1125
- const inFolder = variant === "folder";
1193
+ const multiline = variant === "folder-multiline";
1194
+ const inFolder = variant === "folder" || multiline;
1195
return (
1196
<li
1197
data-thread-item={threadKey}
@@ -1130,6 +1199,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
1199
{...(fileDropHandlers ?? {})}
1200
className={cn(
1201
"list-none [content-visibility:auto] [contain-intrinsic-size:auto_36px]",
1202
+ metaLine !== null && multiline && "[contain-intrinsic-size:auto_54px]",
1203
sortable?.isDragging && "relative z-20",
1204
)}
1205
>
@@ -1148,7 +1218,9 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
1218
aria-busy={isRegeneratingTitle || undefined}
1219
className={cn(
1220
rowSurfaceClassName,
1151
- "flex h-9 items-center gap-2.5 px-2.5",
1221
+ multiline
1222
+ ? "flex flex-col justify-center px-2.5 py-1.5"
1223
+ : "flex h-9 items-center gap-2.5 px-2.5",
1224
// Lines titles up with the folder name, past its chevron and icon.
1225
inFolder && "ps-9",
1226
)}
@@ -1159,142 +1231,147 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
1231
/>
1232
}
1233
>
1162
- {accessibleTitle}
1163
- {inFolder ? null : (
1164
- <span
1165
- className={cn(
1166
- "flex shrink-0 items-center transition-opacity",
1167
- (!props.isActive || variantAction === "unsettle") &&
1168
- "opacity-40 grayscale group-focus-within/sidebar-row:opacity-100 group-focus-within/sidebar-row:grayscale-0 group-hover/sidebar-row:opacity-100 group-hover/sidebar-row:grayscale-0",
1169
- )}
1170
- >
1171
- {props.project ? (
1172
- <ProjectFavicon project={props.project} className="size-4" />
1173
- ) : null}
1174
- </span>
1175
- )}
1176
- {draftIndicator}
1177
- {title}
1178
- {pinIndicator}
1179
- {terminalStatusIcon}
1180
- {isRegeneratingTitle ? (
1181
- <span role="status" className="sr-only">
1182
- Regenerating title
1183
- </span>
1184
- ) : null}
1185
- {sortable?.isDragging ? (
1186
- dragDestination
1187
- ) : (
1188
- <span
1189
- className={cn(
1190
- "relative ml-auto flex h-6 min-w-8 shrink-0 items-center justify-end",
1191
- props.sweepAction !== null && "hidden",
1192
- )}
1193
- >
1234
+ {/* `contents` keeps one-line rows a single flex row. */}
1235
+ <div className={multiline ? "flex h-6 min-w-0 items-center gap-2.5" : "contents"}>
1236
+ {accessibleTitle}
1237
+ {inFolder ? null : (
1238
<span
1239
className={cn(
1196
- "inline-flex justify-end tabular-nums text-secondary-label transition-opacity",
1197
- !isWoke && "group-any-hover/sidebar-row:opacity-0",
1240
+ "flex shrink-0 items-center transition-opacity",
1241
+ (!props.isActive || variantAction === "unsettle") &&
1242
+ "opacity-40 grayscale group-focus-within/sidebar-row:opacity-100 group-focus-within/sidebar-row:grayscale-0 group-hover/sidebar-row:opacity-100 group-hover/sidebar-row:grayscale-0",
1243
)}
1244
>
1200
- {variantAction === "unsnooze" && props.snoozeWakeLabelText !== null ? (
1201
- <span className="inline-flex items-center gap-1 text-xs text-info-foreground tabular-nums">
1202
- {/* The clock tells a wake time from an age at a glance. */}
1203
- <AlarmClockIcon aria-hidden className="size-3" />
1204
- {props.snoozeWakeLabelText}
1205
- </span>
1206
- ) : (inFolder ? isWokeStatus : isWoke) ? (
1245
+ {props.project ? (
1246
+ <ProjectFavicon project={props.project} className="size-4" />
1247
+ ) : null}
1248
+ </span>
1249
+ )}
1250
+ {draftIndicator}
1251
+ {title}
1252
+ {multiline ? titleLineProviderStack : null}
1253
+ {pinIndicator}
1254
+ {multiline ? null : terminalStatusIcon}
1255
+ {isRegeneratingTitle ? (
1256
+ <span role="status" className="sr-only">
1257
+ Regenerating title
1258
+ </span>
1259
+ ) : null}
1260
+ {sortable?.isDragging ? (
1261
+ dragDestination
1262
+ ) : (
1263
+ <span
1264
+ className={cn(
1265
+ "relative ml-auto flex h-6 min-w-8 shrink-0 items-center justify-end",
1266
+ props.sweepAction !== null && "hidden",
1267
+ )}
1268
+ >
1269
+ <span
1270
+ className={cn(
1271
+ "inline-flex justify-end tabular-nums text-secondary-label transition-opacity",
1272
+ !isWoke && "group-any-hover/sidebar-row:opacity-0",
1273
+ )}
1274
+ >
1275
+ {variantAction === "unsnooze" && props.snoozeWakeLabelText !== null ? (
1276
+ <span className="inline-flex items-center gap-1 text-xs text-info-foreground tabular-nums">
1277
+ {/* The clock tells a wake time from an age at a glance. */}
1278
+ <AlarmClockIcon aria-hidden className="size-3" />
1279
+ {props.snoozeWakeLabelText}
1280
+ </span>
1281
+ ) : (inFolder ? isWokeStatus : isWoke) ? (
1282
+ <Tooltip>
1283
+ <TooltipTrigger
1284
+ render={
1285
+ <button
1286
+ type="button"
1287
+ aria-label="Dismiss Woke notification"
1288
+ onClick={handleAcknowledgeWokeClick}
1289
+ className="inline-flex cursor-pointer items-center gap-1 rounded-sm text-xs font-medium text-warning-foreground outline-none hover:underline focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring"
1290
+ >
1291
+ <AlarmClockIcon aria-hidden className="size-3" />
1292
+ <span role="status">Woke</span>
1293
+ </button>
1294
+ }
1295
+ />
1296
+ <TooltipPopup side="top">Dismiss Woke notification</TooltipPopup>
1297
+ </Tooltip>
1298
+ ) : inFolder && topStatus ? (
1299
+ // Folder rows have no status line, so the status takes the time slot.
1300
+ <span
1301
+ className={cn(
1302
+ "inline-flex items-center gap-1 text-xs font-medium",
1303
+ topStatus.className,
1304
+ )}
1305
+ >
1306
+ <TopStatusIcon icon={topStatus.icon} className="size-3" />
1307
+ {topStatus.label}
1308
+ </span>
1309
+ ) : (
1310
+ <span className="text-xs">
1311
+ <RelativeTimeLabel
1312
+ timestamp={
1313
+ variantAction === "unsettle"
1314
+ ? resolveSettledThreadTimestamp(thread)
1315
+ : threadTimeTimestamp(thread)
1316
+ }
1317
+ />
1318
+ </span>
1319
+ )}
1320
+ </span>
1321
+ {variantAction === "unsnooze" ? (
1322
+ !props.snoozeSupported ? null : (
1323
+ <button
1324
+ type="button"
1325
+ aria-label="Wake thread now"
1326
+ onClick={handleUnsnoozeClick}
1327
+ onPointerDown={handleActionPointerDown}
1328
+ className={cn(
1329
+ "pointer-events-none absolute inset-y-0 right-0 -mr-1 inline-flex cursor-pointer items-center gap-1 rounded-md bg-transparent px-1.5 text-xs text-muted-foreground opacity-0 transition-opacity hover:text-foreground focus-visible:pointer-events-auto focus-visible:opacity-100 group-any-hover/sidebar-row:pointer-events-auto group-any-hover/sidebar-row:opacity-100",
1330
+ isWoke && "group-any-hover/sidebar-row:static",
1331
+ )}
1332
+ >
1333
+ <AlarmClockOffIcon className="mb-px size-3" />
1334
+ </button>
1335
+ )
1336
+ ) : !props.settlementSupported ? null : variantAction === "unsettle" ? (
1337
<Tooltip>
1338
<TooltipTrigger
1339
render={
1340
<button
1341
type="button"
1212
- aria-label="Dismiss Woke notification"
1213
- onClick={handleAcknowledgeWokeClick}
1214
- className="inline-flex cursor-pointer items-center gap-1 rounded-sm text-xs font-medium text-warning-foreground outline-none hover:underline focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring"
1215
- >
1216
- <AlarmClockIcon aria-hidden className="size-3" />
1217
- <span role="status">Woke</span>
1218
- </button>
1342
+ aria-label="Un-settle thread"
1343
+ onClick={handleUnsettleClick}
1344
+ onPointerDown={handleActionPointerDown}
1345
+ className={cn(
1346
+ "pointer-events-none absolute inset-y-0 right-0 -mr-1 inline-flex cursor-pointer items-center gap-1 rounded-md bg-transparent px-1.5 text-xs text-muted-foreground opacity-0 transition-opacity hover:text-foreground focus-visible:pointer-events-auto focus-visible:opacity-100 group-any-hover/sidebar-row:pointer-events-auto group-any-hover/sidebar-row:opacity-100",
1347
+ isWoke && "group-any-hover/sidebar-row:static",
1348
+ )}
1349
+ />
1350
}
1220
- />
1221
- <TooltipPopup side="top">Dismiss Woke notification</TooltipPopup>
1351
+ >
1352
+ <Undo2Icon className="mb-px size-3.5" />
1353
+ </TooltipTrigger>
1354
+ <TooltipPopup side="top">Un-settle thread</TooltipPopup>
1355
</Tooltip>
1223
- ) : inFolder && topStatus ? (
1224
- // Folder rows have no status line, so the status takes the time slot.
1225
- <span
1226
- className={cn(
1227
- "inline-flex items-center gap-1 text-xs font-medium",
1228
- topStatus.className,
1229
- )}
1230
- >
1231
- <TopStatusIcon icon={topStatus.icon} className="size-3" />
1232
- {topStatus.label}
1233
- </span>
1356
) : (
1235
- <span className="text-xs">
1236
- <RelativeTimeLabel
1237
- timestamp={
1238
- variantAction === "unsettle"
1239
- ? resolveSettledThreadTimestamp(thread)
1240
- : threadTimeTimestamp(thread)
1241
- }
1242
- />
1243
- </span>
1244
- )}
1245
- </span>
1246
- {variantAction === "unsnooze" ? (
1247
- !props.snoozeSupported ? null : (
1357
<button
1358
type="button"
1250
- aria-label="Wake thread now"
1251
- onClick={handleUnsnoozeClick}
1359
+ aria-label="Settle thread"
1360
+ onClick={handleSettleClick}
1361
onPointerDown={handleActionPointerDown}
1362
className={cn(
1254
- "pointer-events-none absolute inset-y-0 right-0 -mr-1 inline-flex cursor-pointer items-center gap-1 rounded-md bg-transparent px-1.5 text-xs text-muted-foreground opacity-0 transition-opacity hover:text-foreground focus-visible:pointer-events-auto focus-visible:opacity-100 group-any-hover/sidebar-row:pointer-events-auto group-any-hover/sidebar-row:opacity-100",
1363
+ "pointer-events-none absolute inset-y-0 right-0 inline-flex cursor-pointer items-center gap-1 rounded-md bg-transparent px-2 text-xs text-muted-foreground opacity-0 transition-opacity hover:text-foreground focus-visible:pointer-events-auto focus-visible:opacity-100 group-any-hover/sidebar-row:pointer-events-auto group-any-hover/sidebar-row:opacity-100",
1364
isWoke && "group-any-hover/sidebar-row:static",
1365
)}
1366
>
1258
- <AlarmClockOffIcon className="mb-px size-3" />
1367
+ <CheckIcon className="size-3" />
1368
</button>
1260
- )
1261
- ) : !props.settlementSupported ? null : variantAction === "unsettle" ? (
1262
- <Tooltip>
1263
- <TooltipTrigger
1264
- render={
1265
- <button
1266
- type="button"
1267
- aria-label="Un-settle thread"
1268
- onClick={handleUnsettleClick}
1269
- onPointerDown={handleActionPointerDown}
1270
- className={cn(
1271
- "pointer-events-none absolute inset-y-0 right-0 -mr-1 inline-flex cursor-pointer items-center gap-1 rounded-md bg-transparent px-1.5 text-xs text-muted-foreground opacity-0 transition-opacity hover:text-foreground focus-visible:pointer-events-auto focus-visible:opacity-100 group-any-hover/sidebar-row:pointer-events-auto group-any-hover/sidebar-row:opacity-100",
1272
- isWoke && "group-any-hover/sidebar-row:static",
1273
- )}
1274
- />
1275
- }
1276
- >
1277
- <Undo2Icon className="mb-px size-3.5" />
1278
- </TooltipTrigger>
1279
- <TooltipPopup side="top">Un-settle thread</TooltipPopup>
1280
- </Tooltip>
1281
- ) : (
1282
- <button
1283
- type="button"
1284
- aria-label="Settle thread"
1285
- onClick={handleSettleClick}
1286
- onPointerDown={handleActionPointerDown}
1287
- className={cn(
1288
- "pointer-events-none absolute inset-y-0 right-0 inline-flex cursor-pointer items-center gap-1 rounded-md bg-transparent px-2 text-xs text-muted-foreground opacity-0 transition-opacity hover:text-foreground focus-visible:pointer-events-auto focus-visible:opacity-100 group-any-hover/sidebar-row:pointer-events-auto group-any-hover/sidebar-row:opacity-100",
1289
- isWoke && "group-any-hover/sidebar-row:static",
1290
- )}
1291
- >
1292
- <CheckIcon className="size-3" />
1293
- </button>
1294
- )}
1295
- </span>
1296
- )}
1297
- {props.sweepAction !== null ? dragDestination : null}
1369
+ )}
1370
+ </span>
1371
+ )}
1372
+ {props.sweepAction !== null ? dragDestination : null}
1373
+ </div>
1374
+ {multiline ? metaLine : null}
1375
{props.jumpLabel ? <JumpHintBadge label={props.jumpLabel} /> : null}
1376
</TooltipTrigger>
1377
{detailsTooltip}
@@ -1303,16 +1380,6 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
1380
);
1381
}
1382
1306
- const diff = latestRunDiff(thread);
1307
- // Only the provider icon would remain, so the row drops the line instead of leaving it blank.
1308
- const metaLineEmpty =
1309
- !thread.branch &&
1310
- !showsScratchMachine &&
1311
- prBadge === null &&
1312
- diff === null &&
1313
- !isRemote &&
1314
- runningTerminalIds.length === 0;
1315
-
1383
return (
1384
<li
1385
data-thread-item={threadKey}
@@ -1502,68 +1569,9 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
1569
Regenerating title
1570
</span>
1571
) : null}
1505
- {metaLineEmpty ? (
1506
- <span aria-hidden className="inline-flex shrink-0">
1507
- <SidebarProviderStack
1508
- thread={thread}
1509
- providerEntryByInstanceId={props.providerEntryByInstanceId}
1510
- />
1511
- </span>
1512
- ) : null}
1572
+ {titleLineProviderStack}
1573
</div>
1514
- {metaLineEmpty ? null : (
1515
- <div className="mt-0.5 flex min-w-0 items-center gap-1.5 text-secondary-label text-xs">
1516
- {thread.branch ? (
1517
- <>
1518
- <ThreadWorktreeIndicator thread={thread} />
1519
- <span className="flex min-w-0 flex-1">
1520
- <MiddleTruncate value={thread.branch} showTitle={false} />
1521
- </span>
1522
- </>
1523
- ) : showsScratchMachine ? (
1524
- <>
1525
- <EnvironmentMachineIcon
1526
- aria-hidden
1527
- kind={props.environmentMachine}
1528
- className="size-3 shrink-0"
1529
- />
1530
- <span className="min-w-0 flex-1 truncate">{props.scratchMachineLabel}</span>
1531
- </>
1532
- ) : (
1533
- <span className="flex-1" />
1534
- )}
1535
- {terminalStatusIcon}
1536
- {prBadge}
1537
- {diff ? (
1538
- <span className="shrink-0 font-mono">
1539
- <span className="text-diff-addition-foreground">
1540
- +{formatDiffCount(diff.insertions)}
1541
- </span>{" "}
1542
- <span className="text-diff-deletion-foreground">
1543
- −{formatDiffCount(diff.deletions)}
1544
- </span>
1545
- </span>
1546
- ) : null}
1547
- <span
1548
- aria-hidden
1549
- className="pointer-events-none ml-auto inline-flex shrink-0 items-center gap-1"
1550
- >
1551
- {isRemote && !showsScratchMachine ? (
1552
- <span className="inline-flex shrink-0 items-center text-sidebar-muted-foreground/70">
1553
- <EnvironmentMachineIcon
1554
- aria-hidden
1555
- kind={props.environmentMachine}
1556
- className="size-3.5"
1557
- />
1558
- </span>
1559
- ) : null}
1560
- <SidebarProviderStack
1561
- thread={thread}
1562
- providerEntryByInstanceId={props.providerEntryByInstanceId}
1563
- />
1564
- </span>
1565
- </div>
1566
- )}
1574
+ {metaLine}
1575
</div>
1576
{props.jumpLabel ? <JumpHintBadge label={props.jumpLabel} /> : null}
1577
</TooltipTrigger>
packages/contracts/src/settings.ts
+4
@@ -474,6 +474,9 @@ export const ClientSettingsSchema = Schema.Struct({
474
proactivePanelsEnabled: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
475
showSkillsInSlashMenu: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
476
boringSidebarEnabled: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
477
+ boringSidebarMultilineRows: Schema.Boolean.pipe(
478
+ Schema.withDecodingDefault(Effect.succeed(false)),
479
+ ),
480
// Opt-in for the removed legacy sidebar. Still read so those users land in
481
// the boring sidebar; the boring sidebar toggle clears it.
482
legacySidebarEnabled: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
@@ -1707,6 +1710,7 @@ export const ClientSettingsPatch = Schema.Struct({
1710
proactivePanelsEnabled: Schema.optionalKey(Schema.Boolean),
1711
showSkillsInSlashMenu: Schema.optionalKey(Schema.Boolean),
1712
boringSidebarEnabled: Schema.optionalKey(Schema.Boolean),
1713
+ boringSidebarMultilineRows: Schema.optionalKey(Schema.Boolean),
1714
legacySidebarEnabled: Schema.optionalKey(Schema.Boolean),
1715
sidebarWorkingShelfEnabled: Schema.optionalKey(Schema.Boolean),
1716
sidebarProjectGroupingMode: Schema.optionalKey(SidebarProjectGroupingMode),