Merge remote-tracking branch 'origin/main' into feat/rag-hybrid

# Conflicts:
#	components/chat-screen/Messages.tsx
#	ios/Podfile.lock

Author: kfaracik

__mocks__/react-native-executorch.ts

@@ -62,6 +62,9 @@ export const LFM2_5_VL_1_6B_QUANTIZED = makeModelConstants(
 export const LFM2_5_VL_450M_QUANTIZED = makeModelConstants(
   'lfm2.5-vl-450m-quantized'
 );
+export const BIELIK_V3_0_1_5B_QUANTIZED = makeModelConstants(
+  'bielik-v3.0-1.5b-quantized'
+);
 export const GEMMA4_E2B = makeModelConstants('gemma4-e2b');
 export const GEMMA4_E2B_MM = makeModelConstants('gemma4-e2b-mm');
 export const WHISPER_TINY_EN = 'whisper-tiny-en';

__tests__/defaultModels.test.ts

@@ -1,4 +1,5 @@
-import { getStartingModels } from '../constants/default-models';
+import { BIELIK_V3_0_1_5B_QUANTIZED } from 'react-native-executorch';
+import { DEFAULT_MODELS, getStartingModels } from '../constants/default-models';
 
 describe('getStartingModels', () => {
   it('returns low-end model suggestions below 4 GB RAM', () => {
@@ -36,3 +37,29 @@ describe('getStartingModels', () => {
     expect(getStartingModels(-1)).toEqual(lowEnd);
   });
 });
+
+describe('DEFAULT_MODELS paths', () => {
+  it('sources Bielik paths from the react-native-executorch constant', () => {
+    const bielik = DEFAULT_MODELS.find((m) => m.modelName === 'Bielik - v3.0');
+    expect(bielik).toBeDefined();
+    expect(bielik!.modelPath).toBe(BIELIK_V3_0_1_5B_QUANTIZED.modelSource);
+    expect(bielik!.tokenizerPath).toBe(
+      BIELIK_V3_0_1_5B_QUANTIZED.tokenizerSource
+    );
+    expect(bielik!.tokenizerConfigPath).toBe(
+      BIELIK_V3_0_1_5B_QUANTIZED.tokenizerConfigSource
+    );
+  });
+
+  it('never points a default model at the mutable HF main branch', () => {
+    for (const model of DEFAULT_MODELS) {
+      for (const path of [
+        model.modelPath,
+        model.tokenizerPath,
+        model.tokenizerConfigPath,
+      ]) {
+        expect(path).not.toContain('/resolve/main/');
+      }
+    }
+  });
+});

__tests__/modelPathRefresh.test.ts

@@ -0,0 +1,69 @@
+import type { SQLiteDatabase } from 'expo-sqlite';
+
+jest.mock('../store/chatStore', () => ({
+  useChatStore: { getState: () => ({}) },
+}));
+jest.mock('../store/llmStore', () => ({
+  useLLMStore: { getState: () => ({}) },
+}));
+jest.mock('../store/modelStore', () => ({
+  useModelStore: { getState: () => ({}) },
+}));
+jest.mock('../store/sourceStore', () => ({
+  useSourceStore: { getState: () => ({}) },
+}));
+jest.mock('../database/modelRepository', () => ({ addModel: jest.fn() }));
+jest.mock('../constants/default-models', () => ({
+  DEFAULT_MODELS: [
+    {
+      modelName: 'Bielik - v3.0',
+      family: 'Bielik',
+      modelPath: 'https://hf.example/resolve/v0.9.0/xnnpack/bielik.pte',
+      tokenizerPath: 'https://hf.example/resolve/v0.9.0/tokenizer.json',
+      tokenizerConfigPath:
+        'https://hf.example/resolve/v0.9.0/tokenizer_config.json',
+      source: 'remote',
+      modelSize: 0.86,
+      featured: true,
+    },
+  ],
+}));
+
+import { runMigrations } from '../database/db';
+
+type Call = { sql: string; params: unknown[] };
+
+const makeFakeDb = () => {
+  const calls: Call[] = [];
+  const db = {
+    getAllAsync: async () => [],
+    execAsync: async () => {},
+    getFirstAsync: async () => null,
+    runAsync: async (sql: string, ...params: unknown[]) => {
+      calls.push({ sql, params: params.flat() });
+      return {};
+    },
+    withTransactionAsync: async (fn: () => Promise<void>) => fn(),
+  };
+  return { db: db as unknown as SQLiteDatabase, calls };
+};
+
+describe('runMigrations built-in model path refresh', () => {
+  it('rewrites stale download paths for undownloaded built-in models', async () => {
+    const { db, calls } = makeFakeDb();
+
+    await runMigrations(db);
+
+    const refresh = calls.find((c) => c.sql.includes('SET modelPath'));
+    expect(refresh).toBeDefined();
+    expect(refresh!.sql).toContain(`source = 'built-in'`);
+    expect(refresh!.sql).toContain('isDownloaded = 0');
+    expect(refresh!.params).toEqual([
+      'https://hf.example/resolve/v0.9.0/xnnpack/bielik.pte',
+      'https://hf.example/resolve/v0.9.0/tokenizer.json',
+      'https://hf.example/resolve/v0.9.0/tokenizer_config.json',
+      0.86,
+      'Bielik - v3.0',
+    ]);
+  });
+});

__tests__/modelRepository.test.ts

@@ -1,6 +1,11 @@
 // __tests__/modelRepository.test.ts
 import { type SQLiteDatabase } from 'expo-sqlite';
-import { getAllModels, getModelsByNames } from '../database/modelRepository';
+import {
+  getAllModels,
+  getModelsByNames,
+  syncBuiltInModelPaths,
+} from '../database/modelRepository';
+import { DEFAULT_MODELS } from '../constants/default-models';
 
 jest.mock('expo-sqlite', () => {
   const stableDb = {};
@@ -167,3 +172,33 @@ describe('getModelsByNames', () => {
     ]);
   });
 });
+
+describe('syncBuiltInModelPaths', () => {
+  it('rewrites a built-in row with paths from DEFAULT_MODELS', async () => {
+    const bielik = DEFAULT_MODELS.find((m) => m.modelName === 'Bielik - v3.0')!;
+    const runAsync = jest.fn().mockResolvedValue({});
+    const mockDb = { runAsync } as unknown as SQLiteDatabase;
+
+    await syncBuiltInModelPaths(mockDb, 7, 'Bielik - v3.0');
+
+    expect(runAsync).toHaveBeenCalledTimes(1);
+    const [sql, params] = runAsync.mock.calls[0];
+    expect(sql).toContain(`source = 'built-in'`);
+    expect(params).toEqual([
+      bielik.modelPath,
+      bielik.tokenizerPath,
+      bielik.tokenizerConfigPath,
+      bielik.modelSize,
+      7,
+    ]);
+  });
+
+  it('does nothing for a model name outside DEFAULT_MODELS', async () => {
+    const runAsync = jest.fn();
+    const mockDb = { runAsync } as unknown as SQLiteDatabase;
+
+    await syncBuiltInModelPaths(mockDb, 3, 'My Local Model');
+
+    expect(runAsync).not.toHaveBeenCalled();
+  });
+});

__tests__/useKeyboardLift.test.ts

@@ -0,0 +1,77 @@
+import { renderHook } from '@testing-library/react-native';
+import { useKeyboardLift } from '../components/chat-screen/useKeyboardLift';
+
+let mockInsetsBottom = 0;
+const mockHeight = { value: 0 };
+const mockProgress = { value: 0 };
+
+jest.mock('../context/ThemeContext', () => ({
+  useTheme: () => ({
+    theme: {
+      insets: { top: 0, bottom: mockInsetsBottom, left: 0, right: 0 },
+    },
+  }),
+}));
+
+jest.mock('react-native-keyboard-controller', () => ({
+  useReanimatedKeyboardAnimation: () => ({
+    height: mockHeight,
+    progress: mockProgress,
+  }),
+}));
+
+describe('useKeyboardLift', () => {
+  beforeEach(() => {
+    mockHeight.value = 0;
+    mockProgress.value = 0;
+    mockInsetsBottom = 0;
+  });
+
+  it('returns 0 when the keyboard is closed', () => {
+    const { result } = renderHook(() => useKeyboardLift());
+
+    expect(result.current.value).toBe(0);
+  });
+
+  it('gives back the bottom inset the open keyboard swallows', () => {
+    mockInsetsBottom = 34;
+    mockHeight.value = -346;
+    mockProgress.value = 1;
+
+    const { result } = renderHook(() => useKeyboardLift());
+
+    expect(result.current.value).toBe(-312);
+  });
+
+  it('scales the inset compensation with keyboard progress', () => {
+    mockInsetsBottom = 34;
+    mockHeight.value = -173;
+    mockProgress.value = 0.5;
+
+    const { result } = renderHook(() => useKeyboardLift());
+
+    expect(result.current.value).toBe(-156);
+  });
+
+  it('equals the raw keyboard height on a device without a bottom inset', () => {
+    mockHeight.value = -300;
+    mockProgress.value = 1;
+
+    const { result } = renderHook(() => useKeyboardLift());
+
+    expect(result.current.value).toBe(-300);
+  });
+
+  it('recomputes after the keyboard values change', () => {
+    mockInsetsBottom = 34;
+    const { result, rerender } = renderHook(() => useKeyboardLift());
+
+    expect(result.current.value).toBe(0);
+
+    mockHeight.value = -346;
+    mockProgress.value = 1;
+    rerender({});
+
+    expect(result.current.value).toBe(-312);
+  });
+});

app/(drawer)/_layout.tsx

@@ -55,7 +55,13 @@ const DrawerLayout = () => {
           title: 'Benchmark',
         }}
       />
-      <Drawer.Screen name="chat/[id]" />
+      <Drawer.Screen
+        name="chat/[id]"
+        options={{
+          headerTransparent: true,
+          headerStyle: { backgroundColor: 'transparent' },
+        }}
+      />
     </Drawer>
   );
 };

app/(drawer)/chat/[id].tsx

@@ -63,14 +63,13 @@ function ChatScreenInner() {
   const isEmpty = !isLoading && activeChatMessages.length === 0;
   const shouldExitOnBack = isPhantom && isEmpty;
   const openModelSheetRef = useRef<(() => void) | null>(null);
+  const openModelSheet = useCallback(() => openModelSheetRef.current?.(), []);
 
-  const { MenuElements } = useChatHeader({
+  const { MenuElements, titleBottom } = useChatHeader({
     chatId: chatId,
     chatModel: model,
     isEmpty,
-    onSelectModelFromTitle: isPhantom
-      ? () => openModelSheetRef.current?.()
-      : undefined,
+    onSelectModelFromTitle: isPhantom ? openModelSheet : undefined,
   });
 
   useFocusEffect(
@@ -150,6 +149,7 @@ function ChatScreenInner() {
         selectModel={handleSetModel}
         openModelSheetRef={openModelSheetRef}
         revealFromTop={shouldPlayBranchEntryAnimation}
+        headerTitleBottom={titleBottom}
       />
       {MenuElements}
     </>

babel.config.js

@@ -18,5 +18,12 @@ module.exports = function (api) {
         },
       ],
     ],
+    env: {
+      // Strip every console.* call (error included — there is no crash
+      // reporting to feed) from release bundles; dev and test keep them.
+      production: {
+        plugins: ['transform-remove-console'],
+      },
+    },
   };
 };

components/chat-screen/ChatBar.tsx

@@ -108,6 +108,11 @@ const ChatBar = ({
 
   const defaultBarHeight = useRef(0);
   const prevBarHeight = useRef(0);
+
+  // Inset the baseline was captured with. Checked in the layout handler, not
+  // an effect: onLayout fires first, so an effect-driven reset would lose the
+  // pass carrying the new height.
+  const baselineInset = useRef<number | null>(null);
   const textInputRef = useRef<RNTextInput>(null);
   // iOS-only: bump the TextInput key to force a remount when a prompt
   // suggestion is set programmatically. iOS doesn't re-fire onLayout
@@ -132,12 +137,19 @@ const ChatBar = ({
   const handleBarLayoutForPadding = useCallback(
     (e: { nativeEvent: { layout: { height: number } } }) => {
       const height = e.nativeEvent.layout.height;
+      const inset = theme.insets.bottom;
       // Only capture the default height once we're in the "with messages"
       // layout — otherwise the empty-state extras (WhatsNewCard, prompt
       // suggestions) would bake into the baseline and squeeze the scroll
-      // view once they disappear.
-      if (defaultBarHeight.current === 0 && hasMessages) {
+      // view once they disappear. Re-capture on inset changes (Android
+      // navigation mode, rotation), or the stale baseline reads the difference
+      // as "the bar grew".
+      if (
+        hasMessages &&
+        (defaultBarHeight.current === 0 || baselineInset.current !== inset)
+      ) {
         defaultBarHeight.current = height;
+        baselineInset.current = inset;
       }
       const baseline = defaultBarHeight.current || height;
       const delta = height - baseline;
@@ -147,14 +159,22 @@ const ChatBar = ({
           easing: BAR_GROW_EASING,
         })
       );
+      // Baseline, not live height — consumers must not follow the bar as it
+      // grows with typed lines; that is what extraContentPadding is for.
       onHeightChange?.(hasMessages ? baseline : 0);
       const grew = height > prevBarHeight.current;
       prevBarHeight.current = height;
       if (delta > 0 && grew) {
         onBarGrow?.();
       }
     },
-    [extraContentPadding, onBarGrow, onHeightChange, hasMessages]
+    [
+      extraContentPadding,
+      onBarGrow,
+      onHeightChange,
+      hasMessages,
+      theme.insets.bottom,
+    ]
   );
 
   const {