@nextclaw/ui 0.12.11 → 0.12.13

package/src/{hooks → features/chat/hooks}/use-ncp-chat-session-types.ts

@@ -1,5 +1,5 @@
 import { useQuery } from '@tanstack/react-query';
-import { fetchNcpChatSessionTypes } from '@/api/config';
+import { fetchNcpChatSessionTypes } from '@/shared/lib/api';
 
 export function useNcpChatSessionTypes() {
   return useQuery({

package/src/{components/chat/ncp/session-conversation → features/chat/hooks}/use-ncp-child-session-tabs-view.ts

@@ -1,11 +1,11 @@
 import { useMemo } from "react";
-import type { SessionEntryView } from "@/api/types";
-import { sessionDisplayName } from "@/components/chat/chat-session-display";
-import { adaptNcpSessionSummaries } from "@/components/chat/ncp/ncp-session-adapter";
-import { resolveSessionTypeLabel } from "@/components/chat/useChatSessionTypeState";
-import type { ChatChildSessionTab } from "@/components/chat/stores/chat-thread.store";
-import { useNcpSessions } from "@/hooks/useConfig";
-import type { SessionRunStatus } from "@/lib/session-run-status";
+import type { SessionEntryView } from "@/shared/lib/api";
+import { sessionDisplayName } from "@/features/chat/utils/chat-session-display.utils";
+import { adaptNcpSessionSummaries } from "@/features/chat/utils/ncp-session-adapter.utils";
+import { resolveSessionTypeLabel } from "@/features/chat/hooks/use-chat-session-type-state";
+import type { ChatChildSessionTab } from "@/features/chat/stores/chat-thread.store";
+import { useNcpSessions } from "@/shared/hooks/use-config";
+import type { SessionRunStatus } from "@/features/chat/types/session-run-status.types";
 
 export type ResolvedChildSessionTab = {
   sessionKey: string;

package/src/{components/chat/ncp/session-conversation → features/chat/hooks}/use-ncp-session-conversation.test.tsx

@@ -29,9 +29,13 @@ const mocks = vi.hoisted(() => ({
   clientInstances: [] as unknown[],
 }));
 
-vi.mock("@/api/ncp-session", () => ({
-  fetchNcpSessionMessages: mocks.fetchNcpSessionMessages,
-}));
+vi.mock("@/shared/lib/api", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@/shared/lib/api")>();
+  return {
+    ...actual,
+    fetchNcpSessionMessages: mocks.fetchNcpSessionMessages,
+  };
+});
 
 vi.mock("@nextclaw/ncp-react", () => ({
   useHydratedNcpAgent: vi.fn((params: { client: unknown; loadSeed: unknown }) => {

package/src/{components/chat/ncp/session-conversation → features/chat/hooks}/use-ncp-session-conversation.ts

@@ -1,9 +1,8 @@
 import { useCallback, useEffect, useRef, useState } from "react";
 import { NcpHttpAgentClientEndpoint } from "@nextclaw/ncp-http-agent-client";
 import { useHydratedNcpAgent, type NcpConversationSeed } from "@nextclaw/ncp-react";
-import { API_BASE } from "@/api/api-base";
-import { fetchNcpSessionMessages } from "@/api/ncp-session";
-import { createNcpAppClientFetch } from "@/components/chat/ncp/ncp-app-client-fetch";
+import { API_BASE, fetchNcpSessionMessages } from "@/shared/lib/api";
+import { createNcpAppClientFetch } from "@/features/chat/utils/ncp-app-client-fetch.utils";
 import { useChatRuntimeAvailability } from "@/features/system-status";
 
 const DEFAULT_MESSAGE_LIMIT = 300;
@@ -63,29 +62,51 @@ export async function fetchNcpSessionConversationSeed(
   }
 }
 
+function useSyncReadyRetryVersion(
+  readyRetrySignature: string | null,
+  bumpRetryVersion: () => void,
+): void {
+  const retriedReadySignatureRef = useRef<string | null>(null);
+  const syncReadyRetryVersion = useCallback(
+    (nextSignature: string | null) => {
+      if (!nextSignature) {
+        retriedReadySignatureRef.current = null;
+        return;
+      }
+      if (retriedReadySignatureRef.current === nextSignature) {
+        return;
+      }
+      retriedReadySignatureRef.current = nextSignature;
+      bumpRetryVersion();
+    },
+    [bumpRetryVersion],
+  );
+
+  useEffect(() => {
+    syncReadyRetryVersion(readyRetrySignature);
+  }, [readyRetrySignature, syncReadyRetryVersion]);
+}
+
 export function useNcpSessionConversation(
   sessionId: string,
   options: UseNcpSessionConversationOptions = {},
 ) {
   const [client] = useState(() => createNcpSessionConversationClient());
   const runtimeAvailability = useChatRuntimeAvailability();
-  const [hydrationRetryNonce, setHydrationRetryNonce] = useState(0);
-  const retriedReadySignatureRef = useRef<string | null>(null);
+  const [hydrationRetryVersion, setHydrationRetryVersion] = useState(0);
   const messageLimit = options.messageLimit ?? DEFAULT_MESSAGE_LIMIT;
   const loadSeed = useCallback(
     (targetSessionId: string, signal: AbortSignal) => {
-      void hydrationRetryNonce;
+      void hydrationRetryVersion;
       return fetchNcpSessionConversationSeed(targetSessionId, signal, messageLimit);
     },
-    [hydrationRetryNonce, messageLimit],
+    [hydrationRetryVersion, messageLimit],
   );
-
   const agent = useHydratedNcpAgent({
     sessionId,
     client,
     loadSeed,
   });
-
   const currentAgentError =
     agent.hydrateError?.message ?? agent.snapshot.error?.message ?? null;
   const readyRetrySignature =
@@ -93,18 +114,8 @@ export function useNcpSessionConversation(
     isNcpAgentStartupUnavailableErrorMessage(currentAgentError)
       ? `${sessionId}:${runtimeAvailability.lastReadyAt ?? 0}`
       : null;
-
-  useEffect(() => {
-    if (!readyRetrySignature) {
-      retriedReadySignatureRef.current = null;
-      return;
-    }
-    if (retriedReadySignatureRef.current === readyRetrySignature) {
-      return;
-    }
-    retriedReadySignatureRef.current = readyRetrySignature;
-    setHydrationRetryNonce((current) => current + 1);
-  }, [readyRetrySignature]);
-
+  useSyncReadyRetryVersion(readyRetrySignature, () => {
+    setHydrationRetryVersion((current) => current + 1);
+  });
   return agent;
 }

package/src/{components/chat/ncp → features/chat/hooks}/use-ncp-session-list-view.ts

@@ -1,10 +1,10 @@
 import { useMemo } from 'react';
-import type { SessionEntryView } from '@/api/types';
-import { adaptNcpSessionSummaries } from '@/components/chat/ncp/ncp-session-adapter';
-import { sessionMatchesQuery } from '@/components/chat/chat-session-display';
-import { useChatSessionListStore } from '@/components/chat/stores/chat-session-list.store';
-import { useNcpSessions } from '@/hooks/useConfig';
-import type { SessionRunStatus } from '@/lib/session-run-status';
+import type { SessionEntryView } from '@/shared/lib/api';
+import { sessionMatchesQuery } from '@/features/chat/utils/chat-session-display.utils';
+import { adaptNcpSessionSummaries } from '@/features/chat/utils/ncp-session-adapter.utils';
+import { useChatSessionListStore } from '@/features/chat/stores/chat-session-list.store';
+import { useNcpSessions } from '@/shared/hooks/use-config';
+import type { SessionRunStatus } from '@/features/chat/types/session-run-status.types';
 
 export type NcpSessionListItemView = {
   session: SessionEntryView;

package/src/features/chat/index.ts

@@ -0,0 +1,6 @@
+export * from "./components/chat-sidebar-list-mode-switch"; export * from "./components/chat-sidebar-project-groups"; export * from "./components/chat-sidebar-session-item"; export * from "./components/chat-welcome";
+export * from "./components/conversation/chat-conversation-panel"; export * from "./components/layout/chat-sidebar";
+export * from "./components/chat-session-type-option-item"; export * from "./components/chat-session-workspace-file-preview"; export * from "./components/chat-session-workspace-panel"; export * from "./components/chat-session-workspace-panel-nav";
+export * from "./hooks/use-chat-session-type-state"; export * from "./hooks/use-ncp-chat-session-types"; export * from "./hooks/use-ncp-session-list-view";
+export * from "./managers/chat-recent-models.manager"; export * from "./managers/chat-recent-skills.manager"; export * from "./managers/chat-session-preference-sync.manager"; export * from "./managers/ncp-chat-input.manager"; export * from "./managers/ncp-chat-presenter.manager"; export * from "./managers/ncp-chat-thread.manager"; export * from "./stores/chat-input.store"; export * from "./stores/chat-session-list.store"; export * from "./stores/chat-thread.store";
+export * from "./types/chat-input.types"; export * from "./utils/chat-composer-state.utils"; export * from "./utils/chat-inline-token.utils"; export * from "./utils/chat-session-display.utils"; export * from "./utils/chat-session-preference-governance.utils"; export * from "./utils/chat-session-route.utils"; export * from "./utils/ncp-session-adapter.utils";

package/src/{components/chat → features/chat/managers}/chat-recent-models.manager.ts

@@ -1,4 +1,4 @@
-import { RecentSelectionManager } from '@/lib/recent-selection.manager';
+import { RecentSelectionManager } from './recent-selection.manager';
 
 export const chatRecentModelsManager = new RecentSelectionManager({
   storageKey: 'nextclaw.chat.recent-models',

package/src/{components/chat → features/chat/managers}/chat-recent-skills.manager.ts

@@ -1,4 +1,4 @@
-import { RecentSelectionManager } from '@/lib/recent-selection.manager';
+import { RecentSelectionManager } from './recent-selection.manager';
 
 export const chatRecentSkillsManager = new RecentSelectionManager({
   storageKey: 'nextclaw.chat.recent-skills',

package/src/{components → features}/chat/managers/chat-session-list.manager.test.ts

@@ -1,16 +1,20 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { ChatSessionListManager } from '@/components/chat/managers/chat-session-list.manager';
-import { useChatInputStore } from '@/components/chat/stores/chat-input.store';
-import { useChatSessionListStore } from '@/components/chat/stores/chat-session-list.store';
-import { useChatThreadStore } from '@/components/chat/stores/chat-thread.store';
+import { ChatSessionListManager } from '@/features/chat/managers/chat-session-list.manager';
+import { useChatInputStore } from '@/features/chat/stores/chat-input.store';
+import { useChatSessionListStore } from '@/features/chat/stores/chat-session-list.store';
+import { useChatThreadStore } from '@/features/chat/stores/chat-thread.store';
 
 const mocks = vi.hoisted(() => ({
   updateNcpSession: vi.fn(),
 }));
 
-vi.mock('@/api/ncp-session', () => ({
-  updateNcpSession: mocks.updateNcpSession,
-}));
+vi.mock('@/shared/lib/api', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@/shared/lib/api')>();
+  return {
+    ...actual,
+    updateNcpSession: mocks.updateNcpSession,
+  };
+});
 
 describe('ChatSessionListManager', () => {
   beforeEach(() => {

package/src/{components → features}/chat/managers/chat-session-list.manager.ts

@@ -1,13 +1,12 @@
-import { useChatSessionListStore } from '@/components/chat/stores/chat-session-list.store';
-import { useChatInputStore } from '@/components/chat/stores/chat-input.store';
-import { useChatThreadStore } from '@/components/chat/stores/chat-thread.store';
-import type { ChatUiManager } from '@/components/chat/managers/chat-ui.manager';
+import { useChatSessionListStore } from '@/features/chat/stores/chat-session-list.store';
+import { useChatInputStore } from '@/features/chat/stores/chat-input.store';
+import { useChatThreadStore } from '@/features/chat/stores/chat-thread.store';
+import type { ChatUiManager } from '@/features/chat/managers/chat-ui.manager';
 import type { SetStateAction } from 'react';
-import type { ChatStreamActionsManager } from '@/components/chat/managers/chat-stream-actions.manager';
-import { normalizeSessionProjectRootValue } from '@/lib/session-project/session-project.utils';
-import { createNcpSessionId } from '@/components/chat/ncp/ncp-session-adapter';
-import { updateNcpSession } from '@/api/ncp-session';
-
+import type { ChatStreamActionsManager } from '@/features/chat/managers/chat-stream-actions.manager';
+import { normalizeSessionProjectRootValue } from '@/shared/lib/session-project';
+import { createNcpSessionId } from '@/features/chat/utils/ncp-session-adapter.utils';
+import { updateNcpSession } from '@/shared/lib/api';
 export class ChatSessionListManager {
   constructor(
     private uiManager: ChatUiManager,
@@ -38,7 +37,6 @@ export class ChatSessionListManager {
     }
     return next;
   };
-
   private shouldPersistReadAt = (
     sessionKey: string,
     readAt: string,

package/src/{components/chat/chat-session-preference-sync.test.ts → features/chat/managers/chat-session-preference-sync.manager.test.ts}

@@ -1,19 +1,23 @@
 import { afterEach, describe, expect, it, vi } from 'vitest';
-import { updateNcpSession } from '@/api/ncp-session';
-import { ChatSessionPreferenceSync } from '@/components/chat/chat-session-preference-sync';
-import { useChatInputStore } from '@/components/chat/stores/chat-input.store';
-import { useChatSessionListStore } from '@/components/chat/stores/chat-session-list.store';
-import { useChatThreadStore } from '@/components/chat/stores/chat-thread.store';
+import { updateNcpSession } from '@/shared/lib/api';
+import { ChatSessionPreferenceSync } from './chat-session-preference-sync.manager';
+import { useChatInputStore } from '@/features/chat/stores/chat-input.store';
+import { useChatSessionListStore } from '@/features/chat/stores/chat-session-list.store';
+import { useChatThreadStore } from '@/features/chat/stores/chat-thread.store';
 
-vi.mock('@/api/ncp-session', () => ({
-  updateNcpSession: vi.fn(async () => ({
-    sessionId: 'session-1',
-    messageCount: 0,
-    updatedAt: new Date().toISOString(),
-    status: 'idle',
-    metadata: {}
-  }))
-}));
+vi.mock('@/shared/lib/api', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@/shared/lib/api')>();
+  return {
+    ...actual,
+    updateNcpSession: vi.fn(async () => ({
+      sessionId: 'session-1',
+      messageCount: 0,
+      updatedAt: new Date().toISOString(),
+      status: 'idle',
+      metadata: {}
+    }))
+  };
+});
 
 describe('ChatSessionPreferenceSync', () => {
   afterEach(() => {

package/src/{components/chat/chat-session-preference-sync.ts → features/chat/managers/chat-session-preference-sync.manager.ts}

@@ -1,16 +1,12 @@
-import type { SessionPatchUpdate, ThinkingLevel } from '@/api/types';
-import { useChatInputStore } from '@/components/chat/stores/chat-input.store';
-import { useChatSessionListStore } from '@/components/chat/stores/chat-session-list.store';
-import { useChatThreadStore } from '@/components/chat/stores/chat-thread.store';
+import type { SessionPatchUpdate, ThinkingLevel } from '@/shared/lib/api';
+import { useChatInputStore } from '@/features/chat/stores/chat-input.store';
+import { useChatSessionListStore } from '@/features/chat/stores/chat-session-list.store';
+import { useChatThreadStore } from '@/features/chat/stores/chat-thread.store';
 
-type QueuedSessionPreferenceSync = {
-  sessionKey: string;
-  patch: SessionPatchUpdate;
-};
+type QueuedSessionPreferenceSync = { sessionKey: string; patch: SessionPatchUpdate };
 
 function normalizeOptionalModel(value: string): string | null {
-  const normalized = value.trim();
-  return normalized.length > 0 ? normalized : null;
+  const normalized = value.trim(); return normalized.length > 0 ? normalized : null;
 }
 
 function normalizeOptionalThinking(value: ThinkingLevel | null): ThinkingLevel | null {
@@ -22,10 +18,7 @@ export class ChatSessionPreferenceSync {
   private queued: QueuedSessionPreferenceSync | null = null;
 
   constructor(
-    private readonly updateSession: (
-      sessionKey: string,
-      patch: SessionPatchUpdate
-    ) => Promise<unknown>
+    private readonly updateSession: (sessionKey: string, patch: SessionPatchUpdate) => Promise<unknown>
   ) {}
 
   syncSelectedSessionPreferences = (): void => {

package/src/{components → features}/chat/managers/chat-stream-actions.manager.ts

@@ -1,4 +1,4 @@
-import type { ChatStreamActions } from '@/components/chat/chat-stream/types';
+import type { ChatStreamActions } from '@/features/chat/types/chat-stream.types';
 
 const noopAsync = async () => {};
 const noop = () => {};
@@ -19,7 +19,8 @@ export class ChatStreamActionsManager {
     };
   };
 
-  sendMessage = (payload: Parameters<ChatStreamActions['sendMessage']>[0]) => this.actions.sendMessage(payload);
+  sendMessage = (payload: Parameters<ChatStreamActions['sendMessage']>[0]) =>
+    this.actions.sendMessage(payload);
 
   stopCurrentRun = () => this.actions.stopCurrentRun();
 

package/src/{components → features}/chat/managers/chat-ui.manager.ts

@@ -1,5 +1,5 @@
-import { buildSessionPath } from '@/components/chat/chat-session-route';
 import type { NavigateFunction, NavigateOptions } from 'react-router-dom';
+import { buildSessionPath } from '@/features/chat/utils/chat-session-route.utils';
 
 type ChatUiState = {
   pathname: string;
@@ -7,10 +7,18 @@ type ChatUiState = {
 
 type ChatUiActions = {
   navigate: NavigateFunction | null;
-  confirm: (params: { title: string; variant: 'destructive'; confirmLabel: string }) => Promise<boolean>;
+  confirm: (params: {
+    title: string;
+    variant: 'destructive';
+    confirmLabel: string;
+  }) => Promise<boolean>;
 };
 
-const noopConfirm = async (_params: { title: string; variant: 'destructive'; confirmLabel: string }) => false;
+const noopConfirm = async (_params: {
+  title: string;
+  variant: 'destructive';
+  confirmLabel: string;
+}) => false;
 
 export class ChatUiManager {
   private state: ChatUiState = {

package/src/{components/chat/ncp/tests → features/chat/managers}/ncp-chat-input.manager.test.ts

@@ -1,9 +1,9 @@
 import { createChatComposerTextNode } from '@nextclaw/agent-chat-ui';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { NcpChatInputManager } from '@/components/chat/ncp/ncp-chat-input.manager';
-import { useChatInputStore } from '@/components/chat/stores/chat-input.store';
-import { useChatSessionListStore } from '@/components/chat/stores/chat-session-list.store';
-import { useChatThreadStore } from '@/components/chat/stores/chat-thread.store';
+import { NcpChatInputManager } from '@/features/chat/managers/ncp-chat-input.manager';
+import { useChatInputStore } from '@/features/chat/stores/chat-input.store';
+import { useChatSessionListStore } from '@/features/chat/stores/chat-session-list.store';
+import { useChatThreadStore } from '@/features/chat/stores/chat-thread.store';
 import { useSystemStatusStore } from '@/features/system-status';
 
 describe('NcpChatInputManager', () => {

package/src/{components/chat/ncp → features/chat/managers}/ncp-chat-input.manager.ts

@@ -1,8 +1,8 @@
 import type { ChatComposerNode } from '@nextclaw/agent-chat-ui';
 import type { NcpDraftAttachment } from '@nextclaw/ncp-react';
 import type { SetStateAction } from 'react';
-import type { ThinkingLevel } from '@/api/types';
-import { updateNcpSession } from '@/api/ncp-session';
+import type { ThinkingLevel } from '@/shared/lib/api';
+import { updateNcpSession } from '@/shared/lib/api';
 import {
   createChatComposerNodesFromDraft,
   createInitialChatComposerNodes,
@@ -12,20 +12,20 @@ import {
   pruneComposerAttachments,
   syncComposerAttachments,
   syncComposerSkills
-} from '@/components/chat/chat-composer-state';
-import { useChatInputStore } from '@/components/chat/stores/chat-input.store';
-import { useChatSessionListStore } from '@/components/chat/stores/chat-session-list.store';
-import { useChatThreadStore } from '@/components/chat/stores/chat-thread.store';
-import type { ChatInputSnapshot } from '@/components/chat/stores/chat-input.store';
-import type { ChatStreamActionsManager } from '@/components/chat/managers/chat-stream-actions.manager';
-import type { ChatUiManager } from '@/components/chat/managers/chat-ui.manager';
-import type { ChatSessionListManager } from '@/components/chat/managers/chat-session-list.manager';
-import { ChatSessionPreferenceSync } from '@/components/chat/chat-session-preference-sync';
-import { isNcpChatSendDisabled } from '@/components/chat/chat-input/ncp-chat-input-availability.utils';
-import { chatRecentModelsManager } from '@/components/chat/chat-recent-models.manager';
-import { chatRecentSkillsManager } from '@/components/chat/chat-recent-skills.manager';
-import type { ChatModelOption } from '@/components/chat/chat-input.types';
-import { normalizeSessionType } from '@/components/chat/useChatSessionTypeState';
+} from '@/features/chat/utils/chat-composer-state.utils';
+import { useChatInputStore } from '@/features/chat/stores/chat-input.store';
+import { useChatSessionListStore } from '@/features/chat/stores/chat-session-list.store';
+import { useChatThreadStore } from '@/features/chat/stores/chat-thread.store';
+import type { ChatInputSnapshot } from '@/features/chat/stores/chat-input.store';
+import type { ChatStreamActionsManager } from '@/features/chat/managers/chat-stream-actions.manager';
+import type { ChatUiManager } from '@/features/chat/managers/chat-ui.manager';
+import type { ChatSessionListManager } from '@/features/chat/managers/chat-session-list.manager';
+import { ChatSessionPreferenceSync } from '@/features/chat/managers/chat-session-preference-sync.manager';
+import { isNcpChatSendDisabled } from '@/features/chat/utils/ncp-chat-input-availability.utils';
+import { chatRecentModelsManager } from '@/features/chat/managers/chat-recent-models.manager';
+import { chatRecentSkillsManager } from '@/features/chat/managers/chat-recent-skills.manager';
+import type { ChatModelOption } from '@/features/chat/types/chat-input.types';
+import { normalizeSessionType } from '@/features/chat/hooks/use-chat-session-type-state';
 import { systemStatusManager } from '@/features/system-status';
 
 export class NcpChatInputManager {

package/src/{components/chat/ncp/ncp-chat.presenter.ts → features/chat/managers/ncp-chat-presenter.manager.ts}

@@ -1,8 +1,8 @@
-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';
-import { NcpChatInputManager } from '@/components/chat/ncp/ncp-chat-input.manager';
-import { NcpChatThreadManager } from '@/components/chat/ncp/ncp-chat-thread.manager';
+import { ChatSessionListManager } from '@/features/chat/managers/chat-session-list.manager';
+import { ChatStreamActionsManager } from '@/features/chat/managers/chat-stream-actions.manager';
+import { ChatUiManager } from '@/features/chat/managers/chat-ui.manager';
+import { NcpChatInputManager } from '@/features/chat/managers/ncp-chat-input.manager';
+import { NcpChatThreadManager } from '@/features/chat/managers/ncp-chat-thread.manager';
 
 export class NcpChatPresenter {
   chatUiManager = new ChatUiManager();

package/src/{components/chat/ncp/tests → features/chat/managers}/ncp-chat-thread.manager.test.ts

@@ -1,21 +1,22 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { appQueryClient } from '@/app-query-client';
-import { NcpChatThreadManager } from '@/components/chat/ncp/ncp-chat-thread.manager';
-import { useChatSessionListStore } from '@/components/chat/stores/chat-session-list.store';
-import { useChatThreadStore } from '@/components/chat/stores/chat-thread.store';
+import { NcpChatThreadManager } from '@/features/chat/managers/ncp-chat-thread.manager';
+import { useChatSessionListStore } from '@/features/chat/stores/chat-session-list.store';
+import { useChatThreadStore } from '@/features/chat/stores/chat-thread.store';
 
 const { deleteNcpSessionMock, deleteSummaryMock } = vi.hoisted(() => ({
   deleteNcpSessionMock: vi.fn(async () => ({ deleted: true, sessionId: 'parent-session-1' })),
   deleteSummaryMock: vi.fn(),
 }));
 
-vi.mock('@/api/ncp-session', () => ({
-  deleteNcpSession: deleteNcpSessionMock,
-}));
-
-vi.mock('@/api/ncp-session-query-cache', () => ({
-  deleteNcpSessionSummaryInQueryClient: deleteSummaryMock,
-}));
+vi.mock('@/shared/lib/api', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@/shared/lib/api')>();
+  return {
+    ...actual,
+    deleteNcpSession: deleteNcpSessionMock,
+    deleteNcpSessionSummaryInQueryClient: deleteSummaryMock,
+  };
+});
 
 describe('NcpChatThreadManager', () => {
   beforeEach(() => {

package/src/{components/chat/ncp → features/chat/managers}/ncp-chat-thread.manager.ts

@@ -1,20 +1,21 @@
 import { appQueryClient } from '@/app-query-client';
-import { deleteNcpSessionSummaryInQueryClient } from '@/api/ncp-session-query-cache';
-import { deleteNcpSession as deleteNcpSessionApi } from '@/api/ncp-session';
+import { deleteNcpSessionSummaryInQueryClient } from '@/shared/lib/api';
+import { deleteNcpSession as deleteNcpSessionApi } from '@/shared/lib/api';
 import type {
   ChatFileOpenActionViewModel,
   ChatToolActionViewModel,
 } from '@nextclaw/agent-chat-ui';
-import type { ChatSessionListManager } from '@/components/chat/managers/chat-session-list.manager';
-import type { ChatStreamActionsManager } from '@/components/chat/managers/chat-stream-actions.manager';
-import type { ChatUiManager } from '@/components/chat/managers/chat-ui.manager';
-import { useChatSessionListStore } from '@/components/chat/stores/chat-session-list.store';
+import type { ChatSessionListManager } from '@/features/chat/managers/chat-session-list.manager';
+import type { ChatStreamActionsManager } from '@/features/chat/managers/chat-stream-actions.manager';
+import type { ChatUiManager } from '@/features/chat/managers/chat-ui.manager';
+import { useChatSessionListStore } from '@/features/chat/stores/chat-session-list.store';
 import type {
   ChatThreadSnapshot,
   ChatWorkspaceFileTab,
-} from '@/components/chat/stores/chat-thread.store';
-import { useChatThreadStore } from '@/components/chat/stores/chat-thread.store';
-import { t } from '@/lib/i18n';
+} from '@/features/chat/stores/chat-thread.store';
+import { useChatThreadStore } from '@/features/chat/stores/chat-thread.store';
+import { viewportLayoutManager } from '@/app/managers/viewport-layout.manager';
+import { t } from '@/shared/lib/i18n';
 
 export class NcpChatThreadManager {
   constructor(
@@ -281,10 +282,7 @@ export class NcpChatThreadManager {
   };
 
   private isCompactViewport = (): boolean => {
-    if (typeof window === 'undefined' || typeof window.matchMedia !== 'function') {
-      return false;
-    }
-    return window.matchMedia('(max-width: 767px)').matches;
+    return viewportLayoutManager.getSnapshot().mode === 'mobile';
   };
 
   private deleteCurrentSession = async () => {

package/src/{lib → features/chat/managers}/recent-selection.manager.test.ts

@@ -1,4 +1,4 @@
-import { RecentSelectionManager } from '@/lib/recent-selection.manager';
+import { RecentSelectionManager } from './recent-selection.manager';
 
 describe('RecentSelectionManager', () => {
   const storageKey = 'test.recent-selection-manager';

package/src/{lib → features/chat/managers}/recent-selection.manager.ts

@@ -13,7 +13,7 @@ type VisibleRecentSelectionParams = {
 export class RecentSelectionManager {
   constructor(private readonly options: RecentSelectionManagerOptions) {}
 
-  read(): string[] {
+  read = (): string[] => {
     const storage = this.getStorage();
     if (!storage) {
       return [];
@@ -23,9 +23,9 @@ export class RecentSelectionManager {
     } catch {
       return [];
     }
-  }
+  };
 
-  remember(value: string): string[] {
+  remember = (value: string): string[] => {
     const normalizedValue = this.normalizeValue(value);
     if (!normalizedValue) {
       return this.read();
@@ -33,9 +33,9 @@ export class RecentSelectionManager {
     const next = [normalizedValue, ...this.read().filter((item) => item !== normalizedValue)].slice(0, this.options.limit);
     this.write(next);
     return next;
-  }
+  };
 
-  resolveVisible(params: VisibleRecentSelectionParams): string[] {
+  resolveVisible = (params: VisibleRecentSelectionParams): string[] => {
     const availableValues = this.normalizeList(params.availableValues, Number.POSITIVE_INFINITY);
     if (availableValues.length <= params.minAvailableCount) {
       return [];
@@ -53,9 +53,9 @@ export class RecentSelectionManager {
       }
     }
     return visible;
-  }
+  };
 
-  private write(values: string[]): void {
+  private write = (values: string[]): void => {
     const storage = this.getStorage();
     if (!storage) {
       return;
@@ -65,9 +65,9 @@ export class RecentSelectionManager {
     } catch {
       // Ignore storage write failures and keep the runtime behavior deterministic.
     }
-  }
+  };
 
-  private getStorage(): Storage | null {
+  private getStorage = (): Storage | null => {
     if (Object.prototype.hasOwnProperty.call(this.options, 'storage')) {
       return (this.options.storage as Storage | null | undefined) ?? null;
     }
@@ -75,9 +75,9 @@ export class RecentSelectionManager {
       return null;
     }
     return window.localStorage;
-  }
+  };
 
-  private normalizeList(values: unknown, limit = this.options.limit): string[] {
+  private normalizeList = (values: unknown, limit = this.options.limit): string[] => {
     if (!Array.isArray(values)) {
       return [];
     }
@@ -93,13 +93,13 @@ export class RecentSelectionManager {
       }
     }
     return deduped;
-  }
+  };
 
-  private normalizeValue(value: unknown): string | null {
+  private normalizeValue = (value: unknown): string | null => {
     if (typeof value !== 'string') {
       return null;
     }
     const normalized = value.trim();
     return normalized.length > 0 ? normalized : null;
-  }
+  };
 }

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

@@ -0,0 +1,6 @@
+import type { ChatPageProps } from '@/features/chat/components/layout/chat-page-shell';
+import { NcpChatPage } from '@/features/chat/pages/ncp-chat-page';
+
+export function ChatPage({ view }: ChatPageProps) {
+  return <NcpChatPage view={view} />;
+}