@nextclaw/ui 0.15.0 → 0.15.1

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'
 ]);
 

package/src/features/chat/features/workspace/components/__tests__/chat-session-workspace-file-preview.test.tsx

@@ -189,6 +189,23 @@ describe("ChatSessionWorkspaceFilePreview rendering", () => {
     ).toBe("js");
   });
 
+  it("keeps HTML files in the source preview when preview viewer is automatic", () => {
+    mockTextRead({
+      resolvedPath: "/tmp/example.html",
+      text: "<!doctype html><h1>Hello</h1>",
+    });
+    renderWorkspaceFilePreview({
+      file: {
+        label: "example.html",
+        path: "/tmp/example.html",
+        viewMode: "preview",
+      },
+    });
+
+    expect(screen.queryByTestId("workspace-html-preview")).toBeNull();
+    expect(screen.getByTestId("file-code-surface")).toBeTruthy();
+  });
+
   it("renders HTML files through an unrestricted server content iframe when rendered preview is requested", () => {
     mockTextRead({
       resolvedPath: "/tmp/example.html",
@@ -212,6 +229,23 @@ describe("ChatSessionWorkspaceFilePreview rendering", () => {
     expect(screen.queryByTestId("file-code-surface")).toBeNull();
   });
 
+  it("keeps HTML files in the source preview when source is requested", () => {
+    mockTextRead({
+      resolvedPath: "/tmp/example.html",
+      text: "<!doctype html><h1>Hello</h1>",
+    });
+    renderWorkspaceFilePreview({
+      file: {
+        path: "/tmp/example.html",
+        previewViewer: "source",
+        viewMode: "preview",
+      },
+    });
+
+    expect(screen.queryByTestId("workspace-html-preview")).toBeNull();
+    expect(screen.getByTestId("file-code-surface")).toBeTruthy();
+  });
+
   it("falls back to the source preview when rendered is requested for a non-HTML file", () => {
     mockTextRead({ resolvedPath: "/tmp/example.txt", text: "plain text" });
     renderWorkspaceFilePreview({

package/src/features/chat/features/workspace/components/chat-session-workspace-file-preview.tsx

@@ -24,17 +24,11 @@ function inferPreviewKind(params: {
   return /\.mdx?$/i.test(params.path) ? "markdown" : "text";
 }
 
-function isHtmlFilePath(path: string): boolean {
-  return /\.html?$/i.test(path);
-}
-
 function resolveFilePreviewViewer(params: {
   path: string;
   viewer?: ChatFilePreviewViewer | null;
 }): "source" | "rendered" {
-  return params.viewer === "rendered" && isHtmlFilePath(params.path)
-    ? "rendered"
-    : "source";
+  return params.viewer === "rendered" && /\.html?$/i.test(params.path) ? "rendered" : "source";
 }
 
 function buildPreviewBlock(params: {

package/src/features/chat/features/workspace/utils/__tests__/chat-workspace-panel-view-model.utils.test.ts

@@ -158,4 +158,50 @@ describe("buildWorkspaceTabsViewModel", () => {
       active: true,
     });
   });
+
+  it("keeps distinct source and rendered file tabs without collapsing by path", () => {
+    const renderedTab = {
+      key: "parent::preview:rendered::demo.html",
+      parentSessionKey: "parent-1",
+      path: "demo.html",
+      label: "demo.html",
+      viewMode: "preview" as const,
+      previewViewer: "rendered" as const,
+    };
+    const sourceTab = {
+      key: "parent::preview::demo.html",
+      parentSessionKey: "parent-1",
+      path: "demo.html",
+      label: "demo.html",
+      viewMode: "preview" as const,
+      previewViewer: "source" as const,
+    };
+
+    const tabs = buildWorkspaceTabsViewModel({
+      resolvedChildTabs: [],
+      activeSideChatDraft: null,
+      workspaceFileTabs: [sourceTab, renderedTab],
+      sessionCronJobCount: 0,
+      activeSelection: {
+        kind: "file",
+        file: sourceTab,
+      },
+      optimisticReadAtBySessionKey: {},
+      onSelectSession: vi.fn(),
+      onSelectFile: vi.fn(),
+      onCloseFile: vi.fn(),
+      onSelectCronJobs: vi.fn(),
+    });
+
+    expect(tabs).toEqual([
+      expect.objectContaining({
+        key: "file:parent::preview::demo.html",
+        active: true,
+      }),
+      expect.objectContaining({
+        key: "file:parent::preview:rendered::demo.html",
+        active: false,
+      }),
+    ]);
+  });
 });

package/src/features/chat/managers/__tests__/chat-thread.manager.test.ts

@@ -331,6 +331,53 @@ describe('ChatThreadManager', () => {
 });
 
 describe('ChatThreadManager workspace file tabs', () => {
+  it('opens HTML previews in source mode when the viewer is omitted or auto', () => {
+    const manager = new ChatThreadManager(
+      createUiManager(),
+      {} as ConstructorParameters<typeof ChatThreadManager>[1],
+    );
+
+    manager.openFilePreview({
+      path: 'demo.html',
+      label: 'demo.html',
+      viewMode: 'preview',
+    });
+
+    expect(useChatThreadStore.getState().snapshot).toMatchObject({
+      activeWorkspaceFileKey: 'parent-session-1::preview::demo.html',
+      workspaceFileTabs: [
+        {
+          key: 'parent-session-1::preview::demo.html',
+          path: 'demo.html',
+          viewMode: 'preview',
+          previewViewer: 'source',
+        },
+      ],
+    });
+
+    manager.openFilePreview({
+      path: 'auto.html',
+      label: 'auto.html',
+      viewMode: 'preview',
+      previewViewer: 'auto',
+    });
+
+    expect(useChatThreadStore.getState().snapshot).toMatchObject({
+      activeWorkspaceFileKey: 'parent-session-1::preview::auto.html',
+      workspaceFileTabs: [
+        {
+          key: 'parent-session-1::preview::auto.html',
+          path: 'auto.html',
+          viewMode: 'preview',
+          previewViewer: 'source',
+        },
+        expect.objectContaining({
+          key: 'parent-session-1::preview::demo.html',
+        }),
+      ],
+    });
+  });
+
   it('keeps source and rendered previews for the same file as separate workspace tabs', () => {
     const manager = new ChatThreadManager(
       createUiManager(),

package/src/features/chat/managers/chat-thread.manager.ts

@@ -111,14 +111,20 @@ export class ChatThreadManager {
       return null;
     }
     const normalizedParentSessionKey = parentSessionKey?.trim() || null;
-    const tabViewIdentity = action.viewMode === 'preview' && action.previewViewer === 'rendered' ? 'preview:rendered' : action.viewMode;
+    const previewViewer =
+      action.viewMode === 'preview' &&
+      action.previewViewer !== 'rendered' &&
+      (action.previewViewer === 'auto' || action.previewViewer === 'source' || /\.html?$/i.test(normalizedPath))
+        ? 'source'
+        : action.previewViewer ?? null;
+    const tabViewIdentity = action.viewMode === 'preview' && previewViewer === 'rendered' ? 'preview:rendered' : action.viewMode;
     return {
       key: `${normalizedParentSessionKey ?? 'draft'}::${tabViewIdentity}::${normalizedPath}`,
       parentSessionKey: normalizedParentSessionKey,
       path: normalizedPath,
       label: action.label?.trim() || null,
       viewMode: action.viewMode,
-      previewViewer: action.previewViewer ?? null,
+      previewViewer,
       line: action.line ?? null,
       column: action.column ?? null,
       rawText: action.rawText ?? null,