Retry agent skill loading after transient errors

SovereignAI-Starter/flutter_app/lib/features/chat/presentation/cubit/chat_cubit.dart

@@ -19,6 +19,7 @@ class ChatCubit extends Cubit<ChatState> {
   final LocalSettingsStore _settingsStore;
   Timer? _elapsedTimer;
   Stopwatch? _requestStopwatch;
+  Future<void>? _loadingAgentSkills;
   int _requestGeneration = 0;
   List<ChatMessage> _messagesBeforeRequest = const [];
   bool _requestAppendedUserMessage = true;
@@ -196,14 +197,44 @@ class ChatCubit extends Cubit<ChatState> {
     }
   }
 
-  Future<void> _loadAgentSkills() async {
-    try {
-      final available = await _api.getAgentSkills();
-      if (!isClosed) emit(state.copyWith(availableSkills: available));
-    } catch (error) {
-      if (!isClosed) {
-        emit(state.copyWith(error: 'تعذر تحميل مهارات الوكيل: $error'));
+  Future<void> _loadAgentSkills() {
+    final pending = _loadingAgentSkills;
+    if (pending != null) return pending;
+    final loading = _loadAgentSkillsWithRetry();
+    _loadingAgentSkills = loading;
+    return loading.whenComplete(() {
+      if (identical(_loadingAgentSkills, loading)) {
+        _loadingAgentSkills = null;
       }
+    });
+  }
+
+  Future<void> _loadAgentSkillsWithRetry() async {
+    const delays = [Duration(milliseconds: 300), Duration(milliseconds: 750)];
+    Object? lastError;
+    for (var attempt = 0; attempt <= delays.length; attempt++) {
+      try {
+        final available = await _api.getAgentSkills();
+        if (!isClosed) {
+          emit(
+            state.copyWith(
+              availableSkills: available,
+              clearError:
+                  state.error?.startsWith('تعذر تحميل مهارات الوكيل:') ?? false,
+            ),
+          );
+        }
+        return;
+      } catch (error) {
+        lastError = error;
+        if (attempt < delays.length) {
+          await Future<void>.delayed(delays[attempt]);
+          if (isClosed) return;
+        }
+      }
+    }
+    if (!isClosed) {
+      emit(state.copyWith(error: 'تعذر تحميل مهارات الوكيل: $lastError'));
     }
   }
 

SovereignAI-Starter/flutter_app/test/chat_cubit_test.dart

@@ -21,6 +21,8 @@ class _VersionTestApi extends ApiRepository {
   List<String> deletedFiles = const [];
   String? registeredProject;
   String? unregisteredProject;
+  int skillFailuresRemaining = 0;
+  int skillLoadCount = 0;
 
   @override
   Future<String> getModelName() async => 'gemma4:e2b';
@@ -40,23 +42,30 @@ class _VersionTestApi extends ApiRepository {
   ];
 
   @override
-  Future<List<AgentSkillDescriptor>> getAgentSkills() async => const [
-    AgentSkillDescriptor(
-      id: 'code_explain',
-      name: 'شرح الكود',
-      description: 'شرح المصدر.',
-    ),
-    AgentSkillDescriptor(
-      id: 'code_review',
-      name: 'مراجعة الكود',
-      description: 'مراجعة المصدر.',
-    ),
-    AgentSkillDescriptor(
-      id: 'test_plan',
-      name: 'خطة اختبارات',
-      description: 'اقتراح الاختبارات.',
-    ),
-  ];
+  Future<List<AgentSkillDescriptor>> getAgentSkills() async {
+    skillLoadCount++;
+    if (skillFailuresRemaining > 0) {
+      skillFailuresRemaining--;
+      throw StateError('temporary API failure');
+    }
+    return const [
+      AgentSkillDescriptor(
+        id: 'code_explain',
+        name: 'شرح الكود',
+        description: 'شرح المصدر.',
+      ),
+      AgentSkillDescriptor(
+        id: 'code_review',
+        name: 'مراجعة الكود',
+        description: 'مراجعة المصدر.',
+      ),
+      AgentSkillDescriptor(
+        id: 'test_plan',
+        name: 'خطة اختبارات',
+        description: 'اقتراح الاختبارات.',
+      ),
+    ];
+  }
 
   @override
   Future<List<SavedConversation>> listConversations() async => [];
@@ -164,6 +173,36 @@ class _MemorySettingsStore extends LocalSettingsStore {
 }
 
 void main() {
+  test('agent skills retry a transient API failure during startup', () async {
+    final api = _VersionTestApi()..skillFailuresRemaining = 1;
+    final cubit = ChatCubit(api, settingsStore: LocalSettingsStore.inMemory());
+
+    await Future<void>.delayed(const Duration(milliseconds: 450));
+
+    expect(api.skillLoadCount, 2);
+    expect(cubit.state.availableSkills, hasLength(3));
+    expect(cubit.state.error, isNull);
+    await cubit.close();
+  });
+
+  test(
+    'agent skills preserve an error after all startup retries fail',
+    () async {
+      final api = _VersionTestApi()..skillFailuresRemaining = 3;
+      final cubit = ChatCubit(
+        api,
+        settingsStore: LocalSettingsStore.inMemory(),
+      );
+
+      await Future<void>.delayed(const Duration(milliseconds: 1200));
+
+      expect(api.skillLoadCount, 3);
+      expect(cubit.state.availableSkills, isEmpty);
+      expect(cubit.state.error, contains('تعذر تحميل مهارات الوكيل'));
+      await cubit.close();
+    },
+  );
+
   test('embedding-only models are not selectable for chat', () async {
     final api = _VersionTestApi();
     final cubit = ChatCubit(api, settingsStore: LocalSettingsStore.inMemory());
@@ -197,14 +236,8 @@ void main() {
     ]);
     expect(message, contains('فُهرست 2 ملفًا'));
     expect(message, contains('4 مقطعًا'));
-    expect(
-      progressUpdates,
-      contains('يفهرس الملف 1/2: README.md…'),
-    );
-    expect(
-      progressUpdates,
-      contains('يفهرس الملف 2/2: main.dart…'),
-    );
+    expect(progressUpdates, contains('يفهرس الملف 1/2: README.md…'));
+    expect(progressUpdates, contains('يفهرس الملف 2/2: main.dart…'));
     expect(cubit.state.agentProgress, isNull);
     await subscription.cancel();