Fix deferred restart review findings.

Drop phantom pending records when provider disconnect removes nothing
and when Behavior AGENTS.md payloads are not deferred. Clear the Apply
badge after external OpenCode manual-restart guidance. Align skills and
commands save toasts with deferred restart feedback, and fix French
OpenCode elision.

Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com>

packages/ui/src/lib/i18n/messages/fr.settings.ts

@@ -44,14 +44,14 @@ export const settingsDict = {
   'settings.view.actions.applyAndRestartOpenCode': 'Appliquer et redémarrer',
   'settings.view.actions.applyAndRestartOpenCodeTooltipSingle': 'Appliquer 1 modification de configuration en attente et redémarrer OpenCode.',
   'settings.view.actions.applyAndRestartOpenCodeTooltipPlural': 'Appliquer {count} modifications de configuration en attente et redémarrer OpenCode.',
-  'settings.view.pendingRestart.applying': 'Application des modifications et redémarrage de OpenCode…',
+  'settings.view.pendingRestart.applying': 'Application des modifications et redémarrage d\'OpenCode…',
   'settings.view.pendingRestart.applied': 'OpenCode a redémarré avec les modifications de configuration en attente.',
   'settings.view.pendingRestart.applyFailed': 'Échec de l\'application des modifications de configuration.',
   'settings.view.pendingRestart.manualRestartRequired': 'Enregistré sur le disque. Redémarrez le serveur OpenCode connecté pour appliquer les modifications.',
   'settings.view.pendingRestart.saved': 'Enregistré. Redémarrez OpenCode pour appliquer.',
 
   'settings.view.pendingRestart.confirm.title': 'Appliquer et redémarrer ?',
-  'settings.view.pendingRestart.confirm.description': 'Le redémarrage de OpenCode arrêtera tous les chats en cours. Vos modifications de configuration enregistrées prendront effet après le redémarrage.',
+  'settings.view.pendingRestart.confirm.description': 'Le redémarrage d\'OpenCode arrêtera tous les chats en cours. Vos modifications de configuration enregistrées prendront effet après le redémarrage.',
   'settings.view.pendingRestart.confirm.dontShowAgain': 'Ne plus afficher',
   'settings.view.pendingRestart.confirm.cancel': 'Annuler',  'settings.view.actions.backToSettings': 'Retour aux paramètres',
   'settings.view.actions.closeSettings': 'Fermer les paramètres',

packages/ui/src/lib/opencode/deferredRestart.test.ts

@@ -43,6 +43,20 @@ describe('deferred OpenCode restart helpers', () => {
     expect(usePendingOpenCodeRestartStore.getState().changes[0]?.scope).toBe('mcp');
   });
 
+  test('noteDeferredRestartFromPayload ignores non-deferred payloads', async () => {
+    const { usePendingOpenCodeRestartStore } = await import('@/stores/usePendingOpenCodeRestartStore');
+    usePendingOpenCodeRestartStore.getState().clear();
+
+    const { noteDeferredRestartFromPayload } = await import('./deferredRestart');
+    const noted = noteDeferredRestartFromPayload({
+      requiresReload: false,
+      message: 'Provider was not connected',
+    }, 'providers', { id: 'openai' });
+
+    expect(noted).toBe(false);
+    expect(usePendingOpenCodeRestartStore.getState().changes).toHaveLength(0);
+  });
+
   test('applyPendingOpenCodeRestart clears pending changes after success', async () => {
     mock.module('@/stores/useAgentsStore', () => ({
       reloadOpenCodeConfiguration: async () => undefined,
@@ -59,4 +73,25 @@ describe('deferred OpenCode restart helpers', () => {
     expect(usePendingOpenCodeRestartStore.getState().changes).toHaveLength(0);
     expect(usePendingOpenCodeRestartStore.getState().isApplying).toBe(false);
   });
+
+  test('applyPendingOpenCodeRestart clears pending changes on manual restart', async () => {
+    mock.module('@/stores/useAgentsStore', () => ({
+      reloadOpenCodeConfiguration: async () => {
+        const error = new Error('Restart your connected OpenCode server');
+        (error as Error & { requiresManualRestart?: boolean }).requiresManualRestart = true;
+        throw error;
+      },
+    }));
+
+    const { usePendingOpenCodeRestartStore } = await import('@/stores/usePendingOpenCodeRestartStore');
+    usePendingOpenCodeRestartStore.getState().clear();
+    usePendingOpenCodeRestartStore.getState().recordChange({ scope: 'mcp', id: 'filesystem' });
+
+    const { applyPendingOpenCodeRestart } = await import('./deferredRestart');
+    const result = await applyPendingOpenCodeRestart({ message: 'Applying…' });
+
+    expect(result).toEqual({ ok: false, requiresManualRestart: true });
+    expect(usePendingOpenCodeRestartStore.getState().changes).toHaveLength(0);
+    expect(usePendingOpenCodeRestartStore.getState().isApplying).toBe(false);
+  });
 });

packages/ui/src/lib/opencode/deferredRestart.ts

@@ -70,10 +70,12 @@ export async function applyPendingOpenCodeRestart(options?: {
     usePendingOpenCodeRestartStore.getState().clear();
     return { ok: true };
   } catch (error) {
-    usePendingOpenCodeRestartStore.getState().setApplying(false);
     if ((error as Error & { requiresManualRestart?: boolean })?.requiresManualRestart) {
+      // Changes are already on disk; clear the badge after delivering manual-restart guidance.
+      usePendingOpenCodeRestartStore.getState().clear();
       return { ok: false, requiresManualRestart: true };
     }
+    usePendingOpenCodeRestartStore.getState().setApplying(false);
     throw error;
   }
 }