From 454bccb8f2287aa7fbda24280d3481ec99269db1 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Mon, 28 Sep 2026 18:29:21 +0530
Subject: [PATCH 001/129] build(mobile): add native video playback dependency
 [skip ci]

---
 ios/Podfile.lock  | 90 +++++++++++++++++++++++++++++++++++++++++++++++
 package-lock.json | 11 ++++++
 package.json      |  1 +
 3 files changed, 102 insertions(+)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 1bb3fde0a..613f017a5 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -2303,6 +2303,92 @@ PODS:
   - react-native-tcp-socket (6.4.1):
     - CocoaAsyncSocket
     - React-Core
+  - react-native-video (6.19.3):
+    - boost
+    - DoubleConversion
+    - fast_float
+    - fmt
+    - glog
+    - hermes-engine
+    - RCT-Folly
+    - RCT-Folly/Fabric
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-jsi
+    - react-native-video/Video (= 6.19.3)
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-renderercss
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - SocketRocket
+    - Yoga
+  - react-native-video/Fabric (6.19.3):
+    - boost
+    - DoubleConversion
+    - fast_float
+    - fmt
+    - glog
+    - hermes-engine
+    - RCT-Folly
+    - RCT-Folly/Fabric
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-jsi
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-renderercss
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - SocketRocket
+    - Yoga
+  - react-native-video/Video (6.19.3):
+    - boost
+    - DoubleConversion
+    - fast_float
+    - fmt
+    - glog
+    - hermes-engine
+    - RCT-Folly
+    - RCT-Folly/Fabric
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-jsi
+    - react-native-video/Fabric
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-renderercss
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - SocketRocket
+    - Yoga
   - react-native-voice (3.2.4):
     - React-Core
   - react-native-zeroconf (0.14.0):
@@ -3554,6 +3640,7 @@ DEPENDENCIES:
   - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
   - "react-native-slider (from `../node_modules/@react-native-community/slider`)"
   - react-native-tcp-socket (from `../node_modules/react-native-tcp-socket`)
+  - react-native-video (from `../node_modules/react-native-video`)
   - "react-native-voice (from `../node_modules/@react-native-voice/voice`)"
   - react-native-zeroconf (from `../node_modules/react-native-zeroconf`)
   - React-NativeModulesApple (from `../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`)
@@ -3730,6 +3817,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@react-native-community/slider"
   react-native-tcp-socket:
     :path: "../node_modules/react-native-tcp-socket"
+  react-native-video:
+    :path: "../node_modules/react-native-video"
   react-native-voice:
     :path: "../node_modules/@react-native-voice/voice"
   react-native-zeroconf:
@@ -3897,6 +3986,7 @@ SPEC CHECKSUMS:
   react-native-safe-area-context: c00143b4823773bba23f2f19f85663ae89ceb460
   react-native-slider: 34064ca1a6864d7b263e44dd76a2d794e8d26744
   react-native-tcp-socket: 7c7e53a07f122ecf00fb3626684bc0ca82c4f044
+  react-native-video: 61841250a61ed594812b0bd4ce3f03549d574efc
   react-native-voice: 908a0eba96c8c3d643e4f98b7232c6557d0a6f9c
   react-native-zeroconf: eb2e5584308f20f5fc3eb0cea2ceafbbd345b48b
   React-NativeModulesApple: a2c3d2cbec893956a5b3e4060322db2984fff75b
diff --git a/package-lock.json b/package-lock.json
index 23f27de91..e6f614f2a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -59,6 +59,7 @@
         "react-native-tcp-socket": "^6.4.1",
         "react-native-url-polyfill": "^3.0.0",
         "react-native-vector-icons": "^10.3.0",
+        "react-native-video": "^6.19.3",
         "react-native-vision-camera": "^4.7.3",
         "react-native-worklets": "^0.7.3",
         "react-native-zeroconf": "^0.14.0",
@@ -15276,6 +15277,16 @@
         "node": ">=10"
       }
     },
+    "node_modules/react-native-video": {
+      "version": "6.19.3",
+      "resolved": "https://registry.npmjs.org/react-native-video/-/react-native-video-6.19.3.tgz",
+      "integrity": "sha512-hI0YhEH6NdkfbFfMoZTZizEmLIm13rLlMf6KyWlGSe0+6If7/gvhapR2j/BMKBEwmlAIZjU4A6ax4Qn7yssjLQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
+      }
+    },
     "node_modules/react-native-vision-camera": {
       "version": "4.7.3",
       "resolved": "https://registry.npmjs.org/react-native-vision-camera/-/react-native-vision-camera-4.7.3.tgz",
diff --git a/package.json b/package.json
index 864b69f8e..60a459b4d 100644
--- a/package.json
+++ b/package.json
@@ -81,6 +81,7 @@
     "react-native-tcp-socket": "^6.4.1",
     "react-native-url-polyfill": "^3.0.0",
     "react-native-vector-icons": "^10.3.0",
+    "react-native-video": "^6.19.3",
     "react-native-vision-camera": "^4.7.3",
     "react-native-worklets": "^0.7.3",
     "react-native-zeroconf": "^0.14.0",

From 50c50468da6ecb35cf20f0b1da08f8140f272c3f Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Mon, 28 Sep 2026 18:29:21 +0530
Subject: [PATCH 002/129] feat(media): store synced videos and update Pro
 integration [skip ci]

---
 pro                    |  2 +-
 src/stores/appStore.ts | 14 ++++++++++++++
 src/types/index.ts     | 22 +++++++++++++++++++++-
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/pro b/pro
index 035e38bd2..7233bbfbb 160000
--- a/pro
+++ b/pro
@@ -1 +1 @@
-Subproject commit 035e38bd2345569d82377809cd8a582701592cfd
+Subproject commit 7233bbfbb64ff058e8cec2e412ed7115a5672044
diff --git a/src/stores/appStore.ts b/src/stores/appStore.ts
index 053637864..e675e466b 100644
--- a/src/stores/appStore.ts
+++ b/src/stores/appStore.ts
@@ -24,6 +24,7 @@ import {
   INFERENCE_BACKENDS,
   LiteRTBackend,
   GeneratedImage,
+  GeneratedVideo,
 } from '../types';
 import {
   emitChangedModelSettings,
@@ -195,6 +196,10 @@ export interface AppState extends ProAccessSlice {
   setImageGenerationStatus: (status: string | null) => void;
   setImagePreviewPath: (path: string | null) => void;
   generatedImages: GeneratedImage[];
+  generatedVideos: GeneratedVideo[];
+  addGeneratedVideo: (video: GeneratedVideo) => void;
+  removeGeneratedVideo: (videoId: string) => void;
+  removeVideosByConversationId: (conversationId: string) => string[];
   addGeneratedImage: (image: GeneratedImage) => void;
   removeGeneratedImage: (imageId: string) => void;
   removeImagesByConversationId: (conversationId: string) => string[];
@@ -417,6 +422,14 @@ export const useAppStore = create<AppState>()(
       setImagePreviewPath: path => set({ imagePreviewPath: path }),
       // Gallery
       generatedImages: [],
+      generatedVideos: [],
+      addGeneratedVideo: video => set(state => ({ generatedVideos: [video, ...state.generatedVideos] })),
+      removeGeneratedVideo: videoId => set(state => ({ generatedVideos: state.generatedVideos.filter(video => video.id !== videoId) })),
+      removeVideosByConversationId: conversationId => {
+        const videos = get().generatedVideos.filter(video => video.conversationId === conversationId);
+        set(state => ({ generatedVideos: state.generatedVideos.filter(video => video.conversationId !== conversationId) }));
+        return videos.map(video => video.id);
+      },
       addGeneratedImage: image =>
         set(state => ({
           generatedImages: [image, ...state.generatedImages],
@@ -494,6 +507,7 @@ function persistedAppState(state: AppState) {
         modelSettingProvenance: state.modelSettingProvenance,
         activeImageModelId: state.activeImageModelId,
         generatedImages: state.generatedImages,
+        generatedVideos: state.generatedVideos,
         warmedImageModels: state.warmedImageModels,
         textGenerationCount: state.textGenerationCount,
         imageGenerationCount: state.imageGenerationCount,
diff --git a/src/types/index.ts b/src/types/index.ts
index aca2cfd4b..caba8870a 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -195,7 +195,7 @@ export interface ModelRecommendation {
 // Media attachment types
 export interface MediaAttachment {
   id: string;
-  type: 'image' | 'document' | 'audio';
+  type: 'image' | 'document' | 'audio' | 'video';
   uri: string;
   mimeType?: string;
   width?: number;
@@ -405,6 +405,26 @@ export const INFERENCE_BACKENDS = {
 /** 'auto' = smart detect, 'force' = always generate image, 'disabled' = never */
 export type ImageModeState = 'auto' | 'force' | 'disabled';
 
+export interface GeneratedVideo {
+  id: string;
+  provenance?: RecordProvenance;
+  prompt: string;
+  negativePrompt?: string;
+  videoPath: string;
+  fileName?: string;
+  width: number;
+  height: number;
+  fps: number;
+  frames: number;
+  durationSeconds: number;
+  steps: number;
+  guidance: number;
+  seed: number;
+  modelId: string;
+  createdAt: string;
+  conversationId?: string;
+}
+
 export interface GeneratedImage {
   id: string;
   /** Immutable device attribution for portable Sync records. */

From d42bbb109dd29259ffb0490292e41b1c6391ad2c Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Mon, 28 Sep 2026 18:29:21 +0530
Subject: [PATCH 003/129] feat(gallery): play save and delete videos on mobile
 [skip ci]

---
 .../components/MessageAttachments.tsx         |  3 +
 src/screens/ChatScreen/ChatModalSection.tsx   | 13 +++--
 .../ChatScreen/useChatGenerationActions.ts    |  5 ++
 src/screens/GalleryScreen/index.tsx           | 57 +++++++++++++++++--
 src/screens/HomeScreen/hooks/useHomeScreen.ts |  2 +
 src/screens/HomeScreen/index.tsx              |  6 +-
 6 files changed, 75 insertions(+), 11 deletions(-)

diff --git a/src/components/ChatMessage/components/MessageAttachments.tsx b/src/components/ChatMessage/components/MessageAttachments.tsx
index 619639f62..048b05f0e 100644
--- a/src/components/ChatMessage/components/MessageAttachments.tsx
+++ b/src/components/ChatMessage/components/MessageAttachments.tsx
@@ -12,6 +12,7 @@ import Animated, {
   withTiming,
 } from 'react-native-reanimated';
 import Icon from 'react-native-vector-icons/Feather';
+import Video from 'react-native-video';
 // Imported directly, not through the barrel: a component that reaches its sibling via the index
 // resolves undefined at render time.
 import { LoadingDots } from '../../LoadingDots';
@@ -197,6 +198,8 @@ export function MessageAttachments({
             styles={styles}
             colors={colors}
           />
+        ) : attachment.type === 'video' ? (
+          <Video key={attachment.id} source={{ uri: resolveMediaUri(attachment.uri) }} controls paused resizeMode="contain" style={{ width: '100%', aspectRatio: 16 / 9, backgroundColor: '#000' }} />
         ) : attachment.type === 'audio' ? (
           <AudioAttachment
             key={attachment.id}
diff --git a/src/screens/ChatScreen/ChatModalSection.tsx b/src/screens/ChatScreen/ChatModalSection.tsx
index 85b72c498..e0bf8a080 100644
--- a/src/screens/ChatScreen/ChatModalSection.tsx
+++ b/src/screens/ChatScreen/ChatModalSection.tsx
@@ -6,6 +6,7 @@ import {
 import { createStyles } from './styles';
 import { useTheme } from '../../theme';
 import { ImageViewerModal } from './ChatScreenComponents';
+import { useAppStore } from '../../stores/appStore';
 
 type StylesType = ReturnType<typeof createStyles>;
 type ColorsType = ReturnType<typeof useTheme>['colors'];
@@ -55,7 +56,10 @@ export const ChatModalSection: React.FC<ChatModalSectionProps> = ({
   isModelLoading, imageCount, activeConversationId, navigation,
   viewerImageUri, setViewerImageUri, handleSaveImage,
   isRemote,
-}) => (
+}) => {
+  const videoCount = useAppStore(state => state.generatedVideos.filter(video => video.conversationId === activeConversationId).length);
+  const mediaCount = imageCount + videoCount;
+  return (
   <>
     <ProjectSelectorSheet
       visible={showProjectSelector}
@@ -87,9 +91,9 @@ export const ChatModalSection: React.FC<ChatModalSectionProps> = ({
       visible={showSettingsPanel}
       onClose={() => setShowSettingsPanel(false)}
       onOpenProject={() => setShowProjectSelector(true)}
-      onOpenGallery={imageCount > 0 ? () => navigation.navigate('Gallery', { conversationId: activeConversationId }) : undefined}
+      onOpenGallery={mediaCount > 0 ? () => navigation.navigate('Gallery', { conversationId: activeConversationId }) : undefined}
       onDeleteConversation={activeConversation ? handleDeleteConversation : undefined}
-      conversationImageCount={imageCount}
+      conversationImageCount={mediaCount}
       activeProjectName={activeProject?.name || null}
       isRemote={isRemote}
     />
@@ -100,4 +104,5 @@ export const ChatModalSection: React.FC<ChatModalSectionProps> = ({
       onSave={handleSaveImage}
     />
   </>
-);
+  );
+};
diff --git a/src/screens/ChatScreen/useChatGenerationActions.ts b/src/screens/ChatScreen/useChatGenerationActions.ts
index e53cbbd28..9888d5bee 100644
--- a/src/screens/ChatScreen/useChatGenerationActions.ts
+++ b/src/screens/ChatScreen/useChatGenerationActions.ts
@@ -1,5 +1,7 @@
 /* eslint-disable max-lines -- cohesive generation-action orchestrator (send/regenerate/dispatch/route share the same GenerationDeps + session state); splitting it would scatter tightly-coupled turn logic. */
 import { Dispatch, SetStateAction } from 'react';
+import RNFS from 'react-native-fs';
+import { resolveDocumentPath } from '../../utils/resolveDocumentPath';
 import { AlertState, showAlert, hideAlert } from '../../components';
 import { generationSession } from '../../services/generationSession';
 import { APP_CONFIG } from '../../constants';
@@ -1075,6 +1077,9 @@ export async function executeDeleteConversationFn(
   }
   for (const id of deps.removeImagesByConversationId(deps.activeConversationId))
     await onnxImageGeneratorService.deleteGeneratedImage(id);
+  const videos = useAppStore.getState().generatedVideos.filter(video => video.conversationId === deps.activeConversationId);
+  useAppStore.getState().removeVideosByConversationId(deps.activeConversationId);
+  for (const video of videos) await RNFS.unlink(resolveDocumentPath(video.videoPath)).catch(() => {});
   contextCompactionService.clearSummary(deps.activeConversationId);
   deps.deleteConversation(deps.activeConversationId);
   deps.setActiveConversation(null);
diff --git a/src/screens/GalleryScreen/index.tsx b/src/screens/GalleryScreen/index.tsx
index 03cab0c6d..e29a8f4ae 100644
--- a/src/screens/GalleryScreen/index.tsx
+++ b/src/screens/GalleryScreen/index.tsx
@@ -1,4 +1,10 @@
-import React from 'react';
+import React, { useMemo, useState } from 'react';
+import { Alert, Modal, Share } from 'react-native';
+import Video from 'react-native-video';
+import RNFS from 'react-native-fs';
+import { useAppStore } from '../../stores/appStore';
+import { resolveDocumentPath } from '../../utils/resolveDocumentPath';
+import type { GeneratedVideo } from '../../types';
 import { View, Text, Image, TouchableOpacity, FlatList, Platform } from 'react-native';
 import Icon from 'react-native-vector-icons/Feather';
 import { SafeAreaView } from 'react-native-safe-area-context';
@@ -18,6 +24,11 @@ export const GalleryScreen: React.FC = () => {
   const navigation = useNavigation();
   const route = useRoute<GalleryScreenRouteProp>();
   const conversationId = route.params?.conversationId;
+  const [kind, setKind] = useState<'images' | 'videos'>('images');
+  const [selectedVideo, setSelectedVideo] = useState<GeneratedVideo | null>(null);
+  const videos = useAppStore(state => state.generatedVideos);
+  const removeVideo = useAppStore(state => state.removeGeneratedVideo);
+  const displayVideos = useMemo(() => conversationId ? videos.filter(video => video.conversationId === conversationId) : videos, [videos, conversationId]);
 
   const { colors } = useTheme();
   const styles = useThemedStyles(createStyles);
@@ -43,7 +54,7 @@ export const GalleryScreen: React.FC = () => {
     closeViewer,
   } = useGalleryActions(conversationId);
 
-  const screenTitle = conversationId ? 'Chat Images' : 'Gallery';
+  const screenTitle = conversationId ? 'Chat Media' : 'Gallery';
 
   const renderGridItem = ({ item, index }: { item: GeneratedImage; index: number }) => (
     <GalleryGridItem
@@ -102,7 +113,7 @@ export const GalleryScreen: React.FC = () => {
               <Icon name="x" size={24} color={colors.text} />
             </TouchableOpacity>
             <Text style={styles.title}>{screenTitle}</Text>
-            <Text style={styles.countBadge}>{displayImages.length}</Text>
+            <Text style={styles.countBadge}>{kind === 'images' ? displayImages.length : displayVideos.length}</Text>
             {displayImages.length > 0 && (
               <TouchableOpacity style={styles.headerButton} onPress={toggleSelectMode}>
                 <Icon name="check-square" size={20} color={colors.text} />
@@ -112,6 +123,13 @@ export const GalleryScreen: React.FC = () => {
         )}
       </View>
 
+      <View style={{ flexDirection: 'row', padding: 8, gap: 8 }}>
+        {(['images', 'videos'] as const).map(tab => <TouchableOpacity key={tab} onPress={() => setKind(tab)} accessibilityRole="button"
+          style={{ paddingHorizontal: 12, paddingVertical: 8, borderRadius: 6, backgroundColor: kind === tab ? colors.primary : colors.surface }}>
+          <Text style={{ color: kind === tab ? colors.background : colors.text }}>{tab === 'images' ? `Images (${displayImages.length})` : `Videos (${displayVideos.length})`}</Text>
+        </TouchableOpacity>)}
+      </View>
+
       {imageGenState.isGenerating && (
         <View style={styles.genBanner}>
           <View style={styles.genBannerRow}>
@@ -152,7 +170,10 @@ export const GalleryScreen: React.FC = () => {
         </View>
       )}
 
-      {displayImages.length === 0 ? (
+      {kind === 'videos' ? (displayVideos.length === 0 ? <View style={styles.emptyContainer}><Icon name="video" size={48} color={colors.textMuted} /><Text style={styles.emptyTitle}>No videos in this gallery</Text></View> :
+        <FlatList data={displayVideos} keyExtractor={item => item.id} contentContainerStyle={{ padding: 12 }}
+          renderItem={({ item }) => <TouchableOpacity onPress={() => setSelectedVideo(item)} accessibilityRole="button" style={{ flexDirection: 'row', alignItems: 'center', padding: 16, marginBottom: 8, backgroundColor: colors.surface, borderRadius: 8, gap: 12 }}><Icon name="play-circle" size={28} color={colors.primary} /><View style={{ flex: 1 }}><Text numberOfLines={2} style={{ color: colors.text }}>{item.prompt}</Text><Text style={{ color: colors.textMuted }}>{item.durationSeconds.toFixed(1)} s · {item.width} × {item.height}</Text></View></TouchableOpacity>} />
+      ) : displayImages.length === 0 ? (
         <View style={styles.emptyContainer}>
           <Icon name="image" size={48} color={colors.textMuted} />
           <Text style={styles.emptyTitle}>
@@ -173,6 +194,34 @@ export const GalleryScreen: React.FC = () => {
         />
       )}
 
+      <Modal visible={!!selectedVideo} animationType="slide" onRequestClose={() => setSelectedVideo(null)}>
+        <SafeAreaView style={styles.container}>
+          <View style={{ flexDirection: 'row', justifyContent: 'space-between', padding: 16 }}>
+            <TouchableOpacity onPress={() => setSelectedVideo(null)}><Text style={{ color: colors.text }}>Close</Text></TouchableOpacity>
+            {selectedVideo ? <TouchableOpacity onPress={() => {
+              const source = resolveDocumentPath(selectedVideo.videoPath);
+              if (Platform.OS === 'ios') {
+                void Share.share({ url: `file://${source}` });
+              } else {
+                const destination = `${RNFS.DownloadDirectoryPath}/${selectedVideo.id}.mp4`;
+                void RNFS.copyFile(source, destination)
+                  .then(() => Alert.alert('Video saved', 'The video is in Downloads.'))
+                  .catch(() => Alert.alert('Save failed', 'The video could not be saved.'));
+              }
+            }}><Text style={{ color: colors.primary }}>{Platform.OS === 'ios' ? 'Share' : 'Save'}</Text></TouchableOpacity> : null}
+          </View>
+          {selectedVideo ? <>
+            <Video source={{ uri: `file://${resolveDocumentPath(selectedVideo.videoPath)}` }} controls paused resizeMode="contain" style={{ width: '100%', aspectRatio: selectedVideo.width / selectedVideo.height, backgroundColor: '#000' }} />
+            <Text style={{ color: colors.text, padding: 16 }}>{selectedVideo.prompt}</Text>
+            <TouchableOpacity onPress={() => {
+              const path = resolveDocumentPath(selectedVideo.videoPath);
+              removeVideo(selectedVideo.id);
+              void RNFS.unlink(path).catch(() => {});
+              setSelectedVideo(null);
+            }} style={{ padding: 16 }}><Text style={{ color: colors.error }}>Delete video</Text></TouchableOpacity>
+          </> : null}
+        </SafeAreaView>
+      </Modal>
       <FullscreenViewer
         image={selectedImage}
         showDetails={showDetails}
diff --git a/src/screens/HomeScreen/hooks/useHomeScreen.ts b/src/screens/HomeScreen/hooks/useHomeScreen.ts
index b17e524ab..a35edcb3e 100644
--- a/src/screens/HomeScreen/hooks/useHomeScreen.ts
+++ b/src/screens/HomeScreen/hooks/useHomeScreen.ts
@@ -87,6 +87,7 @@ export const useHomeScreen = (navigation: HomeScreenNavigationProp) => {
     deviceInfo,
     setDeviceInfo,
     generatedImages,
+    generatedVideos,
   } = useAppStore();
 
   const recentConversations = useChatStore(
@@ -375,6 +376,7 @@ export const useHomeScreen = (navigation: HomeScreenNavigationProp) => {
     downloadedImageModels,
     activeImageModelId,
     generatedImages,
+    generatedVideos,
     conversationCount,
     activeTextModel,
     activeTextModelId,
diff --git a/src/screens/HomeScreen/index.tsx b/src/screens/HomeScreen/index.tsx
index 276d846f6..23e41ebff 100644
--- a/src/screens/HomeScreen/index.tsx
+++ b/src/screens/HomeScreen/index.tsx
@@ -74,6 +74,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({ navigation }) => {
     downloadedImageModels,
     activeImageModelId,
     generatedImages,
+    generatedVideos,
     conversationCount,
     activeTextModelId,
     activeTextModelName,
@@ -281,7 +282,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({ navigation }) => {
             </AnimatedEntry>
           )}
 
-          {/* Image Gallery */}
+          {/* Media Gallery */}
           <AnimatedPressable
             style={styles.galleryCard}
             onPress={() => navigation.navigate('Gallery')}
@@ -291,8 +292,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({ navigation }) => {
             <View style={styles.galleryCardInfo}>
               <Text style={styles.galleryCardTitle}>Image Gallery</Text>
               <Text style={styles.galleryCardMeta}>
-                {generatedImages.length}{' '}
-                {generatedImages.length === 1 ? 'image' : 'images'}
+                {generatedImages.length} images · {generatedVideos.length} videos
               </Text>
             </View>
             <Icon name="chevron-right" size={16} color={colors.textMuted} />

From 6e936cd45744344cbda396ff3e5527c7770dd81a Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Mon, 28 Sep 2026 18:49:06 +0530
Subject: [PATCH 004/129] test(sync): cover received videos and chat attachment
 cleanup

---
 .../unit/sync/sharedFileMaterializer.test.ts  | 28 ++++++++++++++++++-
 pro                                           |  2 +-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/__tests__/unit/sync/sharedFileMaterializer.test.ts b/__tests__/unit/sync/sharedFileMaterializer.test.ts
index f98508349..d9192f26c 100644
--- a/__tests__/unit/sync/sharedFileMaterializer.test.ts
+++ b/__tests__/unit/sync/sharedFileMaterializer.test.ts
@@ -65,10 +65,36 @@ describe('making a transferred file appear in the app', () => {
       ?.messages.find(({ uuid }) => uuid === messageUuid)?.attachments ?? [];
 
   beforeEach(() => {
-    useAppStore.setState({ generatedImages: [] });
+    useAppStore.setState({ generatedImages: [], generatedVideos: [] });
     useChatStore.setState({ conversations: [] });
   });
 
+  describe('a video generated on another device', () => {
+    const video = () => record({
+      mimeType: 'video/mp4', name: 'lake.mp4', localPath: '/docs/shared_files/lake.mp4',
+      conversationId: 'chat-7', messageId: 'message-1', width: 320, height: 192,
+      durationSeconds: 2.125,
+      metadataJson: JSON.stringify({ prompt: 'A moving lake', steps: 20, guidance: 6, seed: 42, modelId: 'wan', fps: 8, frames: 17 }),
+    });
+    it('appears once in the video gallery and on its message after repeated delivery', () => {
+      useChatStore.setState({ conversations: [conversation()] });
+      materializeSharedFile(video());
+      materializeSharedFile(video());
+      expect(gallery()).toEqual([]);
+      expect(useAppStore.getState().generatedVideos).toHaveLength(1);
+      expect(useAppStore.getState().generatedVideos[0]).toMatchObject({ prompt: 'A moving lake', durationSeconds: 2.125, fps: 8, seed: 42 });
+      expect(attachmentsOn('chat-7', 'message-1')).toHaveLength(1);
+      expect(attachmentsOn('chat-7', 'message-1')[0]).toMatchObject({ type: 'video', mimeType: 'video/mp4' });
+    });
+    it('removes the gallery entry and chat attachment when the shared video is deleted', () => {
+      useChatStore.setState({ conversations: [conversation()] });
+      materializeSharedFile(video());
+      removeMaterializedSharedFile(video());
+      expect(useAppStore.getState().generatedVideos).toEqual([]);
+      expect(attachmentsOn('chat-7', 'message-1')).toEqual([]);
+    });
+  });
+
   describe('a picture generated on another device', () => {
     it('appears in the gallery, with the prompt that made it', () => {
       materializeSharedFile(
diff --git a/pro b/pro
index 7233bbfbb..057cd1818 160000
--- a/pro
+++ b/pro
@@ -1 +1 @@
-Subproject commit 7233bbfbb64ff058e8cec2e412ed7115a5672044
+Subproject commit 057cd18187ecfdc4a9ab35bb8f6f392d7166b118

From 3b80a82c01cf5f103519f402ee25bbec4311e4f8 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Mon, 28 Sep 2026 21:32:38 +0530
Subject: [PATCH 005/129] feat(video): add shared native lifecycle and iOS
 Metal generation [skip ci]

---
 ios/OffgridMobile/Info.plist                 |   4 +
 ios/OffgridMobile/OffgridMobile.entitlements |   2 +
 ios/Podfile                                  |   1 +
 ios/Podfile.lock                             |   8 +-
 native/video/OffgridVideo.podspec            |  15 +++
 native/video/RUNTIME-LICENSE                 |  21 +++
 native/video/VideoEncoder.h                  |   5 +
 native/video/VideoEncoder.mm                 |  64 +++++++++
 native/video/VideoGenerationModule.mm        | 132 +++++++++++++++++++
 native/video/common/VideoRuntime.hpp         |  87 ++++++++++++
 scripts/build-video-ios.sh                   |  31 +++++
 scripts/video/CMakeLists.txt                 |  24 ++++
 scripts/video/exports.txt                    |   5 +
 scripts/video/revision                       |   1 +
 14 files changed, 399 insertions(+), 1 deletion(-)
 create mode 100644 native/video/OffgridVideo.podspec
 create mode 100644 native/video/RUNTIME-LICENSE
 create mode 100644 native/video/VideoEncoder.h
 create mode 100644 native/video/VideoEncoder.mm
 create mode 100644 native/video/VideoGenerationModule.mm
 create mode 100644 native/video/common/VideoRuntime.hpp
 create mode 100755 scripts/build-video-ios.sh
 create mode 100644 scripts/video/CMakeLists.txt
 create mode 100644 scripts/video/exports.txt
 create mode 100644 scripts/video/revision

diff --git a/ios/OffgridMobile/Info.plist b/ios/OffgridMobile/Info.plist
index 350fa2054..e665da43a 100644
--- a/ios/OffgridMobile/Info.plist
+++ b/ios/OffgridMobile/Info.plist
@@ -124,5 +124,9 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>BGTaskSchedulerPermittedIdentifiers</key>
+	<array>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER).video.*</string>
+	</array>
 </dict>
 </plist>
diff --git a/ios/OffgridMobile/OffgridMobile.entitlements b/ios/OffgridMobile/OffgridMobile.entitlements
index 510563fbc..e480f62a3 100644
--- a/ios/OffgridMobile/OffgridMobile.entitlements
+++ b/ios/OffgridMobile/OffgridMobile.entitlements
@@ -6,5 +6,7 @@
 	<true/>
 	<key>com.apple.developer.kernel.extended-virtual-addressing</key>
 	<true/>
+	<key>com.apple.developer.background-tasks.continued-processing.gpu</key>
+	<true/>
 </dict>
 </plist>
diff --git a/ios/Podfile b/ios/Podfile
index fd0564901..2c10fd7ca 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -20,6 +20,7 @@ end
 
 target 'OffgridMobile' do
   config = use_native_modules!
+  pod 'OffgridVideo', :path => '../native/video'
   
   use_react_native!(
     :path => config[:reactNativePath],
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 613f017a5..82d7b4e12 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -42,6 +42,8 @@ PODS:
   - MMKV (2.4.0):
     - MMKVCore (~> 2.4.0)
   - MMKVCore (2.4.0)
+  - OffgridVideo (0.1.0):
+    - React-Core
   - op-sqlite (15.2.5):
     - boost
     - DoubleConversion
@@ -3592,6 +3594,7 @@ DEPENDENCIES:
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
   - hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
   - llama-rn (from `../node_modules/llama.rn`)
+  - OffgridVideo (from `../native/video`)
   - "op-sqlite (from `../node_modules/@op-engineering/op-sqlite`)"
   - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
   - RCTDeprecation (from `../node_modules/react-native/ReactApple/Libraries/RCTFoundation/RCTDeprecation`)
@@ -3723,6 +3726,8 @@ EXTERNAL SOURCES:
     :tag: hermes-v0.14.0
   llama-rn:
     :path: "../node_modules/llama.rn"
+  OffgridVideo:
+    :path: "../native/video"
   op-sqlite:
     :path: "../node_modules/@op-engineering/op-sqlite"
   RCT-Folly:
@@ -3938,6 +3943,7 @@ SPEC CHECKSUMS:
   llama-rn: fc4d176920fff190ee3a5a4172ce739531150cc4
   MMKV: 86859fdfa2b0b21db1fd6e48788474a6416a2c77
   MMKVCore: 3d16ce9f7d411e135020915fde98a056859a1efa
+  OffgridVideo: 3a0d4acebd54e2ab315c9ff737aa017ccc3d36b8
   op-sqlite: bafff369cecaee4fe65c89eec47deaba26f2db95
   opencv-rne: 2305807573b6e29c8c87e3416ab096d09047a7a0
   RCT-Folly: 846fda9475e61ec7bcbf8a3fe81edfcaeb090669
@@ -4043,6 +4049,6 @@ SPEC CHECKSUMS:
   whisper-rn: 7566faf9b7d78e39ab9fc634cb90fdee81177793
   Yoga: 5456bb010373068fc92221140921b09d126b116e
 
-PODFILE CHECKSUM: d2e7563af7ca0531bcab79cceff20997d2fbe48c
+PODFILE CHECKSUM: d97d58b05041bdcebe2a6d7281b601cc8a2856c6
 
 COCOAPODS: 1.15.2
diff --git a/native/video/OffgridVideo.podspec b/native/video/OffgridVideo.podspec
new file mode 100644
index 000000000..2b607031b
--- /dev/null
+++ b/native/video/OffgridVideo.podspec
@@ -0,0 +1,15 @@
+Pod::Spec.new do |s|
+  s.name = 'OffgridVideo'
+  s.version = '0.1.0'
+  s.summary = 'Local Wan video generation and MP4 encoding for Off Grid AI'
+  s.homepage = 'https://github.com/off-grid-ai/OGAM'
+  s.license = { :type => 'AGPL-3.0', :file => '../../LICENSE' }
+  s.author = 'Off Grid AI'
+  s.source = { :git => 'https://github.com/off-grid-ai/OGAM.git' }
+  s.platform = :ios, '17.0'
+  s.source_files = '*.{h,mm}', 'common/*.hpp'
+  s.vendored_frameworks = 'OffgridVideoRuntime.xcframework'
+  s.frameworks = 'BackgroundTasks', 'AVFoundation', 'CoreVideo', 'Metal', 'Accelerate', 'UIKit'
+  s.dependency 'React-Core'
+  s.pod_target_xcconfig = { 'CLANG_CXX_LANGUAGE_STANDARD' => 'c++17' }
+end
diff --git a/native/video/RUNTIME-LICENSE b/native/video/RUNTIME-LICENSE
new file mode 100644
index 000000000..56e1e5a63
--- /dev/null
+++ b/native/video/RUNTIME-LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 leejet
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/native/video/VideoEncoder.h b/native/video/VideoEncoder.h
new file mode 100644
index 000000000..aa823f535
--- /dev/null
+++ b/native/video/VideoEncoder.h
@@ -0,0 +1,5 @@
+#import <Foundation/Foundation.h>
+#import <OffgridVideoRuntime/stable-diffusion.h>
+#include <atomic>
+BOOL OGEncodeVideo(sd_image_t *frames, int count, int fps, NSString *path,
+                   const std::atomic_bool &cancelled, NSError **error);
diff --git a/native/video/VideoEncoder.mm b/native/video/VideoEncoder.mm
new file mode 100644
index 000000000..09a96b031
--- /dev/null
+++ b/native/video/VideoEncoder.mm
@@ -0,0 +1,64 @@
+#import "VideoEncoder.h"
+#import <AVFoundation/AVFoundation.h>
+
+BOOL OGEncodeVideo(sd_image_t *frames, int count, int fps, NSString *path,
+                   const std::atomic_bool &cancelled, NSError **error) {
+  if (!frames || count < 1 || fps < 1) return NO;
+  AVAssetWriter *writer = [[AVAssetWriter alloc] initWithURL:[NSURL fileURLWithPath:path]
+      fileType:AVFileTypeMPEG4 error:error];
+  if (!writer) return NO;
+  NSDictionary *settings = @{ AVVideoCodecKey: AVVideoCodecTypeH264,
+      AVVideoWidthKey: @(frames[0].width), AVVideoHeightKey: @(frames[0].height) };
+  AVAssetWriterInput *input = [AVAssetWriterInput assetWriterInputWithMediaType:AVMediaTypeVideo outputSettings:settings];
+  input.expectsMediaDataInRealTime = NO;
+  NSDictionary *attributes = @{ (id)kCVPixelBufferPixelFormatTypeKey: @(kCVPixelFormatType_32BGRA),
+      (id)kCVPixelBufferWidthKey: @(frames[0].width), (id)kCVPixelBufferHeightKey: @(frames[0].height),
+      (id)kCVPixelBufferIOSurfacePropertiesKey: @{} };
+  AVAssetWriterInputPixelBufferAdaptor *adaptor = [AVAssetWriterInputPixelBufferAdaptor
+      assetWriterInputPixelBufferAdaptorWithAssetWriterInput:input sourcePixelBufferAttributes:attributes];
+  if (![writer canAddInput:input]) return NO;
+  [writer addInput:input];
+  if (![writer startWriting]) { if (error) *error = writer.error; return NO; }
+  [writer startSessionAtSourceTime:kCMTimeZero];
+  BOOL ok = YES;
+  for (int i = 0; i < count && ok; ++i) {
+    @autoreleasepool {
+      // Bound a stalled encoder and permit Stop while waiting for its next buffer.
+      NSDate *deadline = [NSDate dateWithTimeIntervalSinceNow:30];
+      while (!input.readyForMoreMediaData && writer.status == AVAssetWriterStatusWriting &&
+             !cancelled.load() && deadline.timeIntervalSinceNow > 0) [NSThread sleepForTimeInterval:0.01];
+      if (cancelled.load() || !input.readyForMoreMediaData || frames[i].channel < 3 || !frames[i].data || frames[i].width != frames[0].width || frames[i].height != frames[0].height) { ok = NO; break; }
+      CVPixelBufferRef buffer = nil;
+      if (CVPixelBufferPoolCreatePixelBuffer(NULL, adaptor.pixelBufferPool, &buffer) != kCVReturnSuccess) { ok = NO; break; }
+      CVPixelBufferLockBaseAddress(buffer, 0);
+      auto *pixels = (uint8_t *)CVPixelBufferGetBaseAddress(buffer);
+      size_t stride = CVPixelBufferGetBytesPerRow(buffer);
+      for (uint32_t y = 0; y < frames[i].height; ++y) {
+        for (uint32_t x = 0; x < frames[i].width; ++x) {
+          const uint8_t *rgb = frames[i].data + (y * frames[i].width + x) * frames[i].channel;
+          uint8_t *bgra = pixels + y * stride + x * 4;
+          bgra[0] = rgb[2]; bgra[1] = rgb[1]; bgra[2] = rgb[0]; bgra[3] = 255;
+        }
+      }
+      CVPixelBufferUnlockBaseAddress(buffer, 0);
+      ok = [adaptor appendPixelBuffer:buffer withPresentationTime:CMTimeMake(i, fps)];
+      CVPixelBufferRelease(buffer);
+    }
+  }
+  if (ok) {
+    [input markAsFinished];
+    dispatch_semaphore_t finished = dispatch_semaphore_create(0);
+    [writer finishWritingWithCompletionHandler:^{ dispatch_semaphore_signal(finished); }];
+    NSDate *deadline = [NSDate dateWithTimeIntervalSinceNow:30];
+    while (dispatch_semaphore_wait(finished, dispatch_time(DISPATCH_TIME_NOW, NSEC_PER_MSEC * 100)) != 0) {
+      if (cancelled.load() || deadline.timeIntervalSinceNow <= 0) { [writer cancelWriting]; break; }
+    }
+    ok = writer.status == AVAssetWriterStatusCompleted && !cancelled.load();
+  }
+  if (!ok) {
+    if (error) *error = writer.error;
+    [writer cancelWriting];
+    [[NSFileManager defaultManager] removeItemAtPath:path error:nil];
+  }
+  return ok;
+}
diff --git a/native/video/VideoGenerationModule.mm b/native/video/VideoGenerationModule.mm
new file mode 100644
index 000000000..64036b006
--- /dev/null
+++ b/native/video/VideoGenerationModule.mm
@@ -0,0 +1,132 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
+#import <UIKit/UIKit.h>
+#import <BackgroundTasks/BackgroundTasks.h>
+#import "VideoEncoder.h"
+#include "common/VideoRuntime.hpp"
+
+@interface VideoGenerationModule : RCTEventEmitter <RCTBridgeModule>
+@end
+@implementation VideoGenerationModule {
+  offgrid::VideoRuntime _runtime;
+  dispatch_queue_t _worker;
+  BOOL _busy;
+  BOOL _listeners;
+  BGTask *_continued;
+  NSString *_taskIdentifier;
+  dispatch_block_t _continuedWork;
+}
+RCT_EXPORT_MODULE(VideoGenerationModule)
++ (BOOL)requiresMainQueueSetup { return YES; }
+- (instancetype)init {
+  if ((self = [super init])) {
+    _worker = dispatch_queue_create("ai.offgrid.video", DISPATCH_QUEUE_SERIAL);
+
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(backgrounded)
+      name:UIApplicationDidEnterBackgroundNotification object:nil];
+  }
+  return self;
+}
+- (void)dealloc { [[NSNotificationCenter defaultCenter] removeObserver:self]; }
+- (NSArray<NSString *> *)supportedEvents { return @[@"VideoGenerationProgress"]; }
+- (void)startObserving { _listeners = YES; }
+- (void)stopObserving { _listeners = NO; }
+- (void)backgrounded {
+  // Metal work must stop before the OS removes GPU access. Continued GPU tasks
+  // are admitted separately by the background coordinator on supported systems.
+  if (_busy && !_continued) _runtime.cancel();
+}
+- (void)emitStage:(NSString *)stage step:(int)step total:(int)total {
+  dispatch_async(dispatch_get_main_queue(), ^{
+    if (@available(iOS 26.0, *)) {
+      if (self->_continued && total > 0) {
+        BGContinuedProcessingTask *task = (BGContinuedProcessingTask *)self->_continued;
+        task.progress.totalUnitCount = total + 2;
+        task.progress.completedUnitCount = MIN(step + 1, total + 1);
+        [task updateTitle:@"Generating video" subtitle:stage];
+      }
+    }
+    if (self->_listeners) [self sendEventWithName:@"VideoGenerationProgress"
+      body:@{@"stage":stage, @"step":@(step), @"total":@(total)}];
+  });
+}
+RCT_REMAP_METHOD(cancel, cancelWithResolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+  dispatch_async(dispatch_get_main_queue(), ^{
+    self->_runtime.cancel();
+    if (self->_continuedWork) {
+      if (self->_taskIdentifier) [BGTaskScheduler.sharedScheduler cancelTaskRequestWithIdentifier:self->_taskIdentifier];
+      dispatch_block_t pending = self->_continuedWork; self->_continuedWork = nil;
+      pending(); // The worker observes cancellation and settles the JS promise.
+    }
+    resolve(nil);
+  });
+}
+RCT_REMAP_METHOD(generate, generate:(NSDictionary *)input resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+  dispatch_async(dispatch_get_main_queue(), ^{
+    if (self->_busy) { reject(@"VIDEO_BUSY", @"Video generation is already running.", nil); return; }
+    self->_busy = YES; self->_runtime.cancelled.store(false);
+    [self startContinuedWork:^{
+    dispatch_async(self->_worker, ^{
+      @autoreleasepool {
+        NSString *output = input[@"outputPath"];
+        NSError *failure = nil;
+        try {
+          offgrid::VideoRequest request{
+            [input[@"weight"] UTF8String], [input[@"vae"] UTF8String], [input[@"encoder"] UTF8String],
+            [input[@"prompt"] UTF8String], [input[@"negativePrompt"] UTF8String],
+            [input[@"width"] intValue], [input[@"height"] intValue], [input[@"frames"] intValue],
+            [input[@"fps"] intValue], [input[@"steps"] intValue], [input[@"guidance"] floatValue], [input[@"seed"] longLongValue]
+          };
+          [self emitStage:@"preparing" step:0 total:request.steps];
+          self->_runtime.run(request, [&](int step, int total) {
+            [self emitStage:@"generating" step:step total:total];
+          }, [&](sd_image_t *frames, int count, int fps) {
+            [self emitStage:@"encoding" step:count total:count];
+            NSError *encodingError = nil;
+            if (!OGEncodeVideo(frames, count, fps, output, self->_runtime.cancelled, &encodingError))
+              throw std::runtime_error(encodingError ? encodingError.localizedDescription.UTF8String : "Video encoding stopped.");
+          });
+        } catch (const std::exception &error) {
+          failure = [NSError errorWithDomain:@"OffgridVideo" code:1 userInfo:@{NSLocalizedDescriptionKey:@(error.what())}];
+          [[NSFileManager defaultManager] removeItemAtPath:output error:nil];
+        }
+        dispatch_async(dispatch_get_main_queue(), ^{
+          self->_busy = NO;
+          if (self->_continued) {
+            [self->_continued setTaskCompletedWithSuccess:failure == nil]; self->_continued = nil;
+          }
+          if (failure) reject(self->_runtime.cancelled.load() ? @"VIDEO_CANCELLED" : @"VIDEO_FAILED", failure.localizedDescription, failure);
+          else resolve(@{@"path":output});
+        });
+      }
+    });
+    }];
+  });
+}
+- (void)startContinuedWork:(dispatch_block_t)work {
+  _continuedWork = [work copy];
+  if (@available(iOS 26.0, *)) {
+    if (BGTaskScheduler.supportedResources & BGContinuedProcessingTaskRequestResourcesGPU) {
+      if (!_taskIdentifier) {
+        _taskIdentifier = [NSString stringWithFormat:@"%@.video.generation", NSBundle.mainBundle.bundleIdentifier];
+        __weak VideoGenerationModule *weakSelf = self;
+        BOOL registered = [BGTaskScheduler.sharedScheduler registerForTaskWithIdentifier:_taskIdentifier usingQueue:dispatch_get_main_queue() launchHandler:^(BGTask *task) {
+          VideoGenerationModule *owner = weakSelf;
+          if (!owner || !owner->_busy) { [task setTaskCompletedWithSuccess:NO]; return; }
+          owner->_continued = task;
+          task.expirationHandler = ^{ VideoGenerationModule *active = weakSelf; if (active) active->_runtime.cancel(); };
+          dispatch_block_t admitted = owner->_continuedWork; owner->_continuedWork = nil;
+          if (admitted) admitted();
+        }];
+        if (!registered) { _taskIdentifier = nil; _continuedWork = nil; work(); return; }
+      }
+      BGContinuedProcessingTaskRequest *request = [[BGContinuedProcessingTaskRequest alloc] initWithIdentifier:_taskIdentifier title:@"Generating video" subtitle:@"Loading model"];
+      request.requiredResources = BGContinuedProcessingTaskRequestResourcesGPU;
+      request.strategy = BGContinuedProcessingTaskRequestSubmissionStrategyFail;
+      if ([BGTaskScheduler.sharedScheduler submitTaskRequest:request error:nil]) return;
+    }
+  }
+  _continuedWork = nil;
+  work();
+}
+@end
diff --git a/native/video/common/VideoRuntime.hpp b/native/video/common/VideoRuntime.hpp
new file mode 100644
index 000000000..5164f6905
--- /dev/null
+++ b/native/video/common/VideoRuntime.hpp
@@ -0,0 +1,87 @@
+#pragma once
+#ifdef __APPLE__
+#include <OffgridVideoRuntime/stable-diffusion.h>
+#else
+#include "stable-diffusion.h"
+#endif
+#include <atomic>
+#include <functional>
+#include <mutex>
+#include <stdexcept>
+#include <string>
+
+namespace offgrid {
+struct VideoRequest {
+  std::string weight, vae, encoder, prompt, negative;
+  int width, height, frames, fps, steps;
+  float guidance;
+  int64_t seed;
+};
+// One instance per process. Both host bridges use the same native lifecycle.
+class VideoRuntime {
+  std::mutex contextMutex;
+  std::mutex executionMutex;
+  sd_ctx_t *context = nullptr;
+public:
+  std::atomic_bool cancelled{false};
+  void cancel() {
+    cancelled.store(true);
+    std::lock_guard<std::mutex> guard(contextMutex);
+    if (context) sd_cancel_generation(context, SD_CANCEL_ALL);
+  }
+  void run(const VideoRequest &request,
+           const std::function<void(int, int)> &progress,
+           const std::function<void(sd_image_t *, int, int)> &encode) {
+    std::unique_lock<std::mutex> execution(executionMutex, std::try_to_lock);
+    if (!execution.owns_lock()) throw std::runtime_error("Video generation is already running.");
+    sd_image_t *frames = nullptr;
+    int count = 0, fps = request.fps;
+    auto cleanup = [&] {
+      if (frames) free_sd_images(frames, count);
+      sd_set_progress_callback(nullptr, nullptr);
+      std::lock_guard<std::mutex> guard(contextMutex);
+      if (context) free_sd_ctx(context);
+      context = nullptr;
+    };
+    try {
+      if (cancelled.load()) throw std::runtime_error("Video generation stopped.");
+      sd_ctx_params_t config;
+      sd_ctx_params_init(&config);
+      config.diffusion_model_path = request.weight.c_str();
+      config.vae_path = request.vae.c_str();
+      config.t5xxl_path = request.encoder.c_str();
+      config.enable_mmap = true;
+      config.diffusion_flash_attn = true;
+      config.auto_fit = true;
+      config.eager_load = false;
+      config.n_threads = 4;
+      auto loaded = new_sd_ctx(&config);
+      {
+        std::lock_guard<std::mutex> guard(contextMutex);
+        context = loaded;
+      }
+      if (!loaded) throw std::runtime_error("Could not load the video model pack.");
+      if (cancelled.load()) throw std::runtime_error("Video generation stopped.");
+      sd_set_progress_callback([](int step, int total, float, void *data) {
+        (*static_cast<const std::function<void(int, int)> *>(data))(step, total);
+      }, const_cast<void *>(static_cast<const void *>(&progress)));
+      sd_vid_gen_params_t params;
+      sd_vid_gen_params_init(&params);
+      params.prompt = request.prompt.c_str(); params.negative_prompt = request.negative.c_str();
+      params.width = request.width; params.height = request.height;
+      params.video_frames = request.frames; params.fps = request.fps; params.seed = request.seed;
+      params.sample_params.sample_steps = request.steps;
+      params.sample_params.guidance.txt_cfg = request.guidance;
+      params.sample_params.flow_shift = 3;
+      params.sample_params.sample_method = EULER_SAMPLE_METHOD;
+      params.sample_params.scheduler = sd_get_default_scheduler(loaded, EULER_SAMPLE_METHOD);
+      params.vae_tiling_params.enabled = true;
+      if (!generate_video(loaded, &params, &frames, &count, nullptr, &fps) || !frames || count == 0)
+        throw std::runtime_error(cancelled.load() ? "Video generation stopped." : "The video engine produced no frames.");
+      if (cancelled.load()) throw std::runtime_error("Video generation stopped.");
+      encode(frames, count, fps);
+    } catch (...) { cleanup(); throw; }
+    cleanup();
+  }
+};
+}
diff --git a/scripts/build-video-ios.sh b/scripts/build-video-ios.sh
new file mode 100755
index 000000000..bf3a4c225
--- /dev/null
+++ b/scripts/build-video-ios.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+set -euo pipefail
+ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+REVISION="$(cat "$ROOT/scripts/video/revision")"
+CACHE="${OFFGRID_VIDEO_BUILD_DIR:-$ROOT/.video-build}"
+SOURCE="${OFFGRID_SD_SOURCE:-$CACHE/source}"
+OUTPUT="$ROOT/native/video/OffgridVideoRuntime.xcframework"
+if [ -f "$OUTPUT/ios-arm64/OffgridVideoRuntime.framework/Headers/stable-diffusion.h" ] && [ -f "$OUTPUT/revision" ] && [ "$(cat "$OUTPUT/revision")" = "$REVISION" ]; then exit 0; fi
+mkdir -p "$CACHE"
+if [ ! -d "$SOURCE/.git" ]; then
+  git clone --filter=blob:none --no-checkout https://github.com/leejet/stable-diffusion.cpp.git "$SOURCE"
+fi
+if [ "$(git -C "$SOURCE" rev-parse HEAD)" != "$REVISION" ]; then
+  git -C "$SOURCE" fetch origin "$REVISION"
+  git -C "$SOURCE" checkout --detach "$REVISION"
+fi
+git -C "$SOURCE" submodule update --init --depth 1 ggml
+for SDK in iphoneos iphonesimulator; do
+  cmake -S "$ROOT/scripts/video" -B "$CACHE/$SDK" -G Xcode \
+    -DSD_SOURCE="$SOURCE" -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT="$SDK" \
+    -DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_OSX_DEPLOYMENT_TARGET=17.0
+  cmake --build "$CACHE/$SDK" --config Release --target stable-diffusion -- -quiet CODE_SIGNING_ALLOWED=NO
+ done
+# Replace only this generated build artifact.
+rm -rf "$OUTPUT"
+xcodebuild -create-xcframework \
+  -framework "$CACHE/iphoneos/bin/Release/OffgridVideoRuntime.framework" \
+  -framework "$CACHE/iphonesimulator/bin/Release/OffgridVideoRuntime.framework" \
+  -output "$OUTPUT"
+printf '%s\n' "$REVISION" > "$OUTPUT/revision"
+cp "$SOURCE/LICENSE" "$ROOT/native/video/RUNTIME-LICENSE"
diff --git a/scripts/video/CMakeLists.txt b/scripts/video/CMakeLists.txt
new file mode 100644
index 000000000..8b38e0bf6
--- /dev/null
+++ b/scripts/video/CMakeLists.txt
@@ -0,0 +1,24 @@
+cmake_minimum_required(VERSION 3.24)
+project(OffgridVideoRuntime LANGUAGES C CXX OBJC OBJCXX)
+set(SD_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+set(SD_BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE)
+set(SD_BUILD_SHARED_GGML_LIB OFF CACHE BOOL "" FORCE)
+set(SD_METAL ON CACHE BOOL "" FORCE)
+set(SD_WEBP OFF CACHE BOOL "" FORCE)
+set(SD_WEBM OFF CACHE BOOL "" FORCE)
+set(GGML_METAL_EMBED_LIBRARY ON CACHE BOOL "" FORCE)
+set(GGML_NATIVE OFF CACHE BOOL "" FORCE)
+set(GGML_OPENMP OFF CACHE BOOL "" FORCE)
+set(CMAKE_C_VISIBILITY_PRESET hidden)
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+add_subdirectory("${SD_SOURCE}" runtime)
+target_sources(stable-diffusion PRIVATE "${SD_SOURCE}/include/stable-diffusion.h")
+set_target_properties(stable-diffusion PROPERTIES
+  FRAMEWORK TRUE FRAMEWORK_VERSION A
+  OUTPUT_NAME OffgridVideoRuntime
+  MACOSX_FRAMEWORK_IDENTIFIER ai.offgrid.video.runtime
+  XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER ai.offgrid.video.runtime
+  PUBLIC_HEADER "${SD_SOURCE}/include/stable-diffusion.h"
+  XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED NO
+  INSTALL_NAME_DIR "@rpath")
+target_link_options(stable-diffusion PRIVATE "-Wl,-exported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/exports.txt")
diff --git a/scripts/video/exports.txt b/scripts/video/exports.txt
new file mode 100644
index 000000000..f57d83965
--- /dev/null
+++ b/scripts/video/exports.txt
@@ -0,0 +1,5 @@
+_sd_*
+_new_sd_ctx
+_free_sd_ctx
+_free_sd_images
+_generate_video
diff --git a/scripts/video/revision b/scripts/video/revision
new file mode 100644
index 000000000..8e5956cae
--- /dev/null
+++ b/scripts/video/revision
@@ -0,0 +1 @@
+3f8527a46c54ecf4cb4ed6003da8e8982283c73c

From d46a539eb4821981d1de41a79f51af1ab5c57f20 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Mon, 28 Sep 2026 21:32:38 +0530
Subject: [PATCH 006/129] feat(video): add Android Vulkan generation and scoped
 media export [skip ci]

---
 android/app/build.gradle                      |  1 +
 android/app/src/main/AndroidManifest.xml      |  5 ++
 android/app/src/main/cpp/CMakeLists.txt       | 35 ++++++++
 android/app/src/main/cpp/video/video-jni.cpp  | 83 +++++++++++++++++
 .../java/ai/offgridmobile/MainApplication.kt  |  1 +
 .../downloads/SyncDownloadsModule.kt          | 33 +++++++
 .../ai/offgridmobile/video/VideoEncoder.kt    | 90 +++++++++++++++++++
 .../video/VideoGenerationModule.kt            | 73 +++++++++++++++
 .../video/VideoGenerationPackage.kt           |  9 ++
 .../video/VideoGenerationService.kt           | 36 ++++++++
 10 files changed, 366 insertions(+)
 create mode 100644 android/app/src/main/cpp/CMakeLists.txt
 create mode 100644 android/app/src/main/cpp/video/video-jni.cpp
 create mode 100644 android/app/src/main/java/ai/offgridmobile/video/VideoEncoder.kt
 create mode 100644 android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
 create mode 100644 android/app/src/main/java/ai/offgridmobile/video/VideoGenerationPackage.kt
 create mode 100644 android/app/src/main/java/ai/offgridmobile/video/VideoGenerationService.kt

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 88875fc44..ab329c9ff 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -89,6 +89,7 @@ android {
         coreLibraryDesugaringEnabled true
     }
 
+    externalNativeBuild { cmake { path "src/main/cpp/CMakeLists.txt"; version "3.22.1" } }
     defaultConfig {
         applicationId "ai.offgridmobile"
         minSdkVersion rootProject.ext.minSdkVersion
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 04fef1ba4..bf9009eb9 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -47,6 +47,8 @@
     <!-- Run large model downloads as a foreground service so they keep progressing when
          the app is backgrounded / the screen is off (WorkManager foreground worker). -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROCESSING" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
     <!-- Personal Mesh keeps a live local-network connection to paired devices. -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE" />
@@ -140,5 +142,8 @@
           android:exported="false"
           android:foregroundServiceType="connectedDevice" />
 
+      <service android:name=".video.VideoGenerationService" android:exported="false" android:foregroundServiceType="mediaProcessing|specialUse">
+        <property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE" android:value="User-started local video generation" />
+      </service>
     </application>
 </manifest>
diff --git a/android/app/src/main/cpp/CMakeLists.txt b/android/app/src/main/cpp/CMakeLists.txt
new file mode 100644
index 000000000..ed35317dc
--- /dev/null
+++ b/android/app/src/main/cpp/CMakeLists.txt
@@ -0,0 +1,35 @@
+cmake_minimum_required(VERSION 3.22)
+project(appmodules LANGUAGES C CXX)
+include(${REACT_ANDROID_DIR}/cmake-utils/ReactNative-application.cmake)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_C_VISIBILITY_PRESET hidden)
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+set(SD_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+set(SD_BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
+set(SD_BUILD_SHARED_GGML_LIB OFF CACHE BOOL "" FORCE)
+set(GGML_NATIVE OFF CACHE BOOL "" FORCE)
+set(SD_WEBP OFF CACHE BOOL "" FORCE)
+set(SD_WEBM OFF CACHE BOOL "" FORCE)
+set(SD_METAL OFF CACHE BOOL "" FORCE)
+set(SD_VULKAN ON CACHE BOOL "" FORCE)
+set(SD_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/../../../../../.video-build/source")
+if(NOT EXISTS "${SD_SOURCE}/CMakeLists.txt")
+  message(FATAL_ERROR "Run scripts/prepare-video-runtime.sh before building Android.")
+endif()
+set(SPIRV-Headers_DIR "${SD_SOURCE}/../vulkan-header-prefix/share/cmake/SPIRV-Headers")
+set(Vulkan_INCLUDE_DIR "${SD_SOURCE}/../vulkan-header-prefix/include" CACHE PATH "Pinned Vulkan headers" FORCE)
+string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" VIDEO_HOST_OS)
+# The NDK shader compiler can be too old for the pinned runtime. Use the host
+# shaderc installation, or an explicit -DVulkan_GLSLC_EXECUTABLE path.
+find_program(Vulkan_GLSLC_EXECUTABLE NAMES glslc glslc.exe
+  HINTS "${SD_SOURCE}/../shaderc/bin" NO_CMAKE_FIND_ROOT_PATH REQUIRED)
+find_program(VIDEO_HOST_CC NAMES clang gcc cl NO_CMAKE_FIND_ROOT_PATH REQUIRED)
+find_program(VIDEO_HOST_CXX NAMES clang++ g++ cl NO_CMAKE_FIND_ROOT_PATH REQUIRED)
+set(GGML_VULKAN_SHADERS_GEN_TOOLCHAIN "${CMAKE_BINARY_DIR}/video-host-toolchain.cmake")
+file(WRITE "${GGML_VULKAN_SHADERS_GEN_TOOLCHAIN}"
+  "set(CMAKE_C_COMPILER \"${VIDEO_HOST_CC}\")\nset(CMAKE_CXX_COMPILER \"${VIDEO_HOST_CXX}\")\nset(CMAKE_MAKE_PROGRAM \"${CMAKE_MAKE_PROGRAM}\" CACHE FILEPATH \"Host build tool\" FORCE)\n")
+add_subdirectory("${SD_SOURCE}" runtime)
+add_library(offgrid_video SHARED video/video-jni.cpp)
+target_include_directories(offgrid_video PRIVATE "${SD_SOURCE}/include" "${CMAKE_CURRENT_SOURCE_DIR}/../../../../../native/video/common")
+target_link_libraries(offgrid_video PRIVATE stable-diffusion android log)
+target_link_options(offgrid_video PRIVATE "-Wl,--exclude-libs,ALL" "-Wl,-z,max-page-size=16384")
diff --git a/android/app/src/main/cpp/video/video-jni.cpp b/android/app/src/main/cpp/video/video-jni.cpp
new file mode 100644
index 000000000..83d059cfb
--- /dev/null
+++ b/android/app/src/main/cpp/video/video-jni.cpp
@@ -0,0 +1,83 @@
+#include <jni.h>
+#include <limits>
+#include "VideoRuntime.hpp"
+
+static offgrid::VideoRuntime runtime;
+
+class AttachedEnv {
+  JavaVM *vm;
+  bool attached = false;
+public:
+  JNIEnv *env = nullptr;
+  explicit AttachedEnv(JavaVM *value) : vm(value) {
+    if (vm->GetEnv(reinterpret_cast<void **>(&env), JNI_VERSION_1_6) == JNI_EDETACHED) {
+      attached = vm->AttachCurrentThread(&env, nullptr) == JNI_OK;
+      if (!attached) env = nullptr;
+    }
+  }
+  ~AttachedEnv() { if (attached) vm->DetachCurrentThread(); }
+};
+
+static std::string string(JNIEnv *env, jstring value) {
+  if (!value) throw std::runtime_error("Missing video argument.");
+  const char *bytes = env->GetStringUTFChars(value, nullptr);
+  if (!bytes) throw std::runtime_error("Missing video argument.");
+  std::string result(bytes);
+  env->ReleaseStringUTFChars(value, bytes);
+  return result;
+}
+
+extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationModule_nativePrepare(JNIEnv *, jobject) { runtime.cancelled.store(false); }
+extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationModule_nativeCancel(JNIEnv *, jobject) { runtime.cancel(); }
+extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationModule_nativeGenerate(
+  JNIEnv *env, jobject self, jstring weight, jstring vae, jstring encoder, jstring prompt, jstring negative,
+  jint width, jint height, jint frames, jint fps, jint steps, jdouble guidance, jdouble seed) {
+  jobject owner = nullptr;
+  try {
+    offgrid::VideoRequest request{string(env, weight), string(env, vae), string(env, encoder), string(env, prompt), string(env, negative), width, height, frames, fps, steps, (float)guidance, (int64_t)seed};
+    JavaVM *vm = nullptr;
+    if (env->GetJavaVM(&vm) != JNI_OK) throw std::runtime_error("Could not access the video host.");
+    owner = env->NewGlobalRef(self);
+    if (!owner) throw std::runtime_error("Not enough memory to start video generation.");
+    auto klass = env->GetObjectClass(self);
+    auto progress = env->GetMethodID(klass, "progress", "(II)V");
+    auto frame = env->GetMethodID(klass, "frame", "([BIII)V");
+    env->DeleteLocalRef(klass);
+    if (!progress || !frame) throw std::runtime_error("Missing video host callbacks.");
+    std::atomic_bool callbackFailed{false};
+    runtime.run(request, [&](int step, int total) {
+      // The engine may report progress from a worker thread. JNI environments
+      // are thread-local; never retain the caller's environment in this callback.
+      AttachedEnv thread(vm);
+      if (!thread.env) { callbackFailed.store(true); runtime.cancel(); return; }
+      thread.env->CallVoidMethod(owner, progress, step, total);
+      if (thread.env->ExceptionCheck()) {
+        thread.env->ExceptionClear();
+        callbackFailed.store(true);
+        runtime.cancel();
+      }
+    }, [&](sd_image_t *images, int count, int) {
+      if (callbackFailed.load()) throw std::runtime_error("Could not report video progress.");
+      for (int i = 0; i < count; ++i) {
+        if (runtime.cancelled.load()) throw std::runtime_error("Video generation stopped.");
+        auto &image = images[i];
+        const uint64_t size = uint64_t(image.width) * image.height * image.channel;
+        if (!image.data || image.width != uint32_t(width) || image.height != uint32_t(height) ||
+            image.channel != 3 || size > uint64_t(std::numeric_limits<jsize>::max()))
+          throw std::runtime_error("The video engine returned an invalid frame.");
+        auto bytes = env->NewByteArray(static_cast<jsize>(size));
+        if (!bytes) throw std::runtime_error("Not enough memory to encode video.");
+        env->SetByteArrayRegion(bytes, 0, static_cast<jsize>(size), reinterpret_cast<jbyte *>(image.data));
+        if (!env->ExceptionCheck()) env->CallVoidMethod(owner, frame, bytes, image.width, image.height, image.channel);
+        env->DeleteLocalRef(bytes);
+        if (env->ExceptionCheck()) throw std::runtime_error("Video encoder failed.");
+      }
+    });
+  } catch (const std::exception &error) {
+    if (!env->ExceptionCheck()) {
+      auto klass = env->FindClass("java/lang/IllegalStateException");
+      if (klass) { env->ThrowNew(klass, error.what()); env->DeleteLocalRef(klass); }
+    }
+  }
+  if (owner) env->DeleteGlobalRef(owner);
+}
diff --git a/android/app/src/main/java/ai/offgridmobile/MainApplication.kt b/android/app/src/main/java/ai/offgridmobile/MainApplication.kt
index 258707112..3040aef5e 100644
--- a/android/app/src/main/java/ai/offgridmobile/MainApplication.kt
+++ b/android/app/src/main/java/ai/offgridmobile/MainApplication.kt
@@ -28,6 +28,7 @@ class MainApplication : Application(), ReactApplication {
           // Packages that cannot be autolinked yet can be added manually here, for example:
           add(DownloadManagerPackage())
           add(LocalDreamPackage())
+          add(ai.offgridmobile.video.VideoGenerationPackage())
           add(PDFExtractorPackage())
           add(LiteRTPackage())
           add(DeviceMemoryPackage())
diff --git a/android/app/src/main/java/ai/offgridmobile/downloads/SyncDownloadsModule.kt b/android/app/src/main/java/ai/offgridmobile/downloads/SyncDownloadsModule.kt
index abdcff1e1..55a035086 100644
--- a/android/app/src/main/java/ai/offgridmobile/downloads/SyncDownloadsModule.kt
+++ b/android/app/src/main/java/ai/offgridmobile/downloads/SyncDownloadsModule.kt
@@ -1,6 +1,7 @@
 package ai.offgridmobile.downloads
 
 import android.Manifest
+import android.content.ContentValues
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.Uri
@@ -43,6 +44,38 @@ class SyncDownloadsModule(
 
     override fun getName(): String = "SyncDownloadsModule"
 
+    /** Export an app-owned file through scoped storage without broad media access. */
+    @ReactMethod
+    fun saveFileToDownloads(sourcePath: String, displayName: String, mimeType: String, promise: Promise) {
+        Thread({
+            var created: Uri? = null
+            try {
+                require(Build.VERSION.SDK_INT >= 29) { "Scoped Downloads requires Android 10." }
+                val source = File(sourcePath).canonicalFile
+                val roots = listOf(context.filesDir.canonicalFile, context.cacheDir.canonicalFile)
+                require(roots.any { source.path.startsWith(it.path + File.separator) } && source.isFile) { "The file is outside app storage." }
+                require(displayName == File(displayName).name && displayName.isNotBlank() && displayName.length <= 200) { "Invalid export filename." }
+                require(mimeType in listOf("video/mp4", "image/png", "image/jpeg", "image/webp")) { "Unsupported media type." }
+                val values = ContentValues().apply {
+                    put(MediaStore.MediaColumns.DISPLAY_NAME, displayName)
+                    put(MediaStore.MediaColumns.MIME_TYPE, mimeType)
+                    put(MediaStore.MediaColumns.RELATIVE_PATH, Environment.DIRECTORY_DOWNLOADS)
+                    put(MediaStore.MediaColumns.IS_PENDING, 1)
+                }
+                val uri = checkNotNull(context.contentResolver.insert(MediaStore.Downloads.EXTERNAL_CONTENT_URI, values))
+                created = uri
+                checkNotNull(context.contentResolver.openOutputStream(uri)).use { output -> source.inputStream().use { it.copyTo(output) } }
+                values.clear()
+                values.put(MediaStore.MediaColumns.IS_PENDING, 0)
+                context.contentResolver.update(uri, values, null, null)
+                promise.resolve(uri.toString())
+            } catch (error: Throwable) {
+                created?.let { runCatching { context.contentResolver.delete(it, null, null) } }
+                promise.reject("MEDIA_EXPORT_FAILED", error.message, error)
+            }
+        }, "offgrid-media-export").start()
+    }
+
     @ReactMethod
     fun hasPermission(promise: Promise) {
         promise.resolve(granted() || allFilesAccess())
diff --git a/android/app/src/main/java/ai/offgridmobile/video/VideoEncoder.kt b/android/app/src/main/java/ai/offgridmobile/video/VideoEncoder.kt
new file mode 100644
index 000000000..db8f3b2c4
--- /dev/null
+++ b/android/app/src/main/java/ai/offgridmobile/video/VideoEncoder.kt
@@ -0,0 +1,90 @@
+package ai.offgridmobile.video
+
+import android.media.MediaCodec
+import android.media.MediaCodecInfo
+import android.media.MediaFormat
+import android.media.MediaMuxer
+import java.io.Closeable
+
+/** Platform MP4 adapter. Diffusion and job state remain in the shared runtime. */
+class VideoEncoder(path: String, private val width: Int, private val height: Int, private val fps: Int) : Closeable {
+    private val codec = MediaCodec.createEncoderByType("video/avc")
+    private val muxer = MediaMuxer(path, MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4)
+    private var track = -1
+    private var started = false
+    private var frame = 0
+    private val info = MediaCodec.BufferInfo()
+    init {
+        try {
+            val format = MediaFormat.createVideoFormat("video/avc", width, height).apply {
+                setInteger(MediaFormat.KEY_COLOR_FORMAT, MediaCodecInfo.CodecCapabilities.COLOR_FormatYUV420Flexible)
+                setInteger(MediaFormat.KEY_BIT_RATE, width * height * fps * 2)
+                setInteger(MediaFormat.KEY_FRAME_RATE, fps)
+                setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, 1)
+            }
+            codec.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE)
+            codec.start()
+        } catch (error: Throwable) { codec.release(); muxer.release(); throw error }
+    }
+    fun append(rgb: ByteArray, channels: Int, cancelled: () -> Boolean) {
+        require(channels >= 3 && rgb.size == width * height * channels)
+        var index: Int
+        val deadline = System.nanoTime() + 30_000_000_000L
+        do {
+            check(!cancelled()) { "Video generation stopped." }
+            index = codec.dequeueInputBuffer(10_000)
+            drain(false, cancelled)
+            check(System.nanoTime() < deadline) { "Video encoder stalled." }
+        } while (index < 0)
+        val image = checkNotNull(codec.getInputImage(index)) { "Video encoder has no YUV input." }
+        for (y in 0 until height) for (x in 0 until width) {
+            val p = (y * width + x) * channels
+            val r = rgb[p].toInt() and 255; val g = rgb[p + 1].toInt() and 255; val b = rgb[p + 2].toInt() and 255
+            fun put(plane: Int, px: Int, py: Int, value: Int) {
+                val target = image.planes[plane]
+                target.buffer.put(py * target.rowStride + px * target.pixelStride, value.coerceIn(0, 255).toByte())
+            }
+            put(0, x, y, ((66 * r + 129 * g + 25 * b + 128) shr 8) + 16)
+            if (x % 2 == 0 && y % 2 == 0) {
+                put(1, x / 2, y / 2, ((-38 * r - 74 * g + 112 * b + 128) shr 8) + 128)
+                put(2, x / 2, y / 2, ((112 * r - 94 * g - 18 * b + 128) shr 8) + 128)
+            }
+        }
+        image.close()
+        codec.queueInputBuffer(index, 0, width * height * 3 / 2, frame++ * 1_000_000L / fps, 0)
+        drain(false, cancelled)
+    }
+    fun finish(cancelled: () -> Boolean) {
+        val deadline = System.nanoTime() + 30_000_000_000L
+        var index: Int
+        do {
+            check(!cancelled() && System.nanoTime() < deadline) { "Video encoding stopped." }
+            index = codec.dequeueInputBuffer(10_000); drain(false, cancelled)
+        } while (index < 0)
+        codec.queueInputBuffer(index, 0, 0, frame * 1_000_000L / fps, MediaCodec.BUFFER_FLAG_END_OF_STREAM)
+        drain(true, cancelled)
+    }
+    private fun drain(finish: Boolean, cancelled: () -> Boolean) {
+        val deadline = System.nanoTime() + 30_000_000_000L
+        while (true) {
+            check(!cancelled() && System.nanoTime() < deadline) { "Video encoding stopped." }
+            val index = codec.dequeueOutputBuffer(info, if (finish) 10_000 else 0)
+            if (index == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
+                check(!started); track = muxer.addTrack(codec.outputFormat); muxer.start(); started = true
+            } else if (index >= 0) {
+                val buffer = checkNotNull(codec.getOutputBuffer(index))
+                if (info.flags and MediaCodec.BUFFER_FLAG_CODEC_CONFIG != 0) info.size = 0
+                if (info.size > 0) { check(started); buffer.position(info.offset); buffer.limit(info.offset + info.size); muxer.writeSampleData(track, buffer, info) }
+                val done = info.flags and MediaCodec.BUFFER_FLAG_END_OF_STREAM != 0
+                codec.releaseOutputBuffer(index, false)
+                if (done) return
+            } else if (!finish) return
+        }
+    }
+    override fun close() {
+        try { codec.stop() } finally {
+            codec.release()
+            try { if (started) muxer.stop() } finally { muxer.release() }
+        }
+    }
+}
diff --git a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
new file mode 100644
index 000000000..fdbf5dd7e
--- /dev/null
+++ b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
@@ -0,0 +1,73 @@
+package ai.offgridmobile.video
+
+import android.content.Intent
+import androidx.core.content.ContextCompat
+import com.facebook.react.bridge.*
+import com.facebook.react.modules.core.DeviceEventManagerModule
+import java.io.File
+import java.util.concurrent.Executors
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.atomic.AtomicBoolean
+
+class VideoGenerationModule(private val context: ReactApplicationContext) : ReactContextBaseJavaModule(context) {
+    companion object { init { System.loadLibrary("offgrid_video") } }
+    private val executor = Executors.newSingleThreadExecutor()
+    private val busy = AtomicBoolean(false)
+    private val cancelled = AtomicBoolean(false)
+    private var encoder: VideoEncoder? = null
+    override fun getName() = "VideoGenerationModule"
+    private external fun nativeGenerate(weight: String, vae: String, encoder: String, prompt: String, negative: String, width: Int, height: Int, frames: Int, fps: Int, steps: Int, guidance: Double, seed: Double)
+    private external fun nativeCancel()
+    private external fun nativePrepare()
+    @ReactMethod fun addListener(name: String) {}
+    @ReactMethod fun removeListeners(count: Int) {}
+    private fun stop() { cancelled.set(true); nativeCancel() }
+    @ReactMethod fun cancel(promise: Promise) { stop(); promise.resolve(null) }
+    // Called synchronously by JNI while its worker owns the runtime.
+    fun progress(step: Int, total: Int) {
+        emit("generating", step, total)
+    }
+    fun frame(rgb: ByteArray, width: Int, height: Int, channels: Int) {
+        check(!cancelled.get()) { "Video generation stopped." }
+        emit("encoding", 0, 0)
+        checkNotNull(encoder).append(rgb, channels) { cancelled.get() }
+    }
+    private fun emit(stage: String, step: Int, total: Int) {
+        if (!context.hasActiveReactInstance()) return
+        context.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+            .emit("VideoGenerationProgress", Arguments.createMap().apply { putString("stage", stage); putInt("step", step); putInt("total", total) })
+    }
+    @ReactMethod fun generate(input: ReadableMap, promise: Promise) {
+        if (!busy.compareAndSet(false, true)) { promise.reject("VIDEO_BUSY", "Video generation is already running."); return }
+        cancelled.set(false); nativePrepare()
+        executor.execute {
+            var output: File? = null
+            try {
+                val destination = File(checkNotNull(input.getString("outputPath")))
+                output = destination
+                VideoGenerationService.admission = CompletableFuture()
+                VideoGenerationService.cancel = { stop() }
+                ContextCompat.startForegroundService(context, Intent(context, VideoGenerationService::class.java))
+                VideoGenerationService.admission.get(5, TimeUnit.SECONDS)
+                check(!cancelled.get()) { "Video generation stopped." }
+                emit("preparing", 0, input.getInt("steps"))
+                VideoEncoder(destination.path, input.getInt("width"), input.getInt("height"), input.getInt("fps")).use { writer ->
+                    encoder = writer
+                    nativeGenerate(checkNotNull(input.getString("weight")), checkNotNull(input.getString("vae")), checkNotNull(input.getString("encoder")),
+                        checkNotNull(input.getString("prompt")), input.getString("negativePrompt") ?: "", input.getInt("width"), input.getInt("height"),
+                        input.getInt("frames"), input.getInt("fps"), input.getInt("steps"), input.getDouble("guidance"), input.getDouble("seed"))
+                    writer.finish { cancelled.get() }
+                }
+                check(destination.length() > 0) { "Video encoder produced no file." }
+                promise.resolve(Arguments.createMap().apply { putString("path", destination.path) })
+            } catch (error: Throwable) {
+                output?.delete(); promise.reject(if (cancelled.get()) "VIDEO_CANCELLED" else "VIDEO_FAILED", error.message, error)
+            } finally {
+                encoder = null; VideoGenerationService.cancel = null
+                context.stopService(Intent(context, VideoGenerationService::class.java)); busy.set(false)
+            }
+        }
+    }
+    override fun invalidate() { stop(); executor.shutdown(); super.invalidate() }
+}
diff --git a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationPackage.kt b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationPackage.kt
new file mode 100644
index 000000000..9c0b2a1d3
--- /dev/null
+++ b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationPackage.kt
@@ -0,0 +1,9 @@
+package ai.offgridmobile.video
+import com.facebook.react.ReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.uimanager.ViewManager
+class VideoGenerationPackage : ReactPackage {
+    override fun createNativeModules(context: ReactApplicationContext): List<NativeModule> = listOf(VideoGenerationModule(context))
+    override fun createViewManagers(context: ReactApplicationContext): List<ViewManager<*, *>> = emptyList()
+}
diff --git a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationService.kt b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationService.kt
new file mode 100644
index 000000000..996c14b51
--- /dev/null
+++ b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationService.kt
@@ -0,0 +1,36 @@
+package ai.offgridmobile.video
+
+import android.app.*
+import android.content.Intent
+import android.content.pm.ServiceInfo
+import android.os.Build
+import android.os.IBinder
+import java.util.concurrent.CompletableFuture
+
+class VideoGenerationService : Service() {
+    companion object {
+        const val CHANNEL = "offgrid-video-generation"
+        var admission = CompletableFuture<Unit>()
+        var cancel: (() -> Unit)? = null
+    }
+    override fun onBind(intent: Intent?): IBinder? = null
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        if (intent?.action == "cancel") { cancel?.invoke(); return START_NOT_STICKY }
+        try {
+            val manager = getSystemService(NotificationManager::class.java)
+            if (Build.VERSION.SDK_INT >= 26) manager.createNotificationChannel(NotificationChannel(CHANNEL, "Video generation", NotificationManager.IMPORTANCE_LOW))
+            val stop = PendingIntent.getService(this, 0, Intent(this, VideoGenerationService::class.java).setAction("cancel"), PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
+            val builder = if (Build.VERSION.SDK_INT >= 26) Notification.Builder(this, CHANNEL) else Notification.Builder(this)
+            val notification = builder.setContentTitle("Generating video").setContentText("Off Grid is using this device.")
+                .setSmallIcon(android.R.drawable.ic_menu_slideshow).setOngoing(true)
+                .addAction(Notification.Action.Builder(null, "Stop", stop).build()).build()
+            if (Build.VERSION.SDK_INT >= 35) startForeground(7413, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PROCESSING)
+            else if (Build.VERSION.SDK_INT >= 34) startForeground(7413, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
+            else startForeground(7413, notification)
+            admission.complete(Unit)
+        } catch (error: Throwable) { admission.completeExceptionally(error); cancel?.invoke(); stopSelf() }
+        return START_NOT_STICKY
+    }
+    override fun onTimeout(startId: Int, fgsType: Int) { cancel?.invoke(); stopSelf() }
+    override fun onDestroy() { cancel?.invoke(); super.onDestroy() }
+}

From 2b2c7f3f5676f954d458dacd1de699dec0794d60 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Mon, 28 Sep 2026 21:33:01 +0530
Subject: [PATCH 007/129] feat(models): manage complete video packs and
 resumable downloads [skip ci]

---
 src/services/backgroundDownloadService.ts     | 106 +++++--
 src/services/backgroundDownloadTypes.ts       |   2 +-
 .../providers/videoProvider.ts                | 283 ++++++++++++++++++
 .../modelDownloadService/registerProviders.ts |   2 +
 src/services/modelDownloadService/types.ts    |  40 ++-
 .../modelDownloadService/uniformId.ts         |   6 +-
 src/services/modelManager/restore.ts          |  84 ++++--
 src/services/modelResidency/policy.ts         |  36 ++-
 src/services/videoModelFiles.ts               |  49 +++
 src/stores/appStore.ts                        | 110 +++++--
 src/types/index.ts                            |   4 +-
 src/utils/downloadStatus.ts                   |  32 +-
 12 files changed, 645 insertions(+), 109 deletions(-)
 create mode 100644 src/services/modelDownloadService/providers/videoProvider.ts
 create mode 100644 src/services/videoModelFiles.ts

diff --git a/src/services/backgroundDownloadService.ts b/src/services/backgroundDownloadService.ts
index d92c88e6d..bae25774f 100644
--- a/src/services/backgroundDownloadService.ts
+++ b/src/services/backgroundDownloadService.ts
@@ -5,8 +5,12 @@ import logger from '../utils/logger';
 import { serializeQueue, saveQueuedDownloads } from './queuedDownloadPersistence';
 import type {
   DownloadParams,
-  DownloadProgressEvent, DownloadCompleteEvent, DownloadErrorEvent,
-  DownloadProgressCallback, DownloadCompleteCallback, DownloadErrorCallback,
+  DownloadProgressEvent,
+  DownloadCompleteEvent,
+  DownloadErrorEvent,
+  DownloadProgressCallback,
+  DownloadCompleteCallback,
+  DownloadErrorCallback,
 } from './backgroundDownloadTypes';
 const { DownloadManagerModule } = NativeModules;
 
@@ -105,7 +109,10 @@ class BackgroundDownloadService {
   /** Actually start a native download. When `counted` (the default) it occupies one
    *  concurrency slot; an uncounted start (a sidecar) begins immediately and never
    *  touches activeIds, so it neither consumes a slot nor blocks the queue. */
-  private async beginDownload(params: DownloadParams, counted = true): Promise<BackgroundDownloadInfo> {
+  private async beginDownload(
+    params: DownloadParams,
+    counted = true,
+  ): Promise<BackgroundDownloadInfo> {
     if (!counted) return this.startNativeDownload(params); // sidecar: no slot bookkeeping
     // Reserve the slot synchronously (before the first await) so a burst of
     // startDownload() calls in the same tick can't all pass the size check and
@@ -130,11 +137,20 @@ class BackgroundDownloadService {
 
   /** The raw native start + BackgroundDownloadInfo mapping — no concurrency accounting.
    *  Sidecars call this directly; the counted path wraps it in slot bookkeeping. */
-  private async startNativeDownload(params: DownloadParams): Promise<BackgroundDownloadInfo> {
+  private async startNativeDownload(
+    params: DownloadParams,
+  ): Promise<BackgroundDownloadInfo> {
     // Android 13+: prompt for notification permission so the foreground-service download
     // notification is visible (the download still runs as an FGS if denied). Best-effort.
-    if (Platform.OS === 'android' && typeof DownloadManagerModule.requestNotificationPermission === 'function') {
-      try { DownloadManagerModule.requestNotificationPermission(); } catch { /* non-fatal */ }
+    if (
+      Platform.OS === 'android' &&
+      typeof DownloadManagerModule.requestNotificationPermission === 'function'
+    ) {
+      try {
+        DownloadManagerModule.requestNotificationPermission();
+      } catch {
+        /* non-fatal */
+      }
     }
     const result = await DownloadManagerModule.startDownload({
       url: params.url,
@@ -170,7 +186,10 @@ class BackgroundDownloadService {
 
   private pump(): void {
     let admitted = false;
-    while (this.activeIds.size < MAX_CONCURRENT_DOWNLOADS && this.startQueue.length > 0) {
+    while (
+      this.activeIds.size < MAX_CONCURRENT_DOWNLOADS &&
+      this.startQueue.length > 0
+    ) {
       const next = this.startQueue.shift()!;
       admitted = true;
       // beginDownload reserves the slot synchronously, so the loop condition sees the
@@ -239,8 +258,14 @@ class BackgroundDownloadService {
    * them as "Queued". These have no native downloadId yet (they haven't started), so
    * they live only here — the queue's owner is the single source of truth for them.
    */
-  getQueuedItems(): Array<{ modelKey: string; modelId: string; fileName: string; modelType: string; totalBytes: number }> {
-    return this.startQueue.map((q) => ({
+  getQueuedItems(): Array<{
+    modelKey: string;
+    modelId: string;
+    fileName: string;
+    modelType: string;
+    totalBytes: number;
+  }> {
+    return this.startQueue.map(q => ({
       modelKey: q.key,
       modelId: q.params.modelId,
       fileName: q.params.fileName,
@@ -275,9 +300,15 @@ class BackgroundDownloadService {
   }
 
   async resumeDownload(downloadId: string): Promise<void> {
-    if (!this.isAvailable()) throw new Error('Background downloads not available');
-    if (!this.activeIds.has(downloadId) && this.activeIds.size >= MAX_CONCURRENT_DOWNLOADS) {
-      throw new Error('Three downloads are already running. Try again when one finishes.');
+    if (!this.isAvailable())
+      throw new Error('Background downloads not available');
+    if (
+      !this.activeIds.has(downloadId) &&
+      this.activeIds.size >= MAX_CONCURRENT_DOWNLOADS
+    ) {
+      throw new Error(
+        'Three downloads are already running. Try again when one finishes.',
+      );
     }
     this.activeIds.add(downloadId);
     try {
@@ -386,23 +417,44 @@ class BackgroundDownloadService {
     }));
   }
 
-  async moveCompletedDownload(downloadId: string, targetPath: string): Promise<string> {
+  async moveCompletedDownload(
+    downloadId: string,
+    targetPath: string,
+  ): Promise<string> {
     if (!this.isAvailable()) {
       throw new Error('Background downloads not available on this platform');
     }
     return DownloadManagerModule.moveCompletedDownload(downloadId, targetPath);
   }
 
-  private registerListener<T>(listeners: Map<string, T>, key: string, callback: T): () => void {
+  private registerListener<T>(
+    listeners: Map<string, T>,
+    key: string,
+    callback: T,
+  ): () => void {
     listeners.set(key, callback);
     return () => listeners.delete(key);
   }
 
-  onProgress(downloadId: string, callback: DownloadProgressCallback): () => void {
-    return this.registerListener(this.progressListeners, `progress_${downloadId}`, callback);
-  }
-  onComplete(downloadId: string, callback: DownloadCompleteCallback): () => void {
-    return this.registerListener(this.completeListeners, `complete_${downloadId}`, callback);
+  onProgress(
+    downloadId: string,
+    callback: DownloadProgressCallback,
+  ): () => void {
+    return this.registerListener(
+      this.progressListeners,
+      `progress_${downloadId}`,
+      callback,
+    );
+  }
+  onComplete(
+    downloadId: string,
+    callback: DownloadCompleteCallback,
+  ): () => void {
+    return this.registerListener(
+      this.completeListeners,
+      `complete_${downloadId}`,
+      callback,
+    );
   }
   onError(downloadId: string, callback: DownloadErrorCallback): () => void {
     return this.registerListener(this.errorListeners, `error_${downloadId}`, callback);
@@ -471,7 +523,17 @@ class BackgroundDownloadService {
   }
 
   downloadFileTo(opts: {
-    params: Pick<DownloadParams, 'url' | 'fileName' | 'modelId' | 'totalBytes' | 'modelType' | 'metadataJson' | 'modelKey'>;
+    params: Pick<
+      DownloadParams,
+      | 'url'
+      | 'fileName'
+      | 'modelId'
+      | 'totalBytes'
+      | 'modelType'
+      | 'metadataJson'
+      | 'modelKey'
+      | 'sha256'
+    >;
     destPath: string;
     onProgress?: (bytesDownloaded: number, totalBytes: number) => void;
     silent?: boolean;
@@ -488,7 +550,7 @@ class BackgroundDownloadService {
       });
       resolveId(info.downloadId);
       await new Promise<void>((resolve, reject) => {
-        const removeProgress = this.onProgress(info.downloadId, (event) => {
+        const removeProgress = this.onProgress(info.downloadId, event => {
           opts.onProgress?.(event.bytesDownloaded, event.totalBytes);
         });
         const done = () => { removeProgress(); removeComplete(); removeError(); };
@@ -497,7 +559,7 @@ class BackgroundDownloadService {
           try { await this.moveCompletedDownload(info.downloadId, opts.destPath); } catch { /* may already be moved */ }
           resolve();
         });
-        const removeError = this.onError(info.downloadId, (err) => {
+        const removeError = this.onError(info.downloadId, err => {
           done();
           const error = new Error(err.reason || 'Download failed') as Error & { cancelled?: boolean };
           // Let callers distinguish a user cancel from a real failure so they can
diff --git a/src/services/backgroundDownloadTypes.ts b/src/services/backgroundDownloadTypes.ts
index adc3fefc3..ab5ad33aa 100644
--- a/src/services/backgroundDownloadTypes.ts
+++ b/src/services/backgroundDownloadTypes.ts
@@ -5,7 +5,7 @@ export interface DownloadParams {
   fileName: string;
   modelId: string;
   modelKey?: string;
-  modelType?: 'text' | 'image' | 'stt' | 'tts';
+  modelType?: 'text' | 'image' | 'video' | 'stt' | 'tts';
   quantization?: string;
   combinedTotalBytes?: number;
   mmProjDownloadId?: string;
diff --git a/src/services/modelDownloadService/providers/videoProvider.ts b/src/services/modelDownloadService/providers/videoProvider.ts
new file mode 100644
index 000000000..34938fe44
--- /dev/null
+++ b/src/services/modelDownloadService/providers/videoProvider.ts
@@ -0,0 +1,283 @@
+import { modelResidencyManager } from '../../modelResidency';
+import RNFS from 'react-native-fs';
+import type { ModelEntry } from '@offgrid/models';
+import { useAppStore } from '../../../stores/appStore';
+import { useDownloadStore } from '../../../stores/downloadStore';
+import { backgroundDownloadService } from '../../backgroundDownloadService';
+import {
+  resolveVideoPack,
+  validateVideoPack,
+  videoModelDirectory,
+} from '../../videoModelFiles';
+import type {
+  DownloadProvider,
+  ModelDownload,
+  ModelDownloadStatus,
+} from '../types';
+
+interface Transfer {
+  cancelled: boolean;
+  paused: boolean;
+  nativeId?: string;
+  wake?: () => void;
+}
+const transfers = new Map<string, Transfer>();
+const key = (id: string) => `video:${id}`;
+const bare = (id: string) => id.replace(/^video:/, '');
+function addRow(model: ModelEntry, status: 'pending' | 'paused') {
+  useDownloadStore
+    .getState()
+    .add({
+      modelKey: key(model.id),
+      modelId: model.id,
+      downloadId: key(model.id),
+      modelType: 'video',
+      fileName: model.name,
+      totalBytes: model.files.reduce((sum, f) => sum + (f.sizeBytes ?? 0), 0),
+      bytesDownloaded: 0,
+      progress: 0,
+      status,
+      quantization: '',
+      combinedTotalBytes: model.files.reduce(
+        (sum, f) => sum + (f.sizeBytes ?? 0),
+        0,
+      ),
+      createdAt: Date.now(),
+    });
+}
+async function start(model: ModelEntry): Promise<void> {
+  validateVideoPack(model);
+  if (
+    useAppStore
+      .getState()
+      .downloadedVideoModels.some(item => item.id === model.id)
+  )
+    throw new Error(
+      'Remove the installed video pack before downloading another variant.',
+    );
+  if (transfers.has(model.id)) return;
+  const transfer: Transfer = { cancelled: false, paused: false };
+  transfers.set(model.id, transfer);
+  useAppStore.getState().setVideoDownload(model.id, model);
+  addRow(model, 'pending');
+  const directory = videoModelDirectory(model.id);
+  let bytes = 0;
+  const total = model.files.reduce(
+    (sum, file) => sum + (file.sizeBytes ?? 0),
+    0,
+  );
+  try {
+    await RNFS.mkdir(directory);
+    for (const file of model.files) {
+      if (transfer.paused)
+        await new Promise<void>(resolve => {
+          transfer.wake = resolve;
+        });
+      if (transfer.cancelled) throw new Error('Download cancelled.');
+      const destination = `${directory}/${file.name}`;
+      const existing = await RNFS.stat(destination).catch(() => null);
+      if (
+        existing &&
+        file.sizeBytes &&
+        Number(existing.size) === file.sizeBytes &&
+        (!file.sha256 || (await RNFS.hash(destination, 'sha256')).toLowerCase() === file.sha256.toLowerCase())
+      ) {
+        bytes += file.sizeBytes;
+        continue;
+      }
+      useDownloadStore.getState().setStatus(key(model.id), 'running');
+      const task = backgroundDownloadService.downloadFileTo({
+        params: {
+          url: file.url,
+          fileName: `${encodeURIComponent(model.id)}_${file.name}`,
+          modelId: key(model.id),
+          modelType: 'video',
+          totalBytes: file.sizeBytes,
+          sha256: file.sha256,
+        },
+        destPath: destination,
+        onProgress: received =>
+          useDownloadStore
+            .getState()
+            .updateProgress(key(model.id), bytes + received, total),
+      });
+      task.downloadIdPromise
+        ?.then(async id => {
+          transfer.nativeId = id;
+          if (transfer.cancelled)
+            await backgroundDownloadService.cancelDownload(id);
+          else if (transfer.paused)
+            await backgroundDownloadService.pauseDownload(id);
+        })
+        .catch(() => {});
+      await task.promise;
+      transfer.nativeId = undefined;
+      bytes += Number((await RNFS.stat(destination)).size);
+    }
+    if (transfer.cancelled) throw new Error('Download cancelled.');
+    await resolveVideoPack(model, true);
+    const app = useAppStore.getState();
+    app.addDownloadedVideoModel({
+      ...model,
+      kind: 'video',
+      downloadedAt: new Date().toISOString(),
+    });
+    app.setVideoDownload(model.id, null);
+    useDownloadStore.getState().remove(key(model.id));
+  } catch (error) {
+    if (!transfer.cancelled)
+      useDownloadStore
+        .getState()
+        .setStatus(key(model.id), 'failed', {
+          message:
+            error instanceof Error ? error.message : 'Video download failed.',
+        });
+    else useDownloadStore.getState().remove(key(model.id));
+  } finally {
+    if (transfer.cancelled) await RNFS.unlink(directory).catch(() => {});
+    transfers.delete(model.id);
+  }
+}
+export const videoProvider: DownloadProvider = {
+  modelType: 'video',
+  async start(request) {
+    if (request.modelType === 'video') await start(request.model);
+  },
+  async list() {
+    const result: ModelDownload[] = [];
+    for (const model of Object.values(useAppStore.getState().videoDownloads)) {
+      const row = useDownloadStore.getState().downloads[key(model.id)];
+      const status: ModelDownloadStatus =
+        row?.status === 'running'
+          ? 'downloading'
+          : row?.status === 'pending'
+            ? 'queued'
+            : row?.status === 'failed'
+              ? 'error'
+              : 'paused';
+      result.push({
+        id: key(model.id),
+        modelType: 'video',
+        name: model.name,
+        sizeBytes: row?.totalBytes ?? 0,
+        bytesDownloaded: row?.bytesDownloaded ?? 0,
+        progress: row?.progress ?? 0,
+        status,
+        error: row?.errorMessage,
+        capabilities: {
+          cancel: true,
+          retry: true,
+          remove: true,
+          pause: transfers.has(model.id) && status === 'downloading',
+          resume: status === 'paused',
+          resumable: false,
+          determinateProgress: true,
+        },
+      });
+    }
+    for (const model of useAppStore.getState().downloadedVideoModels) {
+      if (result.some(row => row.id === key(model.id))) continue;
+      const size = model.files.reduce(
+        (sum, file) => sum + (file.sizeBytes ?? 0),
+        0,
+      );
+      result.push({
+        id: key(model.id),
+        modelType: 'video',
+        name: model.name,
+        sizeBytes: size,
+        bytesDownloaded: size,
+        progress: 1,
+        status: 'completed',
+        filePath: videoModelDirectory(model.id),
+        capabilities: {
+          cancel: false,
+          retry: false,
+          remove: true,
+          resumable: false,
+          determinateProgress: true,
+        },
+      });
+    }
+    return result;
+  },
+  async pause(id) {
+    const transfer = transfers.get(bare(id));
+    if (!transfer) return;
+    transfer.paused = true;
+    try {
+      if (transfer.nativeId)
+        await backgroundDownloadService.pauseDownload(transfer.nativeId);
+    } catch (error) {
+      transfer.paused = false;
+      throw error;
+    }
+    useDownloadStore.getState().setStatus(id, 'paused');
+  },
+  async resume(id) {
+    const transfer = transfers.get(bare(id));
+    if (!transfer) {
+      await videoProvider.retry(id);
+      return;
+    }
+    if (transfer.nativeId)
+      await backgroundDownloadService.resumeDownload(transfer.nativeId);
+    transfer.paused = false;
+    transfer.wake?.();
+    transfer.wake = undefined;
+    useDownloadStore.getState().setStatus(id, 'running');
+  },
+  async cancel(id) {
+    const modelId = bare(id),
+      transfer = transfers.get(modelId);
+    if (transfer) {
+      transfer.cancelled = true;
+      transfer.wake?.();
+      backgroundDownloadService.cancelQueued(key(modelId));
+      if (transfer.nativeId)
+        await backgroundDownloadService.cancelDownload(transfer.nativeId);
+    }
+    if (!transfer) await RNFS.unlink(videoModelDirectory(modelId)).catch(() => {});
+    useAppStore.getState().setVideoDownload(modelId, null);
+    useDownloadStore.getState().remove(key(modelId));
+  },
+  async retry(id) {
+    const model = useAppStore.getState().videoDownloads[bare(id)];
+    if (model) await start(model);
+  },
+  async remove(id) {
+    const modelId = bare(id);
+    if (
+      modelResidencyManager
+        .getResidents()
+        .some(resident => resident.type === 'video')
+    )
+      throw new Error('Stop video generation before removing this model.');
+    if (transfers.has(modelId))
+      throw new Error('Cancel the download before removing its files.');
+    const directory = videoModelDirectory(modelId);
+    if (await RNFS.exists(directory)) await RNFS.unlink(directory);
+    useAppStore.getState().removeDownloadedVideoModel(modelId);
+    useAppStore.getState().setVideoDownload(modelId, null);
+    useDownloadStore.getState().remove(key(modelId));
+  },
+  subscribe(listener) {
+    const a = useAppStore.subscribe(listener),
+      b = useDownloadStore.subscribe(listener);
+    return () => {
+      a();
+      b();
+    };
+  },
+  async reconcile() {
+    // An old native request has no pack continuation after process death. Preserve
+    // completed pack files, stop the orphan request, and offer an explicit resume.
+    for (const row of await backgroundDownloadService.getActiveDownloads()) {
+      if (row.modelId.startsWith('video:') && !transfers.has(bare(row.modelId)))
+        await backgroundDownloadService.cancelDownload(row.downloadId);
+    }
+    for (const model of Object.values(useAppStore.getState().videoDownloads)) {
+      if (!transfers.has(model.id)) addRow(model, 'paused');
+    }
+  },
+};
diff --git a/src/services/modelDownloadService/registerProviders.ts b/src/services/modelDownloadService/registerProviders.ts
index 05796c8bd..78eb479ab 100644
--- a/src/services/modelDownloadService/registerProviders.ts
+++ b/src/services/modelDownloadService/registerProviders.ts
@@ -1,3 +1,4 @@
+import { videoProvider } from './providers/videoProvider';
 /**
  * Register the core download providers (text / image / stt) with the single
  * ModelDownloadService. Called once at app boot. The tts provider lives in pro and
@@ -15,5 +16,6 @@ export function registerCoreDownloadProviders(): void {
   registered = true;
   modelDownloadService.register(textProvider);
   modelDownloadService.register(imageProvider);
+  modelDownloadService.register(videoProvider);
   modelDownloadService.register(sttProvider);
 }
diff --git a/src/services/modelDownloadService/types.ts b/src/services/modelDownloadService/types.ts
index ef10ef30a..ee16859dd 100644
--- a/src/services/modelDownloadService/types.ts
+++ b/src/services/modelDownloadService/types.ts
@@ -16,18 +16,26 @@
  * See docs/design/MODEL_DOWNLOAD_SERVICE.md.
  */
 
-export type ModelDownloadType = 'text' | 'image' | 'stt' | 'tts';
+export type ModelDownloadType = 'text' | 'image' | 'video' | 'stt' | 'tts';
 
 export type ModelDownloadStatus =
-  | 'queued'        // accepted, not yet transferring
-  | 'downloading'   // bytes moving
-  | 'paused'        // interrupted (e.g. waiting for network / app was killed) — resumable
-  | 'completed'     // on disk + registered in its domain store
-  | 'error';        // failed; retryable
+  | 'queued' // accepted, not yet transferring
+  | 'downloading' // bytes moving
+  | 'paused' // interrupted (e.g. waiting for network / app was killed) — resumable
+  | 'completed' // on disk + registered in its domain store
+  | 'error'; // failed; retryable
 
 export type ModelDownloadStartRequest =
-  | { modelType: 'text'; modelId: string; file: import('../../types').ModelFile }
-  | { modelType: 'image'; model: import('../imageModelDownloadTypes').ImageModelDescriptor }
+  | { modelType: 'video'; model: import('@offgrid/models').ModelEntry }
+  | {
+      modelType: 'text';
+      modelId: string;
+      file: import('../../types').ModelFile;
+    }
+  | {
+      modelType: 'image';
+      model: import('../imageModelDownloadTypes').ImageModelDescriptor;
+    }
   | { modelType: 'stt'; modelId: string };
 
 /**
@@ -46,12 +54,12 @@ export type ModelDownloadStartRequest =
  *    download surfaces as needing a manual retry, not a phantom "resuming".
  */
 interface DownloadCapabilities {
-  pause?: boolean;     // can an in-progress transfer stop without removing its bytes?
-  resume?: boolean;    // can the paused transfer continue?
-  cancel: boolean;     // can an in-progress transfer be aborted + cleaned up?
-  retry: boolean;      // can a failed/stuck download be restarted?
-  remove: boolean;     // can the on-disk model be deleted?
-  resumable: boolean;  // does it survive an app kill and continue on its own?
+  pause?: boolean; // can an in-progress transfer stop without removing its bytes?
+  resume?: boolean; // can the paused transfer continue?
+  cancel: boolean; // can an in-progress transfer be aborted + cleaned up?
+  retry: boolean; // can a failed/stuck download be restarted?
+  remove: boolean; // can the on-disk model be deleted?
+  resumable: boolean; // does it survive an app kill and continue on its own?
   determinateProgress: boolean; // are byteDownloaded/sizeBytes real (vs fraction-only)?
 }
 
@@ -136,5 +144,7 @@ export interface DownloadProvider {
    * never admission-controlled/queued can omit it. `params` is passed as the shared shape so the
    * service never branches on the concrete type.
    */
-  reissue?(params: import('../backgroundDownloadTypes').DownloadParams): Promise<void>;
+  reissue?(
+    params: import('../backgroundDownloadTypes').DownloadParams,
+  ): Promise<void>;
 }
diff --git a/src/services/modelDownloadService/uniformId.ts b/src/services/modelDownloadService/uniformId.ts
index 252cdbf66..00d7e1e1a 100644
--- a/src/services/modelDownloadService/uniformId.ts
+++ b/src/services/modelDownloadService/uniformId.ts
@@ -15,13 +15,17 @@ import type { ModelType } from '../../stores/downloadStore';
  * (`[DL-SM] … REFUSED: not found`). Every other type passes the modelId through
  * unchanged; only STT normalizes, and it normalizes HERE, once.
  */
-export function uniformDownloadId(modelType: ModelType, modelId: string): string {
+export function uniformDownloadId(
+  modelType: ModelType,
+  modelId: string,
+): string {
   // Per-type canonicalization, owned HERE so the providers' list() and the View's
   // dispatch can't drift. Both are idempotent (safe whether given the bare id or the
   // prefixed store id): STT store rows are `whisper-<id>` but whisperService keys by
   // the bare id; image store rows carry an `image:` prefix the provider strips.
   let canonical = modelId;
   if (modelType === 'stt') canonical = modelId.replace(/^whisper-/, '');
+  else if (modelType === 'video') canonical = modelId.replace(/^video:/, '');
   else if (modelType === 'image') canonical = modelId.replace(/^image:/, '');
   return `${modelType}:${canonical}`;
 }
diff --git a/src/services/modelManager/restore.ts b/src/services/modelManager/restore.ts
index 898ade3ee..0eed5f03c 100644
--- a/src/services/modelManager/restore.ts
+++ b/src/services/modelManager/restore.ts
@@ -104,12 +104,21 @@ interface RestoreEntryOpts {
   onProgress?: DownloadProgressCallback;
 }
 
-function buildMetadataFromActiveDownload(download: RestorableDownloadInfo, modelsDir: string): PersistedDownloadInfo | null {
+function buildMetadataFromActiveDownload(
+  download: RestorableDownloadInfo,
+  modelsDir: string,
+): PersistedDownloadInfo | null {
   // image: (image models) and whisper- (STT models) are owned by their own
   // managers, not the text model manager. Recovering them here registered them
   // as text models, so they showed up under Text in the model selector and the
   // Download Manager's downloaded list.
-  if (!download.modelId || download.modelId.startsWith('image:') || download.modelId.startsWith('whisper-')) return null;
+  if (
+    !download.modelId ||
+    download.modelId.startsWith('video:') ||
+    download.modelId.startsWith('image:') ||
+    download.modelId.startsWith('whisper-')
+  )
+    return null;
   const mainFileSize = download.totalBytes;
   const combinedTotal = download.combinedTotalBytes || download.totalBytes;
   const mmProjFileSize = Math.max(combinedTotal - mainFileSize, 0);
@@ -126,7 +135,9 @@ function buildMetadataFromActiveDownload(download: RestorableDownloadInfo, model
       if (typeof parsed.mmProjFileName === 'string' && parsed.mmProjFileName) {
         derivedMmProjFileName = parsed.mmProjFileName;
       }
-    } catch { /* non-fatal: fall through to heuristic */ }
+    } catch {
+      /* non-fatal: fall through to heuristic */
+    }
   }
   if (!derivedMmProjFileName && hasMmProj) {
     derivedMmProjFileName = mmProjLocalName(download.fileName);
@@ -141,15 +152,22 @@ function buildMetadataFromActiveDownload(download: RestorableDownloadInfo, model
     mainFileSize,
     mmProjFileName: derivedMmProjFileName,
     mmProjFileSize: derivedMmProjFileName ? mmProjFileSize : undefined,
-    mmProjLocalPath: derivedMmProjFileName ? `${modelsDir}/${derivedMmProjFileName}` : null,
+    mmProjLocalPath: derivedMmProjFileName
+      ? `${modelsDir}/${derivedMmProjFileName}`
+      : null,
     mmProjDownloadId: download.mmProjDownloadId,
   };
 }
 
 async function restoreDownloadEntry(opts: RestoreEntryOpts): Promise<void> {
   const {
-    download, metadata, modelsDir, activeDownloads,
-    backgroundDownloadContext, backgroundDownloadMetadataCallback, onProgress,
+    download,
+    metadata,
+    modelsDir,
+    activeDownloads,
+    backgroundDownloadContext,
+    backgroundDownloadMetadataCallback,
+    onProgress,
   } = opts;
 
   const localPath = `${modelsDir}/${metadata.fileName}`;
@@ -184,36 +202,49 @@ async function restoreDownloadEntry(opts: RestoreEntryOpts): Promise<void> {
   let mainBytesDownloaded = download.bytesDownloaded;
   let mmProjBytesDownloaded = mmProjCompleted
     ? mmProjFileSize
-    : (mmProjDownload?.bytesDownloaded || 0);
+    : mmProjDownload?.bytesDownloaded || 0;
 
   const reportProgress = () => {
     const combinedDownloaded = mainBytesDownloaded + mmProjBytesDownloaded;
     onProgress?.({
       downloadId: download.downloadId,
-      modelId: metadata.modelId, fileName: metadata.fileName,
-      bytesDownloaded: combinedDownloaded, totalBytes: combinedTotalBytes,
-      progress: combinedTotalBytes > 0 ? combinedDownloaded / combinedTotalBytes : 0,
+      modelId: metadata.modelId,
+      fileName: metadata.fileName,
+      bytesDownloaded: combinedDownloaded,
+      totalBytes: combinedTotalBytes,
+      progress:
+        combinedTotalBytes > 0 ? combinedDownloaded / combinedTotalBytes : 0,
     });
   };
 
   const removeProgressListener = backgroundDownloadService.onProgress(
-    download.downloadId, (event) => {
-      mainBytesDownloaded = event.bytesDownloaded; reportProgress();
+    download.downloadId,
+    event => {
+      mainBytesDownloaded = event.bytesDownloaded;
+      reportProgress();
     },
   );
 
   let removeMmProjProgressListener: (() => void) | undefined;
   if (mmProjDownloadId && !mmProjCompleted) {
     removeMmProjProgressListener = backgroundDownloadService.onProgress(
-      mmProjDownloadId, (event) => {
-        mmProjBytesDownloaded = event.bytesDownloaded; reportProgress();
+      mmProjDownloadId,
+      event => {
+        mmProjBytesDownloaded = event.bytesDownloaded;
+        reportProgress();
       },
     );
   }
 
   backgroundDownloadContext.set(download.downloadId, {
-    modelId: metadata.modelId, file: fileInfo, localPath, mmProjLocalPath,
-    removeProgressListener, mmProjDownloadId, mmProjCompleted, mainCompleted: download.status === 'completed',
+    modelId: metadata.modelId,
+    file: fileInfo,
+    localPath,
+    mmProjLocalPath,
+    removeProgressListener,
+    mmProjDownloadId,
+    mmProjCompleted,
+    mainCompleted: download.status === 'completed',
     removeMmProjProgressListener,
   });
   backgroundDownloadMetadataCallback?.(download.downloadId, { ...metadata, mmProjLocalPath });
@@ -234,8 +265,16 @@ function collectMmProjIds(
   return ids;
 }
 
-export async function restoreInProgressDownloads(opts: RestoreDownloadsOpts): Promise<string[]> {
-  const { modelsDir, backgroundDownloadContext, backgroundDownloadMetadataCallback, onProgress, persistedDownloads } = opts;
+export async function restoreInProgressDownloads(
+  opts: RestoreDownloadsOpts,
+): Promise<string[]> {
+  const {
+    modelsDir,
+    backgroundDownloadContext,
+    backgroundDownloadMetadataCallback,
+    onProgress,
+    persistedDownloads,
+  } = opts;
 
   if (!backgroundDownloadService.isAvailable()) return [];
 
@@ -267,8 +306,13 @@ export async function restoreInProgressDownloads(opts: RestoreDownloadsOpts): Pr
     if (!metadata || backgroundDownloadContext.has(download.downloadId)) continue;
     try {
       await restoreDownloadEntry({
-        download, metadata, modelsDir, activeDownloads,
-        backgroundDownloadContext, backgroundDownloadMetadataCallback, onProgress,
+        download,
+        metadata,
+        modelsDir,
+        activeDownloads,
+        backgroundDownloadContext,
+        backgroundDownloadMetadataCallback,
+        onProgress,
       });
       restoredDownloadIds.push(download.downloadId);
       if (isInFlight(download.status)) adoptableIds.push(download.downloadId);
diff --git a/src/services/modelResidency/policy.ts b/src/services/modelResidency/policy.ts
index a2e188304..9e409caa4 100644
--- a/src/services/modelResidency/policy.ts
+++ b/src/services/modelResidency/policy.ts
@@ -19,7 +19,14 @@
 
 import { modelMemoryBudgetMB, LoadPolicy } from '../memoryBudget';
 
-export type ResidentType = 'text' | 'image' | 'whisper' | 'tts' | 'classifier' | 'embedding';
+export type ResidentType =
+  | 'text'
+  | 'image'
+  | 'video'
+  | 'whisper'
+  | 'tts'
+  | 'classifier'
+  | 'embedding';
 
 export interface Resident {
   /** Unique model id. */
@@ -60,7 +67,13 @@ const SIDECAR_TYPES = new Set<ResidentType>(['whisper', 'tts', 'embedding']);
 // Priority (what to KEEP): text is highest, then image, then the STT/TTS/embedding
 // sidecars (equal, lowest), then pinned helpers. Eviction takes the lowest first.
 const PRIORITY: Record<ResidentType, number> = {
-  text: 3, image: 2, whisper: 1, tts: 1, embedding: 1, classifier: 0,
+  text: 3,
+  image: 2,
+  video: 2,
+  whisper: 1,
+  tts: 1,
+  embedding: 1,
+  classifier: 0,
 };
 
 /**
@@ -77,11 +90,14 @@ function selectEvictionVictim(
 ): Resident | undefined {
   const incomingIsSidecar = SIDECAR_TYPES.has(incoming.type);
   return current
-    .filter(r =>
-      !r.pinned && r.key !== incoming.key && !isEvicted(r) &&
-      // A sidecar incoming may only reclaim from peer sidecars (never a
-      // generation model); a generation incoming may evict anything non-pinned.
-      (!incomingIsSidecar || SIDECAR_TYPES.has(r.type)),
+    .filter(
+      r =>
+        !r.pinned &&
+        r.key !== incoming.key &&
+        !isEvicted(r) &&
+        // A sidecar incoming may only reclaim from peer sidecars (never a
+        // generation model); a generation incoming may evict anything non-pinned.
+        (!incomingIsSidecar || SIDECAR_TYPES.has(r.type)),
     )
     .sort((a, b) => {
       const pa = PRIORITY[a.type] ?? 0;
@@ -145,9 +161,11 @@ export function planEviction(
     // Extreme mode: evict everything evictable (no co-residency). selectEvictionVictim
     // still skips pinned + in-use (canEvict veto) residents, so the classifier and a
     // playing TTS survive; every other model is unloaded to free the most RAM.
-    for (let victim = selectEvictionVictim(current, incoming, isEvicted);
+    for (
+      let victim = selectEvictionVictim(current, incoming, isEvicted);
       victim;
-      victim = selectEvictionVictim(current, incoming, isEvicted)) {
+      victim = selectEvictionVictim(current, incoming, isEvicted)
+    ) {
       evict.push(victim);
     }
     return {
diff --git a/src/services/videoModelFiles.ts b/src/services/videoModelFiles.ts
new file mode 100644
index 000000000..87ccdc727
--- /dev/null
+++ b/src/services/videoModelFiles.ts
@@ -0,0 +1,49 @@
+import RNFS from 'react-native-fs';
+import type { ModelEntry } from '@offgrid/models';
+import {
+  videoPackError,
+  VIDEO_VAE_FILENAME,
+  VIDEO_ENCODER_FILENAME,
+} from '@offgrid/models';
+
+export interface VideoModel extends ModelEntry {
+  kind: 'video';
+  downloadedAt: string;
+}
+export const videoModelsDirectory = () =>
+  `${RNFS.DocumentDirectoryPath}/video-models`;
+export const videoModelDirectory = (id: string) =>
+  `${videoModelsDirectory()}/${encodeURIComponent(id)}`;
+export function validateVideoPack(model: ModelEntry): void {
+  const error = videoPackError(model.files);
+  if (model.kind !== 'video' || error)
+    throw new Error(error ?? 'This is not a video model.');
+}
+export async function resolveVideoPack(
+  model: ModelEntry,
+  verifyChecksum = false,
+) {
+  validateVideoPack(model);
+  const directory = videoModelDirectory(model.id);
+  for (const file of model.files) {
+    const stat = await RNFS.stat(`${directory}/${file.name}`);
+    if (
+      !stat.isFile() ||
+      Number(stat.size) <= 0 ||
+      (file.sizeBytes && Number(stat.size) !== file.sizeBytes)
+    )
+      throw new Error(`Video model file is incomplete: ${file.name}`);
+    if (
+      verifyChecksum &&
+      file.sha256 &&
+      (await RNFS.hash(`${directory}/${file.name}`, 'sha256')).toLowerCase() !==
+        file.sha256.toLowerCase()
+    )
+      throw new Error(`Video model checksum failed: ${file.name}`);
+  }
+  return {
+    weight: `${directory}/${model.files.find(f => f.role === 'primary')!.name}`,
+    vae: `${directory}/${VIDEO_VAE_FILENAME}`,
+    encoder: `${directory}/${VIDEO_ENCODER_FILENAME}`,
+  };
+}
diff --git a/src/stores/appStore.ts b/src/stores/appStore.ts
index e675e466b..11b652c68 100644
--- a/src/stores/appStore.ts
+++ b/src/stores/appStore.ts
@@ -1,3 +1,8 @@
+import type {
+  ModelEntry,
+  VideoGenerationRequestContract,
+} from '@offgrid/models';
+import type { VideoModel } from '../services/videoModelFiles';
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';
 import { Platform } from 'react-native';
@@ -61,6 +66,10 @@ export type AppSettings = {
   imageGenerationMode: ImageGenerationMode;
   autoDetectMethod: AutoDetectMethod;
   classifierModelId: string | null;
+  videoParams: Record<string, Partial<VideoGenerationRequestContract>>;
+  videoSeed: number;
+  videoNegative: string;
+  enhanceVideoPrompts: boolean;
   imageSteps: number;
   imageGuidanceScale: number;
   imageThreads: number;
@@ -179,6 +188,13 @@ export interface AppState extends ProAccessSlice {
     provenance?: RecordProvenance,
   ) => void;
   resetSettings: () => void;
+  downloadedVideoModels: VideoModel[];
+  videoDownloads: Record<string, ModelEntry>;
+  activeVideoModelId: string | null;
+  setActiveVideoModelId: (id: string | null) => void;
+  addDownloadedVideoModel: (model: VideoModel) => void;
+  removeDownloadedVideoModel: (id: string) => void;
+  setVideoDownload: (id: string, model: ModelEntry | null) => void;
   downloadedImageModels: ONNXImageModel[];
   activeImageModelId: string | null;
   setDownloadedImageModels: (models: ONNXImageModel[]) => void;
@@ -248,6 +264,10 @@ export const DEFAULT_SETTINGS: AppSettings = {
   imageGenerationMode: 'auto' as ImageGenerationMode,
   autoDetectMethod: 'pattern' as AutoDetectMethod,
   classifierModelId: null,
+  videoParams: {},
+  videoSeed: -1,
+  videoNegative: '',
+  enhanceVideoPrompts: false,
   imageSteps: defaultImageSteps(Platform.OS),
   imageGuidanceScale: 7.5,
   imageThreads: 4,
@@ -379,6 +399,32 @@ export const useAppStore = create<AppState>()(
         emitChangedModelSettings(before, after);
       },
       // Image models (ONNX-based)
+      downloadedVideoModels: [],
+      videoDownloads: {},
+      activeVideoModelId: null,
+      setActiveVideoModelId: id => set({ activeVideoModelId: id }),
+      addDownloadedVideoModel: model =>
+        set(state => ({
+          downloadedVideoModels: [
+            ...state.downloadedVideoModels.filter(m => m.id !== model.id),
+            model,
+          ],
+        })),
+      removeDownloadedVideoModel: id =>
+        set(state => ({
+          downloadedVideoModels: state.downloadedVideoModels.filter(
+            m => m.id !== id,
+          ),
+          activeVideoModelId:
+            state.activeVideoModelId === id ? null : state.activeVideoModelId,
+        })),
+      setVideoDownload: (id, model) =>
+        set(state => {
+          const videoDownloads = { ...state.videoDownloads };
+          if (model) videoDownloads[id] = model;
+          else delete videoDownloads[id];
+          return { videoDownloads };
+        }),
       downloadedImageModels: [],
       activeImageModelId: null,
       setDownloadedImageModels: models =>
@@ -423,8 +469,19 @@ export const useAppStore = create<AppState>()(
       // Gallery
       generatedImages: [],
       generatedVideos: [],
-      addGeneratedVideo: video => set(state => ({ generatedVideos: [video, ...state.generatedVideos] })),
-      removeGeneratedVideo: videoId => set(state => ({ generatedVideos: state.generatedVideos.filter(video => video.id !== videoId) })),
+      addGeneratedVideo: video =>
+        set(state => ({
+          generatedVideos: [
+            video,
+            ...state.generatedVideos.filter(item => item.id !== video.id),
+          ],
+        })),
+      removeGeneratedVideo: videoId =>
+        set(state => ({
+          generatedVideos: state.generatedVideos.filter(
+            video => video.id !== videoId,
+          ),
+        })),
       removeVideosByConversationId: conversationId => {
         const videos = get().generatedVideos.filter(video => video.conversationId === conversationId);
         set(state => ({ generatedVideos: state.generatedVideos.filter(video => video.conversationId !== conversationId) }));
@@ -497,28 +554,31 @@ export const useAppStore = create<AppState>()(
 
 function persistedAppState(state: AppState) {
   return {
-        themeMode: state.themeMode,
-        hasCompletedOnboarding: state.hasCompletedOnboarding,
-        onboardingChecklist: state.onboardingChecklist,
-        checklistDismissed: state.checklistDismissed,
-        activeModelId: state.activeModelId,
-        lastTextModelId: state.lastTextModelId,
-        settings: state.settings,
-        modelSettingProvenance: state.modelSettingProvenance,
-        activeImageModelId: state.activeImageModelId,
-        generatedImages: state.generatedImages,
-        generatedVideos: state.generatedVideos,
-        warmedImageModels: state.warmedImageModels,
-        textGenerationCount: state.textGenerationCount,
-        imageGenerationCount: state.imageGenerationCount,
-        hasEngagedSharePrompt: state.hasEngagedSharePrompt,
-        hasRegisteredPro: state.hasRegisteredPro,
-        // Persist eviction so a relaunch cannot grant Pro while the roster is offline.
-        proDeviceAdmission: state.proDeviceAdmission,
-        devProDisabled: state.devProDisabled,
-        proBannerDismissed: state.proBannerDismissed,
-        desktopPromoDismissed: state.desktopPromoDismissed,
-        proAhaTriggeredBy: state.proAhaTriggeredBy,
-        loadedSettings: state.loadedSettings,
+    themeMode: state.themeMode,
+    hasCompletedOnboarding: state.hasCompletedOnboarding,
+    onboardingChecklist: state.onboardingChecklist,
+    checklistDismissed: state.checklistDismissed,
+    activeModelId: state.activeModelId,
+    lastTextModelId: state.lastTextModelId,
+    settings: state.settings,
+    modelSettingProvenance: state.modelSettingProvenance,
+    activeVideoModelId: state.activeVideoModelId,
+    downloadedVideoModels: state.downloadedVideoModels,
+    videoDownloads: state.videoDownloads,
+    activeImageModelId: state.activeImageModelId,
+    generatedImages: state.generatedImages,
+    generatedVideos: state.generatedVideos,
+    warmedImageModels: state.warmedImageModels,
+    textGenerationCount: state.textGenerationCount,
+    imageGenerationCount: state.imageGenerationCount,
+    hasEngagedSharePrompt: state.hasEngagedSharePrompt,
+    hasRegisteredPro: state.hasRegisteredPro,
+    // Persist eviction so a relaunch cannot grant Pro while the roster is offline.
+    proDeviceAdmission: state.proDeviceAdmission,
+    devProDisabled: state.devProDisabled,
+    proBannerDismissed: state.proBannerDismissed,
+    desktopPromoDismissed: state.desktopPromoDismissed,
+    proAhaTriggeredBy: state.proAhaTriggeredBy,
+    loadedSettings: state.loadedSettings,
   };
 }
diff --git a/src/types/index.ts b/src/types/index.ts
index caba8870a..c970b5a89 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -286,7 +286,7 @@ export interface Message {
    *  a cancelled image turn leaves only the "Enhanced prompt" reply and no image, and inferring from
    *  that made the retry a TEXT turn (device-confirmed on Android and iOS). Absent on turns recorded
    *  before this field existed; those still fall back to the reply scan. */
-  turnKind?: 'text' | 'image';
+  turnKind?: 'text' | 'image' | 'video';
   /** Indicates this is a system info message (model loaded/unloaded, etc.) */
   isSystemInfo?: boolean;
   attachments?: MediaAttachment[];
@@ -403,7 +403,7 @@ export const INFERENCE_BACKENDS = {
   METAL: 'metal' as InferenceBackend,
 } as const;
 /** 'auto' = smart detect, 'force' = always generate image, 'disabled' = never */
-export type ImageModeState = 'auto' | 'force' | 'disabled';
+export type ImageModeState = 'auto' | 'force' | 'disabled' | 'video';
 
 export interface GeneratedVideo {
   id: string;
diff --git a/src/utils/downloadStatus.ts b/src/utils/downloadStatus.ts
index 8d485305b..5db962081 100644
--- a/src/utils/downloadStatus.ts
+++ b/src/utils/downloadStatus.ts
@@ -17,9 +17,9 @@ export type DownloadStatus =
   | 'processing'
   | 'completed'
   | 'failed'
-  | 'cancelled'
+  | 'cancelled';
 
-export type ModelType = 'text' | 'image' | 'stt' | 'tts'
+export type ModelType = 'text' | 'image' | 'video' | 'stt' | 'tts';
 
 export interface DownloadEntry {
   modelKey: ModelKey
@@ -34,18 +34,18 @@ export interface DownloadEntry {
   combinedTotalBytes: number
   progress: number
   /** Last valid byte observation. The canonical store owns rate sampling, not each view. */
-  rateSample?: ProgressRateSample
+  rateSample?: ProgressRateSample;
   /** Live byte rate measured between canonical progress events. */
-  bytesPerSecond?: number
-  mmProjDownloadId?: string
-  mmProjBytesDownloaded?: number
-  mmProjStatus?: DownloadStatus
-  mmProjFileName?: string
-  mmProjFileSize?: number
-  errorMessage?: string
-  errorCode?: string
-  createdAt: number
-  metadataJson?: string
+  bytesPerSecond?: number;
+  mmProjDownloadId?: string;
+  mmProjBytesDownloaded?: number;
+  mmProjStatus?: DownloadStatus;
+  mmProjFileName?: string;
+  mmProjFileSize?: number;
+  errorMessage?: string;
+  errorCode?: string;
+  createdAt: number;
+  metadataJson?: string;
 }
 
 /**
@@ -54,7 +54,11 @@ export interface DownloadEntry {
  * have two parallel native downloads racing on the same logical file.
  */
 const ACTIVE_STATUSES = new Set<DownloadStatus>([
-  'pending', 'running', 'retrying', 'waiting_for_network', 'processing',
+  'pending',
+  'running',
+  'retrying',
+  'waiting_for_network',
+  'processing',
 ]);
 
 export function isActiveStatus(status: DownloadStatus): boolean {

From 0f42fb98fd5a9148fab03ef594703cf7e853349d Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Mon, 28 Sep 2026 21:33:01 +0530
Subject: [PATCH 008/129] feat(remote): discover OGAD video models and resume
 remote jobs [skip ci]

---
 .../RemoteServerEditor/useRemoteServerForm.ts |  26 +-
 .../models/RemoteModelOptionsSection.tsx      |  31 +-
 src/hooks/useActiveRemoteModelLabels.ts       |   4 +-
 .../hooks/useRemoteModelHandlers.ts           |  36 +--
 src/screens/RemoteServerEditorScreen.tsx      |  12 +
 src/services/offGridDesktopModels.ts          |  35 ++-
 src/services/remoteMediaRuntime.ts            | 270 ++++++++++++++----
 src/services/remoteModelSelection.ts          |  25 +-
 src/services/remoteServerManager.ts           |   9 +-
 src/stores/remoteServerHelpers.ts             |  91 +++---
 src/types/remoteServer.ts                     |   3 +
 11 files changed, 397 insertions(+), 145 deletions(-)

diff --git a/src/components/RemoteServerEditor/useRemoteServerForm.ts b/src/components/RemoteServerEditor/useRemoteServerForm.ts
index de3e7503a..f89e2914a 100644
--- a/src/components/RemoteServerEditor/useRemoteServerForm.ts
+++ b/src/components/RemoteServerEditor/useRemoteServerForm.ts
@@ -20,6 +20,7 @@ interface FormOptions {
 
 interface ModelIdSetters {
   text: React.Dispatch<React.SetStateAction<string>>;
+  video: React.Dispatch<React.SetStateAction<string>>;
   image: React.Dispatch<React.SetStateAction<string>>;
   transcription: React.Dispatch<React.SetStateAction<string>>;
   voice: React.Dispatch<React.SetStateAction<string>>;
@@ -32,12 +33,14 @@ function applyDiscoveredModelIds(
   if (result.modelManagement === 'offgrid-desktop-v1') {
     setters.text(result.mediaModels?.text ?? '');
     setters.image(result.mediaModels?.image ?? '');
+    setters.video(result.mediaModels?.video ?? '');
     setters.transcription(result.mediaModels?.transcription ?? '');
     setters.voice(result.mediaModels?.voice ?? '');
     return;
   }
   setters.text(
-    current => current || result.mediaModels?.text || result.models?.[0]?.id || '',
+    current =>
+      current || result.mediaModels?.text || result.models?.[0]?.id || '',
   );
   setters.image(current => current || result.mediaModels?.image || '');
   setters.transcription(
@@ -59,6 +62,7 @@ export function useRemoteServerForm({
   const [notes, setNotes] = useState('');
   const [textModelId, setTextModelId] = useState('');
   const [imageModelId, setImageModelId] = useState('');
+  const [videoModelId, setVideoModelId] = useState('');
   const [transcriptionModelId, setTranscriptionModelId] = useState('');
   const [voiceModelId, setVoiceModelId] = useState('');
   const [errors, setErrors] = useState<Record<string, string>>({});
@@ -85,6 +89,7 @@ export function useRemoteServerForm({
       setNotes(server.notes || '');
       setTextModelId(server.mediaModels?.text || '');
       setImageModelId(server.mediaModels?.image || '');
+      setVideoModelId(server.mediaModels?.video || '');
       setTranscriptionModelId(server.mediaModels?.transcription || '');
       setVoiceModelId(server.mediaModels?.voice || '');
       // Load existing API key from keychain so user can see it's set
@@ -104,6 +109,7 @@ export function useRemoteServerForm({
       setNotes('');
       setTextModelId('');
       setImageModelId('');
+      setVideoModelId('');
       setTranscriptionModelId('');
       setVoiceModelId('');
     }
@@ -159,6 +165,7 @@ export function useRemoteServerForm({
     applyDiscoveredModelIds(result, {
       text: setTextModelId,
       image: setImageModelId,
+      video: setVideoModelId,
       transcription: setTranscriptionModelId,
       voice: setVoiceModelId,
     });
@@ -226,6 +233,9 @@ export function useRemoteServerForm({
       const mediaModels = {
         ...(textModelId.trim() ? { text: textModelId.trim() } : {}),
         ...(imageModelId.trim() ? { image: imageModelId.trim() } : {}),
+        ...(modelManagement === 'offgrid-desktop-v1' && videoModelId.trim()
+          ? { video: videoModelId.trim() }
+          : {}),
         ...(transcriptionModelId.trim()
           ? { transcription: transcriptionModelId.trim() }
           : {}),
@@ -245,6 +255,7 @@ export function useRemoteServerForm({
         }
         for (const category of [
           'image',
+          'video',
           'transcription',
           'voice',
         ] as const) {
@@ -337,6 +348,7 @@ export function useRemoteServerForm({
     notes,
     textModelId,
     imageModelId,
+    videoModelId,
     transcriptionModelId,
     voiceModelId,
     modelCatalog,
@@ -353,11 +365,11 @@ export function useRemoteServerForm({
     if (endpoint && !isPrivateNetworkEndpoint(endpoint)) {
       setAlertState(
         showAlert(
-        'Public Network Warning',
-        'This endpoint appears to be on the public internet. Your data will be sent to a remote server. Continue?',
-        [
-          { text: 'Cancel', style: 'cancel' },
-          { text: 'Continue', onPress: () => saveServer() },
+          'Public Network Warning',
+          'This endpoint appears to be on the public internet. Your data will be sent to a remote server. Continue?',
+          [
+            { text: 'Cancel', style: 'cancel' },
+            { text: 'Continue', onPress: () => saveServer() },
           ],
         ),
       );
@@ -378,7 +390,9 @@ export function useRemoteServerForm({
     textModelId,
     setTextModelId,
     imageModelId,
+    videoModelId,
     setImageModelId,
+    setVideoModelId,
     transcriptionModelId,
     setTranscriptionModelId,
     voiceModelId,
diff --git a/src/components/models/RemoteModelOptionsSection.tsx b/src/components/models/RemoteModelOptionsSection.tsx
index 1b4d1323a..eec1b2483 100644
--- a/src/components/models/RemoteModelOptionsSection.tsx
+++ b/src/components/models/RemoteModelOptionsSection.tsx
@@ -56,13 +56,30 @@ export const RemoteModelOptionsSection: React.FC<Props> = ({
             key={key}
             compact
             testID={`remote-${category}-model-${key}`}
-            model={{ id: option.id, name: option.name, author: option.serverName,
-              modelType: category === 'image' ? 'vision' : undefined }}
+            model={{
+              id: option.id,
+              name: option.name,
+              author: option.serverName,
+              modelType: category === 'image' ? 'vision' : undefined,
+            }}
             sourceBadge="Remote"
-            facts={[category === 'transcription' ? 'Transcription' : category === 'voice' ? 'Voice' : 'Image']}
+            facts={[
+              category === 'video'
+                ? 'Video'
+                : category === 'transcription'
+                  ? 'Transcription'
+                  : category === 'voice'
+                    ? 'Voice'
+                    : 'Image',
+            ]}
             isActive={active}
-            trailing={selecting === key ? <LoadingDots color={colors.primary} />
-              : active ? <Icon name="check" size={16} color={colors.primary} /> : null}
+            trailing={
+              selecting === key ? (
+                <LoadingDots color={colors.primary} />
+              ) : active ? (
+                <Icon name="check" size={16} color={colors.primary} />
+              ) : null
+            }
             disabled={selecting !== null}
             onPress={async () => {
               setSelecting(key);
@@ -81,8 +98,8 @@ export const RemoteModelOptionsSection: React.FC<Props> = ({
                   isTransportFailure(reason)
                     ? `Could not reach ${serverName}. Models on this phone still work. Check the server address and network.`
                     : reason instanceof Error
-                    ? reason.message
-                    : 'The remote model could not be selected.',
+                      ? reason.message
+                      : 'The remote model could not be selected.',
                 );
               } finally {
                 setSelecting(null);
diff --git a/src/hooks/useActiveRemoteModelLabels.ts b/src/hooks/useActiveRemoteModelLabels.ts
index 7a643a621..f7bda8f2b 100644
--- a/src/hooks/useActiveRemoteModelLabels.ts
+++ b/src/hooks/useActiveRemoteModelLabels.ts
@@ -3,6 +3,7 @@ import { useRemoteServerStore } from '../stores/remoteServerStore';
 
 /** Human labels for the active server's selected media models. */
 export function useActiveRemoteModelLabels(): {
+  video: string | null;
   image: string | null;
   transcription: string | null;
   voice: string | null;
@@ -11,9 +12,10 @@ export function useActiveRemoteModelLabels(): {
   const activeServerIds = useRemoteServerStore(
     state => state.activeRemoteMediaServerIds,
   );
-  const serverFor = (category: 'image' | 'transcription' | 'voice') =>
+  const serverFor = (category: 'video' | 'image' | 'transcription' | 'voice') =>
     servers.find(server => server.id === activeServerIds[category]);
   return {
+    video: selectedRemoteModelName(serverFor('video'), 'video'),
     image: selectedRemoteModelName(serverFor('image'), 'image'),
     transcription: selectedRemoteModelName(
       serverFor('transcription'),
diff --git a/src/screens/HomeScreen/hooks/useRemoteModelHandlers.ts b/src/screens/HomeScreen/hooks/useRemoteModelHandlers.ts
index 6e4cdf306..310449334 100644
--- a/src/screens/HomeScreen/hooks/useRemoteModelHandlers.ts
+++ b/src/screens/HomeScreen/hooks/useRemoteModelHandlers.ts
@@ -7,7 +7,7 @@ import logger from '../../../utils/logger';
 
 interface RemoteModelHandlersParams {
   activeModelId: string | null;
-  setPickerType: (type: 'text' | 'image' | null) => void;
+  setPickerType: (type: 'text' | 'image' | 'video' | null) => void;
   setLoadingState: (state: LoadingState) => void;
   setAlertState: (state: any) => void;
 }
@@ -25,19 +25,19 @@ export function useRemoteModelHandlers({
         model.id,
         model.serverId,
       );
-    setPickerType(null);
-    setLoadingState({ isLoading: true, type: 'text', modelName: model.name });
-    try {
-      // Unload any active local model first — only one active model at a time
-      if (activeModelId) {
-        await activeModelService.unloadTextModel();
-      }
+      setPickerType(null);
+      setLoadingState({ isLoading: true, type: 'text', modelName: model.name });
+      try {
+        // Unload any active local model first — only one active model at a time
+        if (activeModelId) {
+          await activeModelService.unloadTextModel();
+        }
         await remoteServerManager.setActiveRemoteTextModel(
           model.serverId,
           model.id,
         );
-      logger.log('[useHomeScreen] Remote text model set successfully');
-    } catch (_error) {
+        logger.log('[useHomeScreen] Remote text model set successfully');
+      } catch (_error) {
         logger.error(
           '[useHomeScreen] Failed to set remote text model:',
           _error,
@@ -48,9 +48,9 @@ export function useRemoteModelHandlers({
             `Failed to connect to remote model: ${(_error as Error).message}`,
           ),
         );
-    } finally {
-      setLoadingState({ isLoading: false, type: null, modelName: null });
-    }
+      } finally {
+        setLoadingState({ isLoading: false, type: null, modelName: null });
+      }
     },
     [activeModelId, setPickerType, setLoadingState, setAlertState],
   );
@@ -75,22 +75,22 @@ export function useRemoteModelHandlers({
         type: 'image',
         modelName: model.name,
       });
-    try {
+      try {
         await remoteServerManager.setActiveRemoteMediaModel(
           model.serverId,
           'image',
           model.id,
         );
-    } catch (_error) {
+      } catch (_error) {
         setAlertState(
           showAlert(
             'Error',
             `Failed to connect to remote model: ${(_error as Error).message}`,
           ),
         );
-    } finally {
-      setLoadingState({ isLoading: false, type: null, modelName: null });
-    }
+      } finally {
+        setLoadingState({ isLoading: false, type: null, modelName: null });
+      }
     },
     [setPickerType, setLoadingState, setAlertState],
   );
diff --git a/src/screens/RemoteServerEditorScreen.tsx b/src/screens/RemoteServerEditorScreen.tsx
index 3151552f9..fe4ede959 100644
--- a/src/screens/RemoteServerEditorScreen.tsx
+++ b/src/screens/RemoteServerEditorScreen.tsx
@@ -149,6 +149,18 @@ export const RemoteServerEditorScreen: React.FC = () => {
           loading={form.isTesting}
           allowManualEntry={form.modelManagement !== 'offgrid-desktop-v1'}
         />
+        {form.modelManagement === 'offgrid-desktop-v1' && (
+          <RemoteModelField
+            label="Video model"
+            value={form.videoModelId}
+            options={form.modelCatalog.video ?? []}
+            onChange={form.setVideoModelId}
+            placeholder="Select an OGAD video model"
+            testID="server-video-model"
+            loading={form.isTesting}
+            allowManualEntry={false}
+          />
+        )}
         <RemoteModelField
           label="Transcription model"
           value={form.transcriptionModelId}
diff --git a/src/services/offGridDesktopModels.ts b/src/services/offGridDesktopModels.ts
index 638990f91..2ad11e2e8 100644
--- a/src/services/offGridDesktopModels.ts
+++ b/src/services/offGridDesktopModels.ts
@@ -44,6 +44,7 @@ function record(value: unknown): Record<string, unknown> | null {
 
 function categoryForKind(kind: string): GatewayCategory {
   if (kind === 'text' || kind === 'vision' || kind === 'chat') return 'text';
+  if (kind === 'video') return 'video';
   if (kind === 'image') return 'image';
   if (kind === 'voice' || kind === 'speech') return 'voice';
   if (kind === 'transcription') return 'transcription';
@@ -63,7 +64,11 @@ function modelFiles(value: unknown): string[] {
 
 function parseCatalog(value: unknown): GatewayCatalogModel[] | null {
   const payload = record(value);
-  if (!payload || !Array.isArray(payload.models) || !Array.isArray(payload.kinds)) {
+  if (
+    !payload ||
+    !Array.isArray(payload.models) ||
+    !Array.isArray(payload.kinds)
+  ) {
     return null;
   }
   const models: GatewayCatalogModel[] = [];
@@ -191,6 +196,7 @@ function projectActive(
   active: Record<string, string | null>,
 ): RemoteMediaModelIds {
   const text = activeOptionId(catalog, 'text', active.text);
+  const video = activeOptionId(catalog, 'video', active.video);
   const image = activeOptionId(catalog, 'image', active.image);
   const transcription = activeOptionId(
     catalog,
@@ -205,6 +211,7 @@ function projectActive(
   return {
     ...(text ? { text } : {}),
     ...(image ? { image } : {}),
+    ...(video ? { video } : {}),
     ...(transcription ? { transcription } : {}),
     ...(voice ? { voice } : {}),
   };
@@ -224,7 +231,8 @@ function textModels(
     const predicted = predictGgufCapabilities(model);
     const hasLiveCapabilities = live?.capabilities !== undefined && live.capabilities !== null;
     const supportsThinking = hasLiveCapabilities
-      ? live?.capabilities?.includes('reasoning') === true || live?.reasoningMandatory === true
+      ? live?.capabilities?.includes('reasoning') === true ||
+        live?.reasoningMandatory === true
       : predicted.thinking;
     return [
       {
@@ -232,17 +240,18 @@ function textModels(
         name: model.name,
         serverId,
         capabilities: {
-          supportsVision: model.kind === 'vision' || live?.capabilities?.includes('vision') === true,
+          supportsVision:
+            model.kind === 'vision' ||
+            live?.capabilities?.includes('vision') === true,
           supportsToolCalling: hasLiveCapabilities
             ? live?.capabilities?.includes('tools') === true
-            // Desktop offloads idle models, so /v1/models can omit capabilities.
-            // Keep tools usable until the runtime makes an authoritative claim.
-            : true,
+            : // Desktop offloads idle models, so /v1/models can omit capabilities.
+              // Keep tools usable until the runtime makes an authoritative claim.
+              true,
           supportsThinking,
-          acceptsThinkingKwarg: model.id.startsWith('remote-vision:') && supportsThinking,
-          ...(live?.reasoningMandatory
-            ? { thinkingLevelsOnly: true }
-            : {}),
+          acceptsThinkingKwarg:
+            model.id.startsWith('remote-vision:') && supportsThinking,
+          ...(live?.reasoningMandatory ? { thinkingLevelsOnly: true } : {}),
         },
         lastUpdated: new Date().toISOString(),
       },
@@ -262,11 +271,7 @@ export async function readOffGridDesktopModelState(
         gatewayFetch(server, '/v1/models/active'),
         gatewayFetch(server, '/v1/models'),
       ]);
-    if (
-      !catalogResponse.ok ||
-      !installedResponse.ok ||
-      !activeResponse.ok
-    ) {
+    if (!catalogResponse.ok || !installedResponse.ok || !activeResponse.ok) {
       return null;
     }
     const [catalogPayload, installedPayload, activePayload] =
diff --git a/src/services/remoteMediaRuntime.ts b/src/services/remoteMediaRuntime.ts
index 996d2e531..91e6080ee 100644
--- a/src/services/remoteMediaRuntime.ts
+++ b/src/services/remoteMediaRuntime.ts
@@ -1,3 +1,10 @@
+import { isRecordProvenance, type RecordProvenance } from '@offgrid/sync';
+import { generateId } from '../utils/generateId';
+import RNFS from 'react-native-fs';
+import type {
+  ResolvedVideoRequest,
+  VideoGenerationResultContract,
+} from '@offgrid/models';
 import { remoteServerManager } from './remoteServerManager';
 import type { RemoteMediaModelIds, RemoteServer } from '../types';
 import { REMOTE_FETCH_REDIRECT_POLICY, remoteAuthorizationHeaders } from './remoteTransportPolicy';
@@ -41,6 +48,7 @@ async function request<T>(
   signal?.addEventListener('abort', abort, { once: true });
   try {
     const apiKey = await remoteServerManager.getApiKey(server.id);
+    if (signal?.aborted) controller.abort();
     if (controller.signal.aborted) throw new Error('Remote request cancelled');
     const response = await fetch(endpoint(server, path), {
       ...init,
@@ -58,8 +66,14 @@ async function request<T>(
       try {
         const body = JSON.parse(detail) as { error?: { code?: unknown }; code?: unknown };
         const marker = 'OFFGRID_IMAGE_MEMORY_LIMIT:';
-        if ((body.error?.code ?? body.code) === 'OFFGRID_IMAGE_MEMORY_LIMIT' || message.includes(marker)) {
-          throw Object.assign(new OverridableMemoryError(message.replace(marker, '').trim()), { remote: true });
+        if (
+          (body.error?.code ?? body.code) === 'OFFGRID_IMAGE_MEMORY_LIMIT' ||
+          message.includes(marker)
+        ) {
+          throw Object.assign(
+            new OverridableMemoryError(message.replace(marker, '').trim()),
+            { remote: true },
+          );
         }
       } catch (error) {
         if (error instanceof OverridableMemoryError) throw error;
@@ -88,6 +102,143 @@ function requiredModel(
 
 /** Thin OpenAI-compatible adapters. The server record owns every endpoint and model choice. */
 export const remoteMediaRuntime = {
+  async generateVideo(
+    server: RemoteServer,
+    input: ResolvedVideoRequest,
+    outputPath: string,
+    options: {
+      signal: AbortSignal;
+      model?: string;
+      jobId?: string;
+      onJobStarted: (id: string) => Promise<unknown>;
+      onProgress: (progress: { step: number; total: number }) => void;
+    },
+  ): Promise<
+    VideoGenerationResultContract & { provenance?: RecordProvenance }
+  > {
+    if (server.modelManagement !== 'offgrid-desktop-v1')
+      throw new Error('Remote video requires an OGAD server.');
+    const clientJobId = options.jobId ?? generateId();
+    await options.onJobStarted(clientJobId);
+    const job = await request(
+      {
+        server,
+        path: '/v1/videos',
+        signal: options.signal,
+        init: {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({
+            ...input,
+            model: options.model ?? requiredModel(server, 'video'),
+            enhancePrompt: false,
+            client_job_id: clientJobId,
+          }),
+        },
+      },
+      response => response.json() as Promise<{ request_id: string }>,
+    );
+    if (!job.request_id) throw new Error('The server returned no video job.');
+    await options.onJobStarted(job.request_id);
+    const cancel = () => {
+      void request(
+        {
+          server,
+          path: `/v1/videos/${encodeURIComponent(job.request_id)}/cancel`,
+          init: { method: 'POST' },
+        },
+        async response => {
+          await response.text();
+        },
+      ).catch(() => {});
+    };
+    options.signal.addEventListener('abort', cancel, { once: true });
+    try {
+      if (options.signal.aborted) {
+        cancel();
+        throw new Error('Video generation stopped.');
+      }
+      while (true) {
+        const state = await request(
+          {
+            server,
+            path: `/v1/videos/${encodeURIComponent(job.request_id)}`,
+            signal: options.signal,
+            init: { method: 'GET' },
+          },
+          response =>
+            response.json() as Promise<{
+              status: string;
+              progress?: { step: number; total: number };
+              error?: { message: string };
+              result?: VideoGenerationResultContract & {
+                provenance?: RecordProvenance;
+              };
+            }>,
+        );
+        if (state.progress) options.onProgress(state.progress);
+        if (state.status === 'failed')
+          throw Object.assign(
+            new Error(
+              state.error?.message ?? 'Remote video generation failed.',
+            ),
+            { code: 'VIDEO_REMOTE_FAILED' },
+          );
+        if (state.status === 'completed') {
+          if (!state.result?.syncId)
+            throw new Error('The server returned an invalid video result.');
+          const apiKey = await remoteServerManager.getApiKey(server.id);
+          const transfer = RNFS.downloadFile({
+            fromUrl: endpoint(
+              server,
+              `/v1/videos/${encodeURIComponent(job.request_id)}/content`,
+            ),
+            toFile: outputPath,
+            headers: remoteAuthorizationHeaders(server.endpoint, apiKey),
+            connectionTimeout: 15000,
+            readTimeout: 60000,
+          });
+          const stopTransfer = () => RNFS.stopDownload(transfer.jobId);
+          options.signal.addEventListener('abort', stopTransfer, {
+            once: true,
+          });
+          try {
+            if (options.signal.aborted) {
+              stopTransfer();
+              throw new Error('Video generation stopped.');
+            }
+            const result = await transfer.promise;
+            if (result.statusCode !== 200 || result.bytesWritten <= 0)
+              throw new Error('Could not download the generated video.');
+          } finally {
+            options.signal.removeEventListener('abort', stopTransfer);
+          }
+          return {
+            ...state.result,
+            provenance: isRecordProvenance(state.result.provenance)
+              ? state.result.provenance
+              : undefined,
+            path: outputPath,
+          };
+        }
+        await new Promise<void>((resolve, reject) => {
+          const abort = () => {
+            clearTimeout(timer);
+            reject(new Error('Video generation stopped.'));
+          };
+          const timer = setTimeout(() => {
+            options.signal.removeEventListener('abort', abort);
+            resolve();
+          }, 1000);
+          options.signal.addEventListener('abort', abort, { once: true });
+          if (options.signal.aborted) abort();
+        });
+      }
+    } finally {
+      options.signal.removeEventListener('abort', cancel);
+    }
+  },
+
   async generateImage(
     server: RemoteServer,
     input: { prompt: string; size?: string },
@@ -97,32 +248,42 @@ export const remoteMediaRuntime = {
     const desktop = server.modelManagement === 'offgrid-desktop-v1';
     type ImagePayload = {
       data?: Array<{ b64_json?: string; url?: string }>;
-      choices?: Array<{ message?: { images?: Array<{ image_url?: { url?: string } }> } }>;
+      choices?: Array<{
+        message?: { images?: Array<{ image_url?: { url?: string } }> };
+      }>;
     };
-    const payload = await request({
-      server,
-      path: openRouter ? '/v1/chat/completions' : '/v1/images/generations',
-      init: {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify(openRouter
-          ? {
-              model: requiredModel(server, 'image'),
-              messages: [{ role: 'user', content: input.prompt }],
-              modalities: ['image', 'text'],
-              stream: false,
-            }
-          : {
-              model: requiredModel(server, 'image'),
-              prompt: input.prompt,
-              size: input.size ?? '1024x1024',
-              response_format: 'b64_json',
-              ...(desktop ? { async: true } : {}),
-              ...(options.override ? { allow_unsafe_memory_override: true } : {}),
-            }),
+    const payload = await request(
+      {
+        server,
+        path: openRouter ? '/v1/chat/completions' : '/v1/images/generations',
+        init: {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify(
+            openRouter
+              ? {
+                  model: requiredModel(server, 'image'),
+                  messages: [{ role: 'user', content: input.prompt }],
+                  modalities: ['image', 'text'],
+                  stream: false,
+                }
+              : {
+                  model: requiredModel(server, 'image'),
+                  prompt: input.prompt,
+                  size: input.size ?? '1024x1024',
+                  response_format: 'b64_json',
+                  ...(desktop ? { async: true } : {}),
+                  ...(options.override
+                    ? { allow_unsafe_memory_override: true }
+                    : {}),
+                },
+          ),
+        },
+        signal: options.signal,
       },
-      signal: options.signal,
-    }, response => response.json() as Promise<ImagePayload & { request_id?: string }>);
+      response =>
+        response.json() as Promise<ImagePayload & { request_id?: string }>,
+    );
     let result: ImagePayload = payload;
     if (desktop && payload.request_id) {
       while (true) {
@@ -194,31 +355,40 @@ export const remoteMediaRuntime = {
     options: RemoteMediaRequestOptions = {},
   ): Promise<RemoteVoiceResult> {
     const openRouter = new URL(server.endpoint).hostname === 'openrouter.ai';
-    const voice = input.voice || (openRouter
-      ? (await remoteMediaRuntime.listVoices(server, options))[0]
-      : undefined);
-    if (openRouter && !voice) throw new Error('This remote model has no available speakers.');
-    return request({
-      server,
-      path: '/v1/audio/speech',
-      init: {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({
-          model: requiredModel(server, 'voice'),
-          input: input.text,
-          ...(voice ? { voice } : {}),
-          ...(openRouter ? { response_format: 'mp3' } : {}),
-        }),
+    const voice =
+      input.voice ||
+      (openRouter
+        ? (await remoteMediaRuntime.listVoices(server, options))[0]
+        : undefined);
+    if (openRouter && !voice)
+      throw new Error('This remote model has no available speakers.');
+    return request(
+      {
+        server,
+        path: '/v1/audio/speech',
+        init: {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({
+            model: requiredModel(server, 'voice'),
+            input: input.text,
+            ...(voice ? { voice } : {}),
+            ...(openRouter ? { response_format: 'mp3' } : {}),
+          }),
+        },
+        signal: options.signal,
       },
-      signal: options.signal,
-    }, async response => ({
-      audio: await response.arrayBuffer(),
-      contentType: response.headers.get('content-type') ?? 'audio/mpeg',
-    }));
+      async response => ({
+        audio: await response.arrayBuffer(),
+        contentType: response.headers.get('content-type') ?? 'audio/mpeg',
+      }),
+    );
   },
 
-  async listVoices(server: RemoteServer, options: RemoteMediaRequestOptions = {}): Promise<string[]> {
+  async listVoices(
+    server: RemoteServer,
+    options: RemoteMediaRequestOptions = {},
+  ): Promise<string[]> {
     try {
       const modelId = requiredModel(server, 'voice');
       const catalog = await request({
@@ -244,7 +414,9 @@ export const remoteMediaRuntime = {
       signal: options.signal,
     }, response => response.json() as Promise<{ voices?: unknown }>);
     return Array.isArray(payload.voices)
-      ? payload.voices.filter((voice): voice is string => typeof voice === 'string')
+      ? payload.voices.filter(
+          (voice): voice is string => typeof voice === 'string',
+        )
       : [];
   },
 };
diff --git a/src/services/remoteModelSelection.ts b/src/services/remoteModelSelection.ts
index 78f01aa7b..c8e37f96d 100644
--- a/src/services/remoteModelSelection.ts
+++ b/src/services/remoteModelSelection.ts
@@ -27,16 +27,21 @@ export function remoteServerModelOptions(
   servers: RemoteServer[],
   category: RemoteModelCategory,
 ): RemoteServerModelOption[] {
-  return servers.flatMap(server => {
-    const reported = server.modelCatalog?.[category] ?? [];
-    const options =
-      reported.length > 0 ? reported : configuredOption(server, category);
-    return options.map(option => ({
-      ...option,
-      serverId: server.id,
-      serverName: server.name,
-    }));
-  });
+  return servers
+    .filter(
+      server =>
+        category !== 'video' || server.modelManagement === 'offgrid-desktop-v1',
+    )
+    .flatMap(server => {
+      const reported = server.modelCatalog?.[category] ?? [];
+      const options =
+        reported.length > 0 ? reported : configuredOption(server, category);
+      return options.map(option => ({
+        ...option,
+        serverId: server.id,
+        serverName: server.name,
+      }));
+    });
 }
 
 export function selectedRemoteModelName(
diff --git a/src/services/remoteServerManager.ts b/src/services/remoteServerManager.ts
index a69d78041..274acad89 100644
--- a/src/services/remoteServerManager.ts
+++ b/src/services/remoteServerManager.ts
@@ -250,6 +250,7 @@ class RemoteServerManager {
     store.setActiveServerId(null);
     store.setActiveRemoteTextModelId(null);
     store.setActiveRemoteImageModelId(null);
+    store.setActiveRemoteMediaServerId('video', null);
     store.setActiveRemoteMediaServerId('image', null);
     store.setActiveRemoteMediaServerId('transcription', null);
     store.setActiveRemoteMediaServerId('voice', null);
@@ -296,7 +297,9 @@ class RemoteServerManager {
   }> {
     let discovered: DiscoveredServer[];
     const savedEndpoints = new Set(
-      useRemoteServerStore.getState().servers.map(server => trimSlash(server.endpoint)),
+      useRemoteServerStore
+        .getState()
+        .servers.map(server => trimSlash(server.endpoint)),
     );
     try {
       discovered = await discoverLANServers(undefined, {
@@ -314,7 +317,9 @@ class RemoteServerManager {
     }
     return {
       moved: [],
-      found: discovered.filter(server => !savedEndpoints.has(trimSlash(server.endpoint))),
+      found: discovered.filter(
+        server => !savedEndpoints.has(trimSlash(server.endpoint)),
+      ),
     };
   }
 
diff --git a/src/stores/remoteServerHelpers.ts b/src/stores/remoteServerHelpers.ts
index f94a490d1..62a390309 100644
--- a/src/stores/remoteServerHelpers.ts
+++ b/src/stores/remoteServerHelpers.ts
@@ -60,22 +60,28 @@ async function fetchForDiscovery(
 
 const gatewayCategory = (kind: unknown): RemoteModelCategory | null => {
   if (kind === 'chat' || kind === 'vision') return 'text';
+  if (kind === 'video') return 'video';
   if (kind === 'image') return 'image';
   if (kind === 'transcription') return 'transcription';
   if (kind === 'speech') return 'voice';
   return null;
 };
 
-function modelCategories(model: {
-  kind?: unknown;
-  architecture?: { input_modalities?: unknown; output_modalities?: unknown };
-}, isOpenRouter = false): RemoteModelCategory[] {
+function modelCategories(
+  model: {
+    kind?: unknown;
+    architecture?: { input_modalities?: unknown; output_modalities?: unknown };
+  },
+  isOpenRouter = false,
+): RemoteModelCategory[] {
   const declared = gatewayCategory(model.kind);
   if (declared) return [declared];
   const outputs = Array.isArray(model.architecture?.output_modalities)
-    ? model.architecture.output_modalities : [];
+    ? model.architecture.output_modalities
+    : [];
   const inputs = Array.isArray(model.architecture?.input_modalities)
-    ? model.architecture.input_modalities : [];
+    ? model.architecture.input_modalities
+    : [];
   if (outputs.includes('image')) return ['image'];
   if (outputs.includes('transcription')) return ['transcription'];
   if (outputs.includes('speech')) return ['voice'];
@@ -125,7 +131,10 @@ async function fetchGatewayModelCatalog(
       id?: unknown;
       name?: unknown;
       kind?: unknown;
-      architecture?: { input_modalities?: unknown; output_modalities?: unknown };
+      architecture?: {
+        input_modalities?: unknown;
+        output_modalities?: unknown;
+      };
     }>) {
       if (typeof model.id !== 'string') continue;
       for (const category of modelCategories(model, isOpenRouter)) {
@@ -375,27 +384,35 @@ export async function fetchModelsFromServer(
       };
 
       // OpenAI format: { object: "list", data: [{ id, object, owned_by, ... }] }
-      if ((data?.object === 'list' || isOpenRouter) && Array.isArray(data.data)) {
+      if (
+        (data?.object === 'list' || isOpenRouter) &&
+        Array.isArray(data.data)
+      ) {
         const generativeModels = data.data.filter(
           (model: { id: string; kind?: unknown }) => isTextModel(model),
         );
         const modelInfos = await Promise.all(
-          generativeModels.map((model: {
-            id: string;
-            context_length?: number;
-            architecture?: { input_modalities?: string[] };
-            supported_parameters?: string[];
-            reasoning?: { mandatory?: boolean };
-          }) =>
-            isOpenRouter
-              ? {
-                  contextLength: model.context_length ?? 4096,
-                  supportsVision: model.architecture?.input_modalities?.includes('image') === true,
-                  supportsToolCalling: model.supported_parameters?.includes('tools') === true,
-                  supportsThinking: !!model.reasoning,
-                  thinkingLevelsOnly: model.reasoning?.mandatory === true,
-                }
-              : fetchModelCapabilities(url, model.id, nameDetect),
+          generativeModels.map(
+            (model: {
+              id: string;
+              context_length?: number;
+              architecture?: { input_modalities?: string[] };
+              supported_parameters?: string[];
+              reasoning?: { mandatory?: boolean };
+            }) =>
+              isOpenRouter
+                ? {
+                    contextLength: model.context_length ?? 4096,
+                    supportsVision:
+                      model.architecture?.input_modalities?.includes(
+                        'image',
+                      ) === true,
+                    supportsToolCalling:
+                      model.supported_parameters?.includes('tools') === true,
+                    supportsThinking: !!model.reasoning,
+                    thinkingLevelsOnly: model.reasoning?.mandatory === true,
+                  }
+                : fetchModelCapabilities(url, model.id, nameDetect),
           ),
         );
         return generativeModels.map(
@@ -410,14 +427,14 @@ export async function fetchModelsFromServer(
             },
             i: number,
           ) => ({
-          id: model.id,
+            id: model.id,
             name: displayModelName(model.name?.trim() || model.id),
-          serverId: server.id,
-          capabilities: {
-            // The gateway declares each model's kind authoritatively; trust kind:'vision'
-            // for vision support. The name/probe-based fallback (modelInfos) can't detect a
-            // gateway vision model whose id doesn't match the name heuristics, which dropped
-            // the attached image client-side (the model then behaved text-only).
+            serverId: server.id,
+            capabilities: {
+              // The gateway declares each model's kind authoritatively; trust kind:'vision'
+              // for vision support. The name/probe-based fallback (modelInfos) can't detect a
+              // gateway vision model whose id doesn't match the name heuristics, which dropped
+              // the attached image client-side (the model then behaved text-only).
               supportsVision:
                 model.kind === 'vision' ||
                 (declaredCapability(model.capabilities, 'vision') ??
@@ -426,12 +443,12 @@ export async function fetchModelsFromServer(
                 declaredCapability(model.capabilities, 'tools') ??
                 modelInfos[i].supportsToolCalling ??
                 detectToolCallingCapability(model.id),
-            supportsThinking: modelInfos[i].supportsThinking ?? false,
-            thinkingLevelsOnly: modelInfos[i].thinkingLevelsOnly,
-            acceptsThinkingKwarg: modelInfos[i].acceptsThinkingKwarg ?? false,
-            maxContextLength: modelInfos[i].contextLength,
-          },
-          lastUpdated: new Date().toISOString(),
+              supportsThinking: modelInfos[i].supportsThinking ?? false,
+              thinkingLevelsOnly: modelInfos[i].thinkingLevelsOnly,
+              acceptsThinkingKwarg: modelInfos[i].acceptsThinkingKwarg ?? false,
+              maxContextLength: modelInfos[i].contextLength,
+            },
+            lastUpdated: new Date().toISOString(),
           }),
         );
       }
diff --git a/src/types/remoteServer.ts b/src/types/remoteServer.ts
index 12187019c..20e861008 100644
--- a/src/types/remoteServer.ts
+++ b/src/types/remoteServer.ts
@@ -12,6 +12,7 @@ type RemoteProviderType = 'openai-compatible' | 'anthropic';
 export interface RemoteMediaModelIds {
   text?: string;
   image?: string;
+  video?: string;
   transcription?: string;
   voice?: string;
 }
@@ -33,6 +34,7 @@ export type RemoteModelCatalog = Partial<
 
 export interface RemoteServerCapabilities {
   imageGeneration: boolean;
+  videoGeneration: boolean;
   transcription: boolean;
   voice: boolean;
 }
@@ -71,6 +73,7 @@ export function remoteServerCapabilities(
 ): RemoteServerCapabilities {
   return {
     imageGeneration: !!server.mediaModels?.image?.trim(),
+    videoGeneration: !!server.mediaModels?.video?.trim(),
     transcription: !!server.mediaModels?.transcription?.trim(),
     voice: !!server.mediaModels?.voice?.trim(),
   };

From 26bf6fd3f7b3dfa96b550ceb6c1412ef136dc0eb Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Mon, 28 Sep 2026 21:33:01 +0530
Subject: [PATCH 009/129] feat(models): add video search selection settings and
 storage controls [skip ci]

---
 .../VideoGenerationSection.tsx                | 127 ++++++++
 .../GenerationSettingsModal/index.tsx         |   9 +-
 .../ModelSelectorModal/VideoTab.tsx           |  47 +++
 src/components/ModelSelectorModal/index.tsx   | 101 +++---
 src/components/models/ModelsManagerSheet.tsx  |  85 ++++-
 src/components/models/ModelsSummaryRow.tsx    |  87 ++++--
 src/components/models/useResidentRows.ts      |  15 +-
 src/screens/DownloadManagerScreen/items.tsx   | 294 +++++++++++++-----
 .../useDownloadManager.ts                     |  53 +++-
 src/screens/ModelSettingsScreen/index.tsx     |  20 +-
 src/screens/ModelsScreen/VideoModelsTab.tsx   | 253 +++++++++++++++
 src/screens/ModelsScreen/index.tsx            |  59 ++--
 src/screens/ModelsScreen/types.ts             |   2 +-
 src/screens/StorageSettingsScreen.tsx         |  66 +++-
 14 files changed, 1008 insertions(+), 210 deletions(-)
 create mode 100644 src/components/GenerationSettingsModal/VideoGenerationSection.tsx
 create mode 100644 src/components/ModelSelectorModal/VideoTab.tsx
 create mode 100644 src/screens/ModelsScreen/VideoModelsTab.tsx

diff --git a/src/components/GenerationSettingsModal/VideoGenerationSection.tsx b/src/components/GenerationSettingsModal/VideoGenerationSection.tsx
new file mode 100644
index 000000000..65aa50dd7
--- /dev/null
+++ b/src/components/GenerationSettingsModal/VideoGenerationSection.tsx
@@ -0,0 +1,127 @@
+import { Accordion } from '../Accordion';
+import { useRemoteServerStore } from '../../stores/remoteServerStore';
+import React, { useEffect, useState } from 'react';
+import { Text, TextInput, View, Switch } from 'react-native';
+import { VIDEO_DEFAULTS } from '@offgrid/models';
+import { useAppStore } from '../../stores';
+import { useTheme, useThemedStyles } from '../../theme';
+import { SliderSetting } from '../SliderSetting';
+import { createStyles } from './styles';
+
+const CONTROLS = [
+  { key: 'width', label: 'Width', min: 256, max: 832, step: 16 },
+  { key: 'height', label: 'Height', min: 192, max: 480, step: 16 },
+  { key: 'frames', label: 'Frames', min: 9, max: 81, step: 4 },
+  { key: 'fps', label: 'Frames per second', min: 4, max: 24, step: 1 },
+  { key: 'steps', label: 'Steps', min: 4, max: 50, step: 1 },
+  { key: 'guidance', label: 'Guidance', min: 0, max: 20, step: 0.5 },
+] as const;
+export const VideoGenerationSection: React.FC = () => {
+  const {
+    settings,
+    updateSettings,
+    activeVideoModelId,
+    downloadedVideoModels,
+  } = useAppStore();
+  const { colors } = useTheme(),
+    styles = useThemedStyles(createStyles);
+  const model = downloadedVideoModels.find(m => m.id === activeVideoModelId);
+  const remoteName = useRemoteServerStore(
+    s =>
+      s.servers.find(server => server.id === s.activeRemoteMediaServerIds.video)
+        ?.mediaModels?.video,
+  );
+  const key =
+    remoteName ??
+    model?.files.find(f => f.role === 'primary')?.name ??
+    'default';
+  const saved =
+    settings.videoParams?.[key] ?? settings.videoParams?.default ?? {};
+  const values = { ...VIDEO_DEFAULTS, ...saved };
+  const [seedText, setSeedText] = useState(
+    settings.videoSeed === -1 ? '' : String(settings.videoSeed ?? ''),
+  );
+  useEffect(
+    () =>
+      setSeedText(
+        settings.videoSeed === -1 ? '' : String(settings.videoSeed ?? ''),
+      ),
+    [settings.videoSeed],
+  );
+  const saveSeed = () => {
+    const seed = seedText.trim() === '' ? -1 : Number(seedText);
+    if (Number.isInteger(seed) && seed >= -1 && seed <= 2147483647)
+      updateSettings({ videoSeed: seed });
+    else
+      setSeedText(
+        settings.videoSeed === -1 ? '' : String(settings.videoSeed ?? ''),
+      );
+  };
+  return (
+    <Accordion title="Video generation" variant="plain">
+      <Text style={styles.settingDescription}>
+        {remoteName ?? model?.name ?? 'Default video settings'}
+      </Text>
+      {CONTROLS.map(control => (
+        <SliderSetting
+          key={control.key}
+          compact
+          label={control.label}
+          value={values[control.key]}
+          min={control.min}
+          max={control.max}
+          step={control.step}
+          onChange={value =>
+            updateSettings({
+              videoParams: {
+                ...settings.videoParams,
+                [key]: {
+                  ...saved,
+                  [control.key]:
+                    control.key === 'frames'
+                      ? 1 + Math.round((value - 1) / 4) * 4
+                      : control.key === 'width' || control.key === 'height'
+                        ? Math.round(value / 16) * 16
+                        : value,
+                },
+              },
+            })
+          }
+        />
+      ))}
+      <Text style={styles.settingLabel}>Seed</Text>
+      <TextInput
+        accessibilityLabel="Video seed"
+        value={seedText}
+        keyboardType="number-pad"
+        style={{ color: colors.text }}
+        placeholderTextColor={colors.textMuted}
+        placeholder="Random"
+        onChangeText={setSeedText}
+        onEndEditing={saveSeed}
+      />
+      <Text style={styles.settingDescription}>
+        Leave blank for a new seed with each video.
+      </Text>
+      <Text style={styles.settingLabel}>Negative prompt</Text>
+      <TextInput
+        accessibilityLabel="Video negative prompt"
+        multiline
+        value={settings.videoNegative ?? ''}
+        style={{ color: colors.text }}
+        placeholderTextColor={colors.textMuted}
+        placeholder="What to avoid"
+        onChangeText={videoNegative => updateSettings({ videoNegative })}
+      />
+      <View style={styles.settingHeader}>
+        <Text style={styles.settingLabel}>Enhance video prompts</Text>
+        <Switch
+          value={settings.enhanceVideoPrompts ?? false}
+          onValueChange={enhanceVideoPrompts =>
+            updateSettings({ enhanceVideoPrompts })
+          }
+        />
+      </View>
+    </Accordion>
+  );
+};
diff --git a/src/components/GenerationSettingsModal/index.tsx b/src/components/GenerationSettingsModal/index.tsx
index a295a26f6..a3a84938d 100644
--- a/src/components/GenerationSettingsModal/index.tsx
+++ b/src/components/GenerationSettingsModal/index.tsx
@@ -1,3 +1,4 @@
+import { VideoGenerationSection } from './VideoGenerationSection';
 import React, { useState, useEffect } from 'react';
 import { View, Text, ScrollView, TouchableOpacity } from 'react-native';
 import Icon from 'react-native-vector-icons/Feather';
@@ -25,7 +26,9 @@ interface GenerationSettingsModalProps {
   isRemote?: boolean;
 }
 
-export const GenerationSettingsModal: React.FC<GenerationSettingsModalProps> = ({
+export const GenerationSettingsModal: React.FC<
+  GenerationSettingsModalProps
+> = ({
   visible,
   onClose,
   onOpenProject,
@@ -113,6 +116,7 @@ export const GenerationSettingsModal: React.FC<GenerationSettingsModalProps> = (
           />
         </TouchableOpacity>
         {imageSettingsOpen && <ImageGenerationSection />}
+        <VideoGenerationSection />
 
         {/* TEXT GENERATION SETTINGS */}
         <TouchableOpacity
@@ -133,7 +137,8 @@ export const GenerationSettingsModal: React.FC<GenerationSettingsModalProps> = (
               <View style={styles.remoteNotice}>
                 <Icon name="info" size={13} color={colors.textMuted} />
                 <Text style={styles.remoteNoticeText}>
-                  These settings only apply to local models and won't affect the current remote session.
+                  These settings only apply to local models and won't affect the
+                  current remote session.
                 </Text>
               </View>
             )}
diff --git a/src/components/ModelSelectorModal/VideoTab.tsx b/src/components/ModelSelectorModal/VideoTab.tsx
new file mode 100644
index 000000000..56520ca58
--- /dev/null
+++ b/src/components/ModelSelectorModal/VideoTab.tsx
@@ -0,0 +1,47 @@
+import { RemoteModelOptionsSection } from '../models/RemoteModelOptionsSection';
+import { remoteServerManager } from '../../services/remoteServerManager';
+import React from 'react';
+import { Text } from 'react-native';
+import { useAppStore } from '../../stores';
+import { ModelCard } from '../ModelCard';
+import { Button } from '../Button';
+import { useTheme } from '../../theme';
+import { videoGenerationService } from '../../services/videoGenerationService';
+export function VideoTab({ onSelect }: { onSelect: () => void }) {
+  const models = useAppStore(s => s.downloadedVideoModels),
+    selected = useAppStore(s => s.activeVideoModelId);
+  const { colors } = useTheme();
+  return (
+    <>
+      <RemoteModelOptionsSection category="video" onSelect={onSelect} />
+      {!models.length && (
+        <Text style={{ color: colors.textMuted }}>
+          Download a video model from Models.
+        </Text>
+      )}
+      {models.map(model => (
+        <ModelCard
+          key={model.id}
+          compact
+          model={{ id: model.id, name: model.name, author: model.org ?? '' }}
+          isDownloaded
+          isActive={selected === model.id}
+          facts={['Video', 'Loads when generation starts']}
+          disabled={videoGenerationService.getState().phase === 'running'}
+          onSelect={() => {
+            remoteServerManager.clearActiveRemoteMediaModel('video');
+            useAppStore.getState().setActiveVideoModelId(model.id);
+            onSelect();
+          }}
+        />
+      ))}
+      {selected && (
+        <Button
+          title="Clear video selection"
+          variant="ghost"
+          onPress={() => useAppStore.getState().setActiveVideoModelId(null)}
+        />
+      )}
+    </>
+  );
+}
diff --git a/src/components/ModelSelectorModal/index.tsx b/src/components/ModelSelectorModal/index.tsx
index abcfeacb9..0216dce84 100644
--- a/src/components/ModelSelectorModal/index.tsx
+++ b/src/components/ModelSelectorModal/index.tsx
@@ -1,3 +1,4 @@
+import { VideoTab } from './VideoTab';
 import React, { useEffect, useState, useMemo } from 'react';
 import { Text, ScrollView, TouchableOpacity } from 'react-native';
 import Icon from 'react-native-vector-icons/Feather';
@@ -34,25 +35,26 @@ import {
 } from '../../utils/modelSelectorFilters';
 import logger from '../../utils/logger';
 
-type TabType = 'text' | 'image';
+type TabType = 'text' | 'image' | 'video';
 
 function savedTextModels(
   server: RemoteServer,
   discovered: RemoteModel[],
 ): RemoteModel[] {
-  return remoteServerModelOptions([server], 'text').map(option =>
-    discovered.find(model => model.id === option.id) ?? {
-      id: option.id,
-      name: option.name,
-      serverId: option.serverId,
-      capabilities: {
-        supportsVision: false,
-        supportsToolCalling: false,
-        supportsThinking: false,
+  return remoteServerModelOptions([server], 'text').map(
+    option =>
+      discovered.find(model => model.id === option.id) ?? {
+        id: option.id,
+        name: option.name,
+        serverId: option.serverId,
+        capabilities: {
+          supportsVision: false,
+          supportsToolCalling: false,
+          supportsThinking: false,
+        },
+        details: { serverName: option.serverName },
+        lastUpdated: server.lastHealthCheck ?? server.createdAt,
       },
-      details: { serverName: option.serverName },
-      lastUpdated: server.lastHealthCheck ?? server.createdAt,
-    },
   );
 }
 
@@ -69,7 +71,7 @@ interface ModelSelectorModalProps {
   onSelectionComplete?: () => void;
   onClosed?: () => void;
   onBackToModels?: () => void;
-  onBrowseModels?: (tab: 'text' | 'image') => void;
+  onBrowseModels?: (tab: 'text' | 'image' | 'video') => void;
 }
 
 export const ModelSelectorModal: React.FC<ModelSelectorModalProps> = ({
@@ -180,7 +182,11 @@ export const ModelSelectorModal: React.FC<ModelSelectorModalProps> = ({
           id: option.id,
           name: option.name,
           serverId: option.serverId,
-          capabilities: { supportsVision: false, supportsToolCalling: false, supportsThinking: false },
+          capabilities: {
+            supportsVision: false,
+            supportsToolCalling: false,
+            supportsThinking: false,
+          },
           details: { serverName: option.serverName },
           lastUpdated: server.lastHealthCheck ?? server.createdAt,
         })),
@@ -286,28 +292,41 @@ export const ModelSelectorModal: React.FC<ModelSelectorModalProps> = ({
       onClosed={onClosed}
       onBackPress={onBackToModels}
       snapPoints={['40%', '75%']}
-      title={activeTab === 'image' ? 'IMAGE MODEL' : 'TEXT MODEL'}
+      title={
+        activeTab === 'video'
+          ? 'VIDEO MODEL'
+          : activeTab === 'image'
+            ? 'IMAGE MODEL'
+            : 'TEXT MODEL'
+      }
     >
-        {/* Text-model loading now shows an inline spinner ON the selected row (TextTab → ModelRow),
+      {/* Text-model loading now shows an inline spinner ON the selected row (TextTab → ModelRow),
             not a banner over the list. The image tab keeps its own indicator, so no banner for text. */}
 
       <ScrollView
         style={styles.content}
         contentContainerStyle={styles.contentContainer}
       >
-          {activeTab === 'text' ? (
-            <TextTab
-              downloadedModels={filteredDownloadedModels}
-              remoteModels={remoteTextModels}
-              currentModelPath={currentModelPath}
-              selectedModelPath={selectedModelPath}
-              currentRemoteModelId={activeRemoteTextModelId}
-              isAnyLoading={isAnyLoading}
-              loadingModelId={effectiveLoadingTextModelId}
-              loadingRemoteModelKey={loadingRemoteTextModelKey}
-              onSelectModel={handleSelectLocalModel}
-              onSelectRemoteModel={handleSelectRemoteTextModel}
-              onUnloadModel={handleUnloadModel}
+        {activeTab === 'video' ? (
+          <VideoTab
+            onSelect={() => {
+              onSelectionComplete?.();
+              onClose();
+            }}
+          />
+        ) : activeTab === 'text' ? (
+          <TextTab
+            downloadedModels={filteredDownloadedModels}
+            remoteModels={remoteTextModels}
+            currentModelPath={currentModelPath}
+            selectedModelPath={selectedModelPath}
+            currentRemoteModelId={activeRemoteTextModelId}
+            isAnyLoading={isAnyLoading}
+            loadingModelId={effectiveLoadingTextModelId}
+            loadingRemoteModelKey={loadingRemoteTextModelKey}
+            onSelectModel={handleSelectLocalModel}
+            onSelectRemoteModel={handleSelectRemoteTextModel}
+            onUnloadModel={handleUnloadModel}
             onAddServer={() => {
               onClose();
               onAddServer?.();
@@ -315,14 +334,16 @@ export const ModelSelectorModal: React.FC<ModelSelectorModalProps> = ({
             onBrowseModels={
               onBrowseModels ? () => onBrowseModels('text') : undefined
             }
-            />
-          ) : (
-            <ImageTab
-              downloadedImageModels={filteredDownloadedImageModels}
+          />
+        ) : (
+          <ImageTab
+            downloadedImageModels={filteredDownloadedImageModels}
             remoteVisionModels={remoteImageModels}
-              activeImageModelId={activeImageModelId}
-              loadedImageModelId={activeModelService.getLoadedModelIds().imageModelId}
-              activeRemoteImageModelId={activeRemoteImageModelId}
+            activeImageModelId={activeImageModelId}
+            loadedImageModelId={
+              activeModelService.getLoadedModelIds().imageModelId
+            }
+            activeRemoteImageModelId={activeRemoteImageModelId}
             activeRemoteImageServerId={activeRemoteMediaServerIds.image ?? null}
               isAnyLoading={isAnyLoading}
               isLoadingImage={isLoadingImage}
@@ -333,9 +354,9 @@ export const ModelSelectorModal: React.FC<ModelSelectorModalProps> = ({
             onBrowseModels={
               onBrowseModels ? () => onBrowseModels('image') : undefined
             }
-            />
-          )}
-        </ScrollView>
+          />
+        )}
+      </ScrollView>
 
       {onBrowseModels && (
         <TouchableOpacity
diff --git a/src/components/models/ModelsManagerSheet.tsx b/src/components/models/ModelsManagerSheet.tsx
index 830811234..7b2bb30a6 100644
--- a/src/components/models/ModelsManagerSheet.tsx
+++ b/src/components/models/ModelsManagerSheet.tsx
@@ -24,6 +24,7 @@ type RowDef = { type: ModelRowType; icon: string; label: string };
 const ROWS: RowDef[] = [
   { type: 'text', icon: 'message-square', label: 'Text' },
   { type: 'image', icon: 'image', label: 'Image' },
+  { type: 'video', icon: 'video', label: 'Video' },
   { type: 'voice', icon: 'volume-2', label: 'Voice' },
   { type: 'speech', icon: 'mic', label: 'Speech' },
 ];
@@ -50,7 +51,16 @@ type Props = {
  * type's picker.
  */
 export const ModelsManagerSheet: React.FC<Props> = ({
-  visible, onClose, onClosed, labels, remote, loadingState, isEjecting, hasActiveModel, onOpenRow, onEject,
+  visible,
+  onClose,
+  onClosed,
+  labels,
+  remote,
+  loadingState,
+  isEjecting,
+  hasActiveModel,
+  onOpenRow,
+  onEject,
 }) => {
   const { colors } = useTheme();
   const styles = useThemedStyles(createStyles);
@@ -66,7 +76,9 @@ export const ModelsManagerSheet: React.FC<Props> = ({
     setEjectingRow(row);
     logger.log(`[MODEL-SM] sheet eject → ${resident.type} (${resident.key}) ~${(resident.sizeMB / 1024).toFixed(1)}GB`);
     ejectResident(resident)
-      .catch((err) => logger.log(`[MODEL-SM] sheet eject ${resident.key} failed:`, err))
+      .catch(err =>
+        logger.log(`[MODEL-SM] sheet eject ${resident.key} failed:`, err),
+      )
       .finally(() => setEjectingRow(null));
   };
   const refreshModels = async () => {
@@ -105,10 +117,17 @@ export const ModelsManagerSheet: React.FC<Props> = ({
   };
 
   return (
-    <AppSheet visible={visible} onClose={onClose} onClosed={onClosed} title="MODELS" enableDynamicSizing>
+    <AppSheet
+      visible={visible}
+      onClose={onClose}
+      onClosed={onClosed}
+      title="MODELS"
+      enableDynamicSizing
+    >
       <View style={styles.content}>
-        {ROWS.map((row) => {
-          const isLoading = loadingState.isLoading && loadingState.type === row.type;
+        {ROWS.map(row => {
+          const isLoading =
+            loadingState.isLoading && loadingState.type === row.type;
           const value = labels[row.type];
           const isSet = value && value !== '—';
           const resident = residentByRow[row.type];
@@ -124,9 +143,10 @@ export const ModelsManagerSheet: React.FC<Props> = ({
               <Text style={styles.label}>{row.label}</Text>
               {/* Fixed-width eject column right of the label so all four rows align; empty when not resident. */}
               <View style={styles.ejectSlot}>
-                {resident && (ejectingRow === row.type
-                  ? <LoadingDots color={colors.error} />
-                  : (
+                {resident &&
+                  (ejectingRow === row.type ? (
+                    <LoadingDots color={colors.error} />
+                  ) : (
                     <TouchableOpacity
                       testID={`models-row-${row.type}-eject`}
                       accessibilityLabel={`Eject ${row.label} model from memory`}
@@ -139,11 +159,19 @@ export const ModelsManagerSheet: React.FC<Props> = ({
               </View>
               <View style={styles.valueGroup}>
                 {resident && (
-                  <View testID={`models-row-${row.type}-ram`} style={styles.ramChip}>
-                    <Text style={styles.ramChipText}>{`${(resident.sizeMB / 1024).toFixed(1)} GB`}</Text>
+                  <View
+                    testID={`models-row-${row.type}-ram`}
+                    style={styles.ramChip}
+                  >
+                    <Text
+                      style={styles.ramChipText}
+                    >{`${(resident.sizeMB / 1024).toFixed(1)} GB`}</Text>
                   </View>
                 )}
-                <Text style={[styles.value, isSet && styles.valueSet]} numberOfLines={1}>
+                <Text
+                  style={[styles.value, isSet && styles.valueSet]}
+                  numberOfLines={1}
+                >
                   {isLoading ? 'Loading…' : value}
                 </Text>
                 {!!remote?.[row.type] && isSet && (
@@ -196,7 +224,12 @@ export const ModelsManagerSheet: React.FC<Props> = ({
 };
 
 const createStyles = (colors: ThemeColors) => ({
-  content: { paddingHorizontal: SPACING.lg, paddingTop: SPACING.sm, paddingBottom: SPACING.md, gap: SPACING.sm as number },
+  content: {
+    paddingHorizontal: SPACING.lg,
+    paddingTop: SPACING.sm,
+    paddingBottom: SPACING.md,
+    gap: SPACING.sm as number,
+  },
   row: {
     flexDirection: 'row' as const,
     alignItems: 'center' as const,
@@ -208,9 +241,18 @@ const createStyles = (colors: ThemeColors) => ({
     borderColor: colors.border,
     backgroundColor: colors.surface,
   },
-  label: { ...TYPOGRAPHY.label, textTransform: 'uppercase' as const, color: colors.textMuted, width: 64 },
+  label: {
+    ...TYPOGRAPHY.label,
+    textTransform: 'uppercase' as const,
+    color: colors.textMuted,
+    width: 64,
+  },
   // Fixed-width control column right of the label — all four rows align whether or not resident.
-  ejectSlot: { width: 22, alignItems: 'center' as const, justifyContent: 'center' as const },
+  ejectSlot: {
+    width: 22,
+    alignItems: 'center' as const,
+    justifyContent: 'center' as const,
+  },
   ejectGlyph: { opacity: 0.8 },
   ramChip: {
     borderWidth: 1,
@@ -222,8 +264,19 @@ const createStyles = (colors: ThemeColors) => ({
   ramChipText: { ...TYPOGRAPHY.label, color: colors.textMuted },
   // Right-aligned value cluster: the name (shrinks/ellipsizes) with the remote cloud hugging its
   // right edge at the minimum token gap (xs) — the marker reads as part of the name, not the row.
-  valueGroup: { flex: 1, flexDirection: 'row' as const, alignItems: 'center' as const, justifyContent: 'flex-end' as const, gap: SPACING.xs },
-  value: { ...TYPOGRAPHY.body, color: colors.textMuted, flexShrink: 1, textAlign: 'right' as const },
+  valueGroup: {
+    flex: 1,
+    flexDirection: 'row' as const,
+    alignItems: 'center' as const,
+    justifyContent: 'flex-end' as const,
+    gap: SPACING.xs,
+  },
+  value: {
+    ...TYPOGRAPHY.body,
+    color: colors.textMuted,
+    flexShrink: 1,
+    textAlign: 'right' as const,
+  },
   valueSet: { color: colors.text },
   actions: {
     flexDirection: 'row' as const,
diff --git a/src/components/models/ModelsSummaryRow.tsx b/src/components/models/ModelsSummaryRow.tsx
index 47f3d84e4..1b4c74e81 100644
--- a/src/components/models/ModelsSummaryRow.tsx
+++ b/src/components/models/ModelsSummaryRow.tsx
@@ -21,6 +21,7 @@ type Props = {
 const TYPE_ICONS: { type: ModelRowType; icon: string; caption: string }[] = [
   { type: 'text', icon: 'message-square', caption: 'Text' },
   { type: 'image', icon: 'image', caption: 'Image' },
+  { type: 'video', icon: 'video', caption: 'Video' },
   { type: 'voice', icon: 'volume-2', caption: 'Voice' },
   { type: 'speech', icon: 'mic', caption: 'Speech' },
 ];
@@ -30,12 +31,23 @@ const TYPE_ICONS: { type: ModelRowType; icon: string; caption: string }[] = [
  * type — emerald + bright caption when that type has an active model, dimmed +
  * muted when not. Tap → manager sheet.
  */
-export const ModelsSummaryRow: React.FC<Props> = ({ labels, counts, isLoading, onPress, onPressType }) => {
+export const ModelsSummaryRow: React.FC<Props> = ({
+  labels,
+  counts,
+  isLoading,
+  onPress,
+  onPressType,
+}) => {
   const { colors } = useTheme();
   const styles = useThemedStyles(createStyles);
 
   return (
-    <AnimatedPressable style={styles.container} hapticType="selection" testID="models-summary" onPress={onPress}>
+    <AnimatedPressable
+      style={styles.container}
+      hapticType="selection"
+      testID="models-summary"
+      onPress={onPress}
+    >
       <View style={styles.header}>
         <Text style={styles.label}>Models</Text>
         {isLoading
@@ -51,26 +63,42 @@ export const ModelsSummaryRow: React.FC<Props> = ({ labels, counts, isLoading, o
               key={type}
               testID={`model-summary-${type}-open`}
               hapticType="selection"
-              onPress={(event) => { event?.stopPropagation?.(); (onPressType ?? onPress)(type); }}
+              onPress={event => {
+                event?.stopPropagation?.();
+                (onPressType ?? onPress)(type);
+              }}
             >
-            <View
-              testID={`model-summary-${type}`}
-              // `selected` reflects "this model type has an active model" — the same signal the
-              // caption/icon colour encodes visually. Exposed so a test can observe active-vs-dimmed
-              // state without inspecting colours (e.g. a remote text model active while local count = 0).
-              accessibilityState={{ selected: active }}
-              style={[styles.iconCol, !active && styles.inactive]}
-            >
-              <View style={styles.typeStack}>
-                <Icon name={icon} size={18} color={active ? colors.primary : colors.textMuted} />
-                <Text style={[styles.caption, active && styles.captionActive]}>{caption}</Text>
+              <View
+                testID={`model-summary-${type}`}
+                // `selected` reflects "this model type has an active model" — the same signal the
+                // caption/icon colour encodes visually. Exposed so a test can observe active-vs-dimmed
+                // state without inspecting colours (e.g. a remote text model active while local count = 0).
+                accessibilityState={{ selected: active }}
+                style={[styles.iconCol, !active && styles.inactive]}
+              >
+                <View style={styles.typeStack}>
+                  <Icon
+                    name={icon}
+                    size={18}
+                    color={active ? colors.primary : colors.textMuted}
+                  />
+                  <Text
+                    style={[styles.caption, active && styles.captionActive]}
+                  >
+                    {caption}
+                  </Text>
+                </View>
+                {typeof count === 'number' && (
+                  // Big numeral to the RIGHT of the icon+label, tall enough to span
+                  // both — fills the gap between types so the row reads at a glance.
+                  <Text
+                    testID={`model-summary-count-${type}`}
+                    style={[styles.count, count > 0 && styles.countActive]}
+                  >
+                    {count}
+                  </Text>
+                )}
               </View>
-              {typeof count === 'number' && (
-                // Big numeral to the RIGHT of the icon+label, tall enough to span
-                // both — fills the gap between types so the row reads at a glance.
-                <Text testID={`model-summary-count-${type}`} style={[styles.count, count > 0 && styles.countActive]}>{count}</Text>
-              )}
-            </View>
             </AnimatedPressable>
           );
         })}
@@ -95,13 +123,21 @@ const createStyles = (colors: ThemeColors, shadows: ThemeShadows) => ({
     alignItems: 'center' as const,
     justifyContent: 'space-between' as const,
   },
-  label: { ...TYPOGRAPHY.label, textTransform: 'uppercase' as const, color: colors.textMuted },
+  label: {
+    ...TYPOGRAPHY.label,
+    textTransform: 'uppercase' as const,
+    color: colors.textMuted,
+  },
   icons: {
     flexDirection: 'row' as const,
     justifyContent: 'space-between' as const,
     paddingHorizontal: SPACING.xs,
   },
-  iconCol: { flexDirection: 'row' as const, alignItems: 'center' as const, gap: SPACING.sm },
+  iconCol: {
+    flexDirection: 'row' as const,
+    alignItems: 'center' as const,
+    gap: SPACING.sm,
+  },
   inactive: { opacity: 0.35 },
   typeStack: { alignItems: 'center' as const, gap: SPACING.xs },
   caption: { ...TYPOGRAPHY.metaSmall, color: colors.textMuted },
@@ -109,6 +145,11 @@ const createStyles = (colors: ThemeColors, shadows: ThemeShadows) => ({
   // Numeral to the right of the icon+label. Thin (weight 200) and only modestly
   // larger than the icon so it reads as a quiet secondary count, not a loud hero —
   // matches the restrained terminal look. lineHeight spans the stack for centering.
-  count: { ...TYPOGRAPHY.display, fontSize: 18, lineHeight: 34, color: colors.textMuted },
+  count: {
+    ...TYPOGRAPHY.display,
+    fontSize: 18,
+    lineHeight: 34,
+    color: colors.textMuted,
+  },
   countActive: { color: colors.primary },
 });
diff --git a/src/components/models/useResidentRows.ts b/src/components/models/useResidentRows.ts
index d226564e0..fd1b6ef17 100644
--- a/src/components/models/useResidentRows.ts
+++ b/src/components/models/useResidentRows.ts
@@ -14,27 +14,32 @@ import type { Resident, ResidentType } from '../../services/modelResidency/polic
 /** The manager sheet's modality rows. Defined HERE (the lower-level projection) rather than in
  *  ModelsManagerSheet so the hook doesn't import the component — that was a dependency cycle
  *  (ModelsManagerSheet → useResidentRows → ModelsManagerSheet). The sheet re-exports it. */
-export type ModelRowType = 'text' | 'image' | 'voice' | 'speech';
+export type ModelRowType = 'text' | 'image' | 'video' | 'voice' | 'speech';
 
 /** Sheet row → residency type. Voice is the TTS output engine; Speech is the Whisper STT input. */
 const ROW_RESIDENT_TYPE: Record<ModelRowType, ResidentType> = {
   text: 'text',
   image: 'image',
+  video: 'video',
   voice: 'tts',
   speech: 'whisper',
 };
 
 /** Pure: pick the resident (if any) backing each sheet row. */
-function residentsByRow(residents: Resident[]): Partial<Record<ModelRowType, Resident>> {
+function residentsByRow(
+  residents: Resident[],
+): Partial<Record<ModelRowType, Resident>> {
   const out: Partial<Record<ModelRowType, Resident>> = {};
-  (Object.keys(ROW_RESIDENT_TYPE) as ModelRowType[]).forEach((row) => {
-    const match = residents.find((r) => r.type === ROW_RESIDENT_TYPE[row]);
+  (Object.keys(ROW_RESIDENT_TYPE) as ModelRowType[]).forEach(row => {
+    const match = residents.find(r => r.type === ROW_RESIDENT_TYPE[row]);
     if (match) out[row] = match;
   });
   return out;
 }
 
-export function useResidentRows(active: boolean): Partial<Record<ModelRowType, Resident>> {
+export function useResidentRows(
+  active: boolean,
+): Partial<Record<ModelRowType, Resident>> {
   const [byRow, setByRow] = useState<Partial<Record<ModelRowType, Resident>>>(
     () => residentsByRow(modelResidencyManager.getResidents()),
   );
diff --git a/src/screens/DownloadManagerScreen/items.tsx b/src/screens/DownloadManagerScreen/items.tsx
index a6153d7c0..9d87a1a63 100644
--- a/src/screens/DownloadManagerScreen/items.tsx
+++ b/src/screens/DownloadManagerScreen/items.tsx
@@ -18,7 +18,7 @@ import { predictGgufCapabilities } from '../../utils/ggufCapabilities';
 
 export type DownloadItem = {
   type: 'active' | 'completed';
-  modelType: 'text' | 'image' | 'tts' | 'stt';
+  modelType: 'text' | 'image' | 'video' | 'tts' | 'stt';
   downloadId?: string;
   modelKey?: string;
   modelId: string;
@@ -71,7 +71,12 @@ function textCapabilities(item: DownloadItem) {
 
 function getStatusLabel(item: DownloadItem): string {
   if (item.status === 'running') return '';
-  if (item.status === 'failed' || item.status === 'retrying' || item.status === 'pending' || item.status === 'waiting_for_network') {
+  if (
+    item.status === 'failed' ||
+    item.status === 'retrying' ||
+    item.status === 'pending' ||
+    item.status === 'waiting_for_network'
+  ) {
     return getDownloadStatusLabel(item.status, item.reasonCode, item.reason);
   }
   if (!item.reason && !item.reasonCode) return getStatusText(item.status);
@@ -88,7 +93,13 @@ interface ActiveDownloadCardProps {
   onResume: (item: DownloadItem) => void;
 }
 
-export const ActiveDownloadCard: React.FC<ActiveDownloadCardProps> = ({ item, onRemove, onRetry, onPause, onResume }) => {
+export const ActiveDownloadCard: React.FC<ActiveDownloadCardProps> = ({
+  item,
+  onRemove,
+  onRetry,
+  onPause,
+  onResume,
+}) => {
   const { colors } = useTheme();
   const styles = useThemedStyles(createStyles);
   const progressColor =
@@ -120,78 +131,158 @@ export const ActiveDownloadCard: React.FC<ActiveDownloadCardProps> = ({ item, on
   return (
     <ModelCard
       compact
-      model={{ id: item.modelId, name: item.fileName, author: item.author,
-        modelType: item.isVisionModel ? 'vision' : item.modelType === 'text' ? 'text' : undefined }}
-      file={{ name: item.fileName, size: item.fileSize, quantization: item.quantization, downloadUrl: '' }}
+      model={{
+        id: item.modelId,
+        name: item.fileName,
+        author: item.author,
+        modelType: item.isVisionModel
+          ? 'vision'
+          : item.modelType === 'text'
+            ? 'text'
+            : undefined,
+      }}
+      file={{
+        name: item.fileName,
+        size: item.fileSize,
+        quantization: item.quantization,
+        downloadUrl: '',
+      }}
       capabilities={textCapabilities(item)}
-      facts={[item.modelType === 'tts' ? 'Voice' : item.modelType === 'stt' ? 'Transcription' : item.modelType === 'image' ? 'Image' : 'Text']}
-      footer={<>
-      <View style={styles.progressContainer}>
-        <View style={styles.transferRow}>
-          <View style={[styles.progressBarBackground, styles.transferProgressBar]}>
-            <View style={[styles.progressBarFill, { width: `${percentage}%` as const, backgroundColor: progressColor }]} />
-          </View>
-          <View style={styles.transferActions}>
-            {item.status === 'failed' ? (
-              <>
-                {isRetryable(item.reasonCode) && !item.modelKey?.startsWith('model-download:') && (
-                  <TouchableOpacity style={styles.transferIconButton} hitSlop={SPACING.md} testID="failed-retry-button" accessibilityRole="button" accessibilityLabel={`Retry ${item.fileName}`} onPress={() => onRetry(item)}>
-                    <Icon name="refresh-cw" size={14} color={colors.primary} />
-                  </TouchableOpacity>
+      facts={[
+        item.modelType === 'tts'
+          ? 'Voice'
+          : item.modelType === 'stt'
+            ? 'Transcription'
+            : item.modelType === 'video'
+              ? 'Video'
+              : item.modelType === 'image'
+                ? 'Image'
+                : 'Text',
+      ]}
+      footer={
+        <>
+          <View style={styles.progressContainer}>
+            <View style={styles.transferRow}>
+              <View
+                style={[
+                  styles.progressBarBackground,
+                  styles.transferProgressBar,
+                ]}
+              >
+                <View
+                  style={[
+                    styles.progressBarFill,
+                    {
+                      width: `${percentage}%` as const,
+                      backgroundColor: progressColor,
+                    },
+                  ]}
+                />
+              </View>
+              <View style={styles.transferActions}>
+                {item.status === 'failed' ? (
+                  <>
+                    {isRetryable(item.reasonCode) &&
+                      !item.modelKey?.startsWith('model-download:') && (
+                        <TouchableOpacity
+                          style={styles.transferIconButton}
+                          hitSlop={SPACING.md}
+                          testID="failed-retry-button"
+                          accessibilityRole="button"
+                          accessibilityLabel={`Retry ${item.fileName}`}
+                          onPress={() => onRetry(item)}
+                        >
+                          <Icon
+                            name="refresh-cw"
+                            size={14}
+                            color={colors.primary}
+                          />
+                        </TouchableOpacity>
+                      )}
+                    <TouchableOpacity
+                      style={styles.transferIconButton}
+                      hitSlop={SPACING.md}
+                      testID="failed-remove-button"
+                      accessibilityRole="button"
+                      accessibilityLabel={`Remove ${item.fileName}`}
+                      onPress={() => onRemove(item)}
+                    >
+                      <Icon name="trash-2" size={14} color={colors.error} />
+                    </TouchableOpacity>
+                  </>
+                ) : (
+                  <>
+                    {(item.canPause || item.canResume) && (
+                      <TouchableOpacity
+                        style={styles.transferIconButton}
+                        accessibilityRole="button"
+                        accessibilityLabel={`${item.canResume ? 'Resume' : 'Pause'} ${item.fileName}`}
+                        hitSlop={6}
+                        onPress={() =>
+                          item.canResume ? onResume(item) : onPause(item)
+                        }
+                      >
+                        <Icon
+                          name={item.canResume ? 'play' : 'pause'}
+                          size={14}
+                          color={colors.primary}
+                        />
+                      </TouchableOpacity>
+                    )}
+                    <TouchableOpacity
+                      style={styles.transferIconButton}
+                      testID="remove-download-button"
+                      accessibilityRole="button"
+                      accessibilityLabel={`Remove ${item.fileName}`}
+                      hitSlop={6}
+                      onPress={() => onRemove(item)}
+                    >
+                      <Icon name="x" size={16} color={colors.error} />
+                    </TouchableOpacity>
+                  </>
                 )}
-                <TouchableOpacity style={styles.transferIconButton} hitSlop={SPACING.md} testID="failed-remove-button" accessibilityRole="button" accessibilityLabel={`Remove ${item.fileName}`} onPress={() => onRemove(item)}>
-                  <Icon name="trash-2" size={14} color={colors.error} />
-                </TouchableOpacity>
-              </>
-            ) : (
-              <>
-              {(item.canPause || item.canResume) && (
-                <TouchableOpacity
-                  style={styles.transferIconButton}
-                  accessibilityRole="button"
-                  accessibilityLabel={`${item.canResume ? 'Resume' : 'Pause'} ${item.fileName}`}
-                  hitSlop={6}
-                  onPress={() => item.canResume ? onResume(item) : onPause(item)}
-                >
-                  <Icon name={item.canResume ? 'play' : 'pause'} size={14} color={colors.primary} />
-                </TouchableOpacity>
-              )}
-                <TouchableOpacity
-                  style={styles.transferIconButton}
-                  testID="remove-download-button"
-                  accessibilityRole="button"
-                  accessibilityLabel={`Remove ${item.fileName}`}
-                  hitSlop={6}
-                  onPress={() => onRemove(item)}
-                >
-                  <Icon name="x" size={16} color={colors.error} />
-                </TouchableOpacity>
-              </>
-            )}
+              </View>
+            </View>
+            <View style={styles.transferCaptionRow}>
+              <Text
+                style={styles.progressText}
+                testID="download-progress-detail"
+              >
+                {presented.detailText}
+              </Text>
+              <Text style={styles.progressText}>
+                {presented.percentageText}
+              </Text>
+            </View>
           </View>
-        </View>
-        <View style={styles.transferCaptionRow}>
-          <Text style={styles.progressText} testID="download-progress-detail">{presented.detailText}</Text>
-          <Text style={styles.progressText}>{presented.percentageText}</Text>
-        </View>
-      </View>
-      <View style={styles.downloadMeta}>
-        {(!!getStatusLabel(item) || !!getStatusIcon()) && (
-          <View style={styles.statusIconRow}>
-            {getStatusIcon() && (
-              <Icon name={getStatusIcon()!} size={14} color={getStatusIconColor()} accessibilityLabel={getStatusText(item.status)} />
-            )}
-            {/* Queued is icon-only (clock) — the word is redundant next to it. Other states
+          <View style={styles.downloadMeta}>
+            {(!!getStatusLabel(item) || !!getStatusIcon()) && (
+              <View style={styles.statusIconRow}>
+                {getStatusIcon() && (
+                  <Icon
+                    name={getStatusIcon()!}
+                    size={14}
+                    color={getStatusIconColor()}
+                    accessibilityLabel={getStatusText(item.status)}
+                  />
+                )}
+                {/* Queued is icon-only (clock) — the word is redundant next to it. Other states
                 (failed/retrying/network) keep their explanatory text. */}
-            {item.status !== 'pending' && !!getStatusLabel(item) && (
-              <Text style={[styles.statusText, item.status === 'failed' && { color: colors.error }]}>
-                {getStatusLabel(item)}
-              </Text>
+                {item.status !== 'pending' && !!getStatusLabel(item) && (
+                  <Text
+                    style={[
+                      styles.statusText,
+                      item.status === 'failed' && { color: colors.error },
+                    ]}
+                  >
+                    {getStatusLabel(item)}
+                  </Text>
+                )}
+              </View>
             )}
           </View>
-        )}
-      </View>
-      </>}
+        </>
+      }
     />
   );
 };
@@ -206,7 +297,15 @@ interface CompletedDownloadCardProps {
   isRepairingVision?: boolean;
 }
 
-export const CompletedDownloadCard: React.FC<CompletedDownloadCardProps> = ({ item, onDelete, onRepairVision, onPauseRepair, onResumeRepair, onCancelRepair, isRepairingVision = false }) => {
+export const CompletedDownloadCard: React.FC<CompletedDownloadCardProps> = ({
+  item,
+  onDelete,
+  onRepairVision,
+  onPauseRepair,
+  onResumeRepair,
+  onCancelRepair,
+  isRepairingVision = false,
+}) => {
   const needsVisionRepair = checkNeedsVisionRepair(item);
   // A vision repair drives a live download-store row keyed on the completed
   // model's modelKey (`repo/file` = item.modelId). Read it so the SAME
@@ -223,21 +322,60 @@ export const CompletedDownloadCard: React.FC<CompletedDownloadCardProps> = ({ it
           id: item.modelId,
           name: item.fileName,
           author: item.author,
-          modelType: item.isVisionModel ? 'vision' : item.modelType === 'text' ? 'text' : undefined,
-          description: item.downloadedAt ? new Date(item.downloadedAt).toLocaleDateString() : undefined,
+          modelType: item.isVisionModel
+            ? 'vision'
+            : item.modelType === 'text'
+              ? 'text'
+              : undefined,
+          description: item.downloadedAt
+            ? new Date(item.downloadedAt).toLocaleDateString()
+            : undefined,
+        }}
+        file={{
+          name: item.fileName,
+          size: item.fileSize,
+          quantization: item.quantization,
+          downloadUrl: '',
         }}
-        file={{ name: item.fileName, size: item.fileSize, quantization: item.quantization, downloadUrl: '' }}
         capabilities={textCapabilities(item)}
         isDownloaded
         isDownloading={showRepairProgress && repairEntry.status !== 'paused'}
         isPaused={showRepairProgress && repairEntry.status === 'paused'}
         isRepairingVision={repairActive}
         downloadProgress={repairEntry?.progress}
-        downloadBytes={repairEntry ? { downloaded: repairEntry.bytesDownloaded, total: repairEntry.totalBytes, bytesPerSecond: repairEntry.bytesPerSecond } : undefined}
-        onRepairVision={needsVisionRepair && onRepairVision ? () => onRepairVision(item) : undefined}
-        onPause={showRepairProgress && repairEntry.status === 'running' && onPauseRepair ? () => onPauseRepair(item) : undefined}
-        onResume={showRepairProgress && repairEntry.status === 'paused' && onResumeRepair ? () => onResumeRepair(item) : undefined}
-        onCancel={showRepairProgress && onCancelRepair ? () => onCancelRepair(item) : undefined}
+        downloadBytes={
+          repairEntry
+            ? {
+                downloaded: repairEntry.bytesDownloaded,
+                total: repairEntry.totalBytes,
+                bytesPerSecond: repairEntry.bytesPerSecond,
+              }
+            : undefined
+        }
+        onRepairVision={
+          needsVisionRepair && onRepairVision
+            ? () => onRepairVision(item)
+            : undefined
+        }
+        onPause={
+          showRepairProgress &&
+          repairEntry.status === 'running' &&
+          onPauseRepair
+            ? () => onPauseRepair(item)
+            : undefined
+        }
+        onResume={
+          showRepairProgress &&
+          repairEntry.status === 'paused' &&
+          onResumeRepair
+            ? () => onResumeRepair(item)
+            : undefined
+        }
+        onCancel={
+          showRepairProgress && onCancelRepair
+            ? () => onCancelRepair(item)
+            : undefined
+        }
         onDelete={() => onDelete(item)}
       />
     </View>
diff --git a/src/screens/DownloadManagerScreen/useDownloadManager.ts b/src/screens/DownloadManagerScreen/useDownloadManager.ts
index 766567439..df2ba9664 100644
--- a/src/screens/DownloadManagerScreen/useDownloadManager.ts
+++ b/src/screens/DownloadManagerScreen/useDownloadManager.ts
@@ -48,8 +48,12 @@ export function useDownloadManager(): UseDownloadManagerResult {
   const [alertState, setAlertState] = useState<AlertState>(initialAlertState);
   const repairingVisionIds = useDownloadStore(s => s.repairingVisionIds);
   const setRepairingVision = useDownloadStore(s => s.setRepairingVision);
-  const { downloadedModels, setDownloadedModels, downloadedImageModels } =
-    useAppStore();
+  const {
+    downloadedModels,
+    setDownloadedModels,
+    downloadedImageModels,
+    downloadedVideoModels,
+  } = useAppStore();
 
   const downloads = useDownloadStore(state => state.downloads);
   const removeDownloadEntry = useDownloadStore(state => state.remove);
@@ -149,6 +153,23 @@ export function useDownloadManager(): UseDownloadManagerResult {
   const completedItems: DownloadItem[] = [
     ...modelStoreCompletedItems(downloadedModels, downloadedImageModels),
     ...voiceCompleted,
+    ...downloadedVideoModels.map(model => ({
+      type: 'completed' as const,
+      modelType: 'video' as const,
+      modelId: model.id,
+      fileName: model.name,
+      name: model.name,
+      author: model.org ?? '',
+      quantization: model.quant ?? '',
+      fileSize: model.files.reduce(
+        (sum, file) => sum + (file.sizeBytes ?? 0),
+        0,
+      ),
+      bytesDownloaded: 0,
+      progress: 1,
+      status: 'completed',
+      downloadedAt: model.downloadedAt,
+    })),
   ];
 
   // One entry per model. A downloaded (registered, on-disk) model is authoritative, so
@@ -293,6 +314,34 @@ export function useDownloadManager(): UseDownloadManagerResult {
   };
 
   const handleDeleteItem = (item: DownloadItem) => {
+    if (item.modelType === 'video') {
+      setAlertState(
+        showAlert(
+          'Delete Video Model',
+          `Delete "${item.fileName}" and free ${formatBytes(item.fileSize)}?`,
+          [
+            { text: 'Cancel', style: 'cancel' },
+            {
+              text: 'Delete',
+              style: 'destructive',
+              onPress: () => {
+                void modelDownloadService
+                  .remove(idOf(item))
+                  .catch(error =>
+                    setAlertState(
+                      showAlert(
+                        'Could not delete model',
+                        String(error.message),
+                      ),
+                    ),
+                  );
+              },
+            },
+          ],
+        ),
+      );
+      return;
+    }
     if (item.modelType === 'tts' || item.modelType === 'stt') {
       setAlertState(buildVoiceDeleteAlert(item));
       return;
diff --git a/src/screens/ModelSettingsScreen/index.tsx b/src/screens/ModelSettingsScreen/index.tsx
index e43e05e4d..f32e3930c 100644
--- a/src/screens/ModelSettingsScreen/index.tsx
+++ b/src/screens/ModelSettingsScreen/index.tsx
@@ -1,3 +1,4 @@
+import { VideoGenerationSection } from '../../components/GenerationSettingsModal/VideoGenerationSection';
 import React, { useState } from 'react';
 import { View, Text, ScrollView, TouchableOpacity } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
@@ -47,19 +48,19 @@ export const ModelSettingsScreen: React.FC = () => {
   const handleReset = () => {
     setAlertState(
       showAlert(
-      'Reset All Settings',
-      'This will restore all model settings to their defaults. You may need to reload the model for changes to take effect.',
-      [
-        { text: 'Cancel', style: 'cancel' },
-        {
-          text: 'Reset',
-          style: 'destructive',
+        'Reset All Settings',
+        'This will restore all model settings to their defaults. You may need to reload the model for changes to take effect.',
+        [
+          { text: 'Cancel', style: 'cancel' },
+          {
+            text: 'Reset',
+            style: 'destructive',
             onPress: () => {
               resetSettings();
               setAlertState(hideAlert());
             },
-        },
-      ],
+          },
+        ],
       ),
     );
   };
@@ -110,6 +111,7 @@ export const ModelSettingsScreen: React.FC = () => {
           />
         </TouchableOpacity>
         {imageOpen && <ImageGenerationSection />}
+        <VideoGenerationSection />
 
         <TouchableOpacity
           style={styles.accordionHeader}
diff --git a/src/screens/ModelsScreen/VideoModelsTab.tsx b/src/screens/ModelsScreen/VideoModelsTab.tsx
new file mode 100644
index 000000000..6bc6cac99
--- /dev/null
+++ b/src/screens/ModelsScreen/VideoModelsTab.tsx
@@ -0,0 +1,253 @@
+import React, { useEffect, useState } from 'react';
+import { ScrollView, Text, TextInput, View } from 'react-native';
+import {
+  CATALOG,
+  searchHuggingFace,
+  getModelFiles,
+  resolveHuggingFaceModel,
+  formatFileSize,
+  determineCredibility,
+} from '@offgrid/models';
+import type { HFSearchResult, ModelFileVariant } from '@offgrid/models';
+import { Button, ModelCard } from '../../components';
+import { LoadingDots } from '../../components/LoadingDots';
+import { useAppStore } from '../../stores';
+import { useRemoteServerStore } from '../../stores/remoteServerStore';
+import { useDownloadStore } from '../../stores/downloadStore';
+import { modelDownloadService } from '../../services/modelDownloadService';
+import { useTheme, useThemedStyles } from '../../theme';
+import { createStyles } from './styles';
+
+export const VideoModelsTab: React.FC = () => {
+  const styles = useThemedStyles(createStyles),
+    { colors } = useTheme();
+  const [query, setQuery] = useState('');
+  const [results, setResults] = useState<HFSearchResult[]>([]);
+  const [selected, setSelected] = useState<HFSearchResult | null>(null);
+  const [files, setFiles] = useState<ModelFileVariant[]>([]);
+  const [searchLoading, setSearchLoading] = useState(false);
+  const [filesLoading, setFilesLoading] = useState(false);
+  const loading = selected ? filesLoading : searchLoading;
+  const [error, setError] = useState<string | null>(null);
+  const models = useAppStore(s => s.downloadedVideoModels);
+  const active = useAppStore(s => s.activeVideoModelId);
+  const downloads = useDownloadStore(s => s.downloads);
+  useEffect(() => {
+    let current = true;
+    if (!query.trim()) {
+      setResults([]);
+      setSearchLoading(false);
+      return;
+    }
+    setSearchLoading(true);
+    setError(null);
+    const timer = setTimeout(() => {
+      searchHuggingFace(query.trim(), { kind: 'video' })
+        .then(rows => {
+          if (current) setResults(rows);
+        })
+        .catch(e => {
+          if (current) setError(String(e.message));
+        })
+        .finally(() => {
+          if (current) setSearchLoading(false);
+        });
+    }, 300);
+    return () => {
+      current = false;
+      clearTimeout(timer);
+    };
+  }, [query]);
+  useEffect(() => {
+    if (!selected) return;
+    let current = true;
+    setFiles([]);
+    setFilesLoading(true);
+    setError(null);
+    getModelFiles(selected.id, { kind: 'video' })
+      .then(rows => {
+        if (current) setFiles(rows);
+      })
+      .catch(e => {
+        if (current) setError(String(e.message));
+      })
+      .finally(() => {
+        if (current) setFilesLoading(false);
+      });
+    return () => {
+      current = false;
+    };
+  }, [selected]);
+  const act = (work: () => Promise<unknown>) => {
+    void work().catch(e => setError(String(e.message)));
+  };
+  const download = (fileName: string) =>
+    act(async () => {
+      if (!selected) return;
+      const model = await resolveHuggingFaceModel(selected.id, {
+        kind: 'video',
+        fileName,
+      });
+      if (!model) throw new Error('This file is no longer available.');
+      await modelDownloadService.start({ modelType: 'video', model });
+    });
+  const defaults = CATALOG.filter(m => m.kind === 'video');
+  const rows = query.trim()
+    ? results
+    : defaults.map(m => ({ id: m.id, name: m.name, org: m.org ?? '' }));
+  return (
+    <ScrollView keyboardShouldPersistTaps="handled">
+      {selected ? (
+        <>
+          <Button
+            title="Back to video models"
+            variant="ghost"
+            onPress={() => setSelected(null)}
+          />
+          <Text style={{ color: colors.text }}>{selected.name}</Text>
+          <Text style={{ color: colors.textSecondary }}>
+            Each download includes the required text encoder and VAE.
+          </Text>
+          {!loading && files.length === 0 && (
+            <Text style={{ color: colors.textMuted }}>
+              No files in this repository are supported by this build. Local
+              generation currently requires Wan 2.1 T2V 1.3B.
+            </Text>
+          )}
+          {files.map(file => (
+            <Button
+              key={file.fileName}
+              title={`${file.fileName} · ${formatFileSize(file.sizeBytes)}`}
+              variant="outline"
+              disabled={
+                !!downloads[`video:${selected.id}`] ||
+                models.some(model => model.id === selected.id)
+              }
+              onPress={() => download(file.fileName)}
+            />
+          ))}
+        </>
+      ) : (
+        <>
+          <View style={styles.searchContainer}>
+            <TextInput
+              style={styles.searchInput}
+              value={query}
+              onChangeText={setQuery}
+              accessibilityLabel="Search video models on Hugging Face"
+              placeholder="Search Hugging Face"
+              placeholderTextColor={colors.textMuted}
+              autoCapitalize="none"
+            />
+          </View>
+          {rows.map(row => {
+            const catalogEntry = defaults.find(model => model.id === row.id);
+            const installed = models.some(m => m.id === row.id),
+              transfer = downloads[`video:${row.id}`];
+            return (
+              <ModelCard
+                key={row.id}
+                model={{ id: row.id, name: row.name, author: row.org }}
+                facts={
+                  catalogEntry?.availabilityNote
+                    ? [catalogEntry.availabilityNote]
+                    : undefined
+                }
+                isDownloaded={installed}
+                isActive={active === row.id}
+                isDownloading={transfer?.status === 'running'}
+                isPaused={transfer?.status === 'paused'}
+                isQueued={transfer?.status === 'pending'}
+                downloadProgress={transfer?.progress}
+                onPress={() =>
+                  setSelected({
+                    ...row,
+                    credibility: determineCredibility(row.org),
+                  })
+                }
+                onDownload={
+                  catalogEntry?.availability === 'coming_soon'
+                    ? undefined
+                    : () =>
+                        setSelected({
+                          ...row,
+                          credibility: determineCredibility(row.org),
+                        })
+                }
+                onSelect={
+                  installed
+                    ? () => {
+                        useAppStore.getState().setActiveVideoModelId(row.id);
+                        useRemoteServerStore
+                          .getState()
+                          .setActiveRemoteMediaServerId('video', null);
+                      }
+                    : undefined
+                }
+                onDelete={
+                  installed
+                    ? () =>
+                        act(() =>
+                          modelDownloadService.remove(`video:${row.id}`),
+                        )
+                    : undefined
+                }
+                onPause={
+                  transfer?.status === 'running'
+                    ? () =>
+                        act(() => modelDownloadService.pause(`video:${row.id}`))
+                    : undefined
+                }
+                onResume={
+                  transfer?.status === 'paused'
+                    ? () =>
+                        act(() =>
+                          modelDownloadService.resume(`video:${row.id}`),
+                        )
+                    : undefined
+                }
+                onCancel={
+                  transfer
+                    ? () =>
+                        act(() =>
+                          modelDownloadService.cancel(`video:${row.id}`),
+                        )
+                    : undefined
+                }
+                failedState={
+                  transfer?.status === 'failed'
+                    ? {
+                        errorMessage:
+                          transfer.errorMessage ?? 'Download failed.',
+                        bytesDownloaded: transfer.bytesDownloaded,
+                        totalBytes: transfer.totalBytes,
+                        onRetry: () =>
+                          act(() =>
+                            modelDownloadService.retry(`video:${row.id}`),
+                          ),
+                        onRemove: () =>
+                          act(() =>
+                            modelDownloadService.remove(`video:${row.id}`),
+                          ),
+                      }
+                    : undefined
+                }
+              />
+            );
+          })}
+          {!loading && query.trim() && rows.length === 0 && (
+            <Text style={{ color: colors.textMuted }}>
+              No compatible video repositories found.
+            </Text>
+          )}
+        </>
+      )}
+      {loading && <LoadingDots />}
+      {error && (
+        <Text accessibilityRole="alert" style={{ color: colors.error }}>
+          {error}
+        </Text>
+      )}
+    </ScrollView>
+  );
+};
diff --git a/src/screens/ModelsScreen/index.tsx b/src/screens/ModelsScreen/index.tsx
index b011fb279..dc2a1087d 100644
--- a/src/screens/ModelsScreen/index.tsx
+++ b/src/screens/ModelsScreen/index.tsx
@@ -1,3 +1,4 @@
+import { VideoModelsTab } from './VideoModelsTab';
 import React, { useCallback, useRef } from 'react';
 import { View, Text, TouchableOpacity, StyleSheet, ScrollView } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
@@ -17,9 +18,14 @@ import { useSlot, SLOTS } from '../../bootstrap/slotRegistry';
 import type { ModelTab } from './types';
 import { ScreenHeader } from '../../components/ScreenHeader';
 
-const MODEL_TABS: ReadonlyArray<{ key: ModelTab; label: string; testID?: string }> = [
+const MODEL_TABS: ReadonlyArray<{
+  key: ModelTab;
+  label: string;
+  testID?: string;
+}> = [
   { key: 'text', label: 'Text' },
   { key: 'image', label: 'Image' },
+  { key: 'video', label: 'Video' },
   { key: 'voice', label: 'Voice', testID: 'voice-models-tab' },
   { key: 'transcription', label: 'Speech', testID: 'transcription-models-tab' },
 ];
@@ -39,11 +45,16 @@ const ScreenFrame: React.FC<{
     <SafeAreaView style={styles.container} edges={['top']} testID="models-screen">{children}</SafeAreaView>
   );
 
-const HideWhenEmbedded: React.FC<{ embedded: boolean; children: React.ReactNode }> = ({ embedded, children }) => (
+const HideWhenEmbedded: React.FC<{
+  embedded: boolean;
+  children: React.ReactNode;
+}> = ({ embedded, children }) => (
   <View style={embedded ? collapsedStyle.hidden : undefined}>{children}</View>
 );
 
-export const ModelsScreen: React.FC<ModelsScreenProps> = ({ embedded = false }) => {
+export const ModelsScreen: React.FC<ModelsScreenProps> = ({
+  embedded = false,
+}) => {
   const { colors } = useTheme();
   const styles = useThemedStyles(createStyles);
   const vm = useModelsScreen();
@@ -114,24 +125,33 @@ export const ModelsScreen: React.FC<ModelsScreenProps> = ({ embedded = false })
           />
         </HideWhenEmbedded>
 
-        <HideWhenEmbedded embedded={embedded}><View>
-          {vm.activeTab === 'text' && vm.isImporting && vm.importProgress && (
-            <View style={styles.importProgressCard}>
-              <View style={styles.importProgressHeader}>
-                <Icon name="file" size={18} color={colors.primary} />
-                <Text style={styles.importProgressText} numberOfLines={1}>
-                  Importing {vm.importProgress.fileName}
+        <HideWhenEmbedded embedded={embedded}>
+          <View>
+            {vm.activeTab === 'text' && vm.isImporting && vm.importProgress && (
+              <View style={styles.importProgressCard}>
+                <View style={styles.importProgressHeader}>
+                  <Icon name="file" size={18} color={colors.primary} />
+                  <Text style={styles.importProgressText} numberOfLines={1}>
+                    Importing {vm.importProgress.fileName}
+                  </Text>
+                </View>
+                <View style={styles.imageProgressBar}>
+                  <View
+                    style={[
+                      styles.imageProgressFill,
+                      {
+                        width: `${Math.round(vm.importProgress.fraction * 100)}%`,
+                      },
+                    ]}
+                  />
+                </View>
+                <Text style={styles.importProgressPercent}>
+                  {Math.round(vm.importProgress.fraction * 100)}%
                 </Text>
               </View>
-              <View style={styles.imageProgressBar}>
-                <View style={[styles.imageProgressFill, { width: `${Math.round(vm.importProgress.fraction * 100)}%` }]} />
-              </View>
-              <Text style={styles.importProgressPercent}>
-                {Math.round(vm.importProgress.fraction * 100)}%
-              </Text>
-            </View>
-          )}
-        </View></HideWhenEmbedded>
+            )}
+          </View>
+        </HideWhenEmbedded>
 
         {/* Tab Bar (horizontally scrollable — four tabs don't fit on a phone) */}
         <ScrollView
@@ -205,6 +225,7 @@ export const ModelsScreen: React.FC<ModelsScreenProps> = ({ embedded = false })
       )}
 
       {/* Image Models Tab */}
+      {vm.activeTab === 'video' && <VideoModelsTab />}
       {vm.activeTab === 'image' && (
         <ImageModelsTab
           imageSearchQuery={vm.imageSearchQuery}
diff --git a/src/screens/ModelsScreen/types.ts b/src/screens/ModelsScreen/types.ts
index fe275adc3..512bb744d 100644
--- a/src/screens/ModelsScreen/types.ts
+++ b/src/screens/ModelsScreen/types.ts
@@ -13,7 +13,7 @@ export type SizeFilter = 'all' | 'tiny' | 'small' | 'medium' | 'large';
 export type SortOption = 'recommended' | 'bestfit' | 'size' | 'downloads' | 'recency';
 export type FilterDimension = 'org' | 'type' | 'source' | 'size' | 'quant' | 'sort' | null;
 export type ImageFilterDimension = 'backend' | 'style' | 'sdVersion' | null;
-export type ModelTab = 'text' | 'image' | 'voice' | 'transcription';
+export type ModelTab = 'text' | 'image' | 'video' | 'voice' | 'transcription';
 
 export interface FilterState {
   orgs: string[];
diff --git a/src/screens/StorageSettingsScreen.tsx b/src/screens/StorageSettingsScreen.tsx
index 2b960be3a..412a451c3 100644
--- a/src/screens/StorageSettingsScreen.tsx
+++ b/src/screens/StorageSettingsScreen.tsx
@@ -30,10 +30,8 @@ export const StorageSettingsScreen: React.FC = () => {
   const [availableStorage, setAvailableStorage] = useState(0);
   const [alertState, setAlertState] = useState<AlertState>(initialAlertState);
 
-  const {
-    downloadedModels,
-    downloadedImageModels,
-  } = useAppStore();
+  const { downloadedModels, downloadedImageModels, downloadedVideoModels } =
+    useAppStore();
   const { conversations } = useChatStore();
   const transcriptionModelCount = useWhisperStore(s => s.presentModelIds.length);
   const speechModelCount = useModelDownloads().filter(
@@ -42,7 +40,17 @@ export const StorageSettingsScreen: React.FC = () => {
   const downloads = useDownloadStore(s => s.downloads);
   const removeFromStore = useDownloadStore(s => s.remove);
 
-  const imageStorageUsed = downloadedImageModels.reduce((total, m) => total + (m.size || 0), 0);
+  const imageStorageUsed = downloadedImageModels.reduce(
+    (total, m) => total + (m.size || 0),
+    0,
+  );
+
+  const videoStorageUsed = downloadedVideoModels.reduce(
+    (total, model) =>
+      total +
+      model.files.reduce((size, file) => size + (file.sizeBytes ?? 0), 0),
+    0,
+  );
 
   // A "stale" entry is a store entry missing the basic fields needed to
   // display or finalize it. Now sourced from the unified download store.
@@ -53,9 +61,9 @@ export const StorageSettingsScreen: React.FC = () => {
   const loadStorageInfo = useCallback(async () => {
     const used = await modelManager.getStorageUsed();
     const available = await modelManager.getAvailableStorage();
-    setStorageUsed(used + imageStorageUsed);
+    setStorageUsed(used + imageStorageUsed + videoStorageUsed);
     setAvailableStorage(available);
-  }, [imageStorageUsed]);
+  }, [imageStorageUsed, videoStorageUsed]);
 
   useEffect(() => {
     loadStorageInfo();
@@ -105,7 +113,10 @@ export const StorageSettingsScreen: React.FC = () => {
         <Text style={styles.title}>Storage</Text>
       </View>
 
-      <ScrollView style={styles.scrollView} contentContainerStyle={styles.content}>
+      <ScrollView
+        style={styles.scrollView}
+        contentContainerStyle={styles.content}
+      >
         <Card style={styles.section}>
           <Text style={styles.sectionTitle}>Storage Usage</Text>
           <View style={styles.storageBar}>
@@ -113,12 +124,23 @@ export const StorageSettingsScreen: React.FC = () => {
           </View>
           <View style={styles.storageLegend}>
             <View style={styles.legendItem}>
-              <View style={[styles.legendDot, { backgroundColor: colors.primary }]} />
-              <Text style={styles.legendText}>Used: {hardwareService.formatBytes(storageUsed)}</Text>
+              <View
+                style={[styles.legendDot, { backgroundColor: colors.primary }]}
+              />
+              <Text style={styles.legendText}>
+                Used: {hardwareService.formatBytes(storageUsed)}
+              </Text>
             </View>
             <View style={styles.legendItem}>
-              <View style={[styles.legendDot, { backgroundColor: colors.surfaceLight }]} />
-              <Text style={styles.legendText}>Free: {hardwareService.formatBytes(availableStorage)}</Text>
+              <View
+                style={[
+                  styles.legendDot,
+                  { backgroundColor: colors.surfaceLight },
+                ]}
+              />
+              <Text style={styles.legendText}>
+                Free: {hardwareService.formatBytes(availableStorage)}
+              </Text>
             </View>
           </View>
         </Card>
@@ -139,6 +161,13 @@ export const StorageSettingsScreen: React.FC = () => {
             </View>
             <Text style={styles.infoValue}>{downloadedImageModels.length}</Text>
           </View>
+          <View style={styles.infoRow}>
+            <View style={styles.infoRowLeft}>
+              <Icon name="video" size={18} color={colors.primary} />
+              <Text style={styles.infoLabel}>Video Models</Text>
+            </View>
+            <Text style={styles.infoValue}>{downloadedVideoModels.length}</Text>
+          </View>
           <View style={styles.infoRow}>
             <View style={styles.infoRowLeft}>
               <Icon name="mic" size={18} color={colors.primary} />
@@ -189,15 +218,22 @@ export const StorageSettingsScreen: React.FC = () => {
                 <Text style={styles.clearAllText}>Clear All</Text>
               </TouchableOpacity>
             </View>
-            <Text style={[styles.hint, { textAlign: 'left' as const, marginBottom: SPACING.md }]}>
-              These download entries have invalid or missing data and can be safely cleared.
+            <Text
+              style={[
+                styles.hint,
+                { textAlign: 'left' as const, marginBottom: SPACING.md },
+              ]}
+            >
+              These download entries have invalid or missing data and can be
+              safely cleared.
             </Text>
             {staleDownloads.map(entry => (
               <View key={entry.modelKey} style={styles.orphanedRow}>
                 <View style={styles.orphanedInfo}>
                   <Text style={styles.orphanedName}>Download #{entry.downloadId}</Text>
                   <Text style={styles.orphanedMeta}>
-                    {entry.fileName || 'Unknown file'} • {entry.modelId || 'Unknown model'}
+                    {entry.fileName || 'Unknown file'} •{' '}
+                    {entry.modelId || 'Unknown model'}
                   </Text>
                 </View>
                 <TouchableOpacity

From 3adb2bac258ab03b8a3e866e1fcb06d1323be77d Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Mon, 28 Sep 2026 21:33:01 +0530
Subject: [PATCH 010/129] feat(video): own generation recovery gallery and
 media export [skip ci]

---
 App.tsx                                  |   4 +
 src/components/VideoGenerationStatus.tsx |  58 +++
 src/screens/GalleryScreen/index.tsx      | 211 ++++++++---
 src/services/exportGeneratedMedia.ts     |  42 +++
 src/services/modelPreloader.ts           |   2 +
 src/services/userModelEjection.ts        |   2 +
 src/services/videoGenerationService.ts   | 441 +++++++++++++++++++++++
 src/services/videoGenerator.ts           |  36 ++
 src/stores/chatMessageMutationActions.ts |  35 ++
 9 files changed, 789 insertions(+), 42 deletions(-)
 create mode 100644 src/components/VideoGenerationStatus.tsx
 create mode 100644 src/services/exportGeneratedMedia.ts
 create mode 100644 src/services/videoGenerationService.ts
 create mode 100644 src/services/videoGenerator.ts

diff --git a/App.tsx b/App.tsx
index 862b92582..23ed7a132 100644
--- a/App.tsx
+++ b/App.tsx
@@ -1,3 +1,5 @@
+import { videoGenerationService } from './src/services/videoGenerationService';
+import { videoProvider } from './src/services/modelDownloadService/providers/videoProvider';
 /**
  * Off Grid - On-Device AI Chat Application
  * Private AI assistant that runs entirely on your device
@@ -234,6 +236,8 @@ function App() {
       // becomes the SINGLE owner only once the Download Manager consumes the service
       // and the old recovery paths are folded into the providers.
       registerCoreDownloadProviders();
+      await videoProvider.reconcile?.().catch(error => logger.error('[Video] Download recovery failed:', error));
+      await videoGenerationService.restore().catch(error => logger.error('[Video] Job recovery failed:', error));
 
       // Re-surface QUEUED downloads that never started before an app kill. A queued item (waiting for
       // one of the 3 concurrency slots) has no native row, so hydrateDownloadStore can't recover it —
diff --git a/src/components/VideoGenerationStatus.tsx b/src/components/VideoGenerationStatus.tsx
new file mode 100644
index 000000000..03cbc5939
--- /dev/null
+++ b/src/components/VideoGenerationStatus.tsx
@@ -0,0 +1,58 @@
+import React, { useSyncExternalStore } from 'react';
+import { Text } from 'react-native';
+import { videoGenerationService } from '../services/videoGenerationService';
+import { Card } from './Card';
+import { Button } from './Button';
+import { useTheme } from '../theme';
+export function VideoGenerationStatus({
+  conversationId,
+}: {
+  conversationId?: string | null;
+}) {
+  const state = useSyncExternalStore(
+    videoGenerationService.subscribe,
+    videoGenerationService.getState,
+  );
+  const { colors } = useTheme();
+  if (conversationId && state.conversationId !== conversationId) return null;
+  if (state.phase === 'failed')
+    return (
+      <Card title="Video generation stopped">
+        <Text accessibilityRole="alert" style={{ color: colors.error }}>
+          {state.error}
+        </Text>
+        <Button
+          title="Retry"
+          variant="secondary"
+          onPress={() => {
+            void videoGenerationService.retry().catch(() => {});
+          }}
+        />
+      </Card>
+    );
+  if (state.phase !== 'running') return null;
+  return (
+    <Card
+      title={
+        state.stage === 'encoding'
+          ? 'Encoding video'
+          : state.stage === 'preparing'
+            ? 'Loading video model'
+            : 'Generating video'
+      }
+    >
+      {state.progress && (
+        <Text style={{ color: colors.text }}>
+          {state.progress.step} / {state.progress.total}
+        </Text>
+      )}
+      <Button
+        title="Stop"
+        variant="secondary"
+        onPress={() => {
+          void videoGenerationService.cancelGeneration();
+        }}
+      />
+    </Card>
+  );
+}
diff --git a/src/screens/GalleryScreen/index.tsx b/src/screens/GalleryScreen/index.tsx
index e29a8f4ae..770846284 100644
--- a/src/screens/GalleryScreen/index.tsx
+++ b/src/screens/GalleryScreen/index.tsx
@@ -1,7 +1,9 @@
+import { exportGeneratedMedia } from '../../services/exportGeneratedMedia';
+import { videoGenerationService } from '../../services/videoGenerationService';
+import { VideoGenerationStatus } from '../../components/VideoGenerationStatus';
 import React, { useMemo, useState } from 'react';
-import { Alert, Modal, Share } from 'react-native';
+import { Alert, Modal } from 'react-native';
 import Video from 'react-native-video';
-import RNFS from 'react-native-fs';
 import { useAppStore } from '../../stores/appStore';
 import { resolveDocumentPath } from '../../utils/resolveDocumentPath';
 import type { GeneratedVideo } from '../../types';
@@ -27,8 +29,13 @@ export const GalleryScreen: React.FC = () => {
   const [kind, setKind] = useState<'images' | 'videos'>('images');
   const [selectedVideo, setSelectedVideo] = useState<GeneratedVideo | null>(null);
   const videos = useAppStore(state => state.generatedVideos);
-  const removeVideo = useAppStore(state => state.removeGeneratedVideo);
-  const displayVideos = useMemo(() => conversationId ? videos.filter(video => video.conversationId === conversationId) : videos, [videos, conversationId]);
+  const displayVideos = useMemo(
+    () =>
+      conversationId
+        ? videos.filter(video => video.conversationId === conversationId)
+        : videos,
+    [videos, conversationId],
+  );
 
   const { colors } = useTheme();
   const styles = useThemedStyles(createStyles);
@@ -56,7 +63,13 @@ export const GalleryScreen: React.FC = () => {
 
   const screenTitle = conversationId ? 'Chat Media' : 'Gallery';
 
-  const renderGridItem = ({ item, index }: { item: GeneratedImage; index: number }) => (
+  const renderGridItem = ({
+    item,
+    index,
+  }: {
+    item: GeneratedImage;
+    index: number;
+  }) => (
     <GalleryGridItem
       item={item}
       index={index}
@@ -79,11 +92,18 @@ export const GalleryScreen: React.FC = () => {
   );
 
   return (
-    <SafeAreaView testID="gallery-screen" style={styles.container} edges={['top']}>
+    <SafeAreaView
+      testID="gallery-screen"
+      style={styles.container}
+      edges={['top']}
+    >
       <View style={styles.header}>
         {isSelectMode ? (
           <>
-            <TouchableOpacity style={styles.closeButton} onPress={toggleSelectMode}>
+            <TouchableOpacity
+              style={styles.closeButton}
+              onPress={toggleSelectMode}
+            >
               <Icon name="x" size={24} color={colors.text} />
             </TouchableOpacity>
             <Text style={styles.title}>{selectedIds.size} selected</Text>
@@ -91,7 +111,10 @@ export const GalleryScreen: React.FC = () => {
               <Text style={styles.headerButtonText}>All</Text>
             </TouchableOpacity>
             <TouchableOpacity
-              style={[styles.headerButton, selectedIds.size === 0 && styles.headerButtonDisabled]}
+              style={[
+                styles.headerButton,
+                selectedIds.size === 0 && styles.headerButtonDisabled,
+              ]}
               onPress={handleDeleteSelected}
               disabled={selectedIds.size === 0}
             >
@@ -115,7 +138,10 @@ export const GalleryScreen: React.FC = () => {
             <Text style={styles.title}>{screenTitle}</Text>
             <Text style={styles.countBadge}>{kind === 'images' ? displayImages.length : displayVideos.length}</Text>
             {displayImages.length > 0 && (
-              <TouchableOpacity style={styles.headerButton} onPress={toggleSelectMode}>
+              <TouchableOpacity
+                style={styles.headerButton}
+                onPress={toggleSelectMode}
+              >
                 <Icon name="check-square" size={20} color={colors.text} />
               </TouchableOpacity>
             )}
@@ -130,6 +156,9 @@ export const GalleryScreen: React.FC = () => {
         </TouchableOpacity>)}
       </View>
 
+      {kind === 'videos' && (
+        <VideoGenerationStatus conversationId={conversationId} />
+      )}
       {imageGenState.isGenerating && (
         <View style={styles.genBanner}>
           <View style={styles.genBannerRow}>
@@ -152,7 +181,9 @@ export const GalleryScreen: React.FC = () => {
                   <View
                     style={[
                       styles.genProgressFill,
-                      { width: `${(imageGenState.progress.step / imageGenState.progress.totalSteps) * 100}%` },
+                      {
+                        width: `${(imageGenState.progress.step / imageGenState.progress.totalSteps) * 100}%`,
+                      },
                     ]}
                   />
                 </View>
@@ -160,32 +191,76 @@ export const GalleryScreen: React.FC = () => {
             </View>
             {imageGenState.progress && (
               <Text style={styles.genSteps}>
-                {imageGenState.progress.step}/{imageGenState.progress.totalSteps}
+                {imageGenState.progress.step}/
+                {imageGenState.progress.totalSteps}
               </Text>
             )}
-            <TouchableOpacity style={styles.genCancelButton} onPress={handleCancelGeneration}>
+            <TouchableOpacity
+              style={styles.genCancelButton}
+              onPress={handleCancelGeneration}
+            >
               <Icon name="x" size={16} color={colors.error} />
             </TouchableOpacity>
           </View>
         </View>
       )}
 
-      {kind === 'videos' ? (displayVideos.length === 0 ? <View style={styles.emptyContainer}><Icon name="video" size={48} color={colors.textMuted} /><Text style={styles.emptyTitle}>No videos in this gallery</Text></View> :
-        <FlatList data={displayVideos} keyExtractor={item => item.id} contentContainerStyle={{ padding: 12 }}
-          renderItem={({ item }) => <TouchableOpacity onPress={() => setSelectedVideo(item)} accessibilityRole="button" style={{ flexDirection: 'row', alignItems: 'center', padding: 16, marginBottom: 8, backgroundColor: colors.surface, borderRadius: 8, gap: 12 }}><Icon name="play-circle" size={28} color={colors.primary} /><View style={{ flex: 1 }}><Text numberOfLines={2} style={{ color: colors.text }}>{item.prompt}</Text><Text style={{ color: colors.textMuted }}>{item.durationSeconds.toFixed(1)} s · {item.width} × {item.height}</Text></View></TouchableOpacity>} />
+      {kind === 'videos' ? (
+        displayVideos.length === 0 ? (
+          <View style={styles.emptyContainer}>
+            <Icon name="video" size={48} color={colors.textMuted} />
+            <Text style={styles.emptyTitle}>No videos in this gallery</Text>
+          </View>
+        ) : (
+          <FlatList
+            data={displayVideos}
+            keyExtractor={item => item.id}
+            contentContainerStyle={{ padding: 12 }}
+            renderItem={({ item }) => (
+              <TouchableOpacity
+                onPress={() => setSelectedVideo(item)}
+                accessibilityRole="button"
+                style={{
+                  flexDirection: 'row',
+                  alignItems: 'center',
+                  padding: 16,
+                  marginBottom: 8,
+                  backgroundColor: colors.surface,
+                  borderRadius: 8,
+                  gap: 12,
+                }}
+              >
+                <Icon name="play-circle" size={28} color={colors.primary} />
+                <View style={{ flex: 1 }}>
+                  <Text numberOfLines={2} style={{ color: colors.text }}>
+                    {item.prompt}
+                  </Text>
+                  <Text style={{ color: colors.textMuted }}>
+                    {item.durationSeconds.toFixed(1)} s · {item.width} ×{' '}
+                    {item.height}
+                  </Text>
+                </View>
+              </TouchableOpacity>
+            )}
+          />
+        )
       ) : displayImages.length === 0 ? (
         <View style={styles.emptyContainer}>
           <Icon name="image" size={48} color={colors.textMuted} />
           <Text style={styles.emptyTitle}>
-            {conversationId ? 'No images in this chat' : 'No generated images yet'}
+            {conversationId
+              ? 'No images in this chat'
+              : 'No generated images yet'}
+          </Text>
+          <Text style={styles.emptyText}>
+            Generate images from any chat conversation.
           </Text>
-          <Text style={styles.emptyText}>Generate images from any chat conversation.</Text>
         </View>
       ) : (
         <FlatList
           data={displayImages}
           renderItem={renderGridItem}
-          keyExtractor={(item) => item.id}
+          keyExtractor={item => item.id}
           numColumns={COLUMN_COUNT}
           contentContainerStyle={styles.gridContainer}
           columnWrapperStyle={styles.gridRow}
@@ -194,32 +269,84 @@ export const GalleryScreen: React.FC = () => {
         />
       )}
 
-      <Modal visible={!!selectedVideo} animationType="slide" onRequestClose={() => setSelectedVideo(null)}>
+      <Modal
+        visible={!!selectedVideo}
+        animationType="slide"
+        onRequestClose={() => setSelectedVideo(null)}
+      >
         <SafeAreaView style={styles.container}>
-          <View style={{ flexDirection: 'row', justifyContent: 'space-between', padding: 16 }}>
-            <TouchableOpacity onPress={() => setSelectedVideo(null)}><Text style={{ color: colors.text }}>Close</Text></TouchableOpacity>
-            {selectedVideo ? <TouchableOpacity onPress={() => {
-              const source = resolveDocumentPath(selectedVideo.videoPath);
-              if (Platform.OS === 'ios') {
-                void Share.share({ url: `file://${source}` });
-              } else {
-                const destination = `${RNFS.DownloadDirectoryPath}/${selectedVideo.id}.mp4`;
-                void RNFS.copyFile(source, destination)
-                  .then(() => Alert.alert('Video saved', 'The video is in Downloads.'))
-                  .catch(() => Alert.alert('Save failed', 'The video could not be saved.'));
-              }
-            }}><Text style={{ color: colors.primary }}>{Platform.OS === 'ios' ? 'Share' : 'Save'}</Text></TouchableOpacity> : null}
+          <View
+            style={{
+              flexDirection: 'row',
+              justifyContent: 'space-between',
+              padding: 16,
+            }}
+          >
+            <TouchableOpacity onPress={() => setSelectedVideo(null)}>
+              <Text style={{ color: colors.text }}>Close</Text>
+            </TouchableOpacity>
+            {selectedVideo ? (
+              <TouchableOpacity
+                onPress={() => {
+                  void exportGeneratedMedia(
+                    selectedVideo.videoPath,
+                    `${selectedVideo.id}.mp4`,
+                    'video/mp4',
+                  )
+                    .then(() => {
+                      if (Platform.OS === 'android')
+                        Alert.alert(
+                          'Video saved',
+                          'The video is in Downloads.',
+                        );
+                    })
+                    .catch(error =>
+                      Alert.alert('Save failed', String(error.message)),
+                    );
+                }}
+              >
+                <Text style={{ color: colors.primary }}>
+                  {Platform.OS === 'ios' ? 'Share' : 'Save'}
+                </Text>
+              </TouchableOpacity>
+            ) : null}
           </View>
-          {selectedVideo ? <>
-            <Video source={{ uri: `file://${resolveDocumentPath(selectedVideo.videoPath)}` }} controls paused resizeMode="contain" style={{ width: '100%', aspectRatio: selectedVideo.width / selectedVideo.height, backgroundColor: '#000' }} />
-            <Text style={{ color: colors.text, padding: 16 }}>{selectedVideo.prompt}</Text>
-            <TouchableOpacity onPress={() => {
-              const path = resolveDocumentPath(selectedVideo.videoPath);
-              removeVideo(selectedVideo.id);
-              void RNFS.unlink(path).catch(() => {});
-              setSelectedVideo(null);
-            }} style={{ padding: 16 }}><Text style={{ color: colors.error }}>Delete video</Text></TouchableOpacity>
-          </> : null}
+          {selectedVideo ? (
+            <>
+              <Video
+                source={{
+                  uri: `file://${resolveDocumentPath(selectedVideo.videoPath)}`,
+                }}
+                controls
+                paused
+                resizeMode="contain"
+                style={{
+                  width: '100%',
+                  aspectRatio: selectedVideo.width / selectedVideo.height,
+                  backgroundColor: '#000',
+                }}
+              />
+              <Text style={{ color: colors.text, padding: 16 }}>
+                {selectedVideo.prompt}
+              </Text>
+              <TouchableOpacity
+                onPress={() => {
+                  void videoGenerationService
+                    .deleteVideo(selectedVideo.id)
+                    .then(() => setSelectedVideo(null))
+                    .catch(error =>
+                      Alert.alert(
+                        'Could not delete video',
+                        String(error.message),
+                      ),
+                    );
+                }}
+                style={{ padding: 16 }}
+              >
+                <Text style={{ color: colors.error }}>Delete video</Text>
+              </TouchableOpacity>
+            </>
+          ) : null}
         </SafeAreaView>
       </Modal>
       <FullscreenViewer
diff --git a/src/services/exportGeneratedMedia.ts b/src/services/exportGeneratedMedia.ts
new file mode 100644
index 000000000..9b92008fa
--- /dev/null
+++ b/src/services/exportGeneratedMedia.ts
@@ -0,0 +1,42 @@
+import {
+  NativeModules,
+  PermissionsAndroid,
+  Platform,
+  Share,
+} from 'react-native';
+import RNFS from 'react-native-fs';
+import { resolveDocumentPath } from '../utils/resolveDocumentPath';
+
+/** One export boundary for app-owned generated media. */
+export async function exportGeneratedMedia(
+  path: string,
+  fileName: string,
+  mime: string,
+): Promise<void> {
+  const source = resolveDocumentPath(path);
+  if (Platform.OS === 'ios') {
+    await Share.share({ url: `file://${source}` });
+    return;
+  }
+  if (Number(Platform.Version) >= 29) {
+    await NativeModules.SyncDownloadsModule.saveFileToDownloads(
+      source,
+      fileName,
+      mime,
+    );
+    return;
+  }
+  const permission = await PermissionsAndroid.request(
+    PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE,
+  );
+  if (permission !== PermissionsAndroid.RESULTS.GRANTED)
+    throw new Error('Storage permission is required to save the file.');
+  if (
+    !source.startsWith(RNFS.DocumentDirectoryPath + '/') ||
+    source.split('/').includes('..') ||
+    /[/\\]/.test(fileName)
+  ) {
+    throw new Error('Invalid media export path.');
+  }
+  await RNFS.copyFile(source, `${RNFS.DownloadDirectoryPath}/${fileName}`);
+}
diff --git a/src/services/modelPreloader.ts b/src/services/modelPreloader.ts
index c7e862e19..989039559 100644
--- a/src/services/modelPreloader.ts
+++ b/src/services/modelPreloader.ts
@@ -1,3 +1,4 @@
+import { videoGenerationService } from './videoGenerationService';
 /**
  * Boot-time model preloader.
  *
@@ -36,6 +37,7 @@ export function abortPreload(): void {
 function isGenerationActive(): boolean {
   return (
     generationService.getState().isGenerating ||
+    videoGenerationService.getState().phase === 'running' ||
     imageGenerationService.getState().isGenerating
   );
 }
diff --git a/src/services/userModelEjection.ts b/src/services/userModelEjection.ts
index a0d6e2cbd..9540c4e06 100644
--- a/src/services/userModelEjection.ts
+++ b/src/services/userModelEjection.ts
@@ -1,3 +1,4 @@
+import { videoGenerationService } from './videoGenerationService';
 import { activeModelService } from './activeModelService';
 import { generationService } from './generationService';
 import { imageGenerationService } from './imageGenerationService';
@@ -11,6 +12,7 @@ export async function ejectAllModelsForUser(): Promise<{ count: number }> {
   await Promise.all([
     generationService.stopGeneration(),
     imageGenerationService.cancelGeneration(),
+    videoGenerationService.cancelGeneration(),
   ]);
   return activeModelService.ejectAll();
 }
diff --git a/src/services/videoGenerationService.ts b/src/services/videoGenerationService.ts
new file mode 100644
index 000000000..c70840b1a
--- /dev/null
+++ b/src/services/videoGenerationService.ts
@@ -0,0 +1,441 @@
+import { resolveDocumentPath } from '../utils/resolveDocumentPath';
+import logger from '../utils/logger';
+import AsyncStorage from '@react-native-async-storage/async-storage';
+import { useRemoteServerStore } from '../stores/remoteServerStore';
+import { remoteMediaRuntime } from './remoteMediaRuntime';
+import {
+  generateStandalone,
+  getActiveEngineService,
+  isRemoteTextModelActive,
+} from './engines';
+import { activeModelService } from './activeModelService';
+import RNFS from 'react-native-fs';
+import { generateId as uuid } from '../utils/generateId';
+import {
+  resolveVideoRequest,
+  type VideoGenerationJobContract,
+  type VideoGenerationRequestContract,
+} from '@offgrid/models';
+import { useAppStore, useChatStore } from '../stores';
+import { videoGenerator } from './videoGenerator';
+import { resolveVideoPack } from './videoModelFiles';
+import { modelResidencyManager } from './modelResidency';
+import { generationSession } from './generationSession';
+import type { GeneratedVideo } from '../types';
+
+const JOURNAL_KEY = 'offgrid.video.active-job.v1';
+type VideoInput = VideoGenerationRequestContract & { conversationId?: string };
+interface VideoJournal {
+  input: VideoInput;
+  id: string;
+  messageId: string;
+  remoteServerId?: string;
+  remoteJobId?: string;
+  startedAt: number;
+  result?: GeneratedVideo;
+}
+const EMPTY: VideoGenerationJobContract = {
+  id: null,
+  phase: 'idle',
+  conversationId: null,
+  projectId: null,
+  stage: null,
+  enhancedPrompt: '',
+  progress: null,
+  outputPath: null,
+  error: null,
+  startedAt: null,
+  finishedAt: null,
+};
+class VideoGenerationService {
+  private state = EMPTY;
+  private journal: VideoJournal | null = null;
+  private persistence: Promise<unknown> = Promise.resolve();
+  private persist() {
+    const value = this.journal ? JSON.stringify(this.journal) : null;
+    this.persistence = this.persistence
+      .catch(() => {})
+      .then(() =>
+        value
+          ? AsyncStorage.setItem(JOURNAL_KEY, value)
+          : AsyncStorage.removeItem(JOURNAL_KEY),
+      );
+    return this.persistence;
+  }
+  async restore(): Promise<void> {
+    if (this.completion) return;
+    const raw = await AsyncStorage.getItem(JOURNAL_KEY);
+    if (!raw) return;
+    const saved = JSON.parse(raw) as VideoJournal;
+    if (
+      !saved.input ||
+      typeof saved.id !== 'string' ||
+      !/^[a-zA-Z0-9_-]+$/.test(saved.id) ||
+      typeof saved.messageId !== 'string'
+    )
+      return;
+    resolveVideoRequest(saved.input);
+    if (
+      saved.result &&
+      saved.result.videoPath ===
+        `${RNFS.DocumentDirectoryPath}/generated-videos/${saved.id}.mp4` &&
+      (await RNFS.exists(saved.result.videoPath))
+    ) {
+      this.publishResult(saved.result, saved.messageId, saved.startedAt);
+      await AsyncStorage.removeItem(JOURNAL_KEY);
+      return;
+    }
+    if (
+      useAppStore
+        .getState()
+        .generatedVideos.some(video => video.id === saved.id)
+    ) {
+      await AsyncStorage.removeItem(JOURNAL_KEY);
+      return;
+    }
+    this.journal = saved;
+    this.messageId = saved.messageId;
+    this.update({
+      ...EMPTY,
+      id: saved.id,
+      conversationId: saved.input.conversationId ?? null,
+      phase: 'failed',
+      error: saved.remoteJobId
+        ? 'The connection was interrupted. Retry to check the same OGAD job.'
+        : 'Video generation was interrupted. Retry to start it again.',
+      startedAt: saved.startedAt,
+      finishedAt: Date.now(),
+    });
+  }
+  private publishResult(
+    result: GeneratedVideo,
+    messageId: string,
+    startedAt: number,
+  ) {
+    useAppStore.getState().addGeneratedVideo(result);
+    const conversation = useChatStore
+      .getState()
+      .conversations.find(c => c.id === result.conversationId);
+    if (
+      !conversation ||
+      conversation.messages.some(message => message.uuid === messageId)
+    )
+      return;
+    useChatStore
+      .getState()
+      .addMessage(conversation.id, {
+        role: 'assistant',
+        uuid: messageId,
+        content: `Generated video for: "${result.prompt}"`,
+        turnStatus: 'completed',
+        turnKind: 'video',
+        attachments: [
+          {
+            id: result.id,
+            type: 'video',
+            uri: `file://${result.videoPath}`,
+            width: result.width,
+            height: result.height,
+          },
+        ],
+        generationTimeMs: Date.now() - startedAt,
+      });
+  }
+  async deleteVideo(id: string): Promise<void> {
+    const video = useAppStore
+      .getState()
+      .generatedVideos.find(item => item.id === id);
+    if (!video) return;
+    const path = resolveDocumentPath(video.videoPath);
+    const root = RNFS.DocumentDirectoryPath + '/';
+    if (!path.startsWith(root) || path.split('/').includes('..'))
+      throw new Error('The video path is outside app storage.');
+    if (await RNFS.exists(path)) await RNFS.unlink(path);
+    useChatStore.getState().removeMediaAttachment(id);
+    useAppStore.getState().removeGeneratedVideo(id);
+  }
+  async retry(): Promise<GeneratedVideo | undefined> {
+    if (!this.journal) return;
+    if (this.completion)
+      throw new Error('Video generation is already running.');
+    if (generationSession.getConversationId())
+      throw new Error(
+        'Wait for the current generation to finish before retrying.',
+      );
+    this.completion = this.run(this.journal.input, this.journal).finally(() => {
+      this.completion = null;
+    });
+    return this.completion;
+  }
+  private listeners = new Set<() => void>();
+  private cancelled = false;
+  private abort = new AbortController();
+  private messageId: string | null = null;
+  getMessageId = () => this.messageId;
+  private pending = new Map<string, VideoGenerationRequestContract>();
+  private completion: Promise<GeneratedVideo | undefined> | null = null;
+  getState = () => this.state;
+  subscribe = (listener: () => void) => {
+    this.listeners.add(listener);
+    return () => {
+      this.listeners.delete(listener);
+    };
+  };
+  private update(patch: Partial<VideoGenerationJobContract>) {
+    this.state = { ...this.state, ...patch };
+    for (const listener of this.listeners) listener();
+  }
+  defer(conversationId: string, input: VideoGenerationRequestContract) {
+    resolveVideoRequest(input);
+    if (this.pending.has(conversationId))
+      throw new Error('A video is already requested for this turn.');
+    this.pending.set(conversationId, input);
+  }
+  discardDeferred(conversationId: string) {
+    this.pending.delete(conversationId);
+  }
+  hasPending() {
+    return this.pending.size > 0 || this.state.phase === 'running';
+  }
+  async finishDeferred(conversationId: string, stopped: boolean) {
+    const input = this.pending.get(conversationId);
+    this.pending.delete(conversationId);
+    if (input && !stopped) await this.generate({ ...input, conversationId });
+  }
+  async cancelGeneration() {
+    this.pending.clear();
+    this.cancelled = true;
+    this.abort.abort();
+    if (this.state.phase === 'running') {
+      await videoGenerator.cancel();
+      if (this.state.stage === 'enhancing')
+        await getActiveEngineService()?.stopGeneration();
+      await this.completion;
+    }
+  }
+  generate(
+    input: VideoGenerationRequestContract & { conversationId?: string },
+  ): Promise<GeneratedVideo | undefined> {
+    if (this.completion)
+      return Promise.reject(new Error('Video generation is already running.'));
+    this.completion = this.run(input).finally(() => {
+      this.completion = null;
+    });
+    return this.completion;
+  }
+  private async run(
+    input: VideoInput,
+    resumed?: VideoJournal,
+  ): Promise<GeneratedVideo | undefined> {
+    const app = useAppStore.getState();
+    const model = app.downloadedVideoModels.find(
+      m => m.id === (input.model ?? app.activeVideoModelId),
+    );
+    const remoteState = useRemoteServerStore.getState();
+    const server = remoteState.servers.find(
+      s =>
+        s.id ===
+        (resumed?.remoteServerId ??
+          remoteState.activeRemoteMediaServerIds.video),
+    );
+    if (resumed?.remoteServerId && !server)
+      throw new Error('The OGAD server for this job is no longer configured.');
+    if (!model && !server) throw new Error('Select a video model in Models.');
+    const modelId =
+      resumed?.input.model ?? server?.mediaModels?.video ?? model!.id;
+    const primary =
+      server?.mediaModels?.video ??
+      model!.files.find(f => f.role === 'primary')!.name;
+    let request = resolveVideoRequest(input, {
+      ...(app.settings.videoParams?.[primary] ??
+        app.settings.videoParams?.default),
+      seed: app.settings.videoSeed ?? -1,
+      negativePrompt: app.settings.videoNegative ?? '',
+    });
+    const id = resumed?.id ?? uuid(),
+      messageId = resumed?.messageId ?? uuid();
+    const directory = `${RNFS.DocumentDirectoryPath}/generated-videos`,
+      output = `${directory}/${id}.mp4`;
+    this.cancelled = false;
+    this.abort = new AbortController();
+    this.messageId = messageId;
+    this.update({
+      ...EMPTY,
+      id,
+      phase: 'running',
+      conversationId: input.conversationId ?? null,
+      stage: 'preparing',
+      startedAt: Date.now(),
+    });
+    if (input.conversationId) generationSession.begin(input.conversationId);
+    let registration: symbol | undefined;
+    this.journal = resumed ?? {
+      input: { ...input, ...request, model: modelId },
+      id,
+      messageId,
+      remoteServerId: server?.id,
+      startedAt: Date.now(),
+    };
+    try {
+      await this.persist();
+      if (
+        !resumed &&
+        (input.enhancePrompt ?? app.settings.enhanceVideoPrompts)
+      ) {
+        this.update({ stage: 'enhancing' });
+        const selectedText = activeModelService.selectedTextModelId();
+        if (
+          !isRemoteTextModelActive() &&
+          !getActiveEngineService()?.isModelLoaded() &&
+          selectedText
+        )
+          await activeModelService.loadTextModel(selectedText);
+        if (
+          isRemoteTextModelActive() ||
+          getActiveEngineService()?.isModelLoaded()
+        ) {
+          const enhanced = await generateStandalone([
+            {
+              id: uuid(),
+              role: 'system',
+              content:
+                'Rewrite the request as one short video prompt. Preserve the subject and action. Describe useful motion and camera movement. Return only the prompt.',
+              timestamp: Date.now(),
+            },
+            {
+              id: uuid(),
+              role: 'user',
+              content: request.prompt,
+              timestamp: Date.now(),
+            },
+          ]);
+          if (enhanced.trim())
+            request = { ...request, prompt: enhanced.trim() };
+        }
+      }
+      if (this.cancelled) throw new Error('Video generation stopped.');
+      this.update({ stage: 'preparing', enhancedPrompt: request.prompt });
+      this.journal.input = { ...this.journal.input, ...request };
+      await this.persist();
+      await RNFS.mkdir(directory);
+      let path = output,
+        resultId = id;
+      let provenance: GeneratedVideo['provenance'];
+      if (server) {
+        const remote = await remoteMediaRuntime.generateVideo(
+          server,
+          request,
+          output,
+          {
+            signal: this.abort.signal,
+            model: modelId,
+            jobId: resumed?.remoteJobId,
+            onJobStarted: async jobId => {
+              if (this.journal) {
+                this.journal.remoteJobId = jobId;
+                await this.persist();
+              }
+            },
+            onProgress: progress =>
+              this.update({ stage: 'generating', progress }),
+          },
+        );
+        path = remote.path;
+        resultId = remote.provenance ? remote.syncId : id;
+        provenance = remote.provenance;
+      } else {
+        const pack = await resolveVideoPack(model!);
+        await modelResidencyManager.runExclusive(
+          'video-generation',
+          async () => {
+            const sizeMB =
+              model!.files.reduce(
+                (sum, file) => sum + (file.sizeBytes ?? 0),
+                0,
+              ) /
+                1048576 +
+              (request.width * request.height * request.frames * 12) / 1048576 +
+              1024;
+            const spec = {
+              key: 'video',
+              type: 'video' as const,
+              modelId: model!.id,
+              sizeMB,
+              dirtyMemory: true,
+              canEvict: () => false,
+            };
+            const fit = await modelResidencyManager.makeRoomFor(spec);
+            if (!fit.fits)
+              throw new Error(
+                'Not enough available memory for this video model and clip size.',
+              );
+            if (this.cancelled) throw new Error('Video generation stopped.');
+            registration = modelResidencyManager.register(spec, () =>
+              videoGenerator.cancel(),
+            );
+          },
+        );
+        if (this.cancelled) throw new Error('Video generation stopped.');
+        path = await videoGenerator.generate(request, pack, output, update =>
+          this.update(update),
+        );
+      }
+      if (this.cancelled) throw new Error('Video generation stopped.');
+      const result: GeneratedVideo = {
+        id: resultId,
+        provenance,
+        ...request,
+        modelId,
+        videoPath: path,
+        fileName: `${id}.mp4`,
+        durationSeconds: request.frames / request.fps,
+        createdAt: new Date().toISOString(),
+        conversationId: input.conversationId,
+      };
+      this.journal.result = result;
+      await this.persist();
+      this.publishResult(result, messageId, this.state.startedAt ?? Date.now());
+      this.journal = null;
+      await this.persist().catch(error =>
+        logger.warn('[Video] Could not clear finished job', error),
+      );
+      this.update({
+        phase: 'succeeded',
+        outputPath: path,
+        finishedAt: Date.now(),
+      });
+      return result;
+    } catch (error) {
+      if (
+        (error as { code?: string })?.code === 'VIDEO_REMOTE_FAILED' &&
+        this.journal
+      ) {
+        delete this.journal.remoteJobId;
+        await this.persist().catch(error =>
+          logger.warn('[Video] Could not save failed job', error),
+        );
+      }
+      if ((error as { code?: string })?.code === 'VIDEO_CANCELLED')
+        this.cancelled = true;
+      if (this.cancelled) {
+        this.journal = null;
+        await this.persist().catch(error =>
+          logger.warn('[Video] Could not clear stopped job', error),
+        );
+      }
+      await RNFS.unlink(output).catch(() => {});
+      this.update({
+        phase: this.cancelled ? 'cancelled' : 'failed',
+        error:
+          error instanceof Error ? error.message : 'Video generation failed.',
+        finishedAt: Date.now(),
+      });
+      if (!this.cancelled) throw error;
+    } finally {
+      if (registration) modelResidencyManager.unregister('video', registration);
+      if (generationSession.isGeneratingFor(input.conversationId))
+        generationSession.end('video-finished');
+    }
+  }
+}
+export const videoGenerationService = new VideoGenerationService();
diff --git a/src/services/videoGenerator.ts b/src/services/videoGenerator.ts
new file mode 100644
index 000000000..07af4d66a
--- /dev/null
+++ b/src/services/videoGenerator.ts
@@ -0,0 +1,36 @@
+import { NativeEventEmitter, NativeModules } from 'react-native';
+import type {
+  ResolvedVideoRequest,
+  VideoGenerationUpdateContract,
+} from '@offgrid/models';
+const native = NativeModules.VideoGenerationModule;
+export const videoGenerator = {
+  available: () => !!native,
+  cancel: async (): Promise<void> => {
+    if (native) await native.cancel();
+  },
+  async generate(
+    request: ResolvedVideoRequest,
+    pack: { weight: string; vae: string; encoder: string },
+    outputPath: string,
+    onUpdate: (update: VideoGenerationUpdateContract) => void,
+  ): Promise<string> {
+    if (!native)
+      throw new Error('This build does not include the video engine.');
+    const listener = new NativeEventEmitter(native).addListener(
+      'VideoGenerationProgress',
+      event => {
+        onUpdate({
+          stage: event.stage,
+          progress:
+            event.total > 0 ? { step: event.step, total: event.total } : null,
+        });
+      },
+    );
+    try {
+      return (await native.generate({ ...request, ...pack, outputPath })).path;
+    } finally {
+      listener.remove();
+    }
+  },
+};
diff --git a/src/stores/chatMessageMutationActions.ts b/src/stores/chatMessageMutationActions.ts
index 8c4beeea3..65844b841 100644
--- a/src/stores/chatMessageMutationActions.ts
+++ b/src/stores/chatMessageMutationActions.ts
@@ -7,6 +7,7 @@ import {
 } from '../services/sync/mutation';
 
 export interface ChatMessageMutationActions {
+  removeMediaAttachment: (attachmentId: string) => void;
   updateMessageContent: (
     conversationId: string,
     messageId: string,
@@ -90,6 +91,40 @@ export function createMessageMutationActions(
   owner: ChatMessageMutationOwner,
 ): ChatMessageMutationActions {
   return {
+    removeMediaAttachment: attachmentId => {
+      const changed: Array<{ conversationId: string; message: Message }> = [];
+      owner.updateConversations(conversations =>
+        conversations.map(conversation => {
+          let updated = false;
+          const messages = conversation.messages.map(message => {
+            if (
+              !message.attachments?.some(
+                attachment => attachment.id === attachmentId,
+              )
+            )
+              return message;
+            updated = true;
+            const next = {
+              ...message,
+              attachments: message.attachments.filter(
+                attachment => attachment.id !== attachmentId,
+              ),
+            };
+            changed.push({ conversationId: conversation.id, message: next });
+            return next;
+          });
+          return updated
+            ? {
+                ...conversation,
+                messages,
+                updatedAt: nextUpdatedAt(conversation.updatedAt),
+              }
+            : conversation;
+        }),
+      );
+      for (const { conversationId, message } of changed)
+        emitSyncMutation(messagePutMutation(conversationId, message));
+    },
     updateMessageContent: (conversationId, messageId, content) => {
       owner.updateConversations(conversations =>
         mapConversation(conversations, conversationId, conversation =>

From 421c95dfcbcafc86cd3803210dbd0b43a4031c0d Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Mon, 28 Sep 2026 21:33:01 +0530
Subject: [PATCH 011/129] feat(chat): route video turns and tools through
 shared generation state [skip ci]

---
 package-lock.json                             |   1 +
 pro                                           |   2 +-
 src/components/ChatInput/Popovers.tsx         | 232 +++++++++++++---
 src/components/ChatInput/index.tsx            | 229 +++++++++-------
 src/navigation/types.ts                       |   2 +-
 src/screens/ChatScreen/ChatMessageArea.tsx    |   9 +-
 src/screens/ChatScreen/ChatModalSection.tsx   |  47 +++-
 src/screens/ChatScreen/index.tsx              |  41 +--
 .../ChatScreen/useChatGenerationActions.ts    | 106 ++++++--
 src/screens/ChatScreen/useChatScreen.ts       |  44 ++-
 .../ChatScreen/useChatScreenActions.ts        |   7 +-
 src/screens/HomeScreen/hooks/types.ts         |   4 +-
 src/screens/HomeScreen/index.tsx              |  11 +-
 src/services/generationRemoteHelpers.ts       |   9 +-
 src/services/generationService.ts             | 251 ++++++++++++------
 src/services/sync/messageContext.ts           |   2 +
 src/services/sync/mutation.ts                 |  10 +
 src/services/tools/handlers.ts                |  89 +++++--
 src/services/tools/registry.ts                |  25 +-
 19 files changed, 816 insertions(+), 305 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e6f614f2a..9a1814468 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -140,6 +140,7 @@
       "dependencies": {
         "@noble/hashes": "1.8.0",
         "@offgrid/automation": "*",
+        "@offgrid/models": "*",
         "bonjour-service": "^1.2.1",
         "js-sha512": "^0.9.0",
         "tweetnacl": "^1.0.3",
diff --git a/pro b/pro
index 057cd1818..64f7b78a8 160000
--- a/pro
+++ b/pro
@@ -1 +1 @@
-Subproject commit 057cd18187ecfdc4a9ab35bb8f6f392d7166b118
+Subproject commit 64f7b78a8bc6d455333dffc52d702d0e991097d4
diff --git a/src/components/ChatInput/Popovers.tsx b/src/components/ChatInput/Popovers.tsx
index 8673e95e4..d7125f2e7 100644
--- a/src/components/ChatInput/Popovers.tsx
+++ b/src/components/ChatInput/Popovers.tsx
@@ -77,6 +77,7 @@ interface QuickSettingsPopoverProps {
   anchorX: number;
   imageMode: ImageModeState;
   onImageModeToggle: () => void;
+  onVideoModeToggle?: () => void;
   imageModelLoaded: boolean;
   supportsThinking: boolean;
   supportsToolCalling: boolean;
@@ -88,7 +89,8 @@ interface QuickSettingsPopoverProps {
 
 function getImageModeBadge(mode: ImageModeState, colors: any) {
   if (mode === 'force') return { label: 'ON', bg: colors.primary };
-  if (mode === 'disabled') return { label: 'OFF', bg: colors.textMuted };
+  if (mode === 'disabled' || mode === 'video')
+    return { label: 'OFF', bg: colors.textMuted };
   return { label: 'Auto', bg: `${colors.textMuted}80` };
 }
 
@@ -111,10 +113,20 @@ function getToolsStyle(supported: boolean, count: number, colors: any) {
 }
 
 export const QuickSettingsPopover: React.FC<QuickSettingsPopoverProps> = ({
-  visible, onClose, anchorY, anchorX,
-  imageMode, onImageModeToggle, imageModelLoaded, supportsThinking,
-  supportsToolCalling, enabledToolCount, onToolsPress,
-  mcpToolCount = 0, onMcpPress,
+  visible,
+  onClose,
+  anchorY,
+  anchorX,
+  imageMode,
+  onImageModeToggle,
+  onVideoModeToggle,
+  imageModelLoaded,
+  supportsThinking,
+  supportsToolCalling,
+  enabledToolCount,
+  onToolsPress,
+  mcpToolCount = 0,
+  onMcpPress,
 }) => {
   const { colors } = useTheme();
   const thinkingEnabled = useAppStore(state => state.settings.thinkingEnabled);
@@ -139,7 +151,12 @@ export const QuickSettingsPopover: React.FC<QuickSettingsPopoverProps> = ({
   const mcpBadgeBg = showMcpWarning ? TOOL_WARNING_COLOR : mcpDefaultBg;
 
   return (
-    <Modal transparent visible={visible} animationType="fade" onRequestClose={onClose}>
+    <Modal
+      transparent
+      visible={visible}
+      animationType="fade"
+      onRequestClose={onClose}
+    >
       {/* accessible={false} on the SCRIM too. The inner wrapper was fixed first, but this outer
           dismiss layer wraps the whole popover and merges it just the same - iOS reported one
           control named ", Image Gen, Auto, , Thinking, ON, , Voice, Chat, , Tools, 1, Pro Tools, 6"
@@ -155,24 +172,72 @@ export const QuickSettingsPopover: React.FC<QuickSettingsPopoverProps> = ({
               reach one setting. Android exposes the rows individually; this is what made iOS
               differ. */}
           <TouchableWithoutFeedback accessible={false}>
-            <View style={[popoverStyles.popover, {
-              backgroundColor: colors.surface,
-              borderColor: colors.border,
-              bottom: anchorY + 8,
-              right: clampPopoverRight(anchorX),
-            }]}>
+            <View
+              style={[
+                popoverStyles.popover,
+                {
+                  backgroundColor: colors.surface,
+                  borderColor: colors.border,
+                  bottom: anchorY + 8,
+                  right: clampPopoverRight(anchorX),
+                },
+              ]}
+            >
               <TouchableOpacity
                 testID="quick-image-mode"
                 style={popoverStyles.row}
-                onPress={() => { triggerHaptic('impactLight'); onImageModeToggle(); }}
+                onPress={() => {
+                  triggerHaptic('impactLight');
+                  onImageModeToggle();
+                }}
               >
-                <Icon name="image" size={16} color={imageModelLoaded ? colors.text : colors.textMuted} />
-                <Text style={[popoverStyles.rowLabel, { color: colors.text }]}>Image Gen</Text>
-                <View testID={imageMode === 'force' ? 'image-mode-force-badge' : undefined} style={[popoverStyles.badge, { backgroundColor: imgBadge.bg }]}>
-                  <Text style={[popoverStyles.badgeText, { color: colors.background }]}>{imgBadge.label}</Text>
+                <Icon
+                  name="image"
+                  size={16}
+                  color={imageModelLoaded ? colors.text : colors.textMuted}
+                />
+                <Text style={[popoverStyles.rowLabel, { color: colors.text }]}>
+                  Image Gen
+                </Text>
+                <View
+                  testID={
+                    imageMode === 'force' ? 'image-mode-force-badge' : undefined
+                  }
+                  style={[
+                    popoverStyles.badge,
+                    { backgroundColor: imgBadge.bg },
+                  ]}
+                >
+                  <Text
+                    style={[
+                      popoverStyles.badgeText,
+                      { color: colors.background },
+                    ]}
+                  >
+                    {imgBadge.label}
+                  </Text>
                 </View>
               </TouchableOpacity>
 
+              <TouchableOpacity
+                disabled={!onVideoModeToggle}
+                accessibilityRole="button"
+                accessibilityState={{
+                  selected: imageMode === 'video',
+                  disabled: !onVideoModeToggle,
+                }}
+                style={popoverStyles.row}
+                onPress={onVideoModeToggle}
+              >
+                <Icon name="video" size={16} color={colors.text} />
+                <Text style={[popoverStyles.rowLabel, { color: colors.text }]}>
+                  Video Gen
+                </Text>
+                <Text style={{ color: colors.text }}>
+                  {imageMode === 'video' ? 'ON' : 'OFF'}
+                </Text>
+              </TouchableOpacity>
+
               {supportsThinking && (
                 <TouchableOpacity
                   testID="quick-thinking-toggle"
@@ -182,12 +247,32 @@ export const QuickSettingsPopover: React.FC<QuickSettingsPopoverProps> = ({
                     updateSettings({ thinkingEnabled: !thinkingEnabled });
                   }}
                 >
-                  <Icon name="zap" size={16} color={thinkingEnabled ? colors.primary : colors.textMuted} />
-                  <Text style={[popoverStyles.rowLabel, { color: colors.text }]}>Thinking</Text>
-                  <View style={[popoverStyles.badge, {
-                    backgroundColor: thinkingEnabled ? colors.primary : colors.textMuted,
-                  }]}>
-                    <Text style={[popoverStyles.badgeText, { color: colors.background }]}>
+                  <Icon
+                    name="zap"
+                    size={16}
+                    color={thinkingEnabled ? colors.primary : colors.textMuted}
+                  />
+                  <Text
+                    style={[popoverStyles.rowLabel, { color: colors.text }]}
+                  >
+                    Thinking
+                  </Text>
+                  <View
+                    style={[
+                      popoverStyles.badge,
+                      {
+                        backgroundColor: thinkingEnabled
+                          ? colors.primary
+                          : colors.textMuted,
+                      },
+                    ]}
+                  >
+                    <Text
+                      style={[
+                        popoverStyles.badgeText,
+                        { color: colors.background },
+                      ]}
+                    >
                       {thinkingEnabled ? 'ON' : 'OFF'}
                     </Text>
                   </View>
@@ -206,9 +291,25 @@ export const QuickSettingsPopover: React.FC<QuickSettingsPopoverProps> = ({
                 }}
               >
                 <Icon name="tool" size={16} color={toolIconColor} />
-                <Text style={[popoverStyles.rowLabel, { color: tools.labelColor }]}>Tools</Text>
-                <View style={[popoverStyles.badge, { backgroundColor: toolBadgeBg }]}>
-                  <Text style={[popoverStyles.badgeText, { color: colors.background }]}>{tools.badgeLabel}</Text>
+                <Text
+                  style={[popoverStyles.rowLabel, { color: tools.labelColor }]}
+                >
+                  Tools
+                </Text>
+                <View
+                  style={[
+                    popoverStyles.badge,
+                    { backgroundColor: toolBadgeBg },
+                  ]}
+                >
+                  <Text
+                    style={[
+                      popoverStyles.badgeText,
+                      { color: colors.background },
+                    ]}
+                  >
+                    {tools.badgeLabel}
+                  </Text>
                 </View>
               </TouchableOpacity>
 
@@ -221,11 +322,29 @@ export const QuickSettingsPopover: React.FC<QuickSettingsPopoverProps> = ({
                   onMcpPress?.();
                 }}
               >
-                <IconMC name="crown" size={16} color={showMcpWarning ? TOOL_WARNING_COLOR : colors.primary} />
-                <Text style={[popoverStyles.rowLabel, { color: colors.text }]}>Pro Tools</Text>
+                <IconMC
+                  name="crown"
+                  size={16}
+                  color={showMcpWarning ? TOOL_WARNING_COLOR : colors.primary}
+                />
+                <Text style={[popoverStyles.rowLabel, { color: colors.text }]}>
+                  Pro Tools
+                </Text>
                 {mcpToolCount > 0 && (
-                  <View style={[popoverStyles.badge, { backgroundColor: mcpBadgeBg }]}>
-                    <Text style={[popoverStyles.badgeText, { color: colors.background }]}>{mcpToolCount}</Text>
+                  <View
+                    style={[
+                      popoverStyles.badge,
+                      { backgroundColor: mcpBadgeBg },
+                    ]}
+                  >
+                    <Text
+                      style={[
+                        popoverStyles.badgeText,
+                        { color: colors.background },
+                      ]}
+                    >
+                      {mcpToolCount}
+                    </Text>
                   </View>
                 )}
               </TouchableOpacity>
@@ -250,15 +369,25 @@ interface AttachPickerPopoverProps {
 }
 
 export const AttachPickerPopover: React.FC<AttachPickerPopoverProps> = ({
-  visible, onClose, anchorY, anchorX,
-  supportsVision, onPhoto, onDocument,
+  visible,
+  onClose,
+  anchorY,
+  anchorX,
+  supportsVision,
+  onPhoto,
+  onDocument,
 }) => {
   const { colors } = useTheme();
 
   if (!visible) return null;
 
   return (
-    <Modal transparent visible={visible} animationType="fade" onRequestClose={onClose}>
+    <Modal
+      transparent
+      visible={visible}
+      animationType="fade"
+      onRequestClose={onClose}
+    >
       {/* accessible={false} on the SCRIM too. The inner wrapper was fixed first, but this outer
           dismiss layer wraps the whole popover and merges it just the same - iOS reported one
           control named ", Image Gen, Auto, , Thinking, ON, , Voice, Chat, , Tools, 1, Pro Tools, 6"
@@ -274,24 +403,41 @@ export const AttachPickerPopover: React.FC<AttachPickerPopoverProps> = ({
               reach one setting. Android exposes the rows individually; this is what made iOS
               differ. */}
           <TouchableWithoutFeedback accessible={false}>
-            <View style={[popoverStyles.popover, {
-              backgroundColor: colors.surface,
-              borderColor: colors.border,
-              bottom: anchorY + 8,
-              right: clampPopoverRight(anchorX),
-            }]}>
+            <View
+              style={[
+                popoverStyles.popover,
+                {
+                  backgroundColor: colors.surface,
+                  borderColor: colors.border,
+                  bottom: anchorY + 8,
+                  right: clampPopoverRight(anchorX),
+                },
+              ]}
+            >
               <TouchableOpacity
                 testID="attach-photo"
                 style={popoverStyles.row}
-                onPress={() => { onClose(); onPhoto(); }}
+                onPress={() => {
+                  onClose();
+                  onPhoto();
+                }}
               >
-                <Icon name="camera" size={16} color={supportsVision ? colors.primary : colors.textMuted} />
-                <Text style={[popoverStyles.rowLabel, { color: colors.text }]}>Photo</Text>
+                <Icon
+                  name="camera"
+                  size={16}
+                  color={supportsVision ? colors.primary : colors.textMuted}
+                />
+                <Text style={[popoverStyles.rowLabel, { color: colors.text }]}>
+                  Photo
+                </Text>
               </TouchableOpacity>
               <TouchableOpacity
                 testID="attach-document"
                 style={popoverStyles.row}
-                onPress={() => { onClose(); onDocument(); }}
+                onPress={() => {
+                  onClose();
+                  onDocument();
+                }}
               >
                 <Icon name="file" size={16} color={colors.text} />
                 <Text style={[popoverStyles.rowLabel, { color: colors.text }]}>Document</Text>
diff --git a/src/components/ChatInput/index.tsx b/src/components/ChatInput/index.tsx
index 215f1c5c7..5baee16e7 100644
--- a/src/components/ChatInput/index.tsx
+++ b/src/components/ChatInput/index.tsx
@@ -26,7 +26,12 @@ import { Button } from '../Button';
 type AssistantAvailability = 'no-pro' | 'needs-sync' | 'unavailable' | 'ready';
 
 interface ChatInputProps {
-  onSend: (message: string, attachments?: MediaAttachment[], imageMode?: ImageModeState, assistantEnabled?: boolean) => void;
+  onSend: (
+    message: string,
+    attachments?: MediaAttachment[],
+    imageMode?: ImageModeState,
+    assistantEnabled?: boolean,
+  ) => void;
   onStop?: () => void;
   disabled?: boolean;
   isGenerating?: boolean;
@@ -120,7 +125,15 @@ const buildNoVisionAlert = (opts: {
       [
         { text: 'Cancel', onPress: opts.dismiss },
         ...(opts.onRepairVision
-          ? [{ text: 'Go to Download Manager', onPress: () => { opts.dismiss(); opts.onRepairVision!(); } }]
+          ? [
+              {
+                text: 'Go to Download Manager',
+                onPress: () => {
+                  opts.dismiss();
+                  opts.onRepairVision!();
+                },
+              },
+            ]
           : [{ text: 'OK' }]),
       ],
     );
@@ -223,13 +236,26 @@ export const ChatInput: React.FC<ChatInputProps> = ({
     addAudioAttachment,
     clearAttachments,
     onHaptic: () => triggerHaptic('impactMedium'),
-    appendTranscript: (text) => setMessage(prev => {
-      const prefix = prev.trim() ? `${prev.trim()} ` : '';
-      return prefix + text;
-    }),
+    appendTranscript: text =>
+      setMessage(prev => {
+        const prefix = prev.trim() ? `${prev.trim()} ` : '';
+        return prefix + text;
+      }),
   });
 
-  const { isRecording, isModelLoading, isStartingRecording, isTranscribing, partialResult, error, voiceAvailable, isAwaitingSpeech, startRecording, stopRecording, cancelRecording } = useVoiceInput({
+  const {
+    isRecording,
+    isModelLoading,
+    isStartingRecording,
+    isTranscribing,
+    partialResult,
+    error,
+    voiceAvailable,
+    isAwaitingSpeech,
+    startRecording,
+    stopRecording,
+    cancelRecording,
+  } = useVoiceInput({
     conversationId,
     interfaceMode,
     onTranscript: voiceHandlers.onTranscript,
@@ -279,7 +305,7 @@ export const ChatInput: React.FC<ChatInputProps> = ({
     setMessage('');
     clearAttachments();
     inputRef.current?.focus();
-    if (imageMode === 'force') {
+    if (imageMode === 'force' || imageMode === 'video') {
       setImageMode('auto');
       onImageModeChange?.('auto');
     }
@@ -341,26 +367,27 @@ export const ChatInput: React.FC<ChatInputProps> = ({
     }, ANIM_DURATION_IN);
   };
 
-  const assistantGate = assistantAvailability === 'no-pro'
-    ? {
-        title: 'Assistant requires Pro',
-        body: 'Assistant uses Web Use and Computer Use on a connected Desktop.',
-        action: 'View Pro',
-        onPress: onAssistantUpgrade,
-      }
-    : assistantAvailability === 'unavailable'
+  const assistantGate =
+    assistantAvailability === 'no-pro'
       ? {
-          title: 'Desktop tasks unavailable',
-          body: 'This Desktop is connected, but Web Use and Computer Use are not available. Allow remote tasks on the Desktop and try again.',
-          action: 'OK',
-          onPress: undefined,
+          title: 'Assistant requires Pro',
+          body: 'Assistant uses Web Use and Computer Use on a connected Desktop.',
+          action: 'View Pro',
+          onPress: onAssistantUpgrade,
         }
-    : {
-        title: 'Connect a Desktop',
-        body: 'Set up Sync and connect Off Grid AI Desktop to use Web Use and Computer Use.',
-        action: 'Set up Sync',
-        onPress: onAssistantSetupSync,
-      };
+      : assistantAvailability === 'unavailable'
+        ? {
+            title: 'Desktop tasks unavailable',
+            body: 'This Desktop is connected, but Web Use and Computer Use are not available. Allow remote tasks on the Desktop and try again.',
+            action: 'OK',
+            onPress: undefined,
+          }
+        : {
+            title: 'Connect a Desktop',
+            body: 'Set up Sync and connect Off Grid AI Desktop to use Web Use and Computer Use.',
+            action: 'Set up Sync',
+            onPress: onAssistantSetupSync,
+          };
 
   const handleAttachPress = () => {
     logger.log(`[COMPOSER-SM] attach pressed platform=${Platform.OS} supportsVision=${supportsVision}`);
@@ -370,7 +397,7 @@ export const ChatInput: React.FC<ChatInputProps> = ({
         : ['Document', 'Cancel'];
       ActionSheetIOS.showActionSheetWithOptions(
         { options, cancelButtonIndex: options.length - 1 },
-        (index) => {
+        index => {
           if (supportsVision) {
             if (index === 0) handleVisionPress();
             else if (index === 1) handlePickDocument();
@@ -391,64 +418,70 @@ export const ChatInput: React.FC<ChatInputProps> = ({
   if (isAudioMode && AudioInput) {
     return (
       <>
-      <AudioInput
-        styles={styles}
-        disabled={disabled}
-        onSend={onSend}
-        isGenerating={isGenerating}
-        imageMode={imageMode}
-        imageModelLoaded={imageModelLoaded}
-        supportsThinking={supportsThinking}
-        supportsToolCalling={supportsToolCalling}
-        enabledToolCount={enabledToolCount}
-        thinkingEnabled={thinkingEnabled}
-        attachments={attachments}
-        onRemoveAttachment={removeAttachment}
-        onClearAttachments={clearAttachments}
-        queueCount={queueCount}
-        queuedTexts={queuedTexts}
-        onClearQueue={onClearQueue}
-        isRecording={isRecording}
-        voiceAvailable={voiceAvailable}
-        isModelLoading={isModelLoading}
-        isTranscribing={isTranscribing}
-        partialResult={partialResult}
-        error={error}
-        onStartRecording={startRecording}
-        onStopRecording={stopRecording}
-        onCancelRecording={cancelRecording}
-        onStop={onStop}
-        onImageModeToggle={handleImageModeToggle}
-        onThinkingToggle={handleThinkingToggle}
-        onToolsPress={onToolsPress}
-        onMcpPress={onMcpPress}
-        mcpToolCount={mcpToolCount}
-        onVisionPress={handleVisionPress}
-        onPickDocument={handlePickDocument}
-        onAttachPress={handleAttachPress}
-        attachPicker={attachPicker}
-        voicePicker={voicePicker}
-        quickSettings={quickSettings}
-        supportsVision={supportsVision}
-        alertState={alertState}
-        setAlertState={setAlertState}
-        assistantSelected={assistantEnabled}
-        onAssistantPress={handleAssistantPress}
-      />
-      <AppSheet
-        visible={assistantGateOpen}
-        onClose={() => setAssistantGateOpen(false)}
-        title={assistantGate.title}
-        enableDynamicSizing
-      >
-        <View style={styles.assistantGateContent}>
-          <Text style={styles.assistantGateText}>{assistantGate.body}</Text>
-          <Button title={assistantGate.action} onPress={() => {
-            setAssistantGateOpen(false);
-            assistantGate.onPress?.();
-          }} />
-        </View>
-      </AppSheet>
+        <AudioInput
+          styles={styles}
+          disabled={disabled}
+          onSend={onSend}
+          isGenerating={isGenerating}
+          imageMode={imageMode}
+          imageModelLoaded={imageModelLoaded}
+          supportsThinking={supportsThinking}
+          supportsToolCalling={supportsToolCalling}
+          enabledToolCount={enabledToolCount}
+          thinkingEnabled={thinkingEnabled}
+          attachments={attachments}
+          onRemoveAttachment={removeAttachment}
+          onClearAttachments={clearAttachments}
+          queueCount={queueCount}
+          queuedTexts={queuedTexts}
+          onClearQueue={onClearQueue}
+          isRecording={isRecording}
+          voiceAvailable={voiceAvailable}
+          isModelLoading={isModelLoading}
+          isTranscribing={isTranscribing}
+          partialResult={partialResult}
+          error={error}
+          onStartRecording={startRecording}
+          onStopRecording={stopRecording}
+          onCancelRecording={cancelRecording}
+          onStop={onStop}
+          onImageModeToggle={handleImageModeToggle}
+          onVideoModeToggle={() =>
+            setImageMode(imageMode === 'video' ? 'auto' : 'video')
+          }
+          onThinkingToggle={handleThinkingToggle}
+          onToolsPress={onToolsPress}
+          onMcpPress={onMcpPress}
+          mcpToolCount={mcpToolCount}
+          onVisionPress={handleVisionPress}
+          onPickDocument={handlePickDocument}
+          onAttachPress={handleAttachPress}
+          attachPicker={attachPicker}
+          voicePicker={voicePicker}
+          quickSettings={quickSettings}
+          supportsVision={supportsVision}
+          alertState={alertState}
+          setAlertState={setAlertState}
+          assistantSelected={assistantEnabled}
+          onAssistantPress={handleAssistantPress}
+        />
+        <AppSheet
+          visible={assistantGateOpen}
+          onClose={() => setAssistantGateOpen(false)}
+          title={assistantGate.title}
+          enableDynamicSizing
+        >
+          <View style={styles.assistantGateContent}>
+            <Text style={styles.assistantGateText}>{assistantGate.body}</Text>
+            <Button
+              title={assistantGate.action}
+              onPress={() => {
+                setAssistantGateOpen(false);
+                assistantGate.onPress?.();
+              }}
+            />
+          </View>
+        </AppSheet>
       </>
     );
   }
@@ -513,16 +546,23 @@ export const ChatInput: React.FC<ChatInputProps> = ({
                 size="small"
                 testID="assistant-toggle"
                 accessibilityLabel="Assistant"
-                accessibilityState={{ selected: assistantEnabled, busy: assistantTransitioning }}
+                accessibilityState={{
+                  selected: assistantEnabled,
+                  busy: assistantTransitioning,
+                }}
                 onPress={handleAssistantPress}
                 active={assistantEnabled}
                 loading={assistantTransitioning}
                 style={styles.assistantButton}
-                icon={<IconMC
-                  name={assistantEnabled ? 'robot' : 'robot-outline'}
-                  size={16}
-                  color={assistantEnabled ? colors.primary : colors.textDisabled}
-                />}
+                icon={
+                  <IconMC
+                    name={assistantEnabled ? 'robot' : 'robot-outline'}
+                    size={16}
+                    color={
+                      assistantEnabled ? colors.primary : colors.textDisabled
+                    }
+                  />
+                }
               />
               <TextInput
                 ref={inputRef}
@@ -530,7 +570,9 @@ export const ChatInput: React.FC<ChatInputProps> = ({
                 style={styles.pillInput}
                 value={message}
                 onChangeText={setMessage}
-                placeholder={placeholder}
+                placeholder={
+                  imageMode === 'video' ? 'Describe a video' : placeholder
+                }
                 placeholderTextColor={colors.textMuted}
                 multiline
                 scrollEnabled
@@ -575,6 +617,9 @@ export const ChatInput: React.FC<ChatInputProps> = ({
         anchorX={quickSettings.anchor.x}
         imageMode={imageMode}
         onImageModeToggle={handleImageModeToggle}
+        onVideoModeToggle={() =>
+          setImageMode(imageMode === 'video' ? 'auto' : 'video')
+        }
         imageModelLoaded={imageModelLoaded}
         supportsThinking={supportsThinking}
         supportsToolCalling={supportsToolCalling}
diff --git a/src/navigation/types.ts b/src/navigation/types.ts
index 678687011..7bc4906a3 100644
--- a/src/navigation/types.ts
+++ b/src/navigation/types.ts
@@ -37,7 +37,7 @@ export type MainTabParamList = {
   ProjectsTab: undefined;
   ModelsTab:
     | {
-        initialTab?: 'text' | 'image' | 'voice' | 'transcription';
+        initialTab?: 'text' | 'image' | 'video' | 'voice' | 'transcription';
         repairModelId?: string;
         initialSearchQuery?: string;
       }
diff --git a/src/screens/ChatScreen/ChatMessageArea.tsx b/src/screens/ChatScreen/ChatMessageArea.tsx
index 72e2c3346..8f71160f3 100644
--- a/src/screens/ChatScreen/ChatMessageArea.tsx
+++ b/src/screens/ChatScreen/ChatMessageArea.tsx
@@ -1,3 +1,4 @@
+import { VideoGenerationStatus } from '../../components/VideoGenerationStatus';
 import React, { useState, useMemo, useEffect, useRef } from 'react';
 import {
   View,
@@ -220,7 +221,10 @@ export const ChatMessageArea: React.FC<ChatMessageAreaProps> = ({
     prevIsStreamingRef.current = isStreaming;
   }, [isStreaming]);
   useEffect(() => {
-    if (chat.isGeneratingForThisConversation && !generationWasActiveRef.current) {
+    if (
+      chat.isGeneratingForThisConversation &&
+      !generationWasActiveRef.current
+    ) {
       userScrolledDuringGenerationRef.current = false;
     }
     generationWasActiveRef.current = chat.isGeneratingForThisConversation;
@@ -319,6 +323,7 @@ export const ChatMessageArea: React.FC<ChatMessageAreaProps> = ({
           </AnimatedPressable>
         </Animated.View>
       )}
+      <VideoGenerationStatus conversationId={chat.activeConversationId} />
       {chat.isGeneratingImage && (
         <ImageProgressIndicator
           styles={styles}
@@ -361,7 +366,7 @@ export const ChatMessageArea: React.FC<ChatMessageAreaProps> = ({
       <RequiredThinkingAdviceCard
         modelName={chat.activeModelName}
         required={Boolean(
-          chat.activeRemoteModel?.capabilities.thinkingLevelsOnly
+          chat.activeRemoteModel?.capabilities.thinkingLevelsOnly,
         )}
       />
       {/* A vision model missing its projector: repairable from here, because this is where the
diff --git a/src/screens/ChatScreen/ChatModalSection.tsx b/src/screens/ChatScreen/ChatModalSection.tsx
index e0bf8a080..4fbacf97a 100644
--- a/src/screens/ChatScreen/ChatModalSection.tsx
+++ b/src/screens/ChatScreen/ChatModalSection.tsx
@@ -1,7 +1,9 @@
 import React from 'react';
 import {
-  ModelSelectorModal, GenerationSettingsModal,
-  ProjectSelectorSheet, DebugSheet,
+  ModelSelectorModal,
+  GenerationSettingsModal,
+  ProjectSelectorSheet,
+  DebugSheet,
 } from '../../components';
 import { createStyles } from './styles';
 import { useTheme } from '../../theme';
@@ -22,7 +24,7 @@ type ChatModalSectionProps = {
   setShowModelSelector: (v: boolean) => void;
   onModelSelectorClosed?: () => void;
   onBackToModels?: () => void;
-  modelSelectorTab?: 'text' | 'image';
+  modelSelectorTab?: 'text' | 'image' | 'video';
   showSettingsPanel: boolean;
   setShowSettingsPanel: (v: boolean) => void;
   debugInfo: any;
@@ -45,16 +47,35 @@ type ChatModalSectionProps = {
 };
 
 export const ChatModalSection: React.FC<ChatModalSectionProps> = ({
-  styles, colors,
-  showProjectSelector, setShowProjectSelector,
-  showDebugPanel, setShowDebugPanel,
-  showModelSelector, setShowModelSelector, modelSelectorTab = 'text',
-  onModelSelectorClosed, onBackToModels,
-  showSettingsPanel, setShowSettingsPanel,
-  debugInfo, activeProject, activeConversation, settings, projects,
-  handleSelectProject, handleModelSelect, handleUnloadModel, handleDeleteConversation,
-  isModelLoading, imageCount, activeConversationId, navigation,
-  viewerImageUri, setViewerImageUri, handleSaveImage,
+  styles,
+  colors,
+  showProjectSelector,
+  setShowProjectSelector,
+  showDebugPanel,
+  setShowDebugPanel,
+  showModelSelector,
+  setShowModelSelector,
+  modelSelectorTab = 'text',
+  onModelSelectorClosed,
+  onBackToModels,
+  showSettingsPanel,
+  setShowSettingsPanel,
+  debugInfo,
+  activeProject,
+  activeConversation,
+  settings,
+  projects,
+  handleSelectProject,
+  handleModelSelect,
+  handleUnloadModel,
+  handleDeleteConversation,
+  isModelLoading,
+  imageCount,
+  activeConversationId,
+  navigation,
+  viewerImageUri,
+  setViewerImageUri,
+  handleSaveImage,
   isRemote,
 }) => {
   const videoCount = useAppStore(state => state.generatedVideos.filter(video => video.conversationId === activeConversationId).length);
diff --git a/src/screens/ChatScreen/index.tsx b/src/screens/ChatScreen/index.tsx
index 14c6a8632..ea7578a7f 100644
--- a/src/screens/ChatScreen/index.tsx
+++ b/src/screens/ChatScreen/index.tsx
@@ -1,3 +1,4 @@
+import { useAppStore } from '../../stores/appStore';
 import React, { useEffect, useRef, useState } from 'react';
 import { FlatList, Keyboard, Platform } from 'react-native';
 // Edge-to-edge-aware KeyboardAvoidingView. RN's own version leaves a residual
@@ -62,9 +63,9 @@ export const ChatScreen: React.FC = () => {
   const [modelsManagerOpen, setModelsManagerOpen] = useState(false);
   // Which tab the model selector opens on — set from the manager row the user tapped so
   // tapping "Image" focuses the Image tab (it defaulted to Text regardless of the row).
-  const [modelSelectorTab, setModelSelectorTab] = useState<'text' | 'image'>(
-    'text',
-  );
+  const [modelSelectorTab, setModelSelectorTab] = useState<
+    'text' | 'image' | 'video'
+  >('text');
   const [whisperOpen, setWhisperOpen] = useState(false);
   const [voiceOpen, setVoiceOpen] = useState(false);
   const returnToModelsRef = useRef(false);
@@ -76,7 +77,13 @@ export const ChatScreen: React.FC = () => {
   const voiceSummary = useUiModeStore(s => s.voiceSummary);
   const whisperModelId = useWhisperStore(s => s.downloadedModelId);
   const remoteLabels = useActiveRemoteModelLabels();
+  const videoLabel = useAppStore(
+    s =>
+      s.downloadedVideoModels.find(m => m.id === s.activeVideoModelId)?.name ??
+      '—',
+  );
   const modelLabels: Record<ModelRowType, string> = {
+    video: remoteLabels.video ?? videoLabel,
     text: chat.activeModelName ?? chat.activeModel?.name ?? '—',
     image: remoteLabels.image ?? chat.activeImageModel?.name ?? '—',
     voice: remoteLabels.voice ?? voiceSummary ?? '—',
@@ -101,14 +108,14 @@ export const ChatScreen: React.FC = () => {
         'Eject All Models',
         'Unload all active models to free up memory?',
         [
-      { text: 'Cancel', style: 'cancel' },
-      {
+          { text: 'Cancel', style: 'cancel' },
+          {
             text: 'Eject',
             style: 'destructive',
-        onPress: async () => {
-          chat.setAlertState(hideAlert());
-          try {
-            const count = await ejectAll();
+            onPress: async () => {
+              chat.setAlertState(hideAlert());
+              try {
+                const count = await ejectAll();
                 if (count > 0)
                   chat.setAlertState(
                     showAlert(
@@ -116,19 +123,19 @@ export const ChatScreen: React.FC = () => {
                       `Unloaded ${count} model${count > 1 ? 's' : ''}`,
                     ),
                   );
-          } catch {
+              } catch {
                 chat.setAlertState(
                   showAlert('Error', 'Failed to unload models'),
                 );
-          }
-        },
-      },
+              }
+            },
+          },
         ],
       ),
     );
   };
   const openModelRowNow = (type: ModelRowType) => {
-    if (type === 'text' || type === 'image') {
+    if (type === 'text' || type === 'image' || type === 'video') {
       setModelSelectorTab(type);
       chat.setShowModelSelector(true);
     } else if (type === 'speech') setWhisperOpen(true);
@@ -206,7 +213,11 @@ export const ChatScreen: React.FC = () => {
       onClose={() => chat.setAlertState(hideAlert())}
     />
   );
-  if (!chat.hasActiveModel && chat.displayMessages.length === 0 && !chat.isModelLoading) {
+  if (
+    !chat.hasActiveModel &&
+    chat.displayMessages.length === 0 &&
+    !chat.isModelLoading
+  ) {
     return (
       <>
         <NoModelScreen
diff --git a/src/screens/ChatScreen/useChatGenerationActions.ts b/src/screens/ChatScreen/useChatGenerationActions.ts
index 9888d5bee..a610c22d9 100644
--- a/src/screens/ChatScreen/useChatGenerationActions.ts
+++ b/src/screens/ChatScreen/useChatGenerationActions.ts
@@ -1,3 +1,4 @@
+import { videoGenerationService } from '../../services/videoGenerationService';
 /* eslint-disable max-lines -- cohesive generation-action orchestrator (send/regenerate/dispatch/route share the same GenerationDeps + session state); splitting it would scatter tightly-coupled turn logic. */
 import { Dispatch, SetStateAction } from 'react';
 import RNFS from 'react-native-fs';
@@ -210,7 +211,7 @@ function buildMessagesForContext(
 /** The modality of a turn. Resolved ONCE from user intent when the turn is created, recorded on
  *  the turn's record, and READ on resend/edit so the same pipeline runs again (deterministic) —
  *  never re-classified from current settings. STT/TTS join this union as the pipeline grows. */
-export type TurnKind = 'text' | 'image';
+export type TurnKind = 'text' | 'image' | 'video';
 
 /** Did this assistant reply produce an image? An image turn's final assistant message carries an
  *  image attachment (imageGenerationService), so that message IS the owning record of the turn's
@@ -249,6 +250,7 @@ export function recordedTurnKind(
     if (m.role === 'user') break; // next turn begins — stop scanning
     if (m.role !== 'assistant') continue;
     sawReply = true;
+    if (m.attachments?.some(a => a.type === 'video')) return 'video';
     if (messageHasImageOutput(m)) return 'image';
   }
   return sawReply ? 'text' : undefined;
@@ -264,11 +266,13 @@ export async function resolveTurnKind(
   input: {
     text: string;
     recordedKind?: TurnKind;
+    forceVideoMode?: boolean;
     forceImageMode?: boolean;
     imageEnabled?: boolean;
   },
 ): Promise<TurnKind> {
   if (input.recordedKind) return input.recordedKind; // replay: the recorded fact wins
+  if (input.forceVideoMode) return 'video';
   if (input.imageEnabled === false) return 'text'; // image route explicitly disabled for this turn
   return (await shouldRouteToImageGenerationFn(
     deps,
@@ -456,9 +460,16 @@ async function prepareContext(
   setDebugInfo: SetState<any>,
   systemPrompt: string,
   messages: Message[],
-): Promise<Pick<GenerationMeta, 'contextPromptTokens' | 'contextWindowTokens' | 'contextEstimate'> | undefined> {
+): Promise<
+  | Pick<
+      GenerationMeta,
+      'contextPromptTokens' | 'contextWindowTokens' | 'contextEstimate'
+    >
+  | undefined
+> {
   const estimatedPromptTokens = Math.ceil(
-    JSON.stringify(messages.map(m => ({ role: m.role, content: m.content }))).length / 4,
+    JSON.stringify(messages.map(m => ({ role: m.role, content: m.content })))
+      .length / 4,
   );
   const remoteStore = useRemoteServerStore.getState();
   if (remoteStore.activeServerId) {
@@ -467,7 +478,9 @@ async function prepareContext(
     setDebugInfo(null);
     return {
       contextPromptTokens: estimatedPromptTokens,
-      ...(contextWindowTokens && contextWindowTokens > 0 ? { contextWindowTokens } : {}),
+      ...(contextWindowTokens && contextWindowTokens > 0
+        ? { contextWindowTokens }
+        : {}),
       contextEstimate: true,
     };
   }
@@ -482,7 +495,8 @@ async function prepareContext(
     }
     const contextWindowTokens = contextDebug.maxContextLength || useAppStore.getState().settings.contextLength || APP_CONFIG.maxContextLength;
     return {
-      contextPromptTokens: contextDebug.estimatedTokens || estimatedPromptTokens,
+      contextPromptTokens:
+        contextDebug.estimatedTokens || estimatedPromptTokens,
       contextWindowTokens,
       contextEstimate: true,
     };
@@ -497,7 +511,13 @@ async function prepareContext(
 }
 /** Compact before the prompt budget is full; keep the context-full retry as a fallback. */
 async function generateWithCompactionRetry(
-  opts: { id: string; prompt: string; messages: Message[]; setDebugInfo?: SetState<any>; assistantEnabled?: boolean },
+  opts: {
+    id: string;
+    prompt: string;
+    messages: Message[];
+    setDebugInfo?: SetState<any>;
+    assistantEnabled?: boolean;
+  },
   enabledTools: string[],
   projectId?: string,
 ): Promise<boolean> {
@@ -524,13 +544,22 @@ async function generateWithCompactionRetry(
           contextUsage,
           assistantEnabled: opts.assistantEnabled,
         })
-      : generationService.generateResponse(opts.id, msgs, undefined, contextUsage);
+      : generationService.generateResponse(
+          opts.id,
+          msgs,
+          undefined,
+          contextUsage,
+        );
   };
   const contextWindowTokens = useRemoteServerStore.getState().activeServerId
-    ? useAppStore.getState().settings.contextLength || APP_CONFIG.maxContextLength
-    : llmService.getPerformanceSettings().contextLength || APP_CONFIG.maxContextLength;
+    ? useAppStore.getState().settings.contextLength ||
+      APP_CONFIG.maxContextLength
+    : llmService.getPerformanceSettings().contextLength ||
+      APP_CONFIG.maxContextLength;
   const estimatedPromptTokens = Math.ceil(
-    JSON.stringify(opts.messages.map(m => ({ role: m.role, content: m.content }))).length / 4,
+    JSON.stringify(
+      opts.messages.map(m => ({ role: m.role, content: m.content })),
+    ).length / 4,
   );
   let messagesForFirstAttempt = opts.messages;
   if (
@@ -891,6 +920,33 @@ async function dispatchResolvedTurn(
     onTextModelUnavailable: () => void;
   },
 ): Promise<ResolvedDispatch> {
+  if (kind === 'video') {
+    if (
+      opts.attachments?.some(
+        attachment =>
+          attachment.type === 'image' || attachment.type === 'video',
+      )
+    )
+      throw new Error(
+        'This video model uses text prompts. Remove the image or video attachment to continue.',
+      );
+    if (!opts.imageSkipsUserMessage)
+      deps.addMessage(opts.conversationId, {
+        role: 'user',
+        content: opts.text,
+        attachments: opts.attachments,
+        turnKind: 'video',
+      });
+    try {
+      await videoGenerationService.generate({
+        prompt: opts.text,
+        conversationId: opts.conversationId,
+      });
+    } finally {
+      generationService.drainQueue();
+    }
+    return { handled: true };
+  }
   const shouldGenerateImage = kind === 'image';
   if (shouldGenerateImage && deps.activeImageModel) {
     logger.log('[ROUTE-SM] dispatch → IMAGE pipeline');
@@ -927,7 +983,7 @@ export type DispatchCall = {
   text: string;
   attachments?: MediaAttachment[];
   conversationId: string;
-  imageMode?: 'auto' | 'force' | 'disabled';
+  imageMode?: 'auto' | 'force' | 'disabled' | 'video';
   assistantEnabled?: boolean;
 };
 /**
@@ -939,7 +995,11 @@ export type DispatchCall = {
 export async function dispatchGenerationFn(
   deps: GenerationDeps,
   call: DispatchCall,
-  startTextGeneration: (convId: string, messageText: string, assistantEnabled?: boolean) => Promise<void>,
+  startTextGeneration: (
+    convId: string,
+    messageText: string,
+    assistantEnabled?: boolean,
+  ) => Promise<void>,
 ): Promise<void> {
   const { text, attachments, conversationId, imageMode = 'auto', assistantEnabled } = call;
   const messageTextForRoute = appendAttachmentText(text, attachments);
@@ -954,6 +1014,7 @@ export async function dispatchGenerationFn(
   // ONE decision seam (resolveTurnKind); a NEW turn has no recorded kind so the route rule decides.
   const kind = await resolveTurnKind(deps, {
     text: messageTextForRoute,
+    forceVideoMode: imageMode === 'video',
     forceImageMode: imageMode === 'force',
     imageEnabled: imageMode !== 'disabled',
   });
@@ -979,7 +1040,7 @@ export async function dispatchGenerationFn(
 export type SendCall = {
   text: string;
   attachments?: MediaAttachment[];
-  imageMode?: 'auto' | 'force' | 'disabled';
+  imageMode?: 'auto' | 'force' | 'disabled' | 'video';
   assistantEnabled?: boolean;
   startGeneration: (convId: string, text: string, assistantEnabled?: boolean) => Promise<void>;
   setDebugInfo: SetState<any>;
@@ -1003,7 +1064,10 @@ export async function handleSendFn(
   let targetConversationId = deps.activeConversationId;
   if (!targetConversationId) {
     const fallbackModelId =
-      deps.activeModelInfo?.modelId || deps.activeImageModel?.id;
+      deps.activeModelInfo?.modelId ||
+      deps.activeImageModel?.id ||
+      useAppStore.getState().activeVideoModelId ||
+      'video';
     targetConversationId = deps.createConversation(
       fallbackModelId!,
       undefined,
@@ -1014,6 +1078,7 @@ export async function handleSendFn(
   // Cross-modality serialization: queue if any generation is running (routed later).
   if (
     generationService.getState().isGenerating ||
+    videoGenerationService.getState().phase === 'running' ||
     imageGenerationService.getState().isGenerating
   ) {
     const messageText = appendAttachmentText(text, attachments);
@@ -1032,7 +1097,13 @@ export async function handleSendFn(
   }
   await dispatchGenerationFn(
     deps,
-    { text, attachments, conversationId: targetConversationId, imageMode, assistantEnabled },
+    {
+      text,
+      attachments,
+      conversationId: targetConversationId,
+      imageMode,
+      assistantEnabled,
+    },
     startGeneration,
   );
 }
@@ -1043,7 +1114,10 @@ export async function handleStopFn(
   callHook(HOOKS.audioStop); // abort must silence TTS too — buffered-ahead sentences keep playing otherwise
   // The image X is also the remote stop signal. Start both cancellations now; waiting for the text
   // engine first leaves every paired device showing image progress while that stop call drains.
-  const stops: Promise<unknown>[] = [generationService.stopGeneration()];
+  const stops: Promise<unknown>[] = [
+    generationService.stopGeneration(),
+    videoGenerationService.cancelGeneration(),
+  ];
   const taskStop = callHook<Promise<void>>(HOOKS.taskStopActive);
   if (taskStop !== undefined) stops.push(taskStop);
   if (deps.isGeneratingImage)
diff --git a/src/screens/ChatScreen/useChatScreen.ts b/src/screens/ChatScreen/useChatScreen.ts
index 585d17446..dd7a8e092 100644
--- a/src/screens/ChatScreen/useChatScreen.ts
+++ b/src/screens/ChatScreen/useChatScreen.ts
@@ -173,7 +173,16 @@ export const useChatScreen = () => {
     ? (activeModelInfo.model as RemoteModel | null)
     : null;
   const hasTextModel = activeModelInfo.modelId !== null;
-  const hasActiveModel = hasTextModel || !!activeImageModelId || !!activeRemoteImageServer;
+  const selectedVideoModelId = useAppStore(s => s.activeVideoModelId);
+  const remoteVideoId = useRemoteServerStore(
+    s => s.activeRemoteMediaServerIds.video,
+  );
+  const hasActiveModel =
+    !!remoteVideoId ||
+    !!selectedVideoModelId ||
+    hasTextModel ||
+    !!activeImageModelId ||
+    !!activeRemoteImageServer;
   const activeModelName = activeModelInfo.modelName;
   const availableDownloadedTextModels = useMemo(
     () =>
@@ -202,7 +211,10 @@ export const useChatScreen = () => {
     ? getProject(effectiveProjectId)
     : null;
   const activeImageModel = activeRemoteImageServer
-    ? { id: activeRemoteImageServer.mediaModels!.image!, name: `${activeRemoteImageServer.name} / ${activeRemoteImageServer.mediaModels!.image}` }
+    ? {
+        id: activeRemoteImageServer.mediaModels!.image!,
+        name: `${activeRemoteImageServer.name} / ${activeRemoteImageServer.mediaModels!.image}`,
+      }
     : downloadedImageModels.find(m => m.id === activeImageModelId);
   const imageModelLoaded = !!activeImageModel;
   const isGeneratingImage = imageGenState.isGenerating;
@@ -305,21 +317,30 @@ export const useChatScreen = () => {
   const remotePreviews = useRemoteChatStreamPreviews(activeConversationId);
   const localDeviceId = useSyncIdentityStore(s => s.localDeviceId);
   const displayMessages = useMemo(
-    () => getDisplayMessages(activeConversation?.messages || [], {
+    () =>
+      getDisplayMessages(activeConversation?.messages || [], {
+        isThinking,
+        streamingMessage: '',
+        streamingReasoningContent: '',
+        hasStreamingText,
+        isStreamingForThisConversation,
+        isModelLoading,
+        loadingModelName: loadingModel?.name,
+        isGeneratingForThisConversation,
+        remotePreviews,
+        localDeviceId,
+      }),
+    [
+      activeConversation?.messages,
       isThinking,
-      streamingMessage: '',
-      streamingReasoningContent: '',
       hasStreamingText,
       isStreamingForThisConversation,
       isModelLoading,
-      loadingModelName: loadingModel?.name,
+      loadingModel?.name,
       isGeneratingForThisConversation,
       remotePreviews,
       localDeviceId,
-    }),
-    [activeConversation?.messages, isThinking, hasStreamingText,
-      isStreamingForThisConversation, isModelLoading, loadingModel?.name,
-      isGeneratingForThisConversation, remotePreviews, localDeviceId],
+    ],
   );
 
   const animateLastN = useChatPresentationLifecycle(
@@ -329,7 +350,8 @@ export const useChatScreen = () => {
   );
 
   const chatActions = useChatScreenActions({
-    generationDeps: genDeps, generationDepsRef: genDepsRef,
+    generationDeps: genDeps,
+    generationDepsRef: genDepsRef,
     modelDeps,
     activeModelInfo,
     supportsToolCalling,
diff --git a/src/screens/ChatScreen/useChatScreenActions.ts b/src/screens/ChatScreen/useChatScreenActions.ts
index 2daebfe6f..7fdffa417 100644
--- a/src/screens/ChatScreen/useChatScreenActions.ts
+++ b/src/screens/ChatScreen/useChatScreenActions.ts
@@ -116,7 +116,7 @@ export function useChatScreenActions({
   const handleSend = (
     text: string,
     attachments?: MediaAttachment[],
-    imageMode?: 'auto' | 'force' | 'disabled',
+    imageMode?: 'auto' | 'force' | 'disabled' | 'video',
     assistantEnabled?: boolean,
   ) =>
     handleSendFn(generationDeps, {
@@ -191,7 +191,10 @@ export function useChatScreenActions({
     handleCopyMessage: (content: string) => {
       callHook(HOOKS.clipboardRecordLocalText, content, Date.now());
     },
-    handleRetryMessage: (message: ChatStoreState['conversations'][number]['messages'][number], assistantEnabled = false) => {
+    handleRetryMessage: (
+      message: ChatStoreState['conversations'][number]['messages'][number],
+      assistantEnabled = false,
+    ) => {
       const currentDeps = generationDepsRef.current ?? generationDeps;
       return handleRetryMessageFn(message, currentDeps, {
         activeConversationId: currentDeps.activeConversationId,
diff --git a/src/screens/HomeScreen/hooks/types.ts b/src/screens/HomeScreen/hooks/types.ts
index 4f4b75257..8bbff298f 100644
--- a/src/screens/HomeScreen/hooks/types.ts
+++ b/src/screens/HomeScreen/hooks/types.ts
@@ -14,10 +14,10 @@ export type HomeScreenNavigationProp = CompositeNavigationProp<
   NativeStackNavigationProp<RootStackParamList>
 >;
 
-export type ModelPickerType = 'text' | 'image' | null;
+export type ModelPickerType = 'text' | 'image' | 'video' | null;
 
 export type LoadingState = {
   isLoading: boolean;
-  type: 'text' | 'image' | null;
+  type: 'text' | 'image' | 'video' | null;
   modelName: string | null;
 };
diff --git a/src/screens/HomeScreen/index.tsx b/src/screens/HomeScreen/index.tsx
index 23e41ebff..e45e0485a 100644
--- a/src/screens/HomeScreen/index.tsx
+++ b/src/screens/HomeScreen/index.tsx
@@ -1,3 +1,4 @@
+import { useAppStore } from '../../stores/appStore';
 import React from 'react';
 import { View, Text, ScrollView, TouchableOpacity, Image } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
@@ -41,6 +42,7 @@ type HomeScreenProps = {
 function homeModelLabels(input: {
   text?: string;
   image?: string;
+  video?: string;
   voice?: string | null;
   transcription?: string | null;
   localVoice?: string | null;
@@ -49,6 +51,7 @@ function homeModelLabels(input: {
   return {
     text: input.text ?? '—',
     image: input.image ?? '—',
+    video: input.video ?? '—',
     voice: input.voice ?? input.localVoice ?? '—',
     speech: input.transcription ?? input.localTranscription ?? '—',
   };
@@ -111,7 +114,11 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({ navigation }) => {
   const voiceSummary = useUiModeStore(s => s.voiceSummary);
   const remoteLabels = useActiveRemoteModelLabels();
 
+  const videoLabel = useAppStore(
+    s => s.downloadedVideoModels.find(m => m.id === s.activeVideoModelId)?.name,
+  );
   const modelLabels = homeModelLabels({
+    video: remoteLabels.video ?? videoLabel,
     text: activeTextModelId ? activeTextModelName : undefined,
     image: activeImageModel?.name,
     voice: remoteLabels.voice,
@@ -139,6 +146,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({ navigation }) => {
   const presentModelSheet = (type: ModelRowType) => {
     if (type === 'text') setPickerType('text');
     else if (type === 'image') setPickerType('image');
+    else if (type === 'video') setPickerType('video');
     else if (type === 'speech') setWhisperOpen(true);
     else setVoiceOpen(true);
   };
@@ -292,7 +300,8 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({ navigation }) => {
             <View style={styles.galleryCardInfo}>
               <Text style={styles.galleryCardTitle}>Image Gallery</Text>
               <Text style={styles.galleryCardMeta}>
-                {generatedImages.length} images · {generatedVideos.length} videos
+                {generatedImages.length} images · {generatedVideos.length}{' '}
+                videos
               </Text>
             </View>
             <Icon name="chevron-right" size={16} color={colors.textMuted} />
diff --git a/src/services/generationRemoteHelpers.ts b/src/services/generationRemoteHelpers.ts
index df3882d09..9b4e96951 100644
--- a/src/services/generationRemoteHelpers.ts
+++ b/src/services/generationRemoteHelpers.ts
@@ -1,3 +1,4 @@
+import { videoGenerationService } from './videoGenerationService';
 // Remote (OpenAI-compatible server) generation paths for GenerationService.
 //
 // Split from generationServiceHelpers.ts, which owns the LOCAL engines (llama.rn and LiteRT). The two
@@ -151,7 +152,7 @@ export async function generateRemoteWithToolsImpl(
 
   try {
     // Use the same tool loop but with remote provider
-    await runToolLoop({
+    const outcome = await runToolLoop({
       conversationId,
       messages,
       enabledToolIds,
@@ -185,8 +186,14 @@ export async function generateRemoteWithToolsImpl(
         );
       svc.checkSharePrompt();
       svc.resetState();
+      await videoGenerationService.finishDeferred(
+        conversationId,
+        outcome.interrupted,
+      );
+      svc.drainQueue();
     }
   } catch (error) {
+    videoGenerationService.discardDeferred(conversationId);
     if (svc.abortRequested) return;
     logger.error('[GenerationService] Remote tool generation error:', error);
     // Reset generating state on error, else isGenerating stays stuck → red stop, next send blocked (2026-07-14).
diff --git a/src/services/generationService.ts b/src/services/generationService.ts
index f2d2e9b5a..a5879226c 100644
--- a/src/services/generationService.ts
+++ b/src/services/generationService.ts
@@ -1,3 +1,4 @@
+import { videoGenerationService } from './videoGenerationService';
 /** GenerationService - Handles LLM generation independently of UI lifecycle */
 import { llmService } from './llm';
 import { getActiveEngineService, prepareActiveConversation, stopAllTextEngines } from './engines';
@@ -33,12 +34,15 @@ type FallbackRoute =
   | { kind: 'local'; id: string; name: string };
 
 export interface QueuedMessage {
-  id: string; conversationId: string; text: string;
-  attachments?: MediaAttachment[]; messageText: string;
+  id: string;
+  conversationId: string;
+  text: string;
+  attachments?: MediaAttachment[];
+  messageText: string;
   /** The modality the user forced for THIS send (force/disabled/auto). Carried through the queue so a
    *  message the user explicitly forced to image mode is dispatched as image on drain — never re-decided
    *  at 'auto' by resolveTurnKind (#510: a queued force-image send generated as text). */
-  imageMode?: 'auto' | 'force' | 'disabled';
+  imageMode?: 'auto' | 'force' | 'disabled' | 'video';
   assistantEnabled?: boolean;
 }
 
@@ -56,8 +60,12 @@ type QueueProcessor = (item: QueuedMessage) => Promise<void>;
 
 class GenerationService {
   private state: GenerationState = {
-    isGenerating: false, isThinking: false, conversationId: null,
-    streamingContent: '', startTime: null, queuedMessages: [],
+    isGenerating: false,
+    isThinking: false,
+    conversationId: null,
+    streamingContent: '',
+    startTime: null,
+    queuedMessages: [],
   };
 
   private listeners: Set<GenerationListener> = new Set();
@@ -66,12 +74,19 @@ class GenerationService {
   private generationAttempt: number = 0;
   /** Whether the last/active generation was stopped by the user — lets callers skip a
    *  "no response" retry prompt when the empty result was an intentional abort. */
-  wasAborted(): boolean { return this.abortRequested; }
+  wasAborted(): boolean {
+    return this.abortRequested;
+  }
   private pendingStop: Promise<void> | null = null;
   private queueProcessor: QueueProcessor | null = null;
   private currentRemoteAbortController: AbortController | null = null;
   private remoteTimeToFirstToken: number | undefined;
-  private contextUsage: Pick<GenerationMeta, 'contextPromptTokens' | 'contextWindowTokens' | 'contextEstimate'> | undefined;
+  private contextUsage:
+    | Pick<
+        GenerationMeta,
+        'contextPromptTokens' | 'contextWindowTokens' | 'contextEstimate'
+      >
+    | undefined;
 
   // Token batching — collect tokens and flush to UI at a controlled rate
   private tokenBuffer: string = '';
@@ -121,11 +136,16 @@ class GenerationService {
     this.flushTokenBuffer();
   }
 
-  private normalizeStreamChunk(data: StreamChunk): { content?: string; reasoningContent?: string } {
+  private normalizeStreamChunk(data: StreamChunk): {
+    content?: string;
+    reasoningContent?: string;
+  } {
     return typeof data === 'string' ? { content: data } : data;
   }
 
-  getState(): GenerationState { return { ...this.state }; }
+  getState(): GenerationState {
+    return { ...this.state };
+  }
 
   isGeneratingFor(conversationId: string): boolean {
     return this.state.isGenerating && this.state.conversationId === conversationId;
@@ -135,7 +155,9 @@ class GenerationService {
     this.listeners.add(listener); listener(this.getState()); return () => this.listeners.delete(listener);
   }
 
-  private notifyListeners(): void { this.listeners.forEach(l => l(this.getState())); }
+  private notifyListeners(): void {
+    this.listeners.forEach(l => l(this.getState()));
+  }
 
   private updateState(partial: Partial<GenerationState>): void {
     this.state = { ...this.state, ...partial };
@@ -149,8 +171,12 @@ class GenerationService {
     checkProPromptForText(delayMs);
   }
 
-  private buildToolLoopHandlers() { return buildToolLoopHandlersImpl(this); }
-  private buildGenerationMeta(): GenerationMeta { return buildGenerationMetaImpl(this); }
+  private buildToolLoopHandlers() {
+    return buildToolLoopHandlersImpl(this);
+  }
+  private buildGenerationMeta(): GenerationMeta {
+    return buildGenerationMetaImpl(this);
+  }
   private async prepareGeneration(conversationId: string): Promise<boolean> {
     return prepareGenerationImpl(this, conversationId);
   }
@@ -180,30 +206,51 @@ class GenerationService {
     const selectedId = startedRemote ? remote.activeRemoteTextModelId : local.activeModelId;
     const selectedName = startedRemote
       ? remote.getActiveRemoteTextModel()?.name || selectedId || 'Remote model'
-      : local.downloadedModels.find(model => model.id === selectedId)?.name || 'Local model';
+      : local.downloadedModels.find(model => model.id === selectedId)?.name ||
+        'Local model';
     const needsVision = messages.some(message =>
       message.attachments?.some(attachment => attachment.type === 'image'),
     );
     const remoteRoutes = startedRemote
       ? remote.servers.flatMap(server =>
           (remote.discoveredModels[server.id] || [])
-            .filter(model =>
-              (server.id !== remote.activeServerId || model.id !== selectedId) &&
-              (!needsVision || model.capabilities.supportsVision),
+            .filter(
+              model =>
+                (server.id !== remote.activeServerId ||
+                  model.id !== selectedId) &&
+                (!needsVision || model.capabilities.supportsVision),
             )
-            .map(model => ({ kind: 'remote' as const, serverId: server.id, id: model.id, name: model.name })),
+            .map(model => ({
+              kind: 'remote' as const,
+              serverId: server.id,
+              id: model.id,
+              name: model.name,
+            })),
         )
       : [];
     const localRoutes = local.downloadedModels
-      .filter(model =>
-        model.id !== selectedId &&
-        (!needsVision || (model.engine === 'litert' ? model.liteRTVision : model.isVisionModel)),
+      .filter(
+        model =>
+          model.id !== selectedId &&
+          (!needsVision ||
+            (model.engine === 'litert'
+              ? model.liteRTVision
+              : model.isVisionModel)),
       )
       .sort((a, b) => a.fileSize - b.fileSize)
-      .map(model => ({ kind: 'local' as const, id: model.id, name: model.name }));
+      .map(model => ({
+        kind: 'local' as const,
+        id: model.id,
+        name: model.name,
+      }));
     return [
       startedRemote
-        ? { kind: 'remote', serverId: remote.activeServerId || '', id: selectedId || '', name: selectedName }
+        ? {
+            kind: 'remote',
+            serverId: remote.activeServerId || '',
+            id: selectedId || '',
+            name: selectedName,
+          }
         : { kind: 'local', id: selectedId || '', name: selectedName },
       ...remoteRoutes,
       ...localRoutes,
@@ -250,7 +297,8 @@ class GenerationService {
         this.totalReasoningLength = 0;
         this.remoteTimeToFirstToken = undefined;
         useChatStore.getState().addMessage(conversationId, {
-          role: 'tool', toolName: 'model_fallback',
+          role: 'tool',
+          toolName: 'model_fallback',
           content: `${failedName} could not answer. Trying ${route.name}.`,
         });
         prepared = this.state.isGenerating;
@@ -301,46 +349,81 @@ class GenerationService {
         options.onToolCallComplete?.(name, result);
       },
     };
-    return this.withModelFallback(conversationId, messages, async (route, prepared) => {
-      if (route.kind === 'remote') {
-        return generateRemoteWithToolsImpl(this, {
-          conversationId, messages,
-          options: { ...trackedOptions, prepared, preservePartialOnError: false },
-        });
-      }
-      const { enabledToolIds, projectId, contextUsage, assistantEnabled, ...callbacks } = trackedOptions;
-      if (!prepared && !(await this.prepareGeneration(conversationId))) return;
-      this.contextUsage = contextUsage;
-      try {
-      const outcome = await runToolLoop({
-        conversationId,
-        messages,
-        enabledToolIds,
-        projectId,
-        assistantEnabled,
-        callbacks,
-        ...this.buildToolLoopHandlers(),
-      });
-
-      // If aborted, stopGeneration() already handled cleanup.
-      logger.log(`[GenService][ToolLoop] runToolLoop done — aborted=${this.abortRequested}, streamingContent=${this.state.streamingContent?.length ?? 0}ch, tokenBuffer=${this.tokenBuffer?.length ?? 0}ch`);
-      if (!this.abortRequested) {
-        this.forceFlushTokens();
-        const store = useChatStore.getState();
-        logger.log(`[GenService][ToolLoop] pre-finalize — streamingForConvId=${store.streamingForConversationId}, targetConvId=${conversationId}, streamingMsg=${store.streamingMessage?.length ?? 0}ch`);
-        const generationTime = this.state.startTime ? Date.now() - this.state.startTime : undefined;
-        store.finalizeStreamingMessage(conversationId, generationTime, this.buildGenerationMeta());
-        logger.log(`[GenService][ToolLoop] finalizeStreamingMessage called — convId=${conversationId}`);
-        this.checkSharePrompt();
-        this.resetState();
-      }
-      return outcome;
-    } catch (error) {
-      if (this.abortRequested) return;
-      logger.error('[GenerationService] Tool generation error:', error);
-      throw error;
-      }
-    }, () => !toolStarted);
+    return this.withModelFallback(
+      conversationId,
+      messages,
+      async (route, prepared) => {
+        if (route.kind === 'remote') {
+          return generateRemoteWithToolsImpl(this, {
+            conversationId,
+            messages,
+            options: {
+              ...trackedOptions,
+              prepared,
+              preservePartialOnError: false,
+            },
+          });
+        }
+        const {
+          enabledToolIds,
+          projectId,
+          contextUsage,
+          assistantEnabled,
+          ...callbacks
+        } = trackedOptions;
+        if (!prepared && !(await this.prepareGeneration(conversationId)))
+          return;
+        this.contextUsage = contextUsage;
+        try {
+          const outcome = await runToolLoop({
+            conversationId,
+            messages,
+            enabledToolIds,
+            projectId,
+            assistantEnabled,
+            callbacks,
+            ...this.buildToolLoopHandlers(),
+          });
+
+          // If aborted, stopGeneration() already handled cleanup.
+          logger.log(
+            `[GenService][ToolLoop] runToolLoop done — aborted=${this.abortRequested}, streamingContent=${this.state.streamingContent?.length ?? 0}ch, tokenBuffer=${this.tokenBuffer?.length ?? 0}ch`,
+          );
+          if (!this.abortRequested) {
+            this.forceFlushTokens();
+            const store = useChatStore.getState();
+            logger.log(
+              `[GenService][ToolLoop] pre-finalize — streamingForConvId=${store.streamingForConversationId}, targetConvId=${conversationId}, streamingMsg=${store.streamingMessage?.length ?? 0}ch`,
+            );
+            const generationTime = this.state.startTime
+              ? Date.now() - this.state.startTime
+              : undefined;
+            store.finalizeStreamingMessage(
+              conversationId,
+              generationTime,
+              this.buildGenerationMeta(),
+            );
+            logger.log(
+              `[GenService][ToolLoop] finalizeStreamingMessage called — convId=${conversationId}`,
+            );
+            this.checkSharePrompt();
+            this.resetState();
+          }
+          await videoGenerationService.finishDeferred(
+            conversationId,
+            outcome.interrupted,
+          );
+          this.drainQueue();
+          return outcome;
+        } catch (error) {
+          videoGenerationService.discardDeferred(conversationId);
+          if (this.abortRequested) return;
+          logger.error('[GenerationService] Tool generation error:', error);
+          throw error;
+        }
+      },
+      () => !toolStarted,
+    );
   }
 
   /**
@@ -424,8 +507,10 @@ class GenerationService {
     // generations can drain it before starting.
     const engine = getActiveEngineService();
     this.pendingStop = (engine?.stopGeneration() ?? Promise.resolve())
-      .catch(() => { })
-      .finally(() => { this.pendingStop = null; });
+      .catch(() => {})
+      .finally(() => {
+        this.pendingStop = null;
+      });
 
     return partialContent;
   }
@@ -460,9 +545,14 @@ class GenerationService {
     this.notifyListeners();
   }
 
-  clearQueue(): void { this.state = { ...this.state, queuedMessages: [] }; this.notifyListeners(); }
+  clearQueue(): void {
+    this.state = { ...this.state, queuedMessages: [] };
+    this.notifyListeners();
+  }
 
-  setQueueProcessor(processor: QueueProcessor | null): void { this.queueProcessor = processor; }
+  setQueueProcessor(processor: QueueProcessor | null): void {
+    this.queueProcessor = processor;
+  }
 
   /**
    * Process queued messages now. Text generation drains its own queue on
@@ -471,26 +561,23 @@ class GenerationService {
    * text generation is currently running.
    */
   drainQueue(): void {
-    if (this.state.isGenerating) return;
+    if (this.state.isGenerating || videoGenerationService.hasPending()) return;
     this.processNextInQueue();
   }
 
   private processNextInQueue(): void {
-    if (this.state.queuedMessages.length === 0 || !this.queueProcessor) return;
-    const all = this.state.queuedMessages;
-    this.state = { ...this.state, queuedMessages: [] };
+    if (
+      this.state.queuedMessages.length === 0 ||
+      !this.queueProcessor ||
+      videoGenerationService.hasPending()
+    )
+      return;
+    const [combined, ...remaining] = this.state.queuedMessages;
+    this.state = { ...this.state, queuedMessages: remaining };
     this.notifyListeners();
-    const combined: QueuedMessage = all.length === 1 ? all[0] : {
-      id: all[0].id, conversationId: all[0].conversationId,
-      text: all.map(m => m.text).join('\n\n'),
-      attachments: all.flatMap(m => m.attachments || []),
-      messageText: all.map(m => m.messageText).join('\n\n'),
-      // If ANY coalesced send forced image mode, the combined dispatch must force image too — the
-      // user's explicit force must never be dropped by the merge (mirror of the single-message carry).
-      imageMode: all.some(m => m.imageMode === 'force') ? 'force' : all[0].imageMode,
-      assistantEnabled: all.some(m => m.assistantEnabled),
-    };
-    this.queueProcessor(combined).catch(e => { logger.error('[GenerationService] Queue processor error:', e); });
+    this.queueProcessor(combined).catch(e => {
+      logger.error('[GenerationService] Queue processor error:', e);
+    });
   }
 
   private resetState(): void {
diff --git a/src/services/sync/messageContext.ts b/src/services/sync/messageContext.ts
index 77a01cfff..507264414 100644
--- a/src/services/sync/messageContext.ts
+++ b/src/services/sync/messageContext.ts
@@ -41,6 +41,7 @@ export function serializeMessageContext(
     | 'generationMeta'
     | 'isSystemInfo'
     | 'turnStatus'
+    | 'turnKind'
   >,
 ): string | null {
   return serializeSyncedMessageContext({
@@ -100,6 +101,7 @@ export function serializeMessageContext(
     ...(message.generationTimeMs !== undefined
       ? { durationMs: message.generationTimeMs }
       : {}),
+    turnKind: message.turnKind,
     status: message.turnStatus ?? 'completed',
   });
 }
diff --git a/src/services/sync/mutation.ts b/src/services/sync/mutation.ts
index 2ff7cc451..9c8950e02 100644
--- a/src/services/sync/mutation.ts
+++ b/src/services/sync/mutation.ts
@@ -1,3 +1,4 @@
+import { VIDEO_SETTING_KEYS, acceptsVideoSetting } from '@offgrid/models';
 import { callHook, HOOKS } from '../../bootstrap/hookRegistry';
 import {
   KNOWLEDGE_DOCUMENT_ENTITY,
@@ -62,6 +63,15 @@ const integerInRange =
 const MODEL_SETTING_DESCRIPTORS: Readonly<
   Record<string, ModelSettingDescriptor>
 > = {
+  ...Object.fromEntries(
+    VIDEO_SETTING_KEYS.map(key => [
+      key,
+      {
+        localKey: key,
+        accepts: (value: unknown) => acceptsVideoSetting(key, value),
+      },
+    ]),
+  ),
   temperature: { localKey: 'temperature', accepts: finiteInRange(0, 2) },
   ctxSize: {
     localKey: 'contextLength',
diff --git a/src/services/tools/handlers.ts b/src/services/tools/handlers.ts
index b7dd6c36d..8814dcdad 100644
--- a/src/services/tools/handlers.ts
+++ b/src/services/tools/handlers.ts
@@ -1,11 +1,22 @@
+import { videoGenerationService } from '../videoGenerationService';
 import { Platform } from 'react-native';
 import DeviceInfo from 'react-native-device-info';
 import { ToolCall, ToolResult } from './types';
 import type { RagSearchResult } from '../rag';
 import logger from '../../utils/logger';
 
-function makeResult(call: ToolCall, start: number, opts: { content: string; error?: string }): ToolResult {
-  return { toolCallId: call.id, name: call.name, content: opts.content, error: opts.error, durationMs: Date.now() - start };
+function makeResult(
+  call: ToolCall,
+  start: number,
+  opts: { content: string; error?: string },
+): ToolResult {
+  return {
+    toolCallId: call.id,
+    name: call.name,
+    content: opts.content,
+    error: opts.error,
+    durationMs: Date.now() - start,
+  };
 }
 function requireString(call: ToolCall, param: string): string | null {
   const val = call.arguments[param];
@@ -25,6 +36,13 @@ export async function executeToolCall(call: ToolCall): Promise<ToolResult> {
 
 async function dispatchTool(call: ToolCall): Promise<string> {
   switch (call.name) {
+    case 'generate_video': {
+      const prompt = requireString(call, 'prompt');
+      if (!prompt || !call.context?.conversationId)
+        throw new Error('A video prompt and chat are required.');
+      videoGenerationService.defer(call.context.conversationId, { prompt });
+      return 'Video generation is queued after this reply. The video will appear in this chat when complete.';
+    }
     case 'web_search': {
       const q = requireString(call, 'query');
       if (!q) throw new Error('Missing required parameter: query');
@@ -60,8 +78,9 @@ async function handleWebSearch(query: string): Promise<string> {
     const response = await fetch(url, {
       signal: controller.signal,
       headers: {
-        'User-Agent': 'Mozilla/5.0 (Linux; Android 13) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Mobile Safari/537.36',
-        'Accept': 'text/html',
+        'User-Agent':
+          'Mozilla/5.0 (Linux; Android 13) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Mobile Safari/537.36',
+        Accept: 'text/html',
       },
     });
     const html = await response.text();
@@ -139,7 +158,12 @@ function parseBraveResults(html: string): SearchResult[] {
 }
 
 const NAMED_HTML_ENTITIES: Readonly<Record<string, string>> = {
-  amp: '&', lt: '<', gt: '>', quot: '"', apos: "'", nbsp: ' ',
+  amp: '&',
+  lt: '<',
+  gt: '>',
+  quot: '"',
+  apos: "'",
+  nbsp: ' ',
 };
 
 function decodeHTMLEntities(text: string): string {
@@ -171,7 +195,10 @@ function evaluateExpression(expr: string): number {
 
   function parseTerm(): number {
     let left = parsePower();
-    while (pos < str.length && (str[pos] === '*' || str[pos] === '/' || str[pos] === '%')) {
+    while (
+      pos < str.length &&
+      (str[pos] === '*' || str[pos] === '/' || str[pos] === '%')
+    ) {
       const op = str[pos++];
       const right = parsePower();
       if (op === '*') left *= right;
@@ -234,8 +261,14 @@ function handleCalculator(expression: string): string {
 function handleGetDatetime(timezone?: string): string {
   const now = new Date();
   const options: Intl.DateTimeFormatOptions = {
-    weekday: 'long', year: 'numeric', month: 'long', day: 'numeric',
-    hour: '2-digit', minute: '2-digit', second: '2-digit', timeZoneName: 'long',
+    weekday: 'long',
+    year: 'numeric',
+    month: 'long',
+    day: 'numeric',
+    hour: '2-digit',
+    minute: '2-digit',
+    second: '2-digit',
+    timeZoneName: 'long',
     ...(timezone ? { timeZone: timezone } : {}),
   };
   try {
@@ -250,7 +283,8 @@ function handleGetDatetime(timezone?: string): string {
 }
 
 async function collectDeviceSection(
-  label: string, fetcher: () => Promise<string>,
+  label: string,
+  fetcher: () => Promise<string>,
 ): Promise<string> {
   try { return await fetcher(); } catch { return `${label}: unavailable`; }
 }
@@ -323,8 +357,19 @@ function htmlToMarkdown(html: string): string {
   const root = parse(html);
 
   // strip boilerplate
-  ['script','style','nav','header','footer','aside','noscript','iframe','form','button'].forEach(
-    tag => root.querySelectorAll(tag).forEach((el: any) => el.remove()),
+  [
+    'script',
+    'style',
+    'nav',
+    'header',
+    'footer',
+    'aside',
+    'noscript',
+    'iframe',
+    'form',
+    'button',
+  ].forEach(tag =>
+    root.querySelectorAll(tag).forEach((el: any) => el.remove()),
   );
 
   // prefer semantic content containers
@@ -356,8 +401,9 @@ async function handleReadUrl(rawUrl: string): Promise<string> {
     const response = await fetch(url, {
       signal: controller.signal,
       headers: {
-        'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 17_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0 Mobile/15E148 Safari/604.1',
-        'Accept': 'text/html, text/plain, */*',
+        'User-Agent':
+          'Mozilla/5.0 (iPhone; CPU iPhone OS 17_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0 Mobile/15E148 Safari/604.1',
+        Accept: 'text/html, text/plain, */*',
       },
     });
     if (!response.ok) throw new Error(`HTTP ${response.status}: ${response.statusText}`);
@@ -370,16 +416,25 @@ async function handleReadUrl(rawUrl: string): Promise<string> {
   } catch (e: any) {
     logger.error(`[Tools] read_url FAILED for "${url}": ${e?.message || e}`);
     throw e;
-  } finally { clearTimeout(timeout); }
+  } finally {
+    clearTimeout(timeout);
+  }
 }
 
-async function handleSearchKnowledgeBase(query: string, projectId?: string): Promise<string> {
-  if (!projectId) return 'No project context. Knowledge base requires an active project.';
+async function handleSearchKnowledgeBase(
+  query: string,
+  projectId?: string,
+): Promise<string> {
+  if (!projectId)
+    return 'No project context. Knowledge base requires an active project.';
   const { ragService } = require('../rag'); // NOSONAR
   const result = await ragService.searchProject(projectId, query);
   if (result.chunks.length === 0) return `No results found for "${query}" in the knowledge base.`;
   return result.chunks
-    .map((c: RagSearchResult, i: number) => `[${i + 1}] ${c.name} (part ${c.position + 1}):\n${c.content}`)
+    .map(
+      (c: RagSearchResult, i: number) =>
+        `[${i + 1}] ${c.name} (part ${c.position + 1}):\n${c.content}`,
+    )
     .join('\n\n---\n\n');
 }
 
diff --git a/src/services/tools/registry.ts b/src/services/tools/registry.ts
index ab683cd4f..8e5e59548 100644
--- a/src/services/tools/registry.ts
+++ b/src/services/tools/registry.ts
@@ -1,11 +1,23 @@
 import { ToolDefinition } from './types';
 
 export const AVAILABLE_TOOLS: ToolDefinition[] = [
+  {
+    id: 'generate_video',
+    name: 'generate_video',
+    displayName: 'Generate Video',
+    icon: 'video',
+    description:
+      'Request a short silent video from the selected video model. Generation starts after this text reply finishes. Describe the requested subject and motion.',
+    parameters: {
+      prompt: { type: 'string', description: 'Video prompt', required: true },
+    },
+  },
   {
     id: 'web_search',
     name: 'web_search',
     displayName: 'Web Search',
-    description: 'Search the live web and return real-time result titles, snippets, and URLs. Use this for any question about current events, prices, weather, news, or anything that requires up-to-date information. When the snippet is insufficient, call read_url on the most relevant result URL to get the full page content.',
+    description:
+      'Search the live web and return real-time result titles, snippets, and URLs. Use this for any question about current events, prices, weather, news, or anything that requires up-to-date information. When the snippet is insufficient, call read_url on the most relevant result URL to get the full page content.',
     icon: 'globe',
     requiresNetwork: true,
     parameters: {
@@ -75,7 +87,8 @@ export const AVAILABLE_TOOLS: ToolDefinition[] = [
     id: 'read_url',
     name: 'read_url',
     displayName: 'URL Reader',
-    description: 'Fetch the full live content of any URL. Use this after web_search to read the complete text of a result page, or directly when the user shares a link.',
+    description:
+      'Fetch the full live content of any URL. Use this after web_search to read the complete text of a result page, or directly when the user shares a link.',
     icon: 'link',
     requiresNetwork: true,
     parameters: {
@@ -89,9 +102,8 @@ export const AVAILABLE_TOOLS: ToolDefinition[] = [
 ];
 
 export function getToolsAsOpenAISchema(enabledToolIds: readonly string[]) {
-  return AVAILABLE_TOOLS
-    .filter(tool => enabledToolIds.includes(tool.id))
-    .map(tool => ({
+  return AVAILABLE_TOOLS.filter(tool => enabledToolIds.includes(tool.id)).map(
+    tool => ({
       type: 'function' as const,
       function: {
         name: tool.name,
@@ -113,7 +125,8 @@ export function getToolsAsOpenAISchema(enabledToolIds: readonly string[]) {
             .map(([key]) => key),
         },
       },
-    }));
+    }),
+  );
 }
 
 export function buildToolSystemPromptHint(enabledToolIds: string[]): string {

From 80ec42ea8a8120a54e956df76575702f66be2e08 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Mon, 28 Sep 2026 21:37:25 +0530
Subject: [PATCH 012/129] build(video): prepare pinned runtimes through
 CocoaPods and Gradle [skip ci]

---
 .gitignore                                  |  4 ++
 android/app/build.gradle                    | 13 +++++
 docs/VIDEO_GENERATION.md                    | 64 +++++++++++++++++++++
 ios/Podfile                                 |  3 +
 ios/Podfile.lock                            |  2 +-
 scripts/prepare-video-runtime.sh            | 36 ++++++++++++
 scripts/video/android-vulkan-dispatch.patch | 29 ++++++++++
 scripts/video/build-shaderc.sh              | 28 +++++++++
 8 files changed, 178 insertions(+), 1 deletion(-)
 create mode 100644 docs/VIDEO_GENERATION.md
 create mode 100644 scripts/prepare-video-runtime.sh
 create mode 100644 scripts/video/android-vulkan-dispatch.patch
 create mode 100644 scripts/video/build-shaderc.sh

diff --git a/.gitignore b/.gitignore
index 2d7905928..cff64d92b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,3 +98,7 @@ docs/wire-captures/
 
 # Scratch renders derived from scripts/e2e/fixtures (regenerable, not versioned)
 /tmp/
+
+# Generated native video runtime
+.video-build/
+native/video/*.xcframework/
diff --git a/android/app/build.gradle b/android/app/build.gradle
index ab329c9ff..f3136af57 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -196,3 +196,16 @@ dependencies {
     testImplementation("org.mockito.kotlin:mockito-kotlin:5.4.0")
     testImplementation("androidx.test:core:1.6.1")
 }
+
+// Native video setup is shared by command-line, IDE, and CI builds.
+// Configure tasks need the source tree before CMake evaluates it.
+def videoRoot = rootProject.projectDir.parentFile
+def prepareVideoRuntime = tasks.register("prepareVideoRuntime", Exec) {
+    workingDir videoRoot
+    commandLine "bash", new File(videoRoot, "scripts/prepare-video-runtime.sh").absolutePath, "--android"
+    inputs.files(fileTree(new File(videoRoot, "scripts/video")), new File(videoRoot, "scripts/prepare-video-runtime.sh"))
+    outputs.files(new File(videoRoot, ".video-build/runtime-ready"), new File(videoRoot, ".video-build/shaderc/bin/glslc"))
+}
+tasks.configureEach { task ->
+    if (task.name.startsWith("configureCMake")) task.dependsOn(prepareVideoRuntime)
+}
diff --git a/docs/VIDEO_GENERATION.md b/docs/VIDEO_GENERATION.md
new file mode 100644
index 000000000..21166da44
--- /dev/null
+++ b/docs/VIDEO_GENERATION.md
@@ -0,0 +1,64 @@
+# Video generation
+
+## Current engine
+
+Local generation uses stable-diffusion.cpp at the revision in
+`scripts/video/revision`. The first supported architecture is Wan 2.1 T2V 1.3B.
+A complete pack has the diffusion weight, Wan VAE, and UMT5 text encoder. Models
+uses the shared Hugging Face search and pack resolver. LTX and Hunyuan catalog
+entries state that this build does not support them.
+
+Video request validation and settings keys live in `@offgrid/models`. Mobile's
+video generation service owns local and OGAD jobs, progress, cancellation,
+recovery, and completed chat/gallery records. The native bridges share the C++
+runtime lifecycle. Pro owns sync and model transfer through existing extension
+points.
+
+## Build setup
+
+CocoaPods builds the pinned iOS framework during `pod install`. Gradle prepares the Android runtime before CMake configuration. Both paths reuse their build cache. For explicit setup, run from the mobile repository after installing JavaScript dependencies:
+
+```sh
+bash scripts/prepare-video-runtime.sh
+bash scripts/build-video-ios.sh
+(cd ios && pod install)
+```
+
+The iOS framework includes arm64 device and arm64 simulator slices. Use an Apple
+Silicon simulator. Building requires an Xcode SDK with the iOS 26 background task
+APIs. Deployment remains iOS 17; older iOS versions run video in the foreground.
+
+For Android, install CMake, Make, Python 3, and the project's Android SDK/NDK:
+
+```sh
+bash scripts/prepare-video-runtime.sh --android
+(cd android && ./gradlew assembleDebug)
+```
+
+Android preparation builds a pinned host shader compiler. The NDK compiler is
+not sufficient for this engine's Vulkan shaders. Generated sources, libraries,
+and compiler tools stay in `.video-build` and are not committed. The small
+Vulkan patch uses the engine's dynamic dispatcher so linking remains compatible
+with the app's Android API 24 minimum.
+
+## Device limits and recovery
+
+Model download does not guarantee that a device has enough memory to generate.
+The residency manager checks the pack and clip size before loading. Default
+clips are 320 × 192, 17 frames, at 8 FPS. Speed and peak memory still need manual
+checks on physical iOS and Android devices.
+
+On iOS 26, continued background GPU work requires OS support and admission.
+If admission is not available, generation stops when the app enters the
+background. Android uses a foreground service with a Stop action; an OS timeout
+also cancels the job. Partial output is removed on failure or cancellation.
+
+After restart, interrupted jobs appear with Retry. Local Retry restarts the
+clip. Remote Retry uses the same OGAD job ID, so a lost connection does not start
+a second job. Settings and model selection can change while a saved request
+retains its resolved generation parameters.
+
+Only OGAD remote video servers are supported. REST and MCP share OGAD's video
+job owner. Model transfer sends and checks all three pack files before
+registration. Tests have not been added or run for this implementation; manual
+verification comes first.
diff --git a/ios/Podfile b/ios/Podfile
index 2c10fd7ca..a56c23f49 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -20,6 +20,9 @@ end
 
 target 'OffgridMobile' do
   config = use_native_modules!
+  # The script reuses a framework only when its pinned revision and headers match.
+  video_builder = File.expand_path('../scripts/build-video-ios.sh', __dir__)
+  raise 'Video runtime build failed' unless system('bash', video_builder)
   pod 'OffgridVideo', :path => '../native/video'
   
   use_react_native!(
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 82d7b4e12..0cbb1bad1 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -4049,6 +4049,6 @@ SPEC CHECKSUMS:
   whisper-rn: 7566faf9b7d78e39ab9fc634cb90fdee81177793
   Yoga: 5456bb010373068fc92221140921b09d126b116e
 
-PODFILE CHECKSUM: d97d58b05041bdcebe2a6d7281b601cc8a2856c6
+PODFILE CHECKSUM: a51a87720248f5187c458d3af5dfc690def5388e
 
 COCOAPODS: 1.15.2
diff --git a/scripts/prepare-video-runtime.sh b/scripts/prepare-video-runtime.sh
new file mode 100644
index 000000000..f05ee71cf
--- /dev/null
+++ b/scripts/prepare-video-runtime.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+set -euo pipefail
+ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+SOURCE="$ROOT/.video-build/source"
+REVISION="$(cat "$ROOT/scripts/video/revision")"
+mkdir -p "$ROOT/.video-build"
+if [ ! -d "$SOURCE/.git" ]; then
+  git clone --filter=blob:none --no-checkout https://github.com/leejet/stable-diffusion.cpp.git "$SOURCE"
+fi
+git -C "$SOURCE" fetch origin "$REVISION"
+git -C "$SOURCE" checkout --detach "$REVISION"
+git -C "$SOURCE" submodule update --init --depth 1 ggml
+# Use the initialized Vulkan dispatcher for Vulkan 1.1 features. Direct symbols
+# are absent from Android API 24's loader even when the device supports them.
+PATCH="$ROOT/scripts/video/android-vulkan-dispatch.patch"
+if ! git -C "$SOURCE/ggml" apply --reverse --check "$PATCH" 2>/dev/null; then
+  git -C "$SOURCE/ggml" apply "$PATCH"
+fi
+# Match the header versions used by the runtime's Vulkan build. These are build
+# inputs only; the device still supplies its Vulkan driver.
+prepare_headers() {
+  local project="$1" revision="$2" directory="$ROOT/.video-build/$1-source"
+  if [ ! -d "$directory/.git" ]; then git clone --filter=blob:none --no-checkout "https://github.com/KhronosGroup/$project.git" "$directory"; fi
+  git -C "$directory" fetch origin "$revision"
+  git -C "$directory" checkout --detach "$revision"
+  cmake -S "$directory" -B "$directory/build" -DCMAKE_INSTALL_PREFIX="$ROOT/.video-build/vulkan-header-prefix"
+  cmake --install "$directory/build"
+}
+prepare_headers SPIRV-Headers 01e0577914a75a2569c846778c2f93aa8e6feddd
+prepare_headers Vulkan-Headers 19725e4d48082fe78e26622b15d3080ccd54112b
+
+if [ "${1:-}" = "--android" ]; then
+  bash "$ROOT/scripts/video/build-shaderc.sh"
+fi
+
+touch "$ROOT/.video-build/runtime-ready"
diff --git a/scripts/video/android-vulkan-dispatch.patch b/scripts/video/android-vulkan-dispatch.patch
new file mode 100644
index 000000000..41a93caff
--- /dev/null
+++ b/scripts/video/android-vulkan-dispatch.patch
@@ -0,0 +1,29 @@
+--- a/src/ggml-vulkan/ggml-vulkan.cpp
++++ b/src/ggml-vulkan/ggml-vulkan.cpp
+@@ -4306,7 +4306,7 @@
+             device_extensions.push_back("VK_EXT_device_fault");
+         }
+ 
+-        vkGetPhysicalDeviceFeatures2(device->physical_device, &device_features2);
++        VULKAN_HPP_DEFAULT_DISPATCHER.vkGetPhysicalDeviceFeatures2(device->physical_device, &device_features2);
+ 
+         device->device_fault = device->device_fault && fault_features.deviceFault;
+ 
+@@ -4930,7 +4930,7 @@
+     }
+ #endif
+ 
+-    vkGetPhysicalDeviceFeatures2(physical_device, &device_features2);
++    VULKAN_HPP_DEFAULT_DISPATCHER.vkGetPhysicalDeviceFeatures2(physical_device, &device_features2);
+ 
+     fp16 = fp16 && vk12_features.shaderFloat16;
+ 
+@@ -16170,7 +16170,7 @@
+     vk11_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_FEATURES;
+     device_features2.pNext = &vk11_features;
+ 
+-    vkGetPhysicalDeviceFeatures2(vkdev, &device_features2);
++    VULKAN_HPP_DEFAULT_DISPATCHER.vkGetPhysicalDeviceFeatures2(vkdev, &device_features2);
+ 
+     return vk11_features.storageBuffer16BitAccess;
+ }
diff --git a/scripts/video/build-shaderc.sh b/scripts/video/build-shaderc.sh
new file mode 100644
index 000000000..f0664dbc4
--- /dev/null
+++ b/scripts/video/build-shaderc.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+set -euo pipefail
+ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
+REVISION=d393a813c9b67c709d37b329203d72beb69d719e
+SOURCE="$ROOT/.video-build/shaderc-source"
+PREFIX="$ROOT/.video-build/shaderc"
+if [ -x "$PREFIX/bin/glslc" ] && [ "$(cat "$PREFIX/revision" 2>/dev/null || true)" = "$REVISION" ]; then exit 0; fi
+# A host package of this exact release is also suitable for shader compilation.
+if command -v glslc >/dev/null && [[ "$(glslc --version)" == "shaderc v2026.4 "* ]]; then
+  mkdir -p "$PREFIX/bin"
+  ln -sf "$(command -v glslc)" "$PREFIX/bin/glslc"
+  printf '%s\n' "$REVISION" > "$PREFIX/revision"
+  exit 0
+fi
+mkdir -p "$ROOT/.video-build"
+if [ ! -d "$SOURCE/.git" ]; then
+  git clone --filter=blob:none --no-checkout https://github.com/google/shaderc.git "$SOURCE"
+fi
+git -C "$SOURCE" fetch origin "$REVISION"
+git -C "$SOURCE" checkout --detach "$REVISION"
+(cd "$SOURCE" && python3 utils/git-sync-deps)
+cmake -S "$SOURCE" -B "$SOURCE/build-host" -G "Unix Makefiles" \
+  -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$PREFIX" \
+  -DSHADERC_SKIP_TESTS=ON -DSHADERC_SKIP_EXAMPLES=ON -DSHADERC_SKIP_COPYRIGHT_CHECK=ON
+cmake --build "$SOURCE/build-host" --target glslc --parallel "${VIDEO_BUILD_JOBS:-4}"
+mkdir -p "$PREFIX/bin"
+cp "$SOURCE/build-host/glslc/glslc" "$PREFIX/bin/glslc"
+printf '%s\n' "$REVISION" > "$PREFIX/revision"

From 397a43839b128fe02f0a6c1059e3ea015cef4244 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 09:31:36 +0530
Subject: [PATCH 013/129] chore(ios): refresh pod checksums for physical device
 build [skip ci]

---
 ios/Podfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 0cbb1bad1..8d65a014e 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -3939,7 +3939,7 @@ SPEC CHECKSUMS:
   FBLazyVector: 309703e71d3f2f1ed7dc7889d58309c9d77a95a4
   fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
   glog: 5683914934d5b6e4240e497e0f4a3b42d1854183
-  hermes-engine: 3de70ea2100f1780402cf146bb8110a0cdb2f34e
+  hermes-engine: 8b1958efa30118ab638933e7e33b2ac1eff78de3
   llama-rn: fc4d176920fff190ee3a5a4172ce739531150cc4
   MMKV: 86859fdfa2b0b21db1fd6e48788474a6416a2c77
   MMKVCore: 3d16ce9f7d411e135020915fde98a056859a1efa
@@ -3985,7 +3985,7 @@ SPEC CHECKSUMS:
   react-native-background-downloader: b02d12c3961322ce1c85fa0f8b3e4adb5b652106
   react-native-document-picker: dc2d83366e47e89e7c51e8a41eab99c1d54e941c
   react-native-document-viewer: 8c6ed07e7e27352743fa98e8dd6d288ad925b884
-  react-native-executorch: 863673cf458ceec5df61012fa30981ffa3ee8fc4
+  react-native-executorch: 020b518bffbf62b06138674283d31f4f58dc72d1
   react-native-get-random-values: d16467cf726c618e9c7a8c3c39c31faa2244bbba
   react-native-image-picker: 0314366753615115fa55c3cc937ac44cb7e75702
   react-native-keyboard-controller: 7534b5a39d1e8b2b79f86e8e998ed71c7154f69f
@@ -4051,4 +4051,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: a51a87720248f5187c458d3af5dfc690def5388e
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2

From 7b13e9a1a925f912e617a6de90e79b0c8058291e Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 11:07:37 +0530
Subject: [PATCH 014/129] fix(models): match video browsing to the text model
 flow [skip ci]

---
 src/screens/ModelsScreen/VideoModelsTab.tsx | 404 ++++++++++++--------
 src/services/videoModelFiles.ts             |   7 +-
 2 files changed, 257 insertions(+), 154 deletions(-)

diff --git a/src/screens/ModelsScreen/VideoModelsTab.tsx b/src/screens/ModelsScreen/VideoModelsTab.tsx
index 6bc6cac99..71045aaf9 100644
--- a/src/screens/ModelsScreen/VideoModelsTab.tsx
+++ b/src/screens/ModelsScreen/VideoModelsTab.tsx
@@ -7,13 +7,16 @@ import {
   resolveHuggingFaceModel,
   formatFileSize,
   determineCredibility,
+  videoVaeFilename,
 } from '@offgrid/models';
 import type { HFSearchResult, ModelFileVariant } from '@offgrid/models';
-import { Button, ModelCard } from '../../components';
+import { ModelCard } from '../../components';
+import { ScreenHeader } from '../../components/ScreenHeader';
 import { LoadingDots } from '../../components/LoadingDots';
 import { useAppStore } from '../../stores';
 import { useRemoteServerStore } from '../../stores/remoteServerStore';
 import { useDownloadStore } from '../../stores/downloadStore';
+import { hardwareService } from '../../services/hardware';
 import { modelDownloadService } from '../../services/modelDownloadService';
 import { useTheme, useThemedStyles } from '../../theme';
 import { createStyles } from './styles';
@@ -32,6 +35,8 @@ export const VideoModelsTab: React.FC = () => {
   const models = useAppStore(s => s.downloadedVideoModels);
   const active = useAppStore(s => s.activeVideoModelId);
   const downloads = useDownloadStore(s => s.downloads);
+  const pendingModels = useAppStore(s => s.videoDownloads);
+  const ramGB = hardwareService.getTotalMemoryGB();
   useEffect(() => {
     let current = true;
     if (!query.trim()) {
@@ -94,160 +99,257 @@ export const VideoModelsTab: React.FC = () => {
   const defaults = CATALOG.filter(m => m.kind === 'video');
   const rows = query.trim()
     ? results
-    : defaults.map(m => ({ id: m.id, name: m.name, org: m.org ?? '' }));
+    : defaults.map(m => ({
+        id: m.id,
+        name: m.name,
+        org: m.org ?? '',
+        credibility: determineCredibility(m.org ?? ''),
+      }));
+
+  // Both browsing and version selection use Text's existing card and download states.
+  const renderCard = (row: HFSearchResult, file?: ModelFileVariant) => {
+    const catalogEntry = defaults.find(model => model.id === row.id);
+    const template = file
+      ? defaults.find(model =>
+          model.files.some(f => f.name === videoVaeFilename(file.fileName)),
+        )
+      : catalogEntry;
+    const modelKey = `video:${row.id}`;
+    const installed = models.find(model => model.id === row.id);
+    const matchesFile = (model: typeof installed) =>
+      !!model &&
+      (!file ||
+        model.files.some(
+          f => f.role === 'primary' && f.name === file.fileName,
+        ));
+    const isDownloaded = matchesFile(installed);
+    const pending = pendingModels[row.id];
+    const transfer =
+      !file ||
+      pending?.files.some(f => f.role === 'primary' && f.name === file.fileName)
+        ? downloads[modelKey]
+        : undefined;
+    const unavailable = catalogEntry?.availability === 'coming_soon';
+    const totalBytes = file
+      ? file.sizeBytes +
+        (template?.files
+          .filter(f => f.role !== 'primary')
+          .reduce((sum, f) => sum + (f.sizeBytes ?? 0), 0) ?? 0)
+      : (installed ?? pending ?? catalogEntry)?.files.reduce(
+          (sum, f) => sum + (f.sizeBytes ?? 0),
+          0,
+        );
+    const defaultVersion =
+      file &&
+      template?.files.some(
+        f => f.role === 'primary' && f.name === file.fileName,
+      );
+    const precision =
+      file?.quant && file.quant !== 'Unknown' ? file.quant : undefined;
+    const versionName = defaultVersion
+      ? 'Standard'
+      : /bf16/i.test(file?.fileName ?? '')
+      ? 'Alternative precision'
+      : precision
+      ? `Compact ${precision}`
+      : 'Alternative version';
+    const memory = template?.minRamGb;
+    const memoryWarning =
+      memory && ramGB > 0 && ramGB < memory
+        ? 'May exceed available memory. Use an OGAD server for larger models.'
+        : undefined;
+    const facts = [
+      unavailable ? 'Not available in this app yet' : undefined,
+      totalBytes ? `${formatFileSize(totalBytes)} total download` : undefined,
+      memory ? `${memory} GB memory suggested` : undefined,
+      defaultVersion ? 'Default version' : undefined,
+      file && installed && !isDownloaded
+        ? 'Remove the installed version to change versions.'
+        : undefined,
+    ].filter((fact): fact is string => !!fact);
+    const open = () => {
+      setError(null);
+      setSelected(row);
+    };
+    const startDownload = () => {
+      if (file) download(file.fileName);
+      else if (catalogEntry?.files.length)
+        act(() =>
+          modelDownloadService.start({
+            modelType: 'video',
+            model: catalogEntry,
+          }),
+        );
+      else open();
+    };
+    return (
+      <ModelCard
+        key={file?.fileName ?? row.id}
+        compact
+        model={{
+          id: row.id,
+          name: file ? versionName : row.name,
+          author: row.org,
+          credibility: {
+            source:
+              row.credibility === 'offgrid' ? 'community' : row.credibility,
+            isOfficial: row.credibility === 'official',
+            isVerifiedQuantizer: row.credibility === 'verified-quantizer',
+          },
+          description: unavailable
+            ? catalogEntry?.availabilityNote
+            : 'Create short, silent videos from a description.',
+        }}
+        facts={facts}
+        footer={
+          transfer?.status === 'processing' ? (
+            <Text style={styles.modelDescription}>
+              Checking downloaded files...
+            </Text>
+          ) : memoryWarning ? (
+            <Text style={styles.modelDescription}>{memoryWarning}</Text>
+          ) : undefined
+        }
+        isDownloaded={isDownloaded}
+        isActive={isDownloaded && active === row.id}
+        isDownloading={
+          transfer?.status === 'running' || transfer?.status === 'processing'
+        }
+        isPaused={transfer?.status === 'paused'}
+        isQueued={transfer?.status === 'pending'}
+        downloadProgress={transfer?.progress}
+        downloadBytes={
+          transfer
+            ? {
+                downloaded: transfer.bytesDownloaded,
+                total: transfer.combinedTotalBytes || transfer.totalBytes,
+                bytesPerSecond: transfer.bytesPerSecond,
+              }
+            : undefined
+        }
+        onPress={!file && !unavailable ? open : undefined}
+        onDownload={
+          !unavailable && !installed && !downloads[modelKey]
+            ? startDownload
+            : undefined
+        }
+        onSelect={
+          isDownloaded
+            ? () => {
+                useAppStore.getState().setActiveVideoModelId(row.id);
+                useRemoteServerStore
+                  .getState()
+                  .setActiveRemoteMediaServerId('video', null);
+              }
+            : undefined
+        }
+        onDelete={
+          isDownloaded
+            ? () => act(() => modelDownloadService.remove(modelKey))
+            : undefined
+        }
+        onPause={
+          transfer?.status === 'running'
+            ? () => act(() => modelDownloadService.pause(modelKey))
+            : undefined
+        }
+        onResume={
+          transfer?.status === 'paused'
+            ? () => act(() => modelDownloadService.resume(modelKey))
+            : undefined
+        }
+        onCancel={
+          transfer
+            ? () => act(() => modelDownloadService.cancel(modelKey))
+            : undefined
+        }
+        failedState={
+          transfer?.status === 'failed'
+            ? {
+                errorMessage: transfer.errorMessage ?? 'Download failed.',
+                bytesDownloaded: transfer.bytesDownloaded,
+                totalBytes: transfer.combinedTotalBytes || transfer.totalBytes,
+                onRetry: () => act(() => modelDownloadService.retry(modelKey)),
+                onRemove: () =>
+                  act(() => modelDownloadService.remove(modelKey)),
+              }
+            : undefined
+        }
+      />
+    );
+  };
+
   return (
-    <ScrollView keyboardShouldPersistTaps="handled">
+    <View style={styles.flex1}>
       {selected ? (
-        <>
-          <Button
-            title="Back to video models"
-            variant="ghost"
-            onPress={() => setSelected(null)}
+        <ScreenHeader title={selected.name} onBack={() => setSelected(null)} />
+      ) : (
+        <View style={styles.searchContainer}>
+          <TextInput
+            style={styles.searchInput}
+            value={query}
+            onChangeText={setQuery}
+            accessibilityLabel="Search video models on Hugging Face"
+            placeholder="Search Hugging Face"
+            placeholderTextColor={colors.textMuted}
+            autoCapitalize="none"
+            autoCorrect={false}
+            returnKeyType="search"
           />
-          <Text style={{ color: colors.text }}>{selected.name}</Text>
-          <Text style={{ color: colors.textSecondary }}>
-            Each download includes the required text encoder and VAE.
-          </Text>
-          {!loading && files.length === 0 && (
-            <Text style={{ color: colors.textMuted }}>
-              No files in this repository are supported by this build. Local
-              generation currently requires Wan 2.1 T2V 1.3B.
+        </View>
+      )}
+      <ScrollView
+        contentContainerStyle={styles.listContent}
+        keyboardShouldPersistTaps="handled"
+      >
+        {selected ? (
+          <>
+            <Text style={styles.sectionTitle}>Choose a version</Text>
+            <Text style={styles.sectionSubtitle}>
+              The total includes everything needed to create videos. Download
+              one version.
             </Text>
-          )}
-          {files.map(file => (
-            <Button
-              key={file.fileName}
-              title={`${file.fileName} · ${formatFileSize(file.sizeBytes)}`}
-              variant="outline"
-              disabled={
-                !!downloads[`video:${selected.id}`] ||
-                models.some(model => model.id === selected.id)
-              }
-              onPress={() => download(file.fileName)}
-            />
-          ))}
-        </>
-      ) : (
-        <>
-          <View style={styles.searchContainer}>
-            <TextInput
-              style={styles.searchInput}
-              value={query}
-              onChangeText={setQuery}
-              accessibilityLabel="Search video models on Hugging Face"
-              placeholder="Search Hugging Face"
-              placeholderTextColor={colors.textMuted}
-              autoCapitalize="none"
-            />
+            {[...files]
+              .sort((a, b) => {
+                const primary = defaults
+                  .find(m => m.id === selected.id)
+                  ?.files.find(f => f.role === 'primary')?.name;
+                return (
+                  Number(b.fileName === primary) -
+                    Number(a.fileName === primary) || a.sizeBytes - b.sizeBytes
+                );
+              })
+              .map(file => renderCard(selected, file))}
+            {!loading && files.length === 0 && (
+              <Text style={styles.emptyText}>
+                No supported versions found. Choose another video model.
+              </Text>
+            )}
+          </>
+        ) : (
+          <>
+            {rows.map(row => renderCard(row))}
+            {!loading && query.trim() && rows.length === 0 && (
+              <Text style={styles.emptyText}>
+                No video models found. Try a different search.
+              </Text>
+            )}
+          </>
+        )}
+        {loading && (
+          <View style={styles.loadingContainer}>
+            <LoadingDots />
           </View>
-          {rows.map(row => {
-            const catalogEntry = defaults.find(model => model.id === row.id);
-            const installed = models.some(m => m.id === row.id),
-              transfer = downloads[`video:${row.id}`];
-            return (
-              <ModelCard
-                key={row.id}
-                model={{ id: row.id, name: row.name, author: row.org }}
-                facts={
-                  catalogEntry?.availabilityNote
-                    ? [catalogEntry.availabilityNote]
-                    : undefined
-                }
-                isDownloaded={installed}
-                isActive={active === row.id}
-                isDownloading={transfer?.status === 'running'}
-                isPaused={transfer?.status === 'paused'}
-                isQueued={transfer?.status === 'pending'}
-                downloadProgress={transfer?.progress}
-                onPress={() =>
-                  setSelected({
-                    ...row,
-                    credibility: determineCredibility(row.org),
-                  })
-                }
-                onDownload={
-                  catalogEntry?.availability === 'coming_soon'
-                    ? undefined
-                    : () =>
-                        setSelected({
-                          ...row,
-                          credibility: determineCredibility(row.org),
-                        })
-                }
-                onSelect={
-                  installed
-                    ? () => {
-                        useAppStore.getState().setActiveVideoModelId(row.id);
-                        useRemoteServerStore
-                          .getState()
-                          .setActiveRemoteMediaServerId('video', null);
-                      }
-                    : undefined
-                }
-                onDelete={
-                  installed
-                    ? () =>
-                        act(() =>
-                          modelDownloadService.remove(`video:${row.id}`),
-                        )
-                    : undefined
-                }
-                onPause={
-                  transfer?.status === 'running'
-                    ? () =>
-                        act(() => modelDownloadService.pause(`video:${row.id}`))
-                    : undefined
-                }
-                onResume={
-                  transfer?.status === 'paused'
-                    ? () =>
-                        act(() =>
-                          modelDownloadService.resume(`video:${row.id}`),
-                        )
-                    : undefined
-                }
-                onCancel={
-                  transfer
-                    ? () =>
-                        act(() =>
-                          modelDownloadService.cancel(`video:${row.id}`),
-                        )
-                    : undefined
-                }
-                failedState={
-                  transfer?.status === 'failed'
-                    ? {
-                        errorMessage:
-                          transfer.errorMessage ?? 'Download failed.',
-                        bytesDownloaded: transfer.bytesDownloaded,
-                        totalBytes: transfer.totalBytes,
-                        onRetry: () =>
-                          act(() =>
-                            modelDownloadService.retry(`video:${row.id}`),
-                          ),
-                        onRemove: () =>
-                          act(() =>
-                            modelDownloadService.remove(`video:${row.id}`),
-                          ),
-                      }
-                    : undefined
-                }
-              />
-            );
-          })}
-          {!loading && query.trim() && rows.length === 0 && (
-            <Text style={{ color: colors.textMuted }}>
-              No compatible video repositories found.
-            </Text>
-          )}
-        </>
-      )}
-      {loading && <LoadingDots />}
-      {error && (
-        <Text accessibilityRole="alert" style={{ color: colors.error }}>
-          {error}
-        </Text>
-      )}
-    </ScrollView>
+        )}
+        {error && (
+          <Text
+            accessibilityRole="alert"
+            style={[styles.loadingText, { color: colors.error }]}
+          >
+            {error}
+          </Text>
+        )}
+      </ScrollView>
+    </View>
   );
 };
diff --git a/src/services/videoModelFiles.ts b/src/services/videoModelFiles.ts
index 87ccdc727..5af85a297 100644
--- a/src/services/videoModelFiles.ts
+++ b/src/services/videoModelFiles.ts
@@ -2,7 +2,7 @@ import RNFS from 'react-native-fs';
 import type { ModelEntry } from '@offgrid/models';
 import {
   videoPackError,
-  VIDEO_VAE_FILENAME,
+  videoVaeFilename,
   VIDEO_ENCODER_FILENAME,
 } from '@offgrid/models';
 
@@ -41,9 +41,10 @@ export async function resolveVideoPack(
     )
       throw new Error(`Video model checksum failed: ${file.name}`);
   }
+  const weight = model.files.find(f => f.role === 'primary')!.name;
   return {
-    weight: `${directory}/${model.files.find(f => f.role === 'primary')!.name}`,
-    vae: `${directory}/${VIDEO_VAE_FILENAME}`,
+    weight: `${directory}/${weight}`,
+    vae: `${directory}/${videoVaeFilename(weight)!}`,
     encoder: `${directory}/${VIDEO_ENCODER_FILENAME}`,
   };
 }

From 4777c92fa1cef1b87da98c1c3d4e05a453c20e75 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 11:07:37 +0530
Subject: [PATCH 015/129] fix(downloads): preserve video pack identity and
 validation progress [skip ci]

---
 .../modelDownloadService/providers/videoProvider.ts | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/services/modelDownloadService/providers/videoProvider.ts b/src/services/modelDownloadService/providers/videoProvider.ts
index 34938fe44..6ef280e13 100644
--- a/src/services/modelDownloadService/providers/videoProvider.ts
+++ b/src/services/modelDownloadService/providers/videoProvider.ts
@@ -1,3 +1,4 @@
+import { mapStoreStatus } from '../storeStatus';
 import { modelResidencyManager } from '../../modelResidency';
 import RNFS from 'react-native-fs';
 import type { ModelEntry } from '@offgrid/models';
@@ -83,6 +84,7 @@ async function start(model: ModelEntry): Promise<void> {
         (!file.sha256 || (await RNFS.hash(destination, 'sha256')).toLowerCase() === file.sha256.toLowerCase())
       ) {
         bytes += file.sizeBytes;
+        useDownloadStore.getState().updateProgress(key(model.id), bytes, total);
         continue;
       }
       useDownloadStore.getState().setStatus(key(model.id), 'running');
@@ -91,6 +93,7 @@ async function start(model: ModelEntry): Promise<void> {
           url: file.url,
           fileName: `${encodeURIComponent(model.id)}_${file.name}`,
           modelId: key(model.id),
+          modelKey: key(model.id),
           modelType: 'video',
           totalBytes: file.sizeBytes,
           sha256: file.sha256,
@@ -115,6 +118,7 @@ async function start(model: ModelEntry): Promise<void> {
       bytes += Number((await RNFS.stat(destination)).size);
     }
     if (transfer.cancelled) throw new Error('Download cancelled.');
+    useDownloadStore.getState().setProcessing(key(model.id));
     await resolveVideoPack(model, true);
     const app = useAppStore.getState();
     app.addDownloadedVideoModel({
@@ -147,14 +151,7 @@ export const videoProvider: DownloadProvider = {
     const result: ModelDownload[] = [];
     for (const model of Object.values(useAppStore.getState().videoDownloads)) {
       const row = useDownloadStore.getState().downloads[key(model.id)];
-      const status: ModelDownloadStatus =
-        row?.status === 'running'
-          ? 'downloading'
-          : row?.status === 'pending'
-            ? 'queued'
-            : row?.status === 'failed'
-              ? 'error'
-              : 'paused';
+      const status: ModelDownloadStatus = row ? mapStoreStatus(row.status) : 'paused';
       result.push({
         id: key(model.id),
         modelType: 'video',

From 9adcd032fd567b092d57474a100b6d1e39cb44a1 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 11:07:37 +0530
Subject: [PATCH 016/129] fix(chat): allow local and remote video-only chat
 entry [skip ci]

---
 src/screens/ChatsListScreen.tsx               |  6 ++++--
 src/screens/HomeScreen/hooks/useHomeScreen.ts |  9 +++++----
 src/screens/HomeScreen/index.tsx              |  5 +++--
 src/screens/ProjectChatsScreen.tsx            | 11 +++++++++--
 src/screens/ProjectDetailScreen.tsx           | 11 +++++++++--
 5 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/screens/ChatsListScreen.tsx b/src/screens/ChatsListScreen.tsx
index 184779452..9482b0242 100644
--- a/src/screens/ChatsListScreen.tsx
+++ b/src/screens/ChatsListScreen.tsx
@@ -16,7 +16,7 @@ import { useFocusTrigger } from '../hooks/useFocusTrigger';
 import { useTheme, useThemedStyles } from '../theme';
 import type { ThemeColors, ThemeShadows } from '../theme';
 import { TYPOGRAPHY, SPACING } from '../constants';
-import { useChatStore, useProjectStore, useAppStore } from '../stores';
+import { useChatStore, useProjectStore, useAppStore, useRemoteServerStore } from '../stores';
 import { useActiveTextModel } from '../hooks/useActiveTextModel';
 import { onnxImageGeneratorService, activeModelService, llmService, remoteServerManager } from '../services';
 import { Conversation } from '../types';
@@ -50,7 +50,9 @@ export const ChatsListScreen: React.FC = () => {
   const [selecting, setSelecting] = useState(false);
   const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set());
 
-  const hasModels = !!activeTextModelId || !!activeImageModelId;
+  const activeVideoModelId = useAppStore(s => s.activeVideoModelId);
+  const remoteVideoServerId = useRemoteServerStore(s => s.activeRemoteMediaServerIds.video);
+  const hasModels = !!activeTextModelId || !!activeImageModelId || !!activeVideoModelId || !!remoteVideoServerId;
 
   const handleChatPress = (conversation: Conversation) => {
     setActiveConversation(conversation.id);
diff --git a/src/screens/HomeScreen/hooks/useHomeScreen.ts b/src/screens/HomeScreen/hooks/useHomeScreen.ts
index a35edcb3e..10579a00b 100644
--- a/src/screens/HomeScreen/hooks/useHomeScreen.ts
+++ b/src/screens/HomeScreen/hooks/useHomeScreen.ts
@@ -83,6 +83,7 @@ export const useHomeScreen = (navigation: HomeScreenNavigationProp) => {
     downloadedImageModels,
     setDownloadedImageModels,
     activeImageModelId,
+    activeVideoModelId,
     setActiveImageModelId: _setActiveImageModelId,
     deviceInfo,
     setDeviceInfo,
@@ -258,8 +259,8 @@ export const useHomeScreen = (navigation: HomeScreenNavigationProp) => {
   };
 
   const handleEjectAll = () => {
-    const hasLocalModels = activeModelId || activeImageModelId;
-    const hasRemoteModel = activeRemoteTextModelId || activeRemoteImageModelId;
+    const hasLocalModels = activeModelId || activeImageModelId || activeVideoModelId;
+    const hasRemoteModel = activeRemoteTextModelId || activeRemoteImageModelId || activeRemoteMediaServerIds.video;
     if (!hasLocalModels && !hasRemoteModel) {
       return;
     }
@@ -310,8 +311,8 @@ export const useHomeScreen = (navigation: HomeScreenNavigationProp) => {
   };
 
   const startNewChat = () => {
-    // Allow image-only users to start a chat; conversation is lazily created in useChatScreen
-    if (!activeTextModelId && !activeImageModelId) {
+    // Media-only chats are created when their first generation starts.
+    if (!activeTextModelId && !activeImageModelId && !activeVideoModelId && !activeRemoteMediaServerIds.video) {
       return;
     }
     navigation.navigate('Chat', {});
diff --git a/src/screens/HomeScreen/index.tsx b/src/screens/HomeScreen/index.tsx
index e45e0485a..9a5af188c 100644
--- a/src/screens/HomeScreen/index.tsx
+++ b/src/screens/HomeScreen/index.tsx
@@ -129,6 +129,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({ navigation }) => {
 
   // Downloaded-model counts shown in the Models card (replaces the old stats row).
   const modelCounts: Partial<Record<ModelRowType, number>> = {
+    video: useAppStore(s => s.downloadedVideoModels.length),
     text: downloadedModels.length,
     image: downloadedImageModels.length,
     speech: whisperPresentCount,
@@ -221,7 +222,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({ navigation }) => {
           </AnimatedEntry>
 
           {/* New Chat Button */}
-          {activeTextModelId || activeImageModelId ? (
+          {activeTextModelId || activeImageModelId || modelLabels.video ? (
             <Button
               title="New Chat"
               onPress={startNewChat}
@@ -232,7 +233,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({ navigation }) => {
             <Card style={styles.setupCard} testID="setup-card">
               <Text style={styles.setupText}>
                 {downloadedModels.length > 0 || remoteTextModels.length > 0
-                  ? 'Select a text or image model to start'
+                  ? 'Select a text, image, or video model to start'
                   : 'Choose a model here or on your network.'}
               </Text>
               <View style={styles.setupActions}>
diff --git a/src/screens/ProjectChatsScreen.tsx b/src/screens/ProjectChatsScreen.tsx
index 037beada3..4ab3dab84 100644
--- a/src/screens/ProjectChatsScreen.tsx
+++ b/src/screens/ProjectChatsScreen.tsx
@@ -17,7 +17,7 @@ import { useTheme, useThemedStyles } from '../theme';
 import { formatWhen } from '../utils/localTime';
 import type { ThemeColors, ThemeShadows } from '../theme';
 import { TYPOGRAPHY, SPACING } from '../constants';
-import { useChatStore, useProjectStore, useAppStore } from '../stores';
+import { useChatStore, useProjectStore, useAppStore, useRemoteServerStore } from '../stores';
 import { Conversation } from '../types';
 import { RootStackParamList } from '../navigation/types';
 import { byRecentActivity } from '../utils/conversationOrdering';
@@ -164,7 +164,10 @@ export const ProjectChatsScreen: React.FC = () => {
   const downloadedModels = useAppStore(state => state.downloadedModels);
   const activeModelId = useAppStore(state => state.activeModelId);
 
-  const hasModels = downloadedModels.length > 0;
+  const activeVideoModelId = useAppStore(s => s.activeVideoModelId);
+  const remoteVideoServerId = useRemoteServerStore(s => s.activeRemoteMediaServerIds.video);
+  const hasVideoModel = !!activeVideoModelId || !!remoteVideoServerId;
+  const hasModels = downloadedModels.length > 0 || hasVideoModel;
 
   // Get chats for this project
   const projectChats = useMemo(
@@ -178,6 +181,10 @@ export const ProjectChatsScreen: React.FC = () => {
   };
 
   const handleNewChat = () => {
+    if (hasVideoModel && downloadedModels.length === 0) {
+      navigation.navigate('Chat', { projectId });
+      return;
+    }
     if (!hasModels) {
       setAlertState(showAlert('No Model', 'Please download a model first from the Models tab.'));
       return;
diff --git a/src/screens/ProjectDetailScreen.tsx b/src/screens/ProjectDetailScreen.tsx
index b22dcef52..94d66f709 100644
--- a/src/screens/ProjectDetailScreen.tsx
+++ b/src/screens/ProjectDetailScreen.tsx
@@ -15,7 +15,7 @@ import {
 } from '../components/CustomAlert';
 import { useTheme, useThemedStyles } from '../theme';
 import { createStyles } from './ProjectDetailScreen.styles';
-import { useChatStore, useProjectStore, useAppStore } from '../stores';
+import { useChatStore, useProjectStore, useAppStore, useRemoteServerStore } from '../stores';
 import { Conversation } from '../types';
 import { RootStackParamList } from '../navigation/types';
 import { KnowledgeBaseSection } from './ProjectDetailKnowledgeBaseSection';
@@ -45,7 +45,10 @@ export const ProjectDetailScreen: React.FC = () => {
   const downloadedModels = useAppStore(state => state.downloadedModels);
   const activeModelId = useAppStore(state => state.activeModelId);
 
-  const hasModels = downloadedModels.length > 0;
+  const activeVideoModelId = useAppStore(s => s.activeVideoModelId);
+  const remoteVideoServerId = useRemoteServerStore(s => s.activeRemoteMediaServerIds.video);
+  const hasVideoModel = !!activeVideoModelId || !!remoteVideoServerId;
+  const hasModels = downloadedModels.length > 0 || hasVideoModel;
 
   // Get chats for this project
   const projectChats = useMemo(
@@ -59,6 +62,10 @@ export const ProjectDetailScreen: React.FC = () => {
   };
 
   const handleNewChat = () => {
+    if (hasVideoModel && downloadedModels.length === 0) {
+      navigation.navigate('Chat', { projectId });
+      return;
+    }
     if (!hasModels) {
       setAlertState(
         showAlert(

From f05fd82ddb51aab1182dbfc515fd5fe6b8754dfe Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 11:12:21 +0530
Subject: [PATCH 017/129] fix(models): share text detail hierarchy with video
 browsing [skip ci]

---
 src/screens/ModelsScreen/VideoModelsTab.tsx | 66 +++++++++++++--------
 src/screens/ModelsScreen/index.tsx          | 10 +++-
 2 files changed, 49 insertions(+), 27 deletions(-)

diff --git a/src/screens/ModelsScreen/VideoModelsTab.tsx b/src/screens/ModelsScreen/VideoModelsTab.tsx
index 71045aaf9..2cc809887 100644
--- a/src/screens/ModelsScreen/VideoModelsTab.tsx
+++ b/src/screens/ModelsScreen/VideoModelsTab.tsx
@@ -1,5 +1,5 @@
-import React, { useEffect, useState } from 'react';
-import { ScrollView, Text, TextInput, View } from 'react-native';
+import React, { useCallback, useEffect, useState } from 'react';
+import { BackHandler, ScrollView, Text, TextInput, View } from 'react-native';
 import {
   CATALOG,
   searchHuggingFace,
@@ -10,7 +10,8 @@ import {
   videoVaeFilename,
 } from '@offgrid/models';
 import type { HFSearchResult, ModelFileVariant } from '@offgrid/models';
-import { ModelCard } from '../../components';
+import { useFocusEffect } from '@react-navigation/native';
+import { Card, ModelCard } from '../../components';
 import { ScreenHeader } from '../../components/ScreenHeader';
 import { LoadingDots } from '../../components/LoadingDots';
 import { useAppStore } from '../../stores';
@@ -21,12 +22,22 @@ import { modelDownloadService } from '../../services/modelDownloadService';
 import { useTheme, useThemedStyles } from '../../theme';
 import { createStyles } from './styles';
 
-export const VideoModelsTab: React.FC = () => {
+export const VideoModelsTab: React.FC<{
+  selected: HFSearchResult | null;
+  setSelected: React.Dispatch<React.SetStateAction<HFSearchResult | null>>;
+}> = ({ selected, setSelected }) => {
   const styles = useThemedStyles(createStyles),
     { colors } = useTheme();
   const [query, setQuery] = useState('');
   const [results, setResults] = useState<HFSearchResult[]>([]);
-  const [selected, setSelected] = useState<HFSearchResult | null>(null);
+  useFocusEffect(useCallback(() => {
+    const subscription = BackHandler.addEventListener('hardwareBackPress', () => {
+      if (!selected) return false;
+      setSelected(null);
+      return true;
+    });
+    return () => subscription.remove();
+  }, [selected, setSelected]));
   const [files, setFiles] = useState<ModelFileVariant[]>([]);
   const [searchLoading, setSearchLoading] = useState(false);
   const [filesLoading, setFilesLoading] = useState(false);
@@ -154,18 +165,11 @@ export const VideoModelsTab: React.FC = () => {
       ? `Compact ${precision}`
       : 'Alternative version';
     const memory = template?.minRamGb;
-    const memoryWarning =
-      memory && ramGB > 0 && ramGB < memory
-        ? 'May exceed available memory. Use an OGAD server for larger models.'
-        : undefined;
     const facts = [
       unavailable ? 'Not available in this app yet' : undefined,
-      totalBytes ? `${formatFileSize(totalBytes)} total download` : undefined,
-      memory ? `${memory} GB memory suggested` : undefined,
+      totalBytes ? `${formatFileSize(totalBytes)}${file ? '' : ' total download'}` : undefined,
+      !file && memory ? `${memory} GB memory suggested` : undefined,
       defaultVersion ? 'Default version' : undefined,
-      file && installed && !isDownloaded
-        ? 'Remove the installed version to change versions.'
-        : undefined,
     ].filter((fact): fact is string => !!fact);
     const open = () => {
       setError(null);
@@ -188,7 +192,7 @@ export const VideoModelsTab: React.FC = () => {
         compact
         model={{
           id: row.id,
-          name: file ? versionName : row.name,
+          name: file ? `${row.name.replace(/\s*\([^)]*\)$/, '')} - ${versionName}` : row.name,
           author: row.org,
           credibility: {
             source:
@@ -196,7 +200,7 @@ export const VideoModelsTab: React.FC = () => {
             isOfficial: row.credibility === 'official',
             isVerifiedQuantizer: row.credibility === 'verified-quantizer',
           },
-          description: unavailable
+          description: file ? undefined : unavailable
             ? catalogEntry?.availabilityNote
             : 'Create short, silent videos from a description.',
         }}
@@ -206,8 +210,6 @@ export const VideoModelsTab: React.FC = () => {
             <Text style={styles.modelDescription}>
               Checking downloaded files...
             </Text>
-          ) : memoryWarning ? (
-            <Text style={styles.modelDescription}>{memoryWarning}</Text>
           ) : undefined
         }
         isDownloaded={isDownloaded}
@@ -279,10 +281,31 @@ export const VideoModelsTab: React.FC = () => {
     );
   };
 
+  const selectedCatalog = defaults.find(model => model.id === selected?.id);
+  const selectedMemory = selectedCatalog?.minRamGb;
   return (
     <View style={styles.flex1}>
       {selected ? (
-        <ScreenHeader title={selected.name} onBack={() => setSelected(null)} />
+        <>
+          <ScreenHeader title={selected.name} onBack={() => setSelected(null)} />
+          <Card style={styles.modelInfoCard}>
+            <Text style={styles.modelAuthor}>{selected.org}</Text>
+            <Text style={styles.modelDescription}>
+              Create short, silent videos from a description.
+            </Text>
+            {selectedMemory ? <Text style={styles.statText}>
+              {selectedMemory} GB memory suggested{ramGB > 0 ? ` · This phone: ${Math.round(ramGB)} GB` : ''}
+            </Text> : null}
+            {selectedMemory && ramGB > 0 && ramGB < selectedMemory ?
+              <Text style={styles.statText}>Local generation may exceed available memory.</Text> : null}
+            {models.some(model => model.id === selected.id) ?
+              <Text style={styles.statText}>Remove the installed version to change versions.</Text> : null}
+          </Card>
+          <Text style={styles.sectionTitle}>Available versions</Text>
+          <Text style={styles.sectionSubtitle}>
+            Download one version. The total includes all required files.
+          </Text>
+        </>
       ) : (
         <View style={styles.searchContainer}>
           <TextInput
@@ -304,11 +327,6 @@ export const VideoModelsTab: React.FC = () => {
       >
         {selected ? (
           <>
-            <Text style={styles.sectionTitle}>Choose a version</Text>
-            <Text style={styles.sectionSubtitle}>
-              The total includes everything needed to create videos. Download
-              one version.
-            </Text>
             {[...files]
               .sort((a, b) => {
                 const primary = defaults
diff --git a/src/screens/ModelsScreen/index.tsx b/src/screens/ModelsScreen/index.tsx
index dc2a1087d..af497ae05 100644
--- a/src/screens/ModelsScreen/index.tsx
+++ b/src/screens/ModelsScreen/index.tsx
@@ -1,5 +1,6 @@
 import { VideoModelsTab } from './VideoModelsTab';
-import React, { useCallback, useRef } from 'react';
+import type { HFSearchResult } from '@offgrid/models';
+import React, { useCallback, useRef, useState } from 'react';
 import { View, Text, TouchableOpacity, StyleSheet, ScrollView } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { useFocusEffect, useRoute, RouteProp } from '@react-navigation/native';
@@ -58,6 +59,7 @@ export const ModelsScreen: React.FC<ModelsScreenProps> = ({
   const { colors } = useTheme();
   const styles = useThemedStyles(createStyles);
   const vm = useModelsScreen();
+  const [selectedVideoModel, setSelectedVideoModel] = useState<HFSearchResult | null>(null);
   // Pro fills this slot with the real voice-models panel (engine + downloads).
   // The Voice tab always renders; when the slot is empty (free / non-pro) we
   // show an upsell so users can see what Pro adds.
@@ -88,13 +90,15 @@ export const ModelsScreen: React.FC<ModelsScreenProps> = ({
       return () => {
         didAutoSelect.current = false;
         vm.setSelectedModel(null);
+        setSelectedVideoModel(null);
         vm.setModelFiles([]);
       };
       // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [route.params?.initialTab, route.params?.repairModelId]),
   );
 
-  const isShowingDetail = vm.activeTab === 'text' && vm.selectedModel !== null;
+  const isShowingDetail = (vm.activeTab === 'text' && vm.selectedModel !== null) ||
+    (vm.activeTab === 'video' && selectedVideoModel !== null);
 
   const content = (
     <>
@@ -225,7 +229,7 @@ export const ModelsScreen: React.FC<ModelsScreenProps> = ({
       )}
 
       {/* Image Models Tab */}
-      {vm.activeTab === 'video' && <VideoModelsTab />}
+      {vm.activeTab === 'video' && <VideoModelsTab selected={selectedVideoModel} setSelected={setSelectedVideoModel} />}
       {vm.activeTab === 'image' && (
         <ImageModelsTab
           imageSearchQuery={vm.imageSearchQuery}

From a8c5fc916147c9696369ad77dd6fcec73a36fd2e Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 11:17:56 +0530
Subject: [PATCH 018/129] feat(settings): allow hiding the dev sync status bar
 [skip ci]

---
 App.tsx                        |  7 ++++---
 src/screens/SettingsScreen.tsx | 13 +++++++++++++
 src/stores/appStore.ts         |  5 +++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/App.tsx b/App.tsx
index 23ed7a132..841c57f63 100644
--- a/App.tsx
+++ b/App.tsx
@@ -138,6 +138,7 @@ function App() {
   const applyPendingProRedirect = useProExpiryRedirect();
   const [isInitializing, setIsInitializing] = useState(true);
   const startupGeneration = useRef(0);
+  const showSyncStatusBar = useAppStore(s => s.showSyncStatusBar);
   const setDeviceInfo = useAppStore((s) => s.setDeviceInfo);
   const setModelRecommendation = useAppStore((s) => s.setModelRecommendation);
   const setDownloadedModels = useAppStore((s) => s.setDownloadedModels);
@@ -410,7 +411,7 @@ function App() {
             <SystemBars style={isDark ? 'light' : 'dark'} />
             <LoadingDots size={8} testID="startup-loading-dots" />
           </View>
-          {__DEV__ ? <DevSyncStrip /> : null}
+          {__DEV__ && showSyncStatusBar ? <DevSyncStrip /> : null}
         </SafeAreaProvider>
       </GestureHandlerRootView>
     );
@@ -423,7 +424,7 @@ function App() {
         <SafeAreaProvider>
           <SystemBars style={isDark ? 'light' : 'dark'} />
           <LockScreen onUnlock={handleUnlock} />
-          {__DEV__ ? <DevSyncStrip /> : null}
+          {__DEV__ && showSyncStatusBar ? <DevSyncStrip /> : null}
         </SafeAreaProvider>
       </GestureHandlerRootView>
     );
@@ -469,7 +470,7 @@ function App() {
         >
           <AppNavigator />
         </NavigationContainer>
-        {__DEV__ ? <DevSyncStrip /> : null}
+        {__DEV__ && showSyncStatusBar ? <DevSyncStrip /> : null}
       </SafeAreaProvider>
     </GestureHandlerRootView>
   );
diff --git a/src/screens/SettingsScreen.tsx b/src/screens/SettingsScreen.tsx
index 36eab9e43..acaa22b5a 100644
--- a/src/screens/SettingsScreen.tsx
+++ b/src/screens/SettingsScreen.tsx
@@ -5,6 +5,7 @@ import {
   ScrollView,
   TouchableOpacity,
   Alert,
+  Switch,
 } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import Icon from 'react-native-vector-icons/Feather';
@@ -59,6 +60,8 @@ export const SettingsScreen: React.FC = () => {
   const themeMode = useAppStore(s => s.themeMode);
   const setThemeMode = useAppStore(s => s.setThemeMode);
   const completeChecklistStep = useAppStore(s => s.completeChecklistStep);
+  const showSyncStatusBar = useAppStore(s => s.showSyncStatusBar);
+  const setShowSyncStatusBar = useAppStore(s => s.setShowSyncStatusBar);
   const [showDebugLogs, setShowDebugLogs] = useState(false);
   const deviceInfo = useAppStore(s => s.deviceInfo);
   // Hidden once the user dismisses it, or once Pro is active (the upsell makes no
@@ -311,6 +314,16 @@ export const SettingsScreen: React.FC = () => {
         {__DEV__ && (
           <AnimatedEntry index={11} staggerMs={40} trigger={focusTrigger}>
             <View style={styles.devButtonGroup}>
+              <View style={styles.devButton}>
+                <Text style={styles.devButtonText}>Show sync status bar</Text>
+                <Switch
+                  accessibilityLabel="Show sync status bar"
+                  value={showSyncStatusBar}
+                  onValueChange={setShowSyncStatusBar}
+                  trackColor={{ false: colors.surfaceLight, true: `${colors.primary}80` }}
+                  thumbColor={showSyncStatusBar ? colors.primary : colors.textMuted}
+                />
+              </View>
               <TouchableOpacity
                 style={styles.devButton}
                 onPress={handleResetOnboarding}
diff --git a/src/stores/appStore.ts b/src/stores/appStore.ts
index 11b652c68..56d1777ff 100644
--- a/src/stores/appStore.ts
+++ b/src/stores/appStore.ts
@@ -138,6 +138,8 @@ export type AppSettings = {
 type ThemeMode = 'system' | 'light' | 'dark';
 
 export interface AppState extends ProAccessSlice {
+  showSyncStatusBar: boolean;
+  setShowSyncStatusBar: (visible: boolean) => void;
   themeMode: ThemeMode;
   setThemeMode: (mode: ThemeMode) => void;
   hasCompletedOnboarding: boolean;
@@ -315,6 +317,8 @@ const appStorage = createHydrationGatedStorage<PersistedAppState>(
 export const useAppStore = create<AppState>()(
   persist(
     (set, get) => ({
+      showSyncStatusBar: true,
+      setShowSyncStatusBar: visible => set({ showSyncStatusBar: visible }),
       themeMode: 'system' as ThemeMode,
       setThemeMode: mode => set({ themeMode: mode }),
       hasCompletedOnboarding: false,
@@ -554,6 +558,7 @@ export const useAppStore = create<AppState>()(
 
 function persistedAppState(state: AppState) {
   return {
+    showSyncStatusBar: state.showSyncStatusBar,
     themeMode: state.themeMode,
     hasCompletedOnboarding: state.hasCompletedOnboarding,
     onboardingChecklist: state.onboardingChecklist,

From b0e52ba5e7b8202287835ab97f148950c34c9eb8 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 11:36:43 +0530
Subject: [PATCH 019/129] fix(video): use shared memory failure and override
 flow [skip ci]

---
 src/components/VideoGenerationStatus.tsx | 15 ----------
 src/services/modelFailureHandler.ts      |  1 +
 src/services/videoGenerationService.ts   | 36 ++++++++++++++++++++----
 src/stores/modelFailureStore.ts          |  2 +-
 4 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/components/VideoGenerationStatus.tsx b/src/components/VideoGenerationStatus.tsx
index 03cbc5939..62227ac4c 100644
--- a/src/components/VideoGenerationStatus.tsx
+++ b/src/components/VideoGenerationStatus.tsx
@@ -15,21 +15,6 @@ export function VideoGenerationStatus({
   );
   const { colors } = useTheme();
   if (conversationId && state.conversationId !== conversationId) return null;
-  if (state.phase === 'failed')
-    return (
-      <Card title="Video generation stopped">
-        <Text accessibilityRole="alert" style={{ color: colors.error }}>
-          {state.error}
-        </Text>
-        <Button
-          title="Retry"
-          variant="secondary"
-          onPress={() => {
-            void videoGenerationService.retry().catch(() => {});
-          }}
-        />
-      </Card>
-    );
   if (state.phase !== 'running') return null;
   return (
     <Card
diff --git a/src/services/modelFailureHandler.ts b/src/services/modelFailureHandler.ts
index ae8180047..c06ce69cd 100644
--- a/src/services/modelFailureHandler.ts
+++ b/src/services/modelFailureHandler.ts
@@ -32,6 +32,7 @@ import logger from '../utils/logger';
 const TYPE_LABEL: Record<ModelFailureType, string> = {
   text: 'Text model',
   image: 'Image model',
+  video: 'Video model',
   tts: 'Voice',
   stt: 'Transcription',
   embedding: 'Memory',
diff --git a/src/services/videoGenerationService.ts b/src/services/videoGenerationService.ts
index c70840b1a..fc63d28db 100644
--- a/src/services/videoGenerationService.ts
+++ b/src/services/videoGenerationService.ts
@@ -20,6 +20,9 @@ import { useAppStore, useChatStore } from '../stores';
 import { videoGenerator } from './videoGenerator';
 import { resolveVideoPack } from './videoModelFiles';
 import { modelResidencyManager } from './modelResidency';
+import { OverridableMemoryError } from './modelLoadErrors';
+import { reportModelFailure, clearModelFailure } from './modelFailureHandler';
+import { reasonFromLoadError } from './modelFailureReasons';
 import { generationSession } from './generationSession';
 import type { GeneratedVideo } from '../types';
 
@@ -106,6 +109,7 @@ class VideoGenerationService {
       startedAt: saved.startedAt,
       finishedAt: Date.now(),
     });
+    this.reportFailure(new Error(this.state.error!), !!saved.remoteServerId);
   }
   private publishResult(
     result: GeneratedVideo,
@@ -154,7 +158,22 @@ class VideoGenerationService {
     useChatStore.getState().removeMediaAttachment(id);
     useAppStore.getState().removeGeneratedVideo(id);
   }
-  async retry(): Promise<GeneratedVideo | undefined> {
+  private reportFailure(error: unknown, remote = false) {
+    reportModelFailure('video', error, {
+      remote,
+      onRetry: () => {
+        void (async () => {
+          if (!remote && reasonFromLoadError(error) === 'insufficient-memory')
+            await activeModelService.ejectAll();
+          await this.retry();
+        })().catch(() => {});
+      },
+      onLoadAnyway: () => {
+        void this.retry({ override: true }).catch(() => {});
+      },
+    });
+  }
+  async retry(options?: { override?: boolean }): Promise<GeneratedVideo | undefined> {
     if (!this.journal) return;
     if (this.completion)
       throw new Error('Video generation is already running.');
@@ -162,7 +181,7 @@ class VideoGenerationService {
       throw new Error(
         'Wait for the current generation to finish before retrying.',
       );
-    this.completion = this.run(this.journal.input, this.journal).finally(() => {
+    this.completion = this.run(this.journal.input, this.journal, options).finally(() => {
       this.completion = null;
     });
     return this.completion;
@@ -226,6 +245,7 @@ class VideoGenerationService {
   private async run(
     input: VideoInput,
     resumed?: VideoJournal,
+    options?: { override?: boolean },
   ): Promise<GeneratedVideo | undefined> {
     const app = useAppStore.getState();
     const model = app.downloadedVideoModels.find(
@@ -256,6 +276,7 @@ class VideoGenerationService {
       messageId = resumed?.messageId ?? uuid();
     const directory = `${RNFS.DocumentDirectoryPath}/generated-videos`,
       output = `${directory}/${id}.mp4`;
+    clearModelFailure('video');
     this.cancelled = false;
     this.abort = new AbortController();
     this.messageId = messageId;
@@ -364,14 +385,14 @@ class VideoGenerationService {
               dirtyMemory: true,
               canEvict: () => false,
             };
-            const fit = await modelResidencyManager.makeRoomFor(spec);
+            const fit = await modelResidencyManager.makeRoomFor(spec, options);
             if (!fit.fits)
-              throw new Error(
+              throw new OverridableMemoryError(
                 'Not enough available memory for this video model and clip size.',
               );
             if (this.cancelled) throw new Error('Video generation stopped.');
             registration = modelResidencyManager.register(spec, () =>
-              videoGenerator.cancel(),
+              this.cancelGeneration(),
             );
           },
         );
@@ -430,7 +451,10 @@ class VideoGenerationService {
           error instanceof Error ? error.message : 'Video generation failed.',
         finishedAt: Date.now(),
       });
-      if (!this.cancelled) throw error;
+      if (!this.cancelled) {
+        this.reportFailure(error, !!server);
+        throw error;
+      }
     } finally {
       if (registration) modelResidencyManager.unregister('video', registration);
       if (generationSession.isGeneratingFor(input.conversationId))
diff --git a/src/stores/modelFailureStore.ts b/src/stores/modelFailureStore.ts
index eafc39176..ccd58a0a1 100644
--- a/src/stores/modelFailureStore.ts
+++ b/src/stores/modelFailureStore.ts
@@ -8,7 +8,7 @@ import { create } from 'zustand';
  * the look: 'error' (a load/generation was blocked) vs 'warning' (a soft, non-
  * blocking degradation like enhancement skipped).
  */
-export type ModelFailureType = 'text' | 'image' | 'tts' | 'stt' | 'embedding';
+export type ModelFailureType = 'text' | 'image' | 'video' | 'tts' | 'stt' | 'embedding';
 export type ModelFailureSeverity = 'error' | 'warning';
 
 export interface ModelFailure {

From 519674adbd628fa8046f0a9ce18ab28a4f879025 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 12:05:22 +0530
Subject: [PATCH 020/129] fix(video): show generation progress inline in chat
 [skip ci]

---
 src/components/VideoGenerationStatus.tsx   | 57 ++++++++++++----------
 src/screens/ChatScreen/ChatMessageArea.tsx |  8 ++-
 src/services/videoGenerator.ts             | 12 +++++
 3 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/src/components/VideoGenerationStatus.tsx b/src/components/VideoGenerationStatus.tsx
index 62227ac4c..f709f26a5 100644
--- a/src/components/VideoGenerationStatus.tsx
+++ b/src/components/VideoGenerationStatus.tsx
@@ -1,9 +1,10 @@
 import React, { useSyncExternalStore } from 'react';
 import { Text } from 'react-native';
 import { videoGenerationService } from '../services/videoGenerationService';
-import { Card } from './Card';
-import { Button } from './Button';
 import { useTheme } from '../theme';
+import { SPACING, TYPOGRAPHY } from '../constants';
+
+/** Inline status below the pending reply. The composer owns Stop. */
 export function VideoGenerationStatus({
   conversationId,
 }: {
@@ -14,30 +15,36 @@ export function VideoGenerationStatus({
     videoGenerationService.getState,
   );
   const { colors } = useTheme();
-  if (conversationId && state.conversationId !== conversationId) return null;
-  if (state.phase !== 'running') return null;
+  if (state.phase !== 'running' || state.conversationId !== conversationId)
+    return null;
+  const samplingFinished =
+    state.progress && state.progress.step >= state.progress.total;
+  const label =
+    state.stage === 'enhancing'
+      ? 'Preparing prompt'
+      : state.stage === 'preparing'
+      ? 'Loading video model'
+      : state.stage === 'encoding'
+      ? 'Saving video'
+      : samplingFinished
+      ? 'Finishing video'
+      : 'Generating video';
+  const steps =
+    state.stage === 'generating' && state.progress && !samplingFinished
+      ? ` · Step ${state.progress.step} of ${state.progress.total}`
+      : '';
   return (
-    <Card
-      title={
-        state.stage === 'encoding'
-          ? 'Encoding video'
-          : state.stage === 'preparing'
-            ? 'Loading video model'
-            : 'Generating video'
-      }
+    <Text
+      accessibilityLiveRegion="polite"
+      style={{
+        ...TYPOGRAPHY.bodySmall,
+        color: colors.textSecondary,
+        marginHorizontal: SPACING.lg,
+        marginBottom: SPACING.sm,
+      }}
     >
-      {state.progress && (
-        <Text style={{ color: colors.text }}>
-          {state.progress.step} / {state.progress.total}
-        </Text>
-      )}
-      <Button
-        title="Stop"
-        variant="secondary"
-        onPress={() => {
-          void videoGenerationService.cancelGeneration();
-        }}
-      />
-    </Card>
+      {label}
+      {steps}
+    </Text>
   );
 }
diff --git a/src/screens/ChatScreen/ChatMessageArea.tsx b/src/screens/ChatScreen/ChatMessageArea.tsx
index 8f71160f3..8bbe51fa6 100644
--- a/src/screens/ChatScreen/ChatMessageArea.tsx
+++ b/src/screens/ChatScreen/ChatMessageArea.tsx
@@ -268,6 +268,9 @@ export const ChatMessageArea: React.FC<ChatMessageAreaProps> = ({
           renderItem={renderItem}
           keyExtractor={item => item.id}
           extraData={interfaceMode}
+          ListFooterComponent={
+            <VideoGenerationStatus conversationId={chat.activeConversationId} />
+          }
           contentContainerStyle={styles.messageList}
           onScroll={handleScroll}
           onContentSizeChange={(_w, h) => {
@@ -323,7 +326,6 @@ export const ChatMessageArea: React.FC<ChatMessageAreaProps> = ({
           </AnimatedPressable>
         </Animated.View>
       )}
-      <VideoGenerationStatus conversationId={chat.activeConversationId} />
       {chat.isGeneratingImage && (
         <ImageProgressIndicator
           styles={styles}
@@ -411,7 +413,9 @@ export const ChatMessageArea: React.FC<ChatMessageAreaProps> = ({
           onSend={chat.handleSend}
           onStop={chat.handleStop}
           disabled={!chat.hasActiveModel}
-          isGenerating={chat.isStreaming || chat.isThinking}
+          isGenerating={
+            chat.isGeneratingForThisConversation || chat.isStreaming || chat.isThinking
+          }
           supportsVision={chat.supportsVision}
           visionNeedsRepair={chat.visionNeedsRepair}
           conversationId={chat.activeConversationId}
diff --git a/src/services/videoGenerator.ts b/src/services/videoGenerator.ts
index 07af4d66a..6aa54d3f1 100644
--- a/src/services/videoGenerator.ts
+++ b/src/services/videoGenerator.ts
@@ -17,9 +17,21 @@ export const videoGenerator = {
   ): Promise<string> {
     if (!native)
       throw new Error('This build does not include the video engine.');
+    let lastStep = 0;
     const listener = new NativeEventEmitter(native).addListener(
       'VideoGenerationProgress',
       event => {
+        // sd.cpp also sends tensor-loading and VAE tile counters through this
+        // callback. Only sampling steps belong in the generation step count.
+        if (event.stage === 'generating') {
+          if (
+            event.total !== request.steps ||
+            event.step <= lastStep ||
+            event.step > request.steps
+          )
+            return;
+          lastStep = event.step;
+        }
         onUpdate({
           stage: event.stage,
           progress:

From 49ad7517c55eb8585f7aab97f909150bd3519892 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 12:18:58 +0530
Subject: [PATCH 021/129] fix(settings): keep typed slider values visible [skip
 ci]

---
 src/components/SliderSetting/index.tsx | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/components/SliderSetting/index.tsx b/src/components/SliderSetting/index.tsx
index aad073555..496f9af0e 100644
--- a/src/components/SliderSetting/index.tsx
+++ b/src/components/SliderSetting/index.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useRef, useState } from 'react';
 import { View, Text, TextInput, TouchableOpacity, StyleSheet } from 'react-native';
 import Slider from '@react-native-community/slider';
 import { useTheme } from '../../theme';
@@ -53,6 +53,7 @@ export const SliderSetting: React.FC<SliderSettingProps> = ({
   // While dragging, track the value locally so the label updates live without
   // writing to the store on every gesture frame (commit happens on release).
   const [dragValue, setDragValue] = useState<number | null>(null);
+  const dragging = useRef(false);
   const shown = dragValue ?? value;
 
   // Tap-to-edit: tap the value to type an exact number.
@@ -136,8 +137,16 @@ export const SliderSetting: React.FC<SliderSettingProps> = ({
         maximumValue={max}
         step={step}
         value={value}
-        onValueChange={setDragValue}
+        onSlidingStart={() => {
+          dragging.current = true;
+        }}
+        onValueChange={(v) => {
+          // Native value updates can emit after typed input commits. Only a
+          // user drag may override the value supplied by the settings store.
+          if (dragging.current) setDragValue(v);
+        }}
         onSlidingComplete={(v) => {
+          dragging.current = false;
           setDragValue(null);
           commitFromSlider(v);
         }}

From a806a968cfa7349965e8207e23ff4c3381d87f43 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 12:44:22 +0530
Subject: [PATCH 022/129] fix(navigation): return from Pro page to Home [skip
 ci]

---
 src/navigation/useProExpiryRedirect.ts | 9 ++++++---
 src/screens/ProDetailScreen/index.tsx  | 5 ++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/navigation/useProExpiryRedirect.ts b/src/navigation/useProExpiryRedirect.ts
index b4a1e9304..fdeefe728 100644
--- a/src/navigation/useProExpiryRedirect.ts
+++ b/src/navigation/useProExpiryRedirect.ts
@@ -11,7 +11,7 @@ export const appNavigationRef =
   createNavigationContainerRef<RootStackParamList>();
 
 /**
- * Keep an expired installation on the purchase route.
+ * Show the purchase route when access expires, with Home as the return route.
  *
  * The returned callback is also the NavigationContainer onReady handler. This handles a credential
  * that was already expired during cold-start hydration, before the navigator existed.
@@ -32,8 +32,11 @@ export function useProExpiryRedirect(
     }
     redirectPending.current = false;
     navigation.resetRoot({
-      index: 0,
-      routes: [{ name: 'ProDetail' }],
+      index: 1,
+      routes: [
+        { name: 'Main', params: { screen: 'HomeTab' } },
+        { name: 'ProDetail' },
+      ],
     });
   }, [navigation]);
 
diff --git a/src/screens/ProDetailScreen/index.tsx b/src/screens/ProDetailScreen/index.tsx
index 90ed266a1..805222356 100644
--- a/src/screens/ProDetailScreen/index.tsx
+++ b/src/screens/ProDetailScreen/index.tsx
@@ -106,7 +106,10 @@ export const ProDetailScreen: React.FC = () => {
           entitlement state where a screen's actions go. */}
       <ScreenHeader
         title="Off Grid AI Pro"
-        onBack={() => navigation.goBack()}
+        onBack={() => {
+          if (navigation.canGoBack()) navigation.goBack();
+          else navigation.replace('Main', { screen: 'HomeTab' });
+        }}
         right={
 <View style={styles.headerActions}>
             {deviceStatus ? (

From 8d2d149fe4321941534a2e034175122122e77798 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 12:51:50 +0530
Subject: [PATCH 023/129] feat(video): load LTX and Hunyuan packs on mobile
 [skip ci]

---
 android/app/src/main/cpp/video/video-jni.cpp  |  6 ++++-
 .../video/VideoGenerationModule.kt            | 10 ++++---
 native/video/VideoGenerationModule.mm         |  6 ++++-
 native/video/common/VideoRuntime.hpp          |  8 +++++-
 .../VideoGenerationSection.tsx                | 27 ++++++++++++++-----
 src/services/videoGenerationService.ts        |  2 +-
 src/services/videoGenerator.ts                | 13 +++++++--
 src/services/videoModelFiles.ts               | 15 ++++++-----
 8 files changed, 65 insertions(+), 22 deletions(-)

diff --git a/android/app/src/main/cpp/video/video-jni.cpp b/android/app/src/main/cpp/video/video-jni.cpp
index 83d059cfb..e2b8bad7f 100644
--- a/android/app/src/main/cpp/video/video-jni.cpp
+++ b/android/app/src/main/cpp/video/video-jni.cpp
@@ -31,10 +31,14 @@ extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationMod
 extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationModule_nativeCancel(JNIEnv *, jobject) { runtime.cancel(); }
 extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationModule_nativeGenerate(
   JNIEnv *env, jobject self, jstring weight, jstring vae, jstring encoder, jstring prompt, jstring negative,
-  jint width, jint height, jint frames, jint fps, jint steps, jdouble guidance, jdouble seed) {
+  jint width, jint height, jint frames, jint fps, jint steps, jdouble guidance, jdouble seed, jstring llm, jstring embeddings, jstring audioVae, jdouble flowShift) {
   jobject owner = nullptr;
   try {
     offgrid::VideoRequest request{string(env, weight), string(env, vae), string(env, encoder), string(env, prompt), string(env, negative), width, height, frames, fps, steps, (float)guidance, (int64_t)seed};
+    request.llm = string(env, llm);
+    request.embeddings = string(env, embeddings);
+    request.audioVae = string(env, audioVae);
+    request.flowShift = (float)flowShift;
     JavaVM *vm = nullptr;
     if (env->GetJavaVM(&vm) != JNI_OK) throw std::runtime_error("Could not access the video host.");
     owner = env->NewGlobalRef(self);
diff --git a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
index fdbf5dd7e..71bee1265 100644
--- a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
+++ b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
@@ -17,7 +17,7 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
     private val cancelled = AtomicBoolean(false)
     private var encoder: VideoEncoder? = null
     override fun getName() = "VideoGenerationModule"
-    private external fun nativeGenerate(weight: String, vae: String, encoder: String, prompt: String, negative: String, width: Int, height: Int, frames: Int, fps: Int, steps: Int, guidance: Double, seed: Double)
+    private external fun nativeGenerate(weight: String, vae: String, encoder: String, prompt: String, negative: String, width: Int, height: Int, frames: Int, fps: Int, steps: Int, guidance: Double, seed: Double, llm: String, embeddings: String, audioVae: String, flowShift: Double)
     private external fun nativeCancel()
     private external fun nativePrepare()
     @ReactMethod fun addListener(name: String) {}
@@ -54,9 +54,13 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
                 emit("preparing", 0, input.getInt("steps"))
                 VideoEncoder(destination.path, input.getInt("width"), input.getInt("height"), input.getInt("fps")).use { writer ->
                     encoder = writer
-                    nativeGenerate(checkNotNull(input.getString("weight")), checkNotNull(input.getString("vae")), checkNotNull(input.getString("encoder")),
+                    nativeGenerate(checkNotNull(input.getString("weight")), checkNotNull(input.getString("vae")), if (input.hasKey("encoder")) input.getString("encoder") ?: "" else "",
                         checkNotNull(input.getString("prompt")), input.getString("negativePrompt") ?: "", input.getInt("width"), input.getInt("height"),
-                        input.getInt("frames"), input.getInt("fps"), input.getInt("steps"), input.getDouble("guidance"), input.getDouble("seed"))
+                        input.getInt("frames"), input.getInt("fps"), input.getInt("steps"), input.getDouble("guidance"), input.getDouble("seed"),
+                        if (input.hasKey("llm")) input.getString("llm") ?: "" else "",
+                        if (input.hasKey("embeddings")) input.getString("embeddings") ?: "" else "",
+                        if (input.hasKey("audioVae")) input.getString("audioVae") ?: "" else "",
+                        input.getDouble("flowShift"))
                     writer.finish { cancelled.get() }
                 }
                 check(destination.length() > 0) { "Video encoder produced no file." }
diff --git a/native/video/VideoGenerationModule.mm b/native/video/VideoGenerationModule.mm
index 64036b006..93134491f 100644
--- a/native/video/VideoGenerationModule.mm
+++ b/native/video/VideoGenerationModule.mm
@@ -72,11 +72,15 @@ - (void)emitStage:(NSString *)stage step:(int)step total:(int)total {
         NSError *failure = nil;
         try {
           offgrid::VideoRequest request{
-            [input[@"weight"] UTF8String], [input[@"vae"] UTF8String], [input[@"encoder"] UTF8String],
+            [input[@"weight"] UTF8String], [input[@"vae"] UTF8String], [(input[@"encoder"] ?: @"") UTF8String],
             [input[@"prompt"] UTF8String], [input[@"negativePrompt"] UTF8String],
             [input[@"width"] intValue], [input[@"height"] intValue], [input[@"frames"] intValue],
             [input[@"fps"] intValue], [input[@"steps"] intValue], [input[@"guidance"] floatValue], [input[@"seed"] longLongValue]
           };
+          request.llm = [(input[@"llm"] ?: @"") UTF8String];
+          request.embeddings = [(input[@"embeddings"] ?: @"") UTF8String];
+          request.audioVae = [(input[@"audioVae"] ?: @"") UTF8String];
+          request.flowShift = [input[@"flowShift"] floatValue];
           [self emitStage:@"preparing" step:0 total:request.steps];
           self->_runtime.run(request, [&](int step, int total) {
             [self emitStage:@"generating" step:step total:total];
diff --git a/native/video/common/VideoRuntime.hpp b/native/video/common/VideoRuntime.hpp
index 5164f6905..1c58a746b 100644
--- a/native/video/common/VideoRuntime.hpp
+++ b/native/video/common/VideoRuntime.hpp
@@ -5,6 +5,7 @@
 #include "stable-diffusion.h"
 #endif
 #include <atomic>
+#include <limits>
 #include <functional>
 #include <mutex>
 #include <stdexcept>
@@ -16,6 +17,8 @@ struct VideoRequest {
   int width, height, frames, fps, steps;
   float guidance;
   int64_t seed;
+  std::string llm, embeddings, audioVae;
+  float flowShift = 0;
 };
 // One instance per process. Both host bridges use the same native lifecycle.
 class VideoRuntime {
@@ -50,6 +53,9 @@ class VideoRuntime {
       config.diffusion_model_path = request.weight.c_str();
       config.vae_path = request.vae.c_str();
       config.t5xxl_path = request.encoder.c_str();
+      config.llm_path = request.llm.c_str();
+      config.embeddings_connectors_path = request.embeddings.c_str();
+      config.audio_vae_path = request.audioVae.c_str();
       config.enable_mmap = true;
       config.diffusion_flash_attn = true;
       config.auto_fit = true;
@@ -72,7 +78,7 @@ class VideoRuntime {
       params.video_frames = request.frames; params.fps = request.fps; params.seed = request.seed;
       params.sample_params.sample_steps = request.steps;
       params.sample_params.guidance.txt_cfg = request.guidance;
-      params.sample_params.flow_shift = 3;
+      params.sample_params.flow_shift = request.flowShift > 0 ? request.flowShift : std::numeric_limits<float>::infinity();
       params.sample_params.sample_method = EULER_SAMPLE_METHOD;
       params.sample_params.scheduler = sd_get_default_scheduler(loaded, EULER_SAMPLE_METHOD);
       params.vae_tiling_params.enabled = true;
diff --git a/src/components/GenerationSettingsModal/VideoGenerationSection.tsx b/src/components/GenerationSettingsModal/VideoGenerationSection.tsx
index 65aa50dd7..807845653 100644
--- a/src/components/GenerationSettingsModal/VideoGenerationSection.tsx
+++ b/src/components/GenerationSettingsModal/VideoGenerationSection.tsx
@@ -2,7 +2,7 @@ import { Accordion } from '../Accordion';
 import { useRemoteServerStore } from '../../stores/remoteServerStore';
 import React, { useEffect, useState } from 'react';
 import { Text, TextInput, View, Switch } from 'react-native';
-import { VIDEO_DEFAULTS } from '@offgrid/models';
+import { videoModelDefaults, videoModelLimits } from '@offgrid/models';
 import { useAppStore } from '../../stores';
 import { useTheme, useThemedStyles } from '../../theme';
 import { SliderSetting } from '../SliderSetting';
@@ -37,7 +37,20 @@ export const VideoGenerationSection: React.FC = () => {
     'default';
   const saved =
     settings.videoParams?.[key] ?? settings.videoParams?.default ?? {};
-  const values = { ...VIDEO_DEFAULTS, ...saved };
+  const limits = videoModelLimits(key);
+  const values = { ...videoModelDefaults(key), ...saved };
+  const controls = CONTROLS.map(control => ({
+    ...control,
+    ...(control.key === 'width'
+      ? { max: limits.widthMax, step: limits.sizeStep }
+      : {}),
+    ...(control.key === 'height'
+      ? { max: limits.heightMax, step: limits.sizeStep }
+      : {}),
+    ...(control.key === 'frames'
+      ? { max: limits.framesMax, step: limits.frameStep }
+      : {}),
+  }));
   const [seedText, setSeedText] = useState(
     settings.videoSeed === -1 ? '' : String(settings.videoSeed ?? ''),
   );
@@ -62,7 +75,7 @@ export const VideoGenerationSection: React.FC = () => {
       <Text style={styles.settingDescription}>
         {remoteName ?? model?.name ?? 'Default video settings'}
       </Text>
-      {CONTROLS.map(control => (
+      {controls.map(control => (
         <SliderSetting
           key={control.key}
           compact
@@ -79,10 +92,12 @@ export const VideoGenerationSection: React.FC = () => {
                   ...saved,
                   [control.key]:
                     control.key === 'frames'
-                      ? 1 + Math.round((value - 1) / 4) * 4
+                      ? 1 +
+                        Math.round((value - 1) / limits.frameStep) *
+                          limits.frameStep
                       : control.key === 'width' || control.key === 'height'
-                        ? Math.round(value / 16) * 16
-                        : value,
+                      ? Math.round(value / limits.sizeStep) * limits.sizeStep
+                      : value,
                 },
               },
             })
diff --git a/src/services/videoGenerationService.ts b/src/services/videoGenerationService.ts
index fc63d28db..a8fabd2e4 100644
--- a/src/services/videoGenerationService.ts
+++ b/src/services/videoGenerationService.ts
@@ -266,7 +266,7 @@ class VideoGenerationService {
     const primary =
       server?.mediaModels?.video ??
       model!.files.find(f => f.role === 'primary')!.name;
-    let request = resolveVideoRequest(input, {
+    let request = resolveVideoRequest({ ...input, model: primary }, {
       ...(app.settings.videoParams?.[primary] ??
         app.settings.videoParams?.default),
       seed: app.settings.videoSeed ?? -1,
diff --git a/src/services/videoGenerator.ts b/src/services/videoGenerator.ts
index 6aa54d3f1..2814c7237 100644
--- a/src/services/videoGenerator.ts
+++ b/src/services/videoGenerator.ts
@@ -1,6 +1,8 @@
 import { NativeEventEmitter, NativeModules } from 'react-native';
+import { videoArchitecture } from '@offgrid/models';
 import type {
   ResolvedVideoRequest,
+  VideoModelPack,
   VideoGenerationUpdateContract,
 } from '@offgrid/models';
 const native = NativeModules.VideoGenerationModule;
@@ -11,7 +13,7 @@ export const videoGenerator = {
   },
   async generate(
     request: ResolvedVideoRequest,
-    pack: { weight: string; vae: string; encoder: string },
+    pack: VideoModelPack,
     outputPath: string,
     onUpdate: (update: VideoGenerationUpdateContract) => void,
   ): Promise<string> {
@@ -40,7 +42,14 @@ export const videoGenerator = {
       },
     );
     try {
-      return (await native.generate({ ...request, ...pack, outputPath })).path;
+      return (
+        await native.generate({
+          ...request,
+          ...pack,
+          outputPath,
+          flowShift: videoArchitecture(pack.weight)?.startsWith('wan') ? 3 : 0,
+        })
+      ).path;
     } finally {
       listener.remove();
     }
diff --git a/src/services/videoModelFiles.ts b/src/services/videoModelFiles.ts
index 5af85a297..54c580515 100644
--- a/src/services/videoModelFiles.ts
+++ b/src/services/videoModelFiles.ts
@@ -2,8 +2,8 @@ import RNFS from 'react-native-fs';
 import type { ModelEntry } from '@offgrid/models';
 import {
   videoPackError,
-  videoVaeFilename,
-  VIDEO_ENCODER_FILENAME,
+  videoPackFiles,
+  type VideoModelPack,
 } from '@offgrid/models';
 
 export interface VideoModel extends ModelEntry {
@@ -42,9 +42,10 @@ export async function resolveVideoPack(
       throw new Error(`Video model checksum failed: ${file.name}`);
   }
   const weight = model.files.find(f => f.role === 'primary')!.name;
-  return {
-    weight: `${directory}/${weight}`,
-    vae: `${directory}/${videoVaeFilename(weight)!}`,
-    encoder: `${directory}/${VIDEO_ENCODER_FILENAME}`,
-  };
+  return Object.fromEntries(
+    Object.entries(videoPackFiles(weight)!).map(([role, name]) => [
+      role,
+      `${directory}/${name}`,
+    ]),
+  ) as unknown as VideoModelPack;
 }

From 2dcffb7eb439a34ac722ca7b128eaa1099a7926c Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 13:06:12 +0530
Subject: [PATCH 024/129] fix(video): use CPU conditioning on Android [skip ci]

---
 android/app/src/main/cpp/video/video-jni.cpp | 12 +++++++++++-
 native/video/common/VideoRuntime.hpp         |  6 ++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/android/app/src/main/cpp/video/video-jni.cpp b/android/app/src/main/cpp/video/video-jni.cpp
index e2b8bad7f..f3d372050 100644
--- a/android/app/src/main/cpp/video/video-jni.cpp
+++ b/android/app/src/main/cpp/video/video-jni.cpp
@@ -1,4 +1,5 @@
 #include <jni.h>
+#include <android/log.h>
 #include <limits>
 #include "VideoRuntime.hpp"
 
@@ -27,7 +28,16 @@ static std::string string(JNIEnv *env, jstring value) {
   return result;
 }
 
-extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationModule_nativePrepare(JNIEnv *, jobject) { runtime.cancelled.store(false); }
+extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationModule_nativePrepare(JNIEnv *, jobject) {
+#ifndef NDEBUG
+  sd_set_log_callback([](sd_log_level_t level, const char *text, void *) {
+    const int priority = level == SD_LOG_ERROR ? ANDROID_LOG_ERROR :
+      level == SD_LOG_WARN ? ANDROID_LOG_WARN : ANDROID_LOG_DEBUG;
+    __android_log_write(priority, "OffgridVideo", text);
+  }, nullptr);
+#endif
+  runtime.cancelled.store(false);
+}
 extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationModule_nativeCancel(JNIEnv *, jobject) { runtime.cancel(); }
 extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationModule_nativeGenerate(
   JNIEnv *env, jobject self, jstring weight, jstring vae, jstring encoder, jstring prompt, jstring negative,
diff --git a/native/video/common/VideoRuntime.hpp b/native/video/common/VideoRuntime.hpp
index 1c58a746b..e41b546db 100644
--- a/native/video/common/VideoRuntime.hpp
+++ b/native/video/common/VideoRuntime.hpp
@@ -60,6 +60,12 @@ class VideoRuntime {
       config.diffusion_flash_attn = true;
       config.auto_fit = true;
       config.eager_load = false;
+#ifdef __ANDROID__
+      // Vulkan cannot execute every T5 operation on preallocated encoder
+      // tensors. Keep conditioning on CPU; diffusion still selects the GPU.
+      config.backend = "te=cpu";
+      config.params_backend = "te=cpu";
+#endif
       config.n_threads = 4;
       auto loaded = new_sd_ctx(&config);
       {

From e87d2fa47a409091cd63c8c520bf0e65bad975c2 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 13:15:52 +0530
Subject: [PATCH 025/129] fix(video): show prompt processing and elapsed time
 [skip ci]

---
 android/app/src/main/cpp/video/video-jni.cpp  |  6 ++++-
 .../video/VideoGenerationModule.kt            |  1 +
 native/video/VideoGenerationModule.mm         |  2 +-
 native/video/common/VideoRuntime.hpp          |  4 +++-
 src/components/VideoGenerationStatus.tsx      | 24 +++++++++++++++++--
 5 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/android/app/src/main/cpp/video/video-jni.cpp b/android/app/src/main/cpp/video/video-jni.cpp
index f3d372050..c74ba71bc 100644
--- a/android/app/src/main/cpp/video/video-jni.cpp
+++ b/android/app/src/main/cpp/video/video-jni.cpp
@@ -55,9 +55,10 @@ extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationMod
     if (!owner) throw std::runtime_error("Not enough memory to start video generation.");
     auto klass = env->GetObjectClass(self);
     auto progress = env->GetMethodID(klass, "progress", "(II)V");
+    auto conditioning = env->GetMethodID(klass, "conditioning", "()V");
     auto frame = env->GetMethodID(klass, "frame", "([BIII)V");
     env->DeleteLocalRef(klass);
-    if (!progress || !frame) throw std::runtime_error("Missing video host callbacks.");
+    if (!progress || !frame || !conditioning) throw std::runtime_error("Missing video host callbacks.");
     std::atomic_bool callbackFailed{false};
     runtime.run(request, [&](int step, int total) {
       // The engine may report progress from a worker thread. JNI environments
@@ -86,6 +87,9 @@ extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationMod
         env->DeleteLocalRef(bytes);
         if (env->ExceptionCheck()) throw std::runtime_error("Video encoder failed.");
       }
+    }, [&] {
+      env->CallVoidMethod(owner, conditioning);
+      if (env->ExceptionCheck()) throw std::runtime_error("Could not report prompt processing.");
     });
   } catch (const std::exception &error) {
     if (!env->ExceptionCheck()) {
diff --git a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
index 71bee1265..aeab3291c 100644
--- a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
+++ b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
@@ -25,6 +25,7 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
     private fun stop() { cancelled.set(true); nativeCancel() }
     @ReactMethod fun cancel(promise: Promise) { stop(); promise.resolve(null) }
     // Called synchronously by JNI while its worker owns the runtime.
+    fun conditioning() { emit("conditioning", 0, 0) }
     fun progress(step: Int, total: Int) {
         emit("generating", step, total)
     }
diff --git a/native/video/VideoGenerationModule.mm b/native/video/VideoGenerationModule.mm
index 93134491f..bca1ad821 100644
--- a/native/video/VideoGenerationModule.mm
+++ b/native/video/VideoGenerationModule.mm
@@ -89,7 +89,7 @@ - (void)emitStage:(NSString *)stage step:(int)step total:(int)total {
             NSError *encodingError = nil;
             if (!OGEncodeVideo(frames, count, fps, output, self->_runtime.cancelled, &encodingError))
               throw std::runtime_error(encodingError ? encodingError.localizedDescription.UTF8String : "Video encoding stopped.");
-          });
+          }, [&] { [self emitStage:@"conditioning" step:0 total:0]; });
         } catch (const std::exception &error) {
           failure = [NSError errorWithDomain:@"OffgridVideo" code:1 userInfo:@{NSLocalizedDescriptionKey:@(error.what())}];
           [[NSFileManager defaultManager] removeItemAtPath:output error:nil];
diff --git a/native/video/common/VideoRuntime.hpp b/native/video/common/VideoRuntime.hpp
index e41b546db..2372c3c0e 100644
--- a/native/video/common/VideoRuntime.hpp
+++ b/native/video/common/VideoRuntime.hpp
@@ -34,7 +34,8 @@ class VideoRuntime {
   }
   void run(const VideoRequest &request,
            const std::function<void(int, int)> &progress,
-           const std::function<void(sd_image_t *, int, int)> &encode) {
+           const std::function<void(sd_image_t *, int, int)> &encode,
+           const std::function<void()> &conditioning) {
     std::unique_lock<std::mutex> execution(executionMutex, std::try_to_lock);
     if (!execution.owns_lock()) throw std::runtime_error("Video generation is already running.");
     sd_image_t *frames = nullptr;
@@ -88,6 +89,7 @@ class VideoRuntime {
       params.sample_params.sample_method = EULER_SAMPLE_METHOD;
       params.sample_params.scheduler = sd_get_default_scheduler(loaded, EULER_SAMPLE_METHOD);
       params.vae_tiling_params.enabled = true;
+      conditioning();
       if (!generate_video(loaded, &params, &frames, &count, nullptr, &fps) || !frames || count == 0)
         throw std::runtime_error(cancelled.load() ? "Video generation stopped." : "The video engine produced no frames.");
       if (cancelled.load()) throw std::runtime_error("Video generation stopped.");
diff --git a/src/components/VideoGenerationStatus.tsx b/src/components/VideoGenerationStatus.tsx
index f709f26a5..630f84a8d 100644
--- a/src/components/VideoGenerationStatus.tsx
+++ b/src/components/VideoGenerationStatus.tsx
@@ -1,5 +1,5 @@
-import React, { useSyncExternalStore } from 'react';
-import { Text } from 'react-native';
+import React, { useEffect, useState, useSyncExternalStore } from 'react';
+import { Platform, Text } from 'react-native';
 import { videoGenerationService } from '../services/videoGenerationService';
 import { useTheme } from '../theme';
 import { SPACING, TYPOGRAPHY } from '../constants';
@@ -15,6 +15,15 @@ export function VideoGenerationStatus({
     videoGenerationService.getState,
   );
   const { colors } = useTheme();
+  const [now, setNow] = useState(Date.now);
+  const running =
+    state.phase === 'running' && state.conversationId === conversationId;
+  useEffect(() => {
+    if (!running) return;
+    setNow(Date.now());
+    const timer = setInterval(() => setNow(Date.now()), 1000);
+    return () => clearInterval(timer);
+  }, [running, state.startedAt]);
   if (state.phase !== 'running' || state.conversationId !== conversationId)
     return null;
   const samplingFinished =
@@ -24,6 +33,10 @@ export function VideoGenerationStatus({
       ? 'Preparing prompt'
       : state.stage === 'preparing'
       ? 'Loading video model'
+      : state.stage === 'conditioning'
+      ? Platform.OS === 'android'
+        ? 'Processing prompt on CPU'
+        : 'Processing prompt'
       : state.stage === 'encoding'
       ? 'Saving video'
       : samplingFinished
@@ -33,9 +46,15 @@ export function VideoGenerationStatus({
     state.stage === 'generating' && state.progress && !samplingFinished
       ? ` · Step ${state.progress.step} of ${state.progress.total}`
       : '';
+  const seconds = Math.max(
+    0,
+    Math.floor((now - (state.startedAt ?? now)) / 1000),
+  );
+  const elapsed = `${Math.floor(seconds / 60)}m ${seconds % 60}s elapsed`;
   return (
     <Text
       accessibilityLiveRegion="polite"
+      accessibilityLabel={`${label}${steps}`}
       style={{
         ...TYPOGRAPHY.bodySmall,
         color: colors.textSecondary,
@@ -45,6 +64,7 @@ export function VideoGenerationStatus({
     >
       {label}
       {steps}
+      {` · ${elapsed}`}
     </Text>
   );
 }

From 42256cf6f2d0aee17850d43c5285cb2f71f130e3 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 13:17:09 +0530
Subject: [PATCH 026/129] perf(video): optimize Android debug engine kernels
 [skip ci]

---
 android/app/src/main/cpp/CMakeLists.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/android/app/src/main/cpp/CMakeLists.txt b/android/app/src/main/cpp/CMakeLists.txt
index ed35317dc..e26705511 100644
--- a/android/app/src/main/cpp/CMakeLists.txt
+++ b/android/app/src/main/cpp/CMakeLists.txt
@@ -29,6 +29,13 @@ set(GGML_VULKAN_SHADERS_GEN_TOOLCHAIN "${CMAKE_BINARY_DIR}/video-host-toolchain.
 file(WRITE "${GGML_VULKAN_SHADERS_GEN_TOOLCHAIN}"
   "set(CMAKE_C_COMPILER \"${VIDEO_HOST_CC}\")\nset(CMAKE_CXX_COMPILER \"${VIDEO_HOST_CXX}\")\nset(CMAKE_MAKE_PROGRAM \"${CMAKE_MAKE_PROGRAM}\" CACHE FILEPATH \"Host build tool\" FORCE)\n")
 add_subdirectory("${SD_SOURCE}" runtime)
+# Keep model execution representative in debug apps. Unoptimized tensor kernels
+# make CPU conditioning take minutes even though the app remains responsive.
+foreach(VIDEO_RUNTIME_TARGET stable-diffusion ggml-base ggml-cpu ggml-vulkan)
+  if(TARGET ${VIDEO_RUNTIME_TARGET})
+    target_compile_options(${VIDEO_RUNTIME_TARGET} PRIVATE $<$<CONFIG:Debug>:-O3>)
+  endif()
+endforeach()
 add_library(offgrid_video SHARED video/video-jni.cpp)
 target_include_directories(offgrid_video PRIVATE "${SD_SOURCE}/include" "${CMAKE_CURRENT_SOURCE_DIR}/../../../../../native/video/common")
 target_link_libraries(offgrid_video PRIVATE stable-diffusion android log)

From b7312ff71cf8240e6411a55b58ca12f5c2d18510 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 13:55:33 +0530
Subject: [PATCH 027/129] fix(text): try GPU after NPU load failure [skip ci]

---
 src/services/llm.ts        |  8 ++++----
 src/services/llmHelpers.ts | 21 ++++++++++++++++++---
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/services/llm.ts b/src/services/llm.ts
index 3a4adf0f7..ce419b524 100644
--- a/src/services/llm.ts
+++ b/src/services/llm.ts
@@ -168,11 +168,14 @@ class LLMService {
       availableBytes: deviceInfo.availableMemory,
     });
     if (safeGpuLayers !== params.nGpuLayers) logger.log(`[LLM] GPU layers capped (${(deviceInfo.totalMemory / BYTES_PER_GB).toFixed(1)}GB RAM, ${Platform.OS}): ${params.nGpuLayers} → ${safeGpuLayers}`);
+    let fallbackGpuLayers = 0;
     let resolvedBaseParams: object = params.baseParams;
     if (Platform.OS === 'android') {
       const settings = useAppStore.getState().settings;
       const backend = settings?.inferenceBackend ?? INFERENCE_BACKENDS.CPU;
       if (backend === INFERENCE_BACKENDS.HTP) {
+        const gpuCapability = await hardwareService.getOpenCLCapability();
+        fallbackGpuLayers = gpuCapability.supported ? safeGpuLayers : 0;
         // HTP routes to the Hexagon NPU — not subject to Adreno GPU layer caps,
         // but we still respect the RAM-based safeGpuLayers floor (0 on ≤4GB devices).
         safeGpuLayers = safeGpuLayers > 0 ? (settings?.gpuLayers ?? 99) : 0;
@@ -196,10 +199,7 @@ class LLMService {
     // The model metadata and the user's setting own context length. Do not impose a
     // second RAM-tier ceiling here. validateAndPrepareModel checks this exact
     // model + cache + selected context against live memory without changing it.
-    return {
-      ...await initContextWithFallback(resolvedBaseParams, params.ctxLen, safeGpuLayers),
-      attemptedGpuLayers: safeGpuLayers,
-    };
+    return initContextWithFallback(resolvedBaseParams, params.ctxLen, safeGpuLayers, fallbackGpuLayers);
   }
   /** Multimodal init on a NOT-YET-PUBLISHED context (the load pipeline) — no instance-state writes. */
   private async deriveMultimodalFromProjector(context: LlamaContext, modelPath: string, mmProjPath: string): Promise<{ initialized: boolean; support: MultimodalSupport }> {
diff --git a/src/services/llmHelpers.ts b/src/services/llmHelpers.ts
index 214df1ae2..f2b241882 100644
--- a/src/services/llmHelpers.ts
+++ b/src/services/llmHelpers.ts
@@ -123,6 +123,7 @@ export interface ContextInitResult {
   context: LlamaContext;
   gpuAttemptFailed: boolean;
   actualLength: number;
+  attemptedGpuLayers: number;
 }
 /** Timeout for Adreno GPU context init on Android. 8s proved too tight on-device: Adreno 735
  *  first-load OpenCL kernel compilation exceeded it (2026-07-13 20:11 log: "timed out after
@@ -174,11 +175,12 @@ async function tryGpuInit(promise: Promise<LlamaContext>, nGpuLayers: number, is
   catch (e) { timedOut = true; throw e; }
 }
 
-/** Init llama with GPU/HTP, then retry on CPU at the selected context. */
+/** Try the selected accelerator, a supported GPU fallback, then CPU. */
 export async function initContextWithFallback(
   params: object,
   contextLength: number,
   nGpuLayers: number,
+  fallbackGpuLayers: number = 0,
 ): Promise<ContextInitResult> {
   const modelPath = (params as any).model || 'unknown';
   const isHtp = HTP_ENABLED && Array.isArray((params as any).devices) && (params as any).devices.some((d: string) => d.startsWith('HTP'));
@@ -195,7 +197,7 @@ export async function initContextWithFallback(
     const gpuInitPromise = initLlama({ ...params, n_ctx: contextLength, n_gpu_layers: nGpuLayers } as any);
     const context = await tryGpuInit(gpuInitPromise, nGpuLayers, isHtp);
     logger.log('[LLM] GPU init succeeded');
-    return { context, gpuAttemptFailed, actualLength: contextLength };
+    return { context, gpuAttemptFailed, actualLength: contextLength, attemptedGpuLayers: nGpuLayers };
   } catch (gpuError: any) {
     const gpuMsg = gpuError?.message || String(gpuError);
     if (nGpuLayers > 0) {
@@ -204,6 +206,19 @@ export async function initContextWithFallback(
     } else {
       logger.warn(`[LLM] Attempt 1/2 failed (no GPU requested): ${gpuMsg}`);
     }
+    if (isHtp && nGpuLayers > 0 && fallbackGpuLayers > 0) {
+      const gpuParams = { ...(params as Record<string, unknown>) };
+      delete gpuParams.devices;
+      delete gpuParams.cache_type_k;
+      delete gpuParams.cache_type_v;
+      try {
+        logger.warn('[LLM] NPU initialization failed; trying the supported GPU backend');
+        const context = await tryGpuInit(initLlama({ ...gpuParams, n_ctx: contextLength, n_gpu_layers: fallbackGpuLayers } as any), fallbackGpuLayers);
+        return { context, gpuAttemptFailed: false, actualLength: contextLength, attemptedGpuLayers: fallbackGpuLayers };
+      } catch (fallbackError) {
+        logger.warn('[LLM] GPU fallback failed:', fallbackError);
+      }
+    }
     try {
       logger.log(`[LLM] Attempt 2/2: CPU init (ctx=${contextLength}, gpu_layers=0)`);
       // Strip devices — HTP requires n_gpu_layers > 0; CPU fallback must not request it
@@ -211,7 +226,7 @@ export async function initContextWithFallback(
       delete cpuParams.devices;
       const context = await initLlama({ ...cpuParams, n_ctx: contextLength, n_gpu_layers: 0 } as any);
       logger.log('[LLM] CPU init succeeded');
-      return { context, gpuAttemptFailed, actualLength: contextLength };
+      return { context, gpuAttemptFailed, actualLength: contextLength, attemptedGpuLayers: 0 };
     } catch (cpuError: any) {
       const cpuMsg = cpuError?.message || String(cpuError);
       logger.warn(`[LLM] Attempt 2/2 failed (CPU, ctx=${contextLength}): ${cpuMsg}`);

From 62b1df76970d503d31062fd9adfe21b82998ebc7 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 14:02:21 +0530
Subject: [PATCH 028/129] build(video): bundle Qualcomm DSP runtimes [skip ci]

---
 android/app/build.gradle                      |  5 ++-
 android/app/src/main/cpp/CMakeLists.txt       |  4 +-
 scripts/prepare-video-runtime.sh              |  8 ++++
 scripts/video/android-hardware-fallback.patch | 44 ++++++++++++++++++
 scripts/video/android-hexagon.patch           | 32 +++++++++++++
 scripts/video/build-hexagon.sh                | 45 +++++++++++++++++++
 scripts/video/conditioning-errors.patch       | 16 +++++++
 scripts/video/hexagon-prebuilt.cmake          | 18 ++++++++
 8 files changed, 170 insertions(+), 2 deletions(-)
 create mode 100644 scripts/video/android-hardware-fallback.patch
 create mode 100644 scripts/video/android-hexagon.patch
 create mode 100755 scripts/video/build-hexagon.sh
 create mode 100644 scripts/video/conditioning-errors.patch
 create mode 100644 scripts/video/hexagon-prebuilt.cmake

diff --git a/android/app/build.gradle b/android/app/build.gradle
index f3136af57..44e9a5b4c 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -90,6 +90,7 @@ android {
     }
 
     externalNativeBuild { cmake { path "src/main/cpp/CMakeLists.txt"; version "3.22.1" } }
+    sourceSets.main.assets.srcDir("../../.video-build/hexagon-assets")
     defaultConfig {
         applicationId "ai.offgridmobile"
         minSdkVersion rootProject.ext.minSdkVersion
@@ -204,7 +205,9 @@ def prepareVideoRuntime = tasks.register("prepareVideoRuntime", Exec) {
     workingDir videoRoot
     commandLine "bash", new File(videoRoot, "scripts/prepare-video-runtime.sh").absolutePath, "--android"
     inputs.files(fileTree(new File(videoRoot, "scripts/video")), new File(videoRoot, "scripts/prepare-video-runtime.sh"))
-    outputs.files(new File(videoRoot, ".video-build/runtime-ready"), new File(videoRoot, ".video-build/shaderc/bin/glslc"))
+    outputs.files(new File(videoRoot, ".video-build/runtime-ready"), new File(videoRoot, ".video-build/shaderc/bin/glslc"),
+        new File(videoRoot, ".video-build/hexagon-runtime/htp_iface_stub.c"), new File(videoRoot, ".video-build/hexagon-runtime/htp_iface.h"))
+    outputs.dir(new File(videoRoot, ".video-build/hexagon-assets/video-hexagon"))
 }
 tasks.configureEach { task ->
     if (task.name.startsWith("configureCMake")) task.dependsOn(prepareVideoRuntime)
diff --git a/android/app/src/main/cpp/CMakeLists.txt b/android/app/src/main/cpp/CMakeLists.txt
index e26705511..9bb0adda6 100644
--- a/android/app/src/main/cpp/CMakeLists.txt
+++ b/android/app/src/main/cpp/CMakeLists.txt
@@ -13,6 +13,8 @@ set(SD_WEBM OFF CACHE BOOL "" FORCE)
 set(SD_METAL OFF CACHE BOOL "" FORCE)
 set(SD_VULKAN ON CACHE BOOL "" FORCE)
 set(SD_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/../../../../../.video-build/source")
+set(GGML_HEXAGON ON CACHE BOOL "" FORCE)
+set(OFFGRID_VIDEO_HEXAGON_CMAKE "${CMAKE_CURRENT_SOURCE_DIR}/../../../../../scripts/video/hexagon-prebuilt.cmake")
 if(NOT EXISTS "${SD_SOURCE}/CMakeLists.txt")
   message(FATAL_ERROR "Run scripts/prepare-video-runtime.sh before building Android.")
 endif()
@@ -31,7 +33,7 @@ file(WRITE "${GGML_VULKAN_SHADERS_GEN_TOOLCHAIN}"
 add_subdirectory("${SD_SOURCE}" runtime)
 # Keep model execution representative in debug apps. Unoptimized tensor kernels
 # make CPU conditioning take minutes even though the app remains responsive.
-foreach(VIDEO_RUNTIME_TARGET stable-diffusion ggml-base ggml-cpu ggml-vulkan)
+foreach(VIDEO_RUNTIME_TARGET stable-diffusion ggml-base ggml-cpu ggml-vulkan ggml-hexagon)
   if(TARGET ${VIDEO_RUNTIME_TARGET})
     target_compile_options(${VIDEO_RUNTIME_TARGET} PRIVATE $<$<CONFIG:Debug>:-O3>)
   endif()
diff --git a/scripts/prepare-video-runtime.sh b/scripts/prepare-video-runtime.sh
index f05ee71cf..3091835cc 100644
--- a/scripts/prepare-video-runtime.sh
+++ b/scripts/prepare-video-runtime.sh
@@ -16,6 +16,13 @@ PATCH="$ROOT/scripts/video/android-vulkan-dispatch.patch"
 if ! git -C "$SOURCE/ggml" apply --reverse --check "$PATCH" 2>/dev/null; then
   git -C "$SOURCE/ggml" apply "$PATCH"
 fi
+for entry in "ggml:android-hexagon.patch" ".:android-hardware-fallback.patch" ".:conditioning-errors.patch"; do
+  target="${entry%%:*}"
+  patch="$ROOT/scripts/video/${entry#*:}"
+  if ! git -C "$SOURCE/$target" apply --reverse --check "$patch" 2>/dev/null; then
+    git -C "$SOURCE/$target" apply "$patch"
+  fi
+done
 # Match the header versions used by the runtime's Vulkan build. These are build
 # inputs only; the device still supplies its Vulkan driver.
 prepare_headers() {
@@ -31,6 +38,7 @@ prepare_headers Vulkan-Headers 19725e4d48082fe78e26622b15d3080ccd54112b
 
 if [ "${1:-}" = "--android" ]; then
   bash "$ROOT/scripts/video/build-shaderc.sh"
+  bash "$ROOT/scripts/video/build-hexagon.sh"
 fi
 
 touch "$ROOT/.video-build/runtime-ready"
diff --git a/scripts/video/android-hardware-fallback.patch b/scripts/video/android-hardware-fallback.patch
new file mode 100644
index 000000000..d0efb3761
--- /dev/null
+++ b/scripts/video/android-hardware-fallback.patch
@@ -0,0 +1,44 @@
+diff --git a/src/core/compute_workspace.cpp b/src/core/compute_workspace.cpp
+index 54f0538..ae344c9 100644
+--- a/src/core/compute_workspace.cpp
++++ b/src/core/compute_workspace.cpp
+@@ -18,6 +18,7 @@ namespace sd {
+         segment_end();
+         release();
+         ggml_backend_free(cpu_backend_);
++        ggml_backend_free(gpu_fallback_);
+     }
+ 
+     void ComputeWorkspace::set_extra_backends(const std::vector<ggml_backend_t>& backends) {
+@@ -43,6 +44,19 @@ namespace sd {
+     ggml_backend_sched_t ComputeWorkspace::make_scheduler(size_t graph_size) {
+         std::vector<ggml_backend_t> backends{backend_};
+         backends.insert(backends.end(), extra_backends_.begin(), extra_backends_.end());
++#ifdef __ANDROID__
++        // Hexagon is preferred; unsupported operations go to Vulkan, then CPU.
++        if (sd_backend_is(backend_, "HTP")) {
++            if (gpu_fallback_ == nullptr) {
++                auto device = ggml_backend_dev_by_name("Vulkan0");
++                if (device) gpu_fallback_ = ggml_backend_dev_init(device, nullptr);
++            }
++            if (gpu_fallback_ != nullptr &&
++                std::find(backends.begin(), backends.end(), gpu_fallback_) == backends.end()) {
++                backends.push_back(gpu_fallback_);
++            }
++        }
++#endif
+         if (!sd_backend_is_cpu(backend_)) {
+             if (cpu_backend_ == nullptr) {
+                 cpu_backend_ = sd_backend_cpu_init();
+diff --git a/src/core/compute_workspace.h b/src/core/compute_workspace.h
+index fcf14b8..203d62c 100644
+--- a/src/core/compute_workspace.h
++++ b/src/core/compute_workspace.h
+@@ -17,6 +17,7 @@ namespace sd {
+         ggml_backend_t backend_;
+         std::vector<ggml_backend_t> extra_backends_;
+         ggml_backend_t cpu_backend_     = nullptr;
++        ggml_backend_t gpu_fallback_    = nullptr;
+         ggml_gallocr_t allocator_       = nullptr;
+         ggml_backend_sched_t scheduler_ = nullptr;
+         size_t scheduler_capacity_      = 0;
diff --git a/scripts/video/android-hexagon.patch b/scripts/video/android-hexagon.patch
new file mode 100644
index 000000000..5c0e8b2b5
--- /dev/null
+++ b/scripts/video/android-hexagon.patch
@@ -0,0 +1,32 @@
+diff --git a/src/ggml-hexagon/CMakeLists.txt b/src/ggml-hexagon/CMakeLists.txt
+index 845b922..0a9f237 100644
+--- a/src/ggml-hexagon/CMakeLists.txt
++++ b/src/ggml-hexagon/CMakeLists.txt
+@@ -1,3 +1,9 @@
++# Off Grid builds DSP libraries separately so Android hosts can use macOS.
++if(OFFGRID_VIDEO_HEXAGON_CMAKE)
++    include("${OFFGRID_VIDEO_HEXAGON_CMAKE}")
++    return()
++endif()
++
+ file(TO_CMAKE_PATH "${HEXAGON_SDK_ROOT}"   HEXAGON_SDK_ROOT)
+ file(TO_CMAKE_PATH "${HEXAGON_TOOLS_ROOT}" HEXAGON_TOOLS_ROOT)
+ 
+diff --git a/src/ggml-hexagon/ggml-hexagon.cpp b/src/ggml-hexagon/ggml-hexagon.cpp
+index 9a35002..0ca4222 100644
+--- a/src/ggml-hexagon/ggml-hexagon.cpp
++++ b/src/ggml-hexagon/ggml-hexagon.cpp
+@@ -3887,7 +3887,12 @@ void ggml_hexagon_session::allocate(const ggml_hexagon_device_config & config) n
+     char session_uri[256];
+     {
+         char htp_uri[256];
+-        snprintf(htp_uri, sizeof(htp_uri), "file:///libggml-htp-v%u.so?htp_iface_skel_handle_invoke&_modver=1.0", opt_arch);
++        const char * video_htp_dir = getenv("OFFGRID_VIDEO_HTP_DIR");
++        if (video_htp_dir && *video_htp_dir) {
++            snprintf(htp_uri, sizeof(htp_uri), "file:///liboffgrid-video-htp-v%u.so?htp_iface_skel_handle_invoke&_modver=1.0", opt_arch);
++        } else {
++            throw std::runtime_error("Video Hexagon runtime directory is not configured");
++        }
+ 
+         struct remote_rpc_get_uri u = {};
+         u.session_id      = this->session_id;
diff --git a/scripts/video/build-hexagon.sh b/scripts/video/build-hexagon.sh
new file mode 100755
index 000000000..438ee5b49
--- /dev/null
+++ b/scripts/video/build-hexagon.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+set -euo pipefail
+ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
+BUILD="$ROOT/.video-build"
+SDK_VERSION=6.4.0.2
+SDK_SHA256=b4a57a774795cf12da19a777a5d306e970905bf9758a4c4765e5e4593428ae0b
+SDK="$BUILD/hexagon-sdk/$SDK_VERSION"
+# Reuse the DSP artifacts when their source revision and SDK match.
+REVISION="$(cat "$ROOT/scripts/video/revision")"
+READY="$BUILD/hexagon-runtime/ready"
+COMPLETE=true
+for file in htp_iface_stub.c htp_iface.h; do
+  [ -s "$BUILD/hexagon-runtime/$file" ] || COMPLETE=false
+done
+for arch in v73 v75 v79 v81; do
+  [ -s "$BUILD/hexagon-assets/video-hexagon/liboffgrid-video-htp-$arch.so" ] || COMPLETE=false
+done
+if $COMPLETE && [ "$(cat "$READY" 2>/dev/null || true)" = "$REVISION:$SDK_VERSION" ]; then exit 0; fi
+mkdir -p "$BUILD/hexagon-sdk" "$BUILD/hexagon-runtime" "$BUILD/hexagon-assets/video-hexagon"
+if [ ! -f "$SDK/hexagon_sdk.json" ]; then
+  curl -fL --retry 3 -C - "https://github.com/snapdragon-toolchain/hexagon-sdk/releases/download/v$SDK_VERSION/hexagon-sdk-v$SDK_VERSION-amd64-lnx.tar.xz" -o "$BUILD/hexagon-sdk.tar.xz"
+  printf '%s  %s\n' "$SDK_SHA256" "$BUILD/hexagon-sdk.tar.xz" | shasum -a 256 -c -
+  tar -xJf "$BUILD/hexagon-sdk.tar.xz" -C "$BUILD/hexagon-sdk"
+fi
+# The official Hexagon tools run on Linux. Only this build directory is mounted.
+docker run --rm --platform linux/amd64 -v "$BUILD:/work" -w /work ubuntu:22.04 bash -euc '
+  apt-get update -qq
+  DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ninja-build python3 python3-pip build-essential libncurses5 libtinfo5
+  python3 -m pip install --no-cache-dir cmake==3.31.6
+  export HEXAGON_SDK_ROOT=/work/hexagon-sdk/6.4.0.2
+  export HEXAGON_TOOLS_ROOT=$HEXAGON_SDK_ROOT/tools/HEXAGON_Tools/19.0.04
+  export DEFAULT_HLOS_ARCH=64 DEFAULT_TOOLS_VARIANT=toolv19 DEFAULT_NO_QURT_INC=0
+  for arch in v73 v75 v79 v81; do
+    cmake -S source/ggml/src/ggml-hexagon/htp -B hexagon-build/$arch -G Ninja \
+      -DCMAKE_TOOLCHAIN_FILE=/work/source/ggml/src/ggml-hexagon/htp/cmake-toolchain.cmake \
+      -DCMAKE_BUILD_TYPE=Release -DHEXAGON_SDK_ROOT=$HEXAGON_SDK_ROOT \
+      -DHEXAGON_TOOLS_ROOT=$HEXAGON_TOOLS_ROOT -DDSP_VERSION=$arch \
+      -DPREBUILT_LIB_DIR=toolv19_$arch -DHEXAGON_HTP_DEBUG=OFF
+    cmake --build hexagon-build/$arch --parallel 2
+    cp hexagon-build/$arch/libggml-htp-$arch.so hexagon-assets/video-hexagon/liboffgrid-video-htp-$arch.so
+  done
+  cp hexagon-build/v73/htp_iface_stub.c hexagon-build/v73/htp_iface.h hexagon-runtime/
+'
+cp "$ROOT/scripts/video/revision" "$BUILD/hexagon-runtime/revision"
+printf '%s:%s\n' "$REVISION" "$SDK_VERSION" > "$READY"
diff --git a/scripts/video/conditioning-errors.patch b/scripts/video/conditioning-errors.patch
new file mode 100644
index 000000000..15b07dea3
--- /dev/null
+++ b/scripts/video/conditioning-errors.patch
@@ -0,0 +1,16 @@
+diff --git a/src/conditioning/conditioner.hpp b/src/conditioning/conditioner.hpp
+index 7796a40..33ec41e 100644
+--- a/src/conditioning/conditioner.hpp
++++ b/src/conditioning/conditioner.hpp
+@@ -1570,7 +1570,10 @@ struct T5CLIPEmbedder : public Conditioner {
+                                                    input_ids,
+                                                    t5_attn_mask_chunk,
+                                                    false);
+-            GGML_ASSERT(!chunk_hidden_states.empty());
++            if (chunk_hidden_states.empty()) {
++                LOG_ERROR("T5 encoder returned no output; the backend failed or generation was cancelled");
++                return {};
++            }
+             chunk_hidden_states = apply_token_weights(std::move(chunk_hidden_states), chunk_weights);
+ 
+             if (zero_out_masked) {
diff --git a/scripts/video/hexagon-prebuilt.cmake b/scripts/video/hexagon-prebuilt.cmake
new file mode 100644
index 000000000..ebb950c18
--- /dev/null
+++ b/scripts/video/hexagon-prebuilt.cmake
@@ -0,0 +1,18 @@
+# Host-side Hexagon backend. DSP code is built by build-hexagon.sh from the
+# same pinned GGML source; do not reuse llama.rn's different DSP ABI.
+set(VIDEO_HEXAGON_ROOT "${SD_SOURCE}/../hexagon-runtime")
+set(VIDEO_HEXAGON_SDK "${SD_SOURCE}/../hexagon-sdk/6.4.0.2")
+if(NOT EXISTS "${VIDEO_HEXAGON_ROOT}/htp_iface_stub.c")
+  message(FATAL_ERROR "Run scripts/video/build-hexagon.sh before building Android video.")
+endif()
+add_library(htp_iface OBJECT "${VIDEO_HEXAGON_ROOT}/htp_iface_stub.c")
+set_target_properties(htp_iface PROPERTIES POSITION_INDEPENDENT_CODE ON)
+target_include_directories(htp_iface PUBLIC
+  "${VIDEO_HEXAGON_SDK}/incs" "${VIDEO_HEXAGON_SDK}/incs/stddef"
+  "${VIDEO_HEXAGON_SDK}/ipc/fastrpc/rpcmem/inc"
+  "${VIDEO_HEXAGON_SDK}/utils/examples" "${CMAKE_CURRENT_SOURCE_DIR}/htp"
+  "${VIDEO_HEXAGON_ROOT}")
+target_link_options(htp_iface PUBLIC -llog -ldl)
+ggml_add_backend_library(ggml-hexagon ggml-hexagon.cpp htp-drv.cpp htp-drv.h libdl.h ../../include/ggml-hexagon.h)
+target_link_libraries(ggml-hexagon PRIVATE htp_iface)
+target_include_directories(ggml-hexagon PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/htp" "${VIDEO_HEXAGON_ROOT}")

From 9e65d0906d73d4f439bc43a8cc17d5a388a0e1cb Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 14:16:09 +0530
Subject: [PATCH 029/129] fix(android): prepare DSP assets before packaging
 [skip ci]

---
 android/app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 44e9a5b4c..acfa0e975 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -210,5 +210,5 @@ def prepareVideoRuntime = tasks.register("prepareVideoRuntime", Exec) {
     outputs.dir(new File(videoRoot, ".video-build/hexagon-assets/video-hexagon"))
 }
 tasks.configureEach { task ->
-    if (task.name.startsWith("configureCMake")) task.dependsOn(prepareVideoRuntime)
+    if (task.name.startsWith("configureCMake") || (task.name.startsWith("merge") && task.name.endsWith("Assets"))) task.dependsOn(prepareVideoRuntime)
 }

From b26d6cc5053b7ae4c64e01eb1174ab68b8a31d38 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 14:16:53 +0530
Subject: [PATCH 030/129] feat(video): select and report Android NPU execution
 [skip ci]

---
 android/app/src/main/cpp/video/video-jni.cpp  | 23 +++++++-
 .../video/VideoGenerationModule.kt            | 22 ++++++-
 native/video/VideoGenerationModule.mm         |  2 +-
 native/video/common/VideoRuntime.hpp          | 59 ++++++++++++++++---
 src/components/VideoGenerationStatus.tsx      |  6 +-
 src/services/videoGenerator.ts                |  1 +
 6 files changed, 97 insertions(+), 16 deletions(-)

diff --git a/android/app/src/main/cpp/video/video-jni.cpp b/android/app/src/main/cpp/video/video-jni.cpp
index c74ba71bc..9ccfdcebf 100644
--- a/android/app/src/main/cpp/video/video-jni.cpp
+++ b/android/app/src/main/cpp/video/video-jni.cpp
@@ -39,6 +39,21 @@ extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationMod
   runtime.cancelled.store(false);
 }
 extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationModule_nativeCancel(JNIEnv *, jobject) { runtime.cancel(); }
+extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationModule_nativeSetRuntimeDirectory(JNIEnv *env, jobject, jstring path) {
+  try {
+    auto directory = string(env, path);
+    const char *existing = getenv("ADSP_LIBRARY_PATH");
+    std::string search = directory + ";" + (existing ? existing : "/vendor/lib/rfsa/adsp;/vendor/dsp;/system/lib/rfsa/adsp;/dsp");
+    if (setenv("ADSP_LIBRARY_PATH", search.c_str(), 1) != 0 ||
+        setenv("OFFGRID_VIDEO_HTP_DIR", directory.c_str(), 1) != 0)
+      throw std::runtime_error("Could not configure the NPU runtime.");
+  } catch (const std::exception &error) {
+    if (!env->ExceptionCheck()) {
+      auto klass = env->FindClass("java/lang/IllegalStateException");
+      if (klass) { env->ThrowNew(klass, error.what()); env->DeleteLocalRef(klass); }
+    }
+  }
+}
 extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationModule_nativeGenerate(
   JNIEnv *env, jobject self, jstring weight, jstring vae, jstring encoder, jstring prompt, jstring negative,
   jint width, jint height, jint frames, jint fps, jint steps, jdouble guidance, jdouble seed, jstring llm, jstring embeddings, jstring audioVae, jdouble flowShift) {
@@ -55,7 +70,7 @@ extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationMod
     if (!owner) throw std::runtime_error("Not enough memory to start video generation.");
     auto klass = env->GetObjectClass(self);
     auto progress = env->GetMethodID(klass, "progress", "(II)V");
-    auto conditioning = env->GetMethodID(klass, "conditioning", "()V");
+    auto conditioning = env->GetMethodID(klass, "conditioning", "(Ljava/lang/String;)V");
     auto frame = env->GetMethodID(klass, "frame", "([BIII)V");
     env->DeleteLocalRef(klass);
     if (!progress || !frame || !conditioning) throw std::runtime_error("Missing video host callbacks.");
@@ -87,8 +102,10 @@ extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationMod
         env->DeleteLocalRef(bytes);
         if (env->ExceptionCheck()) throw std::runtime_error("Video encoder failed.");
       }
-    }, [&] {
-      env->CallVoidMethod(owner, conditioning);
+    }, [&](const char *backend) {
+      auto hardware = env->NewStringUTF(backend);
+      env->CallVoidMethod(owner, conditioning, hardware);
+      env->DeleteLocalRef(hardware);
       if (env->ExceptionCheck()) throw std::runtime_error("Could not report prompt processing.");
     });
   } catch (const std::exception &error) {
diff --git a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
index aeab3291c..23ed360c9 100644
--- a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
+++ b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
@@ -20,12 +20,27 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
     private external fun nativeGenerate(weight: String, vae: String, encoder: String, prompt: String, negative: String, width: Int, height: Int, frames: Int, fps: Int, steps: Int, guidance: Double, seed: Double, llm: String, embeddings: String, audioVae: String, flowShift: Double)
     private external fun nativeCancel()
     private external fun nativePrepare()
+    private external fun nativeSetRuntimeDirectory(path: String)
+    private fun prepareHexagonRuntime() {
+        val directory = File(context.filesDir, "video-hexagon").apply { mkdirs() }
+        val names = context.assets.list("video-hexagon") ?: emptyArray()
+        check(names.isNotEmpty()) { "The video NPU runtime is missing from this build." }
+        for (name in names) {
+            check(name.matches(Regex("liboffgrid-video-htp-v[0-9]+\\.so")))
+            val temporary = File(directory, "$name.tmp")
+            context.assets.open("video-hexagon/$name").use { input ->
+                temporary.outputStream().use { output -> input.copyTo(output) }
+            }
+            check(temporary.renameTo(File(directory, name))) { "Could not install the video NPU runtime." }
+        }
+        nativeSetRuntimeDirectory(directory.absolutePath)
+    }
     @ReactMethod fun addListener(name: String) {}
     @ReactMethod fun removeListeners(count: Int) {}
     private fun stop() { cancelled.set(true); nativeCancel() }
     @ReactMethod fun cancel(promise: Promise) { stop(); promise.resolve(null) }
     // Called synchronously by JNI while its worker owns the runtime.
-    fun conditioning() { emit("conditioning", 0, 0) }
+    fun conditioning(backend: String) { emit("conditioning", 0, 0, backend) }
     fun progress(step: Int, total: Int) {
         emit("generating", step, total)
     }
@@ -34,10 +49,10 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
         emit("encoding", 0, 0)
         checkNotNull(encoder).append(rgb, channels) { cancelled.get() }
     }
-    private fun emit(stage: String, step: Int, total: Int) {
+    private fun emit(stage: String, step: Int, total: Int, backend: String? = null) {
         if (!context.hasActiveReactInstance()) return
         context.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-            .emit("VideoGenerationProgress", Arguments.createMap().apply { putString("stage", stage); putInt("step", step); putInt("total", total) })
+            .emit("VideoGenerationProgress", Arguments.createMap().apply { putString("stage", stage); putInt("step", step); putInt("total", total); if (backend != null) putString("backend", backend) })
     }
     @ReactMethod fun generate(input: ReadableMap, promise: Promise) {
         if (!busy.compareAndSet(false, true)) { promise.reject("VIDEO_BUSY", "Video generation is already running."); return }
@@ -45,6 +60,7 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
         executor.execute {
             var output: File? = null
             try {
+                prepareHexagonRuntime()
                 val destination = File(checkNotNull(input.getString("outputPath")))
                 output = destination
                 VideoGenerationService.admission = CompletableFuture()
diff --git a/native/video/VideoGenerationModule.mm b/native/video/VideoGenerationModule.mm
index bca1ad821..638ed3765 100644
--- a/native/video/VideoGenerationModule.mm
+++ b/native/video/VideoGenerationModule.mm
@@ -89,7 +89,7 @@ - (void)emitStage:(NSString *)stage step:(int)step total:(int)total {
             NSError *encodingError = nil;
             if (!OGEncodeVideo(frames, count, fps, output, self->_runtime.cancelled, &encodingError))
               throw std::runtime_error(encodingError ? encodingError.localizedDescription.UTF8String : "Video encoding stopped.");
-          }, [&] { [self emitStage:@"conditioning" step:0 total:0]; });
+          }, [&](const char *) { [self emitStage:@"conditioning" step:0 total:0]; });
         } catch (const std::exception &error) {
           failure = [NSError errorWithDomain:@"OffgridVideo" code:1 userInfo:@{NSLocalizedDescriptionKey:@(error.what())}];
           [[NSFileManager defaultManager] removeItemAtPath:output error:nil];
diff --git a/native/video/common/VideoRuntime.hpp b/native/video/common/VideoRuntime.hpp
index 2372c3c0e..0c401fd16 100644
--- a/native/video/common/VideoRuntime.hpp
+++ b/native/video/common/VideoRuntime.hpp
@@ -3,6 +3,7 @@
 #include <OffgridVideoRuntime/stable-diffusion.h>
 #else
 #include "stable-diffusion.h"
+#include "ggml-backend.h"
 #endif
 #include <atomic>
 #include <limits>
@@ -35,7 +36,7 @@ class VideoRuntime {
   void run(const VideoRequest &request,
            const std::function<void(int, int)> &progress,
            const std::function<void(sd_image_t *, int, int)> &encode,
-           const std::function<void()> &conditioning) {
+           const std::function<void(const char *)> &conditioning) {
     std::unique_lock<std::mutex> execution(executionMutex, std::try_to_lock);
     if (!execution.owns_lock()) throw std::runtime_error("Video generation is already running.");
     sd_image_t *frames = nullptr;
@@ -62,13 +63,53 @@ class VideoRuntime {
       config.auto_fit = true;
       config.eager_load = false;
 #ifdef __ANDROID__
-      // Vulkan cannot execute every T5 operation on preallocated encoder
-      // tensors. Keep conditioning on CPU; diffusion still selects the GPU.
-      config.backend = "te=cpu";
-      config.params_backend = "te=cpu";
+      // Probe the NPU before choosing it. Devices without a usable Hexagon
+      // runtime retain Vulkan diffusion and the CPU conditioning fallback.
+      sd_list_devices(nullptr, 0);
+      std::string preferred;
+      for (size_t i = 0; i < ggml_backend_dev_count(); ++i) {
+        auto device = ggml_backend_dev_get(i);
+        const char *name = ggml_backend_dev_name(device);
+        if (std::string(name).rfind("HTP", 0) != 0) continue;
+        try {
+          auto probe = ggml_backend_dev_init(device, nullptr);
+          if (!probe) continue;
+          preferred = name;
+          ggml_backend_free(probe);
+          break;
+        } catch (const std::exception &) {
+          // An installed driver can still reject the DSP session.
+        }
+      }
+      config.backend = preferred.empty() ? "Vulkan0,te=cpu" : preferred.c_str();
+      // Let auto-fit stage weights between CPU and the accelerator. A fixed
+      // params backend disables auto-fit in sd.cpp. Keep DSP mappings below the
+      // v73 address-space limit and leave room for graph buffers.
+      config.max_vram = "HTP0=1.5";
+      config.disable_prefetch = true;
 #endif
       config.n_threads = 4;
-      auto loaded = new_sd_ctx(&config);
+      sd_ctx_t *loaded = nullptr;
+#ifdef __ANDROID__
+      try { loaded = new_sd_ctx(&config); }
+      catch (const std::exception &) {
+        if (preferred.empty() || cancelled.load()) throw;
+      }
+      if (!loaded && !preferred.empty() && !cancelled.load()) {
+        preferred.clear();
+        config.backend = "Vulkan0,te=cpu";
+        try { loaded = new_sd_ctx(&config); }
+        catch (const std::exception &) {
+          if (cancelled.load()) throw;
+        }
+      }
+      if (!loaded && !cancelled.load()) {
+        config.backend = "cpu";
+        loaded = new_sd_ctx(&config);
+      }
+#else
+      loaded = new_sd_ctx(&config);
+#endif
       {
         std::lock_guard<std::mutex> guard(contextMutex);
         context = loaded;
@@ -89,7 +130,11 @@ class VideoRuntime {
       params.sample_params.sample_method = EULER_SAMPLE_METHOD;
       params.sample_params.scheduler = sd_get_default_scheduler(loaded, EULER_SAMPLE_METHOD);
       params.vae_tiling_params.enabled = true;
-      conditioning();
+#ifdef __ANDROID__
+      conditioning(preferred.empty() ? "cpu" : "npu");
+#else
+      conditioning("");
+#endif
       if (!generate_video(loaded, &params, &frames, &count, nullptr, &fps) || !frames || count == 0)
         throw std::runtime_error(cancelled.load() ? "Video generation stopped." : "The video engine produced no frames.");
       if (cancelled.load()) throw std::runtime_error("Video generation stopped.");
diff --git a/src/components/VideoGenerationStatus.tsx b/src/components/VideoGenerationStatus.tsx
index 630f84a8d..0fae05e8a 100644
--- a/src/components/VideoGenerationStatus.tsx
+++ b/src/components/VideoGenerationStatus.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState, useSyncExternalStore } from 'react';
-import { Platform, Text } from 'react-native';
+import { Text } from 'react-native';
 import { videoGenerationService } from '../services/videoGenerationService';
 import { useTheme } from '../theme';
 import { SPACING, TYPOGRAPHY } from '../constants';
@@ -34,7 +34,9 @@ export function VideoGenerationStatus({
       : state.stage === 'preparing'
       ? 'Loading video model'
       : state.stage === 'conditioning'
-      ? Platform.OS === 'android'
+      ? state.backend === 'npu'
+        ? 'Processing prompt (NPU preferred)'
+        : state.backend === 'cpu'
         ? 'Processing prompt on CPU'
         : 'Processing prompt'
       : state.stage === 'encoding'
diff --git a/src/services/videoGenerator.ts b/src/services/videoGenerator.ts
index 2814c7237..491c7a4db 100644
--- a/src/services/videoGenerator.ts
+++ b/src/services/videoGenerator.ts
@@ -36,6 +36,7 @@ export const videoGenerator = {
         }
         onUpdate({
           stage: event.stage,
+          backend: event.backend ?? null,
           progress:
             event.total > 0 ? { step: event.step, total: event.total } : null,
         });

From d22d20e1db0237efaa9c02029b95b975c0cb4522 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 14:19:09 +0530
Subject: [PATCH 031/129] fix(video): respect buffer ownership across NPU
 fallback [skip ci]

---
 scripts/prepare-video-runtime.sh              |  2 +-
 scripts/video/android-hardware-fallback.patch | 36 ++++++++++++++++++-
 .../android-hexagon-buffer-validation.patch   | 29 +++++++++++++++
 3 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 scripts/video/android-hexagon-buffer-validation.patch

diff --git a/scripts/prepare-video-runtime.sh b/scripts/prepare-video-runtime.sh
index 3091835cc..f46fa43fa 100644
--- a/scripts/prepare-video-runtime.sh
+++ b/scripts/prepare-video-runtime.sh
@@ -16,7 +16,7 @@ PATCH="$ROOT/scripts/video/android-vulkan-dispatch.patch"
 if ! git -C "$SOURCE/ggml" apply --reverse --check "$PATCH" 2>/dev/null; then
   git -C "$SOURCE/ggml" apply "$PATCH"
 fi
-for entry in "ggml:android-hexagon.patch" ".:android-hardware-fallback.patch" ".:conditioning-errors.patch"; do
+for entry in "ggml:android-hexagon.patch" "ggml:android-hexagon-buffer-validation.patch" ".:android-hardware-fallback.patch" ".:conditioning-errors.patch"; do
   target="${entry%%:*}"
   patch="$ROOT/scripts/video/${entry#*:}"
   if ! git -C "$SOURCE/$target" apply --reverse --check "$patch" 2>/dev/null; then
diff --git a/scripts/video/android-hardware-fallback.patch b/scripts/video/android-hardware-fallback.patch
index d0efb3761..5aebd296a 100644
--- a/scripts/video/android-hardware-fallback.patch
+++ b/scripts/video/android-hardware-fallback.patch
@@ -1,5 +1,5 @@
 diff --git a/src/core/compute_workspace.cpp b/src/core/compute_workspace.cpp
-index 54f0538..ae344c9 100644
+index 54f0538..9f20b7e 100644
 --- a/src/core/compute_workspace.cpp
 +++ b/src/core/compute_workspace.cpp
 @@ -18,6 +18,7 @@ namespace sd {
@@ -30,6 +30,23 @@ index 54f0538..ae344c9 100644
          if (!sd_backend_is_cpu(backend_)) {
              if (cpu_backend_ == nullptr) {
                  cpu_backend_ = sd_backend_cpu_init();
+@@ -207,11 +221,12 @@ namespace sd {
+         auto scheduler   = make_scheduler(graph_size);
+         if (scheduler != nullptr) {
+             assign_nodes(scheduler, copy_graph);
+-            std::vector<size_t> sizes(extra_backends_.size() + 2);
++            const int count = ggml_backend_sched_get_n_backends(scheduler);
++            std::vector<size_t> sizes(count);
+             ggml_backend_sched_reserve_size(scheduler, copy_graph, sizes.data());
+-            result.buffers.push_back({backend_, sizes[0]});
+-            for (size_t i = 0; i < extra_backends_.size(); ++i) {
+-                result.buffers.push_back({extra_backends_[i], sizes[i + 1]});
++            for (int i = 0; i < count; ++i) {
++                auto backend = ggml_backend_sched_get_backend(scheduler, i);
++                if (backend != cpu_backend_) result.buffers.push_back({backend, sizes[i]});
+             }
+             ggml_backend_sched_free(scheduler);
+         }
 diff --git a/src/core/compute_workspace.h b/src/core/compute_workspace.h
 index fcf14b8..203d62c 100644
 --- a/src/core/compute_workspace.h
@@ -42,3 +59,20 @@ index fcf14b8..203d62c 100644
          ggml_gallocr_t allocator_       = nullptr;
          ggml_backend_sched_t scheduler_ = nullptr;
          size_t scheduler_capacity_      = 0;
+diff --git a/src/core/ggml_runner.cpp b/src/core/ggml_runner.cpp
+index 4c156ed..2165428 100644
+--- a/src/core/ggml_runner.cpp
++++ b/src/core/ggml_runner.cpp
+@@ -230,7 +230,11 @@ void GGMLRunner::pin_multi_device_nodes(ggml_backend_sched_t sched, ggml_cgraph*
+             node->op == GGML_OP_PERMUTE || node->op == GGML_OP_TRANSPOSE) {
+             continue;
+         }
+-        if (ggml_backend_supports_op(current, node)) {
++        // A view can write into an existing CPU/cache allocation. The
++        // scheduler must keep that operation on a backend that owns its buffer.
++        auto buffer = node->view_src ? node->view_src->buffer : node->buffer;
++        if (ggml_backend_supports_op(current, node) &&
++            (buffer == nullptr || ggml_backend_supports_buft(current, ggml_backend_buffer_get_type(buffer)))) {
+             ggml_backend_sched_set_tensor_backend(sched, node, current);
+         }
+     }
diff --git a/scripts/video/android-hexagon-buffer-validation.patch b/scripts/video/android-hexagon-buffer-validation.patch
new file mode 100644
index 000000000..d2f7a4024
--- /dev/null
+++ b/scripts/video/android-hexagon-buffer-validation.patch
@@ -0,0 +1,29 @@
+--- a/src/ggml-hexagon/ggml-hexagon.cpp
++++ b/src/ggml-hexagon/ggml-hexagon.cpp
+@@ -6474,6 +6474,26 @@
+         }
+     }
+ 
++    // Mixed-backend graphs can retain tensors backed by another device.
++    // Validate the full split before queuing any DSP work: buffer contexts
++    // from CPU/Vulkan are not ggml_hexagon_shared_buffer objects.
++    for (const auto & node : *nodes_ptr) {
++        auto valid_buffer = [&](const ggml_tensor * tensor) {
++            if (!tensor) return true;
++            if (tensor->buffer && ggml_backend_buffer_is_hexagon(tensor->buffer)) return true;
++            GGML_LOG_ERROR("ggml-hex: %s cannot execute %s: tensor %s uses %s buffer\n",
++                           sess->c_name(), node.op_name().c_str(), tensor->name,
++                           tensor->buffer ? ggml_backend_buffer_name(tensor->buffer) : "missing");
++            return false;
++        };
++        for (const auto * tensor : node.get_inputs()) {
++            if (!valid_buffer(tensor)) return GGML_STATUS_FAILED;
++        }
++        for (const auto * tensor : node.get_outputs()) {
++            if (!valid_buffer(tensor)) return GGML_STATUS_FAILED;
++        }
++    }
++
+     // Queue and execute
+     for (const auto & node : *nodes_ptr) {
+         sess->enqueue_op(node);

From 995d324c420f94ccfaf6175ea3d814e3e66a2524 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 14:24:29 +0530
Subject: [PATCH 032/129] fix(video): separate outputs across convolution
 fallback [skip ci]

---
 scripts/video/android-hardware-fallback.patch | 28 +++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/scripts/video/android-hardware-fallback.patch b/scripts/video/android-hardware-fallback.patch
index 5aebd296a..d1cb3050c 100644
--- a/scripts/video/android-hardware-fallback.patch
+++ b/scripts/video/android-hardware-fallback.patch
@@ -59,18 +59,36 @@ index fcf14b8..203d62c 100644
          ggml_gallocr_t allocator_       = nullptr;
          ggml_backend_sched_t scheduler_ = nullptr;
          size_t scheduler_capacity_      = 0;
+diff --git a/src/core/ggml_extend.cpp b/src/core/ggml_extend.cpp
+index d87353d..e491eff 100644
+--- a/src/core/ggml_extend.cpp
++++ b/src/core/ggml_extend.cpp
+@@ -517,7 +517,11 @@ ggml_tensor* ggml_ext_conv_3d(ggml_context* ctx,
+     }
+     if (b != nullptr) {
+         b = ggml_reshape_4d(ctx, b, 1, 1, 1, b->ne[0]);  // [OC, 1, 1, 1]
+-        x = ggml_add_inplace(ctx, x, b);
++        // The convolution may fall back to CPU while ADD runs on an accelerator.
++        // Give ADD its own output so the scheduler can transfer the input.
++        x = backend != nullptr && !ggml_backend_supports_op(backend, x)
++                ? ggml_add(ctx, x, b)
++                : ggml_add_inplace(ctx, x, b);
+     }
+     return x;
+ }
 diff --git a/src/core/ggml_runner.cpp b/src/core/ggml_runner.cpp
-index 4c156ed..2165428 100644
+index 4c156ed..b786dd7 100644
 --- a/src/core/ggml_runner.cpp
 +++ b/src/core/ggml_runner.cpp
-@@ -230,7 +230,11 @@ void GGMLRunner::pin_multi_device_nodes(ggml_backend_sched_t sched, ggml_cgraph*
+@@ -230,7 +230,12 @@ void GGMLRunner::pin_multi_device_nodes(ggml_backend_sched_t sched, ggml_cgraph*
              node->op == GGML_OP_PERMUTE || node->op == GGML_OP_TRANSPOSE) {
              continue;
          }
 -        if (ggml_backend_supports_op(current, node)) {
-+        // A view can write into an existing CPU/cache allocation. The
-+        // scheduler must keep that operation on a backend that owns its buffer.
-+        auto buffer = node->view_src ? node->view_src->buffer : node->buffer;
++        // In-place operations must follow the device chosen for their source.
++        // Its buffer may not exist yet when this graph is assigned.
++        if (node->view_src != nullptr) continue;
++        auto buffer = node->buffer;
 +        if (ggml_backend_supports_op(current, node) &&
 +            (buffer == nullptr || ggml_backend_supports_buft(current, ggml_backend_buffer_get_type(buffer)))) {
              ggml_backend_sched_set_tensor_backend(sched, node, current);

From cb7e96a2dbf4cd629547db2779ca8ecd6f63ede3 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 14:30:03 +0530
Subject: [PATCH 033/129] fix(video): keep NPU memory cap off GPU fallback
 [skip ci]

---
 scripts/video/android-hardware-fallback.patch | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/scripts/video/android-hardware-fallback.patch b/scripts/video/android-hardware-fallback.patch
index d1cb3050c..5e2411a4d 100644
--- a/scripts/video/android-hardware-fallback.patch
+++ b/scripts/video/android-hardware-fallback.patch
@@ -77,7 +77,7 @@ index d87353d..e491eff 100644
      return x;
  }
 diff --git a/src/core/ggml_runner.cpp b/src/core/ggml_runner.cpp
-index 4c156ed..b786dd7 100644
+index 4c156ed..c01c8d0 100644
 --- a/src/core/ggml_runner.cpp
 +++ b/src/core/ggml_runner.cpp
 @@ -230,7 +230,12 @@ void GGMLRunner::pin_multi_device_nodes(ggml_backend_sched_t sched, ggml_cgraph*
@@ -94,3 +94,18 @@ index 4c156ed..b786dd7 100644
              ggml_backend_sched_set_tensor_backend(sched, node, current);
          }
      }
+@@ -728,8 +733,12 @@ std::vector<DeviceMemoryRequest> GGMLRunner::memory_requests(
+         const size_t reusable    = workspace_.bytes(size.backend);
+         const size_t cache_bytes = size.backend == runtime_backend ? pending_cache_bytes : 0;
+         const size_t pending     = add_bytes(size.bytes > reusable ? size.bytes - reusable : 0, cache_bytes);
+-        size_t limit             = max_graph_vram_bytes;
+-        if (is_multi_device()) {
++        // A fallback device has its own physical memory checks. Do not apply
++        // the primary device's address-space cap (for example Hexagon's) to it.
++        const bool configured_backend = size.backend == runtime_backend ||
++            std::find(extra_runtime_backends.begin(), extra_runtime_backends.end(), size.backend) != extra_runtime_backends.end();
++        size_t limit = configured_backend ? max_graph_vram_bytes : 0;
++        if (configured_backend && is_multi_device()) {
+             size_t index = 0;
+             if (size.backend != runtime_backend) {
+                 auto position = std::find(extra_runtime_backends.begin(), extra_runtime_backends.end(), size.backend);

From a4847ed650628f64d0be43df6d006530fad00ddd Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 14:35:30 +0530
Subject: [PATCH 034/129] fix(video): show sampling when step zero starts [skip
 ci]

---
 src/services/videoGenerator.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/services/videoGenerator.ts b/src/services/videoGenerator.ts
index 491c7a4db..bf7131943 100644
--- a/src/services/videoGenerator.ts
+++ b/src/services/videoGenerator.ts
@@ -19,7 +19,8 @@ export const videoGenerator = {
   ): Promise<string> {
     if (!native)
       throw new Error('This build does not include the video engine.');
-    let lastStep = 0;
+    // Step zero marks the start of sampling, before the first step completes.
+    let lastStep = -1;
     const listener = new NativeEventEmitter(native).addListener(
       'VideoGenerationProgress',
       event => {

From 9a2576debda24a00b6ca71dff9a678cd4e858826 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 14:36:26 +0530
Subject: [PATCH 035/129] fix(video): stream NPU weights to reduce Android
 memory [skip ci]

---
 native/video/common/VideoRuntime.hpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/native/video/common/VideoRuntime.hpp b/native/video/common/VideoRuntime.hpp
index 0c401fd16..39fdc5c8c 100644
--- a/native/video/common/VideoRuntime.hpp
+++ b/native/video/common/VideoRuntime.hpp
@@ -82,9 +82,14 @@ class VideoRuntime {
         }
       }
       config.backend = preferred.empty() ? "Vulkan0,te=cpu" : preferred.c_str();
-      // Let auto-fit stage weights between CPU and the accelerator. A fixed
-      // params backend disables auto-fit in sd.cpp. Keep DSP mappings below the
-      // v73 address-space limit and leave room for graph buffers.
+      // Stream NPU weights from disk per graph segment. Keeping a second
+      // complete copy on Vulkan retains the text encoder during diffusion and
+      // can trigger Android's low-memory killer. The graph cap still controls
+      // staging even though explicit disk placement disables auto-fit.
+      if (!preferred.empty()) {
+        config.params_backend = "disk";
+        config.auto_fit = false;
+      }
       config.max_vram = "HTP0=1.5";
       config.disable_prefetch = true;
 #endif
@@ -97,6 +102,8 @@ class VideoRuntime {
       }
       if (!loaded && !preferred.empty() && !cancelled.load()) {
         preferred.clear();
+        config.params_backend = nullptr;
+        config.auto_fit = true;
         config.backend = "Vulkan0,te=cpu";
         try { loaded = new_sd_ctx(&config); }
         catch (const std::exception &) {

From 30d79463b1986603d1920b6446dfe64d86bbc6b1 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 14:52:52 +0530
Subject: [PATCH 036/129] fix(image): validate pinned model packs before
 registration [skip ci]

---
 .../ModelsScreen/imageDownloadResume.ts       | 10 ++++++++-
 src/services/imageDownloadActions.ts          | 21 ++++++++++++-------
 src/services/imageModelDownloadTypes.ts       |  2 +-
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/screens/ModelsScreen/imageDownloadResume.ts b/src/screens/ModelsScreen/imageDownloadResume.ts
index 15fbc4faa..5bf4933a9 100644
--- a/src/screens/ModelsScreen/imageDownloadResume.ts
+++ b/src/screens/ModelsScreen/imageDownloadResume.ts
@@ -5,7 +5,8 @@ import { modelManager, backgroundDownloadService } from '../../services';
 import { resolveCoreMLModelDir } from '../../utils/coreMLModelUtils';
 import { ONNXImageModel } from '../../types';
 import { useDownloadStore, DownloadEntry } from '../../stores/downloadStore';
-import { ImageDownloadDeps, registerAndNotify, proceedWithDownload } from '../../services/imageDownloadActions';
+import { ImageDownloadDeps, registerAndNotify, proceedWithDownload, validateMultifileComplete } from '../../services/imageDownloadActions';
+import type { ImageModelDescriptor } from '../../services/imageModelDownloadTypes';
 import { imageDescriptorFromMetadata } from './imageDescriptor';
 import { validateImageModelDir, ensureImageExtractionComplete } from '../../utils/imageModelIntegrity';
 import { makeImageModelKey } from '../../utils/modelKey';
@@ -195,11 +196,18 @@ async function resumeMultifileDownload(ctx: ResumeCtx): Promise<void> {
     useDownloadStore.getState().setStatus(entry.downloadId, 'failed', { message: 'Download files missing. Please retry.' });
     return;
   }
+  const hfFiles = metadata.imageModelHuggingFaceFiles as ImageModelDescriptor['huggingFaceFiles'];
+  const coremlFiles = metadata.imageModelCoremlFiles as ImageModelDescriptor['coremlFiles'];
+  await validateMultifileComplete(modelDir, hfFiles
+    ? hfFiles.map(file => ({ relativePath: file.path, sha256: file.sha256 }))
+    : (coremlFiles ?? []).map(file => ({ relativePath: file.relativePath })));
+  await RNFS.writeFile(`${modelDir}/_ready`, '', 'utf8');
   const imageModel: ONNXImageModel = {
     id: modelId, name: metadata.imageModelName, description: metadata.imageModelDescription,
     modelPath: modelDir, downloadedAt: new Date().toISOString(),
     size: metadata.imageModelSize, style: metadata.imageModelStyle,
     backend: metadata.imageModelBackend,
+    attentionVariant: metadata.imageModelAttentionVariant,
   };
   logger.log(`[ImageDownload] resumeImageDownload multifile - registering ${modelId}`);
   await registerAndNotify(deps, { imageModel, modelName: metadata.imageModelName });
diff --git a/src/services/imageDownloadActions.ts b/src/services/imageDownloadActions.ts
index 0c83ce33a..5bb1295a1 100644
--- a/src/services/imageDownloadActions.ts
+++ b/src/services/imageDownloadActions.ts
@@ -30,7 +30,7 @@ interface ImageMetadata {
   imageModelRepo?: string;
   imageModelAttentionVariant?: string;
   imageModelDownloadUrl?: string;
-  imageModelHuggingFaceFiles?: { path: string; size: number }[];
+  imageModelHuggingFaceFiles?: ImageModelDescriptor['huggingFaceFiles'];
   imageModelCoremlFiles?: { path: string; relativePath: string; size: number; downloadUrl: string }[];
 }
 
@@ -157,6 +157,7 @@ type MultifileDownloadSpec = {
   relativePath: string;
   size: number;
   url: string;
+  sha256?: string;
 };
 
 async function downloadSequentialFiles(opts: {
@@ -198,15 +199,20 @@ async function downloadSequentialFiles(opts: {
   }
 }
 
-/** Verify every part is present and non-empty before registering — a download can
- *  resolve "successfully" yet write a 0-byte file (200 with no body). Existence +
- *  non-empty only (NOT exact size: descriptor sizes drift from real bytes). Throws so
- *  the caller's catch fails it (retry-able) instead of registering garbage. */
-async function validateMultifileComplete(modelDir: string, files: MultifileDownloadSpec[]): Promise<void> {
+/** Check all parts before registration. Pinned packs also supply a content hash;
+ * legacy descriptors retain their non-empty check because their sizes can drift. */
+export async function validateMultifileComplete(
+  modelDir: string,
+  files: { relativePath: string; sha256?: string }[],
+): Promise<void> {
+  if (files.length === 0) throw new Error('Download file list missing. Please retry.');
   for (const file of files) {
     const filePath = `${modelDir}/${file.relativePath}`;
     const size = (await statFile(filePath))?.size ?? -1;
     if (size <= 0) throw new Error(`Downloaded file missing or empty: ${file.relativePath} — tap retry`);
+    if (file.sha256 && (await RNFS.hash(filePath, 'sha256')).toLowerCase() !== file.sha256.toLowerCase()) {
+      throw new Error(`Downloaded file is damaged: ${file.relativePath} — tap retry`);
+    }
   }
 }
 
@@ -333,7 +339,8 @@ export async function downloadHuggingFaceModel(
     const files = modelInfo.huggingFaceFiles.map((file) => ({
       relativePath: file.path,
       size: file.size,
-      url: `https://huggingface.co/${modelInfo.huggingFaceRepo}/resolve/main/${file.path}`,
+      url: file.downloadUrl ?? `https://huggingface.co/${modelInfo.huggingFaceRepo}/resolve/main/${file.path}`,
+      sha256: file.sha256,
     }));
     await downloadSequentialFiles({ modelInfo, runtime, syntheticId, modelDir, files });
     assertNotCancelled(modelInfo.id, runtime);
diff --git a/src/services/imageModelDownloadTypes.ts b/src/services/imageModelDownloadTypes.ts
index f08044ef7..ad4359b3b 100644
--- a/src/services/imageModelDownloadTypes.ts
+++ b/src/services/imageModelDownloadTypes.ts
@@ -19,7 +19,7 @@ export interface ImageModelDescriptor {
   backend: 'mnn' | 'qnn' | 'coreml';
   variant?: string;
   huggingFaceRepo?: string;
-  huggingFaceFiles?: { path: string; size: number }[];
+  huggingFaceFiles?: { path: string; size: number; downloadUrl?: string; sha256?: string }[];
   coremlFiles?: { path: string; relativePath: string; size: number; downloadUrl: string }[];
   repo?: string;
   attentionVariant?: 'split_einsum' | 'original';

From d653f2fbdfa074ae8d6a60ed7cf3904616840108 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 15:20:08 +0530
Subject: [PATCH 037/129] feat(image): expose the mobile SD runtime with
 hardware fallback [skip ci]

---
 android/app/src/main/cpp/video/video-jni.cpp  |  61 ++++++++
 .../video/VideoGenerationModule.kt            |  60 ++++++++
 .../video/VideoGenerationService.kt           |   4 +-
 native/video/VideoGenerationModule.mm         |  82 ++++++++++-
 native/video/common/VideoRuntime.hpp          | 139 ++++++++++++++----
 scripts/build-video-ios.sh                    |   9 +-
 scripts/video/exports.txt                     |   1 +
 7 files changed, 322 insertions(+), 34 deletions(-)

diff --git a/android/app/src/main/cpp/video/video-jni.cpp b/android/app/src/main/cpp/video/video-jni.cpp
index 9ccfdcebf..008594355 100644
--- a/android/app/src/main/cpp/video/video-jni.cpp
+++ b/android/app/src/main/cpp/video/video-jni.cpp
@@ -116,3 +116,64 @@ extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationMod
   }
   if (owner) env->DeleteGlobalRef(owner);
 }
+
+extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationModule_nativeLoadImage(
+  JNIEnv *env, jobject, jstring path, jstring weight, jstring vae, jstring llm, jint threads, jboolean cpuOnly) {
+  try {
+    offgrid::VideoRequest request{};
+    request.weight = string(env, weight); request.vae = string(env, vae); request.llm = string(env, llm);
+    request.threads = threads; request.cpuOnly = cpuOnly;
+    runtime.loadImage(request, string(env, path));
+  } catch (const std::exception &error) {
+    auto klass = env->FindClass("java/lang/IllegalStateException");
+    if (klass) { env->ThrowNew(klass, error.what()); env->DeleteLocalRef(klass); }
+  }
+}
+extern "C" JNIEXPORT jstring JNICALL Java_ai_offgridmobile_video_VideoGenerationModule_nativeImagePath(JNIEnv *env, jobject) {
+  return env->NewStringUTF(runtime.loadedImagePath().c_str());
+}
+extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationModule_nativeUnloadImage(JNIEnv *env, jobject) {
+  try { runtime.unloadImage(); }
+  catch (const std::exception &error) {
+    auto klass = env->FindClass("java/lang/IllegalStateException");
+    if (klass) { env->ThrowNew(klass, error.what()); env->DeleteLocalRef(klass); }
+  }
+}
+extern "C" JNIEXPORT jbyteArray JNICALL Java_ai_offgridmobile_video_VideoGenerationModule_nativeGenerateImage(
+  JNIEnv *env, jobject self, jstring prompt, jstring negative, jint width, jint height, jint steps, jdouble guidance, jdouble seed) {
+  jbyteArray output = nullptr;
+  jobject owner = nullptr;
+  try {
+    offgrid::VideoRequest request{};
+    request.prompt = string(env, prompt); request.negative = string(env, negative);
+    request.width = width; request.height = height; request.steps = steps; request.guidance = guidance; request.seed = seed;
+    JavaVM *vm = nullptr;
+    if (env->GetJavaVM(&vm) != JNI_OK) throw std::runtime_error("Could not access the image host.");
+    owner = env->NewGlobalRef(self);
+    if (!owner) throw std::runtime_error("Could not retain the image host.");
+    auto klass = env->GetObjectClass(self);
+    auto progress = env->GetMethodID(klass, "imageProgress", "(II)V");
+    env->DeleteLocalRef(klass);
+    if (!progress) throw std::runtime_error("Missing image progress callback.");
+    runtime.image(request, [&](int step, int total) {
+      AttachedEnv thread(vm);
+      if (!thread.env) { runtime.cancel(); return; }
+      thread.env->CallVoidMethod(owner, progress, step, total);
+      if (thread.env->ExceptionCheck()) { thread.env->ExceptionClear(); runtime.cancel(); }
+    }, [&](const sd_image_t &image) {
+      const uint64_t size = uint64_t(image.width) * image.height * image.channel;
+      if (!image.data || image.width != uint32_t(width) || image.height != uint32_t(height) || image.channel != 3 || size > INT32_MAX)
+        throw std::runtime_error("The image engine returned invalid pixels.");
+      output = env->NewByteArray(static_cast<jsize>(size));
+      if (!output) throw std::runtime_error("Not enough memory to save the image.");
+      env->SetByteArrayRegion(output, 0, size, reinterpret_cast<jbyte *>(image.data));
+    });
+  } catch (const std::exception &error) {
+    if (!env->ExceptionCheck()) {
+      auto klass = env->FindClass("java/lang/IllegalStateException");
+      if (klass) { env->ThrowNew(klass, error.what()); env->DeleteLocalRef(klass); }
+    }
+  }
+  if (owner) env->DeleteGlobalRef(owner);
+  return output;
+}
diff --git a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
index 23ed360c9..d471942d4 100644
--- a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
+++ b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
@@ -90,5 +90,65 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
             }
         }
     }
+    private external fun nativeLoadImage(path: String, weight: String, vae: String, llm: String, threads: Int, cpuOnly: Boolean)
+    private external fun nativeUnloadImage()
+    private external fun nativeImagePath(): String
+    private external fun nativeGenerateImage(prompt: String, negative: String, width: Int, height: Int, steps: Int, guidance: Double, seed: Double): ByteArray
+    fun imageProgress(step: Int, total: Int) {
+        if (!context.hasActiveReactInstance()) return
+        context.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java).emit("SDImageProgress", Arguments.createMap().apply {
+            putInt("step", step); putInt("totalSteps", total); putDouble("progress", if (total > 0) step.toDouble() / total else 0.0)
+        })
+    }
+    @ReactMethod fun getLoadedImagePath(promise: Promise) { promise.resolve(nativeImagePath().ifEmpty { null }) }
+    @ReactMethod fun loadImageModel(input: ReadableMap, promise: Promise) {
+        if (!busy.compareAndSet(false, true)) { promise.reject("IMAGE_BUSY", "Image or video generation is running."); return }
+        cancelled.set(false); nativePrepare()
+        executor.execute {
+            try {
+                prepareHexagonRuntime()
+                nativeLoadImage(checkNotNull(input.getString("modelPath")), checkNotNull(input.getString("weight")), checkNotNull(input.getString("vae")), checkNotNull(input.getString("llm")), input.getInt("threads"), input.getBoolean("cpuOnly"))
+                promise.resolve(true)
+            } catch (error: Throwable) { promise.reject("IMAGE_LOAD_FAILED", error.message, error) }
+            finally { busy.set(false) }
+        }
+    }
+    @ReactMethod fun unloadImageModel(promise: Promise) {
+        if (!busy.compareAndSet(false, true)) { promise.reject("IMAGE_BUSY", "Image or video generation is running."); return }
+        executor.execute {
+            try { nativeUnloadImage(); promise.resolve(true) }
+            catch (error: Throwable) { promise.reject("IMAGE_UNLOAD_FAILED", error.message, error) }
+            finally { busy.set(false) }
+        }
+    }
+    @ReactMethod fun generateImage(input: ReadableMap, promise: Promise) {
+        if (!busy.compareAndSet(false, true)) { promise.reject("IMAGE_BUSY", "Image or video generation is running."); return }
+        cancelled.set(false); nativePrepare()
+        executor.execute {
+            var output: File? = null
+            try {
+                val width = input.getInt("width"); val height = input.getInt("height")
+                require(width in 64..2048 && height in 64..2048 && width % 16 == 0 && height % 16 == 0)
+                output = File(checkNotNull(input.getString("outputPath")))
+                VideoGenerationService.admission = CompletableFuture()
+                VideoGenerationService.cancel = { stop() }
+                ContextCompat.startForegroundService(context, Intent(context, VideoGenerationService::class.java).putExtra("modality", "image"))
+                VideoGenerationService.admission.get(5, TimeUnit.SECONDS)
+                val bytes = nativeGenerateImage(checkNotNull(input.getString("prompt")), input.getString("negativePrompt") ?: "", width, height, input.getInt("steps"), input.getDouble("guidanceScale"), input.getDouble("seed"))
+                check(!cancelled.get()) { "Image generation stopped." }
+                val pixels = IntArray(width * height) { i ->
+                    android.graphics.Color.rgb(bytes[i * 3].toInt() and 255, bytes[i * 3 + 1].toInt() and 255, bytes[i * 3 + 2].toInt() and 255)
+                }
+                val bitmap = android.graphics.Bitmap.createBitmap(pixels, width, height, android.graphics.Bitmap.Config.ARGB_8888)
+                try { output.outputStream().use { check(bitmap.compress(android.graphics.Bitmap.CompressFormat.PNG, 100, it)) } }
+                finally { bitmap.recycle() }
+                check(!cancelled.get()) { "Image generation stopped." }
+                promise.resolve(Arguments.createMap().apply {
+                    putString("imagePath", output.path); putInt("width", width); putInt("height", height); putDouble("seed", input.getDouble("seed")); putString("id", input.getString("id"))
+                })
+            } catch (error: Throwable) { output?.delete(); promise.reject("IMAGE_FAILED", error.message, error) }
+            finally { VideoGenerationService.cancel = null; context.stopService(Intent(context, VideoGenerationService::class.java)); busy.set(false) }
+        }
+    }
     override fun invalidate() { stop(); executor.shutdown(); super.invalidate() }
 }
diff --git a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationService.kt b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationService.kt
index 996c14b51..c6301c118 100644
--- a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationService.kt
+++ b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationService.kt
@@ -18,10 +18,10 @@ class VideoGenerationService : Service() {
         if (intent?.action == "cancel") { cancel?.invoke(); return START_NOT_STICKY }
         try {
             val manager = getSystemService(NotificationManager::class.java)
-            if (Build.VERSION.SDK_INT >= 26) manager.createNotificationChannel(NotificationChannel(CHANNEL, "Video generation", NotificationManager.IMPORTANCE_LOW))
+            if (Build.VERSION.SDK_INT >= 26) manager.createNotificationChannel(NotificationChannel(CHANNEL, "Media generation", NotificationManager.IMPORTANCE_LOW))
             val stop = PendingIntent.getService(this, 0, Intent(this, VideoGenerationService::class.java).setAction("cancel"), PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
             val builder = if (Build.VERSION.SDK_INT >= 26) Notification.Builder(this, CHANNEL) else Notification.Builder(this)
-            val notification = builder.setContentTitle("Generating video").setContentText("Off Grid is using this device.")
+            val notification = builder.setContentTitle(if (intent?.getStringExtra("modality") == "image") "Generating image" else "Generating video").setContentText("Off Grid is using this device.")
                 .setSmallIcon(android.R.drawable.ic_menu_slideshow).setOngoing(true)
                 .addAction(Notification.Action.Builder(null, "Stop", stop).build()).build()
             if (Build.VERSION.SDK_INT >= 35) startForeground(7413, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PROCESSING)
diff --git a/native/video/VideoGenerationModule.mm b/native/video/VideoGenerationModule.mm
index 638ed3765..54765f7f4 100644
--- a/native/video/VideoGenerationModule.mm
+++ b/native/video/VideoGenerationModule.mm
@@ -28,7 +28,7 @@ - (instancetype)init {
   return self;
 }
 - (void)dealloc { [[NSNotificationCenter defaultCenter] removeObserver:self]; }
-- (NSArray<NSString *> *)supportedEvents { return @[@"VideoGenerationProgress"]; }
+- (NSArray<NSString *> *)supportedEvents { return @[@"VideoGenerationProgress", @"SDImageProgress"]; }
 - (void)startObserving { _listeners = YES; }
 - (void)stopObserving { _listeners = NO; }
 - (void)backgrounded {
@@ -107,6 +107,86 @@ - (void)emitStage:(NSString *)stage step:(int)step total:(int)total {
     }];
   });
 }
+RCT_REMAP_METHOD(getLoadedImagePath, imagePathWithResolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+  auto path = _runtime.loadedImagePath(); resolve(path.empty() ? nil : @(path.c_str()));
+}
+RCT_REMAP_METHOD(loadImageModel, loadImage:(NSDictionary *)input resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+  dispatch_async(dispatch_get_main_queue(), ^{
+    if (self->_busy) { reject(@"IMAGE_BUSY", @"Image or video generation is running.", nil); return; }
+    self->_busy = YES; self->_runtime.cancelled.store(false);
+    dispatch_async(self->_worker, ^{
+      NSString *failure = nil;
+      try {
+        offgrid::VideoRequest request{};
+        request.weight = [input[@"weight"] UTF8String]; request.vae = [input[@"vae"] UTF8String];
+        request.llm = [input[@"llm"] UTF8String]; request.threads = [input[@"threads"] intValue]; request.cpuOnly = [input[@"cpuOnly"] boolValue];
+        self->_runtime.loadImage(request, [input[@"modelPath"] UTF8String]);
+      } catch (const std::exception &error) { failure = @(error.what()); }
+      dispatch_async(dispatch_get_main_queue(), ^{
+        self->_busy = NO;
+        if (failure) reject(@"IMAGE_LOAD_FAILED", failure, nil); else resolve(@YES);
+      });
+    });
+  });
+}
+RCT_REMAP_METHOD(unloadImageModel, unloadImageWithResolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+  dispatch_async(dispatch_get_main_queue(), ^{
+    if (self->_busy) { reject(@"IMAGE_BUSY", @"Image or video generation is running.", nil); return; }
+    self->_busy = YES;
+    dispatch_async(self->_worker, ^{
+      NSString *failure = nil;
+      try { self->_runtime.unloadImage(); } catch (const std::exception &error) { failure = @(error.what()); }
+      dispatch_async(dispatch_get_main_queue(), ^{
+        self->_busy = NO;
+        if (failure) reject(@"IMAGE_UNLOAD_FAILED", failure, nil); else resolve(@YES);
+      });
+    });
+  });
+}
+RCT_REMAP_METHOD(generateImage, generateImage:(NSDictionary *)input resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+  dispatch_async(dispatch_get_main_queue(), ^{
+    if (self->_busy) { reject(@"IMAGE_BUSY", @"Image or video generation is running.", nil); return; }
+    self->_busy = YES; self->_runtime.cancelled.store(false);
+    dispatch_async(self->_worker, ^{
+      @autoreleasepool {
+        NSString *output = input[@"outputPath"];
+        NSString *failure = nil;
+        try {
+          offgrid::VideoRequest request{};
+          request.prompt = [input[@"prompt"] UTF8String]; request.negative = [input[@"negativePrompt"] UTF8String];
+          request.width = [input[@"width"] intValue]; request.height = [input[@"height"] intValue];
+          request.steps = [input[@"steps"] intValue]; request.guidance = [input[@"guidanceScale"] floatValue]; request.seed = [input[@"seed"] longLongValue];
+          if (request.width < 64 || request.width > 2048 || request.height < 64 || request.height > 2048 || request.width % 16 || request.height % 16)
+            throw std::runtime_error("Image dimensions are not supported.");
+          self->_runtime.image(request, [&](int step, int total) {
+            dispatch_async(dispatch_get_main_queue(), ^{
+              if (self->_listeners) [self sendEventWithName:@"SDImageProgress" body:@{@"step":@(step), @"totalSteps":@(total), @"progress":@(total > 0 ? double(step) / total : 0)}];
+            });
+          }, [&](const sd_image_t &image) {
+            if (!image.data || image.channel != 3 || image.width != request.width || image.height != request.height)
+              throw std::runtime_error("The image engine returned invalid pixels.");
+            CFDataRef data = CFDataCreate(kCFAllocatorDefault, image.data, image.width * image.height * 3);
+            CGDataProviderRef provider = data ? CGDataProviderCreateWithCFData(data) : nullptr;
+            CGColorSpaceRef color = CGColorSpaceCreateDeviceRGB();
+            CGImageRef bitmap = provider ? CGImageCreate(image.width, image.height, 8, 24, image.width * 3, color, kCGImageAlphaNone, provider, nullptr, false, kCGRenderingIntentDefault) : nullptr;
+            NSData *png = bitmap ? UIImagePNGRepresentation([UIImage imageWithCGImage:bitmap]) : nil;
+            if (bitmap) CGImageRelease(bitmap);
+            CGColorSpaceRelease(color); if (provider) CGDataProviderRelease(provider); if (data) CFRelease(data);
+            if (!png || ![png writeToFile:output atomically:YES]) throw std::runtime_error("Could not save the image.");
+          });
+          if (self->_runtime.cancelled.load()) throw std::runtime_error("Image generation stopped.");
+        } catch (const std::exception &error) {
+          failure = @(error.what()); [[NSFileManager defaultManager] removeItemAtPath:output error:nil];
+        }
+        dispatch_async(dispatch_get_main_queue(), ^{
+          self->_busy = NO;
+          if (failure) reject(@"IMAGE_FAILED", failure, nil);
+          else resolve(@{@"id":input[@"id"], @"imagePath":output, @"width":input[@"width"], @"height":input[@"height"], @"seed":input[@"seed"]});
+        });
+      }
+    });
+  });
+}
 - (void)startContinuedWork:(dispatch_block_t)work {
   _continuedWork = [work copy];
   if (@available(iOS 26.0, *)) {
diff --git a/native/video/common/VideoRuntime.hpp b/native/video/common/VideoRuntime.hpp
index 39fdc5c8c..c67b22bb0 100644
--- a/native/video/common/VideoRuntime.hpp
+++ b/native/video/common/VideoRuntime.hpp
@@ -20,36 +20,17 @@ struct VideoRequest {
   int64_t seed;
   std::string llm, embeddings, audioVae;
   float flowShift = 0;
+  bool cpuOnly = false;
+  int threads = 4;
 };
 // One instance per process. Both host bridges use the same native lifecycle.
 class VideoRuntime {
   std::mutex contextMutex;
   std::mutex executionMutex;
   sd_ctx_t *context = nullptr;
-public:
-  std::atomic_bool cancelled{false};
-  void cancel() {
-    cancelled.store(true);
-    std::lock_guard<std::mutex> guard(contextMutex);
-    if (context) sd_cancel_generation(context, SD_CANCEL_ALL);
-  }
-  void run(const VideoRequest &request,
-           const std::function<void(int, int)> &progress,
-           const std::function<void(sd_image_t *, int, int)> &encode,
-           const std::function<void(const char *)> &conditioning) {
-    std::unique_lock<std::mutex> execution(executionMutex, std::try_to_lock);
-    if (!execution.owns_lock()) throw std::runtime_error("Video generation is already running.");
-    sd_image_t *frames = nullptr;
-    int count = 0, fps = request.fps;
-    auto cleanup = [&] {
-      if (frames) free_sd_images(frames, count);
-      sd_set_progress_callback(nullptr, nullptr);
-      std::lock_guard<std::mutex> guard(contextMutex);
-      if (context) free_sd_ctx(context);
-      context = nullptr;
-    };
-    try {
-      if (cancelled.load()) throw std::runtime_error("Video generation stopped.");
+  sd_ctx_t *imageContext = nullptr;
+  std::string imagePath;
+  sd_ctx_t *loadContext(const VideoRequest &request, std::string &preferred) {
       sd_ctx_params_t config;
       sd_ctx_params_init(&config);
       config.diffusion_model_path = request.weight.c_str();
@@ -66,11 +47,11 @@ class VideoRuntime {
       // Probe the NPU before choosing it. Devices without a usable Hexagon
       // runtime retain Vulkan diffusion and the CPU conditioning fallback.
       sd_list_devices(nullptr, 0);
-      std::string preferred;
+
       for (size_t i = 0; i < ggml_backend_dev_count(); ++i) {
         auto device = ggml_backend_dev_get(i);
         const char *name = ggml_backend_dev_name(device);
-        if (std::string(name).rfind("HTP", 0) != 0) continue;
+        if (request.cpuOnly || std::string(name).rfind("HTP", 0) != 0) continue;
         try {
           auto probe = ggml_backend_dev_init(device, nullptr);
           if (!probe) continue;
@@ -81,7 +62,10 @@ class VideoRuntime {
           // An installed driver can still reject the DSP session.
         }
       }
-      config.backend = preferred.empty() ? "Vulkan0,te=cpu" : preferred.c_str();
+      // Convolution-heavy decoders cannot execute their main operations on
+      // Hexagon. Keep them on the GPU to avoid repeated GPU/NPU copies.
+      const std::string npuBackend = preferred + (ggml_backend_dev_by_name("Vulkan0") ? ",vae=Vulkan0" : ",vae=cpu");
+      config.backend = preferred.empty() ? "Vulkan0,te=cpu" : npuBackend.c_str();
       // Stream NPU weights from disk per graph segment. Keeping a second
       // complete copy on Vulkan retains the text encoder during diffusion and
       // can trigger Android's low-memory killer. The graph cap still controls
@@ -93,12 +77,18 @@ class VideoRuntime {
       config.max_vram = "HTP0=1.5";
       config.disable_prefetch = true;
 #endif
-      config.n_threads = 4;
+      config.n_threads = request.threads;
+      if (request.cpuOnly) {
+        config.backend = "cpu"; config.params_backend = nullptr; config.auto_fit = true;
+#ifdef __ANDROID__
+        preferred.clear();
+#endif
+      }
       sd_ctx_t *loaded = nullptr;
 #ifdef __ANDROID__
       try { loaded = new_sd_ctx(&config); }
       catch (const std::exception &) {
-        if (preferred.empty() || cancelled.load()) throw;
+        if (request.cpuOnly || cancelled.load()) throw;
       }
       if (!loaded && !preferred.empty() && !cancelled.load()) {
         preferred.clear();
@@ -117,6 +107,97 @@ class VideoRuntime {
 #else
       loaded = new_sd_ctx(&config);
 #endif
+      return loaded;
+  }
+public:
+  ~VideoRuntime() {
+    if (context) free_sd_ctx(context);
+    if (imageContext) free_sd_ctx(imageContext);
+  }
+  std::atomic_bool cancelled{false};
+  void cancel() {
+    cancelled.store(true);
+    std::lock_guard<std::mutex> guard(contextMutex);
+    if (context) sd_cancel_generation(context, SD_CANCEL_ALL);
+    if (imageContext) sd_cancel_generation(imageContext, SD_CANCEL_ALL);
+  }
+  void loadImage(const VideoRequest &request, const std::string &path) {
+    std::unique_lock<std::mutex> execution(executionMutex, std::try_to_lock);
+    if (!execution.owns_lock()) throw std::runtime_error("Image or video generation is running.");
+    {
+      std::lock_guard<std::mutex> guard(contextMutex);
+      if (imageContext) free_sd_ctx(imageContext);
+      imageContext = nullptr; imagePath.clear();
+    }
+    std::string preferred;
+    auto loaded = loadContext(request, preferred);
+    if (!loaded) throw std::runtime_error("Could not load the image model pack.");
+    std::lock_guard<std::mutex> guard(contextMutex);
+    if (cancelled.load()) { free_sd_ctx(loaded); throw std::runtime_error("Image loading stopped."); }
+    imageContext = loaded; imagePath = path;
+  }
+  void unloadImage() {
+    std::unique_lock<std::mutex> execution(executionMutex, std::try_to_lock);
+    if (!execution.owns_lock()) throw std::runtime_error("Image or video generation is running.");
+    std::lock_guard<std::mutex> guard(contextMutex);
+    if (imageContext) free_sd_ctx(imageContext);
+    imageContext = nullptr; imagePath.clear();
+  }
+  std::string loadedImagePath() {
+    std::lock_guard<std::mutex> guard(contextMutex);
+    return imageContext ? imagePath : "";
+  }
+  void image(const VideoRequest &request,
+             const std::function<void(int, int)> &progress,
+             const std::function<void(const sd_image_t &)> &save) {
+    std::unique_lock<std::mutex> execution(executionMutex, std::try_to_lock);
+    if (!execution.owns_lock()) throw std::runtime_error("Image or video generation is running.");
+    if (!imageContext) throw std::runtime_error("Image model is unloaded.");
+    sd_image_t *images = nullptr; int count = 0;
+    auto cleanup = [&] {
+      sd_set_progress_callback(nullptr, nullptr);
+      if (images) free_sd_images(images, count);
+    };
+    try {
+      if (cancelled.load()) throw std::runtime_error("Image generation stopped.");
+      sd_set_progress_callback([](int step, int total, float, void *data) {
+        (*static_cast<const std::function<void(int, int)> *>(data))(step, total);
+      }, const_cast<void *>(static_cast<const void *>(&progress)));
+      sd_img_gen_params_t params; sd_img_gen_params_init(&params);
+      params.prompt = request.prompt.c_str(); params.negative_prompt = request.negative.c_str();
+      params.width = request.width; params.height = request.height; params.seed = request.seed;
+      params.batch_count = 1;
+      params.sample_params.sample_steps = request.steps;
+      params.sample_params.guidance.txt_cfg = request.guidance;
+      params.sample_params.sample_method = EULER_SAMPLE_METHOD;
+      params.sample_params.scheduler = sd_get_default_scheduler(imageContext, EULER_SAMPLE_METHOD);
+      params.vae_tiling_params.enabled = true;
+      if (!generate_image(imageContext, &params, &images, &count) || !images || count != 1)
+        throw std::runtime_error("The image engine produced no image.");
+      if (cancelled.load()) throw std::runtime_error("Image generation stopped.");
+      save(images[0]);
+    } catch (...) { cleanup(); throw; }
+    cleanup();
+  }
+  void run(const VideoRequest &request,
+           const std::function<void(int, int)> &progress,
+           const std::function<void(sd_image_t *, int, int)> &encode,
+           const std::function<void(const char *)> &conditioning) {
+    std::unique_lock<std::mutex> execution(executionMutex, std::try_to_lock);
+    if (!execution.owns_lock()) throw std::runtime_error("Video generation is already running.");
+    sd_image_t *frames = nullptr;
+    int count = 0, fps = request.fps;
+    auto cleanup = [&] {
+      if (frames) free_sd_images(frames, count);
+      sd_set_progress_callback(nullptr, nullptr);
+      std::lock_guard<std::mutex> guard(contextMutex);
+      if (context) free_sd_ctx(context);
+      context = nullptr;
+    };
+    try {
+      if (cancelled.load()) throw std::runtime_error("Video generation stopped.");
+      std::string preferred;
+      sd_ctx_t *loaded = loadContext(request, preferred);
       {
         std::lock_guard<std::mutex> guard(contextMutex);
         context = loaded;
diff --git a/scripts/build-video-ios.sh b/scripts/build-video-ios.sh
index bf3a4c225..945f9acb9 100755
--- a/scripts/build-video-ios.sh
+++ b/scripts/build-video-ios.sh
@@ -5,7 +5,8 @@ REVISION="$(cat "$ROOT/scripts/video/revision")"
 CACHE="${OFFGRID_VIDEO_BUILD_DIR:-$ROOT/.video-build}"
 SOURCE="${OFFGRID_SD_SOURCE:-$CACHE/source}"
 OUTPUT="$ROOT/native/video/OffgridVideoRuntime.xcframework"
-if [ -f "$OUTPUT/ios-arm64/OffgridVideoRuntime.framework/Headers/stable-diffusion.h" ] && [ -f "$OUTPUT/revision" ] && [ "$(cat "$OUTPUT/revision")" = "$REVISION" ]; then exit 0; fi
+BUILD_KEY="$(cat "$ROOT/scripts/video/revision" "$ROOT/scripts/video/exports.txt" "$ROOT/scripts/video/CMakeLists.txt" "$ROOT/scripts/video/conditioning-errors.patch" | shasum -a 256 | cut -d' ' -f1)"
+if [ -f "$OUTPUT/ios-arm64/OffgridVideoRuntime.framework/Headers/stable-diffusion.h" ] && [ -f "$OUTPUT/revision" ] && [ "$(cat "$OUTPUT/revision")" = "$BUILD_KEY" ]; then exit 0; fi
 mkdir -p "$CACHE"
 if [ ! -d "$SOURCE/.git" ]; then
   git clone --filter=blob:none --no-checkout https://github.com/leejet/stable-diffusion.cpp.git "$SOURCE"
@@ -15,6 +16,10 @@ if [ "$(git -C "$SOURCE" rev-parse HEAD)" != "$REVISION" ]; then
   git -C "$SOURCE" checkout --detach "$REVISION"
 fi
 git -C "$SOURCE" submodule update --init --depth 1 ggml
+PATCH="$ROOT/scripts/video/conditioning-errors.patch"
+if ! git -C "$SOURCE" apply --reverse --check "$PATCH" 2>/dev/null; then
+  git -C "$SOURCE" apply "$PATCH"
+fi
 for SDK in iphoneos iphonesimulator; do
   cmake -S "$ROOT/scripts/video" -B "$CACHE/$SDK" -G Xcode \
     -DSD_SOURCE="$SOURCE" -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT="$SDK" \
@@ -27,5 +32,5 @@ xcodebuild -create-xcframework \
   -framework "$CACHE/iphoneos/bin/Release/OffgridVideoRuntime.framework" \
   -framework "$CACHE/iphonesimulator/bin/Release/OffgridVideoRuntime.framework" \
   -output "$OUTPUT"
-printf '%s\n' "$REVISION" > "$OUTPUT/revision"
+printf '%s\n' "$BUILD_KEY" > "$OUTPUT/revision"
 cp "$SOURCE/LICENSE" "$ROOT/native/video/RUNTIME-LICENSE"
diff --git a/scripts/video/exports.txt b/scripts/video/exports.txt
index f57d83965..a6fb144af 100644
--- a/scripts/video/exports.txt
+++ b/scripts/video/exports.txt
@@ -3,3 +3,4 @@ _new_sd_ctx
 _free_sd_ctx
 _free_sd_images
 _generate_video
+_generate_image

From 75b5488219671d87d501017f80a40196506024f2 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 15:20:54 +0530
Subject: [PATCH 038/129] feat(image): connect Qwen packs to mobile model and
 generation flows [skip ci]

---
 src/screens/ModelsScreen/constants.ts         |  2 +
 .../ModelsScreen/imageDownloadResume.ts       |  3 +-
 src/screens/ModelsScreen/types.ts             |  2 +-
 src/screens/ModelsScreen/useImageModels.ts    |  8 +--
 src/screens/ModelsScreen/utils.ts             |  3 +
 src/services/activeModelService/loaders.ts    |  3 +-
 src/services/hardware.ts                      |  4 +-
 src/services/huggingFaceModelBrowser.ts       | 32 ++++++++-
 src/services/imageDownloadActions.ts          |  6 +-
 src/services/imageGenerationService.ts        |  6 +-
 src/services/imageModelDownloadTypes.ts       |  2 +-
 src/services/localDreamGenerator.ts           | 65 +++++++++++++++----
 src/services/modelManager/scan.ts             |  8 ++-
 src/types/index.ts                            |  4 +-
 src/utils/imageBackend.ts                     |  2 +
 src/utils/imageModelIntegrity.ts              | 22 +++++--
 16 files changed, 134 insertions(+), 38 deletions(-)

diff --git a/src/screens/ModelsScreen/constants.ts b/src/screens/ModelsScreen/constants.ts
index e85353b3c..4ffb4097a 100644
--- a/src/screens/ModelsScreen/constants.ts
+++ b/src/screens/ModelsScreen/constants.ts
@@ -1,3 +1,4 @@
+import { imageBackendLabel } from '../../utils/imageBackend';
 import { CREDIBILITY_LABELS } from '../../constants';
 import {
   BackendFilter,
@@ -60,6 +61,7 @@ export const BACKEND_OPTIONS: { key: BackendFilter; label: string }[] = [
   { key: 'all', label: 'All' },
   { key: 'mnn', label: 'GPU' },
   { key: 'qnn', label: 'NPU' },
+  { key: 'sd', label: imageBackendLabel('sd') },
 ];
 
 export const SORT_OPTIONS: { key: SortOption; label: string; icon: string }[] = [
diff --git a/src/screens/ModelsScreen/imageDownloadResume.ts b/src/screens/ModelsScreen/imageDownloadResume.ts
index 5bf4933a9..046459b25 100644
--- a/src/screens/ModelsScreen/imageDownloadResume.ts
+++ b/src/screens/ModelsScreen/imageDownloadResume.ts
@@ -5,7 +5,7 @@ import { modelManager, backgroundDownloadService } from '../../services';
 import { resolveCoreMLModelDir } from '../../utils/coreMLModelUtils';
 import { ONNXImageModel } from '../../types';
 import { useDownloadStore, DownloadEntry } from '../../stores/downloadStore';
-import { ImageDownloadDeps, registerAndNotify, proceedWithDownload, validateMultifileComplete } from '../../services/imageDownloadActions';
+import { ImageDownloadDeps, registerAndNotify, proceedWithDownload, validateMultifileComplete, isMultifileImageDownloadActive } from '../../services/imageDownloadActions';
 import type { ImageModelDescriptor } from '../../services/imageModelDownloadTypes';
 import { imageDescriptorFromMetadata } from './imageDescriptor';
 import { validateImageModelDir, ensureImageExtractionComplete } from '../../utils/imageModelIntegrity';
@@ -189,6 +189,7 @@ async function resumeZipDownload(ctx: ResumeCtx): Promise<void> {
 
 async function resumeMultifileDownload(ctx: ResumeCtx): Promise<void> {
   const { entry, modelId, metadata, deps } = ctx;
+  if (isMultifileImageDownloadActive(modelId)) return;
   const modelDir = `${modelManager.getImageModelsDirectory()}/${modelId}`;
   const modelDirExists = await RNFS.exists(modelDir);
   if (!modelDirExists) {
diff --git a/src/screens/ModelsScreen/types.ts b/src/screens/ModelsScreen/types.ts
index 512bb744d..43e5342eb 100644
--- a/src/screens/ModelsScreen/types.ts
+++ b/src/screens/ModelsScreen/types.ts
@@ -5,7 +5,7 @@ import { ModelSource } from '../../types';
 import { RootStackParamList, MainTabParamList } from '../../navigation/types';
 export type { ImageModelDescriptor } from '../../services/imageModelDownloadTypes';
 
-export type BackendFilter = 'all' | 'mnn' | 'qnn' | 'coreml';
+export type BackendFilter = 'all' | 'mnn' | 'qnn' | 'coreml' | 'sd';
 
 export type CredibilityFilter = 'all' | ModelSource;
 export type ModelTypeFilter = 'all' | 'text' | 'vision' | 'code' | 'image-gen';
diff --git a/src/screens/ModelsScreen/useImageModels.ts b/src/screens/ModelsScreen/useImageModels.ts
index 3f2eaa2a1..b902e0c2f 100644
--- a/src/screens/ModelsScreen/useImageModels.ts
+++ b/src/screens/ModelsScreen/useImageModels.ts
@@ -5,7 +5,7 @@ import { useAppStore } from '../../stores';
 import { useDownloadStore } from '../../stores/downloadStore';
 import { makeImageModelKey } from '../../utils/modelKey';
 import { modelManager, hardwareService, backgroundDownloadService } from '../../services';
-import { fetchAvailableModels, HFImageModel, guessStyle } from '../../services/huggingFaceModelBrowser';
+import { fetchAvailableModels, getSDImageModels, HFImageModel, guessStyle } from '../../services/huggingFaceModelBrowser';
 import { fetchAvailableCoreMLModels } from '../../services/coreMLModelBrowser';
 import { ImageModelRecommendation } from '../../types';
 import { BackendFilter, ImageFilterDimension, ImageModelDescriptor } from './types';
@@ -55,15 +55,15 @@ export function useImageModels(setAlertState: (s: AlertState) => void) {
     try {
       if (Platform.OS === 'ios') {
         const coremlModels = await fetchAvailableCoreMLModels(forceRefresh);
-        setAvailableHFModels(coremlModels.map(m => ({
+        setAvailableHFModels([...getSDImageModels(), ...coremlModels.map(m => ({
           id: m.id, name: m.name, displayName: m.displayName, backend: 'coreml' as any,
           fileName: m.fileName, downloadUrl: m.downloadUrl, size: m.size, repo: m.repo,
           _coreml: true, _coremlFiles: m.files,
           _coremlAttentionVariant: m.attentionVariant,
-        })));
+        }))]);
       } else {
         const socInfo = await hardwareService.getSoCInfo();
-        setAvailableHFModels(await fetchAvailableModels(forceRefresh, { skipQnn: !socInfo.hasNPU }));
+        setAvailableHFModels([...getSDImageModels(), ...await fetchAvailableModels(forceRefresh, { skipQnn: !socInfo.hasNPU })]);
       }
     } catch (error: any) {
       setHfModelsError(error?.message || 'Failed to fetch models');
diff --git a/src/screens/ModelsScreen/utils.ts b/src/screens/ModelsScreen/utils.ts
index ed8988511..3acdb5648 100644
--- a/src/screens/ModelsScreen/utils.ts
+++ b/src/screens/ModelsScreen/utils.ts
@@ -105,6 +105,7 @@ export function getImageModelCompatibility(
   socInfo?: SoCInfo | null,
 ): { isCompatible: boolean; incompatibleReason: string | undefined } {
   const backendCompatible =
+    model.backend === 'sd' ||
     !imageRec?.compatibleBackends ||
     imageRec.compatibleBackends.includes(model.backend as any);
 
@@ -152,6 +153,8 @@ export function hfModelToDescriptor(
     backend: hfModel._coreml ? 'coreml' : hfModel.backend,
     variant: hfModel.variant,
     coremlFiles: hfModel._coremlFiles,
+    huggingFaceRepo: hfModel.repo,
+    huggingFaceFiles: hfModel.huggingFaceFiles,
     repo: hfModel.repo,
     attentionVariant: hfModel._coremlAttentionVariant,
   };
diff --git a/src/services/activeModelService/loaders.ts b/src/services/activeModelService/loaders.ts
index 294c7f724..898e97162 100644
--- a/src/services/activeModelService/loaders.ts
+++ b/src/services/activeModelService/loaders.ts
@@ -294,7 +294,8 @@ export async function doLoadImageModel(ctx: ImageLoadContext): Promise<void> {
           ctx.model.modelPath,
           ctx.imageThreads,
           {
-            backend: 'auto',
+            backend: ctx.model.backend === 'sd' ? 'sd' : 'auto',
+            modelId: ctx.model.id,
             cpuOnly: ctx.cpuOnly,
             attentionVariant: ctx.model.attentionVariant,
             preferGpu: ctx.preferGpu,
diff --git a/src/services/hardware.ts b/src/services/hardware.ts
index efa6d5779..42df86444 100644
--- a/src/services/hardware.ts
+++ b/src/services/hardware.ts
@@ -296,8 +296,8 @@ class HardwareService {
    * so the gate doesn't refuse an ANE load that fits (nor admit a GPU load that
    * OOMs). Android (ONNX/QNN reserves accelerator memory up front) keeps 2.5×.
    */
-  estimateImageModelRam(model: { fileSize?: number; size?: number; mmProjFileSize?: number }): number {
-    const multiplier = Platform.OS === 'ios' && !this.preferGpuForImageGen() ? 1.8 : 2.5;
+  estimateImageModelRam(model: { fileSize?: number; size?: number; mmProjFileSize?: number; backend?: string }): number {
+    const multiplier = model.backend !== 'sd' && Platform.OS === 'ios' && !this.preferGpuForImageGen() ? 1.8 : 2.5;
     return this.estimateModelRam(model, multiplier);
   }
   formatModelRam(model: { fileSize?: number; size?: number; mmProjFileSize?: number }, multiplier = 1.5): string {
diff --git a/src/services/huggingFaceModelBrowser.ts b/src/services/huggingFaceModelBrowser.ts
index 9ff485a65..197934bb2 100644
--- a/src/services/huggingFaceModelBrowser.ts
+++ b/src/services/huggingFaceModelBrowser.ts
@@ -1,8 +1,12 @@
+import { CATALOG } from '@offgrid/models';
+import type { ImageModelDescriptor } from './imageModelDownloadTypes';
+
 export interface HFImageModel {
   id: string;
   name: string;
   displayName: string;
-  backend: 'mnn' | 'qnn';
+  backend: ImageModelDescriptor['backend'];
+  huggingFaceFiles?: ImageModelDescriptor['huggingFaceFiles'];
   variant?: string;
   downloadUrl: string;
   fileName: string;
@@ -141,3 +145,29 @@ export function guessStyle(name: string): string {
   }
   return 'anime';
 }
+
+/** The shared catalog owns the Qwen pack, including pinned companion files. */
+export function getSDImageModels(): HFImageModel[] {
+  return CATALOG.filter(model => model.id === 'leejet/Qwen-Image-2.1-GGUF').map(model => ({
+    id: `sd-${model.id.replaceAll('/', '--')}`,
+    name: model.name, displayName: model.name, backend: 'sd' as const,
+    repo: model.id, fileName: model.files[0].name, downloadUrl: model.files[0].url,
+    size: model.files.reduce((sum, file) => sum + (file.sizeBytes ?? 0), 0),
+    huggingFaceFiles: model.files.map(file => ({ path: file.name, size: file.sizeBytes ?? 0, downloadUrl: file.url, sha256: file.sha256 })),
+  }));
+}
+
+export function resolveSDImagePack(modelId: string, modelPath: string) {
+  const model = getSDImageModels().find(candidate => candidate.id === modelId);
+  if (!model?.huggingFaceFiles) throw new Error('This image model pack is not supported.');
+  const required = (pattern: RegExp) => {
+    const file = model.huggingFaceFiles!.find(part => pattern.test(part.path));
+    if (!file) throw new Error('The image model pack is incomplete.');
+    return `${modelPath}/${file.path}`;
+  };
+  return {
+    weight: required(/^qwen_image_2\.1-.*\.gguf$/i),
+    vae: required(/vae.*\.safetensors$/i),
+    llm: required(/^Qwen3VL-.*\.gguf$/i),
+  };
+}
diff --git a/src/services/imageDownloadActions.ts b/src/services/imageDownloadActions.ts
index 5bb1295a1..420820dfc 100644
--- a/src/services/imageDownloadActions.ts
+++ b/src/services/imageDownloadActions.ts
@@ -26,7 +26,7 @@ interface ImageMetadata {
   imageModelDescription: string;
   imageModelSize: number;
   imageModelStyle?: string;
-  imageModelBackend?: 'mnn' | 'qnn' | 'coreml';
+  imageModelBackend?: 'mnn' | 'qnn' | 'coreml' | 'sd';
   imageModelRepo?: string;
   imageModelAttentionVariant?: string;
   imageModelDownloadUrl?: string;
@@ -44,6 +44,10 @@ type MultifileRuntime = {
 const activeMultifileDownloads = new Map<string, MultifileRuntime>();
 const USER_CANCELLED_ERROR = 'user_cancelled';
 
+export function isMultifileImageDownloadActive(modelId: string): boolean {
+  return activeMultifileDownloads.has(modelId);
+}
+
 /** Build a synthetic downloadId for multi-file flows that don't go through WorkManager. */
 function makeMultifileId(modelId: string): string {
   return `image-multi:${modelId}`;
diff --git a/src/services/imageGenerationService.ts b/src/services/imageGenerationService.ts
index f11ef5843..c014d98ec 100644
--- a/src/services/imageGenerationService.ts
+++ b/src/services/imageGenerationService.ts
@@ -225,10 +225,10 @@ class ImageGenerationService {
     // the single cross-platform signal (so the notice shows once on every device);
     // the OpenCL kernel-cache check is an extra Android signal in case the cache was
     // cleared after the flag was set.
-    let isFirstRun = !useAppStore
+    let isFirstRun = activeImageModel.backend !== 'sd' && !useAppStore
       .getState()
       .warmedImageModels.includes(activeImageModel.id);
-    if (useOpenCL) {
+    if (useOpenCL && activeImageModel.backend !== 'sd') {
       try {
         const hasCache = await onnxImageGeneratorService.hasKernelCache(
           activeImageModel.modelPath,
@@ -242,7 +242,7 @@ class ImageGenerationService {
 
     this.updateState({
       phase: 'generating',
-      status: isFirstRun
+      status: activeImageModel.backend === 'sd' ? 'Processing image prompt...' : isFirstRun
         ? 'Optimizing GPU for your device (~120s, one-time)...'
         : 'Starting image generation...',
     });
diff --git a/src/services/imageModelDownloadTypes.ts b/src/services/imageModelDownloadTypes.ts
index ad4359b3b..5e1040a0e 100644
--- a/src/services/imageModelDownloadTypes.ts
+++ b/src/services/imageModelDownloadTypes.ts
@@ -16,7 +16,7 @@ export interface ImageModelDescriptor {
   downloadUrl: string;
   size: number;
   style: string;
-  backend: 'mnn' | 'qnn' | 'coreml';
+  backend: 'mnn' | 'qnn' | 'coreml' | 'sd';
   variant?: string;
   huggingFaceRepo?: string;
   huggingFaceFiles?: { path: string; size: number; downloadUrl?: string; sha256?: string }[];
diff --git a/src/services/localDreamGenerator.ts b/src/services/localDreamGenerator.ts
index ce69749df..4731a3fc4 100644
--- a/src/services/localDreamGenerator.ts
+++ b/src/services/localDreamGenerator.ts
@@ -5,11 +5,13 @@ import {
   ImageGenerationProgress,
   GeneratedImage,
 } from '../types';
+import { resolveSDImagePack } from './huggingFaceModelBrowser';
+import { validateImageModelDir } from '../utils/imageModelIntegrity';
 import { generateRandomSeed } from '../utils/generateId';
 import logger from '../utils/logger';
 import { resolveOwnedDocumentPath } from '../utils/resolveDocumentPath';
 
-const { LocalDreamModule, CoreMLDiffusionModule } = NativeModules;
+const { LocalDreamModule, CoreMLDiffusionModule, VideoGenerationModule: SDModule } = NativeModules;
 const PROGRESS_LOG_SAMPLE_STEPS = 5;
 
 // Pick the right native module per platform
@@ -34,25 +36,27 @@ type PreviewCallback = (preview: { previewPath: string; step: number; totalSteps
  * Progress events are emitted via NativeEventEmitter from the native side.
  */
 class LocalDreamGeneratorService {
+  private usingSD = false;
   private loadedThreads: number | null = null;
   private generating = false;
   private eventEmitter: NativeEventEmitter | null = null;
 
   private getEmitter(): NativeEventEmitter {
     if (!this.eventEmitter) {
-      this.eventEmitter = new NativeEventEmitter(DiffusionModule);
+      this.eventEmitter = new NativeEventEmitter(this.usingSD ? SDModule : DiffusionModule);
     }
     return this.eventEmitter;
   }
 
   isAvailable(): boolean {
-    return DiffusionModule != null;
+    return DiffusionModule != null || SDModule?.generateImage != null;
   }
 
   async isModelLoaded(): Promise<boolean> {
     if (!this.isAvailable()) return false;
     try {
-      return await DiffusionModule.isModelLoaded();
+      if (SDModule?.getLoadedImagePath && await SDModule.getLoadedImagePath()) { this.usingSD = true; return true; }
+      return await DiffusionModule?.isModelLoaded() ?? false;
     } catch {
       return false;
     }
@@ -61,18 +65,33 @@ class LocalDreamGeneratorService {
   async getLoadedModelPath(): Promise<string | null> {
     if (!this.isAvailable()) return null;
     try {
-      return await DiffusionModule.getLoadedModelPath();
+      const sdPath = await SDModule?.getLoadedImagePath?.();
+      if (sdPath) { this.usingSD = true; return sdPath; }
+      return await DiffusionModule?.getLoadedModelPath() ?? null;
     } catch {
       return null;
     }
   }
 
-  async loadModel(modelPath: string, threads?: number, opts: { backend?: 'mnn' | 'qnn' | 'auto'; cpuOnly?: boolean; attentionVariant?: 'split_einsum' | 'original'; preferGpu?: boolean } = {}): Promise<boolean> {
+  async loadModel(modelPath: string, threads?: number, opts: { backend?: 'mnn' | 'qnn' | 'auto' | 'sd'; modelId?: string; cpuOnly?: boolean; attentionVariant?: 'split_einsum' | 'original'; preferGpu?: boolean } = {}): Promise<boolean> {
     if (!this.isAvailable()) {
       throw new Error('LocalDream image generation is not available on this platform');
     }
 
     const backend = opts.backend ?? 'auto';
+    if (this.generating) throw new Error('Image generation is running.');
+    if (backend === 'sd') {
+      if (!SDModule?.loadImageModel) throw new Error('This build does not include the SD image runtime.');
+      const integrity = await validateImageModelDir(modelPath, 'sd');
+      if (!integrity.complete) throw new Error(`The image model pack is incomplete: ${integrity.missing.join(', ')}`);
+      const pack = resolveSDImagePack(opts.modelId ?? modelPath.split('/').pop() ?? '', modelPath);
+      if (await DiffusionModule?.isModelLoaded()) await DiffusionModule.unloadModel();
+      await SDModule.loadImageModel({ modelPath, ...pack, threads: threads ?? 4, cpuOnly: opts.cpuOnly ?? false });
+      this.usingSD = true; this.eventEmitter = null; this.loadedThreads = threads ?? 4;
+      return true;
+    }
+    if (SDModule?.getLoadedImagePath && await SDModule.getLoadedImagePath()) await SDModule.unloadImageModel();
+    this.usingSD = false; this.eventEmitter = null;
     const params: { modelPath: string; threads?: number; backend: string; cpuOnly?: boolean; attentionVariant?: string; preferGpu?: boolean } = {
       modelPath,
       backend,
@@ -104,7 +123,9 @@ class LocalDreamGeneratorService {
   async unloadModel(): Promise<boolean> {
     if (!this.isAvailable()) return true;
     try {
-      const result = await DiffusionModule.unloadModel();
+      if (SDModule?.getLoadedImagePath && await SDModule.getLoadedImagePath()) await SDModule.unloadImageModel();
+      const result = await DiffusionModule?.unloadModel() ?? true;
+      this.usingSD = false; this.eventEmitter = null;
       this.loadedThreads = null;
       return result;
     } catch (e) {
@@ -116,7 +137,7 @@ class LocalDreamGeneratorService {
 
   private subscribeToProgress(onProgress?: ProgressCallback, onPreview?: PreviewCallback): any {
     return this.getEmitter().addListener(
-      'LocalDreamProgress',
+      this.usingSD ? 'SDImageProgress' : 'LocalDreamProgress',
       (event: { step: number; totalSteps: number; progress: number; previewPath?: string }) => {
         if (
           !Number.isInteger(event.step) ||
@@ -191,13 +212,29 @@ class LocalDreamGeneratorService {
     }
 
     this.generating = true;
-    const progressSubscription = this.subscribeToProgress(onProgress, onPreview);
+    let lastStep = -1;
+    const progressSubscription = this.subscribeToProgress(progress => {
+      if (this.usingSD) {
+        if (progress.totalSteps !== (params.steps || 8) || progress.step <= lastStep || progress.step > progress.totalSteps) return;
+        lastStep = progress.step;
+      }
+      onProgress?.(progress);
+    }, onPreview);
 
     try {
-      const result = await DiffusionModule.generateImage(this.buildNativeParams(params, trimmedPrompt));
+      const nativeParams = this.buildNativeParams(params, trimmedPrompt);
+      let result;
+      if (this.usingSD) {
+        const id = `${Date.now()}-${generateRandomSeed()}`;
+        const directory = `${RNFS.DocumentDirectoryPath}/generated_images`;
+        await RNFS.mkdir(directory);
+        result = await SDModule.generateImage({ ...nativeParams, id, outputPath: `${directory}/${id}.png` });
+      } else {
+        result = await DiffusionModule.generateImage(nativeParams);
+      }
       // Native side releases the CoreML pipeline after generation to free
       // memory, so clear TS-side state so the next request triggers a reload.
-      this.loadedThreads = null;
+      if (!this.usingSD) this.loadedThreads = null;
       return this.buildResult(params, result);
     } catch (error: any) {
       const msg = error?.message || '';
@@ -213,7 +250,7 @@ class LocalDreamGeneratorService {
 
   async cancelGeneration(): Promise<boolean> {
     if (!this.isAvailable()) return true;
-    this.generating = false;
+    if (this.usingSD) { await SDModule.cancel(); return true; }
     return await DiffusionModule.cancelGeneration();
   }
 
@@ -272,12 +309,12 @@ class LocalDreamGeneratorService {
   }
 
   async clearOpenCLCache(modelPath: string): Promise<number> {
-    if (Platform.OS !== 'android' || !this.isAvailable()) return 0;
+    if (this.usingSD || Platform.OS !== 'android' || !this.isAvailable()) return 0;
     return await DiffusionModule.clearOpenCLCache(modelPath);
   }
 
   async hasKernelCache(modelPath: string): Promise<boolean> {
-    if (Platform.OS !== 'android' || !this.isAvailable()) return true;
+    if (this.usingSD || Platform.OS !== 'android' || !this.isAvailable()) return true;
     return await DiffusionModule.hasOpenCLCache(modelPath);
   }
 
diff --git a/src/services/modelManager/scan.ts b/src/services/modelManager/scan.ts
index 3a22ccb28..b870ab33b 100644
--- a/src/services/modelManager/scan.ts
+++ b/src/services/modelManager/scan.ts
@@ -1,3 +1,4 @@
+import { getSDImageModels } from '../huggingFaceModelBrowser';
 import RNFS from 'react-native-fs';
 import { statFile } from '../../utils/fileStat';
 import { unzip } from 'react-native-zip-archive';
@@ -84,7 +85,8 @@ export async function cleanupMMProjEntries(modelsDir: string): Promise<number> {
   return removedCount;
 }
 
-function detectBackend(dirName: string): 'mnn' | 'qnn' | 'coreml' {
+function detectBackend(dirName: string): 'mnn' | 'qnn' | 'coreml' | 'sd' {
+  if (getSDImageModels().some(model => model.id === dirName)) return 'sd';
   if (dirName.includes('qnn') || dirName.includes('8gen') || dirName.includes('npu')) return 'qnn';
   if (dirName.includes('coreml')) return 'coreml';
   return 'mnn';
@@ -138,14 +140,14 @@ async function isValidZip(zipPath: string): Promise<boolean> {
 /** Build the ONNXImageModel record for a recovered on-disk dir (coreml resolves its inner model dir). */
 async function buildRecoveredImageModel(
   item: { name: string; path: string },
-  backend: 'mnn' | 'qnn' | 'coreml',
+  backend: 'mnn' | 'qnn' | 'coreml' | 'sd',
 ): Promise<ONNXImageModel> {
   let modelPath = item.path;
   if (backend === 'coreml') modelPath = await resolveCoreMLModelDir(item.path).catch(() => item.path);
   const totalSize = await getDirSize(item.path);
   return {
     id: item.name,
-    name: item.name.replaceAll('_', ' '),
+    name: getSDImageModels().find(model => model.id === item.name)?.displayName ?? item.name.replaceAll('_', ' '),
     description: '',
     modelPath,
     size: totalSize,
diff --git a/src/types/index.ts b/src/types/index.ts
index c970b5a89..2dc819d11 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -171,7 +171,7 @@ export interface ImageModelRecommendation {
   recommendedModels?: string[];
   bannerText: string;
   warning?: string;
-  compatibleBackends: Array<'mnn' | 'qnn' | 'coreml'>;
+  compatibleBackends: Array<'mnn' | 'qnn' | 'coreml' | 'sd'>;
 }
 
 // Hardware-related types
@@ -373,7 +373,7 @@ export interface ONNXImageModel {
   downloadedAt: string;
   size: number;
   style?: string;
-  backend?: 'mnn' | 'qnn' | 'coreml';
+  backend?: 'mnn' | 'qnn' | 'coreml' | 'sd';
   attentionVariant?: 'split_einsum' | 'original';
 }
 
diff --git a/src/utils/imageBackend.ts b/src/utils/imageBackend.ts
index dec713209..b1f232e25 100644
--- a/src/utils/imageBackend.ts
+++ b/src/utils/imageBackend.ts
@@ -15,6 +15,8 @@ export function imageBackendLabel(
   fallback: string = 'GPU',
 ): string {
   switch (backend) {
+    case 'sd':
+      return 'Stable Diffusion';
     case 'coreml':
       return 'Core ML';
     case 'qnn':
diff --git a/src/utils/imageModelIntegrity.ts b/src/utils/imageModelIntegrity.ts
index cfed0c20d..f514825b8 100644
--- a/src/utils/imageModelIntegrity.ts
+++ b/src/utils/imageModelIntegrity.ts
@@ -17,13 +17,14 @@
  * coreml (iOS) uses a different layout validated elsewhere, so it's not checked here.
  */
 import RNFS from 'react-native-fs';
+import { getSDImageModels } from '../services/huggingFaceModelBrowser';
 import { unzip } from 'react-native-zip-archive';
 import { ImageModelIncompleteError } from './modelLoadErrors';
 import logger from './logger';
 
 type ReadDirItem = Awaited<ReturnType<typeof RNFS.readDir>>[number];
 
-export type ImageBackend = 'mnn' | 'qnn' | 'coreml';
+export type ImageBackend = 'mnn' | 'qnn' | 'coreml' | 'sd';
 
 export interface ImageDirEntry {
   name: string;
@@ -54,6 +55,13 @@ export function checkImageModelFiles(files: ImageDirEntry[], backend: ImageBacke
   const sizeByName = new Map<string, number>();
   for (const f of files) if (f.isFile) sizeByName.set(f.name, f.size);
 
+  if (backend === 'sd') {
+    const pack = getSDImageModels().find(model => sizeByName.has(model.fileName));
+    if (!pack?.huggingFaceFiles) return { complete: false, missing: ['image model pack'] };
+    const missing = pack.huggingFaceFiles.filter(file => (sizeByName.get(file.path) ?? 0) <= 0).map(file => file.path);
+    return { complete: missing.length === 0, missing };
+  }
+
   const missing: string[] = [];
   const requirePresent = (name: string): void => {
     const size = sizeByName.get(name);
@@ -115,7 +123,13 @@ export async function resolveImageModelDir(modelPath: string, backend: ImageBack
   const marker = backend === 'mnn' ? 'unet.mnn' : 'unet.bin';
   const hasMarker = async (dir: string): Promise<boolean> => {
     // qnn models also ship a clip_v2.mnn; the marker that disambiguates is the unet.
-    try { return await RNFS.exists(`${dir}/${marker}`); } catch { return false; }
+    try {
+      if (backend === 'sd') {
+        for (const model of getSDImageModels()) if (await RNFS.exists(`${dir}/${model.fileName}`)) return true;
+        return false;
+      }
+      return await RNFS.exists(`${dir}/${marker}`);
+    } catch { return false; }
   };
   if (await hasMarker(modelPath)) return modelPath;
   let items: ReadDirItem[];
@@ -141,7 +155,7 @@ export async function resolveImageModelDir(modelPath: string, backend: ImageBack
 export async function validateImageModelDir(modelPath: string, backend: ImageBackend): Promise<IntegrityResult> {
   if (backend === 'coreml') return { complete: true, missing: [] };
   const dir = await resolveImageModelDir(modelPath, backend);
-  if (!dir) return { complete: false, missing: [backend === 'mnn' ? 'unet.mnn' : 'unet.bin'] };
+  if (!dir) return { complete: false, missing: [backend === 'sd' ? 'image model pack' : backend === 'mnn' ? 'unet.mnn' : 'unet.bin'] };
   let items: ReadDirItem[];
   try { items = await RNFS.readDir(dir); } catch { return { complete: false, missing: ['<unreadable model dir>'] }; }
   const files: ImageDirEntry[] = items.map(i => ({ name: i.name, size: Number(i.size) || 0, isFile: i.isFile() }));
@@ -161,7 +175,7 @@ export async function ensureImageExtractionComplete(opts: {
   modelId: string;
 }): Promise<void> {
   const { backend, modelDir, zipPath, modelId } = opts;
-  if (backend !== 'mnn' && backend !== 'qnn') return;
+  if (backend !== 'mnn' && backend !== 'qnn' && backend !== 'sd') return;
   let result = await validateImageModelDir(modelDir, backend);
   if (!result.complete) {
     logger.warn(`[ImageDownload] incomplete extraction ${modelId} missing=[${result.missing.join(',')}] — re-unzipping once`);

From 5e764cd8a76460bf34977145ecd704ab129af024 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 15:20:54 +0530
Subject: [PATCH 039/129] feat(sync): describe portable mobile SD image packs
 [skip ci]

---
 src/services/modelManager/imageTransfer.ts | 23 +++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/services/modelManager/imageTransfer.ts b/src/services/modelManager/imageTransfer.ts
index 495589e94..b313bd97b 100644
--- a/src/services/modelManager/imageTransfer.ts
+++ b/src/services/modelManager/imageTransfer.ts
@@ -1,3 +1,4 @@
+import { getSDImageModels } from '../huggingFaceModelBrowser';
 import type { DevicePlatform, TransferredModelManifest } from '@offgrid/sync';
 import type { ONNXImageModel } from '../../types';
 
@@ -6,7 +7,7 @@ const IMAGE_TRANSFER_ARCHIVE_SUFFIX = '.offgrid-image.zip';
 type MobileImagePlatform = Extract<DevicePlatform, 'ios' | 'android'>;
 type TransferableImageBackend = Extract<
   NonNullable<ONNXImageModel['backend']>,
-  'coreml' | 'mnn'
+  'coreml' | 'mnn' | 'sd'
 >;
 
 export interface TransferredImageDescriptor {
@@ -20,7 +21,7 @@ export interface TransferredImageDescriptor {
 
 export interface TransferredImageManifest extends TransferredModelManifest {
   kind: 'image';
-  engine: 'coreml' | 'localdream-mnn';
+  engine: 'coreml' | 'localdream-mnn' | 'mobile-sd-gguf';
   platform: MobileImagePlatform;
   image: TransferredImageDescriptor;
 }
@@ -36,10 +37,11 @@ function isSafeImageModelId(id: string): boolean {
   );
 }
 
-function expectedImageRuntime(platform: MobileImagePlatform): {
+function expectedImageRuntime(platform: MobileImagePlatform, backend?: ONNXImageModel['backend']): {
   backend: TransferableImageBackend;
   engine: TransferredImageManifest['engine'];
 } {
+  if (backend === 'sd') return { backend: 'sd', engine: 'mobile-sd-gguf' };
   return platform === 'ios'
     ? { backend: 'coreml', engine: 'coreml' }
     : { backend: 'mnn', engine: 'localdream-mnn' };
@@ -48,8 +50,8 @@ function expectedImageRuntime(platform: MobileImagePlatform): {
 /**
  * Why an installed image model may or may not move from this phone.
  *
- * The generated images are portable. The model packages are not: iOS loads Core ML bundles and
- * Android LocalDream loads an MNN package. QNN is intentionally excluded because an Android label
+ * SD image packs work on both mobile platforms. Core ML and LocalDream MNN packages
+ * stay on their original platform. QNN is intentionally excluded because an Android label
  * does not prove that the receiving device has the matching Qualcomm target.
  */
 export function imageModelTransferBlocker(
@@ -59,7 +61,7 @@ export function imageModelTransferBlocker(
   if (!isSafeImageModelId(model.id)) {
     return 'the image model identity is not safe to transfer';
   }
-  const expected = expectedImageRuntime(platform);
+  const expected = expectedImageRuntime(platform, model.backend);
   if (model.backend !== expected.backend) {
     if (model.backend === 'qnn') {
       return 'QNN image models are tied to a specific Qualcomm target and cannot be sent safely';
@@ -68,6 +70,7 @@ export function imageModelTransferBlocker(
       ? 'iPhone and iPad can send only Core ML image models'
       : 'Android can send only LocalDream MNN image models';
   }
+  if (model.backend === 'sd' && !getSDImageModels().some(pack => pack.id === model.id)) return 'this image model pack is not supported';
   if (!Number.isFinite(model.size) || model.size <= 0) {
     return 'the image model size is not valid';
   }
@@ -114,7 +117,7 @@ export function transferredImageManifest(
   if (!Number.isSafeInteger(archiveSizeBytes) || archiveSizeBytes <= 0) {
     throw new Error('the image model archive size is not valid');
   }
-  const runtime = expectedImageRuntime(platform);
+  const runtime = expectedImageRuntime(platform, model.backend);
   return {
     id: model.id,
     name: model.name,
@@ -161,9 +164,11 @@ export function transferredImageDescriptor(
   if (manifest.kind !== 'image') {
     throw new Error('this is not an image model package');
   }
-  const expected = expectedImageRuntime(receiverPlatform);
+  const sdPack = manifest.engine === 'mobile-sd-gguf';
+  if (sdPack && !getSDImageModels().some(pack => pack.id === manifest.id)) throw new Error('This image model pack is not supported.');
+  const expected = expectedImageRuntime(receiverPlatform, sdPack ? 'sd' : undefined);
   if (
-    manifest.platform !== receiverPlatform ||
+    (!sdPack && manifest.platform !== receiverPlatform) ||
     manifest.engine !== expected.engine
   ) {
     throw new Error(

From af12fc345bbaaff2c7bad90a807e7498647e149c Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 15:20:54 +0530
Subject: [PATCH 040/129] fix(video): name the frame decoding stage [skip ci]

---
 src/components/VideoGenerationStatus.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/VideoGenerationStatus.tsx b/src/components/VideoGenerationStatus.tsx
index 0fae05e8a..d0eb71c43 100644
--- a/src/components/VideoGenerationStatus.tsx
+++ b/src/components/VideoGenerationStatus.tsx
@@ -42,7 +42,7 @@ export function VideoGenerationStatus({
       : state.stage === 'encoding'
       ? 'Saving video'
       : samplingFinished
-      ? 'Finishing video'
+      ? 'Decoding video frames'
       : 'Generating video';
   const steps =
     state.stage === 'generating' && state.progress && !samplingFinished

From e33aae2d81c0eb50692f29687239fd7eff69fb02 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 15:23:35 +0530
Subject: [PATCH 041/129] fix(image): preserve active model residency and
 shared image identity [skip ci]

---
 src/services/activeModelService/index.ts | 6 ++++--
 src/services/localDreamGenerator.ts      | 6 +++---
 src/services/modelResidency/index.ts     | 8 +++++++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/services/activeModelService/index.ts b/src/services/activeModelService/index.ts
index 1bd57552e..bd4748229 100644
--- a/src/services/activeModelService/index.ts
+++ b/src/services/activeModelService/index.ts
@@ -333,7 +333,7 @@ class ActiveModelService {
           // os_proc RAM (budgetForSpec dirty-pressure), or a sidecar stacks onto its
           // generation spike and jetsams the app. Without this flag the resident-dirty
           // arm of the gate is a no-op.
-          { key: 'image', type: 'image', dirtyMemory: true, sizeMB: Math.round((hardwareService.estimateImageModelRam(model) || 0) / (1024 * 1024)) },
+          { key: 'image', type: 'image', dirtyMemory: true, canEvict: () => !onnxImageGeneratorService.isGenerating(), sizeMB: Math.round((hardwareService.estimateImageModelRam(model) || 0) / (1024 * 1024)) },
           () => this.doUnloadImageModelLocked(true), // eviction keeps the selection
         );
       },
@@ -376,7 +376,9 @@ class ActiveModelService {
     this.notifyListeners();
     try {
       if (isNativeLoaded) {
-        await onnxImageGeneratorService.unloadModel();
+        if (!(await onnxImageGeneratorService.unloadModel())) {
+          throw new Error('The image model is still in use and could not be unloaded.');
+        }
       }
       this.loadedImageModelId = null;
       this.loadedImageModelThreads = null;
diff --git a/src/services/localDreamGenerator.ts b/src/services/localDreamGenerator.ts
index 4731a3fc4..507c56b90 100644
--- a/src/services/localDreamGenerator.ts
+++ b/src/services/localDreamGenerator.ts
@@ -7,7 +7,7 @@ import {
 } from '../types';
 import { resolveSDImagePack } from './huggingFaceModelBrowser';
 import { validateImageModelDir } from '../utils/imageModelIntegrity';
-import { generateRandomSeed } from '../utils/generateId';
+import { generateId, generateRandomSeed } from '../utils/generateId';
 import logger from '../utils/logger';
 import { resolveOwnedDocumentPath } from '../utils/resolveDocumentPath';
 
@@ -225,7 +225,7 @@ class LocalDreamGeneratorService {
       const nativeParams = this.buildNativeParams(params, trimmedPrompt);
       let result;
       if (this.usingSD) {
-        const id = `${Date.now()}-${generateRandomSeed()}`;
+        const id = generateId();
         const directory = `${RNFS.DocumentDirectoryPath}/generated_images`;
         await RNFS.mkdir(directory);
         result = await SDModule.generateImage({ ...nativeParams, id, outputPath: `${directory}/${id}.png` });
@@ -254,7 +254,7 @@ class LocalDreamGeneratorService {
     return await DiffusionModule.cancelGeneration();
   }
 
-  async isGenerating(): Promise<boolean> {
+  isGenerating(): boolean {
     return this.generating;
   }
 
diff --git a/src/services/modelResidency/index.ts b/src/services/modelResidency/index.ts
index fe1e05585..d7dfb04a0 100644
--- a/src/services/modelResidency/index.ts
+++ b/src/services/modelResidency/index.ts
@@ -433,7 +433,13 @@ class ModelResidencyManager {
     return this.runExclusive(`evict:${key}`, async () => {
       const r = this.residents.get(key);
       if (!r) return false;
-      await r.unload().catch(err => logger.log(`[ModelResidency] evict ${key} unload failed:`, err));
+      if (r.canEvict && !r.canEvict()) return false;
+      try {
+        await r.unload();
+      } catch (err) {
+        logger.log(`[ModelResidency] evict ${key} unload failed:`, err);
+        return false;
+      }
       this.residents.delete(key);
       logger.log(`[ModelResidency] evicted ${r.type} (${key}) by user request`);
       return true;

From 264372247bbc201c0bfecc2abc7f836dde895a05 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 15:27:00 +0530
Subject: [PATCH 042/129] fix(image): reuse verified pack parts and update
 transfer integration [skip ci]

---
 pro                                  | 2 +-
 src/services/imageDownloadActions.ts | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/pro b/pro
index 64f7b78a8..96125dd26 160000
--- a/pro
+++ b/pro
@@ -1 +1 @@
-Subproject commit 64f7b78a8bc6d455333dffc52d702d0e991097d4
+Subproject commit 96125dd26dc5ba5e7d789d5c396fd8b43ea6fd4b
diff --git a/src/services/imageDownloadActions.ts b/src/services/imageDownloadActions.ts
index 420820dfc..aa06526db 100644
--- a/src/services/imageDownloadActions.ts
+++ b/src/services/imageDownloadActions.ts
@@ -181,6 +181,15 @@ async function downloadSequentialFiles(opts: {
     const filePath = `${modelDir}/${file.relativePath}`;
     const fileDir = filePath.substring(0, filePath.lastIndexOf('/'));
     await ensureDirectory(fileDir);
+    // Reuse a complete pinned part after a restart or device-to-device copy.
+    // Size alone cannot distinguish a valid model from corrupted bytes.
+    if (file.sha256 && (await statFile(filePath))?.size === file.size &&
+        (await RNFS.hash(filePath, 'sha256')).toLowerCase() === file.sha256.toLowerCase()) {
+      assertNotCancelled(modelInfo.id, runtime);
+      downloadedSize += file.size;
+      useDownloadStore.getState().updateProgress(syntheticId, downloadedSize, totalSize);
+      continue;
+    }
 
     const tempFileName = `${modelInfo.id}_${file.relativePath.replaceAll('/', '_')}`;
     const capturedDownloadedSize = downloadedSize;

From c277ec188d39eb66a522ae4515bb7e7c18b4a47d Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 15:46:55 +0530
Subject: [PATCH 043/129] fix(video): bound Android GPU decode graphs [skip ci]

---
 native/video/common/VideoRuntime.hpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/native/video/common/VideoRuntime.hpp b/native/video/common/VideoRuntime.hpp
index c67b22bb0..694c14b3a 100644
--- a/native/video/common/VideoRuntime.hpp
+++ b/native/video/common/VideoRuntime.hpp
@@ -219,6 +219,13 @@ class VideoRuntime {
       params.sample_params.scheduler = sd_get_default_scheduler(loaded, EULER_SAMPLE_METHOD);
       params.vae_tiling_params.enabled = true;
 #ifdef __ANDROID__
+      // Mobile Vulkan drivers can lose the device on a full temporal decode.
+      // Keep each decode graph small instead of waiting for allocation failure:
+      // a lost GPU cannot recover through the allocator's tiling retry.
+      params.vae_tiling_params.temporal_tiling = true;
+      params.vae_tiling_params.tile_size_w = 128;
+      params.vae_tiling_params.tile_size_h = 128;
+      params.vae_tiling_params.extra_tiling_args = "temporal_tile_frames=1";
       conditioning(preferred.empty() ? "cpu" : "npu");
 #else
       conditioning("");

From 8d858232a2ad7b11a55fa26200ad386f7b147f4a Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 15:46:55 +0530
Subject: [PATCH 044/129] fix(image): recover verified SD packs after
 interrupted registration [skip ci]

---
 src/services/imageDownloadActions.ts | 20 ++------------------
 src/services/modelManager/scan.ts    | 20 +++++++++++++++++++-
 src/utils/imageModelIntegrity.ts     | 19 +++++++++++++++++++
 3 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/src/services/imageDownloadActions.ts b/src/services/imageDownloadActions.ts
index aa06526db..3d4e9746b 100644
--- a/src/services/imageDownloadActions.ts
+++ b/src/services/imageDownloadActions.ts
@@ -13,7 +13,8 @@ import { useDownloadStore, isActiveStatus } from '../stores/downloadStore';
 import { makeImageModelKey } from '../utils/modelKey';
 import { ImageModelDescriptor, ImageDownloadDeps } from './imageModelDownloadTypes';
 import { getQnnWarningMessage, showQnnWarningAlert } from './imageDownloadQnn';
-import { ensureImageExtractionComplete } from '../utils/imageModelIntegrity';
+import { ensureImageExtractionComplete, validateMultifileComplete } from '../utils/imageModelIntegrity';
+export { validateMultifileComplete } from '../utils/imageModelIntegrity';
 import logger from '../utils/logger';
 
 // ImageDownloadDeps now lives in ./types (so imageDownloadQnn can import it without cycling back
@@ -212,23 +213,6 @@ async function downloadSequentialFiles(opts: {
   }
 }
 
-/** Check all parts before registration. Pinned packs also supply a content hash;
- * legacy descriptors retain their non-empty check because their sizes can drift. */
-export async function validateMultifileComplete(
-  modelDir: string,
-  files: { relativePath: string; sha256?: string }[],
-): Promise<void> {
-  if (files.length === 0) throw new Error('Download file list missing. Please retry.');
-  for (const file of files) {
-    const filePath = `${modelDir}/${file.relativePath}`;
-    const size = (await statFile(filePath))?.size ?? -1;
-    if (size <= 0) throw new Error(`Downloaded file missing or empty: ${file.relativePath} — tap retry`);
-    if (file.sha256 && (await RNFS.hash(filePath, 'sha256')).toLowerCase() !== file.sha256.toLowerCase()) {
-      throw new Error(`Downloaded file is damaged: ${file.relativePath} — tap retry`);
-    }
-  }
-}
-
 /** Remove the entry from the store. Use after register-and-notify or on error. */
 function removeStoreEntry(modelId: string) {
   useDownloadStore.getState().remove(makeImageModelKey(modelId));
diff --git a/src/services/modelManager/scan.ts b/src/services/modelManager/scan.ts
index b870ab33b..c9f5be9b3 100644
--- a/src/services/modelManager/scan.ts
+++ b/src/services/modelManager/scan.ts
@@ -6,7 +6,7 @@ import { DownloadedModel, LlamaDownloadedModel, ONNXImageModel } from '../../typ
 import { loadDownloadedModels, saveModelsList } from './storage';
 import { basenameOf } from './reconcileStoredPaths';
 import { resolveCoreMLModelDir } from '../../utils/coreMLModelUtils';
-import { ensureImageExtractionComplete } from '../../utils/imageModelIntegrity';
+import { ensureImageExtractionComplete, validateMultifileComplete } from '../../utils/imageModelIntegrity';
 // Single source of truth for projector detection + model↔projector matching (see src/services/mmproj.ts).
 import { isMMProjFile, pickMmProjForModel } from '../mmproj';
 
@@ -249,6 +249,24 @@ export async function reconcileFinishedImageDownloads(opts: ReconcileImageModels
         continue;
       }
 
+      // A complete SD pack can survive a stop between its last file and _ready.
+      // Keep partial known packs so the normal download can reuse valid parts.
+      const sdPack = getSDImageModels().find(model => model.id === item.name);
+      if (sdPack?.huggingFaceFiles) {
+        try {
+          await validateMultifileComplete(item.path, sdPack.huggingFaceFiles.map(file => ({
+            relativePath: file.path, sha256: file.sha256,
+          })));
+          await RNFS.writeFile(readyPath, '', 'utf8');
+          const model = await buildRecoveredImageModel(item, 'sd');
+          await addImageModel(model);
+          recovered.push(model);
+        } catch {
+          // Incomplete or damaged parts stay unregistered until Download repairs them.
+        }
+        continue;
+      }
+
       // No _ready — check if a zip exists to re-unzip (mid-unzip kill).
       if (await RNFS.exists(`${item.path}/_zip_name`)) {
         // Non-fatal on unexpected error: leave the dir for the next startup attempt.
diff --git a/src/utils/imageModelIntegrity.ts b/src/utils/imageModelIntegrity.ts
index f514825b8..94fcf3708 100644
--- a/src/utils/imageModelIntegrity.ts
+++ b/src/utils/imageModelIntegrity.ts
@@ -17,6 +17,7 @@
  * coreml (iOS) uses a different layout validated elsewhere, so it's not checked here.
  */
 import RNFS from 'react-native-fs';
+import { statFile } from './fileStat';
 import { getSDImageModels } from '../services/huggingFaceModelBrowser';
 import { unzip } from 'react-native-zip-archive';
 import { ImageModelIncompleteError } from './modelLoadErrors';
@@ -187,3 +188,21 @@ export async function ensureImageExtractionComplete(opts: {
     throw new ImageModelIncompleteError(result.missing);
   }
 }
+
+/** Check all parts before registration. Pinned packs also supply a content hash;
+ * legacy descriptors retain their non-empty check because their sizes can drift. */
+export async function validateMultifileComplete(
+  modelDir: string,
+  files: { relativePath: string; sha256?: string }[],
+): Promise<void> {
+  if (files.length === 0) throw new Error('Download file list missing. Please retry.');
+  for (const file of files) {
+    const filePath = `${modelDir}/${file.relativePath}`;
+    const size = (await statFile(filePath))?.size ?? -1;
+    if (size <= 0) throw new Error(`Downloaded file missing or empty: ${file.relativePath} — tap retry`);
+    if (file.sha256 && (await RNFS.hash(filePath, 'sha256')).toLowerCase() !== file.sha256.toLowerCase()) {
+      throw new Error(`Downloaded file is damaged: ${file.relativePath} — tap retry`);
+    }
+  }
+}
+

From 1986b231cecfcb40a070e1c9c4740e7611e2e675 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 15:48:37 +0530
Subject: [PATCH 045/129] style(image): normalize integrity helper whitespace
 [skip ci]

---
 src/utils/imageModelIntegrity.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/utils/imageModelIntegrity.ts b/src/utils/imageModelIntegrity.ts
index 94fcf3708..b71aae30f 100644
--- a/src/utils/imageModelIntegrity.ts
+++ b/src/utils/imageModelIntegrity.ts
@@ -205,4 +205,3 @@ export async function validateMultifileComplete(
     }
   }
 }
-

From c261d94170a36db761eb4eb40d32a3893a775455 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 15:53:40 +0530
Subject: [PATCH 046/129] fix(video): avoid Adreno crash inside device-fault
 diagnostics [skip ci]

---
 scripts/prepare-video-runtime.sh               |  2 +-
 .../video/android-vulkan-device-fault.patch    | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 scripts/video/android-vulkan-device-fault.patch

diff --git a/scripts/prepare-video-runtime.sh b/scripts/prepare-video-runtime.sh
index f46fa43fa..c17d34f9d 100644
--- a/scripts/prepare-video-runtime.sh
+++ b/scripts/prepare-video-runtime.sh
@@ -16,7 +16,7 @@ PATCH="$ROOT/scripts/video/android-vulkan-dispatch.patch"
 if ! git -C "$SOURCE/ggml" apply --reverse --check "$PATCH" 2>/dev/null; then
   git -C "$SOURCE/ggml" apply "$PATCH"
 fi
-for entry in "ggml:android-hexagon.patch" "ggml:android-hexagon-buffer-validation.patch" ".:android-hardware-fallback.patch" ".:conditioning-errors.patch"; do
+for entry in "ggml:android-vulkan-device-fault.patch" "ggml:android-hexagon.patch" "ggml:android-hexagon-buffer-validation.patch" ".:android-hardware-fallback.patch" ".:conditioning-errors.patch"; do
   target="${entry%%:*}"
   patch="$ROOT/scripts/video/${entry#*:}"
   if ! git -C "$SOURCE/$target" apply --reverse --check "$patch" 2>/dev/null; then
diff --git a/scripts/video/android-vulkan-device-fault.patch b/scripts/video/android-vulkan-device-fault.patch
new file mode 100644
index 000000000..9762ca261
--- /dev/null
+++ b/scripts/video/android-vulkan-device-fault.patch
@@ -0,0 +1,18 @@
+--- a/src/ggml-vulkan/ggml-vulkan.cpp
++++ b/src/ggml-vulkan/ggml-vulkan.cpp
+@@ -146,6 +146,15 @@
+     return std::find(lightning_indexer_k_types.begin(), lightning_indexer_k_types.end(), type) != lightning_indexer_k_types.end();
+ }
+ void ggml_vk_print_device_fault_info(const vk_device& device) {
++#ifdef __ANDROID__
++    // Adreno's fault-info callback can dereference null after device loss
++    // (observed on SM8635). Keep normal error reporting and exception handling
++    // alive instead of crashing while asking the driver for extra diagnostics.
++    if (device->vendor_id == VK_VENDOR_ID_QUALCOMM) {
++        GGML_LOG_ERROR("ggml_vulkan: skipping unsafe Adreno device-fault query\n");
++        return;
++    }
++#endif
+     if (!device->device_fault || !device->pfn_vkGetDeviceFaultInfoEXT) {
+         return;
+     }

From d4d580769bf0101b56c3ba6172a823727db7b00d Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 16:07:12 +0530
Subject: [PATCH 047/129] feat(image): search and download compatible SD packs
 from Hugging Face [skip ci]

---
 pro                                        |  2 +-
 src/screens/ModelsScreen/useImageModels.ts | 37 +++++++++++++---
 src/services/huggingFaceModelBrowser.ts    | 51 +++++++++++++++++++---
 src/services/localDreamGenerator.ts        |  2 +-
 src/services/modelManager/imageTransfer.ts |  5 +--
 src/services/modelManager/scan.ts          | 15 ++++---
 src/utils/imageModelIntegrity.ts           | 11 +++--
 7 files changed, 94 insertions(+), 29 deletions(-)

diff --git a/pro b/pro
index 96125dd26..d3b3868f5 160000
--- a/pro
+++ b/pro
@@ -1 +1 @@
-Subproject commit 96125dd26dc5ba5e7d789d5c396fd8b43ea6fd4b
+Subproject commit d3b3868f54c393b9447cedaa2c0f0a29ea97da7e
diff --git a/src/screens/ModelsScreen/useImageModels.ts b/src/screens/ModelsScreen/useImageModels.ts
index b902e0c2f..078021ced 100644
--- a/src/screens/ModelsScreen/useImageModels.ts
+++ b/src/screens/ModelsScreen/useImageModels.ts
@@ -5,7 +5,7 @@ import { useAppStore } from '../../stores';
 import { useDownloadStore } from '../../stores/downloadStore';
 import { makeImageModelKey } from '../../utils/modelKey';
 import { modelManager, hardwareService, backgroundDownloadService } from '../../services';
-import { fetchAvailableModels, getSDImageModels, HFImageModel, guessStyle } from '../../services/huggingFaceModelBrowser';
+import { fetchAvailableModels, getSDImageModels, searchSDImageModels, HFImageModel, guessStyle } from '../../services/huggingFaceModelBrowser';
 import { fetchAvailableCoreMLModels } from '../../services/coreMLModelBrowser';
 import { ImageModelRecommendation } from '../../types';
 import { BackendFilter, ImageFilterDimension, ImageModelDescriptor } from './types';
@@ -24,6 +24,26 @@ export function useImageModels(setAlertState: (s: AlertState) => void) {
   const [imageFilterExpanded, setImageFilterExpanded] = useState<ImageFilterDimension>(null);
   const [imageSearchQuery, setImageSearchQuery] = useState('');
   const [imageFiltersVisible, setImageFiltersVisible] = useState(false);
+  const [sdSearchModels, setSDSearchModels] = useState<HFImageModel[]>([]);
+  const [sdSearchLoading, setSDSearchLoading] = useState(false);
+  const [sdSearchError, setSDSearchError] = useState<string | null>(null);
+  const [sdSearchRevision, setSDSearchRevision] = useState(0);
+  useEffect(() => {
+    let current = true;
+    setSDSearchModels([]);
+    setSDSearchError(null);
+    const query = imageSearchQuery.trim();
+    if (!query) { setSDSearchLoading(false); return; }
+    setSDSearchLoading(true);
+    const timer = setTimeout(() => {
+      searchSDImageModels(query)
+        .then(models => { if (current) setSDSearchModels(models); })
+        .catch(error => { if (current) setSDSearchError(error.message ?? 'Image search failed. Try again.'); })
+        .finally(() => { if (current) setSDSearchLoading(false); });
+    }, 300);
+    return () => { current = false; clearTimeout(timer); };
+  }, [imageSearchQuery, sdSearchRevision]);
+
   const [imageRec, setImageRec] = useState<ImageModelRecommendation | null>(null);
   const [userChangedBackendFilter, setUserChangedBackendFilter] = useState(false);
   const [showRecommendedOnly, setShowRecommendedOnly] = useState(true);
@@ -51,6 +71,7 @@ export function useImageModels(setAlertState: (s: AlertState) => void) {
   }, [setDownloadedImageModels]);
 
   const loadHFModels = useCallback(async (forceRefresh = false) => {
+    if (forceRefresh) setSDSearchRevision(value => value + 1);
     setHfModelsLoading(true); setHfModelsError(null);
     try {
       if (Platform.OS === 'ios') {
@@ -158,20 +179,22 @@ export function useImageModels(setAlertState: (s: AlertState) => void) {
     return true;
   }, [imageRec]);
 
+  const allHFModels = useMemo(() => [...new Map([...availableHFModels, ...sdSearchModels].map(model => [model.id, model])).values()], [availableHFModels, sdSearchModels]);
   const filteredHFModels = useMemo(() => {
     const query = imageSearchQuery.toLowerCase().trim();
-    const filtered = availableHFModels.filter(m => {
-      if (showRecommendedOnly && imageRec && !isRecommendedModel(m)) return false;
-      if (backendFilter !== 'all' && m.backend !== backendFilter) return false;
+    const searchedIds = new Set(sdSearchModels.map(model => model.id));
+    const filtered = allHFModels.filter(m => {
+      if (!query && showRecommendedOnly && imageRec && !isRecommendedModel(m)) return false;
+      if ((!query || userChangedBackendFilter) && backendFilter !== 'all' && m.backend !== backendFilter) return false;
       if (styleFilter !== 'all' && guessStyle(m.name) !== styleFilter) return false;
       if (!matchesSdVersionFilter(m.name, sdVersionFilter)) return false;
       if (downloadedImageModels.some(d => d.id === m.id)) return false;
-      if (query && !m.displayName.toLowerCase().includes(query) && !m.name.toLowerCase().includes(query)) return false;
+      if (query && !searchedIds.has(m.id) && !m.displayName.toLowerCase().includes(query) && !m.name.toLowerCase().includes(query)) return false;
       return true;
     });
     if (!showRecommendedOnly) filtered.sort((a, b) => a.displayName.localeCompare(b.displayName));
     return filtered;
-  }, [availableHFModels, backendFilter, styleFilter, sdVersionFilter, downloadedImageModels, imageSearchQuery, imageRec, isRecommendedModel, showRecommendedOnly]);
+  }, [allHFModels, sdSearchModels, userChangedBackendFilter, backendFilter, styleFilter, sdVersionFilter, downloadedImageModels, imageSearchQuery, imageRec, isRecommendedModel, showRecommendedOnly]);
 
   const hasActiveImageFilters = backendFilter !== 'all' || styleFilter !== 'all' || sdVersionFilter !== 'all';
   const imageRecommendation = imageRec?.bannerText ?? 'Loading recommendation...';
@@ -196,7 +219,7 @@ export function useImageModels(setAlertState: (s: AlertState) => void) {
   };
 
   return {
-    availableHFModels, hfModelsLoading, hfModelsError,
+    availableHFModels: allHFModels, hfModelsLoading: hfModelsLoading || sdSearchLoading, hfModelsError: imageSearchQuery.trim() ? sdSearchError : hfModelsError,
     backendFilter, setBackendFilter,
     styleFilter, setStyleFilter,
     sdVersionFilter, setSdVersionFilter,
diff --git a/src/services/huggingFaceModelBrowser.ts b/src/services/huggingFaceModelBrowser.ts
index 197934bb2..b296ddd2c 100644
--- a/src/services/huggingFaceModelBrowser.ts
+++ b/src/services/huggingFaceModelBrowser.ts
@@ -1,4 +1,5 @@
-import { CATALOG } from '@offgrid/models';
+import { CATALOG, searchHuggingFace, getModelFiles } from '@offgrid/models';
+import RNFS from 'react-native-fs';
 import type { ImageModelDescriptor } from './imageModelDownloadTypes';
 
 export interface HFImageModel {
@@ -157,11 +158,51 @@ export function getSDImageModels(): HFImageModel[] {
   }));
 }
 
-export function resolveSDImagePack(modelId: string, modelPath: string) {
-  const model = getSDImageModels().find(candidate => candidate.id === modelId);
-  if (!model?.huggingFaceFiles) throw new Error('This image model pack is not supported.');
+/** Supported SD image weights; other architectures need their own complete pack. */
+export const isSDImageWeight = (name: string): boolean => /^qwen_image_2\.1-.*\.gguf$/i.test(name);
+
+/** The same required-file list is used by loading, recovery, and model transfer. */
+export function getSDImagePackFiles(names: string[], modelId?: string): NonNullable<HFImageModel['huggingFaceFiles']> | null {
+  const weights = names.filter(isSDImageWeight);
+  if (weights.length !== 1) return null;
+  const template = getSDImageModels()[0];
+  if (!template?.huggingFaceFiles) return null;
+  return template.huggingFaceFiles.map(file => file.path === template.fileName
+    ? { path: weights[0], size: 0, sha256: modelId === template.id && weights[0] === file.path ? file.sha256 : undefined }
+    : file);
+}
+
+export async function searchSDImageModels(query: string): Promise<HFImageModel[]> {
+  const repositories = await searchHuggingFace(query, { kind: 'image', limit: 10 });
+  const template = getSDImageModels()[0];
+  if (!template?.huggingFaceFiles) return [];
+  const companion = template.huggingFaceFiles.filter(file => file.path !== template.fileName);
+  const listings = await Promise.allSettled(repositories.map(async repo => {
+    const files = await getModelFiles(repo.id, { kind: 'image' });
+    return files.filter(file => isSDImageWeight(file.fileName) && file.sizeBytes > 0).map(file => {
+      const canonical = repo.id === template.repo && file.fileName === template.fileName;
+      if (canonical) return template;
+      const id = `sd-${repo.id.replaceAll('/', '--')}--${file.fileName}`;
+      return {
+        id, name: `${template.name} ${file.quant}`, displayName: `${template.displayName} · ${file.quant}`,
+        backend: 'sd' as const, repo: repo.id, fileName: file.fileName,
+        downloadUrl: file.downloadUrl,
+        size: file.sizeBytes + companion.reduce((sum, part) => sum + part.size, 0),
+        huggingFaceFiles: [{ path: file.fileName, size: file.sizeBytes, downloadUrl: file.downloadUrl, sha256: file.sha256 }, ...companion],
+      };
+    }).filter(model => model.id.length <= 160);
+  }));
+  if (listings.length && listings.every(result => result.status === 'rejected')) {
+    throw new Error('Could not read image model files from Hugging Face. Try again.');
+  }
+  return listings.flatMap(result => result.status === 'fulfilled' ? result.value : []);
+}
+
+export async function resolveSDImagePack(_modelId: string, modelPath: string) {
+  const files = getSDImagePackFiles((await RNFS.readDir(modelPath)).filter(file => file.isFile()).map(file => file.name));
+  if (!files) throw new Error('This image model pack is not supported.');
   const required = (pattern: RegExp) => {
-    const file = model.huggingFaceFiles!.find(part => pattern.test(part.path));
+    const file = files.find(part => pattern.test(part.path));
     if (!file) throw new Error('The image model pack is incomplete.');
     return `${modelPath}/${file.path}`;
   };
diff --git a/src/services/localDreamGenerator.ts b/src/services/localDreamGenerator.ts
index 507c56b90..04b24f003 100644
--- a/src/services/localDreamGenerator.ts
+++ b/src/services/localDreamGenerator.ts
@@ -84,7 +84,7 @@ class LocalDreamGeneratorService {
       if (!SDModule?.loadImageModel) throw new Error('This build does not include the SD image runtime.');
       const integrity = await validateImageModelDir(modelPath, 'sd');
       if (!integrity.complete) throw new Error(`The image model pack is incomplete: ${integrity.missing.join(', ')}`);
-      const pack = resolveSDImagePack(opts.modelId ?? modelPath.split('/').pop() ?? '', modelPath);
+      const pack = await resolveSDImagePack(opts.modelId ?? modelPath.split('/').pop() ?? '', modelPath);
       if (await DiffusionModule?.isModelLoaded()) await DiffusionModule.unloadModel();
       await SDModule.loadImageModel({ modelPath, ...pack, threads: threads ?? 4, cpuOnly: opts.cpuOnly ?? false });
       this.usingSD = true; this.eventEmitter = null; this.loadedThreads = threads ?? 4;
diff --git a/src/services/modelManager/imageTransfer.ts b/src/services/modelManager/imageTransfer.ts
index b313bd97b..e69924094 100644
--- a/src/services/modelManager/imageTransfer.ts
+++ b/src/services/modelManager/imageTransfer.ts
@@ -1,4 +1,3 @@
-import { getSDImageModels } from '../huggingFaceModelBrowser';
 import type { DevicePlatform, TransferredModelManifest } from '@offgrid/sync';
 import type { ONNXImageModel } from '../../types';
 
@@ -70,7 +69,7 @@ export function imageModelTransferBlocker(
       ? 'iPhone and iPad can send only Core ML image models'
       : 'Android can send only LocalDream MNN image models';
   }
-  if (model.backend === 'sd' && !getSDImageModels().some(pack => pack.id === model.id)) return 'this image model pack is not supported';
+  if (model.backend === 'sd' && !model.id.startsWith('sd-')) return 'this image model pack is not supported';
   if (!Number.isFinite(model.size) || model.size <= 0) {
     return 'the image model size is not valid';
   }
@@ -165,7 +164,7 @@ export function transferredImageDescriptor(
     throw new Error('this is not an image model package');
   }
   const sdPack = manifest.engine === 'mobile-sd-gguf';
-  if (sdPack && !getSDImageModels().some(pack => pack.id === manifest.id)) throw new Error('This image model pack is not supported.');
+  if (sdPack && !manifest.id.startsWith('sd-')) throw new Error('This image model pack is not supported.');
   const expected = expectedImageRuntime(receiverPlatform, sdPack ? 'sd' : undefined);
   if (
     (!sdPack && manifest.platform !== receiverPlatform) ||
diff --git a/src/services/modelManager/scan.ts b/src/services/modelManager/scan.ts
index c9f5be9b3..ce2ee2f4e 100644
--- a/src/services/modelManager/scan.ts
+++ b/src/services/modelManager/scan.ts
@@ -1,4 +1,5 @@
-import { getSDImageModels } from '../huggingFaceModelBrowser';
+import { extractQuantization } from '@offgrid/models';
+import { getSDImageModels, getSDImagePackFiles, isSDImageWeight } from '../huggingFaceModelBrowser';
 import RNFS from 'react-native-fs';
 import { statFile } from '../../utils/fileStat';
 import { unzip } from 'react-native-zip-archive';
@@ -86,7 +87,7 @@ export async function cleanupMMProjEntries(modelsDir: string): Promise<number> {
 }
 
 function detectBackend(dirName: string): 'mnn' | 'qnn' | 'coreml' | 'sd' {
-  if (getSDImageModels().some(model => model.id === dirName)) return 'sd';
+  if (dirName.startsWith('sd-')) return 'sd';
   if (dirName.includes('qnn') || dirName.includes('8gen') || dirName.includes('npu')) return 'qnn';
   if (dirName.includes('coreml')) return 'coreml';
   return 'mnn';
@@ -145,9 +146,10 @@ async function buildRecoveredImageModel(
   let modelPath = item.path;
   if (backend === 'coreml') modelPath = await resolveCoreMLModelDir(item.path).catch(() => item.path);
   const totalSize = await getDirSize(item.path);
+  const sdWeight = backend === 'sd' ? (await RNFS.readDir(item.path)).find(file => file.isFile() && isSDImageWeight(file.name))?.name : undefined;
   return {
     id: item.name,
-    name: getSDImageModels().find(model => model.id === item.name)?.displayName ?? item.name.replaceAll('_', ' '),
+    name: getSDImageModels().find(model => model.id === item.name)?.displayName ?? (sdWeight ? `Qwen Image 2.1 ${extractQuantization(sdWeight)}` : item.name.replaceAll('_', ' ')),
     description: '',
     modelPath,
     size: totalSize,
@@ -251,10 +253,11 @@ export async function reconcileFinishedImageDownloads(opts: ReconcileImageModels
 
       // A complete SD pack can survive a stop between its last file and _ready.
       // Keep partial known packs so the normal download can reuse valid parts.
-      const sdPack = getSDImageModels().find(model => model.id === item.name);
-      if (sdPack?.huggingFaceFiles) {
+      const sdFiles = item.name.startsWith('sd-') ? getSDImagePackFiles((await RNFS.readDir(item.path)).filter(file => file.isFile()).map(file => file.name), item.name) : null;
+      if (item.name.startsWith('sd-')) {
         try {
-          await validateMultifileComplete(item.path, sdPack.huggingFaceFiles.map(file => ({
+          if (!sdFiles) continue;
+          await validateMultifileComplete(item.path, sdFiles.map(file => ({
             relativePath: file.path, sha256: file.sha256,
           })));
           await RNFS.writeFile(readyPath, '', 'utf8');
diff --git a/src/utils/imageModelIntegrity.ts b/src/utils/imageModelIntegrity.ts
index b71aae30f..49998c085 100644
--- a/src/utils/imageModelIntegrity.ts
+++ b/src/utils/imageModelIntegrity.ts
@@ -18,7 +18,7 @@
  */
 import RNFS from 'react-native-fs';
 import { statFile } from './fileStat';
-import { getSDImageModels } from '../services/huggingFaceModelBrowser';
+import { getSDImagePackFiles, isSDImageWeight } from '../services/huggingFaceModelBrowser';
 import { unzip } from 'react-native-zip-archive';
 import { ImageModelIncompleteError } from './modelLoadErrors';
 import logger from './logger';
@@ -57,9 +57,9 @@ export function checkImageModelFiles(files: ImageDirEntry[], backend: ImageBacke
   for (const f of files) if (f.isFile) sizeByName.set(f.name, f.size);
 
   if (backend === 'sd') {
-    const pack = getSDImageModels().find(model => sizeByName.has(model.fileName));
-    if (!pack?.huggingFaceFiles) return { complete: false, missing: ['image model pack'] };
-    const missing = pack.huggingFaceFiles.filter(file => (sizeByName.get(file.path) ?? 0) <= 0).map(file => file.path);
+    const files = getSDImagePackFiles([...sizeByName.keys()]);
+    if (!files) return { complete: false, missing: ['image model pack'] };
+    const missing = files.filter(file => (sizeByName.get(file.path) ?? 0) <= 0).map(file => file.path);
     return { complete: missing.length === 0, missing };
   }
 
@@ -126,8 +126,7 @@ export async function resolveImageModelDir(modelPath: string, backend: ImageBack
     // qnn models also ship a clip_v2.mnn; the marker that disambiguates is the unet.
     try {
       if (backend === 'sd') {
-        for (const model of getSDImageModels()) if (await RNFS.exists(`${dir}/${model.fileName}`)) return true;
-        return false;
+        return (await RNFS.readDir(dir)).some(file => file.isFile() && isSDImageWeight(file.name));
       }
       return await RNFS.exists(`${dir}/${marker}`);
     } catch { return false; }

From 986e046969a9052852b4b355693e4098526a013e Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 17:04:13 +0530
Subject: [PATCH 048/129] fix(video): show OGAD stages on mobile clients [skip
 ci]

---
 src/services/remoteMediaRuntime.ts     | 20 +++++++++++++++++---
 src/services/videoGenerationService.ts |  4 ++--
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/services/remoteMediaRuntime.ts b/src/services/remoteMediaRuntime.ts
index 91e6080ee..b3d9ce5cc 100644
--- a/src/services/remoteMediaRuntime.ts
+++ b/src/services/remoteMediaRuntime.ts
@@ -4,6 +4,8 @@ import RNFS from 'react-native-fs';
 import type {
   ResolvedVideoRequest,
   VideoGenerationResultContract,
+  VideoGenerationProgressContract,
+  VideoGenerationStage,
 } from '@offgrid/models';
 import { remoteServerManager } from './remoteServerManager';
 import type { RemoteMediaModelIds, RemoteServer } from '../types';
@@ -111,7 +113,10 @@ export const remoteMediaRuntime = {
       model?: string;
       jobId?: string;
       onJobStarted: (id: string) => Promise<unknown>;
-      onProgress: (progress: { step: number; total: number }) => void;
+      onProgress: (
+        progress: VideoGenerationProgressContract | null,
+        stage?: VideoGenerationStage,
+      ) => void;
     },
   ): Promise<
     VideoGenerationResultContract & { provenance?: RecordProvenance }
@@ -169,6 +174,7 @@ export const remoteMediaRuntime = {
           response =>
             response.json() as Promise<{
               status: string;
+              stage?: VideoGenerationStage;
               progress?: { step: number; total: number };
               error?: { message: string };
               result?: VideoGenerationResultContract & {
@@ -176,8 +182,16 @@ export const remoteMediaRuntime = {
               };
             }>,
         );
-        if (state.progress) options.onProgress(state.progress);
-        if (state.status === 'failed')
+        const progress =
+          state.progress && Number.isFinite(state.progress.step) && Number.isFinite(state.progress.total)
+            ? state.progress
+            : null;
+        const stage =
+          state.stage && ['enhancing', 'preparing', 'conditioning', 'generating', 'encoding'].includes(state.stage)
+            ? state.stage
+            : undefined;
+        if (progress || stage) options.onProgress(progress, stage);
+        if (state.status === 'failed' || state.status === 'cancelled')
           throw Object.assign(
             new Error(
               state.error?.message ?? 'Remote video generation failed.',
diff --git a/src/services/videoGenerationService.ts b/src/services/videoGenerationService.ts
index a8fabd2e4..fc4f5a25d 100644
--- a/src/services/videoGenerationService.ts
+++ b/src/services/videoGenerationService.ts
@@ -357,8 +357,8 @@ class VideoGenerationService {
                 await this.persist();
               }
             },
-            onProgress: progress =>
-              this.update({ stage: 'generating', progress }),
+            onProgress: (progress, stage) =>
+              this.update({ stage: stage ?? 'generating', progress }),
           },
         );
         path = remote.path;

From 7b6b36a85c547d20f130d04b7b2be0aea201a884 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 17:21:40 +0530
Subject: [PATCH 049/129] chore(video): record Adreno shader compile details
 [skip ci]

---
 scripts/prepare-video-runtime.sh              |  2 +-
 .../android-vulkan-pipeline-diagnostics.patch | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 scripts/video/android-vulkan-pipeline-diagnostics.patch

diff --git a/scripts/prepare-video-runtime.sh b/scripts/prepare-video-runtime.sh
index c17d34f9d..e99a5d423 100644
--- a/scripts/prepare-video-runtime.sh
+++ b/scripts/prepare-video-runtime.sh
@@ -16,7 +16,7 @@ PATCH="$ROOT/scripts/video/android-vulkan-dispatch.patch"
 if ! git -C "$SOURCE/ggml" apply --reverse --check "$PATCH" 2>/dev/null; then
   git -C "$SOURCE/ggml" apply "$PATCH"
 fi
-for entry in "ggml:android-vulkan-device-fault.patch" "ggml:android-hexagon.patch" "ggml:android-hexagon-buffer-validation.patch" ".:android-hardware-fallback.patch" ".:conditioning-errors.patch"; do
+for entry in "ggml:android-vulkan-device-fault.patch" "ggml:android-vulkan-pipeline-diagnostics.patch" "ggml:android-hexagon.patch" "ggml:android-hexagon-buffer-validation.patch" ".:android-hardware-fallback.patch" ".:conditioning-errors.patch"; do
   target="${entry%%:*}"
   patch="$ROOT/scripts/video/${entry#*:}"
   if ! git -C "$SOURCE/$target" apply --reverse --check "$patch" 2>/dev/null; then
diff --git a/scripts/video/android-vulkan-pipeline-diagnostics.patch b/scripts/video/android-vulkan-pipeline-diagnostics.patch
new file mode 100644
index 000000000..5c7c1410b
--- /dev/null
+++ b/scripts/video/android-vulkan-pipeline-diagnostics.patch
@@ -0,0 +1,24 @@
+--- a/src/ggml-vulkan/ggml-vulkan.cpp
++++ b/src/ggml-vulkan/ggml-vulkan.cpp
+@@ -586,6 +586,21 @@
+     GGML_ASSERT(parameter_count > 0);
+     GGML_ASSERT(parameter_count <= MAX_PARAMETER_COUNT);
+     GGML_ASSERT(wg_denoms[0] > 0 && wg_denoms[1] > 0 && wg_denoms[2] > 0); // NOLINT
++
++#ifdef __ANDROID__
++    // The Adreno compiler can terminate the process inside pipeline creation,
++    // before Vulkan can return an error. Record the lazy shader variant first.
++    if (device->vendor_id == VK_VENDOR_ID_QUALCOMM) {
++        std::string constants;
++        for (const auto value : specialization_constants) {
++            if (!constants.empty()) constants += ",";
++            constants += std::to_string(value);
++        }
++        GGML_LOG_INFO("ggml_vulkan: Adreno compiling %s (specialization=[%s], subgroup=%u, full_subgroups=%d, spirv_bytes=%zu)\n",
++                      pipeline->name.c_str(), constants.c_str(), required_subgroup_size,
++                      require_full_subgroups ? 1 : 0, spv_size);
++    }
++#endif
+ 
+     vk::ShaderModuleCreateInfo shader_module_create_info({}, spv_size, reinterpret_cast<const uint32_t *>(spv_data));
+ 

From c8323ea5658c50ae539cb4d1046f5e538e4991da Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 17:22:39 +0530
Subject: [PATCH 050/129] fix(video): route unsafe Adreno float matvec to
 fallback backend [skip ci]

---
 scripts/prepare-video-runtime.sh              |  2 +-
 .../android-vulkan-matvec-fallback.patch      | 36 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 scripts/video/android-vulkan-matvec-fallback.patch

diff --git a/scripts/prepare-video-runtime.sh b/scripts/prepare-video-runtime.sh
index e99a5d423..24b99350b 100644
--- a/scripts/prepare-video-runtime.sh
+++ b/scripts/prepare-video-runtime.sh
@@ -16,7 +16,7 @@ PATCH="$ROOT/scripts/video/android-vulkan-dispatch.patch"
 if ! git -C "$SOURCE/ggml" apply --reverse --check "$PATCH" 2>/dev/null; then
   git -C "$SOURCE/ggml" apply "$PATCH"
 fi
-for entry in "ggml:android-vulkan-device-fault.patch" "ggml:android-vulkan-pipeline-diagnostics.patch" "ggml:android-hexagon.patch" "ggml:android-hexagon-buffer-validation.patch" ".:android-hardware-fallback.patch" ".:conditioning-errors.patch"; do
+for entry in "ggml:android-vulkan-device-fault.patch" "ggml:android-vulkan-pipeline-diagnostics.patch" "ggml:android-vulkan-matvec-fallback.patch" "ggml:android-hexagon.patch" "ggml:android-hexagon-buffer-validation.patch" ".:android-hardware-fallback.patch" ".:conditioning-errors.patch"; do
   target="${entry%%:*}"
   patch="$ROOT/scripts/video/${entry#*:}"
   if ! git -C "$SOURCE/$target" apply --reverse --check "$patch" 2>/dev/null; then
diff --git a/scripts/video/android-vulkan-matvec-fallback.patch b/scripts/video/android-vulkan-matvec-fallback.patch
new file mode 100644
index 000000000..feaa46db6
--- /dev/null
+++ b/scripts/video/android-vulkan-matvec-fallback.patch
@@ -0,0 +1,36 @@
+--- a/src/ggml-vulkan/ggml-vulkan.cpp
++++ b/src/ggml-vulkan/ggml-vulkan.cpp
+@@ -15333,6 +15333,33 @@
+         case GGML_OP_MUL_MAT_ID:
+             {
+                 ggml_type src0_type = op->src[0]->type;
++#ifdef __ANDROID__
++                // SM8635's proprietary Adreno compiler crashes while compiling
++                // a floating-point dmmv shader in Wan VAE decode. Reject only
++                // float vector/small-column MUL_MAT shapes so the scheduler can
++                // use another backend. Keep quantized and regular GPU matrices.
++                const bool float_weight = src0_type == GGML_TYPE_F32 ||
++                                          src0_type == GGML_TYPE_F16 ||
++                                          src0_type == GGML_TYPE_BF16;
++                const bool float_input = op->src[1]->type == GGML_TYPE_F32 ||
++                                         op->src[1]->type == GGML_TYPE_F16;
++                const bool vector_shape = op->ne[1] == 1 ||
++                    (op->ne[1] <= mul_mat_vec_max_cols &&
++                     op->src[1]->ne[2] * op->src[1]->ne[3] == 1);
++                // The dispatcher can swap a single output row into matvec too.
++                const bool swapped_vector = op->ne[0] == 1 &&
++                    op->src[0]->ne[2] == 1 && op->src[0]->ne[3] == 1 &&
++                    op->src[1]->ne[2] == 1 && op->src[1]->ne[3] == 1;
++                if (device->vendor_id == VK_VENDOR_ID_QUALCOMM &&
++                    op->op == GGML_OP_MUL_MAT && float_weight && float_input &&
++                    (vector_shape || swapped_vector)) {
++                    static std::atomic_flag reported = ATOMIC_FLAG_INIT;
++                    if (!reported.test_and_set()) {
++                        GGML_LOG_WARN("ggml_vulkan: routing Adreno float matvec to another backend to avoid shader compiler crash\n");
++                    }
++                    return false;
++                }
++#endif
+                 if (src0_type == GGML_TYPE_I8) {
+                     return op->op == GGML_OP_MUL_MAT &&
+                            ggml_vk_can_use_mul_mat_i8_tensorwise(device, op);

From 9564462c31682912d1b78dd7c82ae7febfbe6fc7 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 17:44:57 +0530
Subject: [PATCH 051/129] fix(sync): include video retry completion correction
 [skip ci]

---
 pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pro b/pro
index d3b3868f5..518f87c41 160000
--- a/pro
+++ b/pro
@@ -1 +1 @@
-Subproject commit d3b3868f54c393b9447cedaa2c0f0a29ea97da7e
+Subproject commit 518f87c41f87e226bfdd0fff993bcf38692094b9

From 6b5858b149b6108ad03d993f590e0fa65ce1c324 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 17:58:32 +0530
Subject: [PATCH 052/129] fix(video): use CPU Wan decode on affected Adreno
 devices [skip ci]

---
 native/video/common/VideoRuntime.hpp | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/native/video/common/VideoRuntime.hpp b/native/video/common/VideoRuntime.hpp
index 694c14b3a..1b2b09688 100644
--- a/native/video/common/VideoRuntime.hpp
+++ b/native/video/common/VideoRuntime.hpp
@@ -62,10 +62,18 @@ class VideoRuntime {
           // An installed driver can still reject the DSP session.
         }
       }
-      // Convolution-heavy decoders cannot execute their main operations on
-      // Hexagon. Keep them on the GPU to avoid repeated GPU/NPU copies.
-      const std::string npuBackend = preferred + (ggml_backend_dev_by_name("Vulkan0") ? ",vae=Vulkan0" : ",vae=cpu");
-      config.backend = preferred.empty() ? "Vulkan0,te=cpu" : npuBackend.c_str();
+      // Wan decode still loses the Adreno device between spatial tiles after
+      // the matvec compiler workaround. Keep HTP diffusion/conditioning, but
+      // route this decoder to CPU before it can invalidate the GPU context.
+      const auto gpuDevice = ggml_backend_dev_by_name("Vulkan0");
+      const std::string gpuDescription = gpuDevice ? ggml_backend_dev_description(gpuDevice) : "";
+      const std::string vaeName = request.vae.substr(request.vae.find_last_of("/\\") + 1);
+      const bool wanVae = vaeName == "wan_2.1_vae.safetensors" || vaeName == "wan2.2_vae.safetensors";
+      const bool adrenoWan = wanVae && gpuDescription.find("Adreno") != std::string::npos;
+      const std::string vaeBackend = gpuDevice && !adrenoWan ? ",vae=Vulkan0" : ",vae=cpu";
+      const std::string npuBackend = preferred + vaeBackend;
+      const std::string gpuBackend = "Vulkan0,te=cpu" + vaeBackend;
+      config.backend = preferred.empty() ? gpuBackend.c_str() : npuBackend.c_str();
       // Stream NPU weights from disk per graph segment. Keeping a second
       // complete copy on Vulkan retains the text encoder during diffusion and
       // can trigger Android's low-memory killer. The graph cap still controls
@@ -94,7 +102,7 @@ class VideoRuntime {
         preferred.clear();
         config.params_backend = nullptr;
         config.auto_fit = true;
-        config.backend = "Vulkan0,te=cpu";
+        config.backend = gpuBackend.c_str();
         try { loaded = new_sd_ctx(&config); }
         catch (const std::exception &) {
           if (cancelled.load()) throw;

From d9c81bc3241ef7a19adb743ef86fc69ee660195d Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 18:04:06 +0530
Subject: [PATCH 053/129] fix(build): use macOS host compiler for Vulkan shader
 generator [skip ci]

---
 android/app/src/main/cpp/CMakeLists.txt | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/android/app/src/main/cpp/CMakeLists.txt b/android/app/src/main/cpp/CMakeLists.txt
index 9bb0adda6..848be61ae 100644
--- a/android/app/src/main/cpp/CMakeLists.txt
+++ b/android/app/src/main/cpp/CMakeLists.txt
@@ -25,8 +25,18 @@ string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" VIDEO_HOST_OS)
 # shaderc installation, or an explicit -DVulkan_GLSLC_EXECUTABLE path.
 find_program(Vulkan_GLSLC_EXECUTABLE NAMES glslc glslc.exe
   HINTS "${SD_SOURCE}/../shaderc/bin" NO_CMAKE_FIND_ROOT_PATH REQUIRED)
-find_program(VIDEO_HOST_CC NAMES clang gcc cl NO_CMAKE_FIND_ROOT_PATH REQUIRED)
-find_program(VIDEO_HOST_CXX NAMES clang++ g++ cl NO_CMAKE_FIND_ROOT_PATH REQUIRED)
+if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
+  # The NDK prepends its compiler directory even for host-program discovery.
+  # Its clang cannot compile against the current macOS SDK. Use Xcode's host
+  # toolchain for the shader generator; model libraries still use the NDK.
+  execute_process(COMMAND xcrun --sdk macosx --find clang
+    OUTPUT_VARIABLE VIDEO_HOST_CC OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND_ERROR_IS_FATAL ANY)
+  execute_process(COMMAND xcrun --sdk macosx --find clang++
+    OUTPUT_VARIABLE VIDEO_HOST_CXX OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND_ERROR_IS_FATAL ANY)
+else()
+  find_program(VIDEO_HOST_CC NAMES clang gcc cl NO_CMAKE_FIND_ROOT_PATH REQUIRED)
+  find_program(VIDEO_HOST_CXX NAMES clang++ g++ cl NO_CMAKE_FIND_ROOT_PATH REQUIRED)
+endif()
 set(GGML_VULKAN_SHADERS_GEN_TOOLCHAIN "${CMAKE_BINARY_DIR}/video-host-toolchain.cmake")
 file(WRITE "${GGML_VULKAN_SHADERS_GEN_TOOLCHAIN}"
   "set(CMAKE_C_COMPILER \"${VIDEO_HOST_CC}\")\nset(CMAKE_CXX_COMPILER \"${VIDEO_HOST_CXX}\")\nset(CMAKE_MAKE_PROGRAM \"${CMAKE_MAKE_PROGRAM}\" CACHE FILEPATH \"Host build tool\" FORCE)\n")

From 6810e0c9d96c258c68ae338c2461b0ae9ef2e27f Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 18:07:12 +0530
Subject: [PATCH 054/129] fix(video): report iOS background interruption [skip
 ci]

---
 native/video/VideoGenerationModule.mm | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/native/video/VideoGenerationModule.mm b/native/video/VideoGenerationModule.mm
index 54765f7f4..6e85ba1aa 100644
--- a/native/video/VideoGenerationModule.mm
+++ b/native/video/VideoGenerationModule.mm
@@ -12,6 +12,7 @@ @implementation VideoGenerationModule {
   dispatch_queue_t _worker;
   BOOL _busy;
   BOOL _listeners;
+  NSString *_videoInterruptionReason;
   BGTask *_continued;
   NSString *_taskIdentifier;
   dispatch_block_t _continuedWork;
@@ -34,7 +35,10 @@ - (void)stopObserving { _listeners = NO; }
 - (void)backgrounded {
   // Metal work must stop before the OS removes GPU access. Continued GPU tasks
   // are admitted separately by the background coordinator on supported systems.
-  if (_busy && !_continued) _runtime.cancel();
+  if (_busy && !_continued) {
+    _videoInterruptionReason = @"Video generation stopped when the app went into the background. Keep Off Grid open and try again.";
+    _runtime.cancel();
+  }
 }
 - (void)emitStage:(NSString *)stage step:(int)step total:(int)total {
   dispatch_async(dispatch_get_main_queue(), ^{
@@ -65,6 +69,7 @@ - (void)emitStage:(NSString *)stage step:(int)step total:(int)total {
   dispatch_async(dispatch_get_main_queue(), ^{
     if (self->_busy) { reject(@"VIDEO_BUSY", @"Video generation is already running.", nil); return; }
     self->_busy = YES; self->_runtime.cancelled.store(false);
+    self->_videoInterruptionReason = nil;
     [self startContinuedWork:^{
     dispatch_async(self->_worker, ^{
       @autoreleasepool {
@@ -99,7 +104,9 @@ - (void)emitStage:(NSString *)stage step:(int)step total:(int)total {
           if (self->_continued) {
             [self->_continued setTaskCompletedWithSuccess:failure == nil]; self->_continued = nil;
           }
-          if (failure) reject(self->_runtime.cancelled.load() ? @"VIDEO_CANCELLED" : @"VIDEO_FAILED", failure.localizedDescription, failure);
+          if (failure && self->_videoInterruptionReason)
+            reject(@"VIDEO_BACKGROUND_INTERRUPTED", self->_videoInterruptionReason, failure);
+          else if (failure) reject(self->_runtime.cancelled.load() ? @"VIDEO_CANCELLED" : @"VIDEO_FAILED", failure.localizedDescription, failure);
           else resolve(@{@"path":output});
         });
       }
@@ -198,7 +205,16 @@ - (void)startContinuedWork:(dispatch_block_t)work {
           VideoGenerationModule *owner = weakSelf;
           if (!owner || !owner->_busy) { [task setTaskCompletedWithSuccess:NO]; return; }
           owner->_continued = task;
-          task.expirationHandler = ^{ VideoGenerationModule *active = weakSelf; if (active) active->_runtime.cancel(); };
+          __weak BGTask *expiringTask = task;
+          task.expirationHandler = ^{
+            dispatch_async(dispatch_get_main_queue(), ^{
+              VideoGenerationModule *active = weakSelf;
+              if (active && active->_continued == expiringTask && active->_busy) {
+                active->_videoInterruptionReason = @"iOS stopped background video generation. Keep Off Grid open and try again.";
+                active->_runtime.cancel();
+              }
+            });
+          };
           dispatch_block_t admitted = owner->_continuedWork; owner->_continuedWork = nil;
           if (admitted) admitted();
         }];

From 5d489af17729572eb549d3ca1ced29ebbc095eea Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 18:11:53 +0530
Subject: [PATCH 055/129] fix(video): distinguish generation failures from load
 errors [skip ci]

---
 src/services/videoGenerationService.ts | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/services/videoGenerationService.ts b/src/services/videoGenerationService.ts
index fc4f5a25d..7908f2960 100644
--- a/src/services/videoGenerationService.ts
+++ b/src/services/videoGenerationService.ts
@@ -159,11 +159,25 @@ class VideoGenerationService {
     useAppStore.getState().removeGeneratedVideo(id);
   }
   private reportFailure(error: unknown, remote = false) {
+    const reason = reasonFromLoadError(error);
+    const interrupted =
+      (error as { code?: string } | null)?.code === 'VIDEO_BACKGROUND_INTERRUPTED';
+    const generationFailed =
+      reason === 'load-threw' &&
+      this.state.stage !== null &&
+      this.state.stage !== 'preparing';
+    const detail = error instanceof Error ? error.message : String(error);
     reportModelFailure('video', error, {
       remote,
+      ...(interrupted || generationFailed
+        ? {
+            title: interrupted ? 'Video generation interrupted' : 'Video generation failed',
+            message: detail,
+          }
+        : {}),
       onRetry: () => {
         void (async () => {
-          if (!remote && reasonFromLoadError(error) === 'insufficient-memory')
+          if (!remote && reason === 'insufficient-memory')
             await activeModelService.ejectAll();
           await this.retry();
         })().catch(() => {});

From c7850b02d405418b2f459ed8c56944c0e94c5537 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 18:49:35 +0530
Subject: [PATCH 056/129] fix(ios): stream model checksums during startup [skip
 ci]

---
 ios/StreamingHashModule.m     |  4 ++++
 ios/StreamingHashModule.swift | 35 +++++++++++++++++++++++++++++++++--
 src/shims/react-native-fs.ts  | 26 +++++++++++++++++++++++++-
 3 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/ios/StreamingHashModule.m b/ios/StreamingHashModule.m
index b7a3a52e5..67b419c56 100644
--- a/ios/StreamingHashModule.m
+++ b/ios/StreamingHashModule.m
@@ -6,4 +6,8 @@ @interface RCT_EXTERN_MODULE(StreamingHashModule, NSObject)
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 
+RCT_EXTERN_METHOD(sha256:(NSString *)path
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
 @end
diff --git a/ios/StreamingHashModule.swift b/ios/StreamingHashModule.swift
index 8b97e2363..9d3f76c3d 100644
--- a/ios/StreamingHashModule.swift
+++ b/ios/StreamingHashModule.swift
@@ -8,12 +8,25 @@ enum StreamingFileHasher {
     at url: URL,
     chunkSize: Int = defaultChunkSize,
     didConsumeChunk: (() -> Void)? = nil
+  ) throws -> String {
+    try digestHex(at: url, using: SHA512(), chunkSize: chunkSize, didConsumeChunk: didConsumeChunk)
+  }
+
+  static func sha256Hex(at url: URL) throws -> String {
+    try digestHex(at: url, using: SHA256())
+  }
+
+  private static func digestHex<H: HashFunction>(
+    at url: URL,
+    using initialHasher: H,
+    chunkSize: Int = defaultChunkSize,
+    didConsumeChunk: (() -> Void)? = nil
   ) throws -> String {
     precondition(chunkSize > 0)
     let handle = try FileHandle(forReadingFrom: url)
     defer { try? handle.close() }
 
-    var hasher = SHA512()
+    var hasher = initialHasher
     while true {
       // FileHandle can back each Swift Data with an autoreleased NSData. This work runs in one
       // long-lived GCD block, so the queue's outer autorelease pool is not drained until the whole
@@ -45,6 +58,24 @@ final class StreamingHashModule: NSObject {
     _ path: String,
     resolver resolve: @escaping RCTPromiseResolveBlock,
     rejecter reject: @escaping RCTPromiseRejectBlock
+  ) {
+    hash(path, digest: { try StreamingFileHasher.sha512Hex(at: $0) }, resolve: resolve, reject: reject)
+  }
+
+  @objc
+  func sha256(
+    _ path: String,
+    resolver resolve: @escaping RCTPromiseResolveBlock,
+    rejecter reject: @escaping RCTPromiseRejectBlock
+  ) {
+    hash(path, digest: StreamingFileHasher.sha256Hex, resolve: resolve, reject: reject)
+  }
+
+  private func hash(
+    _ path: String,
+    digest: @escaping (URL) throws -> String,
+    resolve: @escaping RCTPromiseResolveBlock,
+    reject: @escaping RCTPromiseRejectBlock
   ) {
     DispatchQueue.global(qos: .utility).async {
       do {
@@ -54,7 +85,7 @@ final class StreamingHashModule: NSObject {
         defer {
           if scoped { url.stopAccessingSecurityScopedResource() }
         }
-        resolve(try StreamingFileHasher.sha512Hex(at: url))
+        resolve(try digest(url))
       } catch {
         reject("streaming_hash_failed", error.localizedDescription, error)
       }
diff --git a/src/shims/react-native-fs.ts b/src/shims/react-native-fs.ts
index b052b7cca..2687a5104 100644
--- a/src/shims/react-native-fs.ts
+++ b/src/shims/react-native-fs.ts
@@ -10,6 +10,30 @@
 // expect. metro.config.js, jest.config.js, and tsconfig.json all alias
 // 'react-native-fs' to this file. See project_ios_rnfs_duplicate memory.
 import * as RNFS from '@dr.pogodin/react-native-fs';
+import { NativeModules, Platform } from 'react-native';
 
 export * from '@dr.pogodin/react-native-fs';
-export default RNFS;
+// The upstream iOS hash reads the entire file into NSData. Model checksums must
+// use the existing native streaming reader so startup scans cannot exhaust RAM.
+export const hash: typeof RNFS.hash = (path, algorithm) => {
+  if (Platform.OS === 'ios' && (algorithm === 'sha256' || algorithm === 'sha512')) {
+    const streamingHash = NativeModules.StreamingHashModule as
+      | Partial<Record<'sha256' | 'sha512', (file: string) => Promise<string>>>
+      | undefined;
+    const digest = streamingHash?.[algorithm];
+    if (!digest) {
+      return Promise.reject(
+        new Error('Streaming file checksum is unavailable. Update the app and retry.'),
+      );
+    }
+    return digest(path);
+  }
+  return RNFS.hash(path, algorithm);
+};
+
+const fileSystem = { ...RNFS, hash };
+// Keep the default import's file-entry type used by existing model scanners.
+namespace fileSystem {
+  export type ReadDirResItemT = RNFS.ReadDirResItemT;
+}
+export default fileSystem;

From a97958b454f92bd6787b67c4938b09c2f7251e8f Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 18:51:32 +0530
Subject: [PATCH 057/129] chore(ios): refresh installed pod spec checksums
 [skip ci]

---
 ios/Podfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 8d65a014e..fe9372a1e 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -3939,7 +3939,7 @@ SPEC CHECKSUMS:
   FBLazyVector: 309703e71d3f2f1ed7dc7889d58309c9d77a95a4
   fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
   glog: 5683914934d5b6e4240e497e0f4a3b42d1854183
-  hermes-engine: 8b1958efa30118ab638933e7e33b2ac1eff78de3
+  hermes-engine: 3de70ea2100f1780402cf146bb8110a0cdb2f34e
   llama-rn: fc4d176920fff190ee3a5a4172ce739531150cc4
   MMKV: 86859fdfa2b0b21db1fd6e48788474a6416a2c77
   MMKVCore: 3d16ce9f7d411e135020915fde98a056859a1efa
@@ -3985,7 +3985,7 @@ SPEC CHECKSUMS:
   react-native-background-downloader: b02d12c3961322ce1c85fa0f8b3e4adb5b652106
   react-native-document-picker: dc2d83366e47e89e7c51e8a41eab99c1d54e941c
   react-native-document-viewer: 8c6ed07e7e27352743fa98e8dd6d288ad925b884
-  react-native-executorch: 020b518bffbf62b06138674283d31f4f58dc72d1
+  react-native-executorch: 863673cf458ceec5df61012fa30981ffa3ee8fc4
   react-native-get-random-values: d16467cf726c618e9c7a8c3c39c31faa2244bbba
   react-native-image-picker: 0314366753615115fa55c3cc937ac44cb7e75702
   react-native-keyboard-controller: 7534b5a39d1e8b2b79f86e8e998ed71c7154f69f

From f4883a45a620197b1b5844d3211c621b21c349fd Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 18:58:07 +0530
Subject: [PATCH 058/129] feat(video): show reused frame previews and decode
 progress [skip ci]

---
 .../components/MessageAttachments.tsx         |  8 ++--
 src/components/VideoGenerationStatus.tsx      | 48 ++++++++++++-------
 src/services/remoteMediaRuntime.ts            | 35 +++++++++++++-
 src/services/videoGenerationService.ts        |  4 ++
 src/services/videoGenerator.ts                |  6 +++
 5 files changed, 81 insertions(+), 20 deletions(-)

diff --git a/src/components/ChatMessage/components/MessageAttachments.tsx b/src/components/ChatMessage/components/MessageAttachments.tsx
index 048b05f0e..710ebc2a7 100644
--- a/src/components/ChatMessage/components/MessageAttachments.tsx
+++ b/src/components/ChatMessage/components/MessageAttachments.tsx
@@ -27,13 +27,14 @@ interface FadeInImageProps {
   testID?: string;
   wrapperTestID?: string;
   onPress?: () => void;
+  accessibilityLabel?: string;
 }
 
 function resolveMediaUri(uri: string): string {
   return uri.includes('/Documents/') ? `file://${resolveDocumentPath(uri)}` : uri;
 }
 
-function FadeInImage({ uri, imageStyle, testID, wrapperTestID, onPress }: FadeInImageProps) {
+export function FadeInImage({ uri, imageStyle, testID, wrapperTestID, onPress, accessibilityLabel }: FadeInImageProps) {
   const displayUri = resolveMediaUri(uri);
   const opacity = useSharedValue(0);
   const [loaded, setLoaded] = React.useState(false);
@@ -45,10 +46,11 @@ function FadeInImage({ uri, imageStyle, testID, wrapperTestID, onPress }: FadeIn
         testID={wrapperTestID}
         style={fadeInImageStyles.wrapper}
         onPress={onPress}
+        disabled={!onPress}
         activeOpacity={0.8}
-        accessibilityRole="button"
+        accessibilityRole={onPress ? 'button' : 'image'}
         accessibilityLabel={
-          isGeneratedImage ? `Generated image ${loaded ? 'loaded' : 'loading'}` : undefined
+          accessibilityLabel ?? (isGeneratedImage ? `Generated image ${loaded ? 'loaded' : 'loading'}` : undefined)
         }
       >
         <Image
diff --git a/src/components/VideoGenerationStatus.tsx b/src/components/VideoGenerationStatus.tsx
index d0eb71c43..b398028c6 100644
--- a/src/components/VideoGenerationStatus.tsx
+++ b/src/components/VideoGenerationStatus.tsx
@@ -1,5 +1,6 @@
 import React, { useEffect, useState, useSyncExternalStore } from 'react';
-import { Text } from 'react-native';
+import { Text, View } from 'react-native';
+import { FadeInImage } from './ChatMessage/components/MessageAttachments';
 import { videoGenerationService } from '../services/videoGenerationService';
 import { useTheme } from '../theme';
 import { SPACING, TYPOGRAPHY } from '../constants';
@@ -41,12 +42,14 @@ export function VideoGenerationStatus({
         : 'Processing prompt'
       : state.stage === 'encoding'
       ? 'Saving video'
-      : samplingFinished
+      : state.stage === 'decoding' || samplingFinished
       ? 'Decoding video frames'
       : 'Generating video';
   const steps =
     state.stage === 'generating' && state.progress && !samplingFinished
       ? ` · Step ${state.progress.step} of ${state.progress.total}`
+      : state.stage === 'decoding' && state.progress
+      ? ` · Section ${state.progress.step} of ${state.progress.total} complete`
       : '';
   const seconds = Math.max(
     0,
@@ -54,19 +57,32 @@ export function VideoGenerationStatus({
   );
   const elapsed = `${Math.floor(seconds / 60)}m ${seconds % 60}s elapsed`;
   return (
-    <Text
-      accessibilityLiveRegion="polite"
-      accessibilityLabel={`${label}${steps}`}
-      style={{
-        ...TYPOGRAPHY.bodySmall,
-        color: colors.textSecondary,
-        marginHorizontal: SPACING.lg,
-        marginBottom: SPACING.sm,
-      }}
-    >
-      {label}
-      {steps}
-      {` · ${elapsed}`}
-    </Text>
+    <View style={{ marginHorizontal: SPACING.lg, marginBottom: SPACING.sm }}>
+      {state.preview && (
+        <View style={{ marginBottom: SPACING.sm }}>
+          <FadeInImage
+            key={state.preview.path}
+            uri={`file://${state.preview.path}`}
+            imageStyle={{
+              width: '100%',
+              aspectRatio: state.preview.width / state.preview.height,
+            }}
+            accessibilityLabel="First decoded video frame"
+          />
+        </View>
+      )}
+      <Text
+        accessibilityLiveRegion="polite"
+        accessibilityLabel={`${label}${steps}`}
+        style={{
+          ...TYPOGRAPHY.bodySmall,
+          color: colors.textSecondary,
+        }}
+      >
+        {label}
+        {steps}
+        {` · ${elapsed}`}
+      </Text>
+    </View>
   );
 }
diff --git a/src/services/remoteMediaRuntime.ts b/src/services/remoteMediaRuntime.ts
index b3d9ce5cc..7c0534f91 100644
--- a/src/services/remoteMediaRuntime.ts
+++ b/src/services/remoteMediaRuntime.ts
@@ -1,11 +1,13 @@
 import { isRecordProvenance, type RecordProvenance } from '@offgrid/sync';
 import { generateId } from '../utils/generateId';
 import RNFS from 'react-native-fs';
+import { Buffer } from 'buffer';
 import type {
   ResolvedVideoRequest,
   VideoGenerationResultContract,
   VideoGenerationProgressContract,
   VideoGenerationStage,
+  VideoGenerationUpdateContract,
 } from '@offgrid/models';
 import { remoteServerManager } from './remoteServerManager';
 import type { RemoteMediaModelIds, RemoteServer } from '../types';
@@ -117,6 +119,7 @@ export const remoteMediaRuntime = {
         progress: VideoGenerationProgressContract | null,
         stage?: VideoGenerationStage,
       ) => void;
+      onPreview?: (preview: NonNullable<VideoGenerationUpdateContract['preview']>) => void;
     },
   ): Promise<
     VideoGenerationResultContract & { provenance?: RecordProvenance }
@@ -158,6 +161,10 @@ export const remoteMediaRuntime = {
       ).catch(() => {});
     };
     options.signal.addEventListener('abort', cancel, { once: true });
+    const previewController = new AbortController();
+    const stopPreview = () => previewController.abort();
+    options.signal.addEventListener('abort', stopPreview, { once: true });
+    let previewRequest: Promise<void> | undefined;
     try {
       if (options.signal.aborted) {
         cancel();
@@ -176,6 +183,7 @@ export const remoteMediaRuntime = {
               status: string;
               stage?: VideoGenerationStage;
               progress?: { step: number; total: number };
+              preview?: { width: number; height: number };
               error?: { message: string };
               result?: VideoGenerationResultContract & {
                 provenance?: RecordProvenance;
@@ -187,10 +195,32 @@ export const remoteMediaRuntime = {
             ? state.progress
             : null;
         const stage =
-          state.stage && ['enhancing', 'preparing', 'conditioning', 'generating', 'encoding'].includes(state.stage)
+          state.stage && ['enhancing', 'preparing', 'conditioning', 'generating', 'decoding', 'encoding'].includes(state.stage)
             ? state.stage
             : undefined;
         if (progress || stage) options.onProgress(progress, stage);
+        if (!previewRequest && options.onPreview && state.preview &&
+          Number.isFinite(state.preview.width) && state.preview.width > 0 &&
+          Number.isFinite(state.preview.height) && state.preview.height > 0) {
+          const dimensions = state.preview;
+          // Fetch only this job's authenticated route, never a URL from server metadata.
+          // Preview transfer must not delay job polling or final video delivery.
+          const timeout = setTimeout(stopPreview, 5000);
+          previewRequest = request({
+            server,
+            path: `/v1/videos/${encodeURIComponent(job.request_id)}/preview`,
+            signal: previewController.signal,
+            init: { method: 'GET', headers: { Accept: 'image/png' } },
+          }, async response => {
+            const bytes = await response.arrayBuffer();
+            if (bytes.byteLength === 0 || bytes.byteLength > 8 * 1024 * 1024) return;
+            const path = `${outputPath}.preview.png`;
+            await RNFS.writeFile(path, Buffer.from(bytes).toString('base64'), 'base64');
+            if (!previewController.signal.aborted) options.onPreview?.({ path, width: dimensions.width, height: dimensions.height });
+          }).catch(() => {
+            // A missing or expired preview must not fail video generation.
+          }).finally(() => clearTimeout(timeout));
+        }
         if (state.status === 'failed' || state.status === 'cancelled')
           throw Object.assign(
             new Error(
@@ -249,6 +279,9 @@ export const remoteMediaRuntime = {
         });
       }
     } finally {
+      stopPreview();
+      await previewRequest;
+      options.signal.removeEventListener('abort', stopPreview);
       options.signal.removeEventListener('abort', cancel);
     }
   },
diff --git a/src/services/videoGenerationService.ts b/src/services/videoGenerationService.ts
index 7908f2960..5709aa5e4 100644
--- a/src/services/videoGenerationService.ts
+++ b/src/services/videoGenerationService.ts
@@ -45,6 +45,7 @@ const EMPTY: VideoGenerationJobContract = {
   stage: null,
   enhancedPrompt: '',
   progress: null,
+  preview: null,
   outputPath: null,
   error: null,
   startedAt: null,
@@ -373,6 +374,7 @@ class VideoGenerationService {
             },
             onProgress: (progress, stage) =>
               this.update({ stage: stage ?? 'generating', progress }),
+            onPreview: preview => this.update({ preview }),
           },
         );
         path = remote.path;
@@ -470,6 +472,8 @@ class VideoGenerationService {
         throw error;
       }
     } finally {
+      this.update({ preview: null });
+      await RNFS.unlink(`${output}.preview.png`).catch(() => {});
       if (registration) modelResidencyManager.unregister('video', registration);
       if (generationSession.isGeneratingFor(input.conversationId))
         generationSession.end('video-finished');
diff --git a/src/services/videoGenerator.ts b/src/services/videoGenerator.ts
index bf7131943..5842c33b3 100644
--- a/src/services/videoGenerator.ts
+++ b/src/services/videoGenerator.ts
@@ -38,6 +38,12 @@ export const videoGenerator = {
         onUpdate({
           stage: event.stage,
           backend: event.backend ?? null,
+          ...(event.preview &&
+          event.preview.path === `${outputPath}.preview.png` &&
+          Number.isFinite(event.preview.width) && event.preview.width > 0 &&
+          Number.isFinite(event.preview.height) && event.preview.height > 0
+            ? { preview: event.preview }
+            : {}),
           progress:
             event.total > 0 ? { step: event.step, total: event.total } : null,
         });

From 48481c918ccafce6d7a298a0aaa51d59ff83b7f9 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 18:59:11 +0530
Subject: [PATCH 059/129] feat(video): report decode sections and reuse final
 frame preview [skip ci]

---
 android/app/src/main/cpp/video/video-jni.cpp  |  22 +++-
 .../video/VideoGenerationModule.kt            |  35 +++--
 native/video/VideoGenerationModule.mm         |  41 ++++--
 native/video/common/VideoRuntime.hpp          |  15 ++-
 scripts/prepare-video-runtime.sh              |   2 +-
 scripts/video/video-decode-observer.patch     | 123 ++++++++++++++++++
 6 files changed, 216 insertions(+), 22 deletions(-)
 create mode 100644 scripts/video/video-decode-observer.patch

diff --git a/android/app/src/main/cpp/video/video-jni.cpp b/android/app/src/main/cpp/video/video-jni.cpp
index 008594355..c0d489e9c 100644
--- a/android/app/src/main/cpp/video/video-jni.cpp
+++ b/android/app/src/main/cpp/video/video-jni.cpp
@@ -72,8 +72,10 @@ extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationMod
     auto progress = env->GetMethodID(klass, "progress", "(II)V");
     auto conditioning = env->GetMethodID(klass, "conditioning", "(Ljava/lang/String;)V");
     auto frame = env->GetMethodID(klass, "frame", "([BIII)V");
+    auto decodeProgress = env->GetMethodID(klass, "decoding", "(II)V");
+    auto preview = env->GetMethodID(klass, "preview", "([BII)V");
     env->DeleteLocalRef(klass);
-    if (!progress || !frame || !conditioning) throw std::runtime_error("Missing video host callbacks.");
+    if (!progress || !frame || !conditioning || !decodeProgress || !preview) throw std::runtime_error("Missing video host callbacks.");
     std::atomic_bool callbackFailed{false};
     runtime.run(request, [&](int step, int total) {
       // The engine may report progress from a worker thread. JNI environments
@@ -107,6 +109,24 @@ extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationMod
       env->CallVoidMethod(owner, conditioning, hardware);
       env->DeleteLocalRef(hardware);
       if (env->ExceptionCheck()) throw std::runtime_error("Could not report prompt processing.");
+    }, [&](int completed, int total) {
+      AttachedEnv thread(vm);
+      if (!thread.env) return;
+      thread.env->CallVoidMethod(owner, decodeProgress, completed, total);
+      if (thread.env->ExceptionCheck()) thread.env->ExceptionClear();
+    }, [&](const sd_image_t &image) {
+      // A preview is optional. Its failure must not discard a completed decode.
+      const uint64_t size = uint64_t(image.width) * image.height * image.channel;
+      if (!image.data || image.channel != 3 || size > uint64_t(std::numeric_limits<jsize>::max())) return;
+      AttachedEnv thread(vm);
+      if (!thread.env || runtime.cancelled.load()) return;
+      auto bytes = thread.env->NewByteArray(static_cast<jsize>(size));
+      if (bytes) {
+        thread.env->SetByteArrayRegion(bytes, 0, static_cast<jsize>(size), reinterpret_cast<jbyte *>(image.data));
+        if (!thread.env->ExceptionCheck()) thread.env->CallVoidMethod(owner, preview, bytes, image.width, image.height);
+        thread.env->DeleteLocalRef(bytes);
+      }
+      if (thread.env->ExceptionCheck()) thread.env->ExceptionClear();
     });
   } catch (const std::exception &error) {
     if (!env->ExceptionCheck()) {
diff --git a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
index d471942d4..40ec8464b 100644
--- a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
+++ b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
@@ -16,6 +16,7 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
     private val busy = AtomicBoolean(false)
     private val cancelled = AtomicBoolean(false)
     private var encoder: VideoEncoder? = null
+    private var previewFile: File? = null
     override fun getName() = "VideoGenerationModule"
     private external fun nativeGenerate(weight: String, vae: String, encoder: String, prompt: String, negative: String, width: Int, height: Int, frames: Int, fps: Int, steps: Int, guidance: Double, seed: Double, llm: String, embeddings: String, audioVae: String, flowShift: Double)
     private external fun nativeCancel()
@@ -44,15 +45,35 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
     fun progress(step: Int, total: Int) {
         emit("generating", step, total)
     }
+    fun decoding(completed: Int, total: Int) { emit("decoding", completed, total) }
+    fun preview(rgb: ByteArray, width: Int, height: Int) {
+        if (cancelled.get()) return
+        val destination = previewFile ?: return
+        runCatching {
+            saveRgbPng(rgb, width, height, destination)
+            emit("encoding", 0, 0, preview = Arguments.createMap().apply {
+                putString("path", destination.path); putInt("width", width); putInt("height", height)
+            })
+        }.onFailure { destination.delete() }
+    }
+    private fun saveRgbPng(rgb: ByteArray, width: Int, height: Int, destination: File) {
+        require(width > 0 && height > 0 && rgb.size.toLong() == width.toLong() * height * 3)
+        val pixels = IntArray(width * height) { i ->
+            android.graphics.Color.rgb(rgb[i * 3].toInt() and 255, rgb[i * 3 + 1].toInt() and 255, rgb[i * 3 + 2].toInt() and 255)
+        }
+        val bitmap = android.graphics.Bitmap.createBitmap(pixels, width, height, android.graphics.Bitmap.Config.ARGB_8888)
+        try { destination.outputStream().use { check(bitmap.compress(android.graphics.Bitmap.CompressFormat.PNG, 100, it)) } }
+        finally { bitmap.recycle() }
+    }
     fun frame(rgb: ByteArray, width: Int, height: Int, channels: Int) {
         check(!cancelled.get()) { "Video generation stopped." }
         emit("encoding", 0, 0)
         checkNotNull(encoder).append(rgb, channels) { cancelled.get() }
     }
-    private fun emit(stage: String, step: Int, total: Int, backend: String? = null) {
+    private fun emit(stage: String, step: Int, total: Int, backend: String? = null, preview: WritableMap? = null) {
         if (!context.hasActiveReactInstance()) return
         context.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-            .emit("VideoGenerationProgress", Arguments.createMap().apply { putString("stage", stage); putInt("step", step); putInt("total", total); if (backend != null) putString("backend", backend) })
+            .emit("VideoGenerationProgress", Arguments.createMap().apply { putString("stage", stage); putInt("step", step); putInt("total", total); if (backend != null) putString("backend", backend); if (preview != null) putMap("preview", preview) })
     }
     @ReactMethod fun generate(input: ReadableMap, promise: Promise) {
         if (!busy.compareAndSet(false, true)) { promise.reject("VIDEO_BUSY", "Video generation is already running."); return }
@@ -63,6 +84,7 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
                 prepareHexagonRuntime()
                 val destination = File(checkNotNull(input.getString("outputPath")))
                 output = destination
+                previewFile = File(destination.path + ".preview.png")
                 VideoGenerationService.admission = CompletableFuture()
                 VideoGenerationService.cancel = { stop() }
                 ContextCompat.startForegroundService(context, Intent(context, VideoGenerationService::class.java))
@@ -85,7 +107,7 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
             } catch (error: Throwable) {
                 output?.delete(); promise.reject(if (cancelled.get()) "VIDEO_CANCELLED" else "VIDEO_FAILED", error.message, error)
             } finally {
-                encoder = null; VideoGenerationService.cancel = null
+                encoder = null; previewFile = null; VideoGenerationService.cancel = null
                 context.stopService(Intent(context, VideoGenerationService::class.java)); busy.set(false)
             }
         }
@@ -136,12 +158,7 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
                 VideoGenerationService.admission.get(5, TimeUnit.SECONDS)
                 val bytes = nativeGenerateImage(checkNotNull(input.getString("prompt")), input.getString("negativePrompt") ?: "", width, height, input.getInt("steps"), input.getDouble("guidanceScale"), input.getDouble("seed"))
                 check(!cancelled.get()) { "Image generation stopped." }
-                val pixels = IntArray(width * height) { i ->
-                    android.graphics.Color.rgb(bytes[i * 3].toInt() and 255, bytes[i * 3 + 1].toInt() and 255, bytes[i * 3 + 2].toInt() and 255)
-                }
-                val bitmap = android.graphics.Bitmap.createBitmap(pixels, width, height, android.graphics.Bitmap.Config.ARGB_8888)
-                try { output.outputStream().use { check(bitmap.compress(android.graphics.Bitmap.CompressFormat.PNG, 100, it)) } }
-                finally { bitmap.recycle() }
+                saveRgbPng(bytes, width, height, output)
                 check(!cancelled.get()) { "Image generation stopped." }
                 promise.resolve(Arguments.createMap().apply {
                     putString("imagePath", output.path); putInt("width", width); putInt("height", height); putDouble("seed", input.getDouble("seed")); putString("id", input.getString("id"))
diff --git a/native/video/VideoGenerationModule.mm b/native/video/VideoGenerationModule.mm
index 6e85ba1aa..3a85e73b8 100644
--- a/native/video/VideoGenerationModule.mm
+++ b/native/video/VideoGenerationModule.mm
@@ -5,6 +5,18 @@
 #import "VideoEncoder.h"
 #include "common/VideoRuntime.hpp"
 
+static BOOL OGSaveRgbPng(const sd_image_t &image, NSString *output) {
+  if (!image.data || image.channel != 3) return NO;
+  CFDataRef data = CFDataCreate(kCFAllocatorDefault, image.data, image.width * image.height * 3);
+  CGDataProviderRef provider = data ? CGDataProviderCreateWithCFData(data) : nullptr;
+  CGColorSpaceRef color = CGColorSpaceCreateDeviceRGB();
+  CGImageRef bitmap = provider ? CGImageCreate(image.width, image.height, 8, 24, image.width * 3, color, kCGImageAlphaNone, provider, nullptr, false, kCGRenderingIntentDefault) : nullptr;
+  NSData *png = bitmap ? UIImagePNGRepresentation([UIImage imageWithCGImage:bitmap]) : nil;
+  if (bitmap) CGImageRelease(bitmap);
+  CGColorSpaceRelease(color); if (provider) CGDataProviderRelease(provider); if (data) CFRelease(data);
+  return png && [png writeToFile:output atomically:YES];
+}
+
 @interface VideoGenerationModule : RCTEventEmitter <RCTBridgeModule>
 @end
 @implementation VideoGenerationModule {
@@ -90,11 +102,27 @@ - (void)emitStage:(NSString *)stage step:(int)step total:(int)total {
           self->_runtime.run(request, [&](int step, int total) {
             [self emitStage:@"generating" step:step total:total];
           }, [&](sd_image_t *frames, int count, int fps) {
-            [self emitStage:@"encoding" step:count total:count];
+            [self emitStage:@"encoding" step:0 total:count];
             NSError *encodingError = nil;
             if (!OGEncodeVideo(frames, count, fps, output, self->_runtime.cancelled, &encodingError))
               throw std::runtime_error(encodingError ? encodingError.localizedDescription.UTF8String : "Video encoding stopped.");
-          }, [&](const char *) { [self emitStage:@"conditioning" step:0 total:0]; });
+          }, [&](const char *) { [self emitStage:@"conditioning" step:0 total:0]; },
+          [&](int completed, int total) { [self emitStage:@"decoding" step:completed total:total]; },
+          [&](const sd_image_t &image) {
+            if (self->_runtime.cancelled.load()) return;
+            NSString *path = [output stringByAppendingString:@".preview.png"];
+            @try {
+              if (!OGSaveRgbPng(image, path)) return;
+            } @catch (NSException *exception) {
+              [[NSFileManager defaultManager] removeItemAtPath:path error:nil];
+              return;
+            }
+            NSDictionary *preview = @{@"path":path, @"width":@(image.width), @"height":@(image.height)};
+            dispatch_async(dispatch_get_main_queue(), ^{
+              if (self->_listeners) [self sendEventWithName:@"VideoGenerationProgress"
+                  body:@{@"stage":@"encoding", @"step":@0, @"total":@0, @"preview":preview}];
+            });
+          });
         } catch (const std::exception &error) {
           failure = [NSError errorWithDomain:@"OffgridVideo" code:1 userInfo:@{NSLocalizedDescriptionKey:@(error.what())}];
           [[NSFileManager defaultManager] removeItemAtPath:output error:nil];
@@ -172,14 +200,7 @@ - (void)emitStage:(NSString *)stage step:(int)step total:(int)total {
           }, [&](const sd_image_t &image) {
             if (!image.data || image.channel != 3 || image.width != request.width || image.height != request.height)
               throw std::runtime_error("The image engine returned invalid pixels.");
-            CFDataRef data = CFDataCreate(kCFAllocatorDefault, image.data, image.width * image.height * 3);
-            CGDataProviderRef provider = data ? CGDataProviderCreateWithCFData(data) : nullptr;
-            CGColorSpaceRef color = CGColorSpaceCreateDeviceRGB();
-            CGImageRef bitmap = provider ? CGImageCreate(image.width, image.height, 8, 24, image.width * 3, color, kCGImageAlphaNone, provider, nullptr, false, kCGRenderingIntentDefault) : nullptr;
-            NSData *png = bitmap ? UIImagePNGRepresentation([UIImage imageWithCGImage:bitmap]) : nil;
-            if (bitmap) CGImageRelease(bitmap);
-            CGColorSpaceRelease(color); if (provider) CGDataProviderRelease(provider); if (data) CFRelease(data);
-            if (!png || ![png writeToFile:output atomically:YES]) throw std::runtime_error("Could not save the image.");
+            if (!OGSaveRgbPng(image, output)) throw std::runtime_error("Could not save the image.");
           });
           if (self->_runtime.cancelled.load()) throw std::runtime_error("Image generation stopped.");
         } catch (const std::exception &error) {
diff --git a/native/video/common/VideoRuntime.hpp b/native/video/common/VideoRuntime.hpp
index 1b2b09688..2fd83c083 100644
--- a/native/video/common/VideoRuntime.hpp
+++ b/native/video/common/VideoRuntime.hpp
@@ -190,13 +190,20 @@ class VideoRuntime {
   void run(const VideoRequest &request,
            const std::function<void(int, int)> &progress,
            const std::function<void(sd_image_t *, int, int)> &encode,
-           const std::function<void(const char *)> &conditioning) {
+           const std::function<void(const char *)> &conditioning,
+           const std::function<void(int, int)> &decodeProgress,
+           const std::function<void(const sd_image_t &)> &preview) {
     std::unique_lock<std::mutex> execution(executionMutex, std::try_to_lock);
     if (!execution.owns_lock()) throw std::runtime_error("Video generation is already running.");
     sd_image_t *frames = nullptr;
     int count = 0, fps = request.fps;
+    struct DecodeObserver {
+      const std::function<void(int, int)> &progress;
+      const std::function<void(const sd_image_t &)> &frame;
+    } observer{decodeProgress, preview};
     auto cleanup = [&] {
       if (frames) free_sd_images(frames, count);
+      sd_set_video_decode_callback(nullptr, nullptr, nullptr);
       sd_set_progress_callback(nullptr, nullptr);
       std::lock_guard<std::mutex> guard(contextMutex);
       if (context) free_sd_ctx(context);
@@ -215,6 +222,12 @@ class VideoRuntime {
       sd_set_progress_callback([](int step, int total, float, void *data) {
         (*static_cast<const std::function<void(int, int)> *>(data))(step, total);
       }, const_cast<void *>(static_cast<const void *>(&progress)));
+      sd_set_video_decode_callback([](int completed, int total, void *data) {
+        static_cast<DecodeObserver *>(data)->progress(completed, total);
+      }, [](const sd_image_t *image, void *data) {
+        try { static_cast<DecodeObserver *>(data)->frame(*image); }
+        catch (...) { /* The optional preview must not fail generation. */ }
+      }, &observer);
       sd_vid_gen_params_t params;
       sd_vid_gen_params_init(&params);
       params.prompt = request.prompt.c_str(); params.negative_prompt = request.negative.c_str();
diff --git a/scripts/prepare-video-runtime.sh b/scripts/prepare-video-runtime.sh
index 24b99350b..769f9c091 100644
--- a/scripts/prepare-video-runtime.sh
+++ b/scripts/prepare-video-runtime.sh
@@ -16,7 +16,7 @@ PATCH="$ROOT/scripts/video/android-vulkan-dispatch.patch"
 if ! git -C "$SOURCE/ggml" apply --reverse --check "$PATCH" 2>/dev/null; then
   git -C "$SOURCE/ggml" apply "$PATCH"
 fi
-for entry in "ggml:android-vulkan-device-fault.patch" "ggml:android-vulkan-pipeline-diagnostics.patch" "ggml:android-vulkan-matvec-fallback.patch" "ggml:android-hexagon.patch" "ggml:android-hexagon-buffer-validation.patch" ".:android-hardware-fallback.patch" ".:conditioning-errors.patch"; do
+for entry in "ggml:android-vulkan-device-fault.patch" "ggml:android-vulkan-pipeline-diagnostics.patch" "ggml:android-vulkan-matvec-fallback.patch" "ggml:android-hexagon.patch" "ggml:android-hexagon-buffer-validation.patch" ".:android-hardware-fallback.patch" ".:conditioning-errors.patch" ".:video-decode-observer.patch"; do
   target="${entry%%:*}"
   patch="$ROOT/scripts/video/${entry#*:}"
   if ! git -C "$SOURCE/$target" apply --reverse --check "$patch" 2>/dev/null; then
diff --git a/scripts/video/video-decode-observer.patch b/scripts/video/video-decode-observer.patch
new file mode 100644
index 000000000..246f0a9cd
--- /dev/null
+++ b/scripts/video/video-decode-observer.patch
@@ -0,0 +1,123 @@
+--- a/include/stable-diffusion.h
++++ b/include/stable-diffusion.h
+@@ -461,10 +461,16 @@
+ typedef void (*sd_log_cb_t)(enum sd_log_level_t level, const char* text, void* data);
+ typedef void (*sd_progress_cb_t)(int step, int steps, float time, void* data);
+ typedef void (*sd_preview_cb_t)(int step, int frame_count, sd_image_t* frames, bool is_noisy, void* data);
++// The decoded frame is borrowed for the duration of this callback only.
++typedef void (*sd_video_decode_progress_cb_t)(int completed, int total, void* data);
++typedef void (*sd_video_decoded_frame_cb_t)(const sd_image_t* frame, void* data);
+ typedef bool (*sd_graph_eval_callback_t)(struct ggml_tensor* t, bool ask, void* user_data);
+ 
+ SD_API void sd_set_log_callback(sd_log_cb_t sd_log_cb, void* data);
+ SD_API void sd_set_progress_callback(sd_progress_cb_t cb, void* data);
++// Reports final video decode sections and the first complete frame, without an extra decode.
++// total == 0 means the section count is not yet known. Does not report sampling previews.
++SD_API void sd_set_video_decode_callback(sd_video_decode_progress_cb_t progress, sd_video_decoded_frame_cb_t frame, void* data);
+ // In each sampling pass, a positive interval previews every Nth denoiser step, while a
+ // negative interval previews only completed logical step -interval. Zero previews the final
+ // completed step of the first sampling pass (base-resolution or high-noise).
+--- a/src/core/util.h
++++ b/src/core/util.h
+@@ -98,6 +98,18 @@
+ std::vector<std::pair<std::string, float>> split_quotation_attention(
+     const std::vector<std::pair<std::string, float>>& parsed_attention);
+ 
++class SDVideoDecodeScope {
++public:
++    SDVideoDecodeScope();
++    ~SDVideoDecodeScope();
++    SDVideoDecodeScope(const SDVideoDecodeScope&) = delete;
++    SDVideoDecodeScope& operator=(const SDVideoDecodeScope&) = delete;
++private:
++    bool previous;
++};
++void sd_video_decode_progress(int completed, int total);
++void sd_video_decoded_frame(const sd_image_t* frame);
++
+ sd_progress_cb_t sd_get_progress_callback();
+ void* sd_get_progress_callback_data();
+ 
+--- a/src/core/util.cpp
++++ b/src/core/util.cpp
+@@ -357,6 +357,30 @@
+     return n_threads > 0 ? (n_threads <= 4 ? n_threads : n_threads / 2) : 4;
+ }
+ 
++static sd_video_decode_progress_cb_t sd_decode_progress_cb = nullptr;
++static sd_video_decoded_frame_cb_t sd_decoded_frame_cb = nullptr;
++static void* sd_decode_cb_data = nullptr;
++static thread_local bool sd_video_decode_active = false;
++
++SDVideoDecodeScope::SDVideoDecodeScope() : previous(sd_video_decode_active) {
++    sd_video_decode_active = true;
++    sd_video_decode_progress(0, 0);
++}
++SDVideoDecodeScope::~SDVideoDecodeScope() { sd_video_decode_active = previous; }
++void sd_video_decode_progress(int completed, int total) {
++    if (sd_video_decode_active && sd_decode_progress_cb)
++        sd_decode_progress_cb(completed, total, sd_decode_cb_data);
++}
++void sd_video_decoded_frame(const sd_image_t* frame) {
++    if (frame && frame->data && sd_decoded_frame_cb)
++        sd_decoded_frame_cb(frame, sd_decode_cb_data);
++}
++void sd_set_video_decode_callback(sd_video_decode_progress_cb_t progress, sd_video_decoded_frame_cb_t frame, void* data) {
++    sd_decode_progress_cb = progress;
++    sd_decoded_frame_cb = frame;
++    sd_decode_cb_data = data;
++}
++
+ static sd_progress_cb_t sd_progress_cb = nullptr;
+ void* sd_progress_cb_data              = nullptr;
+ 
+@@ -581,6 +605,8 @@
+ }
+ 
+ void pretty_progress(int step, int steps, float time) {
++    // Video decode has its own section callback; keep it out of sampling progress.
++    if (sd_video_decode_active && sd_decode_progress_cb) return;
+     if (sd_progress_cb) {
+         sd_progress_cb(step, steps, time, sd_progress_cb_data);
+         return;
+--- a/src/runtime/tiling.cpp
++++ b/src/runtime/tiling.cpp
+@@ -193,6 +193,7 @@
+     }
+ 
+     int num_tiles   = num_tiles_x * num_tiles_y;
++    sd_video_decode_progress(0, num_tiles);
+     int tile_count  = 1;
+     bool last_y     = false;
+     bool last_x     = false;
+@@ -254,6 +255,7 @@
+                 last_time  = (t2 - t1) / 1000.0f;
+                 pretty_progress(tile_count, num_tiles, last_time);
+             }
++            sd_video_decode_progress(tile_count, num_tiles);
+             tile_count++;
+         }
+         last_x = false;
+--- a/src/pipeline/video.cpp
++++ b/src/pipeline/video.cpp
+@@ -1238,7 +1238,11 @@
+                     (int)video_latent.shape()[3]);
+         // auto z = sd::load_tensor_from_file_as_tensor<float>("ltx_vae_z.bin");
+         int64_t t4            = ggml_time_ms();
+-        sd::Tensor<float> vid = sd->decode_first_stage(video_latent, true);
++        sd::Tensor<float> vid;
++        {
++            SDVideoDecodeScope decode_scope;
++            vid = sd->decode_first_stage(video_latent, true);
++        }
+         int64_t t5            = ggml_time_ms();
+         LOG_INFO("decode_first_stage completed, taking %.2fs", (t5 - t4) * 1.0f / 1000);
+         if (vid.empty()) {
+@@ -1265,6 +1269,7 @@
+ 
+         for (int64_t i = 0; i < vid.shape()[2]; i++) {
+             result_images[i] = tensor_to_sd_image(vid, static_cast<int>(i));
++            if (i == 0) sd_video_decoded_frame(&result_images[i]);
+         }
+ 
+         return result_images;

From 340b82458b8b62903a1fc2db67a554b2da25491d Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 19:04:49 +0530
Subject: [PATCH 060/129] fix(video): honor full precision attention on Hexagon
 [skip ci]

---
 scripts/prepare-video-runtime.sh              |  2 +-
 scripts/video/android-hexagon-precision.patch | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 scripts/video/android-hexagon-precision.patch

diff --git a/scripts/prepare-video-runtime.sh b/scripts/prepare-video-runtime.sh
index 769f9c091..e0cf6a1f1 100644
--- a/scripts/prepare-video-runtime.sh
+++ b/scripts/prepare-video-runtime.sh
@@ -16,7 +16,7 @@ PATCH="$ROOT/scripts/video/android-vulkan-dispatch.patch"
 if ! git -C "$SOURCE/ggml" apply --reverse --check "$PATCH" 2>/dev/null; then
   git -C "$SOURCE/ggml" apply "$PATCH"
 fi
-for entry in "ggml:android-vulkan-device-fault.patch" "ggml:android-vulkan-pipeline-diagnostics.patch" "ggml:android-vulkan-matvec-fallback.patch" "ggml:android-hexagon.patch" "ggml:android-hexagon-buffer-validation.patch" ".:android-hardware-fallback.patch" ".:conditioning-errors.patch" ".:video-decode-observer.patch"; do
+for entry in "ggml:android-vulkan-device-fault.patch" "ggml:android-vulkan-pipeline-diagnostics.patch" "ggml:android-vulkan-matvec-fallback.patch" "ggml:android-hexagon.patch" "ggml:android-hexagon-buffer-validation.patch" "ggml:android-hexagon-precision.patch" ".:android-hardware-fallback.patch" ".:conditioning-errors.patch" ".:video-decode-observer.patch"; do
   target="${entry%%:*}"
   patch="$ROOT/scripts/video/${entry#*:}"
   if ! git -C "$SOURCE/$target" apply --reverse --check "$patch" 2>/dev/null; then
diff --git a/scripts/video/android-hexagon-precision.patch b/scripts/video/android-hexagon-precision.patch
new file mode 100644
index 000000000..fc525fc7d
--- /dev/null
+++ b/scripts/video/android-hexagon-precision.patch
@@ -0,0 +1,30 @@
+--- a/src/ggml-hexagon/ggml-hexagon.cpp
++++ b/src/ggml-hexagon/ggml-hexagon.cpp
+@@ -4287,6 +4287,8 @@
+ }
+ 
+ static bool ggml_hexagon_supported_flash_attn_ext(const struct ggml_hexagon_session * sess, const struct ggml_tensor * op) {
++    // HMX keeps attention scores and recurrent output in F16 tiles.
++    if (ggml_get_op_params_i32(op, 3) == GGML_PREC_F32) return false;
+     const struct ggml_tensor * src0 = op->src[0];
+     const struct ggml_tensor * src1 = op->src[1];
+     const struct ggml_tensor * src2 = op->src[2];
+@@ -5391,6 +5393,9 @@
+ }
+ 
+ static bool ggml_hexagon_supported_mul_mat(const struct ggml_hexagon_session * sess, const struct ggml_tensor * dst) {
++    // HMX can lower activations to F16. Honor explicit F32 accumulation
++    // requests (for example video attention) through another backend.
++    if (ggml_get_op_params_i32(dst, 0) == GGML_PREC_F32) return false;
+     const struct ggml_tensor * src0 = dst->src[0];
+     const struct ggml_tensor * src1 = dst->src[1];
+ 
+@@ -5481,7 +5486,7 @@
+         return false;
+     }
+ 
+-    if (ggml_get_op_params_i32(op, 3) == GGML_PREC_F32) {
++    if (ggml_get_op_params_i32(op, 0) == GGML_PREC_F32) {
+         return false;
+     }
+ 

From a101a2e63ef532d456fe9db429e2e4e13c03672a Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 19:06:39 +0530
Subject: [PATCH 061/129] feat(mobile): use themed video player controls and
 picture in picture [skip ci]

---
 android/app/src/main/AndroidManifest.xml      |  1 +
 ios/OffgridMobile/Info.plist                  |  4 +
 package-lock.json                             | 16 ++++
 package.json                                  |  1 +
 .../components/MessageAttachments.tsx         | 79 ++++++++++++++++++-
 5 files changed, 99 insertions(+), 2 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index bf9009eb9..41b474c28 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -80,6 +80,7 @@
       <uses-native-library android:name="libcdsprpc.so" android:required="false" />
       <activity
         android:name=".MainActivity"
+        android:supportsPictureInPicture="true"
         android:label="@string/app_name"
         android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
         android:launchMode="singleTask"
diff --git a/ios/OffgridMobile/Info.plist b/ios/OffgridMobile/Info.plist
index e665da43a..592d2f8d3 100644
--- a/ios/OffgridMobile/Info.plist
+++ b/ios/OffgridMobile/Info.plist
@@ -108,6 +108,10 @@
 	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>audio</string>
+	</array>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>arm64</string>
diff --git a/package-lock.json b/package-lock.json
index 9a1814468..063c9a635 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -60,6 +60,7 @@
         "react-native-url-polyfill": "^3.0.0",
         "react-native-vector-icons": "^10.3.0",
         "react-native-video": "^6.19.3",
+        "react-native-video-player": "0.16.3",
         "react-native-vision-camera": "^4.7.3",
         "react-native-worklets": "^0.7.3",
         "react-native-zeroconf": "^0.14.0",
@@ -15288,6 +15289,21 @@
         "react-native": "*"
       }
     },
+    "node_modules/react-native-video-player": {
+      "version": "0.16.3",
+      "resolved": "https://registry.npmjs.org/react-native-video-player/-/react-native-video-player-0.16.3.tgz",
+      "integrity": "sha512-7FMPl2uO9HRkklAaAGqtuAx+8qphbluacWTxyOhV19AOLc0GC4hkD0FrQoj6ksmgrwFJEXIkBlWkkfu1GS1YyA==",
+      "license": "MIT",
+      "workspaces": [
+        "example",
+        "docs"
+      ],
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*",
+        "react-native-video": "^6.8.0"
+      }
+    },
     "node_modules/react-native-vision-camera": {
       "version": "4.7.3",
       "resolved": "https://registry.npmjs.org/react-native-vision-camera/-/react-native-vision-camera-4.7.3.tgz",
diff --git a/package.json b/package.json
index 60a459b4d..245ab5469 100644
--- a/package.json
+++ b/package.json
@@ -82,6 +82,7 @@
     "react-native-url-polyfill": "^3.0.0",
     "react-native-vector-icons": "^10.3.0",
     "react-native-video": "^6.19.3",
+    "react-native-video-player": "0.16.3",
     "react-native-vision-camera": "^4.7.3",
     "react-native-worklets": "^0.7.3",
     "react-native-zeroconf": "^0.14.0",
diff --git a/src/components/ChatMessage/components/MessageAttachments.tsx b/src/components/ChatMessage/components/MessageAttachments.tsx
index 710ebc2a7..711366252 100644
--- a/src/components/ChatMessage/components/MessageAttachments.tsx
+++ b/src/components/ChatMessage/components/MessageAttachments.tsx
@@ -10,9 +10,15 @@ import Animated, {
   useSharedValue,
   useAnimatedStyle,
   withTiming,
+  useReducedMotion,
 } from 'react-native-reanimated';
 import Icon from 'react-native-vector-icons/Feather';
-import Video from 'react-native-video';
+import VideoPlayer, { type VideoPlayerRef } from 'react-native-video-player';
+import { ResizeMode } from 'react-native-video';
+import { useTheme } from '../../../theme';
+import { COLORS_DARK } from '../../../theme/palettes';
+import { SPACING, TYPOGRAPHY } from '../../../constants';
+import { Button } from '../../Button';
 // Imported directly, not through the barrel: a component that reaches its sibling via the index
 // resolves undefined at render time.
 import { LoadingDots } from '../../LoadingDots';
@@ -101,6 +107,75 @@ interface MessageAttachmentsProps {
   onImagePress?: (uri: string) => void;
 }
 
+/** The library owns playback and controls; this adapter supplies attachment data and theme. */
+function VideoAttachment({ attachment }: { attachment: MediaAttachment }) {
+  const { colors } = useTheme();
+  const player = React.useRef<VideoPlayerRef>(null);
+  const reducedMotion = useReducedMotion();
+  const [size, setSize] = React.useState({
+    width: attachment.width || 16,
+    height: attachment.height || 9,
+  });
+  const [loaded, setLoaded] = React.useState(false);
+  const [error, setError] = React.useState<string | null>(null);
+  return (
+    <View style={{ width: '100%', gap: SPACING.xs }}>
+      <VideoPlayer
+        ref={player}
+        source={{ uri: resolveMediaUri(attachment.uri) }}
+        videoWidth={size.width}
+        videoHeight={size.height}
+        resizeMode={ResizeMode.CONTAIN}
+        showDuration
+        disableControlsAutoHide
+        pauseOnPress
+        animationDuration={reducedMotion ? 0 : 150}
+        playInBackground
+        playWhenInactive
+        ignoreSilentSwitch="ignore"
+        enterPictureInPictureOnLeave
+        onRestoreUserInterfaceForPictureInPictureStop={() => {
+          player.current?.restoreUserInterfaceForPictureInPictureStopCompleted(true);
+        }}
+        onLoad={({ naturalSize }) => {
+          setLoaded(true);
+          setError(null);
+          if (naturalSize.width > 0 && naturalSize.height > 0) {
+            setSize({ width: naturalSize.width, height: naturalSize.height });
+          }
+        }}
+        onError={() => setError('This video could not be played.')}
+        customStyles={{
+          wrapper: { width: '100%', borderRadius: SPACING.sm, overflow: 'hidden' },
+          controls: { backgroundColor: COLORS_DARK.surface, height: SPACING.xl * 2, marginTop: 0 },
+          controlButton: { minWidth: SPACING.xl * 2, minHeight: SPACING.xl * 2 },
+          controlIcon: { tintColor: COLORS_DARK.text },
+          playArrow: { tintColor: colors.text },
+          playButton: { backgroundColor: colors.surface, width: SPACING.xl * 2, height: SPACING.xl * 2, borderRadius: SPACING.sm },
+          seekBarProgress: { backgroundColor: COLORS_DARK.primary },
+          seekBarKnob: { backgroundColor: COLORS_DARK.primary },
+          seekBarBackground: { backgroundColor: COLORS_DARK.border },
+          durationText: { ...TYPOGRAPHY.meta, color: COLORS_DARK.textSecondary },
+        }}
+      />
+      {error && <Text accessibilityRole="alert" style={{ ...TYPOGRAPHY.bodySmall, color: colors.error }}>{error}</Text>}
+      <Button
+        title="Picture in picture"
+        variant="ghost"
+        size="small"
+        disabled={!loaded}
+        onPress={async () => {
+          try {
+            await player.current?.enterPictureInPicture();
+          } catch {
+            setError('Picture in picture is not available on this device.');
+          }
+        }}
+      />
+    </View>
+  );
+}
+
 function AudioAttachment({
   index,
   isUser,
@@ -201,7 +276,7 @@ export function MessageAttachments({
             colors={colors}
           />
         ) : attachment.type === 'video' ? (
-          <Video key={attachment.id} source={{ uri: resolveMediaUri(attachment.uri) }} controls paused resizeMode="contain" style={{ width: '100%', aspectRatio: 16 / 9, backgroundColor: '#000' }} />
+          <VideoAttachment key={attachment.id} attachment={attachment} />
         ) : attachment.type === 'audio' ? (
           <AudioAttachment
             key={attachment.id}

From 8003ebfef046d72b03ca3c3041d8507546f9f0ce Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 19:07:37 +0530
Subject: [PATCH 062/129] fix(ios): rebuild video preview runtime for physical
 devices [skip ci]

---
 scripts/build-video-ios.sh | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/scripts/build-video-ios.sh b/scripts/build-video-ios.sh
index 945f9acb9..3670806ba 100755
--- a/scripts/build-video-ios.sh
+++ b/scripts/build-video-ios.sh
@@ -5,7 +5,7 @@ REVISION="$(cat "$ROOT/scripts/video/revision")"
 CACHE="${OFFGRID_VIDEO_BUILD_DIR:-$ROOT/.video-build}"
 SOURCE="${OFFGRID_SD_SOURCE:-$CACHE/source}"
 OUTPUT="$ROOT/native/video/OffgridVideoRuntime.xcframework"
-BUILD_KEY="$(cat "$ROOT/scripts/video/revision" "$ROOT/scripts/video/exports.txt" "$ROOT/scripts/video/CMakeLists.txt" "$ROOT/scripts/video/conditioning-errors.patch" | shasum -a 256 | cut -d' ' -f1)"
+BUILD_KEY="${OFFGRID_IOS_DEVICE_ONLY:-0}-$(cat "$ROOT/scripts/video/revision" "$ROOT/scripts/video/exports.txt" "$ROOT/scripts/video/CMakeLists.txt" "$ROOT/scripts/video/conditioning-errors.patch" "$ROOT/scripts/video/video-decode-observer.patch" | shasum -a 256 | cut -d' ' -f1)"
 if [ -f "$OUTPUT/ios-arm64/OffgridVideoRuntime.framework/Headers/stable-diffusion.h" ] && [ -f "$OUTPUT/revision" ] && [ "$(cat "$OUTPUT/revision")" = "$BUILD_KEY" ]; then exit 0; fi
 mkdir -p "$CACHE"
 if [ ! -d "$SOURCE/.git" ]; then
@@ -16,11 +16,14 @@ if [ "$(git -C "$SOURCE" rev-parse HEAD)" != "$REVISION" ]; then
   git -C "$SOURCE" checkout --detach "$REVISION"
 fi
 git -C "$SOURCE" submodule update --init --depth 1 ggml
-PATCH="$ROOT/scripts/video/conditioning-errors.patch"
-if ! git -C "$SOURCE" apply --reverse --check "$PATCH" 2>/dev/null; then
-  git -C "$SOURCE" apply "$PATCH"
-fi
-for SDK in iphoneos iphonesimulator; do
+for PATCH in "$ROOT/scripts/video/conditioning-errors.patch" "$ROOT/scripts/video/video-decode-observer.patch"; do
+  if ! git -C "$SOURCE" apply --reverse --check "$PATCH" 2>/dev/null; then
+    git -C "$SOURCE" apply "$PATCH"
+  fi
+done
+SDKS=(iphoneos)
+if [ "${OFFGRID_IOS_DEVICE_ONLY:-0}" != "1" ]; then SDKS+=(iphonesimulator); fi
+for SDK in "${SDKS[@]}"; do
   cmake -S "$ROOT/scripts/video" -B "$CACHE/$SDK" -G Xcode \
     -DSD_SOURCE="$SOURCE" -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT="$SDK" \
     -DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_OSX_DEPLOYMENT_TARGET=17.0
@@ -28,9 +31,8 @@ for SDK in iphoneos iphonesimulator; do
  done
 # Replace only this generated build artifact.
 rm -rf "$OUTPUT"
-xcodebuild -create-xcframework \
-  -framework "$CACHE/iphoneos/bin/Release/OffgridVideoRuntime.framework" \
-  -framework "$CACHE/iphonesimulator/bin/Release/OffgridVideoRuntime.framework" \
-  -output "$OUTPUT"
+FRAMEWORKS=()
+for SDK in "${SDKS[@]}"; do FRAMEWORKS+=(-framework "$CACHE/$SDK/bin/Release/OffgridVideoRuntime.framework"); done
+xcodebuild -create-xcframework "${FRAMEWORKS[@]}" -output "$OUTPUT"
 printf '%s\n' "$BUILD_KEY" > "$OUTPUT/revision"
 cp "$SOURCE/LICENSE" "$ROOT/native/video/RUNTIME-LICENSE"

From e59e7382086833511b312f8558fc8efe4c501d9f Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 19:11:45 +0530
Subject: [PATCH 063/129] fix(mobile): fit video controls and picture in
 picture in one bar [skip ci]

---
 .../react-native-video-player+0.16.3.patch    | 314 ++++++++++++++++++
 .../components/MessageAttachments.tsx         |  46 +--
 2 files changed, 341 insertions(+), 19 deletions(-)
 create mode 100644 patches/react-native-video-player+0.16.3.patch

diff --git a/patches/react-native-video-player+0.16.3.patch b/patches/react-native-video-player+0.16.3.patch
new file mode 100644
index 000000000..75e7e5b47
--- /dev/null
+++ b/patches/react-native-video-player+0.16.3.patch
@@ -0,0 +1,314 @@
+diff --git a/node_modules/react-native-video-player/lib/commonjs/Video.js b/node_modules/react-native-video-player/lib/commonjs/Video.js
+index 9ff315d..56e8850 100644
+--- a/node_modules/react-native-video-player/lib/commonjs/Video.js
++++ b/node_modules/react-native-video-player/lib/commonjs/Video.js
+@@ -19,6 +19,8 @@ const RenderVideo = exports.RenderVideo = /*#__PURE__*/(0, _react.memo)(/*#__PUR
+     defaultMuted,
+     disableControlsAutoHide,
+     disableFullscreen,
++    disableMute,
++    additionalControl,
+     disableSeek,
+     fullScreenOnLongPress,
+     hideControlsOnStart = false,
+@@ -179,6 +181,8 @@ const RenderVideo = exports.RenderVideo = /*#__PURE__*/(0, _react.memo)(/*#__PUR
+       customStyles: customStyles,
+       showDuration: showDuration,
+       disableFullscreen: disableFullscreen,
++      disableMute: disableMute,
++      additionalControl: additionalControl,
+       duration: props.duration || duration,
+       isPlaying: isPlaying,
+       isMuted: isMuted,
+diff --git a/node_modules/react-native-video-player/lib/commonjs/controls/Controls.js b/node_modules/react-native-video-player/lib/commonjs/controls/Controls.js
+index bb476fb..54ba537 100644
+--- a/node_modules/react-native-video-player/lib/commonjs/controls/Controls.js
++++ b/node_modules/react-native-video-player/lib/commonjs/controls/Controls.js
+@@ -20,6 +20,8 @@ const Controls = exports.Controls = /*#__PURE__*/(0, _react.forwardRef)(({
+   onToggleFullScreen,
+   duration,
+   disableFullscreen,
++  disableMute,
++  additionalControl,
+   onMutePress,
+   isMuted,
+   animationDuration,
+@@ -63,6 +65,7 @@ const Controls = exports.Controls = /*#__PURE__*/(0, _react.forwardRef)(({
+     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_PlayButton.PlayButton, {
+       controlButtonCustomStyles: customStyles?.controlButton,
+       playControlCustomStyles: customStyles?.playControl,
++      controlIconCustomStyles: customStyles?.controlIcon,
+       isPlaying: isPlaying,
+       onPlayPress: onPlayPress
+     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Seekbar.Seekbar, {
+@@ -83,12 +86,12 @@ const Controls = exports.Controls = /*#__PURE__*/(0, _react.forwardRef)(({
+       ref: durationRef,
+       duration: duration,
+       durationTextCustomStyles: customStyles?.durationText
+-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Mute.Mute, {
++    }), !disableMute && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Mute.Mute, {
+       controlButtonCustomStyles: customStyles?.controlButton,
+       controlIconCustomStyles: customStyles?.controlIcon,
+       isMuted: isMuted,
+       onMutePress: onMutePress
+-    }), !disableFullscreen && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Fullscreen.Fullscreen, {
++    }), additionalControl, !disableFullscreen && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Fullscreen.Fullscreen, {
+       onToggleFullScreen: onToggleFullScreen,
+       controlButtonCustomStyles: customStyles?.controlButton,
+       controlIconCustomStyles: customStyles?.controlIcon
+diff --git a/node_modules/react-native-video-player/lib/commonjs/controls/PlayButton.js b/node_modules/react-native-video-player/lib/commonjs/controls/PlayButton.js
+index 2c49655..340f714 100644
+--- a/node_modules/react-native-video-player/lib/commonjs/controls/PlayButton.js
++++ b/node_modules/react-native-video-player/lib/commonjs/controls/PlayButton.js
+@@ -9,14 +9,18 @@ var _react = require("react");
+ var _jsxRuntime = require("react/jsx-runtime");
+ const PlayButton = exports.PlayButton = /*#__PURE__*/(0, _react.memo)(({
+   isPlaying,
++  controlIconCustomStyles,
+   onPlayPress,
+   playControlCustomStyles,
+   controlButtonCustomStyles
+ }) => {
+   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.TouchableOpacity, {
++    accessibilityRole: 'button',
++    accessibilityLabel: isPlaying ? 'Pause video' : 'Play video',
+     onPress: onPlayPress,
+     style: [styles.playControl, controlButtonCustomStyles, playControlCustomStyles],
+     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Image, {
++      style: controlIconCustomStyles,
+       source: isPlaying ? require('../img/pause.png') : require('../img/play.png')
+     })
+   });
+diff --git a/node_modules/react-native-video-player/lib/module/Video.js b/node_modules/react-native-video-player/lib/module/Video.js
+index d190ce5..7127717 100644
+--- a/node_modules/react-native-video-player/lib/module/Video.js
++++ b/node_modules/react-native-video-player/lib/module/Video.js
+@@ -14,6 +14,8 @@ export const RenderVideo = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((props, ref
+     defaultMuted,
+     disableControlsAutoHide,
+     disableFullscreen,
++    disableMute,
++    additionalControl,
+     disableSeek,
+     fullScreenOnLongPress,
+     hideControlsOnStart = false,
+@@ -174,6 +176,8 @@ export const RenderVideo = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((props, ref
+       customStyles: customStyles,
+       showDuration: showDuration,
+       disableFullscreen: disableFullscreen,
++      disableMute: disableMute,
++      additionalControl: additionalControl,
+       duration: props.duration || duration,
+       isPlaying: isPlaying,
+       isMuted: isMuted,
+diff --git a/node_modules/react-native-video-player/lib/module/controls/Controls.js b/node_modules/react-native-video-player/lib/module/controls/Controls.js
+index 64b64f4..9ed6aa2 100644
+--- a/node_modules/react-native-video-player/lib/module/controls/Controls.js
++++ b/node_modules/react-native-video-player/lib/module/controls/Controls.js
+@@ -16,6 +16,8 @@ export const Controls = /*#__PURE__*/forwardRef(({
+   onToggleFullScreen,
+   duration,
+   disableFullscreen,
++  disableMute,
++  additionalControl,
+   onMutePress,
+   isMuted,
+   animationDuration,
+@@ -59,6 +61,7 @@ export const Controls = /*#__PURE__*/forwardRef(({
+     children: [/*#__PURE__*/_jsx(PlayButton, {
+       controlButtonCustomStyles: customStyles?.controlButton,
+       playControlCustomStyles: customStyles?.playControl,
++      controlIconCustomStyles: customStyles?.controlIcon,
+       isPlaying: isPlaying,
+       onPlayPress: onPlayPress
+     }), /*#__PURE__*/_jsx(Seekbar, {
+@@ -79,12 +82,12 @@ export const Controls = /*#__PURE__*/forwardRef(({
+       ref: durationRef,
+       duration: duration,
+       durationTextCustomStyles: customStyles?.durationText
+-    }), /*#__PURE__*/_jsx(Mute, {
++    }), !disableMute && /*#__PURE__*/_jsx(Mute, {
+       controlButtonCustomStyles: customStyles?.controlButton,
+       controlIconCustomStyles: customStyles?.controlIcon,
+       isMuted: isMuted,
+       onMutePress: onMutePress
+-    }), !disableFullscreen && /*#__PURE__*/_jsx(Fullscreen, {
++    }), additionalControl, !disableFullscreen && /*#__PURE__*/_jsx(Fullscreen, {
+       onToggleFullScreen: onToggleFullScreen,
+       controlButtonCustomStyles: customStyles?.controlButton,
+       controlIconCustomStyles: customStyles?.controlIcon
+diff --git a/node_modules/react-native-video-player/lib/module/controls/PlayButton.js b/node_modules/react-native-video-player/lib/module/controls/PlayButton.js
+index 1dea3ae..b177c91 100644
+--- a/node_modules/react-native-video-player/lib/module/controls/PlayButton.js
++++ b/node_modules/react-native-video-player/lib/module/controls/PlayButton.js
+@@ -5,14 +5,18 @@ import { memo } from 'react';
+ import { jsx as _jsx } from "react/jsx-runtime";
+ export const PlayButton = /*#__PURE__*/memo(({
+   isPlaying,
++  controlIconCustomStyles,
+   onPlayPress,
+   playControlCustomStyles,
+   controlButtonCustomStyles
+ }) => {
+   return /*#__PURE__*/_jsx(TouchableOpacity, {
++    accessibilityRole: 'button',
++    accessibilityLabel: isPlaying ? 'Pause video' : 'Play video',
+     onPress: onPlayPress,
+     style: [styles.playControl, controlButtonCustomStyles, playControlCustomStyles],
+     children: /*#__PURE__*/_jsx(Image, {
++      style: controlIconCustomStyles,
+       source: isPlaying ? require('../img/pause.png') : require('../img/play.png')
+     })
+   });
+diff --git a/node_modules/react-native-video-player/lib/typescript/commonjs/src/index.d.ts b/node_modules/react-native-video-player/lib/typescript/commonjs/src/index.d.ts
+index a5eb66e..4001db7 100644
+--- a/node_modules/react-native-video-player/lib/typescript/commonjs/src/index.d.ts
++++ b/node_modules/react-native-video-player/lib/typescript/commonjs/src/index.d.ts
+@@ -32,6 +32,8 @@ export interface VideoPlayerProps extends ReactVideoProps {
+     defaultMuted?: boolean;
+     disableControlsAutoHide?: boolean;
+     disableFullscreen?: boolean;
++  disableMute?: boolean;
++  additionalControl?: React.ReactNode;
+     disableSeek?: boolean;
+     duration?: number;
+     endThumbnail?: ImageSourcePropType;
+diff --git a/node_modules/react-native-video-player/lib/typescript/module/src/index.d.ts b/node_modules/react-native-video-player/lib/typescript/module/src/index.d.ts
+index a5eb66e..4001db7 100644
+--- a/node_modules/react-native-video-player/lib/typescript/module/src/index.d.ts
++++ b/node_modules/react-native-video-player/lib/typescript/module/src/index.d.ts
+@@ -32,6 +32,8 @@ export interface VideoPlayerProps extends ReactVideoProps {
+     defaultMuted?: boolean;
+     disableControlsAutoHide?: boolean;
+     disableFullscreen?: boolean;
++  disableMute?: boolean;
++  additionalControl?: React.ReactNode;
+     disableSeek?: boolean;
+     duration?: number;
+     endThumbnail?: ImageSourcePropType;
+diff --git a/node_modules/react-native-video-player/src/Video.tsx b/node_modules/react-native-video-player/src/Video.tsx
+index 191e724..a25b153 100644
+--- a/node_modules/react-native-video-player/src/Video.tsx
++++ b/node_modules/react-native-video-player/src/Video.tsx
+@@ -31,6 +31,8 @@ type RenderVideoProps = Pick<
+   | 'defaultMuted'
+   | 'disableControlsAutoHide'
+   | 'disableFullscreen'
++  | 'disableMute'
++  | 'additionalControl'
+   | 'disableSeek'
+   | 'duration'
+   | 'fullScreenOnLongPress'
+@@ -63,6 +65,8 @@ export const RenderVideo = memo(
+       defaultMuted,
+       disableControlsAutoHide,
+       disableFullscreen,
++      disableMute,
++      additionalControl,
+       disableSeek,
+       fullScreenOnLongPress,
+       hideControlsOnStart = false,
+@@ -262,6 +266,8 @@ export const RenderVideo = memo(
+           customStyles={customStyles}
+           showDuration={showDuration}
+           disableFullscreen={disableFullscreen}
++          disableMute={disableMute}
++          additionalControl={additionalControl}
+           duration={props.duration || duration}
+           isPlaying={isPlaying}
+           isMuted={isMuted}
+diff --git a/node_modules/react-native-video-player/src/controls/Controls.tsx b/node_modules/react-native-video-player/src/controls/Controls.tsx
+index 7ac7e72..eca3620 100644
+--- a/node_modules/react-native-video-player/src/controls/Controls.tsx
++++ b/node_modules/react-native-video-player/src/controls/Controls.tsx
+@@ -11,6 +11,8 @@ interface ControlsProps
+   extends Omit<SeekbarProps, 'customStyles' | 'onSeeking'> {
+   customStyles: VideoPlayerProps['customStyles'];
+   showDuration: VideoPlayerProps['showDuration'];
++  disableMute?: boolean;
++  additionalControl?: React.ReactNode;
+   disableFullscreen: VideoPlayerProps['disableFullscreen'];
+   animationDuration: number;
+   duration: number;
+@@ -36,6 +38,8 @@ export const Controls = forwardRef<ProgressRef, ControlsProps>(
+       onToggleFullScreen,
+       duration,
+       disableFullscreen,
++      disableMute,
++      additionalControl,
+       onMutePress,
+       isMuted,
+       animationDuration,
+@@ -88,6 +92,7 @@ export const Controls = forwardRef<ProgressRef, ControlsProps>(
+         <PlayButton
+           controlButtonCustomStyles={customStyles?.controlButton}
+           playControlCustomStyles={customStyles?.playControl}
++          controlIconCustomStyles={customStyles?.controlIcon}
+           isPlaying={isPlaying}
+           onPlayPress={onPlayPress}
+         />
+@@ -113,12 +118,13 @@ export const Controls = forwardRef<ProgressRef, ControlsProps>(
+             durationTextCustomStyles={customStyles?.durationText}
+           />
+         )}
+-        <Mute
++        {!disableMute && <Mute
+           controlButtonCustomStyles={customStyles?.controlButton}
+           controlIconCustomStyles={customStyles?.controlIcon}
+           isMuted={isMuted}
+           onMutePress={onMutePress}
+-        />
++        />}
++        {additionalControl}
+         {!disableFullscreen && (
+           <Fullscreen
+             onToggleFullScreen={onToggleFullScreen}
+diff --git a/node_modules/react-native-video-player/src/controls/PlayButton.tsx b/node_modules/react-native-video-player/src/controls/PlayButton.tsx
+index 4df5211..b69fd01 100644
+--- a/node_modules/react-native-video-player/src/controls/PlayButton.tsx
++++ b/node_modules/react-native-video-player/src/controls/PlayButton.tsx
+@@ -5,6 +5,7 @@ import { memo } from 'react';
+ interface PlayButtonProps {
+   controlButtonCustomStyles?: CustomStyles['controlButton'];
+   playControlCustomStyles?: CustomStyles['playControl'];
++  controlIconCustomStyles?: CustomStyles['controlIcon'];
+   isPlaying: boolean;
+   onPlayPress: () => void;
+ }
+@@ -12,12 +13,15 @@ interface PlayButtonProps {
+ export const PlayButton = memo(
+   ({
+     isPlaying,
++    controlIconCustomStyles,
+     onPlayPress,
+     playControlCustomStyles,
+     controlButtonCustomStyles,
+   }: PlayButtonProps) => {
+     return (
+       <TouchableOpacity
++        accessibilityRole="button"
++        accessibilityLabel={isPlaying ? 'Pause video' : 'Play video'}
+         onPress={onPlayPress}
+         style={[
+           styles.playControl,
+@@ -26,6 +30,7 @@ export const PlayButton = memo(
+         ]}
+       >
+         <Image
++          style={controlIconCustomStyles}
+           source={
+             isPlaying ? require('../img/pause.png') : require('../img/play.png')
+           }
+diff --git a/node_modules/react-native-video-player/src/index.tsx b/node_modules/react-native-video-player/src/index.tsx
+index 26bf374..85b69b8 100644
+--- a/node_modules/react-native-video-player/src/index.tsx
++++ b/node_modules/react-native-video-player/src/index.tsx
+@@ -61,6 +61,8 @@ export interface VideoPlayerProps extends ReactVideoProps {
+   defaultMuted?: boolean;
+   disableControlsAutoHide?: boolean;
+   disableFullscreen?: boolean;
++  disableMute?: boolean;
++  additionalControl?: React.ReactNode;
+   disableSeek?: boolean;
+   duration?: number;
+   endThumbnail?: ImageSourcePropType;
diff --git a/src/components/ChatMessage/components/MessageAttachments.tsx b/src/components/ChatMessage/components/MessageAttachments.tsx
index 711366252..d653b0ca8 100644
--- a/src/components/ChatMessage/components/MessageAttachments.tsx
+++ b/src/components/ChatMessage/components/MessageAttachments.tsx
@@ -128,6 +128,25 @@ function VideoAttachment({ attachment }: { attachment: MediaAttachment }) {
         resizeMode={ResizeMode.CONTAIN}
         showDuration
         disableControlsAutoHide
+        disableMute
+        additionalControl={
+          <Button
+            title=""
+            accessibilityLabel="Picture in picture"
+            variant="ghost"
+            size="small"
+            disabled={!loaded}
+            icon={<Icon name="minimize-2" size={SPACING.lg} color={COLORS_DARK.text} />}
+            style={{ width: SPACING.xl * 2, height: SPACING.xl * 2, paddingHorizontal: 0 }}
+            onPress={async () => {
+              try {
+                await player.current?.enterPictureInPicture();
+              } catch {
+                setError('Picture in picture is not available on this device.');
+              }
+            }}
+          />
+        }
         pauseOnPress
         animationDuration={reducedMotion ? 0 : 150}
         playInBackground
@@ -148,30 +167,19 @@ function VideoAttachment({ attachment }: { attachment: MediaAttachment }) {
         customStyles={{
           wrapper: { width: '100%', borderRadius: SPACING.sm, overflow: 'hidden' },
           controls: { backgroundColor: COLORS_DARK.surface, height: SPACING.xl * 2, marginTop: 0 },
-          controlButton: { minWidth: SPACING.xl * 2, minHeight: SPACING.xl * 2 },
-          controlIcon: { tintColor: COLORS_DARK.text },
-          playArrow: { tintColor: colors.text },
-          playButton: { backgroundColor: colors.surface, width: SPACING.xl * 2, height: SPACING.xl * 2, borderRadius: SPACING.sm },
+          controlButton: { width: SPACING.xl * 2, height: SPACING.xl * 2, padding: SPACING.sm, alignItems: 'center', justifyContent: 'center' },
+          controlIcon: { tintColor: COLORS_DARK.text, width: SPACING.lg, height: SPACING.lg },
+          playArrow: { tintColor: COLORS_DARK.text, width: SPACING.lg, height: SPACING.lg, marginLeft: 0 },
+          playButton: { backgroundColor: COLORS_DARK.surface, width: SPACING.xl * 2, height: SPACING.xl * 2, borderRadius: SPACING.sm },
+          seekBar: { flex: 1, minWidth: 0, paddingHorizontal: SPACING.xs, marginLeft: 0, marginRight: SPACING.sm },
           seekBarProgress: { backgroundColor: COLORS_DARK.primary },
-          seekBarKnob: { backgroundColor: COLORS_DARK.primary },
+          seekBarKnob: { backgroundColor: COLORS_DARK.primary, width: SPACING.sm, height: SPACING.sm, marginHorizontal: -SPACING.xs, marginVertical: 0 },
           seekBarBackground: { backgroundColor: COLORS_DARK.border },
-          durationText: { ...TYPOGRAPHY.meta, color: COLORS_DARK.textSecondary },
+          durationText: { ...TYPOGRAPHY.meta, color: COLORS_DARK.textSecondary, flexShrink: 0 },
         }}
       />
       {error && <Text accessibilityRole="alert" style={{ ...TYPOGRAPHY.bodySmall, color: colors.error }}>{error}</Text>}
-      <Button
-        title="Picture in picture"
-        variant="ghost"
-        size="small"
-        disabled={!loaded}
-        onPress={async () => {
-          try {
-            await player.current?.enterPictureInPicture();
-          } catch {
-            setError('Picture in picture is not available on this device.');
-          }
-        }}
-      />
+
     </View>
   );
 }

From d42d19315483ed708e99f005716757221355f9f4 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 19:13:21 +0530
Subject: [PATCH 064/129] fix(mobile): show the first video frame before
 playback [skip ci]

---
 .../react-native-video-player+0.16.3.patch    | 158 ++++++++++++++++--
 .../components/MessageAttachments.tsx         |   1 +
 2 files changed, 147 insertions(+), 12 deletions(-)

diff --git a/patches/react-native-video-player+0.16.3.patch b/patches/react-native-video-player+0.16.3.patch
index 75e7e5b47..f799f32bd 100644
--- a/patches/react-native-video-player+0.16.3.patch
+++ b/patches/react-native-video-player+0.16.3.patch
@@ -1,5 +1,5 @@
 diff --git a/node_modules/react-native-video-player/lib/commonjs/Video.js b/node_modules/react-native-video-player/lib/commonjs/Video.js
-index 9ff315d..56e8850 100644
+index 9ff315d..181c87a 100644
 --- a/node_modules/react-native-video-player/lib/commonjs/Video.js
 +++ b/node_modules/react-native-video-player/lib/commonjs/Video.js
 @@ -19,6 +19,8 @@ const RenderVideo = exports.RenderVideo = /*#__PURE__*/(0, _react.memo)(/*#__PUR
@@ -11,7 +11,17 @@ index 9ff315d..56e8850 100644
      disableSeek,
      fullScreenOnLongPress,
      hideControlsOnStart = false,
-@@ -179,6 +181,8 @@ const RenderVideo = exports.RenderVideo = /*#__PURE__*/(0, _react.memo)(/*#__PUR
+@@ -123,7 +125,8 @@ const RenderVideo = exports.RenderVideo = /*#__PURE__*/(0, _react.memo)(/*#__PUR
+   const _onLoad = (0, _react.useCallback)(event => {
+     if (onLoad) onLoad(event);
+     setDuration(event.duration);
+-  }, [onLoad]);
++        if (!hideControlsOnStart) _showControls();
++  }, [onLoad, hideControlsOnStart, _showControls]);
+   const _onPlayPress = (0, _react.useCallback)(() => {
+     if (onPlayPress) onPlayPress();
+     setIsPlaying(prev => !prev);
+@@ -179,6 +182,8 @@ const RenderVideo = exports.RenderVideo = /*#__PURE__*/(0, _react.memo)(/*#__PUR
        customStyles: customStyles,
        showDuration: showDuration,
        disableFullscreen: disableFullscreen,
@@ -79,8 +89,38 @@ index 2c49655..340f714 100644
        source: isPlaying ? require('../img/pause.png') : require('../img/play.png')
      })
    });
+diff --git a/node_modules/react-native-video-player/lib/commonjs/index.js b/node_modules/react-native-video-player/lib/commonjs/index.js
+index 02eadd9..b1b30a2 100644
+--- a/node_modules/react-native-video-player/lib/commonjs/index.js
++++ b/node_modules/react-native-video-player/lib/commonjs/index.js
+@@ -12,6 +12,7 @@ var _jsxRuntime = require("react/jsx-runtime");
+ const VideoPlayer = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
+   const {
+     autoplay = false,
++    preload = false,
+     customStyles = {},
+     endThumbnail,
+     endWithThumbnail,
+@@ -79,7 +80,7 @@ const VideoPlayer = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
+       customStylesPlayButton: customStyles.playButton,
+       customStylesPlayArrow: customStyles.playArrow
+     });
+-    if (!isStarted) return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
++    if (!isStarted && !preload) return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+       style: [styles.preloadingPlaceholder, sizeStyles, style],
+       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Thumbnail.StartButton, {
+         onStart: _onStart,
+@@ -96,7 +97,7 @@ const VideoPlayer = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
+       onEnd: _onEnd,
+       sizeStyle: sizeStyles
+     });
+-  }, [hasEnded, endThumbnail, isStarted, thumbnail, style, sizeStyles, _onStart, customStyles, rest, autoplay, _onEnd]);
++  }, [preload, hasEnded, endThumbnail, isStarted, thumbnail, style, sizeStyles, _onStart, customStyles, rest, autoplay, _onEnd]);
+   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+     onLayout: onLayout,
+     style: customStyles.wrapper,
 diff --git a/node_modules/react-native-video-player/lib/module/Video.js b/node_modules/react-native-video-player/lib/module/Video.js
-index d190ce5..7127717 100644
+index d190ce5..733710b 100644
 --- a/node_modules/react-native-video-player/lib/module/Video.js
 +++ b/node_modules/react-native-video-player/lib/module/Video.js
 @@ -14,6 +14,8 @@ export const RenderVideo = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((props, ref
@@ -92,7 +132,17 @@ index d190ce5..7127717 100644
      disableSeek,
      fullScreenOnLongPress,
      hideControlsOnStart = false,
-@@ -174,6 +176,8 @@ export const RenderVideo = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((props, ref
+@@ -118,7 +120,8 @@ export const RenderVideo = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((props, ref
+   const _onLoad = useCallback(event => {
+     if (onLoad) onLoad(event);
+     setDuration(event.duration);
+-  }, [onLoad]);
++        if (!hideControlsOnStart) _showControls();
++  }, [onLoad, hideControlsOnStart, _showControls]);
+   const _onPlayPress = useCallback(() => {
+     if (onPlayPress) onPlayPress();
+     setIsPlaying(prev => !prev);
+@@ -174,6 +177,8 @@ export const RenderVideo = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((props, ref
        customStyles: customStyles,
        showDuration: showDuration,
        disableFullscreen: disableFullscreen,
@@ -160,11 +210,47 @@ index 1dea3ae..b177c91 100644
        source: isPlaying ? require('../img/pause.png') : require('../img/play.png')
      })
    });
+diff --git a/node_modules/react-native-video-player/lib/module/index.js b/node_modules/react-native-video-player/lib/module/index.js
+index 5fc06ec..83e65b1 100644
+--- a/node_modules/react-native-video-player/lib/module/index.js
++++ b/node_modules/react-native-video-player/lib/module/index.js
+@@ -8,6 +8,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
+ const VideoPlayer = /*#__PURE__*/forwardRef((props, ref) => {
+   const {
+     autoplay = false,
++    preload = false,
+     customStyles = {},
+     endThumbnail,
+     endWithThumbnail,
+@@ -75,7 +76,7 @@ const VideoPlayer = /*#__PURE__*/forwardRef((props, ref) => {
+       customStylesPlayButton: customStyles.playButton,
+       customStylesPlayArrow: customStyles.playArrow
+     });
+-    if (!isStarted) return /*#__PURE__*/_jsx(View, {
++    if (!isStarted && !preload) return /*#__PURE__*/_jsx(View, {
+       style: [styles.preloadingPlaceholder, sizeStyles, style],
+       children: /*#__PURE__*/_jsx(StartButton, {
+         onStart: _onStart,
+@@ -92,7 +93,7 @@ const VideoPlayer = /*#__PURE__*/forwardRef((props, ref) => {
+       onEnd: _onEnd,
+       sizeStyle: sizeStyles
+     });
+-  }, [hasEnded, endThumbnail, isStarted, thumbnail, style, sizeStyles, _onStart, customStyles, rest, autoplay, _onEnd]);
++  }, [preload, hasEnded, endThumbnail, isStarted, thumbnail, style, sizeStyles, _onStart, customStyles, rest, autoplay, _onEnd]);
+   return /*#__PURE__*/_jsx(View, {
+     onLayout: onLayout,
+     style: customStyles.wrapper,
 diff --git a/node_modules/react-native-video-player/lib/typescript/commonjs/src/index.d.ts b/node_modules/react-native-video-player/lib/typescript/commonjs/src/index.d.ts
-index a5eb66e..4001db7 100644
+index a5eb66e..8b79e74 100644
 --- a/node_modules/react-native-video-player/lib/typescript/commonjs/src/index.d.ts
 +++ b/node_modules/react-native-video-player/lib/typescript/commonjs/src/index.d.ts
-@@ -32,6 +32,8 @@ export interface VideoPlayerProps extends ReactVideoProps {
+@@ -27,11 +27,14 @@ export interface CustomStyles {
+ export interface VideoPlayerProps extends ReactVideoProps {
+     animationDuration?: number;
+     autoplay?: boolean;
++  preload?: boolean;
+     controlsTimeout?: number;
+     customStyles?: CustomStyles;
      defaultMuted?: boolean;
      disableControlsAutoHide?: boolean;
      disableFullscreen?: boolean;
@@ -174,10 +260,16 @@ index a5eb66e..4001db7 100644
      duration?: number;
      endThumbnail?: ImageSourcePropType;
 diff --git a/node_modules/react-native-video-player/lib/typescript/module/src/index.d.ts b/node_modules/react-native-video-player/lib/typescript/module/src/index.d.ts
-index a5eb66e..4001db7 100644
+index a5eb66e..8b79e74 100644
 --- a/node_modules/react-native-video-player/lib/typescript/module/src/index.d.ts
 +++ b/node_modules/react-native-video-player/lib/typescript/module/src/index.d.ts
-@@ -32,6 +32,8 @@ export interface VideoPlayerProps extends ReactVideoProps {
+@@ -27,11 +27,14 @@ export interface CustomStyles {
+ export interface VideoPlayerProps extends ReactVideoProps {
+     animationDuration?: number;
+     autoplay?: boolean;
++  preload?: boolean;
+     controlsTimeout?: number;
+     customStyles?: CustomStyles;
      defaultMuted?: boolean;
      disableControlsAutoHide?: boolean;
      disableFullscreen?: boolean;
@@ -187,7 +279,7 @@ index a5eb66e..4001db7 100644
      duration?: number;
      endThumbnail?: ImageSourcePropType;
 diff --git a/node_modules/react-native-video-player/src/Video.tsx b/node_modules/react-native-video-player/src/Video.tsx
-index 191e724..a25b153 100644
+index 191e724..1d0484b 100644
 --- a/node_modules/react-native-video-player/src/Video.tsx
 +++ b/node_modules/react-native-video-player/src/Video.tsx
 @@ -31,6 +31,8 @@ type RenderVideoProps = Pick<
@@ -208,7 +300,18 @@ index 191e724..a25b153 100644
        disableSeek,
        fullScreenOnLongPress,
        hideControlsOnStart = false,
-@@ -262,6 +266,8 @@ export const RenderVideo = memo(
+@@ -190,8 +194,9 @@ export const RenderVideo = memo(
+       (event: OnLoadData) => {
+         if (onLoad) onLoad(event);
+         setDuration(event.duration);
++        if (!hideControlsOnStart) _showControls();
+       },
+-      [onLoad]
++      [onLoad, hideControlsOnStart, _showControls]
+     );
+ 
+     const _onPlayPress = useCallback(() => {
+@@ -262,6 +267,8 @@ export const RenderVideo = memo(
            customStyles={customStyles}
            showDuration={showDuration}
            disableFullscreen={disableFullscreen}
@@ -300,10 +403,16 @@ index 4df5211..b69fd01 100644
              isPlaying ? require('../img/pause.png') : require('../img/play.png')
            }
 diff --git a/node_modules/react-native-video-player/src/index.tsx b/node_modules/react-native-video-player/src/index.tsx
-index 26bf374..85b69b8 100644
+index 26bf374..6641672 100644
 --- a/node_modules/react-native-video-player/src/index.tsx
 +++ b/node_modules/react-native-video-player/src/index.tsx
-@@ -61,6 +61,8 @@ export interface VideoPlayerProps extends ReactVideoProps {
+@@ -56,11 +56,14 @@ export interface CustomStyles {
+ export interface VideoPlayerProps extends ReactVideoProps {
+   animationDuration?: number;
+   autoplay?: boolean;
++  preload?: boolean;
+   controlsTimeout?: number;
+   customStyles?: CustomStyles;
    defaultMuted?: boolean;
    disableControlsAutoHide?: boolean;
    disableFullscreen?: boolean;
@@ -312,3 +421,28 @@ index 26bf374..85b69b8 100644
    disableSeek?: boolean;
    duration?: number;
    endThumbnail?: ImageSourcePropType;
+@@ -92,6 +95,7 @@ const VideoPlayer = forwardRef<VideoPlayerRef, VideoPlayerProps>(
+   (props, ref) => {
+     const {
+       autoplay = false,
++      preload = false,
+       customStyles = {},
+       endThumbnail,
+       endWithThumbnail,
+@@ -167,7 +171,7 @@ const VideoPlayer = forwardRef<VideoPlayerRef, VideoPlayerProps>(
+             customStylesPlayArrow={customStyles.playArrow}
+           />
+         );
+-      if (!isStarted)
++      if (!isStarted && !preload)
+         return (
+           <View style={[styles.preloadingPlaceholder, sizeStyles, style]}>
+             <StartButton
+@@ -189,6 +193,7 @@ const VideoPlayer = forwardRef<VideoPlayerRef, VideoPlayerProps>(
+         />
+       );
+     }, [
++      preload,
+       hasEnded,
+       endThumbnail,
+       isStarted,
diff --git a/src/components/ChatMessage/components/MessageAttachments.tsx b/src/components/ChatMessage/components/MessageAttachments.tsx
index d653b0ca8..91c4291c2 100644
--- a/src/components/ChatMessage/components/MessageAttachments.tsx
+++ b/src/components/ChatMessage/components/MessageAttachments.tsx
@@ -122,6 +122,7 @@ function VideoAttachment({ attachment }: { attachment: MediaAttachment }) {
     <View style={{ width: '100%', gap: SPACING.xs }}>
       <VideoPlayer
         ref={player}
+        preload
         source={{ uri: resolveMediaUri(attachment.uri) }}
         videoWidth={size.width}
         videoHeight={size.height}

From 0182a3062eb77879900d0f0ee73172a84fa1deb3 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 19:13:43 +0530
Subject: [PATCH 065/129] fix(chat): remove extra frame and caption from
 generated videos [skip ci]

---
 src/components/ChatMessage/index.tsx | 36 +++++++++++++++++++---------
 src/components/ChatMessage/styles.ts |  4 ++++
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/components/ChatMessage/index.tsx b/src/components/ChatMessage/index.tsx
index 8ac4a660a..033b0c042 100644
--- a/src/components/ChatMessage/index.tsx
+++ b/src/components/ChatMessage/index.tsx
@@ -227,6 +227,12 @@ const MessageBubble: React.FC<MessageBubbleProps> = ({
   const answerParsedContent = hasAssistantWork
     ? { ...parsedContent, thinking: '' }
     : parsedContent;
+  const isGeneratedVideo = Boolean(
+    !isUser &&
+      message.turnKind === 'video' &&
+      message.attachments?.length &&
+      message.attachments.every(attachment => attachment.type === 'video'),
+  );
   const hasVisibleAnswer = Boolean(
     hasAttachments || answerParsedContent.response.trim(),
   );
@@ -313,7 +319,13 @@ const MessageBubble: React.FC<MessageBubbleProps> = ({
       {(!hideProse || hasAttachments) && showAnswerBubble && (
         <View
           testID={message.isThinking ? undefined : 'message-bubble'}
-          style={message.isThinking ? undefined : bubbleStyle}
+          style={
+            message.isThinking
+              ? undefined
+              : isGeneratedVideo
+                ? styles.videoMessage
+                : bubbleStyle
+          }
         >
           {hasAttachments && (
             <MessageAttachments
@@ -325,16 +337,18 @@ const MessageBubble: React.FC<MessageBubbleProps> = ({
             />
           )}
 
-          <MessageContent
-            isUser={isUser}
-            isThinking={message.isThinking}
-            content={message.content}
-            isStreaming={isStreaming}
-            parsedContent={answerParsedContent}
-            showThinking={showThinking}
-            onToggleThinking={onToggleThinking}
-            styles={styles}
-          />
+          {!isGeneratedVideo && (
+            <MessageContent
+              isUser={isUser}
+              isThinking={message.isThinking}
+              content={message.content}
+              isStreaming={isStreaming}
+              parsedContent={answerParsedContent}
+              showThinking={showThinking}
+              onToggleThinking={onToggleThinking}
+              styles={styles}
+            />
+          )}
         </View>
       )}
 
diff --git a/src/components/ChatMessage/styles.ts b/src/components/ChatMessage/styles.ts
index 8d6742ee7..b233011cd 100644
--- a/src/components/ChatMessage/styles.ts
+++ b/src/components/ChatMessage/styles.ts
@@ -38,6 +38,10 @@ const createBubbleStyles = (colors: ThemeColors, shadows: ThemeShadows) => ({
     width: MESSAGE_MAX_WIDTH,
     alignSelf: 'flex-start' as const,
   },
+  videoMessage: {
+    width: MESSAGE_MAX_WIDTH,
+    alignSelf: 'flex-start' as const,
+  },
   toolCallPreText: {
     alignSelf: 'flex-start' as const,
     paddingBottom: 6,

From 2e4e47ab6a4d2edb346a8cc427b5fd881e2e27df Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 19:17:22 +0530
Subject: [PATCH 066/129] fix(video): use active app theme for player controls
 [skip ci]

---
 .../components/MessageAttachments.tsx         | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/components/ChatMessage/components/MessageAttachments.tsx b/src/components/ChatMessage/components/MessageAttachments.tsx
index 91c4291c2..a4e8de921 100644
--- a/src/components/ChatMessage/components/MessageAttachments.tsx
+++ b/src/components/ChatMessage/components/MessageAttachments.tsx
@@ -16,7 +16,6 @@ import Icon from 'react-native-vector-icons/Feather';
 import VideoPlayer, { type VideoPlayerRef } from 'react-native-video-player';
 import { ResizeMode } from 'react-native-video';
 import { useTheme } from '../../../theme';
-import { COLORS_DARK } from '../../../theme/palettes';
 import { SPACING, TYPOGRAPHY } from '../../../constants';
 import { Button } from '../../Button';
 // Imported directly, not through the barrel: a component that reaches its sibling via the index
@@ -137,7 +136,7 @@ function VideoAttachment({ attachment }: { attachment: MediaAttachment }) {
             variant="ghost"
             size="small"
             disabled={!loaded}
-            icon={<Icon name="minimize-2" size={SPACING.lg} color={COLORS_DARK.text} />}
+            icon={<Icon name="minimize-2" size={SPACING.lg} color={colors.text} />}
             style={{ width: SPACING.xl * 2, height: SPACING.xl * 2, paddingHorizontal: 0 }}
             onPress={async () => {
               try {
@@ -167,16 +166,16 @@ function VideoAttachment({ attachment }: { attachment: MediaAttachment }) {
         onError={() => setError('This video could not be played.')}
         customStyles={{
           wrapper: { width: '100%', borderRadius: SPACING.sm, overflow: 'hidden' },
-          controls: { backgroundColor: COLORS_DARK.surface, height: SPACING.xl * 2, marginTop: 0 },
+          controls: { backgroundColor: colors.surface, height: SPACING.xl * 2, marginTop: 0 },
           controlButton: { width: SPACING.xl * 2, height: SPACING.xl * 2, padding: SPACING.sm, alignItems: 'center', justifyContent: 'center' },
-          controlIcon: { tintColor: COLORS_DARK.text, width: SPACING.lg, height: SPACING.lg },
-          playArrow: { tintColor: COLORS_DARK.text, width: SPACING.lg, height: SPACING.lg, marginLeft: 0 },
-          playButton: { backgroundColor: COLORS_DARK.surface, width: SPACING.xl * 2, height: SPACING.xl * 2, borderRadius: SPACING.sm },
+          controlIcon: { tintColor: colors.text, width: SPACING.lg, height: SPACING.lg },
+          playArrow: { tintColor: colors.text, width: SPACING.lg, height: SPACING.lg, marginLeft: 0 },
+          playButton: { backgroundColor: colors.surface, width: SPACING.xl * 2, height: SPACING.xl * 2, borderRadius: SPACING.sm },
           seekBar: { flex: 1, minWidth: 0, paddingHorizontal: SPACING.xs, marginLeft: 0, marginRight: SPACING.sm },
-          seekBarProgress: { backgroundColor: COLORS_DARK.primary },
-          seekBarKnob: { backgroundColor: COLORS_DARK.primary, width: SPACING.sm, height: SPACING.sm, marginHorizontal: -SPACING.xs, marginVertical: 0 },
-          seekBarBackground: { backgroundColor: COLORS_DARK.border },
-          durationText: { ...TYPOGRAPHY.meta, color: COLORS_DARK.textSecondary, flexShrink: 0 },
+          seekBarProgress: { backgroundColor: colors.primary },
+          seekBarKnob: { backgroundColor: colors.primary, width: SPACING.sm, height: SPACING.sm, marginHorizontal: -SPACING.xs, marginVertical: 0 },
+          seekBarBackground: { backgroundColor: colors.border },
+          durationText: { ...TYPOGRAPHY.meta, color: colors.textSecondary, flexShrink: 0 },
         }}
       />
       {error && <Text accessibilityRole="alert" style={{ ...TYPOGRAPHY.bodySmall, color: colors.error }}>{error}</Text>}

From cdf57372dc392823ee9924e52448711d46944fa5 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 19:33:03 +0530
Subject: [PATCH 067/129] fix(video): keep Android attention buffers safe
 across devices [skip ci]

---
 scripts/prepare-video-runtime.sh              |  2 +-
 .../android-attention-buffer-ownership.patch  | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 scripts/video/android-attention-buffer-ownership.patch

diff --git a/scripts/prepare-video-runtime.sh b/scripts/prepare-video-runtime.sh
index e0cf6a1f1..15ea92df3 100644
--- a/scripts/prepare-video-runtime.sh
+++ b/scripts/prepare-video-runtime.sh
@@ -16,7 +16,7 @@ PATCH="$ROOT/scripts/video/android-vulkan-dispatch.patch"
 if ! git -C "$SOURCE/ggml" apply --reverse --check "$PATCH" 2>/dev/null; then
   git -C "$SOURCE/ggml" apply "$PATCH"
 fi
-for entry in "ggml:android-vulkan-device-fault.patch" "ggml:android-vulkan-pipeline-diagnostics.patch" "ggml:android-vulkan-matvec-fallback.patch" "ggml:android-hexagon.patch" "ggml:android-hexagon-buffer-validation.patch" "ggml:android-hexagon-precision.patch" ".:android-hardware-fallback.patch" ".:conditioning-errors.patch" ".:video-decode-observer.patch"; do
+for entry in "ggml:android-vulkan-device-fault.patch" "ggml:android-vulkan-pipeline-diagnostics.patch" "ggml:android-vulkan-matvec-fallback.patch" "ggml:android-hexagon.patch" "ggml:android-hexagon-buffer-validation.patch" "ggml:android-hexagon-precision.patch" ".:android-hardware-fallback.patch" ".:conditioning-errors.patch" ".:android-attention-buffer-ownership.patch" ".:video-decode-observer.patch"; do
   target="${entry%%:*}"
   patch="$ROOT/scripts/video/${entry#*:}"
   if ! git -C "$SOURCE/$target" apply --reverse --check "$patch" 2>/dev/null; then
diff --git a/scripts/video/android-attention-buffer-ownership.patch b/scripts/video/android-attention-buffer-ownership.patch
new file mode 100644
index 000000000..00447423e
--- /dev/null
+++ b/scripts/video/android-attention-buffer-ownership.patch
@@ -0,0 +1,24 @@
+--- a/src/core/ggml_extend.cpp
++++ b/src/core/ggml_extend.cpp
+@@ -802,11 +802,21 @@
+ 
+         auto kq = ggml_mul_mat(ctx, k, q);  // [N * n_head, L_q, L_k]
+         ggml_mul_mat_set_prec(kq, GGML_PREC_F32);
++#ifdef __ANDROID__
++        // F32 attention matmul can fall back from HTP to Vulkan. In-place
++        // outputs would retain that device's buffer across scheduler splits.
++        kq = ggml_scale(ctx, kq, scale);
++        if (mask) {
++            kq = ggml_add(ctx, kq, mask);
++        }
++        kq = ggml_soft_max(ctx, kq);
++#else
+         kq = ggml_scale_inplace(ctx, kq, scale);
+         if (mask) {
+             kq = ggml_add_inplace(ctx, kq, mask);
+         }
+         kq = ggml_soft_max_inplace(ctx, kq);
++#endif
+ 
+         kqv = ggml_mul_mat(ctx, v, kq);  // [N * n_head, L_q, d_head]
+ 

From 67cd2dbeb15a0e1c9cb33fe3fca7f2ba6b5968fc Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 19:33:55 +0530
Subject: [PATCH 068/129] fix(ios): keep local generation awake and log
 background admission [skip ci]

---
 native/video/VideoGenerationModule.mm | 41 +++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/native/video/VideoGenerationModule.mm b/native/video/VideoGenerationModule.mm
index 3a85e73b8..ffdd03a66 100644
--- a/native/video/VideoGenerationModule.mm
+++ b/native/video/VideoGenerationModule.mm
@@ -24,6 +24,8 @@ @implementation VideoGenerationModule {
   dispatch_queue_t _worker;
   BOOL _busy;
   BOOL _listeners;
+  BOOL _holdsIdleTimer;
+  BOOL _previousIdleTimerDisabled;
   NSString *_videoInterruptionReason;
   BGTask *_continued;
   NSString *_taskIdentifier;
@@ -40,13 +42,31 @@ - (instancetype)init {
   }
   return self;
 }
-- (void)dealloc { [[NSNotificationCenter defaultCenter] removeObserver:self]; }
+- (void)dealloc {
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
+  if (_holdsIdleTimer) {
+    BOOL previous = _previousIdleTimerDisabled;
+    dispatch_async(dispatch_get_main_queue(), ^{ UIApplication.sharedApplication.idleTimerDisabled = previous; });
+  }
+}
+- (void)keepScreenAwake {
+  if (_holdsIdleTimer) return;
+  _previousIdleTimerDisabled = UIApplication.sharedApplication.idleTimerDisabled;
+  _holdsIdleTimer = YES;
+  UIApplication.sharedApplication.idleTimerDisabled = YES;
+}
+- (void)restoreScreenIdleTimer {
+  if (!_holdsIdleTimer) return;
+  UIApplication.sharedApplication.idleTimerDisabled = _previousIdleTimerDisabled;
+  _holdsIdleTimer = NO;
+}
 - (NSArray<NSString *> *)supportedEvents { return @[@"VideoGenerationProgress", @"SDImageProgress"]; }
 - (void)startObserving { _listeners = YES; }
 - (void)stopObserving { _listeners = NO; }
 - (void)backgrounded {
   // Metal work must stop before the OS removes GPU access. Continued GPU tasks
   // are admitted separately by the background coordinator on supported systems.
+  NSLog(@"[VideoLifecycle] background busy=%d admittedGPU=%d", _busy, _continued != nil);
   if (_busy && !_continued) {
     _videoInterruptionReason = @"Video generation stopped when the app went into the background. Keep Off Grid open and try again.";
     _runtime.cancel();
@@ -82,6 +102,7 @@ - (void)emitStage:(NSString *)stage step:(int)step total:(int)total {
     if (self->_busy) { reject(@"VIDEO_BUSY", @"Video generation is already running.", nil); return; }
     self->_busy = YES; self->_runtime.cancelled.store(false);
     self->_videoInterruptionReason = nil;
+    [self keepScreenAwake];
     [self startContinuedWork:^{
     dispatch_async(self->_worker, ^{
       @autoreleasepool {
@@ -129,6 +150,7 @@ - (void)emitStage:(NSString *)stage step:(int)step total:(int)total {
         }
         dispatch_async(dispatch_get_main_queue(), ^{
           self->_busy = NO;
+          [self restoreScreenIdleTimer];
           if (self->_continued) {
             [self->_continued setTaskCompletedWithSuccess:failure == nil]; self->_continued = nil;
           }
@@ -182,6 +204,7 @@ - (void)emitStage:(NSString *)stage step:(int)step total:(int)total {
   dispatch_async(dispatch_get_main_queue(), ^{
     if (self->_busy) { reject(@"IMAGE_BUSY", @"Image or video generation is running.", nil); return; }
     self->_busy = YES; self->_runtime.cancelled.store(false);
+    [self keepScreenAwake];
     dispatch_async(self->_worker, ^{
       @autoreleasepool {
         NSString *output = input[@"outputPath"];
@@ -208,6 +231,7 @@ - (void)emitStage:(NSString *)stage step:(int)step total:(int)total {
         }
         dispatch_async(dispatch_get_main_queue(), ^{
           self->_busy = NO;
+          [self restoreScreenIdleTimer];
           if (failure) reject(@"IMAGE_FAILED", failure, nil);
           else resolve(@{@"id":input[@"id"], @"imagePath":output, @"width":input[@"width"], @"height":input[@"height"], @"seed":input[@"seed"]});
         });
@@ -218,7 +242,9 @@ - (void)emitStage:(NSString *)stage step:(int)step total:(int)total {
 - (void)startContinuedWork:(dispatch_block_t)work {
   _continuedWork = [work copy];
   if (@available(iOS 26.0, *)) {
-    if (BGTaskScheduler.supportedResources & BGContinuedProcessingTaskRequestResourcesGPU) {
+    BGContinuedProcessingTaskRequestResources resources = BGTaskScheduler.supportedResources;
+    NSLog(@"[VideoLifecycle] supportedBackgroundResources=%lu gpu=%d", (unsigned long)resources, (resources & BGContinuedProcessingTaskRequestResourcesGPU) != 0);
+    if (resources & BGContinuedProcessingTaskRequestResourcesGPU) {
       if (!_taskIdentifier) {
         _taskIdentifier = [NSString stringWithFormat:@"%@.video.generation", NSBundle.mainBundle.bundleIdentifier];
         __weak VideoGenerationModule *weakSelf = self;
@@ -226,11 +252,13 @@ - (void)startContinuedWork:(dispatch_block_t)work {
           VideoGenerationModule *owner = weakSelf;
           if (!owner || !owner->_busy) { [task setTaskCompletedWithSuccess:NO]; return; }
           owner->_continued = task;
+          NSLog(@"[VideoLifecycle] admitted continued GPU task %@", task.identifier);
           __weak BGTask *expiringTask = task;
           task.expirationHandler = ^{
             dispatch_async(dispatch_get_main_queue(), ^{
               VideoGenerationModule *active = weakSelf;
               if (active && active->_continued == expiringTask && active->_busy) {
+                NSLog(@"[VideoLifecycle] continued GPU task expired %@", expiringTask.identifier);
                 active->_videoInterruptionReason = @"iOS stopped background video generation. Keep Off Grid open and try again.";
                 active->_runtime.cancel();
               }
@@ -239,14 +267,21 @@ - (void)startContinuedWork:(dispatch_block_t)work {
           dispatch_block_t admitted = owner->_continuedWork; owner->_continuedWork = nil;
           if (admitted) admitted();
         }];
+        NSLog(@"[VideoLifecycle] registration %@ success=%d", _taskIdentifier, registered);
         if (!registered) { _taskIdentifier = nil; _continuedWork = nil; work(); return; }
       }
       BGContinuedProcessingTaskRequest *request = [[BGContinuedProcessingTaskRequest alloc] initWithIdentifier:_taskIdentifier title:@"Generating video" subtitle:@"Loading model"];
       request.requiredResources = BGContinuedProcessingTaskRequestResourcesGPU;
       request.strategy = BGContinuedProcessingTaskRequestSubmissionStrategyFail;
-      if ([BGTaskScheduler.sharedScheduler submitTaskRequest:request error:nil]) return;
+      NSError *submissionError = nil;
+      if ([BGTaskScheduler.sharedScheduler submitTaskRequest:request error:&submissionError]) {
+        NSLog(@"[VideoLifecycle] submitted continued GPU task %@", _taskIdentifier);
+        return;
+      }
+      NSLog(@"[VideoLifecycle] continued GPU task refused domain=%@ code=%ld detail=%@", submissionError.domain, (long)submissionError.code, submissionError.localizedDescription);
     }
   }
+  NSLog(@"[VideoLifecycle] running in foreground without admitted background GPU access");
   _continuedWork = nil;
   work();
 }

From b0b252f643910ce4b075ed0e9065e47acebb675a Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 19:37:53 +0530
Subject: [PATCH 069/129] fix(video): route unsafe Adreno attention through
 fallback [skip ci]

---
 scripts/prepare-video-runtime.sh              |  2 +-
 .../android-vulkan-attention-fallback.patch   | 23 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 scripts/video/android-vulkan-attention-fallback.patch

diff --git a/scripts/prepare-video-runtime.sh b/scripts/prepare-video-runtime.sh
index 15ea92df3..097779528 100644
--- a/scripts/prepare-video-runtime.sh
+++ b/scripts/prepare-video-runtime.sh
@@ -16,7 +16,7 @@ PATCH="$ROOT/scripts/video/android-vulkan-dispatch.patch"
 if ! git -C "$SOURCE/ggml" apply --reverse --check "$PATCH" 2>/dev/null; then
   git -C "$SOURCE/ggml" apply "$PATCH"
 fi
-for entry in "ggml:android-vulkan-device-fault.patch" "ggml:android-vulkan-pipeline-diagnostics.patch" "ggml:android-vulkan-matvec-fallback.patch" "ggml:android-hexagon.patch" "ggml:android-hexagon-buffer-validation.patch" "ggml:android-hexagon-precision.patch" ".:android-hardware-fallback.patch" ".:conditioning-errors.patch" ".:android-attention-buffer-ownership.patch" ".:video-decode-observer.patch"; do
+for entry in "ggml:android-vulkan-device-fault.patch" "ggml:android-vulkan-pipeline-diagnostics.patch" "ggml:android-vulkan-matvec-fallback.patch" "ggml:android-vulkan-attention-fallback.patch" "ggml:android-hexagon.patch" "ggml:android-hexagon-buffer-validation.patch" "ggml:android-hexagon-precision.patch" ".:android-hardware-fallback.patch" ".:conditioning-errors.patch" ".:android-attention-buffer-ownership.patch" ".:video-decode-observer.patch"; do
   target="${entry%%:*}"
   patch="$ROOT/scripts/video/${entry#*:}"
   if ! git -C "$SOURCE/$target" apply --reverse --check "$patch" 2>/dev/null; then
diff --git a/scripts/video/android-vulkan-attention-fallback.patch b/scripts/video/android-vulkan-attention-fallback.patch
new file mode 100644
index 000000000..2e33177b5
--- /dev/null
+++ b/scripts/video/android-vulkan-attention-fallback.patch
@@ -0,0 +1,23 @@
+--- a/src/ggml-vulkan/ggml-vulkan.cpp
++++ b/src/ggml-vulkan/ggml-vulkan.cpp
+@@ -15447,6 +15447,20 @@
+             }
+         case GGML_OP_FLASH_ATTN_EXT:
+             {
++#ifdef __ANDROID__
++                // Adreno loses the device in Wan's F32/F16 attention kernel.
++                // Keep the fused operation, but let the scheduler use CPU.
++                if (device->vendor_id == VK_VENDOR_ID_QUALCOMM &&
++                    ggml_get_op_params_i32(op, 3) == GGML_PREC_F32 &&
++                    op->src[1]->type == GGML_TYPE_F16 &&
++                    op->src[2]->type == GGML_TYPE_F16) {
++                    static std::atomic_flag reported = ATOMIC_FLAG_INIT;
++                    if (!reported.test_and_set()) {
++                        GGML_LOG_WARN("ggml_vulkan: routing Adreno F32/F16 flash attention to another backend after device loss\n");
++                    }
++                    return false;
++                }
++#endif
+                 bool coopmat2 = device->coopmat2;
+                 uint32_t HSK = op->src[1]->ne[0];
+                 uint32_t HSV = op->src[2]->ne[0];

From 53e4d5deb1440620755440b8382cfd0b11c3bc25 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 19:53:14 +0530
Subject: [PATCH 070/129] fix(video): use catalog names in mobile model labels
 [skip ci]

---
 .../VideoGenerationSection.tsx                        |  7 ++++++-
 src/components/ModelSelectorModal/VideoTab.tsx        |  3 ++-
 src/screens/ChatScreen/index.tsx                      | 10 +++++-----
 .../DownloadManagerScreen/useDownloadManager.ts       |  5 +++--
 src/screens/HomeScreen/index.tsx                      |  8 +++++---
 src/screens/ModelsScreen/VideoModelsTab.tsx           |  5 +++--
 .../modelDownloadService/providers/videoProvider.ts   |  7 ++++---
 src/services/remoteModelSelection.ts                  | 10 +++++++---
 src/stores/appStore.ts                                | 11 ++++++++---
 src/utils/modelHelpers.ts                             |  5 +++++
 10 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/src/components/GenerationSettingsModal/VideoGenerationSection.tsx b/src/components/GenerationSettingsModal/VideoGenerationSection.tsx
index 807845653..7cb08a297 100644
--- a/src/components/GenerationSettingsModal/VideoGenerationSection.tsx
+++ b/src/components/GenerationSettingsModal/VideoGenerationSection.tsx
@@ -1,3 +1,4 @@
+import { videoModelDisplayName } from '../../utils/modelHelpers';
 import { Accordion } from '../Accordion';
 import { useRemoteServerStore } from '../../stores/remoteServerStore';
 import React, { useEffect, useState } from 'react';
@@ -73,7 +74,11 @@ export const VideoGenerationSection: React.FC = () => {
   return (
     <Accordion title="Video generation" variant="plain">
       <Text style={styles.settingDescription}>
-        {remoteName ?? model?.name ?? 'Default video settings'}
+        {remoteName
+          ? videoModelDisplayName(remoteName)
+          : model
+          ? videoModelDisplayName(model.id, model.name)
+          : 'Default video settings'}
       </Text>
       {controls.map(control => (
         <SliderSetting
diff --git a/src/components/ModelSelectorModal/VideoTab.tsx b/src/components/ModelSelectorModal/VideoTab.tsx
index 56520ca58..61bfaff4c 100644
--- a/src/components/ModelSelectorModal/VideoTab.tsx
+++ b/src/components/ModelSelectorModal/VideoTab.tsx
@@ -1,3 +1,4 @@
+import { videoModelDisplayName } from '../../utils/modelHelpers';
 import { RemoteModelOptionsSection } from '../models/RemoteModelOptionsSection';
 import { remoteServerManager } from '../../services/remoteServerManager';
 import React from 'react';
@@ -23,7 +24,7 @@ export function VideoTab({ onSelect }: { onSelect: () => void }) {
         <ModelCard
           key={model.id}
           compact
-          model={{ id: model.id, name: model.name, author: model.org ?? '' }}
+          model={{ id: model.id, name: videoModelDisplayName(model.id, model.name), author: model.org ?? '' }}
           isDownloaded
           isActive={selected === model.id}
           facts={['Video', 'Loads when generation starts']}
diff --git a/src/screens/ChatScreen/index.tsx b/src/screens/ChatScreen/index.tsx
index ea7578a7f..9ce78673e 100644
--- a/src/screens/ChatScreen/index.tsx
+++ b/src/screens/ChatScreen/index.tsx
@@ -1,3 +1,4 @@
+import { videoModelDisplayName } from '../../utils/modelHelpers';
 import { useAppStore } from '../../stores/appStore';
 import React, { useEffect, useRef, useState } from 'react';
 import { FlatList, Keyboard, Platform } from 'react-native';
@@ -77,11 +78,10 @@ export const ChatScreen: React.FC = () => {
   const voiceSummary = useUiModeStore(s => s.voiceSummary);
   const whisperModelId = useWhisperStore(s => s.downloadedModelId);
   const remoteLabels = useActiveRemoteModelLabels();
-  const videoLabel = useAppStore(
-    s =>
-      s.downloadedVideoModels.find(m => m.id === s.activeVideoModelId)?.name ??
-      '—',
-  );
+  const videoLabel = useAppStore(s => {
+    const model = s.downloadedVideoModels.find(m => m.id === s.activeVideoModelId);
+    return model ? videoModelDisplayName(model.id, model.name) : '—';
+  });
   const modelLabels: Record<ModelRowType, string> = {
     video: remoteLabels.video ?? videoLabel,
     text: chat.activeModelName ?? chat.activeModel?.name ?? '—',
diff --git a/src/screens/DownloadManagerScreen/useDownloadManager.ts b/src/screens/DownloadManagerScreen/useDownloadManager.ts
index df2ba9664..6daa1a74c 100644
--- a/src/screens/DownloadManagerScreen/useDownloadManager.ts
+++ b/src/screens/DownloadManagerScreen/useDownloadManager.ts
@@ -1,3 +1,4 @@
+import { videoModelDisplayName } from '../../utils/modelHelpers';
 import { useState } from 'react';
 import {
   AlertState,
@@ -157,8 +158,8 @@ export function useDownloadManager(): UseDownloadManagerResult {
       type: 'completed' as const,
       modelType: 'video' as const,
       modelId: model.id,
-      fileName: model.name,
-      name: model.name,
+      fileName: videoModelDisplayName(model.id, model.name),
+      name: videoModelDisplayName(model.id, model.name),
       author: model.org ?? '',
       quantization: model.quant ?? '',
       fileSize: model.files.reduce(
diff --git a/src/screens/HomeScreen/index.tsx b/src/screens/HomeScreen/index.tsx
index 9a5af188c..b042dd43a 100644
--- a/src/screens/HomeScreen/index.tsx
+++ b/src/screens/HomeScreen/index.tsx
@@ -1,3 +1,4 @@
+import { videoModelDisplayName } from '../../utils/modelHelpers';
 import { useAppStore } from '../../stores/appStore';
 import React from 'react';
 import { View, Text, ScrollView, TouchableOpacity, Image } from 'react-native';
@@ -114,9 +115,10 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({ navigation }) => {
   const voiceSummary = useUiModeStore(s => s.voiceSummary);
   const remoteLabels = useActiveRemoteModelLabels();
 
-  const videoLabel = useAppStore(
-    s => s.downloadedVideoModels.find(m => m.id === s.activeVideoModelId)?.name,
-  );
+  const videoLabel = useAppStore(s => {
+    const model = s.downloadedVideoModels.find(m => m.id === s.activeVideoModelId);
+    return model ? videoModelDisplayName(model.id, model.name) : undefined;
+  });
   const modelLabels = homeModelLabels({
     video: remoteLabels.video ?? videoLabel,
     text: activeTextModelId ? activeTextModelName : undefined,
diff --git a/src/screens/ModelsScreen/VideoModelsTab.tsx b/src/screens/ModelsScreen/VideoModelsTab.tsx
index 2cc809887..9d29ff23c 100644
--- a/src/screens/ModelsScreen/VideoModelsTab.tsx
+++ b/src/screens/ModelsScreen/VideoModelsTab.tsx
@@ -1,3 +1,4 @@
+import { videoModelDisplayName } from '../../utils/modelHelpers';
 import React, { useCallback, useEffect, useState } from 'react';
 import { BackHandler, ScrollView, Text, TextInput, View } from 'react-native';
 import {
@@ -192,7 +193,7 @@ export const VideoModelsTab: React.FC<{
         compact
         model={{
           id: row.id,
-          name: file ? `${row.name.replace(/\s*\([^)]*\)$/, '')} - ${versionName}` : row.name,
+          name: file ? `${videoModelDisplayName(row.id, row.name).replace(/\s*\([^)]*\)$/, '')} - ${versionName}` : videoModelDisplayName(row.id, row.name),
           author: row.org,
           credibility: {
             source:
@@ -287,7 +288,7 @@ export const VideoModelsTab: React.FC<{
     <View style={styles.flex1}>
       {selected ? (
         <>
-          <ScreenHeader title={selected.name} onBack={() => setSelected(null)} />
+          <ScreenHeader title={videoModelDisplayName(selected.id, selected.name)} onBack={() => setSelected(null)} />
           <Card style={styles.modelInfoCard}>
             <Text style={styles.modelAuthor}>{selected.org}</Text>
             <Text style={styles.modelDescription}>
diff --git a/src/services/modelDownloadService/providers/videoProvider.ts b/src/services/modelDownloadService/providers/videoProvider.ts
index 6ef280e13..699c060ea 100644
--- a/src/services/modelDownloadService/providers/videoProvider.ts
+++ b/src/services/modelDownloadService/providers/videoProvider.ts
@@ -1,3 +1,4 @@
+import { videoModelDisplayName } from '../../../utils/modelHelpers';
 import { mapStoreStatus } from '../storeStatus';
 import { modelResidencyManager } from '../../modelResidency';
 import RNFS from 'react-native-fs';
@@ -33,7 +34,7 @@ function addRow(model: ModelEntry, status: 'pending' | 'paused') {
       modelId: model.id,
       downloadId: key(model.id),
       modelType: 'video',
-      fileName: model.name,
+      fileName: videoModelDisplayName(model.id, model.name),
       totalBytes: model.files.reduce((sum, f) => sum + (f.sizeBytes ?? 0), 0),
       bytesDownloaded: 0,
       progress: 0,
@@ -155,7 +156,7 @@ export const videoProvider: DownloadProvider = {
       result.push({
         id: key(model.id),
         modelType: 'video',
-        name: model.name,
+        name: videoModelDisplayName(model.id, model.name),
         sizeBytes: row?.totalBytes ?? 0,
         bytesDownloaded: row?.bytesDownloaded ?? 0,
         progress: row?.progress ?? 0,
@@ -181,7 +182,7 @@ export const videoProvider: DownloadProvider = {
       result.push({
         id: key(model.id),
         modelType: 'video',
-        name: model.name,
+        name: videoModelDisplayName(model.id, model.name),
         sizeBytes: size,
         bytesDownloaded: size,
         progress: 1,
diff --git a/src/services/remoteModelSelection.ts b/src/services/remoteModelSelection.ts
index c8e37f96d..ffe5c5367 100644
--- a/src/services/remoteModelSelection.ts
+++ b/src/services/remoteModelSelection.ts
@@ -1,3 +1,4 @@
+import { videoModelDisplayName } from '../utils/modelHelpers';
 import type {
   RemoteModelCategory,
   RemoteModelOption,
@@ -38,6 +39,9 @@ export function remoteServerModelOptions(
         reported.length > 0 ? reported : configuredOption(server, category);
       return options.map(option => ({
         ...option,
+        name: category === 'video'
+          ? videoModelDisplayName(option.id, option.name)
+          : option.name,
         serverId: server.id,
         serverName: server.name,
       }));
@@ -50,8 +54,8 @@ export function selectedRemoteModelName(
 ): string | null {
   const selectedId = server?.mediaModels?.[category]?.trim();
   if (!server || !selectedId) return null;
-  return (
+  const name =
     server.modelCatalog?.[category]?.find(model => model.id === selectedId)
-      ?.name ?? displayModelName(selectedId)
-  );
+      ?.name ?? displayModelName(selectedId);
+  return category === 'video' ? videoModelDisplayName(selectedId, name) : name;
 }
diff --git a/src/stores/appStore.ts b/src/stores/appStore.ts
index 56d1777ff..95c6825d0 100644
--- a/src/stores/appStore.ts
+++ b/src/stores/appStore.ts
@@ -1,3 +1,4 @@
+import { videoModelDisplayName } from '../utils/modelHelpers';
 import type {
   ModelEntry,
   VideoGenerationRequestContract,
@@ -411,7 +412,7 @@ export const useAppStore = create<AppState>()(
         set(state => ({
           downloadedVideoModels: [
             ...state.downloadedVideoModels.filter(m => m.id !== model.id),
-            model,
+            { ...model, name: videoModelDisplayName(model.id, model.name) },
           ],
         })),
       removeDownloadedVideoModel: id =>
@@ -425,8 +426,12 @@ export const useAppStore = create<AppState>()(
       setVideoDownload: (id, model) =>
         set(state => {
           const videoDownloads = { ...state.videoDownloads };
-          if (model) videoDownloads[id] = model;
-          else delete videoDownloads[id];
+          if (model) {
+            videoDownloads[id] = {
+              ...model,
+              name: videoModelDisplayName(model.id, model.name),
+            };
+          } else delete videoDownloads[id];
           return { videoDownloads };
         }),
       downloadedImageModels: [],
diff --git a/src/utils/modelHelpers.ts b/src/utils/modelHelpers.ts
index 62ac9d5c6..8f4f2cd87 100644
--- a/src/utils/modelHelpers.ts
+++ b/src/utils/modelHelpers.ts
@@ -1,3 +1,4 @@
+import { CATALOG } from '@offgrid/models';
 import { DownloadedModel } from '../types';
 
 export const getMmProjFileSize = (m?: DownloadedModel): number =>
@@ -13,3 +14,7 @@ export const getMmProjFileSize = (m?: DownloadedModel): number =>
  */
 export const isLiteRTFileName = (fileName: string): boolean =>
   fileName.toLowerCase().endsWith('.litertlm');
+
+/** Use the catalog label without changing the repository ID or file names. */
+export const videoModelDisplayName = (id: string, fallback: string = id): string =>
+  CATALOG.find(model => model.kind === 'video' && model.id === id)?.name ?? fallback;

From 62bc123af82fc064daa3afac4c7abef34dbc2d1c Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 20:03:37 +0530
Subject: [PATCH 071/129] fix(video): show iOS background interruption while
 engine stops [skip ci]

---
 native/video/VideoGenerationModule.mm    | 34 +++++++++++++++---------
 src/components/VideoGenerationStatus.tsx |  6 +++--
 src/services/videoGenerationService.ts   |  6 +++--
 src/services/videoGenerator.ts           | 11 ++++++++
 4 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/native/video/VideoGenerationModule.mm b/native/video/VideoGenerationModule.mm
index ffdd03a66..eef40e38f 100644
--- a/native/video/VideoGenerationModule.mm
+++ b/native/video/VideoGenerationModule.mm
@@ -63,17 +63,28 @@ - (void)restoreScreenIdleTimer {
 - (NSArray<NSString *> *)supportedEvents { return @[@"VideoGenerationProgress", @"SDImageProgress"]; }
 - (void)startObserving { _listeners = YES; }
 - (void)stopObserving { _listeners = NO; }
+- (void)logLifecycle:(NSString *)detail {
+  NSLog(@"[VideoLifecycle] %@", detail);
+  if (_listeners) [self sendEventWithName:@"VideoGenerationProgress"
+    body:@{@"lifecycle":detail, @"at":@([[NSDate date] timeIntervalSince1970] * 1000)}];
+}
+- (void)interruptVideo:(NSString *)reason {
+  _videoInterruptionReason = reason;
+  _runtime.cancel();
+  if (_listeners) [self sendEventWithName:@"VideoGenerationProgress"
+    body:@{@"interruption":reason}];
+}
 - (void)backgrounded {
   // Metal work must stop before the OS removes GPU access. Continued GPU tasks
   // are admitted separately by the background coordinator on supported systems.
-  NSLog(@"[VideoLifecycle] background busy=%d admittedGPU=%d", _busy, _continued != nil);
+  [self logLifecycle:[NSString stringWithFormat:@"background busy=%d admittedGPU=%d", _busy, _continued != nil]];
   if (_busy && !_continued) {
-    _videoInterruptionReason = @"Video generation stopped when the app went into the background. Keep Off Grid open and try again.";
-    _runtime.cancel();
+    [self interruptVideo:@"Video generation stopped when the app went into the background. Keep Off Grid open and try again."];
   }
 }
 - (void)emitStage:(NSString *)stage step:(int)step total:(int)total {
   dispatch_async(dispatch_get_main_queue(), ^{
+    if (self->_videoInterruptionReason) return;
     if (@available(iOS 26.0, *)) {
       if (self->_continued && total > 0) {
         BGContinuedProcessingTask *task = (BGContinuedProcessingTask *)self->_continued;
@@ -243,7 +254,7 @@ - (void)startContinuedWork:(dispatch_block_t)work {
   _continuedWork = [work copy];
   if (@available(iOS 26.0, *)) {
     BGContinuedProcessingTaskRequestResources resources = BGTaskScheduler.supportedResources;
-    NSLog(@"[VideoLifecycle] supportedBackgroundResources=%lu gpu=%d", (unsigned long)resources, (resources & BGContinuedProcessingTaskRequestResourcesGPU) != 0);
+    [self logLifecycle:[NSString stringWithFormat:@"supportedBackgroundResources=%lu gpu=%d", (unsigned long)resources, (resources & BGContinuedProcessingTaskRequestResourcesGPU) != 0]];
     if (resources & BGContinuedProcessingTaskRequestResourcesGPU) {
       if (!_taskIdentifier) {
         _taskIdentifier = [NSString stringWithFormat:@"%@.video.generation", NSBundle.mainBundle.bundleIdentifier];
@@ -252,22 +263,21 @@ - (void)startContinuedWork:(dispatch_block_t)work {
           VideoGenerationModule *owner = weakSelf;
           if (!owner || !owner->_busy) { [task setTaskCompletedWithSuccess:NO]; return; }
           owner->_continued = task;
-          NSLog(@"[VideoLifecycle] admitted continued GPU task %@", task.identifier);
+          [owner logLifecycle:[NSString stringWithFormat:@"admitted continued GPU task %@", task.identifier]];
           __weak BGTask *expiringTask = task;
           task.expirationHandler = ^{
             dispatch_async(dispatch_get_main_queue(), ^{
               VideoGenerationModule *active = weakSelf;
               if (active && active->_continued == expiringTask && active->_busy) {
-                NSLog(@"[VideoLifecycle] continued GPU task expired %@", expiringTask.identifier);
-                active->_videoInterruptionReason = @"iOS stopped background video generation. Keep Off Grid open and try again.";
-                active->_runtime.cancel();
+                [active logLifecycle:[NSString stringWithFormat:@"continued GPU task expired %@", expiringTask.identifier]];
+                [active interruptVideo:@"iOS stopped background video generation. Keep Off Grid open and try again."];
               }
             });
           };
           dispatch_block_t admitted = owner->_continuedWork; owner->_continuedWork = nil;
           if (admitted) admitted();
         }];
-        NSLog(@"[VideoLifecycle] registration %@ success=%d", _taskIdentifier, registered);
+        [self logLifecycle:[NSString stringWithFormat:@"registration %@ success=%d", _taskIdentifier, registered]];
         if (!registered) { _taskIdentifier = nil; _continuedWork = nil; work(); return; }
       }
       BGContinuedProcessingTaskRequest *request = [[BGContinuedProcessingTaskRequest alloc] initWithIdentifier:_taskIdentifier title:@"Generating video" subtitle:@"Loading model"];
@@ -275,13 +285,13 @@ - (void)startContinuedWork:(dispatch_block_t)work {
       request.strategy = BGContinuedProcessingTaskRequestSubmissionStrategyFail;
       NSError *submissionError = nil;
       if ([BGTaskScheduler.sharedScheduler submitTaskRequest:request error:&submissionError]) {
-        NSLog(@"[VideoLifecycle] submitted continued GPU task %@", _taskIdentifier);
+        [self logLifecycle:[NSString stringWithFormat:@"submitted continued GPU task %@", _taskIdentifier]];
         return;
       }
-      NSLog(@"[VideoLifecycle] continued GPU task refused domain=%@ code=%ld detail=%@", submissionError.domain, (long)submissionError.code, submissionError.localizedDescription);
+      [self logLifecycle:[NSString stringWithFormat:@"continued GPU task refused domain=%@ code=%ld detail=%@", submissionError.domain, (long)submissionError.code, submissionError.localizedDescription]];
     }
   }
-  NSLog(@"[VideoLifecycle] running in foreground without admitted background GPU access");
+  [self logLifecycle:[NSString stringWithFormat:@"running in foreground without admitted background GPU access"]];
   _continuedWork = nil;
   work();
 }
diff --git a/src/components/VideoGenerationStatus.tsx b/src/components/VideoGenerationStatus.tsx
index b398028c6..747e514c2 100644
--- a/src/components/VideoGenerationStatus.tsx
+++ b/src/components/VideoGenerationStatus.tsx
@@ -30,7 +30,9 @@ export function VideoGenerationStatus({
   const samplingFinished =
     state.progress && state.progress.step >= state.progress.total;
   const label =
-    state.stage === 'enhancing'
+    state.error
+      ? `${state.error} Waiting for the video engine to stop.`
+      : state.stage === 'enhancing'
       ? 'Preparing prompt'
       : state.stage === 'preparing'
       ? 'Loading video model'
@@ -46,7 +48,7 @@ export function VideoGenerationStatus({
       ? 'Decoding video frames'
       : 'Generating video';
   const steps =
-    state.stage === 'generating' && state.progress && !samplingFinished
+    !state.error && state.stage === 'generating' && state.progress && !samplingFinished
       ? ` · Step ${state.progress.step} of ${state.progress.total}`
       : state.stage === 'decoding' && state.progress
       ? ` · Section ${state.progress.step} of ${state.progress.total} complete`
diff --git a/src/services/videoGenerationService.ts b/src/services/videoGenerationService.ts
index 5709aa5e4..f474aa3b0 100644
--- a/src/services/videoGenerationService.ts
+++ b/src/services/videoGenerationService.ts
@@ -413,8 +413,10 @@ class VideoGenerationService {
           },
         );
         if (this.cancelled) throw new Error('Video generation stopped.');
-        path = await videoGenerator.generate(request, pack, output, update =>
-          this.update(update),
+        path = await videoGenerator.generate(
+          request, pack, output,
+          update => this.update(update),
+          reason => this.update({ error: reason, progress: null, preview: null }),
         );
       }
       if (this.cancelled) throw new Error('Video generation stopped.');
diff --git a/src/services/videoGenerator.ts b/src/services/videoGenerator.ts
index 5842c33b3..cab498ea9 100644
--- a/src/services/videoGenerator.ts
+++ b/src/services/videoGenerator.ts
@@ -1,3 +1,4 @@
+import logger from '../utils/logger';
 import { NativeEventEmitter, NativeModules } from 'react-native';
 import { videoArchitecture } from '@offgrid/models';
 import type {
@@ -16,6 +17,7 @@ export const videoGenerator = {
     pack: VideoModelPack,
     outputPath: string,
     onUpdate: (update: VideoGenerationUpdateContract) => void,
+    onInterrupted?: (reason: string) => void,
   ): Promise<string> {
     if (!native)
       throw new Error('This build does not include the video engine.');
@@ -24,6 +26,15 @@ export const videoGenerator = {
     const listener = new NativeEventEmitter(native).addListener(
       'VideoGenerationProgress',
       event => {
+        if (typeof event.lifecycle === 'string') {
+          logger.log('[VideoLifecycle]', event.at, event.lifecycle);
+          return;
+        }
+        if (typeof event.interruption === 'string') {
+          logger.warn('[VideoLifecycle] interrupted', event.interruption);
+          onInterrupted?.(event.interruption);
+          return;
+        }
         // sd.cpp also sends tensor-loading and VAE tile counters through this
         // callback. Only sampling steps belong in the generation step count.
         if (event.stage === 'generating') {

From ed7a6f434820069125a40f004e303848a5bb829b Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 20:11:34 +0530
Subject: [PATCH 072/129] fix(video): respect download cancellation and count
 pack storage [skip ci]

---
 src/screens/StorageSettingsScreen.tsx          | 18 ++++++++++--------
 .../providers/videoProvider.ts                 |  8 +++++++-
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/screens/StorageSettingsScreen.tsx b/src/screens/StorageSettingsScreen.tsx
index 412a451c3..9fc4c23df 100644
--- a/src/screens/StorageSettingsScreen.tsx
+++ b/src/screens/StorageSettingsScreen.tsx
@@ -1,3 +1,5 @@
+import { statFile } from '../utils/fileStat';
+import { videoModelDirectory } from '../services/videoModelFiles';
 import React, { useEffect, useState, useCallback } from 'react';
 import {
   View,
@@ -45,13 +47,6 @@ export const StorageSettingsScreen: React.FC = () => {
     0,
   );
 
-  const videoStorageUsed = downloadedVideoModels.reduce(
-    (total, model) =>
-      total +
-      model.files.reduce((size, file) => size + (file.sizeBytes ?? 0), 0),
-    0,
-  );
-
   // A "stale" entry is a store entry missing the basic fields needed to
   // display or finalize it. Now sourced from the unified download store.
   const staleDownloads = Object.values(downloads).filter(entry => {
@@ -59,11 +54,18 @@ export const StorageSettingsScreen: React.FC = () => {
   });
 
   const loadStorageInfo = useCallback(async () => {
+    const videoSizes = await Promise.all(downloadedVideoModels.flatMap(model =>
+      model.files.map(async file => {
+        const facts = await statFile(`${videoModelDirectory(model.id)}/${file.name}`);
+        return facts?.isFile ? facts.size : 0;
+      }),
+    ));
+    const videoStorageUsed = videoSizes.reduce((total, size) => total + size, 0);
     const used = await modelManager.getStorageUsed();
     const available = await modelManager.getAvailableStorage();
     setStorageUsed(used + imageStorageUsed + videoStorageUsed);
     setAvailableStorage(available);
-  }, [imageStorageUsed, videoStorageUsed]);
+  }, [imageStorageUsed, downloadedVideoModels]);
 
   useEffect(() => {
     loadStorageInfo();
diff --git a/src/services/modelDownloadService/providers/videoProvider.ts b/src/services/modelDownloadService/providers/videoProvider.ts
index 699c060ea..aac085816 100644
--- a/src/services/modelDownloadService/providers/videoProvider.ts
+++ b/src/services/modelDownloadService/providers/videoProvider.ts
@@ -64,6 +64,7 @@ async function start(model: ModelEntry): Promise<void> {
   addRow(model, 'pending');
   const directory = videoModelDirectory(model.id);
   let bytes = 0;
+  const installedFiles: ModelEntry['files'] = [];
   const total = model.files.reduce(
     (sum, file) => sum + (file.sizeBytes ?? 0),
     0,
@@ -84,6 +85,7 @@ async function start(model: ModelEntry): Promise<void> {
         Number(existing.size) === file.sizeBytes &&
         (!file.sha256 || (await RNFS.hash(destination, 'sha256')).toLowerCase() === file.sha256.toLowerCase())
       ) {
+        installedFiles.push({ ...file, sizeBytes: Number(existing.size) });
         bytes += file.sizeBytes;
         useDownloadStore.getState().updateProgress(key(model.id), bytes, total);
         continue;
@@ -116,15 +118,19 @@ async function start(model: ModelEntry): Promise<void> {
         .catch(() => {});
       await task.promise;
       transfer.nativeId = undefined;
-      bytes += Number((await RNFS.stat(destination)).size);
+      const sizeBytes = Number((await RNFS.stat(destination)).size);
+      installedFiles.push({ ...file, sizeBytes });
+      bytes += sizeBytes;
     }
     if (transfer.cancelled) throw new Error('Download cancelled.');
     useDownloadStore.getState().setProcessing(key(model.id));
     await resolveVideoPack(model, true);
+    if (transfer.cancelled) throw new Error('Download cancelled.');
     const app = useAppStore.getState();
     app.addDownloadedVideoModel({
       ...model,
       kind: 'video',
+      files: installedFiles,
       downloadedAt: new Date().toISOString(),
     });
     app.setVideoDownload(model.id, null);

From 755cd74fa7e3608eb2e8648a9754037ebd2d3d2f Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 20:11:34 +0530
Subject: [PATCH 073/129] feat(video): include compatible packs in mobile auto
 setup [skip ci]

---
 src/screens/AutoSetupScreen.tsx  |  1 +
 src/services/autoSetupCatalog.ts | 17 ++++++++++++++++-
 src/services/autoSetupPlan.ts    |  8 ++++++--
 src/services/autoSetupService.ts |  9 ++++++++-
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/screens/AutoSetupScreen.tsx b/src/screens/AutoSetupScreen.tsx
index 3f8d0f8e8..52f5761a6 100644
--- a/src/screens/AutoSetupScreen.tsx
+++ b/src/screens/AutoSetupScreen.tsx
@@ -28,6 +28,7 @@ type Props = {
 const labelForItem = (item: AutoSetupPlan['items'][number]) => {
   if (item.kind === 'text') return 'TEXT + VISION';
   if (item.kind === 'image') return 'IMAGE';
+  if (item.kind === 'video') return 'VIDEO';
   return 'SPEECH INPUT';
 };
 
diff --git a/src/services/autoSetupCatalog.ts b/src/services/autoSetupCatalog.ts
index 0670bef13..ddc0498cc 100644
--- a/src/services/autoSetupCatalog.ts
+++ b/src/services/autoSetupCatalog.ts
@@ -1,3 +1,5 @@
+import { CATALOG, videoPackError } from '@offgrid/models';
+import { videoGenerator } from './videoGenerator';
 import { recommendedModelsForDevice, ramFitScore } from '../utils/recommendedModels';
 import { fileExceedsBudget } from './memoryBudget';
 import { fetchModelFiles } from './modelCatalogFiles';
@@ -12,6 +14,7 @@ type CompatibleTextModel = ReturnType<typeof recommendedModelsForDevice>[number]
 
 export interface AutoSetupCatalogBoundaries {
   totalMemoryGB: () => number;
+  videoAvailable?: () => boolean;
   fetchTextFiles: typeof fetchModelFiles;
   imageRecommendation: typeof hardwareService.getImageModelRecommendation;
   imageModels: typeof autoSetupImageCatalogProvider.load;
@@ -19,6 +22,7 @@ export interface AutoSetupCatalogBoundaries {
 
 const productionCatalogBoundaries: AutoSetupCatalogBoundaries = {
   totalMemoryGB: () => hardwareService.getTotalMemoryGB(),
+  videoAvailable: () => videoGenerator.available(),
   fetchTextFiles: fetchModelFiles,
   imageRecommendation: () => hardwareService.getImageModelRecommendation(),
   imageModels: () => autoSetupImageCatalogProvider.load(),
@@ -87,5 +91,16 @@ export async function loadAutoSetupCompatibleCatalog(
     payload: { modelId: model.id },
   }));
 
-  return { text, image, stt };
+  const video = boundaries.videoAvailable?.() ? CATALOG.flatMap(model => {
+    if (model.kind !== 'video' || model.availability === 'coming_soon' ||
+        !model.minRamGb || model.minRamGb > ramGB || videoPackError(model.files) ||
+        model.files.some(file => !file.sizeBytes)) return [];
+    const sizeBytes = model.files.reduce((sum, file) => sum + (file.sizeBytes ?? 0), 0);
+    if (fileExceedsBudget(sizeBytes, ramGB)) return [];
+    return [{
+      id: model.id, name: model.name, kind: 'video' as const, sizeBytes,
+      fitScore: ramFitScore(model.minRamGb, ramGB), payload: model,
+    }];
+  }) : [];
+  return { text, image, stt, video };
 }
diff --git a/src/services/autoSetupPlan.ts b/src/services/autoSetupPlan.ts
index 199fe1984..71596a508 100644
--- a/src/services/autoSetupPlan.ts
+++ b/src/services/autoSetupPlan.ts
@@ -1,8 +1,9 @@
+import type { ModelEntry } from '@offgrid/models';
 import type { ModelFile } from '../types';
 import type { ImageModelDescriptor } from './imageModelDownloadTypes';
 
 export type AutoSetupTier = 'lean' | 'balanced' | 'extreme';
-type AutoSetupModelKind = 'text' | 'image' | 'stt';
+type AutoSetupModelKind = 'text' | 'image' | 'stt' | 'video';
 
 interface AutoSetupCandidate<T = unknown> {
   id: string;
@@ -22,11 +23,13 @@ export interface AutoSetupPlan {
     AutoSetupCandidate<{ modelId: string; file: ModelFile }>,
     AutoSetupCandidate<ImageModelDescriptor>,
     AutoSetupCandidate<{ modelId: string }>,
+    ...AutoSetupCandidate<ModelEntry>[],
   ];
   totalBytes: number;
 }
 
 export interface AutoSetupCompatibleCatalog {
+  video?: AutoSetupCandidate<ModelEntry>[];
   text: AutoSetupCandidate<{ modelId: string; file: ModelFile }>[];
   image: AutoSetupCandidate<ImageModelDescriptor>[];
   stt: AutoSetupCandidate<{ modelId: string }>[];
@@ -111,7 +114,8 @@ function selectAutoSetupPlan(
       : selectedImage);
   const stt = choose(tier, catalog.stt);
   if (!text || !image || !stt) return null;
-  const items: AutoSetupPlan['items'] = [text, image, stt];
+  const video = choose(tier, catalog.video ?? []);
+  const items: AutoSetupPlan['items'] = [text, image, stt, ...(video ? [video] : [])];
   return {
     tier,
     ...PLAN_COPY[tier],
diff --git a/src/services/autoSetupService.ts b/src/services/autoSetupService.ts
index f880be1f7..7f3566462 100644
--- a/src/services/autoSetupService.ts
+++ b/src/services/autoSetupService.ts
@@ -296,7 +296,7 @@ export function createAutoSetupSession(
     });
     if (activeIds.size === 0) return;
 
-    const [text, image, stt] = plan.items;
+    const [text, image, stt, video] = plan.items;
     const jobs = [
       {
         id: autoSetupDownloadId(text),
@@ -310,6 +310,10 @@ export function createAutoSetupSession(
         id: autoSetupDownloadId(stt),
         run: () => downloads.start({ modelType: 'stt', modelId: stt.payload.modelId }),
       },
+      ...(video ? [{
+        id: autoSetupDownloadId(video),
+        run: () => downloads.start({ modelType: 'video', model: video.payload }),
+      }] : []),
     ].filter(job => activeIds.has(job.id));
     const starts = await Promise.allSettled(jobs.map(job => job.run()));
     if (disposed || token !== operation) return;
@@ -370,6 +374,9 @@ export function createAutoSetupSession(
         if (app.activeImageModelId === null) {
           app.setActiveImageModelId(plan.items[1].id);
         }
+        if (app.activeVideoModelId === null && plan.items[3]) {
+          app.setActiveVideoModelId(plan.items[3].id);
+        }
       }
     },
     dispose() {

From 6dc25d55a73ab63ee275d4e663ccfa726b31f2db Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 20:12:35 +0530
Subject: [PATCH 074/129] chore(pro): update video transfer display names [skip
 ci]

---
 pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pro b/pro
index 518f87c41..c76d0eccb 160000
--- a/pro
+++ b/pro
@@ -1 +1 @@
-Subproject commit 518f87c41f87e226bfdd0fff993bcf38692094b9
+Subproject commit c76d0eccb4eb67186e2705185eb1c81a363d7d4a

From a7ef3ac8731ffce51d61f227ad24a5bf6915948d Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 20:40:35 +0530
Subject: [PATCH 075/129] fix(video): bound Adreno attention work per dispatch
 [skip ci]

---
 scripts/prepare-video-runtime.sh              |  2 +-
 .../android-attention-query-chunks.patch      | 75 +++++++++++++++++++
 2 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 scripts/video/android-attention-query-chunks.patch

diff --git a/scripts/prepare-video-runtime.sh b/scripts/prepare-video-runtime.sh
index 097779528..3f76bc775 100644
--- a/scripts/prepare-video-runtime.sh
+++ b/scripts/prepare-video-runtime.sh
@@ -16,7 +16,7 @@ PATCH="$ROOT/scripts/video/android-vulkan-dispatch.patch"
 if ! git -C "$SOURCE/ggml" apply --reverse --check "$PATCH" 2>/dev/null; then
   git -C "$SOURCE/ggml" apply "$PATCH"
 fi
-for entry in "ggml:android-vulkan-device-fault.patch" "ggml:android-vulkan-pipeline-diagnostics.patch" "ggml:android-vulkan-matvec-fallback.patch" "ggml:android-vulkan-attention-fallback.patch" "ggml:android-hexagon.patch" "ggml:android-hexagon-buffer-validation.patch" "ggml:android-hexagon-precision.patch" ".:android-hardware-fallback.patch" ".:conditioning-errors.patch" ".:android-attention-buffer-ownership.patch" ".:video-decode-observer.patch"; do
+for entry in "ggml:android-vulkan-device-fault.patch" "ggml:android-vulkan-pipeline-diagnostics.patch" "ggml:android-vulkan-matvec-fallback.patch" "ggml:android-vulkan-attention-fallback.patch" "ggml:android-hexagon.patch" "ggml:android-hexagon-buffer-validation.patch" "ggml:android-hexagon-precision.patch" ".:android-hardware-fallback.patch" ".:conditioning-errors.patch" ".:android-attention-buffer-ownership.patch" ".:android-attention-query-chunks.patch" ".:video-decode-observer.patch"; do
   target="${entry%%:*}"
   patch="$ROOT/scripts/video/${entry#*:}"
   if ! git -C "$SOURCE/$target" apply --reverse --check "$patch" 2>/dev/null; then
diff --git a/scripts/video/android-attention-query-chunks.patch b/scripts/video/android-attention-query-chunks.patch
new file mode 100644
index 000000000..ad309d030
--- /dev/null
+++ b/scripts/video/android-attention-query-chunks.patch
@@ -0,0 +1,75 @@
+--- a/src/core/ggml_extend.cpp
++++ b/src/core/ggml_extend.cpp
+@@ -721,6 +721,43 @@
+             mask_in = ggml_cast(ctx, mask_in, GGML_TYPE_F16);
+         }
+ 
++#ifdef __ANDROID__
++        // Adreno can lose the device on a single long video attention dispatch.
++        // Split only queries: each query still attends to every original key/value.
++        auto is_adreno = [](ggml_backend_dev_t device) {
++            const char* name = device ? ggml_backend_dev_name(device) : nullptr;
++            const char* description = device ? ggml_backend_dev_description(device) : nullptr;
++            return name && description && std::string(name).find("Vulkan") != std::string::npos &&
++                std::string(description).find("Adreno") != std::string::npos;
++        };
++        bool adreno_attention = backend && is_adreno(ggml_backend_get_device(backend));
++        // HTP may accept the initial default-precision node, then delegate its
++        // FP32 execution to Vulkan through the scheduler's fallback backend.
++        if (!adreno_attention && sd_backend_is(backend, "HTP")) {
++            for (size_t i = 0; i < ggml_backend_dev_count(); ++i) {
++                if (is_adreno(ggml_backend_dev_get(i))) { adreno_attention = true; break; }
++            }
++        }
++        if (mask_in == nullptr && adreno_attention && q_in->ne[1] > 128) {
++            const int64_t work_per_query = 2 * k_in->ne[1] *
++                (q_in->ne[0] + v_in->ne[0]) * q_in->ne[2] * q_in->ne[3];
++            const int64_t chunk_rows = std::max<int64_t>(8, std::min<int64_t>(128,
++                (4000000000LL / std::max<int64_t>(1, work_per_query) / 8) * 8));
++            ggml_tensor* joined = nullptr;
++            for (int64_t start = 0; start < q_in->ne[1]; start += chunk_rows) {
++                const int64_t rows = std::min(chunk_rows, q_in->ne[1] - start);
++                auto query = ggml_cont(ctx, ggml_view_4d(ctx, q_in,
++                    q_in->ne[0], rows, q_in->ne[2], q_in->ne[3],
++                    q_in->nb[1], q_in->nb[2], q_in->nb[3], start * q_in->nb[1]));
++                auto part = ggml_flash_attn_ext(ctx, query, k_in, v_in, nullptr, scale / kv_scale, 0, 0);
++                if (!ggml_backend_supports_op(backend, part)) return nullptr;
++                ggml_flash_attn_ext_set_prec(part, GGML_PREC_F32);
++                joined = joined ? ggml_concat(ctx, joined, part, 2) : part;
++            }
++            if (kv_scale != 1.0f) joined = ggml_ext_scale(ctx, joined, 1.0f / kv_scale);
++            return joined;
++        }
++#endif
+         auto out = ggml_flash_attn_ext(ctx, q_in, k_in, v_in, mask_in, scale / kv_scale, 0, 0);
+         if (!ggml_backend_supports_op(backend, out)) {
+             return nullptr;
+--- a/src/model/diffusion/wan.hpp
++++ b/src/model/diffusion/wan.hpp
+@@ -988,7 +988,25 @@
+                                  float vace_strength                             = 1.f,
+                                  const sd::Tensor<float>& audio_embed_tensor     = {},
+                                  const sd::Tensor<float>& ref_latent_tensor      = {}) {
+-            ggml_cgraph* gf = new_graph_custom(WAN_GRAPH_SIZE);
++            size_t graph_size = WAN_GRAPH_SIZE;
++#ifdef __ANDROID__
++            // Query chunks keep full attention but add view/copy/concat nodes.
++            // Reserve graph metadata for that path inside the existing 327680-node arena.
++            if (sd_backend_is(runtime_backend, "Vulkan") || sd_backend_is(runtime_backend, "HTP")) {
++                for (size_t i = 0; i < ggml_backend_dev_count(); ++i) {
++                    auto device = ggml_backend_dev_get(i);
++                    const char* name = ggml_backend_dev_name(device);
++                    const char* description = ggml_backend_dev_description(device);
++                    if (name && description && std::string(name).find("Vulkan") != std::string::npos &&
++                        std::string(description).find("Adreno") != std::string::npos) {
++                        graph_size = 131072;
++                        LOG_DEBUG("Adreno chunked Wan graph capacity: %zu", graph_size);
++                        break;
++                    }
++                }
++            }
++#endif
++            ggml_cgraph* gf = new_graph_custom(graph_size);
+ 
+             ggml_tensor* x               = make_input(x_tensor);
+             ggml_tensor* timesteps       = make_input(timesteps_tensor);

From ca25ae383b0a568a0c51c640ba5b4f3ecc8da1eb Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 20:59:20 +0530
Subject: [PATCH 076/129] perf(video): keep Adreno attention chunks on the GPU
 [skip ci]

---
 scripts/prepare-video-runtime.sh              |  9 ++-
 .../android-attention-query-routing.patch     | 63 +++++++++++++++++++
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 scripts/video/android-attention-query-routing.patch

diff --git a/scripts/prepare-video-runtime.sh b/scripts/prepare-video-runtime.sh
index 3f76bc775..37bef7367 100644
--- a/scripts/prepare-video-runtime.sh
+++ b/scripts/prepare-video-runtime.sh
@@ -16,7 +16,14 @@ PATCH="$ROOT/scripts/video/android-vulkan-dispatch.patch"
 if ! git -C "$SOURCE/ggml" apply --reverse --check "$PATCH" 2>/dev/null; then
   git -C "$SOURCE/ggml" apply "$PATCH"
 fi
-for entry in "ggml:android-vulkan-device-fault.patch" "ggml:android-vulkan-pipeline-diagnostics.patch" "ggml:android-vulkan-matvec-fallback.patch" "ggml:android-vulkan-attention-fallback.patch" "ggml:android-hexagon.patch" "ggml:android-hexagon-buffer-validation.patch" "ggml:android-hexagon-precision.patch" ".:android-hardware-fallback.patch" ".:conditioning-errors.patch" ".:android-attention-buffer-ownership.patch" ".:android-attention-query-chunks.patch" ".:video-decode-observer.patch"; do
+# This overlay extends the scheduler inserted by android-hardware-fallback.patch.
+# Remove it before checking the base patch, then apply it again in order below.
+# Do not reset the source tree: other platform patches must remain intact.
+ROUTING_PATCH="$ROOT/scripts/video/android-attention-query-routing.patch"
+if git -C "$SOURCE" apply --reverse --check "$ROUTING_PATCH" 2>/dev/null; then
+  git -C "$SOURCE" apply --reverse "$ROUTING_PATCH"
+fi
+for entry in "ggml:android-vulkan-device-fault.patch" "ggml:android-vulkan-pipeline-diagnostics.patch" "ggml:android-vulkan-matvec-fallback.patch" "ggml:android-vulkan-attention-fallback.patch" "ggml:android-hexagon.patch" "ggml:android-hexagon-buffer-validation.patch" "ggml:android-hexagon-precision.patch" ".:android-hardware-fallback.patch" ".:conditioning-errors.patch" ".:android-attention-buffer-ownership.patch" ".:android-attention-query-chunks.patch" ".:android-attention-query-routing.patch" ".:video-decode-observer.patch"; do
   target="${entry%%:*}"
   patch="$ROOT/scripts/video/${entry#*:}"
   if ! git -C "$SOURCE/$target" apply --reverse --check "$patch" 2>/dev/null; then
diff --git a/scripts/video/android-attention-query-routing.patch b/scripts/video/android-attention-query-routing.patch
new file mode 100644
index 000000000..0d3bb3ca1
--- /dev/null
+++ b/scripts/video/android-attention-query-routing.patch
@@ -0,0 +1,63 @@
+--- a/src/core/ggml_runner.cpp
++++ b/src/core/ggml_runner.cpp
+@@ -210,6 +210,29 @@
+     if (sched == nullptr || gf == nullptr) {
+         return;
+     }
++#ifdef __ANDROID__
++    ggml_backend_t attention_backend = nullptr;
++    int attention_nodes_pinned = 0;
++    const int backend_count = ggml_backend_sched_get_n_backends(sched);
++    for (int index = 0; index < backend_count; ++index) {
++        auto candidate = ggml_backend_sched_get_backend(sched, index);
++        auto device = candidate ? ggml_backend_get_device(candidate) : nullptr;
++        const char* description = device ? ggml_backend_dev_description(device) : nullptr;
++        if (sd_backend_is(candidate, "Vulkan") && description &&
++            std::string(description).find("Adreno") != std::string::npos) {
++            attention_backend = candidate;
++            break;
++        }
++    }
++    auto is_query_chunk = [](const ggml_tensor* node) {
++        if (!node || node->op != GGML_OP_FLASH_ATTN_EXT || node->src[3] ||
++            node->op_params[3] != GGML_PREC_F32) return false;
++        auto query = node->src[0];
++        auto view = query && query->op == GGML_OP_CONT ? query->src[0] : nullptr;
++        return view && view->op == GGML_OP_VIEW && view->src[0] &&
++            query->ne[1] <= 128 && view->ne[1] < view->src[0]->ne[1];
++    };
++#endif
+     ggml_backend_t current = runtime_backend;
+     const int n_nodes      = ggml_graph_n_nodes(gf);
+     for (int i = 0; i < n_nodes; i++) {
+@@ -230,6 +253,20 @@
+             node->op == GGML_OP_PERMUTE || node->op == GGML_OP_TRANSPOSE) {
+             continue;
+         }
++#ifdef __ANDROID__
++        // Keep query copies and their joined attention output on the same GPU.
++        // Pinning these to HTP would copy each chunk across both devices.
++        if (attention_backend && (is_query_chunk(node) ||
++            (node->op == GGML_OP_CONCAT && is_query_chunk(node->src[1]))) &&
++            ggml_backend_supports_op(attention_backend, node)) {
++            ggml_backend_sched_set_tensor_backend(sched, node, attention_backend);
++            ++attention_nodes_pinned;
++            if (is_query_chunk(node) && ggml_backend_supports_op(attention_backend, node->src[0])) {
++                ggml_backend_sched_set_tensor_backend(sched, node->src[0], attention_backend);
++            }
++            continue;
++        }
++#endif
+         // In-place operations must follow the device chosen for their source.
+         // Its buffer may not exist yet when this graph is assigned.
+         if (node->view_src != nullptr) continue;
+@@ -239,6 +276,9 @@
+             ggml_backend_sched_set_tensor_backend(sched, node, current);
+         }
+     }
++#ifdef __ANDROID__
++    if (attention_backend) LOG_DEBUG("Adreno query-chunk GPU nodes pinned: %d", attention_nodes_pinned);
++#endif
+ }
+ 
+ size_t GGMLRunner::retained_runtime_buffer_bytes(ggml_backend_t backend) const {

From 4acdb1ba6d652765e63f65ae598125c39900eeac Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 21:00:56 +0530
Subject: [PATCH 077/129] chore(video): log native progress changes for device
 checks [skip ci]

---
 src/services/videoGenerator.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/services/videoGenerator.ts b/src/services/videoGenerator.ts
index cab498ea9..3794e26ca 100644
--- a/src/services/videoGenerator.ts
+++ b/src/services/videoGenerator.ts
@@ -23,6 +23,7 @@ export const videoGenerator = {
       throw new Error('This build does not include the video engine.');
     // Step zero marks the start of sampling, before the first step completes.
     let lastStep = -1;
+    let lastProgress = '';
     const listener = new NativeEventEmitter(native).addListener(
       'VideoGenerationProgress',
       event => {
@@ -46,6 +47,13 @@ export const videoGenerator = {
             return;
           lastStep = event.step;
         }
+        const progressKey = `${event.stage}:${event.step}:${event.total}`;
+        if (progressKey !== lastProgress) {
+          lastProgress = progressKey;
+          logger.log('[VideoProgress]', {
+            stage: event.stage, step: event.step, total: event.total,
+          });
+        }
         onUpdate({
           stage: event.stage,
           backend: event.backend ?? null,

From 879acf4893a47c75d063201802c83f5d86bfed0a Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 21:01:04 +0530
Subject: [PATCH 078/129] fix(android): bound Adreno video attention dispatches
 [skip ci]

Use FP32 shared-memory flash attention and an 8 GFLOP submission cap on Qualcomm Vulkan. Live chunked generation passed multiple Wan blocks without device loss. Full video output quality remains unverified.
---
 .../android-vulkan-attention-fallback.patch   | 87 +++++++++++++++----
 1 file changed, 69 insertions(+), 18 deletions(-)

diff --git a/scripts/video/android-vulkan-attention-fallback.patch b/scripts/video/android-vulkan-attention-fallback.patch
index 2e33177b5..5b6a0ea52 100644
--- a/scripts/video/android-vulkan-attention-fallback.patch
+++ b/scripts/video/android-vulkan-attention-fallback.patch
@@ -1,23 +1,74 @@
 --- a/src/ggml-vulkan/ggml-vulkan.cpp
 +++ b/src/ggml-vulkan/ggml-vulkan.cpp
-@@ -15447,6 +15447,20 @@
+@@ -1259,6 +1259,16 @@
+     const uint32_t D_lsb = D ^ (D & (D-1));  // extract lowest set bit
+ 
+     result.d_split = std::min(std::min(result.subgroup_size, 8u), D_lsb / 4);
++
++#ifdef __ANDROID__
++    if (device->vendor_id == VK_VENDOR_ID_QUALCOMM && f32acc &&
++        k_type == GGML_TYPE_F16 && v_type == GGML_TYPE_F16) {
++        // Use the existing shared-memory reduction path instead of the
++        // subgroup shuffle pipeline that loses the Adreno device in Wan.
++        result.disable_subgroups = true;
++        result.block_rows = std::min(result.block_rows, 8u);
++    }
++#endif
+ 
+     result.shmem_staging = (device->vendor_id == VK_VENDOR_ID_NVIDIA && hsk < 256 && hsv < 256) ? 1 : 0;
+ 
+@@ -1982,6 +1992,16 @@
              }
-         case GGML_OP_FLASH_ATTN_EXT:
-             {
+             name = aligned ? "flash_attn_f32_f16_aligned" : "flash_attn_f32_f16";
+         }
++#ifdef __ANDROID__
++        if (device->vendor_id == VK_VENDOR_ID_QUALCOMM && f32acc &&
++            fa.first.k_type == GGML_TYPE_F16 && fa.first.v_type == GGML_TYPE_F16) {
++            // Preserve FP32 accumulation and avoid the mobile FP16 arithmetic
++            // path. K/V storage stays F16; no extra attention matrix is stored.
++            spv_data = flash_attn_f32_f16_fp32_data;
++            spv_size = flash_attn_f32_f16_fp32_len;
++            name = "flash_attn_adreno_f32_shared";
++        }
++#endif
+         ggml_vk_create_pipeline(device, fa.second, name, spv_size, spv_data, "main", 8,
+                                 sizeof(vk_flash_attn_push_constants), {Br, 1, 1},
+                                 get_fa_spec_constants(fa.first), aligned ? Bc : 1, true,
+@@ -14226,6 +14246,13 @@
+     uint64_t batch_flops = 0;
+     uint64_t total_flops = 0;
+     uint64_t flops_cap = 200'000'000'000ULL;
++#ifdef __ANDROID__
++    // Keep query chunks in separate submissions on mobile Adreno. A full
++    // Wan attention dispatch exceeds 130 GFLOP and can hit the driver limit.
++    if (ctx->device->vendor_id == VK_VENDOR_ID_QUALCOMM) {
++        flops_cap = 8'000'000'000ULL;
++    }
++#endif
+ 
+     // On weaker AMD GPUs larger submissions can hit a driver timeout, submit more often to avoid this
+     if (ctx->device->vendor_id == VK_VENDOR_ID_AMD && ctx->device->shader_core_count > 0) {
+@@ -14236,6 +14263,11 @@
+         }
+     }
+     uint64_t flops_per_submit = std::min(flops_cap, ctx->last_total_flops / 40u);
++#ifdef __ANDROID__
++    if (ctx->device->vendor_id == VK_VENDOR_ID_QUALCOMM) {
++        flops_per_submit = flops_cap;
++    }
++#endif
+ 
+     auto const submit_after = [&](int start, int end) {
+         if (ctx->device->serialize_submissions) {
+@@ -14263,6 +14295,11 @@
+         batch_flops = 0;
+         if (submit_count < 3) {
+             flops_per_submit *= 2;
 +#ifdef __ANDROID__
-+                // Adreno loses the device in Wan's F32/F16 attention kernel.
-+                // Keep the fused operation, but let the scheduler use CPU.
-+                if (device->vendor_id == VK_VENDOR_ID_QUALCOMM &&
-+                    ggml_get_op_params_i32(op, 3) == GGML_PREC_F32 &&
-+                    op->src[1]->type == GGML_TYPE_F16 &&
-+                    op->src[2]->type == GGML_TYPE_F16) {
-+                    static std::atomic_flag reported = ATOMIC_FLAG_INIT;
-+                    if (!reported.test_and_set()) {
-+                        GGML_LOG_WARN("ggml_vulkan: routing Adreno F32/F16 flash attention to another backend after device loss\n");
-+                    }
-+                    return false;
-+                }
++            if (ctx->device->vendor_id == VK_VENDOR_ID_QUALCOMM) {
++                flops_per_submit = std::min(flops_cap, flops_per_submit);
++            }
 +#endif
-                 bool coopmat2 = device->coopmat2;
-                 uint32_t HSK = op->src[1]->ne[0];
-                 uint32_t HSV = op->src[2]->ne[0];
+         }
+         submit_count++;
+     };

From e572ae4515574aa8b8f2498fd5ba55349ff7ca5e Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 22:25:46 +0530
Subject: [PATCH 079/129] perf(video): share GPU query storage across attention
 chunks [skip ci]

---
 scripts/video/android-attention-query-chunks.patch  |  5 ++++-
 scripts/video/android-attention-query-routing.patch | 12 ++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/scripts/video/android-attention-query-chunks.patch b/scripts/video/android-attention-query-chunks.patch
index ad309d030..33c4af2b5 100644
--- a/scripts/video/android-attention-query-chunks.patch
+++ b/scripts/video/android-attention-query-chunks.patch
@@ -1,6 +1,6 @@
 --- a/src/core/ggml_extend.cpp
 +++ b/src/core/ggml_extend.cpp
-@@ -721,6 +721,43 @@
+@@ -721,6 +721,46 @@
              mask_in = ggml_cast(ctx, mask_in, GGML_TYPE_F16);
          }
  
@@ -22,6 +22,9 @@
 +            }
 +        }
 +        if (mask_in == nullptr && adreno_attention && q_in->ne[1] > 128) {
++            // One owned full-Q buffer lets all query views stay on the GPU.
++            // RoPE may otherwise leave Q aliased to an in-place HTP result.
++            q_in = ggml_cont(ctx, q_in);
 +            const int64_t work_per_query = 2 * k_in->ne[1] *
 +                (q_in->ne[0] + v_in->ne[0]) * q_in->ne[2] * q_in->ne[3];
 +            const int64_t chunk_rows = std::max<int64_t>(8, std::min<int64_t>(128,
diff --git a/scripts/video/android-attention-query-routing.patch b/scripts/video/android-attention-query-routing.patch
index 0d3bb3ca1..5e6ddb3e5 100644
--- a/scripts/video/android-attention-query-routing.patch
+++ b/scripts/video/android-attention-query-routing.patch
@@ -30,7 +30,7 @@
      ggml_backend_t current = runtime_backend;
      const int n_nodes      = ggml_graph_n_nodes(gf);
      for (int i = 0; i < n_nodes; i++) {
-@@ -230,6 +253,20 @@
+@@ -230,6 +253,28 @@
              node->op == GGML_OP_PERMUTE || node->op == GGML_OP_TRANSPOSE) {
              continue;
          }
@@ -44,6 +44,14 @@
 +            ++attention_nodes_pinned;
 +            if (is_query_chunk(node) && ggml_backend_supports_op(attention_backend, node->src[0])) {
 +                ggml_backend_sched_set_tensor_backend(sched, node->src[0], attention_backend);
++                // Query views share this full-Q contiguous producer. Keep it
++                // on GPU too, so the scheduler does not recopy it for each view.
++                auto query_view = node->src[0]->src[0];
++                auto query_storage = query_view ? query_view->view_src : nullptr;
++                if (query_storage && query_storage->op == GGML_OP_CONT &&
++                    ggml_backend_supports_op(attention_backend, query_storage)) {
++                    ggml_backend_sched_set_tensor_backend(sched, query_storage, attention_backend);
++                }
 +            }
 +            continue;
 +        }
@@ -51,7 +59,7 @@
          // In-place operations must follow the device chosen for their source.
          // Its buffer may not exist yet when this graph is assigned.
          if (node->view_src != nullptr) continue;
-@@ -239,6 +276,9 @@
+@@ -239,6 +284,9 @@
              ggml_backend_sched_set_tensor_backend(sched, node, current);
          }
      }

From 885abdb1bb38e40fba12d1d660cddf2626bdcd86 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 22:58:47 +0530
Subject: [PATCH 080/129] fix(android): keep video generation screen awake
 [skip ci]

Apply the window screen-on flag only while video generation is active in a resumed activity. Release the owned flag on pause, completion, failure and module invalidation. Preserve a flag that was already set. Kotlin compilation passed; not installed over the active device run.
---
 .../video/VideoGenerationModule.kt            | 39 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
index 40ec8464b..56319f1a0 100644
--- a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
+++ b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
@@ -1,8 +1,11 @@
 package ai.offgridmobile.video
 
 import android.content.Intent
+import android.view.Window
+import android.view.WindowManager
 import androidx.core.content.ContextCompat
 import com.facebook.react.bridge.*
+import com.facebook.react.common.LifecycleState
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import java.io.File
 import java.util.concurrent.Executors
@@ -10,13 +13,39 @@ import java.util.concurrent.CompletableFuture
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicBoolean
 
-class VideoGenerationModule(private val context: ReactApplicationContext) : ReactContextBaseJavaModule(context) {
+class VideoGenerationModule(private val context: ReactApplicationContext) : ReactContextBaseJavaModule(context), LifecycleEventListener {
     companion object { init { System.loadLibrary("offgrid_video") } }
     private val executor = Executors.newSingleThreadExecutor()
     private val busy = AtomicBoolean(false)
     private val cancelled = AtomicBoolean(false)
+    private val videoScreenActive = AtomicBoolean(false)
+    private var awakeWindow: Window? = null
+    private var addedScreenFlag = false
     private var encoder: VideoEncoder? = null
     private var previewFile: File? = null
+    init { context.addLifecycleEventListener(this) }
+    private fun releaseScreenFlag() {
+        if (addedScreenFlag) awakeWindow?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        awakeWindow = null
+        addedScreenFlag = false
+    }
+    private fun updateScreenFlag() {
+        val window = if (videoScreenActive.get() && context.lifecycleState == LifecycleState.RESUMED) context.currentActivity?.window else null
+        if (window === awakeWindow) return
+        releaseScreenFlag()
+        if (window != null) {
+            awakeWindow = window
+            addedScreenFlag = window.attributes.flags and WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON == 0
+            if (addedScreenFlag) window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        }
+    }
+    private fun keepVideoScreenAwake(active: Boolean) {
+        videoScreenActive.set(active)
+        UiThreadUtil.runOnUiThread { updateScreenFlag() }
+    }
+    override fun onHostResume() { updateScreenFlag() }
+    override fun onHostPause() { releaseScreenFlag() }
+    override fun onHostDestroy() { releaseScreenFlag() }
     override fun getName() = "VideoGenerationModule"
     private external fun nativeGenerate(weight: String, vae: String, encoder: String, prompt: String, negative: String, width: Int, height: Int, frames: Int, fps: Int, steps: Int, guidance: Double, seed: Double, llm: String, embeddings: String, audioVae: String, flowShift: Double)
     private external fun nativeCancel()
@@ -81,6 +110,7 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
         executor.execute {
             var output: File? = null
             try {
+                keepVideoScreenAwake(true)
                 prepareHexagonRuntime()
                 val destination = File(checkNotNull(input.getString("outputPath")))
                 output = destination
@@ -107,6 +137,7 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
             } catch (error: Throwable) {
                 output?.delete(); promise.reject(if (cancelled.get()) "VIDEO_CANCELLED" else "VIDEO_FAILED", error.message, error)
             } finally {
+                keepVideoScreenAwake(false)
                 encoder = null; previewFile = null; VideoGenerationService.cancel = null
                 context.stopService(Intent(context, VideoGenerationService::class.java)); busy.set(false)
             }
@@ -167,5 +198,9 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
             finally { VideoGenerationService.cancel = null; context.stopService(Intent(context, VideoGenerationService::class.java)); busy.set(false) }
         }
     }
-    override fun invalidate() { stop(); executor.shutdown(); super.invalidate() }
+    override fun invalidate() {
+        keepVideoScreenAwake(false)
+        context.removeLifecycleEventListener(this)
+        stop(); executor.shutdown(); super.invalidate()
+    }
 }

From 0cd8fbb72738fc51f260e7259325dee91767a838 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 23:31:05 +0530
Subject: [PATCH 081/129] fix(video): exclude model cache from iOS backups
 [skip ci]

---
 pro                                                          | 2 +-
 src/services/modelDownloadService/providers/videoProvider.ts | 1 +
 src/services/modelManager/index.ts                           | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pro b/pro
index c76d0eccb..b592a6cbd 160000
--- a/pro
+++ b/pro
@@ -1 +1 @@
-Subproject commit c76d0eccb4eb67186e2705185eb1c81a363d7d4a
+Subproject commit b592a6cbd8dfcf280716017a539da7aa778bddb4
diff --git a/src/services/modelDownloadService/providers/videoProvider.ts b/src/services/modelDownloadService/providers/videoProvider.ts
index aac085816..12e1434f1 100644
--- a/src/services/modelDownloadService/providers/videoProvider.ts
+++ b/src/services/modelDownloadService/providers/videoProvider.ts
@@ -71,6 +71,7 @@ async function start(model: ModelEntry): Promise<void> {
   );
   try {
     await RNFS.mkdir(directory);
+    await backgroundDownloadService.excludeFromBackup(directory);
     for (const file of model.files) {
       if (transfer.paused)
         await new Promise<void>(resolve => {
diff --git a/src/services/modelManager/index.ts b/src/services/modelManager/index.ts
index a0683b6f8..895e9f31a 100644
--- a/src/services/modelManager/index.ts
+++ b/src/services/modelManager/index.ts
@@ -1,3 +1,4 @@
+import { videoModelsDirectory } from '../videoModelFiles';
 import RNFS from 'react-native-fs';
 import logger from '../../utils/logger';
 import { getMmProjFileSize } from '../../utils/modelHelpers';
@@ -67,6 +68,7 @@ class ModelManager {
     if (!(await RNFS.exists(this.imageModelsDir))) await RNFS.mkdir(this.imageModelsDir);
     const exclude = (p: string) => backgroundDownloadService.excludeFromBackup(p);
     await Promise.all([exclude(this.modelsDir), exclude(this.imageModelsDir),
+      exclude(videoModelsDirectory()),
       exclude(`${RNFS.DocumentDirectoryPath}/${APP_CONFIG.whisperStorageDir}`)]);
   }
 

From 54750d6103b297facb94b1b144b86c6aca3cec1b Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 23:31:05 +0530
Subject: [PATCH 082/129] docs(video): refresh mobile integration audit and
 limits [skip ci]

---
 docs/VIDEO_GENERATION.md | 45 ++++++++++++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/docs/VIDEO_GENERATION.md b/docs/VIDEO_GENERATION.md
index 21166da44..32fef9bfe 100644
--- a/docs/VIDEO_GENERATION.md
+++ b/docs/VIDEO_GENERATION.md
@@ -3,10 +3,11 @@
 ## Current engine
 
 Local generation uses stable-diffusion.cpp at the revision in
-`scripts/video/revision`. The first supported architecture is Wan 2.1 T2V 1.3B.
-A complete pack has the diffusion weight, Wan VAE, and UMT5 text encoder. Models
-uses the shared Hugging Face search and pack resolver. LTX and Hunyuan catalog
-entries state that this build does not support them.
+`scripts/video/revision`. Models uses the shared Hugging Face search, catalog,
+and architecture-specific pack resolver. The catalog currently includes Wan 2.1,
+Wan 2.2, LTX-2.3, LTX-2.5, and HunyuanVideo 1.5. Each pack must include every
+required weight, encoder, VAE, and connector file. Catalog availability is not
+proof that a model fits or has completed generation on a particular phone.
 
 Video request validation and settings keys live in `@offgrid/models`. Mobile's
 video generation service owns local and OGAD jobs, progress, cancellation,
@@ -20,13 +21,13 @@ CocoaPods builds the pinned iOS framework during `pod install`. Gradle prepares
 
 ```sh
 bash scripts/prepare-video-runtime.sh
-bash scripts/build-video-ios.sh
+OFFGRID_IOS_DEVICE_ONLY=1 bash scripts/build-video-ios.sh
 (cd ios && pod install)
 ```
 
-The iOS framework includes arm64 device and arm64 simulator slices. Use an Apple
-Silicon simulator. Building requires an Xcode SDK with the iOS 26 background task
-APIs. Deployment remains iOS 17; older iOS versions run video in the foreground.
+The command above builds the physical arm64 iPhone framework only. Pass
+`OFFGRID_IOS_DEVICE_ONLY=1` to the physical Xcode build as well. Building requires
+an Xcode SDK with the iOS 26 background task APIs. Deployment remains iOS 17.
 
 For Android, install CMake, Make, Python 3, and the project's Android SDK/NDK:
 
@@ -59,6 +60,28 @@ a second job. Settings and model selection can change while a saved request
 retains its resolved generation parameters.
 
 Only OGAD remote video servers are supported. REST and MCP share OGAD's video
-job owner. Model transfer sends and checks all three pack files before
-registration. Tests have not been added or run for this implementation; manual
-verification comes first.
+job owner. Model transfer sends and checks every file in the selected pack
+before registration. Cancel and retry use the shared package transaction and
+rollback. Local download resume preserves complete files; an incomplete file can
+restart after process death.
+
+## Integration audit (2026-09-29)
+
+- Storage reads actual sizes for all installed video pack files, including old
+  records whose catalog size is missing. Download completion stores actual sizes.
+- Auto Configure includes video only when the native runtime, complete catalog
+  pack, RAM minimum, and existing memory budget allow it. Models below these
+  limits remain manually selectable; automatic setup does not use Run Anyway.
+- iOS excludes downloaded/transferred video model folders from device backups,
+  as it does for text and image models. SD image packs use `image_models` and its
+  existing exclusion. Android disables app backup in its manifest. Generated
+  videos and user content are not excluded by this model-cache policy.
+- Remote video requires OGAD. Local and remote labels use the shared catalog,
+  while model IDs and per-model settings keys remain unchanged.
+- Native progress changes and background admission details enter the app debug
+  log. A heartbeat alone is not proof that a sampling step advanced.
+
+Source checks cover these integrations. Device checks for the latest backup
+exclusion and Auto Configure changes remain pending. Complete video quality and
+all-model coverage are not established by successful builds or partial sampling.
+No automated tests were added or run for this audit.

From 3cc57c9055e23f2e0b3c88d61621b44bc4bc831a Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 23:31:58 +0530
Subject: [PATCH 083/129] fix(image): keep cancellation from starting
 overlapping SD work [skip ci]

---
 src/services/imageGenerationService.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/services/imageGenerationService.ts b/src/services/imageGenerationService.ts
index c014d98ec..07e291b6d 100644
--- a/src/services/imageGenerationService.ts
+++ b/src/services/imageGenerationService.ts
@@ -301,7 +301,7 @@ class ImageGenerationService {
       });
     } catch (error: any) {
       const errorMsg = error?.message || 'Image generation failed';
-      if (errorMsg.includes('cancelled')) {
+      if (this.cancelRequested || errorMsg.includes('cancelled')) {
         this.resetState();
       } else {
         logger.error('[ImageGenerationService] Generation error:', error);
@@ -331,7 +331,9 @@ class ImageGenerationService {
     params: GenerateImageParams,
     opts?: { override?: boolean },
   ): Promise<GeneratedImage | null> {
-    if (isInFlight(this.state.phase)) {
+    // Native cancellation can finish after the UI has cleared its progress.
+    // Keep admission closed until the engine's generation promise settles.
+    if (isInFlight(this.state.phase) || onnxImageGeneratorService.isGenerating()) {
       logger.log(
         '[ImageGenerationService] Already generating, ignoring request',
       );

From 3b08e42b9e7c3b01f99b3fb54ccc40c05725a7d2 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Tue, 29 Sep 2026 23:38:00 +0530
Subject: [PATCH 084/129] fix(litert): report requested accelerator and
 fallback [skip ci]

Preserve the requested NPU backend in load diagnostics and report the release gate before GPU/CPU fallback. Keep the existing native capability and release policy unchanged. Source TypeScript check passed; active device video runs were not changed.
---
 src/services/litert.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/services/litert.ts b/src/services/litert.ts
index 4bb6a21ec..d7478e566 100644
--- a/src/services/litert.ts
+++ b/src/services/litert.ts
@@ -100,9 +100,13 @@ class LiteRTService {
 
   async loadModel(modelPath: string, preferredBackend: LiteRTBackend, opts: { supportsVision?: boolean; supportsAudio?: boolean; maxNumTokens?: number } = {}): Promise<void> {
     if (!this.isAvailable()) throw new Error('LiteRT is not available on this platform');
+    const requestedBackend = preferredBackend;
     // NPU was exposed in a test build, but is not part of this release.
     // Keep saved selections usable without attempting an unsupported native load.
-    if (preferredBackend === 'npu') preferredBackend = 'gpu';
+    if (preferredBackend === 'npu') {
+      logger.warn(TAG, 'LiteRT NPU is disabled in this release; trying GPU, then CPU.');
+      preferredBackend = 'gpu';
+    }
     const { supportsVision = false, supportsAudio = false, maxNumTokens = 4096 } = opts;
     this.configuredMaxTokens = maxNumTokens;
     logger.log(TAG, `loadModel — path=${modelPath} backend=${preferredBackend} supportsVision=${supportsVision} supportsAudio=${supportsAudio} maxNumTokens=${maxNumTokens}`);
@@ -114,7 +118,7 @@ class LiteRTService {
       // older native build (backward-compatible).
       const res: string | { backend: string; maxNumTokens?: number } =
         await LiteRTModule.loadModel(modelPath, preferredBackend, supportsVision, supportsAudio, maxNumTokens);
-      logger.log(`[WIRE-LITERT-LOAD] ${JSON.stringify({ requested: preferredBackend, supportsVision, supportsAudio, maxNumTokens, res })}`); // [WIRE]
+      logger.log(`[WIRE-LITERT-LOAD] ${JSON.stringify({ requested: requestedBackend, attempted: preferredBackend, supportsVision, supportsAudio, maxNumTokens, res })}`); // [WIRE]
       const actualBackend = typeof res === 'string' ? res : res.backend;
       if (typeof res === 'object' && typeof res.maxNumTokens === 'number' && res.maxNumTokens > 0) {
         if (res.maxNumTokens !== this.configuredMaxTokens) {

From 3b75e3632548a68dd64db6b6243d95a71e4054f0 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 00:16:46 +0530
Subject: [PATCH 085/129] fix(image): use model-aware resolution controls [skip
 ci]

---
 .../ImageQualitySliders.tsx                   | 18 +++++++------
 src/hooks/useImageGenerationSettings.ts       | 22 ++++++++++++++-
 .../ImageGenerationSection.tsx                | 20 +++++++-------
 src/services/imageParameterPolicy.ts          | 27 ++++++++++++++++---
 4 files changed, 64 insertions(+), 23 deletions(-)

diff --git a/src/components/GenerationSettingsModal/ImageQualitySliders.tsx b/src/components/GenerationSettingsModal/ImageQualitySliders.tsx
index f0c6607e9..fa252900b 100644
--- a/src/components/GenerationSettingsModal/ImageQualitySliders.tsx
+++ b/src/components/GenerationSettingsModal/ImageQualitySliders.tsx
@@ -1,12 +1,11 @@
 import React from 'react';
 import { View, Text, Switch, Platform, TouchableOpacity } from 'react-native';
+import { Button } from '../Button';
 import { SliderSetting } from '../SliderSetting';
 import { useTheme, useThemedStyles } from '../../theme';
 import { useAppStore } from '../../stores';
-import { DEFAULT_SETTINGS } from '../../stores/appStore';
-import { useClearGpuCache } from '../../hooks/useImageGenerationSettings';
+import { useClearGpuCache, useImageParameterSettings } from '../../hooks/useImageGenerationSettings';
 import {
-  defaultImageSteps,
   MAX_IMAGE_STEPS,
   SWEET_SPOT_SIZE,
 } from '../../utils/imageGenAdvice';
@@ -32,6 +31,7 @@ const ClearGPUCacheButton: React.FC = () => {
 
 /** Basic controls: Image Steps + Image Size */
 export const ImageQualityBasicSliders: React.FC = () => {
+  const { parameters, defaults, maxSize, applyDefaults } = useImageParameterSettings();
   const { settings, updateSettings } = useAppStore();
 
   return (
@@ -41,7 +41,7 @@ export const ImageQualityBasicSliders: React.FC = () => {
         compact
         label="Image Steps"
         description="4-8 steps for speed, 20-50 for quality"
-        value={settings.imageSteps || defaultImageSteps(Platform.OS)}
+        value={parameters.steps}
         min={4} max={MAX_IMAGE_STEPS} step={1}
         onChange={(value) => updateSettings({ imageSteps: value })}
       />
@@ -50,18 +50,20 @@ export const ImageQualityBasicSliders: React.FC = () => {
         testID="image-size"
         compact
         label="Image Size"
-        description="Output resolution. Default: 512x512."
-        value={Math.max(SWEET_SPOT_SIZE, settings.imageWidth ?? DEFAULT_SETTINGS.imageWidth)}
-        min={SWEET_SPOT_SIZE} max={512} step={64}
+        description={`Output resolution. Recommended: ${defaults.size}x${defaults.size}.`}
+        value={parameters.size}
+        min={SWEET_SPOT_SIZE} max={maxSize} step={64}
         formatValue={(v) => `${v}x${v}`}
         onChange={(value) => updateSettings({ imageWidth: value, imageHeight: value })}
       />
+      <Button title="Use model defaults" variant="secondary" size="small" onPress={applyDefaults} testID="image-model-defaults" />
     </>
   );
 };
 
 /** Advanced controls: Guidance Scale, Image Threads, GPU Acceleration */
 export const ImageQualityAdvancedSliders: React.FC = () => {
+  const { parameters } = useImageParameterSettings();
   const { colors } = useTheme();
   const styles = useThemedStyles(createStyles);
   const { settings, updateSettings } = useAppStore();
@@ -73,7 +75,7 @@ export const ImageQualityAdvancedSliders: React.FC = () => {
         compact
         label="Guidance Scale"
         description="Higher = follows prompt more strictly (5-15 range)"
-        value={settings.imageGuidanceScale || 7.5}
+        value={parameters.guidanceScale}
         min={1} max={20} step={0.5} decimals={1}
         onChange={(value) => updateSettings({ imageGuidanceScale: value })}
       />
diff --git a/src/hooks/useImageGenerationSettings.ts b/src/hooks/useImageGenerationSettings.ts
index 3ef3b3684..7c8671a5a 100644
--- a/src/hooks/useImageGenerationSettings.ts
+++ b/src/hooks/useImageGenerationSettings.ts
@@ -1,6 +1,7 @@
 import { useState, useCallback } from 'react';
-import { Alert } from 'react-native';
+import { Alert, Platform } from 'react-native';
 import { useAppStore } from '../stores';
+import { mobileImageParameterDefaults, mobileImageSizeLimit, resolveMobileImageParameters } from '../services/imageParameterPolicy';
 import { localDreamGeneratorService } from '../services/localDreamGenerator';
 
 export function useClearGpuCache() {
@@ -26,3 +27,22 @@ export function useClearGpuCache() {
 
   return { clearing, handleClearCache };
 }
+
+/** Both settings surfaces display the same values that generation will use. */
+export function useImageParameterSettings() {
+  const { settings, updateSettings, activeImageModelId, downloadedImageModels } = useAppStore();
+  const model = downloadedImageModels.find(item => item.id === activeImageModelId) ?? { id: 'legacy-image' };
+  const defaults = mobileImageParameterDefaults(model, Platform.OS);
+  const parameters = resolveMobileImageParameters(model, settings);
+  return {
+    parameters,
+    defaults,
+    maxSize: mobileImageSizeLimit(model),
+    applyDefaults: () => updateSettings({
+      imageSteps: defaults.steps,
+      imageGuidanceScale: defaults.guidanceScale,
+      imageWidth: defaults.size,
+      imageHeight: defaults.size,
+    }),
+  };
+}
diff --git a/src/screens/ModelSettingsScreen/ImageGenerationSection.tsx b/src/screens/ModelSettingsScreen/ImageGenerationSection.tsx
index 6b778d431..964f30d2f 100644
--- a/src/screens/ModelSettingsScreen/ImageGenerationSection.tsx
+++ b/src/screens/ModelSettingsScreen/ImageGenerationSection.tsx
@@ -5,10 +5,8 @@ import { SliderSetting } from '../../components/SliderSetting';
 import { Button } from '../../components/Button';
 import { useTheme, useThemedStyles } from '../../theme';
 import { useAppStore } from '../../stores';
-import { DEFAULT_SETTINGS } from '../../stores/appStore';
-import { useClearGpuCache } from '../../hooks/useImageGenerationSettings';
+import { useClearGpuCache, useImageParameterSettings } from '../../hooks/useImageGenerationSettings';
 import {
-  defaultImageSteps,
   MAX_IMAGE_STEPS,
   SWEET_SPOT_SIZE,
 } from '../../utils/imageGenAdvice';
@@ -129,6 +127,7 @@ const DetectionMethodRow: React.FC = () => {
 // ─── Advanced Section ────────────────────────────────────────────────────────
 
 const ImageAdvancedSection: React.FC = () => {
+  const { parameters } = useImageParameterSettings();
   const { settings, updateSettings } = useAppStore();
 
   return (
@@ -137,7 +136,7 @@ const ImageAdvancedSection: React.FC = () => {
         testID="image-guidance-scale"
         label="Guidance Scale"
         description="Higher = follows prompt more strictly"
-        value={settings?.imageGuidanceScale || 7.5}
+        value={parameters.guidanceScale}
         min={1} max={20} step={0.5} decimals={1}
         onChange={(value) => updateSettings({ imageGuidanceScale: value })}
       />
@@ -162,6 +161,7 @@ const ImageAdvancedSection: React.FC = () => {
 // ─── Main Section ────────────────────────────────────────────────────────────
 
 export const ImageGenerationSection: React.FC = () => {
+  const { parameters, defaults, maxSize, applyDefaults } = useImageParameterSettings();
   const { colors } = useTheme();
   const styles = useThemedStyles(createStyles);
   const { settings, updateSettings } = useAppStore();
@@ -206,7 +206,7 @@ export const ImageGenerationSection: React.FC = () => {
         testID="image-steps"
         label="Image Steps"
         description="More steps = better quality but slower (4-8 fast, 20-50 high quality)"
-        value={settings?.imageSteps || defaultImageSteps(Platform.OS)}
+        value={parameters.steps}
         min={4} max={MAX_IMAGE_STEPS} step={1}
         onChange={(value) => updateSettings({ imageSteps: value })}
       />
@@ -214,15 +214,13 @@ export const ImageGenerationSection: React.FC = () => {
       <SliderSetting
         testID="image-size"
         label="Image Size"
-        description="Output resolution. Default: 512x512."
-        // Single source of truth for the floor: SD-class models render garbage below the
-        // sweet spot (256), so both this screen and the chat modal (ImageQualitySliders) share
-        // the SAME min/fallback — the surfaces can't diverge and a sub-256 value is unreachable.
-        value={Math.max(SWEET_SPOT_SIZE, settings?.imageWidth ?? DEFAULT_SETTINGS.imageWidth)}
-        min={SWEET_SPOT_SIZE} max={512} step={64}
+        description={`Output resolution. Recommended: ${defaults.size}x${defaults.size}.`}
+        value={parameters.size}
+        min={SWEET_SPOT_SIZE} max={maxSize} step={64}
         formatValue={(v) => `${v}x${v}`}
         onChange={(value) => updateSettings({ imageWidth: value, imageHeight: value })}
       />
+      <Button title="Use model defaults" variant="secondary" size="small" onPress={applyDefaults} testID="image-model-defaults" />
 
       <AdvancedToggle isExpanded={showAdvanced} onPress={() => setShowAdvanced(!showAdvanced)} testID="image-advanced-toggle" />
 
diff --git a/src/services/imageParameterPolicy.ts b/src/services/imageParameterPolicy.ts
index 9b770e938..26794ac3c 100644
--- a/src/services/imageParameterPolicy.ts
+++ b/src/services/imageParameterPolicy.ts
@@ -1,9 +1,24 @@
+import { Platform } from 'react-native';
 import {
   effectiveImageParameter,
   resolveImageParameters,
   type ImageParameterStore,
 } from '@offgrid/models';
-import { SWEET_SPOT_SIZE } from '../utils/imageGenAdvice';
+import { defaultImageSteps, SWEET_SPOT_SIZE } from '../utils/imageGenAdvice';
+
+type ImageParameterModel = { id: string; name?: string; backend?: string };
+
+/** Native legacy packs keep their fixed size limit; SD uses the shared model policy. */
+export function mobileImageParameterDefaults(model: ImageParameterModel, platform: string) {
+  const defaults = resolveImageParameters(model, undefined);
+  return model.backend === 'sd'
+    ? { steps: defaults.steps, guidanceScale: defaults.cfgScale, size: defaults.size }
+    : { steps: defaultImageSteps(platform), guidanceScale: 7.5, size: 512 };
+}
+
+export function mobileImageSizeLimit(model: ImageParameterModel): number {
+  return model.backend === 'sd' ? resolveImageParameters(model, undefined).size : 512;
+}
 
 export interface MobileImageParameterSettings {
   imageSteps?: number | null;
@@ -23,7 +38,7 @@ const positiveFinite = (value: number | null | undefined): number | undefined =>
 
 /** Adapt Mobile's current settings shape into the shared model-specific policy. */
 export function resolveMobileImageParameters(
-  model: { id: string; name?: string },
+  model: ImageParameterModel,
   settings: MobileImageParameterSettings,
   request: MobileImageParameterRequest = {},
 ): { steps: number; guidanceScale: number; size: number } {
@@ -35,6 +50,12 @@ export function resolveMobileImageParameters(
     },
   };
   const resolved = resolveImageParameters(model, store);
+  if (model.backend !== 'sd') {
+    const defaults = mobileImageParameterDefaults(model, Platform.OS);
+    resolved.steps = positiveFinite(settings.imageSteps) ?? defaults.steps;
+    resolved.cfgScale = positiveFinite(settings.imageGuidanceScale) ?? defaults.guidanceScale;
+    resolved.size = positiveFinite(settings.imageWidth) ?? defaults.size;
+  }
   return {
     steps: effectiveImageParameter(
       positiveFinite(request.steps),
@@ -44,6 +65,6 @@ export function resolveMobileImageParameters(
       positiveFinite(request.guidanceScale),
       resolved.cfgScale,
     ),
-    size: Math.max(SWEET_SPOT_SIZE, resolved.size),
+    size: Math.min(mobileImageSizeLimit(model), Math.max(SWEET_SPOT_SIZE, resolved.size)),
   };
 }

From 2c3a96594d4d16520451bdf175d49699a9949c8e Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 00:55:28 +0530
Subject: [PATCH 086/129] fix(ios): bound Wan decode graphs and report chunk
 progress [skip ci]

---
 native/video/VideoGenerationModule.mm     |  12 ++
 native/video/common/VideoRuntime.hpp      |   7 ++
 scripts/video/video-decode-observer.patch | 144 +++++++++++++++-------
 3 files changed, 118 insertions(+), 45 deletions(-)

diff --git a/native/video/VideoGenerationModule.mm b/native/video/VideoGenerationModule.mm
index eef40e38f..c1dfb81f1 100644
--- a/native/video/VideoGenerationModule.mm
+++ b/native/video/VideoGenerationModule.mm
@@ -4,6 +4,8 @@
 #import <BackgroundTasks/BackgroundTasks.h>
 #import "VideoEncoder.h"
 #include "common/VideoRuntime.hpp"
+#include <cstdio>
+#include <cstring>
 
 static BOOL OGSaveRgbPng(const sd_image_t &image, NSString *output) {
   if (!image.data || image.channel != 3) return NO;
@@ -119,6 +121,15 @@ - (void)emitStage:(NSString *)stage step:(int)step total:(int)total {
       @autoreleasepool {
         NSString *output = input[@"outputPath"];
         NSError *failure = nil;
+        // Keep targeted runtime diagnostics in the same persistent lifecycle log.
+        sd_set_log_callback([](enum sd_log_level_t, const char *text, void *data) {
+          if (!text) return;
+          std::fputs(text, stderr);
+          if (!std::strstr(text, "Wan VAE decode backend=")) return;
+          VideoGenerationModule *owner = (__bridge VideoGenerationModule *)data;
+          NSString *detail = [NSString stringWithUTF8String:text];
+          dispatch_async(dispatch_get_main_queue(), ^{ [owner logLifecycle:detail]; });
+        }, (__bridge void *)self);
         try {
           offgrid::VideoRequest request{
             [input[@"weight"] UTF8String], [input[@"vae"] UTF8String], [(input[@"encoder"] ?: @"") UTF8String],
@@ -159,6 +170,7 @@ - (void)emitStage:(NSString *)stage step:(int)step total:(int)total {
           failure = [NSError errorWithDomain:@"OffgridVideo" code:1 userInfo:@{NSLocalizedDescriptionKey:@(error.what())}];
           [[NSFileManager defaultManager] removeItemAtPath:output error:nil];
         }
+        sd_set_log_callback(nullptr, nullptr);
         dispatch_async(dispatch_get_main_queue(), ^{
           self->_busy = NO;
           [self restoreScreenIdleTimer];
diff --git a/native/video/common/VideoRuntime.hpp b/native/video/common/VideoRuntime.hpp
index 2fd83c083..174a9d7a0 100644
--- a/native/video/common/VideoRuntime.hpp
+++ b/native/video/common/VideoRuntime.hpp
@@ -249,6 +249,13 @@ class VideoRuntime {
       params.vae_tiling_params.extra_tiling_args = "temporal_tile_frames=1";
       conditioning(preferred.empty() ? "cpu" : "npu");
 #else
+      // Wan's stateful decoder retains causal feature caches between temporal
+      // chunks. Bound the graph without dropping frames or changing resolution.
+      const std::string vaeName = request.vae.substr(request.vae.find_last_of("/\\") + 1);
+      if (vaeName == "wan_2.1_vae.safetensors" || vaeName == "wan2.2_vae.safetensors") {
+        params.vae_tiling_params.temporal_tiling = true;
+        params.vae_tiling_params.extra_tiling_args = "temporal_tile_frames=1";
+      }
       conditioning("");
 #endif
       if (!generate_video(loaded, &params, &frames, &count, nullptr, &fps) || !frames || count == 0)
diff --git a/scripts/video/video-decode-observer.patch b/scripts/video/video-decode-observer.patch
index 246f0a9cd..00b9a7a00 100644
--- a/scripts/video/video-decode-observer.patch
+++ b/scripts/video/video-decode-observer.patch
@@ -1,6 +1,8 @@
+diff --git a/include/stable-diffusion.h b/include/stable-diffusion.h
+index 8e5577d..8713281 100644
 --- a/include/stable-diffusion.h
 +++ b/include/stable-diffusion.h
-@@ -461,10 +461,16 @@
+@@ -461,10 +461,16 @@ struct ggml_tensor;
  typedef void (*sd_log_cb_t)(enum sd_log_level_t level, const char* text, void* data);
  typedef void (*sd_progress_cb_t)(int step, int steps, float time, void* data);
  typedef void (*sd_preview_cb_t)(int step, int frame_count, sd_image_t* frames, bool is_noisy, void* data);
@@ -17,30 +19,11 @@
  // In each sampling pass, a positive interval previews every Nth denoiser step, while a
  // negative interval previews only completed logical step -interval. Zero previews the final
  // completed step of the first sampling pass (base-resolution or high-noise).
---- a/src/core/util.h
-+++ b/src/core/util.h
-@@ -98,6 +98,18 @@
- std::vector<std::pair<std::string, float>> split_quotation_attention(
-     const std::vector<std::pair<std::string, float>>& parsed_attention);
- 
-+class SDVideoDecodeScope {
-+public:
-+    SDVideoDecodeScope();
-+    ~SDVideoDecodeScope();
-+    SDVideoDecodeScope(const SDVideoDecodeScope&) = delete;
-+    SDVideoDecodeScope& operator=(const SDVideoDecodeScope&) = delete;
-+private:
-+    bool previous;
-+};
-+void sd_video_decode_progress(int completed, int total);
-+void sd_video_decoded_frame(const sd_image_t* frame);
-+
- sd_progress_cb_t sd_get_progress_callback();
- void* sd_get_progress_callback_data();
- 
+diff --git a/src/core/util.cpp b/src/core/util.cpp
+index b90f70e..0fc1aed 100644
 --- a/src/core/util.cpp
 +++ b/src/core/util.cpp
-@@ -357,6 +357,30 @@
+@@ -357,6 +357,46 @@ int32_t sd_get_num_physical_cores() {
      return n_threads > 0 ? (n_threads <= 4 ? n_threads : n_threads / 2) : 4;
  }
  
@@ -48,6 +31,9 @@
 +static sd_video_decoded_frame_cb_t sd_decoded_frame_cb = nullptr;
 +static void* sd_decode_cb_data = nullptr;
 +static thread_local bool sd_video_decode_active = false;
++static thread_local int sd_decode_spatial_completed = 0;
++static thread_local int sd_decode_spatial_total = 0;
++static thread_local int sd_decode_temporal_total = 1;
 +
 +SDVideoDecodeScope::SDVideoDecodeScope() : previous(sd_video_decode_active) {
 +    sd_video_decode_active = true;
@@ -55,8 +41,21 @@
 +}
 +SDVideoDecodeScope::~SDVideoDecodeScope() { sd_video_decode_active = previous; }
 +void sd_video_decode_progress(int completed, int total) {
-+    if (sd_video_decode_active && sd_decode_progress_cb)
-+        sd_decode_progress_cb(completed, total, sd_decode_cb_data);
++    if (!sd_video_decode_active) return;
++    // A fresh spatial pass also resets the multiplier on an allocation retry.
++    if (completed == 0) sd_decode_temporal_total = 1;
++    sd_decode_spatial_completed = completed;
++    sd_decode_spatial_total = total;
++    if (sd_decode_progress_cb)
++        sd_decode_progress_cb(completed * sd_decode_temporal_total,
++                              total * sd_decode_temporal_total, sd_decode_cb_data);
++}
++void sd_video_decode_temporal_progress(int completed, int total) {
++    if (!sd_video_decode_active || total <= 0) return;
++    sd_decode_temporal_total = total;
++    if (sd_decode_progress_cb)
++        sd_decode_progress_cb(sd_decode_spatial_completed * total + completed,
++                              std::max(1, sd_decode_spatial_total) * total, sd_decode_cb_data);
 +}
 +void sd_video_decoded_frame(const sd_image_t* frame) {
 +    if (frame && frame->data && sd_decoded_frame_cb)
@@ -71,7 +70,7 @@
  static sd_progress_cb_t sd_progress_cb = nullptr;
  void* sd_progress_cb_data              = nullptr;
  
-@@ -581,6 +605,8 @@
+@@ -581,6 +621,8 @@ static void print_progress_line(int step, int steps, const std::string& speed_te
  }
  
  void pretty_progress(int step, int steps, float time) {
@@ -80,27 +79,62 @@
      if (sd_progress_cb) {
          sd_progress_cb(step, steps, time, sd_progress_cb_data);
          return;
---- a/src/runtime/tiling.cpp
-+++ b/src/runtime/tiling.cpp
-@@ -193,6 +193,7 @@
-     }
+diff --git a/src/core/util.h b/src/core/util.h
+index 334224d..64f3351 100644
+--- a/src/core/util.h
++++ b/src/core/util.h
+@@ -98,6 +98,19 @@ std::vector<std::pair<std::string, float>> parse_prompt_attention(const std::str
+ std::vector<std::pair<std::string, float>> split_quotation_attention(
+     const std::vector<std::pair<std::string, float>>& parsed_attention);
  
-     int num_tiles   = num_tiles_x * num_tiles_y;
-+    sd_video_decode_progress(0, num_tiles);
-     int tile_count  = 1;
-     bool last_y     = false;
-     bool last_x     = false;
-@@ -254,6 +255,7 @@
-                 last_time  = (t2 - t1) / 1000.0f;
-                 pretty_progress(tile_count, num_tiles, last_time);
-             }
-+            sd_video_decode_progress(tile_count, num_tiles);
-             tile_count++;
-         }
-         last_x = false;
++class SDVideoDecodeScope {
++public:
++    SDVideoDecodeScope();
++    ~SDVideoDecodeScope();
++    SDVideoDecodeScope(const SDVideoDecodeScope&) = delete;
++    SDVideoDecodeScope& operator=(const SDVideoDecodeScope&) = delete;
++private:
++    bool previous;
++};
++void sd_video_decode_progress(int completed, int total);
++void sd_video_decode_temporal_progress(int completed, int total);
++void sd_video_decoded_frame(const sd_image_t* frame);
++
+ sd_progress_cb_t sd_get_progress_callback();
+ void* sd_get_progress_callback_data();
+ 
+diff --git a/src/model/vae/wan_vae.hpp b/src/model/vae/wan_vae.hpp
+index 9dd30fd..e28887b 100644
+--- a/src/model/vae/wan_vae.hpp
++++ b/src/model/vae/wan_vae.hpp
+@@ -1500,6 +1500,9 @@ namespace WAN {
+             free_cache_ctx_and_buffer();
+             ae.clear_cache();
+ 
++            LOG_INFO("Wan VAE decode backend=%s temporal_chunks=%d latent_frames=%lld",
++                     ggml_backend_name(runtime_backend), (int)plan.tiles.size(), (long long)input.shape()[2]);
++            sd_video_decode_temporal_progress(0, (int)plan.tiles.size());
+             auto output = process_vae_temporal_tiles(input, plan, [&](const sd::Tensor<float>& input_tile, const VAETemporalTile& tile) {
+                 LOG_VERBOSE("Wan VAE temporal tile %d/%d: latent frames [%lld, %lld)",
+                             tile.index + 1,
+@@ -1509,9 +1512,11 @@ namespace WAN {
+                 auto get_graph = [&]() -> ggml_cgraph* {
+                     return build_temporal_tile_graph(input_tile, static_cast<int>(tile.start));
+                 };
+-                return restore_trailing_singleton_dims(
++                auto decoded = restore_trailing_singleton_dims(
+                     GGMLRunner::compute(get_graph, n_threads, false),
+                     static_cast<size_t>(input.dim()));
++                if (!decoded.empty()) sd_video_decode_temporal_progress(tile.index + 1, (int)plan.tiles.size());
++                return decoded;
+             });
+ 
+             free_cache_ctx_and_buffer();
+diff --git a/src/pipeline/video.cpp b/src/pipeline/video.cpp
+index 2fcff4c..dc0f30f 100644
 --- a/src/pipeline/video.cpp
 +++ b/src/pipeline/video.cpp
-@@ -1238,7 +1238,11 @@
+@@ -1238,7 +1238,11 @@ namespace sd::pipeline {
                      (int)video_latent.shape()[3]);
          // auto z = sd::load_tensor_from_file_as_tensor<float>("ltx_vae_z.bin");
          int64_t t4            = ggml_time_ms();
@@ -113,7 +147,7 @@
          int64_t t5            = ggml_time_ms();
          LOG_INFO("decode_first_stage completed, taking %.2fs", (t5 - t4) * 1.0f / 1000);
          if (vid.empty()) {
-@@ -1265,6 +1269,7 @@
+@@ -1265,6 +1269,7 @@ namespace sd::pipeline {
  
          for (int64_t i = 0; i < vid.shape()[2]; i++) {
              result_images[i] = tensor_to_sd_image(vid, static_cast<int>(i));
@@ -121,3 +155,23 @@
          }
  
          return result_images;
+diff --git a/src/runtime/tiling.cpp b/src/runtime/tiling.cpp
+index 38ea4c2..771968c 100644
+--- a/src/runtime/tiling.cpp
++++ b/src/runtime/tiling.cpp
+@@ -193,6 +193,7 @@ sd::Tensor<float> process_tiles_2d(const sd::Tensor<float>& input,
+     }
+ 
+     int num_tiles   = num_tiles_x * num_tiles_y;
++    sd_video_decode_progress(0, num_tiles);
+     int tile_count  = 1;
+     bool last_y     = false;
+     bool last_x     = false;
+@@ -254,6 +255,7 @@ sd::Tensor<float> process_tiles_2d(const sd::Tensor<float>& input,
+                 last_time  = (t2 - t1) / 1000.0f;
+                 pretty_progress(tile_count, num_tiles, last_time);
+             }
++            sd_video_decode_progress(tile_count, num_tiles);
+             tile_count++;
+         }
+         last_x = false;

From 39f97ab9d940667240b4eef03b41ec739987dcca Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 01:28:11 +0530
Subject: [PATCH 087/129] fix(image): retain residency lock through late SD
 load [skip ci]

A JS load timeout does not stop native model allocation. Drain the SD load and unload its late context before releasing admission or clearing loading state. Preserve existing backend behavior. Production TypeScript check passed; no automated tests or device changes.
---
 src/services/activeModelService/loaders.ts | 46 ++++++++++++++--------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/services/activeModelService/loaders.ts b/src/services/activeModelService/loaders.ts
index 898e97162..ffaab0fba 100644
--- a/src/services/activeModelService/loaders.ts
+++ b/src/services/activeModelService/loaders.ts
@@ -281,28 +281,42 @@ export async function doLoadImageModel(ctx: ImageLoadContext): Promise<void> {
     }
 
     let imgTimeoutId: ReturnType<typeof setTimeout> | null = null;
+    let loadTimedOut = false;
     const timeoutPromise = new Promise<never>((_, reject) => {
       imgTimeoutId = setTimeout(
-        () => reject(new Error('Image model loading timed out')),
+        () => {
+          loadTimedOut = true;
+          reject(new Error('Image model loading timed out'));
+        },
         ctx.timeoutMs,
       );
     });
-
+    const nativeLoad = onnxImageGeneratorService.loadModel(
+      ctx.model.modelPath,
+      ctx.imageThreads,
+      {
+        backend: ctx.model.backend === 'sd' ? 'sd' : 'auto',
+        modelId: ctx.model.id,
+        cpuOnly: ctx.cpuOnly,
+        attentionVariant: ctx.model.attentionVariant,
+        preferGpu: ctx.preferGpu,
+      },
+    );
     try {
-      await Promise.race([
-        onnxImageGeneratorService.loadModel(
-          ctx.model.modelPath,
-          ctx.imageThreads,
-          {
-            backend: ctx.model.backend === 'sd' ? 'sd' : 'auto',
-            modelId: ctx.model.id,
-            cpuOnly: ctx.cpuOnly,
-            attentionVariant: ctx.model.attentionVariant,
-            preferGpu: ctx.preferGpu,
-          },
-        ),
-        timeoutPromise,
-      ]);
+      await Promise.race([nativeLoad, timeoutPromise]);
+    } catch (error) {
+      if (loadTimedOut && ctx.model.backend === 'sd') {
+        // A JS timeout cannot stop native model allocation. Retain the residency
+        // lock until it settles, then remove any late context before admitting
+        // another modality. Otherwise that context is resident but unregistered.
+        logger.warn('[Image] SD load timed out; waiting for native cleanup');
+        await nativeLoad.catch(() => {});
+        if (!(await onnxImageGeneratorService.unloadModel())) {
+          throw new Error('The timed-out image model could not be unloaded.');
+        }
+        modelResidencyManager.release('image');
+      }
+      throw error;
     } finally {
       if (imgTimeoutId !== null) clearTimeout(imgTimeoutId);
     }

From 2fd3175729e0269b401a366298416cb9522493dc Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 01:29:09 +0530
Subject: [PATCH 088/129] fix(image): verify SD file sizes before pack
 registration [skip ci]

---
 src/services/imageDownloadActions.ts | 1 +
 src/services/modelManager/scan.ts    | 5 ++++-
 src/utils/imageModelIntegrity.ts     | 5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/services/imageDownloadActions.ts b/src/services/imageDownloadActions.ts
index 3d4e9746b..38dc725c1 100644
--- a/src/services/imageDownloadActions.ts
+++ b/src/services/imageDownloadActions.ts
@@ -336,6 +336,7 @@ export async function downloadHuggingFaceModel(
     const files = modelInfo.huggingFaceFiles.map((file) => ({
       relativePath: file.path,
       size: file.size,
+      expectedSize: modelInfo.backend === 'sd' ? file.size : undefined,
       url: file.downloadUrl ?? `https://huggingface.co/${modelInfo.huggingFaceRepo}/resolve/main/${file.path}`,
       sha256: file.sha256,
     }));
diff --git a/src/services/modelManager/scan.ts b/src/services/modelManager/scan.ts
index ce2ee2f4e..2d0e037f5 100644
--- a/src/services/modelManager/scan.ts
+++ b/src/services/modelManager/scan.ts
@@ -256,7 +256,10 @@ export async function reconcileFinishedImageDownloads(opts: ReconcileImageModels
       const sdFiles = item.name.startsWith('sd-') ? getSDImagePackFiles((await RNFS.readDir(item.path)).filter(file => file.isFile()).map(file => file.name), item.name) : null;
       if (item.name.startsWith('sd-')) {
         try {
-          if (!sdFiles) continue;
+          // A remote variant's expected weight bytes/hash live in its download
+          // metadata, not the catalog. Let Resume validate that descriptor; a
+          // nonempty partial GGUF alone cannot prove this pack is complete.
+          if (!sdFiles || sdFiles.some(file => !file.sha256)) continue;
           await validateMultifileComplete(item.path, sdFiles.map(file => ({
             relativePath: file.path, sha256: file.sha256,
           })));
diff --git a/src/utils/imageModelIntegrity.ts b/src/utils/imageModelIntegrity.ts
index 49998c085..60098860f 100644
--- a/src/utils/imageModelIntegrity.ts
+++ b/src/utils/imageModelIntegrity.ts
@@ -192,13 +192,16 @@ export async function ensureImageExtractionComplete(opts: {
  * legacy descriptors retain their non-empty check because their sizes can drift. */
 export async function validateMultifileComplete(
   modelDir: string,
-  files: { relativePath: string; sha256?: string }[],
+  files: { relativePath: string; sha256?: string; expectedSize?: number }[],
 ): Promise<void> {
   if (files.length === 0) throw new Error('Download file list missing. Please retry.');
   for (const file of files) {
     const filePath = `${modelDir}/${file.relativePath}`;
     const size = (await statFile(filePath))?.size ?? -1;
     if (size <= 0) throw new Error(`Downloaded file missing or empty: ${file.relativePath} — tap retry`);
+    if (file.expectedSize && size !== file.expectedSize) {
+      throw new Error(`Downloaded file is incomplete: ${file.relativePath} — tap retry`);
+    }
     if (file.sha256 && (await RNFS.hash(filePath, 'sha256')).toLowerCase() !== file.sha256.toLowerCase()) {
       throw new Error(`Downloaded file is damaged: ${file.relativePath} — tap retry`);
     }

From 1df1f0d61a4d50345cbcca744e8b2a385bef2051 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 01:29:12 +0530
Subject: [PATCH 089/129] fix(image): account for failed SD load cleanup [skip
 ci]

---
 src/services/activeModelService/loaders.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/services/activeModelService/loaders.ts b/src/services/activeModelService/loaders.ts
index ffaab0fba..aa5cc80f1 100644
--- a/src/services/activeModelService/loaders.ts
+++ b/src/services/activeModelService/loaders.ts
@@ -312,6 +312,9 @@ export async function doLoadImageModel(ctx: ImageLoadContext): Promise<void> {
         logger.warn('[Image] SD load timed out; waiting for native cleanup');
         await nativeLoad.catch(() => {});
         if (!(await onnxImageGeneratorService.unloadModel())) {
+          // Cleanup failure is not proof that native memory was released. Keep
+          // the existing residency registration/eviction path responsible for it.
+          ctx.onLoaded(ctx.modelId, ctx.imageThreads);
           throw new Error('The timed-out image model could not be unloaded.');
         }
         modelResidencyManager.release('image');

From 490814b32c455cc90e5c1f35563d9b84db837aa3 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 01:42:51 +0530
Subject: [PATCH 090/129] chore(pro): update video transfer integrity checks
 [skip ci]

---
 pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pro b/pro
index b592a6cbd..c5553c251 160000
--- a/pro
+++ b/pro
@@ -1 +1 @@
-Subproject commit b592a6cbd8dfcf280716017a539da7aa778bddb4
+Subproject commit c5553c25162a3f792cd344cbe495a1d3c272efa5

From 4f0a96ad5679d79c7ef2e9cd907023098d538f5e Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 01:43:59 +0530
Subject: [PATCH 091/129] fix(image): retain admission until cancelled request
 settles [skip ci]

---
 src/services/imageGenerationService.ts | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/services/imageGenerationService.ts b/src/services/imageGenerationService.ts
index 07e291b6d..1fc8e803d 100644
--- a/src/services/imageGenerationService.ts
+++ b/src/services/imageGenerationService.ts
@@ -52,6 +52,9 @@ class ImageGenerationService {
 
   private readonly listeners: Set<ImageGenerationListener> = new Set();
   private cancelRequested: boolean = false;
+  // UI cancellation can precede native load/enhancement completion. This promise
+  // owns admission until that work settles; it is not another UI phase.
+  private pendingGeneration: Promise<GeneratedImage | null> | null = null;
   private remoteRequest: AbortController | null = null;
   /** Last generate request, so a failure card's Retry button can re-run it. */
   private _lastParams: GenerateImageParams | null = null;
@@ -195,6 +198,10 @@ class ImageGenerationService {
       );
       return true;
     } catch (error: any) {
+      if (this.cancelRequested) {
+        this.resetState();
+        return false;
+      }
       // Pass the TYPED error as `cause` — an OverridableMemoryError here is what lets
       // the failure card offer "Load Anyway". Stringifying it (as before) hid it.
       this._fail(
@@ -327,18 +334,28 @@ class ImageGenerationService {
    * Generate an image. Runs independently of UI lifecycle.
    * If conversationId is provided, the result will be added as a chat message.
    */
-  async generateImage(
+  generateImage(
     params: GenerateImageParams,
     opts?: { override?: boolean },
   ): Promise<GeneratedImage | null> {
     // Native cancellation can finish after the UI has cleared its progress.
     // Keep admission closed until the engine's generation promise settles.
-    if (isInFlight(this.state.phase) || onnxImageGeneratorService.isGenerating()) {
+    if (this.pendingGeneration || isInFlight(this.state.phase) || onnxImageGeneratorService.isGenerating()) {
       logger.log(
         '[ImageGenerationService] Already generating, ignoring request',
       );
-      return null;
+      return Promise.resolve(null);
     }
+    this.pendingGeneration = this.runImageGeneration(params, opts).finally(() => {
+      this.pendingGeneration = null;
+    });
+    return this.pendingGeneration;
+  }
+
+  private async runImageGeneration(
+    params: GenerateImageParams,
+    opts?: { override?: boolean },
+  ): Promise<GeneratedImage | null> {
     this.cancelRequested = false;
     this._lastParams = params; // so a failure card's Retry can re-run this exact request
     const remoteServer = useRemoteServerStore

From b4faf2f6b26b923e2c6eb93320f87438be92498e Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 03:23:34 +0530
Subject: [PATCH 092/129] fix(video): log Android latent and decode numeric
 summaries [skip ci]

---
 scripts/prepare-video-runtime.sh           |  2 +-
 scripts/video/android-video-numerics.patch | 55 ++++++++++++++++++++++
 2 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 scripts/video/android-video-numerics.patch

diff --git a/scripts/prepare-video-runtime.sh b/scripts/prepare-video-runtime.sh
index 37bef7367..326708667 100644
--- a/scripts/prepare-video-runtime.sh
+++ b/scripts/prepare-video-runtime.sh
@@ -23,7 +23,7 @@ ROUTING_PATCH="$ROOT/scripts/video/android-attention-query-routing.patch"
 if git -C "$SOURCE" apply --reverse --check "$ROUTING_PATCH" 2>/dev/null; then
   git -C "$SOURCE" apply --reverse "$ROUTING_PATCH"
 fi
-for entry in "ggml:android-vulkan-device-fault.patch" "ggml:android-vulkan-pipeline-diagnostics.patch" "ggml:android-vulkan-matvec-fallback.patch" "ggml:android-vulkan-attention-fallback.patch" "ggml:android-hexagon.patch" "ggml:android-hexagon-buffer-validation.patch" "ggml:android-hexagon-precision.patch" ".:android-hardware-fallback.patch" ".:conditioning-errors.patch" ".:android-attention-buffer-ownership.patch" ".:android-attention-query-chunks.patch" ".:android-attention-query-routing.patch" ".:video-decode-observer.patch"; do
+for entry in "ggml:android-vulkan-device-fault.patch" "ggml:android-vulkan-pipeline-diagnostics.patch" "ggml:android-vulkan-matvec-fallback.patch" "ggml:android-vulkan-attention-fallback.patch" "ggml:android-hexagon.patch" "ggml:android-hexagon-buffer-validation.patch" "ggml:android-hexagon-precision.patch" ".:android-hardware-fallback.patch" ".:conditioning-errors.patch" ".:android-attention-buffer-ownership.patch" ".:android-attention-query-chunks.patch" ".:android-attention-query-routing.patch" ".:video-decode-observer.patch" ".:android-video-numerics.patch"; do
   target="${entry%%:*}"
   patch="$ROOT/scripts/video/${entry#*:}"
   if ! git -C "$SOURCE/$target" apply --reverse --check "$patch" 2>/dev/null; then
diff --git a/scripts/video/android-video-numerics.patch b/scripts/video/android-video-numerics.patch
new file mode 100644
index 000000000..e65cb8500
--- /dev/null
+++ b/scripts/video/android-video-numerics.patch
@@ -0,0 +1,55 @@
+--- a/src/pipeline/video.cpp
++++ b/src/pipeline/video.cpp
+@@ -1214,6 +1214,32 @@
+         return embeds;
+     }
+ 
++#if defined(__ANDROID__)
++    // These tensors are already in host memory. Scan once without copying them.
++    static void log_video_tensor_summary(const char* stage, const sd::Tensor<float>& tensor) {
++        int64_t finite = 0;
++        int64_t zero = 0;
++        double minimum = INFINITY;
++        double maximum = -INFINITY;
++        double sum = 0;
++        double squares = 0;
++        for (const float value : tensor.values()) {
++            if (!std::isfinite(value)) continue;
++            ++finite;
++            if (value == 0.0f) ++zero;
++            minimum = std::min(minimum, static_cast<double>(value));
++            maximum = std::max(maximum, static_cast<double>(value));
++            sum += value;
++            squares += static_cast<double>(value) * value;
++        }
++        LOG_INFO("OFFGRID_VIDEO_NUMERICS stage=%s values=%lld finite=%lld nonfinite=%lld zero=%lld min=%.9g max=%.9g mean=%.9g rms=%.9g",
++                 stage, (long long)tensor.numel(), (long long)finite,
++                 (long long)(tensor.numel() - finite), (long long)zero,
++                 minimum, maximum, finite ? sum / finite : 0.0,
++                 finite ? std::sqrt(squares / finite) : 0.0);
++    }
++#endif
++
+     static sd_image_t* decode_video_outputs(StableDiffusionGGML* sd,
+                                             const GenerationRequest& request,
+                                             const sd::Tensor<float>& final_latent,
+@@ -1226,6 +1252,9 @@
+             LOG_ERROR("cancelling video decode");
+             return nullptr;
+         }
++#if defined(__ANDROID__)
++        log_video_tensor_summary("diffusion_latent", final_latent);
++#endif
+         sd::Tensor<float> video_latent = final_latent;
+         if ((sd_version_is_ltxav(sd->version) || sd_version_is_minimax_h3(sd->version)) &&
+             video_latent.shape()[3] > sd->get_latent_channel()) {
+@@ -1254,6 +1283,9 @@
+                     (int)vid.shape()[1],
+                     (int)vid.shape()[2],
+                     (int)vid.shape()[3]);
++#if defined(__ANDROID__)
++        log_video_tensor_summary("decoded_rgb", vid);
++#endif
+         if (request.frames > 0 &&
+             vid.shape()[2] > request.frames) {
+             vid = sd::ops::slice(vid, 2, 0, request.frames);

From f874fd40e508fa3e3fc10abbcfc5ceb206a3cd27 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 05:01:19 +0530
Subject: [PATCH 093/129] Update Pro pricing copy for monthly plan

---
 __tests__/unit/utils/proPricing.test.ts | 11 +++++------
 src/utils/proPricing.ts                 | 12 ++++++------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/__tests__/unit/utils/proPricing.test.ts b/__tests__/unit/utils/proPricing.test.ts
index b922408f1..b982fd31b 100644
--- a/__tests__/unit/utils/proPricing.test.ts
+++ b/__tests__/unit/utils/proPricing.test.ts
@@ -3,14 +3,13 @@ import { getPricingCopy } from '../../../src/utils/proPricing';
 describe('getPricingCopy', () => {
   const copy = getPricingCopy();
 
-  it('offers the two current plans - $49/yr and $69 lifetime - and no monthly', () => {
-    expect(copy.title).toBe('$49/yr or $69 lifetime');
-    expect(copy.sheetSubheadline).toMatch(/\$49 a year/);
+  it('offers the two current plans - $4.99/month and $69 lifetime - and no yearly', () => {
+    expect(copy.title).toBe('$4.99/month or $69 lifetime');
+    expect(copy.sheetSubheadline).toMatch(/\$4\.99 a month/);
     expect(copy.sheetSubheadline).toMatch(/\$69 once/);
-    // The retired monthly plan must not resurface anywhere in the copy.
+    // The retired yearly plan must not resurface anywhere in the copy.
     const all = Object.values(copy).join(' ');
-    expect(all).not.toMatch(/month/i);
-    expect(all).not.toMatch(/\$39/);
+    expect(all).not.toMatch(/year|annual|\$49/i);
   });
 
   it('keeps the Get Pro CTA (the web pay-page trigger the Pro surfaces assert)', () => {
diff --git a/src/utils/proPricing.ts b/src/utils/proPricing.ts
index fae7751db..4282b95fe 100644
--- a/src/utils/proPricing.ts
+++ b/src/utils/proPricing.ts
@@ -1,10 +1,10 @@
 /**
  * Off Grid AI Pro pricing copy, shared by every Pro surface so they stay in sync.
  *
- * Two plans only: a yearly subscription and a one-time lifetime purchase. The price is
+ * Two plans only: a monthly subscription and a one-time lifetime purchase. The price is
  * a founder rate that only ever goes up as we grow, so the numbers are hardcoded to
- * today's tier and bumped in a new release when a tier fills. The web pay page
- * (getoffgridai.co/pay) is where checkout happens and holds the authoritative price.
+ * today's tier and bumped in a new release when a tier fills. The Pro page
+ * (getoffgridai.co/pro) holds the authoritative price and checkout.
  */
 export interface ProPricingCopy {
   /** Small uppercase eyebrow label. */
@@ -24,10 +24,10 @@ export interface ProPricingCopy {
 export function getPricingCopy(): ProPricingCopy {
   return {
     label: 'FOUNDER RATE',
-    title: '$49/yr or $69 lifetime',
+    title: '$4.99/month or $69 lifetime',
     subtitle: "Lock in today's rate - it only goes up, never down. One license covers up to 5 devices, laptop and phone.",
     cta: 'Get Pro',
-    sheetSubheadline: 'Off Grid AI Pro - $49 a year, or $69 once for life.',
-    sheetFooter: 'Founder rate, locked in when you join. Yearly renews; lifetime is a one-time payment.',
+    sheetSubheadline: 'Off Grid AI Pro - $4.99 a month, or $69 once for life.',
+    sheetFooter: 'Founder rate, locked in when you join. Monthly renews; lifetime is a one-time payment.',
   };
 }

From 21b0440da6e95dbc3af03782c5b4c77012faf968 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 05:05:17 +0530
Subject: [PATCH 094/129] feat(settings): move shared generation controls to
 General

---
 .../TextGenerationSection.tsx                 | 14 +------------
 .../GenerationSettingsModal/index.tsx         | 20 ++++++++++++++----
 .../settings/GeneralGenerationControls.tsx    | 21 +++++++++++++++++++
 .../TextGenerationSection.tsx                 |  9 --------
 src/screens/ModelSettingsScreen/index.tsx     | 14 +++++++++++++
 5 files changed, 52 insertions(+), 26 deletions(-)
 create mode 100644 src/components/settings/GeneralGenerationControls.tsx

diff --git a/src/components/GenerationSettingsModal/TextGenerationSection.tsx b/src/components/GenerationSettingsModal/TextGenerationSection.tsx
index 9f959a900..7030f5c04 100644
--- a/src/components/GenerationSettingsModal/TextGenerationSection.tsx
+++ b/src/components/GenerationSettingsModal/TextGenerationSection.tsx
@@ -9,14 +9,10 @@ import {
   useTextGenerationSettings,
 } from '../../hooks/useTextGenerationSettings';
 import {
-  BackendSelector,
   BatchSizeSlider,
   CpuThreadsSlider,
   FlashAttentionToggle,
   KvCacheTypeToggle,
-  LiteRTBackendSelector,
-  ModelLoadingModeSelector,
-  ShowGenerationDetailsToggle,
   SpeculativeDecodingToggle,
   ThinkingBudgetSelector,
 } from '../settings/textGenAdvancedSections';
@@ -42,7 +38,6 @@ export const TextGenerationSection: React.FC = () => {
         <ChatSettingSlider key={setting.key} setting={setting} />
       ))}
       {!isLiteRT && <ThinkingBudgetSelector compact />}
-      <ShowGenerationDetailsToggle />
       <AdvancedToggle
         isExpanded={showAdvanced}
         onPress={() => setShowAdvanced(current => !current)}
@@ -53,20 +48,13 @@ export const TextGenerationSection: React.FC = () => {
           {advancedSettings.map(setting => (
             <ChatSettingSlider key={setting.key} setting={setting} />
           ))}
-          {isLiteRT ? (
-            <>
-              <LiteRTBackendSelector />
-              <ModelLoadingModeSelector />
-            </>
-          ) : (
+          {!isLiteRT && (
             <>
               <CpuThreadsSlider />
               <BatchSizeSlider />
-              <BackendSelector />
               <FlashAttentionToggle />
               <SpeculativeDecodingToggle />
               <KvCacheTypeToggle />
-              <ModelLoadingModeSelector />
             </>
           )}
         </>
diff --git a/src/components/GenerationSettingsModal/index.tsx b/src/components/GenerationSettingsModal/index.tsx
index a3a84938d..4ae63eea9 100644
--- a/src/components/GenerationSettingsModal/index.tsx
+++ b/src/components/GenerationSettingsModal/index.tsx
@@ -8,6 +8,7 @@ import { useAppStore } from '../../stores';
 import { llmService } from '../../services';
 import { createStyles } from './styles';
 import { VoiceTurnSettings } from '../settings/voiceSections';
+import { GeneralGenerationControls } from '../settings/GeneralGenerationControls';
 import { ConversationActionsSection } from './ConversationActionsSection';
 import { ImageGenerationSection } from './ImageGenerationSection';
 import { TextGenerationSection } from './TextGenerationSection';
@@ -45,6 +46,7 @@ export const GenerationSettingsModal: React.FC<
 
   const [performanceStats, setPerformanceStats] = useState(llmService.getPerformanceStats());
   const [imageSettingsOpen, setImageSettingsOpen] = useState(false);
+  const [generalSettingsOpen, setGeneralSettingsOpen] = useState(false);
   const [textSettingsOpen, setTextSettingsOpen] = useState(false);
   const [sttSettingsOpen, setSttSettingsOpen] = useState(false);
   const [ttsSettingsOpen, setTtsSettingsOpen] = useState(false);
@@ -98,12 +100,22 @@ export const GenerationSettingsModal: React.FC<
           activeProjectName={activeProjectName}
         />
 
+        <TouchableOpacity
+          style={[styles.accordionHeader, !hasConversationActions && styles.accordionHeaderNoMargin]}
+          onPress={() => setGeneralSettingsOpen(!generalSettingsOpen)}
+          activeOpacity={0.7}
+          testID="modal-general-accordion"
+          accessibilityRole="button"
+          accessibilityState={{ expanded: generalSettingsOpen }}
+        >
+          <Text style={styles.accordionTitle}>GENERAL</Text>
+          <Icon name={generalSettingsOpen ? 'chevron-up' : 'chevron-down'} size={16} color={colors.textMuted} />
+        </TouchableOpacity>
+        {generalSettingsOpen && <View style={styles.sectionCard}><GeneralGenerationControls /></View>}
+
         {/* IMAGE GENERATION SETTINGS */}
         <TouchableOpacity
-          style={[
-            styles.accordionHeader,
-            !hasConversationActions && styles.accordionHeaderNoMargin,
-          ]}
+          style={styles.accordionHeader}
           onPress={() => setImageSettingsOpen(!imageSettingsOpen)}
           activeOpacity={0.7}
           testID="modal-image-accordion"
diff --git a/src/components/settings/GeneralGenerationControls.tsx b/src/components/settings/GeneralGenerationControls.tsx
new file mode 100644
index 000000000..55eac7543
--- /dev/null
+++ b/src/components/settings/GeneralGenerationControls.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import { useTextGenerationSettings } from '../../hooks/useTextGenerationSettings';
+import {
+  BackendSelector,
+  LiteRTBackendSelector,
+  ModelLoadingModeSelector,
+  ShowGenerationDetailsToggle,
+} from './textGenAdvancedSections';
+
+/** Shared defaults used by every generation settings surface. */
+export const GeneralGenerationControls: React.FC = () => {
+  const { isLiteRT } = useTextGenerationSettings();
+
+  return (
+    <>
+      {isLiteRT ? <LiteRTBackendSelector /> : <BackendSelector />}
+      <ModelLoadingModeSelector />
+      <ShowGenerationDetailsToggle />
+    </>
+  );
+};
diff --git a/src/screens/ModelSettingsScreen/TextGenerationSection.tsx b/src/screens/ModelSettingsScreen/TextGenerationSection.tsx
index 980697b96..a7352f166 100644
--- a/src/screens/ModelSettingsScreen/TextGenerationSection.tsx
+++ b/src/screens/ModelSettingsScreen/TextGenerationSection.tsx
@@ -3,14 +3,10 @@ import { Text } from 'react-native';
 import { AdvancedToggle, Card } from '../../components';
 import { SliderSetting } from '../../components/SliderSetting';
 import {
-  BackendSelector,
   BatchSizeSlider,
   CpuThreadsSlider,
   FlashAttentionToggle,
   KvCacheTypeToggle,
-  LiteRTBackendSelector,
-  ModelLoadingModeSelector,
-  ShowGenerationDetailsToggle,
   SpeculativeDecodingToggle,
   ThinkingBudgetSelector,
 } from '../../components/settings/textGenAdvancedSections';
@@ -48,7 +44,6 @@ export const TextGenerationSection: React.FC = () => {
         </>
       )}
 
-      <ShowGenerationDetailsToggle />
       <AdvancedToggle
         isExpanded={showAdvanced}
         onPress={() => setShowAdvanced(current => !current)}
@@ -59,8 +54,6 @@ export const TextGenerationSection: React.FC = () => {
           <>
             <SliderSetting testID="litert-top-p" {...liteRT.topP} />
             <SliderSetting testID="max-tool-calls" {...toolCalls} />
-            <LiteRTBackendSelector />
-            <ModelLoadingModeSelector />
           </>
         ) : (
           <>
@@ -69,11 +62,9 @@ export const TextGenerationSection: React.FC = () => {
             <SliderSetting testID="max-tool-calls" {...toolCalls} />
             <CpuThreadsSlider />
             <BatchSizeSlider />
-            <BackendSelector />
             <FlashAttentionToggle />
             <SpeculativeDecodingToggle />
             <KvCacheTypeToggle />
-            <ModelLoadingModeSelector />
           </>
         )
       ) : null}
diff --git a/src/screens/ModelSettingsScreen/index.tsx b/src/screens/ModelSettingsScreen/index.tsx
index f32e3930c..4e160f01c 100644
--- a/src/screens/ModelSettingsScreen/index.tsx
+++ b/src/screens/ModelSettingsScreen/index.tsx
@@ -19,6 +19,7 @@ import { SystemPromptSection } from './SystemPromptSection';
 import { ImageGenerationSection } from './ImageGenerationSection';
 import { TextGenerationSection } from './TextGenerationSection';
 import { VoiceTurnSettings } from '../../components/settings/voiceSections';
+import { GeneralGenerationControls } from '../../components/settings/GeneralGenerationControls';
 import { getSlot, SLOTS } from '../../bootstrap/slotRegistry';
 import { WhisperPickerSheet } from '../../components/models/WhisperPickerSheet';
 import {
@@ -34,6 +35,7 @@ export const ModelSettingsScreen: React.FC = () => {
   const [alertState, setAlertState] = useState<AlertState>(initialAlertState);
 
   const [promptOpen, setPromptOpen] = useState(false);
+  const [generalOpen, setGeneralOpen] = useState(false);
   const [imageOpen, setImageOpen] = useState(false);
   const [textOpen, setTextOpen] = useState(false);
   const [ttsOpen, setTtsOpen] = useState(false);
@@ -82,6 +84,18 @@ export const ModelSettingsScreen: React.FC = () => {
         style={styles.scrollView}
         contentContainerStyle={styles.content}
       >
+        <TouchableOpacity
+          style={styles.accordionHeader}
+          onPress={() => setGeneralOpen(!generalOpen)}
+          activeOpacity={0.7}
+          testID="general-generation-accordion"
+          accessibilityRole="button"
+          accessibilityState={{ expanded: generalOpen }}
+        >
+          <Text style={styles.accordionTitle}>General</Text>
+          <Icon name={generalOpen ? 'chevron-up' : 'chevron-down'} size={16} color={colors.textMuted} />
+        </TouchableOpacity>
+        {generalOpen && <View style={styles.settingSection}><GeneralGenerationControls /></View>}
           <TouchableOpacity
             style={styles.accordionHeader}
             onPress={() => setPromptOpen(!promptOpen)}

From d1b8bd0ae5601ceaa449dc4b9abb22c1c9d9ab68 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 05:05:34 +0530
Subject: [PATCH 095/129] test(settings): cover General controls on both
 surfaces

---
 .../modelSettingsSurfaceParity.test.tsx       | 24 +++++++++++++++++++
 .../rntl/screens/ModelSettingsScreen.test.tsx |  3 +++
 2 files changed, 27 insertions(+)

diff --git a/__tests__/integration/settings/modelSettingsSurfaceParity.test.tsx b/__tests__/integration/settings/modelSettingsSurfaceParity.test.tsx
index d8caed028..0720e8cd7 100644
--- a/__tests__/integration/settings/modelSettingsSurfaceParity.test.tsx
+++ b/__tests__/integration/settings/modelSettingsSurfaceParity.test.tsx
@@ -40,6 +40,30 @@ describe('model settings surface parity', () => {
     _clearSlotsForTesting();
   });
 
+  it('keeps shared controls in General on both surfaces and preserves saved values', () => {
+    useAppStore.getState().updateSettings({
+      modelLoadingMode: 'aggressive',
+      showGenerationDetails: true,
+    });
+    const chatSettings = render(<GenerationSettingsModal visible onClose={() => {}} />);
+    fireEvent.press(chatSettings.getByText('TEXT GENERATION'));
+    expect(chatSettings.queryByText('Model Loading')).toBeNull();
+    expect(chatSettings.queryByText('Show Generation Details')).toBeNull();
+    fireEvent.press(chatSettings.getByTestId('modal-general-accordion'));
+    expect(chatSettings.getByText('Inference Backend')).toBeTruthy();
+    expect(chatSettings.getByTestId('model-loading-mode-aggressive-button')).toBeTruthy();
+    expect(chatSettings.getByTestId('show-gen-details-on-button')).toBeTruthy();
+    chatSettings.unmount();
+
+    const modelSettings = renderModelSettings();
+    fireEvent.press(modelSettings.getByTestId('text-generation-accordion'));
+    expect(modelSettings.queryByText('Model Loading')).toBeNull();
+    fireEvent.press(modelSettings.getByTestId('general-generation-accordion'));
+    expect(modelSettings.getByText('Inference Backend')).toBeTruthy();
+    expect(modelSettings.getByTestId('model-loading-mode-aggressive-button')).toBeTruthy();
+    expect(modelSettings.getByTestId('show-gen-details-on-button')).toBeTruthy();
+  });
+
   it('caps output by context on both surfaces and writes one shared setting state', () => {
     useAppStore.getState().setModelMaxContext(262144);
     // A context wide enough for the output this test chooses. Max tokens is capped BY the context,
diff --git a/__tests__/rntl/screens/ModelSettingsScreen.test.tsx b/__tests__/rntl/screens/ModelSettingsScreen.test.tsx
index 25f008bda..ceabf7bcd 100644
--- a/__tests__/rntl/screens/ModelSettingsScreen.test.tsx
+++ b/__tests__/rntl/screens/ModelSettingsScreen.test.tsx
@@ -59,6 +59,9 @@ const renderWithSections = (...sections: ('prompt' | 'image' | 'text')[]) => {
     text: 'text-advanced-toggle',
   };
   for (const section of sections) {
+    if (section === 'text') {
+      fireEvent.press(result.getByTestId('general-generation-accordion'));
+    }
     fireEvent.press(result.getByTestId(testIDMap[section]));
     if (advancedMap[section]) {
       fireEvent.press(result.getByTestId(advancedMap[section]));

From dca21cd8196bf00dde559ac2ae9313e6a6a766fe Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 05:07:16 +0530
Subject: [PATCH 096/129] fix: show saved video generation details in chat
 [skip ci]

---
 .../ChatMessage/components/GenerationMeta.tsx  |  3 +++
 src/components/ChatMessage/index.tsx           | 18 ++++++++++++++++--
 src/services/videoGenerationService.ts         |  2 ++
 src/types/index.ts                             |  9 ++++++---
 src/utils/modelHelpers.ts                      | 13 ++++++++++++-
 5 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/src/components/ChatMessage/components/GenerationMeta.tsx b/src/components/ChatMessage/components/GenerationMeta.tsx
index 6abd19f30..bf044ebd2 100644
--- a/src/components/ChatMessage/components/GenerationMeta.tsx
+++ b/src/components/ChatMessage/components/GenerationMeta.tsx
@@ -33,6 +33,9 @@ function formatOptionalMeta(meta: NonNullable<Message['generationMeta']>, tps: n
     ['steps', m.steps == null ? undefined : `${m.steps} steps`],
     ['cfg', m.guidanceScale == null ? undefined : `cfg ${m.guidanceScale}`],
     ['res', m.resolution],
+    ['frames', m.frames == null ? undefined : `${m.frames} frames`],
+    ['fps', m.fps == null ? undefined : `${m.fps} fps`],
+    ['seed', m.seed == null ? undefined : `Seed: ${m.seed}`],
     ['cache', m.cacheType ? `KV ${m.cacheType}` : undefined],
   ];
   return entries
diff --git a/src/components/ChatMessage/index.tsx b/src/components/ChatMessage/index.tsx
index 033b0c042..33633b475 100644
--- a/src/components/ChatMessage/index.tsx
+++ b/src/components/ChatMessage/index.tsx
@@ -1,3 +1,5 @@
+import { useAppStore } from '../../stores';
+import { videoGenerationMeta } from '../../utils/modelHelpers';
 import React, { useState } from 'react';
 import { View, Text, TouchableOpacity, Clipboard } from 'react-native';
 import type { StyleProp, ViewStyle } from 'react-native';
@@ -211,6 +213,18 @@ const MessageBubble: React.FC<MessageBubbleProps> = ({
   onLongPress,
   onMenuOpen,
 }) => {
+  const savedVideo = useAppStore(state =>
+    message.role === 'assistant'
+      ? state.generatedVideos.find(video =>
+          message.attachments?.some(attachment =>
+            attachment.type === 'video' && attachment.id === video.id,
+          ),
+        )
+      : undefined,
+  );
+  const generationMeta = savedVideo
+    ? { ...videoGenerationMeta(savedVideo), ...message.generationMeta }
+    : message.generationMeta;
   const timelineHasThinking = Boolean(
     message.timeline?.some(entry => entry.kind === 'thinking'),
   );
@@ -382,10 +396,10 @@ const MessageBubble: React.FC<MessageBubbleProps> = ({
         </View>
       )}
 
-      {showTurnFooter && showGenerationDetails && message.generationMeta && (
+      {showTurnFooter && showGenerationDetails && generationMeta && (
         <GenerationMeta
           messageId={message.id}
-          generationMeta={message.generationMeta}
+          generationMeta={generationMeta}
           styles={styles}
           colors={colors}
         />
diff --git a/src/services/videoGenerationService.ts b/src/services/videoGenerationService.ts
index f474aa3b0..1f511a2e2 100644
--- a/src/services/videoGenerationService.ts
+++ b/src/services/videoGenerationService.ts
@@ -1,3 +1,4 @@
+import { videoGenerationMeta } from '../utils/modelHelpers';
 import { resolveDocumentPath } from '../utils/resolveDocumentPath';
 import logger from '../utils/logger';
 import AsyncStorage from '@react-native-async-storage/async-storage';
@@ -144,6 +145,7 @@ class VideoGenerationService {
           },
         ],
         generationTimeMs: Date.now() - startedAt,
+        generationMeta: videoGenerationMeta(result),
       });
   }
   async deleteVideo(id: string): Promise<void> {
diff --git a/src/types/index.ts b/src/types/index.ts
index 2dc819d11..94351bf04 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -249,12 +249,15 @@ export interface GenerationMeta {
   contextEstimate?: boolean;
   /** Model load/init time in seconds */
   modelLoadTimeSeconds?: number;
-  /** Image generation steps */
+  /** Image or video generation steps */
   steps?: number;
-  /** Image guidance scale */
+  /** Image or video guidance scale */
   guidanceScale?: number;
-  /** Image resolution */
+  /** Image or video resolution */
   resolution?: string;
+  frames?: number;
+  fps?: number;
+  seed?: number;
   cacheType?: string; // KV cache quantization type
   /** Tool names sent to the model for this turn (built-in + routed MCP/ext tools). */
   routedToolNames?: string[];
diff --git a/src/utils/modelHelpers.ts b/src/utils/modelHelpers.ts
index 8f4f2cd87..72fdb0864 100644
--- a/src/utils/modelHelpers.ts
+++ b/src/utils/modelHelpers.ts
@@ -1,5 +1,5 @@
 import { CATALOG } from '@offgrid/models';
-import { DownloadedModel } from '../types';
+import type { DownloadedModel, GeneratedVideo, GenerationMeta } from '../types';
 
 export const getMmProjFileSize = (m?: DownloadedModel): number =>
   m?.engine === 'llama' ? (m.mmProjFileSize ?? 0) : 0;
@@ -18,3 +18,14 @@ export const isLiteRTFileName = (fileName: string): boolean =>
 /** Use the catalog label without changing the repository ID or file names. */
 export const videoModelDisplayName = (id: string, fallback: string = id): string =>
   CATALOG.find(model => model.kind === 'video' && model.id === id)?.name ?? fallback;
+
+/** Generation facts shared by new messages and older saved video attachments. */
+export const videoGenerationMeta = (video: GeneratedVideo): GenerationMeta => ({
+  modelName: videoModelDisplayName(video.modelId),
+  resolution: `${video.width} × ${video.height}`,
+  steps: video.steps,
+  guidanceScale: video.guidance,
+  frames: video.frames,
+  fps: video.fps,
+  seed: video.seed,
+});

From 6e19d08ff76c02b8bb0765b4f9c1b8d4649648fc Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 05:22:57 +0530
Subject: [PATCH 097/129] feat(settings): show default system prompt in chat
 Text settings

---
 .../settings/modelSettingsSurfaceParity.test.tsx       | 10 ++++++++++
 .../GenerationSettingsModal/TextGenerationSection.tsx  |  5 ++++-
 .../ModelSettingsScreen/SystemPromptSection.tsx        |  2 ++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/__tests__/integration/settings/modelSettingsSurfaceParity.test.tsx b/__tests__/integration/settings/modelSettingsSurfaceParity.test.tsx
index 0720e8cd7..dd53ecfeb 100644
--- a/__tests__/integration/settings/modelSettingsSurfaceParity.test.tsx
+++ b/__tests__/integration/settings/modelSettingsSurfaceParity.test.tsx
@@ -64,6 +64,16 @@ describe('model settings surface parity', () => {
     expect(modelSettings.getByTestId('show-gen-details-on-button')).toBeTruthy();
   });
 
+  it('shows and edits the saved default system prompt in chat Text settings', () => {
+    useAppStore.getState().updateSettings({ systemPrompt: 'Saved instructions' });
+    const chatSettings = render(<GenerationSettingsModal visible onClose={() => {}} />);
+    fireEvent.press(chatSettings.getByText('TEXT GENERATION'));
+    const input = chatSettings.getByTestId('default-system-prompt-input');
+    expect(input.props.value).toBe('Saved instructions');
+    fireEvent.changeText(input, 'New instructions');
+    expect(useAppStore.getState().settings.systemPrompt).toBe('New instructions');
+  });
+
   it('caps output by context on both surfaces and writes one shared setting state', () => {
     useAppStore.getState().setModelMaxContext(262144);
     // A context wide enough for the output this test chooses. Max tokens is capped BY the context,
diff --git a/src/components/GenerationSettingsModal/TextGenerationSection.tsx b/src/components/GenerationSettingsModal/TextGenerationSection.tsx
index 7030f5c04..65d6a00b4 100644
--- a/src/components/GenerationSettingsModal/TextGenerationSection.tsx
+++ b/src/components/GenerationSettingsModal/TextGenerationSection.tsx
@@ -1,9 +1,10 @@
 import React, { useState } from 'react';
-import { View } from 'react-native';
+import { Text, View } from 'react-native';
 import { AdvancedToggle } from '../AdvancedToggle';
 import { SliderSetting } from '../SliderSetting';
 import { useThemedStyles } from '../../theme';
 import { createStyles } from './styles';
+import { SystemPromptSection } from '../../screens/ModelSettingsScreen/SystemPromptSection';
 import {
   type NumericSettingModel,
   useTextGenerationSettings,
@@ -34,6 +35,8 @@ export const TextGenerationSection: React.FC = () => {
 
   return (
     <View style={styles.sectionCard}>
+      <Text style={styles.settingLabel}>Default System Prompt</Text>
+      <SystemPromptSection />
       {basicSettings.map(setting => (
         <ChatSettingSlider key={setting.key} setting={setting} />
       ))}
diff --git a/src/screens/ModelSettingsScreen/SystemPromptSection.tsx b/src/screens/ModelSettingsScreen/SystemPromptSection.tsx
index 8498feddb..8fa6e1818 100644
--- a/src/screens/ModelSettingsScreen/SystemPromptSection.tsx
+++ b/src/screens/ModelSettingsScreen/SystemPromptSection.tsx
@@ -16,6 +16,8 @@ export const SystemPromptSection: React.FC = () => {
         Instructions given to the model before each conversation. Used when chatting without a project selected.
       </Text>
       <TextInput
+        testID="default-system-prompt-input"
+        accessibilityLabel="Default system prompt"
         style={styles.textArea}
         value={systemPrompt}
         onChangeText={(text) => updateSettings({ systemPrompt: text })}

From f9dae276a2df54022bc60db279ba8c5afb46441b Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 05:23:22 +0530
Subject: [PATCH 098/129] fix: recover active Android video after React reload
 [skip ci]

---
 .../video/VideoGenerationModule.kt            | 37 ++++++++++--
 src/services/videoGenerationService.ts        | 59 ++++++++++++-------
 src/services/videoGenerator.ts                | 35 +++++++++++
 3 files changed, 103 insertions(+), 28 deletions(-)

diff --git a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
index 56319f1a0..540eca46b 100644
--- a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
+++ b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
@@ -14,9 +14,14 @@ import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicBoolean
 
 class VideoGenerationModule(private val context: ReactApplicationContext) : ReactContextBaseJavaModule(context), LifecycleEventListener {
-    companion object { init { System.loadLibrary("offgrid_video") } }
+    companion object {
+        init { System.loadLibrary("offgrid_video") }
+        // JNI owns one process-wide runtime, even when React recreates its bridge.
+        private val busy = AtomicBoolean(false)
+        @Volatile private var activeVideo: VideoGenerationModule? = null
+        @Volatile private var videoStatus: Map<String, Any?>? = null
+    }
     private val executor = Executors.newSingleThreadExecutor()
-    private val busy = AtomicBoolean(false)
     private val cancelled = AtomicBoolean(false)
     private val videoScreenActive = AtomicBoolean(false)
     private var awakeWindow: Window? = null
@@ -68,7 +73,12 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
     @ReactMethod fun addListener(name: String) {}
     @ReactMethod fun removeListeners(count: Int) {}
     private fun stop() { cancelled.set(true); nativeCancel() }
-    @ReactMethod fun cancel(promise: Promise) { stop(); promise.resolve(null) }
+    @ReactMethod fun cancel(promise: Promise) { (activeVideo ?: this).stop(); promise.resolve(null) }
+    @ReactMethod fun getVideoStatus(outputPath: String, promise: Promise) {
+        val status = videoStatus?.takeIf { it["path"] == outputPath }
+        keepVideoScreenAwake(status?.get("phase") == "running")
+        promise.resolve(status?.let { Arguments.makeNativeMap(it) })
+    }
     // Called synchronously by JNI while its worker owns the runtime.
     fun conditioning(backend: String) { emit("conditioning", 0, 0, backend) }
     fun progress(step: Int, total: Int) {
@@ -100,15 +110,21 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
         checkNotNull(encoder).append(rgb, channels) { cancelled.get() }
     }
     private fun emit(stage: String, step: Int, total: Int, backend: String? = null, preview: WritableMap? = null) {
+        videoStatus = videoStatus?.plus(mapOf(
+            "stage" to stage, "step" to step, "total" to total, "backend" to backend,
+        ))?.let { status -> if (preview != null) status + ("preview" to preview.toHashMap()) else status }
         if (!context.hasActiveReactInstance()) return
         context.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
             .emit("VideoGenerationProgress", Arguments.createMap().apply { putString("stage", stage); putInt("step", step); putInt("total", total); if (backend != null) putString("backend", backend); if (preview != null) putMap("preview", preview) })
     }
     @ReactMethod fun generate(input: ReadableMap, promise: Promise) {
         if (!busy.compareAndSet(false, true)) { promise.reject("VIDEO_BUSY", "Video generation is already running."); return }
+        activeVideo = this
+        videoStatus = mapOf("path" to input.getString("outputPath"), "phase" to "running", "stage" to "preparing", "step" to 0, "total" to 0)
         cancelled.set(false); nativePrepare()
         executor.execute {
             var output: File? = null
+            var terminal: Map<String, Any?> = mapOf("phase" to "failed", "code" to "VIDEO_FAILED", "error" to "Video generation failed.")
             try {
                 keepVideoScreenAwake(true)
                 prepareHexagonRuntime()
@@ -133,13 +149,19 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
                     writer.finish { cancelled.get() }
                 }
                 check(destination.length() > 0) { "Video encoder produced no file." }
+                terminal = mapOf("phase" to "succeeded")
                 promise.resolve(Arguments.createMap().apply { putString("path", destination.path) })
             } catch (error: Throwable) {
-                output?.delete(); promise.reject(if (cancelled.get()) "VIDEO_CANCELLED" else "VIDEO_FAILED", error.message, error)
+                val code = if (cancelled.get()) "VIDEO_CANCELLED" else "VIDEO_FAILED"
+                terminal = mapOf("phase" to "failed", "code" to code, "error" to (error.message ?: "Video generation failed."))
+                output?.delete(); promise.reject(code, error.message, error)
             } finally {
                 keepVideoScreenAwake(false)
                 encoder = null; previewFile = null; VideoGenerationService.cancel = null
-                context.stopService(Intent(context, VideoGenerationService::class.java)); busy.set(false)
+                context.stopService(Intent(context, VideoGenerationService::class.java))
+                videoStatus = videoStatus?.plus(terminal)
+                activeVideo = null
+                busy.set(false)
             }
         }
     }
@@ -201,6 +223,9 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
     override fun invalidate() {
         keepVideoScreenAwake(false)
         context.removeLifecycleEventListener(this)
-        stop(); executor.shutdown(); super.invalidate()
+        // A bridge reload must not cancel a video owned by the foreground service.
+        // The replacement bridge reads its retained status and completion.
+        if (activeVideo == null) stop()
+        executor.shutdown(); super.invalidate()
     }
 }
diff --git a/src/services/videoGenerationService.ts b/src/services/videoGenerationService.ts
index 1f511a2e2..ab0caa798 100644
--- a/src/services/videoGenerationService.ts
+++ b/src/services/videoGenerationService.ts
@@ -100,6 +100,14 @@ class VideoGenerationService {
     }
     this.journal = saved;
     this.messageId = saved.messageId;
+    const output = `${RNFS.DocumentDirectoryPath}/generated-videos/${saved.id}.mp4`;
+    if (!saved.remoteServerId && await videoGenerator.getStatus(output)) {
+      this.completion = this.run(saved.input, saved, { nativeRecovery: true }).finally(() => {
+        this.completion = null;
+      });
+      void this.completion.catch(error => logger.warn('[Video] Recovered job failed', error));
+      return;
+    }
     this.update({
       ...EMPTY,
       id: saved.id,
@@ -262,14 +270,15 @@ class VideoGenerationService {
   private async run(
     input: VideoInput,
     resumed?: VideoJournal,
-    options?: { override?: boolean },
+    options?: { override?: boolean; nativeRecovery?: boolean },
   ): Promise<GeneratedVideo | undefined> {
     const app = useAppStore.getState();
     const model = app.downloadedVideoModels.find(
-      m => m.id === (input.model ?? app.activeVideoModelId),
+      m => m.id === (input.model ?? app.activeVideoModelId) ||
+        (options?.nativeRecovery && m.files.some(file => file.role === 'primary' && file.name === input.model)),
     );
     const remoteState = useRemoteServerStore.getState();
-    const server = remoteState.servers.find(
+    const server = options?.nativeRecovery ? undefined : remoteState.servers.find(
       s =>
         s.id ===
         (resumed?.remoteServerId ??
@@ -277,12 +286,12 @@ class VideoGenerationService {
     );
     if (resumed?.remoteServerId && !server)
       throw new Error('The OGAD server for this job is no longer configured.');
-    if (!model && !server) throw new Error('Select a video model in Models.');
+    if (!model && !server && !options?.nativeRecovery) throw new Error('Select a video model in Models.');
     const modelId =
-      resumed?.input.model ?? server?.mediaModels?.video ?? model!.id;
+      (options?.nativeRecovery ? model?.id : resumed?.input.model) ?? server?.mediaModels?.video ?? model!.id;
     const primary =
       server?.mediaModels?.video ??
-      model!.files.find(f => f.role === 'primary')!.name;
+      model?.files.find(f => f.role === 'primary')?.name ?? input.model!;
     let request = resolveVideoRequest({ ...input, model: primary }, {
       ...(app.settings.videoParams?.[primary] ??
         app.settings.videoParams?.default),
@@ -303,7 +312,7 @@ class VideoGenerationService {
       phase: 'running',
       conversationId: input.conversationId ?? null,
       stage: 'preparing',
-      startedAt: Date.now(),
+      startedAt: resumed?.startedAt ?? Date.now(),
     });
     if (input.conversationId) generationSession.begin(input.conversationId);
     let registration: symbol | undefined;
@@ -353,7 +362,7 @@ class VideoGenerationService {
       }
       if (this.cancelled) throw new Error('Video generation stopped.');
       this.update({ stage: 'preparing', enhancedPrompt: request.prompt });
-      this.journal.input = { ...this.journal.input, ...request };
+      this.journal.input = { ...this.journal.input, ...request, model: modelId };
       await this.persist();
       await RNFS.mkdir(directory);
       let path = output,
@@ -383,31 +392,35 @@ class VideoGenerationService {
         resultId = remote.provenance ? remote.syncId : id;
         provenance = remote.provenance;
       } else {
-        const pack = await resolveVideoPack(model!);
+        const pack = options?.nativeRecovery ? null : await resolveVideoPack(model!);
         await modelResidencyManager.runExclusive(
           'video-generation',
           async () => {
             const sizeMB =
-              model!.files.reduce(
+              (model?.files.reduce(
                 (sum, file) => sum + (file.sizeBytes ?? 0),
                 0,
-              ) /
+              ) ?? 0) /
                 1048576 +
               (request.width * request.height * request.frames * 12) / 1048576 +
               1024;
             const spec = {
               key: 'video',
               type: 'video' as const,
-              modelId: model!.id,
+              modelId,
               sizeMB,
               dirtyMemory: true,
               canEvict: () => false,
             };
-            const fit = await modelResidencyManager.makeRoomFor(spec, options);
-            if (!fit.fits)
-              throw new OverridableMemoryError(
-                'Not enough available memory for this video model and clip size.',
-              );
+            // The surviving native worker already owns this memory. Do not evict
+            // or load models while reattaching a replacement React bridge.
+            if (!options?.nativeRecovery) {
+              const fit = await modelResidencyManager.makeRoomFor(spec, options);
+              if (!fit.fits)
+                throw new OverridableMemoryError(
+                  'Not enough available memory for this video model and clip size.',
+                );
+            }
             if (this.cancelled) throw new Error('Video generation stopped.');
             registration = modelResidencyManager.register(spec, () =>
               this.cancelGeneration(),
@@ -415,11 +428,13 @@ class VideoGenerationService {
           },
         );
         if (this.cancelled) throw new Error('Video generation stopped.');
-        path = await videoGenerator.generate(
-          request, pack, output,
-          update => this.update(update),
-          reason => this.update({ error: reason, progress: null, preview: null }),
-        );
+        path = options?.nativeRecovery
+          ? await videoGenerator.recover(request, output, update => this.update(update))
+          : await videoGenerator.generate(
+              request, pack!, output,
+              update => this.update(update),
+              reason => this.update({ error: reason, progress: null, preview: null }),
+            );
       }
       if (this.cancelled) throw new Error('Video generation stopped.');
       const result: GeneratedVideo = {
diff --git a/src/services/videoGenerator.ts b/src/services/videoGenerator.ts
index 3794e26ca..8e95e049e 100644
--- a/src/services/videoGenerator.ts
+++ b/src/services/videoGenerator.ts
@@ -7,8 +7,43 @@ import type {
   VideoGenerationUpdateContract,
 } from '@offgrid/models';
 const native = NativeModules.VideoGenerationModule;
+type NativeVideoStatus = {
+  path: string;
+  phase: 'running' | 'succeeded' | 'failed';
+  stage: VideoGenerationUpdateContract['stage'];
+  step: number;
+  total: number;
+  backend?: VideoGenerationUpdateContract['backend'];
+  preview?: VideoGenerationUpdateContract['preview'];
+  code?: string;
+  error?: string;
+};
 export const videoGenerator = {
   available: () => !!native,
+  async getStatus(outputPath: string): Promise<NativeVideoStatus | null> {
+    return native?.getVideoStatus ? native.getVideoStatus(outputPath) : null;
+  },
+  async recover(
+    request: ResolvedVideoRequest,
+    outputPath: string,
+    onUpdate: (update: VideoGenerationUpdateContract) => void,
+  ): Promise<string> {
+    for (;;) {
+      const status = await videoGenerator.getStatus(outputPath);
+      if (!status) throw new Error('The native video job is no longer available.');
+      if (status.stage !== 'generating' || status.total === request.steps) onUpdate({
+        stage: status.stage,
+        backend: status.backend ?? null,
+        progress: status.total > 0 ? { step: status.step, total: status.total } : null,
+        ...(status.preview?.path === `${outputPath}.preview.png` ? { preview: status.preview } : {}),
+      });
+      if (status.phase === 'succeeded') return status.path;
+      if (status.phase === 'failed') {
+        throw Object.assign(new Error(status.error ?? 'Video generation failed.'), { code: status.code });
+      }
+      await new Promise<void>(resolve => setTimeout(resolve, 1000));
+    }
+  },
   cancel: async (): Promise<void> => {
     if (native) await native.cancel();
   },

From bb537c1c0e346d05fafdc374bee8cae60bcd97eb Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 05:24:41 +0530
Subject: [PATCH 099/129] fix: retain video completion after bridge disposal
 [skip ci]

---
 .../java/ai/offgridmobile/video/VideoGenerationModule.kt    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
index 540eca46b..4fa70d510 100644
--- a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
+++ b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
@@ -150,11 +150,13 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
                 }
                 check(destination.length() > 0) { "Video encoder produced no file." }
                 terminal = mapOf("phase" to "succeeded")
-                promise.resolve(Arguments.createMap().apply { putString("path", destination.path) })
+                if (context.hasActiveReactInstance())
+                    promise.resolve(Arguments.createMap().apply { putString("path", destination.path) })
             } catch (error: Throwable) {
                 val code = if (cancelled.get()) "VIDEO_CANCELLED" else "VIDEO_FAILED"
                 terminal = mapOf("phase" to "failed", "code" to code, "error" to (error.message ?: "Video generation failed."))
-                output?.delete(); promise.reject(code, error.message, error)
+                output?.delete()
+                if (context.hasActiveReactInstance()) promise.reject(code, error.message, error)
             } finally {
                 keepVideoScreenAwake(false)
                 encoder = null; previewFile = null; VideoGenerationService.cancel = null

From eaeeec9a124ab7fbdca3a143edadfba3505c81a8 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 05:28:44 +0530
Subject: [PATCH 100/129] feat(video): show auto setup pack files [skip ci]

---
 src/screens/AutoSetupScreen.tsx | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/screens/AutoSetupScreen.tsx b/src/screens/AutoSetupScreen.tsx
index 52f5761a6..8a380eba1 100644
--- a/src/screens/AutoSetupScreen.tsx
+++ b/src/screens/AutoSetupScreen.tsx
@@ -154,6 +154,16 @@ export const AutoSetupScreen: React.FC<Props> = ({
                       />
                     ) : null}
                   </View>
+                  {plan.items[3] && (
+                    <View style={styles.videoFiles}>
+                      <Text style={styles.includesLabel}>VIDEO FILES</Text>
+                      {plan.items[3].payload.files.map(file => (
+                        <Text key={file.name} style={styles.itemSize}>
+                          {file.name} - {formatBytes(file.sizeBytes ?? 0)}
+                        </Text>
+                      ))}
+                    </View>
+                  )}
                   <Text style={styles.total}>
                     {formatBytes(plan.totalBytes)} download
                   </Text>
@@ -284,6 +294,7 @@ const createStyles = (colors: ThemeColors, _shadows: ThemeShadows) => ({
     flexWrap: 'wrap' as const,
     gap: SPACING.sm,
   },
+  videoFiles: { gap: SPACING.xs },
   planItem: {
     flexBasis: '45%' as const,
     flexGrow: 1,

From 93220a43b34fdcf884565338f91ac5be27c5988b Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 05:35:59 +0530
Subject: [PATCH 101/129] fix(onboarding): read device RAM before auto setup
 [skip ci]

---
 src/services/autoSetupCatalog.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/services/autoSetupCatalog.ts b/src/services/autoSetupCatalog.ts
index ddc0498cc..74d4fb79b 100644
--- a/src/services/autoSetupCatalog.ts
+++ b/src/services/autoSetupCatalog.ts
@@ -13,7 +13,7 @@ const MB = 1024 * 1024;
 type CompatibleTextModel = ReturnType<typeof recommendedModelsForDevice>[number];
 
 export interface AutoSetupCatalogBoundaries {
-  totalMemoryGB: () => number;
+  totalMemoryGB: () => number | Promise<number>;
   videoAvailable?: () => boolean;
   fetchTextFiles: typeof fetchModelFiles;
   imageRecommendation: typeof hardwareService.getImageModelRecommendation;
@@ -21,7 +21,10 @@ export interface AutoSetupCatalogBoundaries {
 }
 
 const productionCatalogBoundaries: AutoSetupCatalogBoundaries = {
-  totalMemoryGB: () => hardwareService.getTotalMemoryGB(),
+  totalMemoryGB: async () => {
+    await hardwareService.getDeviceInfo();
+    return hardwareService.getTotalMemoryGB();
+  },
   videoAvailable: () => videoGenerator.available(),
   fetchTextFiles: fetchModelFiles,
   imageRecommendation: () => hardwareService.getImageModelRecommendation(),
@@ -53,7 +56,7 @@ export function buildAutoSetupTextCandidates(
 export async function loadAutoSetupCompatibleCatalog(
   boundaries: AutoSetupCatalogBoundaries = productionCatalogBoundaries,
 ): Promise<AutoSetupCompatibleCatalog> {
-  const ramGB = boundaries.totalMemoryGB();
+  const ramGB = await boundaries.totalMemoryGB();
   const textModels = recommendedModelsForDevice(ramGB).filter(model => model.type === 'vision');
   const files = await boundaries.fetchTextFiles(textModels);
   const text = buildAutoSetupTextCandidates(textModels, files, ramGB);

From dc67ffa0ce507b3e3198a4f0591927c713efd82f Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 05:35:59 +0530
Subject: [PATCH 102/129] feat(onboarding): choose auto setup model downloads
 [skip ci]

---
 src/components/Button.tsx        |   6 +-
 src/screens/AutoSetupScreen.tsx  | 105 ++++++++++++++++++++-----------
 src/services/autoSetupService.ts |  39 +++++++++---
 3 files changed, 102 insertions(+), 48 deletions(-)

diff --git a/src/components/Button.tsx b/src/components/Button.tsx
index 47517b4bd..e4c2d3037 100644
--- a/src/components/Button.tsx
+++ b/src/components/Button.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { TouchableOpacity, Text, ViewStyle, TextStyle } from 'react-native';
-import type { AccessibilityState } from 'react-native';
+import type { AccessibilityRole, AccessibilityState } from 'react-native';
 import { useTheme, useThemedStyles } from '../theme';
 import type { ThemeColors, ThemeShadows } from '../theme';
 import { SPACING, TYPOGRAPHY } from '../constants';
@@ -24,6 +24,7 @@ interface ButtonProps {
   testID?: string;
   accessibilityLabel?: string;
   accessibilityState?: AccessibilityState;
+  accessibilityRole?: AccessibilityRole;
 }
 
 export const Button: React.FC<ButtonProps> = ({
@@ -40,6 +41,7 @@ export const Button: React.FC<ButtonProps> = ({
   testID,
   accessibilityLabel,
   accessibilityState,
+  accessibilityRole = 'button',
 }) => {
   const { colors } = useTheme();
   const styles = useThemedStyles(createStyles);
@@ -69,7 +71,7 @@ export const Button: React.FC<ButtonProps> = ({
       disabled={disabled || loading}
       activeOpacity={0.7}
       testID={testID}
-      accessibilityRole="button"
+      accessibilityRole={accessibilityRole}
       accessibilityLabel={accessibilityLabel ?? title}
       accessibilityState={accessibilityState}
     >
diff --git a/src/screens/AutoSetupScreen.tsx b/src/screens/AutoSetupScreen.tsx
index 8a380eba1..c975a37f7 100644
--- a/src/screens/AutoSetupScreen.tsx
+++ b/src/screens/AutoSetupScreen.tsx
@@ -1,5 +1,6 @@
 import React, { useEffect, useMemo, useSyncExternalStore } from 'react';
 import { ScrollView, Text, View, useWindowDimensions } from 'react-native';
+import Icon from 'react-native-vector-icons/Feather';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import type { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { Button, Card } from '../components';
@@ -55,9 +56,14 @@ export const AutoSetupScreen: React.FC<Props> = ({
   const selected =
     snapshot.plans.find(plan => plan.tier === snapshot.selectedTier) ??
     snapshot.plans[0];
+  const selectedItems = selected?.items.filter(item =>
+    snapshot.selectedKinds.includes(item.kind),
+  ) ?? [];
+  const selectedBytes = selectedItems.reduce(
+    (total, item) => total + item.sizeBytes, 0,
+  );
   const selectedOutcomes =
-    selected?.items.map(item => snapshot.outcomes[autoSetupDownloadId(item)]) ??
-    [];
+    selectedItems.map(item => snapshot.outcomes[autoSetupDownloadId(item)]);
   const progress =
     selectedOutcomes.length === 0
       ? 0
@@ -113,7 +119,7 @@ export const AutoSetupScreen: React.FC<Props> = ({
           {snapshot.plans.map(plan => (
             <Card
               key={plan.tier}
-              onPress={() => session.selectTier(plan.tier)}
+              onPress={selected?.tier === plan.tier ? undefined : () => session.selectTier(plan.tier)}
               style={{
                 ...styles.planCard,
                 ...(width >= 700 ? styles.planCardWide : {}),
@@ -128,25 +134,63 @@ export const AutoSetupScreen: React.FC<Props> = ({
                   style={styles.expandedPlan}
                   testID="auto-setup-selected-plan"
                 >
-                  <Text style={styles.includesLabel}>INCLUDES</Text>
+                  <Text style={styles.includesLabel}>CHOOSE MODELS</Text>
                   <View style={styles.planItems}>
-                    {plan.items.map(item => (
-                      <View
-                        key={`${plan.tier}:${item.kind}:${item.id}`}
-                        style={styles.planItem}
-                      >
-                        <Text style={styles.itemKind}>
-                          {labelForItem(item)}
-                        </Text>
-                        <Text style={styles.planItemName}>{item.name}</Text>
-                        <Text style={styles.itemSize}>
-                          {formatBytes(item.sizeBytes)}
-                          {outcomeLabel(
-                            snapshot.outcomes[autoSetupDownloadId(item)],
+                    {plan.items.map(item => {
+                      const checked = snapshot.selectedKinds.includes(item.kind);
+                      return (
+                        <View
+                          key={`${plan.tier}:${item.kind}:${item.id}`}
+                          style={styles.planItem}
+                        >
+                          <Button
+                            title={labelForItem(item)}
+                            icon={
+                              <Icon
+                                name={checked ? 'check-square' : 'square'}
+                                size={18}
+                                color={checked ? colors.primary : colors.textSecondary}
+                              />
+                            }
+                            variant="ghost"
+                            size="small"
+                            active={checked}
+                            style={styles.choiceControl}
+                            onPress={() => session.toggleKind(item.kind)}
+                            disabled={starting}
+                            accessibilityRole="checkbox"
+                            accessibilityLabel={`Include ${item.name}, ${formatBytes(item.sizeBytes)}`}
+                            accessibilityState={{ checked, disabled: starting }}
+                            testID={`auto-setup-choice-${item.kind}`}
+                          />
+                          <Text style={styles.planItemName}>{item.name}</Text>
+                          <Text style={styles.itemSize}>
+                            {formatBytes(item.sizeBytes)}
+                            {outcomeLabel(
+                              snapshot.outcomes[autoSetupDownloadId(item)],
+                            )}
+                          </Text>
+                          {item.kind === 'video' && plan.items[3] && (
+                            <>
+                              <Text style={styles.includesLabel}>REQUIRED FILES</Text>
+                              {plan.items[3].payload.files.map(file => (
+                                <Text key={file.name} style={styles.itemSize}>
+                                  {file.name} - {formatBytes(file.sizeBytes ?? 0)}
+                                </Text>
+                              ))}
+                            </>
                           )}
+                        </View>
+                      );
+                    })}
+                    {!plan.items[3] && (
+                      <View style={styles.planItem}>
+                        <Text style={styles.itemKind}>VIDEO</Text>
+                        <Text style={styles.itemSize}>
+                          No compatible video model is included for this device.
                         </Text>
                       </View>
-                    ))}
+                    )}
                     {VoiceIndicator ? (
                       <VoiceIndicator
                         onPress={() => navigation.push('ProDetail')}
@@ -154,18 +198,8 @@ export const AutoSetupScreen: React.FC<Props> = ({
                       />
                     ) : null}
                   </View>
-                  {plan.items[3] && (
-                    <View style={styles.videoFiles}>
-                      <Text style={styles.includesLabel}>VIDEO FILES</Text>
-                      {plan.items[3].payload.files.map(file => (
-                        <Text key={file.name} style={styles.itemSize}>
-                          {file.name} - {formatBytes(file.sizeBytes ?? 0)}
-                        </Text>
-                      ))}
-                    </View>
-                  )}
                   <Text style={styles.total}>
-                    {formatBytes(plan.totalBytes)} download
+                    {formatBytes(selectedBytes)} selected download
                   </Text>
                   {(starting || selectedOutcomes.length > 0) && (
                     <View style={styles.progressTrack}>
@@ -191,12 +225,13 @@ export const AutoSetupScreen: React.FC<Props> = ({
                       title={
                         snapshot.phase === 'failed'
                           ? 'Retry Downloads'
-                          : `Download ${formatBytes(plan.totalBytes)}`
+                          : `Download ${formatBytes(selectedBytes)}`
                       }
                       onPress={() => {
                         session.start().catch(() => undefined);
                       }}
                       loading={starting}
+                      disabled={selectedItems.length === 0}
                       testID="auto-setup-download"
                     />
                   )}
@@ -289,15 +324,8 @@ const createStyles = (colors: ThemeColors, _shadows: ThemeShadows) => ({
     gap: SPACING.sm,
   },
   includesLabel: { ...TYPOGRAPHY.labelSmall, color: colors.textMuted },
-  planItems: {
-    flexDirection: 'row' as const,
-    flexWrap: 'wrap' as const,
-    gap: SPACING.sm,
-  },
-  videoFiles: { gap: SPACING.xs },
+  planItems: { gap: SPACING.sm },
   planItem: {
-    flexBasis: '45%' as const,
-    flexGrow: 1,
     gap: SPACING.xs,
     padding: SPACING.sm,
     borderWidth: 1,
@@ -305,6 +333,7 @@ const createStyles = (colors: ThemeColors, _shadows: ThemeShadows) => ({
     borderRadius: SPACING.sm,
     backgroundColor: colors.surfaceLight,
   },
+  choiceControl: { justifyContent: 'flex-start' as const },
   planItemName: { ...TYPOGRAPHY.body, color: colors.text },
   itemSize: {
     ...TYPOGRAPHY.meta,
diff --git a/src/services/autoSetupService.ts b/src/services/autoSetupService.ts
index 7f3566462..e8bb67e9e 100644
--- a/src/services/autoSetupService.ts
+++ b/src/services/autoSetupService.ts
@@ -46,6 +46,7 @@ interface AutoSetupSnapshot {
   phase: 'loading_catalog' | 'ready' | 'downloading' | 'completed' | 'failed';
   plans: AutoSetupPlan[];
   selectedTier: AutoSetupTier;
+  selectedKinds: AutoSetupPlan['items'][number]['kind'][];
   outcomes: Record<string, AutoSetupItemOutcome>;
   error: string | null;
 }
@@ -55,6 +56,7 @@ export interface AutoSetupSession {
   subscribe(listener: () => void): () => void;
   load(): Promise<void>;
   selectTier(tier: AutoSetupTier): void;
+  toggleKind(kind: AutoSetupPlan['items'][number]['kind']): void;
   start(): Promise<void>;
   complete(): void;
   dispose(): void;
@@ -107,10 +109,10 @@ function message(error: unknown): string {
 }
 
 function initialOutcomes(
-  plan: AutoSetupPlan,
+  items: AutoSetupPlan['items'][number][],
 ): Record<string, AutoSetupItemOutcome> {
   return Object.fromEntries(
-    plan.items.map(item => {
+    items.map(item => {
       const id = autoSetupDownloadId(item);
       return [id, { id, phase: 'waiting', progress: 0 }];
     }),
@@ -173,6 +175,7 @@ export function createAutoSetupSession(
     phase: 'loading_catalog',
     plans: [],
     selectedTier: tierFromPersistedIntent(),
+    selectedKinds: ['text'],
     outcomes: {},
     error: null,
   };
@@ -186,6 +189,8 @@ export function createAutoSetupSession(
   const selectedPlan = (): AutoSetupPlan | undefined =>
     state.plans.find(plan => plan.tier === state.selectedTier) ??
     state.plans[0];
+  const selectedItems = (plan: AutoSetupPlan) =>
+    plan.items.filter(item => state.selectedKinds.includes(item.kind));
 
   const stopActive = async (cancelled: boolean): Promise<void> => {
     const ids = [...activeIds];
@@ -270,17 +275,27 @@ export function createAutoSetupSession(
   const start = async (): Promise<void> => {
     const plan = selectedPlan();
     if (!plan || disposed) return;
+    const items = selectedItems(plan);
+    if (items.length === 0) return;
     const token = ++operation;
+    publish({ phase: 'downloading', error: null });
     await stopActive(false);
-    const existing = await downloads.list();
+    let existing: ModelDownload[];
+    try {
+      existing = await downloads.list();
+    } catch (error) {
+      if (!disposed && token === operation)
+        publish({ phase: 'failed', error: message(error) });
+      return;
+    }
     if (disposed || token !== operation) return;
     const completedIds = new Set(
       existing
         .filter(download => download.status === 'completed')
         .map(download => download.id),
     );
-    const outcomes = initialOutcomes(plan);
-    for (const item of plan.items) {
+    const outcomes = initialOutcomes(items);
+    for (const item of items) {
       const id = autoSetupDownloadId(item);
       if (completedIds.has(id))
         outcomes[id] = { id, phase: 'completed', progress: 1 };
@@ -363,18 +378,26 @@ export function createAutoSetupSession(
         error: null,
       });
     },
+    toggleKind(kind) {
+      if (state.phase === 'downloading') return;
+      if (!selectedPlan()?.items.some(item => item.kind === kind)) return;
+      const selectedKinds = state.selectedKinds.includes(kind)
+        ? state.selectedKinds.filter(selected => selected !== kind)
+        : [...state.selectedKinds, kind];
+      publish({ selectedKinds, outcomes: {}, error: null, phase: 'ready' });
+    },
     start,
     complete() {
       const plan = selectedPlan();
       if (plan && state.phase === 'completed') {
         const app = useAppStore.getState();
-        if (app.activeModelId === null) {
+        if (state.selectedKinds.includes('text') && app.activeModelId === null) {
           activeModelService.selectTextModel(plan.items[0].id);
         }
-        if (app.activeImageModelId === null) {
+        if (state.selectedKinds.includes('image') && app.activeImageModelId === null) {
           app.setActiveImageModelId(plan.items[1].id);
         }
-        if (app.activeVideoModelId === null && plan.items[3]) {
+        if (state.selectedKinds.includes('video') && app.activeVideoModelId === null && plan.items[3]) {
           app.setActiveVideoModelId(plan.items[3].id);
         }
       }

From 340e4400a196ac9c39f4f4f2484f93d390ef926d Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 05:42:25 +0530
Subject: [PATCH 103/129] fix(onboarding): explain video auto setup exclusion
 [skip ci]

---
 src/screens/AutoSetupScreen.tsx  |  2 +-
 src/services/autoSetupCatalog.ts | 23 +++++++++++++++++------
 src/services/autoSetupPlan.ts    |  3 +++
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/screens/AutoSetupScreen.tsx b/src/screens/AutoSetupScreen.tsx
index c975a37f7..cd5ae3fb3 100644
--- a/src/screens/AutoSetupScreen.tsx
+++ b/src/screens/AutoSetupScreen.tsx
@@ -187,7 +187,7 @@ export const AutoSetupScreen: React.FC<Props> = ({
                       <View style={styles.planItem}>
                         <Text style={styles.itemKind}>VIDEO</Text>
                         <Text style={styles.itemSize}>
-                          No compatible video model is included for this device.
+                          {plan.videoExclusionReason ?? 'No video model is included in this Auto Setup plan.'}
                         </Text>
                       </View>
                     )}
diff --git a/src/services/autoSetupCatalog.ts b/src/services/autoSetupCatalog.ts
index 74d4fb79b..091aeb602 100644
--- a/src/services/autoSetupCatalog.ts
+++ b/src/services/autoSetupCatalog.ts
@@ -94,16 +94,27 @@ export async function loadAutoSetupCompatibleCatalog(
     payload: { modelId: model.id },
   }));
 
-  const video = boundaries.videoAvailable?.() ? CATALOG.flatMap(model => {
-    if (model.kind !== 'video' || model.availability === 'coming_soon' ||
-        !model.minRamGb || model.minRamGb > ramGB || videoPackError(model.files) ||
-        model.files.some(file => !file.sizeBytes)) return [];
+  const completeVideoPacks = CATALOG.filter(model =>
+    model.kind === 'video' && model.availability !== 'coming_soon' &&
+    !!model.minRamGb && !videoPackError(model.files) &&
+    model.files.every(file => !!file.sizeBytes),
+  );
+  const videoAvailable = boundaries.videoAvailable?.() ?? false;
+  const video = videoAvailable ? completeVideoPacks.flatMap(model => {
+    if (model.minRamGb! > ramGB) return [];
     const sizeBytes = model.files.reduce((sum, file) => sum + (file.sizeBytes ?? 0), 0);
     if (fileExceedsBudget(sizeBytes, ramGB)) return [];
     return [{
       id: model.id, name: model.name, kind: 'video' as const, sizeBytes,
-      fitScore: ramFitScore(model.minRamGb, ramGB), payload: model,
+      fitScore: ramFitScore(model.minRamGb!, ramGB), payload: model,
     }];
   }) : [];
-  return { text, image, stt, video };
+  const minimumVideoRamGB = Math.min(...completeVideoPacks.map(model => model.minRamGb!));
+  const videoExclusionReason = video.length ? undefined
+    : !videoAvailable ? 'This app build does not include the local video engine.'
+    : !completeVideoPacks.length ? 'No complete video model pack is available in the catalog.'
+    : ramGB < minimumVideoRamGB
+      ? `Auto Setup recommends at least ${minimumVideoRamGB} GB RAM for video. This device reports ${ramGB.toFixed(1)} GB. Select Configure it yourself to review video models.`
+      : 'Video packs exceed this device\'s Auto Setup memory budget. Select Configure it yourself to review video models.';
+  return { text, image, stt, video, videoExclusionReason };
 }
diff --git a/src/services/autoSetupPlan.ts b/src/services/autoSetupPlan.ts
index 71596a508..ec7c4a22d 100644
--- a/src/services/autoSetupPlan.ts
+++ b/src/services/autoSetupPlan.ts
@@ -26,10 +26,12 @@ export interface AutoSetupPlan {
     ...AutoSetupCandidate<ModelEntry>[],
   ];
   totalBytes: number;
+  videoExclusionReason?: string;
 }
 
 export interface AutoSetupCompatibleCatalog {
   video?: AutoSetupCandidate<ModelEntry>[];
+  videoExclusionReason?: string;
   text: AutoSetupCandidate<{ modelId: string; file: ModelFile }>[];
   image: AutoSetupCandidate<ImageModelDescriptor>[];
   stt: AutoSetupCandidate<{ modelId: string }>[];
@@ -121,6 +123,7 @@ function selectAutoSetupPlan(
     ...PLAN_COPY[tier],
     items,
     totalBytes: items.reduce((total, item) => total + item.sizeBytes, 0),
+    ...(video ? {} : { videoExclusionReason: catalog.videoExclusionReason }),
   };
 }
 

From 2c295f57b3ba57679e0992ceaf5d5e711a2e7690 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 05:49:55 +0530
Subject: [PATCH 104/129] fix(onboarding): offer video on 12 GB devices [skip
 ci]

---
 src/screens/AutoSetupScreen.tsx  |  4 ++--
 src/services/autoSetupCatalog.ts | 20 ++++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/screens/AutoSetupScreen.tsx b/src/screens/AutoSetupScreen.tsx
index cd5ae3fb3..f879a2f48 100644
--- a/src/screens/AutoSetupScreen.tsx
+++ b/src/screens/AutoSetupScreen.tsx
@@ -95,8 +95,8 @@ export const AutoSetupScreen: React.FC<Props> = ({
         <Text style={styles.eyebrow}>AUTO SETUP</Text>
         <Text style={styles.title}>Your private AI, ready in one step.</Text>
         <Text style={styles.secondary}>
-          Choose how much capability you want. Every option is safe for this
-          device.
+          Choose the models you want to download. You can change your choice
+          later.
         </Text>
 
         {snapshot.error && (
diff --git a/src/services/autoSetupCatalog.ts b/src/services/autoSetupCatalog.ts
index 091aeb602..c587d93d3 100644
--- a/src/services/autoSetupCatalog.ts
+++ b/src/services/autoSetupCatalog.ts
@@ -1,7 +1,7 @@
 import { CATALOG, videoPackError } from '@offgrid/models';
 import { videoGenerator } from './videoGenerator';
 import { recommendedModelsForDevice, ramFitScore } from '../utils/recommendedModels';
-import { fileExceedsBudget } from './memoryBudget';
+import { fileExceedsBudget, modelBudgetFraction } from './memoryBudget';
 import { fetchModelFiles } from './modelCatalogFiles';
 import { hardwareService } from './hardware';
 import { WHISPER_MODELS } from './whisperModels';
@@ -101,7 +101,6 @@ export async function loadAutoSetupCompatibleCatalog(
   );
   const videoAvailable = boundaries.videoAvailable?.() ?? false;
   const video = videoAvailable ? completeVideoPacks.flatMap(model => {
-    if (model.minRamGb! > ramGB) return [];
     const sizeBytes = model.files.reduce((sum, file) => sum + (file.sizeBytes ?? 0), 0);
     if (fileExceedsBudget(sizeBytes, ramGB)) return [];
     return [{
@@ -109,12 +108,17 @@ export async function loadAutoSetupCompatibleCatalog(
       fitScore: ramFitScore(model.minRamGb!, ramGB), payload: model,
     }];
   }) : [];
-  const minimumVideoRamGB = Math.min(...completeVideoPacks.map(model => model.minRamGb!));
+  const smallestDownload = [...completeVideoPacks]
+    .sort((a, b) =>
+      a.files.reduce((sum, file) => sum + (file.sizeBytes ?? 0), 0) -
+      b.files.reduce((sum, file) => sum + (file.sizeBytes ?? 0), 0),
+    )[0];
+  const smallestDownloadGB = (smallestDownload?.files.reduce(
+    (sum, file) => sum + (file.sizeBytes ?? 0), 0,
+  ) ?? 0) / (1024 ** 3);
   const videoExclusionReason = video.length ? undefined
-    : !videoAvailable ? 'This app build does not include the local video engine.'
-    : !completeVideoPacks.length ? 'No complete video model pack is available in the catalog.'
-    : ramGB < minimumVideoRamGB
-      ? `Auto Setup recommends at least ${minimumVideoRamGB} GB RAM for video. This device reports ${ramGB.toFixed(1)} GB. Select Configure it yourself to review video models.`
-      : 'Video packs exceed this device\'s Auto Setup memory budget. Select Configure it yourself to review video models.';
+    : !videoAvailable ? 'This app build cannot run local video.'
+    : !smallestDownload ? 'Auto Setup has no complete video model to download.'
+    : `${smallestDownload.name} needs a ${smallestDownloadGB.toFixed(1)} GB download. Auto Setup's size limit for this device is ${(ramGB * modelBudgetFraction(ramGB)).toFixed(1)} GB. Select Configure it yourself to review video models.`;
   return { text, image, stt, video, videoExclusionReason };
 }

From 52ee40793d52476f4c359dae1c7313b4db8dc590 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 05:51:55 +0530
Subject: [PATCH 105/129] fix(onboarding): trust bundled video engine [skip ci]

---
 src/services/autoSetupCatalog.ts | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/services/autoSetupCatalog.ts b/src/services/autoSetupCatalog.ts
index c587d93d3..be49c4254 100644
--- a/src/services/autoSetupCatalog.ts
+++ b/src/services/autoSetupCatalog.ts
@@ -1,5 +1,4 @@
 import { CATALOG, videoPackError } from '@offgrid/models';
-import { videoGenerator } from './videoGenerator';
 import { recommendedModelsForDevice, ramFitScore } from '../utils/recommendedModels';
 import { fileExceedsBudget, modelBudgetFraction } from './memoryBudget';
 import { fetchModelFiles } from './modelCatalogFiles';
@@ -14,7 +13,6 @@ type CompatibleTextModel = ReturnType<typeof recommendedModelsForDevice>[number]
 
 export interface AutoSetupCatalogBoundaries {
   totalMemoryGB: () => number | Promise<number>;
-  videoAvailable?: () => boolean;
   fetchTextFiles: typeof fetchModelFiles;
   imageRecommendation: typeof hardwareService.getImageModelRecommendation;
   imageModels: typeof autoSetupImageCatalogProvider.load;
@@ -25,7 +23,6 @@ const productionCatalogBoundaries: AutoSetupCatalogBoundaries = {
     await hardwareService.getDeviceInfo();
     return hardwareService.getTotalMemoryGB();
   },
-  videoAvailable: () => videoGenerator.available(),
   fetchTextFiles: fetchModelFiles,
   imageRecommendation: () => hardwareService.getImageModelRecommendation(),
   imageModels: () => autoSetupImageCatalogProvider.load(),
@@ -99,15 +96,14 @@ export async function loadAutoSetupCompatibleCatalog(
     !!model.minRamGb && !videoPackError(model.files) &&
     model.files.every(file => !!file.sizeBytes),
   );
-  const videoAvailable = boundaries.videoAvailable?.() ?? false;
-  const video = videoAvailable ? completeVideoPacks.flatMap(model => {
+  const video = completeVideoPacks.flatMap(model => {
     const sizeBytes = model.files.reduce((sum, file) => sum + (file.sizeBytes ?? 0), 0);
     if (fileExceedsBudget(sizeBytes, ramGB)) return [];
     return [{
       id: model.id, name: model.name, kind: 'video' as const, sizeBytes,
       fitScore: ramFitScore(model.minRamGb!, ramGB), payload: model,
     }];
-  }) : [];
+  });
   const smallestDownload = [...completeVideoPacks]
     .sort((a, b) =>
       a.files.reduce((sum, file) => sum + (file.sizeBytes ?? 0), 0) -
@@ -117,7 +113,6 @@ export async function loadAutoSetupCompatibleCatalog(
     (sum, file) => sum + (file.sizeBytes ?? 0), 0,
   ) ?? 0) / (1024 ** 3);
   const videoExclusionReason = video.length ? undefined
-    : !videoAvailable ? 'This app build cannot run local video.'
     : !smallestDownload ? 'Auto Setup has no complete video model to download.'
     : `${smallestDownload.name} needs a ${smallestDownloadGB.toFixed(1)} GB download. Auto Setup's size limit for this device is ${(ramGB * modelBudgetFraction(ramGB)).toFixed(1)} GB. Select Configure it yourself to review video models.`;
   return { text, image, stt, video, videoExclusionReason };

From ff55f7f68f62b9a2671224216508f701803f776f Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 06:02:55 +0530
Subject: [PATCH 106/129] fix(video): preserve sampling state across reload
 [skip ci]

---
 .../java/ai/offgridmobile/video/VideoGenerationModule.kt    | 6 +++++-
 src/services/videoGenerationService.ts                      | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
index 4fa70d510..d3755117b 100644
--- a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
+++ b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
@@ -28,6 +28,7 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
     private var addedScreenFlag = false
     private var encoder: VideoEncoder? = null
     private var previewFile: File? = null
+    private var videoSteps = 0
     init { context.addLifecycleEventListener(this) }
     private fun releaseScreenFlag() {
         if (addedScreenFlag) awakeWindow?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
@@ -82,6 +83,8 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
     // Called synchronously by JNI while its worker owns the runtime.
     fun conditioning(backend: String) { emit("conditioning", 0, 0, backend) }
     fun progress(step: Int, total: Int) {
+        // Loading and VAE counters share this callback; preserve the sampling snapshot.
+        if (total != videoSteps || step !in 0..videoSteps) return
         emit("generating", step, total)
     }
     fun decoding(completed: Int, total: Int) { emit("decoding", completed, total) }
@@ -136,7 +139,8 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
                 ContextCompat.startForegroundService(context, Intent(context, VideoGenerationService::class.java))
                 VideoGenerationService.admission.get(5, TimeUnit.SECONDS)
                 check(!cancelled.get()) { "Video generation stopped." }
-                emit("preparing", 0, input.getInt("steps"))
+                videoSteps = input.getInt("steps")
+                emit("preparing", 0, videoSteps)
                 VideoEncoder(destination.path, input.getInt("width"), input.getInt("height"), input.getInt("fps")).use { writer ->
                     encoder = writer
                     nativeGenerate(checkNotNull(input.getString("weight")), checkNotNull(input.getString("vae")), if (input.hasKey("encoder")) input.getString("encoder") ?: "" else "",
diff --git a/src/services/videoGenerationService.ts b/src/services/videoGenerationService.ts
index ab0caa798..1d2ca8fa0 100644
--- a/src/services/videoGenerationService.ts
+++ b/src/services/videoGenerationService.ts
@@ -206,7 +206,7 @@ class VideoGenerationService {
       throw new Error(
         'Wait for the current generation to finish before retrying.',
       );
-    this.completion = this.run(this.journal.input, this.journal, options).finally(() => {
+    this.completion = this.run(this.journal.input, { ...this.journal, startedAt: Date.now() }, options).finally(() => {
       this.completion = null;
     });
     return this.completion;

From b85a21c5075ac26aab0b6dff30afb7c3d67b32fe Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 06:03:36 +0530
Subject: [PATCH 107/129] feat: stream lightweight SD image previews on mobile
 [skip ci]

---
 android/app/src/main/cpp/video/video-jni.cpp  |  17 +-
 .../video/VideoGenerationModule.kt            |  31 +++-
 native/video/VideoGenerationModule.mm         |  16 +-
 native/video/common/VideoRuntime.hpp          |  14 +-
 .../rag/__tests__/embeddingCatalog.test.cjs   |  67 ++++++++
 scripts/rag/__tests__/embeddingIndex.test.cjs | 121 +++++++++++++
 src/navigation/types.ts                       |   2 +-
 .../ModelsScreen/EmbeddingModelsTab.tsx       |  90 ++++++++++
 src/screens/ModelsScreen/index.tsx            |   4 +
 src/screens/ModelsScreen/types.ts             |   2 +-
 src/services/huggingFaceModelBrowser.ts       |  61 +++++++
 src/services/rag/database.ts                  |  46 +++++
 src/services/rag/embedding.ts                 | 160 +++++++++++++++++-
 src/services/rag/index.ts                     | 101 ++++++++++-
 src/services/rag/retrieval.ts                 |   5 +-
 src/services/toolEmbeddingRouter.ts           |  38 ++---
 16 files changed, 734 insertions(+), 41 deletions(-)
 create mode 100644 scripts/rag/__tests__/embeddingCatalog.test.cjs
 create mode 100644 scripts/rag/__tests__/embeddingIndex.test.cjs
 create mode 100644 src/screens/ModelsScreen/EmbeddingModelsTab.tsx

diff --git a/android/app/src/main/cpp/video/video-jni.cpp b/android/app/src/main/cpp/video/video-jni.cpp
index c0d489e9c..00973223e 100644
--- a/android/app/src/main/cpp/video/video-jni.cpp
+++ b/android/app/src/main/cpp/video/video-jni.cpp
@@ -160,7 +160,7 @@ extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationMod
   }
 }
 extern "C" JNIEXPORT jbyteArray JNICALL Java_ai_offgridmobile_video_VideoGenerationModule_nativeGenerateImage(
-  JNIEnv *env, jobject self, jstring prompt, jstring negative, jint width, jint height, jint steps, jdouble guidance, jdouble seed) {
+  JNIEnv *env, jobject self, jstring prompt, jstring negative, jint width, jint height, jint steps, jdouble guidance, jdouble seed, jint previewInterval) {
   jbyteArray output = nullptr;
   jobject owner = nullptr;
   try {
@@ -173,8 +173,9 @@ extern "C" JNIEXPORT jbyteArray JNICALL Java_ai_offgridmobile_video_VideoGenerat
     if (!owner) throw std::runtime_error("Could not retain the image host.");
     auto klass = env->GetObjectClass(self);
     auto progress = env->GetMethodID(klass, "imageProgress", "(II)V");
+    auto preview = env->GetMethodID(klass, "imagePreview", "([BIIII)V");
     env->DeleteLocalRef(klass);
-    if (!progress) throw std::runtime_error("Missing image progress callback.");
+    if (!progress || !preview) throw std::runtime_error("Missing image progress callback.");
     runtime.image(request, [&](int step, int total) {
       AttachedEnv thread(vm);
       if (!thread.env) { runtime.cancel(); return; }
@@ -187,6 +188,18 @@ extern "C" JNIEXPORT jbyteArray JNICALL Java_ai_offgridmobile_video_VideoGenerat
       output = env->NewByteArray(static_cast<jsize>(size));
       if (!output) throw std::runtime_error("Not enough memory to save the image.");
       env->SetByteArrayRegion(output, 0, size, reinterpret_cast<jbyte *>(image.data));
+    }, previewInterval, [&](int step, const sd_image_t &image) {
+      const uint64_t size = uint64_t(image.width) * image.height * image.channel;
+      if (!image.data || (image.channel != 3 && image.channel != 4) || size > INT32_MAX) return;
+      AttachedEnv thread(vm);
+      if (!thread.env) return;
+      jbyteArray bytes = thread.env->NewByteArray(static_cast<jsize>(size));
+      if (bytes) {
+        thread.env->SetByteArrayRegion(bytes, 0, size, reinterpret_cast<jbyte *>(image.data));
+        thread.env->CallVoidMethod(owner, preview, bytes, image.width, image.height, image.channel, step);
+        thread.env->DeleteLocalRef(bytes);
+      }
+      if (thread.env->ExceptionCheck()) thread.env->ExceptionClear();
     });
   } catch (const std::exception &error) {
     if (!env->ExceptionCheck()) {
diff --git a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
index d3755117b..02e94d5e0 100644
--- a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
+++ b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
@@ -98,10 +98,12 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
             })
         }.onFailure { destination.delete() }
     }
-    private fun saveRgbPng(rgb: ByteArray, width: Int, height: Int, destination: File) {
-        require(width > 0 && height > 0 && rgb.size.toLong() == width.toLong() * height * 3)
+    private fun saveRgbPng(rgb: ByteArray, width: Int, height: Int, destination: File, channels: Int = 3) {
+        require(width > 0 && height > 0 && channels in 3..4 && rgb.size.toLong() == width.toLong() * height * channels)
         val pixels = IntArray(width * height) { i ->
-            android.graphics.Color.rgb(rgb[i * 3].toInt() and 255, rgb[i * 3 + 1].toInt() and 255, rgb[i * 3 + 2].toInt() and 255)
+            val offset = i * channels
+            android.graphics.Color.argb(if (channels == 4) rgb[offset + 3].toInt() and 255 else 255,
+                rgb[offset].toInt() and 255, rgb[offset + 1].toInt() and 255, rgb[offset + 2].toInt() and 255)
         }
         val bitmap = android.graphics.Bitmap.createBitmap(pixels, width, height, android.graphics.Bitmap.Config.ARGB_8888)
         try { destination.outputStream().use { check(bitmap.compress(android.graphics.Bitmap.CompressFormat.PNG, 100, it)) } }
@@ -174,7 +176,22 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
     private external fun nativeLoadImage(path: String, weight: String, vae: String, llm: String, threads: Int, cpuOnly: Boolean)
     private external fun nativeUnloadImage()
     private external fun nativeImagePath(): String
-    private external fun nativeGenerateImage(prompt: String, negative: String, width: Int, height: Int, steps: Int, guidance: Double, seed: Double): ByteArray
+    private external fun nativeGenerateImage(prompt: String, negative: String, width: Int, height: Int, steps: Int, guidance: Double, seed: Double, previewInterval: Int): ByteArray
+    private var imagePreviewFile: File? = null
+    private var imageSteps = 0
+    fun imagePreview(pixels: ByteArray, width: Int, height: Int, channels: Int, step: Int) {
+        if (cancelled.get()) return
+        val file = imagePreviewFile ?: return
+        runCatching {
+            saveRgbPng(pixels, width, height, file, channels)
+            if (context.hasActiveReactInstance()) context.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                .emit("SDImageProgress", Arguments.createMap().apply {
+                    putInt("step", step); putInt("totalSteps", imageSteps)
+                    putDouble("progress", if (imageSteps > 0) step.toDouble() / imageSteps else 0.0)
+                    putString("previewPath", file.path)
+                })
+        }
+    }
     fun imageProgress(step: Int, total: Int) {
         if (!context.hasActiveReactInstance()) return
         context.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java).emit("SDImageProgress", Arguments.createMap().apply {
@@ -215,7 +232,9 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
                 VideoGenerationService.cancel = { stop() }
                 ContextCompat.startForegroundService(context, Intent(context, VideoGenerationService::class.java).putExtra("modality", "image"))
                 VideoGenerationService.admission.get(5, TimeUnit.SECONDS)
-                val bytes = nativeGenerateImage(checkNotNull(input.getString("prompt")), input.getString("negativePrompt") ?: "", width, height, input.getInt("steps"), input.getDouble("guidanceScale"), input.getDouble("seed"))
+                imagePreviewFile = File(output.path + ".preview.png")
+                imageSteps = input.getInt("steps")
+                val bytes = nativeGenerateImage(checkNotNull(input.getString("prompt")), input.getString("negativePrompt") ?: "", width, height, input.getInt("steps"), input.getDouble("guidanceScale"), input.getDouble("seed"), if (input.hasKey("previewInterval")) input.getInt("previewInterval").coerceAtLeast(0) else 0)
                 check(!cancelled.get()) { "Image generation stopped." }
                 saveRgbPng(bytes, width, height, output)
                 check(!cancelled.get()) { "Image generation stopped." }
@@ -223,7 +242,7 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
                     putString("imagePath", output.path); putInt("width", width); putInt("height", height); putDouble("seed", input.getDouble("seed")); putString("id", input.getString("id"))
                 })
             } catch (error: Throwable) { output?.delete(); promise.reject("IMAGE_FAILED", error.message, error) }
-            finally { VideoGenerationService.cancel = null; context.stopService(Intent(context, VideoGenerationService::class.java)); busy.set(false) }
+            finally { imagePreviewFile?.delete(); imagePreviewFile = null; VideoGenerationService.cancel = null; context.stopService(Intent(context, VideoGenerationService::class.java)); busy.set(false) }
         }
     }
     override fun invalidate() {
diff --git a/native/video/VideoGenerationModule.mm b/native/video/VideoGenerationModule.mm
index c1dfb81f1..7f944180a 100644
--- a/native/video/VideoGenerationModule.mm
+++ b/native/video/VideoGenerationModule.mm
@@ -8,11 +8,11 @@
 #include <cstring>
 
 static BOOL OGSaveRgbPng(const sd_image_t &image, NSString *output) {
-  if (!image.data || image.channel != 3) return NO;
-  CFDataRef data = CFDataCreate(kCFAllocatorDefault, image.data, image.width * image.height * 3);
+  if (!image.data || (image.channel != 3 && image.channel != 4)) return NO;
+  CFDataRef data = CFDataCreate(kCFAllocatorDefault, image.data, image.width * image.height * image.channel);
   CGDataProviderRef provider = data ? CGDataProviderCreateWithCFData(data) : nullptr;
   CGColorSpaceRef color = CGColorSpaceCreateDeviceRGB();
-  CGImageRef bitmap = provider ? CGImageCreate(image.width, image.height, 8, 24, image.width * 3, color, kCGImageAlphaNone, provider, nullptr, false, kCGRenderingIntentDefault) : nullptr;
+  CGImageRef bitmap = provider ? CGImageCreate(image.width, image.height, 8, 8 * image.channel, image.width * image.channel, color, image.channel == 4 ? kCGImageAlphaLast : kCGImageAlphaNone, provider, nullptr, false, kCGRenderingIntentDefault) : nullptr;
   NSData *png = bitmap ? UIImagePNGRepresentation([UIImage imageWithCGImage:bitmap]) : nil;
   if (bitmap) CGImageRelease(bitmap);
   CGColorSpaceRelease(color); if (provider) CGDataProviderRelease(provider); if (data) CFRelease(data);
@@ -247,6 +247,15 @@ - (void)emitStage:(NSString *)stage step:(int)step total:(int)total {
             if (!image.data || image.channel != 3 || image.width != request.width || image.height != request.height)
               throw std::runtime_error("The image engine returned invalid pixels.");
             if (!OGSaveRgbPng(image, output)) throw std::runtime_error("Could not save the image.");
+          }, std::max(0, [input[@"previewInterval"] intValue]), [&](int step, const sd_image_t &image) {
+            NSString *path = [output stringByAppendingString:@".preview.png"];
+            if (!OGSaveRgbPng(image, path)) return;
+            const int total = request.steps;
+            dispatch_async(dispatch_get_main_queue(), ^{
+              if (self->_listeners) [self sendEventWithName:@"SDImageProgress" body:@{
+                @"step":@(step), @"totalSteps":@(total), @"progress":@(total > 0 ? double(step) / total : 0), @"previewPath":path
+              }];
+            });
           });
           if (self->_runtime.cancelled.load()) throw std::runtime_error("Image generation stopped.");
         } catch (const std::exception &error) {
@@ -255,6 +264,7 @@ - (void)emitStage:(NSString *)stage step:(int)step total:(int)total {
         dispatch_async(dispatch_get_main_queue(), ^{
           self->_busy = NO;
           [self restoreScreenIdleTimer];
+          [[NSFileManager defaultManager] removeItemAtPath:[output stringByAppendingString:@".preview.png"] error:nil];
           if (failure) reject(@"IMAGE_FAILED", failure, nil);
           else resolve(@{@"id":input[@"id"], @"imagePath":output, @"width":input[@"width"], @"height":input[@"height"], @"seed":input[@"seed"]});
         });
diff --git a/native/video/common/VideoRuntime.hpp b/native/video/common/VideoRuntime.hpp
index 174a9d7a0..c4a22e315 100644
--- a/native/video/common/VideoRuntime.hpp
+++ b/native/video/common/VideoRuntime.hpp
@@ -157,13 +157,16 @@ class VideoRuntime {
   }
   void image(const VideoRequest &request,
              const std::function<void(int, int)> &progress,
-             const std::function<void(const sd_image_t &)> &save) {
+             const std::function<void(const sd_image_t &)> &save,
+             int previewInterval = 0,
+             const std::function<void(int, const sd_image_t &)> &preview = {}) {
     std::unique_lock<std::mutex> execution(executionMutex, std::try_to_lock);
     if (!execution.owns_lock()) throw std::runtime_error("Image or video generation is running.");
     if (!imageContext) throw std::runtime_error("Image model is unloaded.");
     sd_image_t *images = nullptr; int count = 0;
     auto cleanup = [&] {
       sd_set_progress_callback(nullptr, nullptr);
+      sd_set_preview_callback(nullptr, PREVIEW_NONE, 0, false, false, nullptr);
       if (images) free_sd_images(images, count);
     };
     try {
@@ -171,6 +174,15 @@ class VideoRuntime {
       sd_set_progress_callback([](int step, int total, float, void *data) {
         (*static_cast<const std::function<void(int, int)> *>(data))(step, total);
       }, const_cast<void *>(static_cast<const void *>(&progress)));
+      if (preview && previewInterval > 0) {
+        // Project the existing latent tensor. Do not run an extra VAE decode.
+        sd_set_preview_callback([](int step, int count, sd_image_t* frames, bool, void* data) {
+          if (count < 1 || !frames || !frames[0].data) return;
+          try { (*static_cast<const std::function<void(int, const sd_image_t &)>*>(data))(step, frames[0]); }
+          catch (...) { /* Optional previews must not fail generation. */ }
+        }, PREVIEW_PROJ, previewInterval, true, false,
+           const_cast<void*>(static_cast<const void*>(&preview)));
+      }
       sd_img_gen_params_t params; sd_img_gen_params_init(&params);
       params.prompt = request.prompt.c_str(); params.negative_prompt = request.negative.c_str();
       params.width = request.width; params.height = request.height; params.seed = request.seed;
diff --git a/scripts/rag/__tests__/embeddingCatalog.test.cjs b/scripts/rag/__tests__/embeddingCatalog.test.cjs
new file mode 100644
index 000000000..8df15a99d
--- /dev/null
+++ b/scripts/rag/__tests__/embeddingCatalog.test.cjs
@@ -0,0 +1,67 @@
+/* eslint-env node, es2022 */
+const { test } = require('node:test');
+const assert = require('node:assert/strict');
+const { readFileSync } = require('node:fs');
+const path = require('node:path');
+const vm = require('node:vm');
+const ts = require('typescript');
+
+// HTTP is the external boundary. Repository and file responses use the Hub API contract.
+function browser(fetchBoundary) {
+  const filename = path.resolve(__dirname, '../../../src/services/huggingFaceModelBrowser.ts');
+  const source = ts.transpileModule(readFileSync(filename, 'utf8'), {
+    compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2022 },
+  }).outputText;
+  const module = { exports: {} };
+  const nativeRequire = name => name === 'react-native-fs' ? require('node:fs/promises') : require(name);
+  vm.runInThisContext(`(function(require,module,exports,fetch){${source}\n})`, { filename })(nativeRequire, module, module.exports, fetchBoundary);
+  return module.exports;
+}
+const revision = 'a'.repeat(40);
+const response = data => new Response(JSON.stringify(data));
+
+test('search combines embedding tasks and returns pinned single-file candidates only', async () => {
+  const { searchEmbeddingModels } = browser(async address => {
+    const url = new URL(address);
+    if (url.pathname === '/api/models') {
+      return response(url.searchParams.get('pipeline_tag') === 'feature-extraction'
+        ? [{ id: 'org/encoder' }, { id: 'org/decoder' }]
+        : [{ id: 'org/encoder' }]);
+    }
+    if (url.pathname === '/api/models/org/decoder') return response({ sha: revision, gguf: { architecture: 'llama' }, siblings: [] });
+    if (url.pathname === '/api/models/org/encoder') return response({
+      sha: revision, gguf: { architecture: 'bert' }, siblings: [
+        { rfilename: 'nested/encoder Q8.gguf', lfs: { size: 40000000, sha256: 'b'.repeat(64) } },
+        { rfilename: 'encoder-00001-of-00002.gguf', size: 30 },
+        { rfilename: 'mmproj.gguf', size: 30 },
+        { rfilename: 'encoder.onnx', size: 30 },
+        { rfilename: 'unknown.gguf' },
+      ],
+    });
+    throw new Error(`Unexpected API resource: ${url.pathname}`);
+  });
+  const found = await searchEmbeddingModels('encoder');
+  assert.equal(found.length, 1);
+  assert.equal(found[0].id, `org/encoder@${revision}/nested/encoder Q8.gguf`);
+  assert.equal(found[0].downloadUrl, `https://huggingface.co/org/encoder/resolve/${revision}/nested/encoder%20Q8.gguf`);
+  assert.equal(found[0].size, 40000000);
+  assert.equal(found[0].sha256, 'b'.repeat(64));
+});
+
+test('search reports a failed file listing instead of claiming no compatible models exist', async () => {
+  const { searchEmbeddingModels } = browser(async address => new URL(address).pathname === '/api/models'
+    ? response([{ id: 'org/encoder' }]) : new Response('', { status: 503 }));
+  await assert.rejects(searchEmbeddingModels('encoder'), /Could not read embedding model files/);
+});
+
+test('recommendations have pinned identities, checksums, and explicit download bytes', () => {
+  const { RECOMMENDED_EMBEDDING_MODELS, BUNDLED_EMBEDDING_MODEL } = browser(fetch);
+  assert.equal(BUNDLED_EMBEDDING_MODEL.size, 0);
+  assert.equal(BUNDLED_EMBEDDING_MODEL.downloadUrl, undefined);
+  for (const candidate of RECOMMENDED_EMBEDDING_MODELS) {
+    assert.match(candidate.id, /@[a-f0-9]{40}\/.+\.gguf$/);
+    assert.match(candidate.downloadUrl, /\/resolve\/[a-f0-9]{40}\/.+\.gguf$/);
+    assert.match(candidate.sha256, /^[a-f0-9]{64}$/);
+    assert.ok(candidate.size > 0);
+  }
+});
diff --git a/scripts/rag/__tests__/embeddingIndex.test.cjs b/scripts/rag/__tests__/embeddingIndex.test.cjs
new file mode 100644
index 000000000..db1c3526d
--- /dev/null
+++ b/scripts/rag/__tests__/embeddingIndex.test.cjs
@@ -0,0 +1,121 @@
+/* eslint-env node, es2022 */
+/* Real SQLite at the native op-sqlite boundary. No application services are replaced. */
+const { test } = require('node:test');
+const assert = require('node:assert/strict');
+const { DatabaseSync } = require('node:sqlite');
+const { readFileSync, mkdtempSync, rmSync } = require('node:fs');
+const { tmpdir } = require('node:os');
+const path = require('node:path');
+const vm = require('node:vm');
+const ts = require('typescript');
+
+function database(t) {
+  const directory = mkdtempSync(path.join(tmpdir(), 'embedding-index-'));
+  const connections = [];
+  const sqlite = {
+    open({ name }) {
+      const db = new DatabaseSync(path.join(directory, name));
+      connections.push(db);
+      db.exec('PRAGMA max_page_count = 100');
+      return {
+        executeSync(sql, params = []) {
+          const statement = db.prepare(sql);
+          const bindings = params.map(p => p instanceof ArrayBuffer ? new Uint8Array(p) : p);
+          if (statement.columns().length) {
+            return { rows: statement.all(...bindings).map(row => Object.fromEntries(
+              Object.entries(row).map(([key, value]) => [key, value instanceof Uint8Array
+                ? value.buffer.slice(value.byteOffset, value.byteOffset + value.byteLength) : value]),
+            )) };
+          }
+          const result = statement.run(...bindings);
+          return { rows: [], insertId: Number(result.lastInsertRowid), rowsAffected: result.changes };
+        },
+      };
+    },
+  };
+  t.after(() => { connections.forEach(db => db.close()); rmSync(directory, { recursive: true }); });
+  function reopen() {
+    const cache = new Map();
+    function load(filename) {
+      if (cache.has(filename)) return cache.get(filename).exports;
+      const module = { exports: {} };
+      cache.set(filename, module);
+      const source = ts.transpileModule(readFileSync(filename, 'utf8'), {
+        compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2022 },
+      }).outputText;
+      const boundaryRequire = name => {
+        if (name === '@op-engineering/op-sqlite') return sqlite;
+        if (name.startsWith('.')) return load(path.resolve(path.dirname(filename), `${name}.ts`));
+        return require(name);
+      };
+      vm.runInThisContext(`(function(require,module,exports,__DEV__){${source}\n})`, { filename })(boundaryRequire, module, module.exports, false);
+      return module.exports;
+    }
+    return load(path.resolve(__dirname, '../../../src/services/rag/database.ts')).ragDatabase;
+  }
+  return reopen;
+}
+
+async function seed(db) {
+  await db.ensureReady();
+  const docId = db.insertDocument({ projectId: 'project', name: 'note.txt', path: '/note.txt', size: 12 });
+  const [chunkRowid] = db.insertChunks(docId, [{ content: 'Searchable note', position: 0 }]);
+  db.insertEmbeddingsBatch([{ docId, chunkRowid, embedding: [1, 0] }]);
+  return { docId, chunkRowid };
+}
+
+function replace(db, model, entries) {
+  db.beginEmbeddingRebuild();
+  for (const entry of entries) db.stageEmbedding(entry);
+  db.commitEmbeddingRebuild(model);
+  db.discardEmbeddingRebuild();
+}
+
+const model = { id: 'repo@revision/encoder.gguf', name: 'Encoder', filePath: '/encoder.gguf', size: 42 };
+
+test('switch persists the model and replacement vectors together; original documents remain', async t => {
+  const reopen = database(t);
+  const db = reopen();
+  const entry = await seed(db);
+  assert.equal(db.getEmbeddingModel(), null);
+  replace(db, model, [{ ...entry, embedding: [0, 1, 0] }]);
+  const restarted = reopen();
+  await restarted.ensureReady();
+  assert.deepEqual(restarted.getEmbeddingModel(), model);
+  assert.deepEqual(restarted.getEmbeddingsByProject('project').map(row => row.embedding), [[0, 1, 0]]);
+  assert.equal(restarted.getDocumentsByProject('project')[0].name, 'note.txt');
+  assert.equal(restarted.getChunksByDocument(entry.docId)[0].content, 'Searchable note');
+  replace(restarted, null, [{ ...entry, embedding: [1, 0] }]);
+  assert.equal(restarted.getEmbeddingModel(), null);
+  assert.deepEqual(restarted.getEmbeddingsByProject('project').map(row => row.embedding), [[1, 0]]);
+});
+
+test('a storage failure preserves both the prior model and searchable vectors', async t => {
+  const reopen = database(t);
+  const db = reopen();
+  const entry = await seed(db);
+  replace(db, model, [{ ...entry, embedding: [0, 1] }]);
+  assert.throws(() => replace(db, { ...model, id: 'another' }, [
+    { ...entry, embedding: new Array(200000).fill(1) },
+  ]));
+  const restarted = reopen();
+  await restarted.ensureReady();
+  assert.deepEqual(restarted.getEmbeddingModel(), model);
+  assert.deepEqual(restarted.getEmbeddingsByProject('project').map(row => row.embedding), [[0, 1]]);
+});
+
+test('uncommitted or cancelled staging never changes the saved model or same-size vectors', async t => {
+  const reopen = database(t);
+  const db = reopen();
+  const entry = await seed(db);
+  db.beginEmbeddingRebuild();
+  db.stageEmbedding({ ...entry, embedding: [0, 1] });
+  const restarted = reopen();
+  await restarted.ensureReady();
+  assert.equal(restarted.getEmbeddingModel(), null);
+  assert.deepEqual(restarted.getEmbeddingsByProject('project').map(row => row.embedding), [[1, 0]]);
+  db.discardEmbeddingRebuild();
+  assert.deepEqual(db.getEmbeddingsByProject('project').map(row => row.embedding), [[1, 0]]);
+  replace(db, model, [{ ...entry, embedding: [0, 1] }]);
+  assert.deepEqual(db.getEmbeddingsByProject('project').map(row => row.embedding), [[0, 1]]);
+});
diff --git a/src/navigation/types.ts b/src/navigation/types.ts
index 7bc4906a3..0109193d3 100644
--- a/src/navigation/types.ts
+++ b/src/navigation/types.ts
@@ -37,7 +37,7 @@ export type MainTabParamList = {
   ProjectsTab: undefined;
   ModelsTab:
     | {
-        initialTab?: 'text' | 'image' | 'video' | 'voice' | 'transcription';
+        initialTab?: 'text' | 'image' | 'video' | 'voice' | 'transcription' | 'embedding';
         repairModelId?: string;
         initialSearchQuery?: string;
       }
diff --git a/src/screens/ModelsScreen/EmbeddingModelsTab.tsx b/src/screens/ModelsScreen/EmbeddingModelsTab.tsx
new file mode 100644
index 000000000..b4c85859e
--- /dev/null
+++ b/src/screens/ModelsScreen/EmbeddingModelsTab.tsx
@@ -0,0 +1,90 @@
+import React, { useEffect, useState, useSyncExternalStore } from 'react';
+import { ScrollView, Text, TextInput, View } from 'react-native';
+import { Button, ModelCard } from '../../components';
+import { CustomAlert, initialAlertState, showAlert, hideAlert } from '../../components/CustomAlert';
+import { searchEmbeddingModels, RECOMMENDED_EMBEDDING_MODELS } from '../../services/huggingFaceModelBrowser';
+import { ragService } from '../../services/rag';
+import { ragDatabase, type EmbeddingModelSelection } from '../../services/rag/database';
+import { useTheme, useThemedStyles } from '../../theme';
+import { createStyles } from './styles';
+
+type Candidate = Awaited<ReturnType<typeof searchEmbeddingModels>>[number];
+
+export const EmbeddingModelsTab: React.FC = () => {
+  const styles = useThemedStyles(createStyles);
+  const { colors } = useTheme();
+  const status = useSyncExternalStore(ragService.subscribeEmbeddingChange, ragService.getEmbeddingChange);
+  const [active, setActive] = useState<EmbeddingModelSelection | null>(null);
+  const [ready, setReady] = useState(false);
+  const [query, setQuery] = useState('');
+  const [results, setResults] = useState<Candidate[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState('');
+  const [alert, setAlert] = useState(initialAlertState);
+
+  useEffect(() => {
+    let current = true;
+    ragDatabase.ensureReady().then(() => {
+      if (current) { setActive(ragDatabase.getEmbeddingModel()); setReady(true); }
+    }).catch(e => { if (current) setError(String(e.message)); });
+    return () => { current = false; };
+  }, [status.busy]);
+
+  useEffect(() => {
+    const controller = new AbortController();
+    setResults([]);
+    setError('');
+    if (!query.trim()) { setLoading(false); return; }
+    setLoading(true);
+    const timer = setTimeout(() => {
+      searchEmbeddingModels(query, controller.signal)
+        .then(rows => { if (!controller.signal.aborted) setResults(rows); })
+        .catch(e => { if (!controller.signal.aborted) setError(String(e.message)); })
+        .finally(() => { if (!controller.signal.aborted) setLoading(false); });
+    }, 350);
+    return () => { clearTimeout(timer); controller.abort(); };
+  }, [query]);
+
+  const select = (candidate: Candidate | null) => setAlert(showAlert(
+    'Rebuild search indexes?',
+    `Use ${candidate?.name ?? 'the built-in MiniLM model'}? This rebuilds semantic search and all project knowledge indexes on this phone. Search waits until indexing ends. Tool search vectors are rebuilt when used. Keep the app open. Your documents are kept. If the change fails, the current model and indexes stay active.`,
+    [
+      { text: 'Cancel', style: 'cancel' },
+      { text: 'Switch and rebuild', onPress: () => { ragService.installEmbeddingModel(candidate).catch(e => setError(String(e.message))); } },
+    ],
+  ));
+
+  return (
+    <ScrollView contentContainerStyle={styles.listContent} keyboardShouldPersistTaps="handled" testID="embedding-models-tab">
+      <Text style={styles.sectionTitle}>Embedding models</Text>
+      <Text style={styles.emptyText}>Search your project knowledge on this phone. The built-in model works offline.</Text>
+      <ModelCard compact model={{ id: active?.id ?? 'bundled', name: active?.name ?? 'MiniLM (built-in)', author: 'Active embedding model' }} isDownloaded isActive />
+      {active && <Button title="Use built-in model" disabled={status.busy || !ready} onPress={() => select(null)} />}
+      <View style={styles.searchContainer}>
+        <TextInput
+          style={styles.searchInput} value={query} onChangeText={setQuery}
+          placeholder="Search Hugging Face embeddings" placeholderTextColor={colors.textMuted}
+          accessibilityLabel="Search Hugging Face embedding models" autoCapitalize="none" autoCorrect={false}
+          testID="embedding-search-input"
+        />
+      </View>
+      <Text style={styles.emptyText}>BERT GGUF text encoders. Download size is not runtime memory. Each model is checked on this phone before use.</Text>
+      {!!status.message && <Text style={styles.emptyText} accessibilityLiveRegion="polite" testID="embedding-index-progress">{status.message}</Text>}
+      {!!(status.error || error) && <Text style={styles.emptyText} accessibilityRole="alert">{status.error || error}</Text>}
+      {status.busy && <Button title="Cancel model change" onPress={ragService.cancelEmbeddingChange} />}
+      {loading && <Text style={styles.emptyText}>Searching Hugging Face...</Text>}
+      {!loading && query.trim() !== '' && !error && results.length === 0 && <Text style={styles.emptyText}>No candidate files found. Try a different model name.</Text>}
+      {!query.trim() && <Text style={styles.sectionTitle}>Recommended candidates</Text>}
+      {(query.trim() ? results : RECOMMENDED_EMBEDDING_MODELS).map(candidate => (
+        <ModelCard key={candidate.id} compact
+          model={{ id: candidate.id, name: candidate.name, author: `${Math.round(candidate.size / 1024 / 1024)} MB download`, description: 'Candidate: device validation required' }}
+          isActive={active?.id === candidate.id}
+          disabled={status.busy || !ready || active?.id === candidate.id}
+          onPress={() => select(candidate)}
+          footer={<Button title="Check and use" disabled={status.busy || !ready || active?.id === candidate.id} onPress={() => select(candidate)} />}
+        />
+      ))}
+      <CustomAlert {...alert} onClose={() => setAlert(hideAlert())} />
+    </ScrollView>
+  );
+};
diff --git a/src/screens/ModelsScreen/index.tsx b/src/screens/ModelsScreen/index.tsx
index af497ae05..60e17a009 100644
--- a/src/screens/ModelsScreen/index.tsx
+++ b/src/screens/ModelsScreen/index.tsx
@@ -1,3 +1,4 @@
+import { EmbeddingModelsTab } from './EmbeddingModelsTab';
 import { VideoModelsTab } from './VideoModelsTab';
 import type { HFSearchResult } from '@offgrid/models';
 import React, { useCallback, useRef, useState } from 'react';
@@ -25,6 +26,7 @@ const MODEL_TABS: ReadonlyArray<{
   testID?: string;
 }> = [
   { key: 'text', label: 'Text' },
+  { key: 'embedding', label: 'Embedding', testID: 'embedding-tab' },
   { key: 'image', label: 'Image' },
   { key: 'video', label: 'Video' },
   { key: 'voice', label: 'Voice', testID: 'voice-models-tab' },
@@ -228,6 +230,8 @@ export const ModelsScreen: React.FC<ModelsScreenProps> = ({
         />
       )}
 
+      {vm.activeTab === 'embedding' && <EmbeddingModelsTab />}
+
       {/* Image Models Tab */}
       {vm.activeTab === 'video' && <VideoModelsTab selected={selectedVideoModel} setSelected={setSelectedVideoModel} />}
       {vm.activeTab === 'image' && (
diff --git a/src/screens/ModelsScreen/types.ts b/src/screens/ModelsScreen/types.ts
index 43e5342eb..a57777c07 100644
--- a/src/screens/ModelsScreen/types.ts
+++ b/src/screens/ModelsScreen/types.ts
@@ -13,7 +13,7 @@ export type SizeFilter = 'all' | 'tiny' | 'small' | 'medium' | 'large';
 export type SortOption = 'recommended' | 'bestfit' | 'size' | 'downloads' | 'recency';
 export type FilterDimension = 'org' | 'type' | 'source' | 'size' | 'quant' | 'sort' | null;
 export type ImageFilterDimension = 'backend' | 'style' | 'sdVersion' | null;
-export type ModelTab = 'text' | 'image' | 'video' | 'voice' | 'transcription';
+export type ModelTab = 'text' | 'image' | 'video' | 'voice' | 'transcription' | 'embedding';
 
 export interface FilterState {
   orgs: string[];
diff --git a/src/services/huggingFaceModelBrowser.ts b/src/services/huggingFaceModelBrowser.ts
index b296ddd2c..0dea7d7d0 100644
--- a/src/services/huggingFaceModelBrowser.ts
+++ b/src/services/huggingFaceModelBrowser.ts
@@ -212,3 +212,64 @@ export async function resolveSDImagePack(_modelId: string, modelPath: string) {
     llm: required(/^Qwen3VL-.*\.gguf$/i),
   };
 }
+
+export const BUNDLED_EMBEDDING_MODEL = {
+  id: 'bundled:all-MiniLM-L6-v2-Q8_0', name: 'MiniLM L6 (built-in)',
+  description: 'English text search. Included with the app.', size: 0, downloadUrl: undefined,
+} as const;
+
+/** Pinned Hugging Face files; runtime validation is still required on each phone. */
+export const RECOMMENDED_EMBEDDING_MODELS = [
+  {
+    id: 'leliuga/all-MiniLM-L12-v2-GGUF@f048c4f3577816f9825989a59a7eed3c9afa3f1d/all-MiniLM-L12-v2.Q8_0.gguf',
+    name: 'MiniLM L12', description: 'English text search, 12-layer encoder.', size: 36413728,
+    downloadUrl: 'https://huggingface.co/leliuga/all-MiniLM-L12-v2-GGUF/resolve/f048c4f3577816f9825989a59a7eed3c9afa3f1d/all-MiniLM-L12-v2.Q8_0.gguf',
+    sha256: '161d07a32057e754e1fe82e30547c736032ab255a6719890b7e76414c565b748',
+  },
+  {
+    id: 'armand01/paraphrase-multilingual-MiniLM-L12-v2-Q6_K-GGUF@34b69e1683fccf80bbbe7255b8651cd7a76e8891/paraphrase-multilingual-minilm-l12-v2.Q6_K.gguf',
+    name: 'Multilingual MiniLM L12', description: 'Text search across multiple languages.', size: 130844160,
+    downloadUrl: 'https://huggingface.co/armand01/paraphrase-multilingual-MiniLM-L12-v2-Q6_K-GGUF/resolve/34b69e1683fccf80bbbe7255b8651cd7a76e8891/paraphrase-multilingual-minilm-l12-v2.Q6_K.gguf',
+    sha256: 'b5780f54a02b2e9a1cded186d349800aedfd6fb38635c41f532a9385fed34d32',
+  },
+] as const;
+
+/** GGUF text encoders are candidates until the local runtime validates the file. */
+export async function searchEmbeddingModels(query: string, signal?: AbortSignal) {
+  const params = new URLSearchParams({
+    search: query.trim(), filter: 'gguf',
+    sort: 'downloads', direction: '-1', limit: '20',
+  });
+  const searches = await Promise.all(['sentence-similarity', 'feature-extraction'].map(async tag => {
+    const response = await fetch(`https://huggingface.co/api/models?${params}&pipeline_tag=${tag}`, { signal });
+    if (!response.ok) throw new Error(`Embedding search failed: HTTP ${response.status}`);
+    return await response.json() as { id: string }[];
+  }));
+  const repos = [...new Map(searches.flat().map(repo => [repo.id, repo])).values()];
+  const listings = await Promise.allSettled(repos.map(async repo => {
+    const result = await fetch(`https://huggingface.co/api/models/${repo.id}?blobs=true`, { signal });
+    if (!result.ok) throw new Error(`Could not read ${repo.id}`);
+    const data = await result.json() as {
+      sha: string;
+      gguf?: { architecture?: string };
+      siblings?: { rfilename: string; size?: number; lfs?: { size: number; sha256?: string } }[];
+    };
+    if (!/^[a-f0-9]{40}$/i.test(data.sha) || (data.gguf?.architecture && data.gguf.architecture !== 'bert')) return [];
+    return (data.siblings ?? []).filter(file =>
+      /\.gguf$/i.test(file.rfilename) &&
+      !/mmproj|(?:-\d{5}-of-\d{5})/i.test(file.rfilename) &&
+      (file.lfs?.size ?? file.size ?? 0) > 0,
+    ).map(file => ({
+      id: `${repo.id}@${data.sha}/${file.rfilename}`,
+      name: `${repo.id} / ${file.rfilename}`,
+      size: file.lfs?.size ?? file.size ?? 0,
+      sha256: file.lfs?.sha256,
+      downloadUrl: `https://huggingface.co/${repo.id}/resolve/${data.sha}/${file.rfilename.split('/').map(encodeURIComponent).join('/')}`,
+    }));
+  }));
+  if (signal?.aborted) throw new Error('Embedding search cancelled');
+  if (listings.length && listings.every(result => result.status === 'rejected')) {
+    throw new Error('Could not read embedding model files. Try again.');
+  }
+  return listings.flatMap(result => result.status === 'fulfilled' ? result.value : []);
+}
diff --git a/src/services/rag/database.ts b/src/services/rag/database.ts
index 2d3e08088..6c9f9307e 100644
--- a/src/services/rag/database.ts
+++ b/src/services/rag/database.ts
@@ -23,6 +23,13 @@ export interface RagSearchResult {
   score: number;
 }
 
+export interface EmbeddingModelSelection {
+  id: string;
+  name: string;
+  filePath: string;
+  size: number;
+}
+
 interface StoredEmbedding {
   chunk_rowid: number;
   doc_id: number;
@@ -96,6 +103,9 @@ class RagDatabase {
           FOREIGN KEY (doc_id) REFERENCES rag_documents(id)
         )`,
       );
+      this.db.executeSync(
+        'CREATE TABLE IF NOT EXISTS rag_embedding_model (id INTEGER PRIMARY KEY CHECK (id = 1), selection TEXT NOT NULL)',
+      );
       this.ready = true;
     } catch (error) {
       logger.error('[RagDB] Failed to initialize:', error);
@@ -162,6 +172,42 @@ class RagDatabase {
     return rowIds;
   }
 
+  getEmbeddingModel(): EmbeddingModelSelection | null {
+    const row = this.getDb().executeSync('SELECT selection FROM rag_embedding_model WHERE id = 1').rows?.[0];
+    return row ? JSON.parse(row.selection as string) as EmbeddingModelSelection : null;
+  }
+
+  beginEmbeddingRebuild(): void {
+    const db = this.getDb();
+    db.executeSync('CREATE TEMP TABLE IF NOT EXISTS rag_embedding_rebuild (chunk_rowid INTEGER, doc_id INTEGER, embedding BLOB)');
+    db.executeSync('DELETE FROM rag_embedding_rebuild');
+  }
+
+  stageEmbedding(entry: { chunkRowid: number; docId: number; embedding: number[] }): void {
+    this.getDb().executeSync('INSERT INTO rag_embedding_rebuild (chunk_rowid, doc_id, embedding) VALUES (?, ?, ?)',
+      [entry.chunkRowid, entry.docId, this.embeddingToBlob(entry.embedding)]);
+  }
+
+  discardEmbeddingRebuild(): void {
+    this.getDb().executeSync('DROP TABLE IF EXISTS temp.rag_embedding_rebuild');
+  }
+
+  /** The model identity and all vectors change in one durable SQLite transaction. */
+  commitEmbeddingRebuild(model: EmbeddingModelSelection | null): void {
+    const db = this.getDb();
+    db.executeSync('BEGIN');
+    try {
+      db.executeSync('DELETE FROM rag_embeddings');
+      db.executeSync('INSERT INTO rag_embeddings (chunk_rowid, doc_id, embedding) SELECT chunk_rowid, doc_id, embedding FROM rag_embedding_rebuild');
+      db.executeSync('DELETE FROM rag_embedding_model');
+      if (model) db.executeSync('INSERT INTO rag_embedding_model (id, selection) VALUES (1, ?)', [JSON.stringify(model)]);
+      db.executeSync('COMMIT');
+    } catch (error) {
+      db.executeSync('ROLLBACK');
+      throw error;
+    }
+  }
+
   private embeddingToBlob(embedding: number[]): ArrayBuffer {
     return new Float32Array(embedding).buffer;
   }
diff --git a/src/services/rag/embedding.ts b/src/services/rag/embedding.ts
index 6fdf942c0..c5f8cb7ce 100644
--- a/src/services/rag/embedding.ts
+++ b/src/services/rag/embedding.ts
@@ -1,7 +1,9 @@
-import { initLlama, LlamaContext } from 'llama.rn';
+import { initLlama, loadLlamaModelInfo, LlamaContext } from 'llama.rn';
 import { Platform } from 'react-native';
+import { sha256 } from 'js-sha256';
 import RNFS from 'react-native-fs';
 import logger from '../../utils/logger';
+import { ragDatabase, type EmbeddingModelSelection } from './database';
 import { modelResidencyManager } from '../modelResidency';
 
 const EMBEDDING_MODEL_FILENAME = 'all-MiniLM-L6-v2-Q8_0.gguf';
@@ -37,6 +39,117 @@ function withTimeout<T>(promise: Promise<T>, opts: { ms: number; message: string
 class EmbeddingService {
   private context: LlamaContext | null = null;
   private loading: Promise<void> | null = null;
+  private operations: Promise<unknown> = Promise.resolve();
+  private downloads: Promise<unknown> = Promise.resolve();
+  private operationActive = false;
+  private pendingModel: EmbeddingModelSelection | null | undefined;
+  private dimension = EMBEDDING_DIMENSION;
+  private modelId = 'bundled:all-MiniLM-L6-v2-Q8_0';
+
+  /** Hold this across vector creation AND index/cache reads or writes. */
+  runExclusive<T>(operation: () => Promise<T>): Promise<T> {
+    const next = this.operations.then(async () => {
+      this.operationActive = true;
+      try { return await operation(); } finally { this.operationActive = false; }
+    });
+    this.operations = next.catch(() => {});
+    return next;
+  }
+
+  getModelId(): string { return this.modelId; }
+
+  /** Caller holds the operation lock; failure leaves the stored model and index intact. */
+  async withRebuildModel<T>(model: EmbeddingModelSelection | null, rebuild: () => Promise<T>): Promise<T> {
+    if (this.loading) await this.loading;
+    await this.unload();
+    this.pendingModel = model;
+    try {
+      await this.load();
+      await this.embed('Embedding compatibility test.');
+      return await rebuild();
+    } catch (error) {
+      await this.unload();
+      throw error;
+    } finally {
+      this.pendingModel = undefined;
+    }
+  }
+
+  async isModelDownloaded(candidate: { id: string; size: number; sha256?: string }): Promise<boolean> {
+    const filePath = `${RNFS.DocumentDirectoryPath}/embedding-${sha256(candidate.id)}.gguf`;
+    if (!await RNFS.exists(filePath)) return false;
+    return Number((await RNFS.stat(filePath)).size) === candidate.size &&
+      (!candidate.sha256 || await RNFS.hash(filePath, 'sha256') === candidate.sha256);
+  }
+
+  /** Download only. Activation and rebuilding require a separate confirmed RAG operation. */
+  async downloadModel(
+    candidate: { id: string; name: string; size: number; downloadUrl: string; sha256?: string },
+    onProgress: (message: string) => void,
+    signal: AbortSignal,
+    onDownloadProgress?: (fraction: number) => void,
+  ): Promise<EmbeddingModelSelection> {
+    const next = this.downloads.then(() => this.downloadModelFile(candidate, onProgress, signal, onDownloadProgress));
+    this.downloads = next.catch(() => {});
+    return next;
+  }
+
+  private async downloadModelFile(
+    candidate: { id: string; name: string; size: number; downloadUrl: string; sha256?: string },
+    onProgress: (message: string) => void,
+    signal: AbortSignal,
+    onDownloadProgress?: (fraction: number) => void,
+  ): Promise<EmbeddingModelSelection> {
+    if (signal.aborted) throw new Error('Model download cancelled');
+    if (!Number.isFinite(candidate.size) || candidate.size <= 0) {
+      throw new Error('The embedding model has no valid file size.');
+    }
+    const filePath = `${RNFS.DocumentDirectoryPath}/embedding-${sha256(candidate.id)}.gguf`;
+    const selection = { id: candidate.id, name: candidate.name, size: candidate.size, filePath };
+    if (await RNFS.exists(filePath)) {
+      if (await this.isModelDownloaded(candidate)) {
+        if (signal.aborted) throw new Error('Model download cancelled');
+        onDownloadProgress?.(1);
+        return selection;
+      }
+      await ragDatabase.ensureReady();
+      if (ragDatabase.getEmbeddingModel()?.id === candidate.id) {
+        throw new Error('The active model file is damaged. Select the built-in model, then download this model again.');
+      }
+      await RNFS.unlink(filePath);
+    }
+    const partial = `${filePath}.part`;
+    const download = RNFS.downloadFile({
+      fromUrl: candidate.downloadUrl, toFile: partial,
+      progressInterval: 250,
+      begin: () => { onProgress('Downloading embedding model...'); onDownloadProgress?.(0); },
+      progress: progress => {
+        const fraction = Math.min(1, progress.bytesWritten / candidate.size);
+        onDownloadProgress?.(fraction);
+        onProgress(`Downloading embedding model: ${Math.round(fraction * 100)}%`);
+      },
+    });
+    const stop = () => RNFS.stopDownload(download.jobId);
+    signal.addEventListener('abort', stop);
+    try {
+      if (signal.aborted) { stop(); throw new Error('Model change cancelled'); }
+      const result = await download.promise;
+      if (signal.aborted) throw new Error('Model change cancelled');
+      if (result.statusCode !== 200 || Number((await RNFS.stat(partial)).size) !== candidate.size) {
+        throw new Error('The model download is incomplete. Try again.');
+      }
+      if (candidate.sha256 && await RNFS.hash(partial, 'sha256') !== candidate.sha256) {
+        throw new Error('The model file failed its integrity check. Try again.');
+      }
+      if (signal.aborted) throw new Error('Model download cancelled');
+      await RNFS.moveFile(partial, filePath);
+      onDownloadProgress?.(1);
+      return selection;
+    } finally {
+      signal.removeEventListener('abort', stop);
+      if (await RNFS.exists(partial)) await RNFS.unlink(partial);
+    }
+  }
 
   async load(): Promise<void> {
     if (this.context) return;
@@ -51,7 +164,30 @@ class EmbeddingService {
   }
 
   private async doLoad(): Promise<void> {
-    const modelPath = await this.ensureModelCopied();
+    await ragDatabase.ensureReady();
+    const selected = this.pendingModel !== undefined ? this.pendingModel : ragDatabase.getEmbeddingModel();
+    // iOS can move the app container after a restore; derive its current path from the stable identity.
+    const modelPath = selected
+      ? `${RNFS.DocumentDirectoryPath}/embedding-${sha256(selected.id)}.gguf`
+      : await this.ensureModelCopied();
+    this.dimension = EMBEDDING_DIMENSION;
+    if (selected) {
+      const info = await loadLlamaModelInfo(modelPath) as Record<string, unknown>;
+      // Only bidirectional BERT encoders with sentence pooling fit this runtime contract.
+      // Decoder models and rerankers need different prompting/output handling.
+      const contextLength = Number(info['bert.context_length']);
+      if (info['general.architecture'] !== 'bert' ||
+          ![1, 2].includes(Number(info['bert.pooling_type'])) ||
+          !Number.isInteger(contextLength) || contextLength < EMBEDDING_CTX_SIZE) {
+        throw new Error('Unsupported embedding model. Use a BERT GGUF text encoder with mean or CLS pooling and at least 512 tokens.');
+      }
+      const dimension = Number(info['bert.embedding_length']);
+      if (!Number.isInteger(dimension) || dimension < 1) {
+        throw new Error('This model has an unsupported embedding size.');
+      }
+      this.dimension = dimension;
+    }
+    this.modelId = selected?.id ?? 'bundled:all-MiniLM-L6-v2-Q8_0';
     logger.log('[Embedding] Loading embedding model...');
     // Load through the residency manager's global lock so this small RAG model
     // never initializes alongside another model load (the single load gateway).
@@ -59,6 +195,14 @@ class EmbeddingService {
     // ThreadPool::startWorkers hang) releases the lock instead of wedging a
     // concurrent chat-model load and tripping the OS watchdog.
     this.context = await modelResidencyManager.runExclusive('load:embedding', async () => {
+      const spec = {
+        key: EMBEDDING_RESIDENT_KEY, type: 'embedding' as const,
+        sizeMB: selected ? Math.ceil(selected.size / (1024 * 1024)) + 128 : EMBEDDING_RESIDENT_MB,
+        canEvict: () => !this.operationActive,
+      };
+      if (selected && !(await modelResidencyManager.makeRoomFor(spec)).fits) {
+        throw new Error('Not enough memory for this embedding model. Choose a smaller model.');
+      }
       const ctx = await withTimeout(
         initLlama({
           model: modelPath,
@@ -83,7 +227,7 @@ class EmbeddingService {
       // against stale free-RAM and OOM. It loads on the tiny MiniLM context and can be
       // evicted as a last-resort sidecar; it never evicts the active generation model.
       modelResidencyManager.register(
-        { key: EMBEDDING_RESIDENT_KEY, type: 'embedding', sizeMB: EMBEDDING_RESIDENT_MB },
+        spec,
         () => this.unload(),
       );
       return ctx;
@@ -112,7 +256,13 @@ class EmbeddingService {
       const result = await (this.context as any).embedding(text);
       // [WIRE] embedding dim + a sample (not the whole vector) so fixtures match the real model's dimensionality.
       logger.log(`[WIRE-EMBED] ${JSON.stringify({ dim: result?.embedding?.length, sample: result?.embedding?.slice?.(0, 8) })}`);
-      return result.embedding;
+      const vector: unknown = result.embedding;
+      if (!Array.isArray(vector) || vector.length !== this.dimension ||
+          !vector.every(value => typeof value === 'number' && Number.isFinite(value)) ||
+          !vector.some(value => value !== 0)) {
+        throw new Error('The model did not return a valid sentence embedding.');
+      }
+      return vector;
     } catch (error: any) {
       const msg = error?.message || String(error) || '';
       logger.error('[Embedding] Native error during embedding:', msg);
@@ -156,7 +306,7 @@ class EmbeddingService {
   }
 
   getDimension(): number {
-    return EMBEDDING_DIMENSION;
+    return this.dimension;
   }
 }
 
diff --git a/src/services/rag/index.ts b/src/services/rag/index.ts
index 37e13ea1c..4c33762b9 100644
--- a/src/services/rag/index.ts
+++ b/src/services/rag/index.ts
@@ -1,4 +1,4 @@
-import { ragDatabase } from './database';
+import { ragDatabase, type EmbeddingModelSelection } from './database';
 import { chunkDocument } from './chunking';
 import { retrievalService } from './retrieval';
 import { embeddingService } from './embedding';
@@ -30,11 +30,53 @@ interface IndexDocumentParams {
 }
 
 class RagService {
+  private embeddingChange = { busy: false, message: '', error: '' };
+  private embeddingListeners = new Set<() => void>();
+  private embeddingAbort: AbortController | null = null;
+  getEmbeddingChange = () => this.embeddingChange;
+  subscribeEmbeddingChange = (listener: () => void) => {
+    this.embeddingListeners.add(listener);
+    return () => { this.embeddingListeners.delete(listener); };
+  };
+  private reportEmbeddingChange(busy: boolean, message: string, error = '') {
+    this.embeddingChange = { busy, message, error };
+    this.embeddingListeners.forEach(listener => listener());
+  }
+  cancelEmbeddingChange = () => { this.embeddingAbort?.abort(); };
+
+  async installEmbeddingModel(candidate: {
+    id: string; name: string; size: number; downloadUrl: string; sha256?: string;
+  } | null): Promise<void> {
+    if (this.embeddingChange.busy) throw new Error('An embedding model change is already in progress.');
+    const controller = new AbortController();
+    this.embeddingAbort = controller;
+    const progress = (message: string) => this.reportEmbeddingChange(true, message);
+    progress('Preparing model change...');
+    let model: EmbeddingModelSelection | null = null;
+    try {
+      await this.ensureReady();
+      model = candidate ? await embeddingService.downloadModel(candidate, progress, controller.signal) : null;
+      await this.switchEmbeddingModel(model, progress, controller.signal);
+      this.reportEmbeddingChange(false, 'Indexing complete');
+    } catch (error) {
+      this.reportEmbeddingChange(false, '', controller.signal.aborted
+        ? 'Model change cancelled. The previous model and indexes are still active.'
+        : `${error instanceof Error ? error.message : String(error)} The previous model and indexes are still active.`);
+      throw error;
+    } finally {
+      this.embeddingAbort = null;
+    }
+  }
+
   async ensureReady(): Promise<void> {
     await ragDatabase.ensureReady();
   }
 
   async indexDocument(params: IndexDocumentParams): Promise<number> {
+    return embeddingService.runExclusive(() => this.indexDocumentUnlocked(params));
+  }
+
+  private async indexDocumentUnlocked(params: IndexDocumentParams): Promise<number> {
     const { projectId, filePath, fileName, fileSize, onProgress } = params;
     await this.ensureReady();
 
@@ -90,7 +132,11 @@ class RagService {
     try {
       await embeddingService.load();
       const texts = chunks.map(c => c.content);
-      const embeddings = await embeddingService.embedBatch(texts);
+      const embeddings: number[][] = [];
+      for (const text of texts) {
+        embeddings.push(await embeddingService.embed(text));
+        onProgress?.({ stage: 'embedding', message: `Indexing ${embeddings.length} of ${texts.length} chunks...` });
+      }
       const entries = rowIds.map((rowId, i) => ({
         chunkRowid: rowId,
         docId,
@@ -152,6 +198,10 @@ class RagService {
   }
 
   async backfillEmbeddings(projectId: string): Promise<number> {
+    return embeddingService.runExclusive(() => this.backfillEmbeddingsUnlocked(projectId));
+  }
+
+  private async backfillEmbeddingsUnlocked(projectId: string): Promise<number> {
     await this.ensureReady();
     const docs = ragDatabase.getDocumentsByProject(projectId);
     let total = 0;
@@ -184,7 +234,46 @@ class RagService {
     return total;
   }
 
+  async switchEmbeddingModel(
+    model: EmbeddingModelSelection | null,
+    onProgress: (message: string) => void,
+    signal?: AbortSignal,
+  ): Promise<void> {
+    return embeddingService.runExclusive(async () => {
+      await this.ensureReady();
+      if (signal?.aborted) throw new Error('Model change cancelled');
+      onProgress('Checking model compatibility...');
+      await embeddingService.withRebuildModel(model, async () => {
+        const documents = ragDatabase.getAllDocuments();
+        const total = documents.reduce((count, doc) => count + ragDatabase.getChunksByDocument(doc.id).length, 0);
+        let completed = 0;
+        ragDatabase.beginEmbeddingRebuild();
+        try {
+          for (const doc of documents) {
+            for (const chunk of ragDatabase.getChunksByDocument(doc.id)) {
+              if (signal?.aborted) throw new Error('Model change cancelled');
+              onProgress(`Rebuilding search and project knowledge: ${completed} of ${total} chunks`);
+              ragDatabase.stageEmbedding({ chunkRowid: chunk.id, docId: doc.id, embedding: await embeddingService.embed(chunk.content) });
+              completed += 1;
+            }
+          }
+          onProgress(`Saving ${completed} chunks...`);
+          if (signal?.aborted) throw new Error('Model change cancelled');
+          ragDatabase.commitEmbeddingRebuild(model);
+        } finally {
+          // Cleanup must not turn a committed switch into an apparent failed switch.
+          try { ragDatabase.discardEmbeddingRebuild(); } catch (error) { logger.warn('Could not clear temporary embedding index', error); }
+        }
+      });
+      onProgress('Indexing complete');
+    });
+  }
+
   async deleteDocument(docId: number): Promise<void> {
+    return embeddingService.runExclusive(() => this.deleteDocumentUnlocked(docId));
+  }
+
+  private async deleteDocumentUnlocked(docId: number): Promise<void> {
     await this.ensureReady();
     const document = ragDatabase.getDocument(docId);
     ragDatabase.deleteDocument(docId);
@@ -231,6 +320,10 @@ class RagService {
   }
 
   async deleteProjectDocuments(projectId: string): Promise<void> {
+    return embeddingService.runExclusive(() => this.deleteProjectDocumentsUnlocked(projectId));
+  }
+
+  private async deleteProjectDocumentsUnlocked(projectId: string): Promise<void> {
     await this.ensureReady();
     const documents = ragDatabase.getDocumentsByProject(projectId);
     ragDatabase.deleteDocumentsByProject(projectId);
@@ -283,6 +376,10 @@ class RagService {
   }
 
   async deleteSyncedDocument(syncId: string): Promise<void> {
+    return embeddingService.runExclusive(() => this.deleteSyncedDocumentUnlocked(syncId));
+  }
+
+  private async deleteSyncedDocumentUnlocked(syncId: string): Promise<void> {
     await this.ensureReady();
     const document = ragDatabase.getDocumentBySyncId(syncId);
     if (document) ragDatabase.deleteDocument(document.id);
diff --git a/src/services/rag/retrieval.ts b/src/services/rag/retrieval.ts
index fd18db059..6b16ae141 100644
--- a/src/services/rag/retrieval.ts
+++ b/src/services/rag/retrieval.ts
@@ -22,7 +22,10 @@ interface SearchResult {
 
 class RetrievalService {
   async search(projectId: string, query: string, topK: number = 5): Promise<SearchResult> {
-    const chunks = await this.searchSemantic(projectId, query, topK);
+    const chunks = await embeddingService.runExclusive(async () => {
+      await ragDatabase.ensureReady();
+      return this.searchSemantic(projectId, query, topK);
+    });
     return { chunks, truncated: false };
   }
 
diff --git a/src/services/toolEmbeddingRouter.ts b/src/services/toolEmbeddingRouter.ts
index e63373afe..a259b5bea 100644
--- a/src/services/toolEmbeddingRouter.ts
+++ b/src/services/toolEmbeddingRouter.ts
@@ -142,11 +142,9 @@ function discoveryBoost(tool: RoutableTool): number {
 
 async function embedTool(tool: RoutableTool, expectedDim?: number): Promise<number[]> {
   const text = `${tool.function.name}: ${firstLine(tool.function.description)}`;
-  const hash = hashText(text);
+  const hash = `${embeddingService.getModelId()}:${hashText(text)}`;
   const cached = toolEmbeddingCache.get(tool.function.name);
-  // A cache hit needs BOTH the text hash AND the current embedding dimension to match.
-  // After an embedding-model swap the dimension changes while the text is identical, so
-  // the dimension check stops a stale-dim vector from poisoning cosineSimilarity with NaN.
+  // Include model identity even when two models have the same vector size.
   if (cached && cached.h === hash && (expectedDim == null || cached.v.length === expectedDim)) {
     return cached.v;
   }
@@ -169,21 +167,23 @@ export async function selectToolsByEmbedding(
   if (tools.length <= topK || !query.trim()) {
     return tools.map(t => t.function.name);
   }
-  await hydrateCache();
-  await embeddingService.load();
-  const queryVec = await embeddingService.embed(query);
-  const tokens = queryTokens(query);
-  const scored: Array<{ name: string; score: number }> = [];
-  for (const tool of tools) {
-    const vec = await embedTool(tool, queryVec.length);
-    // Hybrid: semantic similarity + lexical (provider/verb word) + discovery boost.
-    const score = cosineSimilarity(queryVec, vec) + lexicalBoost(tokens, tool) + discoveryBoost(tool);
-    scored.push({ name: tool.function.name, score });
-  }
-  scored.sort((a, b) => b.score - a.score);
-  const selected = scored.slice(0, topK).map(s => s.name);
-  logger.log(`[ToolRouter] hybrid-routed ${tools.length} → ${selected.length}: [${selected.join(', ')}]`);
-  return selected;
+  return embeddingService.runExclusive(async () => {
+    await hydrateCache();
+    await embeddingService.load();
+    const queryVec = await embeddingService.embed(query);
+    const tokens = queryTokens(query);
+    const scored: Array<{ name: string; score: number }> = [];
+    for (const tool of tools) {
+      const vec = await embedTool(tool, queryVec.length);
+      // Hybrid: semantic similarity + lexical (provider/verb word) + discovery boost.
+      const score = cosineSimilarity(queryVec, vec) + lexicalBoost(tokens, tool) + discoveryBoost(tool);
+      scored.push({ name: tool.function.name, score });
+    }
+    scored.sort((a, b) => b.score - a.score);
+    const selected = scored.slice(0, topK).map(s => s.name);
+    logger.log(`[ToolRouter] hybrid-routed ${tools.length} → ${selected.length}: [${selected.join(', ')}]`);
+    return selected;
+  });
 }
 
 /** Test helper: clear the in-memory cache and re-arm hydration. */

From 96fcdce0bac4a5bc18419c766451e2fa428b1464 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 06:08:37 +0530
Subject: [PATCH 108/129] Add selectable model downloads to Mobile Auto Setup

---
 src/screens/AutoSetupScreen.tsx  |  48 ++++---
 src/services/autoSetupCatalog.ts |  32 ++---
 src/services/autoSetupPlan.ts    |  25 +++-
 src/services/autoSetupService.ts | 219 +++++++++++++++++++++++--------
 4 files changed, 234 insertions(+), 90 deletions(-)

diff --git a/src/screens/AutoSetupScreen.tsx b/src/screens/AutoSetupScreen.tsx
index f879a2f48..271ad019b 100644
--- a/src/screens/AutoSetupScreen.tsx
+++ b/src/screens/AutoSetupScreen.tsx
@@ -8,7 +8,7 @@ import { LoadingDots } from '../components/LoadingDots';
 import { SLOTS, useSlot } from '../bootstrap/slotRegistry';
 import { SPACING, TYPOGRAPHY } from '../constants';
 import type { RootStackParamList } from '../navigation/types';
-import type { AutoSetupPlan } from '../services/autoSetupPlan';
+import type { AutoSetupItem } from '../services/autoSetupPlan';
 import {
   autoSetupDownloadId,
   createAutoSetupSession,
@@ -26,10 +26,11 @@ type Props = {
   sessionFactory?: () => AutoSetupSession;
 };
 
-const labelForItem = (item: AutoSetupPlan['items'][number]) => {
+const labelForItem = (item: AutoSetupItem) => {
   if (item.kind === 'text') return 'TEXT + VISION';
   if (item.kind === 'image') return 'IMAGE';
   if (item.kind === 'video') return 'VIDEO';
+  if (item.kind === 'embedding') return 'SEARCH MODEL';
   return 'SPEECH INPUT';
 };
 
@@ -56,11 +57,13 @@ export const AutoSetupScreen: React.FC<Props> = ({
   const selected =
     snapshot.plans.find(plan => plan.tier === snapshot.selectedTier) ??
     snapshot.plans[0];
-  const selectedItems = selected?.items.filter(item =>
+  const selectedItems = [...(selected?.items ?? []), ...(selected?.embedding ? [selected.embedding] : [])].filter(item =>
     snapshot.selectedKinds.includes(item.kind),
-  ) ?? [];
+  );
   const selectedBytes = selectedItems.reduce(
-    (total, item) => total + item.sizeBytes, 0,
+    (total, item) => total + (
+      snapshot.installedIds.includes(autoSetupDownloadId(item)) ? 0 : item.sizeBytes
+    ), 0,
   );
   const selectedOutcomes =
     selectedItems.map(item => snapshot.outcomes[autoSetupDownloadId(item)]);
@@ -80,7 +83,7 @@ export const AutoSetupScreen: React.FC<Props> = ({
         <View style={styles.center}>
           <LoadingDots color={colors.primary} />
           <Text style={styles.secondary}>
-            Finding the best models for this device...
+            Finding model choices...
           </Text>
         </View>
       </SafeAreaView>
@@ -93,10 +96,10 @@ export const AutoSetupScreen: React.FC<Props> = ({
         testID="auto-setup-screen"
       >
         <Text style={styles.eyebrow}>AUTO SETUP</Text>
-        <Text style={styles.title}>Your private AI, ready in one step.</Text>
+        <Text style={styles.title}>Choose model downloads.</Text>
         <Text style={styles.secondary}>
-          Choose the models you want to download. You can change your choice
-          later.
+          Check the models you want. The total excludes models already on this
+          device.
         </Text>
 
         {snapshot.error && (
@@ -136,7 +139,7 @@ export const AutoSetupScreen: React.FC<Props> = ({
                 >
                   <Text style={styles.includesLabel}>CHOOSE MODELS</Text>
                   <View style={styles.planItems}>
-                    {plan.items.map(item => {
+                    {[...plan.items, ...(plan.embedding ? [plan.embedding] : [])].map(item => {
                       const checked = snapshot.selectedKinds.includes(item.kind);
                       return (
                         <View
@@ -165,10 +168,11 @@ export const AutoSetupScreen: React.FC<Props> = ({
                           />
                           <Text style={styles.planItemName}>{item.name}</Text>
                           <Text style={styles.itemSize}>
-                            {formatBytes(item.sizeBytes)}
-                            {outcomeLabel(
-                              snapshot.outcomes[autoSetupDownloadId(item)],
-                            )}
+                            {item.kind === 'embedding' && item.sizeBytes === 0
+                              ? 'Included with the app' : formatBytes(item.sizeBytes)}
+                            {snapshot.installedIds.includes(autoSetupDownloadId(item))
+                              ? ' - READY'
+                              : outcomeLabel(snapshot.outcomes[autoSetupDownloadId(item)])}
                           </Text>
                           {item.kind === 'video' && plan.items[3] && (
                             <>
@@ -180,6 +184,11 @@ export const AutoSetupScreen: React.FC<Props> = ({
                               ))}
                             </>
                           )}
+                          {item.kind === 'embedding' && (
+                            <Text style={styles.itemSize}>
+                              Download only. To change the search model, open Models and confirm an index rebuild.
+                            </Text>
+                          )}
                         </View>
                       );
                     })}
@@ -225,6 +234,7 @@ export const AutoSetupScreen: React.FC<Props> = ({
                       title={
                         snapshot.phase === 'failed'
                           ? 'Retry Downloads'
+                          : selectedBytes === 0 ? 'Use selected models'
                           : `Download ${formatBytes(selectedBytes)}`
                       }
                       onPress={() => {
@@ -235,6 +245,14 @@ export const AutoSetupScreen: React.FC<Props> = ({
                       testID="auto-setup-download"
                     />
                   )}
+                  {starting && (
+                    <Button
+                      title="Stop Downloads"
+                      variant="outline"
+                      onPress={() => { session.cancel().catch(() => undefined); }}
+                      testID="auto-setup-cancel"
+                    />
+                  )}
                 </View>
               )}
             </Card>
@@ -244,7 +262,7 @@ export const AutoSetupScreen: React.FC<Props> = ({
         {!selected && (
           <Card style={styles.errorCard}>
             <Text style={styles.error}>
-              No complete model set is safe for this device.
+              Auto Setup could not find the models it needs to show a plan.
             </Text>
           </Card>
         )}
diff --git a/src/services/autoSetupCatalog.ts b/src/services/autoSetupCatalog.ts
index be49c4254..dbb253f04 100644
--- a/src/services/autoSetupCatalog.ts
+++ b/src/services/autoSetupCatalog.ts
@@ -1,11 +1,12 @@
 import { CATALOG, videoPackError } from '@offgrid/models';
 import { recommendedModelsForDevice, ramFitScore } from '../utils/recommendedModels';
-import { fileExceedsBudget, modelBudgetFraction } from './memoryBudget';
+import { fileExceedsBudget } from './memoryBudget';
 import { fetchModelFiles } from './modelCatalogFiles';
 import { hardwareService } from './hardware';
 import { WHISPER_MODELS } from './whisperModels';
 import type { AutoSetupCompatibleCatalog } from './autoSetupPlan';
 import { autoSetupImageCatalogProvider } from './autoSetupImageCatalogProvider';
+import { BUNDLED_EMBEDDING_MODEL, RECOMMENDED_EMBEDDING_MODELS } from './huggingFaceModelBrowser';
 
 const MB = 1024 * 1024;
 
@@ -96,24 +97,23 @@ export async function loadAutoSetupCompatibleCatalog(
     !!model.minRamGb && !videoPackError(model.files) &&
     model.files.every(file => !!file.sizeBytes),
   );
-  const video = completeVideoPacks.flatMap(model => {
+  const video = completeVideoPacks.map(model => {
     const sizeBytes = model.files.reduce((sum, file) => sum + (file.sizeBytes ?? 0), 0);
-    if (fileExceedsBudget(sizeBytes, ramGB)) return [];
-    return [{
+    return {
       id: model.id, name: model.name, kind: 'video' as const, sizeBytes,
       fitScore: ramFitScore(model.minRamGb!, ramGB), payload: model,
-    }];
+    };
   });
-  const smallestDownload = [...completeVideoPacks]
-    .sort((a, b) =>
-      a.files.reduce((sum, file) => sum + (file.sizeBytes ?? 0), 0) -
-      b.files.reduce((sum, file) => sum + (file.sizeBytes ?? 0), 0),
-    )[0];
-  const smallestDownloadGB = (smallestDownload?.files.reduce(
-    (sum, file) => sum + (file.sizeBytes ?? 0), 0,
-  ) ?? 0) / (1024 ** 3);
   const videoExclusionReason = video.length ? undefined
-    : !smallestDownload ? 'Auto Setup has no complete video model to download.'
-    : `${smallestDownload.name} needs a ${smallestDownloadGB.toFixed(1)} GB download. Auto Setup's size limit for this device is ${(ramGB * modelBudgetFraction(ramGB)).toFixed(1)} GB. Select Configure it yourself to review video models.`;
-  return { text, image, stt, video, videoExclusionReason };
+    : 'Auto Setup has no complete video model to download.';
+  const embedding = [BUNDLED_EMBEDDING_MODEL, ...RECOMMENDED_EMBEDDING_MODELS]
+    .map((model, index) => ({
+      id: model.id,
+      name: model.name,
+      kind: 'embedding' as const,
+      sizeBytes: model.size,
+      fitScore: index === 1 ? 0 : index,
+      payload: model,
+    }));
+  return { text, image, stt, video, videoExclusionReason, embedding };
 }
diff --git a/src/services/autoSetupPlan.ts b/src/services/autoSetupPlan.ts
index ec7c4a22d..e93665f23 100644
--- a/src/services/autoSetupPlan.ts
+++ b/src/services/autoSetupPlan.ts
@@ -3,7 +3,16 @@ import type { ModelFile } from '../types';
 import type { ImageModelDescriptor } from './imageModelDownloadTypes';
 
 export type AutoSetupTier = 'lean' | 'balanced' | 'extreme';
-type AutoSetupModelKind = 'text' | 'image' | 'stt' | 'video';
+export type AutoSetupModelKind = 'text' | 'image' | 'stt' | 'video' | 'embedding';
+
+export interface AutoSetupEmbeddingModel {
+  id: string;
+  name: string;
+  size: number;
+  downloadUrl?: string;
+  sha256?: string;
+  description?: string;
+}
 
 interface AutoSetupCandidate<T = unknown> {
   id: string;
@@ -27,11 +36,15 @@ export interface AutoSetupPlan {
   ];
   totalBytes: number;
   videoExclusionReason?: string;
+  embedding?: AutoSetupCandidate<AutoSetupEmbeddingModel>;
 }
 
+export type AutoSetupItem = AutoSetupPlan['items'][number] | NonNullable<AutoSetupPlan['embedding']>;
+
 export interface AutoSetupCompatibleCatalog {
   video?: AutoSetupCandidate<ModelEntry>[];
   videoExclusionReason?: string;
+  embedding?: AutoSetupCandidate<AutoSetupEmbeddingModel>[];
   text: AutoSetupCandidate<{ modelId: string; file: ModelFile }>[];
   image: AutoSetupCandidate<ImageModelDescriptor>[];
   stt: AutoSetupCandidate<{ modelId: string }>[];
@@ -41,11 +54,11 @@ const PLAN_COPY: Record<
   AutoSetupTier,
   Pick<AutoSetupPlan, 'title' | 'summary'>
 > = {
-  lean: { title: 'Lean', summary: 'Small downloads with lower memory use.' },
-  balanced: { title: 'Balanced', summary: 'The best balance for this device.' },
+  lean: { title: 'Lean', summary: 'Smaller model downloads.' },
+  balanced: { title: 'Balanced', summary: 'Models near the middle of each list.' },
   extreme: {
     title: 'Extreme',
-    summary: 'The largest safe models for this device.',
+    summary: 'The largest listed models. Check each size before download.',
   },
 };
 
@@ -117,12 +130,14 @@ function selectAutoSetupPlan(
   const stt = choose(tier, catalog.stt);
   if (!text || !image || !stt) return null;
   const video = choose(tier, catalog.video ?? []);
+  const embedding = choose(tier, catalog.embedding ?? []);
   const items: AutoSetupPlan['items'] = [text, image, stt, ...(video ? [video] : [])];
   return {
     tier,
     ...PLAN_COPY[tier],
     items,
-    totalBytes: items.reduce((total, item) => total + item.sizeBytes, 0),
+    totalBytes: items.reduce((total, item) => total + item.sizeBytes, embedding?.sizeBytes ?? 0),
+    ...(embedding ? { embedding } : {}),
     ...(video ? {} : { videoExclusionReason: catalog.videoExclusionReason }),
   };
 }
diff --git a/src/services/autoSetupService.ts b/src/services/autoSetupService.ts
index e8bb67e9e..228be9d20 100644
--- a/src/services/autoSetupService.ts
+++ b/src/services/autoSetupService.ts
@@ -3,12 +3,16 @@ import type { ModelDownload, ModelDownloadStartRequest } from './modelDownloadSe
 import { useAppStore } from '../stores';
 import { activeModelService } from './activeModelService';
 import { uniformDownloadId } from './modelDownloadService/uniformId';
+import { embeddingService } from './rag/embedding';
 import {
   loadAutoSetupCompatibleCatalog,
   type AutoSetupCatalogBoundaries,
 } from './autoSetupCatalog';
 import {
   selectAutoSetupPlans,
+  type AutoSetupEmbeddingModel,
+  type AutoSetupItem,
+  type AutoSetupModelKind,
   type AutoSetupPlan,
   type AutoSetupTier,
 } from './autoSetupPlan';
@@ -20,6 +24,11 @@ export interface AutoSetupDownloadBoundaries {
   subscribe: (listener: () => void) => () => void;
 }
 
+export interface AutoSetupEmbeddingBoundaries {
+  isDownloaded: (model: AutoSetupEmbeddingModel) => Promise<boolean>;
+  start: (model: AutoSetupEmbeddingModel, progress: (fraction: number) => void, signal: AbortSignal) => Promise<void>;
+}
+
 const productionDownloadBoundaries: AutoSetupDownloadBoundaries = {
   start: request => modelDownloadService.start(request),
   list: () => modelDownloadService.list(),
@@ -27,6 +36,21 @@ const productionDownloadBoundaries: AutoSetupDownloadBoundaries = {
   subscribe: listener => modelDownloadService.subscribe(listener),
 };
 
+const productionEmbeddingBoundaries: AutoSetupEmbeddingBoundaries = {
+  isDownloaded: model => model.size === 0
+    ? Promise.resolve(true)
+    : embeddingService.isModelDownloaded(model),
+  async start(model, progress, signal) {
+    if (!model.downloadUrl) throw new Error('This embedding model has no download file.');
+    await embeddingService.downloadModel(
+      { ...model, downloadUrl: model.downloadUrl },
+      () => undefined,
+      signal,
+      progress,
+    );
+  },
+};
+
 type AutoSetupItemPhase =
   | 'waiting'
   | 'starting'
@@ -46,7 +70,8 @@ interface AutoSetupSnapshot {
   phase: 'loading_catalog' | 'ready' | 'downloading' | 'completed' | 'failed';
   plans: AutoSetupPlan[];
   selectedTier: AutoSetupTier;
-  selectedKinds: AutoSetupPlan['items'][number]['kind'][];
+  selectedKinds: AutoSetupModelKind[];
+  installedIds: string[];
   outcomes: Record<string, AutoSetupItemOutcome>;
   error: string | null;
 }
@@ -56,8 +81,9 @@ export interface AutoSetupSession {
   subscribe(listener: () => void): () => void;
   load(): Promise<void>;
   selectTier(tier: AutoSetupTier): void;
-  toggleKind(kind: AutoSetupPlan['items'][number]['kind']): void;
+  toggleKind(kind: AutoSetupModelKind): void;
   start(): Promise<void>;
+  cancel(): Promise<void>;
   complete(): void;
   dispose(): void;
 }
@@ -65,16 +91,11 @@ export interface AutoSetupSession {
 export interface AutoSetupSessionBoundaries {
   catalog?: AutoSetupCatalogBoundaries;
   downloads?: AutoSetupDownloadBoundaries;
+  embedding?: AutoSetupEmbeddingBoundaries;
   catalogDeadlineMs?: number;
 }
 
 const DEFAULT_CATALOG_DEADLINE_MS = 15_000;
-const TIER_POLICY = {
-  lean: 'conservative',
-  balanced: 'balanced',
-  extreme: 'aggressive',
-} as const;
-
 function tierFromPersistedIntent(): AutoSetupTier {
   const mode = useAppStore.getState().settings.modelLoadingMode;
   if (mode === 'conservative') return 'lean';
@@ -82,15 +103,10 @@ function tierFromPersistedIntent(): AutoSetupTier {
   return 'balanced';
 }
 
-function persistTierIntent(tier: AutoSetupTier): void {
-  useAppStore
-    .getState()
-    .updateSettings({ modelLoadingMode: TIER_POLICY[tier] });
-}
-
 export function autoSetupDownloadId(
-  item: AutoSetupPlan['items'][number],
+  item: AutoSetupItem,
 ): string {
+  if (item.kind === 'embedding') return `embedding:${item.id}`;
   return uniformDownloadId(item.kind, item.id);
 }
 
@@ -109,7 +125,7 @@ function message(error: unknown): string {
 }
 
 function initialOutcomes(
-  items: AutoSetupPlan['items'][number][],
+  items: AutoSetupItem[],
 ): Record<string, AutoSetupItemOutcome> {
   return Object.fromEntries(
     items.map(item => {
@@ -166,8 +182,11 @@ export function createAutoSetupSession(
   boundaries: AutoSetupSessionBoundaries = {},
 ): AutoSetupSession {
   const downloads = boundaries.downloads ?? productionDownloadBoundaries;
+  const embedding = boundaries.embedding ?? productionEmbeddingBoundaries;
   const listeners = new Set<() => void>();
   const activeIds = new Set<string>();
+  let pendingEmbeddingId: string | null = null;
+  let embeddingAbort: AbortController | null = null;
   let disposed = false;
   let operation = 0;
   let refreshInFlight = false;
@@ -176,6 +195,7 @@ export function createAutoSetupSession(
     plans: [],
     selectedTier: tierFromPersistedIntent(),
     selectedKinds: ['text'],
+    installedIds: [],
     outcomes: {},
     error: null,
   };
@@ -190,17 +210,21 @@ export function createAutoSetupSession(
     state.plans.find(plan => plan.tier === state.selectedTier) ??
     state.plans[0];
   const selectedItems = (plan: AutoSetupPlan) =>
-    plan.items.filter(item => state.selectedKinds.includes(item.kind));
+    [...plan.items, ...(plan.embedding ? [plan.embedding] : [])]
+      .filter(item => state.selectedKinds.includes(item.kind));
 
   const stopActive = async (cancelled: boolean): Promise<void> => {
-    const ids = [...activeIds];
+    const ids = [...activeIds, ...(pendingEmbeddingId ? [pendingEmbeddingId] : [])];
     activeIds.clear();
-    await Promise.allSettled(ids.map(id => downloads.cancel(id)));
+    pendingEmbeddingId = null;
+    embeddingAbort?.abort();
+    embeddingAbort = null;
+    await Promise.allSettled(ids.filter(id => !id.startsWith('embedding:')).map(id => downloads.cancel(id)));
     if (cancelled && !disposed) {
       const outcomes = { ...state.outcomes };
       for (const id of ids) {
         const current = outcomes[id];
-        if (current && current.phase !== 'completed') {
+        if (current && current.phase !== 'completed' && current.phase !== 'failed') {
           outcomes[id] = { ...current, phase: 'cancelled' };
         }
       }
@@ -210,26 +234,39 @@ export function createAutoSetupSession(
 
   const refreshDownloads = async (): Promise<void> => {
     if (disposed || refreshInFlight || activeIds.size === 0) return;
+    const token = operation;
     refreshInFlight = true;
     try {
       const listed = await downloads.list();
-      if (disposed) return;
+      if (disposed || token !== operation) return;
       const { outcomes, failure, allCompleted } = projectActiveDownloads(
         activeIds,
         listed,
         state.outcomes,
       );
-      publish({ outcomes });
+      publish({
+        outcomes,
+        installedIds: [
+          ...state.installedIds.filter(id => id.startsWith('embedding:')),
+          ...listed.filter(download => download.status === 'completed').map(download => download.id),
+        ],
+      });
       if (failure) {
         operation += 1;
-        await stopActive(false);
+        await stopActive(true);
         publish({
           phase: 'failed',
           error: failure.error ?? 'A model download failed. Try again.',
         });
       } else if (allCompleted) {
         activeIds.clear();
-        publish({ phase: 'completed', error: null });
+        if (!pendingEmbeddingId) publish({ phase: 'completed', error: null });
+      }
+    } catch (error) {
+      if (!disposed && token === operation) {
+        operation += 1;
+        await stopActive(true);
+        publish({ phase: 'failed', error: message(error) });
       }
     } finally {
       refreshInFlight = false;
@@ -256,9 +293,23 @@ export function createAutoSetupSession(
         }),
       ]);
       if (disposed || token !== operation) return;
+      const plans = selectAutoSetupPlans(catalog);
+      const installed = await downloads.list().catch(() => []);
+      const embeddingItems = [...new Map(plans.flatMap(plan =>
+        plan.embedding ? [[plan.embedding.id, plan.embedding] as const] : [],
+      )).values()];
+      const installedEmbedding = await Promise.all(embeddingItems.map(async item =>
+        await embedding.isDownloaded(item.payload).catch(() => false)
+          ? autoSetupDownloadId(item) : null,
+      ));
+      if (disposed || token !== operation) return;
       publish({
         phase: 'ready',
-        plans: selectAutoSetupPlans(catalog),
+        plans,
+        installedIds: [
+          ...installed.filter(download => download.status === 'completed').map(download => download.id),
+          ...installedEmbedding.filter((id): id is string => id !== null),
+        ],
         error: null,
       });
     } catch (error) {
@@ -272,28 +323,69 @@ export function createAutoSetupSession(
     }
   };
 
-  const start = async (): Promise<void> => {
-    const plan = selectedPlan();
-    if (!plan || disposed) return;
-    const items = selectedItems(plan);
-    if (items.length === 0) return;
-    const token = ++operation;
-    publish({ phase: 'downloading', error: null });
-    await stopActive(false);
+  const startEmbeddingDownload = (
+    item: NonNullable<AutoSetupPlan['embedding']>,
+    token: number,
+  ): void => {
+    const id = autoSetupDownloadId(item);
+    const controller = new AbortController();
+    embeddingAbort = controller;
+    embedding.start(item.payload, fraction => {
+      if (disposed || token !== operation) return;
+      publish({ outcomes: {
+        ...state.outcomes,
+        [id]: { id, phase: 'downloading', progress: Math.max(0, Math.min(1, fraction)) },
+      } });
+    }, controller.signal).then(() => {
+      if (disposed || token !== operation) return;
+      pendingEmbeddingId = null;
+      embeddingAbort = null;
+      publish({
+        outcomes: { ...state.outcomes, [id]: { id, phase: 'completed', progress: 1 } },
+        installedIds: [...new Set([...state.installedIds, id])],
+        ...(activeIds.size === 0 ? { phase: 'completed' as const } : {}),
+      });
+    }).catch(async error => {
+      if (disposed || token !== operation) return;
+      operation += 1;
+      await stopActive(true);
+      publish({
+        phase: 'failed',
+        outcomes: { ...state.outcomes, [id]: { id, phase: 'failed', progress: 0, error: message(error) } },
+        error: message(error),
+      });
+    });
+  };
+
+  const prepareSelectedDownloads = async (
+    plan: AutoSetupPlan,
+    items: AutoSetupItem[],
+    token: number,
+  ): Promise<boolean> => {
     let existing: ModelDownload[];
     try {
       existing = await downloads.list();
     } catch (error) {
       if (!disposed && token === operation)
         publish({ phase: 'failed', error: message(error) });
-      return;
+      return false;
     }
-    if (disposed || token !== operation) return;
+    if (disposed || token !== operation) return false;
     const completedIds = new Set(
       existing
         .filter(download => download.status === 'completed')
         .map(download => download.id),
     );
+    const embeddingItem = plan.embedding && state.selectedKinds.includes('embedding')
+      ? plan.embedding : undefined;
+    const selectedEmbeddingId = embeddingItem ? autoSetupDownloadId(embeddingItem) : null;
+    if (embeddingItem && await embedding.isDownloaded(embeddingItem.payload).catch(() => false))
+      completedIds.add(autoSetupDownloadId(embeddingItem));
+    if (disposed || token !== operation) return false;
+    publish({ installedIds: [
+      ...state.installedIds.filter(id => id.startsWith('embedding:') && id !== selectedEmbeddingId),
+      ...completedIds,
+    ] });
     const outcomes = initialOutcomes(items);
     for (const item of items) {
       const id = autoSetupDownloadId(item);
@@ -301,14 +393,33 @@ export function createAutoSetupSession(
         outcomes[id] = { id, phase: 'completed', progress: 1 };
       else {
         outcomes[id] = { id, phase: 'starting', progress: 0 };
-        activeIds.add(id);
+        if (item.kind === 'embedding') pendingEmbeddingId = id;
+        else activeIds.add(id);
       }
     }
     publish({
-      phase: activeIds.size ? 'downloading' : 'completed',
+      phase: activeIds.size || pendingEmbeddingId ? 'downloading' : 'completed',
       outcomes,
       error: null,
     });
+    return true;
+  };
+
+  const start = async (): Promise<void> => {
+    const plan = selectedPlan();
+    if (!plan || disposed) return;
+    const items = selectedItems(plan);
+    if (items.length === 0) return;
+    const token = ++operation;
+    publish({ phase: 'downloading', error: null });
+    await stopActive(false);
+    if (!await prepareSelectedDownloads(plan, items, token)) return;
+    if (!activeIds.size && !pendingEmbeddingId) return;
+
+    const embeddingItem = plan.embedding && state.selectedKinds.includes('embedding')
+      ? plan.embedding : undefined;
+    if (pendingEmbeddingId && embeddingItem) startEmbeddingDownload(embeddingItem, token);
+
     if (activeIds.size === 0) return;
 
     const [text, image, stt, video] = plan.items;
@@ -338,19 +449,13 @@ export function createAutoSetupSession(
     if (failedIndex >= 0) {
       const id = jobs[failedIndex].id;
       const failure = starts[failedIndex] as PromiseRejectedResult;
-      const next = {
-        ...state.outcomes,
-        [id]: {
-          id,
-          phase: 'failed' as const,
-          progress: 0,
-          error: message(failure.reason),
-        },
-      };
-      await stopActive(false);
+      await stopActive(true);
       publish({
         phase: 'failed',
-        outcomes: next,
+        outcomes: {
+          ...state.outcomes,
+          [id]: { id, phase: 'failed', progress: 0, error: message(failure.reason) },
+        },
         error: message(failure.reason),
       });
       return;
@@ -366,11 +471,9 @@ export function createAutoSetupSession(
     },
     load,
     selectTier(tier) {
-      // The selected plan is immutable once its download session starts. If a
-      // completed or active session could switch tiers, its outcomes would
-      // describe the old plan while complete() activated the new plan.
-      if (state.phase === 'downloading' || state.phase === 'completed') return;
-      persistTierIntent(tier);
+      // These tiers only preview download choices. They never change the live
+      // model loading policy or the user's saved active model selections.
+      if (state.phase === 'downloading') return;
       publish({
         phase: 'ready',
         selectedTier: tier,
@@ -380,13 +483,21 @@ export function createAutoSetupSession(
     },
     toggleKind(kind) {
       if (state.phase === 'downloading') return;
-      if (!selectedPlan()?.items.some(item => item.kind === kind)) return;
+      const plan = selectedPlan();
+      if (!plan || ![...plan.items, ...(plan.embedding ? [plan.embedding] : [])]
+        .some(item => item.kind === kind)) return;
       const selectedKinds = state.selectedKinds.includes(kind)
         ? state.selectedKinds.filter(selected => selected !== kind)
         : [...state.selectedKinds, kind];
       publish({ selectedKinds, outcomes: {}, error: null, phase: 'ready' });
     },
     start,
+    async cancel() {
+      if (state.phase !== 'downloading') return;
+      operation += 1;
+      await stopActive(true);
+      publish({ phase: 'ready', error: null });
+    },
     complete() {
       const plan = selectedPlan();
       if (plan && state.phase === 'completed') {

From c688eb86fa94c351baca2bca187f7b91289e5fd8 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 06:09:32 +0530
Subject: [PATCH 109/129] feat: load SD checkpoints and preserve RGBA image
 output [skip ci]

---
 android/app/src/main/cpp/video/video-jni.cpp   |  5 +++--
 .../video/VideoGenerationModule.kt             | 12 +++++++++---
 native/video/VideoGenerationModule.mm          | 10 +++++++---
 native/video/common/VideoRuntime.hpp           | 18 +++++++++++++++---
 scripts/video/exports.txt                      |  2 ++
 5 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/android/app/src/main/cpp/video/video-jni.cpp b/android/app/src/main/cpp/video/video-jni.cpp
index 00973223e..b042c36d9 100644
--- a/android/app/src/main/cpp/video/video-jni.cpp
+++ b/android/app/src/main/cpp/video/video-jni.cpp
@@ -138,11 +138,12 @@ extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationMod
 }
 
 extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationModule_nativeLoadImage(
-  JNIEnv *env, jobject, jstring path, jstring weight, jstring vae, jstring llm, jint threads, jboolean cpuOnly) {
+  JNIEnv *env, jobject, jstring path, jstring weight, jstring vae, jstring llm, jint threads, jboolean cpuOnly, jstring family, jstring sampler, jstring scheduler) {
   try {
     offgrid::VideoRequest request{};
     request.weight = string(env, weight); request.vae = string(env, vae); request.llm = string(env, llm);
     request.threads = threads; request.cpuOnly = cpuOnly;
+    request.imageFamily = string(env, family); request.imageSampler = string(env, sampler); request.imageScheduler = string(env, scheduler);
     runtime.loadImage(request, string(env, path));
   } catch (const std::exception &error) {
     auto klass = env->FindClass("java/lang/IllegalStateException");
@@ -183,7 +184,7 @@ extern "C" JNIEXPORT jbyteArray JNICALL Java_ai_offgridmobile_video_VideoGenerat
       if (thread.env->ExceptionCheck()) { thread.env->ExceptionClear(); runtime.cancel(); }
     }, [&](const sd_image_t &image) {
       const uint64_t size = uint64_t(image.width) * image.height * image.channel;
-      if (!image.data || image.width != uint32_t(width) || image.height != uint32_t(height) || image.channel != 3 || size > INT32_MAX)
+      if (!image.data || image.width != uint32_t(width) || image.height != uint32_t(height) || (image.channel != 3 && image.channel != 4) || size > INT32_MAX)
         throw std::runtime_error("The image engine returned invalid pixels.");
       output = env->NewByteArray(static_cast<jsize>(size));
       if (!output) throw std::runtime_error("Not enough memory to save the image.");
diff --git a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
index 02e94d5e0..714445aab 100644
--- a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
+++ b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
@@ -173,7 +173,7 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
             }
         }
     }
-    private external fun nativeLoadImage(path: String, weight: String, vae: String, llm: String, threads: Int, cpuOnly: Boolean)
+    private external fun nativeLoadImage(path: String, weight: String, vae: String, llm: String, threads: Int, cpuOnly: Boolean, family: String, sampler: String, scheduler: String)
     private external fun nativeUnloadImage()
     private external fun nativeImagePath(): String
     private external fun nativeGenerateImage(prompt: String, negative: String, width: Int, height: Int, steps: Int, guidance: Double, seed: Double, previewInterval: Int): ByteArray
@@ -205,7 +205,13 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
         executor.execute {
             try {
                 prepareHexagonRuntime()
-                nativeLoadImage(checkNotNull(input.getString("modelPath")), checkNotNull(input.getString("weight")), checkNotNull(input.getString("vae")), checkNotNull(input.getString("llm")), input.getInt("threads"), input.getBoolean("cpuOnly"))
+                nativeLoadImage(checkNotNull(input.getString("modelPath")), checkNotNull(input.getString("weight")),
+                    if (input.hasKey("vae")) input.getString("vae") ?: "" else "",
+                    if (input.hasKey("llm")) input.getString("llm") ?: "" else "",
+                    input.getInt("threads"), input.getBoolean("cpuOnly"),
+                    if (input.hasKey("family")) input.getString("family") ?: "" else "",
+                    if (input.hasKey("sampler")) input.getString("sampler") ?: "" else "",
+                    if (input.hasKey("scheduler")) input.getString("scheduler") ?: "" else "")
                 promise.resolve(true)
             } catch (error: Throwable) { promise.reject("IMAGE_LOAD_FAILED", error.message, error) }
             finally { busy.set(false) }
@@ -236,7 +242,7 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
                 imageSteps = input.getInt("steps")
                 val bytes = nativeGenerateImage(checkNotNull(input.getString("prompt")), input.getString("negativePrompt") ?: "", width, height, input.getInt("steps"), input.getDouble("guidanceScale"), input.getDouble("seed"), if (input.hasKey("previewInterval")) input.getInt("previewInterval").coerceAtLeast(0) else 0)
                 check(!cancelled.get()) { "Image generation stopped." }
-                saveRgbPng(bytes, width, height, output)
+                saveRgbPng(bytes, width, height, output, bytes.size / (width * height))
                 check(!cancelled.get()) { "Image generation stopped." }
                 promise.resolve(Arguments.createMap().apply {
                     putString("imagePath", output.path); putInt("width", width); putInt("height", height); putDouble("seed", input.getDouble("seed")); putString("id", input.getString("id"))
diff --git a/native/video/VideoGenerationModule.mm b/native/video/VideoGenerationModule.mm
index 7f944180a..871dc34f7 100644
--- a/native/video/VideoGenerationModule.mm
+++ b/native/video/VideoGenerationModule.mm
@@ -198,8 +198,12 @@ - (void)emitStage:(NSString *)stage step:(int)step total:(int)total {
       NSString *failure = nil;
       try {
         offgrid::VideoRequest request{};
-        request.weight = [input[@"weight"] UTF8String]; request.vae = [input[@"vae"] UTF8String];
-        request.llm = [input[@"llm"] UTF8String]; request.threads = [input[@"threads"] intValue]; request.cpuOnly = [input[@"cpuOnly"] boolValue];
+        request.weight = [input[@"weight"] UTF8String]; request.vae = [(input[@"vae"] ?: @"") UTF8String];
+        request.llm = [(input[@"llm"] ?: @"") UTF8String];
+        request.imageFamily = [(input[@"family"] ?: @"") UTF8String];
+        request.imageSampler = [(input[@"sampler"] ?: @"") UTF8String];
+        request.imageScheduler = [(input[@"scheduler"] ?: @"") UTF8String];
+        request.threads = [input[@"threads"] intValue]; request.cpuOnly = [input[@"cpuOnly"] boolValue];
         self->_runtime.loadImage(request, [input[@"modelPath"] UTF8String]);
       } catch (const std::exception &error) { failure = @(error.what()); }
       dispatch_async(dispatch_get_main_queue(), ^{
@@ -244,7 +248,7 @@ - (void)emitStage:(NSString *)stage step:(int)step total:(int)total {
               if (self->_listeners) [self sendEventWithName:@"SDImageProgress" body:@{@"step":@(step), @"totalSteps":@(total), @"progress":@(total > 0 ? double(step) / total : 0)}];
             });
           }, [&](const sd_image_t &image) {
-            if (!image.data || image.channel != 3 || image.width != request.width || image.height != request.height)
+            if (!image.data || (image.channel != 3 && image.channel != 4) || image.width != request.width || image.height != request.height)
               throw std::runtime_error("The image engine returned invalid pixels.");
             if (!OGSaveRgbPng(image, output)) throw std::runtime_error("Could not save the image.");
           }, std::max(0, [input[@"previewInterval"] intValue]), [&](int step, const sd_image_t &image) {
diff --git a/native/video/common/VideoRuntime.hpp b/native/video/common/VideoRuntime.hpp
index c4a22e315..189682a28 100644
--- a/native/video/common/VideoRuntime.hpp
+++ b/native/video/common/VideoRuntime.hpp
@@ -22,6 +22,7 @@ struct VideoRequest {
   float flowShift = 0;
   bool cpuOnly = false;
   int threads = 4;
+  std::string imageFamily, imageSampler, imageScheduler;
 };
 // One instance per process. Both host bridges use the same native lifecycle.
 class VideoRuntime {
@@ -30,10 +31,13 @@ class VideoRuntime {
   sd_ctx_t *context = nullptr;
   sd_ctx_t *imageContext = nullptr;
   std::string imagePath;
+  sample_method_t imageSampler = EULER_SAMPLE_METHOD;
+  scheduler_t imageScheduler = SCHEDULER_COUNT;
   sd_ctx_t *loadContext(const VideoRequest &request, std::string &preferred) {
       sd_ctx_params_t config;
       sd_ctx_params_init(&config);
-      config.diffusion_model_path = request.weight.c_str();
+      if (request.imageFamily == "checkpoint") config.model_path = request.weight.c_str();
+      else config.diffusion_model_path = request.weight.c_str();
       config.vae_path = request.vae.c_str();
       config.t5xxl_path = request.encoder.c_str();
       config.llm_path = request.llm.c_str();
@@ -132,6 +136,12 @@ class VideoRuntime {
   void loadImage(const VideoRequest &request, const std::string &path) {
     std::unique_lock<std::mutex> execution(executionMutex, std::try_to_lock);
     if (!execution.owns_lock()) throw std::runtime_error("Image or video generation is running.");
+    if (!request.imageFamily.empty() && request.imageFamily != "checkpoint" && request.imageFamily != "qwen-image-2.1")
+      throw std::runtime_error("This image model family is not supported.");
+    const auto sampler = request.imageSampler.empty() ? EULER_SAMPLE_METHOD : str_to_sample_method(request.imageSampler.c_str());
+    const auto scheduler = request.imageScheduler.empty() ? SCHEDULER_COUNT : str_to_scheduler(request.imageScheduler.c_str());
+    if (sampler == SAMPLE_METHOD_COUNT || (!request.imageScheduler.empty() && scheduler == SCHEDULER_COUNT))
+      throw std::runtime_error("The image sampler or scheduler is not supported.");
     {
       std::lock_guard<std::mutex> guard(contextMutex);
       if (imageContext) free_sd_ctx(imageContext);
@@ -143,6 +153,8 @@ class VideoRuntime {
     std::lock_guard<std::mutex> guard(contextMutex);
     if (cancelled.load()) { free_sd_ctx(loaded); throw std::runtime_error("Image loading stopped."); }
     imageContext = loaded; imagePath = path;
+    imageSampler = sampler;
+    imageScheduler = scheduler == SCHEDULER_COUNT ? sd_get_default_scheduler(loaded, sampler) : scheduler;
   }
   void unloadImage() {
     std::unique_lock<std::mutex> execution(executionMutex, std::try_to_lock);
@@ -189,8 +201,8 @@ class VideoRuntime {
       params.batch_count = 1;
       params.sample_params.sample_steps = request.steps;
       params.sample_params.guidance.txt_cfg = request.guidance;
-      params.sample_params.sample_method = EULER_SAMPLE_METHOD;
-      params.sample_params.scheduler = sd_get_default_scheduler(imageContext, EULER_SAMPLE_METHOD);
+      params.sample_params.sample_method = imageSampler;
+      params.sample_params.scheduler = imageScheduler;
       params.vae_tiling_params.enabled = true;
       if (!generate_image(imageContext, &params, &images, &count) || !images || count != 1)
         throw std::runtime_error("The image engine produced no image.");
diff --git a/scripts/video/exports.txt b/scripts/video/exports.txt
index a6fb144af..25fb6eb21 100644
--- a/scripts/video/exports.txt
+++ b/scripts/video/exports.txt
@@ -4,3 +4,5 @@ _free_sd_ctx
 _free_sd_images
 _generate_video
 _generate_image
+_str_to_sample_method
+_str_to_scheduler

From 00b89f11d6895629fbd78c556e423ef2090dcbf8 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 06:11:27 +0530
Subject: [PATCH 110/129] feat(image): support complete SD checkpoints on
 mobile [skip ci]

---
 .../ModelsScreen/imageDownloadResume.ts       |   4 +-
 src/screens/ModelsScreen/useImageModels.ts    |   5 +-
 src/services/huggingFaceModelBrowser.ts       | 195 ++++++++++++++----
 src/services/imageDownloadActions.ts          |  13 +-
 src/services/modelManager/scan.ts             |   6 +-
 src/utils/imageModelIntegrity.ts              |  11 +-
 6 files changed, 184 insertions(+), 50 deletions(-)

diff --git a/src/screens/ModelsScreen/imageDownloadResume.ts b/src/screens/ModelsScreen/imageDownloadResume.ts
index 046459b25..eddd6463e 100644
--- a/src/screens/ModelsScreen/imageDownloadResume.ts
+++ b/src/screens/ModelsScreen/imageDownloadResume.ts
@@ -1,3 +1,4 @@
+import { resolveSDImagePack } from '../../services/huggingFaceModelBrowser';
 import RNFS from 'react-native-fs';
 import { statFile } from '../../utils/fileStat';
 import { unzip } from 'react-native-zip-archive';
@@ -200,8 +201,9 @@ async function resumeMultifileDownload(ctx: ResumeCtx): Promise<void> {
   const hfFiles = metadata.imageModelHuggingFaceFiles as ImageModelDescriptor['huggingFaceFiles'];
   const coremlFiles = metadata.imageModelCoremlFiles as ImageModelDescriptor['coremlFiles'];
   await validateMultifileComplete(modelDir, hfFiles
-    ? hfFiles.map(file => ({ relativePath: file.path, sha256: file.sha256 }))
+    ? hfFiles.map(file => ({ relativePath: file.path, sha256: file.sha256, expectedSize: metadata.imageModelBackend === 'sd' ? file.size : undefined }))
     : (coremlFiles ?? []).map(file => ({ relativePath: file.relativePath })));
+  if (metadata.imageModelBackend === 'sd') await resolveSDImagePack(modelId, modelDir);
   await RNFS.writeFile(`${modelDir}/_ready`, '', 'utf8');
   const imageModel: ONNXImageModel = {
     id: modelId, name: metadata.imageModelName, description: metadata.imageModelDescription,
diff --git a/src/screens/ModelsScreen/useImageModels.ts b/src/screens/ModelsScreen/useImageModels.ts
index 078021ced..bbe073bd6 100644
--- a/src/screens/ModelsScreen/useImageModels.ts
+++ b/src/screens/ModelsScreen/useImageModels.ts
@@ -30,18 +30,19 @@ export function useImageModels(setAlertState: (s: AlertState) => void) {
   const [sdSearchRevision, setSDSearchRevision] = useState(0);
   useEffect(() => {
     let current = true;
+    const controller = new AbortController();
     setSDSearchModels([]);
     setSDSearchError(null);
     const query = imageSearchQuery.trim();
     if (!query) { setSDSearchLoading(false); return; }
     setSDSearchLoading(true);
     const timer = setTimeout(() => {
-      searchSDImageModels(query)
+      searchSDImageModels(query, controller.signal)
         .then(models => { if (current) setSDSearchModels(models); })
         .catch(error => { if (current) setSDSearchError(error.message ?? 'Image search failed. Try again.'); })
         .finally(() => { if (current) setSDSearchLoading(false); });
     }, 300);
-    return () => { current = false; clearTimeout(timer); };
+    return () => { current = false; controller.abort(); clearTimeout(timer); };
   }, [imageSearchQuery, sdSearchRevision]);
 
   const [imageRec, setImageRec] = useState<ImageModelRecommendation | null>(null);
diff --git a/src/services/huggingFaceModelBrowser.ts b/src/services/huggingFaceModelBrowser.ts
index 0dea7d7d0..f6bb98d70 100644
--- a/src/services/huggingFaceModelBrowser.ts
+++ b/src/services/huggingFaceModelBrowser.ts
@@ -1,4 +1,5 @@
-import { CATALOG, searchHuggingFace, getModelFiles } from '@offgrid/models';
+import { Buffer } from 'buffer';
+import { CATALOG, searchHuggingFace, extractQuantization, standardImageModelDefaults } from '@offgrid/models';
 import RNFS from 'react-native-fs';
 import type { ImageModelDescriptor } from './imageModelDownloadTypes';
 
@@ -147,70 +148,182 @@ export function guessStyle(name: string): string {
   return 'anime';
 }
 
-/** The shared catalog owns the Qwen pack, including pinned companion files. */
+const QWEN_IMAGE_WEIGHT = /^qwen_image_2\.1-.*\.gguf$/i;
+const IMAGE_HEADER_BYTES = 1024 * 1024;
+
+/** Bundled complete checkpoints share the Desktop catalog. Split diffusion packs
+ * need an explicit companion contract before they can be offered on mobile. */
 export function getSDImageModels(): HFImageModel[] {
-  return CATALOG.filter(model => model.id === 'leejet/Qwen-Image-2.1-GGUF').map(model => ({
-    id: `sd-${model.id.replaceAll('/', '--')}`,
-    name: model.name, displayName: model.name, backend: 'sd' as const,
-    repo: model.id, fileName: model.files[0].name, downloadUrl: model.files[0].url,
-    size: model.files.reduce((sum, file) => sum + (file.sizeBytes ?? 0), 0),
-    huggingFaceFiles: model.files.map(file => ({ path: file.name, size: file.sizeBytes ?? 0, downloadUrl: file.url, sha256: file.sha256 })),
-  }));
+  return CATALOG.filter(model => model.id === 'leejet/Qwen-Image-2.1-GGUF' ||
+    (model.kind === 'image' && model.files.length === 1 &&
+      /^(offgrid-ai\/|mzwing\/SDXL-Lightning|OlegSkutte\/sdxl-turbo)/i.test(model.id)))
+    .map(model => ({
+      id: `sd-${model.id.replaceAll('/', '--')}`,
+      name: model.name, displayName: model.name, backend: 'sd' as const,
+      repo: model.id, fileName: model.files[0].name, downloadUrl: model.files[0].url,
+      size: model.files.reduce((sum, file) => sum + (file.sizeBytes ?? 0), 0),
+      huggingFaceFiles: model.files.map(file => ({ path: file.name, size: file.sizeBytes ?? 0, downloadUrl: file.url, sha256: file.sha256 })),
+    }));
+}
+
+/** Filename candidates only. New checkpoint candidates must pass tensor validation. */
+export const isSDImageWeight = (name: string): boolean => QWEN_IMAGE_WEIGHT.test(name) ||
+  (/\.(gguf|safetensors)$/i.test(name) && !/[/\\]|(?:vae|clip|t5|encoder|mmproj|lora|adapter|qwen|flux|wan|hunyuan|ltx|z_image|sd3|\d{5}-of-\d{5})/i.test(name));
+
+/** Read tensor names, never model data or metadata strings, to reject text models,
+ * adapters, and UNet-only exports. A bounded or malformed header fails closed. */
+function isCompleteSDCheckpoint(bytes: Buffer): boolean {
+  try {
+    let offset = 0;
+    const take = (size: number) => {
+      if (!Number.isSafeInteger(size) || size < 0 || offset + size > bytes.length) throw new Error('Incomplete header');
+      const start = offset; offset += size; return start;
+    };
+    const u32 = () => bytes.readUInt32LE(take(4));
+    const u64 = () => { const pos = take(8); return bytes.readUInt32LE(pos) + bytes.readUInt32LE(pos + 4) * 4294967296; };
+    const string = () => { const length = u64(); return bytes.toString('utf8', take(length), offset); };
+    let names: string[];
+    if (bytes.toString('ascii', 0, 4) === 'GGUF') {
+      take(4);
+      const version = u32();
+      if (version !== 2 && version !== 3) return false;
+      const tensors = u64(), metadata = u64();
+      if (tensors > 20000 || metadata > 10000) return false;
+      const skipValue = (type: number, depth = 0): void => {
+        if (depth > 1) throw new Error('Invalid metadata');
+        const sizes: Record<number, number> = { 0: 1, 1: 1, 2: 2, 3: 2, 4: 4, 5: 4, 6: 4, 7: 1, 10: 8, 11: 8, 12: 8 };
+        if (type === 8) { string(); return; }
+        if (type === 9) {
+          const subtype = u32(), count = u64();
+          if (count > IMAGE_HEADER_BYTES) throw new Error('Large metadata');
+          for (let i = 0; i < count; i++) skipValue(subtype, depth + 1);
+          return;
+        }
+        if (!sizes[type]) throw new Error('Unknown metadata');
+        take(sizes[type]);
+      };
+      for (let i = 0; i < metadata; i++) { string(); skipValue(u32()); }
+      names = [];
+      for (let i = 0; i < tensors; i++) {
+        names.push(string());
+        const dimensions = u32();
+        if (dimensions > 4) return false;
+        take(dimensions * 8 + 4 + 8);
+      }
+    } else {
+      const length = u64();
+      names = Object.keys(JSON.parse(bytes.toString('utf8', take(length), offset)));
+    }
+    return names.some(name => /^model\.diffusion_model\.input_blocks\./.test(name)) &&
+      names.some(name => /^first_stage_model\.decoder\./.test(name)) &&
+      names.some(name => /^(cond_stage_model\.|conditioner\.embedders\.)/.test(name));
+  } catch { return false; }
 }
 
-/** Supported SD image weights; other architectures need their own complete pack. */
-export const isSDImageWeight = (name: string): boolean => /^qwen_image_2\.1-.*\.gguf$/i.test(name);
+export async function validateSDCheckpointFile(path: string): Promise<boolean> {
+  const size = Number((await RNFS.stat(path)).size);
+  return isCompleteSDCheckpoint(Buffer.from(await RNFS.read(path, Math.min(size, IMAGE_HEADER_BYTES), 0, 'base64'), 'base64'));
+}
 
 /** The same required-file list is used by loading, recovery, and model transfer. */
 export function getSDImagePackFiles(names: string[], modelId?: string): NonNullable<HFImageModel['huggingFaceFiles']> | null {
   const weights = names.filter(isSDImageWeight);
   if (weights.length !== 1) return null;
-  const template = getSDImageModels()[0];
+  const templates = getSDImageModels();
+  if (!QWEN_IMAGE_WEIGHT.test(weights[0])) {
+    const template = templates.find(model => model.id === modelId && model.fileName === weights[0]);
+    return [{ path: weights[0], size: 0, sha256: template?.huggingFaceFiles?.[0].sha256 }];
+  }
+  const template = templates.find(model => model.repo === 'leejet/Qwen-Image-2.1-GGUF');
   if (!template?.huggingFaceFiles) return null;
   return template.huggingFaceFiles.map(file => file.path === template.fileName
     ? { path: weights[0], size: 0, sha256: modelId === template.id && weights[0] === file.path ? file.sha256 : undefined }
     : file);
 }
 
-export async function searchSDImageModels(query: string): Promise<HFImageModel[]> {
-  const repositories = await searchHuggingFace(query, { kind: 'image', limit: 10 });
-  const template = getSDImageModels()[0];
-  if (!template?.huggingFaceFiles) return [];
-  const companion = template.huggingFaceFiles.filter(file => file.path !== template.fileName);
-  const listings = await Promise.allSettled(repositories.map(async repo => {
-    const files = await getModelFiles(repo.id, { kind: 'image' });
-    return files.filter(file => isSDImageWeight(file.fileName) && file.sizeBytes > 0).map(file => {
-      const canonical = repo.id === template.repo && file.fileName === template.fileName;
-      if (canonical) return template;
-      const id = `sd-${repo.id.replaceAll('/', '--')}--${file.fileName}`;
-      return {
-        id, name: `${template.name} ${file.quant}`, displayName: `${template.displayName} · ${file.quant}`,
-        backend: 'sd' as const, repo: repo.id, fileName: file.fileName,
-        downloadUrl: file.downloadUrl,
-        size: file.sizeBytes + companion.reduce((sum, part) => sum + part.size, 0),
-        huggingFaceFiles: [{ path: file.fileName, size: file.sizeBytes, downloadUrl: file.downloadUrl, sha256: file.sha256 }, ...companion],
-      };
-    }).filter(model => model.id.length <= 160);
-  }));
-  if (listings.length && listings.every(result => result.status === 'rejected')) {
-    throw new Error('Could not read image model files from Hugging Face. Try again.');
+/** Replace catalog size estimates with immutable Hugging Face file metadata. */
+export async function resolveSDImageDownloadFiles(repo: string, files: NonNullable<HFImageModel['huggingFaceFiles']>) {
+  if (files.every(file => file.sha256 && /\/resolve\/[a-f0-9]{40}\//i.test(file.downloadUrl ?? ''))) return files;
+  const response = await fetch(`https://huggingface.co/api/models/${repo}?blobs=true`);
+  if (!response.ok) throw new Error('Could not verify the image download files. Try again.');
+  const data = await response.json() as { sha: string; siblings?: { rfilename: string; size?: number; lfs?: { size: number; sha256?: string } }[] };
+  if (!/^[a-f0-9]{40}$/i.test(data.sha)) throw new Error('The model repository has no stable revision.');
+  return files.map(file => {
+    if (file.sha256 && /\/resolve\/[a-f0-9]{40}\//i.test(file.downloadUrl ?? '')) return file;
+    const source = data.siblings?.find(candidate => candidate.rfilename === file.path);
+    const size = source?.lfs?.size ?? source?.size ?? 0;
+    if (!source || size <= 0) throw new Error(`Required image file is missing: ${file.path}`);
+    return { path: file.path, size, sha256: source.lfs?.sha256,
+      downloadUrl: `https://huggingface.co/${repo}/resolve/${data.sha}/${file.path.split('/').map(encodeURIComponent).join('/')}` };
+  });
+}
+
+export async function searchSDImageModels(query: string, signal?: AbortSignal): Promise<HFImageModel[]> {
+  const params = new URLSearchParams({ search: query, pipeline_tag: 'text-to-image', sort: 'downloads', direction: '-1', limit: '10' });
+  const [ggufRepos, checkpointResponse] = await Promise.all([
+    searchHuggingFace(query, { kind: 'image', limit: 10, fetchImpl: (url, init) => fetch(url, { ...init, signal }) }),
+    fetch(`https://huggingface.co/api/models?${params}`, { signal }),
+  ]);
+  if (!checkpointResponse.ok) throw new Error('Could not search image models on Hugging Face. Try again.');
+  const checkpointRepos = await checkpointResponse.json() as { id: string }[];
+  const repositories = [...new Map([...ggufRepos, ...checkpointRepos].map(repo => [repo.id, repo])).values()];
+  const catalogModels = getSDImageModels();
+  const template = catalogModels.find(model => model.repo === 'leejet/Qwen-Image-2.1-GGUF')!;
+  const companion = template.huggingFaceFiles!.filter(file => file.path !== template.fileName);
+  const models: HFImageModel[] = [];
+  let readableRepos = 0;
+  for (const repo of repositories) {
+    if (signal?.aborted) throw new Error('Image search cancelled.');
+    try {
+      const response = await fetch(`https://huggingface.co/api/models/${repo.id}?blobs=true`, { signal });
+      if (!response.ok) continue;
+      const data = await response.json() as { sha: string; siblings?: { rfilename: string; size?: number; lfs?: { size: number; sha256?: string } }[] };
+      if (!/^[a-f0-9]{40}$/i.test(data.sha)) continue;
+      readableRepos++;
+      // Bound header work per repo. Unsupported files remain absent from downloads.
+      const candidates = (data.siblings ?? []).filter(file => isSDImageWeight(file.rfilename) && (file.lfs?.size ?? file.size ?? 0) > 0).slice(0, 8);
+      for (const file of candidates) {
+        const downloadUrl = `https://huggingface.co/${repo.id}/resolve/${data.sha}/${encodeURIComponent(file.rfilename)}`;
+        const qwen = QWEN_IMAGE_WEIGHT.test(file.rfilename);
+        if (!qwen) {
+          const header = await fetch(downloadUrl, { signal, headers: { Range: `bytes=0-${IMAGE_HEADER_BYTES - 1}` } });
+          if (header.status !== 206 || !/^bytes 0-\d+\//.test(header.headers.get('content-range') ?? '') ||
+            Number(header.headers.get('content-length')) > IMAGE_HEADER_BYTES) continue;
+          if (!isCompleteSDCheckpoint(Buffer.from(await header.arrayBuffer()))) continue;
+        }
+        const size = file.lfs?.size ?? file.size ?? 0;
+        const canonical = catalogModels.find(model => model.repo === repo.id && model.fileName === file.rfilename);
+        const id = canonical?.id ?? `sd-${repo.id.replaceAll('/', '--')}--${file.rfilename}`;
+        if (id.length > 160) continue;
+        const displayName = canonical?.displayName ?? (qwen ? `Qwen Image 2.1 ${extractQuantization(file.rfilename)}` : file.rfilename.replace(/\.(gguf|safetensors)$/i, ''));
+        const parts = [{ path: file.rfilename, size, downloadUrl, sha256: file.lfs?.sha256 }, ...(qwen ? companion : [])];
+        models.push({ id, name: displayName, displayName, backend: 'sd', repo: repo.id, fileName: file.rfilename,
+          downloadUrl, size: parts.reduce((sum, part) => sum + part.size, 0), huggingFaceFiles: parts });
+      }
+    } catch { /* One inaccessible repository must not hide other supported results. */ }
   }
-  return listings.flatMap(result => result.status === 'fulfilled' ? result.value : []);
+  if (repositories.length && !readableRepos) throw new Error('Could not read image model files from Hugging Face. Try again.');
+  if (repositories.length && !models.length) throw new Error('No complete supported image checkpoints found. Use SD 1.x, SD 2.x, SDXL, or Qwen Image 2.1. Split models and adapters need other files.');
+  return models;
 }
 
 export async function resolveSDImagePack(_modelId: string, modelPath: string) {
   const files = getSDImagePackFiles((await RNFS.readDir(modelPath)).filter(file => file.isFile()).map(file => file.name));
-  if (!files) throw new Error('This image model pack is not supported.');
+  if (!files) throw new Error('Select one complete SD checkpoint or a Qwen Image 2.1 pack.');
+  const weight = files[0].path;
+  const defaults = standardImageModelDefaults(weight);
+  if (!QWEN_IMAGE_WEIGHT.test(weight)) {
+    if (!await validateSDCheckpointFile(`${modelPath}/${weight}`)) throw new Error('This checkpoint is unsupported or incomplete. It must include the SD image model, text encoder, and VAE.');
+    return { family: 'checkpoint', weight: `${modelPath}/${weight}`, vae: '', llm: '', sampler: defaults.sampler, scheduler: defaults.scheduler };
+  }
   const required = (pattern: RegExp) => {
     const file = files.find(part => pattern.test(part.path));
     if (!file) throw new Error('The image model pack is incomplete.');
     return `${modelPath}/${file.path}`;
   };
-  return {
-    weight: required(/^qwen_image_2\.1-.*\.gguf$/i),
-    vae: required(/vae.*\.safetensors$/i),
-    llm: required(/^Qwen3VL-.*\.gguf$/i),
-  };
+  return { family: 'qwen-image-2.1', weight: `${modelPath}/${weight}`,
+    vae: required(/vae.*\.safetensors$/i), llm: required(/^Qwen3VL-.*\.gguf$/i),
+    sampler: defaults.sampler, scheduler: defaults.scheduler };
 }
 
 export const BUNDLED_EMBEDDING_MODEL = {
diff --git a/src/services/imageDownloadActions.ts b/src/services/imageDownloadActions.ts
index 38dc725c1..45c9afcfe 100644
--- a/src/services/imageDownloadActions.ts
+++ b/src/services/imageDownloadActions.ts
@@ -1,3 +1,4 @@
+import { resolveSDImagePack, resolveSDImageDownloadFiles } from './huggingFaceModelBrowser';
 /** Standalone async image download handlers - no hooks. All download state flows through
  *  useDownloadStore via the stable image:<id> modelKey (single source of truth). */
 import { Platform } from 'react-native';
@@ -308,6 +309,15 @@ export async function downloadHuggingFaceModel(
     deps.setAlertState(showAlert('Error', 'Invalid HuggingFace model configuration'));
     return;
   }
+  if (modelInfo.backend === 'sd') {
+    try {
+      const files = await resolveSDImageDownloadFiles(modelInfo.huggingFaceRepo, modelInfo.huggingFaceFiles);
+      modelInfo = { ...modelInfo, huggingFaceFiles: files, size: files.reduce((sum, file) => sum + file.size, 0) };
+    } catch (error) {
+      deps.setAlertState(showAlert('Download unavailable', error instanceof Error ? error.message : 'Could not verify the image files.'));
+      return;
+    }
+  }
   const syntheticId = makeMultifileId(modelInfo.id);
   const created = addImageEntry({
     modelId: modelInfo.id,
@@ -333,7 +343,7 @@ export async function downloadHuggingFaceModel(
     await ensureDirectory(imageModelsDir);
     await ensureDirectory(modelDir);
 
-    const files = modelInfo.huggingFaceFiles.map((file) => ({
+    const files = modelInfo.huggingFaceFiles!.map((file) => ({
       relativePath: file.path,
       size: file.size,
       expectedSize: modelInfo.backend === 'sd' ? file.size : undefined,
@@ -343,6 +353,7 @@ export async function downloadHuggingFaceModel(
     await downloadSequentialFiles({ modelInfo, runtime, syntheticId, modelDir, files });
     assertNotCancelled(modelInfo.id, runtime);
     await validateMultifileComplete(modelDir, files); // reject a silently-truncated part before registering
+    if (modelInfo.backend === 'sd') await resolveSDImagePack(modelInfo.id, modelDir);
     useDownloadStore.getState().setProcessing(syntheticId);
     assertNotCancelled(modelInfo.id, runtime);
     await RNFS.writeFile(`${modelDir}/_ready`, '', 'utf8').catch(() => {});
diff --git a/src/services/modelManager/scan.ts b/src/services/modelManager/scan.ts
index 2d0e037f5..6cfed33fc 100644
--- a/src/services/modelManager/scan.ts
+++ b/src/services/modelManager/scan.ts
@@ -1,4 +1,3 @@
-import { extractQuantization } from '@offgrid/models';
 import { getSDImageModels, getSDImagePackFiles, isSDImageWeight } from '../huggingFaceModelBrowser';
 import RNFS from 'react-native-fs';
 import { statFile } from '../../utils/fileStat';
@@ -7,7 +6,7 @@ import { DownloadedModel, LlamaDownloadedModel, ONNXImageModel } from '../../typ
 import { loadDownloadedModels, saveModelsList } from './storage';
 import { basenameOf } from './reconcileStoredPaths';
 import { resolveCoreMLModelDir } from '../../utils/coreMLModelUtils';
-import { ensureImageExtractionComplete, validateMultifileComplete } from '../../utils/imageModelIntegrity';
+import { ensureImageExtractionComplete, validateMultifileComplete, validateImageModelDir } from '../../utils/imageModelIntegrity';
 // Single source of truth for projector detection + model↔projector matching (see src/services/mmproj.ts).
 import { isMMProjFile, pickMmProjForModel } from '../mmproj';
 
@@ -149,7 +148,7 @@ async function buildRecoveredImageModel(
   const sdWeight = backend === 'sd' ? (await RNFS.readDir(item.path)).find(file => file.isFile() && isSDImageWeight(file.name))?.name : undefined;
   return {
     id: item.name,
-    name: getSDImageModels().find(model => model.id === item.name)?.displayName ?? (sdWeight ? `Qwen Image 2.1 ${extractQuantization(sdWeight)}` : item.name.replaceAll('_', ' ')),
+    name: getSDImageModels().find(model => model.id === item.name)?.displayName ?? (sdWeight ? sdWeight.replace(/\.(gguf|safetensors)$/i, '') : item.name.replaceAll('_', ' ')),
     description: '',
     modelPath,
     size: totalSize,
@@ -244,6 +243,7 @@ export async function reconcileFinishedImageDownloads(opts: ReconcileImageModels
       const hasReady = await RNFS.exists(readyPath);
 
       if (hasReady) {
+        if (detectBackend(item.name) === 'sd' && !(await validateImageModelDir(item.path, 'sd')).complete) continue;
         // Unzip completed but registerAndNotify was killed — register now.
         const newModel = await buildRecoveredImageModel(item, detectBackend(item.name));
         await addImageModel(newModel);
diff --git a/src/utils/imageModelIntegrity.ts b/src/utils/imageModelIntegrity.ts
index 60098860f..9580e6a18 100644
--- a/src/utils/imageModelIntegrity.ts
+++ b/src/utils/imageModelIntegrity.ts
@@ -18,7 +18,7 @@
  */
 import RNFS from 'react-native-fs';
 import { statFile } from './fileStat';
-import { getSDImagePackFiles, isSDImageWeight } from '../services/huggingFaceModelBrowser';
+import { getSDImagePackFiles, isSDImageWeight, validateSDCheckpointFile } from '../services/huggingFaceModelBrowser';
 import { unzip } from 'react-native-zip-archive';
 import { ImageModelIncompleteError } from './modelLoadErrors';
 import logger from './logger';
@@ -159,7 +159,14 @@ export async function validateImageModelDir(modelPath: string, backend: ImageBac
   let items: ReadDirItem[];
   try { items = await RNFS.readDir(dir); } catch { return { complete: false, missing: ['<unreadable model dir>'] }; }
   const files: ImageDirEntry[] = items.map(i => ({ name: i.name, size: Number(i.size) || 0, isFile: i.isFile() }));
-  return checkImageModelFiles(files, backend);
+  const result = checkImageModelFiles(files, backend);
+  if (backend === 'sd' && result.complete) {
+    const pack = getSDImagePackFiles(files.filter(file => file.isFile).map(file => file.name));
+    if (pack?.length === 1 && !await validateSDCheckpointFile(`${dir}/${pack[0].path}`)) {
+      return { complete: false, missing: ['complete SD checkpoint with image model, text encoder, and VAE'] };
+    }
+  }
+  return result;
 }
 
 /**

From 96f9cd5a6a15b547741efc8ac568ef480a4c8341 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 06:14:17 +0530
Subject: [PATCH 111/129] fix(video): show pending stop until native work ends
 [skip ci]

---
 src/services/videoGenerationService.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/services/videoGenerationService.ts b/src/services/videoGenerationService.ts
index 1d2ca8fa0..7aa897053 100644
--- a/src/services/videoGenerationService.ts
+++ b/src/services/videoGenerationService.ts
@@ -226,6 +226,7 @@ class VideoGenerationService {
     };
   };
   private update(patch: Partial<VideoGenerationJobContract>) {
+    if (this.cancelled && patch.stage !== undefined) return;
     this.state = { ...this.state, ...patch };
     for (const listener of this.listeners) listener();
   }
@@ -251,6 +252,7 @@ class VideoGenerationService {
     this.cancelled = true;
     this.abort.abort();
     if (this.state.phase === 'running') {
+      this.update({ error: 'Video stop requested.', progress: null, preview: null });
       await videoGenerator.cancel();
       if (this.state.stage === 'enhancing')
         await getActiveEngineService()?.stopGeneration();

From 8f9d6f4f71f5605af738555cf33d380098638a70 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 06:22:11 +0530
Subject: [PATCH 112/129] feat(video): add short Android backend diagnostics
 [skip ci]

---
 android/app/src/main/cpp/video/video-jni.cpp  |   5 +-
 .../video/VideoGenerationModule.kt            |   5 +-
 native/video/common/VideoRuntime.hpp          |   3 +-
 src/services/videoGenerationService.ts        | 186 ++++++++++++++----
 src/services/videoGenerator.ts                |   2 +
 5 files changed, 163 insertions(+), 38 deletions(-)

diff --git a/android/app/src/main/cpp/video/video-jni.cpp b/android/app/src/main/cpp/video/video-jni.cpp
index b042c36d9..cd12491c5 100644
--- a/android/app/src/main/cpp/video/video-jni.cpp
+++ b/android/app/src/main/cpp/video/video-jni.cpp
@@ -56,7 +56,7 @@ extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationMod
 }
 extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationModule_nativeGenerate(
   JNIEnv *env, jobject self, jstring weight, jstring vae, jstring encoder, jstring prompt, jstring negative,
-  jint width, jint height, jint frames, jint fps, jint steps, jdouble guidance, jdouble seed, jstring llm, jstring embeddings, jstring audioVae, jdouble flowShift) {
+  jint width, jint height, jint frames, jint fps, jint steps, jdouble guidance, jdouble seed, jstring llm, jstring embeddings, jstring audioVae, jdouble flowShift, jstring diagnosticBackend) {
   jobject owner = nullptr;
   try {
     offgrid::VideoRequest request{string(env, weight), string(env, vae), string(env, encoder), string(env, prompt), string(env, negative), width, height, frames, fps, steps, (float)guidance, (int64_t)seed};
@@ -64,6 +64,9 @@ extern "C" JNIEXPORT void JNICALL Java_ai_offgridmobile_video_VideoGenerationMod
     request.embeddings = string(env, embeddings);
     request.audioVae = string(env, audioVae);
     request.flowShift = (float)flowShift;
+    const auto backend = string(env, diagnosticBackend);
+    request.cpuOnly = backend == "cpu";
+    request.skipNpu = backend == "gpu";
     JavaVM *vm = nullptr;
     if (env->GetJavaVM(&vm) != JNI_OK) throw std::runtime_error("Could not access the video host.");
     owner = env->NewGlobalRef(self);
diff --git a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
index 714445aab..2cbc64a91 100644
--- a/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
+++ b/android/app/src/main/java/ai/offgridmobile/video/VideoGenerationModule.kt
@@ -1,5 +1,6 @@
 package ai.offgridmobile.video
 
+import ai.offgridmobile.BuildConfig
 import android.content.Intent
 import android.view.Window
 import android.view.WindowManager
@@ -53,7 +54,7 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
     override fun onHostPause() { releaseScreenFlag() }
     override fun onHostDestroy() { releaseScreenFlag() }
     override fun getName() = "VideoGenerationModule"
-    private external fun nativeGenerate(weight: String, vae: String, encoder: String, prompt: String, negative: String, width: Int, height: Int, frames: Int, fps: Int, steps: Int, guidance: Double, seed: Double, llm: String, embeddings: String, audioVae: String, flowShift: Double)
+    private external fun nativeGenerate(weight: String, vae: String, encoder: String, prompt: String, negative: String, width: Int, height: Int, frames: Int, fps: Int, steps: Int, guidance: Double, seed: Double, llm: String, embeddings: String, audioVae: String, flowShift: Double, diagnosticBackend: String)
     private external fun nativeCancel()
     private external fun nativePrepare()
     private external fun nativeSetRuntimeDirectory(path: String)
@@ -151,7 +152,7 @@ class VideoGenerationModule(private val context: ReactApplicationContext) : Reac
                         if (input.hasKey("llm")) input.getString("llm") ?: "" else "",
                         if (input.hasKey("embeddings")) input.getString("embeddings") ?: "" else "",
                         if (input.hasKey("audioVae")) input.getString("audioVae") ?: "" else "",
-                        input.getDouble("flowShift"))
+                        input.getDouble("flowShift"), if (BuildConfig.DEBUG && input.hasKey("diagnosticBackend")) input.getString("diagnosticBackend") ?: "auto" else "auto")
                     writer.finish { cancelled.get() }
                 }
                 check(destination.length() > 0) { "Video encoder produced no file." }
diff --git a/native/video/common/VideoRuntime.hpp b/native/video/common/VideoRuntime.hpp
index 189682a28..0a49101c4 100644
--- a/native/video/common/VideoRuntime.hpp
+++ b/native/video/common/VideoRuntime.hpp
@@ -21,6 +21,7 @@ struct VideoRequest {
   std::string llm, embeddings, audioVae;
   float flowShift = 0;
   bool cpuOnly = false;
+  bool skipNpu = false;
   int threads = 4;
   std::string imageFamily, imageSampler, imageScheduler;
 };
@@ -55,7 +56,7 @@ class VideoRuntime {
       for (size_t i = 0; i < ggml_backend_dev_count(); ++i) {
         auto device = ggml_backend_dev_get(i);
         const char *name = ggml_backend_dev_name(device);
-        if (request.cpuOnly || std::string(name).rfind("HTP", 0) != 0) continue;
+        if (request.cpuOnly || request.skipNpu || std::string(name).rfind("HTP", 0) != 0) continue;
         try {
           auto probe = ggml_backend_dev_init(device, nullptr);
           if (!probe) continue;
diff --git a/src/services/videoGenerationService.ts b/src/services/videoGenerationService.ts
index 7aa897053..fe78bef8d 100644
--- a/src/services/videoGenerationService.ts
+++ b/src/services/videoGenerationService.ts
@@ -1,3 +1,4 @@
+import { Alert, DevSettings, Platform } from 'react-native';
 import { videoGenerationMeta } from '../utils/modelHelpers';
 import { resolveDocumentPath } from '../utils/resolveDocumentPath';
 import logger from '../utils/logger';
@@ -14,6 +15,9 @@ import RNFS from 'react-native-fs';
 import { generateId as uuid } from '../utils/generateId';
 import {
   resolveVideoRequest,
+  videoArchitecture,
+  type ModelEntry,
+  type ResolvedVideoRequest,
   type VideoGenerationJobContract,
   type VideoGenerationRequestContract,
 } from '@offgrid/models';
@@ -269,6 +273,136 @@ class VideoGenerationService {
     });
     return this.completion;
   }
+  private async reserveVideo(
+    model: ModelEntry | undefined,
+    request: ResolvedVideoRequest,
+    modelId: string,
+    options?: { override?: boolean; nativeRecovery?: boolean },
+  ): Promise<symbol> {
+    return modelResidencyManager.runExclusive('video-generation', async () => {
+      const sizeMB =
+        (model?.files.reduce((sum, file) => sum + (file.sizeBytes ?? 0), 0) ??
+          0) /
+          1048576 +
+        (request.width * request.height * request.frames * 12) / 1048576 +
+        1024;
+      const spec = {
+        key: 'video',
+        type: 'video' as const,
+        modelId,
+        sizeMB,
+        dirtyMemory: true,
+        canEvict: () => false,
+      };
+      // A recovered native worker already owns its memory.
+      if (!options?.nativeRecovery) {
+        const fit = await modelResidencyManager.makeRoomFor(spec, options);
+        if (!fit.fits)
+          throw new OverridableMemoryError(
+            'Not enough available memory for this video model and clip size.',
+          );
+      }
+      if (this.cancelled) throw new Error('Video generation stopped.');
+      return modelResidencyManager.register(spec, () =>
+        this.cancelGeneration(),
+      );
+    });
+  }
+  async diagnose(backend: 'auto' | 'gpu' | 'cpu'): Promise<string> {
+    if (!__DEV__ || Platform.OS !== 'android')
+      throw new Error('Video diagnostics require an Android debug build.');
+    if (this.completion || generationSession.getConversationId())
+      throw new Error('Wait for the current generation to finish.');
+    const app = useAppStore.getState();
+    const model = app.downloadedVideoModels.find(
+      m => m.id === app.activeVideoModelId,
+    );
+    const primary = model?.files.find(file => file.role === 'primary')?.name;
+    if (!model || !primary || videoArchitecture(primary) !== 'wan21')
+      throw new Error('Select an installed Wan 2.1 video model first.');
+    // Public validation remains unchanged. Only this explicit developer action uses one frame.
+    const request = {
+      ...resolveVideoRequest({
+        model: primary,
+        prompt:
+          'A red ball rolls slowly across a wooden table. Natural daylight, fixed camera.',
+        width: 832,
+        height: 480,
+        frames: 9,
+        fps: 8,
+        steps: 4,
+        guidance: 6,
+        seed: 597089194,
+      }),
+      frames: 1,
+      steps: 2,
+    };
+    const output = `${
+      RNFS.DocumentDirectoryPath
+    }/generated-videos/diagnostic-${backend}-${Date.now()}.mp4`;
+    this.cancelled = false;
+    this.abort = new AbortController();
+    this.update({
+      ...EMPTY,
+      phase: 'running',
+      stage: 'preparing',
+      startedAt: Date.now(),
+    });
+    this.completion = (async () => {
+      let registration: symbol | undefined;
+      try {
+        const pack = await resolveVideoPack(model);
+        registration = await this.reserveVideo(model, request, model.id, {
+          override: true,
+        });
+        await RNFS.mkdir(`${RNFS.DocumentDirectoryPath}/generated-videos`);
+        logger.log('[VideoDiagnostic] start', { ...request, backend, output });
+        await videoGenerator.generate(
+          request,
+          pack,
+          output,
+          update => this.update(update),
+          undefined,
+          backend,
+        );
+        if (this.cancelled) throw new Error('Video generation stopped.');
+        const metadata = {
+          ...request,
+          requestedBackend: backend,
+          output,
+          size: (await RNFS.stat(output)).size,
+          durationMs: Date.now() - (this.state.startedAt ?? Date.now()),
+        };
+        await RNFS.writeFile(
+          `${output}.json`,
+          JSON.stringify(metadata, null, 2),
+          'utf8',
+        );
+        logger.log('[VideoDiagnostic] complete', metadata);
+        this.update({
+          phase: 'succeeded',
+          outputPath: output,
+          finishedAt: Date.now(),
+        });
+      } catch (error) {
+        this.update({
+          phase: this.cancelled ? 'cancelled' : 'failed',
+          error: String(error),
+          finishedAt: Date.now(),
+        });
+        throw error;
+      } finally {
+        if (registration)
+          modelResidencyManager.unregister('video', registration);
+        await RNFS.unlink(`${output}.preview.png`).catch(() => {});
+      }
+      return undefined;
+    })().finally(() => {
+      this.completion = null;
+    });
+    await this.completion;
+    return output;
+  }
   private async run(
     input: VideoInput,
     resumed?: VideoJournal,
@@ -395,40 +529,7 @@ class VideoGenerationService {
         provenance = remote.provenance;
       } else {
         const pack = options?.nativeRecovery ? null : await resolveVideoPack(model!);
-        await modelResidencyManager.runExclusive(
-          'video-generation',
-          async () => {
-            const sizeMB =
-              (model?.files.reduce(
-                (sum, file) => sum + (file.sizeBytes ?? 0),
-                0,
-              ) ?? 0) /
-                1048576 +
-              (request.width * request.height * request.frames * 12) / 1048576 +
-              1024;
-            const spec = {
-              key: 'video',
-              type: 'video' as const,
-              modelId,
-              sizeMB,
-              dirtyMemory: true,
-              canEvict: () => false,
-            };
-            // The surviving native worker already owns this memory. Do not evict
-            // or load models while reattaching a replacement React bridge.
-            if (!options?.nativeRecovery) {
-              const fit = await modelResidencyManager.makeRoomFor(spec, options);
-              if (!fit.fits)
-                throw new OverridableMemoryError(
-                  'Not enough available memory for this video model and clip size.',
-                );
-            }
-            if (this.cancelled) throw new Error('Video generation stopped.');
-            registration = modelResidencyManager.register(spec, () =>
-              this.cancelGeneration(),
-            );
-          },
-        );
+        registration = await this.reserveVideo(model, request, modelId, options);
         if (this.cancelled) throw new Error('Video generation stopped.');
         path = options?.nativeRecovery
           ? await videoGenerator.recover(request, output, update => this.update(update))
@@ -502,3 +603,20 @@ class VideoGenerationService {
   }
 }
 export const videoGenerationService = new VideoGenerationService();
+
+if (__DEV__ && Platform.OS === 'android') {
+  for (const backend of ['auto', 'gpu', 'cpu'] as const) {
+    DevSettings.addMenuItem(
+      `Video diagnostic: ${backend} · 1 frame, 2 steps`,
+      () => {
+        void videoGenerationService.diagnose(backend).then(
+          path => Alert.alert('Video diagnostic saved', path),
+          error => Alert.alert('Video diagnostic stopped', String(error)),
+        );
+      },
+    );
+  }
+  DevSettings.addMenuItem('Stop video diagnostic', () => {
+    void videoGenerationService.cancelGeneration();
+  });
+}
diff --git a/src/services/videoGenerator.ts b/src/services/videoGenerator.ts
index 8e95e049e..3b206ad59 100644
--- a/src/services/videoGenerator.ts
+++ b/src/services/videoGenerator.ts
@@ -53,6 +53,7 @@ export const videoGenerator = {
     outputPath: string,
     onUpdate: (update: VideoGenerationUpdateContract) => void,
     onInterrupted?: (reason: string) => void,
+    diagnosticBackend?: 'auto' | 'gpu' | 'cpu',
   ): Promise<string> {
     if (!native)
       throw new Error('This build does not include the video engine.');
@@ -109,6 +110,7 @@ export const videoGenerator = {
           ...request,
           ...pack,
           outputPath,
+          ...(__DEV__ && diagnosticBackend ? { diagnosticBackend } : {}),
           flowShift: videoArchitecture(pack.weight)?.startsWith('wan') ? 3 : 0,
         })
       ).path;

From 69fc04c4169855a0981e79b01134b8b9cbb61641 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 06:28:38 +0530
Subject: [PATCH 113/129] fix: retain iOS image backend and failure diagnostics
 [skip ci]

---
 native/video/VideoGenerationModule.mm | 34 +++++++++++++++++++++++++++
 src/services/localDreamGenerator.ts   | 13 ++++++++--
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/native/video/VideoGenerationModule.mm b/native/video/VideoGenerationModule.mm
index 871dc34f7..0ce96d363 100644
--- a/native/video/VideoGenerationModule.mm
+++ b/native/video/VideoGenerationModule.mm
@@ -29,6 +29,7 @@ @implementation VideoGenerationModule {
   BOOL _holdsIdleTimer;
   BOOL _previousIdleTimerDisabled;
   NSString *_videoInterruptionReason;
+  NSString *_imageNativeError;
   BGTask *_continued;
   NSString *_taskIdentifier;
   dispatch_block_t _continuedWork;
@@ -70,6 +71,35 @@ - (void)logLifecycle:(NSString *)detail {
   if (_listeners) [self sendEventWithName:@"VideoGenerationProgress"
     body:@{@"lifecycle":detail, @"at":@([[NSDate date] timeIntervalSince1970] * 1000)}];
 }
+- (void)beginImageDiagnostics {
+  @synchronized (self) { _imageNativeError = nil; }
+  sd_set_log_callback([](enum sd_log_level_t level, const char *text, void *data) {
+    if (!text) return;
+    std::fputs(text, stderr);
+    // Retain placement and failure evidence, without prompts or model contents.
+    if (std::strstr(text, "prompt")) return;
+    if (level < SD_LOG_WARN && !std::strstr(text, "auto-fit") &&
+        !std::strstr(text, "backend") && !std::strstr(text, "MiB") &&
+        !std::strstr(text, "sampling completed") && !std::strstr(text, "cancelling")) return;
+    VideoGenerationModule *owner = (__bridge VideoGenerationModule *)data;
+    NSString *detail = [NSString stringWithUTF8String:text];
+    if (!detail) return;
+    if (detail.length > 2048) detail = [detail substringToIndex:2048];
+    if (level == SD_LOG_ERROR) {
+      @synchronized (owner) { owner->_imageNativeError = detail; }
+    }
+    dispatch_async(dispatch_get_main_queue(), ^{
+      if (owner->_listeners) [owner sendEventWithName:@"SDImageProgress" body:@{@"diagnostic":detail}];
+    });
+  }, (__bridge void *)self);
+}
+- (NSString *)finishImageDiagnostics:(NSString *)failure {
+  sd_set_log_callback(nullptr, nullptr);
+  @synchronized (self) {
+    return failure && _imageNativeError.length
+      ? [NSString stringWithFormat:@"%@ %@", failure, _imageNativeError] : failure;
+  }
+}
 - (void)interruptVideo:(NSString *)reason {
   _videoInterruptionReason = reason;
   _runtime.cancel();
@@ -196,6 +226,7 @@ - (void)emitStage:(NSString *)stage step:(int)step total:(int)total {
     self->_busy = YES; self->_runtime.cancelled.store(false);
     dispatch_async(self->_worker, ^{
       NSString *failure = nil;
+      [self beginImageDiagnostics];
       try {
         offgrid::VideoRequest request{};
         request.weight = [input[@"weight"] UTF8String]; request.vae = [(input[@"vae"] ?: @"") UTF8String];
@@ -206,6 +237,7 @@ - (void)emitStage:(NSString *)stage step:(int)step total:(int)total {
         request.threads = [input[@"threads"] intValue]; request.cpuOnly = [input[@"cpuOnly"] boolValue];
         self->_runtime.loadImage(request, [input[@"modelPath"] UTF8String]);
       } catch (const std::exception &error) { failure = @(error.what()); }
+      failure = [self finishImageDiagnostics:failure];
       dispatch_async(dispatch_get_main_queue(), ^{
         self->_busy = NO;
         if (failure) reject(@"IMAGE_LOAD_FAILED", failure, nil); else resolve(@YES);
@@ -236,6 +268,7 @@ - (void)emitStage:(NSString *)stage step:(int)step total:(int)total {
       @autoreleasepool {
         NSString *output = input[@"outputPath"];
         NSString *failure = nil;
+        [self beginImageDiagnostics];
         try {
           offgrid::VideoRequest request{};
           request.prompt = [input[@"prompt"] UTF8String]; request.negative = [input[@"negativePrompt"] UTF8String];
@@ -265,6 +298,7 @@ - (void)emitStage:(NSString *)stage step:(int)step total:(int)total {
         } catch (const std::exception &error) {
           failure = @(error.what()); [[NSFileManager defaultManager] removeItemAtPath:output error:nil];
         }
+        failure = [self finishImageDiagnostics:failure];
         dispatch_async(dispatch_get_main_queue(), ^{
           self->_busy = NO;
           [self restoreScreenIdleTimer];
diff --git a/src/services/localDreamGenerator.ts b/src/services/localDreamGenerator.ts
index 04b24f003..d33368b26 100644
--- a/src/services/localDreamGenerator.ts
+++ b/src/services/localDreamGenerator.ts
@@ -86,7 +86,12 @@ class LocalDreamGeneratorService {
       if (!integrity.complete) throw new Error(`The image model pack is incomplete: ${integrity.missing.join(', ')}`);
       const pack = await resolveSDImagePack(opts.modelId ?? modelPath.split('/').pop() ?? '', modelPath);
       if (await DiffusionModule?.isModelLoaded()) await DiffusionModule.unloadModel();
-      await SDModule.loadImageModel({ modelPath, ...pack, threads: threads ?? 4, cpuOnly: opts.cpuOnly ?? false });
+      const diagnostics = new NativeEventEmitter(SDModule).addListener('SDImageProgress', (event: { diagnostic?: string }) => {
+        if (event.diagnostic) logger.log(`[SD-IMAGE-NATIVE] ${event.diagnostic}`);
+      });
+      try {
+        await SDModule.loadImageModel({ modelPath, ...pack, threads: threads ?? 4, cpuOnly: opts.cpuOnly ?? false });
+      } finally { diagnostics.remove(); }
       this.usingSD = true; this.eventEmitter = null; this.loadedThreads = threads ?? 4;
       return true;
     }
@@ -138,7 +143,11 @@ class LocalDreamGeneratorService {
   private subscribeToProgress(onProgress?: ProgressCallback, onPreview?: PreviewCallback): any {
     return this.getEmitter().addListener(
       this.usingSD ? 'SDImageProgress' : 'LocalDreamProgress',
-      (event: { step: number; totalSteps: number; progress: number; previewPath?: string }) => {
+      (event: { step: number; totalSteps: number; progress: number; previewPath?: string; diagnostic?: string }) => {
+        if (event.diagnostic) {
+          logger.log(`[SD-IMAGE-NATIVE] ${event.diagnostic}`);
+          return;
+        }
         if (
           !Number.isInteger(event.step) ||
           event.step < 1 ||

From 66f81112211dc93c8e4bc0452ca0a28dd748d399 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 06:32:01 +0530
Subject: [PATCH 114/129] Make Mobile Auto Setup choices compact

---
 src/screens/AutoSetupScreen.tsx | 113 +++++++++++++++++---------------
 1 file changed, 61 insertions(+), 52 deletions(-)

diff --git a/src/screens/AutoSetupScreen.tsx b/src/screens/AutoSetupScreen.tsx
index 271ad019b..cdfddc17d 100644
--- a/src/screens/AutoSetupScreen.tsx
+++ b/src/screens/AutoSetupScreen.tsx
@@ -1,5 +1,5 @@
-import React, { useEffect, useMemo, useSyncExternalStore } from 'react';
-import { ScrollView, Text, View, useWindowDimensions } from 'react-native';
+import React, { useEffect, useMemo, useState, useSyncExternalStore } from 'react';
+import { ScrollView, Text, View } from 'react-native';
 import Icon from 'react-native-vector-icons/Feather';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import type { NativeStackNavigationProp } from '@react-navigation/native-stack';
@@ -8,7 +8,7 @@ import { LoadingDots } from '../components/LoadingDots';
 import { SLOTS, useSlot } from '../bootstrap/slotRegistry';
 import { SPACING, TYPOGRAPHY } from '../constants';
 import type { RootStackParamList } from '../navigation/types';
-import type { AutoSetupItem } from '../services/autoSetupPlan';
+import type { AutoSetupItem, AutoSetupTier } from '../services/autoSetupPlan';
 import {
   autoSetupDownloadId,
   createAutoSetupSession,
@@ -27,11 +27,11 @@ type Props = {
 };
 
 const labelForItem = (item: AutoSetupItem) => {
-  if (item.kind === 'text') return 'TEXT + VISION';
+  if (item.kind === 'text') return 'TEXT';
   if (item.kind === 'image') return 'IMAGE';
   if (item.kind === 'video') return 'VIDEO';
-  if (item.kind === 'embedding') return 'SEARCH MODEL';
-  return 'SPEECH INPUT';
+  if (item.kind === 'embedding') return 'SEARCH';
+  return 'SPEECH';
 };
 
 export const AutoSetupScreen: React.FC<Props> = ({
@@ -44,10 +44,12 @@ export const AutoSetupScreen: React.FC<Props> = ({
     session.snapshot,
     session.snapshot,
   );
-  const { width } = useWindowDimensions();
   const { colors } = useTheme();
   const styles = useThemedStyles(createStyles);
   const VoiceIndicator = useSlot(SLOTS.autoSetupVoiceIndicator);
+  const [expandedTier, setExpandedTier] = useState<AutoSetupTier | null>(
+    () => session.snapshot().selectedTier,
+  );
 
   useEffect(() => {
     session.load().catch(() => undefined);
@@ -118,21 +120,27 @@ export const AutoSetupScreen: React.FC<Props> = ({
           </Card>
         )}
 
-        <View style={[styles.planGrid, width >= 700 && styles.planGridWide]}>
+        <View style={styles.planGrid}>
           {snapshot.plans.map(plan => (
             <Card
               key={plan.tier}
-              onPress={selected?.tier === plan.tier ? undefined : () => session.selectTier(plan.tier)}
+              onPress={starting ? undefined : () => {
+                if (expandedTier === plan.tier) {
+                  setExpandedTier(null);
+                  return;
+                }
+                if (selected?.tier !== plan.tier) session.selectTier(plan.tier);
+                setExpandedTier(plan.tier);
+              }}
               style={{
                 ...styles.planCard,
-                ...(width >= 700 ? styles.planCardWide : {}),
                 ...(selected?.tier === plan.tier ? styles.selectedCard : {}),
               }}
               testID={`auto-setup-plan-${plan.tier}`}
             >
               <Text style={styles.planTitle}>{plan.title}</Text>
               <Text style={styles.secondary}>{plan.summary}</Text>
-              {selected?.tier === plan.tier && (
+              {expandedTier === plan.tier && (
                 <View
                   style={styles.expandedPlan}
                   testID="auto-setup-selected-plan"
@@ -141,20 +149,17 @@ export const AutoSetupScreen: React.FC<Props> = ({
                   <View style={styles.planItems}>
                     {[...plan.items, ...(plan.embedding ? [plan.embedding] : [])].map(item => {
                       const checked = snapshot.selectedKinds.includes(item.kind);
+                      const installed = snapshot.installedIds.includes(autoSetupDownloadId(item));
+                      const size = item.kind === 'embedding' && item.sizeBytes === 0
+                        ? 'Included' : formatBytes(item.sizeBytes);
                       return (
-                        <View
+                        <Card
                           key={`${plan.tier}:${item.kind}:${item.id}`}
                           style={styles.planItem}
                         >
                           <Button
-                            title={labelForItem(item)}
-                            icon={
-                              <Icon
-                                name={checked ? 'check-square' : 'square'}
-                                size={18}
-                                color={checked ? colors.primary : colors.textSecondary}
-                              />
-                            }
+                            title=""
+                            icon={<Icon name={checked ? 'check-square' : 'square'} size={20} color={checked ? colors.primary : colors.textSecondary} />}
                             variant="ghost"
                             size="small"
                             active={checked}
@@ -162,38 +167,22 @@ export const AutoSetupScreen: React.FC<Props> = ({
                             onPress={() => session.toggleKind(item.kind)}
                             disabled={starting}
                             accessibilityRole="checkbox"
-                            accessibilityLabel={`Include ${item.name}, ${formatBytes(item.sizeBytes)}`}
+                            accessibilityLabel={`Include ${item.name}, ${size}${installed ? ', already downloaded' : ''}`}
                             accessibilityState={{ checked, disabled: starting }}
                             testID={`auto-setup-choice-${item.kind}`}
                           />
-                          <Text style={styles.planItemName}>{item.name}</Text>
+                          <Text style={styles.itemKind}>{labelForItem(item)}</Text>
+                          <Text style={styles.planItemName} numberOfLines={1}>
+                            {item.name}
+                          </Text>
                           <Text style={styles.itemSize}>
-                            {item.kind === 'embedding' && item.sizeBytes === 0
-                              ? 'Included with the app' : formatBytes(item.sizeBytes)}
-                            {snapshot.installedIds.includes(autoSetupDownloadId(item))
-                              ? ' - READY'
-                              : outcomeLabel(snapshot.outcomes[autoSetupDownloadId(item)])}
+                            {size}{installed ? '' : outcomeLabel(snapshot.outcomes[autoSetupDownloadId(item)])}
                           </Text>
-                          {item.kind === 'video' && plan.items[3] && (
-                            <>
-                              <Text style={styles.includesLabel}>REQUIRED FILES</Text>
-                              {plan.items[3].payload.files.map(file => (
-                                <Text key={file.name} style={styles.itemSize}>
-                                  {file.name} - {formatBytes(file.sizeBytes ?? 0)}
-                                </Text>
-                              ))}
-                            </>
-                          )}
-                          {item.kind === 'embedding' && (
-                            <Text style={styles.itemSize}>
-                              Download only. To change the search model, open Models and confirm an index rebuild.
-                            </Text>
-                          )}
-                        </View>
+                        </Card>
                       );
                     })}
                     {!plan.items[3] && (
-                      <View style={styles.planItem}>
+                      <View style={styles.unavailableItem}>
                         <Text style={styles.itemKind}>VIDEO</Text>
                         <Text style={styles.itemSize}>
                           {plan.videoExclusionReason ?? 'No video model is included in this Auto Setup plan.'}
@@ -203,7 +192,7 @@ export const AutoSetupScreen: React.FC<Props> = ({
                     {VoiceIndicator ? (
                       <VoiceIndicator
                         onPress={() => navigation.push('ProDetail')}
-                        style={styles.planItem}
+                        style={styles.voiceItem}
                       />
                     ) : null}
                   </View>
@@ -323,7 +312,6 @@ const createStyles = (colors: ThemeColors, _shadows: ThemeShadows) => ({
   title: { ...TYPOGRAPHY.h2, color: colors.text },
   secondary: { ...TYPOGRAPHY.body, color: colors.textSecondary },
   planGrid: { gap: SPACING.sm },
-  planGridWide: { flexDirection: 'row' as const },
   planCard: {
     borderWidth: 1,
     borderColor: colors.border,
@@ -331,7 +319,6 @@ const createStyles = (colors: ThemeColors, _shadows: ThemeShadows) => ({
     padding: SPACING.md,
     borderRadius: SPACING.sm,
   },
-  planCardWide: { flex: 1 },
   selectedCard: { borderColor: colors.primary },
   planTitle: { ...TYPOGRAPHY.h3, color: colors.text },
   expandedPlan: {
@@ -344,21 +331,43 @@ const createStyles = (colors: ThemeColors, _shadows: ThemeShadows) => ({
   includesLabel: { ...TYPOGRAPHY.labelSmall, color: colors.textMuted },
   planItems: { gap: SPACING.sm },
   planItem: {
+    flexDirection: 'row' as const,
+    alignItems: 'center' as const,
+    gap: SPACING.sm,
+    paddingHorizontal: SPACING.sm,
+    paddingVertical: SPACING.xs,
+    borderRadius: SPACING.sm,
+    backgroundColor: colors.surfaceLight,
+  },
+  unavailableItem: {
+    padding: SPACING.sm,
     gap: SPACING.xs,
+  },
+  voiceItem: {
     padding: SPACING.sm,
-    borderWidth: 1,
-    borderColor: colors.border,
+    gap: SPACING.xs,
     borderRadius: SPACING.sm,
     backgroundColor: colors.surfaceLight,
   },
-  choiceControl: { justifyContent: 'flex-start' as const },
-  planItemName: { ...TYPOGRAPHY.body, color: colors.text },
+  choiceControl: {
+    width: 44,
+    height: 44,
+    paddingHorizontal: 0,
+    paddingVertical: 0,
+  },
+  planItemName: {
+    ...TYPOGRAPHY.body,
+    color: colors.text,
+    flex: 1,
+    minWidth: 0,
+  },
   itemSize: {
     ...TYPOGRAPHY.meta,
     color: colors.textSecondary,
+    flexShrink: 0,
   },
   total: { ...TYPOGRAPHY.meta, color: colors.primary },
-  itemKind: { ...TYPOGRAPHY.labelSmall, color: colors.textMuted },
+  itemKind: { ...TYPOGRAPHY.labelSmall, color: colors.textMuted, width: 48 },
   progressTrack: {
     height: SPACING.xs,
     backgroundColor: colors.surfaceLight,

From 0a9571aeaebd2f5682296b946f351456cddcfa03 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 06:42:41 +0530
Subject: [PATCH 115/129] fix: keep video loading counts out of sampling
 progress [skip ci]

---
 scripts/video/video-decode-observer.patch | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/video/video-decode-observer.patch b/scripts/video/video-decode-observer.patch
index 00b9a7a00..c1ffcafee 100644
--- a/scripts/video/video-decode-observer.patch
+++ b/scripts/video/video-decode-observer.patch
@@ -79,6 +79,15 @@ index b90f70e..0fc1aed 100644
      if (sd_progress_cb) {
          sd_progress_cb(step, steps, time, sd_progress_cb_data);
          return;
+@@ -600,6 +642,8 @@
+ void pretty_bytes_progress(int step, int steps, uint64_t bytes_processed, float elapsed_seconds) {
++    // Loading counts are not sampling steps, even when their totals happen to match.
++    if (sd_decode_progress_cb) return;
+     if (sd_progress_cb) {
+         float time = elapsed_seconds / (step + 1e-6f);
+         sd_progress_cb(step, steps, time, sd_progress_cb_data);
+         return;
+     }
 diff --git a/src/core/util.h b/src/core/util.h
 index 334224d..64f3351 100644
 --- a/src/core/util.h

From 0a2e6fa9b2fe28e0babe95b12c2c2f3ab1bc1fcc Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 07:06:16 +0530
Subject: [PATCH 116/129] Tighten Mobile Auto Setup layout

---
 src/screens/AutoSetupScreen.tsx | 91 +++++++++++++++++++++------------
 1 file changed, 58 insertions(+), 33 deletions(-)

diff --git a/src/screens/AutoSetupScreen.tsx b/src/screens/AutoSetupScreen.tsx
index cdfddc17d..dcfe300b2 100644
--- a/src/screens/AutoSetupScreen.tsx
+++ b/src/screens/AutoSetupScreen.tsx
@@ -69,6 +69,7 @@ export const AutoSetupScreen: React.FC<Props> = ({
   );
   const selectedOutcomes =
     selectedItems.map(item => snapshot.outcomes[autoSetupDownloadId(item)]);
+  const showProgress = selectedOutcomes.some(outcome => outcome !== undefined);
   const progress =
     selectedOutcomes.length === 0
       ? 0
@@ -97,7 +98,6 @@ export const AutoSetupScreen: React.FC<Props> = ({
         contentContainerStyle={styles.content}
         testID="auto-setup-screen"
       >
-        <Text style={styles.eyebrow}>AUTO SETUP</Text>
         <Text style={styles.title}>Choose model downloads.</Text>
         <Text style={styles.secondary}>
           Check the models you want. The total excludes models already on this
@@ -138,14 +138,20 @@ export const AutoSetupScreen: React.FC<Props> = ({
               }}
               testID={`auto-setup-plan-${plan.tier}`}
             >
-              <Text style={styles.planTitle}>{plan.title}</Text>
+              <View style={styles.planHeading}>
+                <Text style={styles.planTitle}>{plan.title}</Text>
+                <Icon
+                  name={expandedTier === plan.tier ? 'chevron-up' : 'chevron-down'}
+                  size={16}
+                  color={colors.textMuted}
+                />
+              </View>
               <Text style={styles.secondary}>{plan.summary}</Text>
               {expandedTier === plan.tier && (
                 <View
                   style={styles.expandedPlan}
                   testID="auto-setup-selected-plan"
                 >
-                  <Text style={styles.includesLabel}>CHOOSE MODELS</Text>
                   <View style={styles.planItems}>
                     {[...plan.items, ...(plan.embedding ? [plan.embedding] : [])].map(item => {
                       const checked = snapshot.selectedKinds.includes(item.kind);
@@ -153,7 +159,7 @@ export const AutoSetupScreen: React.FC<Props> = ({
                       const size = item.kind === 'embedding' && item.sizeBytes === 0
                         ? 'Included' : formatBytes(item.sizeBytes);
                       return (
-                        <Card
+                        <View
                           key={`${plan.tier}:${item.kind}:${item.id}`}
                           style={styles.planItem}
                         >
@@ -171,14 +177,14 @@ export const AutoSetupScreen: React.FC<Props> = ({
                             accessibilityState={{ checked, disabled: starting }}
                             testID={`auto-setup-choice-${item.kind}`}
                           />
-                          <Text style={styles.itemKind}>{labelForItem(item)}</Text>
                           <Text style={styles.planItemName} numberOfLines={1}>
                             {item.name}
                           </Text>
+                          <Text style={styles.itemKind}>{labelForItem(item)}</Text>
                           <Text style={styles.itemSize}>
                             {size}{installed ? '' : outcomeLabel(snapshot.outcomes[autoSetupDownloadId(item)])}
                           </Text>
-                        </Card>
+                        </View>
                       );
                     })}
                     {!plan.items[3] && (
@@ -189,22 +195,16 @@ export const AutoSetupScreen: React.FC<Props> = ({
                         </Text>
                       </View>
                     )}
-                    {VoiceIndicator ? (
-                      <VoiceIndicator
-                        onPress={() => navigation.push('ProDetail')}
-                        style={styles.voiceItem}
-                      />
-                    ) : null}
                   </View>
                   <Text style={styles.total}>
                     {formatBytes(selectedBytes)} selected download
                   </Text>
-                  {(starting || selectedOutcomes.length > 0) && (
+                  {(starting || showProgress) && (
                     <View style={styles.progressTrack}>
                       <View
                         style={[
                           styles.progressFill,
-                          { width: `${Math.max(2, progress * 100)}%` },
+                          { width: `${progress * 100}%` },
                         ]}
                       />
                     </View>
@@ -248,6 +248,13 @@ export const AutoSetupScreen: React.FC<Props> = ({
           ))}
         </View>
 
+        {VoiceIndicator ? (
+          <VoiceIndicator
+            onPress={() => navigation.push('ProDetail')}
+            style={styles.voiceItem}
+          />
+        ) : null}
+
         {!selected && (
           <Card style={styles.errorCard}>
             <Text style={styles.error}>
@@ -259,12 +266,14 @@ export const AutoSetupScreen: React.FC<Props> = ({
         <Button
           title="Configure it yourself"
           variant="ghost"
+          style={styles.textAction}
           onPress={() => navigation.push('AdvancedSetup')}
           testID="auto-setup-advanced"
         />
         <Button
           title="Skip for Now"
           variant="ghost"
+          style={styles.textAction}
           onPress={() => navigation.replace('Main')}
           testID="auto-setup-skip"
         />
@@ -293,13 +302,13 @@ function outcomeLabel(
   return '';
 }
 
-const createStyles = (colors: ThemeColors, _shadows: ThemeShadows) => ({
+const createStyles = (colors: ThemeColors, shadows: ThemeShadows) => ({
   container: { flex: 1, backgroundColor: colors.background },
   content: {
     paddingHorizontal: SPACING.md,
     paddingTop: SPACING.xl,
     paddingBottom: SPACING.xxl,
-    gap: SPACING.md,
+    gap: SPACING.sm,
   },
   center: {
     flex: 1,
@@ -308,36 +317,38 @@ const createStyles = (colors: ThemeColors, _shadows: ThemeShadows) => ({
     gap: SPACING.md,
     padding: SPACING.xl,
   },
-  eyebrow: { ...TYPOGRAPHY.label, color: colors.primary },
-  title: { ...TYPOGRAPHY.h2, color: colors.text },
-  secondary: { ...TYPOGRAPHY.body, color: colors.textSecondary },
-  planGrid: { gap: SPACING.sm },
+  title: { ...TYPOGRAPHY.h2, color: colors.text, textAlign: 'left' as const },
+  secondary: { ...TYPOGRAPHY.body, color: colors.textSecondary, textAlign: 'left' as const },
+  planGrid: { gap: SPACING.xs },
   planCard: {
     borderWidth: 1,
     borderColor: colors.border,
     gap: SPACING.xs,
-    padding: SPACING.md,
+    padding: SPACING.sm,
     borderRadius: SPACING.sm,
   },
   selectedCard: { borderColor: colors.primary },
-  planTitle: { ...TYPOGRAPHY.h3, color: colors.text },
+  planHeading: {
+    flexDirection: 'row' as const,
+    alignItems: 'center' as const,
+    justifyContent: 'space-between' as const,
+  },
+  planTitle: { ...TYPOGRAPHY.h3, color: colors.text, textAlign: 'left' as const },
   expandedPlan: {
     borderTopWidth: 1,
     borderTopColor: colors.border,
     marginTop: SPACING.xs,
-    paddingTop: SPACING.sm,
-    gap: SPACING.sm,
+    paddingTop: SPACING.xs,
+    gap: SPACING.xs,
   },
-  includesLabel: { ...TYPOGRAPHY.labelSmall, color: colors.textMuted },
-  planItems: { gap: SPACING.sm },
+  planItems: { gap: 0 },
   planItem: {
     flexDirection: 'row' as const,
     alignItems: 'center' as const,
     gap: SPACING.sm,
-    paddingHorizontal: SPACING.sm,
-    paddingVertical: SPACING.xs,
-    borderRadius: SPACING.sm,
-    backgroundColor: colors.surfaceLight,
+    minHeight: 44,
+    borderBottomWidth: 1,
+    borderBottomColor: colors.border,
   },
   unavailableItem: {
     padding: SPACING.sm,
@@ -347,7 +358,15 @@ const createStyles = (colors: ThemeColors, _shadows: ThemeShadows) => ({
     padding: SPACING.sm,
     gap: SPACING.xs,
     borderRadius: SPACING.sm,
-    backgroundColor: colors.surfaceLight,
+    backgroundColor: colors.surface,
+    ...shadows.small,
+  },
+  textAction: {
+    alignSelf: 'flex-start' as const,
+    justifyContent: 'flex-start' as const,
+    marginLeft: SPACING.md,
+    paddingHorizontal: 0,
+    paddingVertical: SPACING.sm,
   },
   choiceControl: {
     width: 44,
@@ -360,14 +379,20 @@ const createStyles = (colors: ThemeColors, _shadows: ThemeShadows) => ({
     color: colors.text,
     flex: 1,
     minWidth: 0,
+    textAlign: 'left' as const,
   },
   itemSize: {
     ...TYPOGRAPHY.meta,
     color: colors.textSecondary,
     flexShrink: 0,
   },
-  total: { ...TYPOGRAPHY.meta, color: colors.primary },
-  itemKind: { ...TYPOGRAPHY.labelSmall, color: colors.textMuted, width: 48 },
+  total: { ...TYPOGRAPHY.meta, color: colors.primary, textAlign: 'left' as const },
+  itemKind: {
+    ...TYPOGRAPHY.labelSmall,
+    color: colors.textMuted,
+    textAlign: 'right' as const,
+    flexShrink: 0,
+  },
   progressTrack: {
     height: SPACING.xs,
     backgroundColor: colors.surfaceLight,

From 1e98df1bddd58c4c88de6176223876fcae982fe8 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 07:09:55 +0530
Subject: [PATCH 117/129] feat: add mobile design partner details and email
 draft

---
 src/navigation/AppNavigator.tsx      |   6 ++
 src/navigation/types.ts              |   1 +
 src/screens/DesignPartnersScreen.tsx | 103 +++++++++++++++++++++++++++
 src/screens/index.ts                 |   1 +
 4 files changed, 111 insertions(+)
 create mode 100644 src/screens/DesignPartnersScreen.tsx

diff --git a/src/navigation/AppNavigator.tsx b/src/navigation/AppNavigator.tsx
index acea552d0..318d73f2f 100644
--- a/src/navigation/AppNavigator.tsx
+++ b/src/navigation/AppNavigator.tsx
@@ -37,6 +37,7 @@ import {
   RemoteServersScreen,
   RemoteServerEditorScreen,
   ProDetailScreen,
+  DesignPartnersScreen,
   AboutScreen,
   ToolsScreen,
 } from '../screens';
@@ -236,6 +237,11 @@ export const AppNavigator: React.FC = () => {
           component={ProDetailScreen}
           options={{ headerShown: false, animation: 'slide_from_bottom' }}
         />
+        <RootStack.Screen
+          name="DesignPartners"
+          component={DesignPartnersScreen}
+          options={{ headerShown: false }}
+        />
         <RootStack.Screen
           name="About"
           component={AboutScreen}
diff --git a/src/navigation/types.ts b/src/navigation/types.ts
index 0109193d3..940396259 100644
--- a/src/navigation/types.ts
+++ b/src/navigation/types.ts
@@ -26,6 +26,7 @@ export type RootStackParamList = {
   DownloadManager: undefined;
   Gallery: { conversationId?: string } | undefined;
   ProDetail: undefined;
+  DesignPartners: undefined;
   About: undefined;
   Tools: undefined;
 };
diff --git a/src/screens/DesignPartnersScreen.tsx b/src/screens/DesignPartnersScreen.tsx
new file mode 100644
index 000000000..3d4d0e30d
--- /dev/null
+++ b/src/screens/DesignPartnersScreen.tsx
@@ -0,0 +1,103 @@
+import React from 'react';
+import { Alert, Linking, ScrollView, Text, View } from 'react-native';
+import { useNavigation } from '@react-navigation/native';
+import type { NativeStackNavigationProp } from '@react-navigation/native-stack';
+import { SafeAreaView } from 'react-native-safe-area-context';
+import { Button } from '../components/Button';
+import { ScreenHeader } from '../components/ScreenHeader';
+import { SPACING, TYPOGRAPHY } from '../constants';
+import type { RootStackParamList } from '../navigation/types';
+import { useThemedStyles } from '../theme';
+import type { ThemeColors } from '../theme';
+
+const PARTNER_EMAIL = 'mac@getoffgridai.co';
+const OFFER = [
+  {
+    title: 'Free setup and implementation',
+    description:
+      'Work directly with Mac to identify a problem worth solving and test the solution in your business. Setup and implementation cost you $0.',
+  },
+  {
+    title: 'Free lifetime product access',
+    description:
+      'If we create a product based even loosely on your input, you get free lifetime access to that product.',
+  },
+  {
+    title: 'Free lifetime Pro if your idea fits',
+    description:
+      'If your idea is a good fit for Off Grid AI, you get free lifetime Off Grid AI Pro. This applies even if we do not build the full solution together.',
+  },
+  {
+    title: 'Your part: time and feedback',
+    description:
+      'Show us how you work today. Try what we build in your business. Tell us what works and what needs to change.',
+  },
+];
+
+export const DesignPartnersScreen: React.FC = () => {
+  const navigation = useNavigation<NativeStackNavigationProp<RootStackParamList>>();
+  const styles = useThemedStyles(createStyles);
+
+  const openEmail = async () => {
+    const subject = encodeURIComponent('Off Grid AI design partnership');
+    const body = encodeURIComponent(
+      'Hi Mac,\n\nWhat my business does:\n\nNumber of people on my team:\n\nThe task or process I want to improve:\n\nHow we handle it today:\n\nWhere we get stuck:\n',
+    );
+    try {
+      await Linking.openURL(`mailto:${PARTNER_EMAIL}?subject=${subject}&body=${body}`);
+    } catch {
+      Alert.alert('Could not open mail', `Email ${PARTNER_EMAIL} with your business, team size, and the task you want to improve. You can copy the address from this screen.`);
+    }
+  };
+
+  return (
+    <SafeAreaView style={styles.container} edges={['top', 'bottom']}>
+      <ScreenHeader
+        title="Design partners"
+        onBack={() => {
+          if (navigation.canGoBack()) navigation.goBack();
+          else navigation.replace('ProDetail');
+        }}
+      />
+      <ScrollView contentContainerStyle={styles.content}>
+        <Text style={styles.title} accessibilityRole="header">Build around your work. Pay $0.</Text>
+        <Text style={styles.body}>For companies with fewer than 25 people.</Text>
+        {OFFER.map(item => (
+          <View key={item.title} style={styles.section}>
+            <Text style={styles.heading} accessibilityRole="header">{item.title}</Text>
+            <Text style={styles.body}>{item.description}</Text>
+          </View>
+        ))}
+        <View style={styles.section}>
+          <Text style={styles.heading} accessibilityRole="header">Is this a fit for my business?</Text>
+          <Text style={styles.body}>
+            We are looking for problems you would normally budget $99-$999 per
+            month to solve. This describes the type of work. Your cost as a
+            design partner is $0.
+          </Text>
+        </View>
+        <Text style={styles.body}>
+          Email Mac with what your business does, your team size, the task you
+          want to improve, and where you get stuck today.
+        </Text>
+        <Button title="Start a conversation" onPress={openEmail} />
+        <Text style={styles.email} selectable>{PARTNER_EMAIL}</Text>
+      </ScrollView>
+    </SafeAreaView>
+  );
+};
+
+const createStyles = (colors: ThemeColors) => ({
+  container: { flex: 1, backgroundColor: colors.background },
+  content: { padding: SPACING.xl, gap: SPACING.lg },
+  title: { ...TYPOGRAPHY.h2, color: colors.text },
+  heading: { ...TYPOGRAPHY.h3, color: colors.text },
+  body: { ...TYPOGRAPHY.bodySmall, color: colors.textSecondary },
+  section: {
+    gap: SPACING.sm,
+    paddingBottom: SPACING.lg,
+    borderBottomWidth: 1,
+    borderBottomColor: colors.border,
+  },
+  email: { ...TYPOGRAPHY.bodySmall, color: colors.textSecondary, textAlign: 'center' as const },
+});
diff --git a/src/screens/index.ts b/src/screens/index.ts
index d578338e9..8d6a59276 100644
--- a/src/screens/index.ts
+++ b/src/screens/index.ts
@@ -23,5 +23,6 @@ export { SecuritySettingsScreen } from './SecuritySettingsScreen';
 export { RemoteServersScreen } from './RemoteServersScreen';
 export { RemoteServerEditorScreen } from './RemoteServerEditorScreen';
 export { ProDetailScreen } from './ProDetailScreen';
+export { DesignPartnersScreen } from './DesignPartnersScreen';
 export { AboutScreen } from './AboutScreen';
 export { ToolsScreen } from './ToolsScreen';

From 448e8c8e3576b55203a6bd1ef48e468226efd051 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 07:10:02 +0530
Subject: [PATCH 118/129] feat: show design partner offer below Pro pricing

---
 src/screens/ProDetailScreen/index.tsx | 29 ++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/screens/ProDetailScreen/index.tsx b/src/screens/ProDetailScreen/index.tsx
index 805222356..f3993b6c8 100644
--- a/src/screens/ProDetailScreen/index.tsx
+++ b/src/screens/ProDetailScreen/index.tsx
@@ -10,7 +10,7 @@ import { useNavigation } from '@react-navigation/native';
 import type { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import Icon from 'react-native-vector-icons/Feather';
-import { Button } from '../../components';
+import { Button, Card } from '../../components';
 import { useTheme, useThemedStyles } from '../../theme';
 import type { ThemeColors, ThemeShadows } from '../../theme';
 import {
@@ -193,6 +193,26 @@ export const ProDetailScreen: React.FC = () => {
               <Text style={styles.pricingSubtitle}>{pricing.subtitle}</Text>
             </View>
 
+            <Card style={styles.partnerCard}>
+              <Text style={styles.sectionLabel}>SMALL BUSINESS DESIGN PARTNERS</Text>
+              <Text style={styles.partnerTitle} accessibilityRole="header">
+                Your business idea could get you Pro free for life.
+              </Text>
+              <Text style={styles.partnerDescription}>
+                Have fewer than 25 people on your team? Help shape a solution for
+                your daily work.
+              </Text>
+              <Text style={styles.partnerDescription}>
+                If your idea fits Off Grid AI, you get free lifetime Pro. Even if
+                we do not build the full solution together.
+              </Text>
+              <Button
+                title="See the partner offer"
+                variant="secondary"
+                onPress={() => navigation.navigate('DesignPartners')}
+              />
+            </Card>
+
             {/* Ambient pillars */}
             <View style={styles.pillarsSection}>
               <Text style={styles.sectionLabel}>ONE PRIVATE LAYER</Text>
@@ -381,6 +401,13 @@ const createStyles = (colors: ThemeColors, shadows: ThemeShadows) => ({
   },
 
   // Pillars
+  partnerCard: { marginHorizontal: SPACING.xl, marginBottom: SPACING.xl },
+  partnerTitle: { ...TYPOGRAPHY.h2, color: colors.text, marginBottom: SPACING.md },
+  partnerDescription: {
+    ...TYPOGRAPHY.bodySmall,
+    color: colors.textSecondary,
+    marginBottom: SPACING.md,
+  },
   pillarsSection: { paddingHorizontal: SPACING.xl, marginBottom: SPACING.lg },
   sectionLabel: {
     ...TYPOGRAPHY.label,

From 2a545627c5018e0408c1ee7e219e282c56269007 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 07:10:02 +0530
Subject: [PATCH 119/129] feat: link Settings Pro card to design partner offer

---
 src/components/settings/ProUpsellBanner.tsx | 25 ++++++++++++++++++++-
 src/screens/SettingsScreen.tsx              |  1 +
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/components/settings/ProUpsellBanner.tsx b/src/components/settings/ProUpsellBanner.tsx
index 2a0ed30f1..83b36958e 100644
--- a/src/components/settings/ProUpsellBanner.tsx
+++ b/src/components/settings/ProUpsellBanner.tsx
@@ -25,6 +25,7 @@ interface Props {
   /** Re-trigger the entrance animation when the screen regains focus. */
   trigger: number;
   onGetPro: () => void;
+  onDesignPartners: () => void;
 }
 
 /**
@@ -32,7 +33,7 @@ interface Props {
  * (hidden once Pro is active or the banner is dismissed). Flat, token-only, and
  * weights <= 400 per docs/design.
  */
-export const ProUpsellBanner: React.FC<Props> = ({ trigger, onGetPro }) => {
+export const ProUpsellBanner: React.FC<Props> = ({ trigger, onGetPro, onDesignPartners }) => {
   const { colors } = useTheme();
   const styles = useThemedStyles(createStyles);
   // A saved credential may need device reactivation, but it is never an upsell.
@@ -83,6 +84,19 @@ export const ProUpsellBanner: React.FC<Props> = ({ trigger, onGetPro }) => {
 
         <Button title={pricing.cta} variant="primary" onPress={onGetPro} style={styles.cta} />
 
+        <View style={styles.partnerOffer}>
+          <Text style={styles.partnerTitle}>Run a small business?</Text>
+          <Text style={styles.desc}>
+            You could get Off Grid AI Pro free for life as a design partner.
+            For teams with fewer than 25 people, if your idea fits.
+          </Text>
+          <Button
+            title="See the partner offer"
+            variant="ghost"
+            onPress={onDesignPartners}
+          />
+        </View>
+
         <TouchableOpacity
           style={styles.desktopLink}
           onPress={() => Linking.openURL(withUtm(OFF_GRID_DESKTOP_URL, 'pro-upsell')).catch(() => {})}
@@ -130,6 +144,15 @@ const createStyles = (colors: ThemeColors, shadows: ThemeShadows) => ({
   },
   label: { ...TYPOGRAPHY.label, color: colors.text, letterSpacing: 0.5 },
   cta: { margin: SPACING.lg, marginTop: SPACING.sm },
+  partnerOffer: {
+    marginHorizontal: SPACING.lg,
+    marginBottom: SPACING.lg,
+    paddingTop: SPACING.lg,
+    borderTopWidth: 1,
+    borderTopColor: colors.border,
+    gap: SPACING.sm,
+  },
+  partnerTitle: { ...TYPOGRAPHY.h3, color: colors.text },
   desktopLink: {
     flexDirection: 'row' as const,
     alignItems: 'center' as const,
diff --git a/src/screens/SettingsScreen.tsx b/src/screens/SettingsScreen.tsx
index acaa22b5a..d09e0b7b7 100644
--- a/src/screens/SettingsScreen.tsx
+++ b/src/screens/SettingsScreen.tsx
@@ -149,6 +149,7 @@ export const SettingsScreen: React.FC = () => {
         <ProUpsellBanner
           trigger={focusTrigger}
           onGetPro={() => navigation.navigate('ProDetail')}
+          onDesignPartners={() => navigation.navigate('DesignPartners')}
         />
 
         <SettingsAppearanceRow

From 0ec6a8bed4c65319888982e6fd26272270aae48a Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 07:15:13 +0530
Subject: [PATCH 120/129] copy: update small business design partner
 eligibility

---
 src/components/settings/ProUpsellBanner.tsx |  2 +-
 src/screens/DesignPartnersScreen.tsx        | 11 +++++++----
 src/screens/ProDetailScreen/index.tsx       |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/settings/ProUpsellBanner.tsx b/src/components/settings/ProUpsellBanner.tsx
index 83b36958e..1c0b283e0 100644
--- a/src/components/settings/ProUpsellBanner.tsx
+++ b/src/components/settings/ProUpsellBanner.tsx
@@ -88,7 +88,7 @@ export const ProUpsellBanner: React.FC<Props> = ({ trigger, onGetPro, onDesignPa
           <Text style={styles.partnerTitle}>Run a small business?</Text>
           <Text style={styles.desc}>
             You could get Off Grid AI Pro free for life as a design partner.
-            For teams with fewer than 25 people, if your idea fits.
+            For teams with fewer than 50 people, if your idea fits.
           </Text>
           <Button
             title="See the partner offer"
diff --git a/src/screens/DesignPartnersScreen.tsx b/src/screens/DesignPartnersScreen.tsx
index 3d4d0e30d..0502f7553 100644
--- a/src/screens/DesignPartnersScreen.tsx
+++ b/src/screens/DesignPartnersScreen.tsx
@@ -61,7 +61,10 @@ export const DesignPartnersScreen: React.FC = () => {
       />
       <ScrollView contentContainerStyle={styles.content}>
         <Text style={styles.title} accessibilityRole="header">Build around your work. Pay $0.</Text>
-        <Text style={styles.body}>For companies with fewer than 25 people.</Text>
+        <Text style={styles.body}>
+          For small businesses with fewer than 50 people. Ideally, we work
+          directly with an owner or someone who can choose and test a solution.
+        </Text>
         {OFFER.map(item => (
           <View key={item.title} style={styles.section}>
             <Text style={styles.heading} accessibilityRole="header">{item.title}</Text>
@@ -71,9 +74,9 @@ export const DesignPartnersScreen: React.FC = () => {
         <View style={styles.section}>
           <Text style={styles.heading} accessibilityRole="header">Is this a fit for my business?</Text>
           <Text style={styles.body}>
-            We are looking for problems you would normally budget $99-$999 per
-            month to solve. This describes the type of work. Your cost as a
-            design partner is $0.
+            We are looking for recurring problems that would normally justify
+            spending $99-$999 per month to solve. As a design partner, your cost
+            is $0.
           </Text>
         </View>
         <Text style={styles.body}>
diff --git a/src/screens/ProDetailScreen/index.tsx b/src/screens/ProDetailScreen/index.tsx
index f3993b6c8..b7d776be7 100644
--- a/src/screens/ProDetailScreen/index.tsx
+++ b/src/screens/ProDetailScreen/index.tsx
@@ -199,7 +199,7 @@ export const ProDetailScreen: React.FC = () => {
                 Your business idea could get you Pro free for life.
               </Text>
               <Text style={styles.partnerDescription}>
-                Have fewer than 25 people on your team? Help shape a solution for
+                Have fewer than 50 people on your team? Help shape a solution for
                 your daily work.
               </Text>
               <Text style={styles.partnerDescription}>

From e1bf5d21185af1d4af8fe86c0408a6c202349191 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 07:36:43 +0530
Subject: [PATCH 121/129] fix(mobile): simplify included Auto Setup models

---
 src/screens/AutoSetupScreen.tsx  | 107 +++++++++++++++++++------------
 src/services/autoSetupPlan.ts    |   2 +-
 src/services/autoSetupService.ts |  17 ++++-
 3 files changed, 82 insertions(+), 44 deletions(-)

diff --git a/src/screens/AutoSetupScreen.tsx b/src/screens/AutoSetupScreen.tsx
index dcfe300b2..55347772e 100644
--- a/src/screens/AutoSetupScreen.tsx
+++ b/src/screens/AutoSetupScreen.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useMemo, useState, useSyncExternalStore } from 'react';
-import { ScrollView, Text, View } from 'react-native';
+import { ScrollView, Text, TouchableOpacity, View } from 'react-native';
 import Icon from 'react-native-vector-icons/Feather';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import type { NativeStackNavigationProp } from '@react-navigation/native-stack';
@@ -11,6 +11,7 @@ import type { RootStackParamList } from '../navigation/types';
 import type { AutoSetupItem, AutoSetupTier } from '../services/autoSetupPlan';
 import {
   autoSetupDownloadId,
+  autoSetupItemNeedsAction,
   createAutoSetupSession,
   type AutoSetupSession,
 } from '../services/autoSetupService';
@@ -60,7 +61,8 @@ export const AutoSetupScreen: React.FC<Props> = ({
     snapshot.plans.find(plan => plan.tier === snapshot.selectedTier) ??
     snapshot.plans[0];
   const selectedItems = [...(selected?.items ?? []), ...(selected?.embedding ? [selected.embedding] : [])].filter(item =>
-    snapshot.selectedKinds.includes(item.kind),
+    snapshot.selectedKinds.includes(item.kind) &&
+    autoSetupItemNeedsAction(item, snapshot.installedIds),
   );
   const selectedBytes = selectedItems.reduce(
     (total, item) => total + (
@@ -100,8 +102,7 @@ export const AutoSetupScreen: React.FC<Props> = ({
       >
         <Text style={styles.title}>Choose model downloads.</Text>
         <Text style={styles.secondary}>
-          Check the models you want. The total excludes models already on this
-          device.
+          Installed models add no download size.
         </Text>
 
         {snapshot.error && (
@@ -124,29 +125,39 @@ export const AutoSetupScreen: React.FC<Props> = ({
           {snapshot.plans.map(plan => (
             <Card
               key={plan.tier}
-              onPress={starting ? undefined : () => {
-                if (expandedTier === plan.tier) {
-                  setExpandedTier(null);
-                  return;
-                }
-                if (selected?.tier !== plan.tier) session.selectTier(plan.tier);
-                setExpandedTier(plan.tier);
-              }}
               style={{
                 ...styles.planCard,
                 ...(selected?.tier === plan.tier ? styles.selectedCard : {}),
               }}
               testID={`auto-setup-plan-${plan.tier}`}
             >
-              <View style={styles.planHeading}>
-                <Text style={styles.planTitle}>{plan.title}</Text>
-                <Icon
-                  name={expandedTier === plan.tier ? 'chevron-up' : 'chevron-down'}
-                  size={16}
-                  color={colors.textMuted}
-                />
-              </View>
-              <Text style={styles.secondary}>{plan.summary}</Text>
+              <TouchableOpacity
+                style={styles.planHeader}
+                onPress={() => {
+                  if (expandedTier === plan.tier) {
+                    setExpandedTier(null);
+                    return;
+                  }
+                  if (selected?.tier !== plan.tier) session.selectTier(plan.tier);
+                  setExpandedTier(plan.tier);
+                }}
+                disabled={starting}
+                activeOpacity={0.7}
+                accessibilityRole="button"
+                accessibilityLabel={`${plan.title} plan`}
+                accessibilityState={{ expanded: expandedTier === plan.tier, disabled: starting }}
+                testID={`auto-setup-plan-heading-${plan.tier}`}
+              >
+                <View style={styles.planHeading}>
+                  <Text style={styles.planTitle}>{plan.title}</Text>
+                  <Icon
+                    name={expandedTier === plan.tier ? 'chevron-up' : 'chevron-down'}
+                    size={16}
+                    color={colors.textMuted}
+                  />
+                </View>
+                <Text style={styles.secondary}>{plan.summary}</Text>
+              </TouchableOpacity>
               {expandedTier === plan.tier && (
                 <View
                   style={styles.expandedPlan}
@@ -156,6 +167,7 @@ export const AutoSetupScreen: React.FC<Props> = ({
                     {[...plan.items, ...(plan.embedding ? [plan.embedding] : [])].map(item => {
                       const checked = snapshot.selectedKinds.includes(item.kind);
                       const installed = snapshot.installedIds.includes(autoSetupDownloadId(item));
+                      const needsAction = autoSetupItemNeedsAction(item, snapshot.installedIds);
                       const size = item.kind === 'embedding' && item.sizeBytes === 0
                         ? 'Included' : formatBytes(item.sizeBytes);
                       return (
@@ -163,26 +175,39 @@ export const AutoSetupScreen: React.FC<Props> = ({
                           key={`${plan.tier}:${item.kind}:${item.id}`}
                           style={styles.planItem}
                         >
-                          <Button
-                            title=""
-                            icon={<Icon name={checked ? 'check-square' : 'square'} size={20} color={checked ? colors.primary : colors.textSecondary} />}
-                            variant="ghost"
-                            size="small"
-                            active={checked}
-                            style={styles.choiceControl}
-                            onPress={() => session.toggleKind(item.kind)}
-                            disabled={starting}
-                            accessibilityRole="checkbox"
-                            accessibilityLabel={`Include ${item.name}, ${size}${installed ? ', already downloaded' : ''}`}
-                            accessibilityState={{ checked, disabled: starting }}
-                            testID={`auto-setup-choice-${item.kind}`}
-                          />
+                          {needsAction ? (
+                            <Button
+                              title=""
+                              icon={<Icon name={checked ? 'check-square' : 'square'} size={20} color={checked ? colors.primary : colors.textSecondary} />}
+                              variant="ghost"
+                              size="small"
+                              active={checked}
+                              style={styles.choiceControl}
+                              onPress={() => session.toggleKind(item.kind)}
+                              disabled={starting}
+                              accessibilityRole="checkbox"
+                              accessibilityLabel={`Include ${item.name}, ${size}${installed ? ', already downloaded' : ''}`}
+                              accessibilityState={{ checked, disabled: starting }}
+                              testID={`auto-setup-choice-${item.kind}`}
+                            />
+                          ) : (
+                            <View
+                              style={styles.choiceControl}
+                              accessible
+                              accessibilityLabel={`${item.name}, included`}
+                              testID={`auto-setup-included-${item.kind}`}
+                            >
+                              <Icon name="package" size={20} color={colors.textMuted} />
+                            </View>
+                          )}
                           <Text style={styles.planItemName} numberOfLines={1}>
                             {item.name}
                           </Text>
                           <Text style={styles.itemKind}>{labelForItem(item)}</Text>
                           <Text style={styles.itemSize}>
-                            {size}{installed ? '' : outcomeLabel(snapshot.outcomes[autoSetupDownloadId(item)])}
+                            {needsAction
+                              ? `${size}${installed ? '' : outcomeLabel(snapshot.outcomes[autoSetupDownloadId(item)])}`
+                              : item.sizeBytes === 0 ? 'Included' : `${size} · Included`}
                           </Text>
                         </View>
                       );
@@ -328,6 +353,7 @@ const createStyles = (colors: ThemeColors, shadows: ThemeShadows) => ({
     borderRadius: SPACING.sm,
   },
   selectedCard: { borderColor: colors.primary },
+  planHeader: { gap: SPACING.xs },
   planHeading: {
     flexDirection: 'row' as const,
     alignItems: 'center' as const,
@@ -362,17 +388,18 @@ const createStyles = (colors: ThemeColors, shadows: ThemeShadows) => ({
     ...shadows.small,
   },
   textAction: {
-    alignSelf: 'flex-start' as const,
-    justifyContent: 'flex-start' as const,
-    marginLeft: SPACING.md,
+    alignSelf: 'stretch' as const,
+    justifyContent: 'center' as const,
     paddingHorizontal: 0,
-    paddingVertical: SPACING.sm,
+    paddingVertical: SPACING.xs,
   },
   choiceControl: {
     width: 44,
     height: 44,
     paddingHorizontal: 0,
     paddingVertical: 0,
+    alignItems: 'center' as const,
+    justifyContent: 'center' as const,
   },
   planItemName: {
     ...TYPOGRAPHY.body,
diff --git a/src/services/autoSetupPlan.ts b/src/services/autoSetupPlan.ts
index e93665f23..3c47c9a6f 100644
--- a/src/services/autoSetupPlan.ts
+++ b/src/services/autoSetupPlan.ts
@@ -58,7 +58,7 @@ const PLAN_COPY: Record<
   balanced: { title: 'Balanced', summary: 'Models near the middle of each list.' },
   extreme: {
     title: 'Extreme',
-    summary: 'The largest listed models. Check each size before download.',
+    summary: 'Largest model downloads.',
   },
 };
 
diff --git a/src/services/autoSetupService.ts b/src/services/autoSetupService.ts
index 228be9d20..18ab8d2d4 100644
--- a/src/services/autoSetupService.ts
+++ b/src/services/autoSetupService.ts
@@ -110,6 +110,15 @@ export function autoSetupDownloadId(
   return uniformDownloadId(item.kind, item.id);
 }
 
+export function autoSetupItemNeedsAction(
+  item: AutoSetupItem,
+  installedIds: readonly string[],
+): boolean {
+  return item.kind !== 'embedding' || (
+    item.sizeBytes > 0 && !installedIds.includes(autoSetupDownloadId(item))
+  );
+}
+
 function message(error: unknown): string {
   if (error instanceof Error) return error.message;
   if (typeof error === 'string') return error;
@@ -211,7 +220,8 @@ export function createAutoSetupSession(
     state.plans[0];
   const selectedItems = (plan: AutoSetupPlan) =>
     [...plan.items, ...(plan.embedding ? [plan.embedding] : [])]
-      .filter(item => state.selectedKinds.includes(item.kind));
+      .filter(item => state.selectedKinds.includes(item.kind) &&
+        autoSetupItemNeedsAction(item, state.installedIds));
 
   const stopActive = async (cancelled: boolean): Promise<void> => {
     const ids = [...activeIds, ...(pendingEmbeddingId ? [pendingEmbeddingId] : [])];
@@ -484,8 +494,9 @@ export function createAutoSetupSession(
     toggleKind(kind) {
       if (state.phase === 'downloading') return;
       const plan = selectedPlan();
-      if (!plan || ![...plan.items, ...(plan.embedding ? [plan.embedding] : [])]
-        .some(item => item.kind === kind)) return;
+      const item = plan && [...plan.items, ...(plan.embedding ? [plan.embedding] : [])]
+        .find(candidate => candidate.kind === kind);
+      if (!item || !autoSetupItemNeedsAction(item, state.installedIds)) return;
       const selectedKinds = state.selectedKinds.includes(kind)
         ? state.selectedKinds.filter(selected => selected !== kind)
         : [...state.selectedKinds, kind];

From 8c9e8180be68c7bf3fdb0ba3bdda81e5ad7218a5 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 07:37:20 +0530
Subject: [PATCH 122/129] fix: report SD image runtime without inferred
 hardware [skip ci]

---
 src/services/imageGenerationHelpers.ts | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/services/imageGenerationHelpers.ts b/src/services/imageGenerationHelpers.ts
index e7247e7e3..c3fdc87f7 100644
--- a/src/services/imageGenerationHelpers.ts
+++ b/src/services/imageGenerationHelpers.ts
@@ -186,20 +186,25 @@ export function buildImageGenMeta(
   },
 ): GenerationMeta {
   const backend = model.backend ?? 'mnn';
+  // SD selects placement in native code. Its result does not report hardware,
+  // so platform and OpenCL settings cannot establish whether GPU was used.
+  const isSD = backend === 'sd';
   const isGpu =
     Platform.OS === 'ios' ||
     backend === 'qnn' ||
     (backend === 'mnn' && opts.useOpenCL);
   const gpuBackend =
-    Platform.OS === 'ios'
-      ? 'Core ML (ANE)'
+    isSD
+      ? 'SD runtime'
+      : Platform.OS === 'ios'
+      ? 'Core ML'
       : backend === 'qnn'
       ? 'QNN (NPU)'
       : isGpu
       ? 'MNN (GPU)'
       : 'MNN (CPU)';
   return {
-    gpu: isGpu,
+    gpu: isSD ? undefined : isGpu,
     gpuBackend,
     modelName: model.name,
     steps: opts.steps,

From 6a250c3b3f5454b19f5bb4d17e6364b22a4cccbc Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 08:03:33 +0530
Subject: [PATCH 123/129] fix: handle resend while native video is stopping
 [skip ci]

---
 .../ChatScreen/useChatMessageHandlers.ts       | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/screens/ChatScreen/useChatMessageHandlers.ts b/src/screens/ChatScreen/useChatMessageHandlers.ts
index 0841882ea..7494ab7a7 100644
--- a/src/screens/ChatScreen/useChatMessageHandlers.ts
+++ b/src/screens/ChatScreen/useChatMessageHandlers.ts
@@ -21,6 +21,8 @@ import { whisperService } from '../../services/whisperService';
 import { activeModelService } from '../../services/activeModelService';
 import { ensureWhisperForTranscription } from '../../components/ChatInput/ensureWhisperForTranscription';
 import { resolveDocumentPath } from '../../utils/resolveDocumentPath';
+import { videoGenerationService } from '../../services/videoGenerationService';
+import { generationSession } from '../../services/generationSession';
 
 type SetState<T> = Dispatch<SetStateAction<T>>;
 
@@ -77,6 +79,12 @@ export async function handleRetryMessageFn(
   // no-op. Mirrors the send path's "No Model Selected" alert (handleSendFn).
   if (!p.hasActiveModel) { logger.log('[RESEND-SM] retry BAIL: no active model'); genDeps.setAlertState(showAlert('No Model Selected', 'Please select a model first.')); return; }
   if (!p.activeConversationId) { logger.log('[RESEND-SM] retry BAIL: no conv'); return; }
+  // Stop can end the chat session before the native video worker exits.
+  // Reject retry before deleting replies or starting another frontend session.
+  if (videoGenerationService.getState().phase === 'running') {
+    genDeps.setAlertState(showAlert('Video is busy', 'Wait for the video engine to finish or stop before resending.'));
+    return;
+  }
   // Retry does not go through the composer button. Re-apply its tool selection before deleting the
   // old reply, so a selected Assistant never silently resends with only the other enabled tools.
   if (p.assistantEnabled && !enableAssistantTools()) {
@@ -89,8 +97,14 @@ export async function handleRetryMessageFn(
   // A synced reply shows as a live preview until its op lands; clear it too, or resend duplicates it.
   supersedeSyncedReplies(p.activeConversationId);
   const ctx: RetryCtx = { message, genDeps, p, convId: p.activeConversationId, msgs };
-  if (message.role === 'user') await retryFromUserMessage(ctx);
-  else await retryFromAssistantMessage(ctx);
+  try {
+    if (message.role === 'user') await retryFromUserMessage(ctx);
+    else await retryFromAssistantMessage(ctx);
+  } catch (error) {
+    generationSession.end('error');
+    logger.warn('[RESEND-SM] retry failed', error);
+    genDeps.setAlertState(showAlert('Could not resend', error instanceof Error ? error.message : 'Please try again.'));
+  }
 }
 
 type EditParams = {

From 113224d013e646c669ea94a8072aa05f52d80b06 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 08:05:24 +0530
Subject: [PATCH 124/129] copy: use dedicated design partner contact address

---
 src/screens/DesignPartnersScreen.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/screens/DesignPartnersScreen.tsx b/src/screens/DesignPartnersScreen.tsx
index 0502f7553..735f9067a 100644
--- a/src/screens/DesignPartnersScreen.tsx
+++ b/src/screens/DesignPartnersScreen.tsx
@@ -10,7 +10,7 @@ import type { RootStackParamList } from '../navigation/types';
 import { useThemedStyles } from '../theme';
 import type { ThemeColors } from '../theme';
 
-const PARTNER_EMAIL = 'mac@getoffgridai.co';
+const PARTNER_EMAIL = 'design.partners@getoffgridai.co';
 const OFFER = [
   {
     title: 'Free setup and implementation',

From 92df18448914dde8a431df51e53154f5dee9c472 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 08:24:56 +0530
Subject: [PATCH 125/129] fix: keep Pro offers compact and make actions visible

---
 src/components/settings/ProUpsellBanner.tsx | 88 ++++++---------------
 src/screens/ProDetailScreen/index.tsx       | 20 +++--
 2 files changed, 32 insertions(+), 76 deletions(-)

diff --git a/src/components/settings/ProUpsellBanner.tsx b/src/components/settings/ProUpsellBanner.tsx
index 1c0b283e0..0615e7039 100644
--- a/src/components/settings/ProUpsellBanner.tsx
+++ b/src/components/settings/ProUpsellBanner.tsx
@@ -10,17 +10,11 @@ import type { ThemeColors, ThemeShadows } from '../../theme';
 import {
   SPACING,
   TYPOGRAPHY,
-  OFF_GRID_DESKTOP_BENEFIT,
   OFF_GRID_DESKTOP_URL,
 } from '../../constants';
 import { withUtm } from '../../utils/utm';
 import { getPricingCopy } from '../../utils/proPricing';
 
-const FEATURE_ROWS = [
-  [{ icon: 'layers', label: 'AMBIENT' }, { icon: 'sunrise', label: 'PROACTIVE' }],
-  [{ icon: 'shield', label: 'PRIVATE' }, { icon: 'refresh-cw', label: 'LIVE SYNC' }],
-];
-
 interface Props {
   /** Re-trigger the entrance animation when the screen regains focus. */
   trigger: number;
@@ -55,57 +49,45 @@ export const ProUpsellBanner: React.FC<Props> = ({ trigger, onGetPro, onDesignPa
           <View style={styles.headerText}>
             <Text style={styles.title}>Off Grid AI Pro</Text>
             <Text style={styles.desc}>
-              Your private AI stays current across your devices with live sync.
+              Private memory and live sync across your devices.
             </Text>
           </View>
           <TouchableOpacity
             onPress={() => dismiss(true)}
             style={styles.close}
+            accessibilityRole="button"
+            accessibilityLabel="Dismiss Pro offer"
             hitSlop={{ top: 8, bottom: 8, left: 8, right: 8 }}
           >
             <Icon name="x" size={16} color={colors.textMuted} />
           </TouchableOpacity>
         </View>
 
-        <View style={styles.grid}>
-          {FEATURE_ROWS.map((row, i) => (
-            <View key={i} style={styles.row}>
-              {row.map((f) => (
-                <View key={f.label} style={styles.item}>
-                  <View style={styles.iconWrap}>
-                    <Icon name={f.icon} size={16} color={colors.primary} />
-                  </View>
-                  <Text style={styles.label}>{f.label}</Text>
-                </View>
-              ))}
-            </View>
-          ))}
-        </View>
-
-        <Button title={pricing.cta} variant="primary" onPress={onGetPro} style={styles.cta} />
+        <Button title={pricing.cta} variant="primary" size="small" onPress={onGetPro} style={styles.cta} />
 
         <View style={styles.partnerOffer}>
-          <Text style={styles.partnerTitle}>Run a small business?</Text>
           <Text style={styles.desc}>
-            You could get Off Grid AI Pro free for life as a design partner.
-            For teams with fewer than 50 people, if your idea fits.
+            Fewer than 50 people? Get free lifetime Pro if your business idea fits.
           </Text>
           <Button
             title="See the partner offer"
-            variant="ghost"
+            variant="outline"
+            size="small"
+            icon={<Icon name="arrow-right" size={16} color={colors.textSecondary} />}
             onPress={onDesignPartners}
           />
         </View>
 
-        <TouchableOpacity
+        <Button
+          title="Get Off Grid AI Desktop"
+          variant="outline"
+          size="small"
           style={styles.desktopLink}
           onPress={() => Linking.openURL(withUtm(OFF_GRID_DESKTOP_URL, 'pro-upsell')).catch(() => {})}
           accessibilityRole="link"
-          accessibilityLabel="Get Off Grid AI Desktop"
-        >
-          <Icon name="monitor" size={14} color={colors.textMuted} />
-          <Text style={styles.desktopLinkText}>{OFF_GRID_DESKTOP_BENEFIT}</Text>
-        </TouchableOpacity>
+          accessibilityLabel="Get Off Grid AI Desktop on the website"
+          icon={<Icon name="external-link" size={16} color={colors.textSecondary} />}
+        />
       </View>
     </AnimatedEntry>
   );
@@ -113,7 +95,7 @@ export const ProUpsellBanner: React.FC<Props> = ({ trigger, onGetPro, onDesignPa
 
 const createStyles = (colors: ThemeColors, shadows: ThemeShadows) => ({
   card: {
-    borderRadius: 12,
+    borderRadius: 8,
     marginBottom: SPACING.lg,
     backgroundColor: colors.surface,
     borderWidth: 1,
@@ -128,44 +110,20 @@ const createStyles = (colors: ThemeColors, shadows: ThemeShadows) => ({
     paddingBottom: SPACING.md,
   },
   headerText: { flex: 1, marginRight: SPACING.md },
-  title: { ...TYPOGRAPHY.h1, color: colors.primary, marginBottom: SPACING.xs },
+  title: { ...TYPOGRAPHY.h2, color: colors.text, marginBottom: SPACING.xs },
   desc: { ...TYPOGRAPHY.bodySmall, color: colors.textSecondary, lineHeight: 18 },
-  close: { padding: SPACING.xs },
-  grid: { paddingHorizontal: SPACING.lg, paddingBottom: SPACING.md, gap: SPACING.sm },
-  row: { flexDirection: 'row' as const, gap: SPACING.sm },
-  item: { flex: 1, flexDirection: 'row' as const, alignItems: 'center' as const, gap: SPACING.sm },
-  iconWrap: {
-    width: 32,
-    height: 32,
-    borderRadius: 8,
-    backgroundColor: colors.surfaceLight,
-    alignItems: 'center' as const,
-    justifyContent: 'center' as const,
-  },
-  label: { ...TYPOGRAPHY.label, color: colors.text, letterSpacing: 0.5 },
-  cta: { margin: SPACING.lg, marginTop: SPACING.sm },
+  close: { padding: SPACING.xs, minWidth: 44, minHeight: 44, alignItems: 'center' as const },
+  cta: { marginHorizontal: SPACING.lg, marginBottom: SPACING.md },
   partnerOffer: {
     marginHorizontal: SPACING.lg,
-    marginBottom: SPACING.lg,
-    paddingTop: SPACING.lg,
+    marginBottom: SPACING.sm,
+    paddingTop: SPACING.md,
     borderTopWidth: 1,
     borderTopColor: colors.border,
     gap: SPACING.sm,
   },
-  partnerTitle: { ...TYPOGRAPHY.h3, color: colors.text },
   desktopLink: {
-    flexDirection: 'row' as const,
-    alignItems: 'center' as const,
-    justifyContent: 'center' as const,
-    gap: SPACING.xs,
-    paddingHorizontal: SPACING.lg,
-    paddingBottom: SPACING.lg,
-    marginTop: -SPACING.xs,
-  },
-  desktopLinkText: {
-    ...TYPOGRAPHY.bodySmall,
-    color: colors.textMuted,
-    flexShrink: 1,
-    textAlign: 'center' as const,
+    marginHorizontal: SPACING.lg,
+    marginBottom: SPACING.lg,
   },
 });
diff --git a/src/screens/ProDetailScreen/index.tsx b/src/screens/ProDetailScreen/index.tsx
index b7d776be7..9013eff54 100644
--- a/src/screens/ProDetailScreen/index.tsx
+++ b/src/screens/ProDetailScreen/index.tsx
@@ -196,19 +196,17 @@ export const ProDetailScreen: React.FC = () => {
             <Card style={styles.partnerCard}>
               <Text style={styles.sectionLabel}>SMALL BUSINESS DESIGN PARTNERS</Text>
               <Text style={styles.partnerTitle} accessibilityRole="header">
-                Your business idea could get you Pro free for life.
+                Free lifetime Pro for design partners
               </Text>
               <Text style={styles.partnerDescription}>
-                Have fewer than 50 people on your team? Help shape a solution for
-                your daily work.
-              </Text>
-              <Text style={styles.partnerDescription}>
-                If your idea fits Off Grid AI, you get free lifetime Pro. Even if
-                we do not build the full solution together.
+                Have fewer than 50 people? If your business idea fits, Pro is free
+                for life, even if we do not build the full solution together.
               </Text>
               <Button
                 title="See the partner offer"
-                variant="secondary"
+                variant="outline"
+                size="small"
+                icon={<Icon name="arrow-right" size={16} color={colors.textSecondary} />}
                 onPress={() => navigation.navigate('DesignPartners')}
               />
             </Card>
@@ -261,7 +259,7 @@ export const ProDetailScreen: React.FC = () => {
             <Text style={styles.desktopTitle}>Get Off Grid AI Desktop</Text>
             <Text style={styles.desktopDesc}>{OFF_GRID_DESKTOP_BENEFIT}</Text>
           </View>
-          <Icon name="external-link" size={16} color={colors.textMuted} />
+          <Icon name="external-link" size={16} color={colors.primary} />
         </TouchableOpacity>
       </ScrollView>
 
@@ -402,7 +400,7 @@ const createStyles = (colors: ThemeColors, shadows: ThemeShadows) => ({
 
   // Pillars
   partnerCard: { marginHorizontal: SPACING.xl, marginBottom: SPACING.xl },
-  partnerTitle: { ...TYPOGRAPHY.h2, color: colors.text, marginBottom: SPACING.md },
+  partnerTitle: { ...TYPOGRAPHY.h3, color: colors.text, marginBottom: SPACING.sm },
   partnerDescription: {
     ...TYPOGRAPHY.bodySmall,
     color: colors.textSecondary,
@@ -463,7 +461,7 @@ const createStyles = (colors: ThemeColors, shadows: ThemeShadows) => ({
     justifyContent: 'center' as const,
   },
   desktopText: { flex: 1, gap: 3 as number },
-  desktopTitle: { ...TYPOGRAPHY.body, color: colors.text },
+  desktopTitle: { ...TYPOGRAPHY.body, color: colors.primary, textDecorationLine: 'underline' as const },
   desktopDesc: {
     ...TYPOGRAPHY.bodySmall,
     color: colors.textSecondary,

From 95eac4426bf12396e7e654a40a6ac13480ceb413 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 08:27:42 +0530
Subject: [PATCH 126/129] fix: use compact navigation rows for Pro secondary
 actions

---
 src/components/settings/ProUpsellBanner.tsx | 48 ++++++++++++++-------
 src/screens/ProDetailScreen/index.tsx       | 31 ++++++++++---
 2 files changed, 57 insertions(+), 22 deletions(-)

diff --git a/src/components/settings/ProUpsellBanner.tsx b/src/components/settings/ProUpsellBanner.tsx
index 0615e7039..07e69069f 100644
--- a/src/components/settings/ProUpsellBanner.tsx
+++ b/src/components/settings/ProUpsellBanner.tsx
@@ -3,6 +3,7 @@ import { View, Text, TouchableOpacity, Linking } from 'react-native';
 import Icon from 'react-native-vector-icons/Feather';
 import { AnimatedEntry } from '../AnimatedEntry';
 import { Button } from '../Button';
+import { AnimatedPressable } from '../AnimatedPressable';
 import { selectHasProAccess } from '../../stores/proAccessSlice';
 import { useAppStore } from '../../stores';
 import { useTheme, useThemedStyles } from '../../theme';
@@ -69,25 +70,26 @@ export const ProUpsellBanner: React.FC<Props> = ({ trigger, onGetPro, onDesignPa
           <Text style={styles.desc}>
             Fewer than 50 people? Get free lifetime Pro if your business idea fits.
           </Text>
-          <Button
-            title="See the partner offer"
-            variant="outline"
-            size="small"
-            icon={<Icon name="arrow-right" size={16} color={colors.textSecondary} />}
+          <AnimatedPressable
+            style={styles.linkRow}
+            accessibilityRole="button"
+            accessibilityLabel="See the partner offer"
             onPress={onDesignPartners}
-          />
+          >
+            <Text style={styles.linkText}>See the partner offer</Text>
+            <Icon name="chevron-right" size={16} color={colors.primary} />
+          </AnimatedPressable>
         </View>
 
-        <Button
-          title="Get Off Grid AI Desktop"
-          variant="outline"
-          size="small"
-          style={styles.desktopLink}
+        <AnimatedPressable
+          style={[styles.linkRow, styles.desktopLink]}
           onPress={() => Linking.openURL(withUtm(OFF_GRID_DESKTOP_URL, 'pro-upsell')).catch(() => {})}
           accessibilityRole="link"
           accessibilityLabel="Get Off Grid AI Desktop on the website"
-          icon={<Icon name="external-link" size={16} color={colors.textSecondary} />}
-        />
+        >
+          <Text style={styles.linkText}>Get Off Grid AI Desktop</Text>
+          <Icon name="external-link" size={16} color={colors.primary} />
+        </AnimatedPressable>
       </View>
     </AnimatedEntry>
   );
@@ -116,14 +118,30 @@ const createStyles = (colors: ThemeColors, shadows: ThemeShadows) => ({
   cta: { marginHorizontal: SPACING.lg, marginBottom: SPACING.md },
   partnerOffer: {
     marginHorizontal: SPACING.lg,
-    marginBottom: SPACING.sm,
+    marginBottom: 0,
     paddingTop: SPACING.md,
     borderTopWidth: 1,
     borderTopColor: colors.border,
+    gap: SPACING.xs,
+  },
+  linkRow: {
+    flexDirection: 'row' as const,
+    alignItems: 'center' as const,
+    justifyContent: 'space-between' as const,
     gap: SPACING.sm,
+    minHeight: 44,
+    paddingVertical: SPACING.sm,
+  },
+  linkText: {
+    ...TYPOGRAPHY.bodySmall,
+    color: colors.primary,
+    textDecorationLine: 'underline' as const,
+    flex: 1,
   },
   desktopLink: {
     marginHorizontal: SPACING.lg,
-    marginBottom: SPACING.lg,
+    marginBottom: SPACING.sm,
+    borderTopWidth: 1,
+    borderTopColor: colors.border,
   },
 });
diff --git a/src/screens/ProDetailScreen/index.tsx b/src/screens/ProDetailScreen/index.tsx
index 9013eff54..c6dd6479b 100644
--- a/src/screens/ProDetailScreen/index.tsx
+++ b/src/screens/ProDetailScreen/index.tsx
@@ -11,6 +11,7 @@ import type { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import Icon from 'react-native-vector-icons/Feather';
 import { Button, Card } from '../../components';
+import { AnimatedPressable } from '../../components/AnimatedPressable';
 import { useTheme, useThemedStyles } from '../../theme';
 import type { ThemeColors, ThemeShadows } from '../../theme';
 import {
@@ -202,13 +203,15 @@ export const ProDetailScreen: React.FC = () => {
                 Have fewer than 50 people? If your business idea fits, Pro is free
                 for life, even if we do not build the full solution together.
               </Text>
-              <Button
-                title="See the partner offer"
-                variant="outline"
-                size="small"
-                icon={<Icon name="arrow-right" size={16} color={colors.textSecondary} />}
+              <AnimatedPressable
+                style={styles.partnerLink}
+                accessibilityRole="button"
+                accessibilityLabel="See the partner offer"
                 onPress={() => navigation.navigate('DesignPartners')}
-              />
+              >
+                <Text style={styles.partnerLinkText}>See the partner offer</Text>
+                <Icon name="chevron-right" size={16} color={colors.primary} />
+              </AnimatedPressable>
             </Card>
 
             {/* Ambient pillars */}
@@ -404,7 +407,21 @@ const createStyles = (colors: ThemeColors, shadows: ThemeShadows) => ({
   partnerDescription: {
     ...TYPOGRAPHY.bodySmall,
     color: colors.textSecondary,
-    marginBottom: SPACING.md,
+    marginBottom: SPACING.xs,
+  },
+  partnerLink: {
+    flexDirection: 'row' as const,
+    alignItems: 'center' as const,
+    justifyContent: 'space-between' as const,
+    gap: SPACING.sm,
+    minHeight: 44,
+    paddingVertical: SPACING.sm,
+  },
+  partnerLinkText: {
+    ...TYPOGRAPHY.bodySmall,
+    color: colors.primary,
+    textDecorationLine: 'underline' as const,
+    flex: 1,
   },
   pillarsSection: { paddingHorizontal: SPACING.xl, marginBottom: SPACING.lg },
   sectionLabel: {

From ef87de9d79f370a10f7b516a40dd9317141db52e Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 08:28:18 +0530
Subject: [PATCH 127/129] copy: describe Pro memory Sync and approved actions

---
 src/components/settings/ProUpsellBanner.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/settings/ProUpsellBanner.tsx b/src/components/settings/ProUpsellBanner.tsx
index 07e69069f..35d3cb6df 100644
--- a/src/components/settings/ProUpsellBanner.tsx
+++ b/src/components/settings/ProUpsellBanner.tsx
@@ -50,7 +50,7 @@ export const ProUpsellBanner: React.FC<Props> = ({ trigger, onGetPro, onDesignPa
           <View style={styles.headerText}>
             <Text style={styles.title}>Off Grid AI Pro</Text>
             <Text style={styles.desc}>
-              Private memory and live sync across your devices.
+              Keep your work in context with memory, Sync, and actions you approve.
             </Text>
           </View>
           <TouchableOpacity

From cab26f866488d64f345ad7341b7cb0593a069eb3 Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 09:01:53 +0530
Subject: [PATCH 128/129] fix: state text hardware and global settings scope
 [skip ci]

---
 .../settings/textGenAdvancedSections.tsx         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/settings/textGenAdvancedSections.tsx b/src/components/settings/textGenAdvancedSections.tsx
index f617371c0..f0b5f4be3 100644
--- a/src/components/settings/textGenAdvancedSections.tsx
+++ b/src/components/settings/textGenAdvancedSections.tsx
@@ -73,13 +73,13 @@ export const BackendSelector: React.FC = () => {
   const current = settings.inferenceBackend ?? defaultBackend;
   const showLayers = current !== INFERENCE_BACKENDS.CPU;
   const layersLabel = current === INFERENCE_BACKENDS.HTP
-    ? 'NPU Layers'
-    : current === INFERENCE_BACKENDS.METAL ? 'GPU Layers (Metal)' : 'GPU Layers (OpenCL)';
+    ? 'Text NPU Layers'
+    : current === INFERENCE_BACKENDS.METAL ? 'Text GPU Layers (Metal)' : 'Text GPU Layers (OpenCL)';
 
   return (
     <SegmentedRow<InferenceBackend>
-      label="Inference Backend"
-      description={backends.find(b => b.id === current)?.desc ?? ''}
+      label="Text Model Backend"
+      description={`Text model default for all chats. ${backends.find(b => b.id === current)?.desc ?? ''} Image and video engines select their own hardware.`}
       options={backends}
       current={current}
       onSelect={(id) => updateSettings({ inferenceBackend: id })}
@@ -113,8 +113,8 @@ export const LiteRTBackendSelector: React.FC = () => {
   const current = settings.liteRTBackend === 'cpu' ? 'cpu' : 'gpu';
   return (
     <SegmentedRow<LiteRTBackend>
-      label="Acceleration"
-      description={LITERT_BACKENDS.find(b => b.id === current)?.desc ?? ''}
+      label="Text Model Acceleration"
+      description={`Text model default for all chats. ${LITERT_BACKENDS.find(b => b.id === current)?.desc ?? ''} Image and video engines select their own hardware.`}
       options={LITERT_BACKENDS}
       current={current}
       onSelect={(id) => updateSettings({ liteRTBackend: id })}
@@ -192,7 +192,7 @@ export const ModelLoadingModeSelector: React.FC = () => {
   return (
     <SegmentedRow<ModelLoadingMode>
       label="Model Loading"
-      description="Lean keeps ONE model in memory at a time. Balanced keeps models loaded together when they fit and swaps when they do not. Aggressive commits a larger share of RAM so bigger models load. You can always Load Anyway if a model is refused."
+      description="Applies to all chats. Lean keeps ONE model in memory at a time. Balanced keeps models loaded together when they fit and swaps when they do not. Aggressive commits a larger share of RAM so bigger models load. You can always Load Anyway if a model is refused."
       options={MODE_OPTIONS}
       current={current}
       onSelect={(id) => updateSettings({ modelLoadingMode: id })}
@@ -250,7 +250,7 @@ export const ShowGenerationDetailsToggle: React.FC = () => {
   return (
     <SegmentedRow<'off' | 'on'>
       label="Show Generation Details"
-      description="Show context use, model, speed, and image settings below each reply"
+      description="Applies to all chats. Show context use, model, speed, and image settings below each reply."
       options={BOOL_OPTIONS}
       current={on ? 'on' : 'off'}
       onSelect={(id) => updateSettings({ showGenerationDetails: id === 'on' })}

From fe4248f8a135b2d0b7add9004992f0343819cd8a Mon Sep 17 00:00:00 2001
From: alichherawalla <mohammed.ali.chherawalla@gmail.com>
Date: Wed, 30 Sep 2026 09:13:24 +0530
Subject: [PATCH 129/129] fix(mobile): give Auto Setup actions accessible touch
 areas

---
 src/screens/AutoSetupScreen.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/screens/AutoSetupScreen.tsx b/src/screens/AutoSetupScreen.tsx
index 55347772e..6bcced824 100644
--- a/src/screens/AutoSetupScreen.tsx
+++ b/src/screens/AutoSetupScreen.tsx
@@ -353,7 +353,11 @@ const createStyles = (colors: ThemeColors, shadows: ThemeShadows) => ({
     borderRadius: SPACING.sm,
   },
   selectedCard: { borderColor: colors.primary },
-  planHeader: { gap: SPACING.xs },
+  planHeader: {
+    gap: SPACING.xs,
+    minHeight: 44,
+    justifyContent: 'center' as const,
+  },
   planHeading: {
     flexDirection: 'row' as const,
     alignItems: 'center' as const,
@@ -388,6 +392,7 @@ const createStyles = (colors: ThemeColors, shadows: ThemeShadows) => ({
     ...shadows.small,
   },
   textAction: {
+    minHeight: 44,
     alignSelf: 'stretch' as const,
     justifyContent: 'center' as const,
     paddingHorizontal: 0,