fix(desktop): decouple Client settings from Host refresh

Keep Desktop appearance and client-setting events independent from Runtime Host availability. Make Host resource reloads settle through their owned error state so a failed refresh cannot misreport a successful mutation, and preserve newly submitted bot credentials at the update response boundary.

Generated-by: Codex

Author: M4n5ter

apps/desktop/src/main/__tests__/client-settings-ipc-main.test.ts

@@ -7,7 +7,7 @@ import {
 } from "@maka/core/settings";
 import { registerClientSettingsIpc } from "../client-settings-ipc-main.js";
 
-test("client settings updates cannot mutate Runtime Host policy", async () => {
+test("client settings updates filter Host policy and return newly submitted secrets", async () => {
   const handlers = new Map<string, (...args: unknown[]) => unknown>();
   let settings = createDefaultSettings();
   let storedPatch: UpdateAppSettingsInput | undefined;
@@ -33,11 +33,19 @@ test("client settings updates cannot mutate Runtime Host policy", async () => {
 
   const result = await handlers.get("settings:client:update")?.({}, {
     appearance: { theme: "dark" },
+    botChat: { channels: { telegram: { token: "fresh-bot-token" } } },
     chatDefaults: { permissionMode: "bypass" },
   });
 
-  assert.deepEqual(storedPatch, { appearance: { theme: "dark" } });
+  assert.deepEqual(storedPatch, {
+    appearance: { theme: "dark" },
+    botChat: { channels: { telegram: { token: "fresh-bot-token" } } },
+  });
   assert.equal((result as { settings: typeof settings }).settings.appearance.theme, "dark");
+  assert.equal(
+    (result as { settings: typeof settings }).settings.botChat.channels.telegram.token,
+    "fresh-bot-token",
+  );
   assert.equal(settings.chatDefaults.permissionMode, "ask");
   assert.equal(applied, 1);
 });

apps/desktop/src/main/client-settings-ipc-main.ts

@@ -33,7 +33,7 @@ export function registerClientSettingsIpc(deps: {
         ? await deps.settingsStore.update(clientPatch)
         : await deps.settingsStore.get();
       await deps.apply(settings);
-      return buildSettingsUpdateResult(maskAppSettings(settings), clientPatch);
+      return buildSettingsUpdateResult(settings, clientPatch);
     },
   );
 }

apps/desktop/src/renderer/app-shell-effects.ts

@@ -404,15 +404,15 @@ export function useAppShellBootstrapSubscriptions(options: {
     const unsubscribeConnections = window.maka.connections.subscribeEvents(handleConnectionSubscriptionEvent);
     const unsubscribeRuntimeHostChanges =
       window.maka.runtimeHostProfiles.subscribeChanges(handleRuntimeHostChange);
-    const refreshSettingsMirrors = () => {
+    const refreshRuntimeHostSettingsMirrors = () => {
       void options.refreshShellSettings();
       void options.refreshConnections();
     };
     const unsubscribeSettingsExternal = window.maka.settings.subscribeExternalChanged(
-      refreshSettingsMirrors,
+      refreshRuntimeHostSettingsMirrors,
     );
     const unsubscribeClientSettings = window.maka.settings.subscribeClientChanged(
-      refreshSettingsMirrors,
+      () => void options.refreshShellSettings(),
     );
     const unsubscribeSessionChanges = window.maka.sessions.subscribeChanges(handleSessionChange);
     const unsubscribeScheduledTaskChanges = window.maka.scheduledTasks.subscribeChanges(handleScheduledTaskChange);

apps/desktop/src/renderer/settings/settings-surface.tsx

@@ -343,7 +343,6 @@ export function SettingsSurface(props: {
           message: settingsActionErrorMessage(error, locale),
         });
       }
-      throw error;
     }
   }
 
@@ -395,7 +394,6 @@ export function SettingsSurface(props: {
           message: settingsActionErrorMessage(error, locale),
         });
       }
-      throw error;
     }
   }
 
@@ -543,21 +541,13 @@ export function SettingsSurface(props: {
     void Promise.all([
       reloadRuntimeHostSettings(selectedRuntimeHost),
       reloadConnections(connectionsBridge, selectedRuntimeHost),
-    ]).catch((error) => {
-      if (settingsModalMountedRef.current) {
-        toast.error(copy.settingsLoadFailed, settingsActionErrorMessage(error, locale));
-      }
-    });
+    ]);
     const unsubscribeSettings = window.maka.settings.subscribeExternalChanged(
       () => void reloadRuntimeHostSettings(selectedRuntimeHost),
       selectedRuntimeHost,
     );
     const unsubscribeConnections = connectionsBridge.subscribeEvents?.(() => {
-      void reloadConnections(connectionsBridge, selectedRuntimeHost).catch((error) => {
-        if (settingsModalMountedRef.current) {
-          toast.error(copy.settingsLoadFailed, settingsActionErrorMessage(error, locale));
-        }
-      });
+      void reloadConnections(connectionsBridge, selectedRuntimeHost);
     });
     return () => {
       unsubscribeSettings();

apps/desktop/src/renderer/use-shell-appearance.ts

@@ -48,15 +48,15 @@ export function useShellAppearance({
 
   async function refreshShellSettings() {
     const uiLocaleHydration = uiLocaleUpdateGate.beginHydration();
-    const [clientResult, runtimeHostResult, fixtureState] = await Promise.all([
+    const runtimeHostHydration = window.maka.settings.get().then(
+      (settings) => ({ ok: true as const, settings }),
+      () => ({ ok: false as const }),
+    );
+    const [clientResult, fixtureState] = await Promise.all([
       window.maka.settings.getClient().then(
         (settings) => ({ ok: true as const, settings }),
         (error: unknown) => ({ ok: false as const, error }),
       ),
-      window.maka.settings.get().then(
-        (settings) => ({ ok: true as const, settings }),
-        () => ({ ok: false as const }),
-      ),
       window.maka.e2eFixture.getState().catch(() => null),
     ]);
 
@@ -87,6 +87,7 @@ export function useShellAppearance({
       );
     }
 
+    const runtimeHostResult = await runtimeHostHydration;
     if (runtimeHostResult.ok) {
       const next = runtimeHostResult.settings;
       setUserLabel(next.personalization.displayName ?? '');