@nextclaw/ui 0.15.1 → 0.15.3

package/src/features/chat/features/message/utils/chat-message-texts.utils.ts

@@ -32,6 +32,71 @@ export function buildChatMessageAdapterTexts(
   };
 }
 
+function buildBuiltInToolStatusLabels() {
+  return {
+    directory: {
+      running: t("chatToolDirectoryRunning"),
+      success: t("chatToolDirectorySuccess"),
+      error: t("chatToolDirectoryError"),
+      cancelled: t("chatToolDirectoryCancelled"),
+    },
+    web: {
+      running: t("chatToolWebRunning"),
+      success: t("chatToolWebSuccess"),
+      error: t("chatToolWebError"),
+      cancelled: t("chatToolWebCancelled"),
+    },
+    message: {
+      running: t("chatToolMessageRunning"),
+      success: t("chatToolMessageSuccess"),
+      error: t("chatToolMessageError"),
+      cancelled: t("chatToolMessageCancelled"),
+    },
+    session: {
+      running: t("chatToolSessionRunning"),
+      success: t("chatToolSessionSuccess"),
+      error: t("chatToolSessionError"),
+      cancelled: t("chatToolSessionCancelled"),
+    },
+    agent: {
+      running: t("chatToolAgentRunning"),
+      success: t("chatToolAgentSuccess"),
+      error: t("chatToolAgentError"),
+      cancelled: t("chatToolAgentCancelled"),
+    },
+    memory: {
+      running: t("chatToolMemoryRunning"),
+      success: t("chatToolMemorySuccess"),
+      error: t("chatToolMemoryError"),
+      cancelled: t("chatToolMemoryCancelled"),
+    },
+    schedule: {
+      running: t("chatToolScheduleRunning"),
+      success: t("chatToolScheduleSuccess"),
+      error: t("chatToolScheduleError"),
+      cancelled: t("chatToolScheduleCancelled"),
+    },
+    system: {
+      running: t("chatToolSystemRunning"),
+      success: t("chatToolSystemSuccess"),
+      error: t("chatToolSystemError"),
+      cancelled: t("chatToolSystemCancelled"),
+    },
+    image: {
+      running: t("chatToolImageRunning"),
+      success: t("chatToolImageSuccess"),
+      error: t("chatToolImageError"),
+      cancelled: t("chatToolImageCancelled"),
+    },
+    display: {
+      running: t("chatToolDisplayRunning"),
+      success: t("chatToolDisplaySuccess"),
+      error: t("chatToolDisplayError"),
+      cancelled: t("chatToolDisplayCancelled"),
+    },
+  };
+}
+
 export function buildChatMessageTexts(
   language: string,
 ): ChatMessageTexts {
@@ -42,8 +107,41 @@ export function buildChatMessageTexts(
     copyMessageLabel: t("chatMessageCopy"),
     copiedMessageLabel: t("chatMessageCopied"),
     typingLabel: t("chatTyping"),
+    reasoningCharacterCountTemplates: {
+      inProgress: t("chatReasoningInProgressCharacterCount"),
+      completed: t("chatReasoningCompletedCharacterCount"),
+    },
+    toolStatusLabels: {
+      terminal: {
+        running: t("chatToolTerminalRunning"),
+        success: t("chatToolTerminalSuccess"),
+        error: t("chatToolTerminalError"),
+        cancelled: t("chatToolTerminalCancelled"),
+      },
+      fileRead: {
+        running: t("chatToolFileReadRunning"),
+        success: t("chatToolFileReadSuccess"),
+        error: t("chatToolFileReadError"),
+        cancelled: t("chatToolFileReadCancelled"),
+      },
+      fileEdit: {
+        running: t("chatToolFileEditRunning"),
+        success: t("chatToolFileEditSuccess"),
+        error: t("chatToolFileEditError"),
+        cancelled: t("chatToolFileEditCancelled"),
+      },
+      search: {
+        running: t("chatToolSearchRunning"),
+        success: t("chatToolSearchSuccess"),
+        error: t("chatToolSearchError"),
+        cancelled: t("chatToolSearchCancelled"),
+      },
+      builtIn: buildBuiltInToolStatusLabels(),
+    },
     attachmentOpenLabel: t("chatAttachmentOpen"),
     attachmentAttachedLabel: t("chatAttachmentAttached"),
+    attachmentExpandLabel: t("chatAttachmentExpand"),
+    attachmentCloseLabel: t("chatAttachmentClosePreview"),
     attachmentCategoryLabels: {
       archive: t("chatAttachmentCategoryArchive"),
       audio: t("chatAttachmentCategoryAudio"),
@@ -56,5 +154,45 @@ export function buildChatMessageTexts(
       sheet: t("chatAttachmentCategorySheet"),
       video: t("chatAttachmentCategoryVideo"),
     },
+    toolActivitySegmentTemplates: {
+      read: {
+        one: t("chatToolActivityReadOne"),
+        other: t("chatToolActivityReadOther"),
+      },
+      edit: {
+        one: t("chatToolActivityEditOne"),
+        other: t("chatToolActivityEditOther"),
+      },
+      directory: {
+        one: t("chatToolActivityDirectoryOne"),
+        other: t("chatToolActivityDirectoryOther"),
+      },
+      search: {
+        one: t("chatToolActivitySearchOne"),
+        other: t("chatToolActivitySearchOther"),
+      },
+      bash: {
+        one: t("chatToolActivityBashOne"),
+        other: t("chatToolActivityBashOther"),
+      },
+      web: {
+        one: t("chatToolActivityWebOne"),
+        other: t("chatToolActivityWebOther"),
+      },
+      agent: {
+        one: t("chatToolActivityAgentOne"),
+        other: t("chatToolActivityAgentOther"),
+      },
+      panel: {
+        one: t("chatToolActivityPanelOne"),
+        other: t("chatToolActivityPanelOther"),
+      },
+      other: {
+        one: t("chatToolActivityOtherOne"),
+        other: t("chatToolActivityOtherOther"),
+      },
+    },
+    toolActivityFailedLabel: t("chatProcessSummaryFailed"),
+    toolActivityCancelledLabel: t("chatProcessSummaryCancelled"),
   };
 }

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

@@ -0,0 +1,116 @@
+import { fireEvent, render, screen } from "@testing-library/react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { ChatSidebarProjectGroups } from "@/features/chat/features/session/components/chat-sidebar-project-groups";
+import { useChatSessionListStore } from "@/features/chat/stores/chat-session-list.store";
+
+const mocks = vi.hoisted(() => ({
+  createSession: vi.fn(),
+  toggleProjectCollapsed: vi.fn(),
+  toggleProjectPinned: vi.fn(),
+}));
+
+vi.mock("@/features/chat/components/providers/chat-presenter.provider", () => ({
+  usePresenter: () => ({
+    chatSessionListManager: mocks,
+  }),
+}));
+
+const projectGroup = {
+  projectRoot: "/tmp/analysis-project",
+  projectName: "analysis-project",
+  items: [
+    {
+      session: {
+        key: "session:analysis",
+        createdAt: "2026-07-12T00:00:00.000Z",
+        updatedAt: "2026-07-12T00:00:00.000Z",
+        sessionType: "native",
+        sessionTypeMutable: false,
+        messageCount: 1,
+      },
+    },
+  ],
+  latestUpdatedAt: 1,
+  isPinned: false,
+};
+
+function renderProjectGroups(isPinned = false) {
+  return render(
+    <ChatSidebarProjectGroups
+      groups={[{ ...projectGroup, isPinned }]}
+      defaultSessionType="native"
+      sessionTypeOptions={[
+        { value: "native", label: "Native", icon: null, ready: true },
+      ]}
+      renderSessionItem={() => <div>Project session</div>}
+    />,
+  );
+}
+
+describe("ChatSidebarProjectGroups", () => {
+  beforeEach(() => {
+    mocks.createSession.mockReset();
+    mocks.toggleProjectCollapsed.mockReset();
+    mocks.toggleProjectPinned.mockReset();
+    useChatSessionListStore.setState({
+      snapshot: {
+        ...useChatSessionListStore.getState().snapshot,
+        collapsedProjectRoots: [],
+        selectedSessionKey: "session:current",
+      },
+    });
+    mocks.toggleProjectCollapsed.mockImplementation((projectRoot: string) => {
+      useChatSessionListStore.getState().setSnapshot({
+        collapsedProjectRoots: [projectRoot],
+      });
+    });
+  });
+
+  it("keeps the project header as the full-width folder row and collapses its sessions", () => {
+    renderProjectGroups();
+
+    const header = screen.getByLabelText("Collapse project");
+    expect(header.parentElement?.className).toContain("h-10");
+    expect(header.parentElement?.className).toContain("hover:bg-gray-200/60");
+    expect(header.parentElement?.className).not.toContain("focus-within:bg");
+    expect(screen.getByText("analysis-project").nextElementSibling?.tagName).toBe("svg");
+
+    fireEvent.click(header);
+
+    expect(mocks.toggleProjectCollapsed).toHaveBeenCalledWith(
+      "/tmp/analysis-project",
+    );
+    expect(useChatSessionListStore.getState().snapshot.selectedSessionKey).toBe(
+      "session:current",
+    );
+    expect(screen.queryByText("Project session")).toBeNull();
+  });
+
+  it("keeps project creation and pinning in one trailing action cluster", () => {
+    renderProjectGroups();
+
+    fireEvent.click(screen.getByLabelText("Pin project"));
+
+    expect(mocks.toggleProjectPinned).toHaveBeenCalledWith(
+      "/tmp/analysis-project",
+    );
+    expect(screen.getByLabelText("New Task · analysis-project")).not.toBeNull();
+  });
+
+  it("uses the same pin control to show and clear the project pin state", () => {
+    renderProjectGroups(true);
+
+    const unpinButton = screen.getByLabelText("Unpin project");
+    const pinIcon = unpinButton.querySelector("svg");
+
+    expect(pinIcon?.getAttribute("class")).toContain("fill-current");
+    expect(pinIcon?.getAttribute("class")).toContain("text-foreground");
+    expect(document.querySelectorAll("svg.fill-current")).toHaveLength(1);
+
+    fireEvent.click(unpinButton);
+
+    expect(mocks.toggleProjectPinned).toHaveBeenCalledWith(
+      "/tmp/analysis-project",
+    );
+  });
+});

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

@@ -1,11 +1,13 @@
 import { useMemo, useState, type ReactNode } from 'react';
-import { Plus } from 'lucide-react';
+import { ChevronDown, ChevronRight, Folder, Pin, Plus } from 'lucide-react';
+import { usePresenter } from '@/features/chat/components/providers/chat-presenter.provider';
 import { ChatSessionTypeMenu } from "@/features/chat/features/session-type/components/chat-session-type-menu";
 import { Popover, PopoverContent, PopoverTrigger } from '@/shared/components/ui/popover';
 import { IconActionButton } from '@/shared/components/ui/actions/icon-action-button';
 import type { ChatSessionTypeOption } from "@/features/chat/features/session-type/utils/chat-session-type.utils";
 import type { NcpSessionListItemView } from '@/features/chat/features/ncp/hooks/use-ncp-session-list-view';
 import type { ChatSidebarProjectGroup } from '@/features/chat/features/session/utils/chat-sidebar-session-groups.utils';
+import { useChatSessionListStore } from '@/features/chat/stores/chat-session-list.store';
 import { t } from '@/shared/lib/i18n';
 
 export type { ChatSidebarProjectGroup };
@@ -17,7 +19,6 @@ type ChatSidebarProjectGroupsProps = {
   defaultSessionType: string;
   sessionTypeOptions: SessionTypeOption[];
   renderSessionItem: (item: NcpSessionListItemView) => ReactNode;
-  onCreateSession: (sessionType: string, projectRoot: string) => void;
 };
 
 function resolveProjectGroupDefaultSessionType(
@@ -31,7 +32,11 @@ function resolveProjectGroupDefaultSessionType(
 }
 
 export function ChatSidebarProjectGroups(props: ChatSidebarProjectGroupsProps) {
-  const { groups, defaultSessionType, sessionTypeOptions, renderSessionItem, onCreateSession } = props;
+  const { groups, defaultSessionType, sessionTypeOptions, renderSessionItem } = props;
+  const presenter = usePresenter();
+  const collapsedProjectRoots = useChatSessionListStore(
+    (state) => state.snapshot.collapsedProjectRoots,
+  );
   const [openProjectRoot, setOpenProjectRoot] = useState<string | null>(null);
   const preferredSessionType = useMemo(
     () => resolveProjectGroupDefaultSessionType(defaultSessionType, sessionTypeOptions),
@@ -43,62 +48,119 @@ export function ChatSidebarProjectGroups(props: ChatSidebarProjectGroupsProps) {
     <div className="space-y-3">
       {groups.map((group) => {
         const actionLabel = `${t('chatSidebarNewTask')} · ${group.projectName}`;
+        const isCollapsed = collapsedProjectRoots.includes(group.projectRoot);
+        const pinLabel = t(
+          group.isPinned ? 'chatSidebarUnpinProject' : 'chatSidebarPinProject',
+        );
 
         return (
           <div key={group.projectRoot}>
-            <div className="flex items-center justify-between gap-2 px-2 py-0.5">
-              <div className="flex min-w-0 items-center gap-1.5">
-                <div
-                  className="truncate text-[11px] font-medium uppercase tracking-wider text-muted-foreground"
+            <div className="group/project relative h-10 rounded-lg px-2 text-muted-foreground transition-colors hover:bg-gray-200/60 hover:text-gray-900">
+              <button
+                type="button"
+                aria-expanded={!isCollapsed}
+                aria-label={t(
+                  isCollapsed
+                    ? 'chatSidebarExpandProject'
+                    : 'chatSidebarCollapseProject',
+                )}
+                className="flex h-full w-full min-w-0 items-center gap-1.5 pr-14 text-left focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-border"
+                onClick={() =>
+                  presenter.chatSessionListManager.toggleProjectCollapsed(
+                    group.projectRoot,
+                  )
+                }
+              >
+                <Folder className="h-3.5 w-3.5 shrink-0" aria-hidden="true" />
+                <span
+                  className="truncate text-[11px] font-medium uppercase tracking-wider"
                   title={group.projectRoot}
                 >
                   {group.projectName}
-                </div>
+                </span>
+                {isCollapsed ? (
+                  <ChevronRight
+                    className="h-3.5 w-3.5 shrink-0"
+                    aria-hidden="true"
+                  />
+                ) : (
+                  <ChevronDown
+                    className="h-3.5 w-3.5 shrink-0"
+                    aria-hidden="true"
+                  />
+                )}
                 <span className="shrink-0 text-[10px] text-muted-foreground/70">
                   {group.items.length}
                 </span>
-              </div>
-              {supportsSessionTypeChoice ? (
-                <Popover
-                  open={openProjectRoot === group.projectRoot}
-                  onOpenChange={(nextOpen) => {
-                    setOpenProjectRoot(nextOpen ? group.projectRoot : null);
-                  }}
-                >
-                  <PopoverTrigger asChild>
-                    <IconActionButton
-                      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-gray-200/60 hover:text-gray-900"
-                    />
-                  </PopoverTrigger>
-                  <PopoverContent
-                    align="end"
-                    className="w-56 rounded-2xl border border-border bg-popover p-1.5 text-popover-foreground shadow-[0_24px_60px_-28px_rgba(15,23,42,0.38)]"
+              </button>
+              <div className="pointer-events-none absolute right-2 top-1/2 flex -translate-y-1/2 items-center opacity-0 transition-opacity group-hover/project:pointer-events-auto group-hover/project:opacity-100 focus-within:pointer-events-auto focus-within:opacity-100">
+                {supportsSessionTypeChoice ? (
+                  <Popover
+                    open={openProjectRoot === group.projectRoot}
+                    onOpenChange={(nextOpen) => {
+                      setOpenProjectRoot(nextOpen ? group.projectRoot : null);
+                    }}
                   >
-                    <ChatSessionTypeMenu
-                      options={sessionTypeOptions}
-                      selectedSessionType={preferredSessionType}
-                      onSelect={(sessionType) => {
-                        onCreateSession(sessionType, group.projectRoot);
-                        setOpenProjectRoot(null);
-                      }}
-                    />
-                  </PopoverContent>
-                </Popover>
-              ) : (
+                    <PopoverTrigger asChild>
+                      <IconActionButton
+                        icon={<Plus className="h-3.5 w-3.5" />}
+                        label={actionLabel}
+                      />
+                    </PopoverTrigger>
+                    <PopoverContent
+                      align="end"
+                      className="w-56 rounded-2xl border border-border bg-popover p-1.5 text-popover-foreground shadow-[0_24px_60px_-28px_rgba(15,23,42,0.38)]"
+                    >
+                      <ChatSessionTypeMenu
+                        options={sessionTypeOptions}
+                        selectedSessionType={preferredSessionType}
+                        onSelect={(sessionType) => {
+                          presenter.chatSessionListManager.createSession(
+                            sessionType,
+                            group.projectRoot,
+                          );
+                          setOpenProjectRoot(null);
+                        }}
+                      />
+                    </PopoverContent>
+                  </Popover>
+                ) : (
+                  <IconActionButton
+                    icon={<Plus className="h-3.5 w-3.5" />}
+                    label={actionLabel}
+                    onClick={() =>
+                      presenter.chatSessionListManager.createSession(
+                        preferredSessionType,
+                        group.projectRoot,
+                      )
+                    }
+                  />
+                )}
                 <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-gray-200/60 hover:text-gray-900"
-                  onClick={() => onCreateSession(preferredSessionType, group.projectRoot)}
+                  icon={
+                    <Pin
+                      className={
+                        group.isPinned
+                          ? 'h-3.5 w-3.5 fill-current text-foreground'
+                          : 'h-3.5 w-3.5'
+                      }
+                    />
+                  }
+                  label={pinLabel}
+                  tooltipSide="right"
+                  onClick={() =>
+                    presenter.chatSessionListManager.toggleProjectPinned(
+                      group.projectRoot,
+                    )
+                  }
                 />
-              )}
-            </div>
-            <div className="space-y-0.5 pl-2">
-              {group.items.map(renderSessionItem)}
+              </div>
             </div>
+            {isCollapsed ? null : (
+              <div className="mt-0.5 space-y-0.5 pl-2">
+                {group.items.map(renderSessionItem)}
+              </div>
+            )}
           </div>
         );
       })}

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

@@ -22,6 +22,7 @@ export function ChatSidebarSessionEntry(props: {
   draftLabel: string;
   savingSessionKey: string | null;
   sessionTypeOptions: ChatSessionTypeOption[];
+  isPinned: boolean;
   sessionTitle: (session: SessionEntryView) => string;
   onSelectSession: (sessionKey: string) => void;
   onOpenChildSessions: (
@@ -32,6 +33,7 @@ export function ChatSidebarSessionEntry(props: {
   onDraftLabelChange: (value: string) => void;
   onSaveSessionLabel: (session: SessionEntryView) => void;
   onCancelEditingSessionLabel: () => void;
+  onTogglePinned: () => void;
 }) {
   const {
     item,
@@ -43,6 +45,7 @@ export function ChatSidebarSessionEntry(props: {
     draftLabel,
     savingSessionKey,
     sessionTypeOptions,
+    isPinned,
     sessionTitle,
     onSelectSession,
     onOpenChildSessions,
@@ -50,6 +53,7 @@ export function ChatSidebarSessionEntry(props: {
     onDraftLabelChange,
     onSaveSessionLabel,
     onCancelEditingSessionLabel,
+    onTogglePinned,
   } = props;
   const { session, runStatus } = item;
   const active = selectedSessionKey === session.key;
@@ -80,6 +84,7 @@ export function ChatSidebarSessionEntry(props: {
       })}
       runStatus={runStatus}
       context={resolveSessionContextView(session, sessionTypeOptions)}
+      isPinned={isPinned}
       title={sessionTitle(session)}
       previewText={previewText}
       trailingText={formatSessionListTime(
@@ -104,6 +109,7 @@ export function ChatSidebarSessionEntry(props: {
       onDraftLabelChange={onDraftLabelChange}
       onSave={() => onSaveSessionLabel(session)}
       onCancel={onCancelEditingSessionLabel}
+      onTogglePinned={onTogglePinned}
     />
   );
 }