@nextclaw/ui 0.11.9 → 0.11.10

package/src/components/chat/ChatSidebar.tsx

@@ -8,9 +8,9 @@ import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover
 import { SelectItem } from '@/components/ui/select';
 import { ChatSidebarSessionItem } from '@/components/chat/chat-sidebar-session-item';
 import { useChatSessionLabelService } from '@/components/chat/chat-session-label.service';
+import { useNcpSessionListView, type NcpSessionListItemView } from '@/components/chat/ncp/use-ncp-session-list-view';
 import { usePresenter } from '@/components/chat/presenter/chat-presenter-context';
 import { useChatInputStore } from '@/components/chat/stores/chat-input.store';
-import { useChatRunStatusStore } from '@/components/chat/stores/chat-run-status.store';
 import { useChatSessionListStore } from '@/components/chat/stores/chat-session-list.store';
 import { cn } from '@/lib/utils';
 import { LANGUAGE_OPTIONS, t, type I18nLanguage } from '@/lib/i18n';
@@ -35,38 +35,39 @@ import {
 
 type DateGroup = {
   label: string;
-  sessions: SessionEntryView[];
+  items: NcpSessionListItemView[];
 };
 
-function groupSessionsByDate(sessions: SessionEntryView[]): DateGroup[] {
+function groupSessionsByDate(items: NcpSessionListItemView[]): DateGroup[] {
   const now = new Date();
   const todayStart = new Date(now.getFullYear(), now.getMonth(), now.getDate()).getTime();
   const yesterdayStart = todayStart - 86_400_000;
   const sevenDaysStart = todayStart - 7 * 86_400_000;
 
-  const today: SessionEntryView[] = [];
-  const yesterday: SessionEntryView[] = [];
-  const previous7: SessionEntryView[] = [];
-  const older: SessionEntryView[] = [];
+  const today: NcpSessionListItemView[] = [];
+  const yesterday: NcpSessionListItemView[] = [];
+  const previous7: NcpSessionListItemView[] = [];
+  const older: NcpSessionListItemView[] = [];
 
-  for (const session of sessions) {
+  for (const item of items) {
+    const { session } = item;
     const ts = new Date(session.updatedAt).getTime();
     if (ts >= todayStart) {
-      today.push(session);
+      today.push(item);
     } else if (ts >= yesterdayStart) {
-      yesterday.push(session);
+      yesterday.push(item);
     } else if (ts >= sevenDaysStart) {
-      previous7.push(session);
+      previous7.push(item);
     } else {
-      older.push(session);
+      older.push(item);
     }
   }
 
   const groups: DateGroup[] = [];
-  if (today.length > 0) groups.push({ label: t('chatSidebarToday'), sessions: today });
-  if (yesterday.length > 0) groups.push({ label: t('chatSidebarYesterday'), sessions: yesterday });
-  if (previous7.length > 0) groups.push({ label: t('chatSidebarPrevious7Days'), sessions: previous7 });
-  if (older.length > 0) groups.push({ label: t('chatSidebarOlder'), sessions: older });
+  if (today.length > 0) groups.push({ label: t('chatSidebarToday'), items: today });
+  if (yesterday.length > 0) groups.push({ label: t('chatSidebarYesterday'), items: yesterday });
+  if (previous7.length > 0) groups.push({ label: t('chatSidebarPrevious7Days'), items: previous7 });
+  if (older.length > 0) groups.push({ label: t('chatSidebarOlder'), items: older });
   return groups;
 }
 
@@ -121,15 +122,15 @@ export function ChatSidebar() {
   const [savingSessionKey, setSavingSessionKey] = useState<string | null>(null);
   const inputSnapshot = useChatInputStore((state) => state.snapshot);
   const listSnapshot = useChatSessionListStore((state) => state.snapshot);
-  const runSnapshot = useChatRunStatusStore((state) => state.snapshot);
   const connectionStatus = useUiStore((state) => state.connectionStatus);
+  const { isLoading, items } = useNcpSessionListView();
   const { language, setLanguage } = useI18n();
   const { theme, setTheme } = useTheme();
   const updateSessionLabel = useChatSessionLabelService();
   const currentThemeLabel = t(THEME_OPTIONS.find((o) => o.value === theme)?.labelKey ?? 'themeWarm');
   const currentLanguageLabel = LANGUAGE_OPTIONS.find((o) => o.value === language)?.label ?? language;
 
-  const groups = useMemo(() => groupSessionsByDate(listSnapshot.sessions), [listSnapshot.sessions]);
+  const groups = useMemo(() => groupSessionsByDate(items), [items]);
   const defaultSessionType = inputSnapshot.defaultSessionType || 'native';
   const nonDefaultSessionTypeOptions = useMemo(
     () => inputSnapshot.sessionTypeOptions.filter((option) => option.value !== defaultSessionType),
@@ -142,20 +143,6 @@ export function ChatSidebar() {
     window.location.reload();
   };
 
-  const patchSessionLabelInStore = (sessionKey: string, label: string | undefined) => {
-    const { sessions } = useChatSessionListStore.getState().snapshot;
-    useChatSessionListStore.getState().setSnapshot({
-      sessions: sessions.map((session) =>
-        session.key === sessionKey
-          ? {
-              ...session,
-              ...(label ? { label } : { label: undefined })
-            }
-          : session
-      )
-    });
-  };
-
   const startEditingSessionLabel = (session: SessionEntryView) => {
     setEditingSessionKey(session.key);
     setDraftLabel(session.label?.trim() ?? '');
@@ -181,7 +168,6 @@ export function ChatSidebar() {
         sessionKey: session.key,
         label: normalizedLabel || null
       });
-      patchSessionLabelInStore(session.key, normalizedLabel || undefined);
       cancelEditingSessionLabel();
     } catch {
       setSavingSessionKey(null);
@@ -297,7 +283,7 @@ export function ChatSidebar() {
       <div className="mx-4 border-t border-gray-200/60" />
 
       <div className="flex-1 min-h-0 overflow-y-auto custom-scrollbar px-3 py-2">
-        {listSnapshot.isLoading ? (
+        {isLoading ? (
           <div className="text-xs text-gray-500 p-3">{t('sessionsLoading')}</div>
         ) : groups.length === 0 ? (
           <div className="p-4 text-center">
@@ -312,9 +298,8 @@ export function ChatSidebar() {
                   {group.label}
                 </div>
                 <div className="space-y-0.5">
-                  {group.sessions.map((session) => {
+                  {group.items.map(({ session, runStatus }) => {
                     const active = listSnapshot.selectedSessionKey === session.key;
-                    const runStatus = runSnapshot.sessionRunStatusByKey.get(session.key);
                     const sessionTypeLabel = resolveSessionTypeLabel(session.sessionType, inputSnapshot.sessionTypeOptions);
                     const isEditing = editingSessionKey === session.key;
                     const isSaving = savingSessionKey === session.key;

package/src/components/chat/chat-session-label.service.ts

@@ -1,5 +1,6 @@
 import { useQueryClient } from '@tanstack/react-query';
 import { toast } from 'sonner';
+import { upsertNcpSessionSummaryInQueryClient } from '@/api/ncp-session-query-cache';
 import { updateNcpSession } from '@/api/ncp-session';
 import { t } from '@/lib/i18n';
 
@@ -13,9 +14,8 @@ export function useChatSessionLabelService() {
 
   return async (params: UpdateChatSessionLabelParams): Promise<void> => {
     try {
-      await updateNcpSession(params.sessionKey, { label: params.label });
-      queryClient.invalidateQueries({ queryKey: ['ncp-sessions'] });
-      queryClient.invalidateQueries({ queryKey: ['ncp-session-messages', params.sessionKey] });
+      const updated = await updateNcpSession(params.sessionKey, { label: params.label });
+      upsertNcpSessionSummaryInQueryClient(queryClient, updated);
       toast.success(t('configSavedApplied'));
     } catch (error) {
       toast.error(t('configSaveFailed') + ': ' + (error instanceof Error ? error.message : String(error)));

package/src/components/chat/containers/chat-message-list.container.test.tsx

@@ -1,5 +1,5 @@
 import { render } from "@testing-library/react";
-import type { UiMessage } from "@nextclaw/agent-chat";
+import type { NcpMessage } from "@nextclaw/ncp";
 import { beforeEach, expect, it, vi } from "vitest";
 import { ChatMessageListContainer } from "./chat-message-list.container";
 
@@ -30,23 +30,22 @@ beforeEach(() => {
 it("reuses adapted message references when the source message object is unchanged", () => {
   const message = {
     id: "assistant-1",
+    sessionId: "session-1",
     role: "assistant",
-    meta: {
-      timestamp: "2026-03-17T10:00:00.000Z",
-      status: "streaming",
-    },
+    status: "streaming",
+    timestamp: "2026-03-17T10:00:00.000Z",
     parts: [{ type: "text", text: "hello" }],
-  } satisfies UiMessage;
+  } satisfies NcpMessage;
 
   const { rerender } = render(
-    <ChatMessageListContainer uiMessages={[message]} isSending={false} />,
+    <ChatMessageListContainer messages={[message]} isSending={false} />,
   );
 
   const firstMessages =
     captures.renders[captures.renders.length - 1]?.messages ?? [];
 
   rerender(
-    <ChatMessageListContainer uiMessages={[message]} isSending={false} />,
+    <ChatMessageListContainer messages={[message]} isSending={false} />,
   );
 
   const secondMessages =
@@ -54,3 +53,49 @@ it("reuses adapted message references when the source message object is unchange
 
   expect(secondMessages[0]).toBe(firstMessages[0]);
 });
+
+it("keeps historical adapted message references stable when only the streaming message changes", () => {
+  const historicalMessage = {
+    id: "assistant-1",
+    sessionId: "session-1",
+    role: "assistant",
+    status: "final",
+    timestamp: "2026-03-17T10:00:00.000Z",
+    parts: [{ type: "text", text: "history" }],
+  } satisfies NcpMessage;
+  const firstStreamingMessage = {
+    id: "assistant-2",
+    sessionId: "session-1",
+    role: "assistant",
+    status: "streaming",
+    timestamp: "2026-03-17T10:00:01.000Z",
+    parts: [{ type: "text", text: "hello" }],
+  } satisfies NcpMessage;
+
+  const { rerender } = render(
+    <ChatMessageListContainer
+      messages={[historicalMessage, firstStreamingMessage]}
+      isSending={false}
+    />,
+  );
+
+  const firstMessages =
+    captures.renders[captures.renders.length - 1]?.messages ?? [];
+  const nextStreamingMessage = {
+    ...firstStreamingMessage,
+    parts: [{ type: "text", text: "hello world" }],
+  } satisfies NcpMessage;
+
+  rerender(
+    <ChatMessageListContainer
+      messages={[historicalMessage, nextStreamingMessage]}
+      isSending={false}
+    />,
+  );
+
+  const secondMessages =
+    captures.renders[captures.renders.length - 1]?.messages ?? [];
+
+  expect(secondMessages[0]).toBe(firstMessages[0]);
+  expect(secondMessages[1]).not.toBe(firstMessages[1]);
+});

package/src/components/chat/containers/chat-message-list.container.tsx

@@ -1,5 +1,5 @@
 import { useMemo } from "react";
-import { type UiMessage } from "@nextclaw/agent-chat";
+import type { NcpMessage } from "@nextclaw/ncp";
 import {
   type ChatMessageViewModel,
   ChatMessageList,
@@ -9,17 +9,18 @@ import {
   type ChatMessageAdapterTexts,
   type ChatMessageSource,
 } from "@/components/chat/adapters/chat-message.adapter";
+import { adaptNcpMessageToUiMessage } from "@/components/chat/ncp/ncp-session-adapter";
 import { useI18n } from "@/components/providers/I18nProvider";
 import { formatDateTime, t } from "@/lib/i18n";
 
 type ChatMessageListContainerProps = {
-  uiMessages: UiMessage[];
+  messages: readonly NcpMessage[];
   isSending: boolean;
   className?: string;
 };
 
 const messageViewModelCache = new WeakMap<
-  UiMessage,
+  NcpMessage,
   { language: string; viewModel: ChatMessageViewModel }
 >();
 
@@ -68,20 +69,21 @@ export function ChatMessageListContainer(props: ChatMessageListContainerProps) {
   );
 
   const messages = useMemo(() => {
-    return props.uiMessages.map((message) => {
+    return props.messages.map((message) => {
       const cached = messageViewModelCache.get(message);
       if (cached && cached.language === language) {
         return cached.viewModel;
       }
 
+      const uiMessage = adaptNcpMessageToUiMessage(message);
       const sourceMessage: ChatMessageSource = {
-        id: message.id,
-        role: message.role,
+        id: uiMessage.id,
+        role: uiMessage.role,
         meta: {
-          timestamp: message.meta?.timestamp,
-          status: message.meta?.status,
+          timestamp: uiMessage.meta?.timestamp,
+          status: uiMessage.meta?.status,
         },
-        parts: message.parts as unknown as ChatMessageSource["parts"],
+        parts: uiMessage.parts as unknown as ChatMessageSource["parts"],
       };
       const viewModel = adaptChatMessage(sourceMessage, {
         formatTimestamp: (value) => formatDateTime(value, language),
@@ -91,17 +93,16 @@ export function ChatMessageListContainer(props: ChatMessageListContainerProps) {
       messageViewModelCache.set(message, { language, viewModel });
       return viewModel;
     });
-  }, [language, props.uiMessages, texts]);
+  }, [language, props.messages, texts]);
 
   const hasAssistantDraft = useMemo(
     () =>
-      props.uiMessages.some(
+      messages.some(
         (message) =>
           message.role === "assistant" &&
-          (message.meta?.status === "streaming" ||
-            message.meta?.status === "pending"),
+          (message.status === "streaming" || message.status === "pending"),
       ),
-    [props.uiMessages],
+    [messages],
   );
   const messageTexts = useMemo(
     () => buildChatMessageTexts(language),

package/src/components/chat/managers/chat-session-list.manager.ts

@@ -1,7 +1,6 @@
 import { useChatSessionListStore } from '@/components/chat/stores/chat-session-list.store';
 import { useChatInputStore } from '@/components/chat/stores/chat-input.store';
 import type { ChatUiManager } from '@/components/chat/managers/chat-ui.manager';
-import type { ChatSessionListSnapshot } from '@/components/chat/stores/chat-session-list.store';
 import type { SetStateAction } from 'react';
 import type { ChatStreamActionsManager } from '@/components/chat/managers/chat-stream-actions.manager';
 
@@ -11,16 +10,6 @@ export class ChatSessionListManager {
     private streamActionsManager: ChatStreamActionsManager
   ) {}
 
-  private hasSnapshotChanges = (patch: Partial<ChatSessionListSnapshot>): boolean => {
-    const current = useChatSessionListStore.getState().snapshot;
-    for (const [key, value] of Object.entries(patch) as Array<[keyof ChatSessionListSnapshot, ChatSessionListSnapshot[keyof ChatSessionListSnapshot]]>) {
-      if (!Object.is(current[key], value)) {
-        return true;
-      }
-    }
-    return false;
-  };
-
   private resolveUpdateValue = <T>(prev: T, next: SetStateAction<T>): T => {
     if (typeof next === 'function') {
       return (next as (value: T) => T)(prev);
@@ -28,13 +17,6 @@ export class ChatSessionListManager {
     return next;
   };
 
-  syncSnapshot = (patch: Partial<ChatSessionListSnapshot>) => {
-    if (!this.hasSnapshotChanges(patch)) {
-      return;
-    }
-    useChatSessionListStore.getState().setSnapshot(patch);
-  };
-
   setSelectedAgentId = (next: SetStateAction<string>) => {
     const prev = useChatSessionListStore.getState().snapshot.selectedAgentId;
     const value = this.resolveUpdateValue(prev, next);

package/src/components/chat/ncp/NcpChatPage.tsx

@@ -14,7 +14,7 @@ import { createNcpAppClientFetch } from '@/components/chat/ncp/ncp-app-client-fe
 import { parseSessionKeyFromRoute, resolveAgentIdFromSessionKey } from '@/components/chat/chat-session-route';
 import { useNcpChatPageData } from '@/components/chat/ncp/ncp-chat-page-data';
 import { NcpChatPresenter } from '@/components/chat/ncp/ncp-chat.presenter';
-import { adaptNcpMessagesToUiMessages, buildNcpSessionRunStatusByKey, createNcpSessionId } from '@/components/chat/ncp/ncp-session-adapter';
+import { createNcpSessionId } from '@/components/chat/ncp/ncp-session-adapter';
 import { ChatPresenterProvider } from '@/components/chat/presenter/chat-presenter-context';
 import type { ResumeRunParams } from '@/components/chat/chat-stream/types';
 import { useChatInputStore } from '@/components/chat/stores/chat-input.store';
@@ -74,12 +74,10 @@ export function NcpChatPage({ view }: ChatPageProps) {
     [routeSessionIdParam]
   );
   const {
-    sessionsQuery,
     installedSkillsQuery,
     isProviderStateResolved,
     modelOptions,
     sessionSummaries,
-    sessions,
     skillRecords,
     selectedSession,
     sessionTypeOptions,
@@ -97,7 +95,6 @@ export function NcpChatPage({ view }: ChatPageProps) {
     setSelectedModel: presenter.chatInputManager.setSelectedModel,
     setSelectedThinkingLevel: presenter.chatInputManager.setSelectedThinkingLevel
   });
-  const refetchSessions = sessionsQuery.refetch;
 
   const activeSessionId = selectedSessionKey ?? draftSessionId;
   const sessionSummariesRef = useRef(sessionSummaries);
@@ -151,32 +148,11 @@ export function NcpChatPage({ view }: ChatPageProps) {
     }
   }, [presenter, selectedSessionKey]);
 
-  const uiMessages = useMemo(
-    () => adaptNcpMessagesToUiMessages(agent.visibleMessages),
-    [agent.visibleMessages]
-  );
   const isSending = agent.isSending || agent.isRunning;
   const isAwaitingAssistantOutput = agent.isRunning;
   const canStopCurrentRun = agent.isRunning;
   const stopDisabledReason = agent.isRunning ? null : '__preparing__';
   const lastSendError = agent.hydrateError?.message ?? agent.snapshot.error?.message ?? null;
-  const activeBackendRunId = agent.activeRunId;
-  const sessionRunStatusByKey = useMemo(
-    () =>
-      buildNcpSessionRunStatusByKey({
-        summaries: sessionSummaries,
-        activeSessionId,
-        isLocallyRunning: isSending || Boolean(activeBackendRunId)
-      }),
-    [activeBackendRunId, activeSessionId, isSending, sessionSummaries]
-  );
-
-  useEffect(() => {
-    if (!isSending && !activeBackendRunId) {
-      return;
-    }
-    void refetchSessions();
-  }, [activeBackendRunId, isSending, refetchSessions]);
 
   useEffect(() => {
     presenter.chatStreamActionsManager.bind({
@@ -201,9 +177,7 @@ export function NcpChatPage({ view }: ChatPageProps) {
           return;
         }
         try {
-          void sessionsQuery.refetch();
           await agent.send(envelope);
-          await sessionsQuery.refetch();
         } catch (error) {
           if (payload.restoreDraftOnError) {
             if (payload.composerNodes && payload.composerNodes.length > 0) {
@@ -222,7 +196,6 @@ export function NcpChatPage({ view }: ChatPageProps) {
       },
       stopCurrentRun: async () => {
         await agent.abort();
-        await sessionsQuery.refetch();
       },
       resumeRun: async (run: ResumeRunParams) => {
         if (run.sessionKey !== activeSessionId) {
@@ -235,7 +208,7 @@ export function NcpChatPage({ view }: ChatPageProps) {
       },
       applyHistoryMessages: () => {}
     });
-  }, [activeSessionId, agent, presenter, sessionsQuery]);
+  }, [activeSessionId, agent, presenter]);
 
   useChatSessionSync({
     view,
@@ -264,12 +237,6 @@ export function NcpChatPage({ view }: ChatPageProps) {
     sessionTypeOptions.find((option) => option.value === selectedSessionType)?.label ??
     resolveSessionTypeLabel(selectedSessionType);
 
-  useEffect(() => {
-    presenter.chatThreadManager.bindActions({
-      refetchSessions: sessionsQuery.refetch
-    });
-  }, [presenter, sessionsQuery.refetch]);
-
   useEffect(() => {
     presenter.chatInputManager.syncSnapshot({
       isProviderStateResolved,
@@ -288,16 +255,6 @@ export function NcpChatPage({ view }: ChatPageProps) {
       skillRecords,
       isSkillsLoading: installedSkillsQuery.isLoading
     });
-    presenter.chatSessionListManager.syncSnapshot({
-      sessions,
-      query,
-      isLoading: sessionsQuery.isLoading
-    });
-    presenter.chatRunStatusManager.syncSnapshot({
-      sessionRunStatusByKey,
-      isLocallyRunning: isSending || Boolean(activeBackendRunId),
-      activeBackendRunId
-    });
     presenter.chatThreadManager.syncSnapshot({
       isProviderStateResolved,
       modelOptions,
@@ -309,12 +266,11 @@ export function NcpChatPage({ view }: ChatPageProps) {
       canDeleteSession: Boolean(selectedSession),
       threadRef,
       isHistoryLoading: agent.isHydrating,
-      uiMessages,
+      messages: agent.visibleMessages,
       isSending,
       isAwaitingAssistantOutput
     });
   }, [
-    activeBackendRunId,
     agent.isHydrating,
     canEditSessionType,
     canStopCurrentRun,
@@ -329,20 +285,16 @@ export function NcpChatPage({ view }: ChatPageProps) {
     modelOptions.length,
     modelOptions,
     presenter,
-    query,
     selectedSession,
     selectedSessionKey,
     selectedSessionType,
-    sessionRunStatusByKey,
     sessionTypeOptions,
     sessionTypeUnavailable,
     sessionTypeUnavailableMessage,
-    sessions,
-    sessionsQuery.isLoading,
     skillRecords,
     stopDisabledReason,
     threadRef,
-    uiMessages
+    agent.visibleMessages
   ]);
 
   return (

package/src/components/chat/ncp/ncp-chat-thread.manager.ts

@@ -1,3 +1,5 @@
+import { appQueryClient } from '@/app-query-client';
+import { deleteNcpSessionSummaryInQueryClient } from '@/api/ncp-session-query-cache';
 import { deleteNcpSession as deleteNcpSessionApi } from '@/api/ncp-session';
 import type { ChatSessionListManager } from '@/components/chat/managers/chat-session-list.manager';
 import type { ChatStreamActionsManager } from '@/components/chat/managers/chat-stream-actions.manager';
@@ -7,30 +9,13 @@ import type { ChatThreadSnapshot } from '@/components/chat/stores/chat-thread.st
 import { useChatThreadStore } from '@/components/chat/stores/chat-thread.store';
 import { t } from '@/lib/i18n';
 
-export type NcpChatThreadManagerActions = {
-  refetchSessions: () => Promise<unknown>;
-};
-
-const noopAsync = async () => {};
-
 export class NcpChatThreadManager {
-  private actions: NcpChatThreadManagerActions = {
-    refetchSessions: noopAsync
-  };
-
   constructor(
     private uiManager: ChatUiManager,
     private sessionListManager: ChatSessionListManager,
     private streamActionsManager: ChatStreamActionsManager
   ) {}
 
-  bindActions = (patch: Partial<NcpChatThreadManagerActions>) => {
-    this.actions = {
-      ...this.actions,
-      ...patch
-    };
-  };
-
   private hasSnapshotChanges = (patch: Partial<ChatThreadSnapshot>): boolean => {
     const current = useChatThreadStore.getState().snapshot;
     for (const [key, value] of Object.entries(patch) as Array<[keyof ChatThreadSnapshot, ChatThreadSnapshot[keyof ChatThreadSnapshot]]>) {
@@ -78,9 +63,10 @@ export class NcpChatThreadManager {
     useChatThreadStore.getState().setSnapshot({ isDeletePending: true });
     try {
       await deleteNcpSessionApi(selectedSessionKey);
+      deleteNcpSessionSummaryInQueryClient(appQueryClient, selectedSessionKey);
+      appQueryClient.removeQueries({ queryKey: ['ncp-session-messages', selectedSessionKey] });
       this.streamActionsManager.resetStreamState();
       this.uiManager.goToChatRoot({ replace: true });
-      await this.actions.refetchSessions();
     } finally {
       useChatThreadStore.getState().setSnapshot({ isDeletePending: false });
     }

package/src/components/chat/ncp/ncp-chat.presenter.ts

@@ -1,4 +1,3 @@
-import { ChatRunStatusManager } from '@/components/chat/managers/chat-run-status.manager';
 import { ChatSessionListManager } from '@/components/chat/managers/chat-session-list.manager';
 import { ChatStreamActionsManager } from '@/components/chat/managers/chat-stream-actions.manager';
 import { ChatUiManager } from '@/components/chat/managers/chat-ui.manager';
@@ -14,7 +13,6 @@ export class NcpChatPresenter {
     this.chatStreamActionsManager,
     () => this.getDraftSessionId()
   );
-  chatRunStatusManager = new ChatRunStatusManager();
   chatThreadManager = new NcpChatThreadManager(
     this.chatUiManager,
     this.chatSessionListManager,

package/src/components/chat/ncp/ncp-session-adapter.test.ts

@@ -1,7 +1,6 @@
 import {
   adaptNcpMessageToUiMessage,
   adaptNcpSessionSummary,
-  buildNcpSessionRunStatusByKey,
   readNcpSessionPreferredThinking
 } from '@/components/chat/ncp/ncp-session-adapter';
 import type { NcpSessionSummaryView } from '@/api/types';
@@ -95,25 +94,3 @@ describe('readNcpSessionPreferredThinking', () => {
     expect(thinking).toBe('high');
   });
 });
-
-describe('buildNcpSessionRunStatusByKey', () => {
-  it('marks the active local session as running before the server summary catches up', () => {
-    const statuses = buildNcpSessionRunStatusByKey({
-      summaries: [createSummary({ sessionId: 'ncp-session-1', status: 'idle' })],
-      activeSessionId: 'ncp-session-1',
-      isLocallyRunning: true
-    });
-
-    expect(statuses.get('ncp-session-1')).toBe('running');
-  });
-
-  it('keeps persisted running sessions marked as running', () => {
-    const statuses = buildNcpSessionRunStatusByKey({
-      summaries: [createSummary({ sessionId: 'ncp-session-2', status: 'running' })],
-      activeSessionId: null,
-      isLocallyRunning: false
-    });
-
-    expect(statuses.get('ncp-session-2')).toBe('running');
-  });
-});

package/src/components/chat/ncp/ncp-session-adapter.ts

@@ -1,7 +1,6 @@
 import { ToolInvocationStatus, type UIMessage } from '@nextclaw/agent-chat';
 import type { NcpMessagePart } from '@nextclaw/ncp';
 import type { NcpMessageView, NcpSessionSummaryView, SessionEntryView, ThinkingLevel } from '@/api/types';
-import type { SessionRunStatus } from '@/lib/session-run-status';
 
 const THINKING_LEVEL_SET = new Set<string>(['off', 'minimal', 'low', 'medium', 'high', 'adaptive', 'xhigh']);
 
@@ -206,24 +205,6 @@ export function adaptNcpSessionSummaries(summaries: NcpSessionSummaryView[]): Se
   return summaries.map(adaptNcpSessionSummary);
 }
 
-export function buildNcpSessionRunStatusByKey(params: {
-  summaries: readonly NcpSessionSummaryView[];
-  activeSessionId?: string | null;
-  isLocallyRunning?: boolean;
-}): Map<string, SessionRunStatus> {
-  const map = new Map<string, SessionRunStatus>();
-  for (const summary of params.summaries) {
-    if (summary.status === 'running') {
-      map.set(summary.sessionId, 'running');
-    }
-  }
-  const activeSessionId = readOptionalString(params.activeSessionId);
-  if (params.isLocallyRunning && activeSessionId) {
-    map.set(activeSessionId, 'running');
-  }
-  return map;
-}
-
 export function createNcpSessionId(): string {
   return `ncp-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`;
 }