@nextclaw/ui 0.12.22 → 0.12.24

package/src/features/chat/managers/ncp-chat-input.manager.test.ts

@@ -77,7 +77,7 @@ describe('NcpChatInputManager', () => {
     } as unknown as ConstructorParameters<typeof NcpChatInputManager>[1];
     const sessionListManager = {
       ensureDraftSession: vi.fn(() => 'draft-session'),
-      promoteRootDraftSessionRoute: vi.fn(),
+      materializeRootSessionRoute: vi.fn(),
     } as unknown as ConstructorParameters<typeof NcpChatInputManager>[2];
     const manager = new NcpChatInputManager(
       {} as ConstructorParameters<typeof NcpChatInputManager>[0],
@@ -95,14 +95,21 @@ describe('NcpChatInputManager', () => {
       }),
     );
     expect(sessionListManager.ensureDraftSession).not.toHaveBeenCalled();
-    expect(sessionListManager.promoteRootDraftSessionRoute).toHaveBeenCalledWith('current-route-session');
+    expect(sessionListManager.materializeRootSessionRoute).not.toHaveBeenCalled();
   });
 
-  it('keeps sending through the current root draft session while /chat is still in blank-draft mode', async () => {
+  it('sends without a session key while /chat is still in blank-draft mode', async () => {
     useChatThreadStore.setState({
       snapshot: {
         ...useChatThreadStore.getState().snapshot,
-        sessionKey: 'draft-root-session',
+        sessionKey: null,
+      },
+    });
+    useChatSessionListStore.setState({
+      snapshot: {
+        ...useChatSessionListStore.getState().snapshot,
+        selectedSessionKey: null,
+        draftSessionKey: null,
       },
     });
     const streamActionsManager = {
@@ -111,7 +118,7 @@ describe('NcpChatInputManager', () => {
     } as unknown as ConstructorParameters<typeof NcpChatInputManager>[1];
     const sessionListManager = {
       ensureDraftSession: vi.fn(() => 'materialized-draft-session'),
-      promoteRootDraftSessionRoute: vi.fn(),
+      materializeRootSessionRoute: vi.fn(),
     } as unknown as ConstructorParameters<typeof NcpChatInputManager>[2];
     const manager = new NcpChatInputManager(
       {} as ConstructorParameters<typeof NcpChatInputManager>[0],
@@ -121,14 +128,18 @@ describe('NcpChatInputManager', () => {
 
     await manager.send();
 
-    expect(sessionListManager.ensureDraftSession).not.toHaveBeenCalled();
+    expect(sessionListManager.ensureDraftSession).toHaveBeenCalledWith('native');
+    expect(streamActionsManager.sendMessage).toHaveBeenCalledWith(
+      expect.not.objectContaining({
+        sessionKey: expect.any(String),
+      }),
+    );
     expect(streamActionsManager.sendMessage).toHaveBeenCalledWith(
       expect.objectContaining({
-        sessionKey: 'draft-root-session',
         message: 'hello from current thread',
       }),
     );
-    expect(sessionListManager.promoteRootDraftSessionRoute).toHaveBeenCalledWith('draft-root-session');
+    expect(sessionListManager.materializeRootSessionRoute).not.toHaveBeenCalled();
   });
 
   it('does not send while the runtime is still blocked during startup', async () => {
@@ -158,7 +169,7 @@ describe('NcpChatInputManager', () => {
     } as unknown as ConstructorParameters<typeof NcpChatInputManager>[1];
     const sessionListManager = {
       ensureDraftSession: vi.fn(() => 'draft-session'),
-      promoteRootDraftSessionRoute: vi.fn(),
+      materializeRootSessionRoute: vi.fn(),
     } as unknown as ConstructorParameters<typeof NcpChatInputManager>[2];
     const manager = new NcpChatInputManager(
       {} as ConstructorParameters<typeof NcpChatInputManager>[0],
@@ -169,7 +180,7 @@ describe('NcpChatInputManager', () => {
     await manager.send();
 
     expect(streamActionsManager.sendMessage).not.toHaveBeenCalled();
-    expect(sessionListManager.promoteRootDraftSessionRoute).not.toHaveBeenCalled();
+    expect(sessionListManager.materializeRootSessionRoute).not.toHaveBeenCalled();
   });
 
   it('still attempts to send when provider metadata is stale or the session type is marked unavailable', async () => {
@@ -187,7 +198,7 @@ describe('NcpChatInputManager', () => {
     } as unknown as ConstructorParameters<typeof NcpChatInputManager>[1];
     const sessionListManager = {
       ensureDraftSession: vi.fn(() => 'draft-session'),
-      promoteRootDraftSessionRoute: vi.fn(),
+      materializeRootSessionRoute: vi.fn(),
     } as unknown as ConstructorParameters<typeof NcpChatInputManager>[2];
     const manager = new NcpChatInputManager(
       {} as ConstructorParameters<typeof NcpChatInputManager>[0],
@@ -198,6 +209,6 @@ describe('NcpChatInputManager', () => {
     await manager.send();
 
     expect(streamActionsManager.sendMessage).toHaveBeenCalledTimes(1);
-    expect(sessionListManager.promoteRootDraftSessionRoute).toHaveBeenCalledWith('current-route-session');
+    expect(sessionListManager.materializeRootSessionRoute).not.toHaveBeenCalled();
   });
 });

package/src/features/chat/managers/ncp-chat-input.manager.ts

@@ -197,11 +197,14 @@ export class NcpChatInputManager {
     const sessionKey =
       threadSnapshot.sessionKey ??
       sessionSnapshot.selectedSessionKey ??
+      null;
+    if (!sessionKey && inputSnapshot.selectedSessionType?.trim()) {
       this.sessionListManager.ensureDraftSession(inputSnapshot.selectedSessionType);
+    }
     this.setComposerNodes(createInitialChatComposerNodes());
     await this.streamActionsManager.sendMessage({
       message,
-      sessionKey,
+      ...(sessionKey ? { sessionKey } : {}),
       agentId: sessionSnapshot.selectedAgentId,
       sessionType: inputSnapshot.selectedSessionType,
       model: inputSnapshot.selectedModel || undefined,
@@ -213,7 +216,6 @@ export class NcpChatInputManager {
       restoreDraftOnError: true,
       composerNodes
     });
-    this.sessionListManager.promoteRootDraftSessionRoute(sessionKey);
   };
 
   stop = async () => {

package/src/features/chat/pages/ncp-chat-page.tsx

@@ -106,9 +106,6 @@ function useNcpChatPageBaseState(presenter: NcpChatPresenter) {
   const selectedSessionKey = useChatSessionListStore(
     (state) => state.snapshot.selectedSessionKey,
   );
-  const draftSessionKey = useChatSessionListStore(
-    (state) => state.snapshot.draftSessionKey,
-  );
   const selectedAgentId = useChatSessionListStore(
     (state) => state.snapshot.selectedAgentId,
   );
@@ -137,16 +134,16 @@ function useNcpChatPageBaseState(presenter: NcpChatPresenter) {
     () => parseSessionKeyFromRoute(routeSessionIdParam),
     [routeSessionIdParam],
   );
-  const sessionKey = routeSessionKey ?? selectedSessionKey ?? draftSessionKey;
+  const sessionKey = routeSessionKey ?? undefined;
   const hasSessionProjectRootOverride =
     pendingProjectRoot !== null &&
-    pendingProjectRootSessionKey === sessionKey;
+    (!sessionKey || pendingProjectRootSessionKey === sessionKey);
   const sessionProjectRootOverride = hasSessionProjectRootOverride
     ? pendingProjectRoot
     : undefined;
   const pageData = useNcpChatPageData({
     query,
-    sessionKey,
+    sessionKey: sessionKey ?? null,
     projectRootOverride: sessionProjectRootOverride,
     currentSelectedModel,
     pendingSessionType,
@@ -213,7 +210,7 @@ function useNcpChatPageState(presenter: NcpChatPresenter) {
     ? (agentsQuery.data?.agents ?? [])
     : [{ id: selectedSession?.agentId ?? selectedAgentId }];
   const derivedState = useNcpChatDerivedState({
-    sessionKey,
+    sessionKey: sessionKey ?? null,
     selectedSession,
     selectedAgentId,
     availableAgents,
@@ -251,14 +248,13 @@ function useNcpChatStreamBindings(params: ReturnType<typeof useNcpChatPageState>
     pendingProjectRootSessionKey,
     presenter,
     selectedSession,
-    selectedSessionKey,
     selectedSessionKeyRef,
     sessionKey,
   } = params;
   useEffect(() => {
     presenter.chatStreamActionsManager.bind({
       sendMessage: async (payload) => {
-        if (payload.sessionKey !== sessionKey) {
+        if ((payload.sessionKey ?? null) !== (sessionKey ?? null)) {
           return;
         }
         const metadata = buildNcpSendMetadata({
@@ -267,7 +263,7 @@ function useNcpChatStreamBindings(params: ReturnType<typeof useNcpChatPageState>
           thinkingLevel: payload.thinkingLevel,
           sessionType: payload.sessionType,
           projectRoot:
-            payload.sessionKey === pendingProjectRootSessionKey
+            !payload.sessionKey || payload.sessionKey === pendingProjectRootSessionKey
               ? pendingProjectRoot
               : (selectedSession?.projectRoot ?? null),
           requestedSkills: payload.requestedSkills,
@@ -322,7 +318,6 @@ function useNcpChatStreamBindings(params: ReturnType<typeof useNcpChatPageState>
     pendingProjectRoot,
     pendingProjectRootSessionKey,
     presenter,
-    selectedSessionKey,
     selectedSession?.projectRoot,
     selectedSessionKeyRef,
     sessionKey,
@@ -336,7 +331,6 @@ function usePendingProjectRootOverrideCleanup(
     pendingProjectRoot,
     pendingProjectRootSessionKey,
     selectedSession,
-    selectedSessionKey,
   } = params;
   useEffect(() => {
     if (
@@ -358,7 +352,6 @@ function usePendingProjectRootOverrideCleanup(
     pendingProjectRoot,
     pendingProjectRootSessionKey,
     selectedSession,
-    selectedSessionKey,
   ]);
 }
 
@@ -385,6 +378,22 @@ function useSelectedSessionAgentSync(params: ReturnType<typeof useNcpChatPageSta
   }, [presenter, selectedAgentId, selectedSession?.agentId]);
 }
 
+function useMaterializedRootSessionRouteSync(
+  params: ReturnType<typeof useNcpChatPageState>,
+) {
+  const { agent, presenter, routeSessionKey } = params;
+  const materializedSessionKey =
+    agent.snapshot.activeRun?.sessionId ??
+    agent.visibleMessages.find((message) => message.sessionId.trim())?.sessionId ??
+    null;
+  useEffect(() => {
+    if (routeSessionKey || !materializedSessionKey) {
+      return;
+    }
+    presenter.chatSessionListManager.materializeRootSessionRoute(materializedSessionKey);
+  }, [materializedSessionKey, presenter, routeSessionKey]);
+}
+
 export function NcpChatPage({ view }: ChatPageProps) {
   const [presenter] = useState(() => new NcpChatPresenter());
   const state = useNcpChatPageState(presenter);
@@ -392,6 +401,7 @@ export function NcpChatPage({ view }: ChatPageProps) {
   usePendingProjectRootOverrideCleanup(state);
   useNcpChatUiBindings(state);
   useSelectedSessionAgentSync(state);
+  useMaterializedRootSessionRouteSync(state);
   useChatSessionSync({
     view,
     routeSessionKey: state.routeSessionKey,

package/src/features/chat/stores/chat-session-list.store.ts

@@ -1,10 +1,9 @@
 import { create, type StateCreator } from 'zustand';
-import { createNcpSessionId } from '@/features/chat/utils/ncp-session-adapter.utils';
 import type { SessionRunStatus } from '@/features/chat/types/session-run-status.types';
 export type ChatSessionListMode = 'time-first' | 'project-first';
 export type ChatSessionListSnapshot = {
   selectedSessionKey: string | null;
-  draftSessionKey: string;
+  draftSessionKey: string | null;
   selectedAgentId: string;
   query: string;
   listMode: ChatSessionListMode;
@@ -50,7 +49,7 @@ type ChatSessionListStoreSet = Parameters<StateCreator<ChatSessionListStore>>[0]
 
 const initialSnapshot: ChatSessionListSnapshot = {
   selectedSessionKey: null,
-  draftSessionKey: createNcpSessionId(),
+  draftSessionKey: null,
   selectedAgentId: 'main',
   query: '',
   listMode: 'time-first'

package/src/features/chat/types/chat-stream.types.ts

@@ -5,7 +5,7 @@ import type { ThinkingLevel } from '@/shared/lib/api';
 
 export type SendMessageParams = {
   message: string;
-  sessionKey: string;
+  sessionKey?: string;
   agentId: string;
   sessionType?: string;
   model?: string;

package/src/features/chat/utils/ncp-session-adapter.utils.ts

@@ -288,7 +288,7 @@ export function adaptNcpSessionSummary(summary: NcpSessionSummaryView): SessionE
   const isPromotedChildSession = readPromotedChildSession(summary);
   return {
     key: summary.sessionId,
-    createdAt: summary.updatedAt,
+    createdAt: summary.createdAt ?? summary.updatedAt,
     updatedAt: summary.updatedAt,
     ...(lastMessageAt ? { lastMessageAt } : {}),
     ...(readAt ? { readAt } : {}),

package/src/features/system-status/hooks/use-system-status.ts

@@ -10,46 +10,24 @@ import {
 import { systemStatusManager } from '@/features/system-status/managers/system-status.manager';
 import { useSystemStatusStore } from '@/features/system-status/stores/system-status.store';
 
-function createPendingBootstrapStatus(): BootstrapStatusView {
-  return {
-    phase: 'kernel-starting',
-    ncpAgent: {
-      state: 'pending',
-    },
-    pluginHydration: {
-      state: 'pending',
-      loadedPluginCount: 0,
-      totalPluginCount: 0,
-    },
-    channels: {
-      state: 'pending',
-      enabled: [],
-    },
-    remote: {
-      state: 'pending',
-    },
-  };
-}
-
 export function useSystemStatusSources() {
-  const runtimeBootstrapStatus = useQuery({
+  const runtimeBootstrapStatus = useQuery<BootstrapStatusView>({
     queryKey: ['runtime-bootstrap-status'],
-    queryFn: fetchBootstrapStatus,
-    placeholderData: createPendingBootstrapStatus,
+    queryFn: () => fetchBootstrapStatus({
+      timeoutMs: 5_000,
+    }),
     refetchInterval: (query) => {
       return systemStatusManager.getRuntimeBootstrapPollInterval(
-        query.state.data
+        query.state.data,
+        query.state.fetchFailureCount
       );
     },
-    refetchIntervalInBackground: true,
     retry: false,
-    refetchOnWindowFocus: true,
   });
   const runtimeControl = useQuery({
     queryKey: ['runtime-control'],
     queryFn: async () => await systemStatusManager.getRuntimeControl(),
     staleTime: 5_000,
-    refetchOnWindowFocus: true,
   });
 
   useEffect(() => {

package/src/features/system-status/index.ts

@@ -1,5 +1,6 @@
 export { useRuntimeControlPanelView, useRuntimeStatusBadgeView, useSystemStatus, useSystemStatusSources } from './hooks/use-system-status';
-export { isTransientRuntimeConnectionErrorMessage, systemStatusManager } from './managers/system-status.manager';
+export { systemStatusManager } from './managers/system-status.manager';
+export { isTransientRuntimeConnectionErrorMessage } from '@/shared/lib/transport';
 export { runtimeUpdateManager } from './managers/runtime-update.manager';
 export type { SystemStatusState, SystemStatusView } from './types/system-status.types';
 export { useSystemStatusStore } from './stores/system-status.store';

package/src/features/system-status/managers/system-status.manager.bootstrap-polling.test.ts

@@ -16,7 +16,7 @@ describe('getRuntimeBootstrapPollInterval', () => {
 
   it('keeps polling while bootstrap status is missing', () => {
     expect(systemStatusManager.getRuntimeBootstrapPollInterval(undefined)).toBe(
-      500
+      1000
     );
   });
 
@@ -40,7 +40,7 @@ describe('getRuntimeBootstrapPollInterval', () => {
           state: 'pending',
         },
       })
-    ).toBe(500);
+    ).toBe(1000);
   });
 
   it('continues polling even when bootstrap status reports an ncp agent error', () => {
@@ -65,7 +65,7 @@ describe('getRuntimeBootstrapPollInterval', () => {
         },
         lastError: 'startup failed',
       })
-    ).toBe(500);
+    ).toBe(2000);
   });
 
   it('stops polling once the ncp agent is ready', () => {
@@ -121,6 +121,16 @@ describe('getRuntimeBootstrapPollInterval', () => {
           state: 'disabled',
         },
       })
-    ).toBe(500);
+    ).toBe(1000);
   });
+
+  it('backs off polling after transport failures', () => {
+    expect(
+      systemStatusManager.getRuntimeBootstrapPollInterval(undefined, 1)
+    ).toBe(2000);
+    expect(
+      systemStatusManager.getRuntimeBootstrapPollInterval(undefined, 3)
+    ).toBe(5000);
+  });
+
 });

package/src/features/system-status/managers/system-status.manager.test.ts

@@ -1,10 +1,8 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import type { BootstrapStatusView } from '@/shared/lib/api';
 import { appQueryClient } from '@/app-query-client';
-import {
-  isTransientRuntimeConnectionErrorMessage,
-  systemStatusManager,
-} from './system-status.manager';
+import { systemStatusManager } from './system-status.manager';
+import { isTransientRuntimeConnectionErrorMessage } from '@/shared/lib/transport';
 import { useSystemStatusStore } from '@/features/system-status/stores/system-status.store';
 
 const readyBootstrapStatus: BootstrapStatusView = {
@@ -76,9 +74,6 @@ describe('systemStatusManager', () => {
   });
 
   it('enters recovering only after the page has previously reached ready', async () => {
-    const invalidateQueriesSpy = vi
-      .spyOn(appQueryClient, 'invalidateQueries')
-      .mockResolvedValue(undefined as never);
     const refetchQueriesSpy = vi
       .spyOn(appQueryClient, 'refetchQueries')
       .mockResolvedValue(undefined as never);
@@ -93,7 +88,6 @@ describe('systemStatusManager', () => {
     systemStatusManager.reportBootstrapStatus(readyBootstrapStatus);
 
     expect(useSystemStatusStore.getState().state.lifecyclePhase).toBe('ready');
-    expect(invalidateQueriesSpy).toHaveBeenCalled();
     expect(refetchQueriesSpy).toHaveBeenCalledWith({ type: 'active' });
   });
 

package/src/features/system-status/managers/system-status.manager.ts

@@ -21,8 +21,14 @@ import {
   initialSystemStatusState,
   useSystemStatusStore,
 } from '@/features/system-status/stores/system-status.store';
+import { isTransientRuntimeConnectionErrorMessage } from '@/shared/lib/transport';
 
 const RECOVERY_TIMEOUT_MS = 30_000;
+const RUNTIME_BOOTSTRAP_PROBE_POLICY = {
+  activePollIntervalMs: 1_000,
+  errorPollIntervalMs: 2_000,
+  maxErrorPollIntervalMs: 5_000,
+} as const;
 
 function getErrorMessage(error: unknown): string {
   if (error instanceof Error) {
@@ -53,46 +59,34 @@ function resolveActionHelp(action: RuntimeControlAction): string {
   return t('runtimeControlRestartingAppHelp');
 }
 
-export function isTransientRuntimeConnectionErrorMessage(
-  message: string
-): boolean {
-  const normalized = message.trim().toLowerCase();
-  if (!normalized) {
-    return false;
-  }
-  return (
-    normalized.includes('failed to fetch') ||
-    normalized.includes('networkerror') ||
-    normalized.includes('network request failed') ||
-    normalized.includes('load failed') ||
-    normalized.includes('request timed out') ||
-    normalized.includes('timed out waiting for remote request response') ||
-    normalized.includes('remote transport connection closed') ||
-    normalized.includes('websocket error') ||
-    normalized.includes('fetch failed on ') ||
-    normalized.includes('stream request failed for ') ||
-    normalized.includes('ncp fetch failed for ')
-  );
-}
-
 export class SystemStatusManager {
   private recoveryTimeoutId: number | null = null;
 
   getRuntimeBootstrapPollInterval = (
-    status: BootstrapStatusView | null | undefined
+    status: BootstrapStatusView | null | undefined,
+    fetchFailureCount = 0
   ): number | false => {
     const { lifecyclePhase, activeSystemAction } = this.getState();
+    if (fetchFailureCount > 0) {
+      return Math.min(
+        RUNTIME_BOOTSTRAP_PROBE_POLICY.maxErrorPollIntervalMs,
+        RUNTIME_BOOTSTRAP_PROBE_POLICY.errorPollIntervalMs * fetchFailureCount
+      );
+    }
     if (
       lifecyclePhase === 'recovering' ||
       lifecyclePhase === 'stalled' ||
       activeSystemAction?.lifecycle === 'recovering'
     ) {
-      return 500;
+      return RUNTIME_BOOTSTRAP_PROBE_POLICY.activePollIntervalMs;
     }
     if (status?.ncpAgent.state === 'ready') {
       return false;
     }
-    return 500;
+    if (status?.ncpAgent.state === 'error' || status?.phase === 'error') {
+      return RUNTIME_BOOTSTRAP_PROBE_POLICY.errorPollIntervalMs;
+    }
+    return RUNTIME_BOOTSTRAP_PROBE_POLICY.activePollIntervalMs;
   };
 
   getRuntimeControl = async (): Promise<RuntimeControlView> => {
@@ -343,10 +337,7 @@ export class SystemStatusManager {
     });
 
     if (shouldRefreshQueries) {
-      void Promise.all([
-        appQueryClient.invalidateQueries(),
-        appQueryClient.refetchQueries({ type: 'active' }),
-      ]);
+      void appQueryClient.refetchQueries({ type: 'active' });
     }
   };
 
@@ -413,7 +404,6 @@ export class SystemStatusManager {
       const view = await this.getRuntimeControl();
       this.syncRuntimeControlQueryCache(view);
       this.reportRuntimeControlView(view);
-      await appQueryClient.invalidateQueries({ queryKey: ['runtime-control'] });
     } catch (error) {
       this.reportRuntimeControlError(error);
     }

package/src/shared/components/common/brand-header.test.tsx

@@ -3,6 +3,7 @@ import userEvent from '@testing-library/user-event';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { MemoryRouter } from 'react-router-dom';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
+import type * as SystemStatusModule from '@/features/system-status';
 import { useRuntimeUpdateStore } from '@/features/system-status';
 import { BrandHeader } from '@/shared/components/common/brand-header';
 import { setLanguage } from '@/shared/lib/i18n';
@@ -13,9 +14,7 @@ const mocks = vi.hoisted(() => ({
 }));
 
 vi.mock('@/features/system-status', async () => {
-  const actual = await vi.importActual<typeof import('@/features/system-status')>(
-    '@/features/system-status'
-  );
+  const actual = await vi.importActual<typeof SystemStatusModule>('@/features/system-status');
   return {
     ...actual,
     runtimeUpdateManager: {
@@ -144,4 +143,86 @@ describe('BrandHeader', () => {
     expect(mocks.applyDownloadedUpdate).toHaveBeenCalledTimes(1);
     expect(mocks.downloadUpdate).not.toHaveBeenCalled();
   });
+
+  it('shows a warning icon with the blocked update reason instead of a visible failure label', async () => {
+    useRuntimeUpdateStore.setState({
+      supported: true,
+      initialized: true,
+      busyAction: null,
+      snapshot: {
+        status: 'blocked',
+        installationKind: 'npm-runtime-bundle',
+        channel: 'stable',
+        hostVersion: '0.19.4',
+        currentVersion: '0.19.4',
+        availableVersion: null,
+        downloadedVersion: null,
+        minimumHostVersion: null,
+        releaseNotesUrl: null,
+        lastCheckedAt: null,
+        progress: null,
+        canAutoDownload: true,
+        canApplyInApp: false,
+        requiresRestart: false,
+        blockReason: 'signature-verification-unavailable',
+        recoveryCommand: 'Set NEXTCLAW_UPDATE_BUNDLE_PUBLIC_KEY',
+        errorMessage: 'Runtime bundle updates require a configured update public key.',
+        preferences: {
+          automaticChecks: true,
+          autoDownload: true
+        }
+      }
+    });
+
+    renderBrandHeader();
+
+    expect(screen.queryByText('更新异常')).toBeNull();
+    const issueIcon = screen.getByLabelText('更新被阻塞');
+
+    expect(issueIcon.textContent).toBe('!');
+    expect(issueIcon.getAttribute('title')).toContain('更新被阻塞');
+    expect(issueIcon.getAttribute('title')).toContain('根因：缺少更新签名公钥，无法验证更新包来源');
+    expect(issueIcon.getAttribute('title')).toContain('Runtime bundle updates require a configured update public key.');
+    expect(issueIcon.getAttribute('title')).toContain('Set NEXTCLAW_UPDATE_BUNDLE_PUBLIC_KEY');
+  });
+
+  it('uses the failed update wording only for failed snapshots', async () => {
+    useRuntimeUpdateStore.setState({
+      supported: true,
+      initialized: true,
+      busyAction: null,
+      snapshot: {
+        status: 'failed',
+        installationKind: 'npm-runtime-bundle',
+        channel: 'stable',
+        hostVersion: '0.19.4',
+        currentVersion: '0.19.3',
+        availableVersion: '0.19.4',
+        downloadedVersion: null,
+        minimumHostVersion: null,
+        releaseNotesUrl: null,
+        lastCheckedAt: null,
+        progress: null,
+        canAutoDownload: true,
+        canApplyInApp: false,
+        requiresRestart: false,
+        blockReason: null,
+        recoveryCommand: null,
+        errorMessage: 'runtime bundle sha256 mismatch',
+        preferences: {
+          automaticChecks: true,
+          autoDownload: true
+        }
+      }
+    });
+
+    renderBrandHeader();
+
+    const issueIcon = screen.getByLabelText('更新失败');
+
+    expect(issueIcon.textContent).toBe('!');
+    expect(issueIcon.getAttribute('title')).toContain('更新失败');
+    expect(issueIcon.getAttribute('title')).toContain('runtime bundle sha256 mismatch');
+    expect(screen.queryByText('更新被阻塞')).toBeNull();
+  });
 });