@nextclaw/ui 0.14.1 → 0.14.2

package/src/features/chat/features/session/hooks/__tests__/use-chat-session-project.test.tsx

@@ -1,7 +1,6 @@
 import { act, renderHook } from '@testing-library/react';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, describe, expect, it, vi } from 'vitest';
 import { toast } from 'sonner';
-import { useChatInputStore } from '@/features/chat/stores/chat-input.store';
 import { useChatSessionProject } from '@/features/chat/features/session/hooks/use-chat-session-project';
 
 const mocks = vi.hoisted(() => ({
@@ -19,21 +18,11 @@ vi.mock('@/features/chat/features/session/hooks/use-chat-session-update', () =>
 }));
 
 describe('useChatSessionProject', () => {
-  beforeEach(() => {
-    useChatInputStore.setState((state) => ({
-      snapshot: {
-        ...state.snapshot,
-        pendingProjectRoot: null,
-        pendingProjectRootSessionKey: null
-      }
-    }));
-  });
-
   afterEach(() => {
     vi.clearAllMocks();
   });
 
-  it('stores the draft project root locally when the session does not exist yet', async () => {
+  it('does not persist draft project root through the session update hook', async () => {
     const { result } = renderHook(() => useChatSessionProject());
 
     await act(async () => {
@@ -45,14 +34,10 @@ describe('useChatSessionProject', () => {
     });
 
     expect(mocks.updateSession).not.toHaveBeenCalled();
-    expect(useChatInputStore.getState().snapshot).toMatchObject({
-      pendingProjectRoot: '/tmp/project-alpha',
-      pendingProjectRootSessionKey: 'draft-session-1'
-    });
     expect(toast.success).toHaveBeenCalledTimes(1);
   });
 
-  it('keeps an explicit draft override when clearing the project root locally', async () => {
+  it('does not persist draft project clearing through the session update hook', async () => {
     const { result } = renderHook(() => useChatSessionProject());
 
     await act(async () => {
@@ -64,10 +49,6 @@ describe('useChatSessionProject', () => {
     });
 
     expect(mocks.updateSession).not.toHaveBeenCalled();
-    expect(useChatInputStore.getState().snapshot).toMatchObject({
-      pendingProjectRoot: null,
-      pendingProjectRootSessionKey: 'draft-session-1'
-    });
     expect(toast.success).toHaveBeenCalledTimes(1);
   });
 
@@ -87,10 +68,6 @@ describe('useChatSessionProject', () => {
       patch: { projectRoot: '/tmp/project-beta' },
       successMessage: 'Project directory updated'
     });
-    expect(useChatInputStore.getState().snapshot).toMatchObject({
-      pendingProjectRoot: null,
-      pendingProjectRootSessionKey: null
-    });
   });
 
   it('persists clearing to the server without keeping a session-scoped local override', async () => {
@@ -109,9 +86,5 @@ describe('useChatSessionProject', () => {
       patch: { projectRoot: null },
       successMessage: 'Project directory cleared'
     });
-    expect(useChatInputStore.getState().snapshot).toMatchObject({
-      pendingProjectRoot: null,
-      pendingProjectRootSessionKey: null
-    });
   });
 });

package/src/features/chat/features/session/hooks/use-chat-session-project.ts

@@ -1,6 +1,5 @@
 import { toast } from 'sonner';
 import { t } from '@/shared/lib/i18n';
-import { useChatInputStore } from '@/features/chat/stores/chat-input.store';
 import { useChatSessionUpdate } from '@/features/chat/features/session/hooks/use-chat-session-update';
 
 type UpdateChatSessionProjectParams = {
@@ -17,10 +16,6 @@ export function useChatSessionProject() {
     const successMessage = projectRoot ? t('chatSessionProjectUpdated') : t('chatSessionProjectCleared');
 
     if (!persistToServer) {
-      useChatInputStore.getState().setSnapshot({
-        pendingProjectRoot: projectRoot,
-        pendingProjectRootSessionKey: sessionKey
-      });
       toast.success(successMessage);
       return;
     }

package/src/features/chat/features/session/utils/chat-run-metadata.utils.ts

@@ -1,3 +1,7 @@
+import {
+  CHAT_SESSION_MATERIALIZATION_METADATA_KEY,
+  type AgentRunSessionMaterializationMetadata,
+} from "@nextclaw/shared";
 import { buildInlineSkillTokensFromComposer, CHAT_UI_INLINE_TOKENS_METADATA_KEY } from "@/features/chat/features/input/utils/chat-inline-token.utils";
 import { normalizeRequestedSkills } from "@/features/chat/features/runtime/utils/chat-runtime.utils";
 import { normalizeSessionProjectRootValue } from "@/shared/lib/session-project";
@@ -17,6 +21,7 @@ export function buildChatRunMetadata(payload: {
   projectRoot?: string | null;
   requestedSkills?: string[];
   composerNodes?: Parameters<typeof buildInlineSkillTokensFromComposer>[0];
+  sessionMaterialization?: AgentRunSessionMaterializationMetadata | null;
 }): Record<string, unknown> {
   const projectRoot = normalizeSessionProjectRootValue(payload.projectRoot);
   const metadata: Record<string, unknown> = {
@@ -36,6 +41,9 @@ export function buildChatRunMetadata(payload: {
   if (inlineSkillTokens.length > 0) {
     metadata[CHAT_UI_INLINE_TOKENS_METADATA_KEY] = inlineSkillTokens;
   }
+  if (payload.sessionMaterialization) {
+    metadata[CHAT_SESSION_MATERIALIZATION_METADATA_KEY] = payload.sessionMaterialization;
+  }
   return metadata;
 }
 

package/src/features/chat/features/session-type/components/__tests__/chat-session-type-menu.test.tsx

@@ -4,8 +4,8 @@ import { ChatSessionTypeMenu } from "@/features/chat/features/session-type/compo
 import { createPopoverAvailableHeightLimit } from "@/shared/components/ui/popover";
 
 const options = [
-  { value: "native", label: "Native", ready: true },
-  { value: "codex", label: "Codex", ready: true },
+  { value: "native", label: "Native", icon: null, ready: true },
+  { value: "codex", label: "Codex", icon: null, ready: true },
 ];
 
 describe("ChatSessionTypeMenu", () => {

package/src/features/chat/features/session-type/components/__tests__/chat-session-type-option-item.test.tsx

@@ -50,6 +50,7 @@ describe("ChatSessionTypeOptionItem", () => {
         option={{
           value: "native",
           label: "Native",
+          icon: null,
           ready: true,
         }}
         onSelect={vi.fn()}
@@ -70,6 +71,7 @@ describe("ChatSessionTypeOptionItem", () => {
         option={{
           value: "claude",
           label: "Claude",
+          icon: null,
           ready: false,
           reasonMessage: "Configure a provider API key first.",
         }}

package/src/features/chat/features/session-type/components/chat-session-type-menu.tsx

@@ -1,10 +1,10 @@
 import { ChatSessionTypeOptionItem } from "@/features/chat/features/session-type/components/chat-session-type-option-item";
-import type { ChatInputSnapshot } from "@/features/chat/stores/chat-input.store";
+import type { ChatSessionTypeOption } from "@/features/chat/features/session-type/utils/chat-session-type.utils";
 import { createPopoverAvailableHeightLimit } from "@/shared/components/ui/popover";
 import { t } from "@/shared/lib/i18n";
 import { cn } from "@/shared/lib/utils";
 
-type SessionTypeOption = ChatInputSnapshot["sessionTypeOptions"][number];
+type SessionTypeOption = ChatSessionTypeOption;
 const CHAT_SESSION_TYPE_MENU_MAX_HEIGHT =
   createPopoverAvailableHeightLimit("18rem");
 const CHAT_SESSION_TYPE_MENU_STYLE = {

package/src/features/chat/features/session-type/components/chat-session-type-option-item.tsx

@@ -1,11 +1,11 @@
-import type { ChatInputSnapshot } from "@/features/chat/stores/chat-input.store";
 import { SessionContextIconNode } from "@/features/chat/features/session/components/session-context-icon";
+import type { ChatSessionTypeOption } from "@/features/chat/features/session-type/utils/chat-session-type.utils";
 import { StatusDot } from "@/shared/components/status/status-dot";
 import { t } from "@/shared/lib/i18n";
 import { cn } from "@/shared/lib/utils";
 import { Bot, Check } from "lucide-react";
 
-type SessionTypeOption = ChatInputSnapshot["sessionTypeOptions"][number];
+type SessionTypeOption = ChatSessionTypeOption;
 
 export function ChatSessionTypeOptionItem(props: {
   option: SessionTypeOption;

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

@@ -1,9 +1,9 @@
 import type { ReactNode } from "react";
+import type { SetStateAction } from "react";
 import { render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import { ChatConversationWelcome } from "@/features/chat/features/welcome/components/chat-conversation-welcome";
-import { useChatInputStore } from "@/features/chat/stores/chat-input.store";
 import { useChatQueryStore } from "@/features/chat/stores/ncp-chat-query.store";
 import { useChatSessionListStore } from "@/features/chat/stores/chat-session-list.store";
 import { useChatThreadStore } from "@/features/chat/stores/chat-thread.store";
@@ -11,14 +11,24 @@ import type { ChatQuerySnapshot } from "@/features/chat/stores/ncp-chat-query.st
 
 const mocks = vi.hoisted(() => ({
   setSelectedAgentId: vi.fn(),
-  applyPromptSuggestion: vi.fn(),
-  setPendingProjectRoot: vi.fn(),
-  setPendingSessionType: vi.fn(),
   agents: [
     { id: "main", displayName: "Main", runtime: "native" },
     { id: "engineer", displayName: "Engineer", runtime: "codex" },
   ],
 }));
+const persistStorage = new Map<string, unknown>();
+
+function createPersistStorage() {
+  return {
+    getItem: (name: string) => persistStorage.get(name) ?? null,
+    setItem: (name: string, value: unknown) => {
+      persistStorage.set(name, value);
+    },
+    removeItem: (name: string) => {
+      persistStorage.delete(name);
+    },
+  };
+}
 
 vi.mock("@/features/chat/features/welcome/components/chat-welcome", () => ({
   ChatWelcome: ({
@@ -60,11 +70,6 @@ vi.mock("@/features/chat/components/providers/chat-presenter.provider", () => ({
     chatSessionListManager: {
       setSelectedAgentId: mocks.setSelectedAgentId,
     },
-    chatInputManager: {
-      applyPromptSuggestion: mocks.applyPromptSuggestion,
-      setPendingProjectRoot: mocks.setPendingProjectRoot,
-      setPendingSessionType: mocks.setPendingSessionType,
-    },
   }),
 }));
 
@@ -88,19 +93,10 @@ function createFetchedQuery<TData>(data: TData) {
 }
 
 function resetWelcomeTestState() {
+  persistStorage.clear();
+  useChatSessionListStore.persist.setOptions({ storage: createPersistStorage() as never });
+  useChatThreadStore.persist.setOptions({ storage: createPersistStorage() as never });
   mocks.setSelectedAgentId.mockReset();
-  mocks.applyPromptSuggestion.mockReset();
-  mocks.setPendingProjectRoot.mockReset();
-  mocks.setPendingSessionType.mockReset();
-  useChatInputStore.setState({
-    snapshot: {
-      ...useChatInputStore.getState().snapshot,
-      defaultSessionType: "native",
-      pendingSessionType: "native",
-      selectedSessionType: undefined,
-      pendingProjectRoot: null,
-    },
-  });
   useChatSessionListStore.setState({
     snapshot: {
       ...useChatSessionListStore.getState().snapshot,
@@ -138,56 +134,78 @@ function resetWelcomeTestState() {
   });
 }
 
+function renderWelcome(overrides: Partial<{
+  onSelectPrompt: (prompt: string) => void;
+  onSelectProjectRoot: (projectRoot: string | null) => void;
+  onSelectSessionType: (sessionType: SetStateAction<string>) => void;
+}> = {}) {
+  return render(
+    <ChatConversationWelcome
+      inputSlot={<div data-testid="input-slot" />}
+      pendingProjectRoot={null}
+      pendingSessionType="native"
+      selectedSessionTypeValue={null}
+      onSelectPrompt={overrides.onSelectPrompt ?? vi.fn()}
+      onSelectProjectRoot={overrides.onSelectProjectRoot ?? vi.fn()}
+      onSelectSessionType={overrides.onSelectSessionType ?? vi.fn()}
+    />,
+  );
+}
+
 describe("ChatConversationWelcome", () => {
   beforeEach(resetWelcomeTestState);
 
-  it("stores the selected welcome project through the input manager", async () => {
+  it("emits the selected welcome project through the local input callback", async () => {
     const user = userEvent.setup();
+    const onSelectProjectRoot = vi.fn();
 
-    render(<ChatConversationWelcome inputSlot={<div data-testid="input-slot" />} />);
+    renderWelcome({ onSelectProjectRoot });
 
     await user.click(
       screen.getByRole("button", { name: "select draft project" }),
     );
 
-    expect(mocks.setPendingProjectRoot).toHaveBeenCalledWith("/tmp/project-alpha");
+    expect(onSelectProjectRoot).toHaveBeenCalledWith("/tmp/project-alpha");
   });
 
-  it("applies a selected prompt suggestion through the input manager", async () => {
+  it("emits a selected prompt suggestion through the local input callback", async () => {
     const user = userEvent.setup();
+    const onSelectPrompt = vi.fn();
 
-    render(<ChatConversationWelcome inputSlot={<div data-testid="input-slot" />} />);
+    renderWelcome({ onSelectPrompt });
 
     await user.click(
       screen.getByRole("button", { name: "pick prompt" }),
     );
 
-    expect(mocks.applyPromptSuggestion).toHaveBeenCalledWith("example prompt");
+    expect(onSelectPrompt).toHaveBeenCalledWith("example prompt");
   });
 
 
   it("syncs the pending session type when switching the draft agent", async () => {
     const user = userEvent.setup();
+    const onSelectSessionType = vi.fn();
 
-    render(<ChatConversationWelcome inputSlot={<div data-testid="input-slot" />} />);
+    renderWelcome({ onSelectSessionType });
 
     await user.click(
       screen.getByRole("button", { name: "switch draft agent" }),
     );
 
     expect(mocks.setSelectedAgentId).toHaveBeenCalledWith("engineer");
-    expect(mocks.setPendingSessionType).toHaveBeenCalledWith("codex");
+    expect(onSelectSessionType).toHaveBeenCalledWith("codex");
   });
 
   it("stores an explicit welcome session type selection", async () => {
     const user = userEvent.setup();
+    const onSelectSessionType = vi.fn();
 
-    render(<ChatConversationWelcome inputSlot={<div data-testid="input-slot" />} />);
+    renderWelcome({ onSelectSessionType });
 
     await user.click(
       screen.getByRole("button", { name: "switch session type" }),
     );
 
-    expect(mocks.setPendingSessionType).toHaveBeenCalledWith("codex");
+    expect(onSelectSessionType).toHaveBeenCalledWith("codex");
   });
 });

package/src/features/chat/features/welcome/components/__tests__/chat-welcome.test.tsx

@@ -10,8 +10,8 @@ vi.mock(
 );
 
 const sessionTypeOptions = [
-  { value: 'native', label: 'Native', ready: true },
-  { value: 'codex', label: 'Codex', ready: true },
+  { value: 'native', label: 'Native', icon: null, ready: true },
+  { value: 'codex', label: 'Codex', icon: null, ready: true },
 ];
 
 function renderWelcome(

package/src/features/chat/features/welcome/components/chat-conversation-welcome.tsx

@@ -1,4 +1,5 @@
 import type { ReactNode } from "react";
+import type { SetStateAction } from "react";
 import { usePresenter } from "@/features/chat/components/providers/chat-presenter.provider";
 import {
   buildSessionTypeOptions,
@@ -11,7 +12,6 @@ import {
   resolveChatWelcomeSelectedSessionType,
 } from "@/features/chat/features/welcome/utils/chat-welcome-selection.utils";
 import { buildChatWelcomeProjectOptions } from "@/features/chat/features/welcome/utils/chat-welcome-project-options.utils";
-import { useChatInputStore } from "@/features/chat/stores/chat-input.store";
 import { useChatQueryStore } from "@/features/chat/stores/ncp-chat-query.store";
 import { useChatSessionListStore } from "@/features/chat/stores/chat-session-list.store";
 import { useChatThreadStore } from "@/features/chat/stores/chat-thread.store";
@@ -23,13 +23,24 @@ const EMPTY_NCP_SESSION_SUMMARIES: NcpSessionSummaryView[] = [];
 
 type ChatConversationWelcomeProps = {
   inputSlot: ReactNode;
+  pendingProjectRoot: string | null;
+  pendingSessionType: string;
+  selectedSessionTypeValue: string | null;
+  onSelectProjectRoot: (projectRoot: string | null) => void;
+  onSelectPrompt: (prompt: string) => void;
+  onSelectSessionType: (sessionType: SetStateAction<string>) => void;
 };
 
 export function ChatConversationWelcome({
   inputSlot,
+  pendingProjectRoot,
+  pendingSessionType,
+  selectedSessionTypeValue,
+  onSelectProjectRoot,
+  onSelectPrompt,
+  onSelectSessionType,
 }: ChatConversationWelcomeProps) {
   const presenter = usePresenter();
-  const inputSnapshot = useChatInputStore((state) => state.snapshot);
   const selectedAgentId = useChatSessionListStore(
     (state) => state.snapshot.selectedAgentId,
   );
@@ -53,18 +64,18 @@ export function ChatConversationWelcome({
     config?.agents.defaults.workspace,
   );
   const selectedProjectRoot = normalizeSessionProjectRootValue(
-    inputSnapshot.pendingProjectRoot,
+    pendingProjectRoot,
   );
   const sessionTypeOptions = buildSessionTypeOptions(
     sessionTypesData?.options ?? [],
   );
   const defaultSessionType = normalizeSessionType(
-    sessionTypesData?.defaultType ?? inputSnapshot.defaultSessionType ?? DEFAULT_SESSION_TYPE,
+    sessionTypesData?.defaultType ?? DEFAULT_SESSION_TYPE,
   );
   const selectedSessionType = resolveChatWelcomeSelectedSessionType({
     defaultSessionType,
-    pendingSessionType: inputSnapshot.pendingSessionType,
-    selectedSessionType: inputSnapshot.selectedSessionType,
+    pendingSessionType,
+    selectedSessionType: selectedSessionTypeValue,
     sessionTypeOptions,
   });
   const projectOptions = buildChatWelcomeProjectOptions({
@@ -73,7 +84,7 @@ export function ChatConversationWelcome({
   });
   const selectDraftAgent = (agentId: string) => {
     presenter.chatSessionListManager.setSelectedAgentId(agentId);
-    presenter.chatInputManager.setPendingSessionType(
+    onSelectSessionType(
       resolveChatWelcomeSelectedSessionType({
         agents: availableAgents,
         agentId,
@@ -96,9 +107,9 @@ export function ChatConversationWelcome({
       selectedSessionType={selectedSessionType}
       sessionTypeOptions={sessionTypeOptions}
       onSelectAgent={selectDraftAgent}
-      onSelectPrompt={presenter.chatInputManager.applyPromptSuggestion}
-      onSelectProjectRoot={presenter.chatInputManager.setPendingProjectRoot}
-      onSelectSessionType={presenter.chatInputManager.setPendingSessionType}
+      onSelectPrompt={onSelectPrompt}
+      onSelectProjectRoot={onSelectProjectRoot}
+      onSelectSessionType={onSelectSessionType}
     />
   );
 }

package/src/features/chat/features/welcome/components/chat-welcome-session-type-picker.tsx

@@ -2,7 +2,7 @@ import { useState } from 'react';
 import { Bot, ChevronDown } from 'lucide-react';
 import { SessionContextIconNode } from '@/features/chat/features/session/components/session-context-icon';
 import { ChatSessionTypeOptionItem } from '@/features/chat/features/session-type/components/chat-session-type-option-item';
-import type { ChatInputSnapshot } from '@/features/chat/stores/chat-input.store';
+import type { ChatSessionTypeOption } from '@/features/chat/features/session-type/utils/chat-session-type.utils';
 import {
   Popover,
   PopoverContent,
@@ -11,7 +11,7 @@ import {
 } from '@/shared/components/ui/popover';
 import { t } from '@/shared/lib/i18n';
 
-type SessionTypeOption = ChatInputSnapshot['sessionTypeOptions'][number];
+type SessionTypeOption = ChatSessionTypeOption;
 
 type ChatWelcomeSessionTypePickerProps = {
   options: readonly SessionTypeOption[];

package/src/features/chat/features/welcome/components/chat-welcome.tsx

@@ -7,11 +7,11 @@ import { ChatWelcomeCapabilityGrid } from '@/features/chat/features/welcome/comp
 import { ChatWelcomeProjectPicker } from '@/features/chat/features/welcome/components/chat-welcome-project-picker';
 import { ChatWelcomeSessionTypePicker } from '@/features/chat/features/welcome/components/chat-welcome-session-type-picker';
 import type { ChatWelcomeProjectOption } from '@/features/chat/features/welcome/utils/chat-welcome-project-options.utils';
-import type { ChatInputSnapshot } from '@/features/chat/stores/chat-input.store';
+import type { ChatSessionTypeOption } from '@/features/chat/features/session-type/utils/chat-session-type.utils';
 import type { AgentProfileView } from '@/shared/lib/api';
 import { t } from '@/shared/lib/i18n';
 
-type SessionTypeOption = ChatInputSnapshot['sessionTypeOptions'][number];
+type SessionTypeOption = ChatSessionTypeOption;
 
 type ChatWelcomeProps = {
   agents: AgentProfileView[];

package/src/features/chat/features/workspace/components/__tests__/chat-session-workspace-panel-content.test.tsx

@@ -0,0 +1,54 @@
+import { render, screen } from "@testing-library/react";
+import { expect, it, vi } from "vitest";
+import { ChatSessionWorkspacePanelContent } from "@/features/chat/features/workspace/components/chat-session-workspace-panel-content";
+import type { ResolvedChildSessionTab } from "@/features/chat/features/ncp/hooks/use-ncp-child-session-tabs-view";
+
+vi.mock("@/features/chat/components/providers/chat-presenter.provider", () => ({
+  usePresenter: () => ({
+    chatThreadManager: {
+      materializeSideChatDraft: vi.fn(),
+      openFilePreview: vi.fn(),
+    },
+  }),
+}));
+
+vi.mock("@/features/chat/features/conversation/components/session-conversation-area", () => ({
+  SessionConversationArea: () => <div data-testid="session-conversation-area" />,
+}));
+
+function createChildTab(): ResolvedChildSessionTab {
+  return {
+    sessionKey: "child-1",
+    parentSessionKey: "parent-1",
+    title: "Child title",
+    agentId: "agent-1",
+    updatedAt: null,
+    lastMessageAt: null,
+    readAt: null,
+    runStatus: undefined,
+    sessionTypeLabel: "原生",
+    preferredModel: "minimax/MiniMax-M3",
+    projectName: "nextbot",
+    projectRoot: "/Users/peiwang/Projects/nextbot",
+  };
+}
+
+it("shows compact child session metadata without repeating the tab title", () => {
+  render(
+    <ChatSessionWorkspacePanelContent
+      activeSelection={{
+        kind: "child-session",
+        tab: createChildTab(),
+      }}
+      sessionCronJobs={[]}
+      sessionProjectRoot={null}
+      sessionWorkingDir={null}
+    />,
+  );
+
+  expect(screen.queryByText("Child title")).toBeNull();
+  expect(screen.getByText("原生")).toBeTruthy();
+  expect(screen.getByText("minimax/MiniMax-M3")).toBeTruthy();
+  expect(screen.getByText("nextbot")).toBeTruthy();
+  expect(screen.getByTitle("/Users/peiwang/Projects/nextbot")).toBeTruthy();
+});