@nextclaw/ui 0.26.4 → 0.27.0

package/src/features/chat/features/conversation/components/floating-session-conversation.tsx

@@ -1,7 +1,6 @@
 import { PageResourceActionsMenu } from '@/features/right-panel-resources';
 import { pageResourceFromTarget } from '@/features/right-panel-resources';
 import { buildSessionPanelUrl } from '@/features/chat/features/session/utils/chat-session-route.utils';
-import { MessageSquare } from 'lucide-react';
 import { useNavigate } from 'react-router-dom';
 import { getAppPresenter } from '@/app/presenters/app.presenter';
 import { sessionSurfaceManager } from '@/features/chat/managers/session-surface.manager';
@@ -17,8 +16,8 @@ export function FloatingSessionConversation() {
   const presenter = getAppPresenter();
   if (!session) return null;
   return <WorkbenchSurface id={SESSION_WORKBENCH_SURFACE} manager={presenter.workbenchSurfaceManager}
-    title={session.title} icon={<MessageSquare className="h-4 w-4 shrink-0" />} testId="floating-session-conversation" focusOnOpen
-    navigation={<div className="flex min-w-0 flex-1 items-center gap-2"><span className="min-w-0 flex-1 truncate text-xs">{session.title}</span><PageResourceActionsMenu page={pageResourceFromTarget({ kind: 'chat-session', title: session.title, url: buildSessionPanelUrl(session.sessionKey), resourceUri: buildSessionPanelUrl(session.sessionKey), historyPolicy: 'none' })} /></div>}
+    title={session.title} testId="floating-session-conversation" focusOnOpen
+    moreActions={<PageResourceActionsMenu page={pageResourceFromTarget({ kind: 'chat-session', title: session.title, url: buildSessionPanelUrl(session.sessionKey), resourceUri: buildSessionPanelUrl(session.sessionKey), historyPolicy: 'none' })} />}
     onClose={sessionSurfaceManager.close}
     onPlace={() => sessionSurfaceManager.dock(session, presenter.docBrowserManager)}
     onOpenMain={() => { navigate(buildSessionPath(session.sessionKey)); sessionSurfaceManager.close(); }}>

package/src/features/chat/features/conversation/components/session-conversation-area.tsx

@@ -437,6 +437,7 @@ export function SessionConversationArea(props: SessionConversationAreaProps) {
         onEditMessage={(payload) => controllerRef.current.editMessage(payload)}
         welcomeSlot={
           <ChatConversationWelcome
+            hasDraftContent={Boolean(inputSnapshot.text.trim() || inputSnapshot.attachments.length || inputSnapshot.selectedSkills.length)}
             inputSlot={
               <div className="space-y-2">
                 {renderInput("embedded", t("chatWelcomeInputPlaceholder"))}

package/src/features/chat/features/conversation/hooks/__tests__/use-session-conversation-input-state.test.tsx

@@ -198,4 +198,37 @@ describe('useSessionConversationInputState session preferences', () => {
     rerender({ sessionKey: null });
     expect(result.current.inputSnapshot.text).toBe('新会话草稿');
   });
+
+  it('keeps a successfully cleared draft empty after switching away and back', () => {
+    const { result, rerender } = renderHook(
+      ({ sessionKey }: { sessionKey: string }) =>
+        useSessionConversationInputState(null, sessionKey),
+      { initialProps: { sessionKey: 'session-sent' } },
+    );
+
+    act(() => {
+      result.current.inputActions.syncComposer({
+        text: '已经发送的消息',
+        nodes: [],
+        selectedSkills: [],
+        skillRecords: [],
+      });
+      result.current.inputActions.resetComposer();
+    });
+    rerender({ sessionKey: 'session-unsent' });
+    act(() => {
+      result.current.inputActions.syncComposer({
+        text: '仍未发送的草稿',
+        nodes: [],
+        selectedSkills: [],
+        skillRecords: [],
+      });
+    });
+
+    rerender({ sessionKey: 'session-sent' });
+    expect(result.current.inputSnapshot.text).toBe('');
+
+    rerender({ sessionKey: 'session-unsent' });
+    expect(result.current.inputSnapshot.text).toBe('仍未发送的草稿');
+  });
 });

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

@@ -122,8 +122,6 @@ class ChatMessageViewModelAdapter {
         message,
         processedLabel,
         language,
-        failedLabel: t("chatProcessSummaryError", language),
-        stoppedLabel: t("chatProcessSummaryStopped", language),
       });
       const processSummaryLabel = processSummary?.label ?? null;
       const executionPresentation = buildChatMessageExecutionPresentation({

package/src/features/chat/features/message/utils/__tests__/chat-message-process-summary.utils.test.ts

@@ -31,8 +31,6 @@ const baseAssistantMessage = {
 
 const summaryLabels = {
   processedLabel: "已处理",
-  failedLabel: "处理失败",
-  stoppedLabel: "已停止",
   language: "zh" as const,
 };
 
@@ -135,8 +133,8 @@ describe("buildChatMessageProcessSummary", () => {
   });
 
   it.each([
-    ["failed", "处理失败"], ["aborted", "已停止"], ["completed", "已处理"],
-  ] as const)("uses the recorded %s outcome", (outcome, expected) => {
+    ["failed", "已处理"], ["aborted", "已处理"], ["completed", "已处理"],
+  ] as const)("keeps the process summary neutral for a %s outcome", (outcome, expected) => {
     const message: NcpMessage = {
       ...baseAssistantMessage,
       metadata: { ai_execution: createUnavailableNcpAiExecutionMetadata({
@@ -146,9 +144,9 @@ describe("buildChatMessageProcessSummary", () => {
     expect(buildChatMessageProcessSummary({ ...summaryLabels, message })?.label).toBe(expected);
   });
 
-  it("shows failure for an error message without execution metadata", () => {
+  it("keeps the process summary neutral for an error message", () => {
     expect(buildChatMessageProcessSummary({
       ...summaryLabels, message: { ...baseAssistantMessage, status: "error" },
-    })?.label).toBe("处理失败");
+    })?.label).toBe("已处理");
   });
 });

package/src/features/chat/features/message/utils/chat-message-execution-summary.utils.ts

@@ -1,4 +1,6 @@
 import type { ChatMessageMoreActionsViewModel } from "@nextclaw/agent-chat-ui";
+import { createElement } from "react";
+import { Braces } from "lucide-react";
 import {
   readNcpAiExecutionMetadata,
   type NcpAiExecutionMetadata,
@@ -159,6 +161,7 @@ export function buildChatMessageExecutionPresentation(params: {
       items: [
         {
           key: "ai-execution-metadata",
+          icon: createElement(Braces, { className: "h-4 w-4" }),
           label: labels.viewMetadata,
           dialog: {
             title: labels.metadataTitle,

package/src/features/chat/features/message/utils/chat-message-process-summary.utils.ts

@@ -1,12 +1,10 @@
-import { readNcpAiExecutionMetadata, type NcpMessage } from "@nextclaw/ncp";
+import type { NcpMessage } from "@nextclaw/ncp";
 import type { ChatMessageProcessSummarySource } from "@/features/chat/types/chat-message.types";
 import { t, type I18nLanguage } from "@/shared/lib/i18n";
 
 type BuildChatMessageProcessSummaryParams = {
   message: NcpMessage;
   processedLabel: string;
-  failedLabel: string;
-  stoppedLabel: string;
   language: I18nLanguage;
 };
 
@@ -78,8 +76,6 @@ function formatLifecycleDuration(message: NcpMessage, language: I18nLanguage): s
  * and must not be mixed into this summary.
  */
 export function buildChatMessageProcessSummary({
-  failedLabel,
-  stoppedLabel,
   message,
   processedLabel,
   language,
@@ -88,11 +84,7 @@ export function buildChatMessageProcessSummary({
     return undefined;
   }
   const duration = formatLifecycleDuration(message, language);
-  const outcome = readNcpAiExecutionMetadata(message.metadata)?.outcome;
-  const statusLabel = message.status === "error" || outcome === "failed"
-    ? failedLabel
-    : outcome === "aborted" ? stoppedLabel : processedLabel;
   return {
-    label: duration ? `${statusLabel} ${duration}` : statusLabel,
+    label: duration ? `${processedLabel} ${duration}` : processedLabel,
   };
 }

package/src/features/chat/features/message/utils/chat-message-texts.utils.ts

@@ -189,6 +189,8 @@ export function buildChatMessageTexts(
     copiedMessageLabel: t("chatMessageCopied"),
     excerptCharacterCountTemplate: t("chatWorkspaceExcerptCharacterCount"),
     mermaidDiagramLabel: t("chatMermaidDiagram"),
+    frontmatterLabel: t("chatMarkdownFrontmatter"),
+    detailsLabel: t("chatMarkdownDetails"),
     mermaidExpandLabel: t("chatMermaidExpand"),
     mermaidLoadingLabel: t("chatMermaidLoading"),
     mermaidRenderErrorLabel: t("chatMermaidRenderError"),

package/src/features/chat/features/message/utils/chat-message-trigger-details.utils.ts

@@ -1,4 +1,6 @@
 import type { ChatMessageMoreActionsViewModel } from "@nextclaw/agent-chat-ui";
+import { createElement } from "react";
+import { Zap } from "lucide-react";
 import {
   readNcpAiExecutionMetadata,
   readNcpRunTriggerMetadata,
@@ -106,6 +108,7 @@ export function buildChatMessageTriggerDetails(params: {
     triggerLabel: labels.moreActions,
     items: [{
       key: "run-trigger-metadata",
+      icon: createElement(Zap, { className: "h-4 w-4" }),
       label: labels.viewTrigger,
       dialog: {
         title: labels.title,

package/src/features/chat/features/session/components/chat-sidebar-project-groups.tsx

@@ -175,6 +175,7 @@ export function ChatSidebarProjectGroups(props: ChatSidebarProjectGroupsProps) {
                   {group.projectId ? (
                     <Link
                       to={`/projects/${encodeURIComponent(group.projectId)}/overview`}
+                      state={{ returnTo: `${location.pathname}${location.search}` }}
                       className="flex h-full min-w-0 flex-1 items-center gap-1.5 rounded-md px-1 text-left focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-border"
                       aria-current={isSelected ? "page" : undefined}
                       title={group.projectRoot}
@@ -261,7 +262,7 @@ export function ChatSidebarProjectGroups(props: ChatSidebarProjectGroupsProps) {
                         onClick={(event) => event.stopPropagation()}
                       />
                     </PopoverTrigger>
-                    <ChatPopoverContent align="end" className="w-56 p-2">
+                    <ChatPopoverContent align="end" variant="menu">
                       <ChatSessionHeaderMenuItem
                         icon={FolderMinus}
                         label={t("projectsRemoveFromList")}

package/src/features/chat/features/session/components/session-header/chat-session-metadata-dialog.tsx

@@ -29,7 +29,7 @@ export function ChatSessionMetadataDialog({
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
       <DialogContent className="max-w-2xl gap-0 overflow-hidden p-0">
-        <DialogHeader className="border-b border-border px-5 py-4 pr-12">
+        <DialogHeader className="border-b border-border px-5 py-4">
           <DialogTitle className="text-base">{t('chatSessionMetadataDialogTitle')}</DialogTitle>
           <DialogDescription className="sr-only">
             {t('chatSessionMetadataDialogDescription')}

package/src/features/chat/features/session/components/session-header/chat-session-project-badge.tsx

@@ -56,8 +56,8 @@ export function ChatSessionProjectBadge({
         <PopoverTrigger asChild>
           <button
             type="button"
-            title={projectRoot ?? undefined}
-            className="min-w-0 max-w-[320px] shrink rounded-full border border-border bg-muted px-2 py-0.5 text-[11px] font-medium text-muted-foreground transition-colors hover:border-primary/35 hover:bg-[var(--interaction-hover)] hover:text-accent-foreground disabled:cursor-not-allowed disabled:opacity-60"
+            title={projectRoot ? `${projectName}\n${projectRoot}` : projectName}
+            className="min-w-0 max-w-[40%] shrink-0 rounded-full border border-border bg-muted px-2 py-0.5 text-[11px] font-medium text-muted-foreground transition-colors hover:bg-[var(--interaction-hover)] hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-border disabled:cursor-not-allowed disabled:opacity-60"
             aria-label={t('chatSessionSetProject')}
             disabled={isProjectPending}
           >

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

@@ -1,6 +1,8 @@
 import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import { describe, expect, it, vi } from 'vitest';
 import { ChatWelcome } from '@/features/chat/features/welcome/components/chat-welcome';
+import { MemoryRouter } from 'react-router-dom';
+import { buildSessionPath } from '@/features/chat/features/session/utils/chat-session-route.utils';
 
 vi.mock(
   '@/features/chat/features/session/components/session-header/chat-session-project-dialog',
@@ -18,12 +20,14 @@ function renderWelcome(
   overrides: Partial<Parameters<typeof ChatWelcome>[0]> = {},
 ) {
   return render(
+    <MemoryRouter>
     <ChatWelcome
       agents={[
         { id: 'main', displayName: 'Main' },
         { id: 'engineer', displayName: 'Engineer' },
       ]}
       projectOptions={[]}
+      selectedProjectRoot="/tmp/project"
       selectedAgentId="main"
       selectedSessionType="native"
       sessionTypeOptions={sessionTypeOptions}
@@ -31,11 +35,34 @@ function renderWelcome(
       onSelectPrompt={vi.fn()}
       onSelectSessionType={vi.fn()}
       {...overrides}
-    />,
+    />
+    </MemoryRouter>,
   );
 }
 
 describe('ChatWelcome', () => {
+  it('offers an open-ended starting point outside an explicit project', () => {
+    renderWelcome({ selectedProjectRoot: null });
+    expect(screen.getByRole('button', { name: 'Talk about how I’ve been' })).toBeTruthy();
+    expect(screen.queryByRole('button', { name: 'Move this project forward' })).toBeNull();
+  });
+
+  it('links to the original session and can dismiss it without removing history', () => {
+    renderWelcome({ continuation: { sessionKey: 'session/one', title: 'A real conversation' } });
+    const link = screen.getByRole('link', { name: /A real conversation/ });
+    expect(link.getAttribute('href')).toBe(buildSessionPath('session/one'));
+    expect(screen.getByRole('button', { name: 'Talk about how I’ve been' })).toBeTruthy();
+    fireEvent.click(screen.getByRole('button', { name: 'Hide this conversation suggestion for now' }));
+    expect(screen.queryByRole('link')).toBeNull();
+    expect(screen.getByRole('button', { name: 'Move this project forward' })).toBeTruthy();
+  });
+
+  it('hides starting suggestions while composing but keeps context controls available', () => {
+    renderWelcome({ hasDraftContent: true });
+    expect(screen.queryByRole('button', { name: 'Move this project forward' })).toBeNull();
+    expect(screen.getByRole('combobox', { name: 'Draft agent' })).toBeTruthy();
+    expect(screen.getByRole('button', { name: 'Choose session type' })).toBeTruthy();
+  });
   it('renders a lightweight draft agent select and allows switching', () => {
     const onSelectAgent = vi.fn();
 
@@ -53,12 +80,10 @@ describe('ChatWelcome', () => {
   it('renders a single-purpose welcome surface with compact prompt suggestions', () => {
     renderWelcome({ agents: [{ id: 'main', displayName: 'Main' }] });
 
-    expect(screen.getByRole('heading', { name: 'What would you like to get done?' })).toBeTruthy();
+    expect(screen.getByRole('heading', { name: 'Where shall we start today?' })).toBeTruthy();
     expect(screen.queryByText(/Describe the goal/)).toBeNull();
     expect(screen.getByRole('group', { name: 'Task context' })).toBeTruthy();
-    const suggestion = screen.getByRole('button', { name: 'Review this project' });
-    expect(suggestion.className).toContain('rounded-full');
-    expect(suggestion.className).not.toContain('border');
+    const suggestion = screen.getByRole('button', { name: 'Move this project forward' });
     expect(suggestion.parentElement?.className).toContain('flex-wrap');
   });
 
@@ -67,7 +92,7 @@ describe('ChatWelcome', () => {
 
     renderWelcome({ onSelectPrompt });
 
-    fireEvent.click(screen.getByRole('button', { name: 'Review this project' }));
+    fireEvent.click(screen.getByRole('button', { name: 'Move this project forward' }));
 
     expect(onSelectPrompt).toHaveBeenCalledWith(
       expect.stringContaining('next three concrete things'),

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

@@ -19,11 +19,13 @@ import { useAgents } from "@/shared/hooks/use-agents";
 import { useProjects } from "@/shared/hooks/use-projects";
 import type { NcpSessionSummaryView } from "@/shared/lib/api";
 import { normalizeSessionProjectRootValue } from "@/shared/lib/session-project";
+import { resolveChatWelcomeContinuation } from "@/features/chat/features/welcome/utils/chat-welcome-continuation.utils";
 
 const EMPTY_NCP_SESSION_SUMMARIES: NcpSessionSummaryView[] = [];
 
 type ChatConversationWelcomeProps = {
   inputSlot: ReactNode;
+  hasDraftContent?: boolean;
   pendingProjectRoot: string | null;
   pendingSessionType: string;
   selectedSessionTypeValue: string | null;
@@ -34,6 +36,7 @@ type ChatConversationWelcomeProps = {
 
 export function ChatConversationWelcome({
   inputSlot,
+  hasDraftContent = false,
   pendingProjectRoot,
   pendingSessionType,
   selectedSessionTypeValue,
@@ -50,7 +53,9 @@ export function ChatConversationWelcome({
     (state) => state.snapshot.configQuery?.data ?? null,
   );
   const sessionSummaries = useChatQueryStore(
-    (state) => state.snapshot.sessionsQuery?.data?.sessions ?? EMPTY_NCP_SESSION_SUMMARIES,
+    (state) => state.snapshot.sessionsQuery?.isSuccess
+      ? state.snapshot.sessionsQuery.data?.sessions ?? EMPTY_NCP_SESSION_SUMMARIES
+      : EMPTY_NCP_SESSION_SUMMARIES,
   );
   const sessionTypesData = useChatQueryStore(
     (state) => state.snapshot.sessionTypesQuery?.data ?? null,
@@ -104,6 +109,13 @@ export function ChatConversationWelcome({
       agents={availableAgents}
       defaultProjectRoot={defaultProjectRoot}
       inputSlot={inputSlot}
+      hasDraftContent={hasDraftContent}
+      continuation={resolveChatWelcomeContinuation({
+        sessions: sessionSummaries,
+        projectRoot: selectedProjectRoot ?? defaultProjectRoot,
+        defaultProjectRoot,
+        agentId: draftAgentId,
+      })}
       projectOptions={projectOptions}
       selectedAgentId={draftAgentId}
       selectedProjectRoot={selectedProjectRoot}

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-muted-foreground shadow-none hover:bg-[var(--interaction-hover)] hover:text-accent-foreground focus:ring-0"
+        className="h-9 w-auto min-w-0 gap-1.5 rounded-lg border-0 bg-transparent px-2 py-1.5 text-sm font-medium text-foreground/80 shadow-none hover:bg-[var(--interaction-hover)] hover:text-foreground focus:ring-1 focus:ring-border"
       >
         <span className="sr-only">{t('chatDraftAgentTitle')}</span>
         <div className="flex min-w-0 items-center gap-1.5">

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

@@ -43,7 +43,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-muted-foreground transition-colors hover:bg-[var(--interaction-hover)] hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-border"
+          className="inline-flex h-9 min-w-0 max-w-full items-center gap-1.5 rounded-lg px-2 py-1.5 text-left text-sm font-medium text-foreground/80 transition-colors hover:bg-[var(--interaction-hover)] hover:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-border"
           title={projectRoot ?? undefined}
           aria-label={t('chatWelcomeProjectPickerLabel')}
           disabled={!selectable || isSaving}

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

@@ -1,9 +1,14 @@
+import { useState } from 'react';
+import { Link } from 'react-router-dom';
+import { ArrowUpRight, History, X } from 'lucide-react';
+import { buildSessionPath } from '@/features/chat/features/session/utils/chat-session-route.utils';
+import type { ChatWelcomeContinuation } from '@/features/chat/features/welcome/utils/chat-welcome-continuation.utils';
 import { t } from '@/shared/lib/i18n';
 
 const WELCOME_PROMPT_SUGGESTIONS = [
   {
-    labelKey: 'chatWelcomeSuggestion1Label' as const,
-    promptKey: 'chatWelcomeSuggestion1Prompt' as const,
+    labelKey: 'chatWelcomeOpenStartLabel' as const,
+    promptKey: 'chatWelcomeOpenStartPrompt' as const,
   },
   {
     labelKey: 'chatWelcomeSuggestion2Label' as const,
@@ -17,21 +22,59 @@ const WELCOME_PROMPT_SUGGESTIONS = [
 
 export function ChatWelcomePromptSuggestions({
   onSelectPrompt,
+  hasDraftContent = false,
+  hasProject = false,
+  continuation,
 }: {
   onSelectPrompt: (prompt: string) => void;
+  hasDraftContent?: boolean;
+  hasProject?: boolean;
+  continuation?: ChatWelcomeContinuation | null;
 }) {
+  const [dismissedSessionKey, setDismissedSessionKey] = useState<string | null>(null);
+  const showContinuation = continuation && continuation.sessionKey !== dismissedSessionKey;
   return (
-    <div className="mt-5 flex flex-wrap justify-center gap-2">
-      {WELCOME_PROMPT_SUGGESTIONS.map((suggestion) => (
-        <button
-          key={suggestion.labelKey}
-          type="button"
-          onClick={() => onSelectPrompt(t(suggestion.promptKey))}
-          className="rounded-full bg-muted/55 px-3.5 py-2 text-xs font-medium text-muted-foreground transition-colors hover:bg-[var(--interaction-hover)] hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
-        >
-          {t(suggestion.labelKey)}
-        </button>
-      ))}
+    <div className={`mt-3 min-h-32 ${hasDraftContent ? 'invisible' : ''}`} aria-hidden={hasDraftContent || undefined}>
+      <div className="flex flex-wrap justify-center gap-x-2 gap-y-1">
+        {WELCOME_PROMPT_SUGGESTIONS.map((suggestion, index) => {
+          const projectStart = index === 2 && hasProject;
+          return (
+            <button
+              key={suggestion.labelKey}
+              type="button"
+              onClick={() => onSelectPrompt(t(projectStart ? 'chatWelcomeSuggestion1Prompt' : suggestion.promptKey))}
+              className="rounded-lg bg-muted/70 px-3 py-1.5 text-[13px] font-normal leading-5 text-foreground/80 transition-colors hover:bg-[var(--interaction-hover)] hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
+            >
+              {t(projectStart ? 'chatWelcomeSuggestion1Label' : suggestion.labelKey)}
+            </button>
+          );
+        })}
+      </div>
+      {continuation ? (
+        <div className={`mx-auto mt-5 flex min-w-0 max-w-lg items-center gap-1 border-t border-border/50 pt-3 ${showContinuation ? '' : 'invisible'}`} aria-hidden={!showContinuation || undefined}>
+          <Link
+            to={buildSessionPath(continuation.sessionKey)}
+            title={t('chatWelcomeContinueHint')}
+            className="flex min-w-0 flex-1 items-center gap-3 rounded-lg px-2 py-2 transition-colors hover:bg-[var(--interaction-hover)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+          >
+            <History aria-hidden="true" className="h-4 w-4 shrink-0 text-muted-foreground" />
+            <span className="min-w-0 flex-1">
+              <span className="block text-xs text-muted-foreground">{t('chatWelcomeContinueLabel')}</span>
+              <span className="mt-1 block truncate text-sm text-foreground">{continuation.title}</span>
+            </span>
+            <ArrowUpRight aria-hidden="true" className="h-4 w-4 shrink-0 text-muted-foreground" />
+          </Link>
+          <button
+            type="button"
+            aria-label={t('chatWelcomeDismissContinue')}
+            title={t('chatWelcomeDismissContinue')}
+            onClick={() => setDismissedSessionKey(continuation.sessionKey)}
+            className="mr-1 flex h-9 w-9 shrink-0 items-center justify-center rounded-lg text-muted-foreground hover:bg-[var(--interaction-hover)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+          >
+            <X aria-hidden="true" className="h-3.5 w-3.5" />
+          </button>
+        </div>
+      ) : null}
     </div>
   );
 }

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

@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import { Bot, ChevronDown } from 'lucide-react';
+import { Cpu, 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 { ChatSessionTypeOption } from '@/features/chat/features/session-type/utils/chat-session-type.utils';
@@ -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-muted-foreground transition-colors hover:bg-[var(--interaction-hover)] hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-border"
+          className="inline-flex h-9 min-w-0 max-w-full items-center gap-1.5 rounded-lg px-2 py-1.5 text-left text-sm font-medium text-foreground/80 transition-colors hover:bg-[var(--interaction-hover)] hover:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-border"
           aria-label={t('chatWelcomeSessionTypePickerLabel')}
         >
           {selectedOption.icon?.src ? (
@@ -53,7 +53,7 @@ export function ChatWelcomeSessionTypePicker({
               className="h-4 w-4"
             />
           ) : (
-            <Bot className="h-4 w-4 shrink-0" />
+            <Cpu className="h-3.5 w-3.5 shrink-0" />
           )}
           <span className="truncate">{selectedOption.label}</span>
           <ChevronDown className="h-3.5 w-3.5 shrink-0 text-muted-foreground/70" />

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

@@ -9,12 +9,15 @@ import type { ChatWelcomeProjectOption } from '@/features/chat/features/welcome/
 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';
+import type { ChatWelcomeContinuation } from '@/features/chat/features/welcome/utils/chat-welcome-continuation.utils';
 
 type SessionTypeOption = ChatSessionTypeOption;
 
 type ChatWelcomeProps = {
   agents: AgentProfileView[];
   inputSlot?: ReactNode;
+  hasDraftContent?: boolean;
+  continuation?: ChatWelcomeContinuation | null;
   defaultProjectRoot?: string | null;
   projectOptions: readonly ChatWelcomeProjectOption[];
   selectedAgentId: string;
@@ -31,6 +34,8 @@ export function ChatWelcome({
   agents,
   defaultProjectRoot,
   inputSlot,
+  hasDraftContent = false,
+  continuation,
   projectOptions,
   selectedAgentId,
   selectedProjectRoot,
@@ -64,18 +69,18 @@ export function ChatWelcome({
     <div className="flex min-h-full items-center justify-center px-4 py-10 sm:p-8">
       <div className="w-full min-w-0 max-w-[min(680px,100%)]">
         <div className="text-center">
-          <h2 className="text-2xl font-semibold leading-tight text-foreground sm:text-[2rem]">
+          <h2 className="text-2xl font-[number:var(--welcome-title-weight)] leading-tight text-[hsl(var(--welcome-title-foreground))] sm:text-[1.75rem]">
             {t('chatWelcomeTitle')}
           </h2>
         </div>
 
         {inputSlot ? <div className="mt-6">{inputSlot}</div> : null}
 
-        <div className="mt-2 flex justify-center px-1">
+        <div className="mt-1.5 flex justify-center px-1">
           <div
             role="group"
             aria-label={t('chatWelcomeContextLabel')}
-            className="flex min-w-0 max-w-full flex-wrap items-center justify-center gap-0.5 rounded-xl bg-muted/40 p-1 text-sm text-muted-foreground"
+            className="flex min-w-0 max-w-full flex-wrap items-center justify-center gap-x-1 gap-y-0.5 text-xs text-muted-foreground"
           >
             {onSelectProjectRoot ? (
               <ChatWelcomeProjectPicker
@@ -101,7 +106,12 @@ export function ChatWelcome({
           </div>
         </div>
 
-        <ChatWelcomePromptSuggestions onSelectPrompt={onSelectPrompt} />
+        <ChatWelcomePromptSuggestions
+          hasDraftContent={hasDraftContent}
+          hasProject={Boolean(selectedProjectRoot)}
+          continuation={continuation}
+          onSelectPrompt={onSelectPrompt}
+        />
       </div>
 
       {onSelectProjectRoot ? (

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

@@ -0,0 +1,40 @@
+import { describe, expect, it } from 'vitest';
+import type { NcpSessionSummaryView } from '@/shared/lib/api';
+import { resolveChatWelcomeContinuation } from '@/features/chat/features/welcome/utils/chat-welcome-continuation.utils';
+
+const summary = (overrides: Partial<NcpSessionSummaryView> = {}): NcpSessionSummaryView => ({
+  sessionId: 'original', agentId: 'main', messageCount: 2,
+  updatedAt: '2026-09-16T10:00:00Z',
+  metadata: { label: 'Project plan', project_root: '/project' },
+  ...overrides,
+});
+const resolve = (sessions: NcpSessionSummaryView[], projectRoot = '/project') =>
+  resolveChatWelcomeContinuation({ sessions, projectRoot, defaultProjectRoot: '/default', agentId: 'main' });
+
+describe('resolveChatWelcomeContinuation', () => {
+  it('selects by message activity without changing source ordering', () => {
+    const sessions = [summary({ sessionId: 'old', lastMessageAt: '2026-09-10T10:00:00Z' }), summary()];
+    expect(resolve(sessions)?.sessionKey).toBe('original');
+    expect(sessions[0].sessionId).toBe('old');
+  });
+
+  it('excludes other agents, projects, empty, untitled and child sessions', () => {
+    expect(resolve([
+      summary({ agentId: 'other' }), summary({ messageCount: 0 }),
+      summary({ metadata: { project_root: '/other', label: 'Other' } }),
+      summary({ metadata: { project_root: '/project' } }),
+      summary({ metadata: { project_root: '/project', label: 'Child', parentSessionId: 'parent' } }),
+    ])).toBeNull();
+  });
+
+  it('uses the default workspace for old sessions without project metadata', () => {
+    const sessions = [summary({ metadata: { label: 'Previous discussion' } })];
+    expect(resolve(sessions, '/default')?.title).toBe('Previous discussion');
+    expect(resolve(sessions)).toBeNull();
+  });
+
+  it('respects a working directory when project metadata is absent', () => {
+    expect(resolve([summary({ metadata: { label: 'Working directory' }, workingDir: '/elsewhere' })])).toBeNull();
+    expect(resolve([])).toBeNull();
+  });
+});

package/src/features/chat/features/welcome/utils/chat-welcome-continuation.utils.ts

@@ -0,0 +1,21 @@
+import { adaptNcpSessionSummaries } from '@/features/chat/features/session/utils/ncp-session-adapter.utils';
+import type { NcpSessionSummaryView } from '@/shared/lib/api';
+
+export type ChatWelcomeContinuation = { sessionKey: string; title: string };
+
+export function resolveChatWelcomeContinuation(params: {
+  sessions: readonly NcpSessionSummaryView[];
+  projectRoot: string | null;
+  defaultProjectRoot: string | null;
+  agentId: string;
+}): ChatWelcomeContinuation | null {
+  const candidates = adaptNcpSessionSummaries([...params.sessions]).filter((session) =>
+    !session.isChildSession && session.messageCount > 0 && session.label?.trim() &&
+    (session.agentId ?? 'main') === params.agentId &&
+    (session.projectRoot ?? session.workingDir ?? params.defaultProjectRoot) === params.projectRoot,
+  );
+  const activityAt = (session: typeof candidates[number]) =>
+    Date.parse(session.lastMessageAt ?? session.updatedAt) || 0;
+  const recent = candidates.sort((a, b) => activityAt(b) - activityAt(a))[0];
+  return recent ? { sessionKey: recent.key, title: recent.label!.trim() } : null;
+}

package/src/features/chat/features/workspace/components/chat-session-workspace-directory-browser.tsx

@@ -359,7 +359,7 @@ function WorkspaceDirectoryBrowserReady({
 
   const content = (
     <div
-      className="flex h-full min-h-0 flex-col bg-white"
+      className="flex h-full min-h-0 flex-col bg-background"
       onContextMenu={(event) => {
         if (!(event.target as HTMLElement).closest('[data-workspace-tree-entry]')) clearSelection();
       }}