@nextclaw/ui 0.14.4 → 0.15.1

package/src/features/chat/features/ncp/hooks/__tests__/use-ncp-session-list-view.test.tsx

@@ -0,0 +1,74 @@
+import { renderHook } from "@testing-library/react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { useNcpSessionListView } from "@/features/chat/features/ncp/hooks/use-ncp-session-list-view";
+import { useChatSessionListStore } from "@/features/chat/stores/chat-session-list.store";
+import type { NcpSessionSummaryView } from "@/shared/lib/api";
+
+const mocks = vi.hoisted(() => ({
+  sessions: [] as NcpSessionSummaryView[],
+}));
+
+vi.mock("@/features/chat/features/ncp/hooks/use-ncp-session-queries", () => ({
+  useNcpSessions: () => ({
+    data: {
+      sessions: mocks.sessions,
+      total: mocks.sessions.length,
+    },
+    isLoading: false,
+  }),
+}));
+
+function createSummary(
+  sessionId: string,
+  label: string,
+): NcpSessionSummaryView {
+  return {
+    sessionId,
+    status: "idle",
+    updatedAt: "2026-06-18T00:00:00.000Z",
+    lastMessageAt: "2026-06-18T00:00:00.000Z",
+    messageCount: 1,
+    metadata: {
+      label,
+      session_type: "native",
+    },
+  };
+}
+
+describe("useNcpSessionListView", () => {
+  beforeEach(() => {
+    mocks.sessions = [
+      createSummary("session:alpha", "Alpha Task"),
+      createSummary("session:beta", "Beta Task"),
+    ];
+    useChatSessionListStore.setState({
+      snapshot: {
+        ...useChatSessionListStore.getState().snapshot,
+        query: "",
+      },
+    });
+  });
+
+  it("uses the sidebar query by default", () => {
+    useChatSessionListStore.getState().setSnapshot({ query: "Alpha" });
+
+    const { result } = renderHook(() => useNcpSessionListView());
+
+    expect(result.current.items.map((item) => item.session.key)).toEqual([
+      "session:alpha",
+    ]);
+  });
+
+  it("can override the hidden sidebar query for header switching", () => {
+    useChatSessionListStore.getState().setSnapshot({ query: "Alpha" });
+
+    const { result } = renderHook(() =>
+      useNcpSessionListView({ query: "" }),
+    );
+
+    expect(result.current.items.map((item) => item.session.key)).toEqual([
+      "session:alpha",
+      "session:beta",
+    ]);
+  });
+});

package/src/features/chat/features/ncp/hooks/use-ncp-session-list-view.ts

@@ -22,8 +22,9 @@ function shouldShowSessionInSidebar(session: SessionEntryView): boolean {
   return session.isPromotedChildSession === true;
 }
 
-export function useNcpSessionListView(params: { limit?: number } = {}) {
-  const query = useChatSessionListStore((state) => state.snapshot.query);
+export function useNcpSessionListView(params: { limit?: number; query?: string | null } = {}) {
+  const storedQuery = useChatSessionListStore((state) => state.snapshot.query);
+  const query = params.query ?? storedQuery;
   const sessionsQuery = useNcpSessions({ limit: params.limit ?? 200 });
 
   const items = useMemo<NcpSessionListItemView[]>(() => {

package/src/features/chat/features/session/components/chat-sidebar-project-groups.tsx

@@ -70,7 +70,7 @@ export function ChatSidebarProjectGroups(props: ChatSidebarProjectGroupsProps) {
                       icon={<Plus className="h-3.5 w-3.5" />}
                       label={actionLabel}
                       tooltip={false}
-                      className="h-7 w-7 shrink-0 rounded-lg text-muted-foreground hover:bg-accent hover:text-accent-foreground"
+                      className="h-7 w-7 shrink-0 rounded-lg text-muted-foreground hover:bg-gray-200/60 hover:text-gray-900"
                     />
                   </PopoverTrigger>
                   <PopoverContent
@@ -91,7 +91,7 @@ export function ChatSidebarProjectGroups(props: ChatSidebarProjectGroupsProps) {
                 <IconActionButton
                   icon={<Plus className="h-3.5 w-3.5" />}
                   label={actionLabel}
-                  className="h-7 w-7 shrink-0 rounded-lg text-muted-foreground hover:bg-accent hover:text-accent-foreground"
+                  className="h-7 w-7 shrink-0 rounded-lg text-muted-foreground hover:bg-gray-200/60 hover:text-gray-900"
                   onClick={() => onCreateSession(preferredSessionType, group.projectRoot)}
                 />
               )}

package/src/features/chat/features/session/components/chat-sidebar-session-item.tsx

@@ -230,7 +230,7 @@ export function ChatSidebarSessionItem({
       className={cn(
         'w-full rounded-xl px-3 py-2.5 text-left transition-all text-[13px]',
         active
-          ? 'bg-gray-200 text-gray-900 font-semibold shadow-sm'
+          ? 'bg-gray-200/80 text-gray-900 font-semibold shadow-sm'
           : 'text-gray-700 hover:bg-gray-200/60 hover:text-gray-900'
       )}
     >

package/src/features/chat/features/session/components/session-header/__tests__/chat-session-header-actions.test.tsx

@@ -92,7 +92,9 @@ describe('ChatSessionHeaderActions', () => {
     await user.click(screen.getByRole('button', { name: 'View Metadata' }));
 
     expect(screen.getByRole('dialog', { name: 'Session Metadata' })).toBeTruthy();
-    expect(screen.getByText(/codex_thread_id/)).toBeTruthy();
+    const metadataBlock = screen.getByText(/codex_thread_id/);
+    expect(metadataBlock.className).toContain('bg-muted/60');
+    expect(metadataBlock.className).toContain('text-foreground');
     expect(screen.getByText(/thread-123/)).toBeTruthy();
   });
 

package/src/features/chat/features/session/components/session-header/chat-session-metadata-dialog.tsx

@@ -36,7 +36,7 @@ export function ChatSessionMetadataDialog({
           </DialogDescription>
         </DialogHeader>
         <div className="px-5 pb-5 pt-4">
-          <pre className="max-h-[60vh] overflow-auto rounded-lg border border-gray-200 bg-gray-950 p-4 text-xs leading-relaxed text-gray-100">
+          <pre className="max-h-[60vh] overflow-auto rounded-lg border border-border bg-muted/60 p-4 font-mono text-xs leading-6 text-foreground shadow-inner custom-scrollbar">
             {formatSessionMetadata(metadata)}
           </pre>
         </div>

package/src/features/chat/features/session/components/session-header/chat-session-title-switcher.tsx

@@ -0,0 +1,294 @@
+import { useMemo, useState } from "react";
+import {
+  Check,
+  ChevronDown,
+  Loader2,
+  MessageSquareText,
+  Search,
+} from "lucide-react";
+import { usePresenter } from "@/features/chat/components/providers/chat-presenter.provider";
+import {
+  useNcpSessionListView,
+  type NcpSessionListItemView,
+} from "@/features/chat/features/ncp/hooks/use-ncp-session-list-view";
+import { SessionContextIconNode } from "@/features/chat/features/session/components/session-context-icon";
+import { SessionRunBadge } from "@/features/chat/features/session/components/session-run-badge";
+import {
+  formatSessionListTime,
+  sessionActivityPreviewText,
+  sessionDisplayName,
+} from "@/features/chat/features/session/utils/chat-session-display.utils";
+import { sortSessionItemsByActivityAtDesc } from "@/features/chat/features/session/utils/chat-sidebar-session-groups.utils";
+import { resolveSessionContextView } from "@/features/chat/features/session/utils/session-context.utils";
+import {
+  buildSessionTypeOptions,
+  type ChatSessionTypeOption,
+} from "@/features/chat/features/session-type/utils/chat-session-type.utils";
+import {
+  shouldShowUnreadSessionIndicator,
+  useChatSessionListStore,
+} from "@/features/chat/stores/chat-session-list.store";
+import { useChatQueryStore } from "@/features/chat/stores/ncp-chat-query.store";
+import { useViewportLayoutStore } from "@/app/stores/viewport-layout.store";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/shared/components/ui/popover";
+import { Input } from "@/shared/components/ui/input";
+import { t } from "@/shared/lib/i18n";
+import { cn } from "@/shared/lib/utils";
+
+const SWITCHER_TRIGGER_CLASS =
+  "group inline-flex min-w-0 max-w-full items-center gap-1.5 rounded-md px-1.5 py-1 text-sm font-medium text-foreground transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/40";
+
+function ChatSessionTitle({ title }: { title: string }) {
+  return (
+    <span className="text-sm font-medium text-foreground truncate">
+      {title}
+    </span>
+  );
+}
+
+function ChatSessionTitleSwitcherEmptyState({ label }: { label: string }) {
+  return (
+    <div className="flex items-center gap-2 px-3 py-4 text-xs text-muted-foreground">
+      <MessageSquareText className="h-4 w-4 shrink-0 text-muted-foreground/55" />
+      <span>{label}</span>
+    </div>
+  );
+}
+
+function ChatSessionTitleSwitcherLoadingState() {
+  return (
+    <div className="flex items-center gap-2 px-3 py-4 text-xs text-muted-foreground">
+      <Loader2 className="h-4 w-4 shrink-0 animate-spin" />
+      <span>{t("sessionsLoading")}</span>
+    </div>
+  );
+}
+
+function ChatSessionSwitchItem({
+  item,
+  selectedSessionKey,
+  optimisticReadAtBySessionKey,
+  sessionTypeOptions,
+  onSelect,
+}: {
+  item: NcpSessionListItemView;
+  selectedSessionKey: string | null;
+  optimisticReadAtBySessionKey: Record<string, string>;
+  sessionTypeOptions: ChatSessionTypeOption[];
+  onSelect: (sessionKey: string) => void;
+}) {
+  const { session, runStatus } = item;
+  const active = selectedSessionKey === session.key;
+  const optimisticReadAt = optimisticReadAtBySessionKey[session.key];
+  const effectiveReadAt =
+    optimisticReadAt && session.readAt
+      ? optimisticReadAt.localeCompare(session.readAt) > 0
+        ? optimisticReadAt
+        : session.readAt
+      : (optimisticReadAt ?? session.readAt);
+  const shouldShowUnread = shouldShowUnreadSessionIndicator({
+    active,
+    lastMessageAt: session.lastMessageAt,
+    readAt: effectiveReadAt,
+    runStatus,
+  });
+  const previewText =
+    sessionActivityPreviewText(session) ??
+    session.projectName ??
+    session.projectRoot ??
+    `${session.messageCount}`;
+  const trailingText = formatSessionListTime(
+    session.lastMessageAt ?? session.createdAt,
+  );
+  const sessionContext = resolveSessionContextView(session, sessionTypeOptions);
+
+  return (
+    <button
+      type="button"
+      aria-current={active ? "page" : undefined}
+      className={cn(
+        "flex w-full min-w-0 items-start gap-2 rounded-lg px-2.5 py-2 text-left transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/40",
+        active
+          ? "bg-accent text-accent-foreground"
+          : "text-popover-foreground hover:bg-accent/70",
+      )}
+      onClick={() => onSelect(session.key)}
+    >
+      <span className="mt-0.5 flex h-4 w-4 shrink-0 items-center justify-center">
+        {active ? (
+          <Check className="h-3.5 w-3.5" />
+        ) : shouldShowUnread ? (
+          <span
+            aria-label={t("chatSessionUnread")}
+            className="h-2 w-2 rounded-full bg-primary"
+          />
+        ) : null}
+      </span>
+      <span className="min-w-0 flex-1">
+        <span className="flex min-w-0 items-center gap-1.5">
+          <span className="min-w-0 truncate text-[13px] font-medium">
+            {sessionDisplayName(session)}
+          </span>
+          {sessionContext.label ? (
+            <span className="shrink-0 rounded-full border border-border/70 px-1.5 py-0.5 text-[10px] font-semibold leading-none text-muted-foreground">
+              {sessionContext.label}
+            </span>
+          ) : null}
+          {sessionContext.icon ? (
+            <span className="inline-flex h-[1.125rem] w-[1.125rem] shrink-0 items-center justify-center text-muted-foreground">
+              <SessionContextIconNode icon={sessionContext.icon} />
+            </span>
+          ) : null}
+        </span>
+        <span className="mt-0.5 flex min-w-0 items-center gap-2 text-[11px] text-muted-foreground">
+          <span className="min-w-0 truncate">{previewText}</span>
+          <span className="shrink-0">{trailingText}</span>
+        </span>
+      </span>
+      {runStatus ? (
+        <span className="mt-0.5 shrink-0">
+          <SessionRunBadge status={runStatus} />
+        </span>
+      ) : null}
+    </button>
+  );
+}
+
+function ChatSessionTitleSwitcherPopover({
+  selectedSessionKey,
+  title,
+}: {
+  selectedSessionKey: string | null;
+  title: string;
+}) {
+  const presenter = usePresenter();
+  const [isOpen, setIsOpen] = useState(false);
+  const [searchQuery, setSearchQuery] = useState("");
+  const optimisticReadAtBySessionKey = useChatSessionListStore(
+    (state) => state.optimisticReadAtBySessionKey,
+  );
+  const sessionTypesData = useChatQueryStore(
+    (state) => state.snapshot.sessionTypesQuery?.data ?? null,
+  );
+  const { isLoading, items } = useNcpSessionListView({ query: searchQuery });
+  const sortedItems = useMemo(
+    () => sortSessionItemsByActivityAtDesc(items),
+    [items],
+  );
+  const sessionTypeOptions = useMemo(
+    () => buildSessionTypeOptions(sessionTypesData?.options ?? []),
+    [sessionTypesData?.options],
+  );
+
+  const selectSession = (sessionKey: string) => {
+    setIsOpen(false);
+    setSearchQuery("");
+    if (sessionKey === selectedSessionKey) {
+      return;
+    }
+    presenter.chatSessionListManager.selectSession(sessionKey);
+  };
+  const updateOpen = (open: boolean) => {
+    setIsOpen(open);
+    if (!open) {
+      setSearchQuery("");
+    }
+  };
+
+  return (
+    <Popover open={isOpen} onOpenChange={updateOpen}>
+      <PopoverTrigger asChild>
+        <button
+          type="button"
+          aria-label={`${t("chatSessionSwitch")}: ${title}`}
+          aria-expanded={isOpen}
+          className={SWITCHER_TRIGGER_CLASS}
+        >
+          <span className="min-w-0 truncate">{title}</span>
+          <ChevronDown
+            className={cn(
+              "h-3.5 w-3.5 shrink-0 text-muted-foreground transition-transform group-hover:text-accent-foreground",
+              isOpen ? "rotate-180" : null,
+            )}
+          />
+        </button>
+      </PopoverTrigger>
+      <PopoverContent
+        align="start"
+        className="w-[22rem] max-w-[calc(100vw-2rem)] p-0"
+      >
+        <div className="space-y-2 border-b border-border px-3 py-2">
+          <div className="text-[11px] font-medium uppercase tracking-wider text-muted-foreground/75">
+            {t("chatSessionSwitcherTitle")}
+          </div>
+          <div className="relative">
+            <Search className="pointer-events-none absolute left-2.5 top-1/2 h-3.5 w-3.5 -translate-y-1/2 text-muted-foreground/65" />
+            <Input
+              value={searchQuery}
+              onChange={(event) => setSearchQuery(event.target.value)}
+              placeholder={t("chatSearchSessionPlaceholder")}
+              aria-label={t("chatSearchSessionPlaceholder")}
+              className="h-8 rounded-lg bg-background pl-8 pr-2 text-xs"
+              autoFocus
+            />
+          </div>
+        </div>
+        <div className="max-h-80 overflow-y-auto p-1.5">
+          {isLoading ? (
+            <ChatSessionTitleSwitcherLoadingState />
+          ) : sortedItems.length > 0 ? (
+            <div className="space-y-1">
+              {sortedItems.map((item) => (
+                <ChatSessionSwitchItem
+                  key={item.session.key}
+                  item={item}
+                  selectedSessionKey={selectedSessionKey}
+                  optimisticReadAtBySessionKey={optimisticReadAtBySessionKey}
+                  sessionTypeOptions={sessionTypeOptions}
+                  onSelect={selectSession}
+                />
+              ))}
+            </div>
+          ) : (
+            <ChatSessionTitleSwitcherEmptyState
+              label={
+                searchQuery.trim()
+                  ? t("chatSessionSwitcherNoResults")
+                  : t("sessionsEmpty")
+              }
+            />
+          )}
+        </div>
+      </PopoverContent>
+    </Popover>
+  );
+}
+
+export function ChatSessionTitleSwitcher({
+  layoutMode,
+  selectedSessionKey,
+  title,
+}: {
+  layoutMode: "desktop" | "mobile";
+  selectedSessionKey: string | null;
+  title: string;
+}) {
+  const isSidebarCollapsed = useViewportLayoutStore(
+    (state) => state.isSidebarCollapsed,
+  );
+
+  if (layoutMode !== "desktop" || !isSidebarCollapsed) {
+    return <ChatSessionTitle title={title} />;
+  }
+
+  return (
+    <ChatSessionTitleSwitcherPopover
+      selectedSessionKey={selectedSessionKey}
+      title={title}
+    />
+  );
+}

package/src/features/chat/features/session/utils/__tests__/chat-session-display.utils.test.ts

@@ -5,7 +5,7 @@ import {
   sessionActivityPreviewText,
   sessionDisplayName,
   sessionMatchesQuery
-} from '../chat-session-display.utils';
+} from '@/features/chat/features/session/utils/chat-session-display.utils';
 
 function createSession(overrides: Partial<SessionEntryView> = {}): SessionEntryView {
   return {
@@ -88,6 +88,20 @@ describe('chat-session-display', () => {
     ).toBe('最终回复内容');
   });
 
+  it('does not show cancelled activity as ordinary session preview text', () => {
+    expect(
+      sessionActivityPreviewText(
+        createSession({
+          activityPreview: {
+            state: 'cancelled',
+            statusText: 'Run interrupted: User stopped the current run.',
+            timestamp: '2026-05-16T01:00:00.000Z'
+          }
+        })
+      )
+    ).toBeNull();
+  });
+
   it('formats today activity as time like WeChat session lists', () => {
     expect(
       formatSessionListTime(

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

@@ -105,8 +105,8 @@ describe('adaptNcpSessionSummary', () => {
         metadata: {
           last_activity_preview: {
             state: 'completed',
-            replyText: '已经整理好方案',
-            statusText: '工具调用完成',
+            replyText: 'Plan is ready',
+            statusText: 'Tool call completed',
             timestamp: '2026-05-16T01:00:00.000Z',
           },
         },
@@ -115,8 +115,28 @@ describe('adaptNcpSessionSummary', () => {
 
     expect(adapted.activityPreview).toEqual({
       state: 'completed',
-      replyText: '已经整理好方案',
-      statusText: '工具调用完成',
+      replyText: 'Plan is ready',
+      statusText: 'Tool call completed',
+      timestamp: '2026-05-16T01:00:00.000Z',
+    });
+  });
+
+  it('maps cancelled session activity preview metadata into the session entry', () => {
+    const adapted = adaptNcpSessionSummary(
+      createSummary({
+        metadata: {
+          last_activity_preview: {
+            state: 'cancelled',
+            statusText: 'Run interrupted: User stopped the current run.',
+            timestamp: '2026-05-16T01:00:00.000Z',
+          },
+        },
+      }),
+    );
+
+    expect(adapted.activityPreview).toEqual({
+      state: 'cancelled',
+      statusText: 'Run interrupted: User stopped the current run.',
       timestamp: '2026-05-16T01:00:00.000Z',
     });
   });

package/src/features/chat/features/session/utils/chat-session-display.utils.ts

@@ -15,6 +15,9 @@ export function sessionActivityPreviewText(session: SessionEntryView): string |
   if (!preview) {
     return null;
   }
+  if (preview.state === 'cancelled') {
+    return null;
+  }
   if (preview.state === 'failed' || preview.state === 'running') {
     return preview.statusText ?? preview.replyText ?? null;
   }

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

@@ -18,6 +18,7 @@ const SESSION_ACTIVITY_PREVIEW_STATE_SET = new Set<SessionActivityPreviewView['s
   'running',
   'completed',
   'failed',
+  'cancelled',
   'idle'
 ]);