chore: sync with upstream pingdotgg/t3code main

apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3WorkspaceNavigationModule.kt

@@ -63,12 +63,11 @@ import expo.modules.kotlin.modules.ModuleDefinition
 import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
 
-private val TABS = listOf("threads", "pullRequests", "settings")
-
 class T3WorkspaceNavigationModule : Module() {
   override fun definition() = ModuleDefinition {
     Name("T3WorkspaceNavigation")
     View(T3WorkspaceNavigationView::class) {
+      Prop("tabs") { view: T3WorkspaceNavigationView, value: List<String> -> view.tabs = value }
       Prop("selectedTab") { view: T3WorkspaceNavigationView, value: String ->
         view.selectedTab = value
       }
@@ -121,6 +120,7 @@ class T3WorkspaceNavigationView(
   private val onTabSelected by EventDispatcher()
   private val onNewThread by EventDispatcher()
   private val onOverlayChange by EventDispatcher()
+  var tabs by mutableStateOf(listOf("threads", "pullRequests", "usage", "settings"))
   var selectedTab by mutableStateOf("threads")
   var rail by mutableStateOf(false)
   var dark by mutableStateOf(false)
@@ -175,7 +175,7 @@ class T3WorkspaceNavigationView(
                 tonalElevation = androidx.compose.ui.unit.Dp(0f),
                 windowInsets = WindowInsets(0),
               ) {
-                TABS.forEach { tab ->
+                tabs.forEach { tab ->
                   NavigationBarItem(
                     selected = selectedTab == tab,
                     onClick = { onTabSelected(mapOf("tab" to tab)) },
@@ -267,12 +267,14 @@ class T3WorkspaceNavigationView(
             )
           }
         }
-        newThreadButton(fraction) {
-          expanded = false
-          onNewThread(emptyMap<String, Any>())
+        if (selectedTab == "threads") {
+          newThreadButton(fraction) {
+            expanded = false
+            onNewThread(emptyMap<String, Any>())
+          }
         }
         Spacer(Modifier.weight(1f))
-        TABS.forEach { tab ->
+        tabs.forEach { tab ->
           railItem(tab, fraction) {
             expanded = false
             onTabSelected(mapOf("tab" to tab))
@@ -356,7 +358,8 @@ class T3WorkspaceNavigationView(
 
   private fun tabTitle(tab: String) = when (tab) {
     "threads" -> "Chats"
-    "pullRequests" -> "PRs"
+    "pullRequests" -> "Pulls"
+    "usage" -> "Usage"
     else -> "Settings"
   }
 
@@ -368,6 +371,7 @@ class T3WorkspaceNavigationView(
     when (tab) {
       "threads" -> R.drawable.t3_chats
       "pullRequests" -> R.drawable.t3_pull_requests
+      "usage" -> R.drawable.t3_usage
       else -> R.drawable.t3_settings
     }
   )

apps/mobile/modules/t3-native-controls/android/src/main/res/drawable/t3_usage.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+  <path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M4,20V10H8V20ZM10,20V4H14V20ZM16,20V7H20V20Z" />
+</vector>

apps/mobile/modules/t3-native-controls/ios/T3NativeControlsModule.swift

@@ -34,9 +34,12 @@ public final class T3NativeControlsModule: Module {
 
     View(T3SidebarTabBarView.self) {
       ViewName("SidebarTabBar")
-      Events("onSelectionChange")
-      Prop("selectedIndex") { (view: T3SidebarTabBarView, value: Int) in view.selectedIndex = value }
+      Events("onSelectionChange", "onCompose")
+      Prop("tabs") { (view: T3SidebarTabBarView, value: [String]) in view.tabs = value }
+      Prop("selectedTab") { (view: T3SidebarTabBarView, value: String) in view.selectedTab = value }
       Prop("selectedColor") { (view: T3SidebarTabBarView, value: UIColor) in view.selectedColor = value }
+      Prop("showsCompose") { (view: T3SidebarTabBarView, value: Bool) in view.showsCompose = value }
+      Prop("compact") { (view: T3SidebarTabBarView, value: Bool) in view.compact = value }
       Prop("appearance") { (view: T3SidebarTabBarView, value: String) in view.appearance = value }
     }
 

apps/mobile/modules/t3-native-controls/ios/T3SidebarTabBarView.swift

@@ -1,37 +1,139 @@
 import ExpoModulesCore
 import UIKit
 
+private final class WorkspaceTabBar: UITabBar {
+  var onContentLayout: ((CGRect) -> Void)?
+
+  override func layoutSubviews() {
+    super.layoutSubviews()
+    let row = tabButtons(in: self).reduce(CGRect.null) { $0.union(convert($1.bounds, from: $1)) }
+    if !row.isNull { onContentLayout?(row) }
+  }
+
+  override func safeAreaInsetsDidChange() {
+    super.safeAreaInsetsDidChange()
+    invalidateIntrinsicContentSize()
+  }
+
+  private func tabButtons(in view: UIView) -> [UIView] {
+    view.subviews.filter { !$0.isHidden }.flatMap { subview in
+      if subview is UIControl, subview.accessibilityIdentifier?.hasPrefix("workspace-tab-") == true {
+        return [subview]
+      }
+      return tabButtons(in: subview)
+    }
+  }
+}
+
 final class T3SidebarTabBarView: ExpoView, UITabBarDelegate {
   let onSelectionChange = EventDispatcher()
-  private let tabBar = UITabBar()
-  var selectedIndex = 0 { didSet { updateSelection() } }
+  let onCompose = EventDispatcher()
+  private let tabBar = WorkspaceTabBar()
+  private let composeButton = UIButton(type: .system)
+  private lazy var tabBarTrailing = tabBar.trailingAnchor.constraint(equalTo: trailingAnchor)
+  private var itemsByTab: [String: UITabBarItem] = [:]
+  var tabs = ["threads", "pullRequests", "usage", "settings"] {
+    didSet { if tabs != oldValue { updateItems() } }
+  }
+  var selectedTab = "threads" { didSet { updateSelection() } }
   var selectedColor: UIColor = .systemBlue { didSet { tabBar.tintColor = selectedColor } }
+  var compact = false {
+    didSet {
+      tabBarTrailing.constant = showsCompose ? (compact ? -64 : -76) : 0
+      tabBar.setNeedsLayout()
+    }
+  }
+  var showsCompose = false {
+    didSet {
+      composeButton.isHidden = !showsCompose
+      tabBarTrailing.constant = showsCompose ? (compact ? -64 : -76) : 0
+      setNeedsLayout()
+    }
+  }
   var appearance = "light" {
     didSet { overrideUserInterfaceStyle = appearance == "dark" ? .dark : .light }
   }
 
   required init(appContext: AppContext? = nil) {
     super.init(appContext: appContext)
-    let iconBundle = Bundle(for: Self.self).url(forResource: "T3NativeControlIcons", withExtension: "bundle").flatMap(Bundle.init(url:))
-    let pullRequestIcon = UIImage(named: "pull-request", in: iconBundle, compatibleWith: nil)?.withRenderingMode(.alwaysTemplate)
-    tabBar.items = [
-      UITabBarItem(title: "Threads", image: tabIcon(UIImage(systemName: "text.bubble")), tag: 0),
-      UITabBarItem(title: "Pulls", image: tabIcon(pullRequestIcon), tag: 1),
-    ]
-    tabBar.items?.last?.accessibilityLabel = "Pull requests"
-    tabBar.items?.first?.selectedImage = tabIcon(UIImage(systemName: "text.bubble.fill"))
     tabBar.itemPositioning = .fill
+    // iPad's regular bar uses a compressed inline row even with fill positioning.
+    // This floating sidebar control needs the same full-size items as a phone bar.
+    if #available(iOS 17.0, *) {
+      tabBar.traitOverrides.horizontalSizeClass = .compact
+    }
     tabBar.delegate = self
+    tabBar.translatesAutoresizingMaskIntoConstraints = false
     addSubview(tabBar)
-    updateSelection()
+    NSLayoutConstraint.activate([
+      tabBar.leadingAnchor.constraint(equalTo: leadingAnchor),
+      tabBarTrailing,
+      tabBar.bottomAnchor.constraint(equalTo: bottomAnchor),
+    ])
+    // UIKit's floating row changes with window geometry. Follow its laid-out items
+    // instead of estimating their position from a second set of safe-area updates.
+    tabBar.onContentLayout = { [weak self] frame in self?.layoutCompose(alongside: frame) }
+    composeButton.accessibilityLabel = "New chat"
+    composeButton.addAction(UIAction { [weak self] _ in self?.onCompose() }, for: .touchUpInside)
+    composeButton.isHidden = true
+    addSubview(composeButton)
+    configureCompose()
+    prepareItems()
+    updateItems()
   }
 
-  override func layoutSubviews() {
-    super.layoutSubviews()
-    tabBar.frame = bounds
+  private func configureCompose() {
+    var configuration: UIButton.Configuration
+    if #available(iOS 26.0, *) {
+      configuration = .glass()
+    } else {
+      configuration = .gray()
+    }
+    configuration.cornerStyle = .capsule
+    configuration.baseForegroundColor = .label
+    configuration.image = UIImage(systemName: "square.and.pencil")
+    configuration.preferredSymbolConfigurationForImage = UIImage.SymbolConfiguration(pointSize: 24)
+    composeButton.configuration = configuration
+  }
+
+  private func prepareItems() {
+    let iconBundle = Bundle(for: Self.self).url(forResource: "T3NativeControlIcons", withExtension: "bundle").flatMap(Bundle.init(url:))
+    let pullRequestIcon = UIImage(named: "pull-request", in: iconBundle, compatibleWith: nil)?.withRenderingMode(.alwaysTemplate)
+    let labels = ["threads": "Chats", "pullRequests": "PRs", "usage": "Usage", "settings": "Settings"]
+    let symbols = ["threads": "text.bubble", "usage": "chart.bar.xaxis", "settings": "gearshape"]
+    for (tab, label) in labels {
+      let icon = tab == "pullRequests" ? pullRequestIcon : UIImage(systemName: symbols[tab] ?? "circle")
+      let item = UITabBarItem(title: nil, image: tabIcon(icon), tag: 0)
+      item.accessibilityLabel = label
+      item.accessibilityIdentifier = "workspace-tab-\(tab)"
+      if tab == "threads" { item.selectedImage = tabIcon(UIImage(systemName: "text.bubble.fill")) }
+      itemsByTab[tab] = item
+    }
+  }
+
+  private func updateItems() {
+    tabBar.items = tabs.enumerated().compactMap { index, tab in
+      guard let item = itemsByTab[tab] else { return nil }
+      item.tag = index
+      return item
+    }
     updateSelection()
   }
 
+  private func layoutCompose(alongside frame: CGRect) {
+    guard showsCompose, frame.height > 0 else { return }
+    let row = convert(frame, from: tabBar)
+    let size = row.height + 8
+    composeButton.frame = CGRect(x: row.maxX + 16, y: row.midY - size / 2, width: size, height: size)
+  }
+
+  override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+    if showsCompose, let target = composeButton.hitTest(convert(point, to: composeButton), with: event) {
+      return target
+    }
+    return tabBar.hitTest(convert(point, to: tabBar), with: event)
+  }
+
   override func didMoveToWindow() {
     super.didMoveToWindow()
     updateSelection()
@@ -49,12 +151,13 @@ final class T3SidebarTabBarView: ExpoView, UITabBarDelegate {
   }
 
   private func updateSelection() {
-    guard let items = tabBar.items, items.indices.contains(selectedIndex) else { return }
-    guard tabBar.selectedItem !== items[selectedIndex] else { return }
-    tabBar.selectedItem = items[selectedIndex]
+    guard let item = itemsByTab[selectedTab], tabBar.items?.contains(item) == true else { return }
+    guard tabBar.selectedItem !== item else { return }
+    tabBar.selectedItem = item
   }
 
   func tabBar(_ tabBar: UITabBar, didSelect item: UITabBarItem) {
-    onSelectionChange(["index": item.tag])
+    guard tabs.indices.contains(item.tag) else { return }
+    onSelectionChange(["tab": tabs[item.tag]])
   }
 }

apps/mobile/package.json

@@ -134,7 +134,7 @@
     "react-native-pdf-jsi": "5.0.0",
     "react-native-reanimated": "4.7.1",
     "react-native-safe-area-context": "~5.10.1",
-    "react-native-screens": "file:deps/react-native-screens-5.0.0-t3.37.tgz",
+    "react-native-screens": "file:deps/react-native-screens-5.0.0-t3.43.tgz",
     "react-native-shiki-engine": "^0.3.12",
     "react-native-svg": "15.16.0",
     "react-native-webview": "14.0.1",

apps/mobile/src/Stack.tsx

@@ -85,6 +85,7 @@ import {
 } from "./features/threads/ThreadSettingsSheet";
 import { NewTaskFlowProvider } from "./features/threads/new-task-flow-provider";
 import { NewTaskRouteScreen } from "./features/threads/NewTaskRouteScreen";
+import { SettingsNavigationRouteScreen } from "./features/settings/SettingsNavigationRouteScreen";
 import { SettingsAppearanceRouteScreen } from "./features/settings/SettingsAppearanceRouteScreen";
 import { SettingsClientStorageRouteScreen } from "./features/settings/SettingsClientStorageRouteScreen";
 import { SettingsDiagnosticsRouteScreen } from "./features/diagnostics/SettingsDiagnosticsRouteScreen";
@@ -237,6 +238,7 @@ const SettingsContentStack = createV5SheetStackNavigator({
         // Android draws its own app bar here. Hidden only from inside the screen, the native one
         // showed for the first frame of the Settings tab and pushed the page down.
         headerShown: Platform.OS !== "android",
+        headerBackVisible: false,
       },
     }),
     SettingsEnvironments: createNativeStackScreen({
@@ -305,6 +307,11 @@ const SettingsContentStack = createV5SheetStackNavigator({
         title: "Archived Threads",
       },
     }),
+    SettingsNavigation: createNativeStackScreen({
+      screen: SettingsNavigationRouteScreen,
+      linking: "navigation-tabs",
+      options: { title: "Navigation tabs" },
+    }),
     SettingsAppearance: createNativeStackScreen({
       screen: SettingsAppearanceRouteScreen,
       linking: "appearance",
@@ -975,8 +982,8 @@ const RootStackConfig = createWorkspaceStackNavigator({
         ...NESTED_NAVIGATOR_OPTIONS,
         gestureEnabled: true,
         headerShown: false,
-        // Android opens Settings as a top-level tab, so it swaps like the other tabs.
-        ...(Platform.OS === "android" ? { animation: "none" as const } : null),
+        presentation: "card",
+        animation: "none",
       },
     }),
     SettingsLegal: createNativeStackScreen({
@@ -1066,42 +1073,15 @@ export const RootStack = RootStackConfig.with(function AdaptiveRootStack({ Navig
   const { width, height } = useWindowDimensions();
   const nativeMetrics = useNativeLayoutMetrics();
   const usesSplitView = deriveLayout({ width, height, nativeMetrics }).usesSplitView;
-  const usesWorkspaceFlowScreens = Platform.OS === "android" || usesSplitView;
-  const flowPresentations = useRef(new Map<string, boolean>());
 
   return (
     <Navigator
       screenLayout={(props) => <GuardedScreenLayout {...props} />}
-      screenListeners={{
-        state: ({ data }) => {
-          const keys = new Set(data.state.routes.map((route) => route.key));
-          for (const key of flowPresentations.current.keys()) {
-            if (!keys.has(key)) flowPresentations.current.delete(key);
-          }
-        },
-      }}
-      screenOptions={({ route }) => {
-        if (route.name !== "SettingsSheet") {
-          return Platform.OS === "android"
-            ? { animation: androidWorkspaceDestinationAnimation(route.name, usesSplitView) }
-            : {};
-        }
-
-        // Moving an open flow between a sheet and a split column remounts its nested
-        // navigator. Keep its presentation until dismissal so folding preserves the settings flow.
-        let usesCard = flowPresentations.current.get(route.key);
-        if (usesCard === undefined) {
-          usesCard = usesWorkspaceFlowScreens;
-          flowPresentations.current.set(route.key, usesCard);
-        }
-        return usesCard
-          ? { presentation: "card" }
-          : {
-              presentation: "formSheet",
-              sheetAllowedDetents: [1],
-              sheetGrabberVisible: true,
-            };
-      }}
+      screenOptions={({ route }) =>
+        Platform.OS === "android" && route.name !== "SettingsSheet"
+          ? { animation: androidWorkspaceDestinationAnimation(route.name, usesSplitView) }
+          : {}
+      }
     />
   );
 });

apps/mobile/src/components/ProjectFavicon.tsx

@@ -17,6 +17,7 @@ import {
   projectAutoMonogram,
   projectIconColorClassNames,
   resolveProjectIconGlyph,
+  resolveProjectIconSymbol,
   type ProjectIconGlyph,
 } from "../lib/projectIcon";
 
@@ -40,6 +41,7 @@ export const ProjectFavicon = memo(function ProjectFavicon(props: {
   readonly projectIcon?: ProjectIconOverride | null;
 }) {
   const size = props.size ?? 42;
+  const symbol = resolveProjectIconSymbol(props.projectIcon);
   const glyph = resolveProjectIconGlyph(props.projectIcon, props.projectTitle);
   const faviconUrl = useAtomValue(
     props.workspaceRoot == null || glyph !== null
@@ -74,6 +76,17 @@ export const ProjectFavicon = memo(function ProjectFavicon(props: {
     [renderableFaviconUrl, props.environmentId, props.workspaceRoot, props.faviconPath],
   );
 
+  if (symbol !== null) {
+    return (
+      <SymbolView
+        name={symbol.name}
+        size={size}
+        tintColorClassName={projectIconColorClassNames(symbol.color).tint}
+        type="monochrome"
+      />
+    );
+  }
+
   if (glyph !== null) {
     return <ProjectIconGlyphView glyph={glyph} size={size} />;
   }