Fix possible issues introduced by #272

CONTRIBUTING.md

@@ -23,42 +23,42 @@ This allows you to test production-like builds with real users before releasing
 
 ```bash
 # Development variant (default)
-npm run ios:dev
+yarn ios:dev
 
 # Preview variant
-npm run ios:preview
+yarn ios:preview
 
 # Production variant
-npm run ios:production
+yarn ios:production
 ```
 
 ### Android Development
 
 ```bash
 # Development variant
-npm run android:dev
+yarn android:dev
 
 # Preview variant
-npm run android:preview
+yarn android:preview
 
 # Production variant
-npm run android:production
+yarn android:production
 ```
 
 ### macOS Desktop (Tauri)
 
 ```bash
 # Development variant - run with hot reload
-npm run tauri:dev
+yarn tauri:dev
 
 # Build development variant
-npm run tauri:build:dev
+yarn tauri:build:dev
 
 # Build preview variant
-npm run tauri:build:preview
+yarn tauri:build:preview
 
 # Build production variant
-npm run tauri:build:production
+yarn tauri:build:production
 ```
 
 **How Tauri Variants Work:**
@@ -71,13 +71,13 @@ npm run tauri:build:production
 
 ```bash
 # Start dev server for development variant
-npm run start:dev
+yarn start:dev
 
 # Start dev server for preview variant
-npm run start:preview
+yarn start:preview
 
 # Start dev server for production variant
-npm run start:production
+yarn start:production
 ```
 
 ## Visual Differences
@@ -95,7 +95,7 @@ This makes it easy to distinguish which version you're testing!
 
 1. **Build development variant:**
    ```bash
-   npm run ios:dev
+   yarn ios:dev
    ```
 
 2. **Make your changes** to the code
@@ -104,19 +104,19 @@ This makes it easy to distinguish which version you're testing!
 
 4. **Rebuild if needed** for native changes:
    ```bash
-   npm run ios:dev
+   yarn ios:dev
    ```
 
 ### Testing Preview (Pre-Release)
 
 1. **Build preview variant:**
    ```bash
-   npm run ios:preview
+   yarn ios:preview
    ```
 
 2. **Test OTA updates:**
    ```bash
-   npm run ota  # Publishes to preview branch
+   yarn ota  # Publishes to preview branch
    ```
 
 3. **Verify** the preview build works as expected
@@ -125,17 +125,17 @@ This makes it easy to distinguish which version you're testing!
 
 1. **Build production variant:**
    ```bash
-   npm run ios:production
+   yarn ios:production
    ```
 
 2. **Submit to App Store:**
    ```bash
-   npm run submit
+   yarn submit
    ```
 
 3. **Deploy OTA updates:**
    ```bash
-   npm run ota:production
+   yarn ota:production
    ```
 
 ## All Variants Simultaneously
@@ -144,9 +144,9 @@ You can install all three variants on the same device:
 
 ```bash
 # Build all three variants
-npm run ios:dev
-npm run ios:preview
-npm run ios:production
+yarn ios:dev
+yarn ios:preview
+yarn ios:production
 ```
 
 All three apps appear on your device with different icons and names!
@@ -195,12 +195,12 @@ You can connect different variants to different Happy CLI instances:
 
 ```bash
 # Development app → Dev CLI daemon
-npm run android:dev
-# Connect to CLI running: npm run dev:daemon:start
+yarn android:dev
+# Connect to CLI running: yarn dev:daemon:start
 
 # Production app → Stable CLI daemon
-npm run android:production
-# Connect to CLI running: npm run stable:daemon:start
+yarn android:production
+# Connect to CLI running: yarn stable:daemon:start
 ```
 
 Each app maintains separate authentication and sessions!
@@ -210,7 +210,7 @@ Each app maintains separate authentication and sessions!
 To test with a local Happy server:
 
 ```bash
-npm run start:local-server
+yarn start:local-server
 ```
 
 This sets:
@@ -227,21 +227,21 @@ This shouldn't happen - each variant has a unique bundle ID. If it does:
 1. Check `app.config.js` - verify `bundleId` is set correctly for the variant
 2. Clean build:
    ```bash
-   npm run prebuild
-   npm run ios:dev  # or whichever variant
+   yarn prebuild
+   yarn ios:dev  # or whichever variant
    ```
 
 ### App not updating after changes
 
 1. **For JS changes**: Hot reload should work automatically
 2. **For native changes**: Rebuild the variant:
    ```bash
-   npm run ios:dev  # Force rebuild
+   yarn ios:dev  # Force rebuild
    ```
 3. **For config changes**: Clean and prebuild:
    ```bash
-   npm run prebuild
-   npm run ios:dev
+   yarn prebuild
+   yarn ios:dev
    ```
 
 ### All three apps look the same
@@ -258,7 +258,7 @@ If they're all the same name, the variant might not be set correctly. Verify:
 echo $APP_ENV
 
 # Or look at the build output
-npm run ios:dev  # Should show "Happy (dev)" as the name
+yarn ios:dev  # Should show "Happy (dev)" as the name
 ```
 
 ### Connected device not found
@@ -270,7 +270,7 @@ For iOS connected device testing:
 xcrun devicectl list devices
 
 # Run on specific connected device
-npm run ios:connected-device
+yarn ios:connected-device
 ```
 
 ## Tips

app.config.js

@@ -1,14 +1,29 @@
 const variant = process.env.APP_ENV || 'development';
-const name = {
+
+// Allow opt-in overrides for local dev tooling without changing upstream defaults.
+const nameOverride = (process.env.EXPO_APP_NAME || '').trim();
+const bundleIdOverride = (process.env.EXPO_APP_BUNDLE_ID || '').trim();
+
+const namesByVariant = {
     development: "Happy (dev)",
     preview: "Happy (preview)",
     production: "Happy"
-}[variant];
-const bundleId = {
+};
+const bundleIdsByVariant = {
     development: "com.slopus.happy.dev",
     preview: "com.slopus.happy.preview",
     production: "com.ex3ndr.happy"
-}[variant];
+};
+
+// If APP_ENV is unknown, fall back to development-safe defaults to avoid generating
+// an invalid Expo config with undefined name/bundle id.
+const name = nameOverride || namesByVariant[variant] || namesByVariant.development;
+const bundleId = bundleIdOverride || bundleIdsByVariant[variant] || bundleIdsByVariant.development;
+// NOTE:
+// The URL scheme is used for deep linking *and* by the Expo development client launcher flow.
+// Keep the default stable for upstream users, but allow opt-in overrides for local dev variants
+// (e.g. to avoid iOS scheme collisions between multiple installs).
+const scheme = (process.env.EXPO_APP_SCHEME || '').trim() || "happy";
 
 export default {
     expo: {
@@ -18,7 +33,7 @@ export default {
         runtimeVersion: "18",
         orientation: "default",
         icon: "./sources/assets/images/icon.png",
-        scheme: "happy",
+        scheme,
         userInterfaceStyle: "automatic",
         newArchEnabled: true,
         notification: {
@@ -174,4 +189,4 @@ export default {
         },
         owner: "bulkacorp"
     }
-};
+};

package.json

@@ -173,6 +173,7 @@
     "@material/material-color-utilities": "^0.3.0",
     "@stablelib/hex": "^2.0.1",
     "@types/react": "~19.1.10",
+    "@types/react-test-renderer": "^19.1.0",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "cross-env": "^10.1.0",
     "patch-package": "^8.0.0",

patches/@more-tech+react-native-libsodium+1.5.5.patch

@@ -0,0 +1,20 @@
+diff --git a/node_modules/@more-tech/react-native-libsodium/react-native-libsodium.podspec b/node_modules/@more-tech/react-native-libsodium/react-native-libsodium.podspec
+index 5dbd9f1..bc3da26 100644
+--- a/node_modules/@more-tech/react-native-libsodium/react-native-libsodium.podspec
++++ b/node_modules/@more-tech/react-native-libsodium/react-native-libsodium.podspec
+@@ -30,7 +30,14 @@ Pod::Spec.new do |s|
+     }
+     s.dependency "React-Codegen"
+     if ENV['RCT_USE_RN_DEP'] != '1'
+-      s.dependency 'RCT-Folly', folly_version
++      # `folly_version` is not always defined during podspec evaluation
++      # (e.g. Expo/RN >= 0.81), so fall back to an unpinned dependency.
++      folly_ver = defined?(folly_version) ? folly_version : nil
++      if folly_ver
++        s.dependency 'RCT-Folly', folly_ver
++      else
++        s.dependency 'RCT-Folly'
++      end
+     end
+     s.dependency "RCTRequired"
+     s.dependency "RCTTypeSafety"

sources/-session/SessionView.tsx

@@ -22,6 +22,7 @@ import { isRunningOnMac } from '@/utils/platform';
 import { useDeviceType, useHeaderHeight, useIsLandscape, useIsTablet } from '@/utils/responsive';
 import { formatPathRelativeToHome, getSessionAvatarId, getSessionName, useSessionStatus } from '@/utils/sessionUtils';
 import { isVersionSupported, MINIMUM_CLI_VERSION } from '@/utils/versionUtils';
+import type { ModelMode } from '@/sync/permissionTypes';
 import { Ionicons } from '@expo/vector-icons';
 import { useRouter } from 'expo-router';
 import * as React from 'react';
@@ -196,10 +197,24 @@ function SessionViewLoaded({ sessionId, session }: { sessionId: string, session:
         storage.getState().updateSessionPermissionMode(sessionId, mode);
     }, [sessionId]);
 
+    const CONFIGURABLE_MODEL_MODES = [
+        'default',
+        'gemini-2.5-pro',
+        'gemini-2.5-flash',
+        'gemini-2.5-flash-lite',
+    ] as const;
+    type ConfigurableModelMode = (typeof CONFIGURABLE_MODEL_MODES)[number];
+    const isConfigurableModelMode = React.useCallback((mode: ModelMode): mode is ConfigurableModelMode => {
+        return (CONFIGURABLE_MODEL_MODES as readonly string[]).includes(mode);
+    }, []);
+
     // Function to update model mode (for Gemini sessions)
-    const updateModelMode = React.useCallback((mode: 'default' | 'gemini-2.5-pro' | 'gemini-2.5-flash' | 'gemini-2.5-flash-lite') => {
-        storage.getState().updateSessionModelMode(sessionId, mode);
-    }, [sessionId]);
+    const updateModelMode = React.useCallback((mode: ModelMode) => {
+        // Only Gemini model modes are configurable from the UI today.
+        if (isConfigurableModelMode(mode)) {
+            storage.getState().updateSessionModelMode(sessionId, mode);
+        }
+    }, [isConfigurableModelMode, sessionId]);
 
     // Memoize header-dependent styles to prevent re-renders
     const headerDependentStyles = React.useMemo(() => ({
@@ -280,8 +295,8 @@ function SessionViewLoaded({ sessionId, session }: { sessionId: string, session:
             sessionId={sessionId}
             permissionMode={permissionMode}
             onPermissionModeChange={updatePermissionMode}
-            modelMode={modelMode as any}
-            onModelModeChange={updateModelMode as any}
+            modelMode={modelMode}
+            onModelModeChange={updateModelMode}
             metadata={session.metadata}
             connectionStatus={{
                 text: sessionStatus.statusText,

sources/app/(app)/_layout.tsx

@@ -117,6 +117,12 @@ export default function RootLayout() {
                     headerTitle: t('settings.features'),
                 }}
             />
+            <Stack.Screen
+                name="settings/profiles"
+                options={{
+                    headerTitle: t('settingsFeatures.profiles'),
+                }}
+            />
             <Stack.Screen
                 name="terminal/connect"
                 options={{
@@ -311,6 +317,13 @@ export default function RootLayout() {
                     headerBackTitle: t('common.back'),
                 }}
             />
+            <Stack.Screen
+                name="new/pick/profile"
+                options={{
+                    headerTitle: '',
+                    headerBackTitle: t('common.back'),
+                }}
+            />
             <Stack.Screen
                 name="new/pick/profile-edit"
                 options={{
@@ -322,7 +335,9 @@ export default function RootLayout() {
                 name="new/index"
                 options={{
                     headerTitle: t('newSession.title'),
-                    headerBackTitle: t('common.back'),
+                    headerShown: true,
+                    headerBackTitle: t('common.cancel'),
+                    presentation: 'modal',
                 }}
             />
             <Stack.Screen

sources/app/(app)/machine/[id].tsx

@@ -399,7 +399,6 @@ export default function MachineDetailScreen() {
                                         disabled={!isMachineOnline(machine)}
                                         selected={isSelected}
                                         showChevron={false}
-                                        pressableStyle={isSelected ? { backgroundColor: theme.colors.surfaceSelected } : undefined}
                                         showDivider={!hideDivider}
                                     />
                                 );