@nextclaw/ui 0.14.1 → 0.14.3

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(
@@ -89,17 +89,10 @@ describe('ChatWelcome', () => {
       defaultProjectRoot: '/Users/demo/.nextclaw/workspace',
       onSelectProjectRoot,
       projectOptions: [
-        {
-          projectRoot: '/Users/demo/.nextclaw/workspace',
-          projectName: 'workspace',
-          sessionCount: 0,
-          isDefault: true,
-        },
         {
           projectRoot: '/tmp/project-alpha',
           projectName: 'project-alpha',
           sessionCount: 3,
-          isDefault: false,
         },
       ],
     });

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-agent-picker.tsx

@@ -28,7 +28,7 @@ export function ChatWelcomeAgentPicker({
     <Select value={selectedAgentId} onValueChange={onSelectAgent}>
       <SelectTrigger
         aria-label={t('chatDraftAgentTitle')}
-        className="h-auto w-auto min-w-0 gap-1 rounded-lg border-0 bg-transparent px-2 py-1.5 text-gray-500 shadow-none hover:bg-gray-100 hover:text-gray-800 focus:ring-0"
+        className="h-auto w-auto min-w-0 gap-1 rounded-lg border-0 bg-transparent px-2 py-1.5 text-muted-foreground shadow-none hover:bg-accent hover:text-accent-foreground focus:ring-0"
       >
         <span className="sr-only">{t('chatDraftAgentTitle')}</span>
         <div className="flex min-w-0 items-center gap-1.5">
@@ -48,7 +48,7 @@ export function ChatWelcomeAgentPicker({
         </div>
       </SelectTrigger>
       <SelectContent
-        className="rounded-xl border-gray-200/80 shadow-lg"
+        className="rounded-xl border-border shadow-lg"
         style={{ maxHeight: AGENT_PICKER_MAX_HEIGHT }}
       >
         {agents.map((agent) => (
@@ -60,7 +60,7 @@ export function ChatWelcomeAgentPicker({
                 avatarUrl={agent.avatarUrl}
                 className="h-5 w-5 shrink-0"
               />
-              <span className="truncate text-sm font-medium text-gray-700">
+              <span className="truncate text-sm font-medium text-foreground">
                 {agent.displayName?.trim() || agent.id}
               </span>
             </div>

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

@@ -35,15 +35,15 @@ export function ChatWelcomeCapabilityGrid({
           <button
             key={capability.titleKey}
             onClick={() => onSelectPrompt(t(capability.promptKey))}
-            className="min-w-0 rounded-2xl border border-gray-200 bg-white p-3 text-left shadow-card transition-shadow hover:shadow-card-hover sm:p-4"
+            className="min-w-0 rounded-2xl border border-border bg-card p-3 text-left text-card-foreground shadow-card transition-[border-color,box-shadow,transform] hover:border-primary/30 hover:shadow-card-hover sm:p-4"
           >
-            <div className="mb-3 flex h-9 w-9 items-center justify-center rounded-xl bg-primary/8">
+            <div className="mb-3 flex h-9 w-9 items-center justify-center rounded-xl bg-accent">
               <Icon className="h-4.5 w-4.5 text-primary" />
             </div>
-            <div className="mb-1 text-sm font-semibold text-gray-900">
+            <div className="mb-1 text-sm font-semibold text-foreground">
               {t(capability.titleKey)}
             </div>
-            <div className="text-[11px] leading-relaxed text-gray-500">
+            <div className="text-[11px] leading-relaxed text-muted-foreground">
               {t(capability.descKey)}
             </div>
           </button>

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

@@ -49,7 +49,7 @@ export function ChatWelcomeProjectPicker({
       <PopoverTrigger asChild>
         <button
           type="button"
-          className="inline-flex min-w-0 max-w-full items-center gap-1.5 rounded-lg px-2 py-1.5 text-left font-medium text-gray-500 transition-colors hover:bg-gray-100 hover:text-gray-800 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/25"
+          className="inline-flex min-w-0 max-w-full items-center gap-1.5 rounded-lg px-2 py-1.5 text-left font-medium text-muted-foreground transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/25"
           title={projectRoot ?? undefined}
           aria-label={t('chatWelcomeProjectPickerLabel')}
           disabled={!selectable || isSaving}
@@ -57,19 +57,19 @@ export function ChatWelcomeProjectPicker({
           <FolderOpen className="h-4 w-4 shrink-0" />
           <span className="truncate">{projectLabel}</span>
           {isDefaultProject ? (
-            <span className="shrink-0 text-xs font-normal text-gray-400">
+            <span className="shrink-0 text-xs font-normal text-muted-foreground/70">
               {t('chatWelcomeProjectDefaultBadge')}
             </span>
           ) : null}
-          <ChevronDown className="h-3.5 w-3.5 shrink-0 text-gray-400" />
+          <ChevronDown className="h-3.5 w-3.5 shrink-0 text-muted-foreground/70" />
         </button>
       </PopoverTrigger>
       <PopoverContent
         align="start"
-        className="flex w-[min(20rem,calc(100vw-1rem))] flex-col overflow-hidden rounded-2xl border border-gray-200/80 bg-white p-0 shadow-[0_24px_60px_-28px_rgba(15,23,42,0.38)]"
+        className="flex w-[min(20rem,calc(100vw-1rem))] flex-col overflow-hidden rounded-2xl border border-border bg-popover p-0 text-popover-foreground shadow-[0_24px_60px_-28px_rgba(15,23,42,0.38)]"
         style={{ maxHeight: PROJECT_PICKER_MAX_HEIGHT }}
       >
-        <div className="shrink-0 px-3 pb-2 pt-3 text-[10px] font-semibold uppercase tracking-[0.18em] text-gray-400">
+        <div className="shrink-0 px-3 pb-2 pt-3 text-[10px] font-semibold uppercase tracking-[0.18em] text-muted-foreground">
           {t('chatWelcomeProjectRecentTitle')}
         </div>
         <div className="min-h-0 flex-1 overflow-y-auto px-1.5 pb-1.5">
@@ -78,51 +78,46 @@ export function ChatWelcomeProjectPicker({
               <button
                 key={option.projectRoot}
                 type="button"
-                className="flex w-full min-w-0 items-start gap-2 rounded-xl px-2 py-2 text-left transition-colors hover:bg-gray-50"
+                className="flex w-full min-w-0 items-start gap-2 rounded-xl px-2 py-2 text-left transition-colors hover:bg-accent"
                 title={option.projectRoot}
                 onClick={() => {
                   void selectProjectRoot(option.projectRoot);
                 }}
               >
-                <FolderOpen className="mt-0.5 h-4 w-4 shrink-0 text-gray-400" />
+                <FolderOpen className="mt-0.5 h-4 w-4 shrink-0 text-muted-foreground/70" />
                 <span className="min-w-0 flex-1">
                   <span className="flex min-w-0 items-center gap-1.5">
-                    <span className="truncate text-[13px] font-semibold text-gray-800">
+                    <span className="truncate text-[13px] font-semibold text-foreground">
                       {option.projectName}
                     </span>
-                    {option.isDefault ? (
-                      <span className="shrink-0 text-[10px] font-medium text-gray-400">
-                        {t('chatWelcomeProjectDefaultBadge')}
-                      </span>
-                    ) : null}
                   </span>
-                  <span className="block truncate text-[11px] leading-4 text-gray-500">
+                  <span className="block truncate text-[11px] leading-4 text-muted-foreground">
                     {option.projectRoot}
                   </span>
                 </span>
                 {option.sessionCount > 0 ? (
-                  <span className="mt-0.5 shrink-0 rounded-full bg-gray-100 px-1.5 py-0.5 text-[10px] font-medium text-gray-500">
+                  <span className="mt-0.5 shrink-0 rounded-full bg-muted px-1.5 py-0.5 text-[10px] font-medium text-muted-foreground">
                     {option.sessionCount}
                   </span>
                 ) : null}
               </button>
             ))
           ) : (
-            <div className="px-2 py-5 text-center text-xs text-gray-400">
+            <div className="px-2 py-5 text-center text-xs text-muted-foreground">
               {t('chatWelcomeProjectNoRecent')}
             </div>
           )}
         </div>
-        <div className="shrink-0 border-t border-gray-100 p-1.5">
+        <div className="shrink-0 border-t border-border p-1.5">
           <button
             type="button"
-            className="flex w-full items-center gap-2 rounded-xl px-2.5 py-2 text-left text-[13px] font-semibold text-gray-700 transition-colors hover:bg-gray-50"
+            className="flex w-full items-center gap-2 rounded-xl px-2.5 py-2 text-left text-[13px] font-semibold text-foreground transition-colors hover:bg-accent"
             onClick={() => {
               setIsOpen(false);
               onOpenProjectDialog();
             }}
           >
-            <FolderOpen className="h-4 w-4 shrink-0 text-gray-400" />
+            <FolderOpen className="h-4 w-4 shrink-0 text-muted-foreground/70" />
             <span>{t('chatWelcomeProjectOpenFolder')}</span>
           </button>
         </div>

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[];
@@ -39,7 +39,7 @@ export function ChatWelcomeSessionTypePicker({
       <PopoverTrigger asChild>
         <button
           type="button"
-          className="inline-flex min-w-0 max-w-full items-center gap-1.5 rounded-lg px-2 py-1.5 text-left font-medium text-gray-500 transition-colors hover:bg-gray-100 hover:text-gray-800 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/25"
+          className="inline-flex min-w-0 max-w-full items-center gap-1.5 rounded-lg px-2 py-1.5 text-left font-medium text-muted-foreground transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/25"
           aria-label={t('chatWelcomeSessionTypePickerLabel')}
         >
           {selectedOption.icon?.src ? (
@@ -56,12 +56,12 @@ export function ChatWelcomeSessionTypePicker({
             <Bot className="h-4 w-4 shrink-0" />
           )}
           <span className="truncate">{selectedOption.label}</span>
-          <ChevronDown className="h-3.5 w-3.5 shrink-0 text-gray-400" />
+          <ChevronDown className="h-3.5 w-3.5 shrink-0 text-muted-foreground/70" />
         </button>
       </PopoverTrigger>
       <PopoverContent
         align="start"
-        className="flex w-[min(16rem,calc(100vw-1rem))] flex-col overflow-hidden rounded-2xl border border-gray-200/80 bg-white p-1.5 shadow-[0_24px_60px_-28px_rgba(15,23,42,0.38)]"
+        className="flex w-[min(16rem,calc(100vw-1rem))] flex-col overflow-hidden rounded-2xl border border-border bg-popover p-1.5 text-popover-foreground shadow-[0_24px_60px_-28px_rgba(15,23,42,0.38)]"
         style={{ maxHeight: SESSION_TYPE_PICKER_MAX_HEIGHT }}
       >
         <div className="min-h-0 flex-1 overflow-y-auto">

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[];
@@ -64,22 +64,22 @@ export function ChatWelcome({
   return (
     <div className="flex min-h-full items-center justify-center px-4 py-8 sm:p-8">
       <div className="min-w-0 w-full max-w-[min(760px,100%)]">
-        <div className="mx-auto mb-5 flex h-14 w-14 items-center justify-center rounded-2xl bg-primary/10">
+        <div className="mx-auto mb-5 flex h-14 w-14 items-center justify-center rounded-2xl border border-border bg-accent shadow-card">
           <Bot className="h-8 w-8 text-primary" />
         </div>
 
         <div className="text-center">
-          <h2 className="text-2xl font-semibold text-gray-950 sm:text-3xl">
+          <h2 className="text-2xl font-semibold text-foreground sm:text-3xl">
             {t('chatWelcomeTitle')}
           </h2>
-          <p className="mt-3 text-sm font-medium text-gray-500 sm:text-base">
+          <p className="mt-3 text-sm font-medium text-muted-foreground sm:text-base">
             {t('chatWelcomeSubtitle')}
           </p>
         </div>
 
         {inputSlot ? <div className="mt-8">{inputSlot}</div> : null}
 
-        <div className="mt-3 flex flex-wrap items-center gap-2 px-1 text-sm text-gray-500">
+        <div className="mt-3 flex flex-wrap items-center gap-2 px-1 text-sm text-muted-foreground">
           {onSelectProjectRoot ? (
             <ChatWelcomeProjectPicker
               defaultProjectRoot={defaultProjectRoot}

package/src/features/chat/features/welcome/utils/__tests__/chat-welcome-project-options.utils.test.ts

@@ -18,10 +18,15 @@ function createSummary(
 }
 
 describe("buildChatWelcomeProjectOptions", () => {
-  it("builds recent project options from session summaries", () => {
+  it("builds recent project options without treating the default workspace as a project", () => {
     const options = buildChatWelcomeProjectOptions({
       defaultProjectRoot: "/Users/demo/.nextclaw/workspace",
       sessionSummaries: [
+        createSummary({
+          sessionId: "session-default",
+          lastMessageAt: "2026-06-12T10:00:00.000Z",
+          metadata: { project_root: "/Users/demo/.nextclaw/workspace" },
+        }),
         createSummary({
           sessionId: "session-1",
           lastMessageAt: "2026-06-10T10:00:00.000Z",
@@ -36,17 +41,10 @@ describe("buildChatWelcomeProjectOptions", () => {
     });
 
     expect(options).toEqual([
-      {
-        projectRoot: "/Users/demo/.nextclaw/workspace",
-        projectName: "workspace",
-        sessionCount: 0,
-        isDefault: true,
-      },
       {
         projectRoot: "/tmp/project-alpha",
         projectName: "project-alpha",
         sessionCount: 2,
-        isDefault: false,
       },
     ]);
   });

package/src/features/chat/features/welcome/utils/chat-welcome-project-options.utils.ts

@@ -6,7 +6,6 @@ export type ChatWelcomeProjectOption = {
   projectRoot: string;
   projectName: string;
   sessionCount: number;
-  isDefault: boolean;
 };
 
 function readSessionActivityAt(session: {
@@ -28,7 +27,7 @@ export function buildChatWelcomeProjectOptions(params: {
 
   for (const session of adaptNcpSessionSummaries([...sessionSummaries])) {
     const projectRoot = session.projectRoot?.trim();
-    if (!projectRoot) {
+    if (!projectRoot || projectRoot === defaultProjectRoot) {
       continue;
     }
     const existing = groups.get(projectRoot);
@@ -45,26 +44,12 @@ export function buildChatWelcomeProjectOptions(params: {
         getSessionProjectName(projectRoot) ||
         projectRoot,
       sessionCount: 1,
-      isDefault: projectRoot === defaultProjectRoot,
       latestUpdatedAt,
     });
   }
 
-  if (defaultProjectRoot && !groups.has(defaultProjectRoot)) {
-    groups.set(defaultProjectRoot, {
-      projectRoot: defaultProjectRoot,
-      projectName: getSessionProjectName(defaultProjectRoot) ?? defaultProjectRoot,
-      sessionCount: 0,
-      isDefault: true,
-      latestUpdatedAt: Number.POSITIVE_INFINITY,
-    });
-  }
-
   return [...groups.values()]
     .sort((left, right) => {
-      if (left.isDefault !== right.isDefault) {
-        return left.isDefault ? -1 : 1;
-      }
       return right.latestUpdatedAt - left.latestUpdatedAt;
     })
     .map(({ latestUpdatedAt: _latestUpdatedAt, ...option }) => option);

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();
+});