Skip to content

Commit 946eb8a

Browse files
committed
Merge remote-tracking branch 'origin/main' into feat/mobile-ios-action-button
# Conflicts: # apps/mobile/src/App.tsx
2 parents bf80437 + 3425671 commit 946eb8a

524 files changed

Lines changed: 24476 additions & 11398 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/scripts/ci-changes.cjs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ const RUST = /^native\/(resource-monitor|kde-snap-shot|hyprland-snap-shot)\//;
3232

3333
// These tests read other packages without declaring dependencies.
3434
const TEST_ONLY_DEPS = {
35+
// Evals import the server's source to test its real model-facing text.
36+
"@t3tools/evals": ["t3"],
3537
"@t3tools/provider-pi": ["@t3tools/client-runtime"],
3638
"@t3tools/scripts": [
3739
"@t3tools/desktop",

‎AGENTS.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@ An empty database is a bad test. Seed your worktree's `.t3` with a copy of real
136136

137137
For authorized mobile verification, a missing or outdated native client is an install step, not a blocker. Run `vp run mobile:install <ios|android> [device-id]` on the device host before starting Metro; it targets the only booted simulator or connected Android device when the id is omitted. It installs the dev client for this checkout's native fingerprint from the shared cache in seconds and builds only when no machine has built it yet, so prefer it over `expo run:*`, `xcodebuild`, or `gradlew`, which rebuild from scratch. Its stdout is one JSON line; build output goes to the log it names. See `test-t3-mobile` for the full workflow.
138138

139+
## Evals
140+
141+
`evals/` checks how real models behave with T3 Code's model-facing text: agent instructions, MCP tool descriptions and schemas, and generated titles. Before you change that text, read [evals/README.md](evals/README.md) and run the evals it names. When you fix a model behavior bug, add a case that fails before the fix.
142+
139143
## Pull requests
140144

141145
- Never make a PR unless the developer explicitly asks you to do so.

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ We are (mostly) not accepting contributions yet. Small fixes may be considered.
9494

9595
Full docs live in [docs/](./docs). There's no docs site yet.
9696

97+
- [FAQ](./docs/user/faq.md)
9798
- [Install and first run](./docs/user/install.md)
9899
- [Permission modes](./docs/user/permission-modes.md)
99100
- [Keyboard shortcuts](./docs/user/keybindings.md)

‎apps/desktop/src/backend/DesktopBackendPool.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ export const layer = Layer.effect(
132132
});
133133
yield* electronDialog.showErrorBox(
134134
"WSL backend couldn't start",
135-
`${reason}\n\nFalling back to the Windows backend so T3 Code can open. Re-enable the WSL backend from Settings > Connections once the WSL distro is fixed.`,
135+
`${reason}\n\nFalling back to the Windows backend so T3 Code can open. Re-enable the WSL backend from Settings > Sharing & access once the WSL distro is fixed.`,
136136
);
137137
// Clear wslOnly too so enabling WSL cannot restore a failed mode.
138138
// Keep the in-memory fallback if persistence fails.

‎apps/mobile/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
"@t3tools/provider-acp-registry": "workspace:*",
7777
"@t3tools/provider-core": "workspace:*",
7878
"@t3tools/provider-cursor": "workspace:*",
79+
"@t3tools/provider-fx": "workspace:*",
7980
"@t3tools/provider-grok": "workspace:*",
8081
"@t3tools/provider-muse": "workspace:*",
8182
"@t3tools/provider-opencode": "workspace:*",

‎apps/mobile/src/App.tsx‎

Lines changed: 43 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import { installPermissionUpdateNotice } from "./features/connection/permissionUpdateNotice";
2+
import { installComposerAttachmentUploads } from "./state/composer-attachment-uploads";
3+
import { installThreadOutboxDelivery } from "./state/threadOutboxDelivery";
24
import * as Linking from "expo-linking";
35
import * as SplashScreen from "expo-splash-screen";
46
import { useEffect } from "react";
@@ -10,6 +12,7 @@ import {
1012
createStaticNavigation,
1113
getActionFromState,
1214
getStateFromPath,
15+
type NavigationState,
1316
} from "@react-navigation/native";
1417

1518
import { RegistryContext } from "@effect/atom-react";
@@ -39,7 +42,6 @@ import {
3942
import { useMobileNavigationTheme } from "./lib/useMobileNavigationTheme";
4043
import { useUiRuntimeMemoryWarningGc } from "./lib/useUiRuntimeMemoryWarningGc";
4144
import { SubscriptionUsageCoordinator } from "./widgets/SubscriptionUsageCoordinator";
42-
import { VoiceInputProvider } from "./features/voice-input/VoiceInputProvider";
4345
import { GlobalVoiceInputControl } from "./features/voice-input/GlobalVoiceInputControl";
4446
import { restoreSettingsLinkState } from "./features/settings/settings-navigation";
4547
import {
@@ -50,10 +52,9 @@ import {
5052
} from "./features/workspace/workspace-selection-store";
5153
import { workspaceDetailLinkAction } from "./features/workspace/workspace-detail-selection";
5254
import { NativeLayoutMetricsProvider } from "./native/native-layout-metrics";
53-
import {
54-
flushRootNavigationReady,
55-
rootNavigationRef,
56-
} from "./features/layout/root-navigation-ready";
55+
import { attachRootNavigation, rootNavigationRef } from "./lib/rootNavigation";
56+
import { flushRootNavigationReady } from "./features/layout/root-navigation-ready";
57+
import { pruneNewTaskBranchCheckouts } from "./features/threads/NewTaskDraftRouteScreen";
5758

5859
import "../global.css";
5960

@@ -87,13 +88,26 @@ const appLinking = {
8788

8889
const Navigation = createStaticNavigation(RootStack);
8990

91+
function handleNavigationStateChange(state: NavigationState | undefined): void {
92+
recordWorkspaceSelections(state);
93+
if (state) pruneNewTaskBranchCheckouts(state);
94+
}
95+
96+
function handleNavigationReady(): void {
97+
handleNavigationStateChange(rootNavigationRef.getRootState());
98+
flushRootNavigationReady();
99+
}
100+
90101
declare const module: { readonly hot?: FoundationHotModule } | undefined;
91102

92-
const disposePermissionUpdateNotice = installPermissionUpdateNotice();
93-
disposeOnFoundationReplace(
94-
typeof module === "undefined" ? undefined : module.hot,
95-
disposePermissionUpdateNotice,
96-
);
103+
const appServiceDisposers = [
104+
installPermissionUpdateNotice(),
105+
installThreadOutboxDelivery(),
106+
installComposerAttachmentUploads(),
107+
];
108+
disposeOnFoundationReplace(typeof module === "undefined" ? undefined : module.hot, () => {
109+
for (const dispose of appServiceDisposers) dispose();
110+
});
97111

98112
function SplashScreenCoordinator() {
99113
const { isReady } = useAppearancePreferences();
@@ -140,30 +154,25 @@ function AppContent() {
140154
<GestureHandlerRootView className="flex-1">
141155
<KeyboardProvider statusBarTranslucent>
142156
<SafeAreaProvider>
143-
<VoiceInputProvider>
144-
<StatusBar barStyle={themeAppearance === "dark" ? "light-content" : "dark-content"} />
145-
{/* native-stack needs the theme's dark flag to select dark native headers. */}
146-
<GlobalVoiceInputControl>
147-
<NativeLayoutMetricsProvider>
148-
<IncomingShareProvider>
149-
<Navigation
150-
ref={rootNavigationRef}
151-
linking={appLinking}
152-
onReady={() => {
153-
recordWorkspaceSelections(rootNavigationRef.getRootState());
154-
flushRootNavigationReady();
155-
}}
156-
theme={navigationTheme}
157-
onStateChange={recordWorkspaceSelections}
158-
/>
159-
</IncomingShareProvider>
160-
<Dialog.Host />
161-
<ThreadArrangementHost />
162-
<ProjectChipIconRasterizer />
163-
</NativeLayoutMetricsProvider>
164-
</GlobalVoiceInputControl>
165-
<OverlayPortalHost />
166-
</VoiceInputProvider>
157+
<StatusBar barStyle={themeAppearance === "dark" ? "light-content" : "dark-content"} />
158+
{/* native-stack needs the theme's dark flag to select dark native headers. */}
159+
<GlobalVoiceInputControl>
160+
<NativeLayoutMetricsProvider>
161+
<IncomingShareProvider>
162+
<Navigation
163+
ref={attachRootNavigation}
164+
linking={appLinking}
165+
onReady={handleNavigationReady}
166+
theme={navigationTheme}
167+
onStateChange={handleNavigationStateChange}
168+
/>
169+
</IncomingShareProvider>
170+
<Dialog.Host />
171+
<ThreadArrangementHost />
172+
<ProjectChipIconRasterizer />
173+
</NativeLayoutMetricsProvider>
174+
</GlobalVoiceInputControl>
175+
<OverlayPortalHost />
167176
</SafeAreaProvider>
168177
</KeyboardProvider>
169178
</GestureHandlerRootView>

‎apps/mobile/src/Stack.tsx‎

Lines changed: 41 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ import {
8282
NewTaskEnvironmentPickerRouteScreen,
8383
} from "./features/threads/NewTaskContextPickerScreens";
8484
import {
85-
ExistingThreadSettingsRouteProvider,
8685
ExistingThreadSettingsRouteScreen,
8786
NewTaskThreadSettingsRouteScreen,
8887
} from "./features/threads/ThreadSettingsSheet";
@@ -98,9 +97,9 @@ import { SettingsEnvironmentDetailRouteScreen } from "./features/settings/Settin
9897
import { SettingsEnvironmentsRouteScreen } from "./features/settings/SettingsEnvironmentsRouteScreen";
9998
import { SettingsFollowUpRouteScreen } from "./features/settings/SettingsFollowUpRouteScreen";
10099
import {
101-
SettingsEnvironmentAgentBehaviorRouteScreen,
102100
SettingsEnvironmentMaintenanceRouteScreen,
103-
SettingsEnvironmentNewThreadsRouteScreen,
101+
SettingsThreadsRouteScreen,
102+
SettingsWorktreesRouteScreen,
104103
SettingsEnvironmentSourceControlRouteScreen,
105104
} from "./features/settings/SettingsServerControlsRouteScreen";
106105
import {
@@ -126,7 +125,7 @@ import { UsageRouteScreen } from "./features/usage/UsageRouteScreen";
126125
import { SettingsAboutRouteScreen } from "./features/settings/SettingsAboutRouteScreen";
127126
import { SettingsNotificationsRouteScreen } from "./features/settings/SettingsNotificationsRouteScreen";
128127
import { SettingsRouteScreen } from "./features/settings/SettingsRouteScreen";
129-
import { SettingsThreadsRouteScreen } from "./features/settings/SettingsThreadsRouteScreen";
128+
import { SettingsLabsRouteScreen } from "./features/settings/ThreadSettingsSections";
130129
import { SettingsEnvironmentFilterProvider } from "./features/settings/settings-environment-filter";
131130
import { openSettings, settingsOpenIn } from "./features/settings/settings-navigation";
132131
import { DEFAULT_SETTINGS_PAGE } from "./features/workspace/workspace-tab-navigation";
@@ -150,8 +149,6 @@ import { deriveLayout } from "./lib/layout";
150149
import { useNativeLayoutMetrics } from "./native/native-layout-metrics";
151150
import { nativeHeaderScrollEdgeEffects } from "./native/StackHeader";
152151
import { HORIZONTAL_FORM_SHEET_OPTIONS, formSheetDetents } from "./native/sheet-surface";
153-
import { useThreadOutboxDrain } from "./state/use-thread-outbox-drain";
154-
import { useComposerAttachmentUploadWorker } from "./state/composer-attachment-uploads";
155152
import {
156153
selectWorkspaceDetail,
157154
workspaceDetailRouter,
@@ -264,25 +261,36 @@ const SETTINGS_SCREENS = {
264261
linking: "settings/environments/:environmentId",
265262
options: { ...SETTINGS_PAGE_OPTIONS, title: "Environment" },
266263
}),
264+
// Old links to New threads and Agent behavior open Threads, which absorbed them.
267265
SettingsEnvironmentNewThreads: createNativeStackScreen({
268-
screen: SettingsEnvironmentNewThreadsRouteScreen,
266+
screen: SettingsThreadsRouteScreen,
269267
linking: "settings/new-threads",
270-
options: { ...SETTINGS_PAGE_OPTIONS, title: "New threads" },
268+
options: { ...SETTINGS_PAGE_OPTIONS, title: "Threads" },
271269
}),
272270
SettingsEnvironmentSourceControl: createNativeStackScreen({
273271
screen: SettingsEnvironmentSourceControlRouteScreen,
274272
linking: "settings/source-control",
275273
options: { ...SETTINGS_PAGE_OPTIONS, title: "Source control" },
276274
}),
277275
SettingsEnvironmentAgentBehavior: createNativeStackScreen({
278-
screen: SettingsEnvironmentAgentBehaviorRouteScreen,
276+
screen: SettingsThreadsRouteScreen,
279277
linking: "settings/agent-behavior",
280-
options: { ...SETTINGS_PAGE_OPTIONS, title: "Agent behavior" },
278+
options: { ...SETTINGS_PAGE_OPTIONS, title: "Threads" },
279+
}),
280+
SettingsWorktrees: createNativeStackScreen({
281+
screen: SettingsWorktreesRouteScreen,
282+
linking: "settings/worktrees",
283+
options: { ...SETTINGS_PAGE_OPTIONS, title: "Worktrees" },
284+
}),
285+
SettingsLabs: createNativeStackScreen({
286+
screen: SettingsLabsRouteScreen,
287+
linking: "settings/labs",
288+
options: { ...SETTINGS_PAGE_OPTIONS, title: "Labs" },
281289
}),
282290
SettingsProviderAccounts: createNativeStackScreen({
283291
screen: SettingsProviderAccountsRouteScreen,
284292
linking: "settings/provider-accounts",
285-
options: { ...SETTINGS_PAGE_OPTIONS, title: "Provider accounts" },
293+
options: { ...SETTINGS_PAGE_OPTIONS, title: "Providers" },
286294
}),
287295
SettingsEnvironmentMaintenance: createNativeStackScreen({
288296
screen: SettingsEnvironmentMaintenanceRouteScreen,
@@ -297,12 +305,12 @@ const SETTINGS_SCREENS = {
297305
SettingsThreads: createNativeStackScreen({
298306
screen: SettingsThreadsRouteScreen,
299307
linking: "settings/thread-preferences",
300-
options: { ...SETTINGS_PAGE_OPTIONS, title: "Thread behavior" },
308+
options: { ...SETTINGS_PAGE_OPTIONS, title: "Threads" },
301309
}),
302310
SettingsAbout: createNativeStackScreen({
303311
screen: SettingsAboutRouteScreen,
304312
linking: "settings/about",
305-
options: { ...SETTINGS_PAGE_OPTIONS, title: "About T3 Code" },
313+
options: { ...SETTINGS_PAGE_OPTIONS, title: "About" },
306314
}),
307315
SettingsEnvironmentNew: createNativeStackScreen({
308316
screen: ConnectionsNewRouteScreen,
@@ -317,7 +325,7 @@ const SETTINGS_SCREENS = {
317325
linking: "settings/archive",
318326
options: {
319327
...SETTINGS_PAGE_OPTIONS,
320-
title: "Archived Threads",
328+
title: "Archive",
321329
},
322330
}),
323331
SettingsNavigation: createNativeStackScreen({
@@ -338,21 +346,21 @@ const SETTINGS_SCREENS = {
338346
linking: "settings/project-grouping",
339347
options: {
340348
...SETTINGS_PAGE_OPTIONS,
341-
title: "Organization",
349+
title: "General",
342350
},
343351
}),
344352
SettingsOrganization: createNativeStackScreen({
345353
screen: SettingsProjectGroupingRouteScreen,
346354
linking: "settings/organization",
347355
options: {
348356
...SETTINGS_PAGE_OPTIONS,
349-
title: "Organization",
357+
title: "General",
350358
},
351359
}),
352360
SettingsProjectOverview: createNativeStackScreen({
353361
screen: SettingsProjectOverviewRouteScreen,
354362
linking: "settings/project",
355-
options: { ...SETTINGS_PAGE_OPTIONS, title: "Project overview" },
363+
options: { ...SETTINGS_PAGE_OPTIONS, title: "Projects" },
356364
}),
357365
SettingsKeyboard: createNativeStackScreen({
358366
screen: SettingsKeyboardRouteScreen,
@@ -375,15 +383,15 @@ const SETTINGS_SCREENS = {
375383
linking: "settings/follow-ups",
376384
options: {
377385
...SETTINGS_PAGE_OPTIONS,
378-
title: "Follow-ups",
386+
title: "Chat",
379387
},
380388
}),
381389
SettingsScheduledTasks: createNativeStackScreen({
382390
screen: SettingsScheduledTasksRouteScreen,
383391
linking: "settings/scheduled-tasks",
384392
options: {
385393
...SETTINGS_PAGE_OPTIONS,
386-
title: "Scheduled Tasks",
394+
title: "Scheduled tasks",
387395
headerTitleStyle: { fontSize: 16, fontWeight: "800" },
388396
},
389397
}),
@@ -486,13 +494,6 @@ function workspaceLocationFromState(state: NavigationState) {
486494
};
487495
}
488496

489-
// Isolate subscriptions so streaming updates cannot re-render RootStackLayout and every screen.
490-
function ThreadOutboxDrainWorker() {
491-
useThreadOutboxDrain();
492-
useComposerAttachmentUploadWorker();
493-
return null;
494-
}
495-
496497
function RootStackLayout(props: {
497498
readonly children: React.ReactNode;
498499
readonly state: NavigationState;
@@ -510,16 +511,11 @@ function RootStackLayout(props: {
510511
);
511512
const draftRoute = props.state.routes.findLast((route) => route.name === "Thread");
512513
const draftParams = (
513-
draftRoute?.params as
514-
| { draft?: { draftId?: string | string[]; pendingTaskId?: string | string[] } }
515-
| undefined
514+
draftRoute?.params as { draft?: { draftId?: string | string[] } } | undefined
516515
)?.draft;
517516
const routeDraftId = Array.isArray(draftParams?.draftId)
518517
? draftParams.draftId[0]
519518
: draftParams?.draftId;
520-
const routePendingTaskId = Array.isArray(draftParams?.pendingTaskId)
521-
? draftParams.pendingTaskId[0]
522-
: draftParams?.pendingTaskId;
523519
useAgentNotificationNavigation(workspaceLocation.pathname);
524520
useConnectOnboardingNavigation();
525521
useAppShortcuts(props.state);
@@ -541,29 +537,22 @@ function RootStackLayout(props: {
541537
}, [navigation, pendingShare, props.state]);
542538

543539
return (
544-
<NewTaskFlowProvider
545-
active={isDraftThreadRoute(draftRoute)}
546-
routeDraftId={routeDraftId}
547-
routePendingTaskId={routePendingTaskId}
548-
>
540+
<NewTaskFlowProvider active={isDraftThreadRoute(draftRoute)} routeDraftId={routeDraftId}>
549541
<HardwareKeyboardCommandProvider pathname={pathname}>
550-
<ThreadOutboxDrainWorker />
551542
<ShowcaseCaptureCoordinator pathname={pathname} />
552543
<SettingsEnvironmentFilterProvider open={settingsOpen}>
553-
<ExistingThreadSettingsRouteProvider>
554-
<WorkspaceConnectionStatusProvider>
555-
<AndroidWorkspaceTabsProvider state={props.state}>
556-
<AdaptiveWorkspaceLayout
557-
pathname={workspaceLocation.pathname}
558-
workspaceRouteKey={workspaceLocation.routeKey}
559-
selectedPullRequestKey={selectedPullRequestKey(props.state)}
560-
>
561-
{props.children}
562-
<HardwareKeyboardCommandOverlay />
563-
</AdaptiveWorkspaceLayout>
564-
</AndroidWorkspaceTabsProvider>
565-
</WorkspaceConnectionStatusProvider>
566-
</ExistingThreadSettingsRouteProvider>
544+
<WorkspaceConnectionStatusProvider>
545+
<AndroidWorkspaceTabsProvider state={props.state}>
546+
<AdaptiveWorkspaceLayout
547+
pathname={workspaceLocation.pathname}
548+
workspaceRouteKey={workspaceLocation.routeKey}
549+
selectedPullRequestKey={selectedPullRequestKey(props.state)}
550+
>
551+
{props.children}
552+
<HardwareKeyboardCommandOverlay />
553+
</AdaptiveWorkspaceLayout>
554+
</AndroidWorkspaceTabsProvider>
555+
</WorkspaceConnectionStatusProvider>
567556
</SettingsEnvironmentFilterProvider>
568557
</HardwareKeyboardCommandProvider>
569558
</NewTaskFlowProvider>

0 commit comments

Comments
 (0)