@nextclaw/ui 0.12.2 → 0.12.3

package/src/components/chat/ChatConversationPanel.tsx

@@ -11,7 +11,9 @@ import { AgentAvatar } from "@/components/common/AgentAvatar";
 import { usePresenter } from "@/components/chat/presenter/chat-presenter-context";
 import { ChatSessionHeaderActions } from "@/components/chat/session-header/chat-session-header-actions";
 import { ChatSessionProjectBadge } from "@/components/chat/session-header/chat-session-project-badge";
+import { useChatInputStore } from "@/components/chat/stores/chat-input.store";
 import { useChatThreadStore } from "@/components/chat/stores/chat-thread.store";
+import { resolveAgentRuntimeSessionType } from "@/components/chat/useChatSessionTypeState";
 import { t } from "@/lib/i18n";
 import { cn } from "@/lib/utils";
 
@@ -45,6 +47,9 @@ function ChatConversationSkeleton() {
 
 export function ChatConversationPanel() {
   const presenter = usePresenter();
+  const defaultSessionType = useChatInputStore(
+    (state) => state.snapshot.defaultSessionType,
+  );
   const snapshot = useChatThreadStore((state) => state.snapshot);
   const fallbackThreadRef = useRef<HTMLDivElement | null>(null);
   const threadRef = snapshot.threadRef ?? fallbackThreadRef;
@@ -80,6 +85,22 @@ export function ChatConversationPanel() {
     snapshot.messages.length === 0 &&
     !snapshot.isSending &&
     !snapshot.isAwaitingAssistantOutput;
+  const availableAgents = snapshot.availableAgents ?? [];
+  const resolveDraftAgent = (agentId: string) =>
+    availableAgents.find((agent) => agent.id === agentId) ?? null;
+  const createDraftSessionForAgent = () => {
+    const sessionType = resolveAgentRuntimeSessionType(
+      resolveDraftAgent(snapshot.agentId ?? "main"),
+      defaultSessionType,
+    );
+    presenter.chatSessionListManager.createSession(sessionType);
+  };
+  const selectDraftAgent = (agentId: string) => {
+    presenter.chatSessionListManager.setSelectedAgentId(agentId);
+    presenter.chatInputManager.setPendingSessionType(
+      resolveAgentRuntimeSessionType(resolveDraftAgent(agentId), defaultSessionType),
+    );
+  };
 
   const { onScroll: handleScroll } = useStickyBottomScroll({
     scrollRef: threadRef,
@@ -192,10 +213,10 @@ export function ChatConversationPanel() {
         >
           {showWelcome ? (
             <ChatWelcome
-              onCreateSession={presenter.chatThreadManager.createSession}
-              agents={snapshot.availableAgents ?? []}
+              onCreateSession={createDraftSessionForAgent}
+              agents={availableAgents}
               selectedAgentId={snapshot.agentId ?? "main"}
-              onSelectAgent={presenter.chatSessionListManager.setSelectedAgentId}
+              onSelectAgent={selectDraftAgent}
             />
           ) : hideEmptyHint ? (
             <div className="h-full" />

package/src/components/chat/managers/chat-session-list.manager.test.ts

@@ -9,13 +9,16 @@ describe('ChatSessionListManager', () => {
       snapshot: {
         ...useChatInputStore.getState().snapshot,
         defaultSessionType: 'native',
-        pendingSessionType: 'native'
+        pendingSessionType: 'native',
+        pendingProjectRoot: null,
+        pendingProjectRootSessionKey: null
       }
     });
     useChatSessionListStore.setState({
       snapshot: {
         ...useChatSessionListStore.getState().snapshot,
-        selectedSessionKey: 'session-1'
+        selectedSessionKey: 'session-1',
+        listMode: 'time-first'
       }
     });
   });
@@ -28,13 +31,30 @@ describe('ChatSessionListManager', () => {
       resetStreamState: vi.fn()
     } as unknown as ConstructorParameters<typeof ChatSessionListManager>[1];
 
-    const manager = new ChatSessionListManager(uiManager, streamActionsManager);
+    const manager = new ChatSessionListManager(uiManager, streamActionsManager, () => 'draft-session-1');
     manager.createSession('codex');
 
     expect(streamActionsManager.resetStreamState).toHaveBeenCalledTimes(1);
     expect(uiManager.goToChatRoot).toHaveBeenCalledTimes(1);
     expect(useChatSessionListStore.getState().snapshot.selectedSessionKey).toBe('session-1');
     expect(useChatInputStore.getState().snapshot.pendingSessionType).toBe('codex');
+    expect(useChatInputStore.getState().snapshot.pendingProjectRoot).toBeNull();
+    expect(useChatInputStore.getState().snapshot.pendingProjectRootSessionKey).toBeNull();
+  });
+
+  it('hydrates the draft project root when creating a session inside a project group', () => {
+    const uiManager = {
+      goToChatRoot: vi.fn()
+    } as unknown as ConstructorParameters<typeof ChatSessionListManager>[0];
+    const streamActionsManager = {
+      resetStreamState: vi.fn()
+    } as unknown as ConstructorParameters<typeof ChatSessionListManager>[1];
+
+    const manager = new ChatSessionListManager(uiManager, streamActionsManager, () => 'draft-session-9');
+    manager.createSession('native', '/tmp/project-alpha');
+
+    expect(useChatInputStore.getState().snapshot.pendingProjectRoot).toBe('/tmp/project-alpha');
+    expect(useChatInputStore.getState().snapshot.pendingProjectRootSessionKey).toBe('draft-session-9');
   });
 
   it('delegates existing-session selection to routing without eagerly mutating the selected session state', () => {
@@ -51,4 +71,15 @@ describe('ChatSessionListManager', () => {
     expect(uiManager.goToSession).toHaveBeenCalledWith('session-2');
     expect(useChatSessionListStore.getState().snapshot.selectedSessionKey).toBe('session-1');
   });
+
+  it('updates the sidebar list mode without touching other session list state', () => {
+    const uiManager = {} as ConstructorParameters<typeof ChatSessionListManager>[0];
+    const streamActionsManager = {} as ConstructorParameters<typeof ChatSessionListManager>[1];
+
+    const manager = new ChatSessionListManager(uiManager, streamActionsManager);
+    manager.setListMode('project-first');
+
+    expect(useChatSessionListStore.getState().snapshot.listMode).toBe('project-first');
+    expect(useChatSessionListStore.getState().snapshot.selectedSessionKey).toBe('session-1');
+  });
 });

package/src/components/chat/managers/chat-session-list.manager.ts

@@ -3,11 +3,13 @@ import { useChatInputStore } from '@/components/chat/stores/chat-input.store';
 import type { ChatUiManager } from '@/components/chat/managers/chat-ui.manager';
 import type { SetStateAction } from 'react';
 import type { ChatStreamActionsManager } from '@/components/chat/managers/chat-stream-actions.manager';
+import { normalizeSessionProjectRootValue } from '@/lib/session-project/session-project.utils';
 
 export class ChatSessionListManager {
   constructor(
     private uiManager: ChatUiManager,
-    private streamActionsManager: ChatStreamActionsManager
+    private streamActionsManager: ChatStreamActionsManager,
+    private getDraftSessionId: () => string = () => ''
   ) {}
 
   private resolveUpdateValue = <T>(prev: T, next: SetStateAction<T>): T => {
@@ -35,7 +37,16 @@ export class ChatSessionListManager {
     useChatSessionListStore.getState().setSnapshot({ selectedSessionKey: value });
   };
 
-  createSession = (sessionType?: string) => {
+  setListMode = (next: SetStateAction<'time-first' | 'project-first'>) => {
+    const prev = useChatSessionListStore.getState().snapshot.listMode;
+    const value = this.resolveUpdateValue(prev, next);
+    if (value === prev) {
+      return;
+    }
+    useChatSessionListStore.getState().setSnapshot({ listMode: value });
+  };
+
+  createSession = (sessionType?: string, projectRoot?: string | null) => {
     const { snapshot } = useChatInputStore.getState();
     const { defaultSessionType: configuredDefaultSessionType } = snapshot;
     const defaultSessionType = configuredDefaultSessionType || 'native';
@@ -43,11 +54,13 @@ export class ChatSessionListManager {
       typeof sessionType === 'string' && sessionType.trim().length > 0
         ? sessionType.trim()
         : defaultSessionType;
+    const normalizedProjectRoot = normalizeSessionProjectRootValue(projectRoot);
+    const draftSessionId = normalizedProjectRoot ? this.getDraftSessionId() : null;
     this.streamActionsManager.resetStreamState();
     useChatInputStore.getState().setSnapshot({
       pendingSessionType: nextSessionType,
-      pendingProjectRoot: null,
-      pendingProjectRootSessionKey: null
+      pendingProjectRoot: normalizedProjectRoot,
+      pendingProjectRootSessionKey: draftSessionId
     });
     this.uiManager.goToChatRoot();
   };

package/src/components/chat/ncp/ncp-chat.presenter.ts

@@ -7,7 +7,11 @@ import { NcpChatThreadManager } from '@/components/chat/ncp/ncp-chat-thread.mana
 export class NcpChatPresenter {
   chatUiManager = new ChatUiManager();
   chatStreamActionsManager = new ChatStreamActionsManager();
-  chatSessionListManager = new ChatSessionListManager(this.chatUiManager, this.chatStreamActionsManager);
+  chatSessionListManager = new ChatSessionListManager(
+    this.chatUiManager,
+    this.chatStreamActionsManager,
+    () => this.getDraftSessionId()
+  );
   chatInputManager = new NcpChatInputManager(
     this.chatUiManager,
     this.chatStreamActionsManager,

package/src/components/chat/stores/chat-session-list.store.ts

@@ -1,8 +1,12 @@
 import { create } from 'zustand';
+
+export type ChatSessionListMode = 'time-first' | 'project-first';
+
 export type ChatSessionListSnapshot = {
   selectedSessionKey: string | null;
   selectedAgentId: string;
   query: string;
+  listMode: ChatSessionListMode;
 };
 
 type ChatSessionListStore = {
@@ -13,7 +17,8 @@ type ChatSessionListStore = {
 const initialSnapshot: ChatSessionListSnapshot = {
   selectedSessionKey: null,
   selectedAgentId: 'main',
-  query: ''
+  query: '',
+  listMode: 'time-first'
 };
 
 export const useChatSessionListStore = create<ChatSessionListStore>((set) => ({

package/src/components/chat/useChatSessionTypeState.ts

@@ -1,6 +1,6 @@
 import { useEffect, useMemo, useRef } from 'react';
 import type { Dispatch, SetStateAction } from 'react';
-import type { ChatSessionTypeOptionView, SessionEntryView } from '@/api/types';
+import type { AgentProfileView, ChatSessionTypeOptionView, SessionEntryView } from '@/api/types';
 import { t } from '@/lib/i18n';
 
 export const DEFAULT_SESSION_TYPE = 'native';
@@ -39,6 +39,14 @@ export function normalizeSessionType(value: unknown): string {
   return normalized || DEFAULT_SESSION_TYPE;
 }
 
+export function resolveAgentRuntimeSessionType(
+  agent: Pick<AgentProfileView, 'runtime' | 'engine'> | null | undefined,
+  fallbackSessionType: string = DEFAULT_SESSION_TYPE
+): string {
+  const runtime = agent?.runtime?.trim() || agent?.engine?.trim() || fallbackSessionType;
+  return normalizeSessionType(runtime);
+}
+
 export function resolveSessionTypeLabel(sessionType: string, fallbackLabel?: string): string {
   if (sessionType === 'native') {
     return t('chatSessionTypeNative');

package/dist/assets/MarketplacePage-BZQW70ti.js

@@ -1 +0,0 @@
-import{t as e}from"./MarketplacePage-DE0QjYVv.js";export{e as MarketplacePage};