@nextclaw/ui 0.15.0 → 0.15.2

package/src/features/chat/features/conversation/components/__tests__/session-conversation-area.test.tsx

@@ -50,7 +50,7 @@ const mocks = vi.hoisted(() => {
     modelOptions: [],
     selectedSession: null as null | {
       activityPreview?: {
-        state: 'running' | 'completed' | 'failed' | 'idle';
+        state: 'running' | 'completed' | 'failed' | 'cancelled' | 'idle';
         statusText?: string;
         replyText?: string;
       };
@@ -260,7 +260,7 @@ describe('SessionConversationArea input boundary', () => {
     mocks.inputQuery.selectedSession = {
       activityPreview: {
         state: 'failed',
-        statusText: '运行出错：Invalid API Key',
+        statusText: 'Run failed: Invalid API Key',
       },
       status: 'idle',
     };
@@ -269,6 +269,21 @@ describe('SessionConversationArea input boundary', () => {
 
     expect(screen.getByTestId('conversation-bottom-slot')).toBeTruthy();
     expect(screen.getByText(/出错了|Something went wrong/)).toBeTruthy();
-    expect(screen.getByText('运行出错：Invalid API Key')).toBeTruthy();
+    expect(screen.getByText('Run failed: Invalid API Key')).toBeTruthy();
+  });
+
+  it('does not surface user-cancelled previews as conversation errors', () => {
+    mocks.inputQuery.selectedSession = {
+      activityPreview: {
+        state: 'cancelled',
+        statusText: 'Run interrupted: User stopped the current run.',
+      },
+      status: 'idle',
+    };
+
+    renderArea('session-1');
+
+    expect(screen.queryByTestId('conversation-bottom-slot')).toBeNull();
+    expect(screen.queryByText(/出错了|Something went wrong/)).toBeNull();
   });
 });

package/src/features/chat/features/conversation/components/session-conversation-input.tsx

@@ -417,7 +417,8 @@ export const SessionConversationInput = memo(function SessionConversationInput(p
           },
         })}
         toolbar={{
-          selects: toolbarSelects,
+          selects: [],
+          trailingSelects: toolbarSelects,
           accessories: [
             {
               key: 'attach',

package/src/features/chat/features/message/components/__tests__/chat-inline-panel-app-card.test.tsx

@@ -32,8 +32,13 @@ vi.mock('@/app/presenters/app.presenter', () => ({
 }));
 
 vi.mock('@/features/panel-apps', () => ({
+  PANEL_APP_IFRAME_SANDBOX: 'allow-scripts allow-forms allow-modals allow-popups allow-popups-to-escape-sandbox allow-downloads allow-pointer-lock allow-presentation',
   findPanelAppEntryByDisplayId: (entries: Array<{ appId: string; id: string; title: string }>, value: string) =>
     entries.find((entry) => [entry.appId, entry.id, entry.title].includes(value)) ?? null,
+  focusPanelAppIframe: (iframe: HTMLIFrameElement | null) => {
+    iframe?.focus({ preventScroll: true });
+    iframe?.contentWindow?.focus();
+  },
   usePanelApps: () => mocks.panelApps,
 }));
 
@@ -68,7 +73,6 @@ it('renders inline panel apps as bounded card-mode iframes with an expand action
   expect(iframe.getAttribute('src')).toBe(
     '/api/panel-apps/weather-card/content?nextclawDisplayMode=card&nextclawPlacement=inline',
   );
-  expect(iframe.getAttribute('scrolling')).toBe('auto');
 
   fireEvent.click(screen.getByLabelText('chatPanelCardExpand'));
 
@@ -80,6 +84,23 @@ it('renders inline panel apps as bounded card-mode iframes with an expand action
   }));
 });
 
+it('focuses the inline panel app iframe when the pointer enters it', () => {
+  render(<ChatInlinePanelAppCard panelApp={{
+    appId: 'weather-card',
+    title: 'Weather',
+  }} />);
+
+  const iframe = screen.getByTitle('Weather') as HTMLIFrameElement;
+  const iframeFocus = vi.spyOn(iframe, 'focus');
+  const contentWindowFocus = vi.spyOn(iframe.contentWindow!, 'focus').mockImplementation(() => undefined);
+
+  fireEvent.pointerOver(iframe);
+
+  expect(iframe.getAttribute('tabindex')).toBe('0');
+  expect(iframeFocus).toHaveBeenCalledWith({ preventScroll: true });
+  expect(contentWindowFocus).toHaveBeenCalled();
+});
+
 it('can render inline panel apps without a side-panel expand action', () => {
   render(
     <ChatInlinePanelAppCard

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

@@ -497,7 +497,7 @@ it("renders context compaction as an in-flow divider instead of a chat message",
         updatedAt: "2026-05-05T12:00:00.000Z",
       },
     },
-    parts: [{ type: "text", text: "较早上下文已自动压缩" }],
+    parts: [{ type: "text", text: "Earlier context was auto-compacted" }],
   } satisfies NcpMessage;
 
   const { getByText } = render(

package/src/features/chat/features/message/components/chat-inline-panel-app-card.tsx

@@ -2,13 +2,17 @@ import { useEffect, useId, useMemo, useRef } from 'react';
 import type { ChatPanelAppCardViewModel } from '@nextclaw/agent-chat-ui';
 import { AppWindow, Maximize2 } from 'lucide-react';
 import { getPresenter } from '@/app/presenters/app.presenter';
-import { findPanelAppEntryByDisplayId, usePanelApps } from '@/features/panel-apps';
+import {
+  PANEL_APP_IFRAME_SANDBOX,
+  findPanelAppEntryByDisplayId,
+  focusPanelAppIframe,
+  usePanelApps,
+} from '@/features/panel-apps';
 import { createPanelAppRightPanelResourceTarget } from '@/features/right-panel-resources';
 import {
   createInlinePanelAppCardUrl,
   createFallbackPanelAppContentPath,
   createInlinePanelAppTab,
-  PANEL_APP_INLINE_IFRAME_SANDBOX,
 } from '@/features/chat/features/message/utils/chat-inline-panel-app-card.utils';
 import { useDocBrowser } from '@/shared/components/doc-browser';
 import { IconActionButton } from '@/shared/components/ui/actions/icon-action-button';
@@ -98,7 +102,7 @@ export function ChatInlinePanelAppCard({
         </div>
         {showExpandAction ? (
           <IconActionButton
-            className="h-7 w-7 rounded-md text-muted-foreground hover:bg-accent hover:text-accent-foreground"
+            size="md"
             icon={<Maximize2 className="h-3.5 w-3.5" />}
             label={t('chatPanelCardExpand')}
             onClick={openExpanded}
@@ -113,8 +117,9 @@ export function ChatInlinePanelAppCard({
           key={iframeInstanceId}
           src={cardUrl}
           title={title}
-          sandbox={PANEL_APP_INLINE_IFRAME_SANDBOX}
-          scrolling="auto"
+          sandbox={PANEL_APP_IFRAME_SANDBOX}
+          tabIndex={0}
+          onPointerOver={() => focusPanelAppIframe(iframeRef.current)}
           className="h-full w-full border-0 bg-card"
         />
       </div>

package/src/features/chat/features/message/utils/chat-inline-panel-app-card.utils.ts

@@ -4,17 +4,6 @@ import {
 } from '@/features/right-panel-resources';
 import type { DocBrowserTab } from '@/shared/components/doc-browser/doc-browser-context';
 
-export const PANEL_APP_INLINE_IFRAME_SANDBOX = [
-  'allow-scripts',
-  'allow-forms',
-  'allow-modals',
-  'allow-popups',
-  'allow-popups-to-escape-sandbox',
-  'allow-downloads',
-  'allow-pointer-lock',
-  'allow-presentation',
-].join(' ');
-
 const PANEL_APP_INLINE_CARD_SEARCH_PARAMS = {
   nextclawDisplayMode: 'card',
   nextclawPlacement: 'inline',

package/src/features/chat/features/ncp/hooks/__tests__/use-ncp-agent-runtime.test.tsx

@@ -217,7 +217,15 @@ describe("useNcpAgentRuntime", () => {
       await result.current.abort();
     });
 
-    expect(client.abort).toHaveBeenCalledWith({ sessionId: "session-running" });
+    expect(client.abort).toHaveBeenCalledWith({
+      sessionId: "session-running",
+      runId: undefined,
+      reason: {
+        code: "abort-error",
+        message: "User stopped the current run.",
+        details: { source: "chat-ui" },
+      },
+    });
   });
 
   it("clears the local running state when the live stream publishes message.abort", async () => {
@@ -243,6 +251,20 @@ describe("useNcpAgentRuntime", () => {
       expect(result.current.activeRunId).toBe("run-1");
     });
 
+    await act(async () => {
+      await result.current.abort();
+    });
+
+    expect(client.abort).toHaveBeenCalledWith({
+      sessionId: "session-running",
+      runId: "run-1",
+      reason: {
+        code: "abort-error",
+        message: "User stopped the current run.",
+        details: { source: "chat-ui" },
+      },
+    });
+
     await act(async () => {
       await client.emit({
         type: NcpEventType.MessageAbort,

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/__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-2 focus-visible:ring-primary/40"
+                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}
     />
   );
 }