Skip to content

Commit 448328f

Browse files
committed
Merge remote-tracking branch 'upstream/main' into t3code/evaluate-upstream-updates
# Conflicts: # apps/server/src/ws.ts
2 parents 508e1b5 + 2d31cb0 commit 448328f

78 files changed

Lines changed: 5151 additions & 1096 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.

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ There's no public docs site yet, checkout the miscellaneous markdown files in [d
5454
## Documentation
5555

5656
- [Getting started](./docs/getting-started/quick-start.md)
57+
- [Remote access](./docs/user/remote-access.md)
58+
- [Keeping T3 Code in sync](./docs/user/server-updates.md)
5759
- [Architecture overview](./docs/architecture/overview.md)
5860
- [Provider guides](./docs/providers/codex.md)
5961
- [Operations](./docs/operations/ci.md)

‎apps/mobile/src/connection/platform.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import { clearComposerDraftsEnvironment } from "../state/use-composer-drafts";
3333
import { connectionStorageLayer } from "./storage";
3434

3535
function networkStatus(state: Network.NetworkState): "unknown" | "offline" | "online" {
36-
if (state.isConnected === false || state.isInternetReachable === false) {
36+
if (state.isConnected === false) {
3737
return "offline";
3838
}
3939
if (state.isConnected === true) {

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

Lines changed: 119 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import type {
44
SidebarThreadSortOrder,
55
} from "@t3tools/contracts";
66
import type { MenuAction } from "@react-native-menu/menu";
7+
import { useAtomValue } from "@effect/atom-react";
8+
import { AsyncResult } from "effect/unstable/reactivity";
79
import { NativeHeaderToolbar, NativeStackScreenOptions } from "../../native/StackHeader";
810
import { useCallback, useMemo, useRef } from "react";
911
import { Platform, Pressable, Text as RNText, TextInput, View } from "react-native";
@@ -14,13 +16,15 @@ import { ControlPillMenu } from "../../components/ControlPill";
1416
import { SymbolView } from "../../components/AppSymbol";
1517
import { T3Wordmark } from "../../components/T3Wordmark";
1618
import { useThemeColor } from "../../lib/useThemeColor";
19+
import { mobilePreferencesAtom } from "../../state/preferences";
1720
import { useHardwareKeyboardCommand } from "../keyboard/hardwareKeyboardCommands";
1821
import { withNativeGlassHeaderItem } from "../layout/native-glass-header-items";
1922
import { createNativeMailSearchToolbarItem } from "../layout/native-mail-search-toolbar";
2023
import type { HomeProjectSortOrder } from "./homeThreadList";
2124
import {
2225
buildHomeListFilterMenu,
2326
type HomeListFilterMenuEnvironment,
27+
type HomeListFilterMenuProject,
2428
} from "./home-list-filter-menu";
2529
import {
2630
hasCustomHomeListOptions,
@@ -33,13 +37,16 @@ export type HomeHeaderEnvironment = HomeListFilterMenuEnvironment;
3337

3438
export function HomeHeader(props: {
3539
readonly environments: ReadonlyArray<HomeHeaderEnvironment>;
40+
readonly projects: ReadonlyArray<HomeListFilterMenuProject>;
3641
readonly searchQuery: string;
3742
readonly selectedEnvironmentId: EnvironmentId | null;
43+
readonly selectedProjectKey: string | null;
3844
readonly projectSortOrder: HomeProjectSortOrder;
3945
readonly threadSortOrder: SidebarThreadSortOrder;
4046
readonly projectGroupingMode: SidebarProjectGroupingMode;
4147
readonly onSearchQueryChange: (query: string) => void;
4248
readonly onEnvironmentChange: (environmentId: EnvironmentId | null) => void;
49+
readonly onProjectChange: (projectKey: string | null) => void;
4350
readonly onProjectSortOrderChange: (sortOrder: HomeProjectSortOrder) => void;
4451
readonly onThreadSortOrderChange: (sortOrder: SidebarThreadSortOrder) => void;
4552
readonly onProjectGroupingModeChange: (mode: SidebarProjectGroupingMode) => void;
@@ -59,11 +66,24 @@ function checkedMenuState(checked: boolean) {
5966
return checked ? ("on" as const) : undefined;
6067
}
6168

69+
/** Thread List v2 lays the list out in fixed creation order, so the
70+
sort/group filter controls would be silently ignored — hide them and
71+
key the "customized" icon state off the environment filter alone. */
72+
function useThreadListV2FilterGate() {
73+
const preferencesResult = useAtomValue(mobilePreferencesAtom);
74+
return (
75+
AsyncResult.isSuccess(preferencesResult) && preferencesResult.value.threadListV2Enabled === true
76+
);
77+
}
78+
6279
function AndroidHomeHeader(props: HomeHeaderProps) {
6380
const insets = useSafeAreaInsets();
6481
const iconColor = useThemeColor("--color-icon");
6582
const mutedColor = useThemeColor("--color-foreground-muted");
66-
const hasCustomListOptions = hasCustomHomeListOptions(props);
83+
const threadListV2Enabled = useThreadListV2FilterGate();
84+
const hasCustomListOptions = threadListV2Enabled
85+
? props.selectedEnvironmentId !== null || props.selectedProjectKey !== null
86+
: hasCustomHomeListOptions(props);
6787
const menuActions = useMemo<MenuAction[]>(
6888
() => [
6989
{
@@ -82,40 +102,67 @@ function AndroidHomeHeader(props: HomeHeaderProps) {
82102
})),
83103
],
84104
},
85-
{
86-
id: "project-sort",
87-
title: "Sort projects",
88-
subactions: PROJECT_SORT_OPTIONS.map((option) => ({
89-
id: `project-sort:${option.value}`,
90-
title: option.label,
91-
state: checkedMenuState(props.projectSortOrder === option.value),
92-
})),
93-
},
94-
{
95-
id: "thread-sort",
96-
title: "Sort threads",
97-
subactions: THREAD_SORT_OPTIONS.map((option) => ({
98-
id: `thread-sort:${option.value}`,
99-
title: option.label,
100-
state: checkedMenuState(props.threadSortOrder === option.value),
101-
})),
102-
},
103-
{
104-
id: "project-grouping",
105-
title: "Group projects",
106-
subactions: PROJECT_GROUPING_OPTIONS.map((option) => ({
107-
id: `project-grouping:${option.value}`,
108-
title: option.label,
109-
state: checkedMenuState(props.projectGroupingMode === option.value),
110-
})),
111-
},
105+
...(props.projects.length === 0
106+
? []
107+
: ([
108+
{
109+
id: "project",
110+
title: "Project",
111+
subactions: [
112+
{
113+
id: "project:all",
114+
title: "All projects",
115+
state: checkedMenuState(props.selectedProjectKey === null),
116+
},
117+
...props.projects.map((project) => ({
118+
id: `project:${project.key}`,
119+
title: project.label,
120+
state: checkedMenuState(props.selectedProjectKey === project.key),
121+
})),
122+
],
123+
},
124+
] satisfies MenuAction[])),
125+
...(threadListV2Enabled
126+
? []
127+
: ([
128+
{
129+
id: "project-sort",
130+
title: "Sort projects",
131+
subactions: PROJECT_SORT_OPTIONS.map((option) => ({
132+
id: `project-sort:${option.value}`,
133+
title: option.label,
134+
state: checkedMenuState(props.projectSortOrder === option.value),
135+
})),
136+
},
137+
{
138+
id: "thread-sort",
139+
title: "Sort threads",
140+
subactions: THREAD_SORT_OPTIONS.map((option) => ({
141+
id: `thread-sort:${option.value}`,
142+
title: option.label,
143+
state: checkedMenuState(props.threadSortOrder === option.value),
144+
})),
145+
},
146+
{
147+
id: "project-grouping",
148+
title: "Group projects",
149+
subactions: PROJECT_GROUPING_OPTIONS.map((option) => ({
150+
id: `project-grouping:${option.value}`,
151+
title: option.label,
152+
state: checkedMenuState(props.projectGroupingMode === option.value),
153+
})),
154+
},
155+
] satisfies MenuAction[])),
112156
],
113157
[
114158
props.environments,
115159
props.projectGroupingMode,
116160
props.projectSortOrder,
161+
props.projects,
117162
props.selectedEnvironmentId,
163+
props.selectedProjectKey,
118164
props.threadSortOrder,
165+
threadListV2Enabled,
119166
],
120167
);
121168
const handleMenuAction = useCallback(
@@ -137,6 +184,19 @@ function AndroidHomeHeader(props: HomeHeaderProps) {
137184
return;
138185
}
139186

187+
if (id === "project:all") {
188+
props.onProjectChange(null);
189+
return;
190+
}
191+
192+
if (id.startsWith("project:")) {
193+
const projectKey = id.slice("project:".length);
194+
if (props.projects.some((project) => project.key === projectKey)) {
195+
props.onProjectChange(projectKey);
196+
}
197+
return;
198+
}
199+
140200
const projectSort = PROJECT_SORT_OPTIONS.find(
141201
(option) => id === `project-sort:${option.value}`,
142202
);
@@ -255,17 +315,24 @@ function AndroidHomeHeader(props: HomeHeaderProps) {
255315
function IosHomeHeader(props: HomeHeaderProps) {
256316
const searchBarRef = useRef<SearchBarCommands>(null);
257317
const iconColor = useThemeColor("--color-icon");
258-
const hasCustomListOptions = hasCustomHomeListOptions(props);
318+
const threadListV2Enabled = useThreadListV2FilterGate();
319+
const hasCustomListOptions = threadListV2Enabled
320+
? props.selectedEnvironmentId !== null || props.selectedProjectKey !== null
321+
: hasCustomHomeListOptions(props);
259322
const focusSearch = useCallback(() => {
260323
searchBarRef.current?.focus();
261324
return searchBarRef.current !== null;
262325
}, []);
263326
useHardwareKeyboardCommand("focusSearch", focusSearch);
264-
const filterMenu = buildHomeListFilterMenu(props);
327+
const filterMenu = buildHomeListFilterMenu({
328+
...props,
329+
listOrganization: !threadListV2Enabled,
330+
});
265331

266332
return (
267333
<>
268334
<NativeStackScreenOptions
335+
optionsVersion={filterMenu.items}
269336
options={{
270337
// Static header config (glass, title, fonts) lives in Stack.tsx
271338
// (GLASS_HEADER_OPTIONS). Only dynamic values are set here.
@@ -366,6 +433,28 @@ function IosHomeHeader(props: HomeHeaderProps) {
366433
))}
367434
</NativeHeaderToolbar.Menu>
368435

436+
{props.projects.length > 0 ? (
437+
<NativeHeaderToolbar.Menu title="Project">
438+
<NativeHeaderToolbar.Label>Project</NativeHeaderToolbar.Label>
439+
<NativeHeaderToolbar.MenuAction
440+
isOn={props.selectedProjectKey === null}
441+
onPress={() => props.onProjectChange(null)}
442+
subtitle="Show threads from every project"
443+
>
444+
<NativeHeaderToolbar.Label>All projects</NativeHeaderToolbar.Label>
445+
</NativeHeaderToolbar.MenuAction>
446+
{props.projects.map((project) => (
447+
<NativeHeaderToolbar.MenuAction
448+
key={project.key}
449+
isOn={props.selectedProjectKey === project.key}
450+
onPress={() => props.onProjectChange(project.key)}
451+
>
452+
<NativeHeaderToolbar.Label>{project.label}</NativeHeaderToolbar.Label>
453+
</NativeHeaderToolbar.MenuAction>
454+
))}
455+
</NativeHeaderToolbar.Menu>
456+
) : null}
457+
369458
<NativeHeaderToolbar.Menu title="Sort projects">
370459
<NativeHeaderToolbar.Label>Sort projects</NativeHeaderToolbar.Label>
371460
{PROJECT_SORT_OPTIONS.map((option) => (

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

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import * as Arr from "effect/Array";
22
import * as Order from "effect/Order";
33
import { useNavigation } from "@react-navigation/native";
4-
import { useMemo, useState } from "react";
4+
import { useEffect, useMemo, useState } from "react";
55

66
import { NativeHeaderToolbar, NativeStackScreenOptions } from "../../native/StackHeader";
7+
import { scopedProjectKey } from "../../lib/scopedEntities";
78
import { useProjects, useThreadShells } from "../../state/entities";
89
import { usePendingNewTasks } from "../../state/use-pending-new-tasks";
910
import { useWorkspaceState } from "../../state/workspace";
@@ -58,6 +59,28 @@ export function HomeRouteScreen() {
5859
setThreadSortOrder,
5960
} = useHomeListOptions(availableEnvironmentIds);
6061
const selectedEnvironmentId = listOptions.selectedEnvironmentId;
62+
const [selectedProjectKey, setSelectedProjectKey] = useState<string | null>(null);
63+
const projectFilterOptions = useMemo(
64+
() =>
65+
projects
66+
.filter(
67+
(project) =>
68+
selectedEnvironmentId === null || project.environmentId === selectedEnvironmentId,
69+
)
70+
.map((project) => ({
71+
key: scopedProjectKey(project.environmentId, project.id),
72+
label: project.title,
73+
})),
74+
[projects, selectedEnvironmentId],
75+
);
76+
useEffect(() => {
77+
if (
78+
selectedProjectKey !== null &&
79+
!projectFilterOptions.some((project) => project.key === selectedProjectKey)
80+
) {
81+
setSelectedProjectKey(null);
82+
}
83+
}, [projectFilterOptions, selectedProjectKey]);
6184

6285
// In split layouts the persistent sidebar IS the thread list — Home becomes
6386
// an empty detail pane so selecting a thread never transitions layouts.
@@ -90,12 +113,15 @@ export function HomeRouteScreen() {
90113
<NativeStackScreenOptions options={{ title: "Threads", headerTitle: "Threads" }} />
91114
<HomeHeader
92115
environments={environments}
116+
projects={projectFilterOptions}
93117
searchQuery={searchQuery}
94118
selectedEnvironmentId={selectedEnvironmentId}
119+
selectedProjectKey={selectedProjectKey}
95120
projectSortOrder={listOptions.projectSortOrder}
96121
threadSortOrder={listOptions.threadSortOrder}
97122
projectGroupingMode={listOptions.projectGroupingMode}
98123
onEnvironmentChange={setSelectedEnvironmentId}
124+
onProjectChange={setSelectedProjectKey}
99125
onOpenSettings={() => navigation.navigate("SettingsSheet", { screen: "Settings" })}
100126
onProjectGroupingModeChange={setProjectGroupingMode}
101127
onProjectSortOrderChange={setProjectSortOrder}
@@ -115,6 +141,7 @@ export function HomeRouteScreen() {
115141
onSettleThread={settleThread}
116142
onUnsettleThread={unsettleThread}
117143
onEnvironmentChange={setSelectedEnvironmentId}
144+
onProjectChange={setSelectedProjectKey}
118145
onOpenEnvironments={() =>
119146
navigation.navigate("SettingsSheet", { screen: "SettingsEnvironments" })
120147
}
@@ -151,6 +178,7 @@ export function HomeRouteScreen() {
151178
savedConnectionsById={savedConnectionsById}
152179
searchQuery={searchQuery}
153180
selectedEnvironmentId={selectedEnvironmentId}
181+
selectedProjectKey={selectedProjectKey}
154182
threads={threads}
155183
threadSortOrder={listOptions.threadSortOrder}
156184
/>

0 commit comments

Comments
 (0)