@nextclaw/ui 0.11.23 → 0.12.1

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

@@ -1,38 +1,88 @@
-import { useMemo } from 'react';
-import { useQuery } from '@tanstack/react-query';
 import { ArrowLeft, Loader2, X } from 'lucide-react';
-import { fetchNcpSessionMessages } from '@/api/ncp-session';
 import { ChatMessageListContainer } from '@/components/chat/containers/chat-message-list.container';
-import { useChatThreadStore } from '@/components/chat/stores/chat-thread.store';
+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';
 
 type ChatChildSessionPanelProps = {
-  sessionKey: string;
-  title?: string | null;
+  tabs: readonly ChatChildSessionTab[];
+  activeSessionKey: string;
+  onSelectSession: (sessionKey: string) => void;
   onClose: () => void;
   onBackToParent: () => void;
   onToolAction?: (action: ChatToolActionViewModel) => void;
 };
 
-export function ChatChildSessionPanel({
+function ChildSessionPanelConversation({
   sessionKey,
-  title,
+  onToolAction,
+}: {
+  sessionKey: string;
+  onToolAction?: (action: ChatToolActionViewModel) => void;
+}) {
+  const agent = useNcpSessionConversation(sessionKey);
+  const messages = agent.visibleMessages;
+
+  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>
+    );
+  }
+
+  if (agent.hydrateError) {
+    return (
+      <div className="px-4 py-5 text-sm text-rose-600">
+        {agent.hydrateError.message}
+      </div>
+    );
+  }
+
+  if (messages.length === 0 && !agent.isRunning) {
+    return (
+      <div className="px-4 py-5 text-sm text-gray-500">
+        {t('chatChildSessionEmpty')}
+      </div>
+    );
+  }
+
+  return (
+    <div className="px-4 py-5">
+      <ChatMessageListContainer
+        messages={messages}
+        isSending={agent.isRunning}
+        onToolAction={onToolAction}
+      />
+    </div>
+  );
+}
+
+export function ChatChildSessionPanel({
+  tabs,
+  activeSessionKey,
+  onSelectSession,
   onClose,
   onBackToParent,
   onToolAction,
 }: ChatChildSessionPanelProps) {
-  const detailParentSessionKey = useChatThreadStore(
-    (state) => state.snapshot.childSessionDetailParentSessionKey,
-  );
-  const query = useQuery({
-    queryKey: ['ncp-session-messages', sessionKey, 'child-panel'],
-    queryFn: () => fetchNcpSessionMessages(sessionKey, 300),
-    staleTime: 5_000,
-  });
+  const resolvedTabs = useNcpChildSessionTabsView(tabs);
+  const activeTab =
+    resolvedTabs.find((tab) => tab.sessionKey === activeSessionKey) ??
+    resolvedTabs[0] ??
+    null;
+  const hasParentSession = resolvedTabs.some((tab) => Boolean(tab.parentSessionKey));
+  const shouldShowTabs = resolvedTabs.length > 1;
 
-  const messages = query.data?.messages ?? [];
-  const headerTitle = useMemo(() => title?.trim() || sessionKey, [sessionKey, title]);
+  if (!activeTab) {
+    return null;
+  }
 
   return (
     <aside className="hidden md:flex md:w-[24rem] lg:w-[28rem] shrink-0 border-l border-gray-200/70 bg-white/90 backdrop-blur-sm">
@@ -43,56 +93,72 @@ export function ChatChildSessionPanel({
               type="button"
               onClick={onBackToParent}
               className={cn(
-                'inline-flex items-center gap-1 text-xs font-medium text-gray-600 hover:text-gray-900',
-                !detailParentSessionKey && '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>Back to parent</span>
+              <span>{t('chatBackToParent')}</span>
             </button>
             <button
               type="button"
               onClick={onClose}
-              className="rounded-md border border-gray-200 p-1 text-gray-500 transition-colors hover:bg-gray-100 hover:text-gray-900"
-              aria-label="Close child session panel"
+              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')}
             >
               <X className="h-4 w-4" />
             </button>
           </div>
-          <div className="mt-2">
-            <div className="text-[11px] font-semibold uppercase tracking-[0.16em] text-gray-400">
-              Child Session
+          {!shouldShowTabs ? (
+            <div className="mt-3 flex min-w-0 items-center gap-2 text-sm font-semibold text-gray-900">
+              {activeTab.agentId ? (
+                <AgentIdentityAvatar
+                  agentId={activeTab.agentId}
+                  className="h-5 w-5 shrink-0"
+                />
+              ) : null}
+              <span className="truncate" title={activeTab.sessionKey}>
+                {activeTab.title}
+              </span>
             </div>
-            <div className="mt-1 text-sm font-semibold text-gray-900">
-              {headerTitle}
+          ) : null}
+          {shouldShowTabs ? (
+            <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>
+                  ))}
+                </TabsList>
+              </Tabs>
             </div>
-            <div className="mt-1 text-[11px] text-gray-500">{sessionKey}</div>
-          </div>
+          ) : null}
         </div>
 
         <div className="flex-1 min-h-0 overflow-y-auto custom-scrollbar">
-          {query.isLoading ? (
-            <div className="flex h-full items-center justify-center text-sm text-gray-500">
-              <Loader2 className="mr-2 h-4 w-4 animate-spin" />
-              Loading child session
-            </div>
-          ) : query.isError ? (
-            <div className="px-4 py-5 text-sm text-rose-600">
-              {(query.error as Error).message}
-            </div>
-          ) : messages.length === 0 ? (
-            <div className="px-4 py-5 text-sm text-gray-500">
-              No child session messages yet.
-            </div>
-          ) : (
-            <div className="px-4 py-5">
-              <ChatMessageListContainer
-                messages={messages}
-                isSending={false}
+          {resolvedTabs.map((tab) => (
+            <div
+              key={tab.sessionKey}
+              className={cn(tab.sessionKey === activeSessionKey ? 'block' : 'hidden')}
+            >
+              <ChildSessionPanelConversation
+                sessionKey={tab.sessionKey}
                 onToolAction={onToolAction}
               />
             </div>
-          )}
+          ))}
         </div>
       </div>
     </aside>

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

@@ -6,6 +6,7 @@ import {
   resolveSelectedModelValue,
   resolveSelectedThinkingLevelValue
 } from '@/components/chat/chat-session-preference-governance';
+import { shouldRefreshDraftSessionId } from '@/components/chat/ncp/NcpChatPage';
 
 const modelOptions = [
   {
@@ -154,6 +155,35 @@ describe('resolveSelectedModelValue', () => {
   });
 });
 
+describe('shouldRefreshDraftSessionId', () => {
+  it('does not replace the initial draft session id on first mount', () => {
+    expect(
+      shouldRefreshDraftSessionId({
+        previousSelectedSessionKey: undefined,
+        nextSelectedSessionKey: null
+      })
+    ).toBe(false);
+  });
+
+  it('replaces the draft session id after leaving an existing session', () => {
+    expect(
+      shouldRefreshDraftSessionId({
+        previousSelectedSessionKey: 'session-1',
+        nextSelectedSessionKey: null
+      })
+    ).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', () => {
   it('returns the most recent preferred model from the same runtime', () => {
     const sessions = [

package/src/components/chat/chat-page-shell.tsx

@@ -2,10 +2,11 @@ import { useEffect } from 'react';
 import type { Dispatch, MutableRefObject, SetStateAction } from 'react';
 import { ChatSidebar } from '@/components/chat/ChatSidebar';
 import { ChatConversationPanel } from '@/components/chat/ChatConversationPanel';
+import { AgentsPage } from '@/components/agents/AgentsPage';
 import { CronConfig } from '@/components/config/CronConfig';
 import { MarketplacePage } from '@/components/marketplace/MarketplacePage';
 
-export type MainPanelView = 'chat' | 'cron' | 'skills';
+export type MainPanelView = 'chat' | 'cron' | 'skills' | 'agents';
 
 export type ChatPageProps = {
   view: MainPanelView;
@@ -15,12 +16,9 @@ type UseChatSessionSyncParams = {
   view: MainPanelView;
   routeSessionKey: string | null;
   selectedSessionKey: string | null;
-  selectedAgentId: string;
   setSelectedSessionKey: Dispatch<SetStateAction<string | null>>;
-  setSelectedAgentId: Dispatch<SetStateAction<string>>;
   selectedSessionKeyRef: MutableRefObject<string | null>;
   resetStreamState: () => void;
-  resolveAgentIdFromSessionKey: (sessionKey: string) => string | null;
 };
 
 export function useChatSessionSync(params: UseChatSessionSyncParams): void {
@@ -28,12 +26,9 @@ export function useChatSessionSync(params: UseChatSessionSyncParams): void {
     view,
     routeSessionKey,
     selectedSessionKey,
-    selectedAgentId,
     setSelectedSessionKey,
-    setSelectedAgentId,
     selectedSessionKeyRef,
     resetStreamState,
-    resolveAgentIdFromSessionKey
   } = params;
 
   useEffect(() => {
@@ -52,16 +47,6 @@ export function useChatSessionSync(params: UseChatSessionSyncParams): void {
     }
   }, [resetStreamState, routeSessionKey, selectedSessionKey, setSelectedSessionKey, view]);
 
-  useEffect(() => {
-    const inferred = selectedSessionKey ? resolveAgentIdFromSessionKey(selectedSessionKey) : null;
-    if (!inferred) {
-      return;
-    }
-    if (selectedAgentId !== inferred) {
-      setSelectedAgentId(inferred);
-    }
-  }, [resolveAgentIdFromSessionKey, selectedAgentId, selectedSessionKey, setSelectedAgentId]);
-
   useEffect(() => {
     selectedSessionKeyRef.current = selectedSessionKey;
   }, [selectedSessionKey, selectedSessionKeyRef]);
@@ -87,6 +72,12 @@ export function ChatPageLayout({ view, confirmDialog }: ChatPageLayoutProps) {
                 <CronConfig />
               </div>
             </div>
+          ) : view === 'agents' ? (
+            <div className="h-full overflow-auto custom-scrollbar">
+              <div className="mx-auto w-full max-w-[min(1180px,100%)] px-6 py-5">
+                <AgentsPage />
+              </div>
+            </div>
           ) : (
             <div className="h-full overflow-hidden">
               <div className="mx-auto flex h-full min-h-0 w-full max-w-[min(1120px,100%)] flex-col px-6 py-5">

package/src/components/chat/chat-session-route.ts

@@ -1,19 +1,5 @@
 const SESSION_ROUTE_PREFIX = 'sid_';
 
-export function resolveAgentIdFromSessionKey(sessionKey: string): string | null {
-  const match = /^agent:([^:]+):/i.exec(sessionKey.trim());
-  if (!match) {
-    return null;
-  }
-  const value = match[1]?.trim();
-  return value ? value : null;
-}
-
-export function buildNewSessionKey(agentId: string): string {
-  const slug = Math.random().toString(36).slice(2, 8);
-  return `agent:${agentId}:ui:direct:web-${Date.now().toString(36)}${slug}`;
-}
-
 export function encodeSessionRouteId(sessionKey: string): string {
   const bytes = new TextEncoder().encode(sessionKey);
   let binary = '';

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

@@ -1,4 +1,5 @@
 import type { SessionEntryView } from '@/api/types';
+import { AgentAvatar } from '@/components/common/AgentAvatar';
 import { SessionContextIconNode } from '@/components/common/session-context-icon';
 import { SessionRunBadge } from '@/components/common/SessionRunBadge';
 import { Button } from '@/components/ui/button';
@@ -15,6 +16,9 @@ type ChatSidebarSessionItemProps = {
   runStatus?: SessionRunStatus;
   context: SessionContextView;
   title: string;
+  agentId?: string | null;
+  agentLabel?: string | null;
+  agentAvatarUrl?: string | null;
   isEditing: boolean;
   draftLabel: string;
   isSaving: boolean;
@@ -32,6 +36,9 @@ export function ChatSidebarSessionItem(props: ChatSidebarSessionItemProps) {
     runStatus,
     context,
     title,
+    agentId,
+    agentLabel,
+    agentAvatarUrl,
     isEditing,
     draftLabel,
     isSaving,
@@ -43,6 +50,10 @@ export function ChatSidebarSessionItem(props: ChatSidebarSessionItemProps) {
   } = props;
 
   const iconTone = active ? 'text-gray-700' : 'text-gray-500';
+  const normalizedAgentId = agentId?.trim() ?? '';
+  const shouldShowAgentAvatar = Boolean(
+    normalizedAgentId && normalizedAgentId.toLowerCase() !== 'main',
+  );
 
   return (
     <div
@@ -105,6 +116,14 @@ export function ChatSidebarSessionItem(props: ChatSidebarSessionItemProps) {
           <button type="button" onClick={onSelect} className="w-full text-left">
             <div className="grid grid-cols-[minmax(0,1fr)_0.875rem] items-center gap-1.5 pr-8">
               <span className="flex min-w-0 items-center gap-1.5">
+                {shouldShowAgentAvatar ? (
+                  <AgentAvatar
+                    agentId={normalizedAgentId}
+                    displayName={agentLabel}
+                    avatarUrl={agentAvatarUrl}
+                    className="h-5 w-5 shrink-0"
+                  />
+                ) : null}
                 <span className="truncate font-medium">{title}</span>
                 {context.label ? (
                   <span
@@ -129,7 +148,7 @@ export function ChatSidebarSessionItem(props: ChatSidebarSessionItemProps) {
               </span>
             </div>
             <div className="mt-0.5 text-[11px] text-gray-400 truncate">
-              {session.messageCount} · {formatDateTime(session.updatedAt)}
+              {agentLabel?.trim() ? `${agentLabel} · ` : ''}{session.messageCount} · {formatDateTime(session.updatedAt)}
             </div>
           </button>
           <button

package/src/components/chat/containers/chat-input-bar.container.tsx

@@ -87,8 +87,9 @@ export function ChatInputBarContainer() {
   const inputBarRef = useRef<ChatInputBarHandle | null>(null);
   const fileInputRef = useRef<HTMLInputElement | null>(null);
 
-  const skillScopeLabels = useMemo<Record<'project' | 'workspace', string>>(() => {
+  const skillScopeLabels = useMemo<Record<'builtin' | 'project' | 'workspace', string>>(() => {
     return {
+      builtin: t('chatSkillScopeBuiltin'),
       project: t('chatSkillScopeProject'),
       workspace: t('chatSkillScopeWorkspace'),
     };

package/src/components/chat/containers/chat-message-list.container.tsx

@@ -12,6 +12,7 @@ import {
 } from "@/components/chat/adapters/chat-message.adapter";
 import { readInlineTokensFromMetadata } from "@/components/chat/chat-inline-token.utils";
 import { adaptNcpMessageToUiMessage } from "@/components/chat/ncp/ncp-session-adapter";
+import { AgentIdentityAvatar } from "@/components/common/agent-identity";
 import { useI18n } from "@/components/providers/I18nProvider";
 import { formatDateTime, t } from "@/lib/i18n";
 
@@ -129,6 +130,12 @@ export function ChatMessageListContainer({
       className={className}
       texts={messageTexts}
       onToolAction={onToolAction}
+      renderToolAgent={(agentId) => (
+        <AgentIdentityAvatar
+          agentId={agentId}
+          className="h-4 w-4 shrink-0"
+        />
+      )}
     />
   );
 }