fix(desktop): isolate Settings state by Runtime Host

Bind asynchronous Host settings and connection snapshots to their selected target so late or failed loads cannot surface data from another Host. Keep Desktop-owned preferences available independently, preserve every-Host connection events, and make profile catalog failures recoverable.

Generated-by: Codex

Author: M4n5ter

apps/desktop/src/main/__tests__/use-keep-system-awake.test.ts

@@ -0,0 +1,52 @@
+import assert from 'node:assert/strict';
+import { afterEach, test } from 'node:test';
+import { act, createElement } from 'react';
+import { createDefaultSettings } from '@maka/core/settings';
+import {
+  useKeepSystemAwake,
+  type KeepSystemAwakeController,
+} from '../../renderer/use-keep-system-awake.js';
+import { cleanupFakeDom, installReactRenderer } from './fake-dom.js';
+
+test('keeps the Desktop preference available when no Runtime Host settings bridge is usable', async () => {
+  const { root } = installReactRenderer();
+  let persisted = {
+    ...createDefaultSettings(),
+    system: { keepSystemAwake: true },
+  };
+  const updates: boolean[] = [];
+  (globalThis.window as unknown as { maka: unknown }).maka = {
+    settings: {
+      getClient: async () => persisted,
+      updateClient: async (patch: { system?: { keepSystemAwake?: boolean } }) => {
+        const keepSystemAwake = patch.system?.keepSystemAwake ?? persisted.system.keepSystemAwake;
+        updates.push(keepSystemAwake);
+        persisted = { ...persisted, system: { keepSystemAwake } };
+        return { settings: persisted };
+      },
+      subscribeClientChanged: () => () => undefined,
+    },
+  };
+
+  let current: KeepSystemAwakeController | undefined;
+  function Probe() {
+    current = useKeepSystemAwake();
+    return null;
+  }
+
+  await act(async () => {
+    root.render(createElement(Probe));
+  });
+  assert.equal(current?.keepSystemAwake, true);
+
+  await act(async () => {
+    await current?.setKeepSystemAwake(false);
+  });
+  assert.deepEqual(updates, [false]);
+  assert.equal(current?.keepSystemAwake, false);
+});
+
+afterEach(() => {
+  cleanupFakeDom();
+  delete (globalThis as { window?: unknown }).window;
+});

apps/desktop/src/preload/preload.ts

@@ -1920,7 +1920,12 @@ const makaBridge = {
       return invokeSelectedRuntimeHost(host, 'connections:setRequestHeaders', slug, headers);
     },
     subscribeEvents(handler: (event: ConnectionEvent) => void, host?: DesktopRuntimeHostRef): () => void {
-      return subscribeSelectedRuntimeHostEvent('connections:event', host, handler);
+      return host
+        ? subscribeSelectedRuntimeHostEvent('connections:event', host, handler)
+        : subscribeEveryRuntimeHostEvent(
+            'connections:event',
+            (_scope, event: ConnectionEvent) => handler(event),
+          );
     },
   },
   mcp: {

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

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

apps/desktop/src/renderer/settings/general-settings-page.tsx

@@ -44,36 +44,61 @@ import { getSettingsPreferencesCopy } from "../locales/settings-preferences-copy
 import { settingsTestResultMessage } from "../locales/settings-test-result-copy.js";
 import { getShellCopy } from "../locales/shell-copy.js";
 import type { RuntimeHostSettingsConnectionsBridge } from './runtime-host-settings-bridge.js';
+import { getSettingsSharedCopy } from '../locales/settings-shared-copy.js';
 
 export function GeneralSettingsPage(props: {
   settings: AppSettings;
   connections: readonly LlmConnection[];
   defaultSlug: string | null;
-  connectionsBridge: Pick<RuntimeHostSettingsConnectionsBridge, 'setDefaultModel'>;
-  testNetworkProxy(input: TestProxyInput): Promise<import('@maka/core/settings').SettingsTestResult>;
+  connectionsBridge: Pick<RuntimeHostSettingsConnectionsBridge, 'setDefaultModel'> | undefined;
+  runtimeHostStatus: 'loading' | 'ready' | 'unavailable' | 'error';
+  testNetworkProxy?(input: TestProxyInput): Promise<import('@maka/core/settings').SettingsTestResult>;
   onUpdate(
     patch: Parameters<typeof window.maka.settings.update>[0],
   ): Promise<UpdateAppSettingsResult>;
   onRefreshConnections(): Promise<void>;
+  onRetryRuntimeHost(): Promise<void>;
 }) {
   const locale = useUiLocale();
   const copy = getSettingsPreferencesCopy(locale).general;
   const sections = getSettingsPreferencesCopy(locale).sections;
+  const sharedCopy = getSettingsSharedCopy(locale);
   const toast = useToast();
+  const runtimeHostAvailable =
+    props.runtimeHostStatus === 'ready' &&
+    props.connectionsBridge !== undefined &&
+    props.testNetworkProxy !== undefined;
   return (
     <SettingsPage>
+      {!runtimeHostAvailable ? (
+        <Banner
+          status={props.runtimeHostStatus === 'error' ? 'error' : 'warning'}
+          title={props.runtimeHostStatus === 'loading'
+            ? sharedCopy.loading
+            : sharedCopy.runtimeHostUnavailable}
+          endContent={props.runtimeHostStatus === 'error' ? (
+            <Button
+              variant="secondary"
+              size="sm"
+              label={sharedCopy.retry}
+              onClick={() => void props.onRetryRuntimeHost()}
+            />
+          ) : undefined}
+        />
+      ) : null}
       {/* Designer audit P2-13: identity fields (显示名称/界面语言/语气偏好)
           moved here from the 外观 page — they configure who you are to the
           app, not how the app looks. The component keeps its save flow. */}
       <PersonalizationSettingsSection
         settings={props.settings}
+        runtimeHostAvailable={runtimeHostAvailable}
         onUpdate={props.onUpdate}
       />
       <SettingsSection
         title={sections.privacy}
         description={sections.privacyHelp}
       >
-        <SettingsRow
+        {runtimeHostAvailable ? <SettingsRow
           label={copy.incognito}
           description={copy.incognitoHelp}
           end={
@@ -93,7 +118,7 @@ export function GeneralSettingsPage(props: {
               }}
             />
           }
-        />
+        /> : null}
         <SettingsRow
           label={copy.notifications}
           description={copy.notificationsHelp}
@@ -115,7 +140,7 @@ export function GeneralSettingsPage(props: {
             />
           }
         />
-        <SettingsRow
+        {runtimeHostAvailable ? <SettingsRow
           label={copy.workspaceInstructions}
           description={copy.workspaceInstructionsHelp}
           end={
@@ -135,27 +160,31 @@ export function GeneralSettingsPage(props: {
               }}
             />
           }
-        />
-      </SettingsSection>
-      <GeneralDefaultsCard
-        connections={props.connections}
-        defaultSlug={props.defaultSlug}
-        connectionsBridge={props.connectionsBridge}
-        onRefresh={props.onRefreshConnections}
-        permissionMode={props.settings.chatDefaults.permissionMode}
-        thinkingLevel={props.settings.chatDefaults.thinkingLevel}
-        onUpdate={props.onUpdate}
-      />
-      <SettingsSection
-        title={sections.network}
-        description={sections.networkHelp}
-      >
-        <NetworkProxySection
-          settings={props.settings}
-          onUpdate={props.onUpdate}
-          testNetworkProxy={props.testNetworkProxy}
-        />
+        /> : null}
       </SettingsSection>
+      {runtimeHostAvailable ? (
+        <>
+          <GeneralDefaultsCard
+            connections={props.connections}
+            defaultSlug={props.defaultSlug}
+            connectionsBridge={props.connectionsBridge!}
+            onRefresh={props.onRefreshConnections}
+            permissionMode={props.settings.chatDefaults.permissionMode}
+            thinkingLevel={props.settings.chatDefaults.thinkingLevel}
+            onUpdate={props.onUpdate}
+          />
+          <SettingsSection
+            title={sections.network}
+            description={sections.networkHelp}
+          >
+            <NetworkProxySection
+              settings={props.settings}
+              onUpdate={props.onUpdate}
+              testNetworkProxy={props.testNetworkProxy!}
+            />
+          </SettingsSection>
+        </>
+      ) : null}
     </SettingsPage>
   );
 }

apps/desktop/src/renderer/settings/personalization-settings-section.tsx

@@ -30,6 +30,7 @@ import { getSettingsPreferencesCopy } from '../locales/settings-preferences-copy
 
 export function PersonalizationSettingsSection(props: {
   settings: AppSettings;
+  runtimeHostAvailable: boolean;
   onUpdate(patch: Parameters<typeof window.maka.settings.update>[0]): Promise<UpdateAppSettingsResult>;
 }) {
   const locale = useUiLocale();
@@ -152,42 +153,41 @@ export function PersonalizationSettingsSection(props: {
           the user to fill in something already filled in, and its blur-save
           gave them no way to back out of a change. The row reports the
           settled value and opens on demand; Cancel puts the draft back. */}
-      <SettingsExpandableRow
-        label={copy.displayName}
-        value={value.displayName || copy.displayNameUnset}
-        actionLabel={value.displayName ? copy.displayNameChange : copy.displayNameSet}
-        isEditing={expandedRow === 'displayName'}
-        canSave={displayName.trim() !== value.displayName}
-        saveLabel={sharedCopy.save}
-        cancelLabel={sharedCopy.cancel}
-        onEdit={() => {
-          setDisplayName(value.displayName);
-          setExpandedRow('displayName');
-        }}
-        onCancel={() => {
-          setDisplayName(value.displayName);
-          setExpandedRow(null);
-        }}
-        onSave={async () => {
-          // Only close on a write that landed: a failed save leaves the row
-          // open with the draft intact, which is the promise explicit saving
-          // makes and blur-autosave could not keep.
-          if (await persistPersonalization({ displayName: displayName.trim().slice(0, 60) })) {
-            setExpandedRow(null);
-          }
-        }}
-      >
-        <TextInput
-          type="text"
-          value={displayName}
-          onChange={(value) => setDisplayName(value.slice(0, 60))}
-          placeholder={copy.displayNamePlaceholder}
+      {props.runtimeHostAvailable ? (
+        <SettingsExpandableRow
           label={copy.displayName}
-          description={copy.displayNameHelp}
-          isLabelHidden
-          width="100%"
-        />
-      </SettingsExpandableRow>
+          value={value.displayName || copy.displayNameUnset}
+          actionLabel={value.displayName ? copy.displayNameChange : copy.displayNameSet}
+          isEditing={expandedRow === 'displayName'}
+          canSave={displayName.trim() !== value.displayName}
+          saveLabel={sharedCopy.save}
+          cancelLabel={sharedCopy.cancel}
+          onEdit={() => {
+            setDisplayName(value.displayName);
+            setExpandedRow('displayName');
+          }}
+          onCancel={() => {
+            setDisplayName(value.displayName);
+            setExpandedRow(null);
+          }}
+          onSave={async () => {
+            if (await persistPersonalization({ displayName: displayName.trim().slice(0, 60) })) {
+              setExpandedRow(null);
+            }
+          }}
+        >
+          <TextInput
+            type="text"
+            value={displayName}
+            onChange={(value) => setDisplayName(value.slice(0, 60))}
+            placeholder={copy.displayNamePlaceholder}
+            label={copy.displayName}
+            description={copy.displayNameHelp}
+            isLabelHidden
+            width="100%"
+          />
+        </SettingsExpandableRow>
+      ) : null}
       {/*
         PR-LANG-PREF-0 (WAWQAQ msg `edc9cb41` + kenji `7e532892`
         acceptance criteria): 自动 / 中文 / English. User explicit
@@ -207,7 +207,7 @@ export function PersonalizationSettingsSection(props: {
           ))}
         </SegmentedControl>}
       />
-      <SettingsField>
+      {props.runtimeHostAvailable ? <SettingsField>
         {/* No fixed height style: it lands as inline style on the wrapper,
             which pins the visible box while the inner textarea keeps its
             native `resize: vertical` — dragging then moves only the grip.
@@ -228,7 +228,7 @@ export function PersonalizationSettingsSection(props: {
           description={copy.assistantToneHelp}
           width="100%"
         />
-      </SettingsField>
+      </SettingsField> : null}
     </SettingsSection>
   );
 }