Skip to content

Commit 9cb5e8d

Browse files
authored
Merge branch 'main' into fix/composer-banner-glass-overlap
2 parents 8462523 + 883e1a3 commit 9cb5e8d

116 files changed

Lines changed: 5523 additions & 719 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/VOUCHED.td‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,41 @@
1010
#
1111
# Keep entries sorted alphabetically.
1212
github:adityavardhansharma
13+
github:arhxam
1314
github:bil0000
1415
github:binbandit
16+
github:Brechard
1517
github:chrisdeeming
1618
github:chuks-qua
1719
github:cursoragent
20+
github:D3OXY
1821
github:eggfriedrice24
22+
github:extoci
1923
github:gbarros-dev
2024
github:gfsaaser24
2125
github:github-actions[bot]
2226
github:gsimone
27+
github:GuilhermeVieiraDev
2328
github:hwanseoc
29+
github:jakeleventhal
2430
github:jamesx0416
2531
github:jappyjan
2632
github:jasonLaster
2733
github:JoeEverest
2834
github:justsomelegs
35+
github:kridaydave
36+
github:lnieuwenhuis
37+
github:Lucenx9
2938
github:mackinleysmith
3039
github:maria-rcks
40+
github:mwolson
3141
github:nmggithub
3242
github:Noojuno
3343
github:notkainoa
3444
github:PatrickBauer
3545
github:pc-style
46+
github:PixPMusic
47+
github:PollyGlot
3648
github:RakshithBhat03
3749
github:realAhmedRoach
3850
github:Rishet11
@@ -43,6 +55,8 @@ github:shivamhwp
4355
github:StiensWout
4456
github:SunkenInTime
4557
github:tarik02
58+
github:tris203
4659
github:UtkarshUsername
4760
github:Yash-Singh1
61+
github:yashranaway
4862
github:Ymit24

‎apps/marketing/vercel.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import type { VercelConfig } from "@vercel/config/v1";
22

33
export const config: VercelConfig = {
4+
git: {
5+
deploymentEnabled: false,
6+
},
47
installCommand: "npm install -g vite-plus && vp install --filter '@t3tools/marketing...'",
58
buildCommand: "vp run --filter @t3tools/marketing build",
69
outputDirectory: "dist",

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ export function brandTitleOffset(nativeLeadingItem: boolean): number {
3333
*/
3434
export function CompactBrandTitle(
3535
props: {
36+
readonly allowFontScaling?: boolean;
3637
readonly nativeLeadingItem?: boolean;
3738
} = {},
3839
) {
@@ -57,6 +58,7 @@ export function CompactBrandTitle(
5758
>
5859
<T3Wordmark color={iconColor} height={15} />
5960
<Text
61+
allowFontScaling={props.allowFontScaling}
6062
style={{
6163
color: mutedColor,
6264
fontFamily: "DMSans-Medium",
@@ -75,6 +77,7 @@ export function CompactBrandTitle(
7577
}}
7678
>
7779
<Text
80+
allowFontScaling={props.allowFontScaling}
7881
style={{
7982
color: mutedColor,
8083
fontFamily: "DMSans-Bold",
@@ -91,7 +94,7 @@ export function CompactBrandTitle(
9194
}
9295

9396
export function renderCompactBrandTitle() {
94-
return <CompactBrandTitle />;
97+
return <CompactBrandTitle allowFontScaling={Platform.OS === "ios"} />;
9598
}
9699

97100
export function renderCompactBrandHeaderItems(): NativeStackHeaderItem[] {

‎apps/mobile/src/features/home/AndroidHomeFab.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import { SymbolView } from "../../components/AppSymbol";
66
import { useThemeColor } from "../../lib/useThemeColor";
77

88
/**
9-
* Android-only wrapper that overlays a bottom-right new-task FAB on the home
10-
* screen. Other platforms render children unchanged.
9+
* Android-only wrapper that overlays a bottom-right new-task FAB on a thread
10+
* list. Other platforms render children unchanged.
1111
*/
1212
export function AndroidHomeFabLayout(props: {
1313
readonly onStartNewTask: () => void;

‎apps/mobile/src/features/home/HomeRouteScreen.tsx‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import * as Arr from "effect/Array";
22
import * as Order from "effect/Order";
33
import { useNavigation } from "@react-navigation/native";
44
import { useEffect, useMemo, useState } from "react";
5+
import { Platform } from "react-native";
56

67
import { NativeHeaderToolbar, NativeStackScreenOptions } from "../../native/StackHeader";
78
import { useProjects, useThreadShells } from "../../state/entities";
@@ -106,7 +107,11 @@ export function HomeRouteScreen() {
106107
return (
107108
<>
108109
<NativeStackScreenOptions
109-
options={{ title: "", headerTitle: "", unstable_headerLeftItems: () => [] }}
110+
options={
111+
Platform.OS === "android"
112+
? { headerShown: false }
113+
: { title: "", headerTitle: "", unstable_headerLeftItems: () => [] }
114+
}
110115
/>
111116
<WorkspaceSidebarToolbar
112117
afterSidebarButton={
@@ -129,18 +134,20 @@ export function HomeRouteScreen() {
129134
onStartNewTask={() => navigation.navigate("NewTaskSheet", { screen: "NewTask" })}
130135
>
131136
<>
132-
{/* Restore the compact title after the split branch blanks the detail
133-
header. The brand slot doubles as the connection status surface:
134-
while an environment reconnects, the lockup fades to a status label
135-
in place (no layout shift in the list below). */}
137+
{/* Restore the header after leaving split view; screen options are
138+
shallow-merged. The brand slot also doubles as the connection
139+
status surface while an environment reconnects. */}
136140
<NativeStackScreenOptions
137-
options={getConnectionAwareBrandHeaderOptions({
138-
onOpenEnvironments: () =>
139-
navigation.navigate("SettingsSheet", {
140-
screen: "SettingsContent",
141-
params: { screen: "SettingsEnvironments" },
142-
}),
143-
})}
141+
options={{
142+
...getConnectionAwareBrandHeaderOptions({
143+
onOpenEnvironments: () =>
144+
navigation.navigate("SettingsSheet", {
145+
screen: "SettingsContent",
146+
params: { screen: "SettingsEnvironments" },
147+
}),
148+
}),
149+
headerShown: true,
150+
}}
144151
/>
145152
<HomeHeader
146153
environments={environments}

‎apps/mobile/src/features/home/HomeScreen.tsx‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ import {
5656
THREAD_LIST_V2_SETTLED_PAGE_COUNT,
5757
type ThreadListV2ListItem,
5858
} from "../threads/threadListV2";
59+
import { useThreadListV2ShelfPreferences } from "../threads/use-thread-list-v2-shelf-preferences";
5960
import type { HomeListFilterMenuEnvironment } from "./home-list-filter-menu";
6061
import {
6162
buildHomeListLayout,
@@ -572,10 +573,13 @@ export function HomeScreen(props: HomeScreenProps) {
572573
() => setSettledVisibleCount((count) => count + THREAD_LIST_V2_SETTLED_PAGE_COUNT),
573574
[],
574575
);
575-
const [snoozedShelfExpanded, setSnoozedShelfExpanded] = useState(false);
576-
const toggleSnoozedShelf = useCallback(() => setSnoozedShelfExpanded((value) => !value), []);
577-
const [settledShelfExpanded, setSettledShelfExpanded] = useState(true);
578-
const toggleSettledShelf = useCallback(() => setSettledShelfExpanded((value) => !value), []);
576+
const {
577+
loaded: shelfPreferencesLoaded,
578+
settledShelfExpanded,
579+
snoozedShelfExpanded,
580+
toggleSettledShelf,
581+
toggleSnoozedShelf,
582+
} = useThreadListV2ShelfPreferences();
579583
// now is quantized to the minute and ticks so the inactivity auto-settle
580584
// boundary is actually crossed while the app stays open (mirrors web);
581585
// without a clock dependency the partition memoizes a frozen "now".
@@ -785,6 +789,7 @@ export function HomeScreen(props: HomeScreenProps) {
785789
return (
786790
<ThreadListV2SnoozedShelfHeader
787791
count={item.count}
792+
disabled={!shelfPreferencesLoaded}
788793
expanded={item.expanded}
789794
onToggle={toggleSnoozedShelf}
790795
/>
@@ -794,6 +799,7 @@ export function HomeScreen(props: HomeScreenProps) {
794799
return (
795800
<ThreadListV2SettledShelfHeader
796801
count={item.count}
802+
disabled={!shelfPreferencesLoaded}
797803
expanded={item.expanded}
798804
onToggle={toggleSettledShelf}
799805
/>
@@ -890,6 +896,7 @@ export function HomeScreen(props: HomeScreenProps) {
890896
props.onSelectThread,
891897
props.savedConnectionsById,
892898
serverConfigs,
899+
shelfPreferencesLoaded,
893900
settlementEnvironmentIds,
894901
snoozeEnvironmentIds,
895902
threadListV2Items,

‎apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ import {
4545
parseActiveThreadPath,
4646
useHardwareKeyboardCommand,
4747
} from "../keyboard/hardwareKeyboardCommands";
48+
import { AndroidHomeFabLayout } from "../home/AndroidHomeFab";
4849
import { HomeListOptionsProvider } from "../home/home-list-options";
4950
import { ThreadNavigationSidebar } from "../threads/ThreadNavigationSidebar";
5051
import { WORKSPACE_PANE_TIMING } from "./workspace-pane-animation";
@@ -435,6 +436,10 @@ function AdaptiveWorkspaceLayoutContent(
435436
});
436437
}, [navigation]);
437438

439+
const handleStartNewTask = useCallback(() => {
440+
navigation.navigate("NewTaskSheet", { screen: "NewTask" });
441+
}, [navigation]);
442+
438443
// Minted here (root stack navigation) so the sidebar pane stays free of
439444
// navigation hooks — on iOS it renders inside an independent nav tree.
440445
const handleOpenEnvironmentSettings = useCallback(() => {
@@ -528,18 +533,22 @@ function AdaptiveWorkspaceLayoutContent(
528533
pointerEvents={panes.primarySidebarVisible ? "auto" : "none"}
529534
style={sidebarAnimatedStyle}
530535
>
531-
<ThreadNavigationSidebar
532-
width={layout.listPaneWidth}
533-
visible={panes.primarySidebarVisible}
534-
onRequestVisibility={revealPrimarySidebar}
535-
selectedThreadKey={selectedThreadKey}
536-
onOpenSettings={handleOpenSettings}
537-
onOpenEnvironmentSettings={handleOpenEnvironmentSettings}
538-
onNewThreadInProject={handleNewThreadInProject}
539-
onSelectThread={handleSelectThread}
540-
onSearchQueryChange={setPrimarySidebarSearchQuery}
541-
searchQuery={primarySidebarSearchQuery}
542-
/>
536+
<View className="flex-1" style={{ width: layout.listPaneWidth }}>
537+
<AndroidHomeFabLayout onStartNewTask={handleStartNewTask}>
538+
<ThreadNavigationSidebar
539+
width={layout.listPaneWidth}
540+
visible={panes.primarySidebarVisible}
541+
onRequestVisibility={revealPrimarySidebar}
542+
selectedThreadKey={selectedThreadKey}
543+
onOpenSettings={handleOpenSettings}
544+
onOpenEnvironmentSettings={handleOpenEnvironmentSettings}
545+
onNewThreadInProject={handleNewThreadInProject}
546+
onSelectThread={handleSelectThread}
547+
onSearchQueryChange={setPrimarySidebarSearchQuery}
548+
searchQuery={primarySidebarSearchQuery}
549+
/>
550+
</AndroidHomeFabLayout>
551+
</View>
543552
</Animated.View>
544553
) : null}
545554
<View className="flex-1 overflow-hidden bg-screen" collapsable={false}>

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

Lines changed: 39 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
import type { ApprovalRequestId, ProviderApprovalDecision } from "@t3tools/contracts";
1+
import type {
2+
ApprovalRequestId,
3+
ProviderApprovalDecision,
4+
ProviderApprovalOption,
5+
} from "@t3tools/contracts";
26
import { Pressable, View } from "react-native";
37

48
import { AppText as Text } from "../../components/AppText";
@@ -13,7 +17,14 @@ export interface PendingApprovalCardProps {
1317
) => Promise<unknown>;
1418
}
1519

20+
const DEFAULT_APPROVAL_OPTIONS = [
21+
{ decision: "accept", label: "Allow once" },
22+
{ decision: "acceptForSession", label: "Allow session" },
23+
{ decision: "decline", label: "Decline" },
24+
] satisfies ReadonlyArray<ProviderApprovalOption>;
25+
1626
export function PendingApprovalCard(props: PendingApprovalCardProps) {
27+
const options = props.approval.options ?? DEFAULT_APPROVAL_OPTIONS;
1728
// Opaque for the same reason as PendingUserInputCard: nothing blurs the feed
1829
// behind this card, so a translucent surface bleeds messages through it.
1930
return (
@@ -22,37 +33,40 @@ export function PendingApprovalCard(props: PendingApprovalCardProps) {
2233
Approval needed
2334
</Text>
2435
<Text className="font-t3-bold text-lg text-neutral-950 dark:text-neutral-50">
25-
{props.approval.requestKind}
36+
{props.approval.appName ?? props.approval.requestKind}
2637
</Text>
2738
{props.approval.detail ? (
2839
<Text className="font-sans text-sm leading-normal text-neutral-600 dark:text-neutral-400">
2940
{props.approval.detail}
3041
</Text>
3142
) : null}
3243
<View className="flex-row flex-wrap gap-2.5">
33-
<Pressable
34-
className="items-center justify-center rounded-[14px] bg-blue-500 px-3.5 py-3"
35-
disabled={props.respondingApprovalId === props.approval.requestId}
36-
onPress={() => void props.onRespond(props.approval.requestId, "accept")}
37-
>
38-
<Text className="font-t3-extrabold text-sm text-white">Allow once</Text>
39-
</Pressable>
40-
<Pressable
41-
className="items-center justify-center rounded-[14px] bg-neutral-200 px-3.5 py-3 dark:bg-neutral-800"
42-
disabled={props.respondingApprovalId === props.approval.requestId}
43-
onPress={() => void props.onRespond(props.approval.requestId, "acceptForSession")}
44-
>
45-
<Text className="font-t3-bold text-sm text-neutral-950 dark:text-neutral-50">
46-
Allow session
47-
</Text>
48-
</Pressable>
49-
<Pressable
50-
className="items-center justify-center rounded-[14px] bg-rose-100 px-3.5 py-3 dark:bg-rose-500/18"
51-
disabled={props.respondingApprovalId === props.approval.requestId}
52-
onPress={() => void props.onRespond(props.approval.requestId, "decline")}
53-
>
54-
<Text className="font-t3-bold text-sm text-rose-700 dark:text-rose-300">Decline</Text>
55-
</Pressable>
44+
{options.map((option) => (
45+
<Pressable
46+
key={option.decision}
47+
className={`items-center justify-center rounded-[14px] px-3.5 py-3 ${
48+
option.decision === "accept"
49+
? "bg-blue-500"
50+
: option.decision === "decline"
51+
? "bg-rose-100 dark:bg-rose-500/18"
52+
: "bg-neutral-200 dark:bg-neutral-800"
53+
}`}
54+
disabled={props.respondingApprovalId === props.approval.requestId}
55+
onPress={() => void props.onRespond(props.approval.requestId, option.decision)}
56+
>
57+
<Text
58+
className={`text-sm ${
59+
option.decision === "accept"
60+
? "font-t3-extrabold text-white"
61+
: option.decision === "decline"
62+
? "font-t3-bold text-rose-700 dark:text-rose-300"
63+
: "font-t3-bold text-neutral-950 dark:text-neutral-50"
64+
}`}
65+
>
66+
{option.label}
67+
</Text>
68+
</Pressable>
69+
))}
5670
</View>
5771
</View>
5872
);

0 commit comments

Comments
 (0)