@nextclaw/ui 0.12.4 → 0.12.6

package/src/components/chat/chat-child-session-panel.tsx

@@ -1,13 +1,23 @@
-import { ArrowLeft, Loader2, X } from 'lucide-react';
-import { ChatMessageListContainer } from '@/components/chat/containers/chat-message-list.container';
-import { useNcpChildSessionTabsView } from '@/components/chat/ncp/session-conversation/use-ncp-child-session-tabs-view';
-import { useNcpSessionConversation } from '@/components/chat/ncp/session-conversation/use-ncp-session-conversation';
-import type { ChatChildSessionTab } from '@/components/chat/stores/chat-thread.store';
-import { AgentIdentityAvatar } from '@/components/common/agent-identity';
-import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs';
-import { t } from '@/lib/i18n';
-import { cn } from '@/lib/utils';
-import type { ChatToolActionViewModel } from '@nextclaw/agent-chat-ui';
+import { useEffect, useRef } from "react";
+import { ArrowLeft, Loader2, X } from "lucide-react";
+import { useStickyBottomScroll } from "@nextclaw/agent-chat-ui";
+import { ChatMessageListContainer } from "@/components/chat/containers/chat-message-list.container";
+import {
+  useNcpChildSessionTabsView,
+  type ResolvedChildSessionTab,
+} from "@/components/chat/ncp/session-conversation/use-ncp-child-session-tabs-view";
+import { useNcpSessionConversation } from "@/components/chat/ncp/session-conversation/use-ncp-session-conversation";
+import {
+  shouldShowUnreadSessionIndicator,
+  useChatSessionListStore,
+} from "@/components/chat/stores/chat-session-list.store";
+import { usePresenter } from "@/components/chat/presenter/chat-presenter-context";
+import type { ChatChildSessionTab } from "@/components/chat/stores/chat-thread.store";
+import { AgentIdentityAvatar } from "@/components/common/agent-identity";
+import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
+import { t } from "@/lib/i18n";
+import { cn } from "@/lib/utils";
+import type { ChatToolActionViewModel } from "@nextclaw/agent-chat-ui";
 
 type ChatChildSessionPanelProps = {
   tabs: readonly ChatChildSessionTab[];
@@ -27,39 +37,84 @@ function ChildSessionPanelConversation({
 }) {
   const agent = useNcpSessionConversation(sessionKey);
   const messages = agent.visibleMessages;
+  const scrollRef = useRef<HTMLDivElement>(null);
+  const { onScroll } = useStickyBottomScroll({
+    scrollRef,
+    resetKey: sessionKey,
+    isLoading: agent.isHydrating,
+    hasContent: messages.length > 0,
+    contentVersion: messages[messages.length - 1] ?? null,
+    stickyThresholdPx: 20,
+  });
 
-  if (agent.isHydrating) {
-    return (
-      <div className="flex h-full items-center justify-center text-sm text-gray-500">
-        <Loader2 className="mr-2 h-4 w-4 animate-spin" />
-        {t('chatChildSessionLoading')}
-      </div>
-    );
-  }
+  return (
+    <div
+      ref={scrollRef}
+      onScroll={onScroll}
+      className="h-full overflow-y-auto custom-scrollbar"
+    >
+      {agent.isHydrating ? (
+        <div className="flex h-full items-center justify-center text-sm text-gray-500">
+          <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+          {t("chatChildSessionLoading")}
+        </div>
+      ) : agent.hydrateError ? (
+        <div className="px-4 py-5 text-sm text-rose-600">
+          {agent.hydrateError.message}
+        </div>
+      ) : messages.length === 0 && !agent.isRunning ? (
+        <div className="px-4 py-5 text-sm text-gray-500">
+          {t("chatChildSessionEmpty")}
+        </div>
+      ) : (
+        <div className="px-4 py-5">
+          <ChatMessageListContainer
+            messages={messages}
+            isSending={agent.isRunning}
+            onToolAction={onToolAction}
+          />
+        </div>
+      )}
+    </div>
+  );
+}
 
-  if (agent.hydrateError) {
-    return (
-      <div className="px-4 py-5 text-sm text-rose-600">
-        {agent.hydrateError.message}
-      </div>
-    );
-  }
+function ChildSessionPanelMetaChip({ value }: { value: string }) {
+  return (
+    <span className="inline-flex max-w-full items-center rounded-full border border-gray-200/80 bg-gray-50/90 px-2.5 py-1 text-[11px] font-medium text-gray-600">
+      <span className="truncate">{value}</span>
+    </span>
+  );
+}
 
-  if (messages.length === 0 && !agent.isRunning) {
-    return (
-      <div className="px-4 py-5 text-sm text-gray-500">
-        {t('chatChildSessionEmpty')}
-      </div>
-    );
+function ChildSessionPanelMetaStrip({ tab }: { tab: ResolvedChildSessionTab }) {
+  const metaItems = [
+    tab.sessionTypeLabel,
+    tab.preferredModel,
+    tab.projectName,
+  ].filter((value): value is string => Boolean(value?.trim()));
+
+  if (metaItems.length === 0 && !tab.projectRoot) {
+    return null;
   }
 
   return (
-    <div className="px-4 py-5">
-      <ChatMessageListContainer
-        messages={messages}
-        isSending={agent.isRunning}
-        onToolAction={onToolAction}
-      />
+    <div className="mt-3 space-y-2">
+      {metaItems.length > 0 ? (
+        <div className="flex flex-wrap gap-1.5">
+          {metaItems.map((item) => (
+            <ChildSessionPanelMetaChip key={item} value={item} />
+          ))}
+        </div>
+      ) : null}
+      {tab.projectRoot ? (
+        <div
+          title={tab.projectRoot}
+          className="truncate rounded-xl border border-gray-200/70 bg-gray-50/80 px-2.5 py-2 font-mono text-[11px] text-gray-500"
+        >
+          {tab.projectRoot}
+        </div>
+      ) : null}
     </div>
   );
 }
@@ -72,14 +127,35 @@ export function ChatChildSessionPanel({
   onBackToParent,
   onToolAction,
 }: ChatChildSessionPanelProps) {
+  const presenter = usePresenter();
   const resolvedTabs = useNcpChildSessionTabsView(tabs);
+  const readUpdatedAtBySessionKey = useChatSessionListStore(
+    (state) => state.readUpdatedAtBySessionKey,
+  );
   const activeTab =
     resolvedTabs.find((tab) => tab.sessionKey === activeSessionKey) ??
     resolvedTabs[0] ??
     null;
-  const hasParentSession = resolvedTabs.some((tab) => Boolean(tab.parentSessionKey));
+  const activeTabSessionKey = activeTab?.sessionKey ?? null;
+  const activeTabUpdatedAt = activeTab?.updatedAt?.trim() ?? null;
+  const hasParentSession = resolvedTabs.some((tab) =>
+    Boolean(tab.parentSessionKey),
+  );
   const shouldShowTabs = resolvedTabs.length > 1;
 
+  useEffect(() => {
+    const syncActiveTabReadState = () => {
+      if (!activeTabSessionKey || !activeTabUpdatedAt) {
+        return;
+      }
+      presenter.chatSessionListManager.markSessionRead(
+        activeTabSessionKey,
+        activeTabUpdatedAt,
+      );
+    };
+    syncActiveTabReadState();
+  }, [activeTabSessionKey, activeTabUpdatedAt, presenter]);
+
   if (!activeTab) {
     return null;
   }
@@ -93,18 +169,18 @@ export function ChatChildSessionPanel({
               type="button"
               onClick={onBackToParent}
               className={cn(
-                'inline-flex items-center gap-1 text-xs font-medium text-gray-600 transition-colors hover:text-gray-900',
-                !hasParentSession && 'pointer-events-none opacity-0',
+                "inline-flex items-center gap-1 text-xs font-medium text-gray-600 transition-colors hover:text-gray-900",
+                !hasParentSession && "pointer-events-none opacity-0",
               )}
             >
               <ArrowLeft className="h-3.5 w-3.5" />
-              <span>{t('chatBackToParent')}</span>
+              <span>{t("chatBackToParent")}</span>
             </button>
             <button
               type="button"
               onClick={onClose}
               className="rounded-full border border-gray-200/80 p-1.5 text-gray-500 transition-colors hover:bg-gray-100 hover:text-gray-900"
-              aria-label={t('chatChildSessionClosePanel')}
+              aria-label={t("chatChildSessionClosePanel")}
             >
               <X className="h-4 w-4" />
             </button>
@@ -126,32 +202,52 @@ export function ChatChildSessionPanel({
             <div className="mt-3 overflow-x-auto custom-scrollbar">
               <Tabs value={activeSessionKey} onValueChange={onSelectSession}>
                 <TabsList className="h-auto min-w-max justify-start gap-1.5 rounded-none bg-transparent p-0 text-gray-500">
-                  {resolvedTabs.map((tab) => (
-                    <TabsTrigger
-                      key={tab.sessionKey}
-                      value={tab.sessionKey}
-                      className="gap-2 rounded-full border border-gray-200/80 bg-white/85 px-2.5 py-1.5 text-xs font-medium text-gray-600 shadow-none hover:border-primary/30 hover:text-primary data-[state=active]:border-primary/30 data-[state=active]:bg-primary-50/70 data-[state=active]:text-primary data-[state=active]:shadow-sm"
-                    >
-                      {tab.agentId ? (
-                        <AgentIdentityAvatar
-                          agentId={tab.agentId}
-                          className="h-4 w-4 shrink-0"
-                        />
-                      ) : null}
-                      <span className="max-w-[132px] truncate">{tab.title}</span>
-                    </TabsTrigger>
-                  ))}
+                  {resolvedTabs.map((tab) => {
+                    const showUnreadDot = shouldShowUnreadSessionIndicator({
+                      active: tab.sessionKey === activeSessionKey,
+                      updatedAt: tab.updatedAt,
+                      readUpdatedAt: readUpdatedAtBySessionKey[tab.sessionKey],
+                      runStatus: tab.runStatus,
+                    });
+                    return (
+                      <TabsTrigger
+                        key={tab.sessionKey}
+                        value={tab.sessionKey}
+                        className="gap-2 rounded-full border border-gray-200/80 bg-white/85 px-2.5 py-1.5 text-xs font-medium text-gray-600 shadow-none hover:border-primary/30 hover:text-primary data-[state=active]:border-primary/30 data-[state=active]:bg-primary-50/70 data-[state=active]:text-primary data-[state=active]:shadow-sm"
+                      >
+                        {tab.agentId ? (
+                          <AgentIdentityAvatar
+                            agentId={tab.agentId}
+                            className="h-4 w-4 shrink-0"
+                          />
+                        ) : null}
+                        <span className="max-w-[132px] truncate">
+                          {tab.title}
+                        </span>
+                        {showUnreadDot ? (
+                          <span
+                            aria-label={t("chatSessionUnread")}
+                            className="h-2 w-2 shrink-0 rounded-full bg-primary"
+                          />
+                        ) : null}
+                      </TabsTrigger>
+                    );
+                  })}
                 </TabsList>
               </Tabs>
             </div>
           ) : null}
+          <ChildSessionPanelMetaStrip tab={activeTab} />
         </div>
 
-        <div className="flex-1 min-h-0 overflow-y-auto custom-scrollbar">
+        <div className="flex-1 min-h-0">
           {resolvedTabs.map((tab) => (
             <div
               key={tab.sessionKey}
-              className={cn(tab.sessionKey === activeSessionKey ? 'block' : 'hidden')}
+              className={cn(
+                "h-full",
+                tab.sessionKey === activeSessionKey ? "block" : "hidden",
+              )}
             >
               <ChildSessionPanelConversation
                 sessionKey={tab.sessionKey}

package/src/components/chat/chat-page-runtime.test.ts

@@ -6,7 +6,9 @@ import {
   resolveSelectedModelValue,
   resolveSelectedThinkingLevelValue
 } from '@/components/chat/chat-session-preference-governance';
-import { shouldRefreshDraftSessionId } from '@/components/chat/ncp/NcpChatPage';
+import {
+  shouldClearPendingProjectRootOverride
+} from '@/components/chat/ncp/NcpChatPage';
 
 const modelOptions = [
   {
@@ -155,33 +157,28 @@ describe('resolveSelectedModelValue', () => {
   });
 });
 
-describe('shouldRefreshDraftSessionId', () => {
-  it('does not replace the initial draft session id on first mount', () => {
+describe('shouldClearPendingProjectRootOverride', () => {
+  it('does not clear an unrelated session project override', () => {
     expect(
-      shouldRefreshDraftSessionId({
-        previousSelectedSessionKey: undefined,
-        nextSelectedSessionKey: null
+      shouldClearPendingProjectRootOverride({
+        pendingProjectRoot: '/tmp/project-alpha',
+        pendingProjectRootSessionKey: 'draft-project-alpha',
+        sessionKey: 'session-existing',
+        selectedSessionProjectRoot: '/tmp/project-alpha'
       })
     ).toBe(false);
   });
 
-  it('replaces the draft session id after leaving an existing session', () => {
+  it('clears the override only after the bound session reflects the same project root', () => {
     expect(
-      shouldRefreshDraftSessionId({
-        previousSelectedSessionKey: 'session-1',
-        nextSelectedSessionKey: null
+      shouldClearPendingProjectRootOverride({
+        pendingProjectRoot: '/tmp/project-alpha',
+        pendingProjectRootSessionKey: 'draft-after-refresh',
+        sessionKey: 'draft-after-refresh',
+        selectedSessionProjectRoot: '/tmp/project-alpha'
       })
     ).toBe(true);
   });
-
-  it('does not replace the draft session id while staying on the same session', () => {
-    expect(
-      shouldRefreshDraftSessionId({
-        previousSelectedSessionKey: 'session-1',
-        nextSelectedSessionKey: 'session-1'
-      })
-    ).toBe(false);
-  });
 });
 
 describe('resolveRecentSessionPreferredModel', () => {

package/src/components/chat/chat-session-preference-sync.test.ts

@@ -3,6 +3,7 @@ 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';
 
 vi.mock('@/api/ncp-session', () => ({
   updateNcpSession: vi.fn(async () => ({
@@ -29,6 +30,12 @@ describe('ChatSessionPreferenceSync', () => {
         selectedSessionKey: null
       }
     }));
+    useChatThreadStore.setState((state) => ({
+      snapshot: {
+        ...state.snapshot,
+        canDeleteSession: false
+      }
+    }));
     vi.clearAllMocks();
   });
 
@@ -46,6 +53,12 @@ describe('ChatSessionPreferenceSync', () => {
         selectedSessionKey: 'session-1'
       }
     }));
+    useChatThreadStore.setState((state) => ({
+      snapshot: {
+        ...state.snapshot,
+        canDeleteSession: true
+      }
+    }));
 
     const sync = new ChatSessionPreferenceSync(updateNcpSession);
     sync.syncSelectedSessionPreferences();

package/src/components/chat/chat-session-preference-sync.ts

@@ -1,6 +1,7 @@
 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';
 
 type QueuedSessionPreferenceSync = {
   sessionKey: string;
@@ -30,8 +31,9 @@ export class ChatSessionPreferenceSync {
   syncSelectedSessionPreferences = (): void => {
     const inputSnapshot = useChatInputStore.getState().snapshot;
     const sessionSnapshot = useChatSessionListStore.getState().snapshot;
+    const threadSnapshot = useChatThreadStore.getState().snapshot;
     const sessionKey = sessionSnapshot.selectedSessionKey;
-    if (!sessionKey) {
+    if (!sessionKey || !threadSnapshot.canDeleteSession) {
       return;
     }
 
@@ -44,15 +46,15 @@ export class ChatSessionPreferenceSync {
     });
   };
 
-  private enqueue(next: QueuedSessionPreferenceSync): void {
+  private enqueue = (next: QueuedSessionPreferenceSync): void => {
     this.queued = next;
     if (this.inFlight) {
       return;
     }
     this.startFlush();
-  }
+  };
 
-  private startFlush(): void {
+  private startFlush = (): void => {
     this.inFlight = this.flush()
       .catch((error) => {
         console.error(`Failed to sync chat session preferences: ${String(error)}`);
@@ -63,13 +65,13 @@ export class ChatSessionPreferenceSync {
           this.startFlush();
         }
       });
-  }
+  };
 
-  private async flush(): Promise<void> {
+  private flush = async (): Promise<void> => {
     while (this.queued) {
       const current = this.queued;
       this.queued = null;
       await this.updateSession(current.sessionKey, current.patch);
     }
-  }
+  };
 }